From 3697d7f2aa1f25a06a4758dc8e7cd2927d0edf8f Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Mon, 7 Oct 2024 15:55:13 +0200
Subject: [PATCH 001/602] Fix: Grand total correction

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

diff --git a/htdocs/core/tpl/list_print_total.tpl.php b/htdocs/core/tpl/list_print_total.tpl.php
index 8900665eaeb..8990ce12984 100644
--- a/htdocs/core/tpl/list_print_total.tpl.php
+++ b/htdocs/core/tpl/list_print_total.tpl.php
@@ -64,7 +64,8 @@ if (isset($totalarray['pos'])) {
 				while ($i < $totalarray['nbfield']) {
 					$i++;
 					if (!empty($totalarray['pos'][$i])) {
-						printTotalValCell($totalarray['type'][$i], $sumsarray[$totalarray['pos'][$i]]);
+						$fieldname = preg_replace('/[^a-z0-9]/', '', $totalarray['pos'][$i]);
+						printTotalValCell($totalarray['type'][$i], $sumsarray[$fieldname]);
 					} else {
 						if ($i == 1) {
 							print '<td>';

From 786905a6c8b341e9d52ec356fce9aab0bec35b63 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Thu, 10 Oct 2024 09:16:32 +0200
Subject: [PATCH 002/602] Fix: Does not filter correctly by project contacts

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

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 411fe6d0663..9a1ea12d88f 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2015-2024	Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2017       Rui Strecht             <rui.strecht@aliartalentos.com>
- * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2018-2024  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1026,7 +1026,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_contact as tc on ec.fk_c_type_contact = tc.rowid";
 			$sql .= " WHERE sc.fk_soc = ".((int) $object->id);
 			$sql .= " AND p.entity IN (".getEntity('project').")";
-			$sql .= " AND tc.element = 'project'";
+			$sql .= " AND tc.element = 'project' AND tc.source = 'external'";
 			$sql .= " ORDER BY p.dateo DESC";
 
 			$result = $db->query($sql);

From 4354165955958eb031f06bf5ba19bd70f704d941 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Wed, 13 Nov 2024 10:31:47 +0100
Subject: [PATCH 003/602] Fix: Closed invoices are not considered as issued

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

diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index a816a83a428..5f291b9e5bd 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2010      Regis Houssin       <regis.houssin@inodbox.com>
  * Copyright (C) 2011-2017 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2014      Marcos García       <marcosgdf@gmail.com>
- * Copyright (C) 2022      Ferran Marcet       <fmarcet@2byte.es>
+ * Copyright (C) 2022-2024 Ferran Marcet       <fmarcet@2byte.es>
  * Copyright (C) 2023      Alexandre Janniaux  <alexandre.janniaux@gmail.com>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
@@ -248,7 +248,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 						$totalHTInvoices = 0;
 						$areAllInvoicesValidated = true;
 						foreach ($orderLinked->linkedObjects['facture'] as $key => $invoice) {
-							if ($invoice->statut == Facture::STATUS_VALIDATED || $object->id == $invoice->id) {
+							if ($invoice->statut == Facture::STATUS_VALIDATED || $invoice->statut == Facture::STATUS_CLOSED || $object->id == $invoice->id) {
 								$totalHTInvoices += (float) $invoice->total_ht;
 							} else {
 								$areAllInvoicesValidated = false;

From 007860ae81859a755fdcb95fc4b3b1c68b3e9a8c Mon Sep 17 00:00:00 2001
From: Nicolas <info@inovea-conseil.com>
Date: Sat, 16 Nov 2024 17:53:53 +0100
Subject: [PATCH 004/602] NEW Closing task

---
 htdocs/core/lib/project.lib.php    |  8 +++++
 htdocs/projet/class/task.class.php | 53 ++++++++++++++++++++++++++++++
 htdocs/projet/tasks.php            | 15 +++++++++
 htdocs/projet/tasks/task.php       | 29 +++++++++++++++-
 4 files changed, 104 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 95566b86a53..f3921b19502 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -701,6 +701,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				$taskstatic->duration_effective = $lines[$i]->duration_effective;
 				$taskstatic->budget_amount = $lines[$i]->budget_amount;
 				$taskstatic->billable = $lines[$i]->billable;
+				$taskstatic->fk_statut = $lines[$i]->fk_statut;
 
 				// Action column
 				if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
@@ -953,6 +954,13 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					print '</td>';
 				}
 
+				// Status
+				if (count($arrayfields) > 0 && !empty($arrayfields['t.fk_statut']['checked'])) {
+					print '<td class="center">';
+					print $taskstatic->getLibStatut(5);
+					print '</td>';
+				}
+
 				// Extra fields
 				$extrafieldsobjectkey = $taskstatic->table_element;
 				$extrafieldsobjectprefix = 'efpt.';
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index f7688bec283..1f18dae8220 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -765,6 +765,59 @@ class Task extends CommonObjectLine
 	}
 
 
+	/**
+	 *  Close task from database
+	 * @param User $user User that close
+	 * @param int $notrigger 0=launch triggers after, 1=disable triggers
+	 * @return    int                        Return integer <0 if KO, >0 if OK
+	 */
+	public function close($user,$notrigger = 0) {
+
+		global $conf;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$error = 0;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::close record task", LOG_DEBUG);
+
+		$sql = " UPDATE ".MAIN_DB_PREFIX."projet_task ";
+		$sql.= "SET fk_statut=".$this::STATUS_CLOSED." WHERE rowid=".(int) $this->id;
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
+		}
+
+		if (!$error) {
+			if (!$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger('TASK_CLOSE', $user);
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+
+	}
+
+
 	/**
 	 *	Delete task from database
 	 *
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 632aa18b6a4..760cebdf120 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -98,6 +98,7 @@ $search_progresscalc = GETPOST('search_progresscalc');
 $search_progressdeclare = GETPOST('search_progressdeclare');
 $search_task_budget_amount = GETPOST('search_task_budget_amount');
 $search_task_billable = GETPOST('search_task_billable');
+$search_fk_statut = GETPOSTINT('search_fk_statut');
 
 $search_date_start_startmonth = GETPOSTINT('search_date_start_startmonth');
 $search_date_start_startyear = GETPOSTINT('search_date_start_startyear');
@@ -183,6 +184,8 @@ $arrayfields = array(
 	't.progress_summary' => array('label' => "TaskProgressSummary", 'checked' => 1, 'position' => 10),
 	't.budget_amount' => array('label' => "Budget", 'checked' => 0, 'position' => 11),
 	'c.assigned' => array('label' => "TaskRessourceLinks", 'checked' => 1, 'position' => 12),
+	't.fk_statut' => array('label' => "Status", 'checked' => 1, 'position' => 12),
+
 );
 if ($object->usage_bill_time) {
 	$arrayfields['t.tobill'] = array('label' => $langs->trans("TimeToBill"), 'checked' => 0, 'position' => 11);
@@ -248,6 +251,7 @@ if (empty($reshook)) {
 		$search_progressdeclare = '';
 		$search_task_budget_amount = '';
 		$search_task_billable = '';
+		$search_fk_statut = '';
 		$toselect = array();
 		$search_array_options = array();
 		$search_date_start_startmonth = "";
@@ -332,6 +336,9 @@ if ($search_task_budget_amount) {
 if ($search_task_billable) {
 	$morewherefilterarray[] = " t.billable = ".($search_task_billable == "yes" ? 1 : 0);
 }
+if ($search_fk_statut) {
+	$morewherefilterarray[] = " t.fk_statut = ".$search_fk_statut;
+}
 //var_dump($morewherefilterarray);
 
 $morewherefilter = '';
@@ -1082,6 +1089,10 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 		print $form->selectyesno('search_task_billable', $search_task_billable, 0, false, 1);
 		print '</td>';
 	}
+	if (!empty($arrayfields['t.fk_statut']['checked'])) {
+		print '<td class="liste_titre center">';
+		print '</td>';
+	}
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
@@ -1160,6 +1171,10 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 	if (!empty($arrayfields['t.billable']['checked'])) {
 		print_liste_field_titre($arrayfields['t.billable']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ', '');
 	}
+
+	if (!empty($arrayfields['t.fk_statut']['checked'])) {
+		print_liste_field_titre($arrayfields['t.fk_statut']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ', '');
+	}
 	// Extra fields
 	$disablesortlink = 1;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 68ff3707182..b75d3e2f0f9 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -208,6 +208,19 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->hasRight('projet'
 	}
 }
 
+if ($action == 'confirm_close' && $confirm == "yes" && $user->hasRight('projet', 'creer')) {
+	$result = $projectstatic->fetch($object->fk_project);
+	$projectstatic->fetch_thirdparty();
+
+	if ($object->close($user) > 0) {
+		header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?restore_lastsearch_values=1&id='.$projectstatic->id.($withproject ? '&withproject=1' : ''));
+		exit;
+	} else {
+		setEventMessages($object->error, $object->errors, 'errors');
+		$action = '';
+	}
+}
+
 // Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
 if (!empty($project_ref) && !empty($withproject)) {
 	if ($projectstatic->fetch(0, $project_ref) > 0) {
@@ -579,6 +592,14 @@ if ($id > 0 || !empty($ref)) {
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ToClone"), $langs->trans("ConfirmCloneTask"), "confirm_clone", $formquestion, '', 1, 300, 590);
 		}
 
+		if ($action == 'close') {
+			$formquestion = array(
+				'text' => $langs->trans("ConfirmClose"),
+			);
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ToClose"), $langs->trans("ConfirmCloseTask"), "confirm_close", $formquestion, '', 1, 300, 590);
+		}
+
+
 		if ($action == 'merge') {
 			$formquestion = array(
 				array(
@@ -701,6 +722,7 @@ if ($id > 0 || !empty($ref)) {
 		print '<span>'.($object->billable ? $langs->trans('Yes') : $langs->trans('No')).'</span>';
 		print '</td></tr>';
 
+
 		// Other attributes
 		$cols = 3;
 		$parameters = array('socid' => $socid);
@@ -730,11 +752,16 @@ if ($id > 0 || !empty($ref)) {
 		if (empty($reshook)) {
 			// Modify
 			if ($user->hasRight('projet', 'creer')) {
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&token='.newToken().'&withproject='.((int) $withproject).'">'.$langs->trans('Modify').'</a>';
+				if ($object->fk_statut != $object::STATUS_CLOSED)
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&token='.newToken().'&withproject='.((int) $withproject).'">'.$langs->trans('Modify').'</a>';
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&token='.newToken().'&withproject='.((int) $withproject).'">'.$langs->trans('Clone').'</a>';
 				print '<a class="butActionDelete classfortooltip" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=merge&token='.newToken().'&withproject='.((int) $withproject).'" title="'.$langs->trans("MergeTasks").'">'.$langs->trans('Merge').'</a>';
+
+				if ($object->fk_statut != $object::STATUS_CLOSED)
+				print '<a class="butAction classfortooltip" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close&token='.newToken().'&withproject='.((int) $withproject).'" title="'.$langs->trans("Close").'">'.$langs->trans('Close').'</a>';
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Modify').'</a>';
+
 			}
 
 			// Delete

From ee1b3df3f11f0a9df571a80c1c21d30f6362b512 Mon Sep 17 00:00:00 2001
From: William Mead <william@inovea-conseil.com>
Date: Sat, 16 Nov 2024 18:42:01 +0100
Subject: [PATCH 005/602] Fixed task closed confirm localisation

---
 htdocs/langs/en_US/projects.lang | 2 ++
 htdocs/projet/tasks/task.php     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index a6f6175ce50..22f6e3f3559 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -312,3 +312,5 @@ TaskMergeSuccess=Tasks have been merged
 ErrorTaskIdIsMandatory=Error: Task id is mandatory
 ErrorsTaskMerge=An error occurred while merging tasks
 Billable = Billable
+ConfirmCloseTask=Are you sure you want to close this task ?
+ConfirmClosed=Confirm task closed
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index b75d3e2f0f9..0af8a5c26ce 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -594,7 +594,7 @@ if ($id > 0 || !empty($ref)) {
 
 		if ($action == 'close') {
 			$formquestion = array(
-				'text' => $langs->trans("ConfirmClose"),
+				'text' => $langs->trans("ConfirmClosed"),
 			);
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ToClose"), $langs->trans("ConfirmCloseTask"), "confirm_close", $formquestion, '', 1, 300, 590);
 		}

From 4cab9e8a6232f0313ea314053d361fc9dd24a05d Mon Sep 17 00:00:00 2001
From: William Mead <william@inovea-conseil.com>
Date: Sat, 16 Nov 2024 23:34:10 +0100
Subject: [PATCH 006/602] Fixed & refactored status label

---
 htdocs/core/lib/project.lib.php    |  3 ++-
 htdocs/projet/class/task.class.php | 16 ++++++++--------
 htdocs/projet/tasks.php            |  1 +
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index f3921b19502..89a70dc2329 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -701,6 +701,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				$taskstatic->duration_effective = $lines[$i]->duration_effective;
 				$taskstatic->budget_amount = $lines[$i]->budget_amount;
 				$taskstatic->billable = $lines[$i]->billable;
+				$taskstatic->status = $lines[$i]->status;
 				$taskstatic->fk_statut = $lines[$i]->fk_statut;
 
 				// Action column
@@ -957,7 +958,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				// Status
 				if (count($arrayfields) > 0 && !empty($arrayfields['t.fk_statut']['checked'])) {
 					print '<td class="center">';
-					print $taskstatic->getLibStatut(5);
+					print $taskstatic->getLibStatut(4);
 					print '</td>';
 				}
 
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 1f18dae8220..77203f5cfbc 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -2498,12 +2498,12 @@ class Task extends CommonObjectLine
 		$this->labelStatus[0] = 'Draft';
 		$this->labelStatus[1] = 'ToDo';
 		$this->labelStatus[2] = 'Running';
-		$this->labelStatus[3] = 'Finish';
+		$this->labelStatus[3] = 'Closed';
 		$this->labelStatus[4] = 'Transfered';
 		$this->labelStatusShort[0] = 'Draft';
 		$this->labelStatusShort[1] = 'ToDo';
 		$this->labelStatusShort[2] = 'Running';
-		$this->labelStatusShort[3] = 'Completed';
+		$this->labelStatusShort[3] = 'Closed';
 		$this->labelStatusShort[4] = 'Transfered';
 
 		if ($mode == 0) {
@@ -2540,17 +2540,17 @@ class Task extends CommonObjectLine
 			}
 		} elseif ($mode == 4) {
 			if ($status == 0) {
-				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut0').' '.$langs->trans($this->labelStatus[$status]);
+				return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status0', $mode);
 			} elseif ($status == 1) {
-				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut1').' '.$langs->trans($this->labelStatus[$status]);
+				return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status1', $mode);
 			} elseif ($status == 2) {
-				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut3').' '.$langs->trans($this->labelStatus[$status]);
+				return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status2', $mode);
 			} elseif ($status == 3) {
-				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6').' '.$langs->trans($this->labelStatus[$status]);
+				return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status3', $mode);
 			} elseif ($status == 4) {
-				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6').' '.$langs->trans($this->labelStatus[$status]);
+				return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status4', $mode);
 			} elseif ($status == 5) {
-				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut5').' '.$langs->trans($this->labelStatus[$status]);
+				return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status5', $mode);
 			}
 		} elseif ($mode == 5) {
 			/*if ($status==0) return $langs->trans($this->labelStatusShort[$status]).' '.img_picto($langs->trans($this->labelStatusShort[$status]),'statut0');
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 760cebdf120..e28d70853ad 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -1091,6 +1091,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 	}
 	if (!empty($arrayfields['t.fk_statut']['checked'])) {
 		print '<td class="liste_titre center">';
+		//TODO: add status filter
 		print '</td>';
 	}
 

From 0cb35d5b03ec8664cff82327c71fa65fbaaaef84 Mon Sep 17 00:00:00 2001
From: John BOTELLA <68917336+thersane-john@users.noreply.github.com>
Date: Sat, 23 Nov 2024 09:15:34 +0100
Subject: [PATCH 007/602] New doc for icon list

---
 .../tools/ui/class/documentation.class.php    |   6 +
 .../tools/ui/components/event-message.php     |   2 +-
 htdocs/admin/tools/ui/components/icons.php    | 131 ++++++++++++++++++
 htdocs/admin/tools/ui/css/documentation.css   |   6 +-
 htdocs/langs/en_US/uxdocumentation.lang       |   5 +
 5 files changed, 148 insertions(+), 2 deletions(-)
 create mode 100644 htdocs/admin/tools/ui/components/icons.php

diff --git a/htdocs/admin/tools/ui/class/documentation.class.php b/htdocs/admin/tools/ui/class/documentation.class.php
index 584f6c36a7f..8d498125adb 100644
--- a/htdocs/admin/tools/ui/class/documentation.class.php
+++ b/htdocs/admin/tools/ui/class/documentation.class.php
@@ -126,6 +126,12 @@ class Documentation
 						'DocButtonSubmenu' => '#buttonsection-submenu',
 					),
 				),
+				'Icons' => array(
+					'url' => dol_buildpath($baseUrl.'/components/icons.php', 1),
+					'icon' => 'far fa-flag pictofixedwidth',
+					'submenu' => array(),
+					'summary' => array(),
+				),
 				'Progress' => array(
 					'url' => dol_buildpath($baseUrl.'/components/progress-bars.php', 1),
 					'icon' => 'fas fa-battery-half pictofixedwidth',
diff --git a/htdocs/admin/tools/ui/components/event-message.php b/htdocs/admin/tools/ui/components/event-message.php
index 98e3080c7d3..2e60227fcc3 100644
--- a/htdocs/admin/tools/ui/components/event-message.php
+++ b/htdocs/admin/tools/ui/components/event-message.php
@@ -104,7 +104,7 @@ $documentation->showSidebar(); ?>
 			$lines = array(
 					'<?php',
 					'/**',
-					'* Function dolGetButtonAction',
+					'* Function setEventMessages',
 					'*',
 					'*  Set event messages in dol_events session object. Will be output by calling dol_htmloutput_events',
 					'*  Note: Calling dol_htmloutput_events is done into pages by standard llxFooter() function',
diff --git a/htdocs/admin/tools/ui/components/icons.php b/htdocs/admin/tools/ui/components/icons.php
new file mode 100644
index 00000000000..d0261f884aa
--- /dev/null
+++ b/htdocs/admin/tools/ui/components/icons.php
@@ -0,0 +1,131 @@
+<?php
+/*
+ * Copyright (C) 2024 Anthony Damhet <a.damhet@progiseize.fr>
+ *
+ * This program and files/directory inner it is free software: you can
+ * redistribute it and/or modify it under the terms of the
+ * GNU Affero General Public License (AGPL) 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 AGPL for more details.
+ *
+ * You should have received a copy of the GNU AGPL
+ * along with this program. If not, see <https://www.gnu.org/licenses/agpl-3.0.html>.
+ */
+
+$res=0;
+if (! $res && file_exists("../../main.inc.php")) : $res=@include '../../main.inc.php';
+endif;
+if (! $res && file_exists("../../../main.inc.php")) : $res=@include '../../../main.inc.php';
+endif;
+if (! $res && file_exists("../../../../main.inc.php")) : $res=@include '../../../../main.inc.php';
+endif;
+
+// Protection if external user
+if ($user->socid > 0) : accessforbidden();
+endif;
+
+// Includes
+dol_include_once('admin/tools/ui/class/documentation.class.php');
+
+// Load documentation translations
+$langs->load('uxdocumentation');
+
+//
+$documentation = new Documentation($db);
+
+// Output html head + body - Param is Title
+$documentation->docHeader('Icons');
+
+// Set view for menu and breadcrumb
+// Menu must be set in constructor of documentation class
+$documentation->view = array('Components','Icons');
+
+// Output sidebar
+$documentation->showSidebar(); ?>
+
+<div class="doc-wrapper">
+
+		<?php $documentation->showBreadCrumb(); ?>
+
+		<div class="doc-content-wrapper">
+
+			<h1 class="documentation-title"><?php echo $langs->trans('DocIconsTitle'); ?></h1>
+			<p class="documentation-text"><?php echo $langs->trans('DocIconsMainDescription'); ?></p>
+
+			<!-- Summary -->
+			<?php $documentation->showSummary(); ?>
+
+			<!-- Basic usage -->
+			<div class="documentation-section" id="icon-section-list">
+
+				<?php
+
+				$iconFileName = 'shims.json';
+				$iconFilePath = DOL_DOCUMENT_ROOT . '/theme/common/fontawesome-5/metadata';
+
+				$fontAwesomeIconRaw = file_get_contents($iconFilePath. '/' .$iconFileName);
+				if ($fontAwesomeIconRaw === false) {
+					dol_print_error($db, 'Error missing file  '. $iconFilePath . '/' . $iconFileName);
+				}
+
+				$fontAwesomeIcons = json_decode($fontAwesomeIconRaw);
+				if ($fontAwesomeIcons === null) {
+					dol_print_error($db, 'Error decoding '. $iconFilePath . '/' . $iconFileName);
+				}
+				?>
+
+				<h2 class="documentation-title"><?php echo $langs->trans('DocIconsList'); ?></h2>
+				<?php /* <p class="documentation-text"><?php echo $langs->trans('DocDocIconsListDescription'); ?></p>*/ ?>
+
+
+				<div class="documentation-example">
+
+					<div class="documentation-fontawesome-icon-list">
+
+					<?php
+					if ($fontAwesomeIcons && is_array($fontAwesomeIcons)) {
+						foreach ($fontAwesomeIcons as $iconData) {
+							$class= $iconData[1]??'fa';
+							if (!empty($iconData[2])) {
+								$class.= ' fa-'.$iconData[2]??'';
+							} else {
+								$class.= ' fa-'.$iconData[0]??'';
+							}
+
+							$iconCode =  '<span class="'.$class.'" ></span>';
+
+
+							print '<div class="info-box ">
+										<span class="info-box-icon bg-infobox-expensereport">
+											'.$iconCode.'
+										</span>
+										<div class="info-box-content">
+											<div class="info-box-title" >'. ($iconData[2]??($iconData[0]??'')) .'</div>
+											<div class="info-box-lines">
+												<div class="info-box-line spanoverflow nowrap">
+													<div class="inline-block nowraponall">
+														<div class="documentation-code"><pre>'.dol_htmlentities($iconCode).'</pre></div>
+													</div>
+												</div>
+											</div><!-- /.info-box-lines -->
+										</div><!-- /.info-box-content -->
+									</div>';
+						}
+					}
+					?>
+					</div>
+				</div>
+			</div>
+			<!--  -->
+		</div>
+	</div>
+
+<?php
+// Output close body + html
+$documentation->docFooter();
+?>
diff --git a/htdocs/admin/tools/ui/css/documentation.css b/htdocs/admin/tools/ui/css/documentation.css
index 0bee0aae2bf..3dbd1abdfb2 100644
--- a/htdocs/admin/tools/ui/css/documentation.css
+++ b/htdocs/admin/tools/ui/css/documentation.css
@@ -78,8 +78,12 @@ body.dolibarr-doc {
 .doc-wrapper .doc-content-wrapper .documentation-section h2.documentation-title {margin: 0;margin-bottom:16px;padding: 0;color: rgb(38,60,92);}
 .doc-wrapper .doc-content-wrapper .documentation-section .documentation-example {border:1px dashed #ccc;box-sizing: border-box;padding: 16px;margin-bottom: 16px;}
 .doc-wrapper .doc-content-wrapper .documentation-section .documentation-code {background: var(--colorbacklinepairchecked);border:1px dashed #ccc;box-sizing: border-box;padding: 16px;margin-bottom: 16px;overflow: auto;}
+.doc-wrapper .doc-content-wrapper .documentation-section .info-box .documentation-code {padding: 3px 16px; margin-bottom: 5px;}
 .doc-wrapper .doc-content-wrapper .documentation-section .documentation-code pre {margin: 0;padding: 0;tab-size: 24px;}
 
 /* Documentation scroll indicator */
 #documentation-scrollwrapper {height: 5px;position: fixed;bottom: 0;left: 260px;right:0;z-index: 99;}
-#documentation-scroll {background: rgb(0, 123, 140);height: 5px;position: absolute;top: 0;left:0}
\ No newline at end of file
+#documentation-scroll {background: rgb(0, 123, 140);height: 5px;position: absolute;top: 0;left:0}
+
+/* component icons */
+.documentation-fontawesome-icon-list span{ 	color: #333; }
diff --git a/htdocs/langs/en_US/uxdocumentation.lang b/htdocs/langs/en_US/uxdocumentation.lang
index 56d3c587185..d8df8d0de27 100644
--- a/htdocs/langs/en_US/uxdocumentation.lang
+++ b/htdocs/langs/en_US/uxdocumentation.lang
@@ -79,3 +79,8 @@ DocSetEventMessage = Message #%s
 DocButtonIconsLowEmphasis = Low emphasis icon buttons
 DocButtonIconsDescriptionLowEmphasis = An icon button with low emphasis is typically a button that includes only an icon (no accompanying text) and has minimal styling to make it unobtrusive. Icon buttons with low emphasis are ideal for secondary or tertiary actions, like clear field, fill field, bookmarking, or sharing, especially in interfaces that have more prominent primary actions (like "Submit" or "Continue").
 DocButtonIconsForTitle = Buttons for list title
+
+# Fontawesome icons
+DocIconsTitle = Icons used by Dolibarr
+DocIconsMainDescription = Dolibarr use a part of fontawesome 5 icons
+DocIconsList = List of usable font icons

From 469baa0b5bac7d6b4778216d08c8cf579894f77f Mon Sep 17 00:00:00 2001
From: John BOTELLA <68917336+thersane-john@users.noreply.github.com>
Date: Sat, 23 Nov 2024 17:53:12 +0100
Subject: [PATCH 008/602] remove double

---
 htdocs/admin/tools/ui/components/icons.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/admin/tools/ui/components/icons.php b/htdocs/admin/tools/ui/components/icons.php
index d0261f884aa..0b47d4d10d5 100644
--- a/htdocs/admin/tools/ui/components/icons.php
+++ b/htdocs/admin/tools/ui/components/icons.php
@@ -88,6 +88,7 @@ $documentation->showSidebar(); ?>
 					<div class="documentation-fontawesome-icon-list">
 
 					<?php
+					$alreadyDisplay = [];
 					if ($fontAwesomeIcons && is_array($fontAwesomeIcons)) {
 						foreach ($fontAwesomeIcons as $iconData) {
 							$class= $iconData[1]??'fa';
@@ -97,6 +98,11 @@ $documentation->showSidebar(); ?>
 								$class.= ' fa-'.$iconData[0]??'';
 							}
 
+							if (in_array($class, $alreadyDisplay)) {
+								continue;
+							}
+
+							$alreadyDisplay[] = $class;
 							$iconCode =  '<span class="'.$class.'" ></span>';
 
 

From 0df412b6be718c2389a7ed87ff062b4aba86c030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 23 Nov 2024 18:24:15 +0100
Subject: [PATCH 009/602] refactor loan schedule

---
 htdocs/core/lib/loan.lib.php | 16 ++++++----
 htdocs/loan/schedule.php     | 57 +++++++++++++++++++++---------------
 2 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/htdocs/core/lib/loan.lib.php b/htdocs/core/lib/loan.lib.php
index 3de9f42290b..88b5146eff9 100644
--- a/htdocs/core/lib/loan.lib.php
+++ b/htdocs/core/lib/loan.lib.php
@@ -1,8 +1,8 @@
 <?php
 /* Copyright (C) 2014-2016	Alexandre Spangaro	<aspangaro@open-dsi.fr>
- * Copyright (C) 2015-2020	Frederic France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2020       Maxime DEMAREST     <maxime@indelog.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.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
@@ -98,7 +98,7 @@ function loan_prepare_head($object)
  * @param   float   $rate				Loan rate
  * @param   int     $numactualloadterm	Actual loan term
  * @param   int   	$nbterm  			Total number of term for this loan
- * @return array<array{cap_rest:float,cap_rest_str:string,interet:float,interet_str:string,mens:float}>		Array with remaining capital, interest, and mensuality for each remaining terms
+ * @return array<array{cap_rest:float,cap_rest_str:string,interet:float,interet_str:string,mens:string}>		Array with remaining capital, interest, and mensuality for each remaining terms
  */
 function loanCalcMonthlyPayment($mens, $capital, $rate, $numactualloadterm, $nbterm)
 {
@@ -123,7 +123,13 @@ function loanCalcMonthlyPayment($mens, $capital, $rate, $numactualloadterm, $nbt
 		$int = round($int, 2, PHP_ROUND_HALF_UP);
 		$cap_rest = round((float) $capital - ((float) $mens - $int), 2, PHP_ROUND_HALF_UP);
 	}
-	$output[$numactualloadterm] = array('cap_rest' => $cap_rest, 'cap_rest_str' => price($cap_rest, 0, '', 1, -1, -1, $conf->currency), 'interet' => $int, 'interet_str' => price($int, 0, '', 1, -1, -1, $conf->currency), 'mens' => $mens);
+	$output[$numactualloadterm] = array(
+		'cap_rest' => $cap_rest,
+		'cap_rest_str' => price($cap_rest, 0, '', 1, -1, -1, $conf->currency),
+		'interet' => $int,
+		'interet_str' => price($int, 0, '', 1, -1, -1, $conf->currency),
+		'mens' => price($mens),
+	);
 
 	$numactualloadterm++;
 	$capital = $cap_rest;
@@ -139,7 +145,7 @@ function loanCalcMonthlyPayment($mens, $capital, $rate, $numactualloadterm, $nbt
 			'cap_rest_str' => price($cap_rest, 0, '', 1, -1, -1, $conf->currency),
 			'interet' => $int,
 			'interet_str' => price($int, 0, '', 1, -1, -1, $conf->currency),
-			'mens' => $mens,
+			'mens' => price($mens),
 		);
 		$capital = $cap_rest;
 		$numactualloadterm++;
diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php
index e48ff1fe773..23e6c561dfd 100644
--- a/htdocs/loan/schedule.php
+++ b/htdocs/loan/schedule.php
@@ -214,34 +214,45 @@ dol_banner_tab($object, 'loanid', $linkback, 1, 'rowid', 'ref', $morehtmlref, ''
 ?>
 <script type="text/javascript">
 $(document).ready(function() {
-	$('[name^="mens"]').focusout(function() {
-		var echeance=$(this).attr('ech');
-		var mens=price2numjs($(this).val());
-		var idcap=echeance-1;
+	var timeout = null;
+	var delay = 750;   // 0.75 seconds
+	$('[name^="mens"]').keyup(function() {
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			var echeance = $(this).attr('ech');
+			var mens = $(this).val();
+			calculateMens(echeance, mens);
+		}, delay);
+	});
+	function calculateMens(echeance, mens) {
+		var table = $('[name^="mens"]');
+		var idcap = echeance-1;
 		idcap = '#hi_capital'+idcap;
-		var capital=price2numjs($(idcap).val());
+		var capital = price2numjs($(idcap).val());
 		console.log("Change monthly amount echeance="+echeance+" idcap="+idcap+" capital="+capital);
 		$.ajax({
-			  method: "GET",
-			  dataType: 'json',
-			  url: 'calcmens.php',
-			  data: { echeance: echeance, mens: mens, capital:capital, rate:<?php echo $object->rate / 100; ?>, nbterm: <?php echo $object->nbterm; ?>, token: '<?php echo currentToken(); ?>' },
-			  success: function(data) {
+			method: "GET",
+			dataType: 'json',
+			url: 'calcmens.php',
+			data: {
+				echeance: echeance,
+				mens: price2numjs(mens),
+				capital: capital,
+				rate: <?php echo $object->rate / 100; ?>,
+				nbterm: <?php echo $object->nbterm; ?>,
+				token: '<?php echo currentToken(); ?>'
+			},
+			success: function(data) {
 				$.each(data, function(index, element) {
-					var idcap_res='#hi_capital'+index;
-					var idcap_res_srt='#capital'+index;
-					var interet_res='#hi_interets'+index;
-					var interet_res_str='#interets'+index;
-					var men_res='#mens'+index;
-					$(idcap_res).val(element.cap_rest);
-					$(idcap_res_srt).text(element.cap_rest_str);
-					$(interet_res).val(element.interet);
-					$(interet_res_str).text(element.interet_str);
-					$(men_res).val(element.mens);
+					$('#hi_capital'+index).val(element.cap_rest);
+					$('#capital'+index).text(element.cap_rest_str);
+					$('#hi_interets'+index).val(element.interet);
+					$('#interets'+index).text(element.interet_str);
+					$('#mens'+index).val(element.mens);
 				});
 			}
 		});
-	});
+	}
 });
 </script>
 <?php
@@ -302,7 +313,7 @@ if ($object->nbterm > 0 && count($echeances->lines) == 0) {
 		print '<td class="center" id ="date'.$i.'"><input type="hidden" name="hi_date'.$i.'" id ="hi_date'.$i.'" value="'.dol_time_plus_duree($object->datestart, $i - 1, 'm').'">'.dol_print_date(dol_time_plus_duree($object->datestart, $i - 1, 'm'), 'day').'</td>';
 		print '<td class="center amount" id="insurance'.$i.'">'.price($insu, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_insurance'.$i.'" id ="hi_insurance'.$i.'" value="'.$insu.'">';
 		print '<td class="center amount" id="interets'.$i.'">'.price($int, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_interets'.$i.'" id ="hi_interets'.$i.'" value="'.$int.'">';
-		print '<td class="center"><input class="width75 right" name="mens'.$i.'" id="mens'.$i.'" value="'.$mens.'" ech="'.$i.'"></td>';
+		print '<td class="center"><input class="width75 right" name="mens'.$i.'" id="mens'.$i.'" value="'.price($mens).'" ech="'.$i.'"></td>';
 		print '<td class="center amount" id="capital'.$i.'">'.price($cap_rest).'</td><input type="hidden" name="hi_capital'.$i.'" id ="hi_capital'.$i.'" value="'.$cap_rest.'">';
 		print '</tr>'."\n";
 		$i++;
@@ -327,7 +338,7 @@ if ($object->nbterm > 0 && count($echeances->lines) == 0) {
 		print '<td class="center amount" id="insurance'.$i.'">'.price($insu, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_insurance'.$i.'" id ="hi_insurance'.$i.'" value="'.$insu.'">';
 		print '<td class="center amount" id="interets'.$i.'">'.price($int, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_interets'.$i.'" id ="hi_interets'.$i.'" value="'.$int.'">';
 		if (empty($line->fk_bank)) {
-			print '<td class="center"><input class="right width75" name="mens'.$i.'" id="mens'.$i.'" value="'.$mens.'" ech="'.$i.'"></td>';
+			print '<td class="center"><input class="right width75" name="mens'.$i.'" id="mens'.$i.'" value="'.price($mens).'" ech="'.$i.'"></td>';
 		} else {
 			print '<td class="center amount">'.price($mens, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="mens'.$i.'" id ="mens'.$i.'" value="'.$mens.'">';
 		}

From c642396dcaaca6cc1e26fe120306ab7f9016cce8 Mon Sep 17 00:00:00 2001
From: John BOTELLA <68917336+thersane-john@users.noreply.github.com>
Date: Sat, 23 Nov 2024 18:26:40 +0100
Subject: [PATCH 010/602] Add List of usable icons with img_picto function

---
 .../tools/ui/class/documentation.class.php    |  5 +-
 htdocs/admin/tools/ui/components/icons.php    | 55 +++++++++++-
 htdocs/core/lib/functions.lib.php             | 85 +++++++++++--------
 htdocs/langs/en_US/uxdocumentation.lang       |  3 +-
 4 files changed, 106 insertions(+), 42 deletions(-)

diff --git a/htdocs/admin/tools/ui/class/documentation.class.php b/htdocs/admin/tools/ui/class/documentation.class.php
index 8d498125adb..183d89b547f 100644
--- a/htdocs/admin/tools/ui/class/documentation.class.php
+++ b/htdocs/admin/tools/ui/class/documentation.class.php
@@ -130,7 +130,10 @@ class Documentation
 					'url' => dol_buildpath($baseUrl.'/components/icons.php', 1),
 					'icon' => 'far fa-flag pictofixedwidth',
 					'submenu' => array(),
-					'summary' => array(),
+					'summary' => array(
+						'DocIconsList' => '#img-picto-section-list',
+						'DocIconsFontAwesomeList' => '#icon-section-list',
+					),
 				),
 				'Progress' => array(
 					'url' => dol_buildpath($baseUrl.'/components/progress-bars.php', 1),
diff --git a/htdocs/admin/tools/ui/components/icons.php b/htdocs/admin/tools/ui/components/icons.php
index 0b47d4d10d5..e8f8b365f97 100644
--- a/htdocs/admin/tools/ui/components/icons.php
+++ b/htdocs/admin/tools/ui/components/icons.php
@@ -60,7 +60,58 @@ $documentation->showSidebar(); ?>
 			<!-- Summary -->
 			<?php $documentation->showSummary(); ?>
 
-			<!-- Basic usage -->
+
+			<!-- List of usage font awesome icon -->
+			<div class="documentation-section" id="img-picto-section-list">
+
+				<?php
+
+				$iconFileName = 'shims.json';
+				$iconFilePath = DOL_DOCUMENT_ROOT . '/theme/common/fontawesome-5/metadata';
+
+				$fontAwesomeIconRaw = file_get_contents($iconFilePath. '/' .$iconFileName);
+				if ($fontAwesomeIconRaw === false) {
+					dol_print_error($db, 'Error missing file  '. $iconFilePath . '/' . $iconFileName);
+				}
+
+				$fontAwesomeIcons = json_decode($fontAwesomeIconRaw);
+				if ($fontAwesomeIcons === null) {
+					dol_print_error($db, 'Error decoding '. $iconFilePath . '/' . $iconFileName);
+				}
+				?>
+
+				<h2 class="documentation-title"><?php echo $langs->trans('DocIconsList'); ?></h2>
+				<?php /* <p class="documentation-text"><?php echo $langs->trans('DocDocIconsListDescription'); ?></p>*/ ?>
+				<div class="documentation-example">
+					<div class="documentation-fontawesome-icon-list">
+						<?php
+						foreach (getImgPictoNameList() as $iconName) {
+							$labelAlt = 'Text on title tag for tooltip';
+							$iconCode =  img_picto($iconName, $iconName);
+							print '<div class="info-box ">
+									<span class="info-box-icon bg-infobox-expensereport">
+										'.$iconCode.'
+									</span>
+									<div class="info-box-content">
+										<div class="info-box-title" >'. $iconName .'</div>
+										<div class="info-box-lines">
+											<div class="info-box-line spanoverflow nowrap">
+												<div class="inline-block nowraponall">
+													<div class="documentation-code"><pre>'.dol_htmlentities('img_picto(\''.$labelAlt.'\', '.$iconName.')').'</pre></div>
+												</div>
+											</div>
+										</div><!-- /.info-box-lines -->
+									</div><!-- /.info-box-content -->
+								</div>';
+						}
+						?>
+					</div>
+				</div>
+			</div>
+			<!--  -->
+
+
+			<!-- List of usage font awesome icon -->
 			<div class="documentation-section" id="icon-section-list">
 
 				<?php
@@ -81,8 +132,6 @@ $documentation->showSidebar(); ?>
 
 				<h2 class="documentation-title"><?php echo $langs->trans('DocIconsList'); ?></h2>
 				<?php /* <p class="documentation-text"><?php echo $langs->trans('DocDocIconsListDescription'); ?></p>*/ ?>
-
-
 				<div class="documentation-example">
 
 					<div class="documentation-fontawesome-icon-list">
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d2609495d49..3e103e06931 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5065,43 +5065,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
 			return $enabledisablehtml;
 		}
 
-		if (empty($srconly) && in_array($pictowithouttext, array(
-				'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
-				'accountancy', 'accounting_account', 'account', 'accountline', 'action', 'add', 'address', 'ai', 'angle-double-down', 'angle-double-up', 'asset',
-				'back', 'bank_account', 'barcode', 'bank', 'bell', 'bill', 'billa', 'billr', 'billd', 'birthday-cake', 'bom', 'bookcal', 'bookmark', 'briefcase-medical', 'bug', 'building',
-				'card', 'calendarlist', 'calendar', 'calendarmonth', 'calendarweek', 'calendarday', 'calendarperuser', 'calendarpertype', 'hourglass',
-				'cash-register', 'category', 'chart', 'check', 'clock', 'clone', 'close_title', 'code', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'conversation', 'cron', 'cross', 'cubes',
-				'check-circle', 'check-square', 'circle', 'stop-circle', 'currency', 'multicurrency',
-				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',
-				'chevron-double-left', 'chevron-double-right', 'chevron-double-down', 'chevron-double-top',
-				'commercial', 'companies',
-				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'dynamicprice',
-				'edit', 'ellipsis-h', 'email', 'entity', 'envelope', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt', 'eye',
-				'filter', 'file', 'file-o', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus', 'font',
-				'gears', 'generate', 'generic', 'globe', 'globe-americas', 'graph', 'grip', 'grip_title', 'group',
-				'hands-helping', 'help', 'holiday',
-				'id-card', 'images', 'incoterm', 'info', 'intervention', 'inventory', 'intracommreport', 'jobprofile',
-				'key', 'knowledgemanagement',
-				'label', 'language', 'layout', 'line', 'link', 'list', 'list-alt', 'listlight', 'loan', 'lock', 'lot', 'long-arrow-alt-right',
-				'margin', 'map-marker-alt', 'member', 'meeting', 'minus', 'money-bill-alt', 'movement', 'mrp', 'note', 'next',
-				'off', 'on', 'order',
-				'paiment', 'paragraph', 'play', 'pdf', 'phone', 'phoning', 'phoning_mobile', 'phoning_fax', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'proposal', 'puce',
-				'stock', 'resize', 'service', 'stats',
-				'security', 'setup', 'share-alt', 'sign-out', 'split', 'stripe', 'stripe-s', 'switch_off', 'switch_on', 'switch_on_grey', 'switch_on_warning', 'switch_on_red', 'tools', 'unlink', 'uparrow', 'user', 'user-tie', 'vcard', 'wrench',
-				'github', 'google', 'jabber', 'microsoft', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
-				'generic', 'home', 'hrm', 'members', 'products', 'invoicing',
-				'partnership', 'payment', 'payment_vat', 'pencil-ruler', 'pictoconfirm', 'preview', 'project', 'projectpub', 'projecttask', 'question', 'refresh', 'region',
-				'salary', 'shipment', 'state', 'supplier_invoice', 'supplier_invoicea', 'supplier_invoicer', 'supplier_invoiced',
-				'technic', 'ticket',
-				'error', 'warning',
-				'recent', 'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'replacement', 'resource', 'recurring','rss',
-				'shapes', 'skill', 'square', 'sort-numeric-down', 'status', 'stop-circle', 'supplier', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
-				'terminal', 'tick', 'timespent', 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda', 'trip',
-				'uncheck', 'undo', 'url', 'user-cog', 'user-injured', 'user-md', 'vat', 'website', 'workstation', 'webhook', 'world', 'private',
-				'conferenceorbooth', 'eventorganization',
-				'stamp', 'signature',
-				'webportal'
-			))) {
+		if (empty($srconly) && in_array($pictowithouttext, getImgPictoNameList())) {
 			$fakey = $pictowithouttext;
 			$facolor = '';
 			$fasize = '';
@@ -5337,6 +5301,53 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
 	return '<img src="'.$fullpathpicto.'"'.($notitle ? '' : ' alt="'.dol_escape_htmltag($alt).'"').(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt.($morecss ? ' class="'.$morecss.'"' : '') : ' class="inline-block'.($morecss ? ' '.$morecss : '').'"').'>'; // Alt is used for accessibility, title for popup
 }
 
+/**
+ * Get all usage icon name for img_picto
+ * @return string[]
+ */
+function getImgPictoNameList()
+{
+
+	return array(
+		'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
+		'accountancy', 'accounting_account', 'account', 'accountline', 'action', 'add', 'address', 'ai', 'angle-double-down', 'angle-double-up', 'asset',
+		'back', 'bank_account', 'barcode', 'bank', 'bell', 'bill', 'billa', 'billr', 'billd', 'birthday-cake', 'bom', 'bookcal', 'bookmark', 'briefcase-medical', 'bug', 'building',
+		'card', 'calendarlist', 'calendar', 'calendarmonth', 'calendarweek', 'calendarday', 'calendarperuser', 'calendarpertype', 'hourglass',
+		'cash-register', 'category', 'chart', 'check', 'clock', 'clone', 'close_title', 'code', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'conversation', 'cron', 'cross', 'cubes',
+		'check-circle', 'check-square', 'circle', 'stop-circle', 'currency', 'multicurrency',
+		'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',
+		'chevron-double-left', 'chevron-double-right', 'chevron-double-down', 'chevron-double-top',
+		'commercial', 'companies',
+		'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'dynamicprice',
+		'edit', 'ellipsis-h', 'email', 'entity', 'envelope', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt', 'eye',
+		'filter', 'file', 'file-o', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus', 'font',
+		'gears', 'generate', 'generic', 'globe', 'globe-americas', 'graph', 'grip', 'grip_title', 'group',
+		'hands-helping', 'help', 'holiday',
+		'id-card', 'images', 'incoterm', 'info', 'intervention', 'inventory', 'intracommreport', 'jobprofile',
+		'key', 'knowledgemanagement',
+		'label', 'language', 'layout', 'line', 'link', 'list', 'list-alt', 'listlight', 'loan', 'lock', 'lot', 'long-arrow-alt-right',
+		'margin', 'map-marker-alt', 'member', 'meeting', 'minus', 'money-bill-alt', 'movement', 'mrp', 'note', 'next',
+		'off', 'on', 'order',
+		'paiment', 'paragraph', 'play', 'pdf', 'phone', 'phoning', 'phoning_mobile', 'phoning_fax', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'proposal', 'puce',
+		'stock', 'resize', 'service', 'stats',
+		'security', 'setup', 'share-alt', 'sign-out', 'split', 'stripe', 'stripe-s', 'switch_off', 'switch_on', 'switch_on_grey', 'switch_on_warning', 'switch_on_red', 'tools', 'unlink', 'uparrow', 'user', 'user-tie', 'vcard', 'wrench',
+		'github', 'google', 'jabber', 'microsoft', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
+		'generic', 'home', 'hrm', 'members', 'products', 'invoicing',
+		'partnership', 'payment', 'payment_vat', 'pencil-ruler', 'pictoconfirm', 'preview', 'project', 'projectpub', 'projecttask', 'question', 'refresh', 'region',
+		'salary', 'shipment', 'state', 'supplier_invoice', 'supplier_invoicea', 'supplier_invoicer', 'supplier_invoiced',
+		'technic', 'ticket',
+		'error', 'warning',
+		'recent', 'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'replacement', 'resource', 'recurring', 'rss',
+		'shapes', 'skill', 'square', 'sort-numeric-down', 'status', 'stop-circle', 'supplier', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
+		'terminal', 'tick', 'timespent', 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda', 'trip',
+		'uncheck', 'undo', 'url', 'user-cog', 'user-injured', 'user-md', 'vat', 'website', 'workstation', 'webhook', 'world', 'private',
+		'conferenceorbooth', 'eventorganization',
+		'stamp', 'signature',
+		'webportal'
+	);
+}
+
+
 /**
  *	Show a picto called object_picto (generic function)
  *
diff --git a/htdocs/langs/en_US/uxdocumentation.lang b/htdocs/langs/en_US/uxdocumentation.lang
index d8df8d0de27..590a150fccf 100644
--- a/htdocs/langs/en_US/uxdocumentation.lang
+++ b/htdocs/langs/en_US/uxdocumentation.lang
@@ -82,5 +82,6 @@ DocButtonIconsForTitle = Buttons for list title
 
 # Fontawesome icons
 DocIconsTitle = Icons used by Dolibarr
+DocIconsList = List of usable icons with img_picto function
 DocIconsMainDescription = Dolibarr use a part of fontawesome 5 icons
-DocIconsList = List of usable font icons
+DocIconsFontAwesomeList = List of usable fontawesome icons

From eb7faffec27b8294c76907a60b27e8fcfa786f1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 23 Nov 2024 18:49:12 +0100
Subject: [PATCH 011/602] refactor loan schedule

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

diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 435e95efa60..0e1023315fa 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -198,7 +198,7 @@ if ($action == 'add_payment' && $permissiontoadd) {
 							$ls->lines[$k - 1]->fk_bank = $payment->fk_bank;
 							$ls->lines[$k - 1]->fk_payment_loan = $payment->id;
 						}
-						$ls->lines[$k - 1]->amount_capital = $v['mens'] - $v['interet'];
+						$ls->lines[$k - 1]->amount_capital = ((float) price2num($v['mens'])) - $v['interet'];
 						$ls->lines[$k - 1]->amount_interest = $v['interet'];
 						$ls->lines[$k - 1]->tms = dol_now();
 						$ls->lines[$k - 1]->fk_user_modif = $user->id;

From 343873c82f1aa8936a31e677209f48f777bb3d26 Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Thu, 7 Nov 2024 23:42:03 +0100
Subject: [PATCH 012/602] Once payment is complet, a click on a product should
 start a new sale

---
 htdocs/takepos/index.php | 5 +++++
 htdocs/takepos/pay.php   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index a92bc4cac53..c9fb88f2ed0 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -527,6 +527,10 @@ function MoreProducts(moreorless) {
 
 function ClickProduct(position, qty = 1) {
 	console.log("ClickProduct at position"+position);
+	if ($('#invoiceid').val() == "") {
+		invoiceid = $('#invoiceid').val();
+		Refresh();
+	}
 	$('#proimg'+position).animate({opacity: '0.5'}, 1);
 	$('#proimg'+position).animate({opacity: '1'}, 100);
 	if ($('#prodiv'+position).data('iscat')==1){
@@ -1015,6 +1019,7 @@ function ModalBox(ModalID)
 function DirectPayment(){
 	console.log("DirectPayment");
 	$("#poslines").load("invoice.php?place="+place+"&action=valid&token=<?php echo newToken(); ?>&pay=LIQ", function() {
+		$('#invoiceid').val("");
 	});
 }
 
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index d2ee2999100..492419e264d 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -352,6 +352,7 @@ if (!getDolGlobalInt("TAKEPOS_NUMPAD")) {
 		parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&token=<?php echo newToken(); ?>&pay="+payment+"&amount="+amountpayed+"&excess="+excess+"&invoiceid="+invoiceid+"&accountid="+accountid, function() {
 			if (amountpayed > <?php echo $remaintopay; ?> || amountpayed == <?php echo $remaintopay; ?> || amountpayed==0 ) {
 				console.log("Close popup");
+				parent.$('#invoiceid').val("");
 				parent.$.colorbox.close();
 			}
 			else {

From 9ae5c03f28ce1f715a66bb9f0452f7932c199efa Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 2 Dec 2024 09:47:43 +0100
Subject: [PATCH 013/602] FIX #32186

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

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index e6597b29ce3..086995608dd 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -307,7 +307,6 @@ if (empty($reshook)) {
 		$search_categ_sup = 0;
 		$filter = '';
 		$option = '';
-		$socid = "";
 	}
 
 	// Mass actions

From d4236332661beb85ae94f8647ebfe2e55f6f5c83 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 2 Dec 2024 10:36:54 +0100
Subject: [PATCH 014/602] FIX phan errors

---
 htdocs/fourn/commande/list.php | 1 +
 htdocs/fourn/facture/card.php  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 5a80dc98f81..d806ef812d3 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -511,6 +511,7 @@ if (empty($reshook)) {
 							}
 
 							$tva_tx = $lines[$i]->tva_tx;
+							// @phan-suppress-next-line PhanTypeMismatchArgumentInternal
 							if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) {
 								$tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
 							}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 609270a284a..fe3507a8344 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1339,6 +1339,7 @@ if (empty($reshook)) {
 								}
 
 								$tva_tx = $lines[$i]->tva_tx;
+								// @phan-suppress-next-line PhanTypeMismatchArgumentInternal
 								if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) {
 									$tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
 								}

From 6aa70da43f232f50170074ba4cf2bce6d0ecd680 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 2 Dec 2024 11:24:03 +0100
Subject: [PATCH 015/602] FIX wrong "fournisseur" var value checking

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 53842b8b2d8..28b3b7250a5 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1388,7 +1388,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				if (getDolGlobalString('THIRDPARTY_SUPPLIER_BY_DEFAULT')) {
 					$default = 1;
 				}
-				print $form->selectyesno("fournisseur", (GETPOSTINT('fournisseur') != '' ? GETPOSTINT('fournisseur') : (GETPOST("type") == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type") == '' ? 1 : 0), 1);
+				print $form->selectyesno("fournisseur", (GETPOSTINT('fournisseur') > 0 ? GETPOSTINT('fournisseur') : (GETPOST("type") == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type") == '' ? 1 : 0), 1);
 				print '</td>';
 
 

From 2beb6e1e3495fd43d4c26037cb8a38936cfaed70 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 2 Dec 2024 11:38:17 +0100
Subject: [PATCH 016/602] FIX uniformize code

---
 htdocs/supplier_proposal/list.php | 40 ++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 6622a28fec3..d8bc7165389 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -65,8 +65,8 @@ $mode = GETPOST('mode', 'alpha');
 $search_user = GETPOST('search_user', 'intcomma');
 $search_sale = GETPOST('search_sale', 'intcomma');
 $search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
-$search_societe = GETPOST('search_societe', 'alpha');
-$search_societe_alias = GETPOST('search_societe_alias', 'alpha');
+$search_company = GETPOST('search_company', 'alpha');
+$search_company_alias = GETPOST('search_company_alias', 'alpha');
 $search_login = GETPOST('search_login', 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
@@ -236,8 +236,8 @@ if (empty($reshook)) {
 		$search_user = '';
 		$search_sale = '';
 		$search_ref = '';
-		$search_societe = '';
-		$search_societe_alias = '';
+		$search_company = '';
+		$search_company_alias = '';
 		$search_montant_ht = '';
 		$search_montant_vat = '';
 		$search_montant_ttc = '';
@@ -294,6 +294,14 @@ $formcompany = new FormCompany($db);
 
 $now = dol_now();
 
+if ($socid > 0) {
+	$soc = new Societe($db);
+	$soc->fetch($socid);
+	if (empty($search_company)) {
+		$search_company = $soc->name;
+	}
+}
+
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
@@ -362,14 +370,14 @@ if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
 if ($search_ref) {
 	$sql .= natural_search('sp.ref', $search_ref);
 }
-if (empty($arrayfields['s.name_alias']['checked']) && $search_societe) {
-	$sql .= natural_search(array("s.nom", "s.name_alias"), $search_societe);
+if (empty($arrayfields['s.name_alias']['checked']) && $search_company) {
+	$sql .= natural_search(array("s.nom", "s.name_alias"), $search_company);
 } else {
-	if ($search_societe) {
-		$sql .= natural_search('s.nom', $search_societe);
+	if ($search_company) {
+		$sql .= natural_search('s.nom', $search_company);
 	}
-	if ($search_societe_alias) {
-		$sql .= natural_search('s.name_alias', $search_societe_alias);
+	if ($search_company_alias) {
+		$sql .= natural_search('s.name_alias', $search_company_alias);
 	}
 }
 if ($search_login) {
@@ -571,11 +579,11 @@ if ($resql) {
 	if ($search_ref) {
 		$param .= '&search_ref='.urlencode($search_ref);
 	}
-	if ($search_societe) {
-		$param .= '&search_societe='.urlencode($search_societe);
+	if ($search_company) {
+		$param .= '&search_company='.urlencode($search_company);
 	}
-	if ($search_societe_alias) {
-		$param .= '&search_societe_alias='.urlencode($search_societe_alias);
+	if ($search_company_alias) {
+		$param .= '&search_company_alias='.urlencode($search_company_alias);
 	}
 	if ($search_user > 0) {
 		$param .= '&search_user='.urlencode((string) ($search_user));
@@ -742,12 +750,12 @@ if ($resql) {
 	}
 	if (!empty($arrayfields['s.nom']['checked'])) {
 		print '<td class="liste_titre left">';
-		print '<input class="flat" type="text" size="12" name="search_societe" value="'.dol_escape_htmltag($search_societe).'">';
+		print '<input class="flat" type="text" size="12" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
 		print '</td>';
 	}
 	if (!empty($arrayfields['s.name_alias']['checked'])) {
 		print '<td class="liste_titre left">';
-		print '<input class="flat" type="text" size="12" name="search_societe_alias" value="'.dol_escape_htmltag($search_societe_alias).'">';
+		print '<input class="flat" type="text" size="12" name="search_company_alias" value="'.dol_escape_htmltag($search_company_alias).'">';
 		print '</td>';
 	}
 	if (!empty($arrayfields['s.town']['checked'])) {

From 3e3f9c755db2f8207f8f3da20424e120a5289267 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 2 Dec 2024 12:10:39 +0100
Subject: [PATCH 017/602] FIX Check "$search_sale" only if it's an internal
 user

---
 htdocs/comm/propal/list.php       | 3 ++-
 htdocs/compta/facture/list.php    | 3 ++-
 htdocs/fourn/commande/list.php    | 3 ++-
 htdocs/fourn/facture/list.php     | 3 ++-
 htdocs/supplier_proposal/list.php | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 9ad46ac19d6..9977b93927c 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -286,7 +286,8 @@ foreach ($object->fields as $key => $val) {
 	}
 }*/
 
-if (!$user->hasRight('societe', 'client', 'voir')) {
+// Check only if it's an internal user
+if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 	$search_sale = $user->id;
 }
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 29225c9e178..c48e14971de 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -304,7 +304,8 @@ $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 '@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
 
-if (!$user->hasRight('societe', 'client', 'voir')) {
+// Check only if it's an internal user
+if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 	$search_sale = $user->id;
 }
 
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index d806ef812d3..c47a099ae47 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -217,7 +217,8 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 
 $error = 0;
 
-if (!$user->hasRight('societe', 'client', 'voir')) {
+// Check only if it's an internal user
+if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 	$search_sale = $user->id;
 }
 
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 086995608dd..c7e10e2317c 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -226,7 +226,8 @@ if ((!$user->hasRight("fournisseur", "facture", "lire") && !getDolGlobalString('
 	accessforbidden();
 }
 
-if (!$user->hasRight('societe', 'client', 'voir')) {
+// Check only if it' an internal user
+if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 	$search_sale = $user->id;
 }
 
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index d8bc7165389..3e8b03d3d22 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -198,7 +198,8 @@ $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 '@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
 
-if (!$user->hasRight('societe', 'client', 'voir')) {
+// Check only if it's an internal user
+if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 	$search_sale = $user->id;
 }
 

From c86b50e3fc0ff807e78dbe68e51313d8350d60d4 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sat, 30 Nov 2024 14:24:13 +0100
Subject: [PATCH 018/602] The $empty param must follow same rules than other
 select component.

---
 htdocs/core/class/html.formticket.class.php | 42 +++++++++++----------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 8920b259489..0cbd3e55876 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -332,7 +332,7 @@ class FormTicket
 
 		// Type of Ticket
 		print '<tr><td class="titlefield"><span class="fieldrequired"><label for="selecttype_code">'.$langs->trans("TicketTypeRequest").'</span></label></td><td>';
-		$this->selectTypesTickets((GETPOST('type_code', 'alpha') ? GETPOST('type_code', 'alpha') : $this->type_code), 'type_code', '', 2, 1, 0, 0, 'minwidth200');
+		$this->selectTypesTickets((GETPOST('type_code', 'alpha') ? GETPOST('type_code', 'alpha') : $this->type_code), 'type_code', '', 2, 'ifone', 0, 0, 'minwidth200');
 		print '</td></tr>';
 
 		// Group => Category
@@ -342,12 +342,12 @@ class FormTicket
 			$filter = 'public=1';
 		}
 		$selected = (GETPOST('category_code') ? GETPOST('category_code') : $this->category_code);
-		$this->selectGroupTickets($selected, 'category_code', $filter, 2, 1, 0, 0, 'minwidth200');
+		$this->selectGroupTickets($selected, 'category_code', $filter, 2, 'ifone', 0, 0, 'minwidth200');
 		print '</td></tr>';
 
 		// Severity => Priority
 		print '<tr><td><span class="fieldrequired"><label for="selectseverity_code">'.$langs->trans("TicketSeverity").'</span></label></td><td>';
-		$this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', 2, 1);
+		$this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', 2, 'ifone');
 		print '</td></tr>';
 
 		if (!empty($conf->knowledgemanagement->enabled)) {
@@ -690,8 +690,8 @@ class FormTicket
 	 *      @param  string|array	$selected		Id of preselected field or array of Ids
 	 *      @param  string			$htmlname		Nom de la zone select
 	 *      @param  string			$filtertype		To filter on field type in llx_c_ticket_type (array('code'=>xx,'label'=>zz))
-	 *      @param  int				$format			0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code
-	 *      @param  int				$empty			1=peut etre vide, 0 sinon
+	 *      @param  int				$format			0=id+label, 1=code+code, 2=code+label, 3=id+code
+	 *      @param  int|string		$empty      	1 = can be empty or 'string' to show the string as the empty value, 0 = can't be empty, 'ifone' = can be empty but autoselected if there is one only
 	 *      @param  int				$noadmininfo	0=Add admin info, 1=Disable admin info
 	 *      @param  int				$maxlength		Max length of label
 	 *      @param	string			$morecss		More CSS
@@ -715,9 +715,9 @@ class FormTicket
 
 		$ticketstat->loadCacheTypesTickets();
 
-		print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.($multiselect?'[]':'').'"'.($multiselect?' multiple':'').'>';
-		if ($empty && !$multiselect) {
-			print '<option value="">&nbsp;</option>';
+		print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.($multiselect ? '[]' : '').'"'.($multiselect ? ' multiple' : '').'>';
+		if ($empty) {
+			print '<option value="">'.((is_numeric($empty) || $empty == 'ifone') ? '&nbsp;' : $empty).'</option>';
 		}
 
 		if (is_array($ticketstat->cache_types_tickets) && count($ticketstat->cache_types_tickets)) {
@@ -755,6 +755,8 @@ class FormTicket
 					print ' selected="selected"';
 				} elseif ($arraytypes['use_default'] == "1" && empty($selected) && !$multiselect) {
 					print ' selected="selected"';
+				} elseif (count($ticketstat->cache_types_tickets) == 1 && (!$empty || $empty == 'ifone')) {	// If only 1 choice, we autoselect it
+					print ' selected="selected"';
 				}
 
 				print '>';
@@ -813,10 +815,10 @@ class FormTicket
 		$ticketstat = new Ticket($this->db);
 		$ticketstat->loadCacheCategoriesTickets($publicgroups ? 1 : -1);	// get list of active ticket groups
 
-		if ($use_multilevel <= 0) {
+		if ($use_multilevel <= 0) {	// Only one combo list to select the group of ticket (default)
 			print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
 			if ($empty) {
-				print '<option value="">&nbsp;</option>';
+				print '<option value="">'.((is_numeric($empty) || $empty == 'ifone') ? '&nbsp;' : $empty).'</option>';
 			}
 
 			if (is_array($ticketstat->cache_category_tickets) && count($ticketstat->cache_category_tickets)) {
@@ -1135,14 +1137,14 @@ class FormTicket
 	/**
 	 *      Return html list of ticket severitys (priorities)
 	 *
-	 *      @param  string  $selected    Id severity pre-selected
-	 *      @param  string  $htmlname    Name of the select area
-	 *      @param  string  $filtertype  To filter on field type in llx_c_ticket_severity (array('code'=>xx,'label'=>zz))
-	 *      @param  int     $format      0 = id+label, 1 = code+code, 2 = code+label, 3 = id+code
-	 *      @param  int     $empty       1 = can be empty, 0 = or not
-	 *      @param  int     $noadmininfo 0 = add admin info, 1 = disable admin info
-	 *      @param  int     $maxlength   Max length of label
-	 *      @param  string  $morecss     More CSS
+	 *      @param  string  	$selected    	Id severity pre-selected
+	 *      @param  string  	$htmlname    	Name of the select area
+	 *      @param  string  	$filtertype  	To filter on field type in llx_c_ticket_severity (array('code'=>xx,'label'=>zz))
+	 *      @param  int     	$format      	0 = id+label, 1 = code+code, 2 = code+label, 3 = id+code
+	 *      @param  int|string	$empty      	1 = can be empty or 'string' to show the string as the empty value, 0 = can't be empty, 'ifone' = can be empty but autoselected if there is one only
+	 *      @param  int     	$noadmininfo 	0 = add admin info, 1 = disable admin info
+	 *      @param  int     	$maxlength   	Max length of label
+	 *      @param  string  	$morecss     	More CSS
 	 *      @return void
 	 */
 	public function selectSeveritiesTickets($selected = '', $htmlname = 'ticketseverity', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '')
@@ -1163,7 +1165,7 @@ class FormTicket
 
 		print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
 		if ($empty) {
-			print '<option value="">&nbsp;</option>';
+			print '<option value="">'.((is_numeric($empty) || $empty == 'ifone') ? '&nbsp;' : $empty).'</option>';
 		}
 
 		if (is_array($ticketstat->cache_severity_tickets) && count($ticketstat->cache_severity_tickets)) {
@@ -1201,6 +1203,8 @@ class FormTicket
 					print ' selected="selected"';
 				} elseif ($arrayseverities['use_default'] == "1" && empty($selected)) {
 					print ' selected="selected"';
+				} elseif (count($conf->cache['severity_tickets']) == 1 && (!$empty || $empty == 'ifone')) {	// If only 1 choice, we autoselect it
+					print ' selected="selected"';
 				}
 
 				print '>';

From e48e1e27d542787ca0d42f7fdc814214348f8edc Mon Sep 17 00:00:00 2001
From: tnegre <tnegre@open-dsi.fr>
Date: Fri, 6 Dec 2024 12:07:37 +0100
Subject: [PATCH 019/602] replace code from develop to match DLB18 variable
 name

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

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 0cbd3e55876..9c3a3847a24 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1203,7 +1203,7 @@ class FormTicket
 					print ' selected="selected"';
 				} elseif ($arrayseverities['use_default'] == "1" && empty($selected)) {
 					print ' selected="selected"';
-				} elseif (count($conf->cache['severity_tickets']) == 1 && (!$empty || $empty == 'ifone')) {	// If only 1 choice, we autoselect it
+				} elseif (count($ticketstat->cache_severity_tickets) == 1 && (!$empty || $empty == 'ifone')) {	// If only 1 choice, we autoselect it
 					print ' selected="selected"';
 				}
 

From e8aaa51edcf65d9feacb7000ee6e657419670275 Mon Sep 17 00:00:00 2001
From: tnegre <tnegre@open-dsi.fr>
Date: Fri, 6 Dec 2024 14:06:54 +0100
Subject: [PATCH 020/602] set empty value for choice

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

diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 9e69271f09c..9f1f30a3e7f 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -856,11 +856,11 @@ foreach ($object->fields as $key => $val) {
 			print '</td>';
 		} elseif ($key == 'category_code') {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-			$formTicket->selectGroupTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key, '', 2, 1, 1, 0, (!empty($val['css']) ? $val['css'] : 'maxwidth150'));
+			$formTicket->selectGroupTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key, '', 2, '&nbsp;', 1, 0, (!empty($val['css']) ? $val['css'] : 'maxwidth150'));
 			print '</td>';
 		} elseif ($key == 'severity_code') {
 			print '<td class="liste_titre center'.($cssforfield ? ' '.$cssforfield : '').'">';
-			$formTicket->selectSeveritiesTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key, '', 2, 1, 1, 0, (!empty($val['css']) ? $val['css'] : 'maxwidth150'));
+			$formTicket->selectSeveritiesTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key, '', 2, '&nbsp;', 1, 0, (!empty($val['css']) ? $val['css'] : 'maxwidth150'));
 			print '</td>';
 		} elseif ($key == 'fk_user_assign' || $key == 'fk_user_create') {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';

From 05faaab489e7616c93a42c24c52ab43f9d37d316 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 14 Dec 2024 08:36:41 +0100
Subject: [PATCH 021/602] Balance - Add backtopage on create

---
 htdocs/accountancy/bookkeeping/balance.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 1cfdcfe73ae..cd2641ff6be 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -136,6 +136,8 @@ if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
 	accessforbidden();
 }
 
+$permissiontoadd = $user->hasRight('accounting', 'mouvements', 'creer');
+
 
 /*
  * Action
@@ -327,13 +329,13 @@ if ($action != 'export_csv') {
 
 		if ($type == 'sub') {
 			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/balance.php?' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
-			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/balance.php?type=sub&' . $url_param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
+			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/balance.php?type=sub' . $url_param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
 		} else {
 			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/balance.php?' . $url_param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
-			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/balance.php?type=sub&' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
+			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/balance.php?type=sub' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
 		}
 		$newcardbutton .= dolGetButtonTitleSeparator();
-		$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create'.(!empty($type)?'&type=sub':'').'&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 	}
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);

From eb7c02b33aff60da3d247063aefe1822bd147cae Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 15 Dec 2024 22:57:02 +0100
Subject: [PATCH 022/602] Journal - Add backtopage on create

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

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 60409e47f0f..2573a737ebc 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -843,7 +843,7 @@ if (empty($reshook)) {
 	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly'));
 	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?type=sub'.$param, '', 1, array('morecss' => 'marginleftonly'));
 
-	$url = './card.php?action=create';
+	$url = './card.php?action=create'.(!empty($type)?'&type=sub':'').'&backtopage='.urlencode($_SERVER['PHP_SELF']);
 	if (!empty($socid)) {
 		$url .= '&socid='.$socid;
 	}

From 790396a48881d89e1f5fe5b0fb772e61113c4527 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 15 Dec 2024 22:57:27 +0100
Subject: [PATCH 023/602] Ledger - Add backtopage on create

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

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 7834b2a6d0f..2992bbf9c47 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -744,7 +744,7 @@ if (empty($reshook)) {
 		$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?type=sub&' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
 	}
 	$newcardbutton .= dolGetButtonTitleSeparator();
-	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create'.(!empty($type)?'&type=sub':'').'&backtopage='.urlencode($_SERVER['PHP_SELF']));
 }
 
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {

From a90fd44e3eaeb6917811a1ad388b8fdd0b8b588a Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 15 Dec 2024 22:57:53 +0100
Subject: [PATCH 024/602] Accountancy - Add backtopage & type

---
 htdocs/accountancy/bookkeeping/card.php | 28 +++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 0da31291160..1ccc651b4f1 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -52,6 +52,12 @@ $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
+$type = GETPOST('type', 'alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
+if (empty($backtopage)) {
+    $backtopage = '/accountancy/bookkeeping/list.php';
+}
+
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $id = GETPOSTINT('id'); // id of record
@@ -121,7 +127,7 @@ if (empty($reshook)) {
 	$error = 0;
 
 	if ($cancel) {
-		header("Location: ".DOL_URL_ROOT.'/accountancy/bookkeeping/list.php');
+		header("Location: ".DOL_URL_ROOT. $backtopage . (!empty($type)?'?type=sub':''));
 		exit;
 	}
 
@@ -355,7 +361,7 @@ if (empty($reshook)) {
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
-			header("Location: list.php?sortfield=t.piece_num&sortorder=asc");
+			header("Location: " . DOL_URL_ROOT. $backtopage . "?sortfield=t.piece_num&sortorder=asc" . ($type ? '&type='.$type : ''));
 			exit;
 		}
 	}
@@ -458,6 +464,8 @@ if ($action == 'create') {
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="confirm_create">'."\n";
 	print '<input type="hidden" name="next_num_mvt" value="'.$next_num_mvt.'">'."\n";
+    print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+    print '<input type="hidden" name="type" value="'.$type.'">';
 	print '<input type="hidden" name="mode" value="_tmp">'."\n";
 
 	print dol_get_fiche_head();
@@ -520,7 +528,7 @@ if ($action == 'create') {
 
 		$head = array();
 		$h = 0;
-		$head[$h][0] = $_SERVER['PHP_SELF'].'?piece_num='.((int) $object->piece_num).($mode ? '&mode='.$mode : '');
+		$head[$h][0] = DOL_URL_ROOT."/accountancy/bookkeeping/card.php".'?piece_num='.((int) $object->piece_num).($mode ? '&mode='.$mode : '').($type ? '&type='.$type : '').($backtopage ? '&backtopage='.urlencode($backtopage) : '');
 		$head[$h][1] = $langs->trans("Transaction");
 		$head[$h][2] = 'transaction';
 		$h++;
@@ -572,6 +580,8 @@ if ($action == 'create') {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdocref">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
+            print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+            print '<input type="hidden" name="type" value="'.$type.'">';
 			print '<input type="text" size="20" name="doc_ref" value="'.dol_escape_htmltag($object->doc_ref).'">';
 			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
@@ -603,6 +613,8 @@ if ($action == 'create') {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdate">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
+            print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+            print '<input type="hidden" name="type" value="'.$type.'">';
 			print $form->selectDate($object->doc_date ? $object->doc_date : -1, 'doc_date', 0, 0, 0, "setdate");
 			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
@@ -614,7 +626,7 @@ if ($action == 'create') {
 
 		// Journal
 		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print '<table class="nobordernopadding centpercent"><tr><td>';
 		print $langs->trans('Codejournal');
 		print '</td>';
 		if ($action != 'editjournal') {
@@ -634,6 +646,8 @@ if ($action == 'create') {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setjournal">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
+            print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+            print '<input type="hidden" name="type" value="'.$type.'">';
 			print $formaccounting->select_journal($object->code_journal, 'code_journal', 0, 0, 0, 1, 1);
 			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
@@ -809,6 +823,8 @@ if ($action == 'create') {
 			print '<input type="hidden" name="fk_doc" value="'.$object->fk_doc.'">'."\n";
 			print '<input type="hidden" name="fk_docdet" value="'.$object->fk_docdet.'">'."\n";
 			print '<input type="hidden" name="mode" value="'.$mode.'">'."\n";
+            print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+            print '<input type="hidden" name="type" value="'.$type.'">';
 
 			if (count($object->linesmvt) > 0) {
 				print '<div class="div-table-responsive-no-min">';
@@ -965,13 +981,13 @@ if ($action == 'create') {
 					if (empty($total_debit) && empty($total_credit)) {
 						print '<input type="submit" class="button" disabled="disabled" href="#" title="'.dol_escape_htmltag($langs->trans("EnterNonEmptyLinesFirst")).'" value="'.dol_escape_htmltag($langs->trans("ValidTransaction")).'">';
 					} elseif ($total_debit == $total_credit) {
-						print '<a class="button" href="'.$_SERVER["PHP_SELF"].'?piece_num='.((int) $object->piece_num).'&action=valid&token='.newToken().'">'.$langs->trans("ValidTransaction").'</a>';
+						print '<a class="button" href="'.$_SERVER["PHP_SELF"].'?piece_num='.((int) $object->piece_num).(!empty($type)?'&type=sub':'').'&backtopage='.urlencode($backtopage).'&action=valid&token='.newToken().'">'.$langs->trans("ValidTransaction").'</a>';
 					} else {
 						print '<input type="submit" class="button" disabled="disabled" href="#" title="'.dol_escape_htmltag($langs->trans("MvtNotCorrectlyBalanced", $total_debit, $total_credit)).'" value="'.dol_escape_htmltag($langs->trans("ValidTransaction")).'">';
 					}
 
 					print ' &nbsp; ';
-					print '<a class="button button-cancel" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php">'.$langs->trans("Cancel").'</a>';
+					print '<a class="button button-cancel" href="'.DOL_URL_ROOT.$backtopage.(!empty($type)?'?type=sub':'').'">'.$langs->trans("Cancel").'</a>';
 
 					print "</div>";
 				}

From ceff811dafeb269456e742091a7a41aedc57a537 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 16 Dec 2024 08:09:32 +0100
Subject: [PATCH 025/602] CI

---
 htdocs/accountancy/bookkeeping/card.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 1ccc651b4f1..690c0999fa8 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -55,7 +55,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $type = GETPOST('type', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 if (empty($backtopage)) {
-    $backtopage = '/accountancy/bookkeeping/list.php';
+	$backtopage = '/accountancy/bookkeeping/list.php';
 }
 
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
@@ -464,8 +464,8 @@ if ($action == 'create') {
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="confirm_create">'."\n";
 	print '<input type="hidden" name="next_num_mvt" value="'.$next_num_mvt.'">'."\n";
-    print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-    print '<input type="hidden" name="type" value="'.$type.'">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	print '<input type="hidden" name="type" value="'.$type.'">';
 	print '<input type="hidden" name="mode" value="_tmp">'."\n";
 
 	print dol_get_fiche_head();
@@ -580,8 +580,8 @@ if ($action == 'create') {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdocref">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
-            print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-            print '<input type="hidden" name="type" value="'.$type.'">';
+			print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+			print '<input type="hidden" name="type" value="'.$type.'">';
 			print '<input type="text" size="20" name="doc_ref" value="'.dol_escape_htmltag($object->doc_ref).'">';
 			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
@@ -613,8 +613,8 @@ if ($action == 'create') {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdate">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
-            print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-            print '<input type="hidden" name="type" value="'.$type.'">';
+			print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+			print '<input type="hidden" name="type" value="'.$type.'">';
 			print $form->selectDate($object->doc_date ? $object->doc_date : -1, 'doc_date', 0, 0, 0, "setdate");
 			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
@@ -646,8 +646,8 @@ if ($action == 'create') {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setjournal">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
-            print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-            print '<input type="hidden" name="type" value="'.$type.'">';
+			print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+			print '<input type="hidden" name="type" value="'.$type.'">';
 			print $formaccounting->select_journal($object->code_journal, 'code_journal', 0, 0, 0, 1, 1);
 			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
@@ -823,8 +823,8 @@ if ($action == 'create') {
 			print '<input type="hidden" name="fk_doc" value="'.$object->fk_doc.'">'."\n";
 			print '<input type="hidden" name="fk_docdet" value="'.$object->fk_docdet.'">'."\n";
 			print '<input type="hidden" name="mode" value="'.$mode.'">'."\n";
-            print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-            print '<input type="hidden" name="type" value="'.$type.'">';
+			print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+			print '<input type="hidden" name="type" value="'.$type.'">';
 
 			if (count($object->linesmvt) > 0) {
 				print '<div class="div-table-responsive-no-min">';

From 077a8e2653b8aac0b35ea11a67b35d5c7d9ee1e0 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 16 Dec 2024 08:19:52 +0100
Subject: [PATCH 026/602] Right on create link

---
 htdocs/accountancy/bookkeeping/list.php          | 2 +-
 htdocs/accountancy/bookkeeping/listbyaccount.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 2573a737ebc..4b4f57cc3b1 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -848,7 +848,7 @@ if (empty($reshook)) {
 		$url .= '&socid='.$socid;
 	}
 	$newcardbutton .= dolGetButtonTitleSeparator();
-	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', $url, '', $user->hasRight('accounting', 'mouvements', 'creer'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', $url, '', $permissiontoadd);
 }
 
 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 2992bbf9c47..32525479a01 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -744,7 +744,7 @@ if (empty($reshook)) {
 		$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?type=sub&' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
 	}
 	$newcardbutton .= dolGetButtonTitleSeparator();
-	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create'.(!empty($type)?'&type=sub':'').'&backtopage='.urlencode($_SERVER['PHP_SELF']));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create'.(!empty($type)?'&type=sub':'').'&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 }
 
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {

From e577232359fdf0e94149da0965f109f4e408a9ee Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 16 Dec 2024 08:27:31 +0100
Subject: [PATCH 027/602] CI

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

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 690c0999fa8..fab3dec1c6a 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -528,7 +528,7 @@ if ($action == 'create') {
 
 		$head = array();
 		$h = 0;
-		$head[$h][0] = DOL_URL_ROOT."/accountancy/bookkeeping/card.php".'?piece_num='.((int) $object->piece_num).($mode ? '&mode='.$mode : '').($type ? '&type='.$type : '').($backtopage ? '&backtopage='.urlencode($backtopage) : '');
+		$head[$h][0] = DOL_URL_ROOT."/accountancy/bookkeeping/card.php".'?piece_num='.((int) $object->piece_num).($mode ? '&mode='.$mode : '').($type ? '&type='.$type : '').'&backtopage='.urlencode($backtopage);
 		$head[$h][1] = $langs->trans("Transaction");
 		$head[$h][2] = 'transaction';
 		$h++;

From 86833633efb1098e2363e41e2047b4813b20405a Mon Sep 17 00:00:00 2001
From: tnegre <tnegre@open-dsi.fr>
Date: Wed, 18 Dec 2024 10:26:26 +0100
Subject: [PATCH 028/602] fix

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

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 9c3a3847a24..4a140185432 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -863,9 +863,9 @@ class FormTicket
 						print ' selected="selected"';
 					} elseif (isset($selected) && $selected == $id) {
 						print ' selected="selected"';
-					} elseif ($arraycategories['use_default'] == "1" && !$selected && !$empty) {
+					} elseif ($arraycategories['use_default'] == "1" && !$selected && (!$empty || $empty == 'ifone')) {
 						print ' selected="selected"';
-					} elseif (count($ticketstat->cache_category_tickets) == 1) {
+					} elseif (count($ticketstat->cache_category_tickets) == 1 && (!$empty || $empty == 'ifone')) {
 						print ' selected="selected"';
 					}
 
@@ -1201,7 +1201,7 @@ class FormTicket
 					print ' selected="selected"';
 				} elseif (isset($selected) && $selected == $id) {
 					print ' selected="selected"';
-				} elseif ($arrayseverities['use_default'] == "1" && empty($selected)) {
+				} elseif ($arrayseverities['use_default'] == "1" && empty($selected) && (!$empty || $empty == 'ifone')) {
 					print ' selected="selected"';
 				} elseif (count($ticketstat->cache_severity_tickets) == 1 && (!$empty || $empty == 'ifone')) {	// If only 1 choice, we autoselect it
 					print ' selected="selected"';

From 9bb3345c7b360924daa924be946d88e64f9ee7a8 Mon Sep 17 00:00:00 2001
From: William Mead <william@inovea-conseil.com>
Date: Wed, 18 Dec 2024 15:45:57 +0100
Subject: [PATCH 029/602] Added status change on progress update. Updated task
 status & labels. Added status to update method.

---
 htdocs/projet/class/task.class.php | 17 +++++++++++++----
 htdocs/projet/tasks/task.php       |  5 +++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 89c99873c09..ca5ae3d3dd2 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -357,6 +357,11 @@ class Task extends CommonObjectLine
 	 */
 	const STATUS_VALIDATED = 1;
 
+	/**
+	 * Ongoing status (In progress). Note: We also have the field progress to know the progression from 0 to 100%.
+	 */
+	const STATUS_ONGOING = 2;
+
 	/**
 	 * Finished status
 	 */
@@ -565,7 +570,6 @@ class Task extends CommonObjectLine
 				$this->date_end = $this->db->jdate($obj->date_end);
 				$this->fk_user_creat		= $obj->fk_user_creat;
 				$this->fk_user_valid		= $obj->fk_user_valid;
-				$this->fk_statut		    = $obj->status;
 				$this->status			    = $obj->status;
 				$this->progress				= $obj->progress;
 				$this->budget_amount		= $obj->budget_amount;
@@ -647,6 +651,10 @@ class Task extends CommonObjectLine
 			return -1;
 		}
 
+		if (isset($this->status)) {
+			$this->status = (int) $this->status;
+		}
+
 		// Check parameters
 		// Put here code to add control on parameters values
 
@@ -667,7 +675,8 @@ class Task extends CommonObjectLine
 		$sql .= " budget_amount=".(($this->budget_amount != '' && $this->budget_amount >= 0) ? $this->budget_amount : 'null').",";
 		$sql .= " rang=".((!empty($this->rang)) ? ((int) $this->rang) : "0").",";
 		$sql .= " priority=".((!empty($this->priority)) ? ((int) $this->priority) : "0").",";
-		$sql .= " billable=".((int) $this->billable);
+		$sql .= " billable=".((int) $this->billable).",";
+		$sql .= " fk_statut=".((int) $this->status);
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		$this->db->begin();
@@ -2497,12 +2506,12 @@ class Task extends CommonObjectLine
 		// list of Statut of the task
 		$this->labelStatus[0] = 'Draft';
 		$this->labelStatus[1] = 'ToDo';
-		$this->labelStatus[2] = 'Running';
+		$this->labelStatus[2] = 'In progress';
 		$this->labelStatus[3] = 'Closed';
 		$this->labelStatus[4] = 'Transfered';
 		$this->labelStatusShort[0] = 'Draft';
 		$this->labelStatusShort[1] = 'ToDo';
-		$this->labelStatusShort[2] = 'Running';
+		$this->labelStatusShort[2] = 'In progress';
 		$this->labelStatusShort[3] = 'Closed';
 		$this->labelStatusShort[4] = 'Transfered';
 
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 8a219264f96..99d01b26eb3 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -128,6 +128,11 @@ if ($action == 'update' && !GETPOST("cancel") && $user->hasRight('projet', 'cree
 		$object->progress = price2num(GETPOST('progress', 'alphanohtml'));
 		$object->budget_amount = GETPOSTFLOAT('budget_amount');
 		$object->billable = (GETPOST('billable', 'aZ') == 'yes' ? 1 : 0);
+		if (GETPOST('progress') == '100') {
+			$object->status = $object::STATUS_CLOSED;
+		} elseif (GETPOST('progress') != '0') {
+			$object->status = $object::STATUS_VALIDATED;
+		}
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');

From fed049e93e2bccf66bed6416e04bf0fa46e49768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20PASCAL?= <pcl.ben.6@gmail.com>
Date: Tue, 24 Dec 2024 10:36:53 +0100
Subject: [PATCH 030/602] feat: add function to get public holidays list within
 period

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

diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 1005cc70941..77fbf7944e2 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -1013,6 +1013,274 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 	return $nbFerie;
 }
 
+/**
+ *  Return the list of public holidays including Friday, Saturday and Sunday (or not) between 2 dates in timestamp.
+ *  Dates must be UTC with hour, min, sec to 0.
+ *  Called by function  num_open_day()
+ *
+ * @param int $timestampStart Timestamp start (UTC with hour, min, sec = 0)
+ * @param int $timestampEnd Timestamp end (UTC with hour, min, sec = 0)
+ * @param string $country_code Country code
+ * @param int $lastday Last day is included, 0: no, 1:yes
+ * @param int $excludesaturday Exclude saturday as non working day (-1=use setup, 0=no, 1=yes)
+ * @param int $excludesunday Exclude sunday as non working day (-1=use setup, 0=no, 1=yes)
+ * @param int $excludefriday Exclude friday as non working day (-1=use setup, 0=no, 1=yes)
+ * @param int $excludemonday Exclude monday as non working day (-1=use setup, 0=no, 1=yes)
+ * @return    int|array                        List of public holidays or error message string if error
+ * @see num_between_day(), num_open_day()
+ */
+function list_public_holiday($timestampStart, $timestampEnd, $country_code = '', $lastday = 0, $excludesaturday = -1, $excludesunday = -1, $excludefriday = -1, $excludemonday = -1)
+{
+	global $conf, $db, $mysoc;
+
+	// Check to ensure we use correct parameters
+	if (($timestampEnd - $timestampStart) % 86400 != 0) {
+		return 'Error Dates must use same hours and must be GMT dates';
+	}
+
+	if (empty($country_code)) {
+		$country_code = $mysoc->country_code;
+	}
+	if ($excludemonday < 0) {
+		$excludemonday = getDolGlobalInt('MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY', 0);
+	}
+	if ($excludefriday < 0) {
+		$excludefriday = getDolGlobalInt('MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY', 0);
+	}
+	if ($excludesaturday < 0) {
+		$excludesaturday = getDolGlobalInt('MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY', 1);
+	}
+	if ($excludesunday < 0) {
+		$excludesunday = getDolGlobalInt('MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY', 1);
+	}
+
+	$country_id = dol_getIdFromCode($db, $country_code, 'c_country', 'code', 'rowid');
+
+	if (empty($conf->cache['arrayOfActivePublicHolidays_' . $country_id])) {
+		// Loop on public holiday defined into hrm_public_holiday for the day, month and year analyzed
+		$tmpArrayOfPublicHolidays = array();
+		$sql = "SELECT id, code, entity, fk_country, dayrule, year, month, day, active";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "c_hrm_public_holiday";
+		$sql .= " WHERE active = 1 and fk_country IN (0" . ($country_id > 0 ? ", " . $country_id : 0) . ")";
+		$sql .= " AND entity IN (0," . getEntity('holiday') . ")";
+
+		$resql = $db->query($sql);
+		if ($resql) {
+			$num_rows = $db->num_rows($resql);
+			$i = 0;
+			while ($i < $num_rows) {
+				$obj = $db->fetch_object($resql);
+				$tmpArrayOfPublicHolidays[$obj->id] = array('dayrule' => $obj->dayrule, 'year' => $obj->year, 'month' => $obj->month, 'day' => $obj->day);
+				$i++;
+			}
+		} else {
+			dol_syslog($db->lasterror(), LOG_ERR);
+			return 'Error sql ' . $db->lasterror();
+		}
+
+		//var_dump($tmpArrayOfPublicHolidays);
+		$conf->cache['arrayOfActivePublicHolidays_' . $country_id] = $tmpArrayOfPublicHolidays;
+	}
+
+	$arrayOfPublicHolidays = $conf->cache['arrayOfActivePublicHolidays_' . $country_id];
+	$listFeries = [];
+	$i = 0;
+	while ((($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd))
+		&& ($i < 50000)) {        // Loop end when equals (Test on i is a security loop to avoid infinite loop)
+		$nonWorkingDay = false;
+		$ferie = false;
+		$specialdayrule = array();
+
+		$jour = (int) gmdate("d", $timestampStart);
+		$mois = (int) gmdate("m", $timestampStart);
+		$annee = (int) gmdate("Y", $timestampStart);
+
+		// If we have to exclude Friday, Saturday and Sunday
+		if ($excludefriday || $excludesaturday || $excludesunday) {
+			$jour_julien = unixtojd($timestampStart);
+			$jour_semaine = jddayofweek($jour_julien, 0);
+			if ($excludefriday) {                    //Friday (5), Saturday (6) and Sunday (0)
+				if ($jour_semaine == 5) {
+					$nonWorkingDay = true;
+				}
+			}
+			if ($excludesaturday) {                    //Friday (5), Saturday (6) and Sunday (0)
+				if ($jour_semaine == 6) {
+					$nonWorkingDay = true;
+				}
+			}
+			if ($excludesunday) {                    //Friday (5), Saturday (6) and Sunday (0)
+				if ($jour_semaine == 0) {
+					$nonWorkingDay = true;
+				}
+			}
+		}
+		//print "ferie=".$nonWorkingDay."\n";
+
+		if (!$nonWorkingDay) {
+			//print "jour=".$jour." month=".$mois." year=".$annee." includesaturday=".$excludesaturday." includesunday=".$excludesunday."\n";
+			foreach ($arrayOfPublicHolidays as $entrypublicholiday) {
+				if (!empty($entrypublicholiday['dayrule']) && $entrypublicholiday['dayrule'] != 'date') {        // For example 'easter', '...'
+					$specialdayrule[$entrypublicholiday['dayrule']] = $entrypublicholiday['dayrule'];
+				} else {
+					$match = 1;
+					if (!empty($entrypublicholiday['year']) && $entrypublicholiday['year'] != $annee) {
+						$match = 0;
+					}
+					if ($entrypublicholiday['month'] != $mois) {
+						$match = 0;
+					}
+					if ($entrypublicholiday['day'] != $jour) {
+						$match = 0;
+					}
+
+					if ($match) {
+						$ferie = true;
+						$listFeries[] = $timestampStart;
+					}
+				}
+
+				$i++;
+			}
+			//var_dump($specialdayrule)."\n";
+			//print "ferie=".$nonWorkingDay."\n";
+		}
+
+		if (!$nonWorkingDay && !$ferie) {
+			// Special dayrules
+			if (in_array('easter', $specialdayrule)) {
+				// Calculation for easter date
+				$date_paques = getGMTEasterDatetime($annee);
+				$jour_paques = gmdate("d", $date_paques);
+				$mois_paques = gmdate("m", $date_paques);
+				if ($jour_paques == $jour && $mois_paques == $mois) {
+					$ferie = true;
+					$listFeries[] = $timestampStart;
+				}
+				// Easter (sunday)
+			}
+
+			if (in_array('eastermonday', $specialdayrule)) {
+				// Calculation for the monday of easter date
+				$date_paques = getGMTEasterDatetime($annee);
+				//print 'PPP'.$date_paques.' '.dol_print_date($date_paques, 'dayhour', 'gmt')." ";
+				$date_lundi_paques = $date_paques + (3600 * 24);
+				$jour_lundi_paques = gmdate("d", $date_lundi_paques);
+				$mois_lundi_paques = gmdate("m", $date_lundi_paques);
+				if ($jour_lundi_paques == $jour && $mois_lundi_paques == $mois) {
+					$ferie = true;
+					$listFeries[] = $timestampStart;
+				}
+				// Easter (monday)
+				//print 'annee='.$annee.' $jour='.$jour.' $mois='.$mois.' $jour_lundi_paques='.$jour_lundi_paques.' $mois_lundi_paques='.$mois_lundi_paques."\n";
+			}
+
+			//Good Friday
+			if (in_array('goodfriday', $specialdayrule)) {
+				// Pulls the date of Easter
+				$easter = getGMTEasterDatetime($annee);
+
+				// Calculates the date of Good Friday based on Easter
+				$date_good_friday = $easter - (2 * 3600 * 24);
+				$dom_good_friday = gmdate("d", $date_good_friday);
+				$month_good_friday = gmdate("m", $date_good_friday);
+
+				if ($dom_good_friday == $jour && $month_good_friday == $mois) {
+					$ferie = true;
+					$listFeries[] = $timestampStart;
+				}
+			}
+
+			if (in_array('ascension', $specialdayrule)) {
+				// Calcul du jour de l'ascension (39 days after easter day)
+				$date_paques = getGMTEasterDatetime($annee);
+				$date_ascension = $date_paques + (3600 * 24 * 39);
+				$jour_ascension = gmdate("d", $date_ascension);
+				$mois_ascension = gmdate("m", $date_ascension);
+				if ($jour_ascension == $jour && $mois_ascension == $mois) {
+					$ferie = true;
+					$listFeries[] = $timestampStart;
+				}
+				// Ascension (thursday)
+			}
+
+			if (in_array('pentecost', $specialdayrule)) {
+				// Calculation of "Pentecote" (49 days after easter day)
+				$date_paques = getGMTEasterDatetime($annee);
+				$date_pentecote = $date_paques + (3600 * 24 * 49);
+				$jour_pentecote = gmdate("d", $date_pentecote);
+				$mois_pentecote = gmdate("m", $date_pentecote);
+				if ($jour_pentecote == $jour && $mois_pentecote == $mois) {
+					$ferie = true;
+					$listFeries[] = $timestampStart;
+				}
+				// "Pentecote" (sunday)
+			}
+
+			if (in_array('pentecotemonday', $specialdayrule)) {
+				// Calculation of "Pentecote" (49 days after easter day)
+				$date_paques = getGMTEasterDatetime($annee);
+				$date_pentecote = $date_paques + (3600 * 24 * 50);
+				$jour_pentecote = gmdate("d", $date_pentecote);
+				$mois_pentecote = gmdate("m", $date_pentecote);
+				if ($jour_pentecote == $jour && $mois_pentecote == $mois) {
+					$ferie = true;
+					$listFeries[] = $timestampStart;
+				}
+				// "Pentecote" (monday)
+			}
+
+			if (in_array('viernessanto', $specialdayrule)) {
+				// Viernes Santo
+				$date_paques = getGMTEasterDatetime($annee);
+				$date_viernes = $date_paques - (3600 * 24 * 2);
+				$jour_viernes = gmdate("d", $date_viernes);
+				$mois_viernes = gmdate("m", $date_viernes);
+				if ($jour_viernes == $jour && $mois_viernes == $mois) {
+					$ferie = true;
+					$listFeries[] = $timestampStart;
+				}
+				//Viernes Santo
+			}
+
+			if (in_array('fronleichnam', $specialdayrule)) {
+				// Fronleichnam (60 days after easter sunday)
+				$date_paques = getGMTEasterDatetime($annee);
+				$date_fronleichnam = $date_paques + (3600 * 24 * 60);
+				$jour_fronleichnam = gmdate("d", $date_fronleichnam);
+				$mois_fronleichnam = gmdate("m", $date_fronleichnam);
+				if ($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) {
+					$ferie = true;
+					$listFeries[] = $timestampStart;
+				}
+				// Fronleichnam
+			}
+
+			if (in_array('genevafast', $specialdayrule)) {
+				// Geneva fast in Switzerland (Thursday after the first sunday in September)
+				$date_1sunsept = strtotime('next thursday', strtotime('next sunday', mktime(0, 0, 0, 9, 1, $annee)));
+				$jour_1sunsept = date("d", $date_1sunsept);
+				$mois_1sunsept = date("m", $date_1sunsept);
+				if ($jour_1sunsept == $jour && $mois_1sunsept == $mois) {
+					$ferie = true;
+					$listFeries[] = $timestampStart;
+				}
+				// Geneva fast in Switzerland
+			}
+		}
+		//print "ferie=".$nonWorkingDay."\n";
+
+		// Increase number of days (on go up into loop)
+		$timestampStart = dol_time_plus_duree($timestampStart, 1, 'd');
+		//var_dump($jour.' '.$mois.' '.$annee.' '.$timestampStart);
+
+		$i++;
+	}
+
+	//print "nbFerie=".$nbFerie."\n";
+	return $listFeries;
+}
+
 /**
  *	Function to return number of days between two dates (date must be UTC date !)
  *  Example: 2012-01-01 2012-01-02 => 1 if lastday=0, 2 if lastday=1

From 39e509f3809ee47d40cefe2c7977b7b34bff53b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chlo=C3=A9?= <chloe@agence418.fr>
Date: Tue, 24 Dec 2024 10:50:29 +0100
Subject: [PATCH 031/602] fix: list_public_holiday function return type

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

diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 77fbf7944e2..87ad6a3a213 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -1026,7 +1026,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
  * @param int $excludesunday Exclude sunday as non working day (-1=use setup, 0=no, 1=yes)
  * @param int $excludefriday Exclude friday as non working day (-1=use setup, 0=no, 1=yes)
  * @param int $excludemonday Exclude monday as non working day (-1=use setup, 0=no, 1=yes)
- * @return    int|array                        List of public holidays or error message string if error
+ * @return    string|array                        List of public holidays or error message string if error
  * @see num_between_day(), num_open_day()
  */
 function list_public_holiday($timestampStart, $timestampEnd, $country_code = '', $lastday = 0, $excludesaturday = -1, $excludesunday = -1, $excludefriday = -1, $excludemonday = -1)

From 303b7423f350590e7046b5ef11de4c19964b2144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chlo=C3=A9?= <chloe@agence418.fr>
Date: Tue, 24 Dec 2024 11:01:15 +0100
Subject: [PATCH 032/602] fix: update list_public_holiday return type

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

diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 87ad6a3a213..956a3f2d2a5 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -1026,7 +1026,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
  * @param int $excludesunday Exclude sunday as non working day (-1=use setup, 0=no, 1=yes)
  * @param int $excludefriday Exclude friday as non working day (-1=use setup, 0=no, 1=yes)
  * @param int $excludemonday Exclude monday as non working day (-1=use setup, 0=no, 1=yes)
- * @return    string|array                        List of public holidays or error message string if error
+ * @return    string|int[]                        List of public holidays timestamps or error message string if error
  * @see num_between_day(), num_open_day()
  */
 function list_public_holiday($timestampStart, $timestampEnd, $country_code = '', $lastday = 0, $excludesaturday = -1, $excludesunday = -1, $excludefriday = -1, $excludemonday = -1)

From a3193a08bce1df62f5f4af092ff001eb3a089ea1 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 6 Jan 2025 13:56:32 +0100
Subject: [PATCH 033/602] FIX merge problem

---
 htdocs/fourn/commande/list.php | 4 ----
 htdocs/fourn/facture/card.php  | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index e399ce50745..7616d21227f 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -512,12 +512,8 @@ if (empty($reshook)) {
 							}
 
 							$tva_tx = $lines[$i]->tva_tx;
-<<<<<<< HEAD
 							// @phan-suppress-next-line PhanTypeMismatchArgumentInternal
-							if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) {
-=======
 							if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', (string) $tva_tx)) {
->>>>>>> branch '20.0' of git@github.com:Dolibarr/dolibarr.git
 								$tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
 							}
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index b2de69e162e..a7d7df70c25 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1339,12 +1339,8 @@ if (empty($reshook)) {
 								}
 
 								$tva_tx = $lines[$i]->tva_tx;
-<<<<<<< HEAD
 								// @phan-suppress-next-line PhanTypeMismatchArgumentInternal
-								if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) {
-=======
 								if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', (string) $tva_tx)) {
->>>>>>> branch '20.0' of git@github.com:Dolibarr/dolibarr.git
 									$tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
 								}
 

From 510d622f155f7be46b90401f86d5c95284d75130 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 6 Jan 2025 14:16:36 +0100
Subject: [PATCH 034/602] Remove DOL_URL_ROOT already present in backtopage

---
 htdocs/accountancy/bookkeeping/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index fab3dec1c6a..2b4cd2506d8 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -127,7 +127,7 @@ if (empty($reshook)) {
 	$error = 0;
 
 	if ($cancel) {
-		header("Location: ".DOL_URL_ROOT. $backtopage . (!empty($type)?'?type=sub':''));
+		header("Location: ". $backtopage . (!empty($type)?'?type=sub':''));
 		exit;
 	}
 
@@ -361,7 +361,7 @@ if (empty($reshook)) {
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
-			header("Location: " . DOL_URL_ROOT. $backtopage . "?sortfield=t.piece_num&sortorder=asc" . ($type ? '&type='.$type : ''));
+			header("Location: " . $backtopage . "?sortfield=t.piece_num&sortorder=asc" . ($type ? '&type='.$type : ''));
 			exit;
 		}
 	}
@@ -987,7 +987,7 @@ if ($action == 'create') {
 					}
 
 					print ' &nbsp; ';
-					print '<a class="button button-cancel" href="'.DOL_URL_ROOT.$backtopage.(!empty($type)?'?type=sub':'').'">'.$langs->trans("Cancel").'</a>';
+					print '<a class="button button-cancel" href="'.$backtopage.(!empty($type)?'?type=sub':'').'">'.$langs->trans("Cancel").'</a>';
 
 					print "</div>";
 				}

From 3daf44bf68d7172cf729ab0ca4ad05d546dc62dd Mon Sep 17 00:00:00 2001
From: William Mead <william@inovea-conseil.com>
Date: Wed, 8 Jan 2025 15:21:40 +0100
Subject: [PATCH 035/602] Fixed status

---
 htdocs/projet/class/task.class.php | 6 ++++--
 htdocs/projet/tasks.php            | 1 +
 htdocs/projet/tasks/task.php       | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index ca5ae3d3dd2..19ff42e4957 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -435,6 +435,7 @@ class Task extends CommonObjectLine
 		$sql .= ", budget_amount";
 		$sql .= ", priority";
 		$sql .= ", billable";
+		$sql .= ", fk_statut";
 		$sql .= ") VALUES (";
 		$sql .= (!empty($this->entity) ? (int) $this->entity : (int) $conf->entity);
 		$sql .= ", ".((int) $this->fk_project);
@@ -453,6 +454,7 @@ class Task extends CommonObjectLine
 		$sql .= ", ".(($this->budget_amount != '' && $this->budget_amount >= 0) ? ((int) $this->budget_amount) : 'null');
 		$sql .= ", ".(($this->priority != '' && $this->priority >= 0) ? (int) $this->priority : 'null');
 		$sql .= ", ".((int) $this->billable);
+		$sql .= ", ".((int) $this->status);
 		$sql .= ")";
 
 		$this->db->begin();
@@ -2505,12 +2507,12 @@ class Task extends CommonObjectLine
 
 		// list of Statut of the task
 		$this->labelStatus[0] = 'Draft';
-		$this->labelStatus[1] = 'ToDo';
+		$this->labelStatus[1] = 'Validated';
 		$this->labelStatus[2] = 'In progress';
 		$this->labelStatus[3] = 'Closed';
 		$this->labelStatus[4] = 'Transfered';
 		$this->labelStatusShort[0] = 'Draft';
-		$this->labelStatusShort[1] = 'ToDo';
+		$this->labelStatusShort[1] = 'Validated';
 		$this->labelStatusShort[2] = 'In progress';
 		$this->labelStatusShort[3] = 'Closed';
 		$this->labelStatusShort[4] = 'Transfered';
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index a0dab9b2d30..281d7189419 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -387,6 +387,7 @@ if ($action == 'createtask' && $user->hasRight('projet', 'creer')) {
 			$task->progress = $progress;
 			$task->budget_amount = $budget_amount;
 			$task->billable = $billable;
+			$task->status = Task::STATUS_VALIDATED;
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $task);
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 99d01b26eb3..4d09cbcb1ef 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -131,7 +131,7 @@ if ($action == 'update' && !GETPOST("cancel") && $user->hasRight('projet', 'cree
 		if (GETPOST('progress') == '100') {
 			$object->status = $object::STATUS_CLOSED;
 		} elseif (GETPOST('progress') != '0') {
-			$object->status = $object::STATUS_VALIDATED;
+			$object->status = $object::STATUS_ONGOING;
 		}
 
 		// Fill array 'array_options' with data from add form

From 3415fffaac7050a28e1f7afdc9a24be0cdb79b85 Mon Sep 17 00:00:00 2001
From: William Mead <william@inovea-conseil.com>
Date: Wed, 8 Jan 2025 17:14:05 +0100
Subject: [PATCH 036/602] Added status update on addTimeSpent

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

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 19ff42e4957..69a2f523d2e 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1726,6 +1726,17 @@ class Task extends CommonObjectLine
 			$sql .= " SET duration_effective = (SELECT SUM(element_duration) FROM ".MAIN_DB_PREFIX."element_time as ptt where ptt.elementtype = 'task' AND ptt.fk_element = ".((int) $this->id).")";
 			if (isset($this->progress)) {
 				$sql .= ", progress = ".((float) $this->progress); // Do not overwrite value if not provided
+				if ($this->progress == 100) {
+					$this->status = Task::STATUS_CLOSED;
+				} elseif ($this->progress != 0) {
+					$this->status = Task::STATUS_ONGOING;
+				} else {
+					$this->status = Task::STATUS_VALIDATED;
+				}
+				$sql .= ", fk_statut = ".$this->status;
+			} else {
+				$this->status = Task::STATUS_ONGOING;
+				$sql .= ", fk_statut = ".$this->status;
 			}
 			$sql .= " WHERE rowid = ".((int) $this->id);
 

From 34409e8a4dd465556208488dec2be2b8ca8ebe15 Mon Sep 17 00:00:00 2001
From: vmaury <artec.vm@arnac.net>
Date: Sat, 11 Jan 2025 07:33:08 +0100
Subject: [PATCH 037/602] Fix 31370 Pb with external account

---
 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 59bea619be2..4a5a5e69795 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -286,7 +286,7 @@ foreach ($object->fields as $key => $val) {
 	}
 }*/
 
-if (!$user->hasRight('societe', 'client', 'voir')) {
+if ($socid == 0 && !$user->hasRight('societe', 'client', 'voir')) { // add VMA
 	$search_sale = $user->id;
 }
 

From 40e22cc40eeb811fad95c1949e8eb85b5e505e92 Mon Sep 17 00:00:00 2001
From: vmaury <artec.vm@arnac.net>
Date: Sat, 11 Jan 2025 12:31:35 +0100
Subject: [PATCH 038/602] Fix 31370 Pb with external account

---
 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 4a5a5e69795..96f5da1ce5f 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -286,7 +286,7 @@ foreach ($object->fields as $key => $val) {
 	}
 }*/
 
-if ($socid == 0 && !$user->hasRight('societe', 'client', 'voir')) { // add VMA
+if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 	$search_sale = $user->id;
 }
 

From 09185331720be2a4f381cb99e4762170355a5626 Mon Sep 17 00:00:00 2001
From: uvaldenaire-opendsi <uvaldenaire@easya.solutions>
Date: Mon, 13 Jan 2025 11:54:58 +0100
Subject: [PATCH 039/602] NEW add option to not prefill qty line at shipment
 creation

---
 htdocs/admin/expedition.php   |  8 ++++++++
 htdocs/expedition/card.php    | 25 ++++++++++++++++++++-----
 htdocs/langs/en_US/admin.lang |  1 +
 htdocs/langs/fr_FR/admin.lang |  1 +
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 3fcfa7c7b36..5ad30fc921f 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -490,6 +490,14 @@ print '<td>';
 print ajax_constantonoff('EXPEDITION_ALLOW_ONLINESIGN', array(), null, 0, 0, 0, 2, 0, 1, '', '', 'inline-block', 0, $langs->trans("WarningOnlineSignature"));
 print '</td></tr>';
 
+// Pre fill shipment qty option
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("DontPrefillShipmentQty");
+print '</td>';
+print '<td>';
+print ajax_constantonoff('SHIPMENT_DONT_PREFILL_QTY', array(), null, 0, 0, 0, 2, 0, 1, '', '', 'inline-block', 0, '');
+print '</td></tr>';
+
 print '</table>';
 
 print $form->buttonsSaveCancel("Modify", '');
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 8c365e7bee5..1b74583596c 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1360,7 +1360,11 @@ if ($action == 'create') {
 									$deliverableQty = GETPOSTINT('qtyl'.$indiceAsked);
 								}
 								print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
-								print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" class="qtyl right" type="text" size="4" value="'.$deliverableQty.'">';
+								$qtylValue = $deliverableQty;
+								if (getDolGlobalBool('SHIPMENT_DONT_PREFILL_QTY', false)) {
+									$qtylValue = '';
+								}
+								print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" class="qtyl right" type="text" size="4" value="'.$qtylValue.'">';
 							} else {
 								if (getDolGlobalString('SHIPMENT_GETS_ALL_ORDER_PRODUCTS')) {
 									print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
@@ -1491,7 +1495,11 @@ if ($action == 'create') {
 
 									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? 'oddeven' : '').'>';
 									print '<td colspan="3" ></td><td class="center">';
-									print '<input class="qtyl '.$tooltipClass.' right" title="'.$tooltipTitle.'" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
+									$qtylValue = $deliverableQty;
+									if (getDolGlobalBool('SHIPMENT_DONT_PREFILL_QTY', false)) {
+										$qtylValue = '';
+									}
+									print '<input class="qtyl '.$tooltipClass.' right" title="'.$tooltipTitle.'" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$qtylValue.'">';
 									print '</td>';
 
 									print '<!-- Show details of lot -->';
@@ -1604,8 +1612,11 @@ if ($action == 'create') {
 										if (GETPOSTISSET($inputName)) {
 											$deliverableQty = GETPOSTINT($inputName);
 										}
-
-										print '<input class="qtyl'.$tooltipClass.' right" title="'.$tooltipTitle.'" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
+										$qtylValue = $deliverableQty;
+										if (getDolGlobalBool('SHIPMENT_DONT_PREFILL_QTY', false)) {
+											$qtylValue = '';
+										}
+										print '<input class="qtyl'.$tooltipClass.' right" title="'.$tooltipTitle.'" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$qtylValue.'">';
 										print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_id.'">';
 									} else {
 										if (getDolGlobalString('SHIPMENT_GETS_ALL_ORDER_PRODUCTS')) {
@@ -1729,7 +1740,11 @@ if ($action == 'create') {
 										$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = $deliverableQty + $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
 
 										print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? 'oddeven' : '').'><td colspan="3"></td><td class="center">';
-										print '<input class="qtyl right '.$tooltipClass.'" title="'.$tooltipTitle.'" name="'.$inputName.'" id="'.$inputName.'" type="text" size="4" value="'.$deliverableQty.'">';
+										$qtylValue = $deliverableQty;
+										if (getDolGlobalBool('SHIPMENT_DONT_PREFILL_QTY', false)) {
+											$qtylValue = '';
+										}
+										print '<input class="qtyl right '.$tooltipClass.'" title="'.$tooltipTitle.'" name="'.$inputName.'" id="'.$inputName.'" type="text" size="4" value="'.$qtylValue.'">';
 										print '</td>';
 
 										print '<td class="left">';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 436c7d2ddd2..bca02410227 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1805,6 +1805,7 @@ SendingsNumberingModules=Sendings numbering modules
 SendingsAbility=Support shipping sheets for customer deliveries
 NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
 DeliveryOrderModel=Products deliveries receipt model
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index b5d380188cb..6cfe8774cc5 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1800,6 +1800,7 @@ SendingsNumberingModules=Modèles de numérotation des expéditions
 SendingsAbility=Prise en charge des bons d'expédition pour les livraisons clients
 NoNeedForDeliveryReceipts=Dans le plupart des cas, la fiche expédition est utilisée en tant que bon d'expédition (liste des produits expédiés) et bon de livraison (signée par le client). Le bon de réception est un doublon de fonctionnalité et est rarement utilisé.
 FreeLegalTextOnShippings=Mention complémentaire sur les expéditions
+DontPrefillShipmentQty = Ne pas pré-remplir les quantités des lignes à la création d'une expédition
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Modèle de numérotation des bons de réception client
 DeliveryOrderModel=Modèle de bon de réception client

From cf0c04c6ee870b36ff82f3e2ed4f00d225286a92 Mon Sep 17 00:00:00 2001
From: vmaury <artec.vm@arnac.net>
Date: Mon, 13 Jan 2025 11:58:16 +0100
Subject: [PATCH 040/602] Fix 31370 Pb with external account

---
 htdocs/comm/index.php                         | 46 +++++++++----------
 htdocs/comm/propal/class/propal.class.php     |  6 +--
 .../comm/propal/class/propalestats.class.php  | 12 ++---
 htdocs/commande/class/commande.class.php      | 10 ++--
 htdocs/commande/class/commandestats.class.php | 12 ++---
 htdocs/commande/index.php                     | 16 +++----
 htdocs/commande/list.php                      |  5 +-
 htdocs/compta/facture/class/facture.class.php |  6 +--
 .../facture/class/facturestats.class.php      | 14 +++---
 htdocs/compta/facture/list.php                |  8 ++--
 htdocs/compta/index.php                       |  6 +--
 htdocs/contrat/class/contrat.class.php        |  6 +--
 htdocs/contrat/list.php                       |  4 +-
 htdocs/core/boxes/box_actions.php             |  4 +-
 htdocs/core/boxes/box_actions_future.php      |  4 +-
 htdocs/core/boxes/box_activity.php            | 12 ++---
 htdocs/core/boxes/box_clients.php             |  4 +-
 htdocs/core/boxes/box_commandes.php           |  4 +-
 htdocs/core/boxes/box_contacts.php            |  4 +-
 htdocs/core/boxes/box_contracts.php           |  4 +-
 ...box_customers_outstanding_bill_reached.php |  4 +-
 htdocs/core/boxes/box_factures.php            |  4 +-
 htdocs/core/boxes/box_factures_fourn.php      |  4 +-
 htdocs/core/boxes/box_factures_fourn_imp.php  |  4 +-
 htdocs/core/boxes/box_factures_imp.php        |  4 +-
 htdocs/core/boxes/box_ficheinter.php          |  4 +-
 htdocs/core/boxes/box_fournisseurs.php        |  4 +-
 .../boxes/box_graph_propales_permonth.php     |  2 +-
 htdocs/core/boxes/box_propales.php            |  4 +-
 htdocs/core/boxes/box_prospect.php            |  4 +-
 htdocs/core/boxes/box_services_contracts.php  |  2 +-
 htdocs/core/boxes/box_services_expired.php    |  4 +-
 htdocs/core/boxes/box_shipments.php           |  4 +-
 htdocs/core/boxes/box_supplier_orders.php     |  4 +-
 ...box_supplier_orders_awaiting_reception.php |  4 +-
 htdocs/core/lib/invoice.lib.php               | 36 ++++++++-------
 htdocs/core/lib/order.lib.php                 |  6 +--
 htdocs/core/lib/propal.lib.php                |  8 ++--
 .../fichinter/class/fichinterstats.class.php  | 10 ++--
 htdocs/fichinter/list.php                     |  2 +-
 .../class/fournisseur.commande.class.php      |  4 +-
 .../fourn/class/fournisseur.facture.class.php |  4 +-
 .../class/supplier_proposal.class.php         |  8 ++--
 htdocs/ticket/class/ticket.class.php          |  6 +--
 44 files changed, 165 insertions(+), 162 deletions(-)

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 01c96b952f2..c45c7cb0fe6 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -140,13 +140,13 @@ if (isModEnabled("propal") && $user->hasRight("propal", "lire")) {
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."propal as p,";
 	$sql .= " ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";
 	$sql .= " AND p.fk_soc = s.rowid";
 	$sql .= " AND p.fk_statut = ".Propal::STATUS_DRAFT;
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -239,13 +239,13 @@ if (isModEnabled('supplier_proposal') && $user->hasRight("supplier_proposal", "l
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p,";
 	$sql .= " ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE p.entity IN (".getEntity($supplierproposalstatic->element).")";
 	$sql .= " AND p.fk_statut = ".SupplierProposal::STATUS_DRAFT;
 	$sql .= " AND p.fk_soc = s.rowid";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -336,13 +336,13 @@ if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c,";
 	$sql .= " ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE c.entity IN (".getEntity($orderstatic->element).")";
 	$sql .= " AND c.fk_statut = ".Commande::STATUS_DRAFT;
 	$sql .= " AND c.fk_soc = s.rowid";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -436,13 +436,13 @@ if ((isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMO
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf,";
 	$sql .= " ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE cf.entity IN (".getEntity($supplierorderstatic->element).")";
 	$sql .= " AND cf.fk_statut = ".CommandeFournisseur::STATUS_DRAFT;
 	$sql .= " AND cf.fk_soc = s.rowid";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -534,7 +534,7 @@ if (isModEnabled('intervention')) {
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE f.entity IN (".getEntity('intervention').")";
@@ -543,7 +543,7 @@ if (isModEnabled('intervention')) {
 	if ($socid) {
 		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 
@@ -617,12 +617,12 @@ if (isModEnabled("societe") && $user->hasRight('societe', 'lire')) {
 	$sql .= ", s.canvas";
 	$sql .= ", s.datec, s.tms";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE s.entity IN (".getEntity($companystatic->element).")";
 	$sql .= " AND s.client IN (".Societe::CUSTOMER.", ".Societe::PROSPECT.", ".Societe::CUSTOMER_AND_PROSPECT.")";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	// Add where from hooks
@@ -725,7 +725,7 @@ if (isModEnabled('propal')) {
 	$sql .= " AND c.fk_soc = s.rowid";
 	// If the internal user must only see his customers, force searching by him
 	$search_sale = 0;
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$search_sale = $user->id;
 	}
 	// Search on sale representative
@@ -820,7 +820,7 @@ if (isModEnabled('order')) {
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c,";
 	$sql .= " ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE c.fk_soc = s.rowid";
@@ -829,7 +829,7 @@ if (isModEnabled('order')) {
 	if ($socid) {
 		$sql .= " AND c.fk_soc = ".((int) $socid);
 	}
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	$sql .= " ORDER BY c.tms DESC";
@@ -908,12 +908,12 @@ if ((isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) && $use
 	$sql .= ", s.canvas";
 	$sql .= ", s.datec as dc, s.tms as dm";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE s.entity IN (".getEntity($companystatic->element).")";
 	$sql .= " AND s.fournisseur = ".Societe::SUPPLIER;
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	// Add where from hooks
@@ -1023,13 +1023,13 @@ if (isModEnabled('contract') && $user->hasRight("contrat", "lire") && 0) { // TO
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."contrat as c";
 	$sql .= ", ".MAIN_DB_PREFIX."product as p";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE c.entity IN (".getEntity($staticcontrat->element).")";
 	$sql .= " AND c.fk_soc = s.rowid";
 	$sql .= " AND c.fk_product = p.rowid";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -1098,13 +1098,13 @@ if (isModEnabled("propal") && $user->hasRight("propal", "lire")) {
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";
 	$sql .= " AND p.fk_soc = s.rowid";
 	$sql .= " AND p.fk_statut = ".Propal::STATUS_VALIDATED;
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -1217,13 +1217,13 @@ if (isModEnabled('order') && $user->hasRight('commande', 'lire')) {
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE c.entity IN (".getEntity($orderstatic->element).")";
 	$sql .= " AND c.fk_soc = s.rowid";
 	$sql .= " AND c.fk_statut IN (".Commande::STATUS_VALIDATED.", ".Commande::STATUS_SHIPMENTONPROCESS.")";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index a27eca21f18..44fd80ca8b7 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2861,7 +2861,7 @@ class Propal extends CommonObject
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$search_sale = $user->id;
 		}
 		// Search on sale representative
@@ -3384,7 +3384,7 @@ class Propal extends CommonObject
 		}
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$search_sale = $user->id;
 		}
 		// Search on sale representative
@@ -3561,7 +3561,7 @@ class Propal extends CommonObject
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$search_sale = $user->id;
 		}
 		// Search on sale representative
diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php
index 5321886f0fb..ace66cd25bd 100644
--- a/htdocs/comm/propal/class/propalestats.class.php
+++ b/htdocs/comm/propal/class/propalestats.class.php
@@ -122,7 +122,7 @@ class PropaleStats extends Stats
 
 		$sql = "SELECT date_format(".$this->field_date.",'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$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;
@@ -147,7 +147,7 @@ class PropaleStats extends Stats
 
 		$sql = "SELECT date_format(".$this->field_date.",'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$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;
@@ -171,7 +171,7 @@ class PropaleStats extends Stats
 
 		$sql = "SELECT date_format(".$this->field_date.",'%m') as dm, SUM(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$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;
@@ -196,7 +196,7 @@ class PropaleStats extends Stats
 
 		$sql = "SELECT date_format(".$this->field_date.",'%m') as dm, AVG(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$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;
@@ -219,7 +219,7 @@ class PropaleStats extends Stats
 
 		$sql = "SELECT date_format(".$this->field_date.",'%Y') as year, COUNT(*) as nb, SUM(".$this->field.") as total, AVG(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$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;
@@ -247,7 +247,7 @@ class PropaleStats extends Stats
 		$sql .= " FROM ".$this->from;
 		$sql .= " INNER JOIN ".$this->from_line." ON p.rowid = tl.fk_propal";
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."product as product ON tl.fk_product = product.rowid";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$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;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 2ac0d52671a..70a7656fa0b 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2715,16 +2715,16 @@ class Commande extends CommonOrder
 
 		$sql = "SELECT s.rowid, s.nom as name, s.client,";
 		$sql .= " c.rowid as cid, c.ref";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", sc.fk_soc, sc.fk_user";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.entity IN (".getEntity('commande').")";
 		$sql .= " AND c.fk_soc = s.rowid";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($socid) {
@@ -3551,7 +3551,7 @@ class Commande extends CommonOrder
 
 		$sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.date_livraison as delivery_date, c.fk_statut, c.total_ht";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = " AND";
@@ -4059,7 +4059,7 @@ class Commande extends CommonOrder
 		$sql = "SELECT count(co.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande as co";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index f9f49ef7ada..332bddd1698 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -123,7 +123,7 @@ class CommandeStats extends Stats
 
 		$sql = "SELECT date_format(c.date_commande,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= "  INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		$sql .= $this->join;
@@ -148,7 +148,7 @@ class CommandeStats extends Stats
 
 		$sql = "SELECT date_format(c.date_commande,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= "  INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		$sql .= $this->join;
@@ -172,7 +172,7 @@ class CommandeStats extends Stats
 
 		$sql = "SELECT date_format(c.date_commande,'%m') as dm, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= "  INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		$sql .= $this->join;
@@ -197,7 +197,7 @@ class CommandeStats extends Stats
 
 		$sql = "SELECT date_format(c.date_commande,'%m') as dm, AVG(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= "  INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		$sql .= $this->join;
@@ -220,7 +220,7 @@ class CommandeStats extends Stats
 
 		$sql = "SELECT date_format(c.date_commande,'%Y') as year, COUNT(*) as nb, SUM(c.".$this->field.") as total, AVG(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= "  INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		$sql .= $this->join;
@@ -246,7 +246,7 @@ class CommandeStats extends Stats
 		$sql .= " FROM ".$this->from;
 		$sql .= " INNER JOIN ".$this->from_line." ON c.rowid = tl.fk_commande";
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."product as product ON tl.fk_product = product.rowid";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= "  INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		$sql .= $this->join;
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 61be815d34d..ff9d1a3a6e2 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -98,7 +98,7 @@ if (isModEnabled('order')) {
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE c.fk_soc = s.rowid";
@@ -107,7 +107,7 @@ if (isModEnabled('order')) {
 	if ($socid) {
 		$sql .= " AND c.fk_soc = ".((int) $socid);
 	}
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 
@@ -164,7 +164,7 @@ $sql .= ", s.code_client";
 $sql .= ", s.canvas";
 $sql .= " FROM ".MAIN_DB_PREFIX."commande as c,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->hasRight('societe', 'client', 'voir')) {
+if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE c.fk_soc = s.rowid";
@@ -173,7 +173,7 @@ $sql .= " AND c.entity IN (".getEntity('commande').")";
 if ($socid) {
 	$sql .= " AND c.fk_soc = ".((int) $socid);
 }
-if (!$user->hasRight('societe', 'client', 'voir')) {
+if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 $sql .= " ORDER BY c.tms DESC";
@@ -250,7 +250,7 @@ if (isModEnabled('order')) {
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE c.fk_soc = s.rowid";
@@ -259,7 +259,7 @@ if (isModEnabled('order')) {
 	if ($socid) {
 		$sql .= " AND c.fk_soc = ".((int) $socid);
 	}
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	$sql .= " ORDER BY c.rowid DESC";
@@ -339,7 +339,7 @@ if (isModEnabled('order')) {
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE c.fk_soc = s.rowid";
@@ -348,7 +348,7 @@ if (isModEnabled('order')) {
 	if ($socid) {
 		$sql .= " AND c.fk_soc = ".((int) $socid);
 	}
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	$sql .= " ORDER BY c.rowid DESC";
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 3db787bbcc2..b60cb2e58fe 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -906,9 +906,8 @@ $sql .= ' AND c.entity IN ('.getEntity('commande').')';
 if ($socid > 0) {
 	$sql .= ' AND s.rowid = '.((int) $socid);
 }
-
 // Restriction on sale representative
-if (!$permissiontoreadallthirdparty) {
+if (empty($user->socid) && !$permissiontoreadallthirdparty) {
 	$sql .= " AND (EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = c.fk_soc AND sc.fk_user = ".((int) $user->id).")";
 	if (getDolGlobalInt('MAIN_SEE_SUBORDINATES') && $userschilds) {
 		$sql .= " OR EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = c.fk_soc AND sc.fk_user IN (".$db->sanitize(implode(',', $userschilds))."))";
@@ -1619,7 +1618,7 @@ if (!empty($arrayfields['p.title']['checked'])) {
 // Thirpdarty
 if (!empty($arrayfields['s.nom']['checked'])) {
 	print '<td class="liste_titre" align="left">';
-	print '<input class="flat maxwidth100" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
+	print '<input class="flat maxwidth100" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'"'.(!empty($user->socid) ? " disabled" : "").'>';
 	print '</td>';
 }
 // Alias
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 375a9eb087a..76ca915f9a8 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4753,7 +4753,7 @@ class Facture extends CommonInvoice
 		}
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$search_sale = $user->id;
 		}
 		// Search on sale representative
@@ -4946,7 +4946,7 @@ class Facture extends CommonInvoice
 
 		$sql = "SELECT f.rowid, f.date_lim_reglement as datefin, f.fk_statut as status, f.total_ht";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= " JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON f.fk_soc = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = " AND";
@@ -5194,7 +5194,7 @@ class Facture extends CommonInvoice
 		$sql = "SELECT count(f.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php
index 6476235c9b2..0a02a2294c6 100644
--- a/htdocs/compta/facture/class/facturestats.class.php
+++ b/htdocs/compta/facture/class/facturestats.class.php
@@ -136,7 +136,7 @@ class FactureStats extends Stats
 
 		$sql = "SELECT date_format(f.datef,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -162,7 +162,7 @@ class FactureStats extends Stats
 
 		$sql = "SELECT date_format(f.datef,'%Y') as dm, COUNT(*), SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -187,7 +187,7 @@ class FactureStats extends Stats
 
 		$sql = "SELECT date_format(datef,'%m') as dm, SUM(f.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -213,7 +213,7 @@ class FactureStats extends Stats
 
 		$sql = "SELECT date_format(datef,'%m') as dm, AVG(f.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -236,7 +236,7 @@ class FactureStats extends Stats
 
 		$sql = "SELECT date_format(datef,'%Y') as year, COUNT(*) as nb, SUM(f.".$this->field.") as total, AVG(f.".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -260,7 +260,7 @@ class FactureStats extends Stats
 
 		$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";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
@@ -288,7 +288,7 @@ class FactureStats extends Stats
 		$startYear = $endYear - $numberYears;
 		$sql = "SELECT date_format(datef,'%Y') as dm, SUM(f.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= $this->join;
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 29225c9e178..fde549cc967 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -304,15 +304,15 @@ $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 '@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
 
-if (!$user->hasRight('societe', 'client', 'voir')) {
-	$search_sale = $user->id;
-}
-
 // Security check
 $fieldid = (!empty($ref) ? 'ref' : 'rowid');
 if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
+if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
+	$search_sale = $user->id;
+}
+
 $result = restrictedArea($user, 'facture', $id, '', '', 'fk_soc', $fieldid);
 
 
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 9968411c62e..a238b4f6a2b 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -153,7 +153,7 @@ if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
 		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
 	// Filter on sale representative
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = f.fk_soc AND sc.fk_user = ".((int) $user->id).")";
 	}
 	// Add where from hooks
@@ -304,7 +304,7 @@ if ((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMO
 		$sql .= " AND ff.fk_soc = ".((int) $socid);
 	}
 	// Filter on sale representative
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = ff.fk_soc AND sc.fk_user = ".((int) $user->id).")";
 	}
 	// Add where from hooks
@@ -624,7 +624,7 @@ if (isModEnabled('invoice') && isModEnabled('order') && $user->hasRight("command
 	$sql .= " AND c.fk_statut = ".((int) Commande::STATUS_CLOSED);
 	$sql .= " AND c.facture = 0";
 	// Filter on sale representative
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = c.fk_soc AND sc.fk_user = ".((int) $user->id).")";
 	}
 
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 633034c27f4..8bf66f9fe2e 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2279,7 +2279,7 @@ class Contrat extends CommonObject
 		$this->from = " FROM ".MAIN_DB_PREFIX."contrat as c";
 		$this->from .= ", ".MAIN_DB_PREFIX."contratdet as cd";
 		$this->from .= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$this->from .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 
@@ -2310,7 +2310,7 @@ class Contrat extends CommonObject
 		if ($user->socid) {
 			$sql .= " AND c.fk_soc = ".((int) $user->socid);
 		}
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 
@@ -2376,7 +2376,7 @@ class Contrat extends CommonObject
 		$sql = "SELECT count(c.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index bc5af219667..09d8e040b26 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -200,7 +200,7 @@ $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 '@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
 
-if (!$user->hasRight('societe', 'client', 'voir')) {
+if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 	$search_sale = $user->id;
 }
 
@@ -875,7 +875,7 @@ if (!empty($arrayfields['c.ref_supplier']['checked'])) {
 }
 if (!empty($arrayfields['s.nom']['checked'])) {
 	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" size="8" name="search_name" value="'.dol_escape_htmltag($search_name).'">';
+	print '<input type="text" class="flat" size="8" name="search_name" value="'.dol_escape_htmltag($search_name).'"'.($user->socid > 0 ? " disabled" : "").'>';
 	print '</td>';
 }
 if (!empty($arrayfields['s.email']['checked'])) {
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index 633914ce74b..1cd2a57f3dc 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -83,14 +83,14 @@ class box_actions extends ModeleBoxes
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm AS ta, ".MAIN_DB_PREFIX."actioncomm AS a";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
 			}
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 			$sql .= " WHERE a.fk_action = ta.id";
 			$sql .= " AND a.entity IN (".getEntity('actioncomm').")";
 			$sql .= " AND a.percent >= 0 AND a.percent < 100";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".((int) $user->id).")";
 			}
 			if ($user->socid) {
diff --git a/htdocs/core/boxes/box_actions_future.php b/htdocs/core/boxes/box_actions_future.php
index 6a202bd9f2b..e9d8841fcc9 100644
--- a/htdocs/core/boxes/box_actions_future.php
+++ b/htdocs/core/boxes/box_actions_future.php
@@ -85,14 +85,14 @@ class box_actions_future extends ModeleBoxes
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm AS ta, ".MAIN_DB_PREFIX."actioncomm AS a";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
 			}
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 			$sql .= " WHERE a.fk_action = ta.id";
 			$sql .= " AND a.entity IN (".getEntity('actioncomm').")";
 			//$sql .= " AND a.percent >= 0 AND a.percent < 100";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".((int) $user->id).")";
 			}
 			if ($user->socid) {
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 88571ed872b..3c8d2ce6a83 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -104,13 +104,13 @@ class box_activity extends ModeleBoxes
 
 			$sql = "SELECT p.fk_statut, SUM(p.total_ttc) as Mnttot, COUNT(*) as nb";
 			$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= ")";
 			$sql .= " WHERE p.entity IN (".getEntity('propal').")";
 			$sql .= " AND p.fk_soc = s.rowid";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($user->socid) {
@@ -193,13 +193,13 @@ class box_activity extends ModeleBoxes
 
 			$sql = "SELECT c.fk_statut, sum(c.total_ttc) as Mnttot, count(*) as nb";
 			$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= ")";
 			$sql .= " WHERE c.entity IN (".getEntity('commande').")";
 			$sql .= " AND c.fk_soc = s.rowid";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($user->socid) {
@@ -278,12 +278,12 @@ class box_activity extends ModeleBoxes
 			$data = array();
 			$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
 			$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= ")";
 			$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($user->socid) {
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 7201ec1da11..a8d706fdb63 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -85,12 +85,12 @@ class box_clients extends ModeleBoxes
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE s.client IN (1, 3)";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			// Add where from hooks
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index d7a87dacbfa..bbb226fcf03 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -92,7 +92,7 @@ class box_commandes extends ModeleBoxes
 			$sql .= ", c.total_tva";
 			$sql .= ", c.total_ttc";
 			$sql .= " FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE c.fk_soc = s.rowid";
@@ -100,7 +100,7 @@ class box_commandes extends ModeleBoxes
 			if (getDolGlobalString('ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY')) {
 				$sql .= " AND c.fk_statut = 1";
 			}
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($user->socid) {
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index b9be887b2ed..0d5f91eb35f 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -98,11 +98,11 @@ class box_contacts extends ModeleBoxes
 			if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 				$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
 			}
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			$sql .= " AND ((sp.fk_user_creat = ".((int) $user->id)." AND sp.priv = 1) OR sp.priv = 0)"; // check if this is a private contact
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index 2f32b170066..2653acb63a1 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -77,12 +77,12 @@ class box_contracts extends ModeleBoxes
 			$sql .= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.tms as date_modification, c.fin_validite, c.date_cloture,";
 			$sql .= " c.ref_customer, c.ref_supplier";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE c.fk_soc = s.rowid";
 			$sql .= " AND c.entity = ".$conf->entity;
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($user->socid) {
diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
index 3aaf3082ae3..57237f6a318 100644
--- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
+++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
@@ -84,12 +84,12 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 			$sql .= ", s.outstanding_limit";
 			$sql .= ", s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE s.client IN (1, 3)";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($user->socid) {
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 3e8de6c90e8..8a4f99ffb1c 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -93,12 +93,12 @@ class box_factures extends ModeleBoxes
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture,";
 			$sql .= " ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE f.fk_soc = s.rowid";
 			$sql .= " AND f.entity IN (".getEntity('invoice').")";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($user->socid) {
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index cfaeddc5b0f..4e874faa4eb 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -91,12 +91,12 @@ class box_factures_fourn extends ModeleBoxes
 			$sql .= ', f.date_lim_reglement as datelimite, f.tms, f.type';
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE f.fk_soc = s.rowid";
 			$sql .= " AND f.entity = ".$conf->entity;
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($user->socid) {
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index c75418ae958..24cecd0024a 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -93,14 +93,14 @@ class box_factures_fourn_imp extends ModeleBoxes
 			$sql2 = " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql2 .= ",".MAIN_DB_PREFIX."facture_fourn as f";
 			$sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf ON f.rowid = pf.fk_facturefourn";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql2 .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql2 .= " WHERE f.fk_soc = s.rowid";
 			$sql2 .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 			$sql2 .= " AND f.paye = 0";
 			$sql2 .= " AND fk_statut = 1";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql2 .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($user->socid) {
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 6cfb7650547..8f52032b742 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -102,7 +102,7 @@ class box_factures_imp extends ModeleBoxes
 			if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 				$sql2 .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
 			}
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql2 .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql2 .= ", ".MAIN_DB_PREFIX."facture as f";
@@ -111,7 +111,7 @@ class box_factures_imp extends ModeleBoxes
 			$sql2 .= " AND f.entity IN (".getEntity('invoice').")";
 			$sql2 .= " AND f.paye = 0";
 			$sql2 .= " AND fk_statut = 1";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql2 .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($user->socid) {
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index 636c2b6eb2a..7da9d06d350 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -80,13 +80,13 @@ class box_ficheinter extends ModeleBoxes
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= ", ".MAIN_DB_PREFIX."fichinter as f";
 			$sql .= " WHERE f.fk_soc = s.rowid ";
 			$sql .= " AND f.entity = ".$conf->entity;
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($user->socid) {
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index ee5ae31472f..b54c5d7074a 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -78,12 +78,12 @@ class box_fournisseurs extends ModeleBoxes
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE s.fournisseur = 1";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			// Add where from hooks
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index e153e4bbe92..0597d7ec8de 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -93,7 +93,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 		if ($user->socid) {
 			$socid = $user->socid;
 		}
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
 		}
 
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index 9922fc1e881..3b2b4370237 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -81,12 +81,12 @@ class box_propales extends ModeleBoxes
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", p.rowid, p.ref, p.fk_statut as status, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.total_tva, p.total_ttc, p.tms";
 			$sql .= " FROM ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE p.fk_soc = s.rowid";
 			$sql .= " AND p.entity IN (".getEntity('propal').")";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($user->socid) {
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index aa4725935ab..159c9bca946 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -86,12 +86,12 @@ class box_prospect extends ModeleBoxes
 			$sql .= ", s.fk_stcomm";
 			$sql .= ", s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE s.client IN (2, 3)";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			// Add where from hooks
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index 6a9dd91c55a..21259696bfb 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -86,7 +86,7 @@ class box_services_contracts extends ModeleBoxes
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."contrat as c ON s.rowid = c.fk_soc";
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			$sql .= ")";
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index e2dea31cd4a..0e6b66add1b 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -74,7 +74,7 @@ class box_services_expired extends ModeleBoxes
 			$sql .= " s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 			$sql .= " MIN(cd.date_fin_validite) as date_line, COUNT(cd.rowid) as nb_services";
 			$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE cd.statut = 4 AND cd.date_fin_validite <= '".$this->db->idate($now)."'";
@@ -83,7 +83,7 @@ class box_services_expired extends ModeleBoxes
 			if ($user->socid) {
 				$sql .= ' AND c.fk_soc = '.((int) $user->socid);
 			}
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			$sql .= " GROUP BY c.rowid, c.ref, c.statut, c.date_contrat, c.ref_customer, c.ref_supplier, s.nom, s.rowid";
diff --git a/htdocs/core/boxes/box_shipments.php b/htdocs/core/boxes/box_shipments.php
index 512dbc6a944..42fa9b4821c 100644
--- a/htdocs/core/boxes/box_shipments.php
+++ b/htdocs/core/boxes/box_shipments.php
@@ -92,7 +92,7 @@ class box_shipments extends ModeleBoxes
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
 			}
 			$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
@@ -102,7 +102,7 @@ class box_shipments extends ModeleBoxes
 			if ($user->socid > 0) {
 				$sql.= " AND s.rowid = ".((int) $user->socid);
 			}
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND sc.fk_user = ".((int) $user->id);
 			} else {
 				$sql .= " ORDER BY e.tms DESC, e.date_delivery DESC, e.ref DESC";
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 88e87cff07b..3287e20c852 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -84,12 +84,12 @@ class box_supplier_orders extends ModeleBoxes
 			$sql .= ", c.fk_statut as status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE c.fk_soc = s.rowid";
 			$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($user->socid) {
diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
index acddab7dc23..86f30d122e1 100644
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
@@ -81,14 +81,14 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
 			$sql .= ", c.fk_statut as status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
 			$sql .= " WHERE c.fk_soc = s.rowid";
 			$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
 			$sql .= " AND c.date_livraison IS NOT NULL";
 			$sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.")";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
+			if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			if ($user->socid) {
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index b1af5dbd95e..dee5549fee8 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -492,6 +492,7 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)
 	$result = '';
 
 	if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
+		if ($user->socid > 0) $socid = $user->socid;
 		$maxofloop = (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
 
 		$tmpinvoice = new Facture($db);
@@ -502,16 +503,16 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)
 		$sql .= ", s.rowid as socid, s.email";
 		$sql .= ", s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur";
 		$sql .= ", cc.rowid as country_id, cc.code as country_code";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", sc.fk_soc, sc.fk_user ";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE s.rowid = f.fk_soc AND f.fk_statut = ".Facture::STATUS_DRAFT;
 		$sql .= " AND f.entity IN (".getEntity('invoice').")";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 
@@ -526,7 +527,7 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)
 		$sql .= " GROUP BY f.rowid, f.ref, f.datef, f.total_ht, f.total_tva, f.total_ttc, f.ref_client, f.type, f.fk_statut, f.paye,";
 		$sql .= " s.nom, s.rowid, s.email, s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur,";
 		$sql .= " cc.rowid, cc.code";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", sc.fk_soc, sc.fk_user";
 		}
 
@@ -642,6 +643,7 @@ function getDraftSupplierTable($maxCount = 500, $socid = 0)
 	$result = '';
 
 	if ((isModEnabled('fournisseur') || isModEnabled('supplier_invoice')) && $user->hasRight('facture', 'lire')) {
+		if ($user->socid > 0) $socid = $user->socid;
 		$maxofloop = (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
 
 		$facturesupplierstatic = new FactureFournisseur($db);
@@ -653,12 +655,12 @@ function getDraftSupplierTable($maxCount = 500, $socid = 0)
 		$sql .= ", s.code_fournisseur, s.code_compta_fournisseur";
 		$sql .= ", cc.rowid as country_id, cc.code as country_code";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE s.rowid = f.fk_soc AND f.fk_statut = ".FactureFournisseur::STATUS_DRAFT;
 		$sql .= " AND f.entity IN (".getEntity('invoice').')';
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($socid) {
@@ -773,12 +775,12 @@ function getDraftSupplierTable($maxCount = 500, $socid = 0)
 function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 {
 	global $conf, $db, $langs, $user;
-
+	if ($user->socid > 0) $socid = $user->socid;
 	$sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, f.type, f.total_ht, f.total_tva, f.total_ttc, f.datec,";
 	$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE f.fk_soc = s.rowid";
@@ -786,7 +788,7 @@ function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 	if ($socid) {
 		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	$sql .= " ORDER BY f.tms DESC";
@@ -881,12 +883,12 @@ function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 function getPurchaseInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 {
 	global $conf, $db, $langs, $user;
-
+	if ($user->socid > 0) $socid = $user->socid;
 	$sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, f.total_ht, f.total_tva, f.total_ttc, f.type, f.ref_supplier, f.datec,";
 	$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE f.fk_soc = s.rowid";
@@ -894,7 +896,7 @@ function getPurchaseInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 	if ($socid) {
 		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	$sql .= " ORDER BY f.tms DESC";
@@ -999,6 +1001,7 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 	$result = '';
 
 	if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
+		if ($user->socid > 0) $socid = $user->socid;
 		$tmpinvoice = new Facture($db);
 
 		$sql = "SELECT f.rowid, f.ref, f.fk_statut as status, f.datef, f.type, f.total_ht, f.total_tva, f.total_ttc, f.paye, f.tms";
@@ -1011,12 +1014,12 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 		$sql .= ", sum(pf.amount) as am";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays,".MAIN_DB_PREFIX."facture as f";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE s.rowid = f.fk_soc AND f.paye = 0 AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 		$sql .= " AND f.entity IN (".getEntity('invoice').')';
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($socid) {
@@ -1187,6 +1190,7 @@ function getPurchaseInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 	$result = '';
 
 	if (isModEnabled("supplier_invoice") && ($user->hasRight('fournisseur', 'facture', 'lire') || $user->hasRight('supplier_invoice', 'read'))) {
+		if ($user->socid > 0) $socid = $user->socid;		
 		$facstatic = new FactureFournisseur($db);
 
 		$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut as status, ff.type, ff.libelle as label, ff.total_ht, ff.total_tva, ff.total_ttc, ff.paye";
@@ -1198,14 +1202,14 @@ function getPurchaseInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 		$sql .= ", sum(pf.amount) as am";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE s.rowid = ff.fk_soc";
 		$sql .= " AND ff.entity = ".$conf->entity;
 		$sql .= " AND ff.paye = 0";
 		$sql .= " AND ff.fk_statut = ".FactureFournisseur::STATUS_VALIDATED;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($socid) {
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 2f2d71a978b..72bf04842b8 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -239,11 +239,11 @@ function getCustomerOrderPieChart($socid = 0)
 	/*
 	 * Statistics
 	 */
-
+	if ($user->socid > 0) $socid = $user->socid;
 	$sql = "SELECT count(c.rowid) as nb, c.fk_statut as status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."commande as c";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE c.fk_soc = s.rowid";
@@ -251,7 +251,7 @@ function getCustomerOrderPieChart($socid = 0)
 	if ($user->socid) {
 		$sql .= ' AND c.fk_soc = '.((int) $user->socid);
 	}
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	$sql .= " GROUP BY c.fk_statut";
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index 46cf91ce684..f9247d84d1f 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -217,15 +217,15 @@ function getCustomerProposalPieChart($socid = 0)
 	if (!isModEnabled('propal') || !$user->hasRight('propal', 'lire')) {
 		return '';
 	}
-
+	
 	$listofstatus = array(Propal::STATUS_DRAFT, Propal::STATUS_VALIDATED, Propal::STATUS_SIGNED, Propal::STATUS_NOTSIGNED, Propal::STATUS_BILLED);
 
 	$propalstatic = new Propal($db);
-
+	if ($user->socid > 0) $socid = $user->socid;
 	$sql = "SELECT count(p.rowid) as nb, p.fk_statut as status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."propal as p";
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if ($user->socid == 0 && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";
@@ -233,7 +233,7 @@ function getCustomerProposalPieChart($socid = 0)
 	if ($user->socid) {
 		$sql .= ' AND p.fk_soc = '.((int) $user->socid);
 	}
-	if (!$user->hasRight('societe', 'client', 'voir')) {
+	if ($user->socid == 0 && !$user->hasRight('societe', 'client', 'voir')) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	$sql .= " AND p.fk_statut IN (".$db->sanitize(implode(" ,", $listofstatus)).")";
diff --git a/htdocs/fichinter/class/fichinterstats.class.php b/htdocs/fichinter/class/fichinterstats.class.php
index 15d19eaba73..fea03d405fa 100644
--- a/htdocs/fichinter/class/fichinterstats.class.php
+++ b/htdocs/fichinter/class/fichinterstats.class.php
@@ -98,7 +98,7 @@ class FichinterStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
@@ -122,7 +122,7 @@ class FichinterStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, 0";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE ".$this->where;
@@ -145,7 +145,7 @@ class FichinterStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%m') as dm, 0";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
@@ -169,7 +169,7 @@ class FichinterStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%m') as dm, 0";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
@@ -191,7 +191,7 @@ class FichinterStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as year, COUNT(*) as nb, 0 as total, 0 as avg";
 		$sql .= " FROM ".$this->from;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE ".$this->where;
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 08b4b55373a..450396fbe2b 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -296,7 +296,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
-if (!$user->hasRight('societe', 'client', 'voir')) {
+if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 5eea5501d69..cb94ccd7366 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3207,7 +3207,7 @@ class CommandeFournisseur extends CommonOrder
 		$sql = "SELECT count(co.rowid) as nb";
 		$sql .= " FROM ".$this->db->prefix()."commande_fournisseur as co";
 		$sql .= " LEFT JOIN ".$this->db->prefix()."societe as s ON co.fk_soc = s.rowid";
-		if (!$user->hasRight("societe", "client", "voir") && !$user->socid) {
+		if (empty($user->socid) && !$user->hasRight("societe", "client", "voir") && !$user->socid) {
 			$sql .= " LEFT JOIN ".$this->db->prefix()."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
@@ -3243,7 +3243,7 @@ class CommandeFournisseur extends CommonOrder
 
 		$sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.fk_statut, c.date_livraison as delivery_date, c.total_ht";
 		$sql .= " FROM ".$this->db->prefix()."commande_fournisseur as c";
-		if (!$user->hasRight("societe", "client", "voir") && !$user->socid) {
+		if (empty($user->socid) && !$user->hasRight("societe", "client", "voir") && !$user->socid) {
 			$sql .= " JOIN ".$this->db->prefix()."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		$sql .= " WHERE c.entity = ".$conf->entity;
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 79b345dab2c..0ca5cf7f339 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -2703,7 +2703,7 @@ class FactureFournisseur extends CommonInvoice
 
 		$sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut as status, ff.total_ht, ff.total_ttc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as ff';
-		if (!$user->hasRight("societe", "client", "voir") && !$user->socid) {
+		if (empty($user->socid) && !$user->hasRight("societe", "client", "voir")) {
 			$sql .= " JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ff.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		$sql .= ' WHERE ff.paye = 0';
@@ -3123,7 +3123,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql = "SELECT count(f.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
-		if (!$user->hasRight("societe", "client", "voir") && !$user->socid) {
+		if (empty($user->socid) && !$user->hasRight("societe", "client", "voir")) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 959533d131d..6437570bf0f 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1943,7 +1943,7 @@ class SupplierProposal extends CommonObject
 		$ga = array();
 
 		$search_sale = 0;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$search_sale = $user->id;
 		}
 
@@ -2212,7 +2212,7 @@ class SupplierProposal extends CommonObject
 	public function load_board($user, $mode)
 	{
 		// phpcs:enable
-		global $conf, $user, $langs;
+		global $conf, $langs;
 
 		$now = dol_now();
 
@@ -2220,7 +2220,7 @@ class SupplierProposal extends CommonObject
 
 		$sql = "SELECT p.rowid, p.ref, p.datec as datec, p.date_cloture as datefin";
 		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = " AND";
@@ -2377,7 +2377,7 @@ class SupplierProposal extends CommonObject
 		$sql = "SELECT count(p.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 4791136e400..839b4e89efa 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -891,7 +891,7 @@ class Ticket extends CommonObject
 		$socid = $user->socid ? $user->socid : 0;
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$search_sale = $user->id;
 		}
 		// Search on sale representative
@@ -3156,7 +3156,7 @@ class Ticket extends CommonObject
 
 		$sql = "SELECT p.rowid, p.ref, p.datec as datec";
 		$sql .= " FROM ".MAIN_DB_PREFIX."ticket as p";
-		if (isModEnabled('societe') && !$user->hasRight('societe', 'client', 'voir') && !$user->socid) {
+		if (empty($user->socid) && isModEnabled('societe') && !$user->hasRight('societe', 'client', 'voir') && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = " AND";
@@ -3220,7 +3220,7 @@ class Ticket extends CommonObject
 		$sql = "SELECT count(p.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."ticket as p";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
+		if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";

From df88c74d119c0da18880b7f73c6e411f4c630927 Mon Sep 17 00:00:00 2001
From: vmaury <artec.vm@arnac.net>
Date: Mon, 13 Jan 2025 12:04:16 +0100
Subject: [PATCH 041/602] Fix 31370 Pb with external account

---
 htdocs/core/lib/invoice.lib.php | 2 +-
 htdocs/core/lib/propal.lib.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index dee5549fee8..7eecd6b0131 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -1190,7 +1190,7 @@ function getPurchaseInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 	$result = '';
 
 	if (isModEnabled("supplier_invoice") && ($user->hasRight('fournisseur', 'facture', 'lire') || $user->hasRight('supplier_invoice', 'read'))) {
-		if ($user->socid > 0) $socid = $user->socid;		
+		if ($user->socid > 0) $socid = $user->socid;
 		$facstatic = new FactureFournisseur($db);
 
 		$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut as status, ff.type, ff.libelle as label, ff.total_ht, ff.total_tva, ff.total_ttc, ff.paye";
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index f9247d84d1f..6ec7c824cee 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -217,7 +217,7 @@ function getCustomerProposalPieChart($socid = 0)
 	if (!isModEnabled('propal') || !$user->hasRight('propal', 'lire')) {
 		return '';
 	}
-	
+
 	$listofstatus = array(Propal::STATUS_DRAFT, Propal::STATUS_VALIDATED, Propal::STATUS_SIGNED, Propal::STATUS_NOTSIGNED, Propal::STATUS_BILLED);
 
 	$propalstatic = new Propal($db);

From db47ce3bb129a1dde64bf3348b46a4e2073acb09 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Mon, 20 Jan 2025 11:33:24 +0100
Subject: [PATCH 042/602] FIX delete supplier order line when linked to
 customer order line

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 020b551f99a..156ec3971ef 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3894,7 +3894,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
 			return -1;
 		}
 
-		$sql1 = 'UPDATE '.MAIN_DB_PREFIX."commandedet SET fk_commandefourndet = NULL WHERE rowid=".((int) $this->id);
+		$sql1 = 'UPDATE '.MAIN_DB_PREFIX."commandedet SET fk_commandefourndet = NULL WHERE fk_commandefourndet=".((int) $this->id);
 		$resql = $this->db->query($sql1);
 		if (!$resql) {
 			$this->db->rollback();

From 426f4305b05c6696994a8ebce17b4c4b7d6b6ac2 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Mon, 20 Jan 2025 11:48:37 +0100
Subject: [PATCH 043/602] FIX delete supplier order when at least one line
 linked to customer order line

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index b98f14aa074..60b6f98f0cf 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2312,6 +2312,16 @@ class CommandeFournisseur extends CommonOrder
 			$error++;
 		}
 
+		if (!$error) {
+			$sql1 = 'UPDATE '.$this->db->prefix()."commandedet SET fk_commandefourndet = NULL WHERE fk_commandefourndet IN (SELECT rowid FROM ".$main." WHERE fk_commande = ".((int) $this->id).")";
+			dol_syslog(__METHOD__." linked order lines", LOG_DEBUG);
+			if (!$this->db->query($sql1)) {
+				$error++;
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->db->lasterror();
+			}
+		}
+
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE fk_commande =".((int) $this->id);
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		if (!$this->db->query($sql)) {

From 08a976fd8545ec7edfa17543fb099f74d6a84a9d Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Mon, 20 Jan 2025 11:56:54 +0100
Subject: [PATCH 044/602] FIX delete supplier order when at least one line
 linked to customer order line

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 156ec3971ef..8bd670525a1 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2133,6 +2133,16 @@ class CommandeFournisseur extends CommonOrder
 			$error++;
 		}
 
+		if (!$error) {
+			$sql1 = "UPDATE ".MAIN_DB_PREFIX."commandedet SET fk_commandefourndet = NULL WHERE fk_commandefourndet IN (SELECT rowid FROM ".$main." WHERE fk_commande = ".((int) $this->id).")";
+			dol_syslog(__METHOD__." linked order lines", LOG_DEBUG);
+			if (!$this->db->query($sql1)) {
+				$error++;
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->db->lasterror();
+			}
+		}
+
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE fk_commande =".((int) $this->id);
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		if (!$this->db->query($sql)) {

From ad60a50d4de17dedcbf6244ff9082343148785d1 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Mon, 20 Jan 2025 11:58:58 +0100
Subject: [PATCH 045/602] Uniformize SQL concat char

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 8bd670525a1..0e16160189e 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3904,7 +3904,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
 			return -1;
 		}
 
-		$sql1 = 'UPDATE '.MAIN_DB_PREFIX."commandedet SET fk_commandefourndet = NULL WHERE fk_commandefourndet=".((int) $this->id);
+		$sql1 = "UPDATE ".MAIN_DB_PREFIX."commandedet SET fk_commandefourndet = NULL WHERE fk_commandefourndet=".((int) $this->id);
 		$resql = $this->db->query($sql1);
 		if (!$resql) {
 			$this->db->rollback();

From 7f2a253625148d02dc94a2513e2a8251020e8c3f Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Mon, 20 Jan 2025 12:17:12 +0100
Subject: [PATCH 046/602] Uniformize SQL concat char

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 60b6f98f0cf..6ad989bceb5 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2313,7 +2313,7 @@ class CommandeFournisseur extends CommonOrder
 		}
 
 		if (!$error) {
-			$sql1 = 'UPDATE '.$this->db->prefix()."commandedet SET fk_commandefourndet = NULL WHERE fk_commandefourndet IN (SELECT rowid FROM ".$main." WHERE fk_commande = ".((int) $this->id).")";
+			$sql1 = "UPDATE ".$this->db->prefix()."commandedet SET fk_commandefourndet = NULL WHERE fk_commandefourndet IN (SELECT rowid FROM ".$main." WHERE fk_commande = ".((int) $this->id).")";
 			dol_syslog(__METHOD__." linked order lines", LOG_DEBUG);
 			if (!$this->db->query($sql1)) {
 				$error++;
@@ -4147,7 +4147,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
 			return -1;
 		}
 
-		$sql1 = 'UPDATE '.MAIN_DB_PREFIX."commandedet SET fk_commandefourndet = NULL WHERE fk_commandefourndet=".((int) $this->id);
+		$sql1 = "UPDATE ".MAIN_DB_PREFIX."commandedet SET fk_commandefourndet = NULL WHERE fk_commandefourndet=".((int) $this->id);
 		$resql = $this->db->query($sql1);
 		if (!$resql) {
 			$this->db->rollback();

From 1ca277faeff8819d40c0df8153c5ec7ec292226a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina=20JOUM?= <melina.joum@altairis.fr>
Date: Mon, 20 Jan 2025 12:36:10 +0100
Subject: [PATCH 047/602] NEW: Use the packaging feature to round the
 quantities to some given multiples for the sale

---
 htdocs/product/admin/product.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index d38409f9eaa..92f698ed976 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -169,6 +169,11 @@ if ($action == 'other') {
 		$value = GETPOST('PRODUCT_USE_SUPPLIER_PACKAGING', 'alpha');
 		$res = dolibarr_set_const($db, "PRODUCT_USE_SUPPLIER_PACKAGING", $value, 'chaine', 0, '', $conf->entity);
 	}
+
+	if (GETPOSTISSET('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+		$value = GETPOST('PRODUCT_USE_CUSTOMER_PACKAGING', 'alpha');
+		$res = dolibarr_set_const($db, "PRODUCT_USE_CUSTOMER_PACKAGING", $value, 'chaine', 0, '', $conf->entity);
+	}
 }
 
 
@@ -642,6 +647,17 @@ if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
 	print '</tr>';
 }
 
+// Use packaging during your sales
+if (isModEnabled("order") || isModEnabled("invoice")) {
+	print '<tr class="oddeven">';
+	print '<td>'.$form->textwithpicto($langs->trans("UseProductCustomerPackaging"), $langs->trans("PackagingForThisProductSellDesc")).'</td>';
+	print '<td align="right">';
+	print ajax_constantonoff("PRODUCT_USE_CUSTOMER_PACKAGING", array(), $conf->entity, 0, 0, 0, 0);
+	//print $form->selectyesno("activate_useProdSupplierPackaging", (!empty($conf->global->PRODUCT_USE_CUSTOMER_PACKAGING) ? $conf->global->PRODUCT_USE_CUSTOMER_PACKAGING : 0), 1);
+	print '</td>';
+	print '</tr>';
+}
+
 print '</table>';
 print '</div>';
 

From a14a474a708c117906bd91f96f35dd7820ed7350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina=20JOUM?= <melina.joum@altairis.fr>
Date: Mon, 20 Jan 2025 12:43:30 +0100
Subject: [PATCH 048/602] ADD: packaging to round the quantities to some given
 multiples for the sale prices

---
 htdocs/product/class/product.class.php | 13 ++++++++++++
 htdocs/product/price.php               | 28 ++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index fa3cc2b2d4e..d0b9dfd9738 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1438,6 +1438,9 @@ class Product extends CommonObject
 		$this->accountancy_code_sell_intra = trim($this->accountancy_code_sell_intra);
 		$this->accountancy_code_sell_export = trim($this->accountancy_code_sell_export);
 
+		if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING') && !empty($this->packaging)) {
+			$this->packaging = $this->packaging;
+		}
 
 		$this->db->begin();
 
@@ -1588,6 +1591,9 @@ class Product extends CommonObject
 			$sql .= ", fk_price_expression = ".($this->fk_price_expression != 0 ? (int) $this->fk_price_expression : 'NULL');
 			$sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id : 'NULL');
 			$sql .= ", mandatory_period = ".($this->mandatory_period);
+			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING') && !empty($this->packaging)) {
+				$sql .= ", packaging = ".($this->packaging);
+			}
 			// stock field is not here because it is a denormalized value from product_stock.
 			$sql .= " WHERE rowid = ".((int) $id);
 
@@ -2888,6 +2894,9 @@ class Product extends CommonObject
 		} else {
 			$sql .= " ppe.accountancy_code_buy, ppe.accountancy_code_buy_intra, ppe.accountancy_code_buy_export, ppe.accountancy_code_sell, ppe.accountancy_code_sell_intra, ppe.accountancy_code_sell_export,";
 		}
+		if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+			$sql .= " p.packaging,";
+		}
 
 		// For MultiCompany
 		// PMP per entity & Stocks Sharings stock_reel includes only stocks shared with this entity
@@ -3067,6 +3076,10 @@ class Product extends CommonObject
 
 				$this->mandatory_period = $obj->mandatory_period;
 
+				if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+					$this->packaging = $obj->packaging;
+				}
+
 				$this->db->free($resql);
 
 				// fetch optionals attributes and labels
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index c0d130de0db..aba3ab981c7 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -283,6 +283,11 @@ if (empty($reshook)) {
 		$psq = empty($newpsq) ? 0 : $newpsq;
 		$maxpricesupplier = $object->min_recommended_price();
 
+		// Packaging / Conditionnement
+		if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+			$packaging = GETPOST('packaging');
+		}
+
 		if (isModEnabled('dynamicprices')) {
 			$object->fk_price_expression = empty($eid) ? 0 : $eid; //0 discards expression
 
@@ -481,6 +486,11 @@ if (empty($reshook)) {
 		if (!$error) {
 			$db->begin();
 
+			// Packaging / Conditionnement
+			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+				$object->packaging = $packaging;
+			}
+
 			foreach ($pricestoupdate as $key => $val) {
 				$newprice = $val['price'];
 
@@ -1421,6 +1431,13 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUS
 	}
 	print '</td></tr>';
 
+	// Packaging / Conditionnement
+	if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+		print '<tr class="field_price_label"><td>'.$form->textwithpicto($langs->trans("PackagingForThisProduct"), $langs->trans("PackagingForThisProductSellDesc")).'</td><td>';
+		print $object->packaging;
+		print '</td></tr>';
+	}
+
 	// Price Label
 	print '<tr class="field_price_label"><td>'.$langs->trans("PriceLabel").'</td><td>';
 	print $object->price_label;
@@ -1743,6 +1760,17 @@ if (($action == 'edit_price' || $action == 'edit_level_price') && $object->getRi
 		print '</td>';
 		print '</tr>';
 
+		// Packaging / Conditionnement
+		if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+			print '<tr><td>';
+			print $form->textwithpicto($langs->trans("PackagingForThisProduct"), $langs->trans("PackagingForThisProductSellDesc"));
+			print '</td><td>';
+			$packaging = $object->packaging;
+			print '<input class="flat" name="packaging" size="5" value="'.$packaging.'">';
+			print '</td>';
+			print '</tr>';
+		}
+
 		// Price Label
 		print '<tr><td>';
 		print $langs->trans('PriceLabel');

From b7b0a29e42b7f502d94ffcabae8a7d2f6598b99a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina=20JOUM?= <melina.joum@altairis.fr>
Date: Mon, 20 Jan 2025 12:50:09 +0100
Subject: [PATCH 049/602] ADD: packaging to round the quantities to some given
 multiples for the sales orders

---
 htdocs/commande/class/commande.class.php  | 30 +++++++++++++++++++++++
 htdocs/commande/class/orderline.class.php | 11 +++++++++
 2 files changed, 41 insertions(+)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 474c50a7ff7..55bc6ff71a1 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1634,6 +1634,20 @@ class Commande extends CommonOrder
 
 			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
+			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+				$product = new Product($this->db);
+				$result = $product->fetch($fk_product);
+				if ($qty < $product->packaging) {
+					$qty = $product->packaging;
+				} else {
+					if (!empty($product->packaging) && (fmod((float) $qty, $product->packaging)  > 0.000001)) {
+						$coeff = intval((float) $qty / $product->packaging) + 1;
+						$qty = (float) $product->packaging * $coeff;
+						setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');
+					}
+				}
+			}
+
 			// Clean vat code
 			$reg = array();
 			$vat_src_code = '';
@@ -2192,6 +2206,10 @@ class Commande extends CommonOrder
 				$line->volume           = $objp->volume;
 				$line->volume_units     = $objp->volume_units;
 
+				if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+					$line->packaging = $objp->packaging;
+				}
+
 				$line->date_start       = $this->db->jdate($objp->date_start);
 				$line->date_end         = $this->db->jdate($objp->date_end);
 
@@ -3163,6 +3181,18 @@ class Commande extends CommonOrder
 				$this->line->rang = $rangmax + 1;
 			}
 
+			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+				if ($qty < $this->line->packaging) {
+					$qty = $this->line->packaging;
+				} else {
+					if (!empty($this->line->packaging) && ($qty % $this->line->packaging) > 0) {
+						$coeff = intval($qty / $this->line->packaging) + 1;
+						$qty = $this->line->packaging * $coeff;
+						setEventMessage($langs->trans('QtyRecalculatedWithPackaging'), 'mesgs');
+					}
+				}
+			}
+
 			$this->line->id = $rowid;
 			$this->line->label = $label;
 			$this->line->desc = $desc;
diff --git a/htdocs/commande/class/orderline.class.php b/htdocs/commande/class/orderline.class.php
index e16bde3054e..9db924777f5 100644
--- a/htdocs/commande/class/orderline.class.php
+++ b/htdocs/commande/class/orderline.class.php
@@ -145,6 +145,10 @@ class OrderLine extends CommonOrderLine
 	 */
 	public $skip_update_total;
 
+	/**
+	 * @var float
+	 */
+	public $packaging;
 
 	/**
 	 *      Constructor
@@ -171,6 +175,9 @@ class OrderLine extends CommonOrderLine
 		$sql .= ' cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc,';
 		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc, p.tobatch as product_tobatch,';
 		$sql .= ' cd.date_start, cd.date_end, cd.vat_src_code';
+		if (getDolGlobalInt('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+			$sql .= ', p.packaging'; 
+		}
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as cd';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
 		$sql .= ' WHERE cd.rowid = '.((int) $rowid);
@@ -225,6 +232,10 @@ class OrderLine extends CommonOrderLine
 			$this->product_tobatch  = $objp->product_tobatch;
 			$this->fk_unit          = $objp->fk_unit;
 
+			if (getDolGlobalInt('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+				$this->packaging      = $objp->packaging;
+			}
+
 			$this->date_start       = $this->db->jdate($objp->date_start);
 			$this->date_end         = $this->db->jdate($objp->date_end);
 

From 979a10fcb183d37005e67deafa2d87174c578552 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Jan 2025 15:26:06 +0100
Subject: [PATCH 050/602] Update list.php

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

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 7b7b2565569..aecb059d464 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -304,7 +304,7 @@ $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 '@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
 
-// Check only if it's an internal user, external users are already filterd by $socid
+// Check only if it's an internal user, external users are already filtered by $socid
 if (empty($user->socid) && !$user->hasRight('societe', 'client', 'voir')) {
 	$search_sale = $user->id;
 }

From 02dea8d103a8edd96746b0cfb3a307e9ed2f61ba Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 20 Jan 2025 17:11:06 +0100
Subject: [PATCH 051/602] fix: allow list mass action update price when price
 mode is multiprice price

---
 htdocs/core/actions_massactions.inc.php | 42 ++++++++++++++++++-------
 htdocs/product/list.php                 |  5 ++-
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 6e26ef0eca7..3f06f4f3e8c 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1281,18 +1281,38 @@ if (!$error && ($action == 'updateprice' && $confirm == 'yes') && $permissiontoa
 				$result = $object->fetch($toselectid);
 				//var_dump($contcats);exit;
 				if ($result > 0) {
-					if ($obj->price_base_type == 'TTC') {
-						$newprice = $object->price_ttc * (100 + $pricepercentage) / 100;
-						$minprice = $object->price_min_ttc;
+					if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
+						for ($level = 1; $level <= getDolGlobalInt('PRODUIT_MULTIPRICES_LIMIT'); $level++) {
+							// Force the update of the price of the product using the new VAT
+							if ($object->price_base_type == 'TTC') {
+								$newprice = $object->multiprices_ttc[$level] * (100 + $pricepercentage) / 100;
+								$minprice = $object->multiprices_min_ttc[$level];
+							} else {
+								$newprice = $object->multiprices[$level] * (100 + $pricepercentage) / 100;
+								$minprice = $object->multiprices_min[$level];
+							}
+							$ret = $object->updatePrice($newprice, $object->price_base_type, $user, $object->tva_tx, $minprice, $level, $object->tva_npr, 0, 0, array(), $object->default_vat_code);
+
+							if ($res > 0) {
+								$nbok++;
+							} else {
+								setEventMessages($object->error, $object->errors, 'errors');
+							}
+						}
 					} else {
-						$newprice = $object->price * (100 + $pricepercentage) / 100;
-						$minprice = $object->price_min;
-					}
-					$res = $object->updatePrice($newprice, $obj->price_base_type, $user, $object->tva_tx, $minprice, 0, $object->tva_npr, 0, 0, array(), $object->default_vat_code);
-					if ($res > 0) {
-						$nbok++;
-					} else {
-						setEventMessages($object->error, $object->errors, 'errors');
+						if ($object->price_base_type == 'TTC') {
+							$newprice = $object->price_ttc * (100 + $pricepercentage) / 100;
+							$minprice = $object->price_min_ttc;
+						} else {
+							$newprice = $object->price * (100 + $pricepercentage) / 100;
+							$minprice = $object->price_min;
+						}
+						$res = $object->updatePrice($newprice, $object->price_base_type, $user, $object->tva_tx, $minprice, 0, $object->tva_npr, 0, 0, array(), $object->default_vat_code);
+						if ($res > 0) {
+							$nbok++;
+						} else {
+							setEventMessages($object->error, $object->errors, 'errors');
+						}
 					}
 				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 4d817250cbe..cecce963be1 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -829,9 +829,8 @@ $arrayofmassactions = array(
 	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
 if ($user->hasRight($rightskey, 'creer')) {
-	if (getDolGlobalString('PRODUCT_PRICE_UNIQ') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
-		$arrayofmassactions['preupdateprice'] = img_picto('', 'edit', 'class="pictofixedwidth"').$langs->trans("UpdatePrice");
-	}
+	$arrayofmassactions['preupdateprice'] = img_picto('', 'edit', 'class="pictofixedwidth"').$langs->trans("UpdatePrice");
+
 
 	$arrayofmassactions['switchonsalestatus'] = img_picto('', 'stop-circle', 'class="pictofixedwidth"').$langs->trans("SwitchOnSaleStatus");
 	$arrayofmassactions['switchonpurchasestatus'] = img_picto('', 'stop-circle', 'class="pictofixedwidth"').$langs->trans("SwitchOnPurchaseStatus");

From e4078477c6c05d51caabeacfd8b5004bed0dffcb Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 20 Jan 2025 17:32:08 +0100
Subject: [PATCH 052/602] fix: allow list mass action update price when price
 mode is multiprice price

---
 htdocs/core/actions_massactions.inc.php | 3 +--
 htdocs/core/tpl/massactions_pre.tpl.php | 7 ++++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 3f06f4f3e8c..e84c02a8c93 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1291,8 +1291,7 @@ if (!$error && ($action == 'updateprice' && $confirm == 'yes') && $permissiontoa
 								$newprice = $object->multiprices[$level] * (100 + $pricepercentage) / 100;
 								$minprice = $object->multiprices_min[$level];
 							}
-							$ret = $object->updatePrice($newprice, $object->price_base_type, $user, $object->tva_tx, $minprice, $level, $object->tva_npr, 0, 0, array(), $object->default_vat_code);
-
+							$res = $object->updatePrice($newprice, $object->price_base_type, $user, $object->tva_tx, $minprice, $level, $object->tva_npr, 0, 0, array(), $object->default_vat_code);
 							if ($res > 0) {
 								$nbok++;
 							} else {
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 3c321f10123..bdbcee257f5 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -112,7 +112,12 @@ if ($massaction == 'preupdateprice') {
 				'value' => $valuefield
 			);
 
-	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmUpdatePrice"), $langs->trans("ConfirmUpdatePriceQuestion", count($toselect)), "updateprice", $formquestion, 1, 0, 200, 500, 1);
+	$descConfirmPreUpdatePrice=$langs->trans("ConfirmUpdatePriceQuestion", count($toselect));
+	if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
+		$descConfirmPreUpdatePrice=$langs->trans("ConfirmUpdatePriceQuestion", count($toselect)*getDolGlobalInt('PRODUIT_MULTIPRICES_LIMIT') .' ('.$langs->transnoentities('PricingRule').', '.$langs->transnoentities('MultiPricesNumPrices').')');
+	}
+
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmUpdatePrice"), $descConfirmPreUpdatePrice, "updateprice", $formquestion, 1, 0, 200, 500, 1);
 }
 
 if ($massaction == 'presetsupervisor') {

From be06fc32affc41b37a2b580ccdabf3fdda282586 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 20 Jan 2025 15:55:19 +0100
Subject: [PATCH 053/602] Qual: Fix ci for new api_memberstypes.class

# Qual: Fix ci for new api_memberstypes.class

This fixes the notifications for the new api_memberstypes.class
---
 htdocs/adherents/class/api_members.class.php  | 16 +++++++------
 .../class/api_memberstypes.class.php          | 23 +++++++++++++------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 19882d2fc11..55f5b61af8c 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2016	Xebax Christy	<xebax@wanadoo.fr>
- * Copyright (C) 2017	Regis Houssin	<regis.houssin@inodbox.com>
- * Copyright (C) 2020	Thibault FOUCART<support@ptibogxiv.net>
- * Copyright (C) 2020	Frédéric France	<frederic.france@netlogic.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+/* Copyright (C) 2016	    Xebax Christy	        <xebax@wanadoo.fr>
+ * Copyright (C) 2017	    Regis Houssin	        <regis.houssin@inodbox.com>
+ * Copyright (C) 2020	    Thibault FOUCART        <support@ptibogxiv.net>
+ * Copyright (C) 2020-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 class Members extends DolibarrApi
 {
 	/**
-	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 * @var string[]       Mandatory fields, checked when create and update object
 	 */
 	public static $FIELDS = array(
 		'morphy',
@@ -283,7 +283,9 @@ class Members extends DolibarrApi
 	/**
 	 * Create member object
 	 *
-	 * @param array $request_data   Request data
+	 * @param array	 $request_data   Request data
+	 * @phan-param ?array<string,string>	$request_data
+	 * @phpstan-param ?array<string,string>	$request_data
 	 * @return int  ID of member
 	 *
 	 * @throws	RestException	403		Access denied
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 32e9e105fa2..c96967f79ff 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017	Regis Houssin	<regis.houssin@inodbox.com>
+ * Copyright (C) 2025		MDW				<mdeweerd@users.noreply.github.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
@@ -28,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 class MembersTypes extends DolibarrApi
 {
 	/**
-	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 * @var string[]	Mandatory fields, checked when create and update object
 	 */
 	public static $FIELDS = array(
 		'label',
@@ -84,6 +85,8 @@ class MembersTypes extends DolibarrApi
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.libelle:like:'SO-%') and (t.subscription:=:'1')"
 	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return array                Array of member type objects
+	 * @phan-return AdherentType[]
+	 * @phpstan-return AdherentType[]
 	 *
 	 * @throws RestException
 	 */
@@ -143,7 +146,9 @@ class MembersTypes extends DolibarrApi
 	/**
 	 * Create member type object
 	 *
-	 * @param array $request_data   Request data
+	 * @param array	$request_data   Request data
+	 * @phan-param ?array<string,string>    $request_data
+	 * @phpstan-param ?array<string,string> $request_data
 	 * @return int  ID of member type
 	 */
 	public function post($request_data = null)
@@ -175,7 +180,9 @@ class MembersTypes extends DolibarrApi
 	 *
 	 * @param int   $id             ID of member type to update
 	 * @param array $request_data   Datas
-	 * @return int
+	 * @phan-param ?array<string,string>    $request_data
+	 * @phpstan-param ?array<string,string> $request_data
+	 * @return Object
 	 */
 	public function put($id, $request_data = null)
 	{
@@ -227,6 +234,8 @@ class MembersTypes extends DolibarrApi
 	 *
 	 * @param int $id   member type ID
 	 * @return array
+	 * @phan-return array<string,array{code:int,message:string}>
+	 * @phpstan-return array<string,array{code:int,message:string}>
 	 */
 	public function delete($id)
 	{
@@ -261,8 +270,8 @@ class MembersTypes extends DolibarrApi
 	/**
 	 * Validate fields before creating an object
 	 *
-	 * @param array|null    $data   Data to validate
-	 * @return array
+	 * @param ?array<null|int|float|string> $data   Data to validate
+	 * @return array<string,null|int|float|string>
 	 *
 	 * @throws RestException
 	 */
@@ -282,8 +291,8 @@ class MembersTypes extends DolibarrApi
 	/**
 	 * Clean sensible object datas
 	 *
-	 * @param   Object  $object    Object to clean
-	 * @return    Object    Object with cleaned properties
+	 * @param	Object  $object		Object to clean
+	 * @return	Object				Object with cleaned properties
 	 */
 	protected function _cleanObjectDatas($object)
 	{

From 576e70c3ce95da7511ce3c13f6b501c7a56d3d4c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 20 Jan 2025 22:32:30 +0100
Subject: [PATCH 054/602] FIX wrong update function parameter

---
 htdocs/fourn/class/api_supplier_invoices.class.php | 2 +-
 htdocs/ticket/class/api_tickets.class.php          | 2 +-
 htdocs/zapier/class/api_zapier.class.php           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 13dc0e8b094..1614552ee5c 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -272,7 +272,7 @@ class SupplierInvoices extends DolibarrApi
 			$this->invoice->$field = $value;
 		}
 
-		if ($this->invoice->update($id, DolibarrApiAccess::$user)) {
+		if ($this->invoice->update(DolibarrApiAccess::$user)) {
 			return $this->get($id);
 		}
 
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index 62f94b2491b..a40e54934a1 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -389,7 +389,7 @@ class Tickets extends DolibarrApi
 			$this->ticket->$field = $value;
 		}
 
-		if ($this->ticket->update($id, DolibarrApiAccess::$user)) {
+		if ($this->ticket->update(DolibarrApiAccess::$user)) {
 			return $this->get($id);
 		}
 
diff --git a/htdocs/zapier/class/api_zapier.class.php b/htdocs/zapier/class/api_zapier.class.php
index 5ff155aebf0..2ed4e984126 100644
--- a/htdocs/zapier/class/api_zapier.class.php
+++ b/htdocs/zapier/class/api_zapier.class.php
@@ -300,7 +300,7 @@ class Zapier extends DolibarrApi
 			$this->hook->$field = $value;
 		}
 
-		if ($this->hook->update($id, DolibarrApiAccess::$user) > 0) {
+		if ($this->hook->update(DolibarrApiAccess::$user) > 0) {
 			return $this->get($id);
 		} else {
 			throw new RestException(500, $this->hook->error);

From dc976ce2ec02e172c8074a666f1bc08850d4b478 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 20 Jan 2025 22:54:37 +0100
Subject: [PATCH 055/602] FIX remove socid when cloning a project without third
 parties

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

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index d4ecaff58a0..cf7cc5558a4 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1729,9 +1729,7 @@ class Project extends CommonObject
 		// Load source object
 		$clone_project->fetch($fromid);
 		$clone_project->fetch_optionals();
-		if ($newthirdpartyid > 0) {
-			$clone_project->socid = $newthirdpartyid;
-		}
+		$clone_project->socid = ($newthirdpartyid > 0 ? $newthirdpartyid : 0);
 		$clone_project->fetch_thirdparty();
 
 		$orign_dt_start = $clone_project->date_start;

From 3c2e6140a1fc3cd2a2fb6a9e9d31e2af2cb14682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina=20JOUM?= <melina.joum@altairis.fr>
Date: Tue, 21 Jan 2025 09:43:00 +0100
Subject: [PATCH 056/602] ADD: packaging to round the quantities to some given
 multiples for the commercials proposals

---
 htdocs/comm/propal/class/propal.class.php     | 26 +++++++++++++++++++
 .../comm/propal/class/propaleligne.class.php  | 11 ++++++++
 2 files changed, 37 insertions(+)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index a78da69017f..cb3cd883abe 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -709,6 +709,20 @@ class Propal extends CommonObject
 
 			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
+			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+				$product = new Product($this->db);
+				$result = $product->fetch($fk_product);
+				if ($qty < $product->packaging) {
+					$qty = $product->packaging;
+				} else {
+					if (!empty($product->packaging) && (fmod((float) $qty, $product->packaging)  > 0.000001)) {
+						$coeff = intval((float) $qty / $product->packaging) + 1;
+						$qty = (float) $product->packaging * $coeff;
+						setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');
+					}
+				}
+			}
+
 			// Clean vat code
 			$reg = array();
 			$vat_src_code = '';
@@ -974,6 +988,18 @@ class Propal extends CommonObject
 				$this->line->rang = $rangmax + 1;
 			}
 
+			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+				if ($qty < $this->line->packaging) {
+					$qty = $this->line->packaging;
+				} else {
+					if (!empty($this->line->packaging) && ($qty % $this->line->packaging) > 0) {
+						$coeff = intval($qty / $this->line->packaging) + 1;
+						$qty = $this->line->packaging * $coeff;
+						setEventMessage($langs->trans('QtyRecalculatedWithPackaging'), 'mesgs');
+					}
+				}
+			}
+
 			$this->line->id = $rowid;
 			$this->line->label = $label;
 			$this->line->desc = $desc;
diff --git a/htdocs/comm/propal/class/propaleligne.class.php b/htdocs/comm/propal/class/propaleligne.class.php
index ea403b5b363..817b6866f64 100644
--- a/htdocs/comm/propal/class/propaleligne.class.php
+++ b/htdocs/comm/propal/class/propaleligne.class.php
@@ -343,6 +343,10 @@ class PropaleLigne extends CommonObjectLine
 	 */
 	public $multicurrency_total_ttc;
 
+		/**
+	 * @var float
+	 */
+	public $packaging;
 
 	/**
 	 * 	Class line Constructor
@@ -370,6 +374,9 @@ class PropaleLigne extends CommonObjectLine
 		$sql .= ' pd.fk_multicurrency, pd.multicurrency_code, pd.multicurrency_subprice, pd.multicurrency_total_ht, pd.multicurrency_total_tva, pd.multicurrency_total_ttc,';
 		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
 		$sql .= ' pd.date_start, pd.date_end, pd.product_type';
+		if (getDolGlobalInt('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+			$sql .= ', p.packaging'; 
+		}
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'propaldet as pd';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pd.fk_product = p.rowid';
 		$sql .= ' WHERE pd.rowid = '.((int) $rowid);
@@ -418,6 +425,10 @@ class PropaleLigne extends CommonObjectLine
 				$this->product_desc		= $objp->product_desc;
 				$this->fk_unit          = $objp->fk_unit;
 
+				if (getDolGlobalInt('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+					$this->packaging      = $objp->packaging;
+				}
+
 				$this->date_start       = $this->db->jdate($objp->date_start);
 				$this->date_end         = $this->db->jdate($objp->date_end);
 

From 33d2969ab843fdb4330ff2f8d9e5c6816ee62409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina=20JOUM?= <melina.joum@altairis.fr>
Date: Tue, 21 Jan 2025 09:56:43 +0100
Subject: [PATCH 057/602] ADD: packaging to round the quantities to some given
 multiples for the invoices

---
 htdocs/compta/facture/class/facture.class.php | 26 +++++++++++++++++++
 .../facture/class/factureligne.class.php      | 12 +++++++++
 2 files changed, 38 insertions(+)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 179385b1aba..4964b9d9929 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3994,6 +3994,20 @@ class Facture extends CommonInvoice
 
 			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
+			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+				$product = new Product($this->db);
+				$result = $product->fetch($fk_product);
+				if ($qty < $product->packaging) {
+					$qty = $product->packaging;
+				} else {
+					if (!empty($product->packaging) && (fmod((float) $qty, $product->packaging)  > 0.000001)) {
+						$coeff = intval((float) $qty / $product->packaging) + 1;
+						$qty = (float) $product->packaging * $coeff;
+						setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');
+					}
+				}
+			}
+
 			// Clean vat code
 			$reg = array();
 			$vat_src_code = '';
@@ -4298,6 +4312,18 @@ class Facture extends CommonInvoice
 				$this->line->rang = $rangmax + 1;
 			}
 
+			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+				if ($qty < $this->line->packaging) {
+					$qty = $this->line->packaging;
+				} else {
+					if (!empty($this->line->packaging) && ($qty % $this->line->packaging) > 0) {
+						$coeff = intval($qty / $this->line->packaging) + 1;
+						$qty = $this->line->packaging * $coeff;
+						setEventMessage($langs->trans('QtyRecalculatedWithPackaging'), 'mesgs');
+					}
+				}
+			}
+
 			$this->line->id = $rowid;
 			$this->line->rowid = $rowid;
 			$this->line->label = $label;
diff --git a/htdocs/compta/facture/class/factureligne.class.php b/htdocs/compta/facture/class/factureligne.class.php
index e4e2b1a3ae2..c96f07c056b 100644
--- a/htdocs/compta/facture/class/factureligne.class.php
+++ b/htdocs/compta/facture/class/factureligne.class.php
@@ -180,6 +180,11 @@ class FactureLigne extends CommonInvoiceLine
 	 */
 	public $fk_prev_id;
 
+	/**
+	 * @var float
+	 */
+	public $packaging;
+
 
 	/**
 	 *      Constructor
@@ -211,6 +216,9 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= ' fd.multicurrency_total_tva,';
 		$sql .= ' fd.multicurrency_total_ttc,';
 		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc';
+		if (getDolGlobalInt('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+			$sql .= ', p.packaging'; 
+		}
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facturedet as fd';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON fd.fk_product = p.rowid';
 		$sql .= ' WHERE fd.rowid = '.((int) $rowid);
@@ -277,6 +285,10 @@ class FactureLigne extends CommonInvoiceLine
 			$this->multicurrency_total_tva = $objp->multicurrency_total_tva;
 			$this->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
 
+			if (getDolGlobalInt('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+				$this->packaging      = $objp->packaging;
+			}
+
 			$this->fetch_optionals();
 
 			$this->db->free($result);

From cf1ae3a5da2fee841482fb3efaccbbad7957ad5a Mon Sep 17 00:00:00 2001
From: William Mead <william@inovea-conseil.com>
Date: Tue, 21 Jan 2025 10:15:41 +0100
Subject: [PATCH 058/602] Fixed task status badge. Refactored LibStatut.

---
 htdocs/core/lib/functions.lib.php  | 14 +-----
 htdocs/projet/class/task.class.php | 77 ++++++++++++++++--------------
 2 files changed, 42 insertions(+), 49 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8b79a7f4a63..12ba56bbe58 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3207,18 +3207,8 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 			$morehtmlstatus .= $object->getLibStatut(5);
 		}
 	} elseif ($object->element == 'project_task') {
-		$object->fk_statut = 1;
-		$object->status = 1;
-		if ($object->progress > 0) {
-			$object->fk_statut = 2;
-			$object->status = 2;
-		}
-		if ($object->progress >= 100) {
-			$object->fk_statut = 3;
-			$object->status = 3;
-		}
-		$tmptxt = $object->getLibStatut(5);
-		$morehtmlstatus .= $tmptxt; // No status on task
+		$tmptxt = $object->getLibStatut(4);
+		$morehtmlstatus .= $tmptxt;
 	} elseif (method_exists($object, 'getLibStatut')) { // Generic case for status
 		$tmptxt = $object->getLibStatut(6);
 		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) {
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index c038185554a..f2bd2c74fdb 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -2516,7 +2516,7 @@ class Task extends CommonObjectLine
 		// phpcs:enable
 		global $langs;
 
-		// list of Statut of the task
+		// list of status of the task
 		$this->labelStatus[0] = 'Draft';
 		$this->labelStatus[1] = 'Validated';
 		$this->labelStatus[2] = 'In progress';
@@ -2533,46 +2533,49 @@ class Task extends CommonObjectLine
 		} elseif ($mode == 1) {
 			return $langs->trans($this->labelStatusShort[$status]);
 		} elseif ($mode == 2) {
-			if ($status == 0) {
-				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut0').' '.$langs->trans($this->labelStatusShort[$status]);
-			} elseif ($status == 1) {
-				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut1').' '.$langs->trans($this->labelStatusShort[$status]);
-			} elseif ($status == 2) {
-				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut3').' '.$langs->trans($this->labelStatusShort[$status]);
-			} elseif ($status == 3) {
-				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6').' '.$langs->trans($this->labelStatusShort[$status]);
-			} elseif ($status == 4) {
-				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6').' '.$langs->trans($this->labelStatusShort[$status]);
-			} elseif ($status == 5) {
-				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut5').' '.$langs->trans($this->labelStatusShort[$status]);
+			switch ($status) {
+				case 0:
+					return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut0').' '.$langs->trans($this->labelStatusShort[$status]);
+				case 1:
+					return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut1').' '.$langs->trans($this->labelStatusShort[$status]);
+				case 2:
+					return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut3').' '.$langs->trans($this->labelStatusShort[$status]);
+				case 3:
+					return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6').' '.$langs->trans($this->labelStatusShort[$status]);
+				case 4:
+					return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6').' '.$langs->trans($this->labelStatusShort[$status]);
+				case 5:
+					return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut5').' '.$langs->trans($this->labelStatusShort[$status]);
 			}
 		} elseif ($mode == 3) {
-			if ($status == 0) {
-				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut0');
-			} elseif ($status == 1) {
-				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut1');
-			} elseif ($status == 2) {
-				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut3');
-			} elseif ($status == 3) {
-				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6');
-			} elseif ($status == 4) {
-				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6');
-			} elseif ($status == 5) {
-				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut5');
+			switch ($status) {
+				case 0:
+					return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut0');
+				case 1:
+					return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut1');
+				case 2:
+					return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut3');
+				case 3:
+					return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6');
+				case 4:
+					return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6');
+				case 5:
+					return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut5');
 			}
 		} elseif ($mode == 4) {
-			if ($status == 0) {
-				return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status0', $mode);
-			} elseif ($status == 1) {
-				return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status1', $mode);
-			} elseif ($status == 2) {
-				return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status2', $mode);
-			} elseif ($status == 3) {
-				return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status3', $mode);
-			} elseif ($status == 4) {
-				return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status4', $mode);
-			} elseif ($status == 5) {
-				return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status5', $mode);
+			switch ($status) {
+				case 0:
+					return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status0', $mode);
+				case 1:
+					return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status1', $mode);
+				case 2:
+					return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status2', $mode);
+				case 3:
+					return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status3', $mode);
+				case 4:
+					return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status4', $mode);
+				case 5:
+					return dolGetStatus($langs->trans($this->labelStatus[$status]), $langs->trans($this->labelStatusShort[$status]), '', 'status5', $mode);
 			}
 		} elseif ($mode == 5) {
 			/*if ($status==0) return $langs->trans($this->labelStatusShort[$status]).' '.img_picto($langs->trans($this->labelStatusShort[$status]),'statut0');

From 58676e4287872529a0b62cd9f93c12f668a3d2d3 Mon Sep 17 00:00:00 2001
From: William Mead <william@inovea-conseil.com>
Date: Tue, 21 Jan 2025 12:03:17 +0100
Subject: [PATCH 059/602] Added task list status filter. Cleaned code.

---
 htdocs/core/lib/project.lib.php    | 14 +++++------
 htdocs/langs/en_US/main.lang       |  1 +
 htdocs/langs/en_US/projects.lang   |  1 +
 htdocs/projet/class/task.class.php | 27 +++++++++++---------
 htdocs/projet/tasks.php            | 40 ++++++++++++++++++------------
 htdocs/projet/tasks/list.php       | 31 +++++++++++++++++++++++
 6 files changed, 79 insertions(+), 35 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index ffd3420fb38..9ec5e33b555 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -870,6 +870,13 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					print '</td>';
 				}
 
+				// Status
+				if (count($arrayfields) > 0 && !empty($arrayfields['t.fk_statut']['checked'])) {
+					print '<td class="center">';
+					print $taskstatic->getLibStatut(4);
+					print '</td>';
+				}
+
 				if ($showbilltime) {
 					// Time not billed
 					if (count($arrayfields) > 0 && !empty($arrayfields['t.tobill']['checked'])) {
@@ -955,13 +962,6 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					print '</td>';
 				}
 
-				// Status
-				if (count($arrayfields) > 0 && !empty($arrayfields['t.fk_statut']['checked'])) {
-					print '<td class="center">';
-					print $taskstatic->getLibStatut(4);
-					print '</td>';
-				}
-
 				// Extra fields
 				$extrafieldsobjectkey = $taskstatic->table_element;
 				$extrafieldsobjectprefix = 'efpt.';
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index a76687104cb..0542f2ac060 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1347,3 +1347,4 @@ SpecialLine=Special Line
 EcoTax=Eco-Tax
 GroupingLine=Grouping line
 AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 22f6e3f3559..9e2bf735982 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -314,3 +314,4 @@ ErrorsTaskMerge=An error occurred while merging tasks
 Billable = Billable
 ConfirmCloseTask=Are you sure you want to close this task ?
 ConfirmClosed=Confirm task closed
+TaskStatus=Task status
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index f2bd2c74fdb..4696ce2baf1 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -386,6 +386,21 @@ class Task extends CommonObjectLine
 	public function __construct($db)
 	{
 		$this->db = $db;
+		// list of status of the task
+		$this->labelStatus = array(
+			0 => 'Draft',
+			1 => 'Validated',
+			2 => 'In progress',
+			3 => 'Closed',
+			4 => 'Transferred',
+		);
+		$this->labelStatusShort = array(
+			0 => 'Draft',
+			1 => 'Validated',
+			2 => 'In progress',
+			3 => 'Closed',
+			4 => 'Transferred',
+		);
 	}
 
 
@@ -2516,18 +2531,6 @@ class Task extends CommonObjectLine
 		// phpcs:enable
 		global $langs;
 
-		// list of status of the task
-		$this->labelStatus[0] = 'Draft';
-		$this->labelStatus[1] = 'Validated';
-		$this->labelStatus[2] = 'In progress';
-		$this->labelStatus[3] = 'Closed';
-		$this->labelStatus[4] = 'Transfered';
-		$this->labelStatusShort[0] = 'Draft';
-		$this->labelStatusShort[1] = 'Validated';
-		$this->labelStatusShort[2] = 'In progress';
-		$this->labelStatusShort[3] = 'Closed';
-		$this->labelStatusShort[4] = 'Transfered';
-
 		if ($mode == 0) {
 			return $langs->trans($this->labelStatus[$status]);
 		} elseif ($mode == 1) {
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 281d7189419..1128ffa0b0e 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -98,7 +98,7 @@ $search_progresscalc = GETPOST('search_progresscalc');
 $search_progressdeclare = GETPOST('search_progressdeclare');
 $search_task_budget_amount = GETPOST('search_task_budget_amount');
 $search_task_billable = GETPOST('search_task_billable');
-$search_fk_statut = GETPOSTINT('search_fk_statut');
+$search_status = GETPOSTINT('search_status');
 
 $search_date_start_startmonth = GETPOSTINT('search_date_start_startmonth');
 $search_date_start_startyear = GETPOSTINT('search_date_start_startyear');
@@ -182,9 +182,9 @@ $arrayfields = array(
 	't.progress_calculated' => array('label' => "ProgressCalculated", 'checked' => 1, 'position' => 8),
 	't.progress' => array('label' => "ProgressDeclared", 'checked' => 1, 'position' => 9),
 	't.progress_summary' => array('label' => "TaskProgressSummary", 'checked' => 1, 'position' => 10),
-	't.budget_amount' => array('label' => "Budget", 'checked' => 0, 'position' => 11),
-	'c.assigned' => array('label' => "TaskRessourceLinks", 'checked' => 1, 'position' => 12),
-	't.fk_statut' => array('label' => "Status", 'checked' => 1, 'position' => 12),
+	't.fk_statut' => array('label' => "Status", 'checked' => 1, 'position' => 11),
+	't.budget_amount' => array('label' => "Budget", 'checked' => 0, 'position' => 12),
+	'c.assigned' => array('label' => "TaskRessourceLinks", 'checked' => 1, 'position' => 13),
 
 );
 if ($object->usage_bill_time) {
@@ -251,7 +251,7 @@ if (empty($reshook)) {
 		$search_progressdeclare = '';
 		$search_task_budget_amount = '';
 		$search_task_billable = '';
-		$search_fk_statut = '';
+		$search_status = -1;
 		$toselect = array();
 		$search_array_options = array();
 		$search_date_start_startmonth = "";
@@ -330,15 +330,15 @@ if (!empty($search_progresscalc)) {
 	$morewherefilterarray[] = '(planned_workload IS NULL OR planned_workload = 0 OR '.natural_search('ROUND(100 * duration_effective / planned_workload, 2)', $search_progresscalc, 1, 1).')';
 	//natural_search('round(100 * $line->duration_effective / $line->planned_workload,2)', $filterprogresscalc, 1, 1).' {return 1;} else {return 0;}';
 }
+if ($search_status > -1) {
+	$morewherefilterarray[] = " t.fk_statut = ".$search_status;
+}
 if ($search_task_budget_amount) {
 	$morewherefilterarray[] = natural_search('t.budget_amount', $search_task_budget_amount, 1, 1);
 }
 if ($search_task_billable) {
 	$morewherefilterarray[] = " t.billable = ".($search_task_billable == "yes" ? 1 : 0);
 }
-if ($search_fk_statut) {
-	$morewherefilterarray[] = " t.fk_statut = ".$search_fk_statut;
-}
 //var_dump($morewherefilterarray);
 
 $morewherefilter = '';
@@ -579,6 +579,9 @@ if ($id > 0 || !empty($ref)) {
 	if ($search_progressdeclare) {
 		$param .= '&search_progressdeclare='.urlencode($search_progressdeclare);
 	}
+	if ($search_status) {
+		$param .= '&search_status='.urlencode($search_status);
+	}
 	if ($search_task_budget_amount) {
 		$param .= '&search_task_budget_amount='.urlencode($search_task_budget_amount);
 	}
@@ -1057,6 +1060,16 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 		print '<td class="liste_titre right"></td>';
 	}
 
+	if (!empty($arrayfields['t.fk_statut']['checked'])) {
+		print '<td class="liste_titre center">';
+		$arrayofstatus = array();
+		foreach ($taskstatic->labelStatusShort as $key => $val) {
+			$arrayofstatus[$key] = $langs->trans($val);
+		}
+		print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
+		print '</td>';
+	}
+
 	if ($object->usage_bill_time) {
 		if (!empty($arrayfields['t.tobill']['checked'])) {
 			print '<td class="liste_titre right">';
@@ -1085,11 +1098,6 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 		print $form->selectyesno('search_task_billable', $search_task_billable, 0, false, 1);
 		print '</td>';
 	}
-	if (!empty($arrayfields['t.fk_statut']['checked'])) {
-		print '<td class="liste_titre center">';
-		//TODO: add status filter
-		print '</td>';
-	}
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
@@ -1147,6 +1155,9 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 	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 (!empty($arrayfields['t.fk_statut']['checked'])) {
+		print_liste_field_titre($arrayfields['t.fk_statut']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ', '');
+	}
 	if ($object->usage_bill_time) {
 		if (!empty($arrayfields['t.tobill']['checked'])) {
 			print_liste_field_titre($arrayfields['t.tobill']['label'], $_SERVER["PHP_SELF"], "t.tobill", '', $param, '', $sortfield, $sortorder, 'right ');
@@ -1168,9 +1179,6 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 		print_liste_field_titre($arrayfields['t.billable']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ', '');
 	}
 
-	if (!empty($arrayfields['t.fk_statut']['checked'])) {
-		print_liste_field_titre($arrayfields['t.fk_statut']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ', '');
-	}
 	// Extra fields
 	$disablesortlink = 1;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 056860cd47e..37c156c2b28 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -70,6 +70,7 @@ $search_project_user = GETPOST('search_project_user', 'intcomma');
 $search_task_user = GETPOST('search_task_user', 'intcomma');
 $search_task_progress = GETPOST('search_task_progress');
 $search_task_budget_amount = GETPOST('search_task_budget_amount');
+$search_task_status = GETPOSTINT('search_task_status');
 $search_societe = GETPOST('search_societe');
 $search_societe_alias = GETPOST('search_societe_alias');
 $search_opp_status = GETPOST("search_opp_status", 'alpha');
@@ -181,6 +182,7 @@ $arrayfields = array(
 	't.progress' => array('label' => "ProgressDeclared", 'checked' => 1, 'position' => 305),
 	't.progress_summary' => array('label' => "TaskProgressSummary", 'checked' => 1, 'position' => 306),
 	't.budget_amount' => array('label' => "Budget", 'checked' => 0, 'position' => 307),
+	't.fk_statut' => array('label' => "TaskStatus", 'checked' => 0, 'position' => 308),
 	't.tobill' => array('label' => "TimeToBill", 'checked' => 0, 'position' => 310),
 	't.billed' => array('label' => "TimeBilled", 'checked' => 0, 'position' => 311),
 	't.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 500),
@@ -241,6 +243,7 @@ if (empty($reshook)) {
 		$search_task_progress = "";
 		$search_task_budget_amount = "";
 		$search_task_user = -1;
+		$search_task_status = -1;
 		$search_project_user = -1;
 		$search_date_startday = '';
 		$search_date_startmonth = '';
@@ -464,6 +467,9 @@ if ($search_project_user > 0) {
 if ($search_task_user > 0) {
 	$sql .= " AND ect.fk_c_type_contact IN (".$db->sanitize(implode(',', array_keys($listoftaskcontacttype))).") AND ect.element_id = t.rowid AND ect.fk_socpeople = ".((int) $search_task_user);
 }
+if ($search_task_status > -1) {
+	$sql .= " AND t.fk_statut = ".((int) $search_task_status);
+}
 // Search for tag/category ($searchCategoryProjectList is an array of ID)
 $searchCategoryProjectList = array($search_categ);
 $searchCategoryProjectOperator = 0;
@@ -685,6 +691,9 @@ if ($search_task_ref_parent != '') {
 if ($search_task_progress != '') {
 	$param .= '&search_task_progress='.urlencode($search_task_progress);
 }
+if ($search_task_status != '') {
+	$param .= '&search_task_status='.urlencode($search_task_status);
+}
 if ($search_societe != '') {
 	$param .= '&search_societe='.urlencode($search_societe);
 }
@@ -954,6 +963,15 @@ if (!empty($arrayfields['t.progress']['checked'])) {
 if (!empty($arrayfields['t.progress_summary']['checked'])) {
 	print '<td class="liste_titre"></td>';
 }
+if (!empty($arrayfields['t.fk_statut']['checked'])) {
+	print '<td class="liste_titre center">';
+	$arrayofstatus = array();
+	foreach ($object->labelStatusShort as $key => $val) {
+		$arrayofstatus[$key] = $langs->trans($val);
+	}
+	print $form->selectarray('search_task_status', $arrayofstatus, $search_task_status, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
+	print '</td>';
+}
 
 if (!empty($arrayfields['t.budget_amount']['checked'])) {
 	print '<td class="liste_titre center">';
@@ -1086,6 +1104,10 @@ if (!empty($arrayfields['t.progress_summary']['checked'])) {
 	print_liste_field_titre($arrayfields['t.progress_summary']['label'], $_SERVER["PHP_SELF"], "t.progress", "", $param, '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
+if (!empty($arrayfields['t.fk_statut']['checked'])) {
+	print_liste_field_titre($arrayfields['t.fk_statut']['label'], $_SERVER["PHP_SELF"], "t.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
+}
 if (!empty($arrayfields['t.budget_amount']['checked'])) {
 	print_liste_field_titre($arrayfields['t.budget_amount']['label'], $_SERVER["PHP_SELF"], "t.budget_amount", "", $param, '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
@@ -1479,6 +1501,15 @@ while ($i < $imaxinloop) {
 					$totalarray['totalprogress_summary'] = $totalarray['nbfield'];
 				}
 			}
+			// Project status
+			if (!empty($arrayfields['t.fk_statut']['checked'])) {
+				print '<td class="center">';
+				print $object->getLibStatut(4);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
 			// Budget for task
 			if (!empty($arrayfields['t.budget_amount']['checked'])) {
 				print '<td class="center">';

From 932df6a5ed2dc4d0fa5d4750471c5b19847faab2 Mon Sep 17 00:00:00 2001
From: William Mead <william@inovea-conseil.com>
Date: Tue, 21 Jan 2025 12:18:16 +0100
Subject: [PATCH 060/602] Cleaned code

---
 htdocs/projet/class/task.class.php | 4 ----
 htdocs/projet/tasks.php            | 2 +-
 htdocs/projet/tasks/list.php       | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 4696ce2baf1..848310af2e6 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -668,10 +668,6 @@ class Task extends CommonObjectLine
 			return -1;
 		}
 
-		if (isset($this->status)) {
-			$this->status = (int) $this->status;
-		}
-
 		// Check parameters
 		// Put here code to add control on parameters values
 
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 1128ffa0b0e..fcd8aa3d572 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -580,7 +580,7 @@ if ($id > 0 || !empty($ref)) {
 		$param .= '&search_progressdeclare='.urlencode($search_progressdeclare);
 	}
 	if ($search_status) {
-		$param .= '&search_status='.urlencode($search_status);
+		$param .= '&search_status='.urlencode((string)$search_status);
 	}
 	if ($search_task_budget_amount) {
 		$param .= '&search_task_budget_amount='.urlencode($search_task_budget_amount);
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 37c156c2b28..a751dd53677 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -692,7 +692,7 @@ if ($search_task_progress != '') {
 	$param .= '&search_task_progress='.urlencode($search_task_progress);
 }
 if ($search_task_status != '') {
-	$param .= '&search_task_status='.urlencode($search_task_status);
+	$param .= '&search_task_status='.urlencode((string)$search_task_status);
 }
 if ($search_societe != '') {
 	$param .= '&search_societe='.urlencode($search_societe);

From d03810a0d011e4b6374103a977519d14d10a8c18 Mon Sep 17 00:00:00 2001
From: William Mead <william@inovea-conseil.com>
Date: Tue, 21 Jan 2025 14:19:26 +0100
Subject: [PATCH 061/602] Fixed filter

---
 htdocs/projet/tasks.php      | 3 +--
 htdocs/projet/tasks/list.php | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index fcd8aa3d572..8563d7f1857 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -98,7 +98,7 @@ $search_progresscalc = GETPOST('search_progresscalc');
 $search_progressdeclare = GETPOST('search_progressdeclare');
 $search_task_budget_amount = GETPOST('search_task_budget_amount');
 $search_task_billable = GETPOST('search_task_billable');
-$search_status = GETPOSTINT('search_status');
+$search_status = GETPOST('search_status');
 
 $search_date_start_startmonth = GETPOSTINT('search_date_start_startmonth');
 $search_date_start_startyear = GETPOSTINT('search_date_start_startyear');
@@ -431,7 +431,6 @@ if ($action == 'createtask' && $user->hasRight('projet', 'creer')) {
 	}
 }
 
-
 /*
  * View
  */
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index a751dd53677..5dfdd4d7132 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -70,7 +70,7 @@ $search_project_user = GETPOST('search_project_user', 'intcomma');
 $search_task_user = GETPOST('search_task_user', 'intcomma');
 $search_task_progress = GETPOST('search_task_progress');
 $search_task_budget_amount = GETPOST('search_task_budget_amount');
-$search_task_status = GETPOSTINT('search_task_status');
+$search_task_status = GETPOST('search_task_status');
 $search_societe = GETPOST('search_societe');
 $search_societe_alias = GETPOST('search_societe_alias');
 $search_opp_status = GETPOST("search_opp_status", 'alpha');

From 1569366feb7903dad163663b34f756d3a8ced09f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina=20JOUM?= <melina.joum@altairis.fr>
Date: Tue, 21 Jan 2025 14:45:33 +0100
Subject: [PATCH 062/602] ADD: translations for option Use the packaging
 feature to round the quantities to some given multiples for the sale

---
 htdocs/langs/en_US/products.lang | 3 +++
 htdocs/langs/fr_FR/products.lang | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index ededc52cbfc..40769a0af05 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -345,6 +345,9 @@ ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
 PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
+UseProductCustomerPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a customer documents, recalculate quantities and sale prices according to the higher multiple set on the sale prices of a product)
+PackagingForThisProductSell=Packaging of quantities (sale)
+PackagingForThisProductSellDesc=You will automatically sell a multiple of this quantity.
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 2dd144775d4..73eb7584c2a 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -345,6 +345,9 @@ ProductSupplierDescription=Description du fournisseur du produit
 UseProductSupplierPackaging=Utilisez la fonction "conditionnement" pour arrondir les quantités à certains multiples donnés (lors de l'ajout/de la mise à jour d'une ligne, dans les documents d'un fournisseur, recalculez les quantités et les prix d'achat en fonction du multiple supérieur défini sur les prix d'achat d'un produit)
 PackagingForThisProduct=Conditionnement des quantités
 PackagingForThisProductDesc=Vous achèterez automatiquement un multiple de cette quantité.
+UseProductCustomerPackaging=Utilisez la fonction "conditionnement" pour arrondir les quantités à certains multiples donnés (lors de l'ajout/de la mise à jour d'une ligne, dans les documents d'un client, recalculez les quantités et les prix de vente en fonction du multiple supérieur défini sur les prix de vente d'un produit)
+PackagingForThisProductSell=Conditionnement des quantités (vente)
+PackagingForThisProductSellDesc=Vous vendrez automatiquement un multiple de cette quantité.
 QtyRecalculatedWithPackaging=La quantité de la ligne a été recalculée en fonction de l'emballage du fournisseur
 
 #Attributes

From 3230e83f2b5c5e34b157424f0c12e3321555f275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina=20JOUM?= <melina.joum@altairis.fr>
Date: Tue, 21 Jan 2025 15:59:13 +0100
Subject: [PATCH 063/602] ADD: the packaging field to product import

---
 htdocs/core/modules/modProduct.class.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 7b87d30b1f4..01b77908a23 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -638,6 +638,12 @@ class modProduct extends DolibarrModules
 			));
 		}
 
+		if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
+				'p.packaging' => 'PackagingForThisProductSell',
+			));
+		}
+
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice") || isModEnabled('margin')) {
 			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.cost_price' => 'CostPrice'));
 		}
@@ -755,6 +761,13 @@ class modProduct extends DolibarrModules
 				)
 			));
 		}
+
+		if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+			$import_sample = array_merge($import_sample, array(
+				'p.packaging' => "2",
+			));
+		}
+
 		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
 		$this->import_updatekeys_array[$r] = array('p.ref' => 'Ref');
 		if (isModEnabled('barcode')) {

From 7a8e0d9b5ccd24e1571559a0e19dd9457f4147d3 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 21 Jan 2025 18:51:18 +0100
Subject: [PATCH 064/602] FIX #32736 + avoid php warning

---
 htdocs/compta/sociales/card.php | 1 +
 htdocs/compta/sociales/list.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 67ede36a989..e6027db3b1c 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -207,6 +207,7 @@ if (empty($reshook)) {
 			$object->mode_reglement_id = GETPOSTINT('mode_reglement_id');
 			$object->fk_account = GETPOSTINT('fk_account');
 			$object->fk_project = GETPOSTINT('fk_project');
+			$object->paye = ChargeSociales::STATUS_UNPAID;
 
 			$id = $object->create($user);
 			if ($id <= 0) {
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 550c532ddb5..92f4772fcab 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -72,7 +72,7 @@ $search_date_limit_endyear = GETPOSTINT('search_date_limit_endyear');
 $search_date_limit_start = dol_mktime(0, 0, 0, $search_date_limit_startmonth, $search_date_limit_startday, $search_date_limit_startyear);
 $search_date_limit_end = dol_mktime(23, 59, 59, $search_date_limit_endmonth, $search_date_limit_endday, $search_date_limit_endyear);
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
-$search_users = GETPOST('search_users', 'intcomma');
+$search_users = GETPOST('search_users', 'array:int');
 $search_type = GETPOST('search_type', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 

From f709a073fc17765a0f0618065cb2e1747d715c9d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 21 Jan 2025 22:42:50 +0100
Subject: [PATCH 065/602] Fix price format with multicurrency

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a3787797c25..05d6f60ba06 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3978,16 +3978,16 @@ class Form
 					$optstart .= ' data-product-id="' . dol_escape_htmltag($objp->rowid) . '"';
 					$optstart .= ' data-price-id="' . dol_escape_htmltag($objp->idprodfournprice) . '"';
 					$optstart .= ' data-qty="' . dol_escape_htmltag($objp->quantity) . '"';
-					$optstart .= ' data-up="' . dol_escape_htmltag(price2num($objp->unitprice)) . '"';
-					$optstart .= ' data-up-locale="' . dol_escape_htmltag(price($objp->unitprice)) . '"';
+					$optstart .= ' data-up="' . dol_escape_htmltag(price2num($objp->unitprice)) . '"';		// the price with numeric international format
+					$optstart .= ' data-up-locale="' . dol_escape_htmltag(price($objp->unitprice)) . '"';	// the price formated in user languge
 					$optstart .= ' data-discount="' . dol_escape_htmltag($outdiscount) . '"';
-					$optstart .= ' data-tvatx="' . dol_escape_htmltag(price2num($objp->tva_tx)) . '"';
-					$optstart .= ' data-tvatx-formated="' . dol_escape_htmltag(price($objp->tva_tx, 0, $langs, 1, -1, 2)) . '"';
+					$optstart .= ' data-tvatx="' . dol_escape_htmltag(price2num($objp->tva_tx)) . '"';		// the rate with numeric international format
+					$optstart .= ' data-tvatx-formated="' . dol_escape_htmltag(price($objp->tva_tx, 0, $langs, 1, -1, 2)) . '"';	// the rate formated in user language
 					$optstart .= ' data-default-vat-code="' . dol_escape_htmltag($objp->default_vat_code) . '"';
 					$optstart .= ' data-supplier-ref="' . dol_escape_htmltag($objp->ref_fourn) . '"';
 					if (isModEnabled('multicurrency')) {
 						$optstart .= ' data-multicurrency-code="' . dol_escape_htmltag($objp->multicurrency_code) . '"';
-						$optstart .= ' data-multicurrency-up="' . dol_escape_htmltag($objp->multicurrency_unitprice) . '"';
+						$optstart .= ' data-multicurrency-up="' . dol_escape_htmltag(price2num($objp->multicurrency_unitprice)) . '"';	// the price with numeric international format
 					}
 				}
 				$optstart .= ' data-description="' . dol_escape_htmltag($objp->description, 0, 1) . '"';

From da3d1f32f13352ae8f87a9229aa2101c9b35abc8 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 21 Jan 2025 22:55:43 +0100
Subject: [PATCH 066/602] FIX #32656 Loan - Note - Missing formclass project

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

diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index 44f18d6821b..9bc1da5c0a9 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2012	Regis Houssin				<regis.houssin@inodbox.com>
  * Copyright (C) 2013		Florian Henry				<florian.henry@open-concept.pro>
  * Copyright (C) 2015-2024  Frédéric France				<frederic.france@free.fr>
- * Copyright (C) 2016-2024	Alexandre Spangaro			<alexandre@inovea-conseil.com>
+ * Copyright (C) 2016-2025	Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) 2017		Ferran Marcet				<fmarcet@2byte.es>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
@@ -33,6 +33,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
 if (isModEnabled('project')) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 /**
@@ -83,7 +84,9 @@ if (empty($reshook)) {
 
 $morehtmlright = '';
 $form = new Form($db);
-$formproject = new FormProjets($db);
+if (isModEnabled('project')) {
+	$formproject = new FormProjets($db);
+}
 
 $title = $langs->trans("Loan").' - '.$langs->trans("Notes");
 $help_url = 'EN:Module_Loan|FR:Module_Emprunt';

From 68e8452bd3d62557672d6855f7eda0f3a403865c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 21 Jan 2025 23:08:39 +0100
Subject: [PATCH 067/602] Fix language

---
 htdocs/compta/accounting-files.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 2005e7d0fb2..5ccd1ffa2d8 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -1,12 +1,12 @@
 <?php
-/* Copyright (C) 2001-2006  Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2019  Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2017       Pierre-Henry Favre   <support@atm-consulting.fr>
- * Copyright (C) 2020       Maxime DEMAREST      <maxime@indelog.fr>
- * Copyright (C) 2021       Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2022-2024  Alexandre Spangaro          <alexandre@inovea-conseil.com>
+/* Copyright (C) 2001-2006	Rodolphe Quiedeville		<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2019	Laurent Destailleur			<eldy@users.sourceforge.net>
+ * Copyright (C) 2017		Pierre-Henry Favre			<support@atm-consulting.fr>
+ * Copyright (C) 2020		Maxime DEMAREST				<maxime@indelog.fr>
+ * Copyright (C) 2021		Gauthier VERDOL				<gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2022-2025	Alexandre Spangaro          <alexandre@inovea-conseil.com>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024		Frédéric France				<frederic.france@free.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
@@ -622,7 +622,7 @@ $charge_sociales = new ChargeSociales($db);
 $various_payment = new PaymentVarious($db);
 $payment_loan = new PaymentLoan($db);
 
-$title = $langs->trans("ComptaFiles").' - '.$langs->trans("List");
+$title = $langs->trans("AccountantFiles").' - '.$langs->trans("List");
 $help_url = '';
 
 llxHeader('', $title, $help_url);

From 391aca510c48fd59f790b0caa7f2022663950d83 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 21 Jan 2025 23:18:04 +0100
Subject: [PATCH 068/602] FIX autofill price with multicurrency on supplier doc

---
 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 a550f366b93..8c465f0e050 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3996,7 +3996,7 @@ class Form
 					$optstart .= ' data-supplier-ref="' . dol_escape_htmltag($objp->ref_fourn) . '"';
 					if (isModEnabled('multicurrency')) {
 						$optstart .= ' data-multicurrency-code="' . dol_escape_htmltag($objp->multicurrency_code) . '"';
-						$optstart .= ' data-multicurrency-up="' . dol_escape_htmltag(price2num($objp->multicurrency_unitprice)) . '"';	// the price with numeric international format
+						$optstart .= ' data-multicurrency-unitprice="' . dol_escape_htmltag(price2num($objp->multicurrency_unitprice)) . '"';	// the price with numeric international format
 					}
 				}
 				$optstart .= ' data-description="' . dol_escape_htmltag($objp->description, 0, 1) . '"';

From 87dbb1f445b57ff04fab99c9ec4df555f54fa4de Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 22 Jan 2025 02:38:41 +0100
Subject: [PATCH 069/602] Translate "Emailing" line 2345

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

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 6f6d25eecb8..ba8b55c69d7 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -2342,6 +2342,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr
 				if (!empty($arraylist[$labelOfTypeToShow])) {
 					$labelOfTypeToShow = $arraylist[$labelOfTypeToShow];
 				} elseif ($actionstatic->type_code == 'AC_EMAILING') {
+					$langs->load("mails");
 					$labelOfTypeToShow = $langs->trans("Emailing");
 				}
 				if ($actionstatic->type_code == 'AC_OTH_AUTO' && ($actionstatic->type_code != $actionstatic->code) && $labelOfTypeToShow && !empty($arraylist[$actionstatic->code])) {

From a8fe17688f41200f24d2bed1d8a9d561386b6e07 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 22 Jan 2025 02:46:47 +0100
Subject: [PATCH 070/602] Fix pre-commit

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

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index ba8b55c69d7..09ff9d4edd1 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1756,6 +1756,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr
 	global $user, $conf, $hookmanager;
 	global $form;
 	global $param, $massactionbutton;
+	global $langs;
 
 	$start_year = GETPOSTINT('dateevent_startyear');
 	$start_month = GETPOSTINT('dateevent_startmonth');

From 7378dc0f7a7a268beb2e37a404a846456af563dc Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 22 Jan 2025 02:50:58 +0100
Subject: [PATCH 071/602] Fix pre-commit

---
 dev/translation/ignore_translation_keys.lst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst
index 9a34c97bc3f..5679343b154 100644
--- a/dev/translation/ignore_translation_keys.lst
+++ b/dev/translation/ignore_translation_keys.lst
@@ -53,6 +53,7 @@ MoveField
 MyContacts
 NbOfActiveNotifications
 NbOfTargetedContacts
+Payed
 PreviewMailing
 Processing
 PropalStatusClosedShort

From 0ed1317607fbdf661551bc3fca130c4de5922ea7 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 22 Jan 2025 05:40:50 +0100
Subject: [PATCH 072/602] FIX avoid warning with the new Dolistore website

---
 htdocs/admin/modules.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 6f96506cc31..b4bc00f68ca 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -1185,7 +1185,9 @@ if ($mode == 'marketplace') {
 
 	print '<br>';
 
-	if (!getDolGlobalString('MAIN_DISABLE_DOLISTORE_SEARCH') && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1) {
+	$conf->global->MAIN_DISABLE_DOLISTORE_SEARCH = 1; // avoid warning with the new Dolistore website
+
+	if (!getDolGlobalString('MAIN_DISABLE_DOLISTORE_SEARCH') && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 		// $options is array with filter criteria
 		//var_dump($options);
 		$dolistore->getRemoteCategories();

From 99caa9aa37b67098be5be7d262240006942ddf0b Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 22 Jan 2025 05:48:25 +0100
Subject: [PATCH 073/602] FIX Brian is in the kitchen

---
 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 8c465f0e050..29824c01b50 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3988,7 +3988,7 @@ class Form
 					$optstart .= ' data-price-id="' . dol_escape_htmltag($objp->idprodfournprice) . '"';
 					$optstart .= ' data-qty="' . dol_escape_htmltag($objp->quantity) . '"';
 					$optstart .= ' data-up="' . dol_escape_htmltag(price2num($objp->unitprice)) . '"';		// the price with numeric international format
-					$optstart .= ' data-up-locale="' . dol_escape_htmltag(price($objp->unitprice)) . '"';	// the price formated in user languge
+					$optstart .= ' data-up-locale="' . dol_escape_htmltag(price($objp->unitprice)) . '"';	// the price formatted in user language
 					$optstart .= ' data-discount="' . dol_escape_htmltag($outdiscount) . '"';
 					$optstart .= ' data-tvatx="' . dol_escape_htmltag(price2num($objp->tva_tx)) . '"';		// the rate with numeric international format
 					$optstart .= ' data-tvatx-formated="' . dol_escape_htmltag(price($objp->tva_tx, 0, $langs, 1, -1, 2)) . '"';	// the rate formated in user language

From 8c5dce626733611ee954812cbb08a0f15a13eaaf Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 22 Jan 2025 05:57:05 +0100
Subject: [PATCH 074/602] FIX Where is Brian ?

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 29824c01b50..0140a6589cc 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3991,7 +3991,7 @@ class Form
 					$optstart .= ' data-up-locale="' . dol_escape_htmltag(price($objp->unitprice)) . '"';	// the price formatted in user language
 					$optstart .= ' data-discount="' . dol_escape_htmltag($outdiscount) . '"';
 					$optstart .= ' data-tvatx="' . dol_escape_htmltag(price2num($objp->tva_tx)) . '"';		// the rate with numeric international format
-					$optstart .= ' data-tvatx-formated="' . dol_escape_htmltag(price($objp->tva_tx, 0, $langs, 1, -1, 2)) . '"';	// the rate formated in user language
+					$optstart .= ' data-tvatx-formated="' . dol_escape_htmltag(price($objp->tva_tx, 0, $langs, 1, -1, 2)) . '"';	// the rate formatted in user language
 					$optstart .= ' data-default-vat-code="' . dol_escape_htmltag($objp->default_vat_code) . '"';
 					$optstart .= ' data-supplier-ref="' . dol_escape_htmltag($objp->ref_fourn) . '"';
 					if (isModEnabled('multicurrency')) {
@@ -7082,17 +7082,17 @@ class Form
 		if ($d) {
 			// Show date with popup
 			if ($usecalendar != 'combo') {
-				$formated_date = '';
+				$formatted_date = '';
 				//print "e".$set_time." t ".$conf->format_date_short;
 				if (strval($set_time) != '' && $set_time != -1) {
-					//$formated_date=dol_print_date($set_time,$conf->format_date_short);
-					$formated_date = dol_print_date($set_time, $langs->trans("FormatDateShortInput"), $gm); // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
+					//$formatted_date=dol_print_date($set_time,$conf->format_date_short);
+					$formatted_date = dol_print_date($set_time, $langs->trans("FormatDateShortInput"), $gm); // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
 				}
 
 				// Calendrier popup version eldy
 				if ($usecalendar == "eldy") {
 					// Input area to enter date manually
-					$retstring .= '<input id="' . $prefix . '" name="' . $prefix . '" type="text" class="maxwidthdate center" maxlength="11" value="' . $formated_date . '"';
+					$retstring .= '<input id="' . $prefix . '" name="' . $prefix . '" type="text" class="maxwidthdate center" maxlength="11" value="' . $formatted_date . '"';
 					$retstring .= ($disabled ? ' disabled' : '');
 					$retstring .= ' onChange="dpChangeDay(\'' . $prefix . '\',\'' . $langs->trans("FormatDateShortJavaInput") . '\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
 					$retstring .= ' autocomplete="off">';
@@ -7148,7 +7148,7 @@ class Form
 
 					// Input area to enter date manually
 					$retstring .= '<div class="nowraponall inline-block divfordateinput">';
-					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidthdate center" maxlength="11" value="'.$formated_date.'"';
+					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidthdate center" maxlength="11" value="'.$formatted_date.'"';
 					$retstring .= ($disabled ? ' disabled' : '');
 					$retstring .= ($placeholder ? ' placeholder="' . dol_escape_htmltag($placeholder) . '"' : '');
 					$retstring .= ' onChange="dpChangeDay(\'' . dol_escape_js($prefix) . '\',\'' . dol_escape_js($langs->trans("FormatDateShortJavaInput")) . '\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript

From 5c6ddba47ae500afec95d9ebabd3fe788ae7eb6c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 22 Jan 2025 06:22:14 +0100
Subject: [PATCH 075/602] FIX #32743

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

diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 346d0f89595..97a42add100 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -199,6 +199,7 @@ $form = new Form($db);
 $warehouse = new Entrepot($db);
 
 $now = dol_now();
+$totalarray = array();
 
 $title = $langs->trans("Warehouses");
 $help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
@@ -615,7 +616,6 @@ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 }
 print '</tr>'."\n";
 
-$totalarray = array();
 $totalarray['nbfield'] = 0;
 
 // Fields title label

From 2c4bfe38604af5d47dc0f699f2dbb75d658af469 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 22 Jan 2025 05:57:05 +0100
Subject: [PATCH 076/602] FIX Where is Brian ?

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8c465f0e050..e7a9fda4156 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3991,7 +3991,7 @@ class Form
 					$optstart .= ' data-up-locale="' . dol_escape_htmltag(price($objp->unitprice)) . '"';	// the price formated in user languge
 					$optstart .= ' data-discount="' . dol_escape_htmltag($outdiscount) . '"';
 					$optstart .= ' data-tvatx="' . dol_escape_htmltag(price2num($objp->tva_tx)) . '"';		// the rate with numeric international format
-					$optstart .= ' data-tvatx-formated="' . dol_escape_htmltag(price($objp->tva_tx, 0, $langs, 1, -1, 2)) . '"';	// the rate formated in user language
+					$optstart .= ' data-tvatx-formated="' . dol_escape_htmltag(price($objp->tva_tx, 0, $langs, 1, -1, 2)) . '"';	// the rate formatted in user language
 					$optstart .= ' data-default-vat-code="' . dol_escape_htmltag($objp->default_vat_code) . '"';
 					$optstart .= ' data-supplier-ref="' . dol_escape_htmltag($objp->ref_fourn) . '"';
 					if (isModEnabled('multicurrency')) {
@@ -7082,17 +7082,17 @@ class Form
 		if ($d) {
 			// Show date with popup
 			if ($usecalendar != 'combo') {
-				$formated_date = '';
+				$formatted_date = '';
 				//print "e".$set_time." t ".$conf->format_date_short;
 				if (strval($set_time) != '' && $set_time != -1) {
-					//$formated_date=dol_print_date($set_time,$conf->format_date_short);
-					$formated_date = dol_print_date($set_time, $langs->trans("FormatDateShortInput"), $gm); // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
+					//$formatted_date=dol_print_date($set_time,$conf->format_date_short);
+					$formatted_date = dol_print_date($set_time, $langs->trans("FormatDateShortInput"), $gm); // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
 				}
 
 				// Calendrier popup version eldy
 				if ($usecalendar == "eldy") {
 					// Input area to enter date manually
-					$retstring .= '<input id="' . $prefix . '" name="' . $prefix . '" type="text" class="maxwidthdate center" maxlength="11" value="' . $formated_date . '"';
+					$retstring .= '<input id="' . $prefix . '" name="' . $prefix . '" type="text" class="maxwidthdate center" maxlength="11" value="' . $formatted_date . '"';
 					$retstring .= ($disabled ? ' disabled' : '');
 					$retstring .= ' onChange="dpChangeDay(\'' . $prefix . '\',\'' . $langs->trans("FormatDateShortJavaInput") . '\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
 					$retstring .= ' autocomplete="off">';
@@ -7148,7 +7148,7 @@ class Form
 
 					// Input area to enter date manually
 					$retstring .= '<div class="nowraponall inline-block divfordateinput">';
-					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidthdate center" maxlength="11" value="'.$formated_date.'"';
+					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidthdate center" maxlength="11" value="'.$formatted_date.'"';
 					$retstring .= ($disabled ? ' disabled' : '');
 					$retstring .= ($placeholder ? ' placeholder="' . dol_escape_htmltag($placeholder) . '"' : '');
 					$retstring .= ' onChange="dpChangeDay(\'' . dol_escape_js($prefix) . '\',\'' . dol_escape_js($langs->trans("FormatDateShortJavaInput")) . '\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript

From 8ae1208ff659256d59d8d42b9e8ee63172be2513 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 22 Jan 2025 05:48:25 +0100
Subject: [PATCH 077/602] FIX Brian is in the kitchen

---
 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 e7a9fda4156..0140a6589cc 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3988,7 +3988,7 @@ class Form
 					$optstart .= ' data-price-id="' . dol_escape_htmltag($objp->idprodfournprice) . '"';
 					$optstart .= ' data-qty="' . dol_escape_htmltag($objp->quantity) . '"';
 					$optstart .= ' data-up="' . dol_escape_htmltag(price2num($objp->unitprice)) . '"';		// the price with numeric international format
-					$optstart .= ' data-up-locale="' . dol_escape_htmltag(price($objp->unitprice)) . '"';	// the price formated in user languge
+					$optstart .= ' data-up-locale="' . dol_escape_htmltag(price($objp->unitprice)) . '"';	// the price formatted in user language
 					$optstart .= ' data-discount="' . dol_escape_htmltag($outdiscount) . '"';
 					$optstart .= ' data-tvatx="' . dol_escape_htmltag(price2num($objp->tva_tx)) . '"';		// the rate with numeric international format
 					$optstart .= ' data-tvatx-formated="' . dol_escape_htmltag(price($objp->tva_tx, 0, $langs, 1, -1, 2)) . '"';	// the rate formatted in user language

From d7bdb0941744ebce5763271c311014af8e685e6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina=20JOUM?= <melina.joum@altairis.fr>
Date: Wed, 22 Jan 2025 11:28:44 +0100
Subject: [PATCH 078/602] FIX: If the constant
 PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES is active, allow you to choose the
 price level

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

diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index d38409f9eaa..b31fae0df5f 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -608,7 +608,7 @@ print '</tr>';
 
 
 // multiprix nombre de prix a proposer
-if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
+if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("MultiPricesNumPrices").'</td>';
 	print '<td class="right"><input size="3" type="text" class="flat right" name="value_PRODUIT_MULTIPRICES_LIMIT" value="' . getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT').'"></td>';

From 0fd7d517bee448c899036fe3b77f054e3e980693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina=20JOUM?= <melina.joum@altairis.fr>
Date: Wed, 22 Jan 2025 11:40:59 +0100
Subject: [PATCH 079/602] FIX: Allow import and export with the
 PRODUCT_CUSTOMER_PRICES_AND_MULTIPRICES option

---
 htdocs/core/modules/modProduct.class.php | 4 ++--
 htdocs/core/modules/modService.class.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 7b87d30b1f4..7b5ae32f69a 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -335,7 +335,7 @@ class modProduct extends DolibarrModules
 			$this->export_sql_order[$r] = ' GROUP BY p.rowid'; // FIXME The group by used a generic value to say "all fields in select except function fields"
 		}
 
-		if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
+		if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 			// Exports product multiprice
 			$r++;
 			$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -905,7 +905,7 @@ class modProduct extends DolibarrModules
 			$this->import_updatekeys_array[$r] = array('sp.fk_product' => 'ProductOrService', 'sp.ref_fourn' => 'SupplierRef', 'sp.fk_soc' => 'Supplier', 'sp.quantity' => "QtyMin");
 		}
 
-		if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
+		if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 			// Import products multiprices
 			$r++;
 			$this->import_code[$r] = $this->rights_class.'_multiprice';
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 7501cebf241..ea16a72ff63 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -285,7 +285,7 @@ class modService extends DolibarrModules
 		}
 
 		if (!isModEnabled("product")) {	// We enable next import templates only if module product not already enabled (to avoid duplicate entries)
-			if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 				// Exports product multiprice
 				$r++;
 				$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -801,7 +801,7 @@ class modService extends DolibarrModules
 				$this->import_updatekeys_array[$r] = array('sp.fk_product' => 'ProductOrService', 'sp.ref_fourn' => 'SupplierRef', 'sp.fk_soc' => 'Supplier');
 			}
 
-			if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
 				// Import products multiprices
 				$r++;
 				$this->import_code[$r] = $this->rights_class.'_multiprice';

From 8069cd304d508a388adf853045f1e231efaa4394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?=
 <109105553+comaiteseb@users.noreply.github.com>
Date: Wed, 22 Jan 2025 14:31:05 +0100
Subject: [PATCH 080/602] Update facture.class.php ajout de class_element_line

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

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 0723255b101..3bad1dfee22 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -75,6 +75,11 @@ class Facture extends CommonInvoice
 	 */
 	public $table_element_line = 'facturedet';
 
+	/**
+	 * @var string Name of class line
+	 */
+	public $class_element_line = 'FactureLigne';
+	
 	/**
 	 * @var string Fieldname with ID of parent key if this field has a parent
 	 */

From 4f80adc2bf6e8fe5fc79ec493c8b880300a7283b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?=
 <109105553+comaiteseb@users.noreply.github.com>
Date: Wed, 22 Jan 2025 14:56:53 +0100
Subject: [PATCH 081/602] Update facture.class.php

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

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 3bad1dfee22..0da59edf3d9 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -79,7 +79,7 @@ class Facture extends CommonInvoice
 	 * @var string Name of class line
 	 */
 	public $class_element_line = 'FactureLigne';
-	
+
 	/**
 	 * @var string Fieldname with ID of parent key if this field has a parent
 	 */

From 0f0ea09f72e95842637cc3300709eac0be7a76d3 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 22 Jan 2025 16:28:05 +0100
Subject: [PATCH 082/602] Debug v21 - fix canonical url management

---
 htdocs/core/lib/website2.lib.php | 121 ++++++++++++++++++++-----------
 1 file changed, 79 insertions(+), 42 deletions(-)

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index c2260b72b9e..fa39397bfcd 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -174,6 +174,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 
 	$tplcontent = '';
 	if (!isset($originalcontentonly)) {
+		// If we want to generate a page with some code to manage PHP content
 		$tplcontent .= "<?php // BEGIN PHP\n";
 		$tplcontent .= '$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
 		$tplcontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {\n";
@@ -195,67 +196,89 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 		$tplcontent .= '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'."\n";
 		$tplcontent .= '<meta name="robots" content="index, follow" />'."\n";
 		$tplcontent .= '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
-		$tplcontent .= '<meta name="keywords" content="'.dol_string_nohtmltag($objectpage->keywords).'" />'."\n";
+		$tplcontent .= '<meta name="keywords" content="'.dol_string_nohtmltag($objectpage->keywords, 0, 'UTF-8').'" />'."\n";
 		$tplcontent .= '<meta name="title" content="'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'" />'."\n";
 		$tplcontent .= '<meta name="description" content="'.dol_string_nohtmltag($objectpage->description, 0, 'UTF-8').'" />'."\n";
 		$tplcontent .= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.' '.DOL_VERSION.' (https://www.dolibarr.org)" />'."\n";
-		$tplcontent .= '<meta name="dolibarr:pageid" content="'.dol_string_nohtmltag((string) $objectpage->id).'" />'."\n";
+		$tplcontent .= '<meta name="dolibarr:pageid" content="'.((int) $objectpage->id).'" />'."\n";
 
 		// Add favicon
 		if (in_array($objectpage->type_container, array('page', 'blogpost'))) {
 			$tplcontent .= '<link rel="icon" type="image/png" href="/favicon.png" />'."\n";
 		}
 
-		// Add canonical reference
+		// Add the link of the canonical reference
+		// Note: $object is website, $objectpage is website page
 		if ($object->virtualhost) {
-			$tplcontent .= '<link rel="canonical" href="'.(($objectpage->id == $object->fk_default_home) ? '/' : (($shortlangcode != substr($object->lang, 0, 2) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php')).'" />'."\n";
-		}
-		// Add translation reference (main language)
-		if ($object->isMultiLang()) {
-			// Add page "translation of"
-			$translationof = $objectpage->fk_page;
-			if ($translationof) {
-				$tmppage = new WebsitePage($db);
-				$tmppage->fetch($translationof);
-				if ($tmppage->id > 0) {
-					$tmpshortlangcode = '';
-					if ($tmppage->lang) {
-						$tmpshortlangcode = preg_replace('/[_-].*$/', '', $tmppage->lang); // en_US or en-US -> en
-					}
-					if (empty($tmpshortlangcode)) {
-						$tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
-					}
-					if ($tmpshortlangcode != $shortlangcode) {
-						$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="<?php echo $website->virtualhost; ?>'.($object->fk_default_home == $tmppage->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2)) ? '/'.$tmpshortlangcode : '').'/'.$tmppage->pageurl.'.php').'" />'."\n";
-					}
+			$canonicalurladdid = '';
+			if ($objectpage->lang) {	// A language is forced on the page, it means we may have other langueg files with hard links
+				$canonicalurl = (($objectpage->id == $object->fk_default_home) ? '/' : (($shortlangcode != substr($object->lang, 0, 2) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php'));
+			} else {					// No language forced, it means the canonical is the one with
+				$canonicalurl = '/'.$objectpage->pageurl.'.php';
+
+				if ($object->lang && $object->isMultiLang()) {
+					$tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
+					$canonicalurl .= '?l=<?php echo $weblangs->shortlang ? $weblangs->shortlang : "'.$tmpshortlangcode.'"; ?>';
+					// Add parameter ID required to be unique/canonical
+					$canonicalurladdid = '<?php echo GETPOSTINT("id") ? "&id=".GETPOSTINT("id") : "" ?>';
+				} else {
+					// Add parameter ID required to be unique/canonical
+					$canonicalurladdid = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id") : "" ?>';
 				}
 			}
 
-			// Add "has translation pages"
-			$sql = "SELECT rowid as id, lang, pageurl from ".MAIN_DB_PREFIX.'website_page where fk_page IN ('.$db->sanitize($objectpage->id.($translationof ? ", ".$translationof : '')).")";
-			$resql = $db->query($sql);
-			if ($resql) {
-				$num_rows = $db->num_rows($resql);
-				if ($num_rows > 0) {
-					while ($obj = $db->fetch_object($resql)) {
+			$tplcontent .= '<link rel="canonical" href="'.$canonicalurl.$canonicalurladdid.'" />'."\n";
+		}
+
+		// Add the link of alternate translation reference
+		if ($object->isMultiLang()) {	// If website has other languages to support
+			if ($objectpage->lang) {	// If the page has been set to a given language
+				// Add page "translation of"
+				$translationof = $objectpage->fk_page;
+				if ($translationof) {
+					$tmppage = new WebsitePage($db);
+					$tmppage->fetch($translationof);
+					if ($tmppage->id > 0) {
 						$tmpshortlangcode = '';
-						if ($obj->lang) {
-							$tmpshortlangcode = preg_replace('/[_-].*$/', '', $obj->lang); // en_US or en-US -> en
+						if ($tmppage->lang) {
+							$tmpshortlangcode = preg_replace('/[_-].*$/', '', $tmppage->lang); // en_US or en-US -> en
+						}
+						if (empty($tmpshortlangcode)) {
+							$tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
 						}
 						if ($tmpshortlangcode != $shortlangcode) {
-							$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="<?php echo $website->virtualhost; ?>'.($object->fk_default_home == $obj->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2) ? '/'.$tmpshortlangcode : '')).'/'.$obj->pageurl.'.php').'" />'."\n";
+							$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="<?php echo $website->virtualhost; ?>'.($object->fk_default_home == $tmppage->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2)) ? '/'.$tmpshortlangcode : '').'/'.$tmppage->pageurl.'.php').'" />'."\n";
 						}
 					}
 				}
+
+				// Add "has translation pages"
+				$sql = "SELECT rowid as id, lang, pageurl from ".MAIN_DB_PREFIX.'website_page where fk_page IN ('.$db->sanitize($objectpage->id.($translationof ? ", ".$translationof : '')).")";
+				$resql = $db->query($sql);
+				if ($resql) {
+					$num_rows = $db->num_rows($resql);
+					if ($num_rows > 0) {
+						while ($obj = $db->fetch_object($resql)) {
+							$tmpshortlangcode = '';
+							if ($obj->lang) {
+								$tmpshortlangcode = preg_replace('/[_-].*$/', '', $obj->lang); // en_US or en-US -> en
+							}
+							if ($tmpshortlangcode != $shortlangcode) {
+								$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="<?php echo $website->virtualhost; ?>'.($object->fk_default_home == $obj->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2) ? '/'.$tmpshortlangcode : '')).'/'.$obj->pageurl.'.php').'" />'."\n";
+							}
+						}
+					}
+				} else {
+					dol_print_error($db);
+				}
+
+				// Add myself
+				$tplcontent .= '<?php if ($_SERVER["PHP_SELF"] == "'.(($object->fk_default_home == $objectpage->id) ? '/' : (($shortlangcode != substr($object->lang, 0, 2)) ? '/'.$shortlangcode : '')).'/'.$objectpage->pageurl.'.php") { ?>'."\n";
+				$tplcontent .= '<link rel="alternate" hreflang="'.$shortlangcode.'" href="<?php echo $website->virtualhost; ?>'.(($object->fk_default_home == $objectpage->id) ? '/' : (($shortlangcode != substr($object->lang, 0, 2)) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php').'" />'."\n";
+
+				$tplcontent .= '<?php } ?>'."\n";
 			} else {
-				dol_print_error($db);
 			}
-
-			// Add myself
-			$tplcontent .= '<?php if ($_SERVER["PHP_SELF"] == "'.(($object->fk_default_home == $objectpage->id) ? '/' : (($shortlangcode != substr($object->lang, 0, 2)) ? '/'.$shortlangcode : '')).'/'.$objectpage->pageurl.'.php") { ?>'."\n";
-			$tplcontent .= '<link rel="alternate" hreflang="'.$shortlangcode.'" href="<?php echo $website->virtualhost; ?>'.(($object->fk_default_home == $objectpage->id) ? '/' : (($shortlangcode != substr($object->lang, 0, 2)) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php').'" />'."\n";
-
-			$tplcontent .= '<?php } ?>'."\n";
 		}
 		// Add manifest.json. Do we have to add it only on home page ?
 		$tplcontent .= '<?php if ($website->use_manifest) { print \'<link rel="manifest" href="/manifest.json.php" />\'."\n"; } ?>'."\n";
@@ -278,7 +301,9 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 		$tplcontent .= '</html>'."\n";
 
 		$tplcontent .= '<?php // BEGIN PHP'."\n";
-		$tplcontent .= '$tmp = ob_get_contents(); ob_end_clean();'."\n";
+		$tplcontent .= '$tmp = ob_get_contents(); ob_end_clean();'."\n";	// replace with ob_get_clean ?
+
+		// Old method for custom SEO
 		if (strpos($objectpage->content, '$__PAGE__TITLE__') !== false) {
 			$tplcontent .= '$tmp = preg_replace("/<title>.*?<\/title>/s", "<title>" . dol_escape_htmltag($__PAGE__TITLE__) . "</title>", $tmp);'."\n";
 			$tplcontent .= '$tmp = preg_replace("/<meta name=\"title\" content=\".*?\" \/>/s", "<meta name=\"title\" content=\"" . dol_string_nohtmltag($__PAGE__TITLE__) . "\"  />", $tmp);';
@@ -289,7 +314,19 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 		if (strpos($objectpage->content, '$__PAGE__DESC__') !== false) {
 			$tplcontent .= '$tmp = preg_replace("/<meta name=\"description\" content=\".*?\" \/>/s", "<meta name=\"description\" content=\"" . dol_string_nohtmltag($__PAGE__DESC__) . "\"  />", $tmp);';
 		}
-		$tplcontent .= 'dolWebsiteOutput($tmp, "html", '.$objectpage->id.'); dolWebsiteIncrementCounter('.$object->id.', "'.$objectpage->type_container.'", '.$objectpage->id.');'."\n";
+		// New method for custom SEO
+		if (strpos($objectpage->content, 'define("__SEO_PAGE_TITLE__")') !== false) {
+			$tplcontent .= '$tmp = preg_replace("/<title>.*?<\/title>/s", "<title>" . dol_escape_htmltag(constant("__SEO_PAGE_TITLE__")) . "</title>", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/<meta name=\"title\" content=\".*?\" \/>/s", "<meta name=\"title\" content=\"" . dol_string_nohtmltag(constant("__SEO_PAGE_TITLE__")) . "\"  />", $tmp);';
+		}
+		if (strpos($objectpage->content, 'define("__SEO_PAGE_KEYWORDS__")') !== false) {
+			$tplcontent .= '$tmp = preg_replace("/<meta name=\"keywords\" content=\".*?\" \/>/s", "<meta name=\"keywords\" content=\"" . dol_string_nohtmltag(constant("__SEO_PAGE_KEYWORDS__")) . "\"  />", $tmp);';
+		}
+		if (strpos($objectpage->content, 'define("__SEO_PAGE_DESC__")') !== false) {
+			$tplcontent .= '$tmp = preg_replace("/<meta name=\"description\" content=\".*?\" \/>/s", "<meta name=\"description\" content=\"" . dol_string_nohtmltag(constant("__SEO_PAGE_DESC__")) . "\"  />", $tmp);';
+		}
+
+		$tplcontent .= 'dolWebsiteOutput($tmp, "html", '.((int) $objectpage->id).'); dolWebsiteIncrementCounter('.((int) $object->id).', "'.$objectpage->type_container.'", '.((int) $objectpage->id).');'."\n";
 		$tplcontent .= "// END PHP ?>\n";
 	} else {
 		$tplcontent .= "<?php // BEGIN PHP\n";

From 20b24446b8dcd048270521c0f8464343222d8642 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 22 Jan 2025 16:31:41 +0100
Subject: [PATCH 083/602] Clean meta tags

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

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index fa39397bfcd..f539d9f68c4 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -191,14 +191,14 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 		// If a language was forced on page, we use it, else we use the lang of visitor else the lang of web site
 		$tplcontent .= '<html'.($objectpage->lang ? ' lang="'.substr($objectpage->lang, 0, 2).'"' : '<?php echo $weblangs->shortlang ? \' lang="\'.$weblangs->shortlang.\'"\' : \'\' ?>').'>'."\n";
 		$tplcontent .= '<head>'."\n";
-		$tplcontent .= '<title>'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'</title>'."\n";
+		$tplcontent .= '<title>'.dol_string_nohtmltag($objectpage->title, 1, 'UTF-8').'</title>'."\n";
 		$tplcontent .= '<meta charset="utf-8">'."\n";
 		$tplcontent .= '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'."\n";
 		$tplcontent .= '<meta name="robots" content="index, follow" />'."\n";
 		$tplcontent .= '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
-		$tplcontent .= '<meta name="keywords" content="'.dol_string_nohtmltag($objectpage->keywords, 0, 'UTF-8').'" />'."\n";
-		$tplcontent .= '<meta name="title" content="'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'" />'."\n";
-		$tplcontent .= '<meta name="description" content="'.dol_string_nohtmltag($objectpage->description, 0, 'UTF-8').'" />'."\n";
+		$tplcontent .= '<meta name="keywords" content="'.dol_string_nohtmltag($objectpage->keywords, 1, 'UTF-8').'" />'."\n";
+		$tplcontent .= '<meta name="title" content="'.dol_string_nohtmltag($objectpage->title, 1, 'UTF-8').'" />'."\n";
+		$tplcontent .= '<meta name="description" content="'.dol_string_nohtmltag($objectpage->description, 1, 'UTF-8').'" />'."\n";
 		$tplcontent .= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.' '.DOL_VERSION.' (https://www.dolibarr.org)" />'."\n";
 		$tplcontent .= '<meta name="dolibarr:pageid" content="'.((int) $objectpage->id).'" />'."\n";
 

From f381a7322cd593a448971ac4c9cebc3e44405356 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 22 Jan 2025 18:48:03 +0100
Subject: [PATCH 084/602] Fix use of constants

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

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index f539d9f68c4..8aab8ba4962 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -315,14 +315,14 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 			$tplcontent .= '$tmp = preg_replace("/<meta name=\"description\" content=\".*?\" \/>/s", "<meta name=\"description\" content=\"" . dol_string_nohtmltag($__PAGE__DESC__) . "\"  />", $tmp);';
 		}
 		// New method for custom SEO
-		if (strpos($objectpage->content, 'define("__SEO_PAGE_TITLE__")') !== false) {
+		if (strpos($objectpage->content, 'define("__SEO_PAGE_TITLE__"') !== false) {
 			$tplcontent .= '$tmp = preg_replace("/<title>.*?<\/title>/s", "<title>" . dol_escape_htmltag(constant("__SEO_PAGE_TITLE__")) . "</title>", $tmp);'."\n";
 			$tplcontent .= '$tmp = preg_replace("/<meta name=\"title\" content=\".*?\" \/>/s", "<meta name=\"title\" content=\"" . dol_string_nohtmltag(constant("__SEO_PAGE_TITLE__")) . "\"  />", $tmp);';
 		}
-		if (strpos($objectpage->content, 'define("__SEO_PAGE_KEYWORDS__")') !== false) {
+		if (strpos($objectpage->content, 'define("__SEO_PAGE_KEYWORDS__"') !== false) {
 			$tplcontent .= '$tmp = preg_replace("/<meta name=\"keywords\" content=\".*?\" \/>/s", "<meta name=\"keywords\" content=\"" . dol_string_nohtmltag(constant("__SEO_PAGE_KEYWORDS__")) . "\"  />", $tmp);';
 		}
-		if (strpos($objectpage->content, 'define("__SEO_PAGE_DESC__")') !== false) {
+		if (strpos($objectpage->content, 'define("__SEO_PAGE_DESC__"') !== false) {
 			$tplcontent .= '$tmp = preg_replace("/<meta name=\"description\" content=\".*?\" \/>/s", "<meta name=\"description\" content=\"" . dol_string_nohtmltag(constant("__SEO_PAGE_DESC__")) . "\"  />", $tmp);';
 		}
 

From 8d0a4ac6d91b0f719135d86c46311094b4987ba9 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 22 Jan 2025 20:18:53 +0100
Subject: [PATCH 085/602] fix: allow list mass action update price when price
 mode is multiprice price

---
 htdocs/core/actions_massactions.inc.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index e84c02a8c93..fb45b57ac7a 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1283,7 +1283,6 @@ if (!$error && ($action == 'updateprice' && $confirm == 'yes') && $permissiontoa
 				if ($result > 0) {
 					if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 						for ($level = 1; $level <= getDolGlobalInt('PRODUIT_MULTIPRICES_LIMIT'); $level++) {
-							// Force the update of the price of the product using the new VAT
 							if ($object->price_base_type == 'TTC') {
 								$newprice = $object->multiprices_ttc[$level] * (100 + $pricepercentage) / 100;
 								$minprice = $object->multiprices_min_ttc[$level];

From 4673f319621bb8693a0896b736a3a4486c768817 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 22 Jan 2025 21:13:26 +0100
Subject: [PATCH 086/602] Debug v21 - fix alternate lang

---
 htdocs/core/lib/website2.lib.php | 107 +++++++++++++++++--------------
 1 file changed, 59 insertions(+), 48 deletions(-)

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 8aab8ba4962..6e156b5070a 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -207,79 +207,90 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 			$tplcontent .= '<link rel="icon" type="image/png" href="/favicon.png" />'."\n";
 		}
 
+		$listofaltlang = $object->otherlang;
+
 		// Add the link of the canonical reference
 		// Note: $object is website, $objectpage is website page
 		if ($object->virtualhost) {
-			$canonicalurladdid = '';
-			if ($objectpage->lang) {	// A language is forced on the page, it means we may have other langueg files with hard links
+			$canonicalurladdidlang = '';
+			if ($objectpage->lang) {	// A language is forced on the page, it means we may have other language files with hard links into properties of page
 				$canonicalurl = (($objectpage->id == $object->fk_default_home) ? '/' : (($shortlangcode != substr($object->lang, 0, 2) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php'));
 			} else {					// No language forced, it means the canonical is the one with
 				$canonicalurl = '/'.$objectpage->pageurl.'.php';
 
-				if ($object->lang && $object->isMultiLang()) {
+				if ($object->lang && $listofaltlang) {
 					$tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
-					$canonicalurl .= '?l=<?php echo $weblangs->shortlang ? $weblangs->shortlang : "'.$tmpshortlangcode.'"; ?>';
 					// Add parameter ID required to be unique/canonical
-					$canonicalurladdid = '<?php echo GETPOSTINT("id") ? "&id=".GETPOSTINT("id") : "" ?>';
+					$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id")."&" : "?" ?>';
+					$canonicalurladdidlang .= 'l=<?php echo $weblangs->shortlang ? $weblangs->shortlang : "'.$tmpshortlangcode.'"; ?>';
 				} else {
 					// Add parameter ID required to be unique/canonical
-					$canonicalurladdid = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id") : "" ?>';
+					$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id") : "" ?>';
 				}
 			}
 
-			$tplcontent .= '<link rel="canonical" href="'.$canonicalurl.$canonicalurladdid.'" />'."\n";
-		}
+			$tplcontent .= '<link rel="canonical" href="<?php echo $website->virtualhost; ?>'.$canonicalurl.$canonicalurladdidlang.'" />'."\n";
 
-		// Add the link of alternate translation reference
-		if ($object->isMultiLang()) {	// If website has other languages to support
-			if ($objectpage->lang) {	// If the page has been set to a given language
-				// Add page "translation of"
-				$translationof = $objectpage->fk_page;
-				if ($translationof) {
-					$tmppage = new WebsitePage($db);
-					$tmppage->fetch($translationof);
-					if ($tmppage->id > 0) {
-						$tmpshortlangcode = '';
-						if ($tmppage->lang) {
-							$tmpshortlangcode = preg_replace('/[_-].*$/', '', $tmppage->lang); // en_US or en-US -> en
-						}
-						if (empty($tmpshortlangcode)) {
-							$tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
-						}
-						if ($tmpshortlangcode != $shortlangcode) {
-							$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="<?php echo $website->virtualhost; ?>'.($object->fk_default_home == $tmppage->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2)) ? '/'.$tmpshortlangcode : '').'/'.$tmppage->pageurl.'.php').'" />'."\n";
-						}
-					}
-				}
-
-				// Add "has translation pages"
-				$sql = "SELECT rowid as id, lang, pageurl from ".MAIN_DB_PREFIX.'website_page where fk_page IN ('.$db->sanitize($objectpage->id.($translationof ? ", ".$translationof : '')).")";
-				$resql = $db->query($sql);
-				if ($resql) {
-					$num_rows = $db->num_rows($resql);
-					if ($num_rows > 0) {
-						while ($obj = $db->fetch_object($resql)) {
+			// Add the link of alternate translation reference
+			if ($listofaltlang) {			// If website has other languages to support
+				if ($objectpage->lang) {	// A language is forced on the page, it means we may have other language files with hard links into properties of page
+					// Add page "translation of"
+					$translationof = $objectpage->fk_page;
+					if ($translationof) {
+						$tmppage = new WebsitePage($db);
+						$tmppage->fetch($translationof);
+						if ($tmppage->id > 0) {
 							$tmpshortlangcode = '';
-							if ($obj->lang) {
-								$tmpshortlangcode = preg_replace('/[_-].*$/', '', $obj->lang); // en_US or en-US -> en
+							if ($tmppage->lang) {
+								$tmpshortlangcode = preg_replace('/[_-].*$/', '', $tmppage->lang); // en_US or en-US -> en
+							}
+							if (empty($tmpshortlangcode)) {
+								$tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
 							}
 							if ($tmpshortlangcode != $shortlangcode) {
-								$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="<?php echo $website->virtualhost; ?>'.($object->fk_default_home == $obj->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2) ? '/'.$tmpshortlangcode : '')).'/'.$obj->pageurl.'.php').'" />'."\n";
+								$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="<?php echo $website->virtualhost; ?>'.($object->fk_default_home == $tmppage->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2)) ? '/'.$tmpshortlangcode : '').'/'.$tmppage->pageurl.'.php').'" />'."\n";
 							}
 						}
 					}
+
+					// Add "has translation pages"
+					$sql = "SELECT rowid as id, lang, pageurl from ".MAIN_DB_PREFIX.'website_page where fk_page IN ('.$db->sanitize($objectpage->id.($translationof ? ", ".$translationof : '')).")";
+					$resql = $db->query($sql);
+					if ($resql) {
+						$num_rows = $db->num_rows($resql);
+						if ($num_rows > 0) {
+							while ($obj = $db->fetch_object($resql)) {
+								$tmpshortlangcode = '';
+								if ($obj->lang) {
+									$tmpshortlangcode = preg_replace('/[_-].*$/', '', $obj->lang); // en_US or en-US -> en
+								}
+								if ($tmpshortlangcode != $shortlangcode) {
+									$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="<?php echo $website->virtualhost; ?>'.($object->fk_default_home == $obj->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2) ? '/'.$tmpshortlangcode : '')).'/'.$obj->pageurl.'.php').'" />'."\n";
+								}
+							}
+						}
+					} else {
+						dol_print_error($db);
+					}
+
+					// Add myself
+					$tplcontent .= '<?php if ($_SERVER["PHP_SELF"] == "'.(($object->fk_default_home == $objectpage->id) ? '/' : (($shortlangcode != substr($object->lang, 0, 2)) ? '/'.$shortlangcode : '')).'/'.$objectpage->pageurl.'.php") { ?>'."\n";
+					$tplcontent .= '<link rel="alternate" hreflang="'.$shortlangcode.'" href="<?php echo $website->virtualhost; ?>'.(($object->fk_default_home == $objectpage->id) ? '/' : (($shortlangcode != substr($object->lang, 0, 2)) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php').'" />'."\n";
+
+					$tplcontent .= '<?php } ?>'."\n";
 				} else {
-					dol_print_error($db);
+					$canonicalurl = '/'.$objectpage->pageurl.'.php';
+					$arrayofaltlang = explode(',', $listofaltlang);
+					foreach ($arrayofaltlang as $altlang) {
+						// Add parameter ID required to be unique/canonical
+						$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id")."&" : "?" ?>';
+						$canonicalurladdidlang .= 'l='.$altlang;
+						$tplcontent .= '<link rel="alternate" hreflang="'.$altlang.'" href="<?php echo $website->virtualhost; ?>'.$canonicalurl.$canonicalurladdidlang.'" />'."\n";
+					}
 				}
-
-				// Add myself
-				$tplcontent .= '<?php if ($_SERVER["PHP_SELF"] == "'.(($object->fk_default_home == $objectpage->id) ? '/' : (($shortlangcode != substr($object->lang, 0, 2)) ? '/'.$shortlangcode : '')).'/'.$objectpage->pageurl.'.php") { ?>'."\n";
-				$tplcontent .= '<link rel="alternate" hreflang="'.$shortlangcode.'" href="<?php echo $website->virtualhost; ?>'.(($object->fk_default_home == $objectpage->id) ? '/' : (($shortlangcode != substr($object->lang, 0, 2)) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php').'" />'."\n";
-
-				$tplcontent .= '<?php } ?>'."\n";
-			} else {
 			}
 		}
+
 		// Add manifest.json. Do we have to add it only on home page ?
 		$tplcontent .= '<?php if ($website->use_manifest) { print \'<link rel="manifest" href="/manifest.json.php" />\'."\n"; } ?>'."\n";
 		$tplcontent .= '<!-- Include link to CSS file -->'."\n";

From 6dc14c6560d0124e3dbc641cacf938f55ed0bb62 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 22 Jan 2025 21:21:29 +0100
Subject: [PATCH 087/602] Debug v21 - fix alternate lang

---
 htdocs/core/lib/website2.lib.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 6e156b5070a..07caa48f9a0 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -281,11 +281,16 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 				} else {
 					$canonicalurl = '/'.$objectpage->pageurl.'.php';
 					$arrayofaltlang = explode(',', $listofaltlang);
+
+					$tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
+
 					foreach ($arrayofaltlang as $altlang) {
-						// Add parameter ID required to be unique/canonical
-						$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id")."&" : "?" ?>';
-						$canonicalurladdidlang .= 'l='.$altlang;
-						$tplcontent .= '<link rel="alternate" hreflang="'.$altlang.'" href="<?php echo $website->virtualhost; ?>'.$canonicalurl.$canonicalurladdidlang.'" />'."\n";
+						if ($altlang != $tmpshortlangcode) {
+							// Add parameter ID required to be unique/canonical
+							$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id")."&" : "?" ?>';
+							$canonicalurladdidlang .= 'l='.$altlang;
+							$tplcontent .= '<link rel="alternate" hreflang="'.$altlang.'" href="<?php echo $website->virtualhost; ?>'.$canonicalurl.$canonicalurladdidlang.'" />'."\n";
+						}
 					}
 				}
 			}

From bae28f5b7e10ba07a186cddc509418ceae62288a Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 22 Jan 2025 21:21:29 +0100
Subject: [PATCH 088/602] Debug v21 - fix alternate lang

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

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 6e156b5070a..31d90141eaa 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -281,12 +281,16 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 				} else {
 					$canonicalurl = '/'.$objectpage->pageurl.'.php';
 					$arrayofaltlang = explode(',', $listofaltlang);
+
 					foreach ($arrayofaltlang as $altlang) {
 						// Add parameter ID required to be unique/canonical
 						$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id")."&" : "?" ?>';
 						$canonicalurladdidlang .= 'l='.$altlang;
 						$tplcontent .= '<link rel="alternate" hreflang="'.$altlang.'" href="<?php echo $website->virtualhost; ?>'.$canonicalurl.$canonicalurladdidlang.'" />'."\n";
 					}
+
+					$tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
+					$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="<?php echo $website->virtualhost; ?>'.$canonicalurl.$canonicalurladdidlang.'" />'."\n";
 				}
 			}
 		}

From e874b980d8a08231564cee8809706b6c6de38b38 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 22 Jan 2025 21:31:06 +0100
Subject: [PATCH 089/602] Debug v21 - Fix canonical

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

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 31d90141eaa..d675473a98a 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -290,6 +290,8 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 					}
 
 					$tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
+					$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id")."&" : "?" ?>';
+					$canonicalurladdidlang .= 'l='.$tmpshortlangcode;
 					$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="<?php echo $website->virtualhost; ?>'.$canonicalurl.$canonicalurladdidlang.'" />'."\n";
 				}
 			}

From 46ec36846202a8a0ee09973a53b03defc5cc674a Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 22 Jan 2025 21:50:38 +0100
Subject: [PATCH 090/602] Fix canonical name

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

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index d675473a98a..fb161162679 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -221,11 +221,11 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 				if ($object->lang && $listofaltlang) {
 					$tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
 					// Add parameter ID required to be unique/canonical
-					$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id")."&" : "?" ?>';
+					$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id")."&" : (GETPOSTINT("cat") ? "?cat=".GETPOSTINT("cat")."&" : "?") ?>';
 					$canonicalurladdidlang .= 'l=<?php echo $weblangs->shortlang ? $weblangs->shortlang : "'.$tmpshortlangcode.'"; ?>';
 				} else {
 					// Add parameter ID required to be unique/canonical
-					$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id") : "" ?>';
+					$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id") : (GETPOSTINT("cat") ? "?cat=".GETPOSTINT("cat") : "") ?>';
 				}
 			}
 
@@ -284,13 +284,13 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 
 					foreach ($arrayofaltlang as $altlang) {
 						// Add parameter ID required to be unique/canonical
-						$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id")."&" : "?" ?>';
+						$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id")."&" : (GETPOSTINT("cat") ? "?cat=".GETPOSTINT("cat")."&" : "?") ?>';
 						$canonicalurladdidlang .= 'l='.$altlang;
 						$tplcontent .= '<link rel="alternate" hreflang="'.$altlang.'" href="<?php echo $website->virtualhost; ?>'.$canonicalurl.$canonicalurladdidlang.'" />'."\n";
 					}
 
 					$tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
-					$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id")."&" : "?" ?>';
+					$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id")."&" : (GETPOSTINT("cat") ? "?cat=".GETPOSTINT("cat")."&" : "?") ?>';
 					$canonicalurladdidlang .= 'l='.$tmpshortlangcode;
 					$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="<?php echo $website->virtualhost; ?>'.$canonicalurl.$canonicalurladdidlang.'" />'."\n";
 				}

From cbe15c7c71059ad25315533d60d52dc973e93bba Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Wed, 22 Jan 2025 23:53:16 +0100
Subject: [PATCH 091/602] missing hookmanager like others doc_generic*odt
 modules

---
 .../project/task/doc/doc_generic_task_odt.modules.php     | 8 ++++++++
 .../core/modules/societe/doc/doc_generic_odt.modules.php  | 1 +
 .../mymodule/doc/doc_generic_myobject_odt.modules.php     | 5 +++++
 .../doc_generic_recruitmentjobposition_odt.modules.php    | 5 +++++
 4 files changed, 19 insertions(+)

diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 51e53e21d3f..f2cb1eddb78 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -469,6 +469,14 @@ class doc_generic_task_odt extends ModelePDFTask
 			return -1;
 		}
 
+		// Add odtgeneration hook
+		if (!is_object($hookmanager)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('odtgeneration'));
+		global $action;
+
 		if (!is_object($outputlangs)) {
 			$outputlangs = $langs;
 		}
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index 374c44c7a25..49ce657fce7 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -216,6 +216,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
+		global $action;
 
 		if (!is_object($outputlangs)) {
 			$outputlangs = $langs;
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index e35fb604cec..680cf49de6b 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -233,7 +233,12 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		}
 
 		// Add odtgeneration hook
+		if (!is_object($hookmanager)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($this->db);
+		}
 		$hookmanager->initHooks(array('odtgeneration'));
+		global $action;
 
 		if (!is_object($outputlangs)) {
 			$outputlangs = $langs;
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
index da7640d708a..128293c9d85 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
@@ -221,7 +221,12 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 		}
 
 		// Add odtgeneration hook
+		if (!is_object($hookmanager)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($this->db);
+		}
 		$hookmanager->initHooks(array('odtgeneration'));
+		global $action;
 
 		if (!is_object($outputlangs)) {
 			$outputlangs = $langs;

From 821565e03142744fe1f9978c21bf1801c16d4c38 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 23 Jan 2025 01:29:29 +0100
Subject: [PATCH 092/602] Debug v21

---
 htdocs/comm/mailing/card.php              | 31 +++++++++++++----------
 htdocs/core/ajax/mailtemplate.php         | 11 ++++----
 htdocs/core/class/html.formmail.class.php |  6 ++---
 htdocs/core/lib/functions.lib.php         | 17 -------------
 4 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index b36538b2a68..0920ddae516 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -799,7 +799,7 @@ if ($action == 'create') {	// aaa
 	// Print mail form
 	print load_fiche_titre($langs->trans("NewMailing"), $availablelink, 'object_email');
 
-	print dol_get_fiche_head(array(), '', '', -4, '', 0, '', '');
+	print dol_get_fiche_head(array(), '', '', 0, '', 0, '', '');
 
 	print '<table class="border centpercent">';
 
@@ -831,17 +831,21 @@ if ($action == 'create') {	// aaa
 	}
 	print '</table>';
 
-	print '<br><br>';
+	print '<br>';
 
 	print '<table class="border centpercent">';
 
-	print '<tr class="fieldsforemail"><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailFrom").'</td><td><input class="flat minwidth200" name="from" value="'.(GETPOSTISSET('from') ? GETPOST('from') : getDolGlobalString('MAILING_EMAIL_FROM')).'"></td></tr>';
+	print '<tr class="fieldsforemail"><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailFrom").'</td>';
+	print '<td>'.img_picto('', 'email', 'class="pictofixedwidth"').'<input class="flat minwidth200" name="from" value="'.(GETPOSTISSET('from') ? GETPOST('from') : getDolGlobalString('MAILING_EMAIL_FROM')).'"></td></tr>';
 
-	print '<tr class="fieldsforsms hidden"><td class="fieldrequired titlefieldcreate">'.$langs->trans("PhoneFrom").'</td><td><input class="flat minwidth200" name="fromphone" value="'.(GETPOSTISSET('fromphone') ? GETPOST('fromphone') : getDolGlobalString('MAILING_SMS_FROM')).'" placeholder="+123..."></td></tr>';
+	print '<tr class="fieldsforsms hidden"><td class="fieldrequired titlefieldcreate">'.$langs->trans("PhoneFrom").'</td>';
+	print '<td>'.img_picto('', 'email', 'class="pictofixedwidth"').'<input class="flat minwidth200" name="fromphone" value="'.(GETPOSTISSET('fromphone') ? GETPOST('fromphone') : getDolGlobalString('MAILING_SMS_FROM')).'" placeholder="+123..."></td></tr>';
 
-	print '<tr class="fieldsforemail"><td>'.$langs->trans("MailErrorsTo").'</td><td><input class="flat minwidth200" name="errorsto" value="'.getDolGlobalString('MAILING_EMAIL_ERRORSTO', getDolGlobalString('MAIN_MAIL_ERRORS_TO')).'"></td></tr>';
+	print '<tr class="fieldsforemail"><td>'.$langs->trans("MailErrorsTo").'</td>';
+	print '<td>'.img_picto('', 'email', 'class="pictofixedwidth"').'<input class="flat minwidth200" name="errorsto" value="'.getDolGlobalString('MAILING_EMAIL_ERRORSTO', getDolGlobalString('MAIN_MAIL_ERRORS_TO')).'"></td></tr>';
 
-	print '<tr class="fieldsforemail"><td>'.$langs->trans("MailReply").'</td><td><input class="flat minwidth200" name="replyto" value="'.getDolGlobalString('MAILING_EMAIL_REPLYTO', getDolGlobalString('MAIN_MAIL_REPLY_TO')).'"></td></tr>';
+	print '<tr class="fieldsforemail"><td>'.$langs->trans("MailReply").'</td>';
+	print '<td>'.img_picto('', 'email', 'class="pictofixedwidth"').'<input class="flat minwidth200" name="replyto" value="'.getDolGlobalString('MAILING_EMAIL_REPLYTO', getDolGlobalString('MAIN_MAIL_REPLY_TO')).'"></td></tr>';
 
 	// Other attributes
 	$parameters = array();
@@ -852,7 +856,8 @@ if ($action == 'create') {	// aaa
 	}
 
 	print '</table>';
-	print '<br><br>';
+
+	print '<br>';
 
 	print '<table class="border centpercent">';
 	print '<tr class="fieldsforemail"><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailTopic").'</td><td><input id="sujet" class="flat minwidth200 quatrevingtpercent" name="sujet" value="'.dol_escape_htmltag(GETPOST('sujet', 'alphanohtml')).'"></td></tr>';
@@ -889,7 +894,7 @@ if ($action == 'create') {	// aaa
 	print '<div style="padding-top: 10px">';
 	// wysiwyg editor
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('bodyemail', GETPOST('bodyemail', 'restricthtmlallowunvalid'), '', 600, 'dolibarr_mailings', '', true, -1, getDolGlobalInt('FCKEDITOR_ENABLE_MAILING'), 20, '90%');
+	$doleditor = new DolEditor('bodyemail', GETPOST('bodyemail', 'restricthtmlallowunvalid'), '', 600, 'dolibarr_mailings', '', true, -1, getDolGlobalInt('FCKEDITOR_ENABLE_MAILING'), 20, '100%');
 	$doleditor->Create();
 	print '</div>';
 
@@ -1129,7 +1134,7 @@ if ($action == 'create') {	// aaa
 				}
 				print $text;
 				if (getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING') != 'default') {
-					if (getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING') != 'mail') {
+					if (getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING') && getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING') != 'mail') {
 						print ' <span class="opacitymedium">('.getDolGlobalString('MAIN_MAIL_SMTP_SERVER_EMAILING', getDolGlobalString('MAIN_MAIL_SMTP_SERVER')).')</span>';
 					}
 				} elseif (getDolGlobalString('MAIN_MAIL_SENDMODE') != 'mail' && getDolGlobalString('MAIN_MAIL_SMTP_SERVER')) {
@@ -1329,7 +1334,7 @@ if ($action == 'create') {	// aaa
 				$readonly = 1;
 				// wysiwyg editor
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', false, -1, getDolGlobalInt('FCKEDITOR_ENABLE_MAILING'), 20, '90%', $readonly);
+				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', false, -1, getDolGlobalInt('FCKEDITOR_ENABLE_MAILING'), 20, '100%', $readonly);
 				$doleditor->Create();
 			} else {
 				print dol_htmlentitiesbr($object->body);
@@ -1548,19 +1553,19 @@ if ($action == 'create') {	// aaa
 			if ($action == 'edit') {
 				// wysiwyg editor
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, -1, getDolGlobalInt('FCKEDITOR_ENABLE_MAILING'), 20, '90%');
+				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, -1, getDolGlobalInt('FCKEDITOR_ENABLE_MAILING'), 20, '100%');
 				$doleditor->Create();
 			}
 			if ($action == 'edittxt') {
 				// wysiwyg editor
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, -1, 0, 20, '90%');
+				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, -1, 0, 20, '100%');
 				$doleditor->Create();
 			}
 			if ($action == 'edithtml') {
 				// HTML source editor
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, -1, 'ace', 20, '90%');
+				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, -1, 'ace', 20, '100%');
 				$doleditor->Create(0, '', false, 'HTML Source', 'php');
 			}
 
diff --git a/htdocs/core/ajax/mailtemplate.php b/htdocs/core/ajax/mailtemplate.php
index 41054250305..fd6981b8c7f 100644
--- a/htdocs/core/ajax/mailtemplate.php
+++ b/htdocs/core/ajax/mailtemplate.php
@@ -73,16 +73,17 @@ if (GETPOSTISSET('content')) {
 
 		foreach ($selectedPosts as $postId) {
 			$post = getNewsDetailsById($postId);
+
 			$newsList .= '<div style="display: flex; align-items: flex-start; justify-content: flex-start; width: 100%; max-width: 800px; margin-top: 20px;margin-bottom: 50px; padding: 20px;">
                             <div style="flex-grow: 1; margin-right: 30px; max-width: 600px; margin-left: 100px;">
-                                <h2 style="margin: 0; font-size: 1.5em;">' . htmlentities($post['title']) . '</h2>
-                                <p style="margin: 10px 0; color: #555;">' . htmlentities($post['description']) . '</p>
-                                <span style="display: block; margin-bottom: 5px; color: #888;">Created By: <strong>' . htmlentities($post['user_fullname']) . '</strong></span>
+                                <h2 style="margin: 0; font-size: 1.5em;">' . htmlentities(empty($post['title']) ? '' : $post['title']) . '</h2>
+                                <p style="margin: 10px 0; color: #555;">' . htmlentities(empty($post['description']) ? '' : $post['description']) . '</p>
+                                <span style="display: block; margin-bottom: 5px; color: #888;">Created By: <strong>' . htmlentities(empty($post['user_fullname']) ? '' : $post['user_fullname']) . '</strong></span>
                                 <br>
-                                <span style="display: block; color: #888;">' . dol_print_date($post['date_creation'], 'daytext', 'tzserver', $langs) . '</span>
+                                <span style="display: block; color: #888;">' . dol_print_date((empty($post['date_creation']) ? dol_now() : $post['date_creation']), 'daytext', 'tzserver', $langs) . '</span>
                             </div>
                             <div style="flex-shrink: 0; margin-left: 100px; float: right;">
-                                ' . ($post['image'] ? '<img alt="Image" width="130px" height="130px" style="border-radius: 10px;" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=medias&file=' . htmlentities($post['image']) . '">' : '<img alt="Gray rectangle" width="130px" height="130px" style="border-radius: 10px;" src="__GRAY_RECTANGLE__">') . '
+                                ' . (!empty($post['image']) ? '<img alt="Image" width="130px" height="130px" style="border-radius: 10px;" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=medias&file=' . htmlentities($post['image']) . '">' : '<img alt="Gray rectangle" width="130px" height="130px" style="border-radius: 10px;" src="__GRAY_RECTANGLE__">') . '
                             </div>
                         </div>';
 		}
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 3f09d2816f7..21f064ba8ca 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1693,7 +1693,7 @@ class FormMail extends Form
 		// Use the multiselect array function to create the dropdown
 		$out .= '<div id="post-dropdown-container" class="email-layout-container hidden" style="display:none;">';
 		$out .= '<label for="blogpost-select">Select Posts: </label>';
-		$out .= self::multiselectarray('blogpost-select', $blogArray);
+		$out .= self::multiselectarray('blogpost-select', $blogArray, array(), 0, 0, 'minwidth200');
 		$out .= '</div>';
 
 		$out .= '<script type="text/javascript">
@@ -1706,9 +1706,7 @@ class FormMail extends Form
           var sendtocc = jQuery("#sendtocc").val();
           var sendtoccc = jQuery("#sendtoccc").val();
 
-					console.log("We choose a layout for email template=" + template + ", subject="+subject);
-
-				console.log("We choose a layout for email template " + template);
+				console.log("We choose a layout for email template=" + template + ", subject="+subject);
 
 				$(".template-option").removeClass("selected");
 				$(this).addClass("selected");
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5bdf8f1eaed..459bc021b4d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2704,23 +2704,6 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 		$out .= '<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>'; // Output right area first so when space is missing, text is in front of tabs and not under.
 	}
 
-	// Show title
-	/*
-	if (!empty($title) && $showtitle && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
-		$limittitle = 30;
-		$out .= '<a class="tabTitle">';
-		if ($picto) {
-			$noprefix = $pictoisfullpath;
-			if (strpos($picto, 'fontawesome_') !== false) {
-				$noprefix = 1;
-			}
-			$out .= img_picto($title, ($noprefix ? '' : 'object_').$picto, '', $pictoisfullpath, 0, 0, '', 'imgTabTitle').' ';
-		}
-		$out .= '<span class="tabTitleText">'.dol_escape_htmltag(dol_trunc($title, $limittitle)).'</span>';
-		$out .= '</a>';
-	}
-	*/
-
 	// Show tabs
 
 	// Define max of key (max may be higher than sizeof because of hole due to module disabling some tabs).

From 47da1b3242213636e6034dfce989a21bc3414c28 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 23 Jan 2025 01:35:52 +0100
Subject: [PATCH 093/602] Debug v21

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

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index ce1ef8fbcce..ed5e64a5a39 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -476,7 +476,7 @@ if ($object->fetch($id) >= 0) {
 		}
 		print $text;
 		if (getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING') != 'default') {
-			if (getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING') != 'mail') {
+			if (getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING') && getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING') != 'mail') {
 				print ' <span class="opacitymedium">('.getDolGlobalString('MAIN_MAIL_SMTP_SERVER_EMAILING', getDolGlobalString('MAIN_MAIL_SMTP_SERVER')).')</span>';
 			}
 		} elseif (getDolGlobalString('MAIN_MAIL_SENDMODE') != 'mail' && getDolGlobalString('MAIN_MAIL_SMTP_SERVER')) {
@@ -678,7 +678,7 @@ if ($object->fetch($id) >= 0) {
 			print '<br>';
 		}
 
-		print '<br>';
+		print '<br><br>';
 	}
 
 	// List of selected targets

From aa27507dcd4ab2a599d2210b8dd3decb7c5139d3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 01:47:12 +0100
Subject: [PATCH 094/602] Update ignore_translation_keys.lst

---
 dev/translation/ignore_translation_keys.lst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst
index 5679343b154..9a34c97bc3f 100644
--- a/dev/translation/ignore_translation_keys.lst
+++ b/dev/translation/ignore_translation_keys.lst
@@ -53,7 +53,6 @@ MoveField
 MyContacts
 NbOfActiveNotifications
 NbOfTargetedContacts
-Payed
 PreviewMailing
 Processing
 PropalStatusClosedShort

From 8f2dd9fb7dd900634f207e6735797e0f165562fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 01:48:10 +0100
Subject: [PATCH 095/602] Update company.lib.php

---
 htdocs/core/lib/company.lib.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 09ff9d4edd1..ba8b55c69d7 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1756,7 +1756,6 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr
 	global $user, $conf, $hookmanager;
 	global $form;
 	global $param, $massactionbutton;
-	global $langs;
 
 	$start_year = GETPOSTINT('dateevent_startyear');
 	$start_month = GETPOSTINT('dateevent_startmonth');

From 17ac6fee618926b5c7a5dc2a38d90592e39c7ecc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 23 Jan 2025 01:55:07 +0100
Subject: [PATCH 096/602] Doc

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

diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
index f4a90409958..0350e98dc49 100644
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
@@ -49,7 +49,7 @@ create table llx_product_fournisseur_price
   fk_supplier_price_expression	integer,            -- Link to the rule for dynamic price calculation
   delivery_time_days    integer,
   supplier_reputation varchar(10),
-  packaging			    real DEFAULT NULL,
+  packaging			    real DEFAULT NULL,            -- qty bought will be a multiple of this value
   fk_multicurrency		integer,
   multicurrency_code	varchar(3),
   multicurrency_tx			double(24,8) DEFAULT 1,

From 497316481ae1aa2f73e89613337ab7fc303cfdcf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 23 Jan 2025 02:26:43 +0100
Subject: [PATCH 097/602] Debug v21

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

diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 3cf6e4f82eb..996bf17dcef 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -132,7 +132,7 @@ if ($massaction == 'preupdateprice') {
 	$formquestion = array();
 
 	$valuefield = '<div style="display: flex; align-items: center; justify-content: flex-end; padding-right: 150px">';
-	$valuefield .= '<input type="number" name="pricerate" id="pricerate" min="-100" value="0" style="width: 100px; text-align: right; margin-right: 10px" />%';
+	$valuefield .= '<input class="width50 right" type="text" name="pricerate" id="pricerate" min="-100" placeholder="0" value="" /> %';
 	$valuefield .= '</div>';
 
 	$formquestion[] = array(

From 0251c012968f29f85b31d231fc903bd5c8ed6517 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 23 Jan 2025 02:42:06 +0100
Subject: [PATCH 098/602] Fix warning

---
 htdocs/comm/propal/class/propal.class.php |  2 +-
 htdocs/commande/class/commande.class.php  |  2 +-
 htdocs/core/class/conf.class.php          | 36 +++++++++++------------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 4db467dc34b..f22834a8934 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -497,7 +497,7 @@ class Propal extends CommonObject
 			$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $this->thirdparty, $tva_npr);
 
 			// multiprices
-			if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') && $this->thirdparty->price_level) {
 				$price = $prod->multiprices[$this->thirdparty->price_level];
 			} else {
 				$price = $prod->price;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 630e9fab8d7..57c5e0cf975 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1812,7 +1812,7 @@ class Commande extends CommonOrder
 			$localtax2_tx = get_localtax($tva_tx, 2, $this->thirdparty, $mysoc, $tva_npr);
 
 			// multiprix
-			if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') && $this->thirdparty->price_level) {
 				$price = $prod->multiprices[$this->thirdparty->price_level];
 			} else {
 				$price = $prod->price;
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 3848b19cc28..daa3e0c6cc7 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -1134,10 +1134,10 @@ class Conf extends stdClass
 			// Avoid strict errors. TODO: Replace xxx->warning_delay with a property ->warning_delay_xxx
 			if (isset($this->agenda)) {
 				$this->adherent->subscription = new stdClass();
-				$this->adherent->subscription->warning_delay = (isset($this->global->MAIN_DELAY_MEMBERS) ? (int) $this->global->MAIN_DELAY_MEMBERS : 0) * 86400;
+				$this->adherent->subscription->warning_delay = getDolGlobalInt('MAIN_DELAY_MEMBERS') * 86400;
 			}
 			if (isset($this->agenda)) {
-				$this->agenda->warning_delay = (isset($this->global->MAIN_DELAY_ACTIONS_TODO) ? (int) $this->global->MAIN_DELAY_ACTIONS_TODO : 7) * 86400;
+				$this->agenda->warning_delay = getDolGlobalInt('MAIN_DELAY_ACTIONS_TODO', 7) * 86400;
 			}
 			if (isset($this->projet)) {
 				$this->projet->warning_delay = (getDolGlobalInt('MAIN_DELAY_PROJECT_TO_CLOSE', 7) * 86400);
@@ -1148,46 +1148,46 @@ class Conf extends stdClass
 			if (isset($this->commande)) {
 				$this->commande->client = new stdClass();
 				$this->commande->fournisseur = new stdClass();
-				$this->commande->client->warning_delay = (isset($this->global->MAIN_DELAY_ORDERS_TO_PROCESS) ? (int) $this->global->MAIN_DELAY_ORDERS_TO_PROCESS : 2) * 86400;
-				$this->commande->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS) ? (int) $this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS : 7) * 86400;
+				$this->commande->client->warning_delay = getDolGlobalInt('MAIN_DELAY_ORDERS_TO_PROCESS', 2) * 86400;
+				$this->commande->fournisseur->warning_delay = getDolGlobalInt('MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS', 7) * 86400;
 			}
 			if (isset($this->propal)) {
 				$this->propal->cloture = new stdClass();
 				$this->propal->facturation = new stdClass();
-				$this->propal->cloture->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_CLOSE) ? (int) $this->global->MAIN_DELAY_PROPALS_TO_CLOSE : 0) * 86400;
-				$this->propal->facturation->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_BILL) ? (int) $this->global->MAIN_DELAY_PROPALS_TO_BILL : 0) * 86400;
+				$this->propal->cloture->warning_delay = getDolGlobalInt('MAIN_DELAY_PROPALS_TO_CLOSE') * 86400;
+				$this->propal->facturation->warning_delay = getDolGlobalInt('MAIN_DELAY_PROPALS_TO_BILL') * 86400;
 			}
 			if (isset($this->facture)) {
 				$this->facture->client = new stdClass();
 				$this->facture->fournisseur = new stdClass();
-				$this->facture->client->warning_delay = (isset($this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED) ? (int) $this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED : 0) * 86400;
-				$this->facture->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY) ? (int) $this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY : 0) * 86400;
+				$this->facture->client->warning_delay = getDolGlobalInt('MAIN_DELAY_CUSTOMER_BILLS_UNPAYED') * 86400;
+				$this->facture->fournisseur->warning_delay = getDolGlobalInt('MAIN_DELAY_SUPPLIER_BILLS_TO_PAY') * 86400;
 			}
 			if (isset($this->contrat)) {
 				$this->contrat->services = new stdClass();
 				$this->contrat->services->inactifs = new stdClass();
 				$this->contrat->services->expires = new stdClass();
-				$this->contrat->services->inactifs->warning_delay = (isset($this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES) ? (int) $this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES : 0) * 86400;
-				$this->contrat->services->expires->warning_delay = (isset($this->global->MAIN_DELAY_RUNNING_SERVICES) ? (int) $this->global->MAIN_DELAY_RUNNING_SERVICES : 0) * 86400;
+				$this->contrat->services->inactifs->warning_delay = getDolGlobalInt('MAIN_DELAY_NOT_ACTIVATED_SERVICES') * 86400;
+				$this->contrat->services->expires->warning_delay = getDolGlobalInt(MAIN_DELAY_RUNNING_SERVICES) * 86400;
 			}
 			if (isset($this->commande)) {
 				$this->bank->rappro	= new stdClass();
 				$this->bank->cheque	= new stdClass();
-				$this->bank->rappro->warning_delay = (isset($this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE) ? (int) $this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE : 0) * 86400;
-				$this->bank->cheque->warning_delay = (isset($this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT) ? (int) $this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT : 0) * 86400;
+				$this->bank->rappro->warning_delay = getDolGlobalInt('MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE') * 86400;
+				$this->bank->cheque->warning_delay = getDolGlobalInt('MAIN_DELAY_CHEQUES_TO_DEPOSIT') * 86400;
 			}
 			if (isset($this->expensereport)) {
 				$this->expensereport->approve = new stdClass();
-				$this->expensereport->approve->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS) ? (int) $this->global->MAIN_DELAY_EXPENSEREPORTS : 0) * 86400;
+				$this->expensereport->approve->warning_delay = getDolGlobalInt('MAIN_DELAY_EXPENSEREPORTS') * 86400;
 				$this->expensereport->payment = new stdClass();
-				$this->expensereport->payment->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY) ? (int) $this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY : 0) * 86400;
+				$this->expensereport->payment->warning_delay = getDolGlobalInt('MIN_DELAY_EXPENSEREPORTS_TO_PAY') * 86400;
 			}
 			if (isset($this->holiday)) {
 				$this->holiday->approve = new stdClass();
-				$this->holiday->approve->warning_delay = (isset($this->global->MAIN_DELAY_HOLIDAYS) ? (int) $this->global->MAIN_DELAY_HOLIDAYS : 0) * 86400;
+				$this->holiday->approve->warning_delay = getDolGlobalInt('MAIN_DELAY_HOLIDAYS') * 86400;
 			}
 
-			if ((!empty($this->global->PRODUIT_MULTIPRICES) || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && empty($this->global->PRODUIT_MULTIPRICES_LIMIT)) {
+			if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) && !getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT')) {
 				$this->global->PRODUIT_MULTIPRICES_LIMIT = 5;
 			}
 
@@ -1197,10 +1197,10 @@ class Conf extends stdClass
 
 			// For modules that want to disable top or left menu
 			if (!empty($this->global->MAIN_HIDE_TOP_MENU)) {
-				$this->dol_hide_topmenu = $this->global->MAIN_HIDE_TOP_MENU;
+				$this->dol_hide_topmenu = getDolGlobalString('MAIN_HIDE_TOP_MENU');
 			}
 			if (!empty($this->global->MAIN_HIDE_LEFT_MENU)) {
-				$this->dol_hide_leftmenu = $this->global->MAIN_HIDE_LEFT_MENU;
+				$this->dol_hide_leftmenu = getDolGlobalString('MAIN_HIDE_LEFT_MENU');
 			}
 
 			if (empty($this->global->MAIN_SIZE_SHORTLIST_LIMIT)) {

From 2da37fffc4b8e048a679c7ad517d4f326a262fcb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 23 Jan 2025 02:45:01 +0100
Subject: [PATCH 099/602] Fix quotes

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

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index daa3e0c6cc7..f6f452062c1 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -1168,7 +1168,7 @@ class Conf extends stdClass
 				$this->contrat->services->inactifs = new stdClass();
 				$this->contrat->services->expires = new stdClass();
 				$this->contrat->services->inactifs->warning_delay = getDolGlobalInt('MAIN_DELAY_NOT_ACTIVATED_SERVICES') * 86400;
-				$this->contrat->services->expires->warning_delay = getDolGlobalInt(MAIN_DELAY_RUNNING_SERVICES) * 86400;
+				$this->contrat->services->expires->warning_delay = getDolGlobalInt('MAIN_DELAY_RUNNING_SERVICES') * 86400;
 			}
 			if (isset($this->commande)) {
 				$this->bank->rappro	= new stdClass();

From d42f958398ddc913e47a326c18c84b30275fc3b1 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 Jan 2025 09:34:32 +0100
Subject: [PATCH 100/602] fix pre-commit

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

diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index eb08aac811d..b993a699cb8 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -386,7 +386,7 @@ $form->select_comptes(getDolGlobalString('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS'), 'S
 print '</td></tr>';
 
 
-// Param to record automatically payouts (received from IPN payout.payed and payout.created)
+// Param to record automatically payouts (received from IPN payout.paid and payout.created)
 print '<tr class="oddeven"><td>';
 print $langs->trans("StripeAutoRecordPayout").'</td><td>';
 if ($conf->use_javascript_ajax) {

From 4263b256867797ffd680e963cc300b553bd4ccf4 Mon Sep 17 00:00:00 2001
From: William Mead <william@inovea-conseil.com>
Date: Thu, 23 Jan 2025 09:36:35 +0100
Subject: [PATCH 101/602] Added task reopen button. Refactored task status
 method. Updated EN localization.

---
 htdocs/core/class/commonobject.class.php |  2 +-
 htdocs/langs/en_US/projects.lang         |  1 +
 htdocs/projet/class/task.class.php       | 54 ------------------------
 htdocs/projet/tasks/task.php             | 24 +++++++++--
 4 files changed, 22 insertions(+), 59 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e4ab9a505d1..95f961eaf13 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -11040,7 +11040,7 @@ abstract class CommonObject
 		$this->db->begin();
 
 		$statusfield = 'status';
-		if (in_array($this->element, array('don', 'donation', 'shipping'))) {
+		if (in_array($this->element, array('don', 'donation', 'shipping', 'project_task'))) {
 			$statusfield = 'fk_statut';
 		}
 
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 9e2bf735982..c5f4c4caab3 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -315,3 +315,4 @@ Billable = Billable
 ConfirmCloseTask=Are you sure you want to close this task ?
 ConfirmClosed=Confirm task closed
 TaskStatus=Task status
+TaskReopened=Task reopened
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 848310af2e6..2c9620f0886 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -786,60 +786,6 @@ class Task extends CommonObjectLine
 		}
 	}
 
-
-	/**
-	 *  Close task from database
-	 * @param User $user User that close
-	 * @param int $notrigger 0=launch triggers after, 1=disable triggers
-	 * @return    int                        Return integer <0 if KO, >0 if OK
-	 */
-	public function close($user,$notrigger = 0) {
-
-		global $conf;
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		$error = 0;
-
-		$this->db->begin();
-
-		dol_syslog(get_class($this)."::close record task", LOG_DEBUG);
-
-		$sql = " UPDATE ".MAIN_DB_PREFIX."projet_task ";
-		$sql.= "SET fk_statut=".$this::STATUS_CLOSED." WHERE rowid=".(int) $this->id;
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error++;
-			$this->errors[] = "Error ".$this->db->lasterror();
-		}
-
-		if (!$error) {
-			if (!$notrigger) {
-				// Call trigger
-				$result = $this->call_trigger('TASK_CLOSE', $user);
-				if ($result < 0) {
-					$error++;
-				}
-				// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			foreach ($this->errors as $errmsg) {
-				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-			}
-			$this->db->rollback();
-			return -1 * $error;
-		} else {
-			$this->db->commit();
-			return 1;
-		}
-
-	}
-
-
 	/**
 	 *	Delete task from database
 	 *
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 4d09cbcb1ef..e660ece48ec 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -217,7 +217,7 @@ if ($action == 'confirm_close' && $confirm == "yes" && $user->hasRight('projet',
 	$result = $projectstatic->fetch($object->fk_project);
 	$projectstatic->fetch_thirdparty();
 
-	if ($object->close($user) > 0) {
+	if ($object->setStatusCommon($user, Task::STATUS_CLOSED) > 0) {
 		header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?restore_lastsearch_values=1&id='.$projectstatic->id.($withproject ? '&withproject=1' : ''));
 		exit;
 	} else {
@@ -273,6 +273,17 @@ if ($action == 'remove_file' && $user->hasRight('projet', 'creer')) {
 	}
 }
 
+// Reopen task
+if ($action == 'reopen' && $user->hasRight('projet', 'creer')) {
+	$result = $object->setStatusCommon($user, Task::STATUS_VALIDATED);
+	if ($result >= 0) {
+		setEventMessages($langs->trans("TaskReopened"), null, 'mesgs');
+	} else {
+		$error++;
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+}
+
 
 /*
  * View
@@ -757,13 +768,18 @@ if ($id > 0 || !empty($ref)) {
 		if (empty($reshook)) {
 			// Modify
 			if ($user->hasRight('projet', 'creer')) {
-				if ($object->fk_statut != $object::STATUS_CLOSED)
+				if ($object->status != $object::STATUS_CLOSED) {
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&token='.newToken().'&withproject='.((int) $withproject).'">'.$langs->trans('Modify').'</a>';
+				}
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&token='.newToken().'&withproject='.((int) $withproject).'">'.$langs->trans('Clone').'</a>';
 				print '<a class="butActionDelete classfortooltip" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=merge&token='.newToken().'&withproject='.((int) $withproject).'" title="'.$langs->trans("MergeTasks").'">'.$langs->trans('Merge').'</a>';
 
-				if ($object->fk_statut != $object::STATUS_CLOSED)
-				print '<a class="butAction classfortooltip" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close&token='.newToken().'&withproject='.((int) $withproject).'" title="'.$langs->trans("Close").'">'.$langs->trans('Close').'</a>';
+				if ($object->status != $object::STATUS_CLOSED) {
+					print '<a class="butAction classfortooltip" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close&token='.newToken().'&withproject='.((int) $withproject).'" title="'.$langs->trans("Close").'">'.$langs->trans('Close').'</a>';
+				}
+				if ($object->status == $object::STATUS_CLOSED) {
+					print '<a class="butAction classfortooltip" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen&token='.newToken().'&withproject='.((int) $withproject).'" title="'.$langs->trans("ReOpen").'">'.$langs->trans('ReOpen').'</a>';
+				}
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Modify').'</a>';
 

From bcf62738f0965787986206dcf020c63197a8fba1 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 Jan 2025 09:42:32 +0100
Subject: [PATCH 102/602] Update main.lang

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

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index a76687104cb..d1cb8efc86c 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1253,6 +1253,7 @@ CommercialAffected=Sales representative assigned
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=Message
+Emailing=Emailing
 Progression=Progress
 YourMessage=Your message
 YourMessageHasBeenReceived=Your message has been received. We will answer or contact you as soon as possible.

From dc83dd7cbebc3983950244655688a5839bf120f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Cendrier?= <noe.cendrier@altairis.fr>
Date: Thu, 23 Jan 2025 10:02:59 +0100
Subject: [PATCH 103/602] FIX: trailing space

---
 htdocs/comm/propal/class/propaleligne.class.php    | 2 +-
 htdocs/commande/class/orderline.class.php          | 2 +-
 htdocs/compta/facture/class/factureligne.class.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/propal/class/propaleligne.class.php b/htdocs/comm/propal/class/propaleligne.class.php
index 817b6866f64..c300084d960 100644
--- a/htdocs/comm/propal/class/propaleligne.class.php
+++ b/htdocs/comm/propal/class/propaleligne.class.php
@@ -375,7 +375,7 @@ class PropaleLigne extends CommonObjectLine
 		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
 		$sql .= ' pd.date_start, pd.date_end, pd.product_type';
 		if (getDolGlobalInt('PRODUCT_USE_CUSTOMER_PACKAGING')) {
-			$sql .= ', p.packaging'; 
+			$sql .= ', p.packaging';
 		}
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'propaldet as pd';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pd.fk_product = p.rowid';
diff --git a/htdocs/commande/class/orderline.class.php b/htdocs/commande/class/orderline.class.php
index 9db924777f5..10519dd0cf2 100644
--- a/htdocs/commande/class/orderline.class.php
+++ b/htdocs/commande/class/orderline.class.php
@@ -176,7 +176,7 @@ class OrderLine extends CommonOrderLine
 		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc, p.tobatch as product_tobatch,';
 		$sql .= ' cd.date_start, cd.date_end, cd.vat_src_code';
 		if (getDolGlobalInt('PRODUCT_USE_CUSTOMER_PACKAGING')) {
-			$sql .= ', p.packaging'; 
+			$sql .= ', p.packaging';
 		}
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as cd';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
diff --git a/htdocs/compta/facture/class/factureligne.class.php b/htdocs/compta/facture/class/factureligne.class.php
index c96f07c056b..c397b5ddf00 100644
--- a/htdocs/compta/facture/class/factureligne.class.php
+++ b/htdocs/compta/facture/class/factureligne.class.php
@@ -217,7 +217,7 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= ' fd.multicurrency_total_ttc,';
 		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc';
 		if (getDolGlobalInt('PRODUCT_USE_CUSTOMER_PACKAGING')) {
-			$sql .= ', p.packaging'; 
+			$sql .= ', p.packaging';
 		}
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facturedet as fd';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON fd.fk_product = p.rowid';

From db97347497105c964ca4036ff71e794f58310839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Cendrier?= <noe.cendrier@altairis.fr>
Date: Thu, 23 Jan 2025 10:25:24 +0100
Subject: [PATCH 104/602] FIX: phan remarks

---
 htdocs/product/class/product.class.php | 4 ----
 htdocs/product/price.php               | 6 ++----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 49710e29d87..368a44ecd4a 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1442,10 +1442,6 @@ class Product extends CommonObject
 		$this->accountancy_code_sell_intra = trim($this->accountancy_code_sell_intra);
 		$this->accountancy_code_sell_export = trim($this->accountancy_code_sell_export);
 
-		if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING') && !empty($this->packaging)) {
-			$this->packaging = $this->packaging;
-		}
-
 		$this->db->begin();
 
 		$result = 0;
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index aba3ab981c7..d8000817b9f 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -14,7 +14,7 @@
  * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2018		Nicolas ZABOURI			<info@inovea-conseil.com>
  * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024		Mélina Joum				<melina.joum@altairis.fr>
+ * Copyright (C) 2025		Mélina Joum				<melina.joum@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
@@ -284,9 +284,7 @@ if (empty($reshook)) {
 		$maxpricesupplier = $object->min_recommended_price();
 
 		// Packaging / Conditionnement
-		if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
-			$packaging = GETPOST('packaging');
-		}
+		$packaging = getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING') ? GETPOST('packaging') : null;
 
 		if (isModEnabled('dynamicprices')) {
 			$object->fk_price_expression = empty($eid) ? 0 : $eid; //0 discards expression

From 2589febbae97cd9ff25722157648c7dd13e9615e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Cendrier?= <noe.cendrier@altairis.fr>
Date: Thu, 23 Jan 2025 10:34:59 +0100
Subject: [PATCH 105/602] FIX: property type

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

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index d8000817b9f..1984b661cab 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -486,7 +486,7 @@ if (empty($reshook)) {
 
 			// Packaging / Conditionnement
 			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
-				$object->packaging = $packaging;
+				$object->packaging = (double) $packaging;
 			}
 
 			foreach ($pricestoupdate as $key => $val) {

From c395b626edb93ec4b3f3305c5c48ea9c8a82af90 Mon Sep 17 00:00:00 2001
From: Dolibot <dolibarr-bot@users.noreply.github.com>
Date: Thu, 23 Jan 2025 12:06:56 +0000
Subject: [PATCH 106/602] PHPStan > Update baseline

---
 dev/build/phpstan/phpstan-baseline.neon | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 02bff396fb4..ff60a067420 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -22332,30 +22332,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/loan/payment/payment.php
 
-		-
-			message: '#^Variable \$amount_capital might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/loan/payment/payment.php
-
-		-
-			message: '#^Variable \$amount_insurance might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/loan/payment/payment.php
-
-		-
-			message: '#^Variable \$amount_interest might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/loan/payment/payment.php
-
-		-
-			message: '#^Variable \$line_id might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/loan/payment/payment.php
-
 		-
 			message: '#^Variable \$sumpaid might not be defined\.$#'
 			identifier: variable.undefined

From e36f5fc31daf111ce2e58da4ebdfe5e796198420 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 13:07:51 +0100
Subject: [PATCH 107/602] Debug v21

---
 htdocs/societe/card.php | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index fd29d86a584..72c6b5bc671 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1551,7 +1551,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			print '</td>';
 			print '</tr>';
 
-			print '<tr><td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
+			// Customer code
+			print '<tr>';
+			print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
 			print '<table class="nobordernopadding"><tr><td>';
 			$tmpcode = $object->code_client;
 			if (empty($tmpcode) && !empty($modCodeClient->code_auto)) {
@@ -1564,14 +1566,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			print '</td></tr></table>';
 			print '</td>';
 
+			// Supplier code
 			if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
 				if ($conf->browser->layout == 'phone') {
 					print '<td colspan="2"></td>';
 					print '</tr><tr>';
 				}
-				print '<td>'.$form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0).'</td>';
-				print '<td>';
-				print '<table class="nobordernopadding"><tr>';
+				print '<td>'.$form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0).'</td><td>';
+				print '<table class="nobordernopadding"><tr><td>';
 				$tmpcode = $object->code_fournisseur;
 				if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) {
 					$tmpcode = $modCodeFournisseur->getNextValue($object, 1);
@@ -2332,7 +2334,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				// Nature of thirdparty
 				$selectedprospect = (GETPOSTISSET('prospect') ? GETPOSTINT('prospect') : $selectedprospect);
 				$selectedcustomer = (GETPOSTISSET('customer') ? GETPOSTINT('customer') : $selectedcustomer);
-				print '<tr class="marginbottomlarge height50"><td class="titlefieldcreate">'.$form->editfieldkey('', 'customerprospect', '', $object, 0, 'string', '', 0).'</td>';
+				print '<tr class="marginbottomlarge height50">';
 				print '<td class="maxwidthonsmartphone" colspan="3">';
 
 				if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {
@@ -2393,7 +2395,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				}
 				print '</td>';
 				print '</tr>';
-				print '<tr><td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
+
+				print '<tr><td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td colspan="3">';
 				print '<table class="nobordernopadding"><tr><td>';
 				$tmpcode = $object->code_client;
 				if (empty($tmpcode) && !empty($modCodeClient->code_auto)) {
@@ -2410,7 +2413,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					print '</tr><tr>';
 				}
 
-				print '<td>'.$form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0).'</td><td>';
+				print '<td>'.$form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0).'</td><td colspan="3">';
 
 				if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
 					print '<table class="nobordernopadding"><tr><td>';
@@ -2437,12 +2440,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				}
 
 				// Status
-				print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td colspan="3">';
+				print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td'.($conf->browser->layout == 'phone' ? '' : ' colspan="3"').'>';
 				print $form->selectarray('status', array('0' => $langs->trans('ActivityCeased'), '1' => $langs->trans('InActivity')), $object->status, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
 				print '</td></tr>';
 
-				$colspan = ($conf->browser->layout == 'phone' ? 2 : 4);
-				print '<tr><td'.($colspan ? ' colspan="'.$colspan.'"' : '').'>&nbsp;</td></tr>';
+				//$colspan = ($conf->browser->layout == 'phone' ? 2 : 4);
+				$colspan = 4;
+				print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';
 
 				// Address
 				print '<tr><td class="tdtop">'.$form->editfieldkey('Address', 'address', '', $object, 0).'</td>';
@@ -2550,7 +2554,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 				// Social network
 				if (isModEnabled('socialnetworks')) {
-					$colspan = ($conf->browser->layout == 'phone' ? 2 : 4);
+					//$colspan = ($conf->browser->layout == 'phone' ? 2 : 4);
+					$colspan = 4;
 
 					$object->showSocialNetwork($socialnetworks, $colspan);
 

From e58d1606b3e21ce8ef344cf836d59a83b0da7093 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 14:20:47 +0100
Subject: [PATCH 108/602] Debug v21

---
 htdocs/adherents/class/adherent.class.php     |  6 +++++-
 htdocs/adherents/class/subscription.class.php | 13 ++++++++-----
 htdocs/adherents/subscription.php             | 14 +++++++++-----
 htdocs/adherents/subscription/info.php        |  2 +-
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index bc7e0c14462..3f5291e077f 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1655,7 +1655,7 @@ class Adherent extends CommonObject
 	 */
 	public function subscription($date, $amount, $accountid = 0, $operation = '', $label = '', $num_chq = '', $emetteur_nom = '', $emetteur_banque = '', $datesubend = 0, $fk_type = null)
 	{
-		global $conf, $langs, $user;
+		global $user;
 
 		require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 
@@ -1686,6 +1686,10 @@ class Adherent extends CommonObject
 		$subscription->note_public = $label;
 		$subscription->fk_type = $fk_type;
 
+		if (empty($subscription->user_creation_id)) {
+			$subscription->user_creation_id = $user->id;
+		}
+
 		$rowid = $subscription->create($user);
 		if ($rowid > 0) {
 			// Update denormalized subscription end date (read database subscription to find values)
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index f31f75ea7b1..8fa636ca903 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -155,8 +155,6 @@ class Subscription extends CommonObject
 
 		$this->db->begin();
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."subscription (fk_adherent, fk_type, datec, dateadh, datef, subscription, note)";
-
 		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 		$member = new Adherent($this->db);
 		$result = $member->fetch($this->fk_adherent);
@@ -166,11 +164,15 @@ class Subscription extends CommonObject
 		} else {
 			$type = $this->fk_type;
 		}
+
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."subscription (fk_adherent, fk_type, datec, dateadh, datef, subscription, note, fk_user_creat)";
 		$sql .= " VALUES (".((int) $this->fk_adherent).", '".$this->db->escape($type)."', '".$this->db->idate($now)."',";
 		$sql .= " '".$this->db->idate($this->dateh)."',";
 		$sql .= " '".$this->db->idate($this->datef)."',";
 		$sql .= " ".((float) $this->amount).",";
-		$sql .= " '".$this->db->escape($this->note_public ? $this->note_public : $this->note)."')";
+		$sql .= " '".$this->db->escape($this->note_public ? $this->note_public : $this->note)."',";
+		$sql .= " ".((int) ($this->user_creation_id > 0 ? $this->user_creation_id : $user->id));
+		$sql .= ")";
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
@@ -516,8 +518,7 @@ class Subscription extends CommonObject
 	 */
 	public function info($id)
 	{
-		$sql = 'SELECT c.rowid, c.datec,';
-		$sql .= ' c.tms as datem';
+		$sql = 'SELECT c.rowid, c.datec, c.tms as datem, c.fk_user_creat';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'subscription as c';
 		$sql .= ' WHERE c.rowid = '.((int) $id);
 
@@ -529,6 +530,8 @@ class Subscription extends CommonObject
 
 				$this->date_creation = $this->db->jdate($obj->datec);
 				$this->date_modification = $this->db->jdate($obj->datem);
+
+				$this->user_creation_id = $obj->fk_user_creat;
 			}
 
 			$this->db->free($resql);
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 5a60b07c223..55cde8bd728 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -559,12 +559,12 @@ if ($object->datefin) {
 		print $langs->trans("SubscriptionNotNeeded");
 	} elseif (!$adht->subscription) {
 		print $langs->trans("SubscriptionNotRecorded");
-		if (Adherent::STATUS_VALIDATED == $object->statut) {
+		if (Adherent::STATUS_VALIDATED == $object->status) {
 			print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft, not excluded and not resiliated
 		}
 	} else {
 		print $langs->trans("SubscriptionNotReceived");
-		if (Adherent::STATUS_VALIDATED == $object->statut) {
+		if (Adherent::STATUS_VALIDATED == $object->status) {
 			print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft, not excluded and not resiliated
 		}
 	}
@@ -967,8 +967,8 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
 		$paymentdate = dol_mktime(0, 0, 0, GETPOSTINT('paymentmonth'), GETPOSTINT('paymentday'), GETPOSTINT('paymentyear'));
 	}
 
-	print '<tr>';
 	// Date start subscription
+	print '<tr>';
 	$currentyear = dol_print_date($now, "%Y");
 	$currentmonth = dol_print_date($now, "%m");
 	print '<td class="fieldrequired">'.$langs->trans("DateSubscription").'</td><td>';
@@ -977,7 +977,10 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
 	}
 	if (!$datefrom) {
 		// Guess the subscription start date
-		$datefrom = $object->datevalid; 	// By default, the subscription start date is the payment date
+		// By default, the subscription start date is the end date of previous membership ($object->datefin) + 1 day, or the date of
+		// the validation of the member if no previous date exists.
+		$datefrom = ($object->datefin ? dol_time_plus_duree($object->datefin, 1, 'd') : $object->datevalid);
+
 		if (getDolGlobalString('MEMBER_SUBSCRIPTION_START_AFTER')) {
 			$datefrom = dol_time_plus_duree($now, (int) substr(getDolGlobalString('MEMBER_SUBSCRIPTION_START_AFTER'), 0, -1), substr(getDolGlobalString('MEMBER_SUBSCRIPTION_START_AFTER'), -1));
 		} elseif ($object->datefin > 0 && dol_time_plus_duree($object->datefin, $defaultdelay, $defaultdelayunit) > $now) {
@@ -1015,7 +1018,8 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
 
 	if ($adht->subscription) {
 		// Amount
-		print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="subscription" size="6" value="'.(GETPOSTISSET('subscription') ? GETPOST('subscription') : price($adht->amount, 0, '', 0)).'"> '.$langs->trans("Currency".$conf->currency) .'</td></tr>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td>';
+		print '<td><input autofocus class="width50" type="text" name="subscription" value="'.(GETPOSTISSET('subscription') ? GETPOST('subscription') : (is_null($adht->amount) ? '' : price($adht->amount, 0, '', 0))).'"> '.$langs->trans("Currency".$conf->currency) .'</td></tr>';
 
 		// Label
 		print '<tr><td>'.$langs->trans("Label").'</td>';
diff --git a/htdocs/adherents/subscription/info.php b/htdocs/adherents/subscription/info.php
index 96bed86d3a2..e8046dc3f41 100644
--- a/htdocs/adherents/subscription/info.php
+++ b/htdocs/adherents/subscription/info.php
@@ -80,7 +80,7 @@ print '<br>';
 
 $object->info($rowid);
 
-print '<table width="100%"><tr><td>';
+print '<table class="centpercent"><tr><td>';
 dol_print_object_info($object);
 print '</td></tr></table>';
 

From d13de51a90fb8763931a77de5dfb76bf5f47ba2d Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 14:57:05 +0100
Subject: [PATCH 109/602] Debug v21

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 72c6b5bc671..f59f634afe8 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2838,24 +2838,24 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					if (isModEnabled('accounting')) {
 						/** @var FormAccounting $formaccounting */
 						// Accountancy_code_sell
-						print '<tr><td>'.$langs->trans("ProductAccountancySellCode").'</td>';
+						print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
 						print '<td>';
 						print $formaccounting->select_account($object->accountancy_code_sell, 'accountancy_code_sell', 1, array(), 1, 1);
 						print '</td></tr>';
 
 						// Accountancy_code_buy
-						print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
+						print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyCode").'</td>';
 						print '<td>';
 						print $formaccounting->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, array(), 1, 1);
 						print '</td></tr>';
 					} else { // For external software
 						// Accountancy_code_sell
-						print '<tr><td>'.$langs->trans("ProductAccountancySellCode").'</td>';
+						print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
 						print '<td><input name="accountancy_code_sell" class="maxwidth200" value="'.$object->accountancy_code_sell.'">';
 						print '</td></tr>';
 
 						// Accountancy_code_buy
-						print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
+						print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyCode").'</td>';
 						print '<td><input name="accountancy_code_buy" class="maxwidth200" value="'.$object->accountancy_code_buy.'">';
 						print '</td></tr>';
 					}

From 22e40ccdc4614d7acf976703fc47f37595f55056 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 14:59:22 +0100
Subject: [PATCH 110/602] Debug v21

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index f59f634afe8..7d3568eb687 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2335,7 +2335,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				$selectedprospect = (GETPOSTISSET('prospect') ? GETPOSTINT('prospect') : $selectedprospect);
 				$selectedcustomer = (GETPOSTISSET('customer') ? GETPOSTINT('customer') : $selectedcustomer);
 				print '<tr class="marginbottomlarge height50">';
-				print '<td class="maxwidthonsmartphone" colspan="3">';
+				if ($conf->browser->layout != 'phone') {
+					print '<td class="titlefieldcreate">'.$form->editfieldkey('', 'customerprospect', '', $object, 0, 'string', '', 0).'</td>';
+				}
+				print '<td class="maxwidthonsmartphone"'.($conf->browser->layout != 'phone' ? 'colspan="3"' : 'colspan="2"').'>';
 
 				if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {
 					print '<span id="spannature1" class="spannature prospect-back paddinglarge marginrightonly"><label for="prospectinput" class="valignmiddle">'.$langs->trans("Prospect").'<input id="prospectinput" class="flat checkforselect marginleftonly valignmiddle" type="checkbox" name="prospect" value="2"'.($selectedprospect ? ' checked="checked"' : '').'></label></span>';

From 598c034dfaadbcbcf6eab4603fa2c26cc7da38eb Mon Sep 17 00:00:00 2001
From: William Mead <william@inovea-conseil.com>
Date: Thu, 23 Jan 2025 15:17:31 +0100
Subject: [PATCH 111/602] Cleaned code

---
 htdocs/projet/tasks.php      | 2 +-
 htdocs/projet/tasks/list.php | 2 +-
 htdocs/projet/tasks/task.php | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index fa047705614..413bab683a7 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -579,7 +579,7 @@ if ($id > 0 || !empty($ref)) {
 		$param .= '&search_progressdeclare='.urlencode($search_progressdeclare);
 	}
 	if ($search_status) {
-		$param .= '&search_status='.urlencode((string)$search_status);
+		$param .= '&search_status='.urlencode((string) ($search_status));
 	}
 	if ($search_task_budget_amount) {
 		$param .= '&search_task_budget_amount='.urlencode($search_task_budget_amount);
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 5dfdd4d7132..9b4a6935a81 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -692,7 +692,7 @@ if ($search_task_progress != '') {
 	$param .= '&search_task_progress='.urlencode($search_task_progress);
 }
 if ($search_task_status != '') {
-	$param .= '&search_task_status='.urlencode((string)$search_task_status);
+	$param .= '&search_task_status='.urlencode((string) ($search_task_status));
 }
 if ($search_societe != '') {
 	$param .= '&search_societe='.urlencode($search_societe);
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index e660ece48ec..04961f65c6b 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -782,7 +782,6 @@ if ($id > 0 || !empty($ref)) {
 				}
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Modify').'</a>';
-
 			}
 
 			// Delete

From 9af6ccf845e830497564be2aec45f684340771db Mon Sep 17 00:00:00 2001
From: William Mead <william@inovea-conseil.com>
Date: Thu, 23 Jan 2025 15:26:47 +0100
Subject: [PATCH 112/602] Fixed comment

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

diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 9b4a6935a81..ca1f5cd3a25 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -1501,7 +1501,7 @@ while ($i < $imaxinloop) {
 					$totalarray['totalprogress_summary'] = $totalarray['nbfield'];
 				}
 			}
-			// Project status
+			// Task status
 			if (!empty($arrayfields['t.fk_statut']['checked'])) {
 				print '<td class="center">';
 				print $object->getLibStatut(4);

From 61ea60e456c7f6ee236a1519053321f44af7f4a3 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 16:43:04 +0100
Subject: [PATCH 113/602] Debug v21 - the use of cache file can't work without
 a unique name

---
 htdocs/core/lib/website.lib.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 845db06e602..c9cbbb6dafa 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -599,9 +599,10 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
  * @param 	string	$containerref		Path to file to include (must be a page from website root. Example: 'mypage.php' means 'mywebsite/mypage.php')
  * @param 	int		$once				If set to 1, we use include_once.
  * @param	int		$cachedelay			A cache delay in seconds.
+ * @param	string	$cachekey			Add a key into the name of the cache so the includeContainer can use different cache content for the same page.
  * @return  void
  */
-function includeContainer($containerref, $once = 0, $cachedelay = 0)
+function includeContainer($containerref, $once = 0, $cachedelay = 0, $cachekey = '')
 {
 	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running included containers.
 	global $includehtmlcontentopened;
@@ -618,7 +619,7 @@ function includeContainer($containerref, $once = 0, $cachedelay = 0)
 	$fullpathcache = '';
 	// If we ask to use the cache delay
 	if ($cachedelay > 0 && !getDolGlobalString("WEBSITE_DISABLE_CACHE_OF_CONTAINERS")) {
-		$fullpathcache = DOL_DATA_ROOT.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/temp/'.$websitekey.'-'.$websitepage->id.'-'.$containerref.'.cache';
+		$fullpathcache = DOL_DATA_ROOT.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/temp/'.$websitekey.'-'.$websitepage->id.'-'.$containerref.($cachekey ? '-'.$cachekey: '').'.cache';
 	}
 
 	if (empty($includehtmlcontentopened)) {
@@ -634,7 +635,7 @@ function includeContainer($containerref, $once = 0, $cachedelay = 0)
 
 	// We don't print info messages for pages of type library or service
 	if (!empty($websitepage->type_container) && !in_array($websitepage->type_container, array('library', 'service'))) {
-		print "\n".'<!-- include '.$websitekey.'/'.$containerref.(is_object($websitepage) ? ' parent id='.$websitepage->id : '').' level='.$includehtmlcontentopened.' -->'."\n";
+		print "\n".'<!-- include '.$websitekey.'/'.$containerref.($cachekey ? ' '.$cachekey: '').(is_object($websitepage) ? ' parent id='.$websitepage->id : '').' level='.$includehtmlcontentopened.' -->'."\n";
 	}
 
 	$tmpoutput = '';

From 844237046dd9c8c053e7f26fac680d26a2c85452 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 17:33:11 +0100
Subject: [PATCH 114/602] Fix parameter quality was hardcoded.

---
 htdocs/core/class/commonobject.class.php |  4 ++--
 htdocs/core/lib/images.lib.php           | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e4ab9a505d1..227bcf8775a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6114,9 +6114,10 @@ abstract class CommonObject
 	 *  @todo Move this into files.lib.php
 	 *
 	 *  @param      string	$file           Path file in UTF8 to original file to create thumbs from.
+	 *  @param		int		$quality		Quality after compression (0=worst so better compression, 100=best so low or no compression). For thumbs, we force quality to 50 by default.
 	 *	@return		void
 	 */
-	public function addThumbs($file)
+	public function addThumbs($file, $quality = 50)
 	{
 		$file_osencoded = dol_osencode($file);
 
@@ -6129,7 +6130,6 @@ abstract class CommonObject
 			$maxwidthmini = $tmparraysize['maxwidthmini'];
 			$maxheightmini = $tmparraysize['maxheightmini'];
 			//$quality = $tmparraysize['quality'];
-			$quality = 50;	// For thumbs, we force quality to 50
 
 			// Create small thumbs for company (Ratio is near 16/9)
 			// Used on logon for example
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 26ac9e8930f..4681cc0619f 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -513,7 +513,7 @@ function correctExifImageOrientation($fileSource, $fileDest, $quality = 95)
  *    	@param     int		$maxWidth       	Maximum width of the thumbnail (-1=unchanged, 160 by default)
  *    	@param     int		$maxHeight      	Maximum height of the thumbnail (-1=unchanged, 120 by default)
  *    	@param     string	$extName        	Extension to differentiate thumb file name ('_small', '_mini')
- *    	@param     int		$quality        	Quality of compression (0=worst, 100=best)
+ *    	@param     int		$quality        	Quality after compression (0=worst so better compression, 100=best so low or no compression)
  *      @param     string	$outdir           	Directory where to store thumb
  *      @param     int		$targetformat     	New format of target (IMAGETYPE_GIF, IMAGETYPE_JPG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_WBMP ... or 0 to keep original format)
  *    	@return    string|int<0,0>				Full path of thumb or '' if it fails or 'Error...' if it fails, or 0 if it fails to detect the type of image
@@ -527,18 +527,14 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 	dol_syslog("vignette file=".$file." extName=".$extName." maxWidth=".$maxWidth." maxHeight=".$maxHeight." quality=".$quality." outdir=".$outdir." targetformat=".$targetformat);
 
 	// Clean parameters
-	$file = trim($file);
+	$file = dol_sanitizePathName(trim($file));
 
 	// Check parameters
 	if (!$file) {
 		// If the file has not been indicated
 		return 'ErrorBadParameters';
-	} elseif (!file_exists($file)) {
-		// If the file passed in parameter does not exist
-		dol_syslog($langs->trans("ErrorFileNotFound", $file), LOG_ERR);
-		return $langs->trans("ErrorFileNotFound", $file);
 	} elseif (image_format_supported($file) < 0) {
-		dol_syslog('This file '.$file.' does not seem to be an image format file name.', LOG_WARNING);
+		dol_syslog('This file '.$file.' does not seem to be a supported image file name (bad extension).', LOG_WARNING);
 		return 'ErrorBadImageFormat';
 	} elseif (!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1) {
 		// If max width is incorrect (not numeric, empty, or less than 0)
@@ -550,7 +546,13 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 		return 'Error: Wrong value for parameter maxHeight';
 	}
 
-	$filetoread = realpath(dol_osencode($file)); // Chemin canonique absolu de l'image
+	$filetoread = realpath(dol_osencode($file)); // Absolute canonical path of image
+
+	if (!file_exists($filetoread)) {
+		// If the file passed in parameter does not exist
+		dol_syslog($langs->trans("ErrorFileNotFound", $filetoread), LOG_ERR);
+		return $langs->trans("ErrorFileNotFound", $filetoread);
+	}
 
 	$infoImg = getimagesize($filetoread); // Get information like size and real format of image. Warning real format may be png when extension is .jpg
 	$imgWidth = $infoImg[0]; 	// Width of image
@@ -756,7 +758,6 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 			imagealphablending($imgThumb, false); // For compatibility on certain systems
 			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127); // Keep transparent channel
 			$extImgTarget = '.png';
-			$newquality = $quality - 100;
 			$newquality = round(abs($quality - 100) * 9 / 100);
 			break;
 		case IMAGETYPE_BMP:	    // 6

From 0e3549a3313185ede9f147ac140e32d03ccc3ee4 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 18:21:03 +0100
Subject: [PATCH 115/602] Add log to help debug

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index a2795eda594..88bc1109eb0 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2153,6 +2153,8 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
 	$result = 0;
 	$error = 0;
 
+	dol_syslog("addFileIntoDatabaseIndex dir=".$dir." file=".$file, LOG_DEBUG);
+
 	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $dir);
 
 	if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {     // If not a temporary directory. TODO Does this test work ?

From c7a79511c64cd04f2dee08ede32f455578197283 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 18:39:00 +0100
Subject: [PATCH 116/602] Debug v21

---
 htdocs/core/lib/files.lib.php | 50 ++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 88bc1109eb0..53c076873ef 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1920,8 +1920,10 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $updatesessionor
 			setEventMessages($langs->trans("ErrorTooMuchFileInForm", $maxfilesinform), null, "errors");
 			return -1;
 		}
+
 		$result = dol_mkdir($upload_dir);
-		//      var_dump($result);exit;
+		//var_dump($result);exit;
+
 		if ($result >= 0) {
 			$TFile = $_FILES[$varfiles];
 			// Convert value of $TFile
@@ -2019,6 +2021,12 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $updatesessionor
 						if ($TFile['type'][$i] == 'application/pdf' && strpos($_SERVER["REQUEST_URI"], 'product') !== false && getDolGlobalString('PRODUCT_ALLOW_EXTERNAL_DOWNLOAD')) {
 							$sharefile = 1;
 						}
+
+						// If we allow overwrite, we may need to also overwrite index, so we delete index first so insert can work
+						if ($allowoverwrite) {
+							deleteFilesIntoDatabaseIndex($upload_dir, basename($destfile).($resupload == 2 ? '.noexe' : ''), '');
+						}
+
 						$result = addFileIntoDatabaseIndex($upload_dir, basename($destfile).($resupload == 2 ? '.noexe' : ''), $TFile['name'][$i], 'uploaded', $sharefile, $object);
 						if ($result < 0) {
 							if ($allowoverwrite) {
@@ -2304,7 +2312,7 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
  */
 function deleteFilesIntoDatabaseIndex($dir, $file, $mode = 'uploaded')
 {
-	global $conf, $db, $user;
+	global $conf, $db;
 
 	$error = 0;
 
@@ -2313,29 +2321,33 @@ function deleteFilesIntoDatabaseIndex($dir, $file, $mode = 'uploaded')
 		return -1;
 	}
 
+	dol_syslog("deleteFilesIntoDatabaseIndex dir=".$dir." file=".$file, LOG_DEBUG);
+
 	$db->begin();
 
 	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $dir);
 
-	$filename = basename($file);
-	$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-	$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+	if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {     // If not a temporary directory. TODO Does this test work ?
+		$filename = basename($file);
+		$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+		$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
-	if (!$error) {
-		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'ecm_files';
-		$sql .= ' WHERE entity = '.$conf->entity;
-		$sql .= " AND filepath = '".$db->escape($rel_dir)."'";
-		if ($file) {
-			$sql .= " AND filename = '".$db->escape($file)."'";
-		}
-		if ($mode) {
-			$sql .= " AND gen_or_uploaded = '".$db->escape($mode)."'";
-		}
+		if (!$error) {
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'ecm_files';
+			$sql .= ' WHERE entity = '.((int) $conf->entity);
+			$sql .= " AND filepath = '".$db->escape($rel_dir)."'";
+			if ($file) {
+				$sql .= " AND filename = '".$db->escape($file)."'";
+			}
+			if ($mode) {
+				$sql .= " AND gen_or_uploaded = '".$db->escape($mode)."'";
+			}
 
-		$resql = $db->query($sql);
-		if (!$resql) {
-			$error++;
-			dol_syslog(__FUNCTION__.' '.$db->lasterror(), LOG_ERR);
+			$resql = $db->query($sql);
+			if (!$resql) {
+				$error++;
+				dol_syslog(__FUNCTION__.' '.$db->lasterror(), LOG_ERR);
+			}
 		}
 	}
 

From da187e5eb5283ec703f2229b8beccaab44801555 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 18:41:57 +0100
Subject: [PATCH 117/602] Debug v21

---
 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 53c076873ef..c86fd8a7b85 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1889,7 +1889,7 @@ function dol_init_file_process($pathtoscan = '', $trackid = '')
 
 
 /**
- * Get and save an upload file (for example after submitting a new file a mail form). Database index of file is also updated if donotupdatesession is set.
+ * Get and save an upload file (for example after submitting a new file a mail form). Database index of file is also updated if updatesessionordb is set to 1.
  * All information used are in db, conf, langs, user and _FILES.
  * Note: This function can be used only into a HTML page context.
  *
@@ -1913,7 +1913,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $updatesessionor
 	$res = 0;
 
 	if (!empty($_FILES[$varfiles])) { // For view $_FILES[$varfiles]['error']
-		dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$updatesessionordb.' savingdocmask='.$savingdocmask, LOG_DEBUG);
+		dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' updatesessionordb='.$updatesessionordb.' savingdocmask='.$savingdocmask, LOG_DEBUG);
 		$maxfilesinform = getDolGlobalInt("MAIN_SECURITY_MAX_ATTACHMENT_ON_FORMS", 10);
 		if (is_array($_FILES[$varfiles]["name"]) && count($_FILES[$varfiles]["name"]) > $maxfilesinform) {
 			$langs->load("errors"); // key must be loaded because we can't rely on loading during output, we need var substitution to be done now.

From 33ce03e128ef8c46be42d781607988f2f74cfbcf Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 19:36:18 +0100
Subject: [PATCH 118/602] Fix the redirect of payment

---
 htdocs/public/payment/paymentko.php | 30 +++++++++++++++++++++--------
 htdocs/public/payment/paymentok.php |  1 +
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index db16c74ab21..17e42d8f16b 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -132,6 +132,22 @@ if (empty($validpaymentmethod)) {
 $object = new stdClass(); // For triggers
 /** @var CommonObject $object */
 
+$error = 0;
+
+// Check if we have redirtodomain to do.
+$ws_virtuelhost = null;
+$doactionsthenredirect = 0;
+if ($ws) {
+	$doactionsthenredirect = 1;
+	include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
+	$website = new Website($db);
+	$result = $website->fetch(0, $ws);
+	if ($result > 0) {
+		$ws_virtuelhost = $website->virtualhost;
+	}
+}
+
+
 /*
  * Actions
  */
@@ -144,13 +160,6 @@ $object = new stdClass(); // For triggers
  * View
  */
 
-// Check if we have redirtodomain to do.
-$doactionsthenredirect = 0;
-if ($ws) {
-	$doactionsthenredirect = 1;
-}
-
-
 dol_syslog("Callback url when an online payment is refused or canceled. query_string=".(empty($_SERVER["QUERY_STRING"]) ? '' : $_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"]) ? '' : $_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_payment');
 
 $tracepost = "";
@@ -333,6 +342,11 @@ $db->close();
 if (!empty($doactionsthenredirect)) {
 	// Redirect to an error page
 	// Paymentko page must be created for the specific website
-	$ext_urlko = DOL_URL_ROOT.'/public/website/index.php?website='.urlencode($ws).'&pageref=paymentko&fulltag='.$FULLTAG;
+	if (!defined('USEDOLIBARRSERVER') && !empty($ws_virtuelhost)) {
+		$ext_urlok = $ws_virtuelhost . '/paymentok.php?fulltag='.$FULLTAG;
+	} else {
+		$ext_urlko = DOL_URL_ROOT.'/public/website/index.php?website='.urlencode($ws).'&pageref=paymentko&fulltag='.$FULLTAG;
+	}
+
 	print "<script>window.top.location.href = '".dol_escape_js($ext_urlko)."';</script>";
 }
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index aa46e7ccf0b..1c0d5a61aea 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -169,6 +169,7 @@ $ErrorCode = $ErrorShortMsg = $ErrorLongMsg = $ErrorSeverityCode = '';
 
 
 $object = new stdClass(); // For triggers
+/** @var CommonObject $object */
 
 $error = 0;
 

From d81a25ea11db395e4e95fbc9aa9386897cd14d18 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 19:39:19 +0100
Subject: [PATCH 119/602] Fix url payment ko

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

diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 17e42d8f16b..9a23d6201dd 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -343,7 +343,7 @@ if (!empty($doactionsthenredirect)) {
 	// Redirect to an error page
 	// Paymentko page must be created for the specific website
 	if (!defined('USEDOLIBARRSERVER') && !empty($ws_virtuelhost)) {
-		$ext_urlok = $ws_virtuelhost . '/paymentok.php?fulltag='.$FULLTAG;
+		$ext_urlok = $ws_virtuelhost . '/paymentko.php?fulltag='.$FULLTAG;
 	} else {
 		$ext_urlko = DOL_URL_ROOT.'/public/website/index.php?website='.urlencode($ws).'&pageref=paymentko&fulltag='.$FULLTAG;
 	}

From 6198d185442165ce26015b783b45839ae6582f89 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 19:42:50 +0100
Subject: [PATCH 120/602] Fix url payment ko

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

diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 9a23d6201dd..5f833ed119d 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -343,7 +343,7 @@ if (!empty($doactionsthenredirect)) {
 	// Redirect to an error page
 	// Paymentko page must be created for the specific website
 	if (!defined('USEDOLIBARRSERVER') && !empty($ws_virtuelhost)) {
-		$ext_urlok = $ws_virtuelhost . '/paymentko.php?fulltag='.$FULLTAG;
+		$ext_urlko = $ws_virtuelhost . '/paymentko.php?fulltag='.$FULLTAG;
 	} else {
 		$ext_urlko = DOL_URL_ROOT.'/public/website/index.php?website='.urlencode($ws).'&pageref=paymentko&fulltag='.$FULLTAG;
 	}

From 132b4f95fe405b6e03a5ae205e766952fc0ab8dc Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 20:21:23 +0100
Subject: [PATCH 121/602] Fix move of files after a merge of products

---
 htdocs/product/card.php                | 23 ++++++++++++++++++++---
 htdocs/societe/class/societe.class.php | 20 ++++++++++----------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index c84c0dc6d63..4ce8eb72df0 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -361,7 +361,7 @@ if (empty($reshook)) {
 						'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
 					);
 
-					//First, all core objects must update their tables
+					// First, all core objects must update their tables
 					foreach ($objects as $object_name => $object_file) {
 						require_once DOL_DOCUMENT_ROOT.$object_file;
 
@@ -406,13 +406,30 @@ if (empty($reshook)) {
 				}
 
 				if (!$error) {
-					// We finally remove the old product
-					// TODO merge attached files from old product into new one before delete
+					// Delete the product
 					if ($productOrigin->delete($user) < 1) {
 						$error++;
 					}
 				}
 
+				if ($error) {
+					// Move files from the dir of the third party to delete into the dir of the third party to keep
+					if (!empty($conf->product->multidir_output[$productOrigin->entity])) {
+						$srcdir = $conf->product->multidir_output[$productOrigin->entity]."/".$productOrigin->ref;
+						$destdir = $conf->product->multidir_output[$object->entity]."/".$object->ref;
+
+						if (dol_is_dir($srcdir)) {
+							$dirlist = dol_dir_list($srcdir, 'files', 1);
+							foreach ($dirlist as $filetomove) {
+								$destfile = $destdir.'/'.$filetomove['relativename'];
+								//var_dump('Move file '.$filetomove['relativename'].' into '.$destfile);
+								dol_move($filetomove['fullname'], $destfile, '0', 0, 0, 1);
+							}
+							//exit;
+						}
+					}
+				}
+
 				if (!$error) {
 					setEventMessages($langs->trans('ProductsMergeSuccess'), null, 'mesgs');
 					$db->commit();
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 13dd05eff14..8d664fda47f 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -5711,6 +5711,16 @@ class Societe extends CommonObject
 				// End call triggers
 			}
 
+			if (!$error) {
+				// We finally remove the old thirdparty
+				if ($soc_origin->delete($soc_origin->id, $user) < 1) {
+					$this->error = $soc_origin->error;
+					$this->errors = $soc_origin->errors;
+					$error++;
+				}
+			}
+
+
 			if (!$error) {
 				// Move files from the dir of the third party to delete into the dir of the third party to keep
 				if (!empty($conf->societe->multidir_output[$this->entity])) {
@@ -5729,16 +5739,6 @@ class Societe extends CommonObject
 				}
 			}
 
-
-			if (!$error) {
-				// We finally remove the old thirdparty
-				if ($soc_origin->delete($soc_origin->id, $user) < 1) {
-					$this->error = $soc_origin->error;
-					$this->errors = $soc_origin->errors;
-					$error++;
-				}
-			}
-
 			if (!$error) {
 				$this->db->commit();
 				return 0;

From 9c7686e5718c855ed82a87fed68a74998b981b0f Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 21:02:49 +0100
Subject: [PATCH 122/602] Fix clean unvalid entries into ecm file table

---
 htdocs/install/repair.php | 52 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index d3d8364b810..06d14be0720 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -111,6 +111,7 @@ print 'Option clean_menus is '.(GETPOST('clean_menus', 'alpha') ? GETPOST('clean
 print 'Option clean_orphelin_dir is '.(GETPOST('clean_orphelin_dir', 'alpha') ? GETPOST('clean_orphelin_dir', 'alpha') : 'undefined').'<br>'."\n";
 print 'Option clean_product_stock_batch is '.(GETPOST('clean_product_stock_batch', 'alpha') ? GETPOST('clean_product_stock_batch', 'alpha') : 'undefined').'<br>'."\n";
 print 'Option clean_perm_table is '.(GETPOST('clean_perm_table', 'alpha') ? GETPOST('clean_perm_table', 'alpha') : 'undefined').'<br>'."\n";
+print 'Option clean_ecm_files_table is '.(GETPOST('clean_ecm_files_table', 'alpha') ? GETPOST('clean_ecm_files_table', 'alpha') : 'undefined').'<br>'."\n";
 print 'Option repair_link_dispatch_lines_supplier_order_lines, is '.(GETPOST('repair_link_dispatch_lines_supplier_order_lines', 'alpha') ? GETPOST('repair_link_dispatch_lines_supplier_order_lines', 'alpha') : 'undefined').'<br>'."\n";
 // Init data
 print 'Option set_empty_time_spent_amount is '.(GETPOST('set_empty_time_spent_amount', 'alpha') ? GETPOST('set_empty_time_spent_amount', 'alpha') : 'undefined').'<br>'."\n";
@@ -205,7 +206,7 @@ $conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
 $oneoptionset = 0;
 $oneoptionset = (GETPOST('standard', 'alpha') || GETPOST('restore_thirdparties_logos', 'alpha') || GETPOST('clean_linked_elements', 'alpha') || GETPOST('clean_menus', 'alpha')
 	|| GETPOST('clean_orphelin_dir', 'alpha') || GETPOST('clean_product_stock_batch', 'alpha') || GETPOST('set_empty_time_spent_amount', 'alpha') || GETPOST('rebuild_product_thumbs', 'alpha')
-	|| GETPOST('clean_perm_table', 'alpha')
+	|| GETPOST('clean_perm_table', 'alpha') || GETPOST('clean_ecm_files_table', 'alpha')
 	|| GETPOST('force_disable_of_modules_not_found', 'alpha')
 	|| GETPOST('force_utf8_on_tables', 'alpha') || GETPOST('force_utf8mb4_on_tables', 'alpha') || GETPOST('force_collation_from_conf_on_tables', 'alpha')
 	|| GETPOST('rebuild_sequences', 'alpha') || GETPOST('recalculateinvoicetotal', 'alpha'));
@@ -1294,6 +1295,55 @@ if ($ok && GETPOST('clean_perm_table', 'alpha')) {
 }
 
 
+// clean_old_module_entries: Clean data into const when files of module were removed without being
+if ($ok && GETPOST('clean_ecm_files_table', 'alpha')) {
+	print '<tr><td colspan="2"><br>*** Clean table ecm_files from lines of entries whose physical files does not exists anymore (emplemented for entity 1 only)</td></tr>';
+
+	$MAXTODELETE = 100;
+
+	$sql = "SELECT rowid, filename, filepath, entity from ".MAIN_DB_PREFIX."ecm_files";
+	$sql .= " WHERE entity = 1";
+	$sql .= " ORDER BY rowid ASC";
+
+	$nbfile = 0;
+	$nbfiletodelete = 0;
+
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
+		if ($num) {
+			$i = 0;
+			while ($i < $num && $nbfiletodelete < $MAXTODELETE) {
+				$obj = $db->fetch_object($resql);
+				if ($obj->rowid > 0) {
+					$filetocheck = DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename;
+					$nbfile++;
+					if (!dol_is_file($filetocheck)) {
+						$nbfiletodelete++;
+						print '<tr><td>Found line with id '.$obj->rowid.', entity '.$obj->entity.', file "'.$filetocheck.'" to delete';
+						if (GETPOST('clean_ecm_files_table', 'alpha') == 'confirmed') {
+							$sqldelete = "DELETE FROM ".MAIN_DB_PREFIX."ecm_files WHERE rowid = ".((int) $obj->rowid);
+							$resqldelete = $db->query($sqldelete);
+							if (!$resqldelete) {
+								dol_print_error($db);
+							}
+							print ' - deleted';
+						}
+						print '</td></tr>';
+					}
+				}
+				$i++;
+			}
+		}
+		if ($nbfiletodelete > $MAXTODELETE) {
+			print '<tr><td>There is more than '.$MAXTODELETE.' invalid entries into ecm_files index table (among '.$nbfile.' analyzed) with no valid physical files. Run the page several time to process all of them.</td></tr>';
+		} else {
+			print '<tr><td>Nb of entries processed into ecm_files index table: '.$nbfile.', number of invalid record: '.$nbfiletodelete.'</td></tr>';
+		}
+	} else {
+		dol_print_error($db);
+	}
+}
 
 // force utf8 on tables
 if ($ok && GETPOST('force_utf8_on_tables', 'alpha')) {

From 78e0eeb557673e503f05b91a11269344c4e8134d Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 21:06:21 +0100
Subject: [PATCH 123/602] Fix repair script

---
 htdocs/install/repair.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 06d14be0720..4a0a1b8501b 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -1313,23 +1313,27 @@ if ($ok && GETPOST('clean_ecm_files_table', 'alpha')) {
 		$num = $db->num_rows($resql);
 		if ($num) {
 			$i = 0;
-			while ($i < $num && $nbfiletodelete < $MAXTODELETE) {
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 				if ($obj->rowid > 0) {
 					$filetocheck = DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename;
 					$nbfile++;
 					if (!dol_is_file($filetocheck)) {
 						$nbfiletodelete++;
-						print '<tr><td>Found line with id '.$obj->rowid.', entity '.$obj->entity.', file "'.$filetocheck.'" to delete';
-						if (GETPOST('clean_ecm_files_table', 'alpha') == 'confirmed') {
-							$sqldelete = "DELETE FROM ".MAIN_DB_PREFIX."ecm_files WHERE rowid = ".((int) $obj->rowid);
-							$resqldelete = $db->query($sqldelete);
-							if (!$resqldelete) {
-								dol_print_error($db);
+						if ($nbfiletodelete <= $MAXTODELETE) {
+							print '<tr><td>Found line with id '.$obj->rowid.', entity '.$obj->entity.', file "'.$filetocheck.'" to delete';
+							if (GETPOST('clean_ecm_files_table', 'alpha') == 'confirmed') {
+								$sqldelete = "DELETE FROM ".MAIN_DB_PREFIX."ecm_files WHERE rowid = ".((int) $obj->rowid);
+								$resqldelete = $db->query($sqldelete);
+								if (!$resqldelete) {
+									dol_print_error($db);
+								}
+								print ' - deleted';
 							}
-							print ' - deleted';
+							print '</td></tr>';
+						} else {
+							break;
 						}
-						print '</td></tr>';
 					}
 				}
 				$i++;

From 8967d995a864a2a6f912fbd0173d1daa5f2ac5c0 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 21:08:45 +0100
Subject: [PATCH 124/602] Fix repair script

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

diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 4a0a1b8501b..20498bc6c9e 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -1318,7 +1318,7 @@ if ($ok && GETPOST('clean_ecm_files_table', 'alpha')) {
 				if ($obj->rowid > 0) {
 					$filetocheck = DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename;
 					$nbfile++;
-					if (!dol_is_file($filetocheck)) {
+					if (!dol_is_file($filetocheck) && !dol_is_file($filetocheck.'.noexe')) {
 						$nbfiletodelete++;
 						if ($nbfiletodelete <= $MAXTODELETE) {
 							print '<tr><td>Found line with id '.$obj->rowid.', entity '.$obj->entity.', file "'.$filetocheck.'" to delete';

From 1ef30c3006081ab67f6ebc63df38a49f795d188f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 23 Jan 2025 21:59:04 +0100
Subject: [PATCH 125/602] fix

---
 htdocs/adherents/class/api_memberstypes.class.php | 3 ++-
 htdocs/loan/note.php                              | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 32e9e105fa2..ce8f2457f66 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017	Regis Houssin	<regis.houssin@inodbox.com>
+ * Copyright (C) 2025       Frédéric France         <frederic.france@free.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
@@ -28,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 class MembersTypes extends DolibarrApi
 {
 	/**
-	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 * @var string[]   $FIELDS     Mandatory fields, checked when create and update object
 	 */
 	public static $FIELDS = array(
 		'label',
diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index 9bc1da5c0a9..3fa7c606d83 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2007	Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin				<regis.houssin@inodbox.com>
  * Copyright (C) 2013		Florian Henry				<florian.henry@open-concept.pro>
- * Copyright (C) 2015-2024  Frédéric France				<frederic.france@free.fr>
+ * Copyright (C) 2015-2025  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2016-2025	Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) 2017		Ferran Marcet				<fmarcet@2byte.es>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
@@ -84,9 +84,6 @@ if (empty($reshook)) {
 
 $morehtmlright = '';
 $form = new Form($db);
-if (isModEnabled('project')) {
-	$formproject = new FormProjets($db);
-}
 
 $title = $langs->trans("Loan").' - '.$langs->trans("Notes");
 $help_url = 'EN:Module_Loan|FR:Module_Emprunt';
@@ -109,6 +106,7 @@ if ($id > 0) {
 	$morehtmlref .= $form->editfieldval("Label", 'label', $object->label, $object, 0, 'string', '', null, null, '', 1);
 	// Project
 	if (isModEnabled('project')) {
+		$formproject = new FormProjets($db);
 		$langs->loadLangs(array("projects"));
 		$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 		if ($user->hasRight('loan', 'write')) {

From 5c616a2812b551845a5731b0fdbd84f7bcc6e9df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 23 Jan 2025 22:01:57 +0100
Subject: [PATCH 126/602] fix

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

diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index ce8f2457f66..fc230bbaf41 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 class MembersTypes extends DolibarrApi
 {
 	/**
-	 * @var string[]   $FIELDS     Mandatory fields, checked when create and update object
+	 * @var string[]       Mandatory fields, checked when create and update object
 	 */
 	public static $FIELDS = array(
 		'label',

From db128814b566feddaeea7ed6f104d52745bfc3e4 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 22:13:19 +0100
Subject: [PATCH 127/602] Debug v21

---
 htdocs/theme/eldy/info-box.inc.php |  8 ++++----
 htdocs/theme/eldy/style.css.php    |  2 +-
 htdocs/theme/md/info-box.inc.php   | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 44f1ff7ddd8..24f981291a5 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -329,10 +329,10 @@ if (getDolGlobalString('THEME_INFOBOX_COLOR_ON_BACKGROUND')) {
 }
 
 if (!isset($conf->global->THEME_SATURATE_RATIO)) {
-	$conf->global->THEME_SATURATE_RATIO = 0.7;
+	$conf->global->THEME_SATURATE_RATIO = 0.8;
 }
 if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
-	$conf->global->THEME_SATURATE_RATIO = GETPOSTINT('THEME_SATURATE_RATIO');
+	$conf->global->THEME_SATURATE_RATIO = GETPOSTFLOAT('THEME_SATURATE_RATIO');
 }
 
 ?>
@@ -341,8 +341,8 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
 	color: #fff !important;
 	<?php } ?>
 	opacity: 0.95;
-	<?php if (isset($conf->global->THEME_SATURATE_RATIO)) { ?>
-		filter: saturate(<?php echo $conf->global->THEME_SATURATE_RATIO; ?>);
+	<?php if (getDolGlobalString('THEME_SATURATE_RATIO')) { ?>
+		filter: saturate(<?php echo getDolGlobalString('THEME_SATURATE_RATIO'); ?>);
 	<?php } ?>
 }
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 9ce2b990fcd..4fad79772c3 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -411,7 +411,7 @@ print 'fontsizesmaller='.$fontsizesmaller."\n";
 print 'topMenuFontSize='.$topMenuFontSize."\n";
 print 'toolTipBgColor='.$toolTipBgColor."\n";
 print 'toolTipFontColor='.$toolTipFontColor."\n";
-print 'conf->global->THEME_SATURATE_RATIO='.getDolGlobalString('THEME_SATURATE_RATIO')." (must be between 0 and 1)\n";
+print 'getDolGlobalString("THEME_SATURATE_RATIO")='.getDolGlobalString('THEME_SATURATE_RATIO')." (must be between 0 and 1)\n";
 print '*/'."\n";
 
 
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index f2afc753cf4..a0588f5656b 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -34,10 +34,10 @@ if (getDolGlobalString('THEME_INFOBOX_COLOR_ON_BACKGROUND')) {
 }
 
 if (!isset($conf->global->THEME_SATURATE_RATIO)) {
-	$conf->global->THEME_SATURATE_RATIO = 0.7;
+	$conf->global->THEME_SATURATE_RATIO = 0.8;
 }
 if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
-	$conf->global->THEME_SATURATE_RATIO = GETPOSTINT('THEME_SATURATE_RATIO');
+	$conf->global->THEME_SATURATE_RATIO = GETPOSTFLOAT('THEME_SATURATE_RATIO');
 }
 
 ?>
@@ -241,8 +241,8 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 	height: 94px;		/* must be same height as min-height of .info-box */
 	width: 86px;
 	background: var(--colorbacktitle1) !important;
-	<?php if (isset($conf->global->THEME_SATURATE_RATIO)) { ?>
-		filter: saturate(<?php echo $conf->global->THEME_SATURATE_RATIO; ?>);
+	<?php if (getDolGlobalString('THEME_SATURATE_RATIO')) { ?>
+		filter: saturate(<?php echo getDolGlobalString('THEME_SATURATE_RATIO'); ?>);
 	<?php } ?>
 }
 
@@ -459,10 +459,10 @@ if (getDolGlobalString('THEME_INFOBOX_COLOR_ON_BACKGROUND')) {
 }
 
 if (!isset($conf->global->THEME_SATURATE_RATIO)) {
-	$conf->global->THEME_SATURATE_RATIO = 0.7;
+	$conf->global->THEME_SATURATE_RATIO = 0.8;
 }
 if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
-	$conf->global->THEME_SATURATE_RATIO = GETPOSTINT('THEME_SATURATE_RATIO');
+	$conf->global->THEME_SATURATE_RATIO = GETPOSTFLOAT('THEME_SATURATE_RATIO');
 }
 ?>
 .bg-infobox-project i.fa{

From 622a655a3c65b4ede7fd30875e5b0cd1ad526ecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 23 Jan 2025 22:15:11 +0100
Subject: [PATCH 128/602] fix

---
 .../adherents/class/api_memberstypes.class.php   | 16 ++++++++++++----
 htdocs/core/class/conf.class.php                 |  6 +++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index fc230bbaf41..9d0c1ebfd7e 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -85,6 +85,8 @@ class MembersTypes extends DolibarrApi
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.libelle:like:'SO-%') and (t.subscription:=:'1')"
 	 * @param string    $properties	Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return array                Array of member type objects
+	 * @phan-return AdherentType[]
+	 * @phpstan-return AdherentType[]
 	 *
 	 * @throws RestException
 	 */
@@ -144,7 +146,9 @@ class MembersTypes extends DolibarrApi
 	/**
 	 * Create member type object
 	 *
-	 * @param array $request_data   Request data
+	 * @param array	$request_data   Request data
+	 * @phan-param ?array<string,string>    $request_data
+	 * @phpstan-param ?array<string,string> $request_data
 	 * @return int  ID of member type
 	 */
 	public function post($request_data = null)
@@ -176,7 +180,9 @@ class MembersTypes extends DolibarrApi
 	 *
 	 * @param int   $id             ID of member type to update
 	 * @param array $request_data   Datas
-	 * @return int
+	 * @phan-param ?array<string,string>    $request_data
+	 * @phpstan-param ?array<string,string> $request_data
+	 * @return Object
 	 */
 	public function put($id, $request_data = null)
 	{
@@ -228,6 +234,8 @@ class MembersTypes extends DolibarrApi
 	 *
 	 * @param int $id   member type ID
 	 * @return array
+	 * @phan-return array<string,array{code:int,message:string}>
+	 * @phpstan-return array<string,array{code:int,message:string}>
 	 */
 	public function delete($id)
 	{
@@ -262,8 +270,8 @@ class MembersTypes extends DolibarrApi
 	/**
 	 * Validate fields before creating an object
 	 *
-	 * @param array|null    $data   Data to validate
-	 * @return array
+	 * @param ?array<null|int|float|string> $data   Data to validate
+	 * @return array<string,null|int|float|string>
 	 *
 	 * @throws RestException
 	 */
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index f6f452062c1..fe27db7061e 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004-2020  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2017  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2006 	    Jean Heimburger         <jean@tiaris.info>
- * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.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
@@ -1197,10 +1197,10 @@ class Conf extends stdClass
 
 			// For modules that want to disable top or left menu
 			if (!empty($this->global->MAIN_HIDE_TOP_MENU)) {
-				$this->dol_hide_topmenu = getDolGlobalString('MAIN_HIDE_TOP_MENU');
+				$this->dol_hide_topmenu = getDolGlobalInt('MAIN_HIDE_TOP_MENU');
 			}
 			if (!empty($this->global->MAIN_HIDE_LEFT_MENU)) {
-				$this->dol_hide_leftmenu = getDolGlobalString('MAIN_HIDE_LEFT_MENU');
+				$this->dol_hide_leftmenu = getDolGlobalInt('MAIN_HIDE_LEFT_MENU');
 			}
 
 			if (empty($this->global->MAIN_SIZE_SHORTLIST_LIMIT)) {

From b6390f959cdaf47676fd7a806d7f9a718fd6ab7e Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 22:19:39 +0100
Subject: [PATCH 129/602] Add slugify function for security purpose

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 459bc021b4d..e436c45cfb5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1874,6 +1874,33 @@ function dol_string_nounprintableascii($str, $removetabcrlf = 1)
 	}
 }
 
+/**
+ *  Returns text slugified (no special char, separator is "-".
+ *
+ *  @param	string	$stringtoslugify		String to slugify
+ *  @return string							Slugified string
+ */
+function dolSlugify($stringtoslugify)
+{
+	$slug = dol_string_unaccent($stringtoslugify);
+
+	// Convert special characters to their ASCII equivalents
+	if (function_exists('iconv')) {
+		$slug = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $slug);
+	}
+
+	// Convert to lowercase
+	$slug = strtolower($slug);
+
+	// Replace non-alphanumeric characters with hyphens
+	$slug = preg_replace('/[^a-z0-9]+/', '-', $slug);
+
+	// Remove leading and trailing hyphens
+	$slug = trim($slug, '-');
+
+	return $slug;
+}
+
 /**
  *  Returns text escaped for inclusion into javascript code
  *

From 9ea11cabf7ea7296a674c2ddcf54aee1b82ada13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 23 Jan 2025 22:26:02 +0100
Subject: [PATCH 130/602] fix

---
 .../triggers/interface_50_modTicket_TicketEmail.class.php    | 5 +++--
 htdocs/public/payment/paymentok.php                          | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 40cd8f49827..d077ff607c1 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -4,6 +4,7 @@
  * 				 2016       Christophe Battarel <christophe@altairis.fr>
  * Copyright (C) 2023		Benjamin Falière	<benjamin.faliere@altairis.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2025       Frédéric France         <frederic.france@free.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
@@ -178,6 +179,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 						if (!getDolGlobalString('TICKET_DISABLE_ALL_MAILS')) {
 							// Send email to assigned user
 							$sendto = $userstat->email;
+							$old_MAIN_MAIL_AUTOCOPY_TO = '';
 							if (!getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO')) {
 								$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 								$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
@@ -192,8 +194,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 							}
 						}
 					} else {
-						$this->error = $userstat->error;
-						$this->errors = $userstat->errors;
+						$this->setErrorsFromObject($userstat);
 					}
 				}
 
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 1c0d5a61aea..aa46e7ccf0b 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -169,7 +169,6 @@ $ErrorCode = $ErrorShortMsg = $ErrorLongMsg = $ErrorSeverityCode = '';
 
 
 $object = new stdClass(); // For triggers
-/** @var CommonObject $object */
 
 $error = 0;
 

From 6fdb20902df842f49a2b7c52c141f74406b06973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 23 Jan 2025 22:31:21 +0100
Subject: [PATCH 131/602] fix

---
 build/phpstan/phpstan-baseline.neon | 50 ++++-------------------------
 1 file changed, 7 insertions(+), 43 deletions(-)

diff --git a/build/phpstan/phpstan-baseline.neon b/build/phpstan/phpstan-baseline.neon
index c850e576f25..260f9b768c0 100644
--- a/build/phpstan/phpstan-baseline.neon
+++ b/build/phpstan/phpstan-baseline.neon
@@ -5457,7 +5457,7 @@ parameters:
 		-
 			message: '#^Variable \$i might not be defined\.$#'
 			identifier: variable.undefined
-			count: 4
+			count: 3
 			path: ../../htdocs/compta/facture/card.php
 
 		-
@@ -6582,12 +6582,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/compta/sociales/card.php
 
-		-
-			message: '#^Variable \$resteapayer might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: ../../htdocs/compta/sociales/card.php
-
 		-
 			message: '#^Negated boolean expression is always true\.$#'
 			identifier: booleanNot.alwaysTrue
@@ -9096,12 +9090,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/core/class/commonobject.class.php
 
-		-
-			message: '#^Parameter \#17 \$pa_ht of method Commande\:\:updateline\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../htdocs/core/class/commonobject.class.php
-
 		-
 			message: '#^Parameter \#2 \$line of method CommonObject\:\:printObjectLine\(\) expects CommonObjectLine, CommonObject\|stdClass given\.$#'
 			identifier: argument.type
@@ -20244,12 +20232,6 @@ parameters:
 			count: 2
 			path: ../../htdocs/fourn/commande/dispatch.php
 
-		-
-			message: '#^Variable \$reception might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/fourn/commande/dispatch.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
@@ -22854,12 +22836,6 @@ parameters:
 			count: 2
 			path: ../../htdocs/loan/class/loanschedule.class.php
 
-		-
-			message: '#^Negated boolean expression is always true\.$#'
-			identifier: booleanNot.alwaysTrue
-			count: 1
-			path: ../../htdocs/loan/class/paymentloan.class.php
-
 		-
 			message: '#^Property PaymentLoan\:\:\$amount_capital \(float\|int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -28734,12 +28710,6 @@ parameters:
 			count: 16
 			path: ../../htdocs/public/webportal/webportal.main.inc.php
 
-		-
-			message: '#^Variable \$logged_partnership might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/public/webportal/webportal.main.inc.php
-
 		-
 			message: '#^Negated boolean expression is always false\.$#'
 			identifier: booleanNot.alwaysFalse
@@ -30315,7 +30285,7 @@ parameters:
 		-
 			message: '#^Ternary operator condition is always true\.$#'
 			identifier: ternary.alwaysTrue
-			count: 4
+			count: 3
 			path: ../../htdocs/societe/card.php
 
 		-
@@ -32581,14 +32551,14 @@ parameters:
 			path: ../../htdocs/variants/class/ProductAttributeValue.class.php
 
 		-
-			message: '#^Loose comparison using \!\= between ''ErrorProductAlready…'' and ''ErrorProductAlready…'' will always evaluate to false\.$#'
-			identifier: notEqual.alwaysFalse
+			message: '#^Call to function is_array\(\) with array\<mixed, mixed\> will always evaluate to true\.$#'
+			identifier: function.alreadyNarrowedType
 			count: 1
 			path: ../../htdocs/variants/class/ProductCombination.class.php
 
 		-
-			message: '#^Negated boolean expression is always false\.$#'
-			identifier: booleanNot.alwaysFalse
+			message: '#^Loose comparison using \!\= between ''ErrorProductAlready…'' and ''ErrorProductAlready…'' will always evaluate to false\.$#'
+			identifier: notEqual.alwaysFalse
 			count: 1
 			path: ../../htdocs/variants/class/ProductCombination.class.php
 
@@ -33289,7 +33259,7 @@ parameters:
 			path: ../../htdocs/website/index.php
 
 		-
-			message: '#^Comparison operation "\>\=" between 1 and 0 is always true\.$#'
+			message: '#^Comparison operation "\>\=" between 0\|1 and 0 is always true\.$#'
 			identifier: greaterOrEqual.alwaysTrue
 			count: 1
 			path: ../../htdocs/website/samples/wrapper.php
@@ -33297,12 +33267,6 @@ parameters:
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
-			count: 3
-			path: ../../htdocs/website/samples/wrapper.php
-
-		-
-			message: '#^If condition is always true\.$#'
-			identifier: if.alwaysTrue
 			count: 1
 			path: ../../htdocs/website/samples/wrapper.php
 

From 48190b39de0a80f8a6335277de6ca1342568c695 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 23:26:59 +0100
Subject: [PATCH 132/602] Debug v21

---
 htdocs/societe/class/societeaccount.class.php | 10 +++++++
 htdocs/societe/website.php                    | 14 ++++-----
 htdocs/website/class/website.class.php        | 30 +++++++++++--------
 3 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index e97ec89d8fa..47207ec2fda 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -31,6 +31,7 @@ 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 SocieteAccount
  */
@@ -257,6 +258,15 @@ class SocieteAccount extends CommonObject
 	 */
 	public function create(User $user, $notrigger = 0)
 	{
+		global $langs;
+
+		if ($this->site == 'dolibarr_website') {
+			if ((int) $this->fk_website <= 0) {
+				$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Website"));
+				return -1;
+			}
+		}
+
 		return $this->createCommon($user, $notrigger);
 	}
 
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 4ed8e18f7d6..1fa3b0678f7 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -35,6 +35,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
@@ -684,15 +685,14 @@ while ($i < $imaxinloop) {
 				print ' title="'.dol_escape_htmltag($object->$key).'"';
 			}
 			print '>';
-			/*if ($key == 'status') {
-				print $objectwebsiteaccount->getLibStatut(5);
-			} elseif ($key == 'rowid') {
-				print $objectwebsiteaccount->showOutputField($val, $key, $object->id, '');
-			} else {
-				print $objectwebsiteaccount->showOutputField($val, $key, $object->$key, '');
-			}*/
 			if ($key == 'login') {
 				print $objectwebsiteaccount->getNomUrl(1, '', 0, '', 1);
+			} elseif ($key == 'fk_website') {
+				if ($obj->$key > 0) {
+					$tmpwebsite = new Website($db);
+					$tmpwebsite->fetch($obj->$key);
+					print $tmpwebsite->getNomUrl(1);
+				}
 			} else {
 				print $objectwebsiteaccount->showOutputField($val, $key, $obj->$key, '');
 			}
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 98fe79aa763..a95a2d84463 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -901,25 +901,31 @@ class Website extends CommonObject
 
 		$result = '';
 
-		$label = '<u>'.$langs->trans("WebSite").'</u>';
+		$label = '<u>'.img_picto('', 'website', 'class="pictofixedwidth"').$langs->trans("WebSite").'</u>';
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
 		$label .= '<b>'.$langs->trans('MainLanguage').':</b> '.$this->lang;
 
-		$linkstart = '<a href="'.DOL_URL_ROOT.'/website/card.php?id='.$this->id.'"';
+		// Links for internal access
+		/*
+		$linkstart = '<a href="'.DOL_URL_ROOT.'/website/index.php?website='.urlencode($this->ref).'"';
 		$linkstart .= ($notooltip ? '' : ' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss ? ' '.$morecss : '').'"');
 		$linkstart .= '>';
-		$linkend = '</a>';
-
-		$linkstart = $linkend = '';
-
-		if ($withpicto) {
-			$result .= ($linkstart.img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? '' : 'class="classfortooltip"')).$linkend);
-			if ($withpicto != 2) {
-				$result .= ' ';
-			}
+		*/
+		if (!empty($this->virtualhost)) {
+			$linkstart = '<a target="_blank" rel="noopener" href="'.$this->virtualhost.'">';
+			$linkend = '</a>';
+		} else {
+			$linkstart = $linkend = '';
 		}
-		$result .= $linkstart.$this->ref.$linkend;
+
+		$result .= $linkstart;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), 'class="pictofixedwidth'.($notooltip ? '' : ' classfortooltip').'"');
+		}
+		$result .= $this->ref;
+		$result .= $linkend;
+
 		return $result;
 	}
 

From 58b9fac4b51dac17907df3331225f36b7d65a148 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 23 Jan 2025 23:41:51 +0100
Subject: [PATCH 133/602] Fix sort on natural order

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

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 00c1a3bf98e..c95f857a4a9 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1437,7 +1437,7 @@ class FormFile
 
 				//var_dump($sortfield.' - '.$sortorder);
 				if ($sortfield && $sortorder) {	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
-					$filearray = dol_sort_array($filearray, $sortfield, $sortorder);
+					$filearray = dol_sort_array($filearray, $sortfield, $sortorder, 1);
 				}
 			}
 

From f649f59cb9258bc7695938d761eeb60839499506 Mon Sep 17 00:00:00 2001
From: PsyCrow <93346975+PsyCrow-code@users.noreply.github.com>
Date: Thu, 23 Jan 2025 18:17:38 -0600
Subject: [PATCH 134/602] FIX #32765 JS Error: Uncaught TypeError

FIX #32765 JS Error: Uncaught TypeError
---
 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 ed2f8085a32..3a6cff28efc 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -11036,7 +11036,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"]))) || ((empty($action) || $action == 'addline') && (preg_match('/card\.php/', $_SERVER["PHP_SELF"])))) {
+			if ($action == 'create' || $action == 'add'  || $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
@@ -11107,7 +11107,7 @@ function printCommonFooter($zone = 'private')
 								// Solution 1: Add handler on submit to check if mandatory fields are empty
 								print 'var form = $(\'#'.dol_escape_js($paramkey).'\').closest("form");'."\n";
 								print "form.on('submit', function(event) {
-										var submitter = event.originalEvent.submitter;
+										var submitter = $(this).find(':submit:focus').get(0);
 										if (submitter) {
 											var buttonName = $(submitter).attr('name');
 											if (buttonName == 'cancel') {
@@ -11134,10 +11134,10 @@ function printCommonFooter($zone = 'private')
 										if (tmpvalue === null || tmpvalue === undefined || tmpvalue === '') {
 											tmpvalueisempty = true;
 										}
-										if (tmpvalue === '0' && tmptypefield == 'select') {
+										if (tmpvalue === '0' && (tmptypefield == 'select' || tmptypefield == 'input')) {
 											tmpvalueisempty = true;
 										}
-										if (tmpvalueisempty) {
+										if (tmpvalueisempty && (buttonName == 'save')) {
 											console.log('field has type '+tmptypefield+' and is empty, we cancel the submit');
 											event.preventDefault(); // Stop submission of form to allow custom code to decide.
 											event.stopPropagation(); // Stop other handlers.

From 53ec7e48d129383735f0d6bcf9e00b48a3135615 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 Jan 2025 09:59:02 +0100
Subject: [PATCH 135/602] fix comments

---
 htdocs/install/mysql/migration/19.0.0-20.0.0.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
index ec3053a6a40..cf2697e3567 100644
--- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -349,7 +349,7 @@ ALTER TABLE llx_societe_commerciaux ADD COLUMN fk_c_type_contact_code varchar(32
 -- VPGSQL8.2 DROP INDEX uk_societe_commerciaux;
 ALTER TABLE llx_societe_commerciaux ADD UNIQUE INDEX uk_societe_commerciaux_c_type_contact (fk_soc, fk_user, fk_c_type_contact_code);
 ALTER TABLE llx_c_type_contact ADD INDEX idx_c_type_contact_code (code);
---Removed, not unique. ALTER TABLE llx_societe_commerciaux ADD CONSTRAINT fk_societe_commerciaux_fk_c_type_contact_code FOREIGN KEY (fk_c_type_contact_code)  REFERENCES llx_c_type_contact(code);
+-- Removed, not unique. ALTER TABLE llx_societe_commerciaux ADD CONSTRAINT fk_societe_commerciaux_fk_c_type_contact_code FOREIGN KEY (fk_c_type_contact_code)  REFERENCES llx_c_type_contact(code);
 ALTER TABLE llx_societe_commerciaux DROP FOREIGN KEY fk_societe_commerciaux_fk_c_type_contact_code;
 ALTER TABLE llx_societe_commerciaux ADD CONSTRAINT fk_societe_commerciaux_fk_soc FOREIGN KEY (fk_soc)  REFERENCES llx_societe(rowid);
 ALTER TABLE llx_societe_commerciaux ADD CONSTRAINT fk_societe_commerciaux_fk_user FOREIGN KEY (fk_user)  REFERENCES llx_user(rowid);
@@ -363,7 +363,7 @@ ALTER TABLE llx_ecm_files DROP column keyword;
 
 ALTER TABLE llx_c_type_container ADD COLUMN typecontainer varchar(10) DEFAULT 'page';
 UPDATE llx_c_type_container SET typecontainer  = 'container' WHERE code IN ('banner', 'other', 'menu');
---UPDATE llx_c_type_container SET typecontainer  = 'page' WHERE code IN ('page', 'blogpost');
+-- UPDATE llx_c_type_container SET typecontainer  = 'page' WHERE code IN ('page', 'blogpost');
 UPDATE llx_c_type_container SET position = 10  WHERE code IN ('page');
 UPDATE llx_c_type_container SET position = 20  WHERE code IN ('blogpost');
 
@@ -413,7 +413,7 @@ ALTER TABLE llx_hrm_evaluation ADD COLUMN entity INTEGER DEFAULT 1 NOT NULL;
 -- Error SQL DB_ERROR_1170 BLOB/TEXT column 'url' used in key specification without a key length, so we remove completely the unique key
 ALTER TABLE llx_menu DROP INDEX idx_menu_uk_menu;
 ALTER TABLE llx_menu MODIFY COLUMN url TEXT NOT NULL;
---ALTER TABLE llx_menu ADD UNIQUE INDEX idx_menu_uk_menu (menu_handler, fk_menu, position, entity, url);
+-- ALTER TABLE llx_menu ADD UNIQUE INDEX idx_menu_uk_menu (menu_handler, fk_menu, position, entity, url);
 
 UPDATE llx_c_units SET short_label = 'mn' WHERE short_label = 'i' AND code = 'MI';
 

From c2be92dad5c10a38862ce65d7ad3df38c3d6c4dd Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 15:09:07 +0100
Subject: [PATCH 136/602] Fix: fetch_object takes resultset, not sql

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

diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index 34f5eb68660..71dbae2b866 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2007-2011 Laurent Destailleur      <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -488,7 +488,7 @@ class CUnits extends CommonDict
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			// TODO : add base col into unit dictionary table
-			$unit = $this->db->fetch_object($sql);
+			$unit = $this->db->fetch_object($resql);
 			if ($unit) {
 				// TODO : if base exists in unit dictionary table, remove this conversion exception and update conversion infos in database.
 				// Example time hour currently scale 3600 will become scale 2 base 60

From b19122b046f7cffb3b5f4afe9a8fa39922ccc2c4 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 15:24:34 +0100
Subject: [PATCH 137/602] Qual: Fix argument type

---
 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 9a1409b9b0d..a4ae40aa36a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2637,7 +2637,7 @@ class Form
 
 			$events = array();
 			$out .= img_picto('', 'resource', 'class="pictofixedwidth"');
-			$out .= $formresources->select_resource_list(0, $htmlname, [], 1, 1, 0, $events, array(), 2, 0);
+			$out .= $formresources->select_resource_list(0, $htmlname, '', 1, 1, 0, $events, '', 2, 0);
 			//$out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
 			$out .= ' <input type="submit" disabled class="button valignmiddle smallpaddingimp reposition" id="' . $action . 'assignedtoresource" name="' . $action . 'assignedtoresource" value="' . dol_escape_htmltag($langs->trans("Add")) . '">';
 			$out .= '<br>';

From 4246215730f027986bf5527be7891d97e86a54a2 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 15:31:49 +0100
Subject: [PATCH 138/602] Fix: Convert email references array to string

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

diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 7740ed0066f..c0d6e3357c8 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2006-2011 Regis Houssin
  * Copyright (C) 2016      Jonathan TISSEAU     <jonathan.tisseau@86dev.fr>
- * Copyright (C) 2024      MDW                  <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW                  <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1574,8 +1574,11 @@ class SMTPs
 		if ($this->getInReplyTo()) {
 			$_header .= "In-Reply-To: ".$this->getInReplyTo()."\r\n";
 		}
-		if ($this->getReferences()) {
-			$_header .= "References: ".$this->getReferences()."\r\n";
+		$references = $this->getReferences();
+		if ($references) {
+			// List of message ids:
+			// Example "References: <id1@domain2.com> <id2@domain.com>
+			$_header .= "References: ".implode(' ', $references)."\r\n";
 		}
 
 		return $_header;

From 694342484d8f7e29e2d705ebd0a3863bbc7ff358 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 15:50:20 +0100
Subject: [PATCH 139/602] Qual: Fix phan notices

---
 htdocs/core/customreports.php                 | 27 +++++-----
 .../modules/commande/modules_commande.php     | 49 ++++++++++++++++++-
 2 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index f0f1cd22712..5535546dece 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2020-2024 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -40,6 +40,11 @@
  * @var User $user
  */
 
+// Initialise values
+$search_xaxis = array();
+$search_groupby = array();
+$tabfamily = null;
+
 if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	require '../main.inc.php';
 
@@ -56,14 +61,10 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	//$search_xaxis = GETPOST('search_xaxis', 'array');
 	if (GETPOST('search_xaxis', 'alpha') && GETPOST('search_xaxis', 'alpha') != '-1') {
 		$search_xaxis = array(GETPOST('search_xaxis', 'alpha'));
-	} else {
-		$search_xaxis = array();
 	}
 	//$search_groupby = GETPOST('search_groupby', 'array');
 	if (GETPOST('search_groupby', 'alpha') && GETPOST('search_groupby', 'alpha') != '-1') {
 		$search_groupby = array(GETPOST('search_groupby', 'alpha'));
-	} else {
-		$search_groupby = array();
 	}
 
 	'@phan-var-force string[] $search_groupby';
@@ -385,11 +386,11 @@ $arrayofmesures = fillArrayOfMeasures($object, 't', $langs->trans($newarrayoftyp
 $arrayofmesures = dol_sort_array($arrayofmesures, 'position', 'asc', 0, 0, 1);
 
 $count = 0;
-$arrayofxaxis = fillArrayOfXAxis($object, 't', $langs->trans($newarrayoftype[$objecttype]['label']), $arrayofxaxis, 0, $count);
+$arrayofxaxis = fillArrayOfXAxis($object, 't', $label, $arrayofxaxis, 0, $count);
 $arrayofxaxis = dol_sort_array($arrayofxaxis, 'position', 'asc', 0, 0, 1);
 
 $count = 0;
-$arrayofgroupby = fillArrayOfGroupBy($object, 't', $langs->trans($newarrayoftype[$objecttype]['label']), $arrayofgroupby, 0, $count);
+$arrayofgroupby = fillArrayOfGroupBy($object, 't', $label, $arrayofgroupby, 0, $count);
 $arrayofgroupby = dol_sort_array($arrayofgroupby, 'position', 'asc', 0, 0, 1);
 
 
@@ -548,7 +549,7 @@ if (is_array($search_groupby) && count($search_groupby)) {
 					*/
 					$labeloffield = $arrayofgroupby[$fieldtocount]['labelnohtml'];
 				} else {
-					$labeloffield = $langs->transnoentitiesnoconv($keyforlabeloffield);
+					$labeloffield = 'FK_ISSUE'; // $langs->transnoentitiesnoconv($keyforlabeloffield);
 				}
 			} else {											// This is a common field
 				$reg = array();
@@ -585,7 +586,7 @@ if (!defined('MAIN_CUSTOM_REPORT_KEEP_GRAPH_ONLY')) {
 	print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" autocomplete="off">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="viewgraph">';
-	print '<input type="hidden" name="tabfamily" value="'.$tabfamily.'">';
+	print '<input type="hidden" name="tabfamily" value="'.(string) $tabfamily.'">';
 
 	$viewmode = '';
 
@@ -725,9 +726,9 @@ if (!defined('MAIN_CUSTOM_REPORT_KEEP_GRAPH_ONLY')) {
 		print '</div>';
 	}
 
-	if ($mode == 'graph') {
-		//
-	}
+	//if ($mode == 'graph') {
+	//
+	//}
 
 	print '<div class="divadvancedsearchfield">';
 	print '<input type="submit" class="button buttongen button-save nomargintop" value="'.$langs->trans("Refresh").'">';
@@ -1114,7 +1115,7 @@ if ($sql) {
 				 */
 				foreach ($search_measures as $key => $val) {
 					$gi = 0;
-					foreach ($search_groupby as $gkey) {
+					foreach ($search_groupby as $gkey => $gval) {
 						//var_dump('*** Fetch #'.$ifetch.' for labeltouse='.$labeltouse.' measure number '.$key.' and group g_'.$gi);
 						//var_dump($arrayofvaluesforgroupby);
 						foreach ($arrayofvaluesforgroupby['g_'.$gi] as $gvaluepossiblekey => $gvaluepossiblelabel) {
diff --git a/htdocs/core/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php
index a0d1f4eda9e..db65437e38e 100644
--- a/htdocs/core/modules/commande/modules_commande.php
+++ b/htdocs/core/modules/commande/modules_commande.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2012      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -41,21 +41,68 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
  */
 abstract class ModelePDFCommandes extends CommonDocGenerator
 {
+	/**
+	 * @var float
+	 */
 	public $posxpicture;
+	/**
+	 * @var float
+	 */
 	public $posxtva;
+	/**
+	 * @var float
+	 */
 	public $posxup;
+	/**
+	 * @var float
+	 */
 	public $posxqty;
+	/**
+	 * @var float
+	 */
 	public $posxunit;
+	/**
+	 * @var float
+	 */
 	public $posxdesc;
+	/**
+	 * @var float
+	 */
 	public $posxdiscount;
+	/**
+	 * @var float
+	 */
 	public $postotalht;
 
+	/**
+	 * @var array<string,float>
+	 */
 	public $tva;
+	/**
+	 * @var array<string,array{amount:float}>
+	 */
 	public $tva_array;
+	/**
+	 * Local tax rates Array[tax_type][tax_rate]
+	 *
+	 * @var array<string,array<int,float>>
+	 */
 	public $localtax1;
+
+	/**
+	 * Local tax rates Array[tax_type][tax_rate]
+	 *
+	 * @var array<string,array<int,float>>
+	 */
 	public $localtax2;
 
+	/**
+	 * @var int<0,1>
+	 */
 	public $atleastoneratenotnull = 0;
+	/**
+	 * @var int<0,1>
+	 */
 	public $atleastonediscount = 0;
 
 

From 3fb717bb68c14450f4fd63fc628d9ce76f4b4616 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 16:18:22 +0100
Subject: [PATCH 140/602] Fix date types/arrays (phan notices)

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

diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index 0c2e3f12160..12bc0fc9d94 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2007 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2014	   Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This file is a modified version of datepicker.php from phpBSM to fix some
@@ -233,7 +233,8 @@ function displayBox($selectedDate, $month, $year)
 	//print "x ".$thedate." y";			// $thedate = first day of month
 	$firstdate = dol_getdate($thedate);
 	//var_dump($firstdateofweek);
-	$mydate = dol_get_first_day_week(1, $month, $year, true); // mydate = cursor date
+	$mydate_tmp = dol_get_first_day_week(1, $month, $year, true); // mydate = cursor date
+	$mydate = dol_getdate(dol_mktime(12, 0, 0, $mydate_tmp['first_month'], $mydate_tmp['first_day'], $mydate_tmp['first_year']));
 
 	// Loop on each day of month
 	$stoploop = 0;
@@ -241,7 +242,7 @@ function displayBox($selectedDate, $month, $year)
 	$cols = 0;
 	while (!$stoploop) {
 		//print_r($mydate);
-		if ($mydate < $firstdate) {	// At first run
+		if ($mydate[0] < $firstdate[0]) {	// At first run
 			echo "<tr class=\"dpWeek\">";
 			//echo $conf->global->MAIN_START_WEEK.' '.$firstdate["wday"].' '.$startday;
 			$cols = 0;
@@ -291,7 +292,7 @@ function displayBox($selectedDate, $month, $year)
 			$stoploop = 1;
 		} else {
 			$mydate = dol_getdate($thedate);
-			if ($firstdate["month"] != $mydate["month"]) {
+			if ($firstdate["mon"] != $mydate["mon"]) {
 				$stoploop = 1;
 			}
 		}

From ba32606084b605ea93c3c119694a3bb60b746337 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 16:19:57 +0100
Subject: [PATCH 141/602] Fix return value for getListOfCollation()

---
 htdocs/core/db/sqlite3.class.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index 3e5fe6cb908..23fa3483e76 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2015      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1278,7 +1278,7 @@ class DoliDBSqlite3 extends DoliDB
 	}
 
 	/**
-	 *	Return list of available collation that can be used for database
+	 *	Return list of available collations that can be used for database
 	 *
 	 *	@return		?array<int,array{collation:string}>		List of Collation
 	 */
@@ -1286,8 +1286,7 @@ class DoliDBSqlite3 extends DoliDB
 	{
 		$liste = array();
 		$i = 0;
-		$liste[$i]['charset'] = 'UTF-8';
-		$liste[$i]['description'] = 'UTF-8';
+		$liste[$i]['collation'] = 'UTF-8';
 		return $liste;
 	}
 

From f322aad97b227f2c12f84037527ba6c41a89383b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 16:27:32 +0100
Subject: [PATCH 142/602] Qual: Ensure type is string.

---
 htdocs/core/extrafieldsinimport.inc.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/extrafieldsinimport.inc.php b/htdocs/core/extrafieldsinimport.inc.php
index 570df5f8e0f..740043d47c0 100644
--- a/htdocs/core/extrafieldsinimport.inc.php
+++ b/htdocs/core/extrafieldsinimport.inc.php
@@ -1,4 +1,6 @@
 <?php
+/* Copyright (C) 2025		MDW	<mdeweerd@users.noreply.github.com>
+ */
 '@phan-var-force DolibarrModules $this';
 
 // $keyforselect = name of main table
@@ -51,7 +53,7 @@ if ($resql) {    // This can fail when class is used on old database (during mig
 				$tmpparam = jsonOrUnserialize($obj->param); // $tmp may be array 'options' => array 'c_currencies:code_iso:code_iso' => null
 				if (is_array($tmpparam) && array_key_exists('options', $tmpparam) &&  $tmpparam['options'] && is_array($tmpparam['options'])) {
 					$tmpkeys = array_keys($tmpparam['options']);
-					$tmp = array_shift($tmpkeys);
+					$tmp = (string) array_shift($tmpkeys);
 				}
 				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
 					$typeFilter = "List:".$tmp;

From a35d502409948665edf98bd8c8a0da688a60a367 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 16:35:34 +0100
Subject: [PATCH 143/602] Fix: Correct key for position of extrafield

---
 htdocs/core/lib/company.lib.php       |  4 ++--
 htdocs/core/lib/customreports.lib.php | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index fc8177a2993..4be8ad3bf8d 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2017       Rui Strecht             <rui.strecht@aliartalentos.com>
  * Copyright (C) 2018-2024  Ferran Marcet           <fmarcet@2byte.es>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -1909,7 +1909,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr
 		} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {
 			$sql .= ", ".MAIN_DB_PREFIX."contrat as o";
 		} elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid'])
-		&& ((!empty($filterobj->fields['ref']) && is_array($filterobj->fields['ref'])) || (!empty($filterobj->fields['label']) && is_array($filterobj->fields['label'])) || (!empty($filterobj->fields['titre']) && is_array($filterobj->fields['titre'])))  // @phan-suppress-curren-line PhanTypeInvalidDimOffset
+		&& ((!empty($filterobj->fields['ref']) && is_array($filterobj->fields['ref'])) || (!empty($filterobj->fields['label']) && is_array($filterobj->fields['label'])) || (!empty($filterobj->fields['titre']) && is_array($filterobj->fields['titre'])))  // @phan-suppress-current-line PhanTypeInvalidDimOffset
 		&& $filterobj->table_element && $filterobj->element) {
 			$sql .= ", ".MAIN_DB_PREFIX.$filterobj->table_element." as o";
 		}
diff --git a/htdocs/core/lib/customreports.lib.php b/htdocs/core/lib/customreports.lib.php
index 574faafeabb..621b0dfd093 100644
--- a/htdocs/core/lib/customreports.lib.php
+++ b/htdocs/core/lib/customreports.lib.php
@@ -1,8 +1,8 @@
 <?php
 /* Copyright (C) 2024       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
-*
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -110,8 +110,11 @@ function fillArrayOfMeasures($object, $tablealias, $labelofobject, &$arrayofmesu
 	if (!empty($object->isextrafieldmanaged) && isset($extrafields->attributes[$object->table_element]['label'])) {
 		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 			if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || (int) dol_eval((string) $extrafields->attributes[$object->table_element]['enabled'][$key], 1, 1, '1'))) {
-				// @phan-suppress-next-line PhanTypeMismatchDimAssignment
-				$position = (!empty($val['position']) ? $val['position'] : 0);
+				if (isset($extrafields->attributes[$object->table_element]['pos'][$key])) {
+					$position = $extrafields->attributes[$object->table_element]['pos'][$key];
+				} else {
+					$position = 0;
+				}
 				$arrayofmesures[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-sum'] = array(
 					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),

From f64c0818f9cce3084820dd32fe013d345d92eb0e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 16:53:07 +0100
Subject: [PATCH 144/602] Qual: Fix nullable and typing (phan notices)

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

diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 0f0ff2cf7be..bb874b7b6ec 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2007 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -315,6 +315,10 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 			break;
 	}
 
+	if ($img === null) {
+		return "Error: Could not create Image from '$filetoread'";
+	}
+
 	// Create empty image for target
 	if ($newExt == 'gif') {
 		// Compatibility image GIF
@@ -615,6 +619,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 
 	// Variable initialization according to image extension
 	$img = null;
+	$extImg = null;
 	switch ($infoImg[2]) {
 		case IMAGETYPE_GIF:	    // 1
 			$img = imagecreatefromgif($filetoread);
@@ -805,7 +810,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 			imagejpeg($imgThumb, $imgThumbName, $newquality); // @phan-suppress-current-line PhanTypeMismatchArgumentNullableInternal,PhanPossiblyUndeclaredVariable
 			break;
 		case IMAGETYPE_PNG:	    // 3
-			imagepng($imgThumb, $imgThumbName, $newquality);  // @phan-suppress-current-line PhanPossiblyUndeclaredVariable
+			imagepng($imgThumb, $imgThumbName, !is_numeric($newquality) ? -1 : (int) $newquality);  // @phan-suppress-current-line PhanPossiblyUndeclaredVariable
 			break;
 		case IMAGETYPE_BMP:	    // 6
 			// Not supported by PHP GD

From 7847da3c1162a9e7d296f743d19035e8c273a177 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 16:55:45 +0100
Subject: [PATCH 145/602] Qual: Fix phan notices

---
 .../core/modules/asset/doc/pdf_standard_asset.modules.php   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 21868e83967..4854eb516c4 100644
--- a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
+++ b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2017       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	    Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -772,7 +772,7 @@ class pdf_standard_asset extends ModelePDFAsset
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
 			if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
-				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, $this->corner_radius, '1001', 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
+				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, $this->corner_radius, '1001', 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -1001,6 +1001,8 @@ class pdf_standard_asset extends ModelePDFAsset
 
 			if (is_object($thirdparty)) {
 				$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
+			} else {
+				$carac_client_name = '';
 			}
 
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), ($usecontact ? 1 : 0), 'target', $object);

From ac9301dc8f6b352a8ae4ad0effcefc3a74cbc674 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 16:58:53 +0100
Subject: [PATCH 146/602] Qual: Handle case where code to convert is <false>

---
 htdocs/core/modules/barcode/doc/phpbarcode.modules.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
index b066f2a460c..56e846a0516 100644
--- a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2005-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -159,6 +159,7 @@ class modPhpbarcode extends ModeleBarCode
 			$filebarcode = '';
 		}
 
+		$result = "No barcode ($code) to print";
 		dol_syslog(get_class($this)."::buildBarCode $code,$encoding,$scale,$mode,$filebarcode");
 		if ($code) {
 			$result = barcode_print($code, $encoding, $scale, $mode, $filebarcode);

From 56c060e14a175b5975a40f29c5da8a8365548a38 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 17:04:18 +0100
Subject: [PATCH 147/602] Qual: Define types for properties

---
 .../modules/barcode/mod_barcode_product_standard.php   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index ca5c3b7a3e0..0188ad64d64 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2007-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -43,9 +43,15 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
+	/**
+	 * @var ?string
+	 */
 	public $searchcode; // Search string
 
-	public $numbitcounter; // Number of digits the counter
+	/**
+	 * @var ?int
+	 */
+	public $numbitcounter; // Number of digits in the counter
 
 	/**
 	 *	Constructor

From ccc0528dd48e85e530fbe3e62833b970508aa960 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 17:11:11 +0100
Subject: [PATCH 148/602] Qual: Fix argument types

---
 .../modules/commande/doc/pdf_einstein.modules.php  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 4b42d6c93da..b678fc7e9b4 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -7,8 +7,8 @@
  * Copyright (C) 2012		Cedric Salvador				<csalvador@gpcsolutions.fr>
  * Copyright (C) 2015		Marcos García				<marcosgdf@gmail.com>
  * Copyright (C) 2017-2018	Ferran Marcet				<fmarcet@2byte.es>
- * Copyright (C) 2018-2025  Frédéric France				<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2018-2024	Frédéric France				<frederic.france@free.fr>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Nick Fragoulis
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
@@ -650,7 +650,7 @@ class pdf_einstein extends ModelePDFCommandes
 						$pagecount = $pdf->setSourceFile($termsofsale);
 						for ($i = 1; $i <= $pagecount; $i++) {
 							$tplIdx = $pdf->importPage($i);
-							if ($tplIdx!==false) {
+							if ($tplIdx !== false) {
 								$s = $pdf->getTemplatesize($tplIdx);
 								$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 								$pdf->useTemplate($tplIdx);
@@ -967,11 +967,11 @@ class pdf_einstein extends ModelePDFCommandes
 
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
-		$pdf->SetXY($col1x, $tab2_top+ $tab2_hl * $index);
+		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
 
 		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
-		$pdf->SetXY($col2x, $tab2_top+ $tab2_hl * $index);
+		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
@@ -1261,7 +1261,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
 			if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
-				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, $this->corner_radius, '1001', 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
+				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, $this->corner_radius, '1001', 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -1614,7 +1614,7 @@ class pdf_einstein extends ModelePDFCommandes
 					// Show shipping frame
 					$pdf->SetXY($posx + 2, $posy - 5);
 					$pdf->SetFont('', '', $default_font_size - 2);
-					$pdf->MultiCell($widthrecbox, '', $outputlangs->transnoentities('ShippingTo'), 0, 'L', 0);
+					$pdf->MultiCell($widthrecbox, 0, $outputlangs->transnoentities('ShippingTo'), 0, 'L', 0);
 					$pdf->RoundedRect($posx, $posy, $widthrecbox, $hautcadre, $this->corner_radius, '1234', 'D');
 
 					// Show shipping name

From c0ad3f22b9328271c600f3a21339853f04dbbacf Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 17:21:18 +0100
Subject: [PATCH 149/602] Qual: fix phan notices

---
 .../commande/doc/pdf_eratosthene.modules.php  | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index e72b7d39491..5f1a384d7a0 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2017       Ferran Marcet				<fmarcet@2byte.es>
  * Copyright (C) 2021-2024	Anthony Berton				<anthony.berton@bb2a.fr>
  * Copyright (C) 2018-2025  Frédéric France				<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	    Nick Fragoulis
  * Copyright (C) 2024       Joachim Kueter				<git-jk@bloxera.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
@@ -226,6 +226,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				}
 
 				$arephoto = false;
+				$realpath = null;
 				foreach ($pdir as $midir) {
 					if (!$arephoto) {
 						if ($conf->entity != $objphoto->entity) {
@@ -275,6 +276,12 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$file = $dir."/".$objectref.".pdf";
 			}
 
+			if ($dir === null) {
+				dol_syslog(get_class($this).'::'.__METHOD__."Target directory should not be null.". getCallerInfoString(), LOG_ERR);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+				return 0;
+			}
+
 			if (!file_exists($dir)) {
 				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
@@ -365,7 +372,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
 				if (!$hidetop && getDolGlobalInt('MAIN_PDF_ENABLE_COL_HEAD_TITLE_REPEAT')) {
 					// TODO : make this hidden conf the default behavior for each PDF when each PDF managed this new Display
-					$tab_top_newpage+= $this->tabTitleHeight;
+					$tab_top_newpage += $this->tabTitleHeight;
 				}
 
 				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
@@ -603,6 +610,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 						// I remove the line commented below because it probably uselesss (or bug source) no need to change bottom margin because we have checked image fit
 						//$pdf->setPageOrientation('', 0, $heightforfooter + $heightforfreetext); // The only function to edit the bottom margin of current page to set it.
 
+						// @phan-suppress-next-line PhanTypeMismatchProperty
 						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
 							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY + $imageTopMargin, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 							// $pdf->Image does not increase value return by getY, so we save it manually
@@ -778,7 +786,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				// Add last page for document footer if there are not enough size left
 				$afterPosData = $this->getMaxAfterColsLinePositionsData();
-				if ($afterPosData['y'] > $this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot) ) {
+				if ($afterPosData['y'] > $this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)) {
 					$pdf->AddPage();
 					if (!empty($tplidx)) {
 						$pdf->useTemplate($tplidx);
@@ -789,7 +797,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				// Draw table frames and columns borders
 				$drawTabNumbPage = $pdf->getNumPages();
-				for ($i=$pageposbeforeprintlines; $i<=$drawTabNumbPage; $i++) {
+				for ($i = $pageposbeforeprintlines; $i <= $drawTabNumbPage; $i++) {
 					$pdf->setPage($i);
 					// reset page orientation each loop to override it if it was changed
 					$pdf->setPageOrientation('', 0, 0); // The only function to edit the bottom margin of current page to set it.
@@ -804,7 +812,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 						$drawTabTop = $tab_top;
 					} elseif (!$drawTabHideTop) {
 						if (getDolGlobalInt('MAIN_PDF_ENABLE_COL_HEAD_TITLE_REPEAT')) {
-							$drawTabTop-= $this->tabTitleHeight;
+							$drawTabTop -= $this->tabTitleHeight;
 						} else {
 							$drawTabHideTop = 1;
 						}
@@ -813,7 +821,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					// last page need to include document footer
 					if ($i == $pdf->getNumPages()) {
 						// remove document footer height to tab bottom position
-						$drawTabBottom-= $heightforfreetext + $heightforinfotot;
+						$drawTabBottom -= $heightforfreetext + $heightforinfotot;
 					}
 
 					$drawTabHeight = $drawTabBottom - $drawTabTop;
@@ -865,7 +873,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 						$pagecount = $pdf->setSourceFile($termsofsale);
 						for ($i = 1; $i <= $pagecount; $i++) {
 							$tplIdx = $pdf->importPage($i);
-							if ($tplIdx!==false) {
+							if ($tplIdx !== false) {
 								$s = $pdf->getTemplatesize($tplIdx);
 								$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 								$pdf->useTemplate($tplIdx);
@@ -1471,7 +1479,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
 			if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
-				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, $this->corner_radius, '1001', 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
+				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, $this->corner_radius, '1001', 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -1738,6 +1746,8 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 			if (is_object($thirdparty)) {
 				$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
+			} else {
+				$carac_client_name = '';
 			}
 
 			$mode =  'target';
@@ -1800,7 +1810,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					// Show shipping frame
 					$pdf->SetXY($posx + 2, $posy - 5);
 					$pdf->SetFont('', '', $default_font_size - 2);
-					$pdf->MultiCell($widthrecbox, '', $outputlangs->transnoentities('ShippingTo'), 0, 'L', 0);
+					$pdf->MultiCell($widthrecbox, 0, $outputlangs->transnoentities('ShippingTo'), 0, 'L', 0);
 					$pdf->RoundedRect($posx, $posy, $widthrecbox, $hautcadre, $this->corner_radius, '1234', 'D');
 
 					// Show shipping name

From 1ae4f984ed9714242d214d0611b8d7e755c77c5a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 17:23:07 +0100
Subject: [PATCH 150/602] Qual: fix phan notices

---
 htdocs/core/modules/contract/doc/pdf_strato.modules.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index a5fb5ace0f3..e58fb460ea1 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2013-2024  Philippe Grand	            <philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Marcos García               <marcosgdf@gmail.com>
  * Copyright (C) 2018-2024  Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	    Nick Fragoulis
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) 2024		Éric Seigne             	<eric.seigne@cap-rel.fr>
@@ -191,6 +191,12 @@ class pdf_strato extends ModelePDFContract
 				$file = $dir."/".$objectref.".pdf";
 			}
 
+			if ($dir === null) {
+				dol_syslog(get_class($this).'::'.__METHOD__."Target directory should not be null.". getCallerInfoString(), LOG_ERR);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", "Null dir");
+				return 0;
+			}
+
 			if (!file_exists($dir)) {
 				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentitiesnoconv("ErrorCanNotCreateDir", $dir);

From 44944ac15ac648a1feda8558b2a5d8607b996321 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 17:24:40 +0100
Subject: [PATCH 151/602] Qual: fix phan notices

---
 htdocs/core/modules/delivery/doc/pdf_storm.modules.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
index d75dade66fa..74e9375dcac 100644
--- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2011-2021 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2020      John BOTELLA
- * Copyright (C) 2024	   MDW					 <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					 <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024      Frédéric France       <frederic.france@free.fr>
  * Copyright (C) 2024	   Nick Fragoulis
  *
@@ -203,6 +203,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 						}
 
 						$arephoto = false;
+						$realpath = false;
 						foreach ($pdir as $midir) {
 							if (!$arephoto) {
 								$dir = $conf->product->dir_output.'/'.$midir;
@@ -663,7 +664,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 		if (empty($hidetop)) {
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
 			if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
-				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, $this->corner_radius, '1001', 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
+				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, $this->corner_radius, '1001', 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 

From 7aa845efd0558de3e8eac962dee7f2730c434abe Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 18:12:36 +0100
Subject: [PATCH 152/602] Qual: Fix phan notices

---
 htdocs/core/customreports.php                 | 48 ++++++---
 .../commande/doc/pdf_eratosthene.modules.php  |  2 +-
 .../modules/commande/modules_commande.php     |  4 +-
 .../delivery/doc/pdf_typhon.modules.php       | 11 ++-
 .../expedition/doc/pdf_merou.modules.php      | 13 ++-
 .../pdf_standard_expensereport.modules.php    | 29 +++++-
 .../modules/facture/doc/pdf_crabe.modules.php | 18 ++--
 .../facture/doc/pdf_octopus.modules.php       | 12 ++-
 .../facture/doc/pdf_sponge.modules.php        | 18 ++--
 .../core/modules/facture/modules_facture.php  | 50 +++++++++-
 htdocs/core/modules/fichinter/mod_pacific.php |  5 +-
 .../doc/pdf_standard_evaluation.modules.php   |  2 +-
 .../modules/mailings/contacts1.modules.php    |  4 +-
 .../modules/mailings/thirdparties.modules.php |  4 +-
 .../pdf_standard_movementstock.modules.php    | 98 +++++++++++++------
 .../modules/mrp/doc/pdf_vinci.modules.php     |  6 +-
 .../modules/printing/printgcp.modules.php     | 18 +++-
 .../product/doc/pdf_standard.modules.php      | 61 ++++++------
 .../task/doc/doc_generic_task_odt.modules.php |  4 +-
 .../modules/propale/doc/pdf_azur.modules.php  | 21 ++--
 .../modules/propale/doc/pdf_cyan.modules.php  | 44 +++++----
 .../core/modules/propale/modules_propale.php  | 49 +++++++++-
 .../reception/doc/pdf_squille.modules.php     |  4 +-
 23 files changed, 372 insertions(+), 153 deletions(-)

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 5535546dece..e15031940c7 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2020-2024 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
@@ -41,9 +42,9 @@
  */
 
 // Initialise values
-$search_xaxis = array();
 $search_groupby = array();
 $tabfamily = null;
+$objecttype = null;
 
 if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	require '../main.inc.php';
@@ -70,7 +71,7 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	'@phan-var-force string[] $search_groupby';
 
 	$search_yaxis = GETPOST('search_yaxis', 'array');
-	$search_graph = GETPOST('search_graph', 'restricthtml');
+	$search_graph = (string) GETPOST('search_graph', 'restricthtml');
 
 	// Load variable for pagination
 	$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
@@ -113,12 +114,21 @@ if (empty($mode)) {
 if (!isset($search_measures)) {
 	$search_measures = array(0 => 't.count');
 }
+if (!isset($search_xaxis)) {
+	// Ensure value is set and not null.
+	$search_xaxis = array();
+}
+if (!isset($search_graph)) {
+	// Ensure value is set and not null
+	$search_graph = '';
+}
 if (!empty($object)) {
 	$objecttype = $object->element.($object->module ? '@'.$object->module : '');
 }
-if (empty($objecttype)) {
+if (!is_string($objecttype) || empty($objecttype)) {
 	$objecttype = 'thirdparty';
 }
+'@phan-var-force string $objecttype';  // Help phan that suggests $objecttype can be null
 
 require_once DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/html.form.class.php";
@@ -163,6 +173,7 @@ $arrayoftype = array(
 
 // Complete $arrayoftype by external modules
 $parameters = array('objecttype' => $objecttype, 'tabfamily' => $tabfamily);
+// @phan-suppress-next-line PhanTypeMismatchArgumentNullable
 $reshook = $hookmanager->executeHooks('loadDataForCustomReports', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -191,9 +202,12 @@ if ($objecttype) {
 		} else {
 			$fileforclass = "/".$objecttype."/class/".$objecttype.".class.php";
 		}
-		dol_include_once($fileforclass);
+		$ObjectClassName = null;
 
-		$ObjectClassName = $arrayoftype[$objecttype]['ObjectClassName'];
+		if ($fileforclass !== null) {
+			dol_include_once($fileforclass);
+			$ObjectClassName = $arrayoftype[$objecttype]['ObjectClassName'];
+		}
 		if (!empty($ObjectClassName)) {
 			if (class_exists($ObjectClassName)) {
 				$object = new $ObjectClassName($db);
@@ -369,7 +383,7 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 
 $newarrayoftype = array();
 foreach ($arrayoftype as $key => $val) {
-	if (dol_eval($val['enabled'], 1, 1, '1')) {
+	if (dol_eval((string) $val['enabled'], 1, 1, '1')) {
 		$newarrayoftype[$key] = $arrayoftype[$key];
 	}
 	if (!empty($val['langs'])) {
@@ -378,11 +392,15 @@ foreach ($arrayoftype as $key => $val) {
 }
 
 $count = 0;
-$arrayoffilterfields = fillArrayOfFilterFields($object, 't', $langs->trans($newarrayoftype[$objecttype]['label']), $arrayoffilterfields, 0, $count);
+$label = '';
+if (array_key_exists($objecttype, $newarrayoftype)) {
+	$label = $langs->trans($newarrayoftype[$objecttype]['label']);
+}
+$arrayoffilterfields = fillArrayOfFilterFields($object, 't', $label, $arrayoffilterfields, 0, $count);
 $arrayoffilterfields = dol_sort_array($arrayoffilterfields, 'position', 'asc', 0, 0, 1);
 
 $count = 0;
-$arrayofmesures = fillArrayOfMeasures($object, 't', $langs->trans($newarrayoftype[$objecttype]['label']), $arrayofmesures, 0, $count);
+$arrayofmesures = fillArrayOfMeasures($object, 't', $label, $arrayofmesures, 0, $count);
 $arrayofmesures = dol_sort_array($arrayofmesures, 'position', 'asc', 0, 0, 1);
 
 $count = 0;
@@ -396,17 +414,17 @@ $arrayofgroupby = dol_sort_array($arrayofgroupby, 'position', 'asc', 0, 0, 1);
 
 // Check parameters
 if ($action == 'viewgraph') {
-	if (is_array($search_measures) && !count($search_measures)) {
+	if (!count($search_measures)) {
 		setEventMessages($langs->trans("AtLeastOneMeasureIsRequired"), null, 'warnings');
 	} elseif ($mode == 'graph' && is_array($search_xaxis) && count($search_xaxis) > 1) {
 		setEventMessages($langs->trans("OnlyOneFieldForXAxisIsPossible"), null, 'warnings');
 		$search_xaxis = array(0 => $search_xaxis[0]);
 	}
-	if (is_array($search_groupby) && count($search_groupby) >= 2) {
+	if (count($search_groupby) >= 2) {
 		setEventMessages($langs->trans("ErrorOnlyOneFieldForGroupByIsPossible"), null, 'warnings');
 		$search_groupby = array(0 => $search_groupby[0]);
 	}
-	if (is_array($search_xaxis) && !count($search_xaxis)) {
+	if (!count($search_xaxis)) {
 		setEventMessages($langs->trans("AtLeastOneXAxisIsRequired"), null, 'warnings');
 	} elseif ($mode == 'graph' && $search_graph == 'bars' && count($search_measures) > $MAXMEASURESINBARGRAPH) {
 		$langs->load("errors");
@@ -417,7 +435,7 @@ if ($action == 'viewgraph') {
 
 // Get all possible values of fields when a 'group by' is set, and save this into $arrayofvaluesforgroupby
 // $arrayofvaluesforgroupby will be used to forge lael of each grouped series
-if (is_array($search_groupby) && count($search_groupby)) {
+if (count($search_groupby)) {
 	$fieldtocount = '';
 	foreach ($search_groupby as $gkey => $gval) {
 		$gvalwithoutprefix = preg_replace('/^[a-z]+\./', '', $gval);
@@ -563,7 +581,7 @@ if (is_array($search_groupby) && count($search_groupby)) {
 				}
 			}
 			//var_dump($labeloffield);
-			setEventMessages($langs->transnoentitiesnoconv("ErrorTooManyDifferentValueForSelectedGroupBy", $MAXUNIQUEVALFORGROUP, $labeloffield), null, 'warnings');
+			setEventMessages($langs->transnoentitiesnoconv("ErrorTooManyDifferentValueForSelectedGroupBy", (string) $MAXUNIQUEVALFORGROUP, (string) $labeloffield), null, 'warnings');
 			$search_groupby = array();
 		}
 
@@ -1064,7 +1082,7 @@ foreach ($search_measures as $key => $val) {
 	$legend[] = $langs->trans($arrayofmesures[$val]['label']);
 }
 
-$useagroupby = (is_array($search_groupby) && count($search_groupby));
+$useagroupby = count($search_groupby);
 //var_dump($useagroupby);
 //var_dump($arrayofvaluesforgroupby);
 
@@ -1221,7 +1239,7 @@ if ($mode == 'graph') {
 
 		$px1->SetLegend($legend);
 		$px1->setShowLegend($SHOWLEGEND);
-		$px1->SetMinValue($px1->GetFloorMinValue());
+		$px1->SetMinValue((int) $px1->GetFloorMinValue());
 		$px1->SetMaxValue($px1->GetCeilMaxValue());
 		$px1->SetWidth($WIDTH);
 		$px1->SetHeight($HEIGHT);
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 5f1a384d7a0..1362556387d 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -278,7 +278,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 			if ($dir === null) {
 				dol_syslog(get_class($this).'::'.__METHOD__."Target directory should not be null.". getCallerInfoString(), LOG_ERR);
-				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", "Null dir");
 				return 0;
 			}
 
diff --git a/htdocs/core/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php
index db65437e38e..fdac0976b70 100644
--- a/htdocs/core/modules/commande/modules_commande.php
+++ b/htdocs/core/modules/commande/modules_commande.php
@@ -85,14 +85,14 @@ abstract class ModelePDFCommandes extends CommonDocGenerator
 	/**
 	 * Local tax rates Array[tax_type][tax_rate]
 	 *
-	 * @var array<string,array<int,float>>
+	 * @var array<int,array<string,float>>
 	 */
 	public $localtax1;
 
 	/**
 	 * Local tax rates Array[tax_type][tax_rate]
 	 *
-	 * @var array<string,array<int,float>>
+	 * @var array<int,array<string,float>>
 	 */
 	public $localtax2;
 
diff --git a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
index 9371f68b116..5841616cda7 100644
--- a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2008      Chiptronik
  * Copyright (C) 2011-2021 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
- * Copyright (C) 2024	   MDW					 <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					 <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024      Frédéric France       <frederic.france@free.fr>
  * Copyright (C) 2024	   Nick Fragoulis
  *
@@ -72,8 +72,17 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	 */
 	public $version = 'dolibarr';
 
+	/**
+	 * @var float
+	 */
 	public $posxcomm;		// For customer comment column
+	/**
+	 * @var float
+	 */
 	public $posxweightvol;	// For weight or volume
+	/**
+	 * @var float
+	 */
 	public $posxremainingqty;
 
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index d4aca633a6e..d54d831adb1 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2013      Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2024	   MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024      Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2024	   Nick Fragoulis
  *
@@ -65,8 +65,17 @@ class pdf_merou extends ModelePdfExpedition
 	 */
 	public $type;
 
+	/**
+	 * @var Contact
+	 */
 	public $destinataire;
+	/**
+	 * @var ?Societe
+	 */
 	public $expediteur;
+	/**
+	 * @var User
+	 */
 	public $livreur;
 
 	/**
@@ -624,7 +633,7 @@ class pdf_merou extends ModelePdfExpedition
 						$label .= $object->tracking_url;
 					}
 					$pdf->SetFont('', 'B', $default_font_size - 3);
-					$pdf->writeHTMLCell(50, 8, '', '', $label, '', 'L');
+					$pdf->writeHTMLCell(50, 8, '', '', $label, 0, 1, false, true, 'L');
 				}
 			}
 		} else {
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
index 44d26eb9f0b..925ff9efce6 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2019       Markus Welters          <markus@welters.de>
  * Copyright (C) 2019       Rafael Ingenleuf        <ingenleuf@welters.de>
  * Copyright (C) 2020       Marc Guenneugues        <marc.guenneugues@simicar.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	    Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -77,19 +77,46 @@ class pdf_standard_expensereport extends ModeleExpenseReport
 	 */
 	public $version = 'dolibarr';
 
+	/**
+	 * @var float
+	 */
 	public $posxpiece;
+	/**
+	 * @var float
+	 */
 	public $posxcomment;
+	/**
+	 * @var float
+	 */
 	public $posxtva;
+	/**
+	 * @var float
+	 */
 	public $posxup;
+	/**
+	 * @var float
+	 */
 	public $posxqty;
+	/**
+	 * @var float
+	 */
 	public $posxtype;
 
 	/**
 	 * @var int posx date
 	 */
 	public $posxdate;
+	/**
+	 * @var float
+	 */
 	public $posxprojet;
+	/**
+	 * @var float
+	 */
 	public $postotalht;
+	/**
+	 * @var float
+	 */
 	public $postotalttc;
 
 
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 9b540229124..b751a886983 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2018-2024  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2022-2024	Anthony Berton				<anthony.berton@bb2a.fr>
  * Copyright (C) 2022		Charlene Benke				<charlene@patas-monkey.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	    Nick Fragoulis
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
@@ -800,7 +800,7 @@ class pdf_crabe extends ModelePDFFactures
 						if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'])) {
 							$this->tva_array[$vatrate . ($vatcode ? ' (' . $vatcode . ')' : '')]['tot_ht'] = 0;
 						}
-						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne, 'tot_ht'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'] + $object->lines[$i]->total_ht);
+						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate' => $vatrate, 'vatcode' => $vatcode, 'amount' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne, 'tot_ht' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'] + $object->lines[$i]->total_ht);
 					} else {
 						if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
 							$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
@@ -901,7 +901,7 @@ class pdf_crabe extends ModelePDFFactures
 						$pagecount = $pdf->setSourceFile($termsofsale);
 						for ($i = 1; $i <= $pagecount; $i++) {
 							$tplIdx = $pdf->importPage($i);
-							if ($tplIdx!==false) {
+							if ($tplIdx !== false) {
 								$s = $pdf->getTemplatesize($tplIdx);
 								$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 								$pdf->useTemplate($tplIdx);
@@ -1884,7 +1884,7 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
-				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, $this->corner_radius, '1001', 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
+				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, $this->corner_radius, '1001', 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -1903,10 +1903,10 @@ class pdf_crabe extends ModelePDFFactures
 
 		if (getDolGlobalString('MAIN_GENERATE_INVOICES_WITH_PICTURE')) {
 			$pdf->line($this->posxpicture - 1, $tab_top, $this->posxpicture - 1, $tab_top + $tab_height);
-			if (empty($hidetop)) {
-				//$pdf->SetXY($this->posxpicture-1, $tab_top+1);
-				//$pdf->MultiCell($this->posxtva-$this->posxpicture-1,2, $outputlangs->transnoentities("Photo"),'','C');
-			}
+			//if (empty($hidetop)) {
+			//$pdf->SetXY($this->posxpicture-1, $tab_top+1);
+			//$pdf->MultiCell($this->posxtva-$this->posxpicture-1,2, $outputlangs->transnoentities("Photo"),'','C');
+			//}
 		}
 
 		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') && !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
@@ -2338,7 +2338,7 @@ class pdf_crabe extends ModelePDFFactures
 					// Show shipping frame
 					$pdf->SetXY($posx + 2, $posy - 5);
 					$pdf->SetFont('', '', $default_font_size - 2);
-					$pdf->MultiCell($widthrecbox, '', $outputlangs->transnoentities('ShippingTo'), 0, 'L', 0);
+					$pdf->MultiCell($widthrecbox, 0, $outputlangs->transnoentities('ShippingTo'), 0, 'L', 0);
 					$pdf->RoundedRect($posx, $posy, $widthrecbox, $hautcadre, $this->corner_radius, '1234', 'D');
 
 					// Show shipping name
diff --git a/htdocs/core/modules/facture/doc/pdf_octopus.modules.php b/htdocs/core/modules/facture/doc/pdf_octopus.modules.php
index b3fa9ee860f..ae9408a933d 100644
--- a/htdocs/core/modules/facture/doc/pdf_octopus.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_octopus.modules.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2022       Anthony Berton          <anthony.berton@bb2a.fr>
  * Copyright (C) 2022-2024  Alexandre Spangaro      <alexandre@inovea-conseil.com>
  * Copyright (C) 2022-2024  Eric Seigne             <eric.seigne@cap-rel.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	    Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -336,6 +336,7 @@ class pdf_octopus extends ModelePDFFactures
 				}
 
 				$arephoto = false;
+				$realpath = false;
 				foreach ($pdir as $midir) {
 					if (!$arephoto) {
 						if ($conf->entity != $objphoto->entity) {
@@ -811,6 +812,7 @@ class pdf_octopus extends ModelePDFFactures
 							}
 						}
 
+						/** @phan-suppress-next-line PhanTypeMismatchProperty */
 						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
 							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $posy + 1, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 							// $pdf->Image does not increase value return by getY, so we save it manually
@@ -1046,7 +1048,7 @@ class pdf_octopus extends ModelePDFFactures
 						if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'])) {
 							$this->tva_array[$vatrate . ($vatcode ? ' (' . $vatcode . ')' : '')]['tot_ht'] = 0;
 						}
-						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne, 'tot_ht'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'] + $object->lines[$i]->total_ht);
+						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate' => $vatrate, 'vatcode' => $vatcode, 'amount' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne, 'tot_ht' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'] + $object->lines[$i]->total_ht);
 					} else {
 						if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
 							$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
@@ -2077,7 +2079,7 @@ class pdf_octopus extends ModelePDFFactures
 
 			// MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
 			if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
-				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, $this->corner_radius, '1001', 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
+				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, $this->corner_radius, '1001', 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 			$tab_top += 4;
 		}
@@ -2503,7 +2505,7 @@ class pdf_octopus extends ModelePDFFactures
 					// Show shipping frame
 					$pdf->SetXY($posx + 2, $posy - 5);
 					$pdf->SetFont('', '', $default_font_size - 2);
-					$pdf->MultiCell($widthrecbox, '', $outputlangs->transnoentities('ShippingTo'), 0, 'L', 0);
+					$pdf->MultiCell($widthrecbox, 0, $outputlangs->transnoentities('ShippingTo'), 0, 'L', 0);
 					$pdf->RoundedRect($posx, $posy, $widthrecbox, $hautcadre, $this->corner_radius, '1234', 'D');
 
 					// Show shipping name
@@ -2883,7 +2885,7 @@ class pdf_octopus extends ModelePDFFactures
 				//$pdf->Rect($this->posx_cumul_anterieur - 1, $tab_top, $width, 5, 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 				$pdf->RoundedRect($this->posx_cumul_anterieur - 1, $tab_top, $width, 5, $this->corner_radius, '1001', 'F', explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 				//$pdf->Rect($this->marge_gauche, $tab_top + 92.5, $this->page_largeur - $this->marge_gauche - $this->marge_droite, 5, 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
-				$pdf->RoundedRect($this->marge_gauche, $tab_top + 92.5, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, $this->corner_radius, '1001', 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
+				$pdf->RoundedRect($this->marge_gauche, $tab_top + 92.5, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, $this->corner_radius, '1001', 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 10bd4544923..0474bd6bf61 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2018-2024	Anthony Berton			<anthony.berton@bb2a.fr>
  * Copyright (C) 2022-2024  Alexandre Spangaro      <alexandre@inovea-conseil.com>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW                     <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Nick Fragoulis
  * Copyright (C) 2024       Franck Moreau
  *
@@ -262,6 +262,7 @@ class pdf_sponge extends ModelePDFFactures
 				}
 
 				$arephoto = false;
+				$realpath = false;
 				foreach ($pdir as $midir) {
 					if (!$arephoto) {
 						if ($conf->entity != $objphoto->entity) {
@@ -751,6 +752,7 @@ class pdf_sponge extends ModelePDFFactures
 						}
 
 						$pdf->setPageOrientation('', 0, $this->heightforfooter + $this->heightforfreetext); // The only function to edit the bottom margin of current page to set it.
+						// @phan-suppress-next-line PhanTypeMismatchProperty
 						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
 							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY + $imageTopMargin, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 							// $pdf->Image does not increase value return by getY, so we save it manually
@@ -941,7 +943,7 @@ class pdf_sponge extends ModelePDFFactures
 						if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'])) {
 							$this->tva_array[$vatrate . ($vatcode ? ' (' . $vatcode . ')' : '')]['tot_ht'] = 0;
 						}
-						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne, 'tot_ht'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'] + $object->lines[$i]->total_ht);
+						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate' => $vatrate, 'vatcode' => $vatcode, 'amount' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne, 'tot_ht' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'] + $object->lines[$i]->total_ht);
 					} else {
 						if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
 							$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
@@ -979,7 +981,7 @@ class pdf_sponge extends ModelePDFFactures
 
 				// Draw table frames and columns borders
 				$drawTabNumbPage = $pdf->getNumPages();
-				for ($i=$pageposbeforeprintlines; $i<=$drawTabNumbPage; $i++) {
+				for ($i = $pageposbeforeprintlines; $i <= $drawTabNumbPage; $i++) {
 					$pdf->setPage($i);
 					// reset page orientation each loop to override it if it was changed
 					$pdf->setPageOrientation('', 0, 0); // The only function to edit the bottom margin of current page to set it.
@@ -994,7 +996,7 @@ class pdf_sponge extends ModelePDFFactures
 						$drawTabTop = $this->tab_top;
 					} elseif (!$drawTabHideTop) {
 						if (getDolGlobalInt('MAIN_PDF_ENABLE_COL_HEAD_TITLE_REPEAT')) {
-							$drawTabTop-= $this->tabTitleHeight;
+							$drawTabTop -= $this->tabTitleHeight;
 						} else {
 							$drawTabHideTop = 1;
 						}
@@ -1003,7 +1005,7 @@ class pdf_sponge extends ModelePDFFactures
 					// last page need to include document footer
 					if ($i == $pdf->getNumPages()) {
 						// remove document footer height to tab bottom position
-						$drawTabBottom-= $this->heightforfreetext + $this->heightforinfotot + $this->getHeightForQRInvoice($pdf->getPage(), $object, $outputlangs);
+						$drawTabBottom -= $this->heightforfreetext + $this->heightforinfotot + $this->getHeightForQRInvoice($pdf->getPage(), $object, $outputlangs);
 					}
 
 					$drawTabHeight = $drawTabBottom - $drawTabTop;
@@ -1061,7 +1063,7 @@ class pdf_sponge extends ModelePDFFactures
 						$pagecount = $pdf->setSourceFile($termsofsale);
 						for ($i = 1; $i <= $pagecount; $i++) {
 							$tplIdx = $pdf->importPage($i);
-							if ($tplIdx!==false) {
+							if ($tplIdx !== false) {
 								$s = $pdf->getTemplatesize($tplIdx);
 								$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 								$pdf->useTemplate($tplIdx);
@@ -2190,7 +2192,7 @@ class pdf_sponge extends ModelePDFFactures
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
 			if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
-				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, $this->corner_radius, '1001', 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
+				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, $this->corner_radius, '1001', 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -2586,7 +2588,7 @@ class pdf_sponge extends ModelePDFFactures
 					// Show shipping frame
 					$pdf->SetXY($posx + 2, $posy - 5);
 					$pdf->SetFont('', '', $default_font_size - 2);
-					$pdf->MultiCell($widthrecbox, '', $outputlangs->transnoentities('ShippingTo'), 0, 'L', 0);
+					$pdf->MultiCell($widthrecbox, 0, $outputlangs->transnoentities('ShippingTo'), 0, 'L', 0);
 					$pdf->RoundedRect($posx, $posy, $widthrecbox, $hautcadre, $this->corner_radius, '1234', 'D');
 
 					// Show shipping name
diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php
index b81a17895d4..0f6ace0c642 100644
--- a/htdocs/core/modules/facture/modules_facture.php
+++ b/htdocs/core/modules/facture/modules_facture.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -42,21 +42,69 @@ use Sprain\SwissQrBill;
  */
 abstract class ModelePDFFactures extends CommonDocGenerator
 {
+	/**
+	 * @var float
+	 */
 	public $posxpicture;
+	/**
+	 * @var float
+	 */
 	public $posxtva;
+	/**
+	 * @var float
+	 */
 	public $posxup;
+	/**
+	 * @var float
+	 */
 	public $posxqty;
+	/**
+	 * @var float
+	 */
 	public $posxunit;
+	/**
+	 * @var float
+	 */
 	public $posxdesc;
+	/**
+	 * @var float
+	 */
 	public $posxdiscount;
+	/**
+	 * @var float
+	 */
 	public $postotalht;
 
+
+	/**
+	 * @var array<string,float>
+	 */
 	public $tva;
+	/**
+	 * @var array<string,array{amount:float}>
+	 */
 	public $tva_array;
+	/**
+	 * Local tax rates Array[tax_type][tax_rate]
+	 *
+	 * @var array<int,array<string,float>>
+	 */
 	public $localtax1;
+
+	/**
+	 * Local tax rates Array[tax_type][tax_rate]
+	 *
+	 * @var array<int,array<string,float>>
+	 */
 	public $localtax2;
 
+	/**
+	 * @var int<0,1>
+	 */
 	public $atleastonediscount = 0;
+	/**
+	 * @var int<0,1>
+	 */
 	public $atleastoneratenotnull = 0;
 
 
diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php
index f6eaa326c75..fe69438341b 100644
--- a/htdocs/core/modules/fichinter/mod_pacific.php
+++ b/htdocs/core/modules/fichinter/mod_pacific.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2013	   Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2024-2025  Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -140,13 +140,12 @@ class mod_pacific extends ModeleNumRefFicheinter
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql .= " AND entity = ".$conf->entity;
 
+		$max = 0;
 		$resql = $db->query($sql);
 		if ($resql) {
 			$obj = $db->fetch_object($resql);
 			if ($obj) {
 				$max = intval($obj->max);
-			} else {
-				$max = 0;
 			}
 		}
 
diff --git a/htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php b/htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php
index e0d8afd8668..8b2b2fb5c0b 100644
--- a/htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php
+++ b/htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2019       Markus Welters          <markus@welters.de>
  * Copyright (C) 2019       Rafael Ingenleuf        <ingenleuf@welters.de>
  * Copyright (C) 2020       Marc Guenneugues        <marc.guenneugues@simicar.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	    Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index e8eca88cf4f..6a47290e352 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -314,7 +314,7 @@ class mailing_contacts1 extends MailingTargets
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 			$formadmin = new FormAdmin($this->db);
 			$s .= img_picto($langs->trans("DefaultLang"), 'language', 'class="pictofixedwidth"');
-			$s .= $formadmin->select_language(GETPOST('filter_lang', 'aZ09'), 'filter_lang', 0, null, $langs->trans("DefaultLang"), 0, 0, '', 0, 0, 0, null, 1);
+			$s .= $formadmin->select_language(GETPOST('filter_lang', 'aZ09'), 'filter_lang', 0, array(), $langs->trans("DefaultLang"), 0, 0, '', 0, 0, 0, array(), 1);
 		}
 
 		return $s;
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 583d0aec206..4385c039596 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2018-2018 Andre Schild        <a.schild@aarboard.ch>
  * Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin       <regis.houssin@inodbox.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This file is an example to follow to add your own email selector inside
@@ -385,7 +385,7 @@ class mailing_thirdparties extends MailingTargets
 			$formadmin = new FormAdmin($this->db);
 			$s .= img_picto($langs->trans("DefaultLang"), 'language', 'class="pictofixedwidth"');
 			//$s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> ';
-			$s .= $formadmin->select_language(GETPOST('filter_lang_thirdparties', 'aZ09'), 'filter_lang_thirdparties', 0, null, $langs->trans("DefaultLang"), 0, 0, '', 0, 0, 0, null, 1);
+			$s .= $formadmin->select_language(GETPOST('filter_lang_thirdparties', 'aZ09'), 'filter_lang_thirdparties', 0, array(), $langs->trans("DefaultLang"), 0, 0, '', 0, 0, 0, array(), 1);
 		}
 
 		return $s;
diff --git a/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php b/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
index 7a0624cb99b..9f461561c32 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017 		Laurent Destailleur 		<eldy@stocks.sourceforge.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2024	    Nick Fragoulis
  *
@@ -45,16 +45,49 @@ class pdf_standard_movementstock extends ModelePDFMovement
 	 */
 	public $update_main_doc_field;
 
+	/**
+	 * @var int
+	 */
 	public $wref;
+	/**
+	 * @var float
+	 */
 	public $posxidref;
+	/**
+	 * @var float
+	 */
 	public $posxdatemouv;
+	/**
+	 * @var float
+	 */
 	public $posxdesc;
+	/**
+	 * @var float
+	 */
 	public $posxlabel;
+	/**
+	 * @var float
+	 */
 	public $posxtva;
+	/**
+	 * @var float
+	 */
 	public $posxqty;
+	/**
+	 * @var float
+	 */
 	public $posxup;
+	/**
+	 * @var float
+	 */
 	public $posxunit;
+	/**
+	 * @var float
+	 */
 	public $posxdiscount;
+	/**
+	 * @var float
+	 */
 	public $postotalht;
 
 
@@ -320,7 +353,7 @@ class pdf_standard_movementstock extends ModelePDFMovement
 
 
 		$resql = $this->db->query($sql);
-		$nbtotalofrecords = $this->db->num_rows($result);
+		$nbtotalofrecords = $this->db->num_rows($resql);
 
 		/*
 		 * END TODO
@@ -840,7 +873,7 @@ class pdf_standard_movementstock extends ModelePDFMovement
 		if (empty($hidetop)) {
 			//$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line takes a position y in 2nd parameter and 4th parameter
 			$pdf->SetXY($this->posxidref, $tab_top + 1);
-			$pdf->MultiCell($this->posxdatemouv - $this->posxdatemouv - 0.8, 3, $outputlangs->transnoentities("Ref"), '', 'L');
+			$pdf->MultiCell($this->posxdesc - $this->posxdatemouv - 0.8, 3, $outputlangs->transnoentities("Ref"), '', 'L');
 		}
 
 		//Date mouv
@@ -1036,6 +1069,7 @@ class pdf_standard_movementstock extends ModelePDFMovement
 			$obj = $this->db->fetch_object($resqlbis);
 			$lastmovementdate = $this->db->jdate($obj->datem);
 		} else {
+			$lastmovementdate = 0;
 			dol_print_error($this->db);
 		}
 
@@ -1088,39 +1122,39 @@ class pdf_standard_movementstock extends ModelePDFMovement
 		//	$top_shift = $pdf->getY() - $current_y;
 		//}
 
-		if ($showaddress) {
-			/*
-			// Sender properties
-			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
+		//if ($showaddress) {
+		/*
+		// Sender properties
+		$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
 
-			// Show sender
-			$posy=42;
-			$posx=$this->marge_gauche;
-			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) $posx=$this->page_largeur-$this->marge_droite-80;
-			$hautcadre=40;
+		// Show sender
+		$posy=42;
+		$posx=$this->marge_gauche;
+		if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) $posx=$this->page_largeur-$this->marge_droite-80;
+		$hautcadre=40;
 
-			// Show sender frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetFillColor(230,230,230);
-			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
-			$pdf->SetTextColor(0,0,60);
+		// Show sender frame
+		$pdf->SetTextColor(0,0,0);
+		$pdf->SetFont('','', $default_font_size - 2);
+		$pdf->SetXY($posx,$posy-5);
+		$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
+		$pdf->SetXY($posx,$posy);
+		$pdf->SetFillColor(230,230,230);
+		$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+		$pdf->SetTextColor(0,0,60);
 
-			// Show sender name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
-			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-			$posy=$pdf->getY();
+		// Show sender name
+		$pdf->SetXY($posx+2,$posy+3);
+		$pdf->SetFont('','B', $default_font_size);
+		$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+		$posy=$pdf->getY();
 
-			// Show sender information
-			$pdf->SetXY($posx+2,$posy);
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
-			*/
-		}
+		// Show sender information
+		$pdf->SetXY($posx+2,$posy);
+		$pdf->SetFont('','', $default_font_size - 1);
+		$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+		*/
+		//}
 
 		$pdf->SetTextColor(0, 0, 0);
 
diff --git a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
index 1625bbffca0..9fde1bfb432 100644
--- a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
+++ b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
@@ -5,8 +5,8 @@
  * Copyright (C) 2010-2014 Juanjo Menent         <jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2017      Ferran Marcet         <fmarcet@2byte.es>
- * Copyright (C) 2018-2025  Frédéric France       <frederic.france@free.fr>
- * Copyright (C) 2024      MDW                   <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2018-2025 Frédéric France       <frederic.france@free.fr>
+ * Copyright (C) 2024-2025 MDW					 <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024      Josep Lluís Amador    <joseplluis@lliuretic.cat>
  * Copyright (C) 2024	   Nick Fragoulis
  *
@@ -944,7 +944,7 @@ class pdf_vinci extends ModelePDFMo
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
 			if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
-				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, $this->corner_radius, '1001', 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
+				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, $this->corner_radius, '1001', 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 060168279ab..af35adb57d0 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * Copyright (C) 2014-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -216,7 +216,7 @@ class printing_printgcp extends PrintingDriver
 		$html .= '<td>'.$langs->trans('GCP_Type').'</td>';
 		$html .= '<td class="center">'.$langs->trans("Select").'</td>';
 		$html .= '</tr>'."\n";
-		$list = $this->getlistAvailablePrinters();
+		$list = $this->getlistAvailableGcpPrinters();
 		//$html.= '<td><pre>'.print_r($list,true).'</pre></td>';
 		foreach ($list['available'] as $printer_det) {
 			$html .= '<tr class="oddeven">';
@@ -245,9 +245,21 @@ class printing_printgcp extends PrintingDriver
 	/**
 	 *  Return list of available printers
 	 *
-	 *  @return array{available:array{name:string,displayname:string,id:string,ownerName:string,status:string,connectionStatus:string,type:string}}	list of printers
+	 *  @return array<array{name:string,displayName:string,id:string,ownerName:string,status:string,connectionStatus:string,type:string}>	list of printers
 	 */
 	public function getlistAvailablePrinters()
+	{
+		/* Compatible with paretn class signature */
+		return $this->getlistAvailableGcpPrinters()['available'];
+	}
+
+
+	/**
+	 *  Return list of available printers (internal format)
+	 *
+	 *  @return array{available:array<array{name:string,displayName:string,id:string,ownerName:string,status:string,connectionStatus:string,type:string}>}	list of printers
+	 */
+	public function getlistAvailableGcpPrinters()
 	{
 		global $conf;
 		$ret = array();
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 68f6a5a7e81..adba3813d90 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2017 	Laurent Destailleur		<eldy@products.sourceforge.net>
  * Copyright (C) 2023 	Anthony Berton			<anthony.berton@bb2a.fr>
- * Copyright (C) 2024	MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024   Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2024	Nick Fragoulis
  *
@@ -278,6 +278,7 @@ class pdf_standard extends ModelePDFProduct
 				}
 				// Define size of image if we need it
 				$imglinesize = array();
+				$nexyafterphoto = null;
 				if (!empty($realpath) && $arephoto) {
 					$imgsize = pdf_getSizeForImage($realpath);
 					$imgsizewidth = $imgsize['width'] + 20;
@@ -832,39 +833,39 @@ class pdf_standard extends ModelePDFProduct
 		// Show list of linked objects
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
 
-		if ($showaddress) {
-			/*
-			// Sender properties
-			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
+		//if ($showaddress) {
+		/*
+		// Sender properties
+		$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
 
-			// Show sender
-			$posy=42;
-			$posx=$this->marge_gauche;
-			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) $posx=$this->page_largeur-$this->marge_droite-80;
-			$hautcadre=40;
+		// Show sender
+		$posy=42;
+		$posx=$this->marge_gauche;
+		if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) $posx=$this->page_largeur-$this->marge_droite-80;
+		$hautcadre=40;
 
-			// Show sender frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetFillColor(230,230,230);
-			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
-			$pdf->SetTextColor(0,0,60);
+		// Show sender frame
+		$pdf->SetTextColor(0,0,0);
+		$pdf->SetFont('','', $default_font_size - 2);
+		$pdf->SetXY($posx,$posy-5);
+		$pdf->MultiCell(80, 5, $outputlangs->transnoentities("BillFrom"), 0, 'L');
+		$pdf->SetXY($posx,$posy);
+		$pdf->SetFillColor(230,230,230);
+		$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+		$pdf->SetTextColor(0,0,60);
 
-			// Show sender name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
-			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-			$posy=$pdf->getY();
+		// Show sender name
+		$pdf->SetXY($posx+2,$posy+3);
+		$pdf->SetFont('','B', $default_font_size);
+		$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+		$posy=$pdf->getY();
 
-			// Show sender information
-			$pdf->SetXY($posx+2,$posy);
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
-			*/
-		}
+		// Show sender information
+		$pdf->SetXY($posx+2,$posy);
+		$pdf->SetFont('','', $default_font_size - 1);
+		$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+		*/
+		//}
 
 		$pdf->SetTextColor(0, 0, 0);
 
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index a20c933500a..705f32894e5 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
  * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2023      	Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -647,7 +647,7 @@ class doc_generic_task_odt extends ModelePDFTask
 								$soc->fetch($contact['socid']);
 								$contact['socname'] = $soc->name;
 							}
-							$contact['fullname'] = $objectdetail->getFullName($outputlangs, 1);
+							$contact['fullname'] = is_object($objectdetail) ? $objectdetail->getFullName($outputlangs, 1) : null;
 
 							$tmparray = $this->get_substitutionarray_tasksressource($contact, $outputlangs);
 
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 0397dd86f0f..03d5134db0e 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2018-2025  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2019       Pierre Ardoin				<mapiolca@me.com>
  * Copyright (C) 2021-2024	Anthony Berton				<anthony.berton@bb2a.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	    Nick Fragoulis
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
@@ -775,7 +775,7 @@ class pdf_azur extends ModelePDFPropales
 						$pagecount = $pdf->setSourceFile($termsofsale);
 						for ($i = 1; $i <= $pagecount; $i++) {
 							$tplIdx = $pdf->importPage($i);
-							if ($tplIdx!==false) {
+							if ($tplIdx !== false) {
 								$s = $pdf->getTemplatesize($tplIdx);
 								$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 								$pdf->useTemplate($tplIdx);
@@ -816,6 +816,7 @@ class pdf_azur extends ModelePDFPropales
 							// If PDF is selected and file is not empty
 							if (count($filetomerge->lines) > 0) {
 								foreach ($filetomerge->lines as $linefile) {
+									$filetomerge_dir = null;
 									if (!empty($linefile->id) && !empty($linefile->file_name)) {
 										if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {
 											if (isModEnabled("product")) {
@@ -831,7 +832,11 @@ class pdf_azur extends ModelePDFPropales
 											}
 										}
 
-										dol_syslog(get_class($this).':: upload_dir='.$filetomerge_dir, LOG_DEBUG);
+										dol_syslog(get_class($this).':: upload_dir='.$filetomerge_dir, $filetomerge_dir === null ? LOG_ERR : LOG_DEBUG);
+										if ($filetomerge_dir === null) {
+											// Skip loop
+											continue;
+										}
 
 										$infile = $filetomerge_dir.'/'.$linefile->file_name;
 										if (file_exists($infile) && is_readable($infile)) {
@@ -1447,7 +1452,7 @@ class pdf_azur extends ModelePDFPropales
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
 			if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
-				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, $this->corner_radius, '1001', 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
+				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, $this->corner_radius, '1001', 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -1466,10 +1471,10 @@ class pdf_azur extends ModelePDFPropales
 
 		if (getDolGlobalString('MAIN_GENERATE_PROPOSALS_WITH_PICTURE')) {
 			$pdf->line($this->posxpicture - 1, $tab_top, $this->posxpicture - 1, $tab_top + $tab_height);
-			if (empty($hidetop)) {
-				//$pdf->SetXY($this->posxpicture-1, $tab_top+1);
-				//$pdf->MultiCell($this->posxtva-$this->posxpicture-1,2, $outputlangs->transnoentities("Photo"),'','C');
-			}
+			//if (empty($hidetop)) {
+			//$pdf->SetXY($this->posxpicture-1, $tab_top+1);
+			//$pdf->MultiCell($this->posxtva-$this->posxpicture-1,2, $outputlangs->transnoentities("Photo"),'','C');
+			//}
 		}
 
 		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') && !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 6121fc0bff5..4170db78e4b 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2017		Ferran Marcet				<fmarcet@2byte.es>
  * Copyright (C) 2021-2024	Anthony Berton				<anthony.berton@bb2a.fr>
  * Copyright (C) 2018-2025  Frédéric France				<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Nick Fragoulis
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
@@ -359,7 +359,7 @@ class pdf_cyan extends ModelePDFPropales
 				$tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
 				if (!$hidetop && getDolGlobalInt('MAIN_PDF_ENABLE_COL_HEAD_TITLE_REPEAT')) {
 					// TODO : make this hidden conf the default behavior for each PDF when each PDF managed this new Display
-					$tab_top_newpage+= $this->tabTitleHeight;
+					$tab_top_newpage += $this->tabTitleHeight;
 				}
 
 				$nexY = $tab_top;
@@ -611,6 +611,7 @@ class pdf_cyan extends ModelePDFPropales
 						}
 
 						$pdf->setPageOrientation('', 0, $heightforfooter + $heightforfreetext); // The only function to edit the bottom margin of current page to set it.
+						// @phan-suppress-next-line PhanTypeMismatchProperty
 						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
 							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY + $imageTopMargin, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 							// $pdf->Image does not increase value return by getY, so we save it manually
@@ -804,7 +805,7 @@ class pdf_cyan extends ModelePDFPropales
 
 				// Add last page for document footer if there are not enough size left
 				$afterPosData = $this->getMaxAfterColsLinePositionsData();
-				if ($afterPosData['y'] > $this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot) ) {
+				if ($afterPosData['y'] > $this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot)) {
 					$pdf->AddPage();
 					if (!empty($tplidx)) {
 						$pdf->useTemplate($tplidx);
@@ -815,7 +816,7 @@ class pdf_cyan extends ModelePDFPropales
 
 				// Draw table frames and columns borders
 				$drawTabNumbPage = $pdf->getNumPages();
-				for ($i=$pageposbeforeprintlines; $i<=$drawTabNumbPage; $i++) {
+				for ($i = $pageposbeforeprintlines; $i <= $drawTabNumbPage; $i++) {
 					$pdf->setPage($i);
 					// reset page orientation each loop to override it if it was changed
 					$pdf->setPageOrientation('', 0, 0); // The only function to edit the bottom margin of current page to set it.
@@ -830,7 +831,7 @@ class pdf_cyan extends ModelePDFPropales
 						$drawTabTop = $tab_top;
 					} elseif (!$drawTabHideTop) {
 						if (getDolGlobalInt('MAIN_PDF_ENABLE_COL_HEAD_TITLE_REPEAT')) {
-							$drawTabTop-= $this->tabTitleHeight;
+							$drawTabTop -= $this->tabTitleHeight;
 						} else {
 							$drawTabHideTop = 1;
 						}
@@ -839,7 +840,7 @@ class pdf_cyan extends ModelePDFPropales
 					// last page need to include document footer
 					if ($i == $pdf->getNumPages()) {
 						// remove document footer height to tab bottom position
-						$drawTabBottom-= $heightforsignature + $heightforfreetext + $heightforinfotot;
+						$drawTabBottom -= $heightforsignature + $heightforfreetext + $heightforinfotot;
 					}
 
 					$drawTabHeight = $drawTabBottom - $drawTabTop;
@@ -895,7 +896,7 @@ class pdf_cyan extends ModelePDFPropales
 						$pagecount = $pdf->setSourceFile($termsofsale);
 						for ($i = 1; $i <= $pagecount; $i++) {
 							$tplIdx = $pdf->importPage($i);
-							if ($tplIdx!==false) {
+							if ($tplIdx !== false) {
 								$s = $pdf->getTemplatesize($tplIdx);
 								$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 								$pdf->useTemplate($tplIdx);
@@ -937,6 +938,7 @@ class pdf_cyan extends ModelePDFPropales
 							if (count($filetomerge->lines) > 0) {
 								foreach ($filetomerge->lines as $linefile) {
 									if (!empty($linefile->id) && !empty($linefile->file_name)) {
+										$filetomerge_dir = null;
 										if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {
 											if (isModEnabled("product")) {
 												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir($product->id, 2, 0, 0, $product, 'product').$product->id."/photos";
@@ -951,7 +953,11 @@ class pdf_cyan extends ModelePDFPropales
 											}
 										}
 
-										dol_syslog(get_class($this).':: upload_dir='.$filetomerge_dir, LOG_DEBUG);
+										dol_syslog(get_class($this).':: upload_dir='.$filetomerge_dir, $filetomerge_dir === null ? LOG_ERR : LOG_DEBUG);
+										if ($filetomerge_dir === null) {
+											// Skip loop
+											continue;
+										}
 
 										$infile = $filetomerge_dir.'/'.$linefile->file_name;
 										if (file_exists($infile) && is_readable($infile)) {
@@ -1259,11 +1265,11 @@ class pdf_cyan extends ModelePDFPropales
 
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
-		$pdf->SetXY($col1x, $tab2_top+ $tab2_hl * $index);
+		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
 
 		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
-		$pdf->SetXY($col2x, $tab2_top+ $tab2_hl * $index);
+		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
@@ -1377,12 +1383,12 @@ class pdf_cyan extends ModelePDFPropales
 
 					foreach ($localtax_rate as $tvakey => $tvaval) {
 						if ($tvakey != 0) {    // On affiche pas taux 0
-								//$this->atleastoneratenotnull++;
+							//$this->atleastoneratenotnull++;
 
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+							$index++;
+							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
-								$tvacompl = '';
+							$tvacompl = '';
 							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
@@ -1412,12 +1418,12 @@ class pdf_cyan extends ModelePDFPropales
 					foreach ($localtax_rate as $tvakey => $tvaval) {
 						// retrieve global local tax
 						if ($tvakey != 0) {    // On affiche pas taux 0
-								//$this->atleastoneratenotnull++;
+							//$this->atleastoneratenotnull++;
 
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+							$index++;
+							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
-								$tvacompl = '';
+							$tvacompl = '';
 							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
@@ -1555,7 +1561,7 @@ class pdf_cyan extends ModelePDFPropales
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
 			if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
-				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, $this->corner_radius, '1001', 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
+				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, $this->corner_radius, '1001', 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php
index f21eb694c9e..b4643a0ab69 100644
--- a/htdocs/core/modules/propale/modules_propale.php
+++ b/htdocs/core/modules/propale/modules_propale.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2012      Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -38,21 +38,68 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Requis
  */
 abstract class ModelePDFPropales extends CommonDocGenerator
 {
+	/**
+	 * @var float
+	 */
 	public $posxpicture;
+	/**
+	 * @var float
+	 */
 	public $posxtva;
+	/**
+	 * @var float
+	 */
 	public $posxup;
+	/**
+	 * @var float
+	 */
 	public $posxqty;
+	/**
+	 * @var float
+	 */
 	public $posxunit;
+	/**
+	 * @var float
+	 */
 	public $posxdesc;
+	/**
+	 * @var float
+	 */
 	public $posxdiscount;
+	/**
+	 * @var float
+	 */
 	public $postotalht;
 
+	/**
+	 * @var array<string,float>
+	 */
 	public $tva;
+	/**
+	 * @var array<string,array{amount:float}>
+	 */
 	public $tva_array;
+	/**
+	 * Local tax rates Array[tax_type][tax_rate]
+	 *
+	 * @var array<int,array<string,float>>
+	 */
 	public $localtax1;
+
+	/**
+	 * Local tax rates Array[tax_type][tax_rate]
+	 *
+	 * @var array<int,array<string,float>>
+	 */
 	public $localtax2;
 
+	/**
+	 * @var int<0,1>
+	 */
 	public $atleastonediscount = 0;
+	/**
+	 * @var int<0,1>
+	 */
 	public $atleastoneratenotnull = 0;
 
 
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 3062ff64178..35d4e0fe107 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2018	    Quentin Vial-Gouteyron   <quentin.vial-gouteyron@atm-consulting.fr>
  * Copyright (C) 2023-2024  Frédéric France          <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						 <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						 <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	    Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1029,7 +1029,7 @@ class pdf_squille extends ModelePdfReception
 			if (empty($arrayidcontact)) {
 				$arrayidcontact = $object->origin_object->getIdContact('internal', 'SHIPPING');
 			}
-			if (count($arrayidcontact) > 0) {
+			if (is_array($arrayidcontact) && count($arrayidcontact) > 0) {
 				$object->fetch_user(reset($arrayidcontact));
 				$labelbeforecontactname = ($outputlangs->transnoentities("FromContactName") != 'FromContactName' ? $outputlangs->transnoentities("FromContactName") : $outputlangs->transnoentities("Name"));
 				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$labelbeforecontactname.": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs));

From f17ad3933bb6430b6f41ad96b42f453585016867 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 19:55:12 +0100
Subject: [PATCH 153/602] Update baseline

---
 dev/tools/phan/baseline.txt | 80 +++++++++++++------------------------
 1 file changed, 27 insertions(+), 53 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 598f3de73fe..5da7be21753 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -12,41 +12,40 @@ return [
     // PhanUndeclaredProperty : 560+ occurrences
     // PhanPossiblyUndeclaredGlobalVariable : 310+ occurrences
     // PhanUndeclaredGlobalVariable : 280+ occurrences
-    // PhanTypeMismatchArgumentProbablyReal : 230+ occurrences
+    // PhanTypeMismatchArgumentProbablyReal : 200+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 180+ occurrences
     // PhanTypeMismatchProperty : 130+ occurrences
     // PhanPluginUnknownArrayMethodParamType : 120+ occurrences
-    // PhanPluginUnknownPropertyType : 110+ occurrences
-    // PhanPossiblyUndeclaredVariable : 65+ occurrences
+    // PhanPluginUnknownPropertyType : 45+ occurrences
+    // PhanPossiblyUndeclaredVariable : 45+ occurrences
     // PhanRedefineFunction : 45+ occurrences
     // PhanTypeExpectedObjectPropAccess : 45+ occurrences
-    // PhanTypeMismatchArgumentNullableInternal : 40+ occurrences
-    // PhanTypeInvalidDimOffset : 30+ occurrences
-    // PhanTypeMismatchDimFetch : 30+ occurrences
-    // PhanPluginEmptyStatementIf : 15+ occurrences
+    // PhanTypeMismatchArgumentNullableInternal : 30+ occurrences
+    // PhanTypeInvalidDimOffset : 25+ occurrences
+    // PhanTypeMismatchDimFetch : 20+ occurrences
+    // PhanUndeclaredConstant : 15+ occurrences
+    // PhanPluginEmptyStatementIf : 10+ occurrences
     // PhanTypeComparisonFromArray : 10+ occurrences
-    // PhanTypeMismatchDimFetchNullable : 10+ occurrences
     // PhanUndeclaredMethod : 10+ occurrences
     // PhanEmptyForeach : 8 occurrences
     // PhanPluginUnknownObjectMethodCall : 8 occurrences
     // PhanPluginBothLiteralsBinaryOp : 7 occurrences
-    // PhanPluginDuplicateExpressionBinaryOp : 7 occurrences
     // PhanPluginSuspiciousParamPosition : 7 occurrences
+    // PhanPluginDuplicateExpressionBinaryOp : 6 occurrences
     // PhanTypeArraySuspiciousNull : 6 occurrences
     // PhanParamTooMany : 5 occurrences
-    // PhanPossiblyNullTypeMismatchProperty : 4 occurrences
+    // PhanPluginDuplicateArrayKey : 4 occurrences
     // PhanEmptyFQSENInClasslike : 3 occurrences
     // PhanInvalidFQSENInClasslike : 3 occurrences
-    // PhanTypeMismatchReturn : 3 occurrences
+    // PhanPossiblyNullTypeMismatchProperty : 3 occurrences
     // PhanTypeMismatchDimAssignment : 2 occurrences
+    // PhanTypeMismatchDimFetchNullable : 2 occurrences
+    // PhanTypeMismatchReturn : 2 occurrences
     // PhanTypeSuspiciousStringExpression : 2 occurrences
-    // PhanUndeclaredTypeParameter : 2 occurrences
     // PhanAccessMethodProtected : 1 occurrence
     // PhanPluginDuplicateExpressionAssignmentOperation : 1 occurrence
     // PhanPluginUnknownArrayPropertyType : 1 occurrence
-    // PhanTypeConversionFromArray : 1 occurrence
     // PhanTypeExpectedObjectPropAccessButGotNull : 1 occurrence
-    // PhanTypeMismatchArgumentInternalProbablyReal : 1 occurrence
 
     // Currently, file_suppressions and directory_suppressions are the only supported suppressions
     'file_suppressions' => [
@@ -122,7 +121,7 @@ return [
         'htdocs/compta/paiement/card.php' => ['PhanUndeclaredProperty'],
         'htdocs/compta/paiement/cheque/list.php' => ['PhanTypeMismatchProperty', 'PhanUndeclaredGlobalVariable'],
         'htdocs/compta/paiement/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/compta/sociales/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal', 'PhanUndeclaredProperty'],
+        'htdocs/compta/sociales/card.php' => ['PhanUndeclaredProperty'],
         'htdocs/compta/tva/class/paymentvat.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/compta/tva/clients.php' => ['PhanTypeArraySuspiciousNull', 'PhanTypeInvalidDimOffset', 'PhanTypeMismatchProperty'],
         'htdocs/compta/tva/payments.php' => ['PhanTypeMismatchArgumentNullableInternal'],
@@ -143,76 +142,51 @@ return [
         'htdocs/core/class/commonsocialnetworks.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/class/conf.class.php' => ['PhanPluginUnknownPropertyType', 'PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentNullableInternal', 'PhanTypeMismatchProperty'],
         'htdocs/core/class/ctyperesource.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/class/cunits.class.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/core/class/doleditor.class.php' => ['PhanPluginDuplicateExpressionAssignmentOperation'],
         'htdocs/core/class/dolgraph.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/class/emailsenderprofile.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/class/hookmanager.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/class/html.form.class.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/core/class/html.formcompany.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/class/html.formfile.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/class/html.formmail.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/class/ldap.class.php' => ['PhanTypeMismatchArgumentInternalProbablyReal'],
         'htdocs/core/class/notify.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/class/smtps.class.php' => ['PhanTypeConversionFromArray'],
         'htdocs/core/class/timespent.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
-        'htdocs/core/customreports.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchDimFetchNullable'],
-        'htdocs/core/datepicker.php' => ['PhanTypeInvalidDimOffset'],
-        'htdocs/core/db/sqlite3.class.php' => ['PhanTypeMismatchReturn'],
-        'htdocs/core/extrafieldsinimport.inc.php' => ['PhanTypeMismatchArgumentNullableInternal'],
         'htdocs/core/lib/admin.lib.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/lib/company.lib.php' => ['PhanTypeInvalidDimOffset'],
-        'htdocs/core/lib/customreports.lib.php' => ['PhanTypeMismatchDimFetch', 'PhanUndeclaredProperty'],
+        'htdocs/core/lib/customreports.lib.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/lib/files.lib.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/lib/functions2.lib.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/lib/images.lib.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentNullableInternal'],
         'htdocs/core/lib/pdf.lib.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/lib/project.lib.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/lib/xcal.lib.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/core/modules/asset/mod_asset_advanced.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/barcode/doc/phpbarcode.modules.php' => ['PhanPossiblyNullTypeMismatchProperty', 'PhanPossiblyUndeclaredVariable'],
-        'htdocs/core/modules/barcode/mod_barcode_product_standard.php' => ['PhanPluginUnknownPropertyType'],
         'htdocs/core/modules/bom/mod_bom_advanced.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/commande/doc/pdf_einstein.modules.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentNullableInternal', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/commande/modules_commande.php' => ['PhanPluginUnknownPropertyType'],
-        'htdocs/core/modules/contract/doc/pdf_strato.modules.php' => ['PhanTypeMismatchArgumentNullableInternal'],
-        'htdocs/core/modules/delivery/doc/pdf_storm.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/core/modules/delivery/doc/pdf_typhon.modules.php' => ['PhanPluginUnknownPropertyType'],
+        'htdocs/core/modules/commande/doc/pdf_einstein.modules.php' => ['PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php' => ['PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/delivery/mod_delivery_saphir.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/expedition/doc/pdf_merou.modules.php' => ['PhanPluginUnknownPropertyType', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php' => ['PhanPluginUnknownPropertyType', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/facture/doc/pdf_crabe.modules.php' => ['PhanPluginEmptyStatementIf', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/facture/doc/pdf_octopus.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/facture/doc/pdf_sponge.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/facture/modules_facture.php' => ['PhanPluginUnknownPropertyType'],
-        'htdocs/core/modules/fichinter/mod_pacific.php' => ['PhanPossiblyUndeclaredVariable'],
+        'htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/modules/facture/doc/pdf_crabe.modules.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/modules/facture/doc/pdf_octopus.modules.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/modules/facture/doc/pdf_sponge.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/hrm/mod_evaluation_advanced.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/import/import_csv.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchProperty'],
         'htdocs/core/modules/import/import_xlsx.modules.php' => ['PhanTypeMismatchProperty'],
-        'htdocs/core/modules/mailings/contacts1.modules.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/core/modules/mailings/thirdparties.modules.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanPluginEmptyStatementIf', 'PhanPluginUnknownPropertyType', 'PhanPossiblyUndeclaredVariable'],
-        'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/mrp/mod_mo_advanced.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/oauth/github_oauthcallback.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/core/modules/printing/printgcp.modules.php' => ['PhanTypeMismatchDimFetch'],
-        'htdocs/core/modules/product/doc/pdf_standard.modules.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredVariable'],
         'htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/project/doc/pdf_timespent.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/propale/doc/pdf_azur.modules.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/propale/doc/pdf_cyan.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/propale/modules_propale.php' => ['PhanPluginUnknownPropertyType'],
-        'htdocs/core/modules/reception/doc/pdf_squille.modules.php' => ['PhanTypeMismatchArgumentNullableInternal', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/propale/doc/pdf_azur.modules.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/modules/propale/doc/pdf_cyan.modules.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/modules/reception/doc/pdf_squille.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/societe/mod_codecompta_aquarium.php' => ['PhanPluginUnknownPropertyType'],
         'htdocs/core/modules/societe/mod_codecompta_digitaria.php' => ['PhanPluginUnknownPropertyType', 'PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentNullableInternal'],
         'htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php' => ['PhanPluginUnknownPropertyType', 'PhanPossiblyUndeclaredVariable'],
         'htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanPluginDuplicateArrayKey'],
         'htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php' => ['PhanPossiblyUndeclaredVariable'],
         'htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
         'htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php' => ['PhanPossiblyUndeclaredVariable'],
@@ -272,7 +246,6 @@ return [
         'htdocs/ecm/dir_card.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/ecm/index.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/emailcollector/class/emailcollector.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/emailcollector/lib/emailcollector.lib.php' => ['PhanUndeclaredTypeParameter'],
         'htdocs/eventorganization/class/conferenceorboothattendee.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
         'htdocs/eventorganization/conferenceorbooth_card.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/eventorganization/conferenceorbooth_list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
@@ -580,6 +553,7 @@ return [
         'htdocs/workstation/workstation_list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/zapier/class/api_zapier.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/zapier/class/hook.class.php' => ['PhanUndeclaredProperty'],
+        'internal' => ['PhanUndeclaredConstant'],
     ],
     // 'directory_suppressions' => ['src/directory_name' => ['PhanIssueName1', 'PhanIssueName2']] can be manually added if needed.
     // (directory_suppressions will currently be ignored by subsequent calls to --save-baseline, but may be preserved in future Phan releases)

From b1c88fd248699ddea8a4b9515d968bf5a0897450 Mon Sep 17 00:00:00 2001
From: Jyhere <jyhere@gmail.com>
Date: Fri, 24 Jan 2025 11:52:29 +0100
Subject: [PATCH 154/602] FIX: when vat setting in on payment date and
 FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is set, vat lines are incompletes

---
 htdocs/core/lib/tax.lib.php | 42 +++----------------------------------
 1 file changed, 3 insertions(+), 39 deletions(-)

diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index ed5586ff29d..0050910fced 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -438,19 +438,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-		if ($direction == 'buy') {
-			if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
-				$sql .= " AND f.type IN (0,1,2,5)";
-			} else {
-				$sql .= " AND f.type IN (0,1,2,3,5)";
-			}
-		} else {
-			if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
-				$sql .= " AND f.type IN (0,1,2,5)";
-			} else {
-				$sql .= " AND f.type IN (0,1,2,3,5)";
-			}
-		}
+		$sql .= " AND f.type IN (0,1,2,3,5)";
 		$sql .= " AND f.rowid = d.".$fk_facture;
 		$sql .= " AND s.rowid = f.fk_soc";
 		$sql .= " AND pf.".$fk_facture2." = f.rowid";
@@ -825,19 +813,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-		if ($direction == 'buy') {
-			if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
-				$sql .= " AND f.type IN (0,1,2,5)";
-			} else {
-				$sql .= " AND f.type IN (0,1,2,3,5)";
-			}
-		} else {
-			if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
-				$sql .= " AND f.type IN (0,1,2,5)";
-			} else {
-				$sql .= " AND f.type IN (0,1,2,3,5)";
-			}
-		}
+		$sql .= " AND f.type IN (0,1,2,3,5)";
 		if ($y && $m) {
 			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
 			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
@@ -1026,19 +1002,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-		if ($direction == 'buy') {
-			if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
-				$sql .= " AND f.type IN (0,1,2,5)";
-			} else {
-				$sql .= " AND f.type IN (0,1,2,3,5)";
-			}
-		} else {
-			if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
-				$sql .= " AND f.type IN (0,1,2,5)";
-			} else {
-				$sql .= " AND f.type IN (0,1,2,3,5)";
-			}
-		}
+		$sql .= " AND f.type IN (0,1,2,3,5)";
 		if ($y && $m) {
 			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
 			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";

From 75db8061027376a07093d3dac991406d00a91d8d Mon Sep 17 00:00:00 2001
From: ATM-Lucas <lucas.mantegari@atm-consulting.fr>
Date: Fri, 24 Jan 2025 12:23:08 +0100
Subject: [PATCH 155/602] Adding sending mails on product

---
 htdocs/core/tpl/card_presend.tpl.php |  5 +++++
 htdocs/product/card.php              | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index d29932c2c20..9a5a12be721 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -115,6 +115,11 @@ if ($action == 'presend') {
 	}
 	if ($forcebuilddoc) {    // If there is no default value for supplier invoice, we do not generate file, even if modelpdf was set by a manual generation
 		if ((!$file || !is_readable($file)) && method_exists($object, 'generateDocument')) {
+
+			$hidedetails = $hidedetails?$hidedetails:'';
+			$hidedesc = $hidedetails?$hidedetails:'';
+			$hideref = $hidedetails?$hidedetails:'';
+
 			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($result < 0) {
 				dol_print_error($db, $object->error, $object->errors);
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 5de9cda0342..bcbe53236c5 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1295,6 +1295,14 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans("WarningSelectOneDocument"), null, 'warnings');
 		}
 	}
+
+	// Actions to send emails
+	$triggersendname = 'PRODUCT_SENTBYMAIL';
+	$paramname = 'id';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_PRODUCT_TO';
+	$trackid = 'prod'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+
 }
 
 
@@ -3027,6 +3035,9 @@ if ($action != 'create' && $action != 'edit') {
 				print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$object->id, '', $usercancreate);
 			}
 
+			//Send
+			print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init&token=' . newToken() . '#formmailbeforetitle');
+
 			if (!isset($hookmanager->resArray['no_button_copy']) || $hookmanager->resArray['no_button_copy'] != 1) {
 				if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)) {
 					$cloneProductUrl = '';
@@ -3198,6 +3209,15 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete') {
 	$somethingshown = $formactions->showactions($object, 'product', 0, 1, '', $MAXEVENT, '', $morehtmlcenter); // Show all action for product
 
 	print '</div></div>';
+
+	// Presend form
+	$modelmail = 'product_send'; // Modèle d'e-mail pour les produits
+	$defaulttopic = $object->label; // Sujet par défaut
+	$diroutput = $conf->product->multidir_output[$object->entity]; // Répertoire de sortie
+	$trackid = 'prod' . $object->id; // ID de suivi
+
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+
 }
 
 // End of page

From ba6f80c307be59843ee1354d16fe12ca4685e592 Mon Sep 17 00:00:00 2001
From: ATM-Lucas <lucas.mantegari@atm-consulting.fr>
Date: Fri, 24 Jan 2025 12:24:43 +0100
Subject: [PATCH 156/602] comm

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index bcbe53236c5..1efadc81fbf 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -3211,10 +3211,10 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete') {
 	print '</div></div>';
 
 	// Presend form
-	$modelmail = 'product_send'; // Modèle d'e-mail pour les produits
-	$defaulttopic = $object->label; // Sujet par défaut
-	$diroutput = $conf->product->multidir_output[$object->entity]; // Répertoire de sortie
-	$trackid = 'prod' . $object->id; // ID de suivi
+	$modelmail = 'product_send';
+	$defaulttopic = $object->label;
+	$diroutput = $conf->product->multidir_output[$object->entity];
+	$trackid = 'prod' . $object->id;
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 

From 81b0ff4ebf7c510fc9d81d24790c035da4a11a1f Mon Sep 17 00:00:00 2001
From: Dolibot <dolibarr-bot@users.noreply.github.com>
Date: Fri, 24 Jan 2025 12:06:49 +0000
Subject: [PATCH 157/602] PHPStan > Update baseline

---
 dev/build/phpstan/phpstan-baseline.neon | 234 ------------------------
 1 file changed, 234 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index ff60a067420..51aaca26db7 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -10734,36 +10734,12 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/customreports.php
 
-		-
-			message: '#^Variable \$gval might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/customreports.php
-
 		-
 			message: '#^Variable \$page might not be defined\.$#'
 			identifier: variable.undefined
 			count: 1
 			path: ../../../htdocs/core/customreports.php
 
-		-
-			message: '#^Variable \$search_graph might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: ../../../htdocs/core/customreports.php
-
-		-
-			message: '#^Variable \$search_groupby might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/core/customreports.php
-
-		-
-			message: '#^Variable \$search_xaxis might not be defined\.$#'
-			identifier: variable.undefined
-			count: 5
-			path: ../../../htdocs/core/customreports.php
-
 		-
 			message: '#^Variable \$search_yaxis might not be defined\.$#'
 			identifier: variable.undefined
@@ -10782,12 +10758,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/customreports.php
 
-		-
-			message: '#^Variable \$tabfamily might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: ../../../htdocs/core/customreports.php
-
 		-
 			message: '#^Constructor of class DoliDBMysqli has an unused parameter \$type\.$#'
 			identifier: constructor.unusedParameter
@@ -10866,12 +10836,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/db/sqlite3.class.php
 
-		-
-			message: '#^Method DoliDBSqlite3\:\:getListOfCollation\(\) should return array\<int, array\{collation\: string\}\>\|null but returns array\{array\{charset\: ''UTF\-8'', description\: ''UTF\-8''\}\}\.$#'
-			identifier: return.type
-			count: 1
-			path: ../../../htdocs/core/db/sqlite3.class.php
-
 		-
 			message: '#^Cannot access property \$db on mixed\.$#'
 			identifier: property.nonObject
@@ -11424,12 +11388,6 @@ parameters:
 			count: 3
 			path: ../../../htdocs/core/lib/images.lib.php
 
-		-
-			message: '#^Variable \$extImg might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/lib/images.lib.php
-
 		-
 			message: '#^Loose comparison using \=\= between ''suppliers'' and ''fourn'' will always evaluate to false\.$#'
 			identifier: equal.alwaysFalse
@@ -12150,12 +12108,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
 
-		-
-			message: '#^Variable \$carac_client_name might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
-
 		-
 			message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -12198,12 +12150,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
 
-		-
-			message: '#^Variable \$result might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/barcode/doc/phpbarcode.modules.php
-
 		-
 			message: '#^Property modTcpdfbarcode\:\:\$is2d has no type specified\.$#'
 			identifier: missingType.property
@@ -12216,18 +12162,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/barcode/mod_barcode_product_standard.php
 
-		-
-			message: '#^Property mod_barcode_product_standard\:\:\$numbitcounter has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/barcode/mod_barcode_product_standard.php
-
-		-
-			message: '#^Property mod_barcode_product_standard\:\:\$searchcode has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/barcode/mod_barcode_product_standard.php
-
 		-
 			message: '#^Parameter \#2 \$type of method mod_barcode_thirdparty_standard\:\:literalBarcodeType\(\) expects int, string given\.$#'
 			identifier: argument.type
@@ -12336,12 +12270,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
 
-		-
-			message: '#^Left side of && is always true\.$#'
-			identifier: booleanAnd.leftAlwaysTrue
-			count: 1
-			path: ../../../htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
-
 		-
 			message: '#^Property Commande\:\:\$availability \(string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -12450,18 +12378,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
 
-		-
-			message: '#^Variable \$carac_client_name might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
-
-		-
-			message: '#^Variable \$realpath might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
-
 		-
 			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Contrat given\.$#'
 			identifier: argument.type
@@ -12498,12 +12414,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php
 
-		-
-			message: '#^Left side of && is always true\.$#'
-			identifier: booleanAnd.leftAlwaysTrue
-			count: 1
-			path: ../../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php
-
 		-
 			message: '#^Parameter \#3 \$posy of method pdf_storm\:\:_tableau_info\(\) expects int, float given\.$#'
 			identifier: argument.type
@@ -12558,12 +12468,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php
 
-		-
-			message: '#^Variable \$realpath might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php
-
 		-
 			message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -12582,24 +12486,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
 
-		-
-			message: '#^Property pdf_typhon\:\:\$posxcomm has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
-
-		-
-			message: '#^Property pdf_typhon\:\:\$posxremainingqty has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
-
-		-
-			message: '#^Property pdf_typhon\:\:\$posxweightvol has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
-
 		-
 			message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -12720,24 +12606,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/expedition/doc/pdf_merou.modules.php
 
-		-
-			message: '#^Property pdf_merou\:\:\$destinataire has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/expedition/doc/pdf_merou.modules.php
-
-		-
-			message: '#^Property pdf_merou\:\:\$expediteur has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/expedition/doc/pdf_merou.modules.php
-
-		-
-			message: '#^Property pdf_merou\:\:\$livreur has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/expedition/doc/pdf_merou.modules.php
-
 		-
 			message: '#^Parameter \#4 \$posy of method pdf_rouget\:\:_tableau_tot\(\) expects int, float given\.$#'
 			identifier: argument.type
@@ -12768,36 +12636,6 @@ parameters:
 			count: 6
 			path: ../../../htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
 
-		-
-			message: '#^Property pdf_standard_expensereport\:\:\$postotalttc has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
-
-		-
-			message: '#^Property pdf_standard_expensereport\:\:\$posxcomment has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
-
-		-
-			message: '#^Property pdf_standard_expensereport\:\:\$posxpiece has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
-
-		-
-			message: '#^Property pdf_standard_expensereport\:\:\$posxprojet has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
-
-		-
-			message: '#^Property pdf_standard_expensereport\:\:\$posxtype has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
-
 		-
 			message: '#^Ternary operator condition is always false\.$#'
 			identifier: ternary.alwaysFalse
@@ -12900,12 +12738,6 @@ parameters:
 			count: 13
 			path: ../../../htdocs/core/modules/facture/doc/pdf_octopus.modules.php
 
-		-
-			message: '#^Left side of && is always true\.$#'
-			identifier: booleanAnd.leftAlwaysTrue
-			count: 1
-			path: ../../../htdocs/core/modules/facture/doc/pdf_octopus.modules.php
-
 		-
 			message: '#^Parameter \#1 \$a of method pdf_octopus\:\:sumSituation\(\) expects array\<int\|string, array\<mixed\>\|float\|int\>, array\<string, Facture\|float\|int\> given\.$#'
 			identifier: argument.type
@@ -13068,12 +12900,6 @@ parameters:
 			count: 3
 			path: ../../../htdocs/core/modules/facture/doc/pdf_octopus.modules.php
 
-		-
-			message: '#^Variable \$realpath might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/facture/doc/pdf_octopus.modules.php
-
 		-
 			message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -13086,12 +12912,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/facture/doc/pdf_sponge.modules.php
 
-		-
-			message: '#^Left side of && is always true\.$#'
-			identifier: booleanAnd.leftAlwaysTrue
-			count: 1
-			path: ../../../htdocs/core/modules/facture/doc/pdf_sponge.modules.php
-
 		-
 			message: '#^Property CommonInvoice\:\:\$type \(int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -13212,12 +13032,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/facture/doc/pdf_sponge.modules.php
 
-		-
-			message: '#^Variable \$realpath might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/facture/doc/pdf_sponge.modules.php
-
 		-
 			message: '#^Property mod_facture_mars\:\:\$prefixcreditnote has no type specified\.$#'
 			identifier: missingType.property
@@ -13296,12 +13110,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
 
-		-
-			message: '#^Variable \$max might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/fichinter/mod_pacific.php
-
 		-
 			message: '#^Property CommonObject\:\:\$entity \(int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -14094,36 +13902,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
 
-		-
-			message: '#^Property pdf_standard_movementstock\:\:\$posxdatemouv has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
-
-		-
-			message: '#^Property pdf_standard_movementstock\:\:\$posxidref has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
-
-		-
-			message: '#^Property pdf_standard_movementstock\:\:\$wref has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
-
-		-
-			message: '#^Variable \$lastmovementdate might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
-
-		-
-			message: '#^Variable \$result might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
-
 		-
 			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Mo given\.$#'
 			identifier: argument.type
@@ -14526,12 +14304,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/propale/doc/pdf_azur.modules.php
 
-		-
-			message: '#^Variable \$filetomerge_dir might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/core/modules/propale/doc/pdf_azur.modules.php
-
 		-
 			message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -14646,12 +14418,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/propale/doc/pdf_cyan.modules.php
 
-		-
-			message: '#^Variable \$filetomerge_dir might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/core/modules/propale/doc/pdf_cyan.modules.php
-
 		-
 			message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType

From 697a9fc59961107e509f0e3d21aed212f07cc06c Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 24 Jan 2025 13:12:48 +0100
Subject: [PATCH 158/602] Finish cleaning v21 of the setup pages

---
 htdocs/admin/accountant.php            |  2 +-
 htdocs/admin/bank.php                  |  4 +--
 htdocs/admin/barcode.php               |  2 +-
 htdocs/admin/bom.php                   |  2 +-
 htdocs/admin/clicktodial.php           |  4 +--
 htdocs/admin/company.php               |  2 +-
 htdocs/admin/contract.php              |  2 +-
 htdocs/admin/dav.php                   |  4 +--
 htdocs/admin/debugbar.php              |  2 +-
 htdocs/admin/delais.php                |  8 +++---
 htdocs/admin/delivery.php              |  2 +-
 htdocs/admin/ecm.php                   |  2 +-
 htdocs/admin/eventorganization.php     |  4 +--
 htdocs/admin/fichinter.php             |  2 +-
 htdocs/admin/geoipmaxmind.php          |  2 +-
 htdocs/admin/holiday.php               | 20 +--------------
 htdocs/admin/hrm.php                   |  4 +--
 htdocs/admin/invoice.php               |  4 +--
 htdocs/admin/knowledgemanagement.php   |  4 +--
 htdocs/admin/ldap.php                  |  2 +-
 htdocs/admin/limits.php                |  4 +--
 htdocs/admin/mailing.php               |  2 +-
 htdocs/admin/mails_ingoing.php         |  2 +-
 htdocs/admin/mrp.php                   |  2 +-
 htdocs/admin/notification.php          |  2 +-
 htdocs/admin/openinghours.php          | 14 +++++------
 htdocs/admin/order.php                 |  2 +-
 htdocs/admin/payment.php               |  2 +-
 htdocs/admin/paymentbybanktransfer.php |  4 +--
 htdocs/admin/pdf.php                   |  4 +--
 htdocs/admin/pdf_other.php             | 34 +++++++++-----------------
 htdocs/admin/prelevement.php           |  4 +--
 htdocs/admin/resource.php              |  2 +-
 htdocs/admin/sms.php                   |  4 +--
 htdocs/admin/stock.php                 |  2 +-
 htdocs/admin/stocktransfer.php         |  4 +--
 htdocs/admin/supplier_invoice.php      |  2 +-
 htdocs/admin/supplier_order.php        |  2 +-
 htdocs/admin/supplier_payment.php      |  2 +-
 htdocs/admin/syslog.php                |  4 +--
 htdocs/admin/taxes.php                 |  2 +-
 htdocs/admin/webhook.php               |  4 +--
 htdocs/admin/website_options.php       |  2 +-
 htdocs/admin/workstation.php           |  4 +--
 htdocs/core/class/conf.class.php       |  9 ++++++-
 45 files changed, 88 insertions(+), 109 deletions(-)

diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 0dbe9d5dc4c..174e71a7516 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -127,7 +127,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="update">';
 
 print '<table class="noborder centpercent editmode">';
-print '<tr class="liste_titre"><th class="titlefieldcreate wordbreak">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";
+print '<tr class="liste_titre"><th class="titlefieldcreate wordbreak">'.$langs->trans("CompanyInfo").'</th><th></th></tr>'."\n";
 
 // Name of Accountant Company
 print '<tr class="oddeven"><td><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 18b5dff4645..2e1afa189cc 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -444,8 +444,8 @@ print load_fiche_titre($langs->trans("BankColorizeMovement"), '', '');
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">'."\n";
 print '<tr class="liste_titre">'."\n";
-print '<td colspan="4">'.$langs->trans("Name").'</td>';
-print '<td align="center" width="75">'.$langs->trans("Value").'</td>'."\n";
+print '<td colspan="4">'.$langs->trans("Parameter").'</td>';
+print '<td align="center" width="75"></td>'."\n";
 print "</tr>\n";
 
 print '<tr class="oddeven"><td colspan="4">';
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index a2d261159e0..f425524f3cc 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -450,7 +450,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td width="60" class="center">'.$langs->trans("Value").'</td>';
+print '<td width="60" class="center"></td>';
 print '<td>&nbsp;</td>';
 print '</tr>';
 
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index 1c28ed4c482..1c4f0b4377a 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -456,7 +456,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td class="center" width="60">'.$langs->trans("Value").'</td>';
+print '<td class="center" width="60"></td>';
 print "<td>&nbsp;</td>\n";
 print "</tr>\n";
 
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 49cb87e885c..ba4836f815c 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -92,8 +92,8 @@ print '<input type="hidden" name="action" value="setvalue">';
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td class="minwidth200">'.$langs->trans("Name").'</td>';
-print '<td>'.$langs->trans("Value").'</td>';
+print '<td class="minwidth200">'.$langs->trans("Parameter").'</td>';
+print '<td></td>';
 print "</tr>\n";
 
 
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index e3d08bb29cb..68856768f08 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -899,7 +899,7 @@ if ($mysoc->country_code == 'GR') {
 	print '<table class="noborder centpercent editmode">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("AccountParameter").'</td>';
-	print '<td>'.$langs->trans("Value").'</td>';
+	print '<td></td>';
 	print '<td></td>';
 	print "</tr>\n";
 
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index cf91b5fb5cb..ae676a142fd 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -497,7 +497,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td class="right">'.$langs->trans("Value").'</td>';
+print '<td class="right"></td>';
 print "</tr>\n";
 
 $substitutionarray = pdf_getSubstitutionArray($langs, array('objectamount'), null, 2);
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index 76bfbd63b8f..6099d183348 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -102,7 +102,7 @@ if ($action == 'edit') {
 	print '<input type="hidden" name="action" value="update">';
 
 	print '<table class="noborder centpercent nomarginbottom">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td></td></tr>';
 
 	foreach ($arrayofparameters as $key => $val) {
 		if (isset($val['enabled']) && empty($val['enabled'])) {
@@ -138,7 +138,7 @@ if ($action == 'edit') {
 	print '<br>';
 } else {
 	print '<table class="noborder centpercent nomarginbottom">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td></td></tr>';
 
 	foreach ($arrayofparameters as $key => $val) {
 		if (isset($val['enabled']) && empty($val['enabled'])) {
diff --git a/htdocs/admin/debugbar.php b/htdocs/admin/debugbar.php
index 9d1356362ba..6f77e1ef4e9 100644
--- a/htdocs/admin/debugbar.php
+++ b/htdocs/admin/debugbar.php
@@ -97,7 +97,7 @@ print '<input type="hidden" name="action" value="set">';
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td>';
+print '<td>'.$langs->trans("Parameter").'</td><td></td>';
 print '<td class="right"><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
 print "</tr>\n";
 
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index fe17368d821..092ec5bc5fc 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -249,11 +249,11 @@ if ($action == 'edit') {
 
 	// Show if meteo is enabled
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Option").'</td><td class="right">'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Option").'</td><td class="right"></td></tr>';
 
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="right">';
-	print $form->selectarray('MAIN_DISABLE_METEO', $labelmeteo, (!getDolGlobalString('MAIN_DISABLE_METEO') ? 0 : $conf->global->MAIN_DISABLE_METEO));
+	print $form->selectarray('MAIN_DISABLE_METEO', $labelmeteo, getDolGlobalInt('MAIN_DISABLE_METEO'));
 	print '</td></tr>';
 
 	print '</table>';
@@ -263,7 +263,7 @@ if ($action == 'edit') {
 	 */
 
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="right">'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="right"></td></tr>';
 
 	foreach ($modules as $module => $delays) {
 		if (isModEnabled($module)) {
@@ -283,7 +283,7 @@ if ($action == 'edit') {
 
 	// Show if meteo is enabled
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Option").'</td><td class="right">'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Option").'</td><td class="right"></td></tr>';
 
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">';
diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
index f8d6c1730ad..fa05a39c472 100644
--- a/htdocs/admin/delivery.php
+++ b/htdocs/admin/delivery.php
@@ -490,7 +490,7 @@ if (getDolGlobalString('MAIN_SUBMODULE_DELIVERY')) {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Parameter").'</td>';
-	print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
+	print '<td align="center" width="60"></td>';
 	print '<td width="80">&nbsp;</td>';
 	print "</tr>\n";
 
diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
index b881d6d6a1a..cfc02d93efa 100644
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@@ -96,7 +96,7 @@ print dol_get_fiche_head($head, 'ecm', '', -1, '');
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Description").'</td>';
-print '<td class="center" width="100px">'.$langs->trans("Value").'</td>'."\n";
+print '<td class="center" width="100px"></td>'."\n";
 print '</tr>';
 
 // Mail required for members
diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index a92affd82cd..51eaededfb0 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -186,7 +186,7 @@ if ($action == 'edit') {
 	print '<input type="hidden" name="action" value="update">';
 
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td></td></tr>';
 
 	foreach ($arrayofparameters as $constname => $val) {
 		if ($val['enabled'] == 1) {
@@ -269,7 +269,7 @@ if ($action == 'edit') {
 } else {
 	if (!empty($arrayofparameters)) {
 		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+		print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td></td></tr>';
 
 		foreach ($arrayofparameters as $constname => $val) {
 			if ($val['enabled'] == 1) {
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 9e04a9894da..edcd0469c1a 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -538,7 +538,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
+print '<td align="center" width="60"></td>';
 print "<td>&nbsp;</td>\n";
 print "</tr>\n";
 
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index 64bc975d3da..20716b351cf 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -110,7 +110,7 @@ print '<input type="hidden" name="action" value="set">';
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td>';
+print '<td>'.$langs->trans("Parameter").'</td><td></td>';
 print '<td class="right"><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
 print "</tr>\n";
 
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index 18b7ac33f6d..b6fc587032d 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -461,27 +461,9 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
+print '<td align="center" width="60"></td>';
 print "</tr>\n";
 
-//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY);
-//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY);
-//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY);
-//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY);
-
-if (!isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY)) {
-	$conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY = 1;
-}
-if (!isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY)) {
-	$conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY = 1;
-}
-
-//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY);
-//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY);
-//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY);
-//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY);
-
-
 // Set working days
 print '<tr class="oddeven">';
 print "<td>".$langs->trans("XIsAUsualNonWorkingDay", $langs->transnoentitiesnoconv("Monday"))."</td>";
diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index 6671a5b68ad..e80962f6d25 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -510,7 +510,7 @@ if ($action == 'edit') {
 	print '<input type="hidden" name="action" value="update">';
 
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td></td></tr>';
 
 	foreach ($arrayofparameters as $constname => $val) {
 		if ($val['enabled'] == 1) {
@@ -595,7 +595,7 @@ if ($action == 'edit') {
 } else {
 	if (!empty($arrayofparameters)) {
 		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+		print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td></td></tr>';
 
 		foreach ($arrayofparameters as $constname => $val) {
 			if ($val['enabled'] == 1) {
diff --git a/htdocs/admin/invoice.php b/htdocs/admin/invoice.php
index 736078cd4cf..e9dc88c9b96 100644
--- a/htdocs/admin/invoice.php
+++ b/htdocs/admin/invoice.php
@@ -792,7 +792,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameters").'</td>';
-print '<td class="center" width="60">'.$langs->trans("Value").'</td>';
+print '<td class="center" width="60"></td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
@@ -879,7 +879,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">'."\n";
 print '<tr class="liste_titre">'."\n";
 print '<td>'.$langs->trans("Name").'</td>'."\n";
-print '<td>'.$langs->trans("Value").'</td>'."\n";
+print '<td></td>'."\n";
 print "</tr>\n";
 print '<tr class="oddeven">'."\n";
 print '<td width="140">'.$langs->trans("PathDirectory").'</td>'."\n";
diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index ffd63bb379c..7c7458a6901 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -217,7 +217,7 @@ if ($action == 'edit') {
 	print '<input type="hidden" name="action" value="update">';
 
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td></td></tr>';
 
 	// @phan-suppress-next-line PhanEmptyForeach
 	foreach ($arrayofparameters as $constname => $val) {
@@ -285,7 +285,7 @@ if ($action == 'edit') {
 } else {
 	if (!empty($arrayofparameters)) {
 		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td></td></tr>';
 
 		// @phan-suppress-next-line PhanEmptyForeach
 		foreach ($arrayofparameters as $constname => $val) {
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index c7c55268b4b..2fb95d6e572 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -198,7 +198,7 @@ print $hookmanager->resPrint;
 
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td>'.$langs->trans("Value").'</td>';
+print '<td></td>';
 print '<td>'.$langs->trans("Example").'</td>';
 print "</tr>\n";
 
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index a3e9b993621..164a0ce525c 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -173,7 +173,7 @@ if ($action == 'edit') {
 	clearstatcache();
 
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Parameters").'</td><td></td></tr>';
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"), $langs->trans("ParameterActiveForNextInputOnly"));
@@ -204,7 +204,7 @@ if ($action == 'edit') {
 } else {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td class="right">'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td class="right"></td></tr>';
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"), $langs->trans("ParameterActiveForNextInputOnly"));
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 36b8553156e..73a0787486b 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -144,7 +144,7 @@ print '<input type="hidden" name="action" value="setvalue">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td>'.$langs->trans("Value").'</td>';
+print '<td></td>';
 print '<td class="hideonsmartphone">'.$langs->trans("Example").'</td>';
 print "</tr>\n";
 
diff --git a/htdocs/admin/mails_ingoing.php b/htdocs/admin/mails_ingoing.php
index 734d83f619c..a206f4bed29 100644
--- a/htdocs/admin/mails_ingoing.php
+++ b/htdocs/admin/mails_ingoing.php
@@ -118,7 +118,7 @@ print "<br><br>\n";
 /*
 print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="noborder centpercent">';
-print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td></td></tr>';
 
 print '<br>';
 
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index bf7c39d8b9a..0b343459e3d 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -450,7 +450,7 @@ print load_fiche_titre($langs->trans("OtherOptions"), '', '');
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td class="center" width="60">'.$langs->trans("Value").'</td>';
+print '<td class="center" width="60"></td>';
 print "<td>&nbsp;</td>\n";
 print "</tr>\n";
 
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index d9a9ae5bbfc..7bf96c88081 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -202,7 +202,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td>'.$langs->trans("Value").'</td>';
+print '<td></td>';
 print "</tr>\n";
 
 
diff --git a/htdocs/admin/openinghours.php b/htdocs/admin/openinghours.php
index 67289748f37..f79b92a7949 100644
--- a/htdocs/admin/openinghours.php
+++ b/htdocs/admin/openinghours.php
@@ -107,37 +107,37 @@ if (empty($action) || $action == 'edit' || $action == 'updateedit') {
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Monday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="monday" id="monday" class="minwidth100" value="'.(getDolGlobalString('MAIN_INFO_OPENINGHOURS_MONDAY') ? $conf->global->MAIN_INFO_OPENINGHOURS_MONDAY : GETPOST("monday", 'alpha')).'"'.(!getDolGlobalString('MAIN_INFO_OPENINGHOURS_MONDAY') ? ' autofocus="autofocus"' : '').'></td></tr>'."\n";
+	print '<input name="monday" id="monday" class="minwidth100" value="'.getDolGlobalString('MAIN_INFO_OPENINGHOURS_MONDAY', GETPOST("monday", 'alpha')).'"'.(getDolGlobalString('MAIN_INFO_OPENINGHOURS_MONDAY') ? '' : ' autofocus="autofocus"').'></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Tuesday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="tuesday" id="tuesday" class="minwidth100" value="'.(getDolGlobalString('MAIN_INFO_OPENINGHOURS_TUESDAY') ? $conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY : GETPOST("tuesday", 'alpha')).'"></td></tr>'."\n";
+	print '<input name="tuesday" id="tuesday" class="minwidth100" value="'.getDolGlobalString('MAIN_INFO_OPENINGHOURS_TUESDAY', GETPOST("tuesday", 'alpha')).'"></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Wednesday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="wednesday" id="wednesday" class="minwidth100" value="'.(getDolGlobalString('MAIN_INFO_OPENINGHOURS_WEDNESDAY') ? $conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY : GETPOST("wednesday", 'alpha')).'"></td></tr>'."\n";
+	print '<input name="wednesday" id="wednesday" class="minwidth100" value="'.getDolGlobalString('MAIN_INFO_OPENINGHOURS_WEDNESDAY', GETPOST("wednesday", 'alpha')).'"></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Thursday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="thursday" id="thursday" class="minwidth100" value="'.(getDolGlobalString('MAIN_INFO_OPENINGHOURS_THURSDAY') ? $conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY : GETPOST("thursday", 'alpha')).'"></td></tr>'."\n";
+	print '<input name="thursday" id="thursday" class="minwidth100" value="'.getDolGlobalString('MAIN_INFO_OPENINGHOURS_THURSDAY', GETPOST("thursday", 'alpha')).'"></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Friday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="friday" id="friday" class="minwidth100" value="'.(getDolGlobalString('MAIN_INFO_OPENINGHOURS_FRIDAY') ? $conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY : GETPOST("friday", 'alpha')).'"></td></tr>'."\n";
+	print '<input name="friday" id="friday" class="minwidth100" value="'.getDolGlobalString('MAIN_INFO_OPENINGHOURS_FRIDAY', GETPOST("friday", 'alpha')).'"></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Saturday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="saturday" id="saturday" class="minwidth100" value="'.(getDolGlobalString('MAIN_INFO_OPENINGHOURS_SATURDAY') ? $conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY : GETPOST("saturday", 'alpha')).'"></td></tr>'."\n";
+	print '<input name="saturday" id="saturday" class="minwidth100" value="'.getDolGlobalString('MAIN_INFO_OPENINGHOURS_SATURDAY', GETPOST("saturday", 'alpha')).'"></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Sunday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="sunday" id="sunday" class="minwidth100" value="'.(getDolGlobalString('MAIN_INFO_OPENINGHOURS_SUNDAY') ? $conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY : GETPOST("sunday", 'alpha')).'"></td></tr>'."\n";
+	print '<input name="sunday" id="sunday" class="minwidth100" value="'.getDolGlobalString('MAIN_INFO_OPENINGHOURS_SUNDAY', GETPOST("sunday", 'alpha')).'"></td></tr>'."\n";
 
 	print '</table>';
 
diff --git a/htdocs/admin/order.php b/htdocs/admin/order.php
index d915eda1693..38b4dd721cf 100644
--- a/htdocs/admin/order.php
+++ b/htdocs/admin/order.php
@@ -649,7 +649,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td class="center" width="60">'.$langs->trans("Value").'</td>';
+print '<td class="center" width="60"></td>';
 print "<td>&nbsp;</td>\n";
 print "</tr>\n";
 
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index c37c008ad9c..f60bed8f0c9 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -265,7 +265,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
+print '<td align="center" width="60"></td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index a4771a9013b..3d5fb00b6ac 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -162,7 +162,7 @@ print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td>'.$langs->trans("Value").'</td>';
+print '<td></td>';
 print "</tr>";
 
 // Bank account (from Banks module)
@@ -445,7 +445,7 @@ if (isModEnabled('notification'))
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("User").'</td>';
-	print '<td>'.$langs->trans("Value").'</td>';
+	print '<td></td>';
 	print '<td class="right">'.$langs->trans("Action").'</td>';
 	print "</tr>\n";
 
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 6101cdcc7bf..02521e57b9e 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -306,7 +306,7 @@ 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("Parameters").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameters").'</td><td width="200px"></td></tr>';
 
 $selected = getDolGlobalString('MAIN_PDF_FORMAT');
 if (empty($selected)) {
@@ -515,7 +515,7 @@ print load_fiche_titre($langs->trans("Other"), '', '');
 
 print '<div class="div-table-responsive-no-min">';
 print '<table summary="more" class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td></td></tr>';
 
 // Use 2 languages into PDF
 
diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index 39e97b2ee70..c325cec6aed 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -211,7 +211,7 @@ if (isModEnabled('propal')) {
 
 	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>';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td width="200px"></td></tr>';
 
 	/* This feature seems not yet used into Dolibarr. So option is kept hidden and enabled by default
 	print '<tr class="oddeven"><td>';
@@ -253,11 +253,12 @@ if (isModEnabled('propal')) {
 }
 
 if (isModEnabled('order')) {
-	print load_fiche_titre($langs->trans("Orders"), '', 'bill');
+	$langs->load("orders");
+	print load_fiche_titre($langs->trans('CustomersOrders'), '', 'order');
 
 	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("Parameters").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameters").'</td><td width="200px"></td></tr>';
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("MAIN_PDF_ADD_TERMSOFSALE_ORDER"), $langs->trans("PdfAddTermOfSaleHelp"));
 	print '</td><td>';
@@ -268,19 +269,8 @@ if (isModEnabled('order')) {
 		print $form->selectarray("MAIN_PDF_ADD_TERMSOFSALE_ORDER", $arrval, $conf->global->MAIN_PDF_ADD_TERMSOFSALE_ORDER);
 	}
 	print '</td></tr>';
-	print '</table>';
-	print '</div>';
-}
 
-if (isModEnabled('order')) {
-	$langs->load("orders");
-	print load_fiche_titre($langs->trans('CustomersOrders'), '', 'order');
-
-	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>';
-
-	print '<tr class="oddeven"><td>';
+		print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("SALES_ORDER_SHOW_SHIPPING_ADDRESS"), $langs->trans("SALES_ORDER_SHOW_SHIPPING_ADDRESSMore"));
 	print '</td><td>';
 	if ($conf->use_javascript_ajax) {
@@ -302,7 +292,7 @@ if (isModEnabled('supplier_proposal')) {
 
 	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>';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td width="200px"></td></tr>';
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE"), '');
@@ -337,7 +327,7 @@ if (isModEnabled('supplier_order')) {
 
 	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>';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td width="200px"></td></tr>';
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE"), '');
@@ -370,7 +360,7 @@ if (isModEnabled('invoice')) {
 
 	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("Parameters").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameters").'</td><td width="200px"></td></tr>';
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("MAIN_PDF_ADD_TERMSOFSALE_INVOICE"), $langs->trans("PdfAddTermOfSaleHelp"));
@@ -476,7 +466,7 @@ if (isModEnabled('shipping')) {
 
 	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("Parameters").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameters").'</td><td width="200px"></td></tr>';
 
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BARCODE_ON_SHIPPING_PDF");
@@ -498,7 +488,7 @@ if (isModEnabled('reception')) {
 
 	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("Parameters").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameters").'</td><td width="200px"></td></tr>';
 
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("RECEPTION_PDF_HIDE_ORDERED");
@@ -541,7 +531,7 @@ if (isModEnabled('stocktransfer')) {
 
 	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("Parameters").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameters").'</td><td width="200px"></td></tr>';
 
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BARCODE_ON_STOCKTRANSFER_PDF");
@@ -561,7 +551,7 @@ if (isModEnabled('stocktransfer')) {
 print load_fiche_titre($langs->trans("Files"), '', 'file');
 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("Parameters").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameters").'</td><td width="200px"></td></tr>';
 
 // Terms of sale
 $tooltiptermsofsale = $langs->trans('AvailableFormats').' : pdf';
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 90a150ba6bc..50a5430df3e 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -164,7 +164,7 @@ print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
 print '<td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td>';
-print '<td>'.$langs->trans("Value").'</td>';
+print '<td></td>';
 print "</tr>";
 
 
@@ -460,7 +460,7 @@ if (isModEnabled('notification') )
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("User").'</td>';
-	print '<td>'.$langs->trans("Value").'</td>';
+	print '<td></td>';
 	print '<td class="right">'.$langs->trans("Action").'</td>';
 	print "</tr>\n";
 
diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php
index aac4c03bfb4..7b16c42eb81 100644
--- a/htdocs/admin/resource.php
+++ b/htdocs/admin/resource.php
@@ -88,7 +88,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameters").'</td>'."\n";
-print '<td class="right">'.$langs->trans("Value").'</td>'."\n";
+print '<td class="right"></td>'."\n";
 print '<td></td>';
 
 
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index ad815dc5bc8..15bbe9a6691 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -181,7 +181,7 @@ if ($action == 'edit') {
 	clearstatcache();
 
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td></td></tr>';
 
 	// Disable
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_SMS").'</td><td>';
@@ -217,7 +217,7 @@ if ($action == 'edit') {
 	print '<br>';
 } else {
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td></td></tr>';
 
 	// Disable
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_SMS").'</td><td>'.yn(getDolGlobalString('MAIN_DISABLE_ALL_SMS')).'</td></tr>';
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 78590db9795..952bccf2074 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -697,7 +697,7 @@ print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
 print "<td>".$langs->trans("Parameter")."</td>\n";
-print '<td class="right">'.$langs->trans("Value").'</td>'."\n";
+print '<td class="right"></td>'."\n";
 print '</tr>'."\n";
 
 print '<tr class="oddeven">';
diff --git a/htdocs/admin/stocktransfer.php b/htdocs/admin/stocktransfer.php
index e1281c1bf58..6a14e25c466 100644
--- a/htdocs/admin/stocktransfer.php
+++ b/htdocs/admin/stocktransfer.php
@@ -192,7 +192,7 @@ print '<span class="opacitymedium">'.$langs->trans("StockTransferSetupPage").'</
 	print '<input type="hidden" name="action" value="update">';
 
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td></td></tr>';
 
 	foreach ($arrayofparameters as $key => $val)
 	{
@@ -213,7 +213,7 @@ print '<span class="opacitymedium">'.$langs->trans("StockTransferSetupPage").'</
 	if (!empty($arrayofparameters))
 	{
 		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td></td></tr>';
 
 		foreach ($arrayofparameters as $key => $val)
 		{
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 325378332ce..8dab80b8157 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -472,7 +472,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
+print '<td align="center" width="60"></td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 17aa2f5f78f..ba4886573f3 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -477,7 +477,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
+print '<td align="center" width="60"></td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index b76fe11f1bd..3419f734977 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -454,7 +454,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
+print '<td align="center" width="60"></td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index fac147f09d4..2a922fbd752 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -217,7 +217,7 @@ print '<div class="div-table-responsive-no-min">'; // You can use div-table-resp
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Type").'</td>';
-print '<td>'.$langs->trans("Value").'</td>';
+print '<td></td>';
 print '<td class="center width150"><input type="submit" class="button small" '.$optionmc.' value="'.$langs->trans("Modify").'"></td>';
 print "</tr>\n";
 
@@ -309,7 +309,7 @@ print '<input type="hidden" name="action" value="setlevel">';
 print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td>';
+print '<td>'.$langs->trans("Parameter").'</td><td></td>';
 print '<td class="center width150"><input type="submit" class="button small" '.$optionmc.' value="'.$langs->trans("Modify").'"></td>';
 print "</tr>\n";
 
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 77ff2b03096..d70217c985e 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -180,7 +180,7 @@ if (empty($mysoc->tva_assuj)) {
 
 	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameters").'</td><td></td></tr>';
 
 	print '<tr class="oddeven"><td><label for="intra_vat">'.$langs->trans("VATIntra").'</label></td><td>';
 	print '<input name="tva" id="intra_vat" class="minwidth200" value="'.getDolGlobalString('MAIN_INFO_TVAINTRA').'">';
diff --git a/htdocs/admin/webhook.php b/htdocs/admin/webhook.php
index 382971d9906..a4451fec911 100644
--- a/htdocs/admin/webhook.php
+++ b/htdocs/admin/webhook.php
@@ -182,7 +182,7 @@ if ($action == 'edit') {
 		print '<input type="hidden" name="action" value="update">';
 
 		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td></td></tr>';
 
 		// @phan-suppress-next-line PhanEmptyForeach
 		foreach ($arrayofparameters as $constname => $val) {
@@ -273,7 +273,7 @@ if ($action == 'edit') {
 	} else {
 		if (!empty($arrayofparameters)) {
 			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+			print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td></td></tr>';
 
 			foreach ($arrayofparameters as $constname => $val) {
 				if ($val['enabled'] == 1) {
diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php
index e41ccdf90c7..4cb3f9c6120 100644
--- a/htdocs/admin/website_options.php
+++ b/htdocs/admin/website_options.php
@@ -128,7 +128,7 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="center" width="20">&nbsp;</td>';
-print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
+print '<td align="center" width="100"></td>'."\n";
 print '</tr>';
 
 
diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index f05467d68da..eac57dbf797 100644
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -195,7 +195,7 @@ if ($action == 'edit') {
 	print '<input type="hidden" name="action" value="update">';
 
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td></td></tr>';
 
 	// @phan-suppress-next-line PhanEmptyForeach
 	foreach ($arrayofparameters as $key => $val) {
@@ -215,7 +215,7 @@ if ($action == 'edit') {
 } else {
 	if (!empty($arrayofparameters)) {
 		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td></td></tr>';
 
 		foreach ($arrayofparameters as $key => $val) {
 			$setupnotempty++;
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index f6f452062c1..d0471938c67 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -20,7 +20,6 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-
 /**
  *	\file       	htdocs/core/class/conf.class.php
  *	\ingroup		core
@@ -1038,6 +1037,14 @@ class Conf extends stdClass
 				$this->global->MAIN_MAX_DECIMALS_SHOWN = 8;
 			}
 
+			// Non working days
+			if (!isset($this->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY)) {
+				$this->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY = 1;
+			}
+			if (!isset($this->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY)) {
+				$this->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY = 1;
+			}
+
 			// Default pdf option
 			if (!isset($this->global->MAIN_PDF_DASH_BETWEEN_LINES)) {
 				$this->global->MAIN_PDF_DASH_BETWEEN_LINES = 1; // use dash between lines

From 34feedbb033f2eb348b065ae1f5b56bcd7fceb4d Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 24 Jan 2025 13:14:32 +0100
Subject: [PATCH 159/602] Clean dead code

---
 htdocs/admin/workstation.php | 51 ------------------------------------
 1 file changed, 51 deletions(-)

diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index eac57dbf797..dc6017c33ed 100644
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -185,57 +185,6 @@ print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 $head = workstationAdminPrepareHead();
 print dol_get_fiche_head($head, 'settings', $langs->trans($page_name), -1, "workstation");
 
-// Setup page goes here
-//echo '<span class="opacitymedium">'.$langs->trans("WorkstationSetupPage").'</span><br><br>';
-
-
-if ($action == 'edit') {
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="update">';
-
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td></td></tr>';
-
-	// @phan-suppress-next-line PhanEmptyForeach
-	foreach ($arrayofparameters as $key => $val) {
-		print '<tr class="oddeven"><td>';
-		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
-		print $form->textwithpicto($langs->trans($key), $tooltiphelp);
-		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.getDolGlobalString($key).'"></td></tr>';
-	}
-	print '</table>';
-
-	print '<br><div class="center">';
-	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
-	print '</div>';
-
-	print '</form>';
-	print '<br>';
-} else {
-	if (!empty($arrayofparameters)) {
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td></td></tr>';
-
-		foreach ($arrayofparameters as $key => $val) {
-			$setupnotempty++;
-
-			print '<tr class="oddeven"><td>';
-			$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
-			print $form->textwithpicto($langs->trans($key), $tooltiphelp);
-			print '</td><td>'.getDolGlobalString($key).'</td></tr>';
-		}
-
-		print '</table>';
-
-		print '<div class="tabsAction">';
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
-		print '</div>';
-	}/* else {
-		print '<br>'.$langs->trans("NothingToSetup");
-	}*/
-}
-
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 	if ($myTmpObjectArray['includerefgeneration']) {

From e3856d0de5a11c137681d493a7075393ed42eafb Mon Sep 17 00:00:00 2001
From: ATM-Lucas <lucas.mantegari@atm-consulting.fr>
Date: Fri, 24 Jan 2025 14:04:30 +0100
Subject: [PATCH 160/602] pre-commit error

---
 htdocs/core/tpl/card_presend.tpl.php | 1 -
 htdocs/product/card.php              | 2 --
 2 files changed, 3 deletions(-)

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 9a5a12be721..e0654d487ca 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -115,7 +115,6 @@ if ($action == 'presend') {
 	}
 	if ($forcebuilddoc) {    // If there is no default value for supplier invoice, we do not generate file, even if modelpdf was set by a manual generation
 		if ((!$file || !is_readable($file)) && method_exists($object, 'generateDocument')) {
-
 			$hidedetails = $hidedetails?$hidedetails:'';
 			$hidedesc = $hidedetails?$hidedetails:'';
 			$hideref = $hidedetails?$hidedetails:'';
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 1efadc81fbf..2a0868bcaa3 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1302,7 +1302,6 @@ if (empty($reshook)) {
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_PRODUCT_TO';
 	$trackid = 'prod'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
-
 }
 
 
@@ -3217,7 +3216,6 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete') {
 	$trackid = 'prod' . $object->id;
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
-
 }
 
 // End of page

From 4e9faa16be7b29708f5f0c282c3776637a9fccf4 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 Jan 2025 14:14:10 +0100
Subject: [PATCH 161/602] Update societeaccount.class.php

---
 htdocs/societe/class/societeaccount.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 47207ec2fda..80fb22b0838 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -162,6 +162,12 @@ class SocieteAccount extends CommonObject
 	 * @var string
 	 */
 	public $site;
+
+	/**
+	 * @var int
+	 */
+	public $fk_website;
+
 	/**
 	 * @var ?string
 	 */

From a6f978c67f9d19f66a7c8b4a4e015b57bd107c0a Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 24 Jan 2025 14:26:07 +0100
Subject: [PATCH 162/602] FIX broken feature, compatibility with "Default
 search filters"

---
 htdocs/ticket/list.php | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 8e800a841db..ea06f4fc308 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -387,13 +387,15 @@ foreach ($search as $key => $val) {
 	$tmpkey = 't.' . $key;
 	if ($key == 'fk_statut' && !empty($search['fk_statut'])) {
 		$newarrayofstatus = array();
-		foreach ($search['fk_statut'] as $key2 => $val2) {
-			if (in_array($val2, array('openall', 'closeall'))) {
-				continue;
+		if (is_array($search['fk_statut'])) {
+			foreach ($search['fk_statut'] as $key2 => $val2) {
+				if (in_array($val2, array('openall', 'closeall'))) {
+					continue;
+				}
+				$newarrayofstatus[] = $val2;
 			}
-			$newarrayofstatus[] = $val2;
 		}
-		if ($search['fk_statut'] == 'openall' || in_array('openall', $search['fk_statut'])) {
+		if ($search['fk_statut'] == 'openall' || (is_array($search['fk_statut']) && in_array('openall', $search['fk_statut']))) {
 			$newarrayofstatus[] = Ticket::STATUS_NOT_READ;
 			$newarrayofstatus[] = Ticket::STATUS_READ;
 			$newarrayofstatus[] = Ticket::STATUS_ASSIGNED;
@@ -401,7 +403,7 @@ foreach ($search as $key => $val) {
 			$newarrayofstatus[] = Ticket::STATUS_NEED_MORE_INFO;
 			$newarrayofstatus[] = Ticket::STATUS_WAITING;
 		}
-		if ($search['fk_statut'] == 'closeall' || in_array('closeall', $search['fk_statut'])) {
+		if ($search['fk_statut'] == 'closeall' || (is_array($search['fk_statut']) && in_array('closeall', $search['fk_statut']))) {
 			$newarrayofstatus[] = Ticket::STATUS_CLOSED;
 			$newarrayofstatus[] = Ticket::STATUS_CANCELED;
 		}
@@ -901,7 +903,11 @@ foreach ($object->fields as $key => $val) {
 			//var_dump(array_values($search[$key]));
 			$selectedarray = null;
 			if (!empty($search[$key])) {
-				$selectedarray = array_values($search[$key]);
+				if (is_array($search[$key])) {
+					$selectedarray = array_values($search[$key]);
+				} else {
+					$selectedarray = array($search[$key]); // Compatibility with "Default search filters"
+				}
 			}
 			print Form::multiselectarray('search_fk_statut', $arrayofstatus, $selectedarray, 0, 0, 'search_status width150 onrightofpage', 1, 0, '', '', '');
 			print '</td>';

From 4afb100767382bdaf926da456c0c9899ab978695 Mon Sep 17 00:00:00 2001
From: ATM-Lucas <lucas.mantegari@atm-consulting.fr>
Date: Fri, 24 Jan 2025 16:52:50 +0100
Subject: [PATCH 163/602] Adding model Mail

---
 htdocs/admin/mails_templates.php          | 3 +++
 htdocs/core/class/html.formmail.class.php | 3 ++-
 htdocs/product/card.php                   | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 6f79d58551a..d710306172c 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -252,6 +252,9 @@ if (isModEnabled('eventorganization') && $user->hasRight('eventorganization', 'r
 if (isModEnabled('partnership') && $user->hasRight('partnership', 'read')) {
 	$elementList['partnership_send'] = img_picto('', 'partnership', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToPartnership'));
 }
+if (isModEnabled('product') && !empty($user->rights->produit->lire)) {
+	$elementList['product_send'] = img_picto('', 'product', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('Product'));
+}
 
 $parameters = array('elementList' => $elementList);
 $reshook = $hookmanager->executeHooks('emailElementlist', $parameters); // Note that $action and $object may have been modified by some hooks
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 3f09d2816f7..8964679bc7e 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -534,6 +534,7 @@ class FormMail extends Form
 			$listofmimes = array();
 			$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
 
+			if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
 			if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
 				if (!empty($arraydefaultmessage->joinfiles) && !empty($this->param['fileinit']) && is_array($this->param['fileinit'])) {
 					foreach ($this->param['fileinit'] as $path) {
@@ -624,7 +625,7 @@ class FormMail extends Form
 			} elseif (!empty($this->param['models']) && in_array($this->param['models'], array(
 					'propal_send', 'order_send', 'facture_send',
 					'shipping_send', 'fichinter_send', 'supplier_proposal_send', 'order_supplier_send',
-					'invoice_supplier_send', 'thirdparty', 'contract', 'user', 'recruitmentcandidature_send', 'all'
+					'invoice_supplier_send', 'thirdparty', 'contract', 'user', 'recruitmentcandidature_send', 'product_send', 'all'
 				))) {
 				// If list of template is empty
 				$out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 2a0868bcaa3..7c3588d0e08 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -3176,6 +3176,10 @@ if (getDolGlobalString('PRODUCT_ADD_FORM_ADD_TO') && $object->id && ($action ==
  * Generated documents
  */
 
+if (GETPOST('modelselected')) {
+	$action = 'presend';
+}
+
 if ($action != 'create' && $action != 'edit' && $action != 'delete') {
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 	print '<a name="builddoc"></a>'; // ancre

From 9c10d36b1b6f96c6327009110a2b707d688c56d0 Mon Sep 17 00:00:00 2001
From: ATM-Lucas <lucas.mantegari@atm-consulting.fr>
Date: Fri, 24 Jan 2025 16:55:13 +0100
Subject: [PATCH 164/602] fault

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

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 8964679bc7e..a5881534518 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -473,7 +473,7 @@ class FormMail extends Form
 		global $conf, $langs, $user, $hookmanager, $form;
 
 		// Required to show preview wof mail attachments
-		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+		require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
 		$formfile = new FormFile($this->db);
 
 		if (!is_object($form)) {
@@ -532,632 +532,632 @@ class FormMail extends Form
 			$listofpaths = array();
 			$listofnames = array();
 			$listofmimes = array();
-			$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
+			$keytoavoidconflict = empty($this->trackid) ? '' : '-' . $this->trackid; // this->trackid must be defined
 
 			if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
-			if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
-				if (!empty($arraydefaultmessage->joinfiles) && !empty($this->param['fileinit']) && is_array($this->param['fileinit'])) {
-					foreach ($this->param['fileinit'] as $path) {
-						if (!empty($path)) {
-							$this->add_attached_files($path);
+				if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
+					if (!empty($arraydefaultmessage->joinfiles) && !empty($this->param['fileinit']) && is_array($this->param['fileinit'])) {
+						foreach ($this->param['fileinit'] as $path) {
+							if (!empty($path)) {
+								$this->add_attached_files($path);
+							}
 						}
 					}
 				}
-			}
 
-			if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) {
-				$listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
-			}
-			if (!empty($_SESSION["listofnames".$keytoavoidconflict])) {
-				$listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
-			}
-			if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {
-				$listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
-			}
-
-
-			$out .= "\n".'<!-- Begin form mail type='.$this->param["models"].' --><div id="mailformdiv"></div>'."\n";
-			if ($this->withform == 1) {
-				$out .= '<form method="POST" name="mailform" id="mailform" enctype="multipart/form-data" action="'.$this->param["returnurl"].'#formmail">'."\n";
-
-				$out .= '<a id="formmail" name="formmail"></a>';
-				$out .= '<input style="display:none" type="submit" id="sendmailhidden" name="sendmail">';
-				$out .= '<input type="hidden" name="token" value="'.newToken().'" />';
-				$out .= '<input type="hidden" name="trackid" value="'.$this->trackid.'" />';
-				$out .= '<input type="hidden" name="inreplyto" value="'.$this->inreplyto.'" />';
-			}
-			if (!empty($this->withfrom)) {
-				if (!empty($this->withfromreadonly)) {
-					$out .= '<input type="hidden" id="fromname" name="fromname" value="'.$this->fromname.'" />';
-					$out .= '<input type="hidden" id="frommail" name="frommail" value="'.$this->frommail.'" />';
+				if (!empty($_SESSION["listofpaths" . $keytoavoidconflict])) {
+					$listofpaths = explode(';', $_SESSION["listofpaths" . $keytoavoidconflict]);
 				}
-			}
-			foreach ($this->param as $key => $value) {
-				if (is_array($value)) {
-					$out .= "<!-- param key=".$key." is array, we do not output input field for it -->\n";
-				} else {
-					$out .= '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />'."\n";
+				if (!empty($_SESSION["listofnames" . $keytoavoidconflict])) {
+					$listofnames = explode(';', $_SESSION["listofnames" . $keytoavoidconflict]);
 				}
-			}
-
-			$modelmail_array = array();
-			if ($this->param['models'] != 'none') {
-				$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
-				if ($result < 0) {
-					setEventMessages($this->error, $this->errors, 'errors');
+				if (!empty($_SESSION["listofmimes" . $keytoavoidconflict])) {
+					$listofmimes = explode(';', $_SESSION["listofmimes" . $keytoavoidconflict]);
 				}
 
-				foreach ($this->lines_model as $line) {
-					$reg = array();
-					if (preg_match('/\((.*)\)/', $line->label, $reg)) {
-						$labeltouse = $langs->trans($reg[1]); // langs->trans when label is __(xxx)__
+
+				$out .= "\n" . '<!-- Begin form mail type=' . $this->param["models"] . ' --><div id="mailformdiv"></div>' . "\n";
+				if ($this->withform == 1) {
+					$out .= '<form method="POST" name="mailform" id="mailform" enctype="multipart/form-data" action="' . $this->param["returnurl"] . '#formmail">' . "\n";
+
+					$out .= '<a id="formmail" name="formmail"></a>';
+					$out .= '<input style="display:none" type="submit" id="sendmailhidden" name="sendmail">';
+					$out .= '<input type="hidden" name="token" value="' . newToken() . '" />';
+					$out .= '<input type="hidden" name="trackid" value="' . $this->trackid . '" />';
+					$out .= '<input type="hidden" name="inreplyto" value="' . $this->inreplyto . '" />';
+				}
+				if (!empty($this->withfrom)) {
+					if (!empty($this->withfromreadonly)) {
+						$out .= '<input type="hidden" id="fromname" name="fromname" value="' . $this->fromname . '" />';
+						$out .= '<input type="hidden" id="frommail" name="frommail" value="' . $this->frommail . '" />';
+					}
+				}
+				foreach ($this->param as $key => $value) {
+					if (is_array($value)) {
+						$out .= "<!-- param key=" . $key . " is array, we do not output input field for it -->\n";
 					} else {
-						$labeltouse = $line->label;
-					}
-
-					// We escape the $labeltouse to store it into $modelmail_array.
-					$modelmail_array[$line->id] = dol_escape_htmltag($labeltouse);
-					if ($line->lang) {
-						$modelmail_array[$line->id] .= ' '.picto_from_langcode($line->lang);
-					}
-					if ($line->private) {
-						$modelmail_array[$line->id] .= ' - <span class="opacitymedium">'.dol_escape_htmltag($langs->trans("Private")).'</span>';
+						$out .= '<input type="hidden" id="' . $key . '" name="' . $key . '" value="' . $value . '" />' . "\n";
 					}
 				}
-			}
 
-			// Zone to select email template
-			if (count($modelmail_array) > 0) {
-				$model_mail_selected_id = GETPOSTISSET('modelmailselected') ? GETPOSTINT('modelmailselected') : ($arraydefaultmessage->id > 0 ? $arraydefaultmessage->id : 0);
+				$modelmail_array = array();
+				if ($this->param['models'] != 'none') {
+					$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
+					if ($result < 0) {
+						setEventMessages($this->error, $this->errors, 'errors');
+					}
 
-				// If list of template is filled
-				$out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
-
-				$out .= $this->selectarray('modelmailselected', $modelmail_array, $model_mail_selected_id, $langs->trans('SelectMailModel'), 0, 0, '', 0, 0, 0, '', 'minwidth100', 1, '', 0, 1);
-				if ($user->admin) {
-					$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')), 1);
-				}
-
-				$out .= ' &nbsp; ';
-				$out .= '<input type="submit" class="button reposition smallpaddingimp" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
-				$out .= ' &nbsp; ';
-				$out .= '</div>';
-			} elseif (!empty($this->param['models']) && in_array($this->param['models'], array(
-					'propal_send', 'order_send', 'facture_send',
-					'shipping_send', 'fichinter_send', 'supplier_proposal_send', 'order_supplier_send',
-					'invoice_supplier_send', 'thirdparty', 'contract', 'user', 'recruitmentcandidature_send', 'product_send', 'all'
-				))) {
-				// If list of template is empty
-				$out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
-				$out .= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> ';
-				$out .= '<select name="modelmailselected" disabled="disabled"><option value="none">'.$langs->trans("NoTemplateDefined").'</option></select>'; // Do not put 'disabled' on 'option' tag, it is already on 'select' and it makes chrome crazy.
-				if ($user->admin) {
-					$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')), 1);
-				}
-				$out .= ' &nbsp; ';
-				$out .= '<input type="submit" class="button reposition smallpaddingimp" value="'.$langs->trans('Apply').'" name="modelselected" disabled="disabled" id="modelselected">';
-				$out .= ' &nbsp; ';
-				$out .= '</div>';
-			} else {
-				$out .= '<!-- No template available for $this->param["models"] = '.$this->param['models'].' -->';
-			}
-
-
-			$out .= '<table class="tableforemailform boxtablenotop centpercent">'."\n";
-
-			// Substitution array/string
-			$helpforsubstitution = '';
-			if (is_array($this->substit) && count($this->substit)) {
-				$helpforsubstitution .= $langs->trans('AvailableVariables').' :<br><br><span class="small">'."\n";
-			}
-			foreach ($this->substit as $key => $val) {
-				// Do not show deprecated variables into the tooltip help of substitution variables
-				if (in_array($key, array('__NEWREF__', '__REFCLIENT__', '__REFSUPPLIER__', '__SUPPLIER_ORDER_DATE_DELIVERY__', '__SUPPLIER_ORDER_DELAY_DELIVERY__'))) {
-					continue;
-				}
-				$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">';
-				if (is_numeric($this->withsubstit)) {
-					$out .= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // Old usage
-				} else {
-					$out .= $form->textwithpicto($langs->trans('AvailableVariables'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // New usage
-				}
-				$out .= "</td></tr>\n";
-			}*/
-
-			// From
-			if (!empty($this->withfrom)) {
-				if (!empty($this->withfromreadonly)) {
-					$out .= '<tr><td class="fieldrequired minwidth200">'.$langs->trans("MailFrom").'</td><td>';
-
-					// $this->fromtype is the default value to use to select sender
-					if (!($this->fromtype === 'user' && $this->fromid > 0)
-						&& !($this->fromtype === 'company')
-						&& !($this->fromtype === 'robot')
-						&& !preg_match('/user_aliases/', $this->fromtype)
-						&& !preg_match('/global_aliases/', $this->fromtype)
-						&& !preg_match('/senderprofile/', $this->fromtype)
-					) {
-						// Use this->fromname and this->frommail or error if not defined
-						$out .= $this->fromname;
-						if ($this->frommail) {
-							$out .= ' &lt;'.$this->frommail.'&gt;';
+					foreach ($this->lines_model as $line) {
+						$reg = array();
+						if (preg_match('/\((.*)\)/', $line->label, $reg)) {
+							$labeltouse = $langs->trans($reg[1]); // langs->trans when label is __(xxx)__
 						} else {
-							if ($this->fromtype) {
+							$labeltouse = $line->label;
+						}
+
+						// We escape the $labeltouse to store it into $modelmail_array.
+						$modelmail_array[$line->id] = dol_escape_htmltag($labeltouse);
+						if ($line->lang) {
+							$modelmail_array[$line->id] .= ' ' . picto_from_langcode($line->lang);
+						}
+						if ($line->private) {
+							$modelmail_array[$line->id] .= ' - <span class="opacitymedium">' . dol_escape_htmltag($langs->trans("Private")) . '</span>';
+						}
+					}
+				}
+
+				// Zone to select email template
+				if (count($modelmail_array) > 0) {
+					$model_mail_selected_id = GETPOSTISSET('modelmailselected') ? GETPOSTINT('modelmailselected') : ($arraydefaultmessage->id > 0 ? $arraydefaultmessage->id : 0);
+
+					// If list of template is filled
+					$out .= '<div class="center" style="padding: 0px 0 12px 0">' . "\n";
+
+					$out .= $this->selectarray('modelmailselected', $modelmail_array, $model_mail_selected_id, $langs->trans('SelectMailModel'), 0, 0, '', 0, 0, 0, '', 'minwidth100', 1, '', 0, 1);
+					if ($user->admin) {
+						$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup') . ' - ' . $langs->transnoentitiesnoconv('EMails')), 1);
+					}
+
+					$out .= ' &nbsp; ';
+					$out .= '<input type="submit" class="button reposition smallpaddingimp" value="' . $langs->trans('Apply') . '" name="modelselected" id="modelselected">';
+					$out .= ' &nbsp; ';
+					$out .= '</div>';
+				} elseif (!empty($this->param['models']) && in_array($this->param['models'], array(
+						'propal_send', 'order_send', 'facture_send',
+						'shipping_send', 'fichinter_send', 'supplier_proposal_send', 'order_supplier_send',
+						'invoice_supplier_send', 'thirdparty', 'contract', 'user', 'recruitmentcandidature_send', 'product_send', 'all'
+					))) {
+					// If list of template is empty
+					$out .= '<div class="center" style="padding: 0px 0 12px 0">' . "\n";
+					$out .= '<span class="opacitymedium">' . $langs->trans('SelectMailModel') . ':</span> ';
+					$out .= '<select name="modelmailselected" disabled="disabled"><option value="none">' . $langs->trans("NoTemplateDefined") . '</option></select>'; // Do not put 'disabled' on 'option' tag, it is already on 'select' and it makes chrome crazy.
+					if ($user->admin) {
+						$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup') . ' - ' . $langs->transnoentitiesnoconv('EMails')), 1);
+					}
+					$out .= ' &nbsp; ';
+					$out .= '<input type="submit" class="button reposition smallpaddingimp" value="' . $langs->trans('Apply') . '" name="modelselected" disabled="disabled" id="modelselected">';
+					$out .= ' &nbsp; ';
+					$out .= '</div>';
+				} else {
+					$out .= '<!-- No template available for $this->param["models"] = ' . $this->param['models'] . ' -->';
+				}
+
+
+				$out .= '<table class="tableforemailform boxtablenotop centpercent">' . "\n";
+
+				// Substitution array/string
+				$helpforsubstitution = '';
+				if (is_array($this->substit) && count($this->substit)) {
+					$helpforsubstitution .= $langs->trans('AvailableVariables') . ' :<br><br><span class="small">' . "\n";
+				}
+				foreach ($this->substit as $key => $val) {
+					// Do not show deprecated variables into the tooltip help of substitution variables
+					if (in_array($key, array('__NEWREF__', '__REFCLIENT__', '__REFSUPPLIER__', '__SUPPLIER_ORDER_DATE_DELIVERY__', '__SUPPLIER_ORDER_DELAY_DELIVERY__'))) {
+						continue;
+					}
+					$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">';
+					if (is_numeric($this->withsubstit)) {
+						$out .= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // Old usage
+					} else {
+						$out .= $form->textwithpicto($langs->trans('AvailableVariables'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // New usage
+					}
+					$out .= "</td></tr>\n";
+				}*/
+
+				// From
+				if (!empty($this->withfrom)) {
+					if (!empty($this->withfromreadonly)) {
+						$out .= '<tr><td class="fieldrequired minwidth200">' . $langs->trans("MailFrom") . '</td><td>';
+
+						// $this->fromtype is the default value to use to select sender
+						if (!($this->fromtype === 'user' && $this->fromid > 0)
+							&& !($this->fromtype === 'company')
+							&& !($this->fromtype === 'robot')
+							&& !preg_match('/user_aliases/', $this->fromtype)
+							&& !preg_match('/global_aliases/', $this->fromtype)
+							&& !preg_match('/senderprofile/', $this->fromtype)
+						) {
+							// Use this->fromname and this->frommail or error if not defined
+							$out .= $this->fromname;
+							if ($this->frommail) {
+								$out .= ' &lt;' . $this->frommail . '&gt;';
+							} else {
+								if ($this->fromtype) {
+									$langs->load('errors');
+									$out .= '<span class="warning"> &lt;' . $langs->trans('ErrorNoMailDefinedForThisUser') . '&gt; </span>';
+								}
+							}
+						} else {
+							$liste = array();
+
+							// Add user email
+							if (empty($user->email)) {
 								$langs->load('errors');
-								$out .= '<span class="warning"> &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt; </span>';
+								$s = $user->getFullName($langs) . ' &lt;' . $langs->trans('ErrorNoMailDefinedForThisUser') . '&gt;';
+							} else {
+								$s = $user->getFullName($langs) . ' &lt;' . $user->email . '&gt;';
 							}
-						}
-					} else {
-						$liste = array();
+							$liste['user'] = array('label' => $s, 'data-html' => $s);
 
-						// Add user email
-						if (empty($user->email)) {
-							$langs->load('errors');
-							$s = $user->getFullName($langs).' &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt;';
-						} else {
-							$s = $user->getFullName($langs).' &lt;'.$user->email.'&gt;';
-						}
-						$liste['user'] = array('label' => $s, 'data-html' => $s);
-
-						// Add also company main email
-						if (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {
-							$s = (!getDolGlobalString('MAIN_INFO_SOCIETE_NOM') ? $conf->global->MAIN_INFO_SOCIETE_EMAIL : $conf->global->MAIN_INFO_SOCIETE_NOM).' &lt;' . getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'&gt;';
-							$liste['company'] = array('label' => $s, 'data-html' => $s);
-						}
-
-						// Add also email aliases if there is some
-						$listaliases = array(
-							'user_aliases' => (empty($user->email_aliases) ? '' : $user->email_aliases),
-							'global_aliases' => getDolGlobalString('MAIN_INFO_SOCIETE_MAIL_ALIASES'),
-						);
-
-						if (!empty($arraydefaultmessage->email_from)) {
-							$templatemailfrom = ' &lt;'.$arraydefaultmessage->email_from.'&gt;';
-							$liste['from_template_'.GETPOST('modelmailselected')] = array('label' => $templatemailfrom, 'data-html' => $templatemailfrom);
-						}
-
-						// Also add robot email
-						if (!empty($this->fromalsorobot)) {
-							if (getDolGlobalString('MAIN_MAIL_EMAIL_FROM') && getDolGlobalString('MAIN_MAIL_EMAIL_FROM') != getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {
-								$s = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
-								if ($this->frommail) {
-									$s .= ' &lt;' . getDolGlobalString('MAIN_MAIL_EMAIL_FROM').'&gt;';
-								}
-								$liste['main_from'] = array('label' => $s, 'data-html' => $s);
+							// Add also company main email
+							if (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {
+								$s = (!getDolGlobalString('MAIN_INFO_SOCIETE_NOM') ? $conf->global->MAIN_INFO_SOCIETE_EMAIL : $conf->global->MAIN_INFO_SOCIETE_NOM) . ' &lt;' . getDolGlobalString('MAIN_INFO_SOCIETE_MAIL') . '&gt;';
+								$liste['company'] = array('label' => $s, 'data-html' => $s);
 							}
-						}
 
-						// Add also email aliases from the c_email_senderprofile table
-						$sql = "SELECT rowid, label, email FROM ".$this->db->prefix()."c_email_senderprofile";
-						$sql .= " WHERE active = 1 AND (private = 0 OR private = ".((int) $user->id).")";
-						$sql .= " ORDER BY position";
-						$resql = $this->db->query($sql);
-						if ($resql) {
-							$num = $this->db->num_rows($resql);
-							$i = 0;
-							while ($i < $num) {
-								$obj = $this->db->fetch_object($resql);
-								if ($obj) {
-									$listaliases['senderprofile_'.$obj->rowid] = $obj->label.' <'.$obj->email.'>';
-								}
-								$i++;
+							// Add also email aliases if there is some
+							$listaliases = array(
+								'user_aliases' => (empty($user->email_aliases) ? '' : $user->email_aliases),
+								'global_aliases' => getDolGlobalString('MAIN_INFO_SOCIETE_MAIL_ALIASES'),
+							);
+
+							if (!empty($arraydefaultmessage->email_from)) {
+								$templatemailfrom = ' &lt;' . $arraydefaultmessage->email_from . '&gt;';
+								$liste['from_template_' . GETPOST('modelmailselected')] = array('label' => $templatemailfrom, 'data-html' => $templatemailfrom);
 							}
-						} else {
-							dol_print_error($this->db);
-						}
 
-						foreach ($listaliases as $typealias => $listalias) {
-							$posalias = 0;
-							$listaliasarray = explode(',', $listalias);
-							foreach ($listaliasarray as $listaliasval) {
-								$posalias++;
-								$listaliasval = trim($listaliasval);
-								if ($listaliasval) {
-									$listaliasval = preg_replace('/</', '&lt;', $listaliasval);
-									$listaliasval = preg_replace('/>/', '&gt;', $listaliasval);
-									if (!preg_match('/&lt;/', $listaliasval)) {
-										$listaliasval = '&lt;'.$listaliasval.'&gt;';
+							// Also add robot email
+							if (!empty($this->fromalsorobot)) {
+								if (getDolGlobalString('MAIN_MAIL_EMAIL_FROM') && getDolGlobalString('MAIN_MAIL_EMAIL_FROM') != getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {
+									$s = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
+									if ($this->frommail) {
+										$s .= ' &lt;' . getDolGlobalString('MAIN_MAIL_EMAIL_FROM') . '&gt;';
 									}
-									$liste[$typealias.'_'.$posalias] = array('label' => $listaliasval, 'data-html' => $listaliasval);
+									$liste['main_from'] = array('label' => $s, 'data-html' => $s);
 								}
 							}
-						}
 
-						// Using ajaxcombo here make the '<email>' no more visible on list because <emailofuser> is not a valid html tag,
-						// so we transform before each record into $liste to be printable with ajaxcombo by replacing <> into ()
-						// $liste['senderprofile_0_0'] = array('label'=>'rrr', 'data-html'=>'rrr &lt;aaaa&gt;');
-						foreach ($liste as $key => $val) {
-							if (!empty($liste[$key]['data-html'])) {
-								$liste[$key]['data-html'] = str_replace(array('&lt;', '<', '&gt;', '>'), array('__LTCHAR__', '__LTCHAR__', '__GTCHAR__', '__GTCHAR__'), $liste[$key]['data-html']);
-								$liste[$key]['data-html'] = str_replace(array('__LTCHAR__', '__GTCHAR__'), array('<span class="opacitymedium">(', ')</span>'), $liste[$key]['data-html']);
+							// Add also email aliases from the c_email_senderprofile table
+							$sql = "SELECT rowid, label, email FROM " . $this->db->prefix() . "c_email_senderprofile";
+							$sql .= " WHERE active = 1 AND (private = 0 OR private = " . ((int)$user->id) . ")";
+							$sql .= " ORDER BY position";
+							$resql = $this->db->query($sql);
+							if ($resql) {
+								$num = $this->db->num_rows($resql);
+								$i = 0;
+								while ($i < $num) {
+									$obj = $this->db->fetch_object($resql);
+									if ($obj) {
+										$listaliases['senderprofile_' . $obj->rowid] = $obj->label . ' <' . $obj->email . '>';
+									}
+									$i++;
+								}
+							} else {
+								dol_print_error($this->db);
 							}
+
+							foreach ($listaliases as $typealias => $listalias) {
+								$posalias = 0;
+								$listaliasarray = explode(',', $listalias);
+								foreach ($listaliasarray as $listaliasval) {
+									$posalias++;
+									$listaliasval = trim($listaliasval);
+									if ($listaliasval) {
+										$listaliasval = preg_replace('/</', '&lt;', $listaliasval);
+										$listaliasval = preg_replace('/>/', '&gt;', $listaliasval);
+										if (!preg_match('/&lt;/', $listaliasval)) {
+											$listaliasval = '&lt;' . $listaliasval . '&gt;';
+										}
+										$liste[$typealias . '_' . $posalias] = array('label' => $listaliasval, 'data-html' => $listaliasval);
+									}
+								}
+							}
+
+							// Using ajaxcombo here make the '<email>' no more visible on list because <emailofuser> is not a valid html tag,
+							// so we transform before each record into $liste to be printable with ajaxcombo by replacing <> into ()
+							// $liste['senderprofile_0_0'] = array('label'=>'rrr', 'data-html'=>'rrr &lt;aaaa&gt;');
+							foreach ($liste as $key => $val) {
+								if (!empty($liste[$key]['data-html'])) {
+									$liste[$key]['data-html'] = str_replace(array('&lt;', '<', '&gt;', '>'), array('__LTCHAR__', '__LTCHAR__', '__GTCHAR__', '__GTCHAR__'), $liste[$key]['data-html']);
+									$liste[$key]['data-html'] = str_replace(array('__LTCHAR__', '__GTCHAR__'), array('<span class="opacitymedium">(', ')</span>'), $liste[$key]['data-html']);
+								}
+							}
+							$out .= ' ' . $form->selectarray('fromtype', $liste, empty($arraydefaultmessage->email_from) ? $this->fromtype : 'from_template_' . GETPOST('modelmailselected'), 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 1, '', $disablebademails);
 						}
-						$out .= ' '.$form->selectarray('fromtype', $liste, empty($arraydefaultmessage->email_from) ? $this->fromtype : 'from_template_'.GETPOST('modelmailselected'), 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 1, '', $disablebademails);
-					}
 
-					$out .= "</td></tr>\n";
-				} else {
-					$out .= '<tr><td class="fieldrequired width200">'.$langs->trans("MailFrom")."</td><td>";
-					$out .= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" class="maxwidth200onsmartphone" value="'.$this->fromname.'" />';
-					$out .= '&nbsp; &nbsp; ';
-					$out .= $langs->trans("EMail").':&lt;<input type="text" id="frommail" name="frommail" class="maxwidth200onsmartphone" value="'.$this->frommail.'" />&gt;';
-					$out .= "</td></tr>\n";
-				}
-			}
-
-			// To
-			if (!empty($this->withto) || is_array($this->withto)) {
-				$out .= $this->getHtmlForTo();
-			}
-
-			// To User
-			if (!empty($this->withtouser) && is_array($this->withtouser) && getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT')) {
-				$out .= '<tr><td>';
-				$out .= $langs->trans("MailToUsers");
-				$out .= '</td><td>';
-
-				// multiselect array convert html entities into options tags, even if we don't want this, so we encode them a second time
-				$tmparray = $this->withtouser;
-				foreach ($tmparray as $key => $val) {
-					$tmparray[$key] = dol_htmlentities($tmparray[$key], 0, 'UTF-8', true);
-				}
-				$withtoselected = GETPOST("receiveruser", 'array'); // Array of selected value
-				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend') {
-					$withtoselected = array_keys($tmparray);
-				}
-				$out .= $form->multiselectarray("receiveruser", $tmparray, $withtoselected, 0, 0, 'inline-block minwidth500', 0, "");
-				$out .= "</td></tr>\n";
-			}
-
-			// With option for one email per recipient
-			if (!empty($this->withoptiononeemailperrecipient)) {
-				if (abs($this->withoptiononeemailperrecipient) == 1) {
-					$out .= '<tr><td class="minwidth200">';
-					$out .= $langs->trans("GroupEmails");
-					$out .= '</td><td>';
-					$out .= ' <input type="checkbox" id="oneemailperrecipient" value="1" name="oneemailperrecipient"'.($this->withoptiononeemailperrecipient > 0 ? ' checked="checked"' : '').'> ';
-					$out .= '<label for="oneemailperrecipient">';
-					$out .= $form->textwithpicto($langs->trans("OneEmailPerRecipient"), $langs->trans("WarningIfYouCheckOneRecipientPerEmail"), 1, 'help');
-					$out .= '</label>';
-					//$out .= '<span class="hideonsmartphone opacitymedium">';
-					//$out .= ' - ';
-					//$out .= $langs->trans("WarningIfYouCheckOneRecipientPerEmail");
-					//$out .= '</span>';
-					if (getDolGlobalString('MASS_ACTION_EMAIL_ON_DIFFERENT_THIRPARTIES_ADD_CUSTOM_EMAIL')) {
-						if (!empty($this->withto) && !is_array($this->withto)) {
-							$out .= ' '.$langs->trans("or").' <input type="email" name="emailto" value="">';
-						}
-					}
-					$out .= '</td></tr>';
-				} else {
-					$out .= '<tr><td><input type="hidden" name="oneemailperrecipient" value="1"></td><td></td></tr>';
-				}
-			}
-
-			// CC
-			if (!empty($this->withtocc) || is_array($this->withtocc)) {
-				$out .= $this->getHtmlForCc();
-			}
-
-			// To User cc
-			if (!empty($this->withtoccuser) && is_array($this->withtoccuser) && getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT')) {
-				$out .= '<tr><td>';
-				$out .= $langs->trans("MailToCCUsers");
-				$out .= '</td><td>';
-
-				// multiselect array convert html entities into options tags, even if we don't want this, so we encode them a second time
-				$tmparray = $this->withtoccuser;
-				foreach ($tmparray as $key => $val) {
-					$tmparray[$key] = dol_htmlentities($tmparray[$key], 0, 'UTF-8', true);
-				}
-				$withtoselected = GETPOST("receiverccuser", 'array'); // Array of selected value
-				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend') {
-					$withtoselected = array_keys($tmparray);
-				}
-				$out .= $form->multiselectarray("receiverccuser", $tmparray, $withtoselected, 0, 0, 'inline-block minwidth500', 0, "");
-				$out .= "</td></tr>\n";
-			}
-
-			// CCC
-			if (!empty($this->withtoccc) || is_array($this->withtoccc)) {
-				$out .= $this->getHtmlForWithCcc();
-			}
-
-			// Replyto
-			if (!empty($this->withreplyto)) {
-				if ($this->withreplytoreadonly) {
-					$out .= '<input type="hidden" id="replyname" name="replyname" value="'.$this->replytoname.'" />';
-					$out .= '<input type="hidden" id="replymail" name="replymail" value="'.$this->replytomail.'" />';
-					$out .= "<tr><td>".$langs->trans("MailReply")."</td><td>".$this->replytoname.($this->replytomail ? (" &lt;".$this->replytomail."&gt;") : "");
-					$out .= "</td></tr>\n";
-				}
-			}
-
-			// Errorsto
-			if (!empty($this->witherrorsto)) {
-				$out .= $this->getHtmlForWithErrorsTo();
-			}
-
-			// Ask delivery receipt
-			if (!empty($this->withdeliveryreceipt) && getDolGlobalInt('MAIN_EMAIL_SUPPORT_ACK')) {
-				$out .= $this->getHtmlForDeliveryreceipt();
-			}
-
-			// Topic
-			if (!empty($this->withtopic)) {
-				$out .= $this->getHtmlForTopic($arraydefaultmessage, $helpforsubstitution);
-			}
-
-			// Attached files
-			if (!empty($this->withfile)) {
-				$out .= '<tr>';
-				$out .= '<td class="tdtop">'.$langs->trans("MailFile").'</td>';
-
-				$out .= '<td>';
-
-				if ($this->withmaindocfile) {
-					// withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked)
-					if (GETPOSTISSET('sendmail')) {
-						$this->withmaindocfile = (GETPOST('addmaindocfile', 'alpha') ? -1 : 1);
-					} elseif (is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-						// If a template was selected, we use setup of template to define if join file checkbox is selected or not.
-						$this->withmaindocfile = ($arraydefaultmessage->joinfiles ? -1 : 1);
-					}
-				}
-
-				if (!empty($this->withmaindocfile)) {
-					if ($this->withmaindocfile == 1) {
-						$out .= '<input type="checkbox" id="addmaindocfile" name="addmaindocfile" value="1" />';
-					} elseif ($this->withmaindocfile == -1) {
-						$out .= '<input type="checkbox" id="addmaindocfile" name="addmaindocfile" value="1" checked="checked" />';
-					}
-					if (getDolGlobalString('MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND')) {
-						$out .= ' <label for="addmaindocfile">'.$langs->trans("JoinMainDocOrLastGenerated").'.</label><br>';
+						$out .= "</td></tr>\n";
 					} else {
-						$out .= ' <label for="addmaindocfile">'.$langs->trans("JoinMainDoc").'.</label><br>';
+						$out .= '<tr><td class="fieldrequired width200">' . $langs->trans("MailFrom") . "</td><td>";
+						$out .= $langs->trans("Name") . ':<input type="text" id="fromname" name="fromname" class="maxwidth200onsmartphone" value="' . $this->fromname . '" />';
+						$out .= '&nbsp; &nbsp; ';
+						$out .= $langs->trans("EMail") . ':&lt;<input type="text" id="frommail" name="frommail" class="maxwidth200onsmartphone" value="' . $this->frommail . '" />&gt;';
+						$out .= "</td></tr>\n";
 					}
 				}
 
-				if (is_numeric($this->withfile)) {
-					// TODO Trick to have param removedfile containing nb of file to delete. But this does not works without javascript
-					$out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
-					$out .= '<script nonce="'.getNonce().'" type="text/javascript">';
-					$out .= 'jQuery(document).ready(function () {';
-					$out .= '    jQuery(".removedfile").click(function() {';
-					$out .= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
-					$out .= '    });';
-					$out .= '})';
-					$out .= '</script>'."\n";
-					if (count($listofpaths)) {
-						foreach ($listofpaths as $key => $val) {
-							$relativepathtofile = substr($val, (strlen(DOL_DATA_ROOT) - strlen($val)));
+				// To
+				if (!empty($this->withto) || is_array($this->withto)) {
+					$out .= $this->getHtmlForTo();
+				}
 
-							$entity = (isset($this->param['object_entity']) ? $this->param['object_entity'] : $conf->entity);
-							if ($entity > 1) {
-								$relativepathtofile = str_replace('/'.$entity.'/', '/', $relativepathtofile);
+				// To User
+				if (!empty($this->withtouser) && is_array($this->withtouser) && getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT')) {
+					$out .= '<tr><td>';
+					$out .= $langs->trans("MailToUsers");
+					$out .= '</td><td>';
+
+					// multiselect array convert html entities into options tags, even if we don't want this, so we encode them a second time
+					$tmparray = $this->withtouser;
+					foreach ($tmparray as $key => $val) {
+						$tmparray[$key] = dol_htmlentities($tmparray[$key], 0, 'UTF-8', true);
+					}
+					$withtoselected = GETPOST("receiveruser", 'array'); // Array of selected value
+					if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend') {
+						$withtoselected = array_keys($tmparray);
+					}
+					$out .= $form->multiselectarray("receiveruser", $tmparray, $withtoselected, 0, 0, 'inline-block minwidth500', 0, "");
+					$out .= "</td></tr>\n";
+				}
+
+				// With option for one email per recipient
+				if (!empty($this->withoptiononeemailperrecipient)) {
+					if (abs($this->withoptiononeemailperrecipient) == 1) {
+						$out .= '<tr><td class="minwidth200">';
+						$out .= $langs->trans("GroupEmails");
+						$out .= '</td><td>';
+						$out .= ' <input type="checkbox" id="oneemailperrecipient" value="1" name="oneemailperrecipient"' . ($this->withoptiononeemailperrecipient > 0 ? ' checked="checked"' : '') . '> ';
+						$out .= '<label for="oneemailperrecipient">';
+						$out .= $form->textwithpicto($langs->trans("OneEmailPerRecipient"), $langs->trans("WarningIfYouCheckOneRecipientPerEmail"), 1, 'help');
+						$out .= '</label>';
+						//$out .= '<span class="hideonsmartphone opacitymedium">';
+						//$out .= ' - ';
+						//$out .= $langs->trans("WarningIfYouCheckOneRecipientPerEmail");
+						//$out .= '</span>';
+						if (getDolGlobalString('MASS_ACTION_EMAIL_ON_DIFFERENT_THIRPARTIES_ADD_CUSTOM_EMAIL')) {
+							if (!empty($this->withto) && !is_array($this->withto)) {
+								$out .= ' ' . $langs->trans("or") . ' <input type="email" name="emailto" value="">';
 							}
-							// Try to extract data from full path
-							$formfile_params = array();
-							preg_match('#^(/)(\w+)(/)(.+)$#', $relativepathtofile, $formfile_params);
-
-							$out .= '<div id="attachfile_'.$key.'">';
-							// Preview of attachment
-							$out .= img_mime($listofnames[$key]).$listofnames[$key];
-
-							$out .= ' '.$formfile->showPreview(array(), $formfile_params[2], $formfile_params[4], 0, ($entity == 1 ? '' : 'entity='.((int) $entity)));
-
-							if (!$this->withfilereadonly) {
-								$out .= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key + 1).'" class="removedfile input-nobottom" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
-								//$out.= ' <a href="'.$_SERVER["PHP_SELF"].'?removedfile='.($key+1).'&id=removedfile_'.$key.'">'.img_delete($langs->trans("Remove"), 'id="removedfile_'.$key.'" name="removedfile_'.$key.'"', 'removedfile input-nobottom').'</a>';
-							}
-							$out .= '<br></div>';
 						}
-					} /*elseif (empty($this->withmaindocfile)) {
+						$out .= '</td></tr>';
+					} else {
+						$out .= '<tr><td><input type="hidden" name="oneemailperrecipient" value="1"></td><td></td></tr>';
+					}
+				}
+
+				// CC
+				if (!empty($this->withtocc) || is_array($this->withtocc)) {
+					$out .= $this->getHtmlForCc();
+				}
+
+				// To User cc
+				if (!empty($this->withtoccuser) && is_array($this->withtoccuser) && getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT')) {
+					$out .= '<tr><td>';
+					$out .= $langs->trans("MailToCCUsers");
+					$out .= '</td><td>';
+
+					// multiselect array convert html entities into options tags, even if we don't want this, so we encode them a second time
+					$tmparray = $this->withtoccuser;
+					foreach ($tmparray as $key => $val) {
+						$tmparray[$key] = dol_htmlentities($tmparray[$key], 0, 'UTF-8', true);
+					}
+					$withtoselected = GETPOST("receiverccuser", 'array'); // Array of selected value
+					if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend') {
+						$withtoselected = array_keys($tmparray);
+					}
+					$out .= $form->multiselectarray("receiverccuser", $tmparray, $withtoselected, 0, 0, 'inline-block minwidth500', 0, "");
+					$out .= "</td></tr>\n";
+				}
+
+				// CCC
+				if (!empty($this->withtoccc) || is_array($this->withtoccc)) {
+					$out .= $this->getHtmlForWithCcc();
+				}
+
+				// Replyto
+				if (!empty($this->withreplyto)) {
+					if ($this->withreplytoreadonly) {
+						$out .= '<input type="hidden" id="replyname" name="replyname" value="' . $this->replytoname . '" />';
+						$out .= '<input type="hidden" id="replymail" name="replymail" value="' . $this->replytomail . '" />';
+						$out .= "<tr><td>" . $langs->trans("MailReply") . "</td><td>" . $this->replytoname . ($this->replytomail ? (" &lt;" . $this->replytomail . "&gt;") : "");
+						$out .= "</td></tr>\n";
+					}
+				}
+
+				// Errorsto
+				if (!empty($this->witherrorsto)) {
+					$out .= $this->getHtmlForWithErrorsTo();
+				}
+
+				// Ask delivery receipt
+				if (!empty($this->withdeliveryreceipt) && getDolGlobalInt('MAIN_EMAIL_SUPPORT_ACK')) {
+					$out .= $this->getHtmlForDeliveryreceipt();
+				}
+
+				// Topic
+				if (!empty($this->withtopic)) {
+					$out .= $this->getHtmlForTopic($arraydefaultmessage, $helpforsubstitution);
+				}
+
+				// Attached files
+				if (!empty($this->withfile)) {
+					$out .= '<tr>';
+					$out .= '<td class="tdtop">' . $langs->trans("MailFile") . '</td>';
+
+					$out .= '<td>';
+
+					if ($this->withmaindocfile) {
+						// withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked)
+						if (GETPOSTISSET('sendmail')) {
+							$this->withmaindocfile = (GETPOST('addmaindocfile', 'alpha') ? -1 : 1);
+						} elseif (is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+							// If a template was selected, we use setup of template to define if join file checkbox is selected or not.
+							$this->withmaindocfile = ($arraydefaultmessage->joinfiles ? -1 : 1);
+						}
+					}
+
+					if (!empty($this->withmaindocfile)) {
+						if ($this->withmaindocfile == 1) {
+							$out .= '<input type="checkbox" id="addmaindocfile" name="addmaindocfile" value="1" />';
+						} elseif ($this->withmaindocfile == -1) {
+							$out .= '<input type="checkbox" id="addmaindocfile" name="addmaindocfile" value="1" checked="checked" />';
+						}
+						if (getDolGlobalString('MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND')) {
+							$out .= ' <label for="addmaindocfile">' . $langs->trans("JoinMainDocOrLastGenerated") . '.</label><br>';
+						} else {
+							$out .= ' <label for="addmaindocfile">' . $langs->trans("JoinMainDoc") . '.</label><br>';
+						}
+					}
+
+					if (is_numeric($this->withfile)) {
+						// TODO Trick to have param removedfile containing nb of file to delete. But this does not works without javascript
+						$out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">' . "\n";
+						$out .= '<script nonce="' . getNonce() . '" type="text/javascript">';
+						$out .= 'jQuery(document).ready(function () {';
+						$out .= '    jQuery(".removedfile").click(function() {';
+						$out .= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
+						$out .= '    });';
+						$out .= '})';
+						$out .= '</script>' . "\n";
+						if (count($listofpaths)) {
+							foreach ($listofpaths as $key => $val) {
+								$relativepathtofile = substr($val, (strlen(DOL_DATA_ROOT) - strlen($val)));
+
+								$entity = (isset($this->param['object_entity']) ? $this->param['object_entity'] : $conf->entity);
+								if ($entity > 1) {
+									$relativepathtofile = str_replace('/' . $entity . '/', '/', $relativepathtofile);
+								}
+								// Try to extract data from full path
+								$formfile_params = array();
+								preg_match('#^(/)(\w+)(/)(.+)$#', $relativepathtofile, $formfile_params);
+
+								$out .= '<div id="attachfile_' . $key . '">';
+								// Preview of attachment
+								$out .= img_mime($listofnames[$key]) . $listofnames[$key];
+
+								$out .= ' ' . $formfile->showPreview(array(), $formfile_params[2], $formfile_params[4], 0, ($entity == 1 ? '' : 'entity=' . ((int)$entity)));
+
+								if (!$this->withfilereadonly) {
+									$out .= ' <input type="image" style="border: 0px;" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/delete.png" value="' . ($key + 1) . '" class="removedfile input-nobottom" id="removedfile_' . $key . '" name="removedfile_' . $key . '" />';
+									//$out.= ' <a href="'.$_SERVER["PHP_SELF"].'?removedfile='.($key+1).'&id=removedfile_'.$key.'">'.img_delete($langs->trans("Remove"), 'id="removedfile_'.$key.'" name="removedfile_'.$key.'"', 'removedfile input-nobottom').'</a>';
+								}
+								$out .= '<br></div>';
+							}
+						} /*elseif (empty($this->withmaindocfile)) {
 						//$out .= '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';
 					}*/
-					if ($this->withfile == 2) {
-						$maxfilesizearray = getMaxFileSizeArray();
-						$maxmin = $maxfilesizearray['maxmin'];
-						if ($maxmin > 0) {
-							$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+						if ($this->withfile == 2) {
+							$maxfilesizearray = getMaxFileSizeArray();
+							$maxmin = $maxfilesizearray['maxmin'];
+							if ($maxmin > 0) {
+								$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">';    // MAX_FILE_SIZE must precede the field type=file
+							}
+							// Can add other files
+							if (!getDolGlobalString('FROM_MAIL_DONT_USE_INPUT_FILE_MULTIPLE')) {
+								$out .= '<input type="file" class="flat" id="addedfile" name="addedfile[]" value="' . $langs->trans("Upload") . '" multiple />';
+							} else {
+								$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="' . $langs->trans("Upload") . '" />';
+							}
+							$out .= ' ';
+							$out .= '<input type="submit" class="button smallpaddingimp" id="' . $addfileaction . '" name="' . $addfileaction . '" value="' . $langs->trans("MailingAddFile") . '" />';
 						}
-						// Can add other files
-						if (!getDolGlobalString('FROM_MAIL_DONT_USE_INPUT_FILE_MULTIPLE')) {
-							$out .= '<input type="file" class="flat" id="addedfile" name="addedfile[]" value="'.$langs->trans("Upload").'" multiple />';
-						} else {
-							$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
-						}
-						$out .= ' ';
-						$out .= '<input type="submit" class="button smallpaddingimp" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
+					} else {
+						$out .= $this->withfile;
 					}
-				} else {
-					$out .= $this->withfile;
+
+					$out .= "</td></tr>\n";
 				}
 
-				$out .= "</td></tr>\n";
-			}
-
-			// Message (+ Links to choose layout or ai prompt)
-			if (!empty($this->withbody)) {
-				$defaultmessage = GETPOST('message', 'restricthtml');
-				if (!GETPOST('modelselected', 'alpha') || GETPOST('modelmailselected') != '-1') {
-					if ($arraydefaultmessage && $arraydefaultmessage->content) {
-						$defaultmessage = $arraydefaultmessage->content;
-					} elseif (!is_numeric($this->withbody)) {
-						$defaultmessage = $this->withbody;
+				// Message (+ Links to choose layout or ai prompt)
+				if (!empty($this->withbody)) {
+					$defaultmessage = GETPOST('message', 'restricthtml');
+					if (!GETPOST('modelselected', 'alpha') || GETPOST('modelmailselected') != '-1') {
+						if ($arraydefaultmessage && $arraydefaultmessage->content) {
+							$defaultmessage = $arraydefaultmessage->content;
+						} elseif (!is_numeric($this->withbody)) {
+							$defaultmessage = $this->withbody;
+						}
 					}
-				}
 
-				// Complete substitution array with the url to make online payment
-				$paymenturl = '';
-				// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
-				require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-				$validpaymentmethod = getValidOnlinePaymentMethods('');
-
-				if (empty($this->substit['__REF__'])) {  // @phan-suppress-current-line PhanTypeMismatchProperty
+					// Complete substitution array with the url to make online payment
 					$paymenturl = '';
-				} else {
-					$langs->loadLangs(array('paypal', 'other'));
-					$typeforonlinepayment = 'free';
-					if ($this->param["models"] == 'order' || $this->param["models"] == 'order_send') {
-						$typeforonlinepayment = 'order'; // TODO use detection on something else than template
-					}
-					if ($this->param["models"] == 'invoice' || $this->param["models"] == 'facture_send') {
-						$typeforonlinepayment = 'invoice'; // TODO use detection on something else than template
-					}
-					if ($this->param["models"] == 'member') {
-						$typeforonlinepayment = 'member'; // TODO use detection on something else than template
-					}
-					$url = getOnlinePaymentUrl(0, $typeforonlinepayment, $this->substit['__REF__']);
-					$paymenturl = $url;
-				}
+					// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
+					require_once DOL_DOCUMENT_ROOT . '/core/lib/payments.lib.php';
+					$validpaymentmethod = getValidOnlinePaymentMethods('');
 
-				if (count($validpaymentmethod) > 0 && $paymenturl) {
-					$langs->load('other');
-					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = str_replace('\n', "\n", $langs->transnoentities("PredefinedMailContentLink", $paymenturl));
-					$this->substit['__ONLINE_PAYMENT_URL__'] = $paymenturl;
-				} elseif (count($validpaymentmethod) > 0) {
-					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = '__ONLINE_PAYMENT_TEXT_AND_URL__';
-					$this->substit['__ONLINE_PAYMENT_URL__'] = '__ONLINE_PAYMENT_URL__';
-				} else {
-					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = '';
-					$this->substit['__ONLINE_PAYMENT_URL__'] = '';
-				}
-
-				$this->substit['__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__'] = '';
-
-				// Generate the string with the template for lines repeated and filled for each line
-				$lines = '';
-				$defaultlines = $arraydefaultmessage->content_lines;
-				if (isset($defaultlines)) {
-					foreach ($this->substit_lines as $lineid => $substit_line) {
-						$lines .= make_substitutions($defaultlines, $substit_line)."\n";
-					}
-				}
-				$this->substit['__LINES__'] = $lines;
-
-				$defaultmessage = str_replace('\n', "\n", $defaultmessage);
-
-				// Deal with format differences between message and some substitution variables (text / HTML)
-				$atleastonecomponentishtml = 0;
-				if (strpos($defaultmessage, '__USER_SIGNATURE__') !== false && dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
-					$atleastonecomponentishtml++;
-				}
-				if (strpos($defaultmessage, '__SENDEREMAIL_SIGNATURE__') !== false && dol_textishtml($this->substit['__SENDEREMAIL_SIGNATURE__'])) {
-					$atleastonecomponentishtml++;
-				}
-				if (strpos($defaultmessage, '__ONLINE_PAYMENT_TEXT_AND_URL__') !== false && dol_textishtml($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'])) {
-					$atleastonecomponentishtml++;
-				}
-				if (strpos($defaultmessage, '__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__') !== false && dol_textishtml($this->substit['__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__'])) {
-					$atleastonecomponentishtml++;
-				}
-				if (dol_textishtml($defaultmessage)) {
-					$atleastonecomponentishtml++;
-				}
-				if ($atleastonecomponentishtml) {
-					if (!dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
-						$this->substit['__USER_SIGNATURE__'] = dol_nl2br($this->substit['__USER_SIGNATURE__']);
-					}
-					if (!dol_textishtml($this->substit['__SENDEREMAIL_SIGNATURE__'])) {
-						$this->substit['__SENDEREMAIL_SIGNATURE__'] = dol_nl2br($this->substit['__SENDEREMAIL_SIGNATURE__']);
-					}
-					if (!dol_textishtml($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'])) {
-						$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = dol_nl2br($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__']);
-					}
-					if (!dol_textishtml($defaultmessage)) {
-						$defaultmessage = dol_nl2br($defaultmessage);
-					}
-				}
-
-				if (GETPOSTISSET("message") && !GETPOST('modelselected')) {
-					$defaultmessage = GETPOST("message", "restricthtml");
-				} else {
-					$defaultmessage = make_substitutions($defaultmessage, $this->substit);
-					// Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty)
-					$defaultmessage = preg_replace("/^(<br>)+/", "", $defaultmessage);
-					$defaultmessage = preg_replace("/^\n+/", "", $defaultmessage);
-				}
-
-				$out .= '<tr>';
-				$out .= '<td class="tdtop">';
-				$out .= $form->textwithpicto($langs->trans('MailText'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody');
-				$out .= '</td>';
-				$out .= '<td class="tdtop">';
-
-				$formmail = $this;
-				$showlinktolayout = ($formmail->withfckeditor && getDolGlobalInt('MAIN_EMAIL_USE_LAYOUT')) ? $formmail->withlayout : '';
-				$showlinktolayoutlabel = $langs->trans("FillMessageWithALayout");
-				$showlinktoai = ($formmail->withaiprompt && isModEnabled('ai')) ? 'textgenerationemail' : '';
-				$showlinktoailabel = $langs->trans("FillMessageWithAIContent");
-				$formatforouput = '';
-				$htmlname = 'message';
-
-				// Fill $out
-				include DOL_DOCUMENT_ROOT.'/core/tpl/formlayoutai.tpl.php';
-
-				$out .= '</td>';
-				$out .= '</tr>';
-
-				$out .= '<tr>';
-				$out .= '<td colspan="2">';
-				if ($this->withbodyreadonly) {
-					$out .= nl2br($defaultmessage);
-					$out .= '<input type="hidden" id="message" name="message" disabled value="'.$defaultmessage.'" />';
-				} else {
-					if (!isset($this->ckeditortoolbar)) {
-						$this->ckeditortoolbar = 'dolibarr_mailings';
+					if (empty($this->substit['__REF__'])) {  // @phan-suppress-current-line PhanTypeMismatchProperty
+						$paymenturl = '';
+					} else {
+						$langs->loadLangs(array('paypal', 'other'));
+						$typeforonlinepayment = 'free';
+						if ($this->param["models"] == 'order' || $this->param["models"] == 'order_send') {
+							$typeforonlinepayment = 'order'; // TODO use detection on something else than template
+						}
+						if ($this->param["models"] == 'invoice' || $this->param["models"] == 'facture_send') {
+							$typeforonlinepayment = 'invoice'; // TODO use detection on something else than template
+						}
+						if ($this->param["models"] == 'member') {
+							$typeforonlinepayment = 'member'; // TODO use detection on something else than template
+						}
+						$url = getOnlinePaymentUrl(0, $typeforonlinepayment, $this->substit['__REF__']);
+						$paymenturl = $url;
 					}
 
-					// Editor wysiwyg
-					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-					if ($this->withfckeditor == -1) {
-						if (getDolGlobalString('FCKEDITOR_ENABLE_MAIL')) {
-							$this->withfckeditor = 1;
-						} else {
-							$this->withfckeditor = 0;
+					if (count($validpaymentmethod) > 0 && $paymenturl) {
+						$langs->load('other');
+						$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = str_replace('\n', "\n", $langs->transnoentities("PredefinedMailContentLink", $paymenturl));
+						$this->substit['__ONLINE_PAYMENT_URL__'] = $paymenturl;
+					} elseif (count($validpaymentmethod) > 0) {
+						$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = '__ONLINE_PAYMENT_TEXT_AND_URL__';
+						$this->substit['__ONLINE_PAYMENT_URL__'] = '__ONLINE_PAYMENT_URL__';
+					} else {
+						$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = '';
+						$this->substit['__ONLINE_PAYMENT_URL__'] = '';
+					}
+
+					$this->substit['__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__'] = '';
+
+					// Generate the string with the template for lines repeated and filled for each line
+					$lines = '';
+					$defaultlines = $arraydefaultmessage->content_lines;
+					if (isset($defaultlines)) {
+						foreach ($this->substit_lines as $lineid => $substit_line) {
+							$lines .= make_substitutions($defaultlines, $substit_line) . "\n";
+						}
+					}
+					$this->substit['__LINES__'] = $lines;
+
+					$defaultmessage = str_replace('\n', "\n", $defaultmessage);
+
+					// Deal with format differences between message and some substitution variables (text / HTML)
+					$atleastonecomponentishtml = 0;
+					if (strpos($defaultmessage, '__USER_SIGNATURE__') !== false && dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
+						$atleastonecomponentishtml++;
+					}
+					if (strpos($defaultmessage, '__SENDEREMAIL_SIGNATURE__') !== false && dol_textishtml($this->substit['__SENDEREMAIL_SIGNATURE__'])) {
+						$atleastonecomponentishtml++;
+					}
+					if (strpos($defaultmessage, '__ONLINE_PAYMENT_TEXT_AND_URL__') !== false && dol_textishtml($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'])) {
+						$atleastonecomponentishtml++;
+					}
+					if (strpos($defaultmessage, '__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__') !== false && dol_textishtml($this->substit['__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__'])) {
+						$atleastonecomponentishtml++;
+					}
+					if (dol_textishtml($defaultmessage)) {
+						$atleastonecomponentishtml++;
+					}
+					if ($atleastonecomponentishtml) {
+						if (!dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
+							$this->substit['__USER_SIGNATURE__'] = dol_nl2br($this->substit['__USER_SIGNATURE__']);
+						}
+						if (!dol_textishtml($this->substit['__SENDEREMAIL_SIGNATURE__'])) {
+							$this->substit['__SENDEREMAIL_SIGNATURE__'] = dol_nl2br($this->substit['__SENDEREMAIL_SIGNATURE__']);
+						}
+						if (!dol_textishtml($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'])) {
+							$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = dol_nl2br($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__']);
+						}
+						if (!dol_textishtml($defaultmessage)) {
+							$defaultmessage = dol_nl2br($defaultmessage);
 						}
 					}
 
-					$doleditor = new DolEditor('message', $defaultmessage, '', 280, $this->ckeditortoolbar, 'In', true, true, $this->withfckeditor, 8, '95%');
-					$out .= $doleditor->Create(1);
+					if (GETPOSTISSET("message") && !GETPOST('modelselected')) {
+						$defaultmessage = GETPOST("message", "restricthtml");
+					} else {
+						$defaultmessage = make_substitutions($defaultmessage, $this->substit);
+						// Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty)
+						$defaultmessage = preg_replace("/^(<br>)+/", "", $defaultmessage);
+						$defaultmessage = preg_replace("/^\n+/", "", $defaultmessage);
+					}
+
+					$out .= '<tr>';
+					$out .= '<td class="tdtop">';
+					$out .= $form->textwithpicto($langs->trans('MailText'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody');
+					$out .= '</td>';
+					$out .= '<td class="tdtop">';
+
+					$formmail = $this;
+					$showlinktolayout = ($formmail->withfckeditor && getDolGlobalInt('MAIN_EMAIL_USE_LAYOUT')) ? $formmail->withlayout : '';
+					$showlinktolayoutlabel = $langs->trans("FillMessageWithALayout");
+					$showlinktoai = ($formmail->withaiprompt && isModEnabled('ai')) ? 'textgenerationemail' : '';
+					$showlinktoailabel = $langs->trans("FillMessageWithAIContent");
+					$formatforouput = '';
+					$htmlname = 'message';
+
+					// Fill $out
+					include DOL_DOCUMENT_ROOT . '/core/tpl/formlayoutai.tpl.php';
+
+					$out .= '</td>';
+					$out .= '</tr>';
+
+					$out .= '<tr>';
+					$out .= '<td colspan="2">';
+					if ($this->withbodyreadonly) {
+						$out .= nl2br($defaultmessage);
+						$out .= '<input type="hidden" id="message" name="message" disabled value="' . $defaultmessage . '" />';
+					} else {
+						if (!isset($this->ckeditortoolbar)) {
+							$this->ckeditortoolbar = 'dolibarr_mailings';
+						}
+
+						// Editor wysiwyg
+						require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+						if ($this->withfckeditor == -1) {
+							if (getDolGlobalString('FCKEDITOR_ENABLE_MAIL')) {
+								$this->withfckeditor = 1;
+							} else {
+								$this->withfckeditor = 0;
+							}
+						}
+
+						$doleditor = new DolEditor('message', $defaultmessage, '', 280, $this->ckeditortoolbar, 'In', true, true, $this->withfckeditor, 8, '95%');
+						$out .= $doleditor->Create(1);
+					}
+					$out .= "</td></tr>\n";
 				}
-				$out .= "</td></tr>\n";
-			}
 
-			$out .= '</table>'."\n";
+				$out .= '</table>' . "\n";
 
-			if ($this->withform == 1 || $this->withform == -1) {
-				$out .= '<div class="center">';
-				$out .= '<input type="submit" class="button button-add" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';
-				// Add a javascript test to avoid to forget to submit file before sending email
-				if ($this->withfile == 2 && $conf->use_javascript_ajax) {
-					$out .= ' onClick="if (document.mailform.addedfile.value != \'\') { alert(\''.dol_escape_js($langs->trans("FileWasNotUploaded")).'\'); return false; } else { return true; }"';
+				if ($this->withform == 1 || $this->withform == -1) {
+					$out .= '<div class="center">';
+					$out .= '<input type="submit" class="button button-add" id="sendmail" name="sendmail" value="' . $langs->trans("SendMail") . '"';
+					// Add a javascript test to avoid to forget to submit file before sending email
+					if ($this->withfile == 2 && $conf->use_javascript_ajax) {
+						$out .= ' onClick="if (document.mailform.addedfile.value != \'\') { alert(\'' . dol_escape_js($langs->trans("FileWasNotUploaded")) . '\'); return false; } else { return true; }"';
+					}
+					$out .= ' />';
+					if ($this->withcancel) {
+						$out .= '<input class="button button-cancel" type="submit" id="cancel" name="cancel" value="' . $langs->trans("Cancel") . '" />';
+					}
+					$out .= '</div>' . "\n";
 				}
-				$out .= ' />';
-				if ($this->withcancel) {
-					$out .= '<input class="button button-cancel" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';
+
+				if ($this->withform == 1) {
+					$out .= '</form>' . "\n";
 				}
-				$out .= '</div>'."\n";
-			}
 
-			if ($this->withform == 1) {
-				$out .= '</form>'."\n";
-			}
-
-			// Disable enter key if option MAIN_MAILFORM_DISABLE_ENTERKEY is set
-			if (getDolGlobalString('MAIN_MAILFORM_DISABLE_ENTERKEY')) {
-				$out .= '<script nonce="'.getNonce().'" type="text/javascript">';
-				$out .= 'jQuery(document).ready(function () {';
-				$out .= '	$(document).on("keypress", \'#mailform\', function (e) {		/* Note this is called at every key pressed ! */
+				// Disable enter key if option MAIN_MAILFORM_DISABLE_ENTERKEY is set
+				if (getDolGlobalString('MAIN_MAILFORM_DISABLE_ENTERKEY')) {
+					$out .= '<script nonce="' . getNonce() . '" type="text/javascript">';
+					$out .= 'jQuery(document).ready(function () {';
+					$out .= '	$(document).on("keypress", \'#mailform\', function (e) {		/* Note this is called at every key pressed ! */
 	    						var code = e.keyCode || e.which;
 	    						if (code == 13) {
 									console.log("Enter was intercepted and blocked");
@@ -1165,16 +1165,16 @@ class FormMail extends Form
 	        						return false;
 	    						}
 							});';
-				$out .= '		})';
-				$out .= '</script>';
+					$out .= '		})';
+					$out .= '</script>';
+				}
+
+				$out .= "<!-- End form mail -->\n";
+
+				return $out;
 			}
-
-			$out .= "<!-- End form mail -->\n";
-
-			return $out;
 		}
 	}
-
 	/**
 	 * get html For To
 	 *

From 0932c2e492169019a1dd5cd1c6c5c30f1c7e1f3a Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 24 Jan 2025 17:28:10 +0100
Subject: [PATCH 165/602] Debug v21

---
 htdocs/comm/action/class/actioncomm.class.php |   2 +-
 htdocs/comm/action/index.php                  | 259 ++---
 htdocs/comm/action/peruser.php                | 930 +++++++++++++++---
 htdocs/contact/card.php                       |   5 +-
 htdocs/holiday/list.php                       |   5 +-
 htdocs/langs/fr_FR/holiday.lang               |   2 +-
 6 files changed, 939 insertions(+), 264 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 6eb05106686..d198de99b1a 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1883,7 +1883,7 @@ class ActionComm extends CommonObject
 				$color = 'style="color: #'.$this->type_color.' !important;"';
 			}
 			if ($this->type_picto) {
-				$imgpicto = img_picto($titlealt.'rr', $this->type_picto, '', 0, 0, 0, '', ($morecss ? ' '.$morecss : ''));
+				$imgpicto = img_picto($titlealt, $this->type_picto, '', 0, 0, 0, '', ($morecss ? ' '.$morecss : ''));
 			} else {
 				if ($this->type_code == 'AC_RDV') {
 					$imgpicto = img_picto($titlealt, 'meeting', $color, 0, 0, 0, '', ($morecss ? ' '.$morecss : ''));
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 93ae98884a3..02737de7db2 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -33,14 +33,13 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
-if (isModEnabled('project')) {
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-}
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 /**
  * @var Conf $conf
@@ -50,14 +49,7 @@ if (isModEnabled('project')) {
  * @var User $user
  */
 
-if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
-	$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
-}
-
-if (!getDolGlobalString('AGENDA_EXT_NB')) {
-	$conf->global->AGENDA_EXT_NB = 5;
-}
-$MAXAGENDA = getDolGlobalString('AGENDA_EXT_NB');
+$MAXAGENDA = getDolGlobalString('AGENDA_EXT_NB', 5);
 $DELAYFORCACHE = 300;	// 300 seconds
 
 $disabledefaultvalues = GETPOSTINT('disabledefaultvalues');
@@ -122,10 +114,10 @@ $year = GETPOSTINT("year") ? GETPOSTINT("year") : date("Y");
 $month = GETPOSTINT("month") ? GETPOSTINT("month") : date("m");
 $week = GETPOSTINT("week") ? GETPOSTINT("week") : date("W");
 $day = GETPOSTINT("day") ? GETPOSTINT("day") : date("d");
-$pid = GETPOSTINT("search_projectid", 3) ? GETPOSTINT("search_projectid", 3) : GETPOSTINT("projectid", 3);
+$pid = GETPOSTISSET("search_projectid") ? GETPOSTINT("search_projectid", 3) : GETPOSTINT("projectid", 3);
 $status = GETPOSTISSET("search_status") ? GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09'); // status may be 0, 50, 100, 'todo', 'na' or -1
 $type = GETPOSTISSET("search_type") ? GETPOST("search_type", 'aZ09') : GETPOST("type", 'aZ09');
-$maxprint = GETPOSTISSET("maxprint") ? GETPOSTINT("maxprint") : getDolGlobalInt('AGENDA_MAX_EVENTS_DAY_VIEW');
+$maxprint = GETPOSTISSET("maxprint") ? GETPOSTINT("maxprint") : getDolGlobalInt('AGENDA_MAX_EVENTS_DAY_VIEW', 3);
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $dateselect = dol_mktime(0, 0, 0, GETPOSTINT('dateselectmonth'), GETPOSTINT('dateselectday'), GETPOSTINT('dateselectyear'));
@@ -149,7 +141,7 @@ if (is_scalar($actioncode) && $actioncode == '-1') {
 }
 
 if ($status == '' && !GETPOSTISSET('search_status')) {
-	$status = ((!getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS') || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+	$status = ((!getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS') || $disabledefaultvalues) ? '' : getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS'));
 }
 
 $defaultview = getDolGlobalString('AGENDA_DEFAULT_VIEW', 'show_month');	// default for app
@@ -253,14 +245,14 @@ if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
-$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:M&oacute;dulo_Agenda|DE:Modul_Terminplanung';
-llxHeader('', $langs->trans("Agenda"), $help_url);
-
 $form = new Form($db);
 $companystatic = new Societe($db);
 $contactstatic = new Contact($db);
 $userstatic = new User($db);
 
+$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:M&oacute;dulo_Agenda|DE:Modul_Terminplanung';
+llxHeader('', $langs->trans("Agenda"), $help_url);
+
 $now = dol_now();
 $nowarray = dol_getdate($now);
 $nowyear = $nowarray['year'];
@@ -407,9 +399,13 @@ if ($mode == 'show_day') {
 //print dol_print_date($firstdaytoshow,'dayhour').' '.dol_print_date($lastdaytoshow,'dayhour');
 
 /*$title = $langs->trans("DoneAndToDoActions");
- if ($status == 'done') $title = $langs->trans("DoneActions");
- if ($status == 'todo') $title = $langs->trans("ToDoActions");
- */
+if ($status == 'done') {
+	$title = $langs->trans("DoneActions");
+}
+if ($status == 'todo') {
+	$title = $langs->trans("ToDoActions");
+}
+*/
 
 $param = '';
 if ($actioncode || GETPOSTISSET('search_actioncode')) {
@@ -428,10 +424,10 @@ if ($status || GETPOSTISSET('status') || GETPOSTISSET('search_status')) {
 	$param .= "&search_status=".urlencode($status);
 }
 if ($filter) {
-	$param .= "&search_filter=".urlencode($filter);
+	$param .= "&search_filter=".urlencode((string) $filter);
 }
 if ($filtert) {
-	$param .= "&search_filtert=".urlencode($filtert);
+	$param .= "&search_filtert=".urlencode((string) $filtert);
 }
 if ($usergroup > 0) {
 	$param .= "&search_usergroup=".urlencode((string) ($usergroup));
@@ -771,10 +767,14 @@ if ($resourceid > 0) {
 }
 // We must filter on assignment table
 if ($filtert > 0 || $usergroup > 0) {
-	$sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
-}
-if ($usergroup > 0) {
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
+	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+	$sql .= " ON ar.fk_actioncomm = a.id AND ar.element_type='user'";
+	if ($filtert > 0) {
+		$sql .= " AND ar.fk_element = ".((int) $filtert);
+	}
+	if ($usergroup > 0) {
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element AND ugu.fk_usergroup = ".((int) $usergroup);
+	}
 }
 $sql .= ' WHERE a.fk_action = ca.id';
 $sql .= ' AND a.entity IN ('.getEntity('agenda').')';	// bookcal is a "virtual view" of agenda
@@ -830,10 +830,6 @@ if ($search_sale && $search_sale != '-1') {
 if ($socid) {
 	$sql .= " AND a.fk_soc = ".((int) $socid);
 }
-// We must filter on assignment table
-if ($filtert > 0 || $usergroup > 0) {
-	$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
-}
 //var_dump($day.' '.$month.' '.$year);
 if ($mode == 'show_day') {
 	$sql .= " AND (";
@@ -866,7 +862,7 @@ if ($status == '0') {
 	// To do (not started)
 	$sql .= " AND a.percent = 0";
 }
-if ($status == 'na') {
+if ($status === 'na') {
 	// Not applicable
 	$sql .= " AND a.percent = -1";
 }
@@ -902,7 +898,7 @@ if ($search_categ_cus != -1) {
 }
 
 // Sort on date
-$sql .= ' ORDER BY datep';
+$sql .= $db->order("datep");
 //print $sql;
 
 dol_syslog("comm/action/index.php", LOG_DEBUG);
@@ -1170,8 +1166,8 @@ if ($user->hasRight("holiday", "read")) {
 			$event->type = 'holiday';
 			$event->type_picto = 'holiday';
 
-			$event->datep                   = $db->jdate($obj->date_start) + (empty($halfday) || $halfday == 1 ? 0 : 12 * 60 * 60 - 1);
-			$event->datef                   = $db->jdate($obj->date_end) + (empty($halfday) || $halfday == -1 ? 24 : 12) * 60 * 60 - 1;
+			$event->datep                   = $db->jdate($obj->date_start) + (empty($obj->halfday) || $obj->halfday == 1 ? 0 : 12 * 60 * 60 - 1);
+			$event->datef                   = $db->jdate($obj->date_end) + (empty($obj->halfday) || $obj->halfday == -1 ? 24 : 12) * 60 * 60 - 1;
 			$event->date_start_in_calendar  = $event->datep;
 			$event->date_end_in_calendar    = $event->datef;
 
@@ -1183,24 +1179,50 @@ if ($user->hasRight("holiday", "read")) {
 				$event->percentage = 0;
 			}
 
-			if ($obj->halfday == 1) {
-				$event->label = $obj->lastname.' ('.$langs->trans("Morning").')';
-			} elseif ($obj->halfday == -1) {
-				$event->label = $obj->lastname.' ('.$langs->trans("Afternoon").')';
-			} else {
-				$event->label = $obj->lastname;
-			}
+			$event->label = $langs->trans("Holiday");
 
 			$daycursor = $event->date_start_in_calendar;
 			$annee = (int) dol_print_date($daycursor, '%Y', 'tzuserrel');
 			$mois = (int) dol_print_date($daycursor, '%m', 'tzuserrel');
 			$jour = (int) dol_print_date($daycursor, '%d', 'tzuserrel');
 
+			$daycursorend = $event->date_end_in_calendar;
+			$anneeend = (int) dol_print_date($daycursorend, '%Y', 'tzuserrel');
+			$moisend = (int) dol_print_date($daycursorend, '%m', 'tzuserrel');
+			$jourend = (int) dol_print_date($daycursorend, '%d', 'tzuserrel');
+
+			// daykey must be date that represent day box in calendar so must be a user time
 			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
+			$daykeygmt = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
+			$ifornbofdays = 0;
 			do {
-				$eventarray[$daykey][] = $event;
+				$ifornbofdays++;
+
+				$firstdayofholiday = ($ifornbofdays == 1);
+				$lastdayofholiday = ($daykeygmt == dol_get_first_hour($event->date_end_in_calendar, 'gmt'));
+
+				/*
+				var_dump(dol_print_date($daykeygmt, 'dayhour', 'gmt'));
+				var_dump(dol_print_date(dol_get_first_hour($event->date_end_in_calendar, 'gmt'), 'dayhour', 'gmt'));
+				var_dump($lastdayofholiday);
+				var_dump($obj->halfday);
+				*/
+
+				if ((in_array($obj->halfday, array(1, 2)) == 1 && $lastdayofholiday) || (in_array($obj->halfday, array(-1, 2)) && $firstdayofholiday)) {
+					// We create a copy of event because we want tochange the label
+					$newevent = dol_clone($event, 1);
+					if (in_array($obj->halfday, array(1, 2)) && $lastdayofholiday) {
+						$newevent->label .= ' ('.$langs->trans("Morning").')';
+					} elseif (in_array($obj->halfday, array(-1, 2)) && $firstdayofholiday) {
+						$newevent->label .= ' ('.$langs->trans("Afternoon").')';
+					}
+					$eventarray[$daykey][] = $newevent;	// We need to use ->gtTypePicto, getXXXon object, so clone must be PHP clone.
+				} else {
+					$eventarray[$daykey][] = $event;	// We can use the event unchanged
+				}
 
 				$daykey += 60 * 60 * 24;
+				$daykeygmt += 60 * 60 * 24;
 			} while ($daykey <= $event->date_end_in_calendar);
 
 			$i++;
@@ -1951,6 +1973,10 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 						if (!empty($cacheusers[$event->userownerid]->color)) {
 							$color = $cacheusers[$event->userownerid]->color;
 						}
+
+						/* May be we need this: if (getDolGlobalString('AGENDA_USE_COLOR_PER_EVENT_TYPE')) {
+							$color = $event->type_color;
+						}*/
 					} elseif ($event->type_code == 'ICALEVENT') {      // Event come from external ical file
 						$numical++;
 						if (!empty($event->icalname)) {
@@ -2092,7 +2118,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 					//var_dump($event->userassigned);
 					//var_dump($event->transparency);
 					print '<table class="centpercent cal_event';
-					print(empty($event->transparency) ? ' cal_event_notbusy' : ' cal_event_busy');
+					print (empty($event->transparency) ? ' cal_event_notbusy' : ' cal_event_busy');
 					//if (empty($event->transparency) && empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) print ' opacitymedium';	// Not busy
 					print '" style="'.$h;
 					$colortouse = $color;
@@ -2112,54 +2138,14 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 					//print ' -moz-border-radius:4px;"';
 					//print 'border: 1px solid #ccc" width="100%"';
 					print '">';
+
+					// First the tr of the event (only one tr for event is used, but several td)
 					print '<tr>';
 					print '<td class="tdoverflow nobottom small centpercent '.($nowrapontd ? 'nowrap ' : '').'cal_event'.($event->type_code == 'BIRTHDAY' ? ' cal_event_birthday' : '').'">';
 					print '<!-- left section of event -->';
 
 					$daterange = '';
 
-					if ($event->type_code == 'BIRTHDAY') {
-						// It's birthday calendar
-						$picb = '<i class="fas fa-birthday-cake inline-block valignmiddle"></i>';
-						//$pice = '<i class="fas fa-briefcase inline-block"></i>';
-						//$typea = ($objp->typea == 'birth') ? $picb : $pice;
-						//var_dump($event);
-						print $picb.' '.$langs->trans("Birthday").'<br>';
-						//print img_picto($langs->trans("Birthday"), 'birthday-cake').' ';
-
-						$tmpid = $event->id;
-
-						if (empty($cachecontacts[$tmpid])) {
-							$newcontact = new Contact($db);
-							$newcontact->fetch($tmpid);
-							$cachecontacts[$tmpid] = $newcontact;
-						}
-						print $cachecontacts[$tmpid]->getNomUrl(1, '', 0, '', -1, 0, 'valignmiddle inline-block');
-
-						//$event->picto = 'birthday-cake';
-						//print $event->getNomUrl(1, $maxnbofchar, 'cal_event', 'birthday', 'contact');
-						/*$listofcontacttoshow = '';
-						$listofcontacttoshow .= '<br>'.$cacheusers[$tmpid]->getNomUrl(-1, '', 0, 0, 0, 0, '', 'paddingright valignmiddle');
-						print $listofcontacttoshow;
-						*/
-					} elseif ($event->type_code == 'HOLIDAY') {
-						// It's holiday calendar
-						$tmpholiday->fetch($event->id);
-
-						print $tmpholiday->getNomUrl(1, -1, 0, 'valignmiddle inline-block');
-
-						$tmpid = $tmpholiday->fk_user;
-						if (empty($cacheusers[$tmpid])) {
-							$newuser = new User($db);
-							$newuser->fetch($tmpid);
-							$cacheusers[$tmpid] = $newuser;
-						}
-
-						$listofusertoshow = '';
-						$listofusertoshow .= '<br>'.$cacheusers[$tmpid]->getNomUrl(-1, '', 0, 0, 0, 0, '', 'paddingright valignmiddle inline-block');
-						print $listofusertoshow;
-					}
-
 					$parameters = array();
 					$reshook = $hookmanager->executeHooks('eventOptions', $parameters, $event, $action); // Note that $action and $object may have been modified by some hooks
 					if ($reshook < 0) {
@@ -2174,41 +2160,49 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 							}
 							*/
 
-							// Date
-							if (empty($event->fulldayevent)) {
-								// Show hours (start ... end)
-								$tmpyearstart  = dol_print_date($event->date_start_in_calendar, '%Y', 'tzuserrel');
-								$tmpmonthstart = dol_print_date($event->date_start_in_calendar, '%m', 'tzuserrel');
-								$tmpdaystart   = dol_print_date($event->date_start_in_calendar, '%d', 'tzuserrel');
-								$tmpyearend    = dol_print_date($event->date_end_in_calendar, '%Y', 'tzuserrel');
-								$tmpmonthend   = dol_print_date($event->date_end_in_calendar, '%m', 'tzuserrel');
-								$tmpdayend     = dol_print_date($event->date_end_in_calendar, '%d', 'tzuserrel');
+							if ($event->type_code == 'BIRTHDAY') {
+								// It's birthday calendar
+								$picb = img_picto('', 'birthday-cake', 'class="pictofixedwidth"');
+								print $picb.$langs->trans("Birthday").'<br>';
+							}
 
-								// Hour start
-								if ($tmpyearstart == $annee && $tmpmonthstart == $mois && $tmpdaystart == $jour) {
-									$daterange .= dol_print_date($event->date_start_in_calendar, 'hour', 'tzuserrel');
-									if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar) {
-										if ($tmpyearstart == $tmpyearend && $tmpmonthstart == $tmpmonthend && $tmpdaystart == $tmpdayend) {
-											$daterange .= '-';
+							// Date
+							if ($event->type_code != 'HOLIDAY' && $event->type_code != 'BIRTHDAY') {
+								if (empty($event->fulldayevent)) {
+									// Show hours (start ... end)
+									$tmpyearstart  = dol_print_date($event->date_start_in_calendar, '%Y', 'tzuserrel');
+									$tmpmonthstart = dol_print_date($event->date_start_in_calendar, '%m', 'tzuserrel');
+									$tmpdaystart   = dol_print_date($event->date_start_in_calendar, '%d', 'tzuserrel');
+									$tmpyearend    = dol_print_date($event->date_end_in_calendar, '%Y', 'tzuserrel');
+									$tmpmonthend   = dol_print_date($event->date_end_in_calendar, '%m', 'tzuserrel');
+									$tmpdayend     = dol_print_date($event->date_end_in_calendar, '%d', 'tzuserrel');
+
+									// Hour start
+									if ($tmpyearstart == $annee && $tmpmonthstart == $mois && $tmpdaystart == $jour) {
+										$daterange .= dol_print_date($event->date_start_in_calendar, 'hour', 'tzuserrel');
+										if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar) {
+											if ($tmpyearstart == $tmpyearend && $tmpmonthstart == $tmpmonthend && $tmpdaystart == $tmpdayend) {
+												$daterange .= '-';
+											}
+											//else
+											//print '...';
 										}
-										//else
-										//print '...';
 									}
-								}
-								if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar) {
-									if ($tmpyearstart != $tmpyearend || $tmpmonthstart != $tmpmonthend || $tmpdaystart != $tmpdayend) {
-										$daterange .= '...';
+									if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar) {
+										if ($tmpyearstart != $tmpyearend || $tmpmonthstart != $tmpmonthend || $tmpdaystart != $tmpdayend) {
+											$daterange .= '...';
+										}
 									}
-								}
-								// Hour end
-								if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar) {
-									if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour) {
-										$daterange .= dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
+									// Hour end
+									if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar) {
+										if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour) {
+											$daterange .= dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
+										}
+									}
+								} else {
+									if ($showinfo) {
+										print $langs->trans("EventOnFullDay")."<br>\n";
 									}
-								}
-							} else {
-								if ($showinfo) {
-									print $langs->trans("EventOnFullDay")."<br>\n";
 								}
 							}
 
@@ -2216,7 +2210,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 							$titletoshow = $daterange;
 							$titletoshow .= ($titletoshow ? ' ' : '').dol_escape_htmltag($event->label);
 
-							if ($event->type_code != 'ICALEVENT') {
+							if ($event->type_code != 'ICALEVENT' && $event->type_code != 'BIRTHDAY') {
 								$savlabel = $event->label;
 								$event->label = $titletoshow;
 								// Note: List of users are inside $event->userassigned. Link may be clickable depending on permissions of user.
@@ -2242,8 +2236,10 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 								$listofusertoshow .= $cacheusers[$tmpid]->getNomUrl(-3, '', 0, 0, 0, 0, '', 'valignmiddle inline-block');
 							}
 
-							print $titletoshow;
-							print $listofusertoshow.' &nbsp;';
+							if ($event->type_code != 'BIRTHDAY') {
+								print $titletoshow;
+								print $listofusertoshow.' &nbsp;';
+							}
 
 							if ($event->type_code == 'ICALEVENT') {
 								print '<br>('.dol_trunc($event->icalname, $maxnbofchar).')';
@@ -2263,7 +2259,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 									$thirdparty = $cachethirdparties[$thirdparty_id];
 								}
 								if (!empty($thirdparty->id)) {
-									$linerelatedto .= $thirdparty->getNomUrl(1, '', 0, 0, -1, 0, '', 'valignmiddle inline-block');
+									$linerelatedto .= $thirdparty->getNomUrl(1, '', 0, 0, -1, 0, '', 'valignmiddle inline');	// using inline-block make the content completely replace with ... when too large
 								}
 							}
 							if (!empty($contact_id) && $contact_id > 0) {
@@ -2278,7 +2274,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 									$linerelatedto .= '&nbsp;';
 								}
 								if (!empty($contact->id)) {
-									$linerelatedto .= $contact->getNomUrl(1, '', 0, '', -1, 0, 'valignmiddle inline-block');
+									$linerelatedto .= $contact->getNomUrl(1, '', 0, '', -1, 0, 'valignmiddle inline');	// using inline-block make the content completely replace with ... when too large
 								}
 							}
 							if (!empty($event->fk_element) && $event->fk_element > 0 && !empty($event->elementtype) && getDolGlobalString('AGENDA_SHOW_LINKED_OBJECT')) {
@@ -2296,6 +2292,24 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 						}
 					}
 
+					if ($event->type_code == 'HOLIDAY') {
+						// It's holiday calendar
+						$tmpholiday->fetch($event->id);
+
+						//print $tmpholiday->getNomUrl(1, -1, 0, 'valignmiddle inline-block');
+
+						$tmpid = $tmpholiday->fk_user;
+						if (empty($cacheusers[$tmpid])) {
+							$newuser = new User($db);
+							$newuser->fetch($tmpid);
+							$cacheusers[$tmpid] = $newuser;
+						}
+
+						$listofusertoshow = '';
+						$listofusertoshow .= "\n".'<br>'.$cacheusers[$tmpid]->getNomUrl(-1, '', 0, 0, 0, 0, '', 'paddingright valignmiddle inline-block')."\n";
+						print $listofusertoshow;
+					}
+
 					// Show location
 					if ($showinfo) {
 						if ($event->location) {
@@ -2305,9 +2319,10 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 					}
 
 					print '</td>';
+
 					// Status - Percent
 					$withstatus = 0;
-					if ($event->type_code != 'BIRTHDAY' && $event->type_code != 'ICALEVENT') {
+					if ($event->type_code != 'HOLIDAY' && $event->type_code != 'BIRTHDAY' && $event->type_code != 'ICALEVENT') {
 						$withstatus = 1;
 						if ($event->percentage >= 0) {
 							$withstatus = 2;
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index bab2ff5916c..915094db599 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -49,14 +49,12 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
  * @var User $user
  */
 
-if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
-	$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
-}
-
-$action = GETPOST('action', 'aZ09');
+$MAXAGENDA = getDolGlobalString('AGENDA_EXT_NB', 5);
+$DELAYFORCACHE = 300;	// 300 seconds
 
 $disabledefaultvalues = GETPOSTINT('disabledefaultvalues');
 
+$check_holiday = GETPOSTINT('check_holiday');
 $filter = GETPOST("search_filter", 'alpha', 3) ? GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
 $filtert = GETPOSTINT("search_filtert", 3) ? GETPOSTINT("search_filtert", 3) : GETPOSTINT("filtert", 3);
 $usergroup = GETPOSTINT("search_usergroup", 3) ? GETPOSTINT("search_usergroup", 3) : GETPOSTINT("usergroup", 3);
@@ -64,10 +62,9 @@ $usergroup = GETPOSTINT("search_usergroup", 3) ? GETPOSTINT("search_usergroup",
 //$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
 $showbirthday = 0;
 
-// If not choice done on calendar owner, we filter on user.
-/*if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
-{
-	$filtert = $user->id;
+// If no choice done on calendar owner (like on left menu link "Agenda"), we filter on current user by default.
+/*if (empty($filtert) && !getDolGlobalString('AGENDA_ALL_CALENDARS')) {
+	$filtert = (string) $user->id;
 }*/
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -85,6 +82,7 @@ if (!$sortfield) {
 	$sortfield = "a.datec";
 }
 
+// Security check
 $socid = GETPOSTINT("search_socid") ? GETPOSTINT("search_socid") : GETPOSTINT("socid");
 if ($user->socid) {
 	$socid = $user->socid;
@@ -101,19 +99,21 @@ if (!$user->hasRight('agenda', 'allactions', 'read')) {
 	$canedit = 0;
 }
 if (!$user->hasRight('agenda', 'allactions', 'read') || $filter == 'mine') {  // If no permission to see all, we show only affected to me
-	$filtert = $user->id;
+	$filtert = (string) $user->id;
 }
 
+$action = GETPOST('action', 'aZ09');
+
 $mode = 'show_peruser';
 $resourceid = GETPOSTINT("search_resourceid") ? GETPOSTINT("search_resourceid") : GETPOSTINT("resourceid");
-$year = GETPOSTINT("year") ? GETPOSTINT("year") : idate("Y");
-$month = GETPOSTINT("month") ? GETPOSTINT("month") : idate("m");
-$week = GETPOSTINT("week") ? GETPOSTINT("week") : idate("W");
-$day = GETPOSTINT("day") ? GETPOSTINT("day") : idate("d");
+$year = GETPOSTINT("year") ? GETPOSTINT("year") : date("Y");
+$month = GETPOSTINT("month") ? GETPOSTINT("month") : date("m");
+$week = GETPOSTINT("week") ? GETPOSTINT("week") : date("W");
+$day = GETPOSTINT("day") ? GETPOSTINT("day") : date("d");
 $pid = GETPOSTISSET("search_projectid") ? GETPOSTINT("search_projectid", 3) : GETPOSTINT("projectid", 3);
 $status = GETPOSTISSET("search_status") ? GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09'); // status may be 0, 50, 100, 'todo', 'na' or -1
-$type = GETPOSTISSET("search_type") ? GETPOST("search_type", 'alpha') : GETPOST("type", 'alpha');
-$maxprint = ((GETPOSTINT("maxprint") != '') ? GETPOSTINT("maxprint") : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
+$type = GETPOSTISSET("search_type") ? GETPOST("search_type", 'aZ09') : GETPOST("type", 'aZ09');
+$maxprint = GETPOSTISSET("maxprint") ? GETPOSTINT("maxprint") : getDolGlobalInt('AGENDA_MAX_EVENTS_DAY_VIEW', 3);
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $search_categ_cus = GETPOSTINT("search_categ_cus", 3) ? GETPOSTINT("search_categ_cus", 3) : 0;
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
@@ -133,7 +133,7 @@ if ($dateselect > 0) {
 	$year = GETPOSTINT('dateselectyear');
 }
 
-$tmp = !getDolGlobalString('MAIN_DEFAULT_WORKING_HOURS') ? '9-18' : $conf->global->MAIN_DEFAULT_WORKING_HOURS;
+$tmp = getDolGlobalString('MAIN_DEFAULT_WORKING_HOURS', '9-18');
 $tmp = str_replace(' ', '', $tmp); // FIX 7533
 $tmparray = explode('-', $tmp);
 $begin_h = GETPOSTISSET('begin_h') ? GETPOSTINT('begin_h') : ($tmparray[0] != '' ? $tmparray[0] : 9);
@@ -148,7 +148,7 @@ if ($end_h <= $begin_h) {
 	$end_h = $begin_h + 1;
 }
 
-$tmp = !getDolGlobalString('MAIN_DEFAULT_WORKING_DAYS') ? '1-5' : $conf->global->MAIN_DEFAULT_WORKING_DAYS;
+$tmp = getDolGlobalString('MAIN_DEFAULT_WORKING_DAYS', '1-5');
 $tmp = str_replace(' ', '', $tmp); // FIX 7533
 $tmparray = explode('-', $tmp);
 $begin_d = GETPOSTISSET('begin_d') ? GETPOSTINT('begin_d') : ($tmparray[0] != '' ? $tmparray[0] : 1);
@@ -164,7 +164,7 @@ if ($end_d < $begin_d) {
 }
 
 if ($status == '' && !GETPOSTISSET('search_status')) {
-	$status = ((!getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS') || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+	$status = ((!getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS') || $disabledefaultvalues) ? '' : getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS'));
 }
 
 if (empty($mode) && !GETPOSTISSET('mode')) {
@@ -177,12 +177,12 @@ if (GETPOST('viewcal', 'alpha') && $mode != 'show_day' && $mode != 'show_week' &
 } // View by month
 if (GETPOST('viewweek', 'alpha') || $mode == 'show_week') {
 	$mode = 'show_week';
-	$week = ($week ? $week : idate("W"));
-	$day = ($day ? $day : idate("d"));
+	$week = ($week ? $week : date("W"));
+	$day = ($day ? $day : date("d"));
 } // View by week
 if (GETPOST('viewday', 'alpha') || $mode == 'show_day') {
 	$mode = 'show_day';
-	$day = ($day ? $day : idate("d"));
+	$day = ($day ? $day : date("d"));
 } // View by day
 
 $object = new ActionComm($db);
@@ -193,7 +193,7 @@ $langs->loadLangs(array('users', 'agenda', 'other', 'commercial'));
 // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
 $hookmanager->initHooks(array('agenda'));
 
-$result = restrictedArea($user, 'agenda', 0, '', 'myactions');
+$result = restrictedArea($user, 'agenda', 0, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
 if ($user->socid && $socid) {
 	$result = restrictedArea($user, 'societe', $socid);
 }
@@ -248,9 +248,65 @@ $nowmonth = $nowarray['mon'];
 $nowday = $nowarray['mday'];
 
 
-// Define list of all external calendars (global setup)
 $listofextcals = array();
 
+// Define list of all external calendars (global setup)
+if (!getDolGlobalString('AGENDA_DISABLE_EXT')) {
+	$i = 0;
+	while ($i < $MAXAGENDA) {
+		$i++;
+		$source = 'AGENDA_EXT_SRC'.$i;
+		$name = 'AGENDA_EXT_NAME'.$i;
+		$offsettz = 'AGENDA_EXT_OFFSETTZ'.$i;
+		$color = 'AGENDA_EXT_COLOR'.$i;
+		$default = 'AGENDA_EXT_ACTIVEBYDEFAULT'.$i;
+		$buggedfile = 'AGENDA_EXT_BUGGEDFILE'.$i;
+		if (getDolGlobalString($source) && getDolGlobalString($name)) {
+			// Note: $conf->global->buggedfile can be empty or 'uselocalandtznodaylight' or 'uselocalandtzdaylight'
+			$listofextcals[] = array(
+				'type' => 'globalsetup',
+				'src' => getDolGlobalString($source),
+				'name' => dol_string_nohtmltag(getDolGlobalString($name)),
+				'offsettz' => (int) getDolGlobalInt($offsettz, 0),
+				'color' => dol_string_nohtmltag(getDolGlobalString($color)),
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
+				'default' => dol_string_nohtmltag(getDolGlobalString($default)),
+				'buggedfile' => dol_string_nohtmltag(getDolGlobalString('buggedfile', ''))
+			);
+		}
+	}
+}
+
+// Define list of external calendars (user setup)
+if (!getDolUserString('AGENDA_DISABLE_EXT')) {
+	$i = 0;
+	while ($i < $MAXAGENDA) {
+		$i++;
+		$source = 'AGENDA_EXT_SRC_'.$user->id.'_'.$i;
+		$name = 'AGENDA_EXT_NAME_'.$user->id.'_'.$i;
+		$offsettz = 'AGENDA_EXT_OFFSETTZ_'.$user->id.'_'.$i;
+		$color = 'AGENDA_EXT_COLOR_'.$user->id.'_'.$i;
+		$enabled = 'AGENDA_EXT_ENABLED_'.$user->id.'_'.$i;
+		$default = 'AGENDA_EXT_ACTIVEBYDEFAULT_'.$user->id.'_'.$i;
+		$buggedfile = 'AGENDA_EXT_BUGGEDFILE_'.$user->id.'_'.$i;
+
+		if (getDolUserString($source) && getDolUserString($name)) {
+			// Note: $conf->global->buggedfile can be empty or 'uselocalandtznodaylight' or 'uselocalandtzdaylight'
+			$listofextcals[] = array(
+				'type' => 'usersetup',
+				'src' => getDolUserString($source),
+				'name' => dol_string_nohtmltag(getDolUserString($name)),
+				'offsettz' => (int) (empty($user->conf->$offsettz) ? 0 : $user->conf->$offsettz),
+				'color' => dol_string_nohtmltag(getDolUserString($color)),
+				// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
+				'default' => dol_string_nohtmltag(getDolUserString($default)),
+				'buggedfile' => dol_string_nohtmltag(isset($user->conf->buggedfile) ? $user->conf->buggedfile : '')
+			);
+		}
+	}
+}
+
+
 $prev = dol_get_first_day_week($day, $month, $year);
 $first_day   = $prev['first_day'];
 $first_month = $prev['first_month'];
@@ -264,7 +320,7 @@ $next_year  = $next['year'];
 $next_month = $next['month'];
 $next_day   = $next['day'];
 
-$max_day_in_month = idate("t", dol_mktime(0, 0, 0, $month, 1, $year));
+$max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year));
 
 $tmpday = $first_day;
 //print 'xx'.$prev_year.'-'.$prev_month.'-'.$prev_day;
@@ -296,7 +352,7 @@ if ($status || GETPOSTISSET('status') || GETPOSTISSET('search_status')) {
 	$param .= "&search_status=".urlencode($status);
 }
 if ($filter) {
-	$param .= "&search_filter=".urlencode($filter);
+	$param .= "&search_filter=".urlencode((string) $filter);
 }
 if ($filtert) {
 	$param .= "&search_filtert=".urlencode((string) $filtert);
@@ -377,66 +433,31 @@ $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_mo
 $nav .= " </span>\n";
 $nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\" title=\"".dol_escape_htmltag($langs->trans("Next"))."\"></i></a>\n";
 if (empty($conf->dol_optimize_smallscreen)) {
-	$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param.'" class="datenowlink">'.$langs->trans("Today").'</a> ';
+	$nav .= ' &nbsp; <a href="?year='.$nowyear.'&month='.$nowmonth.'&day='.$nowday.$param.'" class="datenowlink">'.$langs->trans("Today").'</a> ';
 }
 $nav .= '</div>';
 $nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
-$nav .= ' <button type="submit" class="liste_titre button_search" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
+//$nav .= ' <input type="submit" class="button button-save" name="submitdateselect" value="'.$langs->trans("Refresh").'">';
+$nav .= '<button type="submit" class="liste_titre button_search valignmiddle" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
 
 // Must be after the nav definition
-$param .= '&year='.urlencode((string) ($year)).'&month='.urlencode((string) ($month)).($day ? '&day='.urlencode((string) ($day)) : '');
+$paramnodate = $param;
+$param .= '&year='.$year.'&month='.$month.($day ? '&day='.$day : '');
 //print 'x'.$param;
 
 
-$paramnoaction = preg_replace('/action=[a-z_]+/', '', $param);
+$paramnoaction = preg_replace('/mode=[a-z_]+/', '', preg_replace('/action=[a-z_]+/', '', $param));
+$paramnoactionodate = preg_replace('/mode=[a-z_]+/', '', preg_replace('/action=[a-z_]+/', '', $paramnodate));
 
 $head = calendars_prepare_head($paramnoaction);
 
 print '<form method="POST" id="searchFormList" class="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-
-$showextcals = $listofextcals;
-// Legend
-if ($conf->use_javascript_ajax) {
-	$s = '';
-	$s .= '<script type="text/javascript">'."\n";
-	$s .= 'jQuery(document).ready(function () {'."\n";
-	$s .= 'jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });'."\n";
-	$s .= 'jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });'."\n";
-	$s .= 'jQuery(".family_birthday").toggle();'."\n";
-	if ($mode == "show_week" || $mode == "show_month" || empty($mode)) {
-		$s .= 'jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
-	}
-	$s .= '});'."\n";
-	$s .= '</script>'."\n";
-	if (!empty($conf->use_javascript_ajax)) {
-		$s .= '<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; </div>';
-		if (is_array($showextcals) && count($showextcals) > 0) {
-			foreach ($showextcals as $val) {
-				$htmlname = md5($val['name']);
-				$s .= '<script type="text/javascript">'."\n";
-				$s .= 'jQuery(document).ready(function () {'."\n";
-				$s .= '		jQuery("#check_ext'.$htmlname.'").click(function() {';
-				$s .= ' 		/* alert("'.$htmlname.'"); */';
-				$s .= ' 		jQuery(".family_ext'.$htmlname.'").toggle();';
-				$s .= '		});'."\n";
-				$s .= '});'."\n";
-				$s .= '</script>'."\n";
-				$s .= '<div class="nowrap float"><input type="checkbox" id="check_ext'.$htmlname.'" name="check_ext'.$htmlname.'" checked> '.$val ['name'].' &nbsp; </div>';
-			}
-		}
-
-		//$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
-
-		// Calendars from hooks
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
-		if (empty($reshook)) {
-			$s .= $hookmanager->resPrint;
-		} elseif ($reshook > 1) {
-			$s = $hookmanager->resPrint;
-		}
-	}
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 }
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
+
 
 $mode = 'show_peruser';
 $massactionbutton = '';
@@ -515,43 +536,135 @@ if ($user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda'
 	$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', $urltocreateaction);
 }
 
-$num = 0;
-
-print_barre_liste($langs->trans("Agenda"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, -1, 'object_action', 0, $nav.'<span class="marginleftonly"></span>'.$newcardbutton, '', $limit, 1, 0, 1, $viewmode);
 
+// Define the legend/list of calendard to show
+$s = '';
 $link = '';
-//print load_fiche_titre('', $link.' &nbsp; &nbsp; '.$nav.' '.$newcardbutton, '');
 
 
-$s .= "\n".'<!-- Div to calendars selectors -->'."\n";
+$showextcals = $listofextcals;
+$bookcalcalendars = array();
 
-// Local calendar
-$newtitle = '<div class="nowrap clear inline-block minheight30">';
-$newtitle .= '<input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; ';
-$newtitle .= '</div>';
-//$newtitle=$langs->trans($title);
-
-$s = $newtitle;
-
-// Calendars from hooks
-$parameters = array();
-$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
-if (empty($reshook)) {
-	$s .= $hookmanager->resPrint;
-} elseif ($reshook > 1) {
-	$s = $hookmanager->resPrint;
+// Load Bookcal Calendars
+if (isModEnabled("bookcal")) {
+	$sql = "SELECT ba.rowid, bc.label, bc.ref, bc.rowid as id_cal";
+	$sql .= " FROM ".MAIN_DB_PREFIX."bookcal_availabilities as ba";
+	$sql .= " JOIN ".MAIN_DB_PREFIX."bookcal_calendar as bc";
+	$sql .= " ON bc.rowid = ba.fk_bookcal_calendar";
+	$sql .= " WHERE bc.status = 1";
+	$sql .= " AND ba.status = 1";
+	$sql .= " AND bc.entity IN (".getEntity('agenda').")";	// bookcal is a "virtual view" of agenda
+	if (!empty($filtert) && $filtert != '-1') {
+		$sql .= " AND bc.visibility IN (".$db->sanitize($filtert, 0, 0, 0, 0).")";
+	}
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
+		$i = 0;
+		while ($i < $num) {
+			$objp = $db->fetch_object($resql);
+			$label = !empty($objp->label) ? $objp->label : $objp->ref;
+			$bookcalcalendars["calendars"][] = array("id" => $objp->id_cal, "label" => $label);
+			$bookcalcalendars["availabilitieslink"][$objp->rowid] = $objp->id_cal;
+			$i++;
+		}
+	} else {
+		dol_print_error($db);
+	}
 }
 
-$s .= "\n".'<!-- End div to calendars selectors -->'."\n";
+if (!empty($conf->use_javascript_ajax)) {	// If javascript on
+	$s .= "\n".'<!-- Div to calendars selectors -->'."\n";
 
-print $s;
+	$s .= '<script type="text/javascript">'."\n";
+	$s .= 'jQuery(document).ready(function () {'."\n";
+	$s .= 'jQuery(".check_birthday").click(function() { console.log("Toggle birthdays"); jQuery(".family_birthday").toggle(); });'."\n";
+	$s .= 'jQuery(".check_holiday").click(function() { console.log("Toggle holidays"); jQuery(".family_holiday").toggle(); });'."\n";
+	if (isModEnabled("bookcal") && !empty($bookcalcalendars["calendars"])) {
+		foreach ($bookcalcalendars["calendars"] as $key => $value) {
+			$s .= 'jQuery(".check_bookcal_calendar_'.$value['id'].'").click(function() { console.log("Toggle Bookcal Calendar '.$value['id'].'"); jQuery(".family_bookcal_calendar_'.$value['id'].'").toggle(); });'."\n";
+		}
+	}
+	$s .= '});'."\n";
+	$s .= '</script>'."\n";
 
-print '<div class="liste_titre liste_titre_bydiv centpercent">';
-print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, '', (string) $filtert, '', $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid, $search_categ_cus);
-print '</div>';
+	// Local calendar
+	$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_mytasks" name="check_mytasks" value="1" checked disabled><label class="labelcalendar"><span class="check_holiday_text"> '.$langs->trans("LocalAgenda").' &nbsp; </span></label></div>';
+
+	// Holiday calendar
+	if ($user->hasRight("holiday", "read")) {
+		$s .= '
+            <div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" value="1" class="check_holiday"' . ($check_holiday ? ' checked' : '') . '>
+                <label for="check_holiday" class="labelcalendar">
+                    <span class="check_holiday_text">' . $langs->trans("Holidays") . '</span>
+                </label> &nbsp;
+            </div>';
+	}
+
+	// External calendars
+	if (is_array($showextcals) && count($showextcals) > 0) {
+		foreach ($showextcals as $val) {
+			$htmlname = md5($val['name']);	// not used for security purpose, only to get a string with no special char
+
+			$s .= '<script type="text/javascript">'."\n";
+			$s .= 'jQuery(document).ready(function () {'."\n";
+			$s .= '		jQuery("#check_ext'.$htmlname.'").click(function() {';
+			$s .= ' 		/* alert("'.$htmlname.'"); */';
+			$s .= ' 		jQuery(".family_ext'.$htmlname.'").toggle();';
+			$s .= '		});'."\n";
+			$s .= '});'."\n";
+			$s .= '</script>'."\n";
+			$s .= '<div class="nowrap float"><input type="checkbox" id="check_ext'.$htmlname.'" name="check_ext'.$htmlname.'" checked> '.$val ['name'].' &nbsp; </div>';
+		}
+	}
+
+	// Birthdays
+	//$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
+
+	// Bookcal Calendar
+	/*
+	if (isModEnabled("bookcal")) {
+		if (!empty($bookcalcalendars["calendars"])) {
+			foreach ($bookcalcalendars["calendars"] as $key => $value) {
+				$label = $value['label'];
+				$s .= '<div class="nowrap inline-block minheight30">';
+				$s .= '<input '.(GETPOST('check_bookcal_calendar_'.$value['id']) ? "checked" : "").' type="checkbox" id="check_bookcal_calendar_'.$value['id'].'" name="check_bookcal_calendar_'.$value['id'].'" class="check_bookcal_calendar_'.$value['id'].'">';
+				$s .= '<label for="check_bookcal_calendar_'.$value['id'].'" class="labelcalendar">';
+				$s .= '<span class="check_bookcal_calendar_'.$value['id'].'_text">'.$langs->trans("AgendaShowBookcalCalendar", $label).'</span>';
+				$s .= '</label> &nbsp; </div>';
+			}
+		}
+	}
+	*/
+
+	// Calendars from hooks
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
+	if (empty($reshook)) {
+		$s .= $hookmanager->resPrint;
+	} elseif ($reshook > 1) {
+		$s = $hookmanager->resPrint;
+	}
+
+	$s .= "\n".'<!-- End div to calendars selectors -->'."\n";
+} else { // If javascript off
+	$newparam = $param; // newparam is for birthday links
+	$newparam = preg_replace('/showbirthday=[0-1]/i', 'showbirthday='.(empty($showbirthday) ? 1 : 0), $newparam);
+	if (!preg_match('/showbirthday=/i', $newparam)) {
+		$newparam .= '&showbirthday=1';
+	}
+	$link = '<a href="'.$_SERVER['PHP_SELF'].'?'.dol_escape_htmltag($newparam);
+	$link .= '">';
+	if (empty($showbirthday)) {
+		$link .= $langs->trans("AgendaShowBirthdayEvents");
+	} else {
+		$link .= $langs->trans("AgendaHideBirthdayEvents");
+	}
+	$link .= '</a>';
+}
 
 
-// Get event in an array
+// Load events from database into $eventarray
 $eventarray = array();
 
 
@@ -566,8 +679,14 @@ $sql .= " a.datep2,";
 $sql .= " a.percent,";
 $sql .= " a.fk_user_author,a.fk_user_action,";
 $sql .= " a.transparency, a.priority, a.fulldayevent, a.location,";
-$sql .= " a.fk_soc, a.fk_contact, a.fk_element, a.elementtype, a.fk_project,";
-$sql .= " ca.code, ca.libelle as type_label, ca.color, ca.type as type_type, ca.picto as type_picto";
+$sql .= " a.fk_soc, a.fk_contact, a.fk_project, a.fk_bookcal_calendar,";
+$sql .= " a.fk_element, a.elementtype,";
+$sql .= " ca.code as type_code, ca.libelle as type_label, ca.color as type_color, ca.type as type_type, ca.picto as type_picto";
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
 $sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm as ca, ".MAIN_DB_PREFIX."actioncomm as a";
 // We must filter on resource table
 if ($resourceid > 0) {
@@ -586,7 +705,7 @@ if ($filtert > 0 || $usergroup > 0) {
 }
 
 $sql .= " WHERE a.fk_action = ca.id";
-$sql .= " AND a.entity IN (".getEntity('agenda').")";
+$sql .= " AND a.entity IN (".getEntity('agenda').")";	// bookcal is a "virtual view" of agenda
 // Condition on actioncode
 if (!empty($actioncode)) {
 	if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
@@ -624,7 +743,7 @@ if ($pid) {
 }
 // If the internal user must only see his customers, force searching by him
 $search_sale = 0;
-if (!$user->hasRight('societe', 'client', 'voir')) {
+if (isModEnabled("societe") && !$user->hasRight('societe', 'client', 'voir')) {
 	$search_sale = $user->id;
 }
 // Search on sale representative
@@ -668,6 +787,7 @@ if ($type) {
 	$sql .= " AND ca.id = ".((int) $type);
 }
 if ($status == '0') {
+	// To do (not started)
 	$sql .= " AND a.percent = 0";
 }
 if ($status === 'na') {
@@ -684,6 +804,18 @@ if ($status == 'done' || $status == '100') {
 if ($status == 'todo') {
 	$sql .= " AND (a.percent >= 0 AND a.percent < 100)";
 }
+// We must filter on assignment table
+if ($filtert > 0 || $usergroup > 0) {
+	$sql .= " AND (";
+	if ($filtert > 0) {
+		$sql .= "ar.fk_element = ".((int) $filtert);
+	}
+	if ($usergroup > 0) {
+		$sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".((int) $usergroup);
+	}
+	$sql .= ")";
+}
+
 // Search in categories, -1 is all and -2 is no categories
 if ($search_categ_cus != -1) {
 	if ($search_categ_cus == -2) {
@@ -701,13 +833,14 @@ $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
 
+	$MAXONSAMEPAGE = 10000; // Useless to have more. Protection to avoid memory overload when high number of event (for example after a mass import)
 	$i = 0;
-	while ($i < $num) {
+	while ($i < $num && $i < $MAXONSAMEPAGE) {
 		$obj = $db->fetch_object($resql);
 		//print $obj->fk_user_action.' '.$obj->id."<br>";
 
 		// Discard auto action if option is on
-		if (getDolGlobalString('AGENDA_ALWAYS_HIDE_AUTO') && $obj->code == 'AC_OTH_AUTO') {
+		if (getDolGlobalString('AGENDA_ALWAYS_HIDE_AUTO') && $obj->type_code == 'AC_OTH_AUTO') {
 			$i++;
 			continue;
 		}
@@ -718,49 +851,70 @@ if ($resql) {
 
 		// Create a new object action
 		$event = new ActionComm($db);
+
 		$event->id = $obj->id;
-		$event->datep = $datep; // datep and datef are GMT date
-		$event->datef = $datep2;
-		$event->type_code = $obj->code;
-		$event->type_color = $obj->color;
+		$event->ref = $event->id;
+
+		$event->fulldayevent = $obj->fulldayevent;
+
+		// event->datep and event->datef must be GMT date.
+		if ($event->fulldayevent) {
+			$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
+			$event->datep = $db->jdate($obj->datep, $tzforfullday ? 'tzuser' : 'tzserver');	// If saved in $tzforfullday = gmt, we must invert date to be in user tz
+			$event->datef = $db->jdate($obj->datep2, $tzforfullday ? 'tzuser' : 'tzserver');
+		} else {
+			// Example: $obj->datep = '1970-01-01 01:00:00', jdate will return 0 if TZ of PHP server is Europe/Berlin (+1)
+			$event->datep = $db->jdate($obj->datep, 'tzserver');
+			$event->datef = $db->jdate($obj->datep2, 'tzserver');
+		}
+		//$event->datep_formated_gmt = dol_print_date($event->datep, 'dayhour', 'gmt');
+		//var_dump($obj->id.' '.$obj->datep.' '.dol_print_date($obj->datep, 'dayhour', 'gmt'));
+		//var_dump($obj->id.' '.$event->datep.' '.dol_print_date($event->datep, 'dayhour', 'gmt'));
+
+		$event->type_code = $obj->type_code;
+		$event->type_label = $obj->type_label;
+		$event->type_color = $obj->type_color;
+		$event->type = $obj->type_type;
+		$event->type_picto = $obj->type_picto;
+
 		$event->label = $obj->label;
 		$event->percentage = $obj->percent;
 		$event->authorid = $obj->fk_user_author; // user id of creator
 		$event->userownerid = $obj->fk_user_action; // user id of owner
+		$event->fetch_userassigned(); // This load $event->userassigned
+
 		$event->priority = $obj->priority;
-		$event->fulldayevent = $obj->fulldayevent;
 		$event->location = $obj->location;
 		$event->transparency = $obj->transparency;
+		$event->fk_element = $obj->fk_element;
+		$event->elementid = $obj->fk_element;
+		$event->elementtype = $obj->elementtype;
 
 		$event->fk_project = $obj->fk_project;
 
 		$event->socid = $obj->fk_soc;
 		$event->contact_id = $obj->fk_contact;
-
-		$event->fk_element = $obj->fk_element;
-		$event->elementid = $obj->fk_element;
-		$event->elementtype = $obj->elementtype;
+		$event->fk_bookcal_calendar = $obj->fk_bookcal_calendar;
+		if (!empty($event->fk_bookcal_calendar)) {
+			$event->type = "bookcal_calendar";
+		}
 
 		// Defined date_start_in_calendar and date_end_in_calendar property
 		// They are date start and end of action but modified to not be outside calendar view.
-		$event->date_start_in_calendar = $datep;
-		if ($datep2 != '' && $datep2 >= $datep) {
-			$event->date_end_in_calendar = $datep2;
+		$event->date_start_in_calendar = $event->datep;
+		if ($event->datef != '' && $event->datef >= $event->datep) {
+			$event->date_end_in_calendar = $event->datef;
 		} else {
-			$event->date_end_in_calendar = $datep;
+			$event->date_end_in_calendar = $event->datep;
 		}
 
 		//print '<br>'.$i.' - eventid='.$event->id.' '.dol_print_date($event->date_start_in_calendar, 'dayhour').' '.dol_print_date($firstdaytoshow, 'dayhour').' - '.dol_print_date($event->date_end_in_calendar, 'dayhour').' '.dol_print_date($lastdaytoshow, 'dayhour').'<br>'."\n";
 
 		// Check values
-		if ($event->date_end_in_calendar < $firstdaytoshow ||
-		$event->date_start_in_calendar >= $lastdaytoshow) {
+		if ($event->date_end_in_calendar < $firstdaytoshow || $event->date_start_in_calendar >= $lastdaytoshow) {
 			// This record is out of visible range
 			unset($event);
 		} else {
-			//print $i.' - eventid='.$event->id.' '.dol_print_date($event->date_start_in_calendar, 'dayhour').' - '.dol_print_date($event->date_end_in_calendar, 'dayhour').'<br>'."\n";
-			$event->fetch_userassigned(); // This load $event->userassigned
-
 			if ($event->date_start_in_calendar < $firstdaytoshow) {
 				$event->date_start_in_calendar = $firstdaytoshow;
 			}
@@ -773,33 +927,527 @@ if ($resql) {
 			$annee = (int) dol_print_date($daycursor, '%Y', 'tzuserrel');
 			$mois = (int) dol_print_date($daycursor, '%m', 'tzuserrel');
 			$jour = (int) dol_print_date($daycursor, '%d', 'tzuserrel');
-			//print $daycursor.' '.dol_print_date($daycursor, 'dayhour', 'gmt').' '.$event->id.' -> '.$annee.'-'.$mois.'-'.$jour.'<br>';
+
+			$daycursorend = $event->date_end_in_calendar;
+			$anneeend = (int) dol_print_date($daycursorend, '%Y', 'tzuserrel');
+			$moisend = (int) dol_print_date($daycursorend, '%m', 'tzuserrel');
+			$jourend = (int) dol_print_date($daycursorend, '%d', 'tzuserrel');
 
 			// Loop on each day covered by action to prepare an index to show on calendar
 			$loop = true;
 			$j = 0;
-			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');	// $mois, $jour, $annee has been set for user tz
+			$daykeyend = dol_mktime(0, 0, 0, $moisend, $jourend, $anneeend, 'gmt');	// $moisend, $jourend, $anneeend has been set for user tz
+			/*
+			 print 'GMT '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'gmt').'<br>';
+			 print 'TZSERVER '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzserver').'<br>';
+			 print 'TZUSERREL '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzuserrel').'<br>';
+			 print 'GMT '.$event->date_end_in_calendar.' '.dol_print_date($event->date_end_in_calendar, 'dayhour', 'gmt').'<br>';
+			 print 'TZSERVER '.$event->date_end_in_calendar.' '.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzserver').'<br>';
+			 print 'TZUSER '.$event->date_end_in_calendar.' '.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel').'<br>';
+			 */
 			do {
-				//print 'Add event into eventarray for daykey='.$daykey.'='.dol_print_date($daykey, 'dayhour', 'gmt').' '.$event->id.' '.$event->datep.' '.$event->datef.'<br>';
+				//if ($event->id==408)
+				//print 'daykey='.$daykey.' daykeyend='.$daykeyend.' '.dol_print_date($daykey, 'dayhour', 'gmt').' - '.dol_print_date($event->datep, 'dayhour', 'gmt').' '.dol_print_date($event->datef, 'dayhour', 'gmt').'<br>';
+				//print 'daykey='.$daykey.' daykeyend='.$daykeyend.' '.dol_print_date($daykey, 'dayhour', 'tzuserrel').' - '.dol_print_date($event->datep, 'dayhour', 'tzuserrel').' '.dol_print_date($event->datef, 'dayhour', 'tzuserrel').'<br>';
 
 				$eventarray[$daykey][] = $event;
 				$j++;
 
 				$daykey += 60 * 60 * 24;
-				if ($daykey > $event->date_end_in_calendar) {
+				//if ($daykey > $event->date_end_in_calendar) {
+				if ($daykey > $daykeyend) {
 					$loop = false;
 				}
 			} while ($loop);
-
+			//var_dump($eventarray);
 			//print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
 			//print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array<br>';
 		}
+
+		$parameters['obj'] = $obj;
+		$reshook = $hookmanager->executeHooks('hookEventElements', $parameters, $event, $action); // Note that $action and $object may have been modified by some hooks
+		$event = $hookmanager->resPrint;
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
+
 		$i++;
 	}
 	$db->free($resql);
 } else {
 	dol_print_error($db);
 }
+//var_dump($eventarray);
+
+
+// BIRTHDATES CALENDAR
+// Complete $eventarray with birthdates
+if ($showbirthday) {
+	// Add events in array
+	$sql = 'SELECT sp.rowid, sp.lastname, sp.firstname, sp.birthday';
+	$sql .= ' FROM '.MAIN_DB_PREFIX.'socpeople as sp';
+	$sql .= ' WHERE (priv=0 OR (priv=1 AND fk_user_creat='.((int) $user->id).'))';
+	$sql .= " AND sp.entity IN (".getEntity('contact').")";
+	if ($mode == 'show_day') {
+		$sql .= ' AND MONTH(birthday) = '.((int) $month);
+		$sql .= ' AND DAY(birthday) = '.((int) $day);
+	} else {
+		$sql .= ' AND MONTH(birthday) = '.((int) $month);
+	}
+	$sql .= ' ORDER BY birthday';
+
+	dol_syslog("comm/action/index.php", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
+		$i = 0;
+		while ($i < $num) {
+			$obj = $db->fetch_object($resql);
+
+			$event = new ActionComm($db);
+
+			$event->id = $obj->rowid; // We put contact id in action id for birthdays events
+			$event->ref = $event->id;
+
+			$datebirth = dol_stringtotime($obj->birthday, 1);
+			//print 'ee'.$obj->birthday.'-'.$datebirth;
+			$datearray = dol_getdate($datebirth, true);
+			$event->datep = dol_mktime(0, 0, 0, $datearray['mon'], $datearray['mday'], $year, true); // For full day events, date are also GMT but they won't but converted during output
+			$event->datef = $event->datep;
+
+			$event->type_code = 'BIRTHDAY';
+			$event->type_label = '';
+			$event->type_color = '';
+			$event->type = 'birthdate';
+			$event->type_picto = 'birthdate';
+
+			$event->label = $langs->trans("Birthday").' '.dolGetFirstLastname($obj->firstname, $obj->lastname);
+			$event->percentage = 100;
+			$event->fulldayevent = 1;
+
+			$event->contact_id = $obj->rowid;
+
+			$event->date_start_in_calendar = $db->jdate($event->datep);
+			$event->date_end_in_calendar = $db->jdate($event->datef);
+
+			// Add an entry in eventarray for each day
+			$daycursor = $event->datep;
+			$annee = (int) dol_print_date($daycursor, '%Y', 'tzuserrel');
+			$mois = (int) dol_print_date($daycursor, '%m', 'tzuserrel');
+			$jour = (int) dol_print_date($daycursor, '%d', 'tzuserrel');
+
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
+
+			$eventarray[$daykey][] = $event;
+
+			/*$loop = true;
+			 $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
+			 do {
+			 $eventarray[$daykey][] = $event;
+			 $daykey += 60 * 60 * 24;
+			 if ($daykey > $event->date_end_in_calendar) $loop = false;
+			 } while ($loop);
+			 */
+			$i++;
+		}
+	} else {
+		dol_print_error($db);
+	}
+}
+
+if ($user->hasRight("holiday", "read")) {
+	// LEAVE-HOLIDAY CALENDAR
+	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.statut, x.rowid, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.statut as status";
+	$sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
+	$sql .= " WHERE u.rowid = x.fk_user";
+	$sql .= " AND u.statut = '1'"; // Show only active users  (0 = inactive user, 1 = active user)
+	$sql .= " AND (x.statut = '2' OR x.statut = '3')"; // Show only public leaves (2 = leave wait for approval, 3 = leave approved)
+
+	if ($mode == 'show_day') {
+		// Request only leaves for the current selected day
+		$sql .= " AND '".$db->escape($year)."-".$db->escape($month)."-".$db->escape($day)."' BETWEEN x.date_debut AND x.date_fin";	// date_debut and date_fin are date without time
+	} elseif ($mode == 'show_week') {
+		// Restrict on current month (we get more, but we will filter later)
+		$sql .= " AND date_debut < '".$db->idate(dol_get_last_day($year, $month))."'";
+		$sql .= " AND date_fin >= '".$db->idate(dol_get_first_day($year, $month))."'";
+	} elseif ($mode == 'show_month') {
+		// Restrict on current month
+		$sql .= " AND date_debut <= '".$db->idate(dol_get_last_day($year, $month))."'";
+		$sql .= " AND date_fin >= '".$db->idate(dol_get_first_day($year, $month))."'";
+	}
+
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
+		$i   = 0;
+
+		while ($i < $num) {
+			$obj = $db->fetch_object($resql);
+
+			$event = new ActionComm($db);
+
+			// Need the id of the leave object for link to it
+			$event->id                      = $obj->rowid;
+			$event->ref                     = $event->id;
+
+			$event->type_code = 'HOLIDAY';
+			$event->type_label = '';
+			$event->type_color = '';
+			$event->type = 'holiday';
+			$event->type_picto = 'holiday';
+
+			$event->datep                   = $db->jdate($obj->date_start) + (empty($obj->halfday) || $obj->halfday == 1 ? 0 : 12 * 60 * 60 - 1);
+			$event->datef                   = $db->jdate($obj->date_end) + (empty($obj->halfday) || $obj->halfday == -1 ? 24 : 12) * 60 * 60 - 1;
+			$event->date_start_in_calendar  = $event->datep;
+			$event->date_end_in_calendar    = $event->datef;
+
+			if ($obj->status == 3) {
+				// Show no symbol for leave with state "leave approved"
+				$event->percentage = -1;
+			} elseif ($obj->status == 2) {
+				// Show TO-DO symbol for leave with state "leave wait for approval"
+				$event->percentage = 0;
+			}
+
+			if ($obj->halfday == 1) {
+				$event->label = $obj->lastname.' ('.$langs->trans("Morning").')';
+			} elseif ($obj->halfday == -1) {
+				$event->label = $obj->lastname.' ('.$langs->trans("Afternoon").')';
+			} else {
+				$event->label = $obj->lastname;
+			}
+
+			$daycursor = $event->date_start_in_calendar;
+			$annee = (int) dol_print_date($daycursor, '%Y', 'tzuserrel');
+			$mois = (int) dol_print_date($daycursor, '%m', 'tzuserrel');
+			$jour = (int) dol_print_date($daycursor, '%d', 'tzuserrel');
+
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
+			do {
+				$eventarray[$daykey][] = $event;
+
+				$daykey += 60 * 60 * 24;
+			} while ($daykey <= $event->date_end_in_calendar);
+
+			$i++;
+		}
+	}
+}
+
+// EXTERNAL CALENDAR
+// Complete $eventarray with external import Ical
+if (count($listofextcals)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/ical.class.php';
+
+	foreach ($listofextcals as $key => $extcal) {
+		$url = $extcal['src']; // Example: https://www.google.com/calendar/ical/eldy10%40gmail.com/private-cde92aa7d7e0ef6110010a821a2aaeb/basic.ics
+		$namecal = $extcal['name'];
+		$offsettz = $extcal['offsettz'];
+		$colorcal = $extcal['color'];
+		$buggedfile = $extcal['buggedfile'];
+
+		$pathforcachefile = dol_sanitizePathName($conf->user->dir_temp).'/'.dol_sanitizeFileName('extcal_'.$namecal.'_user'.$user->id).'.cache';
+		//var_dump($pathforcachefile);exit;
+
+		$ical = new ICal();
+		$ical->parse($url, $pathforcachefile, $DELAYFORCACHE);
+		if ($ical->error) {
+			// Save error message for extcal
+			$listofextcals[$key]['error'] = $ical->error;
+			$s .= '<br><div class="warning">'.dol_escape_htmltag($listofextcals[$key]['name']).': '.$url.'<br>Error message: '.dol_escape_htmltag($ical->error).'</div>';
+		}
+
+		// After this $ical->cal['VEVENT'] contains array of events, $ical->cal['DAYLIGHT'] contains daylight info, $ical->cal['STANDARD'] contains non daylight info, ...
+		//var_dump($ical->cal); exit;
+		$icalevents = array();
+		if (is_array($ical->get_event_list())) {
+			$icalevents = array_merge($icalevents, $ical->get_event_list()); // Add $ical->cal['VEVENT']
+		}
+		if (is_array($ical->get_freebusy_list())) {
+			$icalevents = array_merge($icalevents, $ical->get_freebusy_list()); // Add $ical->cal['VFREEBUSY']
+		}
+
+		if (count($icalevents) > 0) {
+			// Duplicate all repeatable events into new entries
+			$moreicalevents = array();
+			foreach ($icalevents as $icalevent) {
+				if (isset($icalevent['RRULE']) && is_array($icalevent['RRULE'])) { //repeatable event
+					//if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow;
+					//if ($event->date_end_in_calendar > $lastdaytoshow) $event->date_end_in_calendar=($lastdaytoshow-1);
+					if ($icalevent['DTSTART;VALUE=DATE']) { //fullday event
+						$datecurstart = dol_stringtotime($icalevent['DTSTART;VALUE=DATE'], 1);
+						$datecurend = dol_stringtotime($icalevent['DTEND;VALUE=DATE'], 1) - 1; // We remove one second to get last second of day
+					} elseif (is_array($icalevent['DTSTART']) && !empty($icalevent['DTSTART']['unixtime'])) {
+						$datecurstart = $icalevent['DTSTART']['unixtime'];
+						$datecurend = $icalevent['DTEND']['unixtime'];
+						if (!empty($ical->cal['DAYLIGHT']['DTSTART']) && $datecurstart) {
+							//var_dump($ical->cal);
+							$tmpcurstart = $datecurstart;
+							$tmpcurend = $datecurend;
+							$tmpdaylightstart = dol_mktime(0, 0, 0, 1, 1, 1970, 1) + (int) $ical->cal['DAYLIGHT']['DTSTART'];
+							$tmpdaylightend = dol_mktime(0, 0, 0, 1, 1, 1970, 1) + (int) $ical->cal['STANDARD']['DTSTART'];
+							//var_dump($tmpcurstart);var_dump($tmpcurend); var_dump($ical->cal['DAYLIGHT']['DTSTART']);var_dump($ical->cal['STANDARD']['DTSTART']);
+							// Edit datecurstart and datecurend
+							if ($tmpcurstart >= $tmpdaylightstart && $tmpcurstart < $tmpdaylightend) {
+								$datecurstart -= ((int) $ical->cal['DAYLIGHT']['TZOFFSETTO']) * 36;
+							} else {
+								$datecurstart -= ((int) $ical->cal['STANDARD']['TZOFFSETTO']) * 36;
+							}
+							if ($tmpcurend >= $tmpdaylightstart && $tmpcurstart < $tmpdaylightend) {
+								$datecurend -= ((int) $ical->cal['DAYLIGHT']['TZOFFSETTO']) * 36;
+							} else {
+								$datecurend -= ((int) $ical->cal['STANDARD']['TZOFFSETTO']) * 36;
+							}
+						}
+						// datecurstart and datecurend are now GMT date
+						//var_dump($datecurstart); var_dump($datecurend); exit;
+					} else {
+						// Not a recognized record
+						dol_syslog("Found a not recognized repeatable record with unknown date start", LOG_ERR);
+						continue;
+					}
+					//print 'xx'.$datecurstart;exit;
+
+					$interval = (empty($icalevent['RRULE']['INTERVAL']) ? 1 : $icalevent['RRULE']['INTERVAL']);
+					$until = empty($icalevent['RRULE']['UNTIL']) ? 0 : dol_stringtotime($icalevent['RRULE']['UNTIL'], 1);
+					$maxrepeat = empty($icalevent['RRULE']['COUNT']) ? 0 : $icalevent['RRULE']['COUNT'];
+					if ($until && ($until + ($datecurend - $datecurstart)) < $firstdaytoshow) {
+						continue; // We discard repeatable event that end before start date to show
+					}
+					if ($datecurstart >= $lastdaytoshow) {
+						continue; // We discard repeatable event that start after end date to show
+					}
+
+					$numofevent = 0;
+					while (($datecurstart < $lastdaytoshow) && (empty($maxrepeat) || ($numofevent < $maxrepeat))) {
+						if ($datecurend >= $firstdaytoshow) {    // We add event
+							$newevent = $icalevent;
+							unset($newevent['RRULE']);
+							if ($icalevent['DTSTART;VALUE=DATE']) {
+								$newevent['DTSTART;VALUE=DATE'] = dol_print_date($datecurstart, '%Y%m%d');
+								$newevent['DTEND;VALUE=DATE'] = dol_print_date($datecurend + 1, '%Y%m%d');
+							} else {
+								$newevent['DTSTART'] = $datecurstart;
+								$newevent['DTEND'] = $datecurend;
+							}
+							$moreicalevents[] = $newevent;
+						}
+						// Jump on next occurrence
+						$numofevent++;
+						$savdatecurstart = $datecurstart;
+						if ($icalevent['RRULE']['FREQ'] == 'DAILY') {
+							$datecurstart = dol_time_plus_duree($datecurstart, $interval, 'd');
+							$datecurend = dol_time_plus_duree($datecurend, $interval, 'd');
+						}
+						if ($icalevent['RRULE']['FREQ'] == 'WEEKLY') {
+							$datecurstart = dol_time_plus_duree($datecurstart, $interval, 'w');
+							$datecurend = dol_time_plus_duree($datecurend, $interval, 'w');
+						} elseif ($icalevent['RRULE']['FREQ'] == 'MONTHLY') {
+							$datecurstart = dol_time_plus_duree($datecurstart, $interval, 'm');
+							$datecurend = dol_time_plus_duree($datecurend, $interval, 'm');
+						} elseif ($icalevent['RRULE']['FREQ'] == 'YEARLY') {
+							$datecurstart = dol_time_plus_duree($datecurstart, $interval, 'y');
+							$datecurend = dol_time_plus_duree($datecurend, $interval, 'y');
+						}
+						// Test to avoid infinite loop ($datecurstart must increase)
+						if ($savdatecurstart >= $datecurstart) {
+							dol_syslog("Found a rule freq ".$icalevent['RRULE']['FREQ']." not managed by dolibarr code. Assume 1 week frequency.", LOG_ERR);
+							$datecurstart += 3600 * 24 * 7;
+							$datecurend += 3600 * 24 * 7;
+						}
+					}
+				}
+			}
+			$icalevents = array_merge($icalevents, $moreicalevents);
+
+			// Loop on each entry into cal file to know if entry is qualified and add an ActionComm into $eventarray
+			foreach ($icalevents as $icalevent) {
+				//var_dump($icalevent);
+
+				//print $icalevent['SUMMARY'].'->';
+				//var_dump($icalevent);exit;
+				if (!empty($icalevent['RRULE'])) {
+					continue; // We found a repeatable event. It was already split into unitary events, so we discard general rule.
+				}
+
+				// Create a new object action
+				$event = new ActionComm($db);
+				$addevent = false;
+				if (isset($icalevent['DTSTART;VALUE=DATE'])) { // fullday event
+					// For full day events, date are also GMT but they won't but converted using tz during output
+					$datestart = dol_stringtotime($icalevent['DTSTART;VALUE=DATE'], 1);
+					if (empty($icalevent['DTEND;VALUE=DATE'])) {
+						$dateend = $datestart + 86400 - 1;
+					} else {
+						$dateend = dol_stringtotime($icalevent['DTEND;VALUE=DATE'], 1) - 1; // We remove one second to get last second of day
+					}
+					//print 'x'.$datestart.'-'.$dateend;exit;
+					//print dol_print_date($dateend,'dayhour','gmt');
+					$event->fulldayevent = 1;
+					$addevent = true;
+				} elseif (!is_array($icalevent['DTSTART'])) { // not fullday event (DTSTART is not array. It is a value like '19700101T000000Z' for 00:00 in greenwitch)
+					$datestart = $icalevent['DTSTART'];
+					$dateend = empty($icalevent['DTEND']) ? $datestart : $icalevent['DTEND'];
+
+					$datestart += +($offsettz * 3600);
+					$dateend += +($offsettz * 3600);
+
+					$addevent = true;
+					//var_dump($offsettz);
+					//var_dump(dol_print_date($datestart, 'dayhour', 'gmt'));
+				} elseif (isset($icalevent['DTSTART']['unixtime'])) {	// File contains a local timezone + a TZ (for example when using bluemind)
+					$datestart = $icalevent['DTSTART']['unixtime'];
+					$dateend = $icalevent['DTEND']['unixtime'];
+
+					$datestart += +($offsettz * 3600);
+					$dateend += +($offsettz * 3600);
+
+					// $buggedfile is set to uselocalandtznodaylight if conf->global->AGENDA_EXT_BUGGEDFILEx = 'uselocalandtznodaylight'
+					if ($buggedfile === 'uselocalandtznodaylight') {	// unixtime is a local date that does not take daylight into account, TZID is +1 for example for 'Europe/Paris' in summer instead of 2
+						// TODO
+					}
+					// $buggedfile is set to uselocalandtzdaylight if conf->global->AGENDA_EXT_BUGGEDFILEx = 'uselocalandtzdaylight' (for example with bluemind)
+					if ($buggedfile === 'uselocalandtzdaylight') {	// unixtime is a local date that does take daylight into account, TZID is +2 for example for 'Europe/Paris' in summer
+						$localtzs = new DateTimeZone(preg_replace('/"/', '', $icalevent['DTSTART']['TZID']));
+						$localtze = new DateTimeZone(preg_replace('/"/', '', $icalevent['DTEND']['TZID']));
+						$localdts = new DateTime(dol_print_date($datestart, 'dayrfc', 'gmt'), $localtzs);
+						$localdte = new DateTime(dol_print_date($dateend, 'dayrfc', 'gmt'), $localtze);
+						$tmps = -1 * $localtzs->getOffset($localdts);
+						$tmpe = -1 * $localtze->getOffset($localdte);
+						$datestart += $tmps;
+						$dateend += $tmpe;
+						//var_dump($datestart);
+					}
+					$addevent = true;
+				}
+
+				if ($addevent) {
+					$event->id = $icalevent['UID'];
+					$event->ref = $event->id;
+					$userId = $userstatic->findUserIdByEmail($namecal);
+					if (!empty($userId) && $userId > 0) {
+						$event->userassigned[$userId] = $userId;
+						$event->percentage = -1;
+					}
+
+					$event->type_code = "ICALEVENT";
+					$event->type_label = $namecal;
+					$event->type_color = $colorcal;
+					$event->type = 'icalevent';
+					$event->type_picto = 'rss';
+
+					$event->icalname = $namecal;
+					$event->icalcolor = $colorcal;
+					$usertime = 0; // We don't modify date because we want to have date into memory datep and datef stored as GMT date. Compensation will be done during output.
+					$event->datep = $datestart + $usertime;
+					$event->datef = $dateend + $usertime;
+
+					if (isset($icalevent['SUMMARY']) && $icalevent['SUMMARY']) {
+						$event->label = dol_string_nohtmltag($icalevent['SUMMARY']);
+					} elseif (isset($icalevent['DESCRIPTION']) && $icalevent['DESCRIPTION']) {
+						$event->label = dol_nl2br(dol_string_nohtmltag($icalevent['DESCRIPTION']), 1);
+					} else {
+						$event->label = $langs->trans("ExtSiteNoLabel");
+					}
+
+					// Priority (see https://www.kanzaki.com/docs/ical/priority.html)
+					// LOW      = 0 to 4
+					// MEDIUM   = 5
+					// HIGH     = 6 to 9
+					if (!empty($icalevent['PRIORITY'])) {
+						$event->priority = $icalevent['PRIORITY'];
+					}
+
+					// Transparency (see https://www.kanzaki.com/docs/ical/transp.html)
+					if (!empty($icalevent['TRANSP'])) {
+						if ($icalevent['TRANSP'] == "TRANSPARENT") {
+							$event->transparency = 0; // 0 = available / free
+						}
+						if ($icalevent['TRANSP'] == "OPAQUE") {
+							$event->transparency = 1; // 1 = busy
+						}
+
+						// TODO: MS outlook states
+						// X-MICROSOFT-CDO-BUSYSTATUS:FREE      + TRANSP:TRANSPARENT => Available / Free
+						// X-MICROSOFT-CDO-BUSYSTATUS:FREE      + TRANSP:OPAQUE      => Work another place
+						// X-MICROSOFT-CDO-BUSYSTATUS:TENTATIVE + TRANSP:OPAQUE      => With reservations
+						// X-MICROSOFT-CDO-BUSYSTATUS:BUSY      + TRANSP:OPAQUE      => Busy
+						// X-MICROSOFT-CDO-BUSYSTATUS:OOF       + TRANSP:OPAQUE      => Away from the office / off-site
+					}
+
+					if (!empty($icalevent['LOCATION'])) {
+						$event->location = $icalevent['LOCATION'];
+					}
+
+					$event->date_start_in_calendar = $event->datep;
+
+					if ($event->datef != '' && $event->datef >= $event->datep) {
+						$event->date_end_in_calendar = $event->datef;
+					} else {
+						$event->date_end_in_calendar = $event->datep;
+					}
+
+					// Add event into $eventarray if date range are ok.
+					if ($event->date_end_in_calendar < $firstdaytoshow || $event->date_start_in_calendar >= $lastdaytoshow) {
+						//print 'x'.$datestart.'-'.$dateend;exit;
+						//print 'x'.$datestart.'-'.$dateend;exit;
+						//print 'x'.$datestart.'-'.$dateend;exit;
+						// This record is out of visible range
+					} else {
+						if ($event->date_start_in_calendar < $firstdaytoshow) {
+							$event->date_start_in_calendar = $firstdaytoshow;
+						}
+						if ($event->date_end_in_calendar >= $lastdaytoshow) {
+							$event->date_end_in_calendar = ($lastdaytoshow - 1);
+						}
+
+						// Add an entry in actionarray for each day
+						$daycursor = $event->date_start_in_calendar;
+						$annee = (int) dol_print_date($daycursor, '%Y', 'tzuserrel');
+						$mois = (int) dol_print_date($daycursor, '%m', 'tzuserrel');
+						$jour = (int) dol_print_date($daycursor, '%d', 'tzuserrel');
+
+						// Loop on each day covered by action to prepare an index to show on calendar
+						$loop = true;
+						$j = 0;
+						// daykey must be date that represent day box in calendar so must be a user time
+						$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
+						$daykeygmt = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
+						do {
+							//if ($event->fulldayevent) print dol_print_date($daykeygmt,'dayhour','gmt').'-'.dol_print_date($daykey,'dayhour','gmt').'-'.dol_print_date($event->date_end_in_calendar,'dayhour','gmt').' ';
+							$eventarray[$daykey][] = $event;
+							$daykey += 60 * 60 * 24;
+							$daykeygmt += 60 * 60 * 24; // Add one day
+							if (($event->fulldayevent ? $daykeygmt : $daykey) > $event->date_end_in_calendar) {
+								$loop = false;
+							}
+						} while ($loop);
+					}
+				}
+			}
+		}
+	}
+}
+
+// Complete $eventarray with events coming from external module
+$parameters = array();
+$object = null;
+$reshook = $hookmanager->executeHooks('getCalendarEvents', $parameters, $object, $action);
+if (!empty($hookmanager->resArray['eventarray'])) {
+	foreach ($hookmanager->resArray['eventarray'] as $keyDate => $events) {
+		if (!isset($eventarray[$keyDate])) {
+			$eventarray[$keyDate] = array();
+		}
+		$eventarray[$keyDate] = array_merge($eventarray[$keyDate], $events);
+	}
+}
+
+// Sort events
+foreach ($eventarray as $keyDate => &$dateeventarray) {
+	usort($dateeventarray, 'sort_events_by_date');
+}
+
 
 $maxnbofchar = 18;
 $cachethirdparties = array();
@@ -812,9 +1460,24 @@ if (is_readable($color_file)) {
 	include $color_file;
 }
 if (!is_array($theme_datacolor)) {
-	$theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
+	$theme_datacolor = array(array(137, 86, 161), array(60, 147, 183), array(250, 190, 80), array(80, 166, 90), array(190, 190, 100), array(91, 115, 247), array(140, 140, 220), array(190, 120, 120), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
 }
 
+$massactionbutton = '';
+
+$num = 0;
+
+print_barre_liste($langs->trans("Agenda"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, -1, 'object_action', 0, $nav.'<span class="marginleftonly"></span>'.$newcardbutton, '', $limit, 1, 0, 1, $viewmode);
+
+$link = '';
+
+// Show div with list of calendars
+print $s;
+
+print '<div class="liste_titre liste_titre_bydiv centpercent">';
+print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, '', (string) $filtert, '', $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid, $search_categ_cus);
+print '</div>';
+
 
 $newparam = $param; // newparam is for birthday links
 $newparam = preg_replace('/showbirthday=/i', 'showbirthday_=', $newparam); // To avoid replacement when replace day= is done
@@ -1091,6 +1754,7 @@ if (getDolGlobalString('AGENDA_USE_EVENT_TYPE') && getDolGlobalString('AGENDA_US
 }
 
 print "\n".'</form>';
+
 print "\n";
 
 // Add js code to manage click on a box
@@ -1187,13 +1851,13 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 
 	// We are in a particular day for $username, now we scan all events
 	foreach ($eventarray as $daykey => $notused) {
-		$annee = dol_print_date($daykey, '%Y', 'tzuserrel');
-		$mois =  dol_print_date($daykey, '%m', 'tzuserrel');
-		$jour =  dol_print_date($daykey, '%d', 'tzuserrel');
+		$annee = (int) dol_print_date($daykey, '%Y', 'tzuserrel');
+		$mois =  (int) dol_print_date($daykey, '%m', 'tzuserrel');
+		$jour =  (int) dol_print_date($daykey, '%d', 'tzuserrel');
 		//var_dump("daykey=$daykey day=$day jour=$jour, month=$month mois=$mois, year=$year annee=$annee");
 
 
-		if ($day == $jour && (int) $month == (int) $mois && $year == $annee) {	// Is it the day we are looking for when calling function ?
+		if ($day == $jour && (int) $month == $mois && $year == $annee) {	// Is it the day we are looking for when calling function ?
 			//var_dump("day=$day jour=$jour month=$month mois=$mois year=$year annee=$annee");
 
 			// Scan all event for this date
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index a3db32f86cb..606ca72fecf 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -924,16 +924,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<table class="border centpercent">';
 
 			// Date To Birth
-			print '<tr><td><label for="birthday">'.$langs->trans("DateOfBirth").'</label></td><td>';
+			print '<tr><td class="titlefieldcreate"><label for="birthday">'.$langs->trans("DateOfBirth").'</label></td><td colspan="3">';
 			$form = new Form($db);
 			if ($object->birthday) {
 				print $form->selectDate($object->birthday, 'birthday', 0, 0, 0, "perso", 1, 0);
 			} else {
 				print $form->selectDate('', 'birthday', 0, 0, 1, "perso", 1, 0);
 			}
-			print '</td>';
 
-			print '<td><label for="birthday_alert">'.$langs->trans("Alert").'</label>: ';
+			print ' &nbsp; <label for="birthday_alert">'.$langs->trans("Alert").'</label> ';
 			if (!empty($object->birthday_alert)) {
 				print '<input type="checkbox" name="birthday_alert" id="birthday_alert" checked>';
 			} else {
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index cfe0f519db9..de0d14ebd49 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -246,7 +246,7 @@ $holidaystatic = new Holiday($db);
 // Update sold
 $result = $object->updateBalance();
 
-$title = $langs->trans('CPTitreMenu');
+$title = $langs->trans('Holidays');
 $help_url = 'EN:Module_Holiday';
 
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'bodyforlist mod-holiday page-list');
@@ -542,9 +542,6 @@ if ($id > 0) {		// For user tab
 
 	print '</div>';
 } else {
-	$title = $langs->trans("ListeCP");
-
-
 	$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'));
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index 859f6d0d00a..7c9c40ea112 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=GRH
 Holidays=Congés
-Holiday=Demande de congés
+Holiday=Congés
 CPTitreMenu=Demande de congés
 MenuReportMonth=État mensuel
 MenuAddCP=Créer demande de congés

From e9e7b854104880c84207d13ca370a1d560a8d72d Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 24 Jan 2025 20:22:23 +0100
Subject: [PATCH 166/602] Debug v21 - pb holiday view into agenda

---
 htdocs/comm/action/index.php     |  23 +--
 htdocs/comm/action/pertype.php   |   2 -
 htdocs/comm/action/peruser.php   | 326 ++++++++++++++++++-------------
 htdocs/theme/eldy/global.inc.php |   7 +-
 htdocs/theme/md/style.css.php    |   8 +
 htdocs/user/perms.php            |   3 +-
 6 files changed, 219 insertions(+), 150 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 02737de7db2..e13c531d640 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -620,8 +620,8 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 
 	$s .= '<script type="text/javascript">'."\n";
 	$s .= 'jQuery(document).ready(function () {'."\n";
-	$s .= 'jQuery(".check_birthday").click(function() { console.log("Toggle birthdays"); jQuery(".family_birthday").toggle(); });'."\n";
-	$s .= 'jQuery(".check_holiday").click(function() { console.log("Toggle holidays"); jQuery(".family_holiday").toggle(); });'."\n";
+	$s .= 'jQuery(".check_birthday").click(function() { console.log("Toggle class .family_birthday"); jQuery(".family_birthday").toggle(); });'."\n";
+	$s .= 'jQuery(".check_holiday").click(function() { console.log("Toggle class .family_holiday"); jQuery(".family_holiday").toggle(); });'."\n";
 	if (isModEnabled("bookcal") && !empty($bookcalcalendars["calendars"])) {
 		foreach ($bookcalcalendars["calendars"] as $key => $value) {
 			$s .= 'jQuery(".check_bookcal_calendar_'.$value['id'].'").click(function() { console.log("Toggle Bookcal Calendar '.$value['id'].'"); jQuery(".family_bookcal_calendar_'.$value['id'].'").toggle(); });'."\n";
@@ -798,7 +798,7 @@ if (!empty($actioncode)) {
 			$sql .= " AND ca.type != 'systemauto'";
 		} elseif ($actioncode == 'AC_ALL_AUTO') {
 			$sql .= " AND ca.type = 'systemauto'";
-		} else {
+		} elseif (!empty($actioncode) && $actioncode !== '-1') {
 			if (is_array($actioncode)) {
 				$sql .= " AND ca.code IN (".$db->sanitize("'".implode("','", $actioncode)."'", 1).")";
 			} else {
@@ -1125,25 +1125,27 @@ if ($showbirthday) {
 	}
 }
 
+// LEAVE-HOLIDAY CALENDAR
 if ($user->hasRight("holiday", "read")) {
-	// LEAVE-HOLIDAY CALENDAR
 	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.statut, x.rowid, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.statut as status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
 	$sql .= " WHERE u.rowid = x.fk_user";
 	$sql .= " AND u.statut = '1'"; // Show only active users  (0 = inactive user, 1 = active user)
 	$sql .= " AND (x.statut = '2' OR x.statut = '3')"; // Show only public leaves (2 = leave wait for approval, 3 = leave approved)
-
 	if ($mode == 'show_day') {
 		// Request only leaves for the current selected day
 		$sql .= " AND '".$db->escape($year)."-".$db->escape($month)."-".$db->escape($day)."' BETWEEN x.date_debut AND x.date_fin";	// date_debut and date_fin are date without time
 	} elseif ($mode == 'show_week') {
 		// Restrict on current month (we get more, but we will filter later)
-		$sql .= " AND date_debut < '".$db->idate(dol_get_last_day($year, $month))."'";
-		$sql .= " AND date_fin >= '".$db->idate(dol_get_first_day($year, $month))."'";
+		$sql .= " AND x.date_debut < '".$db->idate(dol_get_last_day($year, $month))."'";
+		$sql .= " AND x.date_fin >= '".$db->idate(dol_get_first_day($year, $month))."'";
 	} elseif ($mode == 'show_month') {
 		// Restrict on current month
-		$sql .= " AND date_debut <= '".$db->idate(dol_get_last_day($year, $month))."'";
-		$sql .= " AND date_fin >= '".$db->idate(dol_get_first_day($year, $month))."'";
+		$sql .= " AND x.date_debut <= '".$db->idate(dol_get_last_day($year, $month))."'";
+		$sql .= " AND x.date_fin >= '".$db->idate(dol_get_first_day($year, $month))."'";
+	}
+	if (!$user->hasRight('holiday', 'readall')) {
+		$sql.= " AND x.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
 	}
 
 	$resql = $db->query($sql);
@@ -1166,7 +1168,7 @@ if ($user->hasRight("holiday", "read")) {
 			$event->type = 'holiday';
 			$event->type_picto = 'holiday';
 
-			$event->datep                   = $db->jdate($obj->date_start) + (empty($obj->halfday) || $obj->halfday == 1 ? 0 : 12 * 60 * 60 - 1);
+			$event->datep                   = $db->jdate($obj->date_start) + (empty($obj->halfday) || $obj->halfday == 1 ? 0 : 12) * 60 * 60;
 			$event->datef                   = $db->jdate($obj->date_end) + (empty($obj->halfday) || $obj->halfday == -1 ? 24 : 12) * 60 * 60 - 1;
 			$event->date_start_in_calendar  = $event->datep;
 			$event->date_end_in_calendar    = $event->datef;
@@ -1953,7 +1955,6 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 			foreach ($eventarray[$daykey] as $index => $event) {
 				if ($i < $maxprint || $maxprint == 0 || getDolGlobalString('MAIN_JS_SWITCH_AGENDA')) {
 					$keysofuserassigned = array_keys($event->userassigned);
-					$ponct = ($event->date_start_in_calendar == $event->date_end_in_calendar);
 
 					// Define $color (Hex string like '0088FF') and $cssclass of event
 					$color = -1;
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 4d9b4155d46..f3f6226d43f 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -1027,8 +1027,6 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 				}
 
-				$ponct = ($event->date_start_in_calendar == $event->date_end_in_calendar);
-
 				// Define $color (Hex string like '0088FF') and $cssclass of event
 				$color = -1;
 				$cssclass = '';
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 915094db599..3f1e03c317d 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -578,8 +578,8 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 
 	$s .= '<script type="text/javascript">'."\n";
 	$s .= 'jQuery(document).ready(function () {'."\n";
-	$s .= 'jQuery(".check_birthday").click(function() { console.log("Toggle birthdays"); jQuery(".family_birthday").toggle(); });'."\n";
-	$s .= 'jQuery(".check_holiday").click(function() { console.log("Toggle holidays"); jQuery(".family_holiday").toggle(); });'."\n";
+	$s .= 'jQuery(".check_birthday").click(function() { console.log("Toggle class .peruser_birthday"); jQuery(".peruser_birthday").addClass("peruser_birthday_imp"); });'."\n";
+	$s .= 'jQuery(".check_holiday").click(function() { console.log("Toggle class .peruser_holiday"); if (jQuery(".peruser_holiday").hasClass("peruser_holiday_imp")) { jQuery(".peruser_holiday").removeClass("peruser_holiday_imp"); } else { jQuery(".peruser_holiday").addClass("peruser_holiday_imp"); } });'."\n";
 	if (isModEnabled("bookcal") && !empty($bookcalcalendars["calendars"])) {
 		foreach ($bookcalcalendars["calendars"] as $key => $value) {
 			$s .= 'jQuery(".check_bookcal_calendar_'.$value['id'].'").click(function() { console.log("Toggle Bookcal Calendar '.$value['id'].'"); jQuery(".family_bookcal_calendar_'.$value['id'].'").toggle(); });'."\n";
@@ -726,7 +726,7 @@ if (!empty($actioncode)) {
 			$sql .= " AND ca.type != 'systemauto'";
 		} elseif ($actioncode == 'AC_ALL_AUTO') {
 			$sql .= " AND ca.type = 'systemauto'";
-		} else {
+		} elseif (!empty($actioncode) && $actioncode !== '-1') {
 			if (is_array($actioncode)) {
 				$sql .= " AND ca.code IN (".$db->sanitize("'".implode("','", $actioncode)."'", 1).")";
 			} else {
@@ -1063,18 +1063,11 @@ if ($user->hasRight("holiday", "read")) {
 	$sql .= " WHERE u.rowid = x.fk_user";
 	$sql .= " AND u.statut = '1'"; // Show only active users  (0 = inactive user, 1 = active user)
 	$sql .= " AND (x.statut = '2' OR x.statut = '3')"; // Show only public leaves (2 = leave wait for approval, 3 = leave approved)
-
-	if ($mode == 'show_day') {
-		// Request only leaves for the current selected day
-		$sql .= " AND '".$db->escape($year)."-".$db->escape($month)."-".$db->escape($day)."' BETWEEN x.date_debut AND x.date_fin";	// date_debut and date_fin are date without time
-	} elseif ($mode == 'show_week') {
-		// Restrict on current month (we get more, but we will filter later)
-		$sql .= " AND date_debut < '".$db->idate(dol_get_last_day($year, $month))."'";
-		$sql .= " AND date_fin >= '".$db->idate(dol_get_first_day($year, $month))."'";
-	} elseif ($mode == 'show_month') {
-		// Restrict on current month
-		$sql .= " AND date_debut <= '".$db->idate(dol_get_last_day($year, $month))."'";
-		$sql .= " AND date_fin >= '".$db->idate(dol_get_first_day($year, $month))."'";
+	// Restrict on current month (we get more, but we will filter later)
+	$sql .= " AND x.date_debut < '".$db->idate(dol_get_last_day($year, $month))."'";
+	$sql .= " AND x.date_fin >= '".$db->idate(dol_get_first_day($year, $month))."'";
+	if (!$user->hasRight('holiday', 'readall')) {
+		$sql.= " AND x.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
 	}
 
 	$resql = $db->query($sql);
@@ -1097,11 +1090,16 @@ if ($user->hasRight("holiday", "read")) {
 			$event->type = 'holiday';
 			$event->type_picto = 'holiday';
 
-			$event->datep                   = $db->jdate($obj->date_start) + (empty($obj->halfday) || $obj->halfday == 1 ? 0 : 12 * 60 * 60 - 1);
+			$event->datep                   = $db->jdate($obj->date_start) + (empty($obj->halfday) || $obj->halfday == 1 ? 0 : 12) * 60 * 60;
 			$event->datef                   = $db->jdate($obj->date_end) + (empty($obj->halfday) || $obj->halfday == -1 ? 24 : 12) * 60 * 60 - 1;
 			$event->date_start_in_calendar  = $event->datep;
 			$event->date_end_in_calendar    = $event->datef;
 
+			$event->transparency = 1;
+
+			$event->userownerid = $obj->uid; // user id of owner
+			$event->userassigned = array($obj->uid => $obj->uid);
+
 			if ($obj->status == 3) {
 				// Show no symbol for leave with state "leave approved"
 				$event->percentage = -1;
@@ -1110,24 +1108,44 @@ if ($user->hasRight("holiday", "read")) {
 				$event->percentage = 0;
 			}
 
-			if ($obj->halfday == 1) {
-				$event->label = $obj->lastname.' ('.$langs->trans("Morning").')';
-			} elseif ($obj->halfday == -1) {
-				$event->label = $obj->lastname.' ('.$langs->trans("Afternoon").')';
-			} else {
-				$event->label = $obj->lastname;
-			}
 
 			$daycursor = $event->date_start_in_calendar;
 			$annee = (int) dol_print_date($daycursor, '%Y', 'tzuserrel');
 			$mois = (int) dol_print_date($daycursor, '%m', 'tzuserrel');
 			$jour = (int) dol_print_date($daycursor, '%d', 'tzuserrel');
 
+			$daycursorend = $event->date_end_in_calendar;
+			$anneeend = (int) dol_print_date($daycursorend, '%Y', 'tzuserrel');
+			$moisend = (int) dol_print_date($daycursorend, '%m', 'tzuserrel');
+			$jourend = (int) dol_print_date($daycursorend, '%d', 'tzuserrel');
+
+			// daykey must be date that represent day box in calendar so must be a user time
 			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
+			$daykeygmt = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
+			$ifornbofdays = 0;
 			do {
-				$eventarray[$daykey][] = $event;
+				$ifornbofdays++;
+
+				$firstdayofholiday = ($ifornbofdays == 1);
+				$lastdayofholiday = ($daykeygmt == dol_get_first_hour($event->date_end_in_calendar, 'gmt'));
+
+				//var_dump(dol_print_date($daykeygmt, 'dayhour', 'gmt'));
+
+				if ((in_array($obj->halfday, array(1, 2)) == 1 && $lastdayofholiday) || (in_array($obj->halfday, array(-1, 2)) && $firstdayofholiday)) {
+					// We create a copy of event because we want tochange the label
+					$newevent = dol_clone($event, 1);
+					if (in_array($obj->halfday, array(1, 2)) && $lastdayofholiday) {
+						$newevent->label .= ' ('.$langs->trans("Morning").')';
+					} elseif (in_array($obj->halfday, array(-1, 2)) && $firstdayofholiday) {
+						$newevent->label .= ' ('.$langs->trans("Afternoon").')';
+					}
+					$eventarray[$daykey][] = $newevent;	// We need to use ->gtTypePicto, getXXXon object, so clone must be PHP clone.
+				} else {
+					$eventarray[$daykey][] = $event;	// We can use the event unchanged
+				}
 
 				$daykey += 60 * 60 * 24;
+				$daykeygmt += 60 * 60 * 24;
 			} while ($daykey <= $event->date_end_in_calendar);
 
 			$i++;
@@ -1506,7 +1524,7 @@ echo '<div class="div-table-responsive">';
 $colorsbytype = array();
 
 while ($currentdaytoshow < $lastdaytoshow) {
-	echo '<table class="centpercent noborder nocellnopadd cal_month listwithfilterbefore">';
+	echo '<table class="centpercent noborder nocellnopadd cal_month cal_peruser listwithfilterbefore">';
 
 	echo '<tr class="liste_titre">';
 	echo '<td class="nopaddingtopimp nopaddingbottomimp nowraponsmartphone">';
@@ -1605,7 +1623,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 			}
 		}
 	} else {
-		/* Use this list to have for all users */
+		/* Use this list to have lines for all users */
 		$sql = "SELECT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
 		$sql .= " FROM ".$db->prefix()."user as u";
 		if (isModEnabled('multicompany') && getDolGlobalInt('MULTICOMPANY_TRANSVERSE_MODE')) {
@@ -1854,19 +1872,18 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		$annee = (int) dol_print_date($daykey, '%Y', 'tzuserrel');
 		$mois =  (int) dol_print_date($daykey, '%m', 'tzuserrel');
 		$jour =  (int) dol_print_date($daykey, '%d', 'tzuserrel');
-		//var_dump("daykey=$daykey day=$day jour=$jour, month=$month mois=$mois, year=$year annee=$annee");
-
+		//var_dump("daykey=$daykey day=$day jour=$jour, month=$month mois=$mois, year=$year annee=$annee ".dol_print_date($daykey, 'dayhour', 'gmt'));
+		//var_dump($notused);
 
 		if ($day == $jour && (int) $month == $mois && $year == $annee) {	// Is it the day we are looking for when calling function ?
 			//var_dump("day=$day jour=$jour month=$month mois=$mois year=$year annee=$annee");
 
 			// Scan all event for this date
 			foreach ($eventarray[$daykey] as $index => $event) {
-				//print 'daykey='.$daykey.'='.dol_print_date($daykey, 'dayhour', 'gmt').' '.$year.'-'.$month.'-'.$day.' -> This event: '.$event->id.' '.$index.' is open for this daykey '.$annee.'-'.$mois.'-'.$jour."<br>\n";
+				//print 'daykey='.$daykey.'='.dol_print_date($daykey, 'dayhour', 'gmt').' '.$year.'-'.$month.'-'.$day.' -> The event id '.$event->id.' index '.$index.' is open for this daykey '.$annee.'-'.$mois.'-'.$jour."<br>\n";
 				//var_dump($event);
 
 				$keysofuserassigned = array_keys($event->userassigned);
-				$ponct = ($event->date_start_in_calendar == $event->date_end_in_calendar);
 
 				if (!in_array($username->id, $keysofuserassigned)) {
 					continue; // We discard record if event is from another user than user we want to show
@@ -1883,6 +1900,11 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 				$color = -1;
 				$cssclass = '';
 				$colorindex = -1;
+
+				if ($event->type_code == 'HOLIDAY') {
+					$cssclass = 'family_holiday';
+				}
+
 				if (in_array($user->id, $keysofuserassigned)) {
 					$cssclass = 'family_mytasks';
 
@@ -1990,30 +2012,35 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 								$cases1[$h][$event->id]['string'] .= ' - '.$event->label;
 							}
 							$cases1[$h][$event->id]['typecode'] = $event->type_code;
-							$cases1[$h][$event->id]['color'] = $color;
-							if ($event->fk_project > 0) {
-								if (empty($cacheprojects[$event->fk_project])) {
-									$tmpproj = new Project($db);
-									$tmpproj->fetch($event->fk_project);
-									$cacheprojects[$event->fk_project] = $tmpproj;
+							if ($event->type_code == 'HOLIDAY') {
+								$cases1[$h][$event->id]['css'] = 'peruser_holiday ';
+							} else {
+								$cases1[$h][$event->id]['color'] = $color;
+
+								if ($event->fk_project > 0) {
+									if (empty($cacheprojects[$event->fk_project])) {
+										$tmpproj = new Project($db);
+										$tmpproj->fetch($event->fk_project);
+										$cacheprojects[$event->fk_project] = $tmpproj;
+									}
+									$cases1[$h][$event->id]['string'] .= ', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
 								}
-								$cases1[$h][$event->id]['string'] .= ', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
-							}
-							if ($event->socid > 0) {
-								if (empty($cachethirdparties[$event->socid])) {
-									$tmpthirdparty = new Societe($db);
-									$tmpthirdparty->fetch($event->socid);
-									$cachethirdparties[$event->socid] = $tmpthirdparty;
+								if ($event->socid > 0) {
+									if (empty($cachethirdparties[$event->socid])) {
+										$tmpthirdparty = new Societe($db);
+										$tmpthirdparty->fetch($event->socid);
+										$cachethirdparties[$event->socid] = $tmpthirdparty;
+									}
+									$cases1[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
 								}
-								$cases1[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
-							}
-							if ($event->contact_id > 0) {
-								if (empty($cachecontacts[$event->contact_id])) {
-									$tmpcontact = new Contact($db);
-									$tmpcontact->fetch($event->contact_id);
-									$cachecontacts[$event->contact_id] = $tmpcontact;
+								if ($event->contact_id > 0) {
+									if (empty($cachecontacts[$event->contact_id])) {
+										$tmpcontact = new Contact($db);
+										$tmpcontact->fetch($event->contact_id);
+										$cachecontacts[$event->contact_id] = $tmpcontact;
+									}
+									$cases1[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contact_id]->getFullName($langs);
 								}
-								$cases1[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contact_id]->getFullName($langs);
 							}
 						}
 						if ($event->date_start_in_calendar < $b1 && $dateendtouse > $b) {
@@ -2033,30 +2060,35 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 								$cases2[$h][$event->id]['string'] .= ' - '.$event->label;
 							}
 							$cases2[$h][$event->id]['typecode'] = $event->type_code;
-							$cases2[$h][$event->id]['color'] = $color;
-							if ($event->fk_project > 0) {
-								if (empty($cacheprojects[$event->fk_project])) {
-									$tmpproj = new Project($db);
-									$tmpproj->fetch($event->fk_project);
-									$cacheprojects[$event->fk_project] = $tmpproj;
+							if ($event->type_code == 'HOLIDAY') {
+								$cases2[$h][$event->id]['css'] = 'peruser_holiday ';
+							} else {
+								$cases2[$h][$event->id]['color'] = $color;
+
+								if ($event->fk_project > 0) {
+									if (empty($cacheprojects[$event->fk_project])) {
+										$tmpproj = new Project($db);
+										$tmpproj->fetch($event->fk_project);
+										$cacheprojects[$event->fk_project] = $tmpproj;
+									}
+									$cases2[$h][$event->id]['string'] .= ', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
 								}
-								$cases2[$h][$event->id]['string'] .= ', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
-							}
-							if ($event->socid > 0) {
-								if (empty($cachethirdparties[$event->socid])) {
-									$tmpthirdparty = new Societe($db);
-									$tmpthirdparty->fetch($event->socid);
-									$cachethirdparties[$event->socid] = $tmpthirdparty;
+								if ($event->socid > 0) {
+									if (empty($cachethirdparties[$event->socid])) {
+										$tmpthirdparty = new Societe($db);
+										$tmpthirdparty->fetch($event->socid);
+										$cachethirdparties[$event->socid] = $tmpthirdparty;
+									}
+									$cases2[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
 								}
-								$cases2[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
-							}
-							if ($event->contact_id > 0) {
-								if (empty($cachecontacts[$event->contact_id])) {
-									$tmpcontact = new Contact($db);
-									$tmpcontact->fetch($event->contact_id);
-									$cachecontacts[$event->contact_id] = $tmpcontact;
+								if ($event->contact_id > 0) {
+									if (empty($cachecontacts[$event->contact_id])) {
+										$tmpcontact = new Contact($db);
+										$tmpcontact->fetch($event->contact_id);
+										$cachecontacts[$event->contact_id] = $tmpcontact;
+									}
+									$cases2[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contact_id]->getFullName($langs);
 								}
-								$cases2[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contact_id]->getFullName($langs);
 							}
 						}
 						if ($event->date_start_in_calendar < $b2 && $dateendtouse > $b1) {
@@ -2076,30 +2108,35 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 								$cases3[$h][$event->id]['string'] .= ' - '.$event->label;
 							}
 							$cases3[$h][$event->id]['typecode'] = $event->type_code;
-							$cases3[$h][$event->id]['color'] = $color;
-							if ($event->fk_project > 0) {
-								if (empty($cacheprojects[$event->fk_project])) {
-									$tmpproj = new Project($db);
-									$tmpproj->fetch($event->fk_project);
-									$cacheprojects[$event->fk_project] = $tmpproj;
+							if ($event->type_code == 'HOLIDAY') {
+								$cases3[$h][$event->id]['css'] .= 'peruser_holiday ';
+							} else {
+								$cases3[$h][$event->id]['color'] = $color;
+
+								if ($event->fk_project > 0) {
+									if (empty($cacheprojects[$event->fk_project])) {
+										$tmpproj = new Project($db);
+										$tmpproj->fetch($event->fk_project);
+										$cacheprojects[$event->fk_project] = $tmpproj;
+									}
+									$cases3[$h][$event->id]['string'] .= ', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
 								}
-								$cases3[$h][$event->id]['string'] .= ', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
-							}
-							if ($event->socid > 0) {
-								if (empty($cachethirdparties[$event->socid])) {
-									$tmpthirdparty = new Societe($db);
-									$tmpthirdparty->fetch($event->socid);
-									$cachethirdparties[$event->socid] = $tmpthirdparty;
+								if ($event->socid > 0) {
+									if (empty($cachethirdparties[$event->socid])) {
+										$tmpthirdparty = new Societe($db);
+										$tmpthirdparty->fetch($event->socid);
+										$cachethirdparties[$event->socid] = $tmpthirdparty;
+									}
+									$cases3[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
 								}
-								$cases3[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
-							}
-							if ($event->contact_id > 0) {
-								if (empty($cachecontacts[$event->contact_id])) {
-									$tmpcontact = new Contact($db);
-									$tmpcontact->fetch($event->contact_id);
-									$cachecontacts[$event->contact_id] = $tmpcontact;
+								if ($event->contact_id > 0) {
+									if (empty($cachecontacts[$event->contact_id])) {
+										$tmpcontact = new Contact($db);
+										$tmpcontact->fetch($event->contact_id);
+										$cachecontacts[$event->contact_id] = $tmpcontact;
+									}
+									$cases3[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contact_id]->getFullName($langs);
 								}
-								$cases3[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contact_id]->getFullName($langs);
 							}
 						}
 						if ($event->date_start_in_calendar < $c && $dateendtouse > $b2) {
@@ -2119,30 +2156,35 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 								$cases4[$h][$event->id]['string'] .= ' - '.$event->label;
 							}
 							$cases4[$h][$event->id]['typecode'] = $event->type_code;
-							$cases4[$h][$event->id]['color'] = $color;
-							if ($event->fk_project > 0) {
-								if (empty($cacheprojects[$event->fk_project])) {
-									$tmpproj = new Project($db);
-									$tmpproj->fetch($event->fk_project);
-									$cacheprojects[$event->fk_project] = $tmpproj;
+							if ($event->type_code == 'HOLIDAY') {
+								$cases4[$h][$event->id]['css'] = 'peruser_holiday ';
+							} else {
+								$cases4[$h][$event->id]['color'] = $color;
+
+								if ($event->fk_project > 0) {
+									if (empty($cacheprojects[$event->fk_project])) {
+										$tmpproj = new Project($db);
+										$tmpproj->fetch($event->fk_project);
+										$cacheprojects[$event->fk_project] = $tmpproj;
+									}
+									$cases4[$h][$event->id]['string'] .= ', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
 								}
-								$cases4[$h][$event->id]['string'] .= ', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
-							}
-							if ($event->socid > 0) {
-								if (empty($cachethirdparties[$event->socid])) {
-									$tmpthirdparty = new Societe($db);
-									$tmpthirdparty->fetch($event->socid);
-									$cachethirdparties[$event->socid] = $tmpthirdparty;
+								if ($event->socid > 0) {
+									if (empty($cachethirdparties[$event->socid])) {
+										$tmpthirdparty = new Societe($db);
+										$tmpthirdparty->fetch($event->socid);
+										$cachethirdparties[$event->socid] = $tmpthirdparty;
+									}
+									$cases4[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
 								}
-								$cases4[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
-							}
-							if ($event->contact_id > 0) {
-								if (empty($cachecontacts[$event->contact_id])) {
-									$tmpcontact = new Contact($db);
-									$tmpcontact->fetch($event->contact_id);
-									$cachecontacts[$event->contact_id] = $tmpcontact;
+								if ($event->contact_id > 0) {
+									if (empty($cachecontacts[$event->contact_id])) {
+										$tmpcontact = new Contact($db);
+										$tmpcontact->fetch($event->contact_id);
+										$cachecontacts[$event->contact_id] = $tmpcontact;
+									}
+									$cases4[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contact_id]->getFullName($langs);
 								}
-								$cases4[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contact_id]->getFullName($langs);
 							}
 						}
 					} else {
@@ -2163,6 +2205,10 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 						$cases2[$h][$event->id]['color'] = $color;
 						$cases3[$h][$event->id]['color'] = $color;
 						$cases4[$h][$event->id]['color'] = $color;
+						$cases1[$h][$event->id]['css'] = '';
+						$cases2[$h][$event->id]['css'] = '';
+						$cases3[$h][$event->id]['css'] = '';
+						$cases4[$h][$event->id]['css'] = '';
 					}
 				}
 				$i++;
@@ -2178,10 +2224,10 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		$color2 = '';
 		$color3 = '';
 		$color4 = '';
-		$style1 = '';
-		$style2 = '';
-		$style3 = '';
-		$style4 = '';
+		$style1 = 'onclickopenref ';
+		$style2 = 'onclickopenref ';
+		$style3 = 'onclickopenref ';
+		$style4 = 'onclickopenref ';
 		$string1 = '&nbsp;';
 		$string2 = '&nbsp;';
 		$string3 = '&nbsp;';
@@ -2197,13 +2243,16 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			}
 
 			if (!getDolGlobalString('AGENDA_NO_TRANSPARENT_ON_NOT_BUSY')) {
-				$style1 = 'peruser_notbusy';
+				$style1 .= 'peruser_notbusy ';
 			} else {
-				$style1 = 'peruser_busy';
+				$style1 .= 'peruser_busy ';
 			}
 			foreach ($cases1[$h] as $id => $ev) {
 				if ($ev['busy']) {
-					$style1 = 'peruser_busy';
+					$style1 = 'onclickopenref peruser_busy';
+				}
+				if ($ev['css']) {
+					$style1 .= ' '.$ev['css'];
 				}
 			}
 		}
@@ -2214,13 +2263,16 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			}
 
 			if (!getDolGlobalString('AGENDA_NO_TRANSPARENT_ON_NOT_BUSY')) {
-				$style2 = 'peruser_notbusy';
+				$style2 .= 'peruser_notbusy ';
 			} else {
-				$style2 = 'peruser_busy';
+				$style2 .= 'peruser_busy ';
 			}
 			foreach ($cases2[$h] as $id => $ev) {
 				if ($ev['busy']) {
-					$style2 = 'peruser_busy';
+					$style2 = 'onclickopenref peruser_busy';
+				}
+				if ($ev['css']) {
+					$style2 .= ' '.$ev['css'];
 				}
 			}
 		}
@@ -2231,13 +2283,16 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			}
 
 			if (!getDolGlobalString('AGENDA_NO_TRANSPARENT_ON_NOT_BUSY')) {
-				$style3 = 'peruser_notbusy';
+				$style3 .= 'peruser_notbusy ';
 			} else {
-				$style3 = 'peruser_busy';
+				$style3 .= 'peruser_busy ';
 			}
 			foreach ($cases3[$h] as $id => $ev) {
 				if ($ev['busy']) {
-					$style3 = 'peruser_busy';
+					$style3 = 'onclickopenref peruser_busy';
+				}
+				if ($ev['css']) {
+					$style3 .= ' '.$ev['css'];
 				}
 			}
 		}
@@ -2248,13 +2303,16 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			}
 
 			if (!getDolGlobalString('AGENDA_NO_TRANSPARENT_ON_NOT_BUSY')) {
-				$style4 = 'peruser_notbusy';
+				$style4 .= 'peruser_notbusy ';
 			} else {
-				$style4 = 'peruser_busy';
+				$style4 .= 'peruser_busy ';
 			}
 			foreach ($cases4[$h] as $id => $ev) {
 				if ($ev['busy']) {
-					$style4 = 'peruser_busy';
+					$style4 = 'onclickopenref peruser_busy';
+				}
+				if ($ev['css']) {
+					$style4 .= ' '.$ev['css'];
 				}
 			}
 		}
@@ -2351,7 +2409,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		}
 		print 'class="';
 		print($style1 ? $style1.' ' : '');
-		print 'onclickopenref center'.($title2 ? ' classfortooltip' : '').($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_00_'.($ids1 ? $ids1 : 'none').'"'.($title1 ? ' title="'.$title1.'"' : '').'>';
+		print 'center'.($title2 ? ' classfortooltip' : '').($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_00_'.($ids1 ? $ids1 : 'none').'"'.($title1 ? ' title="'.$title1.'"' : '').'>';
 		print $string1;
 		print '</td>';
 
@@ -2363,7 +2421,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		}
 		print 'class="';
 		print($style2 ? $style2.' ' : '');
-		print 'onclickopenref center'.($title2 ? ' classfortooltip' : '').($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_15_'.($ids2 ? $ids2 : 'none').'"'.($title2 ? ' title="'.$title2.'"' : '').'>';
+		print 'center'.($title2 ? ' classfortooltip' : '').($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_15_'.($ids2 ? $ids2 : 'none').'"'.($title2 ? ' title="'.$title2.'"' : '').'>';
 		print $string2;
 		print '</td>';
 
@@ -2375,7 +2433,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		}
 		print 'class="';
 		print($style3 ? $style3.' ' : '');
-		print 'onclickopenref center'.($title2 ? ' classfortooltip' : '').($title3 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_30_'.($ids3 ? $ids3 : 'none').'"'.($title3 ? ' title="'.$title3.'"' : '').'>';
+		print 'center'.($title2 ? ' classfortooltip' : '').($title3 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_30_'.($ids3 ? $ids3 : 'none').'"'.($title3 ? ' title="'.$title3.'"' : '').'>';
 		print $string3;
 		print '</td>';
 
@@ -2387,7 +2445,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		}
 		print 'class="';
 		print($style4 ? $style4.' ' : '');
-		print 'onclickopenref center'.($title3 ? ' classfortooltip' : '').($title4 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_45_'.($ids4 ? $ids4 : 'none').'"'.($title4 ? ' title="'.$title4.'"' : '').'>';
+		print 'center'.($title3 ? ' classfortooltip' : '').($title4 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_45_'.($ids4 ? $ids4 : 'none').'"'.($title4 ? ' title="'.$title4.'"' : '').'>';
 		print $string4;
 		print '</td>';
 
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 92b1b7df0e0..2457de978e4 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -6138,6 +6138,7 @@ table.cal_month    { border-spacing: 0px;  }
 table.cal_month td:first-child  { border-left: 0px; }
 table.cal_month td:last-child   { border-right: 0px; }
 table.cal_month td { padding-left: 1px !important; padding-right: 1px !important; }
+table.cal_month.cal_peruser td { padding-left: 0 !important; padding-right: 0 !important; }
 .cal_current_month { border-top: 0; border-left: solid 1px #E0E0E0; border-right: 0; border-bottom: solid 1px #E0E0E0; }
 .cal_current_month_peruserleft { border-top: 0; border-left: solid 2px #6C7C7B; border-right: 0; border-bottom: solid 1px #E0E0E0; }
 .cal_current_month_oneday { border-right: solid 1px #E0E0E0; }
@@ -6153,7 +6154,7 @@ table.cal_month td { padding-left: 1px !important; padding-right: 1px !important
 .cal_today_peruser { background: #FDFDF0; border-right: solid 1px #E0E0E0; border-bottom: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_today_peruser_peruserleft { background: #FDFDF0; border-left: solid 2px #6C7C7B; border-right: solid 1px #E0E0E0; border-bottom: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_past          { }
-.cal_peruser       { padding-top: 0 !important; padding-bottom: 0 !important; padding-<?php print $left; ?>: 1px !important; padding-<?php print $right; ?>: 1px !important; }
+.cal_peruser       { padding-top: 0 !important; padding-bottom: 0 !important; padding-<?php print $left; ?>: 0 !important; padding-<?php print $right; ?>: 0 !important; }
 .cal_impair        {
 	background: linear-gradient(bottom, var(--colorbacklinepair2) 85%, var(--colorbacklinepair2) 100%);
 	background: -o-linear-gradient(bottom, var(--colorbacklinepair2) 85%, var(--colorbacklinepair2) 100%);
@@ -6190,10 +6191,12 @@ td.small.cal_event {
 td.cal_other_month {
 	opacity: 0.7;
 }
-
 td.event-past span  {
 	opacity: 0.5;
 }
+td.peruser_holiday_imp {
+	background-color: #aaa !important;
+}
 
 .cal_available { background: #0060d450; }
 .cal_chosen { background: #0060d4; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 73c8d8f4e2b..00a7322e0e1 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -6067,6 +6067,8 @@ span.websitebuttonsitepreviewdisabled img, a.websitebuttonsitepreviewdisabled im
 table.cal_month    { border-spacing: 0px; }
 table.cal_month td:first-child  { border-left: 0px; }
 table.cal_month td:last-child   { border-right: 0px; }
+table.cal_month td { padding-left: 1px !important; padding-right: 1px !important; }
+table.cal_month.cal_peruser td { padding-left: 0 !important; padding-right: 0 !important; }
 .cal_current_month { border-top: 0; border-left: solid 1px #E0E0E0; border-right: 0; border-bottom: solid 1px #E0E0E0; }
 .cal_current_month_peruserleft { border-top: 0; border-left: solid 2px #6C7C7B; border-right: 0; border-bottom: solid 1px #E0E0E0; }
 .cal_current_month_oneday { border-right: solid 1px #E0E0E0; }
@@ -6115,6 +6117,12 @@ td.small.cal_event {
 td.cal_other_month {
 	opacity: 0.7;
 }
+td.event-past span  {
+	opacity: 0.5;
+}
+td.peruser_holiday_imp {
+	background-color: #aaa !important;
+}
 
 .cal_available { background: #0060d450; }
 .cal_chosen { background: #0060d4; }
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 69ee963dfbc..d0222f18e45 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -339,6 +339,7 @@ if ($user->admin) {
 if (!empty($object->socid)) {
 	print info_admin(showModulesExludedForExternal($modules))."\n";
 }
+print '<br>';
 
 $parameters = array('permsgroupbyentity' => $permsgroupbyentity);
 $reshook = $hookmanager->executeHooks('insertExtraHeader', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
@@ -346,7 +347,7 @@ if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
-$listofexpandedmodules = array();
+//$listofexpandedmodules = array();
 
 
 print "\n";

From 887d56a5575cc5fc07c10e865d28da7a3f46df8c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 24 Jan 2025 21:22:43 +0100
Subject: [PATCH 167/602] =?UTF-8?q?=CE=A9UAL=20can=20defined=20a=20json=20?=
 =?UTF-8?q?format=20in=20default=20search=20filters?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4fa6d0f9314..df7c289cc8c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -987,8 +987,14 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 											$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
 										}
 									} else {
-										$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
-										$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
+										// Check if the value is a json format for use with multiselect field, eg ["1","2"]
+										if (preg_match('/^\[.*\]$/', $user->default_values[$relativepathstring]['filters'][$defkey][$paramname])) {
+											$out = json_decode($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], true);
+											$check = 'array'; // force to check an array
+										} else {
+											$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
+											$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
+										}
 									}
 									break;
 								}

From 6ae1c6009754187195c52a8d00b6cefe90a22d3f Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Sat, 25 Jan 2025 07:50:24 +0100
Subject: [PATCH 168/602] FIX sql error with the new sql forge filter

---
 htdocs/margin/tabs/productMargins.php               | 1 +
 htdocs/product/agenda.php                           | 2 +-
 htdocs/product/canvas/product/tpl/card_view.tpl.php | 2 +-
 htdocs/product/canvas/service/tpl/card_view.tpl.php | 2 +-
 htdocs/product/card.php                             | 2 +-
 htdocs/product/document.php                         | 2 +-
 htdocs/product/messaging.php                        | 2 +-
 htdocs/product/note.php                             | 2 +-
 htdocs/product/price.php                            | 2 +-
 htdocs/product/price_suppliers.php                  | 2 +-
 htdocs/product/stats/card.php                       | 1 +
 htdocs/product/stats/facture.php                    | 1 +
 htdocs/product/stock/product.php                    | 1 +
 htdocs/variants/combinations.php                    | 2 +-
 14 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index cbf5c4e4837..f518b0dff29 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -102,6 +102,7 @@ if ($id > 0 || !empty($ref)) {
 		print dol_get_fiche_head($head, 'margin', $titre, -1, $picto);
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$object->next_prev_filter = "(te.fk_product_type:=:".((int) $object->type).")";
 
 		dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref');
 
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index cacbe90dd32..c365a97860f 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -161,7 +161,7 @@ $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 print dol_get_fiche_head($head, 'agenda', $titre, -1, $picto);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
-$object->next_prev_filter = "fk_product_type = ".((int) $object->type);
+$object->next_prev_filter = "(te.fk_product_type:=:".((int) $object->type).")";
 
 $shownav = 1;
 if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
diff --git a/htdocs/product/canvas/product/tpl/card_view.tpl.php b/htdocs/product/canvas/product/tpl/card_view.tpl.php
index 1730a75a7c3..47fe31666cb 100644
--- a/htdocs/product/canvas/product/tpl/card_view.tpl.php
+++ b/htdocs/product/canvas/product/tpl/card_view.tpl.php
@@ -33,7 +33,7 @@ $titre = $langs->trans("CardProduct".$object->type);
 print dol_get_fiche_head($head, 'card', $titre, -1, 'product');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
-$object->next_prev_filter = "fk_product_type = ".((int) $object->type);
+$object->next_prev_filter = "(te.fk_product_type:=:".((int) $object->type).")";
 
 $shownav = 1;
 if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
diff --git a/htdocs/product/canvas/service/tpl/card_view.tpl.php b/htdocs/product/canvas/service/tpl/card_view.tpl.php
index 402c604d9ff..1ab37e86dcf 100644
--- a/htdocs/product/canvas/service/tpl/card_view.tpl.php
+++ b/htdocs/product/canvas/service/tpl/card_view.tpl.php
@@ -33,7 +33,7 @@ $titre = $langs->trans("CardProduct".$object->type);
 print dol_get_fiche_head($head, 'card', $titre, -1, 'service');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
-$object->next_prev_filter = " fk_product_type = ".((int) $object->type);
+$object->next_prev_filter = "(te.fk_product_type:=:".((int) $object->type).")";
 
 $shownav = 1;
 if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 05843b55d90..d0790846817 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -2450,7 +2450,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			print dol_get_fiche_head($head, 'card', $titre, -1, $picto);
 
 			$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
-			$object->next_prev_filter = "fk_product_type:=:".((int) $object->type);
+			$object->next_prev_filter = "(te.fk_product_type:=:".((int) $object->type).")";
 
 			$shownav = 1;
 			if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 4749ea17b47..330d210a06e 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -240,7 +240,7 @@ if ($object->id) {
 
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
-	$object->next_prev_filter = "fk_product_type = ".((int) $object->type);
+	$object->next_prev_filter = "(te.fk_product_type:=:".((int) $object->type).")";
 
 	$shownav = 1;
 	if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
diff --git a/htdocs/product/messaging.php b/htdocs/product/messaging.php
index fc9d8b66e79..416a06ab3a8 100644
--- a/htdocs/product/messaging.php
+++ b/htdocs/product/messaging.php
@@ -160,7 +160,7 @@ $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 print dol_get_fiche_head($head, 'agenda', $titre, -1, $picto);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
-$object->next_prev_filter = "fk_product_type = ".((int) $object->type);
+$object->next_prev_filter = "(te.fk_product_type:=:".((int) $object->type).")";
 
 $shownav = 1;
 if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index 623c88114ca..39a3f699df8 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -123,7 +123,7 @@ if ($id > 0 || !empty($ref)) {
 	print dol_get_fiche_head($head, 'note', $titre, -1, $picto);
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
-	$object->next_prev_filter = "fk_product_type = ".((int) $object->type);
+	$object->next_prev_filter = "(te.fk_product_type:=:".((int) $object->type).")";
 
 	$shownav = 1;
 	if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index fdcdc1f7a13..7c4e18f070f 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -898,7 +898,7 @@ $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 print dol_get_fiche_head($head, 'price', $titre, -1, $picto);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
-$object->next_prev_filter = "fk_product_type = ".((int) $object->type);
+$object->next_prev_filter = "(te.fk_product_type:=:".((int) $object->type).")";
 
 $shownav = 1;
 if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
diff --git a/htdocs/product/price_suppliers.php b/htdocs/product/price_suppliers.php
index 2f0c7deba4d..6579201f5d5 100644
--- a/htdocs/product/price_suppliers.php
+++ b/htdocs/product/price_suppliers.php
@@ -393,7 +393,7 @@ if ($id > 0 || $ref) {
 			print dol_get_fiche_head($head, 'suppliers', $titre, -1, $picto);
 
 			$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
-			$object->next_prev_filter = "fk_product_type = ".((int) $object->type);
+			$prod->next_prev_filter = "(te.fk_product_type:=:".((int) $object->type).")"; // use $prod instead $object
 
 			$shownav = 1;
 			if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 231d24828c7..f364d4c84e9 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -150,6 +150,7 @@ if ($result && ($id > 0 || !empty($ref)) && empty($notab)) {
 	print dol_get_fiche_head($head, 'stats', $titre, -1, $picto);
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
+	$object->next_prev_filter = "(te.fk_product_type:=:".((int) $object->type).")";
 
 	dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', '', '', '', 0, '', '', 1);
 
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 3a19836369d..2acf0fe9dd3 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -169,6 +169,7 @@ if ($id > 0 || !empty($ref)) {
 		}
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
+		$object->next_prev_filter = "(te.fk_product_type:=:".((int) $object->type).")";
 
 		$shownav = 1;
 		if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 27f21a5e5b4..e1b05365cf5 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -613,6 +613,7 @@ if ($id > 0 || $ref) {
 		dol_htmloutput_events();
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
+		$object->next_prev_filter = "(te.fk_product_type:=:".((int) $object->type).")";
 
 		$shownav = 1;
 		if ($user->socid && !in_array('stock', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 31370562bef..a92fe50f128 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -417,7 +417,7 @@ if (!empty($id) || !empty($ref)) {
 	print dol_get_fiche_head($head, 'combinations', $titre, -1, $picto);
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.((int) $object->type).'">'.$langs->trans("BackToList").'</a>';
-	$object->next_prev_filter = "fk_product_type = ".((int) $object->type);
+	$object->next_prev_filter = "(te.fk_product_type:=:".((int) $object->type).")";
 
 	dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', '', '', '', 0, '', '');
 

From 45042afe4b0205ff28167a9665c734e12b163274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 25 Jan 2025 09:04:43 +0100
Subject: [PATCH 169/602] fix phpstan branch 21

---
 htdocs/comm/action/index.php   |  4 ++--
 htdocs/comm/action/peruser.php | 37 ++++++++++++++++++----------------
 htdocs/core/lib/agenda.lib.php |  4 ++--
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index e13c531d640..86b41f9d7ad 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2014      Cedric GROSS         <c.gross@kreiz-it.fr>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2017      Open-DSI             <support@open-dsi.fr>
- * Copyright (C) 2021-2024	Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2021-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -798,7 +798,7 @@ if (!empty($actioncode)) {
 			$sql .= " AND ca.type != 'systemauto'";
 		} elseif ($actioncode == 'AC_ALL_AUTO') {
 			$sql .= " AND ca.type = 'systemauto'";
-		} elseif (!empty($actioncode) && $actioncode !== '-1') {
+		} elseif (/* !empty($actioncode) && */ $actioncode !== '-1') {
 			if (is_array($actioncode)) {
 				$sql .= " AND ca.code IN (".$db->sanitize("'".implode("','", $actioncode)."'", 1).")";
 			} else {
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 3f1e03c317d..3106bcac896 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2014      Cedric GROSS         <c.gross@kreiz-it.fr>
- * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023       Florian HENRY           <florian.henry@scopen.fr>
  * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
  *
@@ -60,7 +60,7 @@ $filtert = GETPOSTINT("search_filtert", 3) ? GETPOSTINT("search_filtert", 3) : G
 $usergroup = GETPOSTINT("search_usergroup", 3) ? GETPOSTINT("search_usergroup", 3) : GETPOSTINT("usergroup", 3);
 //if (! ($usergroup > 0) && ! ($filtert > 0)) $filtert = $user->id;
 //$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
-$showbirthday = 0;
+$showbirthday = getDolGlobalInt('AGENDA_ENABLE_SHOW_BIRTHDAY_PER_USER'); // disabled by default
 
 // If no choice done on calendar owner (like on left menu link "Agenda"), we filter on current user by default.
 /*if (empty($filtert) && !getDolGlobalString('AGENDA_ALL_CALENDARS')) {
@@ -465,31 +465,31 @@ $massactionbutton = '';
 
 $viewmode = '<div class="navmode inline-block">';
 
-$viewmode .= '<a class="btnTitle'.($mode == 'list' ? ' btnTitleSelected' : '').' reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&restore_lastsearch_values=1'.$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&restore_lastsearch_values=1'.$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("List"), 'object_calendarlist', 'class="imgforviewmode pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone inline-block width75 divoverflow">'.$langs->trans("ViewList").'</span></a>';
 
-$viewmode .= '<a class="btnTitle'.($mode == 'show_month' ? ' btnTitleSelected' : '').' reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewCal"), 'object_calendarmonth', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone inline-block width75 divoverflow">'.$langs->trans("ViewCal").'</span></a>';
 
-$viewmode .= '<a class="btnTitle'.($mode == 'show_week' ? ' btnTitleSelected' : '').' reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_week&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_week&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone inline-block width75 divoverflow">'.$langs->trans("ViewWeek").'</span></a>';
 
-$viewmode .= '<a class="btnTitle'.($mode == 'show_day' ? ' btnTitleSelected' : '').' reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone inline-block width75 divoverflow">'.$langs->trans("ViewDay").'</span></a>';
 
-$viewmode .= '<a class="btnTitle'.($mode == 'show_peruser' ? ' btnTitleSelected' : '').' reposition marginrightonly" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?mode=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
+$viewmode .= '<a class="btnTitle btnTitleSelected reposition marginrightonly" href="'.DOL_URL_ROOT.'/comm/action/peruser.php?mode=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
 $viewmode .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="pictoactionview block"');
 //$viewmode .= '</span>';
@@ -531,7 +531,7 @@ if ($user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda'
 
 	$urltocreateaction = DOL_URL_ROOT.'/comm/action/card.php?action=create';
 	$urltocreateaction .= '&apyear='.$tmpforcreatebutton['year'].'&apmonth='.$tmpforcreatebutton['mon'].'&apday='.$tmpforcreatebutton['mday'].'&aphour='.$tmpforcreatebutton['hours'].'&apmin='.$tmpforcreatebutton['minutes'];
-	$urltocreateaction .= '&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : ''));
+	$urltocreateaction .= '&backtopage='.urlencode($_SERVER["PHP_SELF"] . $newparam);
 
 	$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', $urltocreateaction);
 }
@@ -602,7 +602,7 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 	}
 
 	// External calendars
-	if (is_array($showextcals) && count($showextcals) > 0) {
+	if (count($showextcals) > 0) {
 		foreach ($showextcals as $val) {
 			$htmlname = md5($val['name']);	// not used for security purpose, only to get a string with no special char
 
@@ -726,7 +726,7 @@ if (!empty($actioncode)) {
 			$sql .= " AND ca.type != 'systemauto'";
 		} elseif ($actioncode == 'AC_ALL_AUTO') {
 			$sql .= " AND ca.type = 'systemauto'";
-		} elseif (!empty($actioncode) && $actioncode !== '-1') {
+		} elseif (/* !empty($actioncode) && */ $actioncode !== '-1') {
 			if (is_array($actioncode)) {
 				$sql .= " AND ca.code IN (".$db->sanitize("'".implode("','", $actioncode)."'", 1).")";
 			} else {
@@ -1197,9 +1197,9 @@ if (count($listofextcals)) {
 						$datecurstart = dol_stringtotime($icalevent['DTSTART;VALUE=DATE'], 1);
 						$datecurend = dol_stringtotime($icalevent['DTEND;VALUE=DATE'], 1) - 1; // We remove one second to get last second of day
 					} elseif (is_array($icalevent['DTSTART']) && !empty($icalevent['DTSTART']['unixtime'])) {
-						$datecurstart = $icalevent['DTSTART']['unixtime'];
+						$datecurstart = $icalevent['DTSTART']['unixtime']; // can't be empty
 						$datecurend = $icalevent['DTEND']['unixtime'];
-						if (!empty($ical->cal['DAYLIGHT']['DTSTART']) && $datecurstart) {
+						if (!empty($ical->cal['DAYLIGHT']['DTSTART']) /* && $datecurstart */) {
 							//var_dump($ical->cal);
 							$tmpcurstart = $datecurstart;
 							$tmpcurend = $datecurend;
@@ -1292,6 +1292,8 @@ if (count($listofextcals)) {
 				// Create a new object action
 				$event = new ActionComm($db);
 				$addevent = false;
+				$datestart = null;
+				$dateend = null;
 				if (isset($icalevent['DTSTART;VALUE=DATE'])) { // fullday event
 					// For full day events, date are also GMT but they won't but converted using tz during output
 					$datestart = dol_stringtotime($icalevent['DTSTART;VALUE=DATE'], 1);
@@ -1343,6 +1345,7 @@ if (count($listofextcals)) {
 				if ($addevent) {
 					$event->id = $icalevent['UID'];
 					$event->ref = $event->id;
+					$userstatic = new User($db);
 					$userId = $userstatic->findUserIdByEmail($namecal);
 					if (!empty($userId) && $userId > 0) {
 						$event->userassigned[$userId] = $userId;
@@ -1754,7 +1757,7 @@ if (getDolGlobalString('AGENDA_USE_EVENT_TYPE') && getDolGlobalString('AGENDA_US
 	print '<br>'.$langs->trans("Legend").': <br>';
 	foreach ($colorsbytype as $code => $color) {
 		if ($color) {
-			print '<div style="float: left; padding: 2px; margin-right: 6px;"><div style="'.($color ? 'background: #'.$color.';' : '').'width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
+			print '<div style="float: left; padding: 2px; margin-right: 6px;"><div style="background: #'.$color.'; width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
 			print $langs->trans("Action".$code) != "Action".$code ? $langs->trans("Action".$code) : $labelbytype[$code];
 			//print $code;
 			print '</div>';
@@ -2405,7 +2408,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		if ($style1 == 'peruser_notbusy') {
 			print 'style="border: 1px solid #'.($color1 ? $color1 : "888").' !important" ';
 		} elseif ($color1) {
-			print($color1 ? 'style="background: #'.$color1.';"' : '');
+			print 'style="background: #'.$color1.'; "';
 		}
 		print 'class="';
 		print($style1 ? $style1.' ' : '');
@@ -2417,7 +2420,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		if ($style2 == 'peruser_notbusy') {
 			print 'style="border: 1px solid #'.($color2 ? $color2 : "888").' !important" ';
 		} elseif ($color2) {
-			print($color2 ? 'style="background: #'.$color2.';"' : '');
+			print 'style="background: #'.$color2.'; "';
 		}
 		print 'class="';
 		print($style2 ? $style2.' ' : '');
@@ -2429,7 +2432,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		if ($style3 == 'peruser_notbusy') {
 			print 'style="border: 1px solid #'.($color3 ? $color3 : "888").' !important" ';
 		} elseif ($color3) {
-			print($color3 ? 'style="background: #'.$color3.';"' : '');
+			print 'style="background: #'.$color3.'; "';
 		}
 		print 'class="';
 		print($style3 ? $style3.' ' : '');
@@ -2441,7 +2444,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		if ($style4 == 'peruser_notbusy') {
 			print 'style="border: 1px solid #'.($color4 ? $color4 : "888").' !important" ';
 		} elseif ($color4) {
-			print($color4 ? 'style="background: #'.$color4.';"' : '');
+			print 'style="background: #'.$color4.'; "';
 		}
 		print 'class="';
 		print($style4 ? $style4.' ' : '');
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 734bed17111..6143ed6ac5b 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2008-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011	   Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2022-2024	Frédéric France				<frederic.france@free.fr>
+ * Copyright (C) 2022-2025  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,7 @@
  *
  * @param	Form			$form				Form object
  * @param	int				$canedit			Can edit filter fields
- * @param	int				$status				Status
+ * @param	string			$status				Status see FormActions::form_select_status_action
  * @param 	int				$year				Year
  * @param 	int				$month				Month
  * @param 	int				$day				Day

From fc7417b955f2cec53e204e410a046ae20a6dfe61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 25 Jan 2025 09:07:59 +0100
Subject: [PATCH 170/602] fix phpstan branch 21

---
 build/phpstan/phpstan-baseline.neon | 48 ++---------------------------
 1 file changed, 3 insertions(+), 45 deletions(-)

diff --git a/build/phpstan/phpstan-baseline.neon b/build/phpstan/phpstan-baseline.neon
index 260f9b768c0..29d7586e373 100644
--- a/build/phpstan/phpstan-baseline.neon
+++ b/build/phpstan/phpstan-baseline.neon
@@ -1884,12 +1884,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/admin/workstation.php
 
-		-
-			message: '#^Variable \$arrayofparameters might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../htdocs/admin/workstation.php
-
 		-
 			message: '#^Variable \$label might not be defined\.$#'
 			identifier: variable.undefined
@@ -3720,12 +3714,6 @@ parameters:
 			count: 2
 			path: ../../htdocs/comm/action/pertype.php
 
-		-
-			message: '#^Parameter \#3 \$status of function print_actions_filter expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../htdocs/comm/action/pertype.php
-
 		-
 			message: '#^Result of && is always false\.$#'
 			identifier: booleanAnd.alwaysFalse
@@ -3756,18 +3744,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/comm/action/pertype.php
 
-		-
-			message: '#^Call to function is_array\(\) with array\{\} will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: ../../htdocs/comm/action/peruser.php
-
-		-
-			message: '#^If condition is always false\.$#'
-			identifier: if.alwaysFalse
-			count: 1
-			path: ../../htdocs/comm/action/peruser.php
-
 		-
 			message: '#^Loose comparison using \!\= between ''show_peruser'' and ''show_day'' will always evaluate to true\.$#'
 			identifier: notEqual.alwaysTrue
@@ -3786,34 +3762,22 @@ parameters:
 			count: 1
 			path: ../../htdocs/comm/action/peruser.php
 
-		-
-			message: '#^Loose comparison using \=\= between ''show_peruser'' and ''list'' will always evaluate to false\.$#'
-			identifier: equal.alwaysFalse
-			count: 1
-			path: ../../htdocs/comm/action/peruser.php
-
 		-
 			message: '#^Loose comparison using \=\= between ''show_peruser'' and ''show_day'' will always evaluate to false\.$#'
 			identifier: equal.alwaysFalse
 			count: 2
 			path: ../../htdocs/comm/action/peruser.php
 
-		-
-			message: '#^Loose comparison using \=\= between ''show_peruser'' and ''show_month'' will always evaluate to false\.$#'
-			identifier: equal.alwaysFalse
-			count: 1
-			path: ../../htdocs/comm/action/peruser.php
-
 		-
 			message: '#^Loose comparison using \=\= between ''show_peruser'' and ''show_peruser'' will always evaluate to true\.$#'
 			identifier: equal.alwaysTrue
-			count: 2
+			count: 1
 			path: ../../htdocs/comm/action/peruser.php
 
 		-
 			message: '#^Loose comparison using \=\= between ''show_peruser'' and ''show_week'' will always evaluate to false\.$#'
 			identifier: equal.alwaysFalse
-			count: 2
+			count: 1
 			path: ../../htdocs/comm/action/peruser.php
 
 		-
@@ -3831,7 +3795,7 @@ parameters:
 		-
 			message: '#^Ternary operator condition is always true\.$#'
 			identifier: ternary.alwaysTrue
-			count: 10
+			count: 8
 			path: ../../htdocs/comm/action/peruser.php
 
 		-
@@ -3843,12 +3807,6 @@ parameters:
 		-
 			message: '#^Variable \$mode in empty\(\) always exists and is not falsy\.$#'
 			identifier: empty.variable
-			count: 2
-			path: ../../htdocs/comm/action/peruser.php
-
-		-
-			message: '#^Variable \$s might not be defined\.$#'
-			identifier: variable.undefined
 			count: 1
 			path: ../../htdocs/comm/action/peruser.php
 

From 01bb6b7d8537492663b9be24c1b3fe67f2f81217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sat, 25 Jan 2025 09:16:52 +0100
Subject: [PATCH 171/602] fix phpstan branch 21

---
 build/phpstan/phpstan-baseline.neon |  6 ------
 htdocs/comm/action/peruser.php      | 12 ++++++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/build/phpstan/phpstan-baseline.neon b/build/phpstan/phpstan-baseline.neon
index 29d7586e373..702bb20b2b4 100644
--- a/build/phpstan/phpstan-baseline.neon
+++ b/build/phpstan/phpstan-baseline.neon
@@ -3768,12 +3768,6 @@ parameters:
 			count: 2
 			path: ../../htdocs/comm/action/peruser.php
 
-		-
-			message: '#^Loose comparison using \=\= between ''show_peruser'' and ''show_peruser'' will always evaluate to true\.$#'
-			identifier: equal.alwaysTrue
-			count: 1
-			path: ../../htdocs/comm/action/peruser.php
-
 		-
 			message: '#^Loose comparison using \=\= between ''show_peruser'' and ''show_week'' will always evaluate to false\.$#'
 			identifier: equal.alwaysFalse
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 3106bcac896..4ed706da62f 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -853,7 +853,7 @@ if ($resql) {
 		$event = new ActionComm($db);
 
 		$event->id = $obj->id;
-		$event->ref = $event->id;
+		$event->ref = (string) $event->id;
 
 		$event->fulldayevent = $obj->fulldayevent;
 
@@ -1008,7 +1008,7 @@ if ($showbirthday) {
 			$event = new ActionComm($db);
 
 			$event->id = $obj->rowid; // We put contact id in action id for birthdays events
-			$event->ref = $event->id;
+			$event->ref = (string) $event->id;
 
 			$datebirth = dol_stringtotime($obj->birthday, 1);
 			//print 'ee'.$obj->birthday.'-'.$datebirth;
@@ -1081,8 +1081,8 @@ if ($user->hasRight("holiday", "read")) {
 			$event = new ActionComm($db);
 
 			// Need the id of the leave object for link to it
-			$event->id                      = $obj->rowid;
-			$event->ref                     = $event->id;
+			$event->id = $obj->rowid;
+			$event->ref = (string) $event->id;
 
 			$event->type_code = 'HOLIDAY';
 			$event->type_label = '';
@@ -1344,7 +1344,7 @@ if (count($listofextcals)) {
 
 				if ($addevent) {
 					$event->id = $icalevent['UID'];
-					$event->ref = $event->id;
+					$event->ref = (string) $event->id;
 					$userstatic = new User($db);
 					$userId = $userstatic->findUserIdByEmail($namecal);
 					if (!empty($userId) && $userId > 0) {
@@ -1532,7 +1532,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 	echo '<tr class="liste_titre">';
 	echo '<td class="nopaddingtopimp nopaddingbottomimp nowraponsmartphone">';
 
-	if ($canedit && $mode == 'show_peruser') {
+	if ($canedit /* && $mode == 'show_peruser' */) { // mode is forced to show_peruser
 		// Filter on days
 		print '<span class="hideonsmartphone" title="'.$langs->trans("VisibleDaysRange").'">';
 		print img_picto('', 'clock', 'class="fawidth30 inline-block marginleftonly"');

From 100cc8fd1c768a6bc45f694a1e7a1254cd277b8d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Sat, 25 Jan 2025 09:19:55 +0100
Subject: [PATCH 172/602] FIX compatibility between next_prev_filter and hook
 return

---
 htdocs/core/class/html.form.class.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0140a6589cc..2150f85bef1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -9889,7 +9889,15 @@ class Form
 		if (is_object($hookmanager)) {
 			$parameters = array('showrefnav' => true);
 			$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
-			$object->next_prev_filter .= $hookmanager->resPrint;
+			if (!empty($hookmanager->resPrint)) {
+				if (empty($object->next_prev_filter) && preg_match('/^\s*AND/i', $hookmanager->resPrint)) {
+					$hookmanager->resPrint = preg_replace('/^\s*AND\s*/i', '', $hookmanager->resPrint);
+				} elseif (!empty($object->next_prev_filter) && !preg_match('/^\s*AND/i', $hookmanager->resPrint)) {
+					$object->next_prev_filter .= ' AND '.$hookmanager->resPrint;
+				} else {
+					$object->next_prev_filter .= $hookmanager->resPrint;
+				}
+			}
 		}
 
 		$previous_ref = $next_ref = '';

From e2949a25e4ece635324aa13e860539cf59476f6a Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Sat, 25 Jan 2025 09:26:12 +0100
Subject: [PATCH 173/602] FIX wrong var

---
 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 2150f85bef1..31c5c5521ee 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -9891,7 +9891,7 @@ class Form
 			$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
 			if (!empty($hookmanager->resPrint)) {
 				if (empty($object->next_prev_filter) && preg_match('/^\s*AND/i', $hookmanager->resPrint)) {
-					$hookmanager->resPrint = preg_replace('/^\s*AND\s*/i', '', $hookmanager->resPrint);
+					$object->next_prev_filter = preg_replace('/^\s*AND\s*/i', '', $hookmanager->resPrint);
 				} elseif (!empty($object->next_prev_filter) && !preg_match('/^\s*AND/i', $hookmanager->resPrint)) {
 					$object->next_prev_filter .= ' AND '.$hookmanager->resPrint;
 				} else {

From 151e01864f9b7211ec962f6ce4da333a99b48b87 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Sat, 25 Jan 2025 09:33:52 +0100
Subject: [PATCH 174/602] FIX wrong filter format

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

diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index cc774bcb1b4..53551e4918e 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
  */
 class Fournisseur extends Societe
 {
-	public $next_prev_filter = "te.fournisseur = 1"; // Used to add a filter in Form::showrefnav method
+	public $next_prev_filter = "(te.fournisseur:=:1)"; // Used to add a filter in Form::showrefnav method
 
 
 	/**

From f6deb314fa5ef139314b6049a3f4117fbcaf667b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sat, 25 Jan 2025 13:20:29 +0100
Subject: [PATCH 175/602] fix search with array

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

diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index c54ebd897f0..fd2827318d4 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -126,7 +126,11 @@ $search_all = trim(GETPOST("search_all", 'alphanohtml'));
 $search = array();
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
-		$search[$key] = GETPOST('search_'.$key, 'alpha');
+		if (isset($val['arrayofkeyval'])) {
+			$search[$key] = GETPOST('search_'.$key, 'array');
+		} else {
+			$search[$key] = GETPOST('search_'.$key, 'alpha');
+		}
 	} else {
 		$search[$key] = "";
 	}

From 52c835af33ac2667e38b4d8094feb78946130d40 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Sat, 25 Jan 2025 14:18:38 +0100
Subject: [PATCH 176/602] Revert "QUAL can defined a json format in default
 search filters"

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index df7c289cc8c..4fa6d0f9314 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -987,14 +987,8 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 											$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
 										}
 									} else {
-										// Check if the value is a json format for use with multiselect field, eg ["1","2"]
-										if (preg_match('/^\[.*\]$/', $user->default_values[$relativepathstring]['filters'][$defkey][$paramname])) {
-											$out = json_decode($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], true);
-											$check = 'array'; // force to check an array
-										} else {
-											$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
-											$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
-										}
+										$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
+										$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
 									}
 									break;
 								}

From dc1bb8f2f5f1fd3aaee396784429c61d21d3cd76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Fali=C3=A8re?= <benjamin.faliere@altairis.fr>
Date: Sat, 25 Jan 2025 14:31:13 +0100
Subject: [PATCH 177/602] FIX: Disable Multicompany module in demo set

If enabled by default but not installed, it will cause many errors in various pages'
---
 dev/initdemo/mysqldump_dolibarr_21.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/initdemo/mysqldump_dolibarr_21.0.0.sql b/dev/initdemo/mysqldump_dolibarr_21.0.0.sql
index 8beb53eac6f..bf494fc5970 100644
--- a/dev/initdemo/mysqldump_dolibarr_21.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_21.0.0.sql
@@ -60051,7 +60051,7 @@ INSERT INTO `llx_const` VALUES
 (12776,'MAIN_VERSION_LAST_UPGRADE',0,'21.0.0','chaine',0,'Dolibarr version for last upgrade','2025-01-06 15:48:34'),
 (12777,'MAIN_FIRST_PING_OK_DATE',2,'20250106154835','chaine',0,'','2025-01-06 15:48:35'),
 (12778,'MAIN_FIRST_PING_OK_ID',2,'disabled','chaine',0,'','2025-01-06 15:48:35'),
-(12781,'MAIN_MODULE_MULTICOMPANY',0,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"18.0.1\"}','2025-01-06 15:50:14'),
+(12781,'MAIN_MODULE_MULTICOMPANY',0,'0','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"18.0.1\"}','2025-01-06 15:50:14'),
 (12782,'MAIN_MODULE_MULTICOMPANY_LOGIN',0,'1','chaine',0,NULL,'2025-01-06 15:50:14'),
 (12783,'MAIN_MODULE_MULTICOMPANY_TRIGGERS',0,'1','chaine',0,NULL,'2025-01-06 15:50:14'),
 (12784,'MAIN_MODULE_MULTICOMPANY_HOOKS',0,'[\"login\",\"main\",\"mainloginpage\",\"upgrade\",\"upgrade2\",\"cashdeskloginpage\",\"passwordforgottenpage\",\"toprightmenu\",\"adminmodules\",\"admincompany\",\"commonobject\",\"thirdpartiesindex\",\"commercialindex\",\"globalcard\",\"thirdpartycard\",\"thirdpartycontact\",\"thirdpartylist\",\"customerlist\",\"prospectlist\",\"supplierlist\",\"usercard\",\"userperms\",\"groupcard\",\"groupperms\",\"userlist\",\"userhome\",\"userdao\",\"contactlist\",\"contactprospectlist\",\"contactcustomerlist\",\"contactsupplierlist\",\"contactotherlist\",\"productindex\",\"productcard\",\"productservicelist\",\"pricesuppliercard\",\"productreassortlist\",\"propalcard\",\"propallist\",\"ordercard\",\"orderlist\",\"invoicecard\",\"invoicelist\",\"warehousecard\",\"stocklist\",\"memberlist\",\"membercard\",\"projectlist\",\"projectcard\",\"accountancyadminaccount\"]','chaine',0,NULL,'2025-01-06 15:50:14'),

From e2fa84c5ab18e6fde99a1539560d1d20d112916d Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sat, 25 Jan 2025 15:16:13 +0100
Subject: [PATCH 178/602] CSS v21

---
 htdocs/theme/eldy/global.inc.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 2457de978e4..d94ade62111 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -2932,11 +2932,11 @@ img.photorefnoborder {
 	display:none;
 <?php } else { ?>
 	background: var(--colorbackhmenu1);
-	/* background-image: linear-gradient(-45deg, <?php echo colorAdjustBrightness(colorArrayToHex(colorStringToArray($colorbackhmenu1)), '5'); ?>, var(--colorbackhmenu1)); */
-	<?php if ($colorbackhmenu1 == '255,255,255') { ?>
-	box-shadow: 0px 0px 4px #ddd;
-	<?php } ?>
-<?php } ?>
+	<?php if ($colorbackhmenu1 == $colorbackbody) { ?>
+	border-bottom: 1px solid var(--colorbackgrey);
+	box-shadow: 0 0 3px var(--colorbackgrey);
+	<?php } else { ?>
+	<?php } } ?>
 }
 
 div#tmenu_tooltip {

From 7e4c8ef622a39ab5017460bcb366913b206325c0 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Sat, 25 Jan 2025 15:27:51 +0100
Subject: [PATCH 179/602] QUAL add help text for default values

---
 htdocs/admin/defaultvalues.php | 4 +++-
 htdocs/langs/en_US/admin.lang  | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index df90a2a2d62..52f5f64c010 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -311,7 +311,9 @@ if ($mode != 'focus' && $mode != 'mandatory') {
 		foreach ($substitutionarray as $key => $val) {
 			$texthelp .= $key.' -> '.$val.'<br>';
 		}
-		$textvalue = $form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, 'subsitutiontooltip');
+		$texthelp2 = $langs->trans("DefaultValuesHelpText");
+		$text = $form->textwithpicto($langs->trans("Value"), $texthelp2);
+		$textvalue = $form->textwithpicto($text, $texthelp, 1, 'list-alt', 'valignmiddle', 0, 2, 'subsitutiontooltip');
 	} else {
 		$texthelp = 'ASC or DESC';
 		$textvalue = $form->textwithpicto($langs->trans("SortOrder"), $texthelp);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d75fa1443c9..92515e51f66 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1723,6 +1723,7 @@ CompressionOfResources=Compression of HTTP responses
 CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Default values (to use on forms)
 DefaultSearchFilters=Default search filters
 DefaultSortOrder=Default sort orders

From 887bbfb88237e3a8efa9689ace1b6324383339a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Fali=C3=A8re?= <benjamin.faliere@altairis.fr>
Date: Sat, 25 Jan 2025 15:40:54 +0100
Subject: [PATCH 180/602] Remove all constants related to multicompany

---
 dev/initdemo/mysqldump_dolibarr_21.0.0.sql | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/dev/initdemo/mysqldump_dolibarr_21.0.0.sql b/dev/initdemo/mysqldump_dolibarr_21.0.0.sql
index bf494fc5970..9b6c75e5123 100644
--- a/dev/initdemo/mysqldump_dolibarr_21.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_21.0.0.sql
@@ -60051,15 +60051,6 @@ INSERT INTO `llx_const` VALUES
 (12776,'MAIN_VERSION_LAST_UPGRADE',0,'21.0.0','chaine',0,'Dolibarr version for last upgrade','2025-01-06 15:48:34'),
 (12777,'MAIN_FIRST_PING_OK_DATE',2,'20250106154835','chaine',0,'','2025-01-06 15:48:35'),
 (12778,'MAIN_FIRST_PING_OK_ID',2,'disabled','chaine',0,'','2025-01-06 15:48:35'),
-(12781,'MAIN_MODULE_MULTICOMPANY',0,'0','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"18.0.1\"}','2025-01-06 15:50:14'),
-(12782,'MAIN_MODULE_MULTICOMPANY_LOGIN',0,'1','chaine',0,NULL,'2025-01-06 15:50:14'),
-(12783,'MAIN_MODULE_MULTICOMPANY_TRIGGERS',0,'1','chaine',0,NULL,'2025-01-06 15:50:14'),
-(12784,'MAIN_MODULE_MULTICOMPANY_HOOKS',0,'[\"login\",\"main\",\"mainloginpage\",\"upgrade\",\"upgrade2\",\"cashdeskloginpage\",\"passwordforgottenpage\",\"toprightmenu\",\"adminmodules\",\"admincompany\",\"commonobject\",\"thirdpartiesindex\",\"commercialindex\",\"globalcard\",\"thirdpartycard\",\"thirdpartycontact\",\"thirdpartylist\",\"customerlist\",\"prospectlist\",\"supplierlist\",\"usercard\",\"userperms\",\"groupcard\",\"groupperms\",\"userlist\",\"userhome\",\"userdao\",\"contactlist\",\"contactprospectlist\",\"contactcustomerlist\",\"contactsupplierlist\",\"contactotherlist\",\"productindex\",\"productcard\",\"productservicelist\",\"pricesuppliercard\",\"productreassortlist\",\"propalcard\",\"propallist\",\"ordercard\",\"orderlist\",\"invoicecard\",\"invoicelist\",\"warehousecard\",\"stocklist\",\"memberlist\",\"membercard\",\"projectlist\",\"projectcard\",\"accountancyadminaccount\"]','chaine',0,NULL,'2025-01-06 15:50:14'),
-(12785,'MAIN_MODULE_MULTICOMPANY_CSS',0,'/multicompany/css/multicompany.css.php','chaine',0,NULL,'2025-01-06 15:50:14'),
-(12786,'MAIN_MODULE_MULTICOMPANY_SUBSTITUTIONS',0,'/multicompany/core/substitutions/','chaine',0,NULL,'2025-01-06 15:50:14'),
-(12787,'MULTICOMPANY_MAIN_VERSION',0,'18.0.1','chaine',0,NULL,'2025-01-06 15:50:14'),
-(12788,'MULTICOMPANY_EXTERNAL_MODULES_SHARING',0,'','chaine',0,NULL,'2025-01-06 15:50:14'),
-(12789,'MULTICOMPANY_PMP_PER_ENTITY_ENABLED',0,'1','chaine',0,NULL,'2025-01-06 15:50:14'),
 (12790,'MAIN_IHM_PARAMS_REV',2,'1','chaine',0,'','2025-01-06 15:50:15'),
 (12791,'MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT',2,'commonkanban','chaine',0,'','2025-01-06 15:50:15'),
 (12792,'MAIN_FIRST_PING_OK_DATE',1,'20250106155034','chaine',0,'','2025-01-06 15:50:34'),

From 41058de4efba7300a2fb21ac4f874ea8007a1762 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Sat, 25 Jan 2025 15:48:21 +0100
Subject: [PATCH 181/602] FIX look and feel

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

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 52f5f64c010..7a1fafd861e 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -311,9 +311,7 @@ if ($mode != 'focus' && $mode != 'mandatory') {
 		foreach ($substitutionarray as $key => $val) {
 			$texthelp .= $key.' -> '.$val.'<br>';
 		}
-		$texthelp2 = $langs->trans("DefaultValuesHelpText");
-		$text = $form->textwithpicto($langs->trans("Value"), $texthelp2);
-		$textvalue = $form->textwithpicto($text, $texthelp, 1, 'list-alt', 'valignmiddle', 0, 2, 'subsitutiontooltip');
+		$textvalue = $form->textwithpicto($langs->trans("Value"), $langs->trans("DefaultValuesHelpText"));
 	} else {
 		$texthelp = 'ASC or DESC';
 		$textvalue = $form->textwithpicto($langs->trans("SortOrder"), $texthelp);
@@ -347,6 +345,7 @@ print '</td>';
 if ($mode != 'focus' && $mode != 'mandatory') {
 	print '<td>';
 	print '<input type="text" class="flat maxwidth100onsmartphone" name="defaultvalue" value="'.dol_escape_htmltag($defaultvalue).'">';
+	print $form->textwithpicto('', $texthelp, 1, 'list-alt', 'paddingleftimp cursorpointer', 0, 2, 'subsitutiontooltip');
 	print '</td>';
 }
 // Limit to superadmin

From c3dd7733e41e265cde3322c2c9c7f00c7793401a Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sat, 25 Jan 2025 15:53:05 +0100
Subject: [PATCH 182/602] Debug v21

---
 htdocs/stripe/charge.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 9325d0cf0ea..442335d1fbe 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -228,7 +228,7 @@ if (!$rowid) {
 			if ($servicestatus) {
 				$url = 'https://dashboard.stripe.com/'.$connect.'payments/'.$charge->id;
 			}
-			print "<td>";
+			print '<td class="tdoverflowmax150">';
 			print "<a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$charge->id."</a>";
 			if ($charge->payment_intent) {
 				print '<br><span class="opacitymedium">'.$charge->payment_intent.'</span>';
@@ -236,7 +236,7 @@ if (!$rowid) {
 			print "</td>\n";
 
 			// Stripe customer
-			print "<td>";
+			print '<td class="tdoverflowmax150">';
 			if (isModEnabled('stripe') && !empty($stripeacc)) {
 				$connect = $stripeacc.'/';
 			}
@@ -259,7 +259,7 @@ if (!$rowid) {
 			print "</td>\n";
 
 			// Origin
-			print "<td>";
+			print '<td class="nowraponall">';
 			if ($charge->metadata->dol_type == "order" || $charge->metadata->dol_type == "commande") {
 				$object = new Commande($db);
 				$object->fetch($charge->metadata->dol_id);
@@ -282,7 +282,7 @@ if (!$rowid) {
 			print "</td>\n";
 
 			// Date payment
-			print '<td class="center">'.dol_print_date($charge->created, 'dayhour')."</td>\n";
+			print '<td class="center nowraponall">'.dol_print_date($charge->created, 'dayhour')."</td>\n";
 			// Type
 			print '<td>';
 			print $type;
@@ -290,7 +290,7 @@ if (!$rowid) {
 			// Amount
 			print '<td class="right"><span class="amount">'.price(($charge->amount - $charge->amount_refunded) / 100, 0, '', 1, - 1, - 1, strtoupper($charge->currency))."</span></td>";
 			// Status
-			print '<td class="right">';
+			print '<td class="nowraponall">';
 			print $status;
 			print "</td>\n";
 

From c3ca19e6e7a14acdc205dabfc7ffdc543c52d5ed Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sat, 25 Jan 2025 16:06:31 +0100
Subject: [PATCH 183/602] CSS

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

diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 442335d1fbe..a834b6a9781 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -250,7 +250,7 @@ if (!$rowid) {
 			print "</td>\n";
 
 			// Link
-			print "<td>";
+			print '<td class="tdoverflowmax200">';
 			if ($societestatic->id > 0) {
 				print $societestatic->getNomUrl(1);
 			} elseif ($memberstatic->id > 0) {

From 01c5025befe9bfaa32812ee633a4bb8924e855d9 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sat, 25 Jan 2025 16:07:41 +0100
Subject: [PATCH 184/602] Center

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

diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index a834b6a9781..98ebb3690c6 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -131,7 +131,7 @@ if (!$rowid) {
 	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left ');
 	print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
-	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right ');
+	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'center ');
 	print "</tr>\n";
 
 	try {

From 7de7bd5ef61bfe150cd05c5f41f6a0a18dbc93a7 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sat, 25 Jan 2025 18:43:05 +0100
Subject: [PATCH 185/602] Clean code

---
 htdocs/core/class/commonobject.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index ec3b079b113..6cfae7ec8fe 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6580,8 +6580,6 @@ abstract class CommonObject
 	 */
 	public function deleteExtraFields()
 	{
-		global $conf;
-
 		if (getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED')) {
 			return 0;
 		}

From 1e43b2f8369acdc151c52159a99daaff4b343c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 26 Jan 2025 11:33:15 +0100
Subject: [PATCH 186/602] fix phan

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

diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 4ed706da62f..8cb88402a57 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -1348,7 +1348,9 @@ if (count($listofextcals)) {
 					$userstatic = new User($db);
 					$userId = $userstatic->findUserIdByEmail($namecal);
 					if (!empty($userId) && $userId > 0) {
-						$event->userassigned[$userId] = $userId;
+						$event->userassigned[$userId] = [
+							'id' => $userId,
+						];
 						$event->percentage = -1;
 					}
 

From 2035f5f7a5bb8ea8c9f2e0af0320d3bc742abb85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 26 Jan 2025 11:34:15 +0100
Subject: [PATCH 187/602] fix phan

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

diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 8cb88402a57..e80e21e8e01 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -1350,6 +1350,7 @@ if (count($listofextcals)) {
 					if (!empty($userId) && $userId > 0) {
 						$event->userassigned[$userId] = [
 							'id' => $userId,
+							'transparency' => 1,
 						];
 						$event->percentage = -1;
 					}

From fe468c03d794fd1026fd508b1ae4792e1829af42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Sun, 26 Jan 2025 11:36:07 +0100
Subject: [PATCH 188/602] clean baseline

---
 build/phpstan/phpstan-baseline.neon | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/build/phpstan/phpstan-baseline.neon b/build/phpstan/phpstan-baseline.neon
index 702bb20b2b4..51af91680f6 100644
--- a/build/phpstan/phpstan-baseline.neon
+++ b/build/phpstan/phpstan-baseline.neon
@@ -31374,12 +31374,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/theme/eldy/dropdown.inc.php
 
-		-
-			message: '#^Parameter \#2 \$steps of function colorAdjustBrightness expects int, string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../htdocs/theme/eldy/global.inc.php
-
 		-
 			message: '#^Variable \$theme might not be defined\.$#'
 			identifier: variable.undefined

From 3c048e81160ef1341f1ea3e14bb577ec6f606c19 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 26 Jan 2025 17:42:43 +0100
Subject: [PATCH 189/602] Fix canonical management in website

---
 htdocs/core/lib/website2.lib.php | 47 ++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index fb161162679..989a5b15ac3 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -215,17 +215,17 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 			$canonicalurladdidlang = '';
 			if ($objectpage->lang) {	// A language is forced on the page, it means we may have other language files with hard links into properties of page
 				$canonicalurl = (($objectpage->id == $object->fk_default_home) ? '/' : (($shortlangcode != substr($object->lang, 0, 2) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php'));
-			} else {					// No language forced, it means the canonical is the one with
+			} else {					// No language forced, it means the canonical is the one with params making url unique
 				$canonicalurl = '/'.$objectpage->pageurl.'.php';
 
 				if ($object->lang && $listofaltlang) {
 					$tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
 					// Add parameter ID required to be unique/canonical
-					$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id")."&" : (GETPOSTINT("cat") ? "?cat=".GETPOSTINT("cat")."&" : "?") ?>';
-					$canonicalurladdidlang .= 'l=<?php echo $weblangs->shortlang ? $weblangs->shortlang : "'.$tmpshortlangcode.'"; ?>';
+					$canonicalurladdidlang = '?__SEO_CANONICAL_URL_PARAMS__';
+					$canonicalurladdidlang .= '&l=<?php echo $weblangs->shortlang ? $weblangs->shortlang : "'.$tmpshortlangcode.'"; ?>';
 				} else {
 					// Add parameter ID required to be unique/canonical
-					$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id") : (GETPOSTINT("cat") ? "?cat=".GETPOSTINT("cat") : "") ?>';
+					$canonicalurladdidlang = '?__SEO_CANONICAL_URL_PARAMS__';
 				}
 			}
 
@@ -278,20 +278,20 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 					$tplcontent .= '<link rel="alternate" hreflang="'.$shortlangcode.'" href="<?php echo $website->virtualhost; ?>'.(($object->fk_default_home == $objectpage->id) ? '/' : (($shortlangcode != substr($object->lang, 0, 2)) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php').'" />'."\n";
 
 					$tplcontent .= '<?php } ?>'."\n";
-				} else {
+				} else {					// No language forced, it means the canonical is the one withparams making url unique
 					$canonicalurl = '/'.$objectpage->pageurl.'.php';
 					$arrayofaltlang = explode(',', $listofaltlang);
 
 					foreach ($arrayofaltlang as $altlang) {
 						// Add parameter ID required to be unique/canonical
-						$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id")."&" : (GETPOSTINT("cat") ? "?cat=".GETPOSTINT("cat")."&" : "?") ?>';
-						$canonicalurladdidlang .= 'l='.$altlang;
+						$canonicalurladdidlang = '?__SEO_CANONICAL_URL_PARAMS__';
+						$canonicalurladdidlang .= '&l='.$altlang;
 						$tplcontent .= '<link rel="alternate" hreflang="'.$altlang.'" href="<?php echo $website->virtualhost; ?>'.$canonicalurl.$canonicalurladdidlang.'" />'."\n";
 					}
 
 					$tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
-					$canonicalurladdidlang = '<?php echo GETPOSTINT("id") ? "?id=".GETPOSTINT("id")."&" : (GETPOSTINT("cat") ? "?cat=".GETPOSTINT("cat")."&" : "?") ?>';
-					$canonicalurladdidlang .= 'l='.$tmpshortlangcode;
+					$canonicalurladdidlang = '?__SEO_CANONICAL_URL_PARAMS__';
+					$canonicalurladdidlang .= '&l='.$tmpshortlangcode;
 					$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="<?php echo $website->virtualhost; ?>'.$canonicalurl.$canonicalurladdidlang.'" />'."\n";
 				}
 			}
@@ -320,29 +320,34 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 		$tplcontent .= '<?php // BEGIN PHP'."\n";
 		$tplcontent .= '$tmp = ob_get_contents(); ob_end_clean();'."\n";	// replace with ob_get_clean ?
 
+		$tplcontent .= "// Now fix the content for SEO or multilanguage\n";
 		// Old method for custom SEO
-		if (strpos($objectpage->content, '$__PAGE__TITLE__') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/<title>.*?<\/title>/s", "<title>" . dol_escape_htmltag($__PAGE__TITLE__) . "</title>", $tmp);'."\n";
-			$tplcontent .= '$tmp = preg_replace("/<meta name=\"title\" content=\".*?\" \/>/s", "<meta name=\"title\" content=\"" . dol_string_nohtmltag($__PAGE__TITLE__) . "\"  />", $tmp);';
-		}
 		if (strpos($objectpage->content, '$__PAGE__KEYWORDS__') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/<meta name=\"keywords\" content=\".*?\" \/>/s", "<meta name=\"keywords\" content=\"" . dol_string_nohtmltag($__PAGE__KEYWORDS__) . "\"  />", $tmp);';
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"keywords\" content=\".*?\" \/>/ms", "<meta name=\"keywords\" content=\"" . dol_string_nohtmltag($__PAGE__KEYWORDS__) . "\"  />", $tmp);'."\n";
+		}
+		if (strpos($objectpage->content, '$__PAGE__TITLE__') !== false) {
+			$tplcontent .= '$tmp = preg_replace("/^<title>.*?<\/title>/ms", "<title>" . dol_escape_htmltag($__PAGE__TITLE__) . "</title>", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"title\" content=\".*?\" \/>/ms", "<meta name=\"title\" content=\"" . dol_string_nohtmltag($__PAGE__TITLE__) . "\"  />", $tmp);'."\n";
 		}
 		if (strpos($objectpage->content, '$__PAGE__DESC__') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/<meta name=\"description\" content=\".*?\" \/>/s", "<meta name=\"description\" content=\"" . dol_string_nohtmltag($__PAGE__DESC__) . "\"  />", $tmp);';
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"description\" content=\".*?\" \/>/ms", "<meta name=\"description\" content=\"" . dol_string_nohtmltag($__PAGE__DESC__) . "\"  />", $tmp);'."\n";
 		}
 		// New method for custom SEO
-		if (strpos($objectpage->content, 'define("__SEO_PAGE_TITLE__"') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/<title>.*?<\/title>/s", "<title>" . dol_escape_htmltag(constant("__SEO_PAGE_TITLE__")) . "</title>", $tmp);'."\n";
-			$tplcontent .= '$tmp = preg_replace("/<meta name=\"title\" content=\".*?\" \/>/s", "<meta name=\"title\" content=\"" . dol_string_nohtmltag(constant("__SEO_PAGE_TITLE__")) . "\"  />", $tmp);';
-		}
 		if (strpos($objectpage->content, 'define("__SEO_PAGE_KEYWORDS__"') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/<meta name=\"keywords\" content=\".*?\" \/>/s", "<meta name=\"keywords\" content=\"" . dol_string_nohtmltag(constant("__SEO_PAGE_KEYWORDS__")) . "\"  />", $tmp);';
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"keywords\" content=\".*?\" \/>/ms", "<meta name=\"keywords\" content=\"" . dol_string_nohtmltag(constant("__SEO_PAGE_KEYWORDS__")) . "\"  />", $tmp);'."\n";
+		}
+		if (strpos($objectpage->content, 'define("__SEO_PAGE_TITLE__"') !== false) {
+			$tplcontent .= '$tmp = preg_replace("/^<title>.*?<\/title>/ms", "<title>" . dol_escape_htmltag(constant("__SEO_PAGE_TITLE__")) . "</title>", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"title\" content=\".*?\" \/>/ms", "<meta name=\"title\" content=\"" . dol_string_nohtmltag(constant("__SEO_PAGE_TITLE__")) . "\"  />", $tmp);'."\n";
 		}
 		if (strpos($objectpage->content, 'define("__SEO_PAGE_DESC__"') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/<meta name=\"description\" content=\".*?\" \/>/s", "<meta name=\"description\" content=\"" . dol_string_nohtmltag(constant("__SEO_PAGE_DESC__")) . "\"  />", $tmp);';
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"description\" content=\".*?\" \/>/ms", "<meta name=\"description\" content=\"" . dol_string_nohtmltag(constant("__SEO_PAGE_DESC__")) . "\"  />", $tmp);'."\n";
+		}
+		if (empty($objectpage->lang)) {		// We may need to use param into the canonical url
+			$tplcontent .= 'defined("__SEO_CANONICAL_URL_PARAMS__") ? ($tmp = preg_replace("/__SEO_CANONICAL_URL_PARAMS__/", dol_string_nohtmltag(constant("__SEO_CANONICAL_URL_PARAMS__")), $tmp)) : ($tmp = preg_replace("/\?__SEO_CANONICAL_URL_PARAMS__\"/", "", preg_replace("/\?__SEO_CANONICAL_URL_PARAMS__&/", "?", $tmp)));'."\n";
 		}
 
+		$tplcontent .= "// Now output the generated page content\n";
 		$tplcontent .= 'dolWebsiteOutput($tmp, "html", '.((int) $objectpage->id).'); dolWebsiteIncrementCounter('.((int) $object->id).', "'.$objectpage->type_container.'", '.((int) $objectpage->id).');'."\n";
 		$tplcontent .= "// END PHP ?>\n";
 	} else {

From b5229f7b3e45a5fe6daf14d9c079311f22733c55 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 26 Jan 2025 19:00:32 +0100
Subject: [PATCH 190/602] Fix redirect in website when we must not propaget
 parameters

---
 htdocs/categories/class/categorie.class.php | 16 +++++++++-------
 htdocs/core/lib/website.lib.php             | 17 ++++++++++-------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 6e1b9083210..08a680c1e1b 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1466,12 +1466,13 @@ class Categorie extends CommonObject
 		// phpcs:enable
 		$ways = array();
 
-		$all_ways = $this->get_all_ways(); // Load array of categories
-		foreach ($all_ways as $way) {
+		$all_ways = $this->get_all_ways(); // Load array of categories to reach this->id
+
+		foreach ($all_ways as $way) {	// It seems we always have 1 entry in this array.
 			$w = array();
 			$i = 0;
 			$forced_color = '';
-			foreach ($way as $cat) {
+			foreach ($way as $cat) {	// Loop on each successive categories to reach the target of current category
 				$i++;
 
 				if (empty($nocolor)) {
@@ -1511,6 +1512,7 @@ class Categorie extends CommonObject
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Returns an array containing the list of parent categories
+	 *  Note: A category can only have one parent but this method return an array to work the same way the get_filles is working.
 	 *
 	 *	@return	int|Categorie[] Return integer <0 KO, array OK
 	 */
@@ -1541,7 +1543,7 @@ class Categorie extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * 	Returns in a table all possible paths to get to the category
+	 * 	Returns in a array all possible paths to go to the category
 	 * 	starting with the major categories represented by Tables of categories
 	 *
 	 *	@return	Categorie[][]
@@ -1554,7 +1556,7 @@ class Categorie extends CommonObject
 		$parents = $this->get_meres();
 		if (is_array($parents)) {
 			foreach ($parents as $parent) {
-				$all_ways = $parent->get_all_ways();
+				$all_ways = $parent->get_all_ways();	// recursivity. TODO Add a protection for infinite loop
 				foreach ($all_ways as $way) {
 					$w = $way;
 					$w[] = $this;
@@ -1646,8 +1648,8 @@ class Categorie extends CommonObject
 	}
 
 	/**
-	 * 	Returns categories whose id or name match
-	 * 	add wildcards in the name unless $exact = true
+	 * 	Returns categories whose id or name matches.
+	 * 	It add wildcards in the name unless $exact = true
 	 *
 	 * 	@param		int			$id			Id
 	 * 	@param		string		$nom		Name
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index c9cbbb6dafa..697d3f5674d 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -509,14 +509,15 @@ function dolWebsiteSaveContent($content)
 /**
  * Make a redirect to another container.
  *
- * @param 	string	$containerref		Ref of container to redirect to (Example: 'mypage' or 'mypage.php').
- * @param 	string	$containeraliasalt	Ref of alternative aliases to redirect to.
- * @param 	int		$containerid		Id of container.
- * @param	int<0,1>	$permanent			0=Use temporary redirect 302, 1=Use permanent redirect 301
- * @param 	array<string,mixed>	$parameters			Array of parameters to append to the URL.
+ * @param 	string		$containerref			Ref of container to redirect to (Example: 'mypage' or 'mypage.php').
+ * @param 	string		$containeraliasalt		Ref of alternative aliases to redirect to.
+ * @param 	int			$containerid			Id of container.
+ * @param	int<0,1>	$permanent				0=Use temporary redirect 302 (default), 1=Use permanent redirect 301
+ * @param 	array<string,mixed>	$parameters		Array of parameters to append to the URL.
+ * @param	int<0,1>	$parampropagation		0=Do not propagate query parameter in URL when doing the redirect, 1=Keep parameters (default)
  * @return  void
  */
-function redirectToContainer($containerref, $containeraliasalt = '', $containerid = 0, $permanent = 0, $parameters = array())
+function redirectToContainer($containerref, $containeraliasalt = '', $containerid = 0, $permanent = 0, $parameters = array(), $parampropagation = 1)
 {
 	global $db, $website;
 	'@phan-var-force Website $website';
@@ -572,7 +573,9 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 		}
 	} else { // When page called from virtual host server
 		$newurl = '/'.$containerref.'.php';
-		$newurl .= (empty($_SERVER["QUERY_STRING"]) ? '' : '?'.$_SERVER["QUERY_STRING"]);
+		if ($parampropagation) {
+			$newurl .= (empty($_SERVER["QUERY_STRING"]) ? '' : '?'.$_SERVER["QUERY_STRING"]);
+		}
 	}
 
 	if ($newurl) {

From 326d0633587268abe95d0e01cbcde26b4ba14c28 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 26 Jan 2025 20:35:23 +0100
Subject: [PATCH 191/602] Debug v21

---
 htdocs/core/lib/functions.lib.php | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e436c45cfb5..868815a49b8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2015,12 +2015,13 @@ function dol_escape_xml($stringtoescape)
  * Return a string label (so on 1 line only and that should not contains any HTML) ready to be output on HTML page.
  * To use text that is not HTML content inside an attribute, you can simply use only dol_escape_htmltag(). In doubt, use dolPrintHTMLForAttribute().
  *
- * @param	string	$s		String to print
- * @return	string			String ready for HTML output
+ * @param	string	$s						String to print
+ * @param	int		$escapeonlyhtmltags		1=Escape only html tags, not the special chars like accents.
+ * @return	string							String ready for HTML output
  */
-function dolPrintLabel($s)
+function dolPrintLabel($s, $escapeonlyhtmltags = 0)
 {
-	return dol_escape_htmltag(dol_string_nohtmltag($s, 1, 'UTF-8', 0, 0), 0, 0, '', 0, 1);
+	return dol_escape_htmltag(dol_string_nohtmltag($s, 1, 'UTF-8', 0, 0), 0, 0, '', $escapeonlyhtmltags, 1);
 }
 
 /**
@@ -2051,18 +2052,23 @@ function dolPrintHTML($s, $allowiframe = 0)
 }
 
 /**
- * Return a string ready to be output on an HTML attribute (alt, title, data-html, ...)
+ * Return a string ready to be output into an HTML attribute (alt, title, data-html, ...)
  * With dolPrintHTMLForAttribute(), the content is HTML encode, even if it is already HTML content.
  *
- * @param	string	$s		String to print
- * @return	string			String ready for HTML output
+ * @param	string	$s						String to print
+ * @param	int		$escapeonlyhtmltags		1=Escape only html tags, not the special chars like accents.
+ * @return	string							String ready for HTML output
  * @see dolPrintHTML(), dolPrintHTMLFortextArea()
  */
-function dolPrintHTMLForAttribute($s)
+function dolPrintHTMLForAttribute($s, $escapeonlyhtmltags = 0)
 {
-	// The dol_htmlentitiesbr will convert simple text into html
-	// The dol_escape_htmltag will escape html chars.
-	return dol_escape_htmltag(dol_string_onlythesehtmltags(dol_htmlentitiesbr($s), 1, 0, 0, 0, array('br', 'b', 'font', 'hr', 'span')), 1, -1, '', 0, 1);
+	// The dol_htmlentitiesbr will convert simple text into html, including switching accent into HTML entities
+	// The dol_escape_htmltag will escape html tags.
+	if ($escapeonlyhtmltags) {
+		return dol_escape_htmltag(dol_string_onlythesehtmltags($s, 1, 0, 0, 0, array('br', 'b', 'font', 'hr', 'span')), 1, -1, '', 1, 1);
+	} else {
+		return dol_escape_htmltag(dol_string_onlythesehtmltags(dol_htmlentitiesbr($s), 1, 0, 0, 0, array('br', 'b', 'font', 'hr', 'span')), 1, -1, '', 0, 1);
+	}
 }
 
 /**

From 627c828b593c2feb735fe4e7556026657ca4c0e8 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 26 Jan 2025 20:37:41 +0100
Subject: [PATCH 192/602] Debug v21

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

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 989a5b15ac3..39ffecd65df 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -323,28 +323,28 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 		$tplcontent .= "// Now fix the content for SEO or multilanguage\n";
 		// Old method for custom SEO
 		if (strpos($objectpage->content, '$__PAGE__KEYWORDS__') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"keywords\" content=\".*?\" \/>/ms", "<meta name=\"keywords\" content=\"" . dol_string_nohtmltag($__PAGE__KEYWORDS__) . "\"  />", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"keywords\" content=\".*?\" \/>/ms", "<meta name=\"keywords\" content=\"" . dolPrintHTMLForAttribute($__PAGE__KEYWORDS__, 1) . "\"  />", $tmp);'."\n";
 		}
 		if (strpos($objectpage->content, '$__PAGE__TITLE__') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/^<title>.*?<\/title>/ms", "<title>" . dol_escape_htmltag($__PAGE__TITLE__) . "</title>", $tmp);'."\n";
-			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"title\" content=\".*?\" \/>/ms", "<meta name=\"title\" content=\"" . dol_string_nohtmltag($__PAGE__TITLE__) . "\"  />", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<title>.*?<\/title>/ms", "<title>" . dolPrintHTMLForAttribute($__PAGE__TITLE__) . "</title>", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"title\" content=\".*?\" \/>/ms", "<meta name=\"title\" content=\"" . dolPrintHTMLForAttribute($__PAGE__TITLE__) . "\"  />", $tmp);'."\n";
 		}
 		if (strpos($objectpage->content, '$__PAGE__DESC__') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"description\" content=\".*?\" \/>/ms", "<meta name=\"description\" content=\"" . dol_string_nohtmltag($__PAGE__DESC__) . "\"  />", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"description\" content=\".*?\" \/>/ms", "<meta name=\"description\" content=\"" . dolPrintHTMLForAttribute($__PAGE__DESC__) . "\"  />", $tmp);'."\n";
 		}
 		// New method for custom SEO
 		if (strpos($objectpage->content, 'define("__SEO_PAGE_KEYWORDS__"') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"keywords\" content=\".*?\" \/>/ms", "<meta name=\"keywords\" content=\"" . dol_string_nohtmltag(constant("__SEO_PAGE_KEYWORDS__")) . "\"  />", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"keywords\" content=\".*?\" \/>/ms", "<meta name=\"keywords\" content=\"" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_KEYWORDS__")) . "\"  />", $tmp);'."\n";
 		}
 		if (strpos($objectpage->content, 'define("__SEO_PAGE_TITLE__"') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/^<title>.*?<\/title>/ms", "<title>" . dol_escape_htmltag(constant("__SEO_PAGE_TITLE__")) . "</title>", $tmp);'."\n";
-			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"title\" content=\".*?\" \/>/ms", "<meta name=\"title\" content=\"" . dol_string_nohtmltag(constant("__SEO_PAGE_TITLE__")) . "\"  />", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<title>.*?<\/title>/ms", "<title>" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_TITLE__")) . "</title>", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"title\" content=\".*?\" \/>/ms", "<meta name=\"title\" content=\"" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_TITLE__")) . "\"  />", $tmp);'."\n";
 		}
 		if (strpos($objectpage->content, 'define("__SEO_PAGE_DESC__"') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"description\" content=\".*?\" \/>/ms", "<meta name=\"description\" content=\"" . dol_string_nohtmltag(constant("__SEO_PAGE_DESC__")) . "\"  />", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"description\" content=\".*?\" \/>/ms", "<meta name=\"description\" content=\"" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_DESC__")) . "\"  />", $tmp);'."\n";
 		}
 		if (empty($objectpage->lang)) {		// We may need to use param into the canonical url
-			$tplcontent .= 'defined("__SEO_CANONICAL_URL_PARAMS__") ? ($tmp = preg_replace("/__SEO_CANONICAL_URL_PARAMS__/", dol_string_nohtmltag(constant("__SEO_CANONICAL_URL_PARAMS__")), $tmp)) : ($tmp = preg_replace("/\?__SEO_CANONICAL_URL_PARAMS__\"/", "", preg_replace("/\?__SEO_CANONICAL_URL_PARAMS__&/", "?", $tmp)));'."\n";
+			$tplcontent .= 'defined("__SEO_CANONICAL_URL_PARAMS__") ? ($tmp = preg_replace("/__SEO_CANONICAL_URL_PARAMS__/", dolPrintHTMLForAttributeUrl(constant("__SEO_CANONICAL_URL_PARAMS__")), $tmp)) : ($tmp = preg_replace("/\?__SEO_CANONICAL_URL_PARAMS__\"/", "", preg_replace("/\?__SEO_CANONICAL_URL_PARAMS__&/", "?", $tmp)));'."\n";
 		}
 
 		$tplcontent .= "// Now output the generated page content\n";

From 59965f1b4aafd0ba4db69da9a0160963c89b56ee Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 26 Jan 2025 20:39:54 +0100
Subject: [PATCH 193/602] Debug v21

---
 htdocs/core/lib/website2.lib.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 39ffecd65df..5438789e826 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -326,22 +326,22 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"keywords\" content=\".*?\" \/>/ms", "<meta name=\"keywords\" content=\"" . dolPrintHTMLForAttribute($__PAGE__KEYWORDS__, 1) . "\"  />", $tmp);'."\n";
 		}
 		if (strpos($objectpage->content, '$__PAGE__TITLE__') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/^<title>.*?<\/title>/ms", "<title>" . dolPrintHTMLForAttribute($__PAGE__TITLE__) . "</title>", $tmp);'."\n";
-			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"title\" content=\".*?\" \/>/ms", "<meta name=\"title\" content=\"" . dolPrintHTMLForAttribute($__PAGE__TITLE__) . "\"  />", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<title>.*?<\/title>/ms", "<title>" . dolPrintHTMLForAttribute($__PAGE__TITLE__, 1) . "</title>", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"title\" content=\".*?\" \/>/ms", "<meta name=\"title\" content=\"" . dolPrintHTMLForAttribute($__PAGE__TITLE__, 1) . "\"  />", $tmp);'."\n";
 		}
 		if (strpos($objectpage->content, '$__PAGE__DESC__') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"description\" content=\".*?\" \/>/ms", "<meta name=\"description\" content=\"" . dolPrintHTMLForAttribute($__PAGE__DESC__) . "\"  />", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"description\" content=\".*?\" \/>/ms", "<meta name=\"description\" content=\"" . dolPrintHTMLForAttribute($__PAGE__DESC__, 1) . "\"  />", $tmp);'."\n";
 		}
 		// New method for custom SEO
 		if (strpos($objectpage->content, 'define("__SEO_PAGE_KEYWORDS__"') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"keywords\" content=\".*?\" \/>/ms", "<meta name=\"keywords\" content=\"" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_KEYWORDS__")) . "\"  />", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"keywords\" content=\".*?\" \/>/ms", "<meta name=\"keywords\" content=\"" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_KEYWORDS__"), 1) . "\"  />", $tmp);'."\n";
 		}
 		if (strpos($objectpage->content, 'define("__SEO_PAGE_TITLE__"') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/^<title>.*?<\/title>/ms", "<title>" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_TITLE__")) . "</title>", $tmp);'."\n";
-			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"title\" content=\".*?\" \/>/ms", "<meta name=\"title\" content=\"" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_TITLE__")) . "\"  />", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<title>.*?<\/title>/ms", "<title>" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_TITLE__"), 1) . "</title>", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"title\" content=\".*?\" \/>/ms", "<meta name=\"title\" content=\"" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_TITLE__"), 1) . "\"  />", $tmp);'."\n";
 		}
 		if (strpos($objectpage->content, 'define("__SEO_PAGE_DESC__"') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"description\" content=\".*?\" \/>/ms", "<meta name=\"description\" content=\"" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_DESC__")) . "\"  />", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"description\" content=\".*?\" \/>/ms", "<meta name=\"description\" content=\"" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_DESC__"), 1) . "\"  />", $tmp);'."\n";
 		}
 		if (empty($objectpage->lang)) {		// We may need to use param into the canonical url
 			$tplcontent .= 'defined("__SEO_CANONICAL_URL_PARAMS__") ? ($tmp = preg_replace("/__SEO_CANONICAL_URL_PARAMS__/", dolPrintHTMLForAttributeUrl(constant("__SEO_CANONICAL_URL_PARAMS__")), $tmp)) : ($tmp = preg_replace("/\?__SEO_CANONICAL_URL_PARAMS__\"/", "", preg_replace("/\?__SEO_CANONICAL_URL_PARAMS__&/", "?", $tmp)));'."\n";

From 507f3b3b71790c21dfc598090d9417ccb638d7cc Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 26 Jan 2025 20:52:16 +0100
Subject: [PATCH 194/602] Debug v21 - Fix lang

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

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 5438789e826..16944471c97 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -333,6 +333,9 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"description\" content=\".*?\" \/>/ms", "<meta name=\"description\" content=\"" . dolPrintHTMLForAttribute($__PAGE__DESC__, 1) . "\"  />", $tmp);'."\n";
 		}
 		// New method for custom SEO
+		if (strpos($objectpage->content, 'define("__SEO_PAGE_LANG__"') !== false) {
+			$tplcontent .= '$tmp = preg_replace("/^<html lang=\"[a-z]+\"/ms", "<html lang=\"" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_LANG__"), 1) . "\">", $tmp);'."\n";
+		}
 		if (strpos($objectpage->content, 'define("__SEO_PAGE_KEYWORDS__"') !== false) {
 			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"keywords\" content=\".*?\" \/>/ms", "<meta name=\"keywords\" content=\"" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_KEYWORDS__"), 1) . "\"  />", $tmp);'."\n";
 		}

From 041e19e4188c87a158033fb5aada69f1c8f97261 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 26 Jan 2025 20:59:45 +0100
Subject: [PATCH 195/602] Fix html tag closing

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

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 16944471c97..7570e562d62 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -334,7 +334,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 		}
 		// New method for custom SEO
 		if (strpos($objectpage->content, 'define("__SEO_PAGE_LANG__"') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/^<html lang=\"[a-z]+\"/ms", "<html lang=\"" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_LANG__"), 1) . "\">", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<html lang=\"[a-z]+\"/ms", "<html lang=\"" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_LANG__"), 1) . "\"", $tmp);'."\n";
 		}
 		if (strpos($objectpage->content, 'define("__SEO_PAGE_KEYWORDS__"') !== false) {
 			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"keywords\" content=\".*?\" \/>/ms", "<meta name=\"keywords\" content=\"" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_KEYWORDS__"), 1) . "\"  />", $tmp);'."\n";

From f78271788f6a0bb7d7514aa01fcf3b1d3b36d242 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 26 Jan 2025 21:14:13 +0100
Subject: [PATCH 196/602] Debug v21

---
 htdocs/core/lib/website2.lib.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 7570e562d62..4140dfb43c4 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -209,9 +209,9 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 
 		$listofaltlang = $object->otherlang;
 
-		// Add the link of the canonical reference
 		// Note: $object is website, $objectpage is website page
 		if ($object->virtualhost) {
+			// Add the link of the canonical reference
 			$canonicalurladdidlang = '';
 			if ($objectpage->lang) {	// A language is forced on the page, it means we may have other language files with hard links into properties of page
 				$canonicalurl = (($objectpage->id == $object->fk_default_home) ? '/' : (($shortlangcode != substr($object->lang, 0, 2) ? '/'.$shortlangcode : '').'/'.$objectpage->pageurl.'.php'));
@@ -219,10 +219,9 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 				$canonicalurl = '/'.$objectpage->pageurl.'.php';
 
 				if ($object->lang && $listofaltlang) {
-					$tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
 					// Add parameter ID required to be unique/canonical
 					$canonicalurladdidlang = '?__SEO_CANONICAL_URL_PARAMS__';
-					$canonicalurladdidlang .= '&l=<?php echo $weblangs->shortlang ? $weblangs->shortlang : "'.$tmpshortlangcode.'"; ?>';
+					$canonicalurladdidlang .= '&l=__SEO_CANONICAL_LANG__';
 				} else {
 					// Add parameter ID required to be unique/canonical
 					$canonicalurladdidlang = '?__SEO_CANONICAL_URL_PARAMS__';
@@ -348,6 +347,9 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 		}
 		if (empty($objectpage->lang)) {		// We may need to use param into the canonical url
 			$tplcontent .= 'defined("__SEO_CANONICAL_URL_PARAMS__") ? ($tmp = preg_replace("/__SEO_CANONICAL_URL_PARAMS__/", dolPrintHTMLForAttributeUrl(constant("__SEO_CANONICAL_URL_PARAMS__")), $tmp)) : ($tmp = preg_replace("/\?__SEO_CANONICAL_URL_PARAMS__\"/", "", preg_replace("/\?__SEO_CANONICAL_URL_PARAMS__&/", "?", $tmp)));'."\n";
+
+			$tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
+			$tplcontent .= '$tmp = preg_replace("/__SEO_CANONICAL_LANG__/", (defined("__SEO_PAGE_LANG__") ? preg_replace(\'/\[_-\].*$/\', "", constant("__SEO_PAGE_LANG__")) : (empty($weblangs->shortlang) ? "'.$tmpshortlangcode.'" : $weblangs->shortlang)), $tmp);'."\n";
 		}
 
 		$tplcontent .= "// Now output the generated page content\n";

From e5ea12ab7028070ddf62cc303a07dc3fe6e80017 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Sun, 26 Jan 2025 21:27:44 +0100
Subject: [PATCH 197/602] Fix fatal error on lang

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

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 4140dfb43c4..6760f7e88a2 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -333,7 +333,8 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 		}
 		// New method for custom SEO
 		if (strpos($objectpage->content, 'define("__SEO_PAGE_LANG__"') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/^<html lang=\"[a-z]+\"/ms", "<html lang=\"" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_LANG__"), 1) . "\"", $tmp);'."\n";
+			$tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
+			$tplcontent .= '$tmp = preg_replace("/^<html lang=\"[a-z]+\"/ms", "<html lang=\"" . dolPrintHTMLForAttribute(defined("__SEO_PAGE_LANG__") ? preg_replace(\'/\[_-\].*$/\', "", constant("__SEO_PAGE_LANG__")) : (empty($weblangs->shortlang) ? "'.$tmpshortlangcode.'" : $weblangs->shortlang), 1) . "\"", $tmp);'."\n";
 		}
 		if (strpos($objectpage->content, 'define("__SEO_PAGE_KEYWORDS__"') !== false) {
 			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"keywords\" content=\".*?\" \/>/ms", "<meta name=\"keywords\" content=\"" . dolPrintHTMLForAttribute(constant("__SEO_PAGE_KEYWORDS__"), 1) . "\"  />", $tmp);'."\n";

From b414ac8ae63e7caa8d5226c9a0cd22cbc1081450 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 27 Jan 2025 00:53:22 +0100
Subject: [PATCH 198/602] Show position in source

---
 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 a4ae40aa36a..471b212b427 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -9498,7 +9498,7 @@ class Form
 				}
 
 				// Note: $val['checked'] <> 0 means we must show the field into the combo list  @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset
-				$listoffieldsforselection .= '<li><input type="checkbox" id="checkbox' . $key . '" value="' . $key . '"' . ((!array_key_exists('checked', $val) || empty($val['checked']) || $val['checked'] == '-1') ? '' : ' checked="checked"') . '/><label for="checkbox' . $key . '">' . dol_escape_htmltag($langs->trans($val['label'])) . '</label></li>';
+				$listoffieldsforselection .= '<li><input type="checkbox" id="checkbox' . $key . '" value="' . $key . '"' . ((!array_key_exists('checked', $val) || empty($val['checked']) || $val['checked'] == '-1') ? '' : ' checked="checked"') . ' data-position="'.$val['position'].'" /><label for="checkbox' . $key . '">' . dol_escape_htmltag($langs->trans($val['label'])) . '</label></li>';
 				$listcheckedstring .= (empty($val['checked']) ? '' : $key . ',');
 			}
 		}

From 158b3c76aa12718d93f4720058ca03d76385c6c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 27 Jan 2025 01:33:32 +0100
Subject: [PATCH 199/602] Fix merge

---
 htdocs/adherents/class/api_members.class.php      | 4 ----
 htdocs/adherents/class/api_memberstypes.class.php | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index a2fd5cf6f18..16efb0a077e 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -37,11 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 class Members extends DolibarrApi
 {
 	/**
-<<<<<<< HEAD
-	 * @var string[]   $FIELDS     Mandatory fields, checked when create and update object
-=======
 	 * @var string[]       Mandatory fields, checked when create and update object
->>>>>>> branch '20.0' of git@github.com:Dolibarr/dolibarr.git
 	 */
 	public static $FIELDS = array(
 		'morphy',
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index e017099af18..d0bc2d6cbd5 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -30,11 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 class MembersTypes extends DolibarrApi
 {
 	/**
-<<<<<<< HEAD
-	 * @var string[]       Mandatory fields, checked when create and update object
-=======
 	 * @var string[]	Mandatory fields, checked when create and update object
->>>>>>> branch '20.0' of git@github.com:Dolibarr/dolibarr.git
 	 */
 	public static $FIELDS = array(
 		'label',

From 07febfe70b7983877eae95a8749abb904ef2a8e3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 27 Jan 2025 01:35:45 +0100
Subject: [PATCH 200/602] Fix merge

---
 htdocs/adherents/class/api_members.class.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 16efb0a077e..a82b5adae05 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -355,13 +355,9 @@ class Members extends DolibarrApi
 	/**
 	 * Create member object
 	 *
-<<<<<<< HEAD
 	 * @param array<string,string> $request_data   Request data
-=======
-	 * @param array	 $request_data   Request data
 	 * @phan-param ?array<string,string>	$request_data
 	 * @phpstan-param ?array<string,string>	$request_data
->>>>>>> branch '20.0' of git@github.com:Dolibarr/dolibarr.git
 	 * @return int  ID of member
 	 *
 	 * @throws	RestException	403		Access denied

From 5e7aa32faa5db6488c56f8fb5a36f7547d19ff02 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 27 Jan 2025 01:44:51 +0100
Subject: [PATCH 201/602] Fix warning

---
 htdocs/loan/note.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index 3fa7c606d83..7a117e64ba7 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -32,10 +32,9 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
-if (isModEnabled('project')) {
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-}
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
 /**
  * @var Conf $conf
  * @var DoliDB $db

From 64c3e3fb36955ebd3b48a0b7f582e5eae07e8f77 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 27 Jan 2025 02:06:15 +0100
Subject: [PATCH 202/602] Fix phan

---
 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 c0b2489b3b8..4fdb68e5ad2 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -9438,7 +9438,7 @@ class Form
 	 * If a saved selection of fields exists for user (into $user->conf->MAIN_SELECTEDFIELDS_contextofpage), we use this one instead of default.
 	 *
 	 * @param string 	$htmlname 	Name of HTML field
-	 * @param array<string,array{label:string,checked:string,enabled?:string,type?:string,langfile?:string}> 	$array 	Array with array of fields we could show. This array may be modified according to setup of user.
+	 * @param array<string,array{label:string,checked:string,enabled?:string,type?:string,langfile?:string,position?:int}> 	$array 	Array with array of fields we could show. This array may be modified according to setup of user.
 	 * @param string 	$varpage 	Id of context for page. Can be set by caller with $varpage=(empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage);
 	 * @param string 	$pos 		Position colon on liste value 'left' or '' (meaning 'right').
 	 * @return string            	HTML multiselect string

From 73e4e05bad6e905ef28370652b1742bb54e71db3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 27 Jan 2025 02:25:57 +0100
Subject: [PATCH 203/602] Fix phpstan

---
 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 4fdb68e5ad2..43ce05648b1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -9438,7 +9438,7 @@ class Form
 	 * If a saved selection of fields exists for user (into $user->conf->MAIN_SELECTEDFIELDS_contextofpage), we use this one instead of default.
 	 *
 	 * @param string 	$htmlname 	Name of HTML field
-	 * @param array<string,array{label:string,checked:string,enabled?:string,type?:string,langfile?:string,position?:int}> 	$array 	Array with array of fields we could show. This array may be modified according to setup of user.
+	 * @param array<string,array{label:string,checked:string,enabled?:string,type?:string,langfile?:string,position?:int,help?:string}> 	$array 	Array with array of fields we could show. This array may be modified according to setup of user.
 	 * @param string 	$varpage 	Id of context for page. Can be set by caller with $varpage=(empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage);
 	 * @param string 	$pos 		Position colon on liste value 'left' or '' (meaning 'right').
 	 * @return string            	HTML multiselect string

From b4bf3978ef2cad6d0529d3a477285f880c2d5fa0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 27 Jan 2025 03:46:51 +0100
Subject: [PATCH 204/602] Better tooltips

---
 htdocs/compta/tva/quadri_detail.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index e0ea47ccbd8..0e374c8d5da 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -185,10 +185,22 @@ if (getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'payment') {
 	$description .= '<br>' . $langs->trans("RulesVATInServices");
 }
 if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
-	$description .= '<br>' . $langs->trans("DepositsAreNotIncluded");
+	if (getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'invoice' && getDolGlobalString('TAX_MODE_SELL_PRODUCT') == 'invoice') {
+		$description .= '<br>' . $langs->trans("DepositsAreNotIncluded");
+	} elseif (getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'invoice') { // calculate on sale invoice for service only
+		$description .= '<br>' . $langs->trans("DepositsAreNotIncluded").' (for services)';
+	} elseif (getDolGlobalString('TAX_MODE_SELL_PRODUCT') == 'invoice') { // calculate on sale invoice for service only
+		$description .= '<br>' . $langs->trans("DepositsAreNotIncluded").' (for products)';
+	}
 }
 if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
-	$description .= $langs->trans("SupplierDepositsAreNotIncluded");
+	if (getDolGlobalString('TAX_MODE_BUY_SERVICE') == 'invoice' && getDolGlobalString('TAX_MODE_BUY_PRODUCT') == 'invoice') {
+		$description .= '<br>' . $langs->trans("SupplierDepositsAreNotIncluded");
+	} elseif (getDolGlobalString('TAX_MODE_BUY_SERVICE') == 'invoice') { // calculate on supplier invoice for service only
+		$description .= '<br>' . $langs->trans("SupplierDepositsAreNotIncluded").' (for services)';
+	} elseif (getDolGlobalString('TAX_MODE_BUY_PRODUCT') == 'invoice') { // calculate on supplier invoice for product only
+		$description .= '<br>' . $langs->trans("SupplierDepositsAreNotIncluded").' (for products)';
+	}
 }
 if (isModEnabled('accounting')) {
 	$description .= '<br>' . $langs->trans("ThisIsAnEstimatedValue");

From 18d593005c1f0e5ab3862d3371fd392672ac7fbb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 27 Jan 2025 03:50:46 +0100
Subject: [PATCH 205/602] Fix phan

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

diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index e80e21e8e01..8457f983e5d 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -1098,7 +1098,7 @@ if ($user->hasRight("holiday", "read")) {
 			$event->transparency = 1;
 
 			$event->userownerid = $obj->uid; // user id of owner
-			$event->userassigned = array($obj->uid => $obj->uid);
+			$event->userassigned = array($obj->uid => array('id' => $obj->uid, 'transparency' => 1));
 
 			if ($obj->status == 3) {
 				// Show no symbol for leave with state "leave approved"

From 5a427209a99321a1e8605f4c280a16ad8d7f164f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 27 Jan 2025 04:57:09 +0100
Subject: [PATCH 206/602] Doc

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3a6cff28efc..c8050d8b679 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2011,17 +2011,23 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 					$tmpold = $tmp;
 
 					if (preg_match('/<'.preg_quote($tagtoreplace, '/').'\s+([^>]+)>/', $tmp, $reg)) {
+						// We want to pprotect the attribute part ... in '<xxx ...>' to avoid transformation by htmlentities() lafter
 						$tmpattributes = str_ireplace(array('[', ']'), '_', $reg[1]);	// We must never have [ ] inside the attribute string
-						$tmpattributes = str_ireplace('href="http:', '__HREFHTTPA', $tmpattributes);
+						$tmpattributes = str_ireplace('href="http:', '__HREFHTTPA', $tmpattributes);	// TODO Try to remove this
 						$tmpattributes = str_ireplace('href="https:', '__HREFHTTPSA', $tmpattributes);
 						$tmpattributes = str_ireplace('src="http:', '__SRCHTTPIMG', $tmpattributes);
 						$tmpattributes = str_ireplace('src="https:', '__SRCHTTPSIMG', $tmpattributes);
 						$tmpattributes = str_ireplace('"', '__DOUBLEQUOTE', $tmpattributes);
 						$tmpattributes = preg_replace('/[^a-z0-9_\/\?\;\s=&\.\-@:\.#\+]/i', '', $tmpattributes);
 						//$tmpattributes = preg_replace("/float:\s*(left|right)/", "", $tmpattributes);	// Disabled: we must not remove content
+
+						// TODO Test the replacement by using a memory array for attributes to restore them
+						// TODO Test a tag like '<a href="https://mydomain.com/aaa%20bbb">abc</a>'
 						$tmp = preg_replace('/<'.preg_quote($tagtoreplace, '/').'\s+'.preg_quote($reg[1], '/').'>/', '__BEGINTAGTOREPLACE'.$tagtoreplace.'['.$tmpattributes.']__', $tmp);
 					}
+					// TODO This may be already in previous case ? Try to remove this.
 					if (preg_match('/<'.preg_quote($tagtoreplace, '/').'\s+([^>]+)\s+\/>/', $tmp, $reg)) {
+						// We want to protect the attribute part ... in '<xxx ... />' to avoid transformation by htmlentities() lafter
 						$tmpattributes = str_ireplace(array('[', ']'), '_', $reg[1]);	// We must not have [ ] inside the attribute string
 						$tmpattributes = str_ireplace('"', '__DOUBLEQUOTE', $tmpattributes);
 						$tmpattributes = preg_replace('/[^a-z0-9_\/\?\;\s=&\.\-@:\.#\+]/i', '', $tmpattributes);

From 046d0511db5e5d392a35577839c677ecf6c5e912 Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Mon, 27 Jan 2025 08:40:13 +0100
Subject: [PATCH 207/602] add an info against booking.class.php >
 calendar.class.php

---
 ChangeLog | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2e13f51fa5b..bc39e16a356 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -518,7 +518,7 @@ NEW: Upgrade in module builder in menu section
 NEW: use account address in sepa mandate (#23642)
 NEW: VAT rate - Add entity
 NEW: When an user unset the batch management of products, transformation of each batch stock mouvement in global stock mouvement
-NEW: PDF Generation for each Human Resource Evaluations. 
+NEW: PDF Generation for each Human Resource Evaluations.
 
 SEC: #25512 applicative anti bruteforce - security on too many login attempts (#25520)
 SEC: Add action confirm_... as sensitive to need a CSRF token
@@ -592,7 +592,7 @@ The following changes may create regressions for some external modules, but were
 * The property ->user_creation to store ID of user of creation has been renamed into ->user_creation_id.
 * The property ->user_modification to store ID of user of modification has been renamed into ->user_modification_id.
 * The private array ->status_short, ->statuts and ->status_long are now array ->labelStatusShort and ->labelStatus everywhere.
-* The duplicate property ->user_creat, ->date_creat, ->date_valid have been removed (use instead user_creation, date_creation, date_validation). 
+* The duplicate property ->user_creat, ->date_creat, ->date_valid have been removed (use instead user_creation, date_creation, date_validation).
 * The method get_substitutionarray_shipment_lines() has been removed. Use the generic get_substitutionarray_lines() instead.
 * The method ProductcustomerPrice->fetch_all_log() has been renamed into camel case ->fetchAllLog()
 * It was possible to use a variable $soc or $right inside a PHP code condition of some extrafields properties, this is no more true (this 2 variables are no more global variables).
@@ -602,7 +602,7 @@ The following changes may create regressions for some external modules, but were
 * The delete() method of AdherentType, Contact, Delivery, MultiCurrency, CurrencyRate now need $user as first parameter.
 * A very high number of class properties (with old name in french) are now deprecated in favor of the property name in english.
 * The load of hook context productdao has been removed before calling loadvirtualstock. Modules must use the context of main parent page or 'all' for all cases.
-
+* booking.class.php was removed, please have a look at calendar.class.php
 
 ***** ChangeLog for 18.0.6 compared to 18.0.5 *****
 FIX: 16.0 - parent company gets emptied when updating a third party from the card in edit mode (#28269)
@@ -1009,7 +1009,7 @@ NEW: Accountancy - Quadratus export with attachments in accountancy export
 NEW: Accountancy - Can filter on a custom group of accounts. Perf or ledger list.
 NEW: Accountancy - Can select the export format during export of journals
 NEW: Accountancy - sort of column of custom group of account
-NEW: Can upload a file with drag and drop on purchase invoice, vats, salaries and social contributions 
+NEW: Can upload a file with drag and drop on purchase invoice, vats, salaries and social contributions
 NEW: Authentication: #22740 add OpenID Connect impl
 NEW: Authentication: add experimental support for Google OAuth2 connexion
 NEW: Authentication: can now edit service name for OAuth token

From 9554ea00a818977d6923b86e4347b9090fb857d0 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 27 Jan 2025 08:53:00 +0100
Subject: [PATCH 208/602] FIX can not delete files in task card

---
 htdocs/projet/tasks/task.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index fbf8fdc1e45..264462594f2 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -72,7 +72,10 @@ if ($reshook < 0) {
 }
 
 if ($id > 0 || $ref) {
-	$object->fetch($id, $ref);
+	$ret = $object->fetch($id, $ref);
+	if ($ret > 0) {
+		$projectstatic->fetch($object->fk_project);
+	}
 }
 
 // Security check
@@ -235,7 +238,7 @@ if ($action == 'remove_file' && $user->hasRight('projet', 'creer')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 	$langs->load("other");
-	$upload_dir = $conf->project->dir_output;
+	$upload_dir = $conf->project->dir_output."/".dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
 	$file = $upload_dir.'/'.dol_sanitizeFileName(GETPOST('file'));
 
 	$ret = dol_delete_file($file);
@@ -254,7 +257,6 @@ $form = new Form($db);
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
 $formproject = new FormProjets($db);
-$result = $projectstatic->fetch($object->fk_project);
 
 $title = $object->ref;
 if (!empty($withproject)) {
@@ -739,7 +741,7 @@ if ($id > 0 || !empty($ref)) {
 		/*
 		 * Generated documents
 		 */
-		$filename = dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
+		$filename = '';
 		$filedir = $conf->project->dir_output."/".dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 		$genallowed = ($user->hasRight('projet', 'lire'));

From a45a86a812e105f2ea0bac7bd8d30da3efef6a2a Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 27 Jan 2025 09:48:13 +0100
Subject: [PATCH 209/602] Fix sql syntax error on empty filter

---
 htdocs/core/lib/company.lib.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 5f8794a5e74..0ffc40ac8f8 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -2000,19 +2000,24 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr
 		}
 
 		if (is_array($actioncode) && !empty($actioncode)) {
-			$sql .= ' AND (';
+			$tmpsql = '';
+
 			foreach ($actioncode as $key => $code) {
-				if ((string) $code == '-1') {
+				if ((string) $code === '-1' || (string) $code === '') {
 					continue;
 				}
 				if ($key != 0) {
-					$sql .= " OR ";
+					$tmpsql .= " OR ";
 				}
 				if (!empty($code)) {
-					addEventTypeSQL($sql, $code, "");
+					addEventTypeSQL($tmpsql, $code, "");
 				}
 			}
-			$sql .= ')';
+			if ($tmpsql) {
+				$sql .= ' AND (';
+				$sql .= $tmpsql;
+				$sql .= ')';
+			}
 		} elseif (!empty($actioncode) && $actioncode != '-1') {
 			addEventTypeSQL($sql, $actioncode);
 		}

From 5e88f9b415975e573c94ec6310a2e927aa681338 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 27 Jan 2025 09:48:29 +0100
Subject: [PATCH 210/602] FIX avoid php warnings

---
 htdocs/core/lib/project.lib.php       | 1 +
 htdocs/projet/class/project.class.php | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 4776907192f..23ae5d8b032 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2743,6 +2743,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 					}
 
 					print '<td class="right">';
+					$alttext = '';
 					if ($objp->opp_percent && $objp->opp_amount) {
 						$opp_weighted_amount = $objp->opp_percent * $objp->opp_amount / 100;
 						$alttext = $langs->trans("OpportunityWeightedAmount").' '.price($opp_weighted_amount, 0, '', 1, -1, 0, $conf->currency);
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index cf7cc5558a4..a7b99b90df0 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -2197,6 +2197,9 @@ class Project extends CommonObject
 					$date = explode('-', $obj->element_date);
 					$week_number = getWeekNumber($date[2], $date[1], $date[0]);
 				}
+				if (!isset($this->monthWorkLoadPerTask[$week_number][$obj->fk_element])) {
+					$this->monthWorkLoadPerTask[$week_number][$obj->fk_element] = 0;
+				}
 				'@phan-var-force int $week_number';  // Needed because phan considers it might be null
 				if (empty($weekalreadyfound[$week_number])) {
 					$this->monthWorkLoad[$week_number] = $obj->element_duration;

From 25ab0e7f9b9d1e83ee68a5a61ee22baa2a297d0b Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 27 Jan 2025 10:03:02 +0100
Subject: [PATCH 211/602] FIX wrong type

---
 htdocs/projet/class/project.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index a7b99b90df0..a3bdd034b9d 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -2197,15 +2197,15 @@ class Project extends CommonObject
 					$date = explode('-', $obj->element_date);
 					$week_number = getWeekNumber($date[2], $date[1], $date[0]);
 				}
-				if (!isset($this->monthWorkLoadPerTask[$week_number][$obj->fk_element])) {
-					$this->monthWorkLoadPerTask[$week_number][$obj->fk_element] = 0;
-				}
 				'@phan-var-force int $week_number';  // Needed because phan considers it might be null
 				if (empty($weekalreadyfound[$week_number])) {
 					$this->monthWorkLoad[$week_number] = $obj->element_duration;
 					$this->monthWorkLoadPerTask[$week_number][$obj->fk_element] = $obj->element_duration;
 				} else {
 					$this->monthWorkLoad[$week_number] += $obj->element_duration;
+					if (!isset($this->monthWorkLoadPerTask[$week_number][$obj->fk_element])) {
+						$this->monthWorkLoadPerTask[$week_number][$obj->fk_element] = array();
+					}
 					$this->monthWorkLoadPerTask[$week_number][$obj->fk_element] += $obj->element_duration;
 				}
 				$weekalreadyfound[$week_number] = 1;

From 2bf034fe07381b18e41bed8b64b6710d02f65287 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 27 Jan 2025 10:03:53 +0100
Subject: [PATCH 212/602] Clean code

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

diff --git a/htdocs/user/agenda.php b/htdocs/user/agenda.php
index 60e4cb1863d..6b4719d18a4 100644
--- a/htdocs/user/agenda.php
+++ b/htdocs/user/agenda.php
@@ -50,7 +50,7 @@ if (!isset($id) || empty($id)) {
 }
 
 if (GETPOST('actioncode', 'array')) {
-	$actioncode = GETPOST('actioncode', 'array', 3);
+	$actioncode = GETPOST('actioncode', 'array:alpha', 3);
 	if (!count($actioncode)) {
 		$actioncode = '0';
 	}

From 968f3dbaa1d0c734e64f9d5dc9a431d29fc5ec18 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 27 Jan 2025 10:04:35 +0100
Subject: [PATCH 213/602] FIX phpstan tu me soules !

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

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index a3bdd034b9d..a8f684acf22 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -2204,7 +2204,7 @@ class Project extends CommonObject
 				} else {
 					$this->monthWorkLoad[$week_number] += $obj->element_duration;
 					if (!isset($this->monthWorkLoadPerTask[$week_number][$obj->fk_element])) {
-						$this->monthWorkLoadPerTask[$week_number][$obj->fk_element] = array();
+						$this->monthWorkLoadPerTask[$week_number][$obj->fk_element] = 0;
 					}
 					$this->monthWorkLoadPerTask[$week_number][$obj->fk_element] += $obj->element_duration;
 				}

From c1058da4c5d2703cea4423bef97eb650ac72141d Mon Sep 17 00:00:00 2001
From: ATM-Lucas <lucas.mantegari@atm-consulting.fr>
Date: Mon, 27 Jan 2025 10:15:56 +0100
Subject: [PATCH 214/602] Travis error

---
 htdocs/core/class/html.formmail.class.php | 1181 ++++++++++-----------
 1 file changed, 589 insertions(+), 592 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index a5881534518..21f064ba8ca 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -473,7 +473,7 @@ class FormMail extends Form
 		global $conf, $langs, $user, $hookmanager, $form;
 
 		// Required to show preview wof mail attachments
-		require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 		$formfile = new FormFile($this->db);
 
 		if (!is_object($form)) {
@@ -532,632 +532,631 @@ class FormMail extends Form
 			$listofpaths = array();
 			$listofnames = array();
 			$listofmimes = array();
-			$keytoavoidconflict = empty($this->trackid) ? '' : '-' . $this->trackid; // this->trackid must be defined
+			$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
 
 			if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
-				if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
-					if (!empty($arraydefaultmessage->joinfiles) && !empty($this->param['fileinit']) && is_array($this->param['fileinit'])) {
-						foreach ($this->param['fileinit'] as $path) {
-							if (!empty($path)) {
-								$this->add_attached_files($path);
-							}
+				if (!empty($arraydefaultmessage->joinfiles) && !empty($this->param['fileinit']) && is_array($this->param['fileinit'])) {
+					foreach ($this->param['fileinit'] as $path) {
+						if (!empty($path)) {
+							$this->add_attached_files($path);
 						}
 					}
 				}
+			}
 
-				if (!empty($_SESSION["listofpaths" . $keytoavoidconflict])) {
-					$listofpaths = explode(';', $_SESSION["listofpaths" . $keytoavoidconflict]);
+			if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+				$listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+			}
+			if (!empty($_SESSION["listofnames".$keytoavoidconflict])) {
+				$listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+			}
+			if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+				$listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+			}
+
+
+			$out .= "\n".'<!-- Begin form mail type='.$this->param["models"].' --><div id="mailformdiv"></div>'."\n";
+			if ($this->withform == 1) {
+				$out .= '<form method="POST" name="mailform" id="mailform" enctype="multipart/form-data" action="'.$this->param["returnurl"].'#formmail">'."\n";
+
+				$out .= '<a id="formmail" name="formmail"></a>';
+				$out .= '<input style="display:none" type="submit" id="sendmailhidden" name="sendmail">';
+				$out .= '<input type="hidden" name="token" value="'.newToken().'" />';
+				$out .= '<input type="hidden" name="trackid" value="'.$this->trackid.'" />';
+				$out .= '<input type="hidden" name="inreplyto" value="'.$this->inreplyto.'" />';
+			}
+			if (!empty($this->withfrom)) {
+				if (!empty($this->withfromreadonly)) {
+					$out .= '<input type="hidden" id="fromname" name="fromname" value="'.$this->fromname.'" />';
+					$out .= '<input type="hidden" id="frommail" name="frommail" value="'.$this->frommail.'" />';
 				}
-				if (!empty($_SESSION["listofnames" . $keytoavoidconflict])) {
-					$listofnames = explode(';', $_SESSION["listofnames" . $keytoavoidconflict]);
-				}
-				if (!empty($_SESSION["listofmimes" . $keytoavoidconflict])) {
-					$listofmimes = explode(';', $_SESSION["listofmimes" . $keytoavoidconflict]);
-				}
-
-
-				$out .= "\n" . '<!-- Begin form mail type=' . $this->param["models"] . ' --><div id="mailformdiv"></div>' . "\n";
-				if ($this->withform == 1) {
-					$out .= '<form method="POST" name="mailform" id="mailform" enctype="multipart/form-data" action="' . $this->param["returnurl"] . '#formmail">' . "\n";
-
-					$out .= '<a id="formmail" name="formmail"></a>';
-					$out .= '<input style="display:none" type="submit" id="sendmailhidden" name="sendmail">';
-					$out .= '<input type="hidden" name="token" value="' . newToken() . '" />';
-					$out .= '<input type="hidden" name="trackid" value="' . $this->trackid . '" />';
-					$out .= '<input type="hidden" name="inreplyto" value="' . $this->inreplyto . '" />';
-				}
-				if (!empty($this->withfrom)) {
-					if (!empty($this->withfromreadonly)) {
-						$out .= '<input type="hidden" id="fromname" name="fromname" value="' . $this->fromname . '" />';
-						$out .= '<input type="hidden" id="frommail" name="frommail" value="' . $this->frommail . '" />';
-					}
-				}
-				foreach ($this->param as $key => $value) {
-					if (is_array($value)) {
-						$out .= "<!-- param key=" . $key . " is array, we do not output input field for it -->\n";
-					} else {
-						$out .= '<input type="hidden" id="' . $key . '" name="' . $key . '" value="' . $value . '" />' . "\n";
-					}
-				}
-
-				$modelmail_array = array();
-				if ($this->param['models'] != 'none') {
-					$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
-					if ($result < 0) {
-						setEventMessages($this->error, $this->errors, 'errors');
-					}
-
-					foreach ($this->lines_model as $line) {
-						$reg = array();
-						if (preg_match('/\((.*)\)/', $line->label, $reg)) {
-							$labeltouse = $langs->trans($reg[1]); // langs->trans when label is __(xxx)__
-						} else {
-							$labeltouse = $line->label;
-						}
-
-						// We escape the $labeltouse to store it into $modelmail_array.
-						$modelmail_array[$line->id] = dol_escape_htmltag($labeltouse);
-						if ($line->lang) {
-							$modelmail_array[$line->id] .= ' ' . picto_from_langcode($line->lang);
-						}
-						if ($line->private) {
-							$modelmail_array[$line->id] .= ' - <span class="opacitymedium">' . dol_escape_htmltag($langs->trans("Private")) . '</span>';
-						}
-					}
-				}
-
-				// Zone to select email template
-				if (count($modelmail_array) > 0) {
-					$model_mail_selected_id = GETPOSTISSET('modelmailselected') ? GETPOSTINT('modelmailselected') : ($arraydefaultmessage->id > 0 ? $arraydefaultmessage->id : 0);
-
-					// If list of template is filled
-					$out .= '<div class="center" style="padding: 0px 0 12px 0">' . "\n";
-
-					$out .= $this->selectarray('modelmailselected', $modelmail_array, $model_mail_selected_id, $langs->trans('SelectMailModel'), 0, 0, '', 0, 0, 0, '', 'minwidth100', 1, '', 0, 1);
-					if ($user->admin) {
-						$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup') . ' - ' . $langs->transnoentitiesnoconv('EMails')), 1);
-					}
-
-					$out .= ' &nbsp; ';
-					$out .= '<input type="submit" class="button reposition smallpaddingimp" value="' . $langs->trans('Apply') . '" name="modelselected" id="modelselected">';
-					$out .= ' &nbsp; ';
-					$out .= '</div>';
-				} elseif (!empty($this->param['models']) && in_array($this->param['models'], array(
-						'propal_send', 'order_send', 'facture_send',
-						'shipping_send', 'fichinter_send', 'supplier_proposal_send', 'order_supplier_send',
-						'invoice_supplier_send', 'thirdparty', 'contract', 'user', 'recruitmentcandidature_send', 'product_send', 'all'
-					))) {
-					// If list of template is empty
-					$out .= '<div class="center" style="padding: 0px 0 12px 0">' . "\n";
-					$out .= '<span class="opacitymedium">' . $langs->trans('SelectMailModel') . ':</span> ';
-					$out .= '<select name="modelmailselected" disabled="disabled"><option value="none">' . $langs->trans("NoTemplateDefined") . '</option></select>'; // Do not put 'disabled' on 'option' tag, it is already on 'select' and it makes chrome crazy.
-					if ($user->admin) {
-						$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup') . ' - ' . $langs->transnoentitiesnoconv('EMails')), 1);
-					}
-					$out .= ' &nbsp; ';
-					$out .= '<input type="submit" class="button reposition smallpaddingimp" value="' . $langs->trans('Apply') . '" name="modelselected" disabled="disabled" id="modelselected">';
-					$out .= ' &nbsp; ';
-					$out .= '</div>';
+			}
+			foreach ($this->param as $key => $value) {
+				if (is_array($value)) {
+					$out .= "<!-- param key=".$key." is array, we do not output input field for it -->\n";
 				} else {
-					$out .= '<!-- No template available for $this->param["models"] = ' . $this->param['models'] . ' -->';
+					$out .= '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />'."\n";
+				}
+			}
+
+			$modelmail_array = array();
+			if ($this->param['models'] != 'none') {
+				$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
+				if ($result < 0) {
+					setEventMessages($this->error, $this->errors, 'errors');
 				}
 
-
-				$out .= '<table class="tableforemailform boxtablenotop centpercent">' . "\n";
-
-				// Substitution array/string
-				$helpforsubstitution = '';
-				if (is_array($this->substit) && count($this->substit)) {
-					$helpforsubstitution .= $langs->trans('AvailableVariables') . ' :<br><br><span class="small">' . "\n";
-				}
-				foreach ($this->substit as $key => $val) {
-					// Do not show deprecated variables into the tooltip help of substitution variables
-					if (in_array($key, array('__NEWREF__', '__REFCLIENT__', '__REFSUPPLIER__', '__SUPPLIER_ORDER_DATE_DELIVERY__', '__SUPPLIER_ORDER_DELAY_DELIVERY__'))) {
-						continue;
-					}
-					$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">';
-					if (is_numeric($this->withsubstit)) {
-						$out .= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // Old usage
+				foreach ($this->lines_model as $line) {
+					$reg = array();
+					if (preg_match('/\((.*)\)/', $line->label, $reg)) {
+						$labeltouse = $langs->trans($reg[1]); // langs->trans when label is __(xxx)__
 					} else {
-						$out .= $form->textwithpicto($langs->trans('AvailableVariables'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // New usage
+						$labeltouse = $line->label;
 					}
-					$out .= "</td></tr>\n";
-				}*/
 
-				// From
-				if (!empty($this->withfrom)) {
-					if (!empty($this->withfromreadonly)) {
-						$out .= '<tr><td class="fieldrequired minwidth200">' . $langs->trans("MailFrom") . '</td><td>';
+					// We escape the $labeltouse to store it into $modelmail_array.
+					$modelmail_array[$line->id] = dol_escape_htmltag($labeltouse);
+					if ($line->lang) {
+						$modelmail_array[$line->id] .= ' '.picto_from_langcode($line->lang);
+					}
+					if ($line->private) {
+						$modelmail_array[$line->id] .= ' - <span class="opacitymedium">'.dol_escape_htmltag($langs->trans("Private")).'</span>';
+					}
+				}
+			}
 
-						// $this->fromtype is the default value to use to select sender
-						if (!($this->fromtype === 'user' && $this->fromid > 0)
-							&& !($this->fromtype === 'company')
-							&& !($this->fromtype === 'robot')
-							&& !preg_match('/user_aliases/', $this->fromtype)
-							&& !preg_match('/global_aliases/', $this->fromtype)
-							&& !preg_match('/senderprofile/', $this->fromtype)
-						) {
-							// Use this->fromname and this->frommail or error if not defined
-							$out .= $this->fromname;
-							if ($this->frommail) {
-								$out .= ' &lt;' . $this->frommail . '&gt;';
-							} else {
-								if ($this->fromtype) {
-									$langs->load('errors');
-									$out .= '<span class="warning"> &lt;' . $langs->trans('ErrorNoMailDefinedForThisUser') . '&gt; </span>';
-								}
-							}
+			// Zone to select email template
+			if (count($modelmail_array) > 0) {
+				$model_mail_selected_id = GETPOSTISSET('modelmailselected') ? GETPOSTINT('modelmailselected') : ($arraydefaultmessage->id > 0 ? $arraydefaultmessage->id : 0);
+
+				// If list of template is filled
+				$out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
+
+				$out .= $this->selectarray('modelmailselected', $modelmail_array, $model_mail_selected_id, $langs->trans('SelectMailModel'), 0, 0, '', 0, 0, 0, '', 'minwidth100', 1, '', 0, 1);
+				if ($user->admin) {
+					$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')), 1);
+				}
+
+				$out .= ' &nbsp; ';
+				$out .= '<input type="submit" class="button reposition smallpaddingimp" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
+				$out .= ' &nbsp; ';
+				$out .= '</div>';
+			} elseif (!empty($this->param['models']) && in_array($this->param['models'], array(
+					'propal_send', 'order_send', 'facture_send',
+					'shipping_send', 'fichinter_send', 'supplier_proposal_send', 'order_supplier_send',
+					'invoice_supplier_send', 'thirdparty', 'contract', 'user', 'recruitmentcandidature_send', 'all'
+				))) {
+				// If list of template is empty
+				$out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
+				$out .= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> ';
+				$out .= '<select name="modelmailselected" disabled="disabled"><option value="none">'.$langs->trans("NoTemplateDefined").'</option></select>'; // Do not put 'disabled' on 'option' tag, it is already on 'select' and it makes chrome crazy.
+				if ($user->admin) {
+					$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')), 1);
+				}
+				$out .= ' &nbsp; ';
+				$out .= '<input type="submit" class="button reposition smallpaddingimp" value="'.$langs->trans('Apply').'" name="modelselected" disabled="disabled" id="modelselected">';
+				$out .= ' &nbsp; ';
+				$out .= '</div>';
+			} else {
+				$out .= '<!-- No template available for $this->param["models"] = '.$this->param['models'].' -->';
+			}
+
+
+			$out .= '<table class="tableforemailform boxtablenotop centpercent">'."\n";
+
+			// Substitution array/string
+			$helpforsubstitution = '';
+			if (is_array($this->substit) && count($this->substit)) {
+				$helpforsubstitution .= $langs->trans('AvailableVariables').' :<br><br><span class="small">'."\n";
+			}
+			foreach ($this->substit as $key => $val) {
+				// Do not show deprecated variables into the tooltip help of substitution variables
+				if (in_array($key, array('__NEWREF__', '__REFCLIENT__', '__REFSUPPLIER__', '__SUPPLIER_ORDER_DATE_DELIVERY__', '__SUPPLIER_ORDER_DELAY_DELIVERY__'))) {
+					continue;
+				}
+				$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">';
+				if (is_numeric($this->withsubstit)) {
+					$out .= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // Old usage
+				} else {
+					$out .= $form->textwithpicto($langs->trans('AvailableVariables'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // New usage
+				}
+				$out .= "</td></tr>\n";
+			}*/
+
+			// From
+			if (!empty($this->withfrom)) {
+				if (!empty($this->withfromreadonly)) {
+					$out .= '<tr><td class="fieldrequired minwidth200">'.$langs->trans("MailFrom").'</td><td>';
+
+					// $this->fromtype is the default value to use to select sender
+					if (!($this->fromtype === 'user' && $this->fromid > 0)
+						&& !($this->fromtype === 'company')
+						&& !($this->fromtype === 'robot')
+						&& !preg_match('/user_aliases/', $this->fromtype)
+						&& !preg_match('/global_aliases/', $this->fromtype)
+						&& !preg_match('/senderprofile/', $this->fromtype)
+					) {
+						// Use this->fromname and this->frommail or error if not defined
+						$out .= $this->fromname;
+						if ($this->frommail) {
+							$out .= ' &lt;'.$this->frommail.'&gt;';
 						} else {
-							$liste = array();
-
-							// Add user email
-							if (empty($user->email)) {
+							if ($this->fromtype) {
 								$langs->load('errors');
-								$s = $user->getFullName($langs) . ' &lt;' . $langs->trans('ErrorNoMailDefinedForThisUser') . '&gt;';
-							} else {
-								$s = $user->getFullName($langs) . ' &lt;' . $user->email . '&gt;';
+								$out .= '<span class="warning"> &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt; </span>';
 							}
-							$liste['user'] = array('label' => $s, 'data-html' => $s);
-
-							// Add also company main email
-							if (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {
-								$s = (!getDolGlobalString('MAIN_INFO_SOCIETE_NOM') ? $conf->global->MAIN_INFO_SOCIETE_EMAIL : $conf->global->MAIN_INFO_SOCIETE_NOM) . ' &lt;' . getDolGlobalString('MAIN_INFO_SOCIETE_MAIL') . '&gt;';
-								$liste['company'] = array('label' => $s, 'data-html' => $s);
-							}
-
-							// Add also email aliases if there is some
-							$listaliases = array(
-								'user_aliases' => (empty($user->email_aliases) ? '' : $user->email_aliases),
-								'global_aliases' => getDolGlobalString('MAIN_INFO_SOCIETE_MAIL_ALIASES'),
-							);
-
-							if (!empty($arraydefaultmessage->email_from)) {
-								$templatemailfrom = ' &lt;' . $arraydefaultmessage->email_from . '&gt;';
-								$liste['from_template_' . GETPOST('modelmailselected')] = array('label' => $templatemailfrom, 'data-html' => $templatemailfrom);
-							}
-
-							// Also add robot email
-							if (!empty($this->fromalsorobot)) {
-								if (getDolGlobalString('MAIN_MAIL_EMAIL_FROM') && getDolGlobalString('MAIN_MAIL_EMAIL_FROM') != getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {
-									$s = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
-									if ($this->frommail) {
-										$s .= ' &lt;' . getDolGlobalString('MAIN_MAIL_EMAIL_FROM') . '&gt;';
-									}
-									$liste['main_from'] = array('label' => $s, 'data-html' => $s);
-								}
-							}
-
-							// Add also email aliases from the c_email_senderprofile table
-							$sql = "SELECT rowid, label, email FROM " . $this->db->prefix() . "c_email_senderprofile";
-							$sql .= " WHERE active = 1 AND (private = 0 OR private = " . ((int)$user->id) . ")";
-							$sql .= " ORDER BY position";
-							$resql = $this->db->query($sql);
-							if ($resql) {
-								$num = $this->db->num_rows($resql);
-								$i = 0;
-								while ($i < $num) {
-									$obj = $this->db->fetch_object($resql);
-									if ($obj) {
-										$listaliases['senderprofile_' . $obj->rowid] = $obj->label . ' <' . $obj->email . '>';
-									}
-									$i++;
-								}
-							} else {
-								dol_print_error($this->db);
-							}
-
-							foreach ($listaliases as $typealias => $listalias) {
-								$posalias = 0;
-								$listaliasarray = explode(',', $listalias);
-								foreach ($listaliasarray as $listaliasval) {
-									$posalias++;
-									$listaliasval = trim($listaliasval);
-									if ($listaliasval) {
-										$listaliasval = preg_replace('/</', '&lt;', $listaliasval);
-										$listaliasval = preg_replace('/>/', '&gt;', $listaliasval);
-										if (!preg_match('/&lt;/', $listaliasval)) {
-											$listaliasval = '&lt;' . $listaliasval . '&gt;';
-										}
-										$liste[$typealias . '_' . $posalias] = array('label' => $listaliasval, 'data-html' => $listaliasval);
-									}
-								}
-							}
-
-							// Using ajaxcombo here make the '<email>' no more visible on list because <emailofuser> is not a valid html tag,
-							// so we transform before each record into $liste to be printable with ajaxcombo by replacing <> into ()
-							// $liste['senderprofile_0_0'] = array('label'=>'rrr', 'data-html'=>'rrr &lt;aaaa&gt;');
-							foreach ($liste as $key => $val) {
-								if (!empty($liste[$key]['data-html'])) {
-									$liste[$key]['data-html'] = str_replace(array('&lt;', '<', '&gt;', '>'), array('__LTCHAR__', '__LTCHAR__', '__GTCHAR__', '__GTCHAR__'), $liste[$key]['data-html']);
-									$liste[$key]['data-html'] = str_replace(array('__LTCHAR__', '__GTCHAR__'), array('<span class="opacitymedium">(', ')</span>'), $liste[$key]['data-html']);
-								}
-							}
-							$out .= ' ' . $form->selectarray('fromtype', $liste, empty($arraydefaultmessage->email_from) ? $this->fromtype : 'from_template_' . GETPOST('modelmailselected'), 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 1, '', $disablebademails);
 						}
-
-						$out .= "</td></tr>\n";
 					} else {
-						$out .= '<tr><td class="fieldrequired width200">' . $langs->trans("MailFrom") . "</td><td>";
-						$out .= $langs->trans("Name") . ':<input type="text" id="fromname" name="fromname" class="maxwidth200onsmartphone" value="' . $this->fromname . '" />';
-						$out .= '&nbsp; &nbsp; ';
-						$out .= $langs->trans("EMail") . ':&lt;<input type="text" id="frommail" name="frommail" class="maxwidth200onsmartphone" value="' . $this->frommail . '" />&gt;';
-						$out .= "</td></tr>\n";
-					}
-				}
+						$liste = array();
 
-				// To
-				if (!empty($this->withto) || is_array($this->withto)) {
-					$out .= $this->getHtmlForTo();
-				}
-
-				// To User
-				if (!empty($this->withtouser) && is_array($this->withtouser) && getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT')) {
-					$out .= '<tr><td>';
-					$out .= $langs->trans("MailToUsers");
-					$out .= '</td><td>';
-
-					// multiselect array convert html entities into options tags, even if we don't want this, so we encode them a second time
-					$tmparray = $this->withtouser;
-					foreach ($tmparray as $key => $val) {
-						$tmparray[$key] = dol_htmlentities($tmparray[$key], 0, 'UTF-8', true);
-					}
-					$withtoselected = GETPOST("receiveruser", 'array'); // Array of selected value
-					if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend') {
-						$withtoselected = array_keys($tmparray);
-					}
-					$out .= $form->multiselectarray("receiveruser", $tmparray, $withtoselected, 0, 0, 'inline-block minwidth500', 0, "");
-					$out .= "</td></tr>\n";
-				}
-
-				// With option for one email per recipient
-				if (!empty($this->withoptiononeemailperrecipient)) {
-					if (abs($this->withoptiononeemailperrecipient) == 1) {
-						$out .= '<tr><td class="minwidth200">';
-						$out .= $langs->trans("GroupEmails");
-						$out .= '</td><td>';
-						$out .= ' <input type="checkbox" id="oneemailperrecipient" value="1" name="oneemailperrecipient"' . ($this->withoptiononeemailperrecipient > 0 ? ' checked="checked"' : '') . '> ';
-						$out .= '<label for="oneemailperrecipient">';
-						$out .= $form->textwithpicto($langs->trans("OneEmailPerRecipient"), $langs->trans("WarningIfYouCheckOneRecipientPerEmail"), 1, 'help');
-						$out .= '</label>';
-						//$out .= '<span class="hideonsmartphone opacitymedium">';
-						//$out .= ' - ';
-						//$out .= $langs->trans("WarningIfYouCheckOneRecipientPerEmail");
-						//$out .= '</span>';
-						if (getDolGlobalString('MASS_ACTION_EMAIL_ON_DIFFERENT_THIRPARTIES_ADD_CUSTOM_EMAIL')) {
-							if (!empty($this->withto) && !is_array($this->withto)) {
-								$out .= ' ' . $langs->trans("or") . ' <input type="email" name="emailto" value="">';
-							}
-						}
-						$out .= '</td></tr>';
-					} else {
-						$out .= '<tr><td><input type="hidden" name="oneemailperrecipient" value="1"></td><td></td></tr>';
-					}
-				}
-
-				// CC
-				if (!empty($this->withtocc) || is_array($this->withtocc)) {
-					$out .= $this->getHtmlForCc();
-				}
-
-				// To User cc
-				if (!empty($this->withtoccuser) && is_array($this->withtoccuser) && getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT')) {
-					$out .= '<tr><td>';
-					$out .= $langs->trans("MailToCCUsers");
-					$out .= '</td><td>';
-
-					// multiselect array convert html entities into options tags, even if we don't want this, so we encode them a second time
-					$tmparray = $this->withtoccuser;
-					foreach ($tmparray as $key => $val) {
-						$tmparray[$key] = dol_htmlentities($tmparray[$key], 0, 'UTF-8', true);
-					}
-					$withtoselected = GETPOST("receiverccuser", 'array'); // Array of selected value
-					if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend') {
-						$withtoselected = array_keys($tmparray);
-					}
-					$out .= $form->multiselectarray("receiverccuser", $tmparray, $withtoselected, 0, 0, 'inline-block minwidth500', 0, "");
-					$out .= "</td></tr>\n";
-				}
-
-				// CCC
-				if (!empty($this->withtoccc) || is_array($this->withtoccc)) {
-					$out .= $this->getHtmlForWithCcc();
-				}
-
-				// Replyto
-				if (!empty($this->withreplyto)) {
-					if ($this->withreplytoreadonly) {
-						$out .= '<input type="hidden" id="replyname" name="replyname" value="' . $this->replytoname . '" />';
-						$out .= '<input type="hidden" id="replymail" name="replymail" value="' . $this->replytomail . '" />';
-						$out .= "<tr><td>" . $langs->trans("MailReply") . "</td><td>" . $this->replytoname . ($this->replytomail ? (" &lt;" . $this->replytomail . "&gt;") : "");
-						$out .= "</td></tr>\n";
-					}
-				}
-
-				// Errorsto
-				if (!empty($this->witherrorsto)) {
-					$out .= $this->getHtmlForWithErrorsTo();
-				}
-
-				// Ask delivery receipt
-				if (!empty($this->withdeliveryreceipt) && getDolGlobalInt('MAIN_EMAIL_SUPPORT_ACK')) {
-					$out .= $this->getHtmlForDeliveryreceipt();
-				}
-
-				// Topic
-				if (!empty($this->withtopic)) {
-					$out .= $this->getHtmlForTopic($arraydefaultmessage, $helpforsubstitution);
-				}
-
-				// Attached files
-				if (!empty($this->withfile)) {
-					$out .= '<tr>';
-					$out .= '<td class="tdtop">' . $langs->trans("MailFile") . '</td>';
-
-					$out .= '<td>';
-
-					if ($this->withmaindocfile) {
-						// withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked)
-						if (GETPOSTISSET('sendmail')) {
-							$this->withmaindocfile = (GETPOST('addmaindocfile', 'alpha') ? -1 : 1);
-						} elseif (is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-							// If a template was selected, we use setup of template to define if join file checkbox is selected or not.
-							$this->withmaindocfile = ($arraydefaultmessage->joinfiles ? -1 : 1);
-						}
-					}
-
-					if (!empty($this->withmaindocfile)) {
-						if ($this->withmaindocfile == 1) {
-							$out .= '<input type="checkbox" id="addmaindocfile" name="addmaindocfile" value="1" />';
-						} elseif ($this->withmaindocfile == -1) {
-							$out .= '<input type="checkbox" id="addmaindocfile" name="addmaindocfile" value="1" checked="checked" />';
-						}
-						if (getDolGlobalString('MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND')) {
-							$out .= ' <label for="addmaindocfile">' . $langs->trans("JoinMainDocOrLastGenerated") . '.</label><br>';
+						// Add user email
+						if (empty($user->email)) {
+							$langs->load('errors');
+							$s = $user->getFullName($langs).' &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt;';
 						} else {
-							$out .= ' <label for="addmaindocfile">' . $langs->trans("JoinMainDoc") . '.</label><br>';
+							$s = $user->getFullName($langs).' &lt;'.$user->email.'&gt;';
 						}
+						$liste['user'] = array('label' => $s, 'data-html' => $s);
+
+						// Add also company main email
+						if (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {
+							$s = (!getDolGlobalString('MAIN_INFO_SOCIETE_NOM') ? $conf->global->MAIN_INFO_SOCIETE_EMAIL : $conf->global->MAIN_INFO_SOCIETE_NOM).' &lt;' . getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'&gt;';
+							$liste['company'] = array('label' => $s, 'data-html' => $s);
+						}
+
+						// Add also email aliases if there is some
+						$listaliases = array(
+							'user_aliases' => (empty($user->email_aliases) ? '' : $user->email_aliases),
+							'global_aliases' => getDolGlobalString('MAIN_INFO_SOCIETE_MAIL_ALIASES'),
+						);
+
+						if (!empty($arraydefaultmessage->email_from)) {
+							$templatemailfrom = ' &lt;'.$arraydefaultmessage->email_from.'&gt;';
+							$liste['from_template_'.GETPOST('modelmailselected')] = array('label' => $templatemailfrom, 'data-html' => $templatemailfrom);
+						}
+
+						// Also add robot email
+						if (!empty($this->fromalsorobot)) {
+							if (getDolGlobalString('MAIN_MAIL_EMAIL_FROM') && getDolGlobalString('MAIN_MAIL_EMAIL_FROM') != getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {
+								$s = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
+								if ($this->frommail) {
+									$s .= ' &lt;' . getDolGlobalString('MAIN_MAIL_EMAIL_FROM').'&gt;';
+								}
+								$liste['main_from'] = array('label' => $s, 'data-html' => $s);
+							}
+						}
+
+						// Add also email aliases from the c_email_senderprofile table
+						$sql = "SELECT rowid, label, email FROM ".$this->db->prefix()."c_email_senderprofile";
+						$sql .= " WHERE active = 1 AND (private = 0 OR private = ".((int) $user->id).")";
+						$sql .= " ORDER BY position";
+						$resql = $this->db->query($sql);
+						if ($resql) {
+							$num = $this->db->num_rows($resql);
+							$i = 0;
+							while ($i < $num) {
+								$obj = $this->db->fetch_object($resql);
+								if ($obj) {
+									$listaliases['senderprofile_'.$obj->rowid] = $obj->label.' <'.$obj->email.'>';
+								}
+								$i++;
+							}
+						} else {
+							dol_print_error($this->db);
+						}
+
+						foreach ($listaliases as $typealias => $listalias) {
+							$posalias = 0;
+							$listaliasarray = explode(',', $listalias);
+							foreach ($listaliasarray as $listaliasval) {
+								$posalias++;
+								$listaliasval = trim($listaliasval);
+								if ($listaliasval) {
+									$listaliasval = preg_replace('/</', '&lt;', $listaliasval);
+									$listaliasval = preg_replace('/>/', '&gt;', $listaliasval);
+									if (!preg_match('/&lt;/', $listaliasval)) {
+										$listaliasval = '&lt;'.$listaliasval.'&gt;';
+									}
+									$liste[$typealias.'_'.$posalias] = array('label' => $listaliasval, 'data-html' => $listaliasval);
+								}
+							}
+						}
+
+						// Using ajaxcombo here make the '<email>' no more visible on list because <emailofuser> is not a valid html tag,
+						// so we transform before each record into $liste to be printable with ajaxcombo by replacing <> into ()
+						// $liste['senderprofile_0_0'] = array('label'=>'rrr', 'data-html'=>'rrr &lt;aaaa&gt;');
+						foreach ($liste as $key => $val) {
+							if (!empty($liste[$key]['data-html'])) {
+								$liste[$key]['data-html'] = str_replace(array('&lt;', '<', '&gt;', '>'), array('__LTCHAR__', '__LTCHAR__', '__GTCHAR__', '__GTCHAR__'), $liste[$key]['data-html']);
+								$liste[$key]['data-html'] = str_replace(array('__LTCHAR__', '__GTCHAR__'), array('<span class="opacitymedium">(', ')</span>'), $liste[$key]['data-html']);
+							}
+						}
+						$out .= ' '.$form->selectarray('fromtype', $liste, empty($arraydefaultmessage->email_from) ? $this->fromtype : 'from_template_'.GETPOST('modelmailselected'), 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 1, '', $disablebademails);
 					}
 
-					if (is_numeric($this->withfile)) {
-						// TODO Trick to have param removedfile containing nb of file to delete. But this does not works without javascript
-						$out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">' . "\n";
-						$out .= '<script nonce="' . getNonce() . '" type="text/javascript">';
-						$out .= 'jQuery(document).ready(function () {';
-						$out .= '    jQuery(".removedfile").click(function() {';
-						$out .= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
-						$out .= '    });';
-						$out .= '})';
-						$out .= '</script>' . "\n";
-						if (count($listofpaths)) {
-							foreach ($listofpaths as $key => $val) {
-								$relativepathtofile = substr($val, (strlen(DOL_DATA_ROOT) - strlen($val)));
+					$out .= "</td></tr>\n";
+				} else {
+					$out .= '<tr><td class="fieldrequired width200">'.$langs->trans("MailFrom")."</td><td>";
+					$out .= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" class="maxwidth200onsmartphone" value="'.$this->fromname.'" />';
+					$out .= '&nbsp; &nbsp; ';
+					$out .= $langs->trans("EMail").':&lt;<input type="text" id="frommail" name="frommail" class="maxwidth200onsmartphone" value="'.$this->frommail.'" />&gt;';
+					$out .= "</td></tr>\n";
+				}
+			}
 
-								$entity = (isset($this->param['object_entity']) ? $this->param['object_entity'] : $conf->entity);
-								if ($entity > 1) {
-									$relativepathtofile = str_replace('/' . $entity . '/', '/', $relativepathtofile);
-								}
-								// Try to extract data from full path
-								$formfile_params = array();
-								preg_match('#^(/)(\w+)(/)(.+)$#', $relativepathtofile, $formfile_params);
+			// To
+			if (!empty($this->withto) || is_array($this->withto)) {
+				$out .= $this->getHtmlForTo();
+			}
 
-								$out .= '<div id="attachfile_' . $key . '">';
-								// Preview of attachment
-								$out .= img_mime($listofnames[$key]) . $listofnames[$key];
+			// To User
+			if (!empty($this->withtouser) && is_array($this->withtouser) && getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT')) {
+				$out .= '<tr><td>';
+				$out .= $langs->trans("MailToUsers");
+				$out .= '</td><td>';
 
-								$out .= ' ' . $formfile->showPreview(array(), $formfile_params[2], $formfile_params[4], 0, ($entity == 1 ? '' : 'entity=' . ((int)$entity)));
+				// multiselect array convert html entities into options tags, even if we don't want this, so we encode them a second time
+				$tmparray = $this->withtouser;
+				foreach ($tmparray as $key => $val) {
+					$tmparray[$key] = dol_htmlentities($tmparray[$key], 0, 'UTF-8', true);
+				}
+				$withtoselected = GETPOST("receiveruser", 'array'); // Array of selected value
+				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend') {
+					$withtoselected = array_keys($tmparray);
+				}
+				$out .= $form->multiselectarray("receiveruser", $tmparray, $withtoselected, 0, 0, 'inline-block minwidth500', 0, "");
+				$out .= "</td></tr>\n";
+			}
 
-								if (!$this->withfilereadonly) {
-									$out .= ' <input type="image" style="border: 0px;" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/delete.png" value="' . ($key + 1) . '" class="removedfile input-nobottom" id="removedfile_' . $key . '" name="removedfile_' . $key . '" />';
-									//$out.= ' <a href="'.$_SERVER["PHP_SELF"].'?removedfile='.($key+1).'&id=removedfile_'.$key.'">'.img_delete($langs->trans("Remove"), 'id="removedfile_'.$key.'" name="removedfile_'.$key.'"', 'removedfile input-nobottom').'</a>';
-								}
-								$out .= '<br></div>';
+			// With option for one email per recipient
+			if (!empty($this->withoptiononeemailperrecipient)) {
+				if (abs($this->withoptiononeemailperrecipient) == 1) {
+					$out .= '<tr><td class="minwidth200">';
+					$out .= $langs->trans("GroupEmails");
+					$out .= '</td><td>';
+					$out .= ' <input type="checkbox" id="oneemailperrecipient" value="1" name="oneemailperrecipient"'.($this->withoptiononeemailperrecipient > 0 ? ' checked="checked"' : '').'> ';
+					$out .= '<label for="oneemailperrecipient">';
+					$out .= $form->textwithpicto($langs->trans("OneEmailPerRecipient"), $langs->trans("WarningIfYouCheckOneRecipientPerEmail"), 1, 'help');
+					$out .= '</label>';
+					//$out .= '<span class="hideonsmartphone opacitymedium">';
+					//$out .= ' - ';
+					//$out .= $langs->trans("WarningIfYouCheckOneRecipientPerEmail");
+					//$out .= '</span>';
+					if (getDolGlobalString('MASS_ACTION_EMAIL_ON_DIFFERENT_THIRPARTIES_ADD_CUSTOM_EMAIL')) {
+						if (!empty($this->withto) && !is_array($this->withto)) {
+							$out .= ' '.$langs->trans("or").' <input type="email" name="emailto" value="">';
+						}
+					}
+					$out .= '</td></tr>';
+				} else {
+					$out .= '<tr><td><input type="hidden" name="oneemailperrecipient" value="1"></td><td></td></tr>';
+				}
+			}
+
+			// CC
+			if (!empty($this->withtocc) || is_array($this->withtocc)) {
+				$out .= $this->getHtmlForCc();
+			}
+
+			// To User cc
+			if (!empty($this->withtoccuser) && is_array($this->withtoccuser) && getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT')) {
+				$out .= '<tr><td>';
+				$out .= $langs->trans("MailToCCUsers");
+				$out .= '</td><td>';
+
+				// multiselect array convert html entities into options tags, even if we don't want this, so we encode them a second time
+				$tmparray = $this->withtoccuser;
+				foreach ($tmparray as $key => $val) {
+					$tmparray[$key] = dol_htmlentities($tmparray[$key], 0, 'UTF-8', true);
+				}
+				$withtoselected = GETPOST("receiverccuser", 'array'); // Array of selected value
+				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend') {
+					$withtoselected = array_keys($tmparray);
+				}
+				$out .= $form->multiselectarray("receiverccuser", $tmparray, $withtoselected, 0, 0, 'inline-block minwidth500', 0, "");
+				$out .= "</td></tr>\n";
+			}
+
+			// CCC
+			if (!empty($this->withtoccc) || is_array($this->withtoccc)) {
+				$out .= $this->getHtmlForWithCcc();
+			}
+
+			// Replyto
+			if (!empty($this->withreplyto)) {
+				if ($this->withreplytoreadonly) {
+					$out .= '<input type="hidden" id="replyname" name="replyname" value="'.$this->replytoname.'" />';
+					$out .= '<input type="hidden" id="replymail" name="replymail" value="'.$this->replytomail.'" />';
+					$out .= "<tr><td>".$langs->trans("MailReply")."</td><td>".$this->replytoname.($this->replytomail ? (" &lt;".$this->replytomail."&gt;") : "");
+					$out .= "</td></tr>\n";
+				}
+			}
+
+			// Errorsto
+			if (!empty($this->witherrorsto)) {
+				$out .= $this->getHtmlForWithErrorsTo();
+			}
+
+			// Ask delivery receipt
+			if (!empty($this->withdeliveryreceipt) && getDolGlobalInt('MAIN_EMAIL_SUPPORT_ACK')) {
+				$out .= $this->getHtmlForDeliveryreceipt();
+			}
+
+			// Topic
+			if (!empty($this->withtopic)) {
+				$out .= $this->getHtmlForTopic($arraydefaultmessage, $helpforsubstitution);
+			}
+
+			// Attached files
+			if (!empty($this->withfile)) {
+				$out .= '<tr>';
+				$out .= '<td class="tdtop">'.$langs->trans("MailFile").'</td>';
+
+				$out .= '<td>';
+
+				if ($this->withmaindocfile) {
+					// withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked)
+					if (GETPOSTISSET('sendmail')) {
+						$this->withmaindocfile = (GETPOST('addmaindocfile', 'alpha') ? -1 : 1);
+					} elseif (is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+						// If a template was selected, we use setup of template to define if join file checkbox is selected or not.
+						$this->withmaindocfile = ($arraydefaultmessage->joinfiles ? -1 : 1);
+					}
+				}
+
+				if (!empty($this->withmaindocfile)) {
+					if ($this->withmaindocfile == 1) {
+						$out .= '<input type="checkbox" id="addmaindocfile" name="addmaindocfile" value="1" />';
+					} elseif ($this->withmaindocfile == -1) {
+						$out .= '<input type="checkbox" id="addmaindocfile" name="addmaindocfile" value="1" checked="checked" />';
+					}
+					if (getDolGlobalString('MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND')) {
+						$out .= ' <label for="addmaindocfile">'.$langs->trans("JoinMainDocOrLastGenerated").'.</label><br>';
+					} else {
+						$out .= ' <label for="addmaindocfile">'.$langs->trans("JoinMainDoc").'.</label><br>';
+					}
+				}
+
+				if (is_numeric($this->withfile)) {
+					// TODO Trick to have param removedfile containing nb of file to delete. But this does not works without javascript
+					$out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
+					$out .= '<script nonce="'.getNonce().'" type="text/javascript">';
+					$out .= 'jQuery(document).ready(function () {';
+					$out .= '    jQuery(".removedfile").click(function() {';
+					$out .= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
+					$out .= '    });';
+					$out .= '})';
+					$out .= '</script>'."\n";
+					if (count($listofpaths)) {
+						foreach ($listofpaths as $key => $val) {
+							$relativepathtofile = substr($val, (strlen(DOL_DATA_ROOT) - strlen($val)));
+
+							$entity = (isset($this->param['object_entity']) ? $this->param['object_entity'] : $conf->entity);
+							if ($entity > 1) {
+								$relativepathtofile = str_replace('/'.$entity.'/', '/', $relativepathtofile);
 							}
-						} /*elseif (empty($this->withmaindocfile)) {
+							// Try to extract data from full path
+							$formfile_params = array();
+							preg_match('#^(/)(\w+)(/)(.+)$#', $relativepathtofile, $formfile_params);
+
+							$out .= '<div id="attachfile_'.$key.'">';
+							// Preview of attachment
+							$out .= img_mime($listofnames[$key]).$listofnames[$key];
+
+							$out .= ' '.$formfile->showPreview(array(), $formfile_params[2], $formfile_params[4], 0, ($entity == 1 ? '' : 'entity='.((int) $entity)));
+
+							if (!$this->withfilereadonly) {
+								$out .= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key + 1).'" class="removedfile input-nobottom" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
+								//$out.= ' <a href="'.$_SERVER["PHP_SELF"].'?removedfile='.($key+1).'&id=removedfile_'.$key.'">'.img_delete($langs->trans("Remove"), 'id="removedfile_'.$key.'" name="removedfile_'.$key.'"', 'removedfile input-nobottom').'</a>';
+							}
+							$out .= '<br></div>';
+						}
+					} /*elseif (empty($this->withmaindocfile)) {
 						//$out .= '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';
 					}*/
-						if ($this->withfile == 2) {
-							$maxfilesizearray = getMaxFileSizeArray();
-							$maxmin = $maxfilesizearray['maxmin'];
-							if ($maxmin > 0) {
-								$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">';    // MAX_FILE_SIZE must precede the field type=file
-							}
-							// Can add other files
-							if (!getDolGlobalString('FROM_MAIL_DONT_USE_INPUT_FILE_MULTIPLE')) {
-								$out .= '<input type="file" class="flat" id="addedfile" name="addedfile[]" value="' . $langs->trans("Upload") . '" multiple />';
-							} else {
-								$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="' . $langs->trans("Upload") . '" />';
-							}
-							$out .= ' ';
-							$out .= '<input type="submit" class="button smallpaddingimp" id="' . $addfileaction . '" name="' . $addfileaction . '" value="' . $langs->trans("MailingAddFile") . '" />';
+					if ($this->withfile == 2) {
+						$maxfilesizearray = getMaxFileSizeArray();
+						$maxmin = $maxfilesizearray['maxmin'];
+						if ($maxmin > 0) {
+							$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
 						}
-					} else {
-						$out .= $this->withfile;
+						// Can add other files
+						if (!getDolGlobalString('FROM_MAIL_DONT_USE_INPUT_FILE_MULTIPLE')) {
+							$out .= '<input type="file" class="flat" id="addedfile" name="addedfile[]" value="'.$langs->trans("Upload").'" multiple />';
+						} else {
+							$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
+						}
+						$out .= ' ';
+						$out .= '<input type="submit" class="button smallpaddingimp" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
 					}
-
-					$out .= "</td></tr>\n";
+				} else {
+					$out .= $this->withfile;
 				}
 
-				// Message (+ Links to choose layout or ai prompt)
-				if (!empty($this->withbody)) {
-					$defaultmessage = GETPOST('message', 'restricthtml');
-					if (!GETPOST('modelselected', 'alpha') || GETPOST('modelmailselected') != '-1') {
-						if ($arraydefaultmessage && $arraydefaultmessage->content) {
-							$defaultmessage = $arraydefaultmessage->content;
-						} elseif (!is_numeric($this->withbody)) {
-							$defaultmessage = $this->withbody;
-						}
-					}
+				$out .= "</td></tr>\n";
+			}
 
-					// Complete substitution array with the url to make online payment
+			// Message (+ Links to choose layout or ai prompt)
+			if (!empty($this->withbody)) {
+				$defaultmessage = GETPOST('message', 'restricthtml');
+				if (!GETPOST('modelselected', 'alpha') || GETPOST('modelmailselected') != '-1') {
+					if ($arraydefaultmessage && $arraydefaultmessage->content) {
+						$defaultmessage = $arraydefaultmessage->content;
+					} elseif (!is_numeric($this->withbody)) {
+						$defaultmessage = $this->withbody;
+					}
+				}
+
+				// Complete substitution array with the url to make online payment
+				$paymenturl = '';
+				// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+				$validpaymentmethod = getValidOnlinePaymentMethods('');
+
+				if (empty($this->substit['__REF__'])) {  // @phan-suppress-current-line PhanTypeMismatchProperty
 					$paymenturl = '';
-					// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
-					require_once DOL_DOCUMENT_ROOT . '/core/lib/payments.lib.php';
-					$validpaymentmethod = getValidOnlinePaymentMethods('');
-
-					if (empty($this->substit['__REF__'])) {  // @phan-suppress-current-line PhanTypeMismatchProperty
-						$paymenturl = '';
-					} else {
-						$langs->loadLangs(array('paypal', 'other'));
-						$typeforonlinepayment = 'free';
-						if ($this->param["models"] == 'order' || $this->param["models"] == 'order_send') {
-							$typeforonlinepayment = 'order'; // TODO use detection on something else than template
-						}
-						if ($this->param["models"] == 'invoice' || $this->param["models"] == 'facture_send') {
-							$typeforonlinepayment = 'invoice'; // TODO use detection on something else than template
-						}
-						if ($this->param["models"] == 'member') {
-							$typeforonlinepayment = 'member'; // TODO use detection on something else than template
-						}
-						$url = getOnlinePaymentUrl(0, $typeforonlinepayment, $this->substit['__REF__']);
-						$paymenturl = $url;
+				} else {
+					$langs->loadLangs(array('paypal', 'other'));
+					$typeforonlinepayment = 'free';
+					if ($this->param["models"] == 'order' || $this->param["models"] == 'order_send') {
+						$typeforonlinepayment = 'order'; // TODO use detection on something else than template
 					}
-
-					if (count($validpaymentmethod) > 0 && $paymenturl) {
-						$langs->load('other');
-						$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = str_replace('\n', "\n", $langs->transnoentities("PredefinedMailContentLink", $paymenturl));
-						$this->substit['__ONLINE_PAYMENT_URL__'] = $paymenturl;
-					} elseif (count($validpaymentmethod) > 0) {
-						$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = '__ONLINE_PAYMENT_TEXT_AND_URL__';
-						$this->substit['__ONLINE_PAYMENT_URL__'] = '__ONLINE_PAYMENT_URL__';
-					} else {
-						$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = '';
-						$this->substit['__ONLINE_PAYMENT_URL__'] = '';
+					if ($this->param["models"] == 'invoice' || $this->param["models"] == 'facture_send') {
+						$typeforonlinepayment = 'invoice'; // TODO use detection on something else than template
 					}
-
-					$this->substit['__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__'] = '';
-
-					// Generate the string with the template for lines repeated and filled for each line
-					$lines = '';
-					$defaultlines = $arraydefaultmessage->content_lines;
-					if (isset($defaultlines)) {
-						foreach ($this->substit_lines as $lineid => $substit_line) {
-							$lines .= make_substitutions($defaultlines, $substit_line) . "\n";
-						}
+					if ($this->param["models"] == 'member') {
+						$typeforonlinepayment = 'member'; // TODO use detection on something else than template
 					}
-					$this->substit['__LINES__'] = $lines;
-
-					$defaultmessage = str_replace('\n', "\n", $defaultmessage);
-
-					// Deal with format differences between message and some substitution variables (text / HTML)
-					$atleastonecomponentishtml = 0;
-					if (strpos($defaultmessage, '__USER_SIGNATURE__') !== false && dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
-						$atleastonecomponentishtml++;
-					}
-					if (strpos($defaultmessage, '__SENDEREMAIL_SIGNATURE__') !== false && dol_textishtml($this->substit['__SENDEREMAIL_SIGNATURE__'])) {
-						$atleastonecomponentishtml++;
-					}
-					if (strpos($defaultmessage, '__ONLINE_PAYMENT_TEXT_AND_URL__') !== false && dol_textishtml($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'])) {
-						$atleastonecomponentishtml++;
-					}
-					if (strpos($defaultmessage, '__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__') !== false && dol_textishtml($this->substit['__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__'])) {
-						$atleastonecomponentishtml++;
-					}
-					if (dol_textishtml($defaultmessage)) {
-						$atleastonecomponentishtml++;
-					}
-					if ($atleastonecomponentishtml) {
-						if (!dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
-							$this->substit['__USER_SIGNATURE__'] = dol_nl2br($this->substit['__USER_SIGNATURE__']);
-						}
-						if (!dol_textishtml($this->substit['__SENDEREMAIL_SIGNATURE__'])) {
-							$this->substit['__SENDEREMAIL_SIGNATURE__'] = dol_nl2br($this->substit['__SENDEREMAIL_SIGNATURE__']);
-						}
-						if (!dol_textishtml($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'])) {
-							$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = dol_nl2br($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__']);
-						}
-						if (!dol_textishtml($defaultmessage)) {
-							$defaultmessage = dol_nl2br($defaultmessage);
-						}
-					}
-
-					if (GETPOSTISSET("message") && !GETPOST('modelselected')) {
-						$defaultmessage = GETPOST("message", "restricthtml");
-					} else {
-						$defaultmessage = make_substitutions($defaultmessage, $this->substit);
-						// Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty)
-						$defaultmessage = preg_replace("/^(<br>)+/", "", $defaultmessage);
-						$defaultmessage = preg_replace("/^\n+/", "", $defaultmessage);
-					}
-
-					$out .= '<tr>';
-					$out .= '<td class="tdtop">';
-					$out .= $form->textwithpicto($langs->trans('MailText'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody');
-					$out .= '</td>';
-					$out .= '<td class="tdtop">';
-
-					$formmail = $this;
-					$showlinktolayout = ($formmail->withfckeditor && getDolGlobalInt('MAIN_EMAIL_USE_LAYOUT')) ? $formmail->withlayout : '';
-					$showlinktolayoutlabel = $langs->trans("FillMessageWithALayout");
-					$showlinktoai = ($formmail->withaiprompt && isModEnabled('ai')) ? 'textgenerationemail' : '';
-					$showlinktoailabel = $langs->trans("FillMessageWithAIContent");
-					$formatforouput = '';
-					$htmlname = 'message';
-
-					// Fill $out
-					include DOL_DOCUMENT_ROOT . '/core/tpl/formlayoutai.tpl.php';
-
-					$out .= '</td>';
-					$out .= '</tr>';
-
-					$out .= '<tr>';
-					$out .= '<td colspan="2">';
-					if ($this->withbodyreadonly) {
-						$out .= nl2br($defaultmessage);
-						$out .= '<input type="hidden" id="message" name="message" disabled value="' . $defaultmessage . '" />';
-					} else {
-						if (!isset($this->ckeditortoolbar)) {
-							$this->ckeditortoolbar = 'dolibarr_mailings';
-						}
-
-						// Editor wysiwyg
-						require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-						if ($this->withfckeditor == -1) {
-							if (getDolGlobalString('FCKEDITOR_ENABLE_MAIL')) {
-								$this->withfckeditor = 1;
-							} else {
-								$this->withfckeditor = 0;
-							}
-						}
-
-						$doleditor = new DolEditor('message', $defaultmessage, '', 280, $this->ckeditortoolbar, 'In', true, true, $this->withfckeditor, 8, '95%');
-						$out .= $doleditor->Create(1);
-					}
-					$out .= "</td></tr>\n";
+					$url = getOnlinePaymentUrl(0, $typeforonlinepayment, $this->substit['__REF__']);
+					$paymenturl = $url;
 				}
 
-				$out .= '</table>' . "\n";
-
-				if ($this->withform == 1 || $this->withform == -1) {
-					$out .= '<div class="center">';
-					$out .= '<input type="submit" class="button button-add" id="sendmail" name="sendmail" value="' . $langs->trans("SendMail") . '"';
-					// Add a javascript test to avoid to forget to submit file before sending email
-					if ($this->withfile == 2 && $conf->use_javascript_ajax) {
-						$out .= ' onClick="if (document.mailform.addedfile.value != \'\') { alert(\'' . dol_escape_js($langs->trans("FileWasNotUploaded")) . '\'); return false; } else { return true; }"';
-					}
-					$out .= ' />';
-					if ($this->withcancel) {
-						$out .= '<input class="button button-cancel" type="submit" id="cancel" name="cancel" value="' . $langs->trans("Cancel") . '" />';
-					}
-					$out .= '</div>' . "\n";
+				if (count($validpaymentmethod) > 0 && $paymenturl) {
+					$langs->load('other');
+					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = str_replace('\n', "\n", $langs->transnoentities("PredefinedMailContentLink", $paymenturl));
+					$this->substit['__ONLINE_PAYMENT_URL__'] = $paymenturl;
+				} elseif (count($validpaymentmethod) > 0) {
+					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = '__ONLINE_PAYMENT_TEXT_AND_URL__';
+					$this->substit['__ONLINE_PAYMENT_URL__'] = '__ONLINE_PAYMENT_URL__';
+				} else {
+					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = '';
+					$this->substit['__ONLINE_PAYMENT_URL__'] = '';
 				}
 
-				if ($this->withform == 1) {
-					$out .= '</form>' . "\n";
+				$this->substit['__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__'] = '';
+
+				// Generate the string with the template for lines repeated and filled for each line
+				$lines = '';
+				$defaultlines = $arraydefaultmessage->content_lines;
+				if (isset($defaultlines)) {
+					foreach ($this->substit_lines as $lineid => $substit_line) {
+						$lines .= make_substitutions($defaultlines, $substit_line)."\n";
+					}
+				}
+				$this->substit['__LINES__'] = $lines;
+
+				$defaultmessage = str_replace('\n', "\n", $defaultmessage);
+
+				// Deal with format differences between message and some substitution variables (text / HTML)
+				$atleastonecomponentishtml = 0;
+				if (strpos($defaultmessage, '__USER_SIGNATURE__') !== false && dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
+					$atleastonecomponentishtml++;
+				}
+				if (strpos($defaultmessage, '__SENDEREMAIL_SIGNATURE__') !== false && dol_textishtml($this->substit['__SENDEREMAIL_SIGNATURE__'])) {
+					$atleastonecomponentishtml++;
+				}
+				if (strpos($defaultmessage, '__ONLINE_PAYMENT_TEXT_AND_URL__') !== false && dol_textishtml($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'])) {
+					$atleastonecomponentishtml++;
+				}
+				if (strpos($defaultmessage, '__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__') !== false && dol_textishtml($this->substit['__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__'])) {
+					$atleastonecomponentishtml++;
+				}
+				if (dol_textishtml($defaultmessage)) {
+					$atleastonecomponentishtml++;
+				}
+				if ($atleastonecomponentishtml) {
+					if (!dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
+						$this->substit['__USER_SIGNATURE__'] = dol_nl2br($this->substit['__USER_SIGNATURE__']);
+					}
+					if (!dol_textishtml($this->substit['__SENDEREMAIL_SIGNATURE__'])) {
+						$this->substit['__SENDEREMAIL_SIGNATURE__'] = dol_nl2br($this->substit['__SENDEREMAIL_SIGNATURE__']);
+					}
+					if (!dol_textishtml($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'])) {
+						$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = dol_nl2br($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__']);
+					}
+					if (!dol_textishtml($defaultmessage)) {
+						$defaultmessage = dol_nl2br($defaultmessage);
+					}
 				}
 
-				// Disable enter key if option MAIN_MAILFORM_DISABLE_ENTERKEY is set
-				if (getDolGlobalString('MAIN_MAILFORM_DISABLE_ENTERKEY')) {
-					$out .= '<script nonce="' . getNonce() . '" type="text/javascript">';
-					$out .= 'jQuery(document).ready(function () {';
-					$out .= '	$(document).on("keypress", \'#mailform\', function (e) {		/* Note this is called at every key pressed ! */
+				if (GETPOSTISSET("message") && !GETPOST('modelselected')) {
+					$defaultmessage = GETPOST("message", "restricthtml");
+				} else {
+					$defaultmessage = make_substitutions($defaultmessage, $this->substit);
+					// Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty)
+					$defaultmessage = preg_replace("/^(<br>)+/", "", $defaultmessage);
+					$defaultmessage = preg_replace("/^\n+/", "", $defaultmessage);
+				}
+
+				$out .= '<tr>';
+				$out .= '<td class="tdtop">';
+				$out .= $form->textwithpicto($langs->trans('MailText'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody');
+				$out .= '</td>';
+				$out .= '<td class="tdtop">';
+
+				$formmail = $this;
+				$showlinktolayout = ($formmail->withfckeditor && getDolGlobalInt('MAIN_EMAIL_USE_LAYOUT')) ? $formmail->withlayout : '';
+				$showlinktolayoutlabel = $langs->trans("FillMessageWithALayout");
+				$showlinktoai = ($formmail->withaiprompt && isModEnabled('ai')) ? 'textgenerationemail' : '';
+				$showlinktoailabel = $langs->trans("FillMessageWithAIContent");
+				$formatforouput = '';
+				$htmlname = 'message';
+
+				// Fill $out
+				include DOL_DOCUMENT_ROOT.'/core/tpl/formlayoutai.tpl.php';
+
+				$out .= '</td>';
+				$out .= '</tr>';
+
+				$out .= '<tr>';
+				$out .= '<td colspan="2">';
+				if ($this->withbodyreadonly) {
+					$out .= nl2br($defaultmessage);
+					$out .= '<input type="hidden" id="message" name="message" disabled value="'.$defaultmessage.'" />';
+				} else {
+					if (!isset($this->ckeditortoolbar)) {
+						$this->ckeditortoolbar = 'dolibarr_mailings';
+					}
+
+					// Editor wysiwyg
+					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+					if ($this->withfckeditor == -1) {
+						if (getDolGlobalString('FCKEDITOR_ENABLE_MAIL')) {
+							$this->withfckeditor = 1;
+						} else {
+							$this->withfckeditor = 0;
+						}
+					}
+
+					$doleditor = new DolEditor('message', $defaultmessage, '', 280, $this->ckeditortoolbar, 'In', true, true, $this->withfckeditor, 8, '95%');
+					$out .= $doleditor->Create(1);
+				}
+				$out .= "</td></tr>\n";
+			}
+
+			$out .= '</table>'."\n";
+
+			if ($this->withform == 1 || $this->withform == -1) {
+				$out .= '<div class="center">';
+				$out .= '<input type="submit" class="button button-add" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';
+				// Add a javascript test to avoid to forget to submit file before sending email
+				if ($this->withfile == 2 && $conf->use_javascript_ajax) {
+					$out .= ' onClick="if (document.mailform.addedfile.value != \'\') { alert(\''.dol_escape_js($langs->trans("FileWasNotUploaded")).'\'); return false; } else { return true; }"';
+				}
+				$out .= ' />';
+				if ($this->withcancel) {
+					$out .= '<input class="button button-cancel" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';
+				}
+				$out .= '</div>'."\n";
+			}
+
+			if ($this->withform == 1) {
+				$out .= '</form>'."\n";
+			}
+
+			// Disable enter key if option MAIN_MAILFORM_DISABLE_ENTERKEY is set
+			if (getDolGlobalString('MAIN_MAILFORM_DISABLE_ENTERKEY')) {
+				$out .= '<script nonce="'.getNonce().'" type="text/javascript">';
+				$out .= 'jQuery(document).ready(function () {';
+				$out .= '	$(document).on("keypress", \'#mailform\', function (e) {		/* Note this is called at every key pressed ! */
 	    						var code = e.keyCode || e.which;
 	    						if (code == 13) {
 									console.log("Enter was intercepted and blocked");
@@ -1165,16 +1164,16 @@ class FormMail extends Form
 	        						return false;
 	    						}
 							});';
-					$out .= '		})';
-					$out .= '</script>';
-				}
-
-				$out .= "<!-- End form mail -->\n";
-
-				return $out;
+				$out .= '		})';
+				$out .= '</script>';
 			}
+
+			$out .= "<!-- End form mail -->\n";
+
+			return $out;
 		}
 	}
+
 	/**
 	 * get html For To
 	 *
@@ -1694,7 +1693,7 @@ class FormMail extends Form
 		// Use the multiselect array function to create the dropdown
 		$out .= '<div id="post-dropdown-container" class="email-layout-container hidden" style="display:none;">';
 		$out .= '<label for="blogpost-select">Select Posts: </label>';
-		$out .= self::multiselectarray('blogpost-select', $blogArray);
+		$out .= self::multiselectarray('blogpost-select', $blogArray, array(), 0, 0, 'minwidth200');
 		$out .= '</div>';
 
 		$out .= '<script type="text/javascript">
@@ -1707,9 +1706,7 @@ class FormMail extends Form
           var sendtocc = jQuery("#sendtocc").val();
           var sendtoccc = jQuery("#sendtoccc").val();
 
-					console.log("We choose a layout for email template=" + template + ", subject="+subject);
-
-				console.log("We choose a layout for email template " + template);
+				console.log("We choose a layout for email template=" + template + ", subject="+subject);
 
 				$(".template-option").removeClass("selected");
 				$(this).addClass("selected");

From a99b132c346e91892973bcd95d389fe39210b05f Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 27 Jan 2025 10:16:28 +0100
Subject: [PATCH 215/602] Accept img src=data into dolPrintHTML

---
 htdocs/core/lib/functions.lib.php | 53 ++++++++++++-------------------
 test/phpunit/FunctionsLibTest.php | 12 +++++++
 2 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 281238f1bf6..865d3f438c9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1064,15 +1064,15 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 
 	// Check type of variable and make sanitization according to this
 	if (preg_match('/^array/', $check)) {	// If 'array' or 'array:restricthtml' or 'array:aZ09' or 'array:intcomma'
-		if (!is_array($out) || empty($out)) {
+		$tmpcheck = 'alphanohtml';
+		if (empty($out)) {
+			$out = array();
+		} elseif (!is_array($out)) {
 			$out = explode(',', $out);
-			$tmpcheck = 'alphanohtml';
 		} else {
 			$tmparray = explode(':', $check);
 			if (!empty($tmparray[1])) {
 				$tmpcheck = $tmparray[1];
-			} else {
-				$tmpcheck = 'alphanohtml';
 			}
 		}
 		foreach ($out as $outkey => $outval) {
@@ -2193,52 +2193,47 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 		}
 
 		if (count($tmparrayoftags)) {
+			// Now we will protect tags (defined into $tmparrayoftags) that we want to keep untouched
+
 			$reg = array();
-			$tmp = str_ireplace('__DOUBLEQUOTE', '', $tmp);	// The keyword DOUBLEQUOTE is forbidden. Reserved, so we removed it if we find it.
+			// Remove reserved keywords. They are forbidden in a source string
+			$tmp = str_ireplace(array('__DOUBLEQUOTE', '__BEGINTAGTOREPLACE', '__ENDTAGTOREPLACE', '__BEGINENDTAGTOREPLACE'), '', $tmp);
 
 			foreach ($tmparrayoftags as $tagtoreplace) {
+				// For case of tag without attributes '<abc>', '</abc>', '<abc />', we protect them to avoid transformation by htmlentities() later
 				$tmp = preg_replace('/<'.preg_quote($tagtoreplace, '/').'>/', '__BEGINTAGTOREPLACE'.$tagtoreplace.'__', $tmp);
 				$tmp = str_ireplace('</'.$tagtoreplace.'>', '__ENDTAGTOREPLACE'.$tagtoreplace.'__', $tmp);
 				$tmp = preg_replace('/<'.preg_quote($tagtoreplace, '/').' \/>/', '__BEGINENDTAGTOREPLACE'.$tagtoreplace.'__', $tmp);
 
-				// For case of tag with attribute
+				// For case of tag with attributes
 				do {
 					$tmpold = $tmp;
 
-					if (preg_match('/<'.preg_quote($tagtoreplace, '/').'\s+([^>]+)>/', $tmp, $reg)) {
-						$tmpattributes = str_ireplace(array('[', ']'), '_', $reg[1]);	// We must never have [ ] inside the attribute string
-						$tmpattributes = str_ireplace('href="http:', '__HREFHTTPA', $tmpattributes);
-						$tmpattributes = str_ireplace('href="https:', '__HREFHTTPSA', $tmpattributes);
-						$tmpattributes = str_ireplace('src="http:', '__SRCHTTPIMG', $tmpattributes);
-						$tmpattributes = str_ireplace('src="https:', '__SRCHTTPSIMG', $tmpattributes);
+					if (preg_match('/<'.preg_quote($tagtoreplace, '/').'(\s+)([^>]+)>/', $tmp, $reg)) {
+						// We want to protect the attribute part ... in '<xxx ...>' to avoid transformation by htmlentities() later
+						$tmpattributes = str_ireplace(array('[', ']'), '_', $reg[2]);	// We must never have [ ] inside the attribute string
 						$tmpattributes = str_ireplace('"', '__DOUBLEQUOTE', $tmpattributes);
-						$tmpattributes = preg_replace('/[^a-z0-9_\/\?\;\s=&\.\-@:\.#\+]/i', '', $tmpattributes);
+						$tmpattributes = preg_replace('/[^a-z0-9_%,\/\?\;\s=&\.\-@:\.#\+]/i', '', $tmpattributes);
 						//$tmpattributes = preg_replace("/float:\s*(left|right)/", "", $tmpattributes);	// Disabled: we must not remove content
-						$tmp = preg_replace('/<'.preg_quote($tagtoreplace, '/').'\s+'.preg_quote($reg[1], '/').'>/', '__BEGINTAGTOREPLACE'.$tagtoreplace.'['.$tmpattributes.']__', $tmp);
-					}
-					if (preg_match('/<'.preg_quote($tagtoreplace, '/').'\s+([^>]+)\s+\/>/', $tmp, $reg)) {
-						$tmpattributes = str_ireplace(array('[', ']'), '_', $reg[1]);	// We must not have [ ] inside the attribute string
-						$tmpattributes = str_ireplace('"', '__DOUBLEQUOTE', $tmpattributes);
-						$tmpattributes = preg_replace('/[^a-z0-9_\/\?\;\s=&\.\-@:\.#\+]/i', '', $tmpattributes);
-						//$tmpattributes = preg_replace("/float:\s*(left|right)/", "", $tmpattributes);	// Disabled: we must not remove content.
-						$tmp = preg_replace('/<'.preg_quote($tagtoreplace, '/').'\s+'.preg_quote($reg[1], '/').'\s+\/>/', '__BEGINENDTAGTOREPLACE'.$tagtoreplace.'['.$tmpattributes.']__', $tmp);
+						$tmp = str_replace('<'.$tagtoreplace.$reg[1].$reg[2].'>', '__BEGINTAGTOREPLACE'.$tagtoreplace.'['.$tmpattributes.']__', $tmp);
 					}
 
 					$diff = strcmp($tmpold, $tmp);
 				} while ($diff);
 			}
 
-			$tmp = str_ireplace('&quot', '__DOUBLEQUOT', $tmp);
+			$tmp = str_ireplace('&quot', '__DOUBLEQUOTE', $tmp);
 			$tmp = str_ireplace('&lt', '__LESSTAN', $tmp);
 			$tmp = str_ireplace('&gt', '__GREATERTHAN', $tmp);
 		}
 
-		// Warning: htmlentities encode HTML tags like <abc>, but not &lt; &gt; &quotes; &apos; &#39; &amp; that remains untouched.
-		$result = htmlentities($tmp, ENT_COMPAT, 'UTF-8');	// Convert & into &amp; and more...
+		// Warning: htmlentities encode HTML tags like <abc> & into &amp; and more (but not &lt; &gt; &quotes; &apos; &#39; &amp; that remains untouched).
+		$result = htmlentities($tmp, ENT_COMPAT, 'UTF-8');
 
 		//print $result;
 
 		if (count($tmparrayoftags)) {
+			// Restore protected tags
 			foreach ($tmparrayoftags as $tagtoreplace) {
 				$result = str_ireplace('__BEGINTAGTOREPLACE'.$tagtoreplace.'__', '<'.$tagtoreplace.'>', $result);
 				$result = preg_replace('/__BEGINTAGTOREPLACE'.$tagtoreplace.'\[([^\]]*)\]__/', '<'.$tagtoreplace.' \1>', $result);
@@ -2247,19 +2242,13 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 				$result = preg_replace('/__BEGINENDTAGTOREPLACE'.$tagtoreplace.'\[([^\]]*)\]__/', '<'.$tagtoreplace.' \1 />', $result);
 			}
 
-			$result = str_ireplace('__HREFHTTPA', 'href="http:', $result);
-			$result = str_ireplace('__HREFHTTPSA', 'href="https:', $result);
-			$result = str_ireplace('__SRCHTTPIMG', 'src="http:', $result);
-			$result = str_ireplace('__SRCHTTPSIMG', 'src="https:', $result);
 			$result = str_ireplace('__DOUBLEQUOTE', '"', $result);
+			$result = str_ireplace('__LESSTAN', '&lt', $result);
+			$result = str_ireplace('__GREATERTHAN', '&gt', $result);
 		}
 
 		$result = str_ireplace('__SIMPLEQUOTE', '&#39;', $result);
 
-		$result = str_ireplace('__DOUBLEQUOT', '&quot', $result);
-		$result = str_ireplace('__LESSTAN', '&lt', $result);
-		$result = str_ireplace('__GREATERTHAN', '&gt', $result);
-
 		//$result="\n\n\n".var_export($tmp, true)."\n\n\n".var_export($result, true);
 
 		return $result;
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 9770cb09c46..bf5b02a69ee 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -1133,6 +1133,18 @@ class FunctionsLibTest extends CommonClassTest
 		$result = dol_escape_htmltag($input, 1);
 		$this->assertEquals('x&amp;&lt;b&gt;#&lt;/b&gt;,&quot;', $result);
 
+		$input = '<img alt="" src="https://github.githubassets.com/assets/GitHub%20Mark-ea2971cee799.png">';    // & and " are converted into html entities, <b> are not removed
+		$result = dol_escape_htmltag($input, 1, 1, 'common', 0, 1);
+		$this->assertEquals('<img alt="" src="https://github.githubassets.com/assets/GitHub%20Mark-ea2971cee799.png">', $result);
+
+		$input = '<img src="data:image/png;base64, 123/456+789==" style="height: 123px; width:456px">';    // & and " are converted into html entities, <b> are not removed
+		$result = dol_escape_htmltag($input, 1, 1, 'common');
+		$this->assertEquals('<img src="data:image/png;base64, 123/456+789==" style="height: 123px; width:456px">', $result);
+
+		$input = '<img src="data:image/png;base64, 123/456+789==" style="height: 123px; width:456px">';    // & and " are converted into html entities, <b> are not removed
+		$result = dol_escape_htmltag($input, 1);
+		$this->assertEquals('&lt;img src=&quot;data:image/png;base64, 123/456+789==&quot; style=&quot;height: 123px; width:456px&quot;&gt;', $result);
+
 		$input = '<img alt="" src="https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png">';    // & and " are converted into html entities, <b> are not removed
 		$result = dol_escape_htmltag($input, 1, 1, 'common', 0, 1);
 		$this->assertEquals('<img alt="" src="https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png">', $result);

From 87e46db2568b252c8525ddd9084d0da3f7a5e12f Mon Sep 17 00:00:00 2001
From: ATM-Lucas <lucas.mantegari@atm-consulting.fr>
Date: Mon, 27 Jan 2025 10:19:22 +0100
Subject: [PATCH 216/602] error

---
 htdocs/core/class/html.formmail.class.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 21f064ba8ca..e2c00213c66 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -624,7 +624,7 @@ class FormMail extends Form
 			} elseif (!empty($this->param['models']) && in_array($this->param['models'], array(
 					'propal_send', 'order_send', 'facture_send',
 					'shipping_send', 'fichinter_send', 'supplier_proposal_send', 'order_supplier_send',
-					'invoice_supplier_send', 'thirdparty', 'contract', 'user', 'recruitmentcandidature_send', 'all'
+					'invoice_supplier_send', 'thirdparty', 'contract', 'user', 'recruitmentcandidature_send', 'product_send', 'all'
 				))) {
 				// If list of template is empty
 				$out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
@@ -1693,7 +1693,7 @@ class FormMail extends Form
 		// Use the multiselect array function to create the dropdown
 		$out .= '<div id="post-dropdown-container" class="email-layout-container hidden" style="display:none;">';
 		$out .= '<label for="blogpost-select">Select Posts: </label>';
-		$out .= self::multiselectarray('blogpost-select', $blogArray, array(), 0, 0, 'minwidth200');
+		$out .= self::multiselectarray('blogpost-select', $blogArray);
 		$out .= '</div>';
 
 		$out .= '<script type="text/javascript">
@@ -1706,7 +1706,10 @@ class FormMail extends Form
           var sendtocc = jQuery("#sendtocc").val();
           var sendtoccc = jQuery("#sendtoccc").val();
 
-				console.log("We choose a layout for email template=" + template + ", subject="+subject);
+		  		console.log("We choose a layout for email template=" + template + ", subject="+subject);
+
+
+				console.log("We choose a layout for email template " + template);
 
 				$(".template-option").removeClass("selected");
 				$(this).addClass("selected");

From 553d7c70a5019130c06a2f2dd48180f1f62abbc6 Mon Sep 17 00:00:00 2001
From: ATM-Lucas <lucas.mantegari@atm-consulting.fr>
Date: Mon, 27 Jan 2025 10:19:54 +0100
Subject: [PATCH 217/602] space

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

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index e2c00213c66..ab21c24112d 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1708,7 +1708,6 @@ class FormMail extends Form
 
 		  		console.log("We choose a layout for email template=" + template + ", subject="+subject);
 
-
 				console.log("We choose a layout for email template " + template);
 
 				$(".template-option").removeClass("selected");

From 16e5b048035e43b0fa0e60331431f4ff2588465a Mon Sep 17 00:00:00 2001
From: ATM-Lucas <lucas.mantegari@atm-consulting.fr>
Date: Mon, 27 Jan 2025 10:22:08 +0100
Subject: [PATCH 218/602] conflict

---
 htdocs/core/class/html.formmail.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index ab21c24112d..c599dd7ec84 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1708,8 +1708,6 @@ class FormMail extends Form
 
 		  		console.log("We choose a layout for email template=" + template + ", subject="+subject);
 
-				console.log("We choose a layout for email template " + template);
-
 				$(".template-option").removeClass("selected");
 				$(this).addClass("selected");
 

From b61d286e7d8dfff1b578b2dec37e81024b9a9204 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 5 Jan 2025 19:55:12 +0100
Subject: [PATCH 219/602] Update baseline

---
 dev/tools/phan/baseline.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 5da7be21753..11f170da225 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,7 +9,7 @@
  */
 return [
     // # Issue statistics:
-    // PhanUndeclaredProperty : 560+ occurrences
+    // PhanUndeclaredProperty : 570+ occurrences
     // PhanPossiblyUndeclaredGlobalVariable : 310+ occurrences
     // PhanUndeclaredGlobalVariable : 280+ occurrences
     // PhanTypeMismatchArgumentProbablyReal : 200+ occurrences

From a42bc6755c7012657bfc597039da011fbb77d7ab Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 7 Jan 2025 15:31:41 +0100
Subject: [PATCH 220/602] Qual: Fix PhanPluginUnknownPropertyType,
 PhanPossiblyUndeclaredVariable

---
 htdocs/api/class/api_documents.class.php      |  7 ++-
 htdocs/core/class/conf.class.php              | 49 +++++++++++++++++--
 ...e_20_modWorkflow_WorkflowManager.class.php |  4 +-
 ...terface_50_modTicket_TicketEmail.class.php |  2 +
 htdocs/holiday/card_group.php                 |  6 ++-
 .../stock/class/mouvementstock.class.php      |  3 +-
 htdocs/stripe/class/stripe.class.php          |  3 +-
 htdocs/ticket/class/api_tickets.class.php     | 18 ++++---
 htdocs/user/bank.php                          | 10 ++++
 htdocs/website/class/website.class.php        | 15 ++++--
 10 files changed, 96 insertions(+), 21 deletions(-)

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 9cc2258a4df..71b42aea8a8 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -1,9 +1,11 @@
 <?php
+
 /* Copyright (C) 2016   Xebax Christy           <xebax@wanadoo.fr>
  * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2016   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2023   Romain Neil             <contact@romain-neil.fr>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -105,7 +107,7 @@ class Documents extends DolibarrApi
 		}
 
 		$file_content = file_get_contents($original_file_osencoded);
-		return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'encoding'=>'base64');
+		return array('filename' => $filename, 'content-type' => dol_mimetype($filename), 'filesize' => filesize($original_file), 'content' => base64_encode($file_content), 'encoding' => 'base64');
 	}
 
 
@@ -290,7 +292,7 @@ class Documents extends DolibarrApi
 		}
 
 		$file_content = file_get_contents($original_file_osencoded);
-		return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'langcode'=>$outputlangs->defaultlang, 'template'=>$templateused, 'encoding'=>'base64');
+		return array('filename' => $filename, 'content-type' => dol_mimetype($filename), 'filesize' => filesize($original_file), 'content' => base64_encode($file_content), 'langcode' => $outputlangs->defaultlang, 'template' => $templateused, 'encoding' => 'base64');
 	}
 
 	/**
@@ -693,6 +695,7 @@ class Documents extends DolibarrApi
 		}
 
 		$original_file = dol_sanitizeFileName($filename);
+		$relativefile = 'UNSET';
 
 		// Define $uploadir
 		$object = null;
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index e5dde138be6..63e782d3366 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -1,10 +1,12 @@
 <?php
+
 /* Copyright (C) 2003-2007  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2003       Xavier Dutoit           <doli@sydesy.com>
  * Copyright (C) 2004-2020  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2017  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2006 	    Jean Heimburger         <jean@tiaris.info>
  * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -53,6 +55,9 @@ class Conf extends stdClass
 	public $browser;
 
 	//! To store some setup of generic modules
+	/**
+	 * @var stdClass
+	 */
 	public $mycompany;
 
 	/**
@@ -71,7 +76,13 @@ class Conf extends stdClass
 	public $multicompany;
 
 	//! To store module status of special module names
+	/**
+	 * @var ?mixed
+	 */
 	public $expedition_bon;
+	/**
+	 * @var ?mixed
+	 */
 	public $delivery_note;
 
 	/**
@@ -85,7 +96,7 @@ class Conf extends stdClass
 	public $disable_compute;
 
 	/**
-	 * @var string Used to store current currency (ISO code like 'USD', 'EUR', ...). To get the currency symbol: $langs->getCurrencySymbol($this->currency)
+	 * @var string Used to store current currency (ISO code like 'USD', 'EUR', ...). To get the currency symbol:->getCurrencySymbol($this->currency)
 	 */
 	public $currency;
 
@@ -172,15 +183,45 @@ class Conf extends stdClass
 	 */
 	public $dol_use_jmobile; // Set if we force param dol_use_jmobile into login url. 0=default, 1=to say we use app from a webview app, 2=to say we use app from a webview app and keep ajax
 
+	/**
+	 * @var string
+	 */
 	public $format_date_short; // Format of day with PHP/C tags (strftime functions)
+	/**
+	 * @var string
+	 */
 	public $format_date_short_java; // Format of day with Java tags
+	/**
+	 * @var string
+	 */
 	public $format_hour_short;
+	/**
+	 * @var string
+	 */
 	public $format_hour_short_duration;
+	/**
+	 * @var string
+	 */
 	public $format_date_text_short;
+	/**
+	 * @var string
+	 */
 	public $format_date_text;
+	/**
+	 * @var string
+	 */
 	public $format_date_hour_short;
+	/**
+	 * @var string
+	 */
 	public $format_date_hour_sec_short;
+	/**
+	 * @var string
+	 */
 	public $format_date_hour_text_short;
+	/**
+	 * @var string
+	 */
 	public $format_date_hour_text;
 
 	/**
@@ -306,12 +347,13 @@ class Conf extends stdClass
 	 */
 	public $productbatch;
 	/**
+	 * @var ?stdClass
 	 * @deprecated Use project
 	 */
 	public $projet;
 
 	/**
-	 * @var stdClass
+	 * @var ?stdClass
 	 */
 	public $project;
 
@@ -631,8 +673,9 @@ class Conf extends stdClass
 			}
 
 			// Object $mc
+			global $mc;
+			$mc = null;
 			if (!defined('NOREQUIREMC') && isModEnabled('multicompany')) {
-				global $mc;
 				$ret = @dol_include_once('/multicompany/class/actions_multicompany.class.php');
 				if ($ret && class_exists('ActionsMulticompany')) {
 					$mc = new ActionsMulticompany($db);
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 28204bfb5ad..d581510dd99 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2014      Marcos García       <marcosgdf@gmail.com>
  * Copyright (C) 2022-2024 Ferran Marcet       <fmarcet@2byte.es>
  * Copyright (C) 2023      Alexandre Janniaux  <alexandre.janniaux@gmail.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -453,7 +453,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 							if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES') && $orderline->product_type > 0) {
 								continue;
 							}
-							if (isset($qtyordred[$shippingline->fk_product])) {
+							if (isset($qtyordred[$orderline->fk_product])) {
 								$qtyordred[$orderline->fk_product] += $orderline->qty;
 							} else {
 								$qtyordred[$orderline->fk_product] = $orderline->qty;
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 0d4734de318..1cd6aebb3c8 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright (C) 2014-2016  Jean-François Ferry	<hello@librethic.io>
  * Copyright (C) 2016       Christophe Battarel <christophe@altairis.fr>
@@ -87,6 +88,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 								$body_assignee = 'TicketAssignedEmailBody';
 								$see_ticket_assignee = 'SeeThisTicketIntomanagementInterface';
 
+								$old_MAIN_MAIL_AUTO_COPY_TO = null;  // For static analysis
 								if (getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO')) {
 									$old_MAIN_MAIL_AUTOCOPY_TO = getDolGlobalString('MAIN_MAIL_AUTOCOPY_TO');
 									$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
diff --git a/htdocs/holiday/card_group.php b/htdocs/holiday/card_group.php
index 34b5f24109e..9eb3f2ab5d0 100644
--- a/htdocs/holiday/card_group.php
+++ b/htdocs/holiday/card_group.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2018-2024  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2020-2021  Udo Tamm					<dev@dolibit.de>
  * Copyright (C) 2022		Anthony Berton				<anthony.berton@bb2a.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -780,6 +780,10 @@ function sendMail($id, $cancreate, $now, $autoValidation)
 				} elseif ($object->halfday == 0 || $object->halfday == 2) {
 					$starthalfdaykey = "Morning";
 					$endhalfdaykey = "Afternoon";
+				} else {
+					// For static analysis, ensure variables are defined
+					$starthalfdaykey = "InvalidHalfday";
+					$endhalfdaykey = "InvalidHalfday";
 				}
 
 				$link = dol_buildpath("/holiday/card.php", 3) . '?id='.$object->id;
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 45668188f93..5794ace75d3 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2011      Jean Heimburger      <jean@tiaris.info>
  * Copyright (C) 2014	   Cedric GROSS	        <c.gross@kreiz-it.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -542,6 +542,7 @@ class MouvementStock extends CommonObject
 
 			// Test if there is already a record for couple (warehouse / product), so later we will make an update or create.
 			$alreadyarecord = 0;
+			$fk_product_stock = 0;
 			if (!$error) {
 				$sql = "SELECT rowid, reel FROM ".$this->db->prefix()."product_stock";
 				$sql .= " WHERE fk_entrepot = ".((int) $entrepot_id)." AND fk_product = ".((int) $fk_product); // This is a unique key
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index b63e8a10e9d..d9df53069b4 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2018-2021 	Thibault FOUCART       <support@ptibogxiv.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -1220,6 +1220,7 @@ class Stripe extends CommonObject
 
 		$description = "";
 		$ref = "";
+		$invoice = null;
 		if ($origin == 'order') {
 			$order = new Commande($this->db);
 			$order->fetch($item);
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index c3206e04120..2d0fca7f77a 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2016   Jean-François Ferry     <hello@librethic.io>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -162,17 +162,19 @@ class Tickets extends DolibarrApi
 				if ($this->ticket->cache_msgs_ticket[$i]['fk_user_author'] > 0) {
 					$user_action = new User($this->db);
 					$user_action->fetch($this->ticket->cache_msgs_ticket[$i]['fk_user_author']);
+				} else {
+					$user_action = null;
 				}
 
 				// Now define messages
 				$messages[] = array(
-				'id' => $this->ticket->cache_msgs_ticket[$i]['id'],
-				'fk_user_action' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
-				'fk_user_action_socid' =>  $user_action->socid,
-				'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname),
-				'message' => $this->ticket->cache_msgs_ticket[$i]['message'],
-				'datec' => $this->ticket->cache_msgs_ticket[$i]['datec'],
-				'private' => $this->ticket->cache_msgs_ticket[$i]['private']
+					'id' => $this->ticket->cache_msgs_ticket[$i]['id'],
+					'fk_user_action' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
+					'fk_user_action_socid' =>  $user_action === null ? '' : $user_action->socid,
+					'fk_user_action_string' => $user_action === null ? '' : dolGetFirstLastname($user_action->firstname, $user_action->lastname),
+					'message' => $this->ticket->cache_msgs_ticket[$i]['message'],
+					'datec' => $this->ticket->cache_msgs_ticket[$i]['datec'],
+					'private' => $this->ticket->cache_msgs_ticket[$i]['private']
 				);
 				$i++;
 			}
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 61fadf541b6..026e4723736 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -62,6 +62,16 @@ if (isModEnabled('accounting')) {
  * @var User $user
  */
 
+// $moreparam is used, but it is unclear how it is set, keeping the variable and ensuring it exists.
+// $countrynotdefined is used, but it is unclear how it is set.
+'
+@phan-var-force ?string $moreparam
+@phan-var-force ?string $countrynotdefined
+';
+if (!isset($moreparam)) {
+	$moreparam = null;
+}
+
 // Load translation files required by page
 $langs->loadLangs(array('companies', 'commercial', 'banks', 'bills', 'trips', 'holiday', 'salaries'));
 
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 65ef58f22dd..d1efc20b1ea 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -790,6 +790,8 @@ class Website extends CommonObject
 			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
+		$newidforhome = 0;
+
 		if (!$error) {
 			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 			dolCopyDir($pathofwebsiteold, $pathofwebsitenew, getDolGlobalString('MAIN_UMASK'), 0, [], 2);
@@ -812,8 +814,6 @@ class Website extends CommonObject
 			$pathofmediasimagenew = DOL_DATA_ROOT.'/medias/image/'.$newref;
 			dolCopyDir($pathofmediasimageold, $pathofmediasimagenew, getDolGlobalString('MAIN_UMASK'), 0);
 
-			$newidforhome = 0;
-
 			// Duplicate pages
 			$objectpages = new WebsitePage($this->db);
 			$listofpages = $objectpages->fetchAll($fromid);
@@ -1350,6 +1350,7 @@ class Website extends CommonObject
 
 		// Search the $maxrowid because we need it later
 		$sqlgetrowid = 'SELECT MAX(rowid) as max from '.MAIN_DB_PREFIX.'website_page';
+		$maxrowid = 0;
 		$resql = $this->db->query($sqlgetrowid);
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
@@ -1364,6 +1365,7 @@ class Website extends CommonObject
 		}
 
 		$objectpagestatic = new WebsitePage($this->db);
+		$aliasesarray = null;
 
 		// Regenerate the php files for pages
 		$fp = fopen($sqlfile, "r");
@@ -1765,6 +1767,8 @@ class Website extends CommonObject
 			return -1;
 		}
 
+		$destdir = null;  // Otherwise only set when 'WEBSITE_ALLOW_OVERWRITE_GIT_SOURCE' is not falsy.
+		$destdirrel = '';  // Otherwise only set when 'WEBSITE_ALLOW_OVERWRITE_GIT_SOURCE' is not falsy.
 		// Replace modified files into the doctemplates directory.
 		if (getDolGlobalString('WEBSITE_ALLOW_OVERWRITE_GIT_SOURCE')) {
 			// If the user has not specified a path
@@ -1798,6 +1802,11 @@ class Website extends CommonObject
 			}
 		}
 
+		if ($destdir === null) {
+			setEventMessages("The destination path is not determined.", null, 'errors');
+			return -1;
+		}
+
 		dol_mkdir($destdir);
 
 		if (!is_writable($destdir)) {

From 881e6712cf1f4720d2d75d898dd7eeadcfe9fb19 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 7 Jan 2025 23:31:34 +0100
Subject: [PATCH 221/602] Qual: Fix last PhanPossiblyNullTypeMismatchProperty

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

diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index d1ee197aaab..35e3ab0610d 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
@@ -8,6 +9,7 @@
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
  * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -128,7 +130,7 @@ $permissiontoadd = (($object->type == Product::TYPE_PRODUCT && $user->hasRight('
  * Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -162,6 +164,7 @@ if ($action == 'filemerge' && $permissiontoadd) {
 
 		$filetomerge_file_array = GETPOST('filetoadd');
 
+		$lang_id = null;
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
 			$lang_id = GETPOST('lang_id', 'aZ09');
 		}
@@ -184,7 +187,7 @@ if ($action == 'filemerge' && $permissiontoadd) {
 				$filetomerge->fk_product = $object->id;
 				$filetomerge->file_name = $filetomerge_file;
 
-				if (getDolGlobalInt('MAIN_MULTILANGS')) {
+				if (getDolGlobalInt('MAIN_MULTILANGS') && $lang_id !== null) {
 					$filetomerge->lang = $lang_id;
 				}
 

From f959aab7e21a0e86ca40295c60d2ecca3b98cbb5 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 8 Jan 2025 00:13:20 +0100
Subject: [PATCH 222/602] Update baseline

---
 dev/tools/phan/baseline.txt | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 11f170da225..45b35ff7fec 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,19 +9,19 @@
  */
 return [
     // # Issue statistics:
-    // PhanUndeclaredProperty : 570+ occurrences
-    // PhanPossiblyUndeclaredGlobalVariable : 310+ occurrences
+    // PhanUndeclaredProperty : 560+ occurrences
+    // PhanPossiblyUndeclaredGlobalVariable : 300+ occurrences
     // PhanUndeclaredGlobalVariable : 280+ occurrences
     // PhanTypeMismatchArgumentProbablyReal : 200+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 180+ occurrences
     // PhanTypeMismatchProperty : 130+ occurrences
     // PhanPluginUnknownArrayMethodParamType : 120+ occurrences
-    // PhanPluginUnknownPropertyType : 45+ occurrences
-    // PhanPossiblyUndeclaredVariable : 45+ occurrences
     // PhanRedefineFunction : 45+ occurrences
     // PhanTypeExpectedObjectPropAccess : 45+ occurrences
+    // PhanPluginUnknownPropertyType : 30+ occurrences
     // PhanTypeMismatchArgumentNullableInternal : 30+ occurrences
     // PhanTypeInvalidDimOffset : 25+ occurrences
+    // PhanPossiblyUndeclaredVariable : 20+ occurrences
     // PhanTypeMismatchDimFetch : 20+ occurrences
     // PhanUndeclaredConstant : 15+ occurrences
     // PhanPluginEmptyStatementIf : 10+ occurrences
@@ -37,7 +37,6 @@ return [
     // PhanPluginDuplicateArrayKey : 4 occurrences
     // PhanEmptyFQSENInClasslike : 3 occurrences
     // PhanInvalidFQSENInClasslike : 3 occurrences
-    // PhanPossiblyNullTypeMismatchProperty : 3 occurrences
     // PhanTypeMismatchDimAssignment : 2 occurrences
     // PhanTypeMismatchDimFetchNullable : 2 occurrences
     // PhanTypeMismatchReturn : 2 occurrences
@@ -55,7 +54,7 @@ return [
         'htdocs/admin/agenda_other.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/admin/defaultvalues.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/api/class/api_access.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanUndeclaredProperty'],
-        'htdocs/api/class/api_documents.class.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanPossiblyUndeclaredVariable'],
+        'htdocs/api/class/api_documents.class.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/api/class/api_login.class.php' => ['PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/api/class/api_setup.class.php' => ['PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/api/class/api_status.class.php' => ['PhanPluginUnknownArrayMethodReturnType'],
@@ -140,7 +139,7 @@ return [
         'htdocs/core/class/commonobject.class.php' => ['PhanParamTooMany', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
         'htdocs/core/class/commonpeople.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/class/commonsocialnetworks.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/class/conf.class.php' => ['PhanPluginUnknownPropertyType', 'PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentNullableInternal', 'PhanTypeMismatchProperty'],
+        'htdocs/core/class/conf.class.php' => ['PhanTypeMismatchArgumentNullableInternal', 'PhanTypeMismatchProperty'],
         'htdocs/core/class/ctyperesource.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/class/doleditor.class.php' => ['PhanPluginDuplicateExpressionAssignmentOperation'],
         'htdocs/core/class/dolgraph.class.php' => ['PhanUndeclaredProperty'],
@@ -186,7 +185,6 @@ return [
         'htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanPluginDuplicateArrayKey'],
         'htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php' => ['PhanPossiblyUndeclaredVariable'],
         'htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
         'htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php' => ['PhanPossiblyUndeclaredVariable'],
@@ -197,6 +195,7 @@ return [
         'htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php' => ['PhanPluginUnknownPropertyType'],
         'htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php' => ['PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php' => ['PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanPluginDuplicateArrayKey'],
         'htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php' => ['PhanPossiblyUndeclaredVariable'],
         'htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php' => ['PhanPossiblyUndeclaredVariable'],
         'htdocs/core/modules/workstation/mod_workstation_advanced.php' => ['PhanUndeclaredProperty'],
@@ -217,7 +216,7 @@ return [
         'htdocs/core/tpl/passwordreset.tpl.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/core/tpl/resource_add.tpl.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
         'htdocs/core/tpl/resource_view.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php' => ['PhanPossiblyUndeclaredVariable', 'PhanUndeclaredProperty'],
+        'htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php' => ['PhanTypeMismatchProperty'],
         'htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php' => ['PhanUndeclaredProperty'],
@@ -298,7 +297,7 @@ return [
         'htdocs/fourn/paiement/document.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/ftp/admin/ftpclient.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/ftp/index.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/holiday/card_group.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
+        'htdocs/holiday/card_group.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
         'htdocs/holiday/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
         'htdocs/holiday/view_log.php' => ['PhanTypeMismatchDimFetch'],
         'htdocs/hrm/admin/admin_hrm.php' => ['PhanEmptyForeach'],
@@ -363,7 +362,7 @@ return [
         'htdocs/product/class/api_products.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanUndeclaredProperty'],
         'htdocs/product/class/html.formproduct.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/class/productfournisseurprice.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
-        'htdocs/product/document.php' => ['PhanPossiblyNullTypeMismatchProperty', 'PhanPossiblyUndeclaredGlobalVariable'],
+        'htdocs/product/document.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/product/inventory/card.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/product/inventory/class/inventory.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/inventory/inventory.php' => ['PhanTypeMismatchArgumentProbablyReal'],
@@ -376,7 +375,6 @@ return [
         'htdocs/product/stock/class/api_stockmovements.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/product/stock/class/api_warehouses.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/product/stock/class/entrepot.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/product/stock/class/mouvementstock.class.php' => ['PhanPossiblyUndeclaredVariable'],
         'htdocs/product/stock/info.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/product/stock/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
         'htdocs/product/stock/movement_card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
@@ -476,7 +474,7 @@ return [
         'htdocs/societe/admin/societe.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredMethod'],
         'htdocs/societe/ajax/company.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
         'htdocs/societe/checkvat/checkVatPopup.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/societe/class/api_thirdparties.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
+        'htdocs/societe/class/api_thirdparties.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
         'htdocs/societe/class/societe.class.php' => ['PhanTypeMismatchProperty'],
         'htdocs/societe/consumption.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/societe/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
@@ -485,7 +483,7 @@ return [
         'htdocs/societe/tpl/linesalesrepresentative.tpl.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/societe/website.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/stripe/class/actions_stripe.class.php' => ['PhanPluginBothLiteralsBinaryOp', 'PhanPluginSuspiciousParamPosition'],
-        'htdocs/stripe/class/stripe.class.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchProperty'],
+        'htdocs/stripe/class/stripe.class.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchProperty'],
         'htdocs/supplier_proposal/card.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/supplier_proposal/class/api_supplier_proposals.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanUndeclaredProperty'],
         'htdocs/supplier_proposal/class/supplier_proposal.class.php' => ['PhanUndeclaredProperty'],
@@ -509,12 +507,12 @@ return [
         'htdocs/theme/md/progress.inc.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/ticket/card.php' => ['PhanUndeclaredProperty'],
         'htdocs/ticket/class/actions_ticket.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/ticket/class/api_tickets.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanPossiblyUndeclaredVariable'],
+        'htdocs/ticket/class/api_tickets.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/ticket/class/cticketcategory.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/ticket/class/ticket.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/ticket/index.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal'],
         'htdocs/ticket/list.php' => ['PhanTypeComparisonFromArray'],
-        'htdocs/user/bank.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/user/bank.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/user/card.php' => ['PhanTypeMismatchProperty'],
         'htdocs/user/class/api_users.class.php' => ['PhanTypeMismatchProperty'],
         'htdocs/user/class/user.class.php' => ['PhanUndeclaredProperty'],
@@ -543,7 +541,7 @@ return [
         'htdocs/webservices/server_supplier_invoice.php' => ['PhanUndeclaredProperty'],
         'htdocs/webservices/server_thirdparty.php' => ['PhanUndeclaredProperty'],
         'htdocs/webservices/server_user.php' => ['PhanUndeclaredProperty'],
-        'htdocs/website/class/website.class.php' => ['PhanPossiblyNullTypeMismatchProperty', 'PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentNullableInternal'],
+        'htdocs/website/class/website.class.php' => ['PhanTypeMismatchArgumentNullableInternal'],
         'htdocs/website/index.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/website/samples/wrapper.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/website/websiteaccount_card.php' => ['PhanUndeclaredProperty'],

From 4809f61c1b383a852212472055f9e24a1c4c1fe2 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 27 Jan 2025 10:25:24 +0100
Subject: [PATCH 223/602] Try a fix fox #32777

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c8050d8b679..eb597f9f71b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2010,9 +2010,9 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 				do {
 					$tmpold = $tmp;
 
-					if (preg_match('/<'.preg_quote($tagtoreplace, '/').'\s+([^>]+)>/', $tmp, $reg)) {
+					if (preg_match('/<'.preg_quote($tagtoreplace, '/').'(\s+)([^>]+)>/', $tmp, $reg)) {
 						// We want to pprotect the attribute part ... in '<xxx ...>' to avoid transformation by htmlentities() lafter
-						$tmpattributes = str_ireplace(array('[', ']'), '_', $reg[1]);	// We must never have [ ] inside the attribute string
+						$tmpattributes = str_ireplace(array('[', ']'), '_', $reg[2]);	// We must never have [ ] inside the attribute string
 						$tmpattributes = str_ireplace('href="http:', '__HREFHTTPA', $tmpattributes);	// TODO Try to remove this
 						$tmpattributes = str_ireplace('href="https:', '__HREFHTTPSA', $tmpattributes);
 						$tmpattributes = str_ireplace('src="http:', '__SRCHTTPIMG', $tmpattributes);
@@ -2023,16 +2023,18 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 
 						// TODO Test the replacement by using a memory array for attributes to restore them
 						// TODO Test a tag like '<a href="https://mydomain.com/aaa%20bbb">abc</a>'
-						$tmp = preg_replace('/<'.preg_quote($tagtoreplace, '/').'\s+'.preg_quote($reg[1], '/').'>/', '__BEGINTAGTOREPLACE'.$tagtoreplace.'['.$tmpattributes.']__', $tmp);
+						//$tmp = preg_replace('/<'.preg_quote($tagtoreplace, '/').'\s+'.preg_quote($reg[1], '/').'>/', '__BEGINTAGTOREPLACE'.$tagtoreplace.'['.$tmpattributes.']__', $tmp);
+						$tmp = str_replace('<'.$tagtoreplace.$reg[1].$reg[2].'>', '__BEGINTAGTOREPLACE'.$tagtoreplace.'['.$tmpattributes.']__', $tmp);
 					}
 					// TODO This may be already in previous case ? Try to remove this.
-					if (preg_match('/<'.preg_quote($tagtoreplace, '/').'\s+([^>]+)\s+\/>/', $tmp, $reg)) {
+					if (preg_match('/<'.preg_quote($tagtoreplace, '/').'(\s+)([^>]+)(\s+)\/>/', $tmp, $reg)) {
 						// We want to protect the attribute part ... in '<xxx ... />' to avoid transformation by htmlentities() lafter
-						$tmpattributes = str_ireplace(array('[', ']'), '_', $reg[1]);	// We must not have [ ] inside the attribute string
+						$tmpattributes = str_ireplace(array('[', ']'), '_', $reg[2]);	// We must not have [ ] inside the attribute string
 						$tmpattributes = str_ireplace('"', '__DOUBLEQUOTE', $tmpattributes);
 						$tmpattributes = preg_replace('/[^a-z0-9_\/\?\;\s=&\.\-@:\.#\+]/i', '', $tmpattributes);
 						//$tmpattributes = preg_replace("/float:\s*(left|right)/", "", $tmpattributes);	// Disabled: we must not remove content.
-						$tmp = preg_replace('/<'.preg_quote($tagtoreplace, '/').'\s+'.preg_quote($reg[1], '/').'\s+\/>/', '__BEGINENDTAGTOREPLACE'.$tagtoreplace.'['.$tmpattributes.']__', $tmp);
+						//$tmp = preg_replace('/<'.preg_quote($tagtoreplace, '/').'\s+'.preg_quote($reg[1], '/').'\s+\/>/', '__BEGINENDTAGTOREPLACE'.$tagtoreplace.'['.$tmpattributes.']__', $tmp);
+						$tmp = str_replace('<'.$tagtoreplace.$reg[1].$reg[2].$reg[3].'/>', '__BEGINTAGTOREPLACE'.$tagtoreplace.'['.$tmpattributes.']__', $tmp);
 					}
 
 					$diff = strcmp($tmpold, $tmp);

From ad6b5ac457eb0e4ce40d04f286275c0d21389aa6 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 27 Jan 2025 10:45:30 +0100
Subject: [PATCH 224/602] Fix second step of #32777

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index eb597f9f71b..cb6b009f99f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2018,7 +2018,7 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 						$tmpattributes = str_ireplace('src="http:', '__SRCHTTPIMG', $tmpattributes);
 						$tmpattributes = str_ireplace('src="https:', '__SRCHTTPSIMG', $tmpattributes);
 						$tmpattributes = str_ireplace('"', '__DOUBLEQUOTE', $tmpattributes);
-						$tmpattributes = preg_replace('/[^a-z0-9_\/\?\;\s=&\.\-@:\.#\+]/i', '', $tmpattributes);
+						$tmpattributes = preg_replace('/[^a-z0-9_%,\/\?\;\s=&\.\-@:\.#\+]/i', '', $tmpattributes);
 						//$tmpattributes = preg_replace("/float:\s*(left|right)/", "", $tmpattributes);	// Disabled: we must not remove content
 
 						// TODO Test the replacement by using a memory array for attributes to restore them
@@ -2031,7 +2031,7 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 						// We want to protect the attribute part ... in '<xxx ... />' to avoid transformation by htmlentities() lafter
 						$tmpattributes = str_ireplace(array('[', ']'), '_', $reg[2]);	// We must not have [ ] inside the attribute string
 						$tmpattributes = str_ireplace('"', '__DOUBLEQUOTE', $tmpattributes);
-						$tmpattributes = preg_replace('/[^a-z0-9_\/\?\;\s=&\.\-@:\.#\+]/i', '', $tmpattributes);
+						$tmpattributes = preg_replace('/[^a-z0-9_%,\/\?\;\s=&\.\-@:\.#\+]/i', '', $tmpattributes);
 						//$tmpattributes = preg_replace("/float:\s*(left|right)/", "", $tmpattributes);	// Disabled: we must not remove content.
 						//$tmp = preg_replace('/<'.preg_quote($tagtoreplace, '/').'\s+'.preg_quote($reg[1], '/').'\s+\/>/', '__BEGINENDTAGTOREPLACE'.$tagtoreplace.'['.$tmpattributes.']__', $tmp);
 						$tmp = str_replace('<'.$tagtoreplace.$reg[1].$reg[2].$reg[3].'/>', '__BEGINTAGTOREPLACE'.$tagtoreplace.'['.$tmpattributes.']__', $tmp);

From c2d2de53f9a0e4a3a49ee8bfaab4393f0de3615d Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 27 Jan 2025 10:16:28 +0100
Subject: [PATCH 225/602] Accept img src=data into dolPrintHTML

---
 htdocs/core/lib/functions.lib.php | 45 ++++++++++++-------------------
 test/phpunit/FunctionsLibTest.php | 12 +++++++++
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ed6a0165d93..41387eacc26 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2191,52 +2191,47 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 		}
 
 		if (count($tmparrayoftags)) {
+			// Now we will protect tags (defined into $tmparrayoftags) that we want to keep untouched
+
 			$reg = array();
-			$tmp = str_ireplace('__DOUBLEQUOTE', '', $tmp);	// The keyword DOUBLEQUOTE is forbidden. Reserved, so we removed it if we find it.
+			// Remove reserved keywords. They are forbidden in a source string
+			$tmp = str_ireplace(array('__DOUBLEQUOTE', '__BEGINTAGTOREPLACE', '__ENDTAGTOREPLACE', '__BEGINENDTAGTOREPLACE'), '', $tmp);
 
 			foreach ($tmparrayoftags as $tagtoreplace) {
+				// For case of tag without attributes '<abc>', '</abc>', '<abc />', we protect them to avoid transformation by htmlentities() later
 				$tmp = preg_replace('/<'.preg_quote($tagtoreplace, '/').'>/', '__BEGINTAGTOREPLACE'.$tagtoreplace.'__', $tmp);
 				$tmp = str_ireplace('</'.$tagtoreplace.'>', '__ENDTAGTOREPLACE'.$tagtoreplace.'__', $tmp);
 				$tmp = preg_replace('/<'.preg_quote($tagtoreplace, '/').' \/>/', '__BEGINENDTAGTOREPLACE'.$tagtoreplace.'__', $tmp);
 
-				// For case of tag with attribute
+				// For case of tag with attributes
 				do {
 					$tmpold = $tmp;
 
-					if (preg_match('/<'.preg_quote($tagtoreplace, '/').'\s+([^>]+)>/', $tmp, $reg)) {
-						$tmpattributes = str_ireplace(array('[', ']'), '_', $reg[1]);	// We must never have [ ] inside the attribute string
-						$tmpattributes = str_ireplace('href="http:', '__HREFHTTPA', $tmpattributes);
-						$tmpattributes = str_ireplace('href="https:', '__HREFHTTPSA', $tmpattributes);
-						$tmpattributes = str_ireplace('src="http:', '__SRCHTTPIMG', $tmpattributes);
-						$tmpattributes = str_ireplace('src="https:', '__SRCHTTPSIMG', $tmpattributes);
+					if (preg_match('/<'.preg_quote($tagtoreplace, '/').'(\s+)([^>]+)>/', $tmp, $reg)) {
+						// We want to protect the attribute part ... in '<xxx ...>' to avoid transformation by htmlentities() later
+						$tmpattributes = str_ireplace(array('[', ']'), '_', $reg[2]);	// We must never have [ ] inside the attribute string
 						$tmpattributes = str_ireplace('"', '__DOUBLEQUOTE', $tmpattributes);
-						$tmpattributes = preg_replace('/[^a-z0-9_\/\?\;\s=&\.\-@:\.#\+]/i', '', $tmpattributes);
+						$tmpattributes = preg_replace('/[^a-z0-9_%,\/\?\;\s=&\.\-@:\.#\+]/i', '', $tmpattributes);
 						//$tmpattributes = preg_replace("/float:\s*(left|right)/", "", $tmpattributes);	// Disabled: we must not remove content
-						$tmp = preg_replace('/<'.preg_quote($tagtoreplace, '/').'\s+'.preg_quote($reg[1], '/').'>/', '__BEGINTAGTOREPLACE'.$tagtoreplace.'['.$tmpattributes.']__', $tmp);
-					}
-					if (preg_match('/<'.preg_quote($tagtoreplace, '/').'\s+([^>]+)\s+\/>/', $tmp, $reg)) {
-						$tmpattributes = str_ireplace(array('[', ']'), '_', $reg[1]);	// We must not have [ ] inside the attribute string
-						$tmpattributes = str_ireplace('"', '__DOUBLEQUOTE', $tmpattributes);
-						$tmpattributes = preg_replace('/[^a-z0-9_\/\?\;\s=&\.\-@:\.#\+]/i', '', $tmpattributes);
-						//$tmpattributes = preg_replace("/float:\s*(left|right)/", "", $tmpattributes);	// Disabled: we must not remove content.
-						$tmp = preg_replace('/<'.preg_quote($tagtoreplace, '/').'\s+'.preg_quote($reg[1], '/').'\s+\/>/', '__BEGINENDTAGTOREPLACE'.$tagtoreplace.'['.$tmpattributes.']__', $tmp);
+						$tmp = str_replace('<'.$tagtoreplace.$reg[1].$reg[2].'>', '__BEGINTAGTOREPLACE'.$tagtoreplace.'['.$tmpattributes.']__', $tmp);
 					}
 
 					$diff = strcmp($tmpold, $tmp);
 				} while ($diff);
 			}
 
-			$tmp = str_ireplace('&quot', '__DOUBLEQUOT', $tmp);
+			$tmp = str_ireplace('&quot', '__DOUBLEQUOTE', $tmp);
 			$tmp = str_ireplace('&lt', '__LESSTAN', $tmp);
 			$tmp = str_ireplace('&gt', '__GREATERTHAN', $tmp);
 		}
 
-		// Warning: htmlentities encode HTML tags like <abc>, but not &lt; &gt; &quotes; &apos; &#39; &amp; that remains untouched.
-		$result = htmlentities($tmp, ENT_COMPAT, 'UTF-8');	// Convert & into &amp; and more...
+		// Warning: htmlentities encode HTML tags like <abc> & into &amp; and more (but not &lt; &gt; &quotes; &apos; &#39; &amp; that remains untouched).
+		$result = htmlentities($tmp, ENT_COMPAT, 'UTF-8');
 
 		//print $result;
 
 		if (count($tmparrayoftags)) {
+			// Restore protected tags
 			foreach ($tmparrayoftags as $tagtoreplace) {
 				$result = str_ireplace('__BEGINTAGTOREPLACE'.$tagtoreplace.'__', '<'.$tagtoreplace.'>', $result);
 				$result = preg_replace('/__BEGINTAGTOREPLACE'.$tagtoreplace.'\[([^\]]*)\]__/', '<'.$tagtoreplace.' \1>', $result);
@@ -2245,19 +2240,13 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 				$result = preg_replace('/__BEGINENDTAGTOREPLACE'.$tagtoreplace.'\[([^\]]*)\]__/', '<'.$tagtoreplace.' \1 />', $result);
 			}
 
-			$result = str_ireplace('__HREFHTTPA', 'href="http:', $result);
-			$result = str_ireplace('__HREFHTTPSA', 'href="https:', $result);
-			$result = str_ireplace('__SRCHTTPIMG', 'src="http:', $result);
-			$result = str_ireplace('__SRCHTTPSIMG', 'src="https:', $result);
 			$result = str_ireplace('__DOUBLEQUOTE', '"', $result);
+			$result = str_ireplace('__LESSTAN', '&lt', $result);
+			$result = str_ireplace('__GREATERTHAN', '&gt', $result);
 		}
 
 		$result = str_ireplace('__SIMPLEQUOTE', '&#39;', $result);
 
-		$result = str_ireplace('__DOUBLEQUOT', '&quot', $result);
-		$result = str_ireplace('__LESSTAN', '&lt', $result);
-		$result = str_ireplace('__GREATERTHAN', '&gt', $result);
-
 		//$result="\n\n\n".var_export($tmp, true)."\n\n\n".var_export($result, true);
 
 		return $result;
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 9770cb09c46..bf5b02a69ee 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -1133,6 +1133,18 @@ class FunctionsLibTest extends CommonClassTest
 		$result = dol_escape_htmltag($input, 1);
 		$this->assertEquals('x&amp;&lt;b&gt;#&lt;/b&gt;,&quot;', $result);
 
+		$input = '<img alt="" src="https://github.githubassets.com/assets/GitHub%20Mark-ea2971cee799.png">';    // & and " are converted into html entities, <b> are not removed
+		$result = dol_escape_htmltag($input, 1, 1, 'common', 0, 1);
+		$this->assertEquals('<img alt="" src="https://github.githubassets.com/assets/GitHub%20Mark-ea2971cee799.png">', $result);
+
+		$input = '<img src="data:image/png;base64, 123/456+789==" style="height: 123px; width:456px">';    // & and " are converted into html entities, <b> are not removed
+		$result = dol_escape_htmltag($input, 1, 1, 'common');
+		$this->assertEquals('<img src="data:image/png;base64, 123/456+789==" style="height: 123px; width:456px">', $result);
+
+		$input = '<img src="data:image/png;base64, 123/456+789==" style="height: 123px; width:456px">';    // & and " are converted into html entities, <b> are not removed
+		$result = dol_escape_htmltag($input, 1);
+		$this->assertEquals('&lt;img src=&quot;data:image/png;base64, 123/456+789==&quot; style=&quot;height: 123px; width:456px&quot;&gt;', $result);
+
 		$input = '<img alt="" src="https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png">';    // & and " are converted into html entities, <b> are not removed
 		$result = dol_escape_htmltag($input, 1, 1, 'common', 0, 1);
 		$this->assertEquals('<img alt="" src="https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png">', $result);

From a825c98d059a0d05015e7fa2b187d602822260f3 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 27 Jan 2025 10:56:09 +0100
Subject: [PATCH 226/602] FIX avoid php warning

---
 htdocs/ticket/card.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index cd1ac5e3afa..cb048260fda 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -69,6 +69,7 @@ $cancel    = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
+$limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma') ? GETPOST('sortfield', 'aZ09comma') : "a.datep";
 $sortorder = GETPOST('sortorder', 'aZ09comma') ? GETPOST('sortorder', 'aZ09comma') : "desc";
 $search_rowid = GETPOST('search_rowid');

From 3a19a7d27735ef58e1d04e17fa525634705c0e12 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 Jan 2025 11:22:10 +0100
Subject: [PATCH 227/602] fix phpstan

---
 htdocs/admin/tools/ui/components/icons.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/tools/ui/components/icons.php b/htdocs/admin/tools/ui/components/icons.php
index e8f8b365f97..b04dfeac43a 100644
--- a/htdocs/admin/tools/ui/components/icons.php
+++ b/htdocs/admin/tools/ui/components/icons.php
@@ -17,20 +17,22 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/agpl-3.0.html>.
  */
 
-$res=0;
-if (! $res && file_exists("../../main.inc.php")) : $res=@include '../../main.inc.php';
-endif;
-if (! $res && file_exists("../../../main.inc.php")) : $res=@include '../../../main.inc.php';
-endif;
-if (! $res && file_exists("../../../../main.inc.php")) : $res=@include '../../../../main.inc.php';
-endif;
+// Load Dolibarr environment
+require '../../../../main.inc.php';
+
+/**
+ * @var DoliDB $db
+ * @var HookManager $hookmanager
+ * @var Translate $langs
+ * @var User $user
+ */
 
 // Protection if external user
 if ($user->socid > 0) : accessforbidden();
 endif;
 
 // Includes
-dol_include_once('admin/tools/ui/class/documentation.class.php');
+require_once DOL_DOCUMENT_ROOT . '/admin/tools/ui/class/documentation.class.php';
 
 // Load documentation translations
 $langs->load('uxdocumentation');

From 16f8de0f4de3065bfa1a07ff98e6ea3d6cff3100 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 Jan 2025 11:27:34 +0100
Subject: [PATCH 228/602] Update icons.php

---
 htdocs/admin/tools/ui/components/icons.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/tools/ui/components/icons.php b/htdocs/admin/tools/ui/components/icons.php
index b04dfeac43a..8efd07a6bab 100644
--- a/htdocs/admin/tools/ui/components/icons.php
+++ b/htdocs/admin/tools/ui/components/icons.php
@@ -144,7 +144,7 @@ $documentation->showSidebar(); ?>
 						foreach ($fontAwesomeIcons as $iconData) {
 							$class= $iconData[1]??'fa';
 							if (!empty($iconData[2])) {
-								$class.= ' fa-'.$iconData[2]??'';
+								$class.= ' fa-'.$iconData[2];
 							} else {
 								$class.= ' fa-'.$iconData[0]??'';
 							}

From 4c6498b2f822dafb0edfcdbf0db0fa0d376a5a18 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 27 Jan 2025 11:41:59 +0100
Subject: [PATCH 229/602] More phpunit test

---
 test/phpunit/FunctionsLibTest.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index bf5b02a69ee..135a83de392 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -372,18 +372,23 @@ class FunctionsLibTest extends CommonClassTest
 
 		$input = "yahoo.com";
 		$result = isValidMXRecord($input);
-		print __METHOD__." result=".$result."\n";
+		print __METHOD__." ".$input." result=".$result."\n";
 		$this->assertEquals(1, $result);
 
 		$input = "yhaoo.com";
 		$result = isValidMXRecord($input);
-		print __METHOD__." result=".$result."\n";
+		print __METHOD__." ".$input." result=".$result."\n";
 		$this->assertEquals(0, $result);
 
 		$input = "dolibarr.fr";
 		$result = isValidMXRecord($input);
-		print __METHOD__." result=".$result."\n";
+		print __METHOD__." ".$input." result=".$result."\n";
 		$this->assertEquals(0, $result);
+
+		$input = "usace.army.mil";
+		$result = isValidMXRecord($input);
+		print __METHOD__." ".$input." result=".$result."\n";
+		$this->assertEquals(1, $result);
 	}
 
 	/**

From 73e3a260cfd280f3cfaae27fe97597329eef4b6a 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 Jan 2025 11:49:01 +0100
Subject: [PATCH 230/602] Update icons.php

---
 htdocs/admin/tools/ui/components/icons.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/tools/ui/components/icons.php b/htdocs/admin/tools/ui/components/icons.php
index 8efd07a6bab..e19f5feee13 100644
--- a/htdocs/admin/tools/ui/components/icons.php
+++ b/htdocs/admin/tools/ui/components/icons.php
@@ -146,7 +146,7 @@ $documentation->showSidebar(); ?>
 							if (!empty($iconData[2])) {
 								$class.= ' fa-'.$iconData[2];
 							} else {
-								$class.= ' fa-'.$iconData[0]??'';
+								$class.= ' fa-'.$iconData[0];
 							}
 
 							if (in_array($class, $alreadyDisplay)) {

From ca619914c2a2c790c653eaad32820673e2451498 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 Jan 2025 11:49:39 +0100
Subject: [PATCH 231/602] Update icons.php

---
 htdocs/admin/tools/ui/components/icons.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/admin/tools/ui/components/icons.php b/htdocs/admin/tools/ui/components/icons.php
index e19f5feee13..c4239a7583a 100644
--- a/htdocs/admin/tools/ui/components/icons.php
+++ b/htdocs/admin/tools/ui/components/icons.php
@@ -185,4 +185,3 @@ $documentation->showSidebar(); ?>
 <?php
 // Output close body + html
 $documentation->docFooter();
-?>

From 806b01c0a6de7cc1e3a550f4457b38fbf31a2de0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Champlon?= <r.champlon@vold.lu>
Date: Mon, 27 Jan 2025 11:54:02 +0100
Subject: [PATCH 232/602] fix

---
 htdocs/core/lib/files.lib.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index b6eb5421d53..684bc3bb9fa 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -3564,9 +3564,19 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 				dol_print_error(null, 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-			if ($fuser->hasRight($tmpmodule, $lire) || preg_match('/^specimen/i', $original_file)) {
-				$accessallowed = 1;
-			}
+
+            // Check fuser->rights->modulepart->myobject->read and fuser->rights->modulepart->read
+            $partsofdirinoriginalfile = explode('/', $original_file);
+            if (!empty($partsofdirinoriginalfile[1])) {	// If original_file is xxx/filename (xxx is a part we will use)
+                $partofdirinoriginalfile = $partsofdirinoriginalfile[0];
+                if ($partofdirinoriginalfile && ($fuser->hasRight($tmpmodule, $partofdirinoriginalfile, 'lire') || $fuser->hasRight($tmpmodule, $partofdirinoriginalfile, 'read'))) {
+                    $accessallowed = 1;
+                }
+            }
+            if ($fuser->hasRight($tmpmodule, $lire) || $fuser->hasRight($tmpmodule, $read)) {
+                $accessallowed = 1;
+            }
+
 			$original_file = $conf->$tmpmodule->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 		} else {
 			if (empty($conf->$modulepart->dir_output)) {	// modulepart not supported

From 180366a2cac5cf2f90c6efe82b5b707c13482abd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Champlon?= <r.champlon@vold.lu>
Date: Mon, 27 Jan 2025 11:56:47 +0100
Subject: [PATCH 233/602] fix

---
 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 684bc3bb9fa..44f95d9e9f4 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -3569,11 +3569,11 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
             $partsofdirinoriginalfile = explode('/', $original_file);
             if (!empty($partsofdirinoriginalfile[1])) {	// If original_file is xxx/filename (xxx is a part we will use)
                 $partofdirinoriginalfile = $partsofdirinoriginalfile[0];
-                if ($partofdirinoriginalfile && ($fuser->hasRight($tmpmodule, $partofdirinoriginalfile, 'lire') || $fuser->hasRight($tmpmodule, $partofdirinoriginalfile, 'read'))) {
+                if (($partofdirinoriginalfile && ($fuser->hasRight($tmpmodule, $partofdirinoriginalfile, 'lire') || $fuser->hasRight($tmpmodule, $partofdirinoriginalfile, 'read'))) || preg_match('/^specimen/i', $original_file)) {
                     $accessallowed = 1;
                 }
             }
-            if ($fuser->hasRight($tmpmodule, $lire) || $fuser->hasRight($tmpmodule, $read)) {
+            if (($fuser->hasRight($tmpmodule, $lire) || $fuser->hasRight($tmpmodule, $read)) || || preg_match('/^specimen/i', $original_file)) {
                 $accessallowed = 1;
             }
 

From da1bee6872cd47c03ca2e2105130ace14c2f592c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Champlon?= <r.champlon@vold.lu>
Date: Mon, 27 Jan 2025 11:57:07 +0100
Subject: [PATCH 234/602] re fix

---
 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 44f95d9e9f4..20edbd73a1c 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -3573,7 +3573,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
                     $accessallowed = 1;
                 }
             }
-            if (($fuser->hasRight($tmpmodule, $lire) || $fuser->hasRight($tmpmodule, $read)) || || preg_match('/^specimen/i', $original_file)) {
+            if (($fuser->hasRight($tmpmodule, $lire) || $fuser->hasRight($tmpmodule, $read)) || preg_match('/^specimen/i', $original_file)) {
                 $accessallowed = 1;
             }
 

From 97af0975bc710943374ab1b57b34efee40337c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Champlon?= <r.champlon@vold.lu>
Date: Mon, 27 Jan 2025 11:58:33 +0100
Subject: [PATCH 235/602] indent

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 20edbd73a1c..030d29cd9e7 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -3565,17 +3565,17 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 				exit;
 			}
 
-            // Check fuser->rights->modulepart->myobject->read and fuser->rights->modulepart->read
-            $partsofdirinoriginalfile = explode('/', $original_file);
-            if (!empty($partsofdirinoriginalfile[1])) {	// If original_file is xxx/filename (xxx is a part we will use)
-                $partofdirinoriginalfile = $partsofdirinoriginalfile[0];
-                if (($partofdirinoriginalfile && ($fuser->hasRight($tmpmodule, $partofdirinoriginalfile, 'lire') || $fuser->hasRight($tmpmodule, $partofdirinoriginalfile, 'read'))) || preg_match('/^specimen/i', $original_file)) {
-                    $accessallowed = 1;
-                }
-            }
-            if (($fuser->hasRight($tmpmodule, $lire) || $fuser->hasRight($tmpmodule, $read)) || preg_match('/^specimen/i', $original_file)) {
-                $accessallowed = 1;
-            }
+			// Check fuser->rights->modulepart->myobject->read and fuser->rights->modulepart->read
+			$partsofdirinoriginalfile = explode('/', $original_file);
+			if (!empty($partsofdirinoriginalfile[1])) {    // If original_file is xxx/filename (xxx is a part we will use)
+				$partofdirinoriginalfile = $partsofdirinoriginalfile[0];
+				if (($partofdirinoriginalfile && ($fuser->hasRight($tmpmodule, $partofdirinoriginalfile, 'lire') || $fuser->hasRight($tmpmodule, $partofdirinoriginalfile, 'read'))) || preg_match('/^specimen/i', $original_file)) {
+					$accessallowed = 1;
+				}
+			}
+			if (($fuser->hasRight($tmpmodule, $lire) || $fuser->hasRight($tmpmodule, $read)) || preg_match('/^specimen/i', $original_file)) {
+				$accessallowed = 1;
+			}
 
 			$original_file = $conf->$tmpmodule->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 		} else {

From c7ee83b3b9164e33288ee0c925c054c5496c7adc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Jan 2025 10:33:38 +0100
Subject: [PATCH 236/602] FIX can not delete files in task card

---
 htdocs/core/lib/files.lib.php |  1 +
 htdocs/projet/tasks/task.php  | 14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 2ed990205ad..ee9b55b21c3 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1448,6 +1448,7 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 					}
 				}
 			} else {
+				$ok = false; // to avoid false positive
 				dol_syslog("No files to delete found", LOG_DEBUG);
 			}
 		} else {
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index b8ff5a6f9bc..4f1ca11848b 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -65,7 +65,10 @@ if ($reshook < 0) {
 }
 
 if ($id > 0 || $ref) {
-	$object->fetch($id, $ref);
+	$ret = $object->fetch($id, $ref);
+	if ($ret > 0) {
+		$projectstatic->fetch($object->fk_project);
+	}
 }
 
 // Security check
@@ -204,14 +207,14 @@ if ($action == 'remove_file' && $user->rights->projet->creer) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 	$langs->load("other");
-	$upload_dir = $conf->project->dir_output;
+	$upload_dir = $conf->project->dir_output."/".dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
 	$file = $upload_dir.'/'.dol_sanitizeFileName(GETPOST('file'));
 
 	$ret = dol_delete_file($file);
 	if ($ret) {
-		setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+		setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
 	} else {
-		setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+		setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
 	}
 }
 
@@ -222,7 +225,6 @@ if ($action == 'remove_file' && $user->rights->projet->creer) {
 $form = new Form($db);
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
-$result = $projectstatic->fetch($object->fk_project);
 
 $title = $object->ref;
 if (!empty($withproject)) {
@@ -692,7 +694,7 @@ if ($id > 0 || !empty($ref)) {
 		/*
 		 * Generated documents
 		 */
-		$filename = dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
+		$filename = '';
 		$filedir = $conf->project->dir_output."/".dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 		$genallowed = ($user->rights->projet->lire);

From 2696c9a1071431e300ad5354c5ef9d6f5e75eafe Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 25 Jan 2025 00:46:59 +0100
Subject: [PATCH 237/602] Fix ci phan/phpstan notices

# Fix ci phan/phpstan notices

Fix most notices, except undefined fk_website in SocieteAccount
as it is not clear if that is supposed to be a property there
(more specifically, that it is set).
---
 htdocs/comm/action/index.php        |  6 +++---
 htdocs/comm/action/peruser.php      | 18 +++++++++---------
 htdocs/core/class/conf.class.php    | 11 ++++++-----
 htdocs/loan/note.php                |  2 +-
 htdocs/public/payment/paymentok.php | 16 +++++++++-------
 5 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 86b41f9d7ad..0f46efb5a85 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2017      Open-DSI             <support@open-dsi.fr>
  * Copyright (C) 2021-2025  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -1145,7 +1145,7 @@ if ($user->hasRight("holiday", "read")) {
 		$sql .= " AND x.date_fin >= '".$db->idate(dol_get_first_day($year, $month))."'";
 	}
 	if (!$user->hasRight('holiday', 'readall')) {
-		$sql.= " AND x.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
+		$sql .= " AND x.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
 	}
 
 	$resql = $db->query($sql);
@@ -2119,7 +2119,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 					//var_dump($event->userassigned);
 					//var_dump($event->transparency);
 					print '<table class="centpercent cal_event';
-					print (empty($event->transparency) ? ' cal_event_notbusy' : ' cal_event_busy');
+					print(empty($event->transparency) ? ' cal_event_notbusy' : ' cal_event_busy');
 					//if (empty($event->transparency) && empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) print ' opacitymedium';	// Not busy
 					print '" style="'.$h;
 					$colortouse = $color;
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 8457f983e5d..cbde1cfc1ee 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2014      Cedric GROSS         <c.gross@kreiz-it.fr>
  * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023       Florian HENRY           <florian.henry@scopen.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -363,7 +363,7 @@ if ($usergroup > 0) {
 if ($socid > 0) {
 	$param .= "&search_socid=".urlencode((string) ($socid));
 }
-if ($showbirthday) {
+if ($showbirthday) {  // Always false @phpstan-suppress-current-line
 	$param .= "&search_showbirthday=1";
 }
 if ($pid) {
@@ -649,13 +649,13 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 	$s .= "\n".'<!-- End div to calendars selectors -->'."\n";
 } else { // If javascript off
 	$newparam = $param; // newparam is for birthday links
-	$newparam = preg_replace('/showbirthday=[0-1]/i', 'showbirthday='.(empty($showbirthday) ? 1 : 0), $newparam);
+	$newparam = preg_replace('/showbirthday=[0-1]/i', 'showbirthday='.($showbirthday ? '1' : '0'), $newparam);  // Always false @phpstan-ignore-line
 	if (!preg_match('/showbirthday=/i', $newparam)) {
 		$newparam .= '&showbirthday=1';
 	}
 	$link = '<a href="'.$_SERVER['PHP_SELF'].'?'.dol_escape_htmltag($newparam);
 	$link .= '">';
-	if (empty($showbirthday)) {
+	if ($showbirthday) {  // Always false @phpstan-ignore-line
 		$link .= $langs->trans("AgendaShowBirthdayEvents");
 	} else {
 		$link .= $langs->trans("AgendaHideBirthdayEvents");
@@ -983,7 +983,7 @@ if ($resql) {
 
 // BIRTHDATES CALENDAR
 // Complete $eventarray with birthdates
-if ($showbirthday) {
+if ($showbirthday) {  // always false @phpstan-ignore-line
 	// Add events in array
 	$sql = 'SELECT sp.rowid, sp.lastname, sp.firstname, sp.birthday';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'socpeople as sp';
@@ -1067,7 +1067,7 @@ if ($user->hasRight("holiday", "read")) {
 	$sql .= " AND x.date_debut < '".$db->idate(dol_get_last_day($year, $month))."'";
 	$sql .= " AND x.date_fin >= '".$db->idate(dol_get_first_day($year, $month))."'";
 	if (!$user->hasRight('holiday', 'readall')) {
-		$sql.= " AND x.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
+		$sql .= " AND x.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
 	}
 
 	$resql = $db->query($sql);
@@ -1342,7 +1342,7 @@ if (count($listofextcals)) {
 					$addevent = true;
 				}
 
-				if ($addevent) {
+				if ($addevent && $datestart !== null && $dateend !== null) {
 					$event->id = $icalevent['UID'];
 					$event->ref = (string) $event->id;
 					$userstatic = new User($db);
@@ -2438,7 +2438,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			print 'style="background: #'.$color3.'; "';
 		}
 		print 'class="';
-		print($style3 ? $style3.' ' : '');
+		print $style3.' ';
 		print 'center'.($title2 ? ' classfortooltip' : '').($title3 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_30_'.($ids3 ? $ids3 : 'none').'"'.($title3 ? ' title="'.$title3.'"' : '').'>';
 		print $string3;
 		print '</td>';
@@ -2450,7 +2450,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			print 'style="background: #'.$color4.'; "';
 		}
 		print 'class="';
-		print($style4 ? $style4.' ' : '');
+		print $style4.' ';
 		print 'center'.($title3 ? ' classfortooltip' : '').($title4 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_45_'.($ids4 ? $ids4 : 'none').'"'.($title4 ? ' title="'.$title4.'"' : '').'>';
 		print $string4;
 		print '</td>';
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index e5dde138be6..b24276f92d0 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2005-2017  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2006 	    Jean Heimburger         <jean@tiaris.info>
  * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -85,7 +86,7 @@ class Conf extends stdClass
 	public $disable_compute;
 
 	/**
-	 * @var string Used to store current currency (ISO code like 'USD', 'EUR', ...). To get the currency symbol: $langs->getCurrencySymbol($this->currency)
+	 * @var string Used to store current currency (ISO code like 'USD', 'EUR', ...). To get the currency symbol:->getCurrencySymbol($this->currency)
 	 */
 	public $currency;
 
@@ -149,12 +150,12 @@ class Conf extends stdClass
 	public $entities = array();
 
 	/**
-	 * @var int Set if we force param dol_hide_topmenu into login url
+	 * @var int<0,1> Set if we force param dol_hide_topmenu into login url
 	 */
 	public $dol_hide_topmenu;
 
 	/**
-	 * @var int Set if we force param dol_hide_leftmenu into login url
+	 * @var int<0,1> Set if we force param dol_hide_leftmenu into login url
 	 */
 	public $dol_hide_leftmenu;
 
@@ -1204,10 +1205,10 @@ class Conf extends stdClass
 
 			// For modules that want to disable top or left menu
 			if (!empty($this->global->MAIN_HIDE_TOP_MENU)) {
-				$this->dol_hide_topmenu = getDolGlobalInt('MAIN_HIDE_TOP_MENU');
+				$this->dol_hide_topmenu = (int) (bool) getDolGlobalInt('MAIN_HIDE_TOP_MENU');
 			}
 			if (!empty($this->global->MAIN_HIDE_LEFT_MENU)) {
-				$this->dol_hide_leftmenu = getDolGlobalInt('MAIN_HIDE_LEFT_MENU');
+				$this->dol_hide_leftmenu = (int) (bool) getDolGlobalInt('MAIN_HIDE_LEFT_MENU');
 			}
 
 			if (empty($this->global->MAIN_SIZE_SHORTLIST_LIMIT)) {
diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index 7a117e64ba7..680ad131370 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2015-2025  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2016-2025	Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) 2017		Ferran Marcet				<fmarcet@2byte.es>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index aa46e7ccf0b..6d415d7820f 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2021		Maxime Demarest			<maxime@indelog.fr>
  * Copyright (C) 2021		Dorian Vabre			<dorian.vabre@gmail.com>
  * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -44,7 +45,7 @@ if (!defined('NOBROWSERNOTIF')) {
 }
 
 if (!defined('XFRAMEOPTIONS_ALLOWALL')) {
-		define('XFRAMEOPTIONS_ALLOWALL', '1');
+	define('XFRAMEOPTIONS_ALLOWALL', '1');
 }
 
 // For MultiCompany module.
@@ -394,7 +395,7 @@ if (empty($ipaddress)) {
 	$ipaddress = $_SESSION['ipaddress'];
 }
 if (empty($TRANSACTIONID)) {
-	$TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' :$_SESSION['TRANSACTIONID'];	// pi_... or ch_...
+	$TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' : $_SESSION['TRANSACTIONID'];	// pi_... or ch_...
 	if (empty($TRANSACTIONID) && GETPOST('payment_intent', 'alphanohtml')) {
 		// For the case we use STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 2
 		$TRANSACTIONID   = GETPOST('payment_intent', 'alphanohtml');
@@ -1653,18 +1654,18 @@ if ($ispaymentok) {
 						} else {
 							$booth->status = ConferenceOrBooth::STATUS_SUGGESTED;
 							$resultboothupdate = $booth->update($user);
-							if ($resultboothupdate<0) {
+							if ($resultboothupdate < 0) {
 								// Finding the thirdparty by getting the invoice
 								$invoice = new Facture($db);
 								$resultinvoice = $invoice->fetch($ref);
-								if ($resultinvoice<0) {
+								if ($resultinvoice < 0) {
 									$postactionmessages[] = 'Could not find the associated invoice.';
 									$ispostactionok = -1;
 									$error++;
 								} else {
 									$thirdparty = new Societe($db);
 									$resultthirdparty = $thirdparty->fetch($invoice->socid);
-									if ($resultthirdparty<0) {
+									if ($resultthirdparty < 0) {
 										$error++;
 										setEventMessages(null, $thirdparty->errors, "errors");
 									} else {
@@ -1893,10 +1894,11 @@ if ($ispaymentok) {
 	$payerID            = empty($PAYPALPAYERID) ? $_SESSION['payerID'] : $PAYPALPAYERID;
 	// Set by newpayment.php
 	$currencyCodeType   = empty($_SESSION['currencyCodeType']) ? '' : $_SESSION['currencyCodeType'];
-	$FinalPaymentAmt    = empty($_SESSION["FinalPaymentAmt"]) ? '': $_SESSION["FinalPaymentAmt"];
+	$FinalPaymentAmt    = empty($_SESSION["FinalPaymentAmt"]) ? '' : $_SESSION["FinalPaymentAmt"];
 	$paymentType        = empty($_SESSION['PaymentType']) ? '' : $_SESSION['PaymentType'];	// Seems used by paypal only
 
 	if (is_object($object) && method_exists($object, 'call_trigger')) {
+		'@phan-var-force CommonObject $object';
 		// Call trigger
 		$result = $object->call_trigger('PAYMENTONLINE_PAYMENT_OK', $user);
 		if ($result < 0) {
@@ -1904,7 +1906,7 @@ if ($ispaymentok) {
 		}
 		// End call triggers
 	} elseif (get_class($object) == 'stdClass') {
-		//In some case $object is not instantiate (for paiement on custom object) We need to deal with payment
+		//In some cases $object is not instantiated (for payment on custom object) We need to deal with payment
 		include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 		$paiement = new Paiement($db);
 		$result = $paiement->call_trigger('PAYMENTONLINE_PAYMENT_OK', $user);

From b043cd02900670e8e784ca2e42342cc06a34a1ec Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 27 Jan 2025 11:41:59 +0100
Subject: [PATCH 238/602] More phpunit test

---
 test/phpunit/FunctionsLibTest.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index bf5b02a69ee..135a83de392 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -372,18 +372,23 @@ class FunctionsLibTest extends CommonClassTest
 
 		$input = "yahoo.com";
 		$result = isValidMXRecord($input);
-		print __METHOD__." result=".$result."\n";
+		print __METHOD__." ".$input." result=".$result."\n";
 		$this->assertEquals(1, $result);
 
 		$input = "yhaoo.com";
 		$result = isValidMXRecord($input);
-		print __METHOD__." result=".$result."\n";
+		print __METHOD__." ".$input." result=".$result."\n";
 		$this->assertEquals(0, $result);
 
 		$input = "dolibarr.fr";
 		$result = isValidMXRecord($input);
-		print __METHOD__." result=".$result."\n";
+		print __METHOD__." ".$input." result=".$result."\n";
 		$this->assertEquals(0, $result);
+
+		$input = "usace.army.mil";
+		$result = isValidMXRecord($input);
+		print __METHOD__." ".$input." result=".$result."\n";
+		$this->assertEquals(1, $result);
 	}
 
 	/**

From 4707d29f0aa92d78b2d843c549eeab4b998cb597 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 11 Jan 2025 13:44:19 +0100
Subject: [PATCH 239/602] Qual: Update PHPdoc of editfieldval to reduce
 typemismatch notices

---
 htdocs/core/class/html.form.class.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 43ce05648b1..180a659471c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (c) 2002-2007  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
@@ -200,23 +201,23 @@ class Form
 	/**
 	 * Output value of a field for an editable field
 	 *
-	 * @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 CommonObject 	$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, 'checkbox', 'email', 'phone', 'amount:99', 'numeric:99',
+	 * @param string		$text 		Text of label (not used in this function)
+	 * @param string		$htmlname 	Name of select field
+	 * @param string|int	$value 		Value to show/edit
+	 * @param CommonObject 	$object 	Object (that we want to show)
+	 * @param bool|int<0,1> $perm 		Permission to allow button to edit parameter
+	 * @param string		$typeofdata Type of data ('string' by default, 'checkbox', 'email', 'phone', 'amount:99', 'numeric:99',
 	 *                                  'text' or 'textarea:rows:cols%', 'safehtmlstring', 'restricthtml',
 	 *                                  '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 formatted price instead of numeric value, or a select combo). Use '' to use same than $value
+	 * @param ?string 	$editvalue 		When in edit mode, use this value as $value instead of value (for example, you can provide here a formatted price instead of numeric value, or a select combo). Use '' to use same than $value
 	 * @param ?CommonObject	$extObject 	External object ???
-	 * @param mixed 	$custommsg 		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
+	 * @param ?string|?array<string,string>	$custommsg 		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
 	 * @param string 	$moreparam 		More param to add on the form on action href URL parameter
-	 * @param int 		$notabletag 	Do no output table tags
+	 * @param int<0,1>	$notabletag 	Do no output table tags
 	 * @param string 	$formatfunc 	Call a specific method of $object->$formatfunc to output field in view mode (For example: 'dol_print_email')
 	 * @param string 	$paramid 		Key of parameter for id ('id', 'socid')
 	 * @param string 	$gm 			'auto' or 'tzuser' or 'tzuserrel' or 'tzserver' (when $typeofdata is a date)
-	 * @param array<string,int> 	$moreoptions 	Array with more options. For example array('addnowlink'=>1), array('valuealreadyhtmlescaped'=>1)
+	 * @param array<string,int> $moreoptions Array with more options. For example array('addnowlink'=>1), array('valuealreadyhtmlescaped'=>1)
 	 * @param string 	$editaction 	[=''] use GETPOST default action or set action to edit mode
 	 * @return string                   HTML edit field
 	 */
@@ -487,9 +488,9 @@ class Form
 	 * @param 	string 	$htmlname 	DIV ID (field name)
 	 * @param 	int 	$condition 	Condition to edit
 	 * @param 	string 	$inputType 	Type of input ('string', 'numeric', 'datepicker' ('day' do not work, don't know why), 'textarea:rows:cols', 'ckeditor:dolibarr_zzz:width:height:?:1:rows:cols', 'select:loadmethod:savemethod:buttononly')
-	 * @param 	string 	$editvalue 	When in edit mode, use this value as $value instead of value
+	 * @param 	?string $editvalue 	When in edit mode, use this value as $value instead of value
 	 * @param 	?CommonObject	$extObject 	External object
-	 * @param 	mixed 	$custommsg 	String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
+	 * @param 	?string|?array<string,string>	$custommsg 	String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
 	 * @return  string              HTML edit in place
 	 */
 	protected function editInPlace($object, $value, $htmlname, $condition, $inputType = 'textarea', $editvalue = null, $extObject = null, $custommsg = null)

From 7150af31dc3c151b17fcfbd6e844f4519b17271c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 13 Jan 2025 20:04:35 +0100
Subject: [PATCH 240/602] Fix Phan notices introduced since 30/12/2024

---
 .../facture/class/facture-rec.class.php       |  4 +-
 htdocs/compta/facture/prelevement.php         |  5 +-
 htdocs/core/actions_massactions.inc.php       |  4 +-
 htdocs/core/class/fileupload.class.php        |  5 +-
 htdocs/core/class/hookmanager.class.php       |  3 +-
 htdocs/core/class/html.form.class.php         |  2 +-
 htdocs/core/class/html.formcompany.class.php  |  2 +-
 htdocs/core/class/html.formfile.class.php     |  5 +-
 htdocs/core/lib/customreports.lib.php         | 15 +++---
 htdocs/core/lib/functions.lib.php             |  2 +
 htdocs/core/lib/pdf.lib.php                   |  6 ++-
 .../task/doc/doc_generic_task_odt.modules.php | 25 ++++++----
 .../societe/mod_codecompta_aquarium.php       | 12 ++++-
 .../societe/mod_codecompta_digitaria.php      | 40 +++++++++------
 .../stock/doc/pdf_standard_stock.modules.php  | 35 ++++++++++++-
 .../stocktransfer/doc/pdf_eagle.modules.php   |  5 +-
 .../doc/pdf_eagle_proforma.modules.php        | 10 +++-
 ...c_generic_supplier_invoice_odt.modules.php |  4 +-
 .../doc/pdf_canelle.modules.php               |  5 +-
 ...doc_generic_supplier_order_odt.modules.php |  4 +-
 .../supplier_order/doc/pdf_cornas.modules.php |  7 +--
 .../doc/pdf_muscadet.modules.php              |  5 +-
 .../mod_commande_fournisseur_muguet.php       |  4 +-
 .../modules_commandefournisseur.php           | 49 ++++++++++++++++++-
 .../pdf_standard_supplierpayment.modules.php  | 24 ++++++++-
 .../doc/doc_generic_ticket_odt.modules.php    |  4 +-
 .../user/doc/doc_generic_user_odt.modules.php |  4 +-
 htdocs/core/search_page.php                   |  8 +--
 htdocs/core/tpl/ajaxrow.tpl.php               |  5 ++
 htdocs/core/tpl/commonfields_view.tpl.php     | 13 +++--
 htdocs/core/tpl/contacts.tpl.php              | 16 +++---
 .../tpl/document_actions_post_headers.tpl.php | 14 +++++-
 htdocs/core/tpl/extrafields_edit.tpl.php      | 20 ++++----
 .../tpl/extrafields_list_search_title.tpl.php |  6 +++
 htdocs/core/tpl/filemanager.tpl.php           | 15 ++++--
 htdocs/core/tpl/formlayoutai.tpl.php          |  5 +-
 htdocs/core/tpl/list_print_total.tpl.php      |  7 ++-
 htdocs/core/tpl/massactions_pre.tpl.php       | 18 ++++---
 htdocs/core/tpl/notes.tpl.php                 | 10 +++-
 htdocs/core/tpl/object_discounts.tpl.php      | 15 +++++-
 htdocs/core/tpl/objectline_create.tpl.php     | 47 +++++++++++-------
 htdocs/core/tpl/objectline_view.tpl.php       |  9 ++--
 .../class/fournisseur.facture-rec.class.php   |  4 +-
 htdocs/hrm/core/tpl/objectline_view.tpl.php   |  9 ++--
 htdocs/projet/tasks/time.php                  |  6 ++-
 htdocs/public/payment/newpayment.php          |  6 ++-
 htdocs/reception/list.php                     |  4 +-
 ...tandard_recruitmentjobposition.modules.php |  5 +-
 htdocs/salaries/virement_request.php          |  6 ++-
 htdocs/user/bank.php                          | 11 +++--
 50 files changed, 407 insertions(+), 142 deletions(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 4c5ee381d51..cdc391e1ee8 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2003-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2004-2019	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@inodbox.com>
@@ -8,7 +9,7 @@
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2017-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023       Nick Fragoulis
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -1491,6 +1492,7 @@ class FactureRec extends CommonInvoice
 					'facturerec' => $facturerec, // it's an object which PHP passes by "reference", so modifiable by hooks.
 					'this'       => $this, // it's an object which PHP passes by "reference", so modifiable by hooks.
 				);
+				// @phan-suppress-next-line PhanTypeMismatchArgumentNullable
 				$reshook = $hookmanager->executeHooks('afterCreationOfRecurringInvoice', $parameters, $facture); // note: $facture can be modified by hooks (warning: $facture can be null)
 
 				$i++;
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index fd22234a7a9..35a46efd9bc 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -1,4 +1,5 @@
 <?php
+
 /* 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>
@@ -6,7 +7,7 @@
  * Copyright (C) 2010-2014  Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2017       Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -931,7 +932,7 @@ if ($object->id > 0) {
 
 		$tmpuser = new User($db);
 
-		$num = $db->num_rows($result);
+		$num = $db->num_rows($resql);
 		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 266bae09fc0..e5a191b8135 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1,10 +1,11 @@
 <?php
+
 /* Copyright (C) 2015-2017  Laurent Destailleur  	<eldy@users.sourceforge.net>
  * Copyright (C) 2018-2021  Nicolas ZABOURI	        <info@inovea-conseil.com>
  * Copyright (C) 2018 	    Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2019 	    Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -1941,6 +1942,7 @@ $parameters['uploaddir'] = $uploaddir;
 $parameters['massaction'] = $massaction;
 $parameters['diroutputmassaction'] = isset($diroutputmassaction) ? $diroutputmassaction : null;
 
+// @phan-suppress-next-line PhanTypeMismatchArgumentNullable
 $reshook = $hookmanager->executeHooks('doMassActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index 675a22ae0fe..31e4b64b6aa 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -1,8 +1,9 @@
 <?php
+
 /* Copyright (C) 2011-2022	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2011-2023	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -161,7 +162,7 @@ class FileUpload
 				'options' => &$options,
 				'element' => $element
 			),
-			$object,
+			$object,  // @phan-suppress-current-line PhanTypeMismatchArgumentNullable
 			$action
 		);
 
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index fc8fc9ada54..2cdec011d65 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -1,8 +1,9 @@
 <?php
+
 /* Copyright (C) 2010-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2010-2014 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2010-2011 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 180a659471c..c524c79e080 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2133,7 +2133,7 @@ class Form
 	 * @param int 				$disabled 		If select list must be disabled
 	 * @param int[]|''|'hierarchy'|'hierarchyme'	$include	Array list of users id to include. User '' for all users or 'hierarchy' to have only supervised users or 'hierarchyme' to have supervised + me
 	 * @param int[]|''			$enableonly 	Array list of users id to be enabled. If defined, it means that others will be disabled
-	 * @param string 			$force_entity 	'0' or list of Ids of environment to force, separated by a coma, or 'default' = do no extend to all entities allowed to superadmin.
+	 * @param string 			$force_entity 	'0' or list of Ids of environment to force, separated by a comma, or 'default' = do no extend to all entities allowed to superadmin.
 	 * @param int 				$maxlength 		Maximum length of string into list (0=no limit)
 	 * @param int<-1,1>			$showstatus 	0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
 	 * @param string 			$morefilter 	Add more filters into sql request (Example: '(employee:=:1)'). This value must not come from user input.
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 39c0ff94ec2..948907ff469 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -810,7 +810,7 @@ class FormCompany extends Form
 	/**
 	 *  Return a select list with types of contacts
 	 *
-	 *  @param	Object		$object         	Object to use to find type of contact
+	 *  @param	?Object		$object         	Object to use to find type of contact
 	 *  @param  string		$selected       	Default selected value
 	 *  @param  string		$htmlname			HTML select name
 	 *  @param  string		$source				Source ('internal' or 'external')
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index c95f857a4a9..54b63b884d3 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2008-2013	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2010-2014	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2010-2016	Juanjo Menent		<jmenent@2byte.es>
@@ -8,7 +9,7 @@
  * Copyright (C) 2015		Bahfir Abbes		<bafbes@gmail.com>
  * Copyright (C) 2016-2017	Ferran Marcet		<fmarcet@2byte.es>
  * Copyright (C) 2019-2024	Frédéric France     <frederic.france@free.fr>
- * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -310,6 +311,7 @@ class FormFile
 		}
 
 		$parameters = array('socid' => (isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id' => (isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'url' => $url, 'perm' => $perm, 'options' => $options);
+		// @phan-suppress-next-line PhanTypeMismatchArgumentNullable
 		$res = $hookmanager->executeHooks('formattachOptionsUpload', $parameters, $object);
 		if (empty($res)) {
 			$out = '<div class="'.($usewithoutform ? 'inline-block valignmiddle' : (($nooutput == 2 ? '' : 'attacharea ').'attacharea'.$htmlname)).'">'.$out.'</div>';
@@ -1349,6 +1351,7 @@ class FormFile
 				'title' => $title,
 				'url' => $url
 		);
+		// @phan-suppress-next-line PhanTypeMismatchArgumentNullable
 		$reshook = $hookmanager->executeHooks('showFilesList', $parameters, $object);
 
 		if (!empty($reshook)) { // null or '' for bypass
diff --git a/htdocs/core/lib/customreports.lib.php b/htdocs/core/lib/customreports.lib.php
index 621b0dfd093..61e2bc17694 100644
--- a/htdocs/core/lib/customreports.lib.php
+++ b/htdocs/core/lib/customreports.lib.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2024       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
@@ -409,21 +410,21 @@ function fillArrayOfGroupBy($object, $tablealias, $labelofobject, &$arrayofgroup
 			if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
 				$position = (empty($val['position']) ? 0 : intval($val['position']));
 				$arrayofgroupby[$tablealias.'.'.$key.'-year'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.')</span>',  // @phan-suppress-current-line PhanUndeclaredProperty
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
 					'position' => ($position + ($count * 100000)).'.1',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofgroupby[$tablealias.'.'.$key.'-month'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',  // @phan-suppress-current-line PhanUndeclaredProperty
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
 					'position' => ($position + ($count * 100000)).'.2',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofgroupby[$tablealias.'.'.$key.'-day'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',  // @phan-suppress-current-line PhanUndeclaredProperty
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
 					'position' => ($position + ($count * 100000)).'.3',
 					'table' => $object->table_element,
@@ -432,7 +433,7 @@ function fillArrayOfGroupBy($object, $tablealias, $labelofobject, &$arrayofgroup
 			} else {
 				$position = (empty($val['position']) ? 0 : intval($val['position']));
 				$arrayofgroupby[$tablealias.'.'.$key] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']),
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']),  // @phan-suppress-current-line PhanUndeclaredProperty
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
 					'position' => ($position + ($count * 100000)),
 					'table' => $object->table_element,
@@ -455,14 +456,14 @@ function fillArrayOfGroupBy($object, $tablealias, $labelofobject, &$arrayofgroup
 			if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('timestamp', 'date', 'datetime'))) {
 				$position = (empty($extrafields->attributes[$object->table_element]['pos'][$key]) ? 0 : intval($extrafields->attributes[$object->table_element]['pos'][$key]));
 				$arrayofgroupby[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-year'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.')</span>',  // @phan-suppress-current-line PhanUndeclaredProperty
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
 					'position' => ($position + ($count * 100000)).'.1',
 					'table' => $object->table_element,
 					'tablefromt' => $tablepath
 				);
 				$arrayofgroupby[preg_replace('/^t/', 'te', $tablealias).'.'.$key.'-month'] = array(
-					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
+					'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',  // @phan-suppress-current-line PhanUndeclaredProperty
 					'labelnohtml' => $labelofobject.': '.$langs->trans($val),
 					'position' => ($position + ($count * 100000)).'.2',
 					'table' => $object->table_element,
@@ -570,7 +571,7 @@ function fillArrayOfFilterFields($object, $tablealias, $labelofobject, &$arrayof
 
 			$position = (empty($val['position']) ? 0 : intval($val['position']));
 			$arrayoffields[$tablealias.'.'.$key] = array(
-				'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']),
+				'label' => img_picto('', (empty($object->picto) ? 'generic' : $object->picto), 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']),  // @phan-suppress-current-line PhanUndeclaredProperty
 				'labelnohtml' => $labelofobject.': '.$langs->trans($val['label']),
 				'position' => ($position + ($count * 100000)),
 				'table' => $object->table_element,
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 865d3f438c9..c38c902e1c6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -495,6 +495,7 @@ function getEntity($element, $shared = 1, $currentobject = null)
 		'currentobject' => $currentobject,
 		'out' => $out
 	);
+	// @phan-suppress-next-line PhanTypeMismatchArgumentNullable
 	$reshook = $hookmanager->executeHooks('hookGetEntity', $parameters, $currentobject, $action); // Note that $action and $object may have been modified by some hooks
 
 	if (is_numeric($reshook)) {
@@ -11309,6 +11310,7 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
 	// No need to make a return $head. Var is modified as a reference
 	if (!empty($hookmanager)) {
 		$parameters = array('object' => $object, 'mode' => $mode, 'head' => &$head, 'filterorigmodule' => $filterorigmodule);
+		// @phan-suppress-next-line PhanTypeMismatchArgumentNullable
 		$reshook = $hookmanager->executeHooks('completeTabsHead', $parameters, $object);
 		if ($reshook > 0) {		// Hook ask to replace completely the array
 			$head = $hookmanager->resArray;
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index fd51a9a474b..010d5f87eed 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2006-2017	Laurent Destailleur 	<eldy@users.sourceforge.net>
  * Copyright (C) 2006		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2007		Patrick Raguin      	<patrick.raguin@gmail.com>
@@ -14,7 +15,7 @@
  * Copyright (C) 2020       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2021-2022	Anthony Berton       	<anthony.berton@bb2a.fr>
  * Copyright (C) 2023-2025  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -454,6 +455,7 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 	if (is_object($hookmanager)) {
 		$parameters = array('sourcecompany' => &$sourcecompany, 'targetcompany' => &$targetcompany, 'targetcontact' => &$targetcontact, 'outputlangs' => $outputlangs, 'mode' => $mode, 'usecontact' => $usecontact);
 		$action = '';
+		// @phan-suppress-next-line PhanTypeMismatchArgumentNullable
 		$reshook = $hookmanager->executeHooks('pdf_build_address', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		$stringaddress .= $hookmanager->resPrint;
 	}
@@ -2678,7 +2680,7 @@ function pdf_getLinkedObjects(&$object, $outputlangs)
 		$reshook = $hookmanager->executeHooks('pdf_getLinkedObjects', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		if (empty($reshook)) {
 			$linkedobjects = array_replace($linkedobjects, $hookmanager->resArray); // array_replace is used to preserve keys
-		} elseif ($reshook>0) {
+		} elseif ($reshook > 0) {
 			// The array must be reinserted even if it is empty because clearing the array could be one of the actions performed by the hook.
 			$linkedobjects = $hookmanager->resArray;
 		}
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 705f32894e5..6583ef2dfd1 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -1,11 +1,12 @@
 <?php
+
 /* Copyright (C) 2010-2012 	Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2013		Florian Henry		<florian.henry@ope-concept.pro>
  * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
  * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2023      	Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -617,11 +618,11 @@ class doc_generic_task_odt extends ModelePDFTask
 
 					// Replace tags of lines for contacts task
 					$sourcearray = array('internal', 'external');
-					$contact_arrray = array();
+					$contact_array = array();
 					foreach ($sourcearray as $source) {
 						$contact_temp = $object->liste_contact(-1, $source);
 						if ((is_array($contact_temp) && count($contact_temp) > 0)) {
-							$contact_arrray = array_merge($contact_arrray, $contact_temp);
+							$contact_array = array_merge($contact_array, $contact_temp);
 						}
 					}
 					// Check for segment
@@ -633,8 +634,8 @@ class doc_generic_task_odt extends ModelePDFTask
 						$foundtagforlines = 0;
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
-					if ($foundtagforlines && (is_array($contact_arrray) && count($contact_arrray) > 0)) {
-						foreach ($contact_arrray as $contact) {
+					if ($foundtagforlines && (is_array($contact_array) && count($contact_array) > 0)) {
+						foreach ($contact_array as $contact) {
 							if ($contact['source'] == 'internal') {
 								$objectdetail = new User($this->db);
 								$objectdetail->fetch($contact['id']);
@@ -646,6 +647,9 @@ class doc_generic_task_odt extends ModelePDFTask
 								$soc = new Societe($this->db);
 								$soc->fetch($contact['socid']);
 								$contact['socname'] = $soc->name;
+							} else {
+								dol_syslog(get_class().'::'.__METHOD__.' Unexpected contact source:'.$contact['source'], LOG_ERR);
+								continue;
 							}
 							$contact['fullname'] = is_object($objectdetail) ? $objectdetail->getFullName($outputlangs, 1) : null;
 
@@ -793,11 +797,11 @@ class doc_generic_task_odt extends ModelePDFTask
 
 				// Replace tags of lines for contacts
 				$sourcearray = array('internal', 'external');
-				$contact_arrray = array();
+				$contact_array = array();
 				foreach ($sourcearray as $source) {
 					$contact_temp = $project->liste_contact(-1, $source);
 					if ((is_array($contact_temp) && count($contact_temp) > 0)) {
-						$contact_arrray = array_merge($contact_arrray, $contact_temp);
+						$contact_array = array_merge($contact_array, $contact_temp);
 					}
 				}
 				// Check for segment
@@ -809,9 +813,9 @@ class doc_generic_task_odt extends ModelePDFTask
 					$foundtagforlines = 0;
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
-				if ($foundtagforlines && (is_array($contact_arrray) && count($contact_arrray) > 0)) {
+				if ($foundtagforlines && (is_array($contact_array) && count($contact_array) > 0)) {
 					try {
-						foreach ($contact_arrray as $contact) {
+						foreach ($contact_array as $contact) {
 							if ($contact['source'] == 'internal') {
 								$objectdetail = new User($this->db);
 								$objectdetail->fetch($contact['id']);
@@ -823,6 +827,9 @@ class doc_generic_task_odt extends ModelePDFTask
 								$soc = new Societe($this->db);
 								$soc->fetch($contact['socid']);
 								$contact['socname'] = $soc->name;
+							} else {
+								dol_syslog(get_class().'::'.__METHOD__.' Unexpected contact source:'.$contact['source'], LOG_ERR);
+								continue;
 							}
 							$contact['fullname'] = $objectdetail->getFullName($outputlangs, 1);
 
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index 07ad702dd36..ce5cfb5466b 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -1,8 +1,9 @@
 <?php
+
 /* Copyright (C) 2004-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -49,10 +50,19 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
+	/**
+	 * @var string Prefix customer accountancy code
+	 */
 	public $prefixcustomeraccountancycode;
 
+	/**
+	 * @var string Prefix supplier accountancy code
+	 */
 	public $prefixsupplieraccountancycode;
 
+	/**
+	 * @var int
+	 */
 	public $position = 20;
 
 
diff --git a/htdocs/core/modules/societe/mod_codecompta_digitaria.php b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
index 857cb2d9521..52c74f78ac6 100644
--- a/htdocs/core/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
@@ -1,9 +1,10 @@
 <?php
+
 /* Copyright (C) 2004       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2010       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2019       Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -45,24 +46,31 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
-	 * Prefix customer accountancy code
-	 * @var string
+	 * @var string Prefix customer accountancy code
 	 */
 	public $prefixcustomeraccountancycode;
 
 	/**
-	 * Prefix supplier accountancy code
-	 * @var string
+	 * @var string Prefix supplier accountancy code
 	 */
 	public $prefixsupplieraccountancycode;
 
+	/**
+	 * @var int
+	 */
 	public $position = 30;
 
 	/**
 	 * @var string
 	 */
 	public $code;
+	/**
+	 * @var string
+	 */
 	public $customeraccountancycodecharacternumber;
+	/**
+	 * @var string
+	 */
 	public $supplieraccountancycodecharacternumber;
 
 
@@ -178,7 +186,9 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 		$s .= "<br>\n";
 
 		if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) {
-			$thirdpartylabelexample = preg_replace('/([^a-z0-9])/i', '', $mysoc->name);
+			$thirdpartylabelexample = (string) preg_replace('/([^a-z0-9])/i', '', $mysoc->name);
+		} else {
+			$thirdpartylabelexample = '';
 		}
 		$s .= "<br>\n";
 		$s .= $this->prefixcustomeraccountancycode.strtoupper(substr($thirdpartylabelexample, 0, (int) $this->customeraccountancycodecharacternumber));
@@ -191,8 +201,8 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 	/**
 	 *  Set accountancy account code for a third party into this->code
 	 *
-	 *  @param	DoliDB	$db              Database handler
-	 *  @param  Societe	$societe         Third party object
+	 *  @param	DoliDB	$db				Database handler
+	 *  @param  Societe	$societe		Third party object
 	 *  @param  string	$type			'customer' or 'supplier'
 	 *  @return	int						>=0 if OK, <0 if KO
 	 */
@@ -209,11 +219,11 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 			dol_syslog("mod_codecompta_digitaria::get_code search code for type=".$type." & company=".(!empty($societe->name) ? $societe->name : ''));
 
 			if ($type == 'supplier') {
-				$codetouse = $societe->name;
+				$codetouse = (string) $societe->name;
 				$prefix = $this->prefixsupplieraccountancycode;
 				$width = $this->supplieraccountancycodecharacternumber;
 			} elseif ($type == 'customer') {
-				$codetouse = $societe->name;
+				$codetouse = (string) $societe->name;
 				$prefix = $this->prefixcustomeraccountancycode;
 				$width = $this->customeraccountancycodecharacternumber;
 			} else {
@@ -228,11 +238,11 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 			}
 			// Remove special char if COMPANY_DIGITARIA_REMOVE_SPECIAL is set to 1 or not set (default)
 			if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL) || getDolGlobalString('COMPANY_DIGITARIA_REMOVE_SPECIAL')) {
-				$codetouse = preg_replace('/([^a-z0-9])/i', '', $codetouse);
+				$codetouse = (string) preg_replace('/([^a-z0-9])/i', '', $codetouse);
 			}
 			// Apply a regex replacement pattern on code if COMPANY_DIGITARIA_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
 			if (getDolGlobalString('COMPANY_DIGITARIA_CLEAN_REGEX')) {	// Example: $conf->global->COMPANY_DIGITARIA_CLEAN_REGEX='^..(..)..';
-				$codetouse = preg_replace('/' . getDolGlobalString('COMPANY_DIGITARIA_CLEAN_REGEX').'/', '\1\2\3', $codetouse);
+				$codetouse = (string) preg_replace('/' . getDolGlobalString('COMPANY_DIGITARIA_CLEAN_REGEX').'/', '\1\2\3', $codetouse);
 			}
 
 			$this->code = $prefix.strtoupper(substr($codetouse, 0, (int) $width));
@@ -248,11 +258,9 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 
 					if ($i <= 9) {
 						$a = 1;
-					}
-					if ($i >= 10 && $i <= 99) {
+					} elseif ($i >= 10 && $i <= 99) {
 						$a = 2;
-					}
-					if ($i >= 100 && $i <= 999) {
+					} else {  // ($i >= 100 && $i <= 999) {
 						$a = 3;
 					}
 
diff --git a/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php b/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php
index b30d54d86b4..e32ed25a551 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php
@@ -1,8 +1,9 @@
 <?php
+
 /* Copyright (C) 2017 	Laurent Destailleur <eldy@stocks.sourceforge.net>
  * Copyright (C) 2022 	Ferran Marcet       <fmarcet@2byte.es>
  * Copyright (C) 2022 	Nicolas Silobre     <nsilobre@ns-info90.fr>
- * Copyright (C) 2024	MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW				<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024   Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2024	Nick Fragoulis
  *
@@ -41,16 +42,46 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_standard_stock extends ModelePDFStock
 {
+	/**
+	 * @var int
+	 */
 	public $wref;
+	/**
+	 * @var float
+	 */
 	public $posxdesc;
+	/**
+	 * @var float
+	 */
 	public $posxlabel;
+	/**
+	 * @var float
+	 */
 	public $posxtva;
+	/**
+	 * @var float
+	 */
 	public $posxqty;
+	/**
+	 * @var float
+	 */
 	public $posxup;
+	/**
+	 * @var float
+	 */
 	public $posxunit;
+	/**
+	 * @var float
+	 */
 	public $posxdiscount;
+	/**
+	 * @var float
+	 */
 	public $postotalht;
 
+	/**
+	 * @var float
+	 */
 	public $tabTitleHeight;
 
 
@@ -390,6 +421,7 @@ class pdf_standard_stock extends ModelePDFStock
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 3, price(price2num($objp->ppmp * $objp->value, 'MT'), 0, $outputlangs), 0, 'R');
 						$totalvalue += price2num($objp->ppmp * $objp->value, 'MT');
 
+						$pricemin = 0;
 						// Price sell min
 						if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 							$pricemin = $objp->price;
@@ -806,6 +838,7 @@ class pdf_standard_stock extends ModelePDFStock
 			$sql = "SELECT max(m.datem) as datem";
 			$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
 			$sql .= " WHERE m.fk_entrepot = ".((int) $object->id);
+			$lastmovementdate = 0;
 			$resqlbis = $this->db->query($sql);
 			if ($resqlbis) {
 				$obj = $this->db->fetch_object($resqlbis);
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
index b9db4237bf7..2a6b0cc2676 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
@@ -1,11 +1,12 @@
 <?php
+
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2012 Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2018-2024 Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2021 	   Gauthier VERDOL 	    <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024	   MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	   Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1167,6 +1168,8 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 			if (!empty($thirdparty)) {
 				$carac_emetteur_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
+			} else {
+				$carac_emetteur_name = '';
 			}
 
 			if ($usecontact) {
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 e2c3747356a..d9375e93809 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2004-2014  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2008		Raphael Bertrand	<raphael.bertrand@resultic.fr>
@@ -9,7 +10,7 @@
  * Copyright (C) 2017       Ferran Marcet       <fmarcet@2byte.es>
  * Copyright (C) 2018-2025  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2021 		Gauthier VERDOL 	<gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	    Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -208,6 +209,7 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 				}
 
 				$arephoto = false;
+				$realpath = null;
 				foreach ($pdir as $midir) {
 					if (!$arephoto) {
 						$dir = $conf->product->dir_output.'/'.$midir;
@@ -640,6 +642,8 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 						$pmp = $object->lines[$i]->pmp;
 						$this->printStdColumnContent($pdf, $curY, 'subprice', price($pmp));
 						$nexY = max($pdf->GetY(), $nexY);
+					} else {
+						$pmp = 0;
 					}
 
 					// Quantity
@@ -1158,7 +1162,7 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
 			if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
-				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, $this->corner_radius, '1001', 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
+				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, $this->corner_radius, '1001', 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -1376,6 +1380,8 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 
 			if (!empty($thirdparty)) {
 				$carac_emetteur_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
+			} else {
+				$carac_emetteur_name = '';
 			}
 
 			if ($usecontact) {
diff --git a/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php b/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
index cd4fbe8617b..d59451d9be9 100644
--- a/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2010-2012 	Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
@@ -6,7 +7,7 @@
  * Copyright (C) 2018-2019  Philippe Grand      <philippe.grand@atoo-net.com>
  * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2019       Tim Otte		    <otte@meuser.it>
- * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -244,6 +245,7 @@ class doc_generic_supplier_invoice_odt extends ModelePDFSuppliersInvoices
 			if ($object->specimen) {
 				$dir = $conf->fournisseur->facture->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
+				$objectref = 'SPECIMEN_REF';
 			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
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 a7a636f772b..3e8769e6c01 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -1,9 +1,10 @@
 <?php
+
 /* Copyright (C) 2010-2011  Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2010-2014  Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2018-2025  Frédéric France      <frederic.france@free.fr>
- * Copyright (C) 2024		MDW					 <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					 <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	    Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -872,7 +873,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
 			if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
-				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, $this->corner_radius, '1001', 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
+				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, $this->corner_radius, '1001', 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index f6407073b83..fcfa4212862 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2010-2012 	Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
@@ -6,7 +7,7 @@
  * Copyright (C) 2018-2019  Philippe Grand      <philippe.grand@atoo-net.com>
  * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2019       Tim Otte		    <otte@meuser.it>
- * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -241,6 +242,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 			if ($object->specimen) {
 				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
+				$objectref = "SPECIMEN_REF";
 			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
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 473940db31d..aa68bdd09e7 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2004-2014 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2011 Regis Houssin         <regis.houssin@inodbox.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
@@ -7,7 +8,7 @@
  * Copyright (C) 2017      Ferran Marcet         <fmarcet@2byte.es>
  * Copyright (C) 2018-2025  Frédéric France       <frederic.france@free.fr>
  * Copyright (C) 2023	   William Mead		     <william.mead@manchenumerique.fr>
- * Copyright (C) 2024	   MDW					 <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					 <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	   Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -313,7 +314,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				// Does we have at least one line with discount $this->atleastonediscount
 				foreach ($object->lines as $line) {
 					if ($line->remise_percent) {
-						$this->atleastonediscount = true;
+						$this->atleastonediscount = 1;
 						break;
 					}
 				}
@@ -1176,7 +1177,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
 			if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
-				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, $this->corner_radius, '1001', 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
+				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, $this->corner_radius, '1001', 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
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 57d7a1b521b..384dd3fdd68 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2004-2014 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2011 Regis Houssin         <regis.houssin@inodbox.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
@@ -6,7 +7,7 @@
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2017      Ferran Marcet         <fmarcet@2byte.es>
  * Copyright (C) 2018-2025  Frédéric France       <frederic.france@free.fr>
- * Copyright (C) 2024	   MDW					 <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	   Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1030,7 +1031,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
 			if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
-				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, $this->corner_radius, '1001', 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
+				$pdf->RoundedRect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, $this->corner_radius, '1001', 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
index 1599ca8e222..21fe26a01f2 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
@@ -1,8 +1,9 @@
 <?php
+
 /* Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024-2025  Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -150,6 +151,7 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql .= " AND entity = ".$conf->entity;
 
+		$max = 0;
 		$resql = $db->query($sql);
 		if ($resql) {
 			$obj = $db->fetch_object($resql);
diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
index 01b04b0a338..00c5ae97dac 100644
--- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
@@ -6,7 +7,7 @@
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2011-2016 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -40,21 +41,67 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // requir
  */
 abstract class ModelePDFSuppliersOrders extends CommonDocGenerator
 {
+	/**
+	 * @var float
+	 */
 	public $posxpicture;
+	/**
+	 * @var float
+	 */
 	public $posxtva;
+	/**
+	 * @var float
+	 */
 	public $posxup;
+	/**
+	 * @var float
+	 */
 	public $posxqty;
+	/**
+	 * @var float
+	 */
 	public $posxunit;
+	/**
+	 * @var float
+	 */
 	public $posxdesc;
+	/**
+	 * @var float
+	 */
 	public $posxdiscount;
+	/**
+	 * @var float
+	 */
 	public $postotalht;
 
+	/**
+	 * @var array<string,float>
+	 */
 	public $tva;
+	/**
+	 * @var array<string,array{amount:float}>
+	 */
 	public $tva_array;
+	/**
+	 * Local tax rates Array[tax_type][tax_rate]
+	 *
+	 * @var array<int,array<string,float>>
+	 */
 	public $localtax1;
+	/**
+	 * Local tax rates Array[tax_type][tax_rate]
+	 *
+	 * @var array<int,array<string,float>>
+	 */
 	public $localtax2;
 
+	/**
+	 * @var int<0,1>
+	 */
 	public $atleastoneratenotnull = 0;
+	/**
+	 * @var int<0,1>
+	 */
 	public $atleastonediscount = 0;
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
index 17437d579de..29d582b9b7b 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
@@ -1,10 +1,11 @@
 <?php
+
 /* Copyright (C) 2010-2011  Juanjo Menent               <jmenent@2byte.es>
  * Copyright (C) 2010-2014  Laurent Destailleur         <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Marcos García               <marcosgdf@gmail.com>
  * Copyright (C) 2022       Ferran Marcet               <fmarcet@2byte.es>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	    Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -73,12 +74,33 @@ class pdf_standard_supplierpayment extends ModelePDFSuppliersPayments
 	 */
 	public $version = 'dolibarr';
 
+	/**
+	 * @var float
+	 */
 	public $posxdate;
+	/**
+	 * @var float
+	 */
 	public $posxreffacturefourn;
+	/**
+	 * @var float
+	 */
 	public $posxreffacture;
+	/**
+	 * @var float
+	 */
 	public $posxtype;
+	/**
+	 * @var float
+	 */
 	public $posxtotalht;
+	/**
+	 * @var float
+	 */
 	public $posxtva;
+	/**
+	 * @var float
+	 */
 	public $posxtotalttc;
 
 
diff --git a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
index c1046c3885a..9dd7398e304 100644
--- a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
+++ b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
@@ -1,8 +1,9 @@
 <?php
+
 /* Copyright (C) 2010-2012 	Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2018-2024	Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -293,6 +294,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
 
+				$contactobject = null;
 				// Recipient name
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
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 78f9e00ca36..07c40904605 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
@@ -1,8 +1,9 @@
 <?php
+
 /* Copyright (C) 2010-2012 	Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2018-2024	Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -327,6 +328,7 @@ class doc_generic_user_odt extends ModelePDFUser
 					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
 
+				$contactobject = null;
 				// Recipient name
 				if (!empty($usecontact)) {
 					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index 28613252aa7..f4b674f8663 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -1,6 +1,8 @@
 <?php
+
 /* Copyright (C) 2005-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.com>
  *
  * This file is a modified version of datepicker.php from phpBSM to fix some
  * bugs, to add new features and to dramatically increase speed.
@@ -128,7 +130,7 @@ $hookmanager->initHooks(array('searchform'));
 // Define $searchform
 $searchform = '';
 
-if ($conf->use_javascript_ajax && 1 == 2) {   // select2 is not best with smartphone
+if ($conf->use_javascript_ajax && 1 == 2) {   // select2 is not best with smartphone @phan-suppress-current-line PhanPluginBothLiteralsBinaryOp
 	if (!is_object($form)) {
 		$form = new Form($db);
 	}
@@ -142,7 +144,7 @@ if ($conf->use_javascript_ajax && 1 == 2) {   // select2 is not best with smartp
 
 	$i = 0;
 	$accesskeyalreadyassigned = array();
-	foreach ($arrayresult as $key => $val) {
+	foreach ($arrayresult as $key => $val) {  // @phan-suppress-current-line PhanEmptyForeach
 		$tmp = explode('?', $val['url']);
 		$urlaction = $tmp[0];
 		$keysearch = 'search_all';
@@ -162,7 +164,7 @@ if ($conf->use_javascript_ajax && 1 == 2) {   // select2 is not best with smartp
 
 
 // Execute hook printSearchForm
-$parameters = array('searchform'=>$searchform);
+$parameters = array('searchform' => $searchform);
 $reshook = $hookmanager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
 if (empty($reshook)) {
 	$searchform .= $hookmanager->resPrint;
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index 1caee516fb9..86506de45d0 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2010-2012 Regis Houssin       <regis.houssin@inodbox.com>
  * Copyright (C) 2010-2016 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -41,6 +42,10 @@ if (empty($object) || !is_object($object)) {
 	print "Error, template page ".basename(__FILE__)." can't be called with no object defined.";
 	exit;
 }
+'
+@phan-var-force ?string $fk_element
+@phan-var-force ?Task[] $tasksarray
+';
 
 ?>
 
diff --git a/htdocs/core/tpl/commonfields_view.tpl.php b/htdocs/core/tpl/commonfields_view.tpl.php
index b96eaafb67b..5122a2e7944 100644
--- a/htdocs/core/tpl/commonfields_view.tpl.php
+++ b/htdocs/core/tpl/commonfields_view.tpl.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -39,6 +40,10 @@ if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit(1);
 }
+
+'
+@phan-var-force ?string $keyforbreak
+';
 if (!is_object($form)) {
 	$form = new Form($db);
 }
@@ -50,7 +55,7 @@ if (!is_object($form)) {
 $object->fields = dol_sort_array($object->fields, 'position');
 
 foreach ($object->fields as $key => $val) {
-	if (!empty($keyforbreak) && $key == $keyforbreak) {
+	if (isset($keyforbreak) && !empty($keyforbreak) && $key == $keyforbreak) {
 		break; // key used for break on second column
 	}
 
@@ -139,7 +144,7 @@ $rightpart = '';
 $alreadyoutput = 1;
 foreach ($object->fields as $key => $val) {
 	if ($alreadyoutput) {
-		if (!empty($keyforbreak) && $key == $keyforbreak) {
+		if (isset($keyforbreak) && !empty($keyforbreak) && $key == $keyforbreak) {
 			$alreadyoutput = 0; // key used for break on second column
 		} else {
 			continue;
@@ -166,7 +171,7 @@ foreach ($object->fields as $key => $val) {
 	if ($val['type'] == 'text' || $val['type'] == 'html') {
 		$rightpart .= ' tdtop';
 	}
-	$rightpart.= '">';
+	$rightpart .= '">';
 	$labeltoshow = '';
 	if (!empty($val['help'])) {
 		$labeltoshow .= $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
@@ -206,7 +211,7 @@ foreach ($object->fields as $key => $val) {
 				$out = $object->showOutputField($val, $key, $value, '', '', '', 0);
 				$rightpart .= showValueWithClipboardCPButton($out, 0, $out);
 			} else {
-				$rightpart.= $object->showOutputField($val, $key, $value, '', '', '', 0);
+				$rightpart .= $object->showOutputField($val, $key, $value, '', '', '', 0);
 			}
 		}
 		if (preg_match('/^(text|html)/', $val['type'])) {
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 77251d73be8..a5a3b64cf32 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2013-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2015-2016  Charlie BENKE 	        <charlie@patas-monkey.com>
  * Copyright (C) 2021-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW					    <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					    <mdeweerd@users.noreply.github.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
@@ -32,6 +32,12 @@
  * @var User $user
  * @var ?string $permission
  */
+'
+@phan-var-force ?CommonObject $object
+@phan-var-force ?CommonObject $objectsrc
+@phan-var-force ?string $permission
+';
+
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
@@ -39,11 +45,6 @@ if (empty($object) || !is_object($object)) {
 }
 
 
-'
-@phan-var-force ?CommonObject $object
-@phan-var-force ?CommonObject $objectsrc
-@phan-var-force ?string $permission
-';
 if (empty($preselectedtypeofcontact)) {
 	$preselectedtypeofcontact = 0;
 }
@@ -128,7 +129,7 @@ if ($permission) {
 		<div class="tagtd"><span class="paddingleft"><?php echo getDolGlobalString('MAIN_INFO_SOCIETE_NOM'); ?></span></div>
 		<!--  <div class="nowrap tagtd"><?php echo img_object('', 'user').' '.$langs->trans("Users"); ?></div> -->
 		<div class="tagtd maxwidthonsmartphone">
-		<?php echo img_object('', 'user', 'class="pictofixedwidth"').$form->select_dolusers($user->id, 'userid', 1, (!empty($userAlreadySelected) ? $userAlreadySelected : null), 0, '', '', 0, 56, 0, '', 0, '', 'minwidth100imp widthcentpercentminusxx maxwidth400 userselectcontact');
+		<?php echo img_object('', 'user', 'class="pictofixedwidth"').$form->select_dolusers($user->id, 'userid', 1, (!empty($userAlreadySelected) ? $userAlreadySelected : null), 0, '', '', '0', 56, 0, '', 0, '', 'minwidth100imp widthcentpercentminusxx maxwidth400 userselectcontact');
 		if (empty($hideaddcontactforgroups) && $module == 'project') {
 			print '<span> '.$langs->trans("or").' </span>';
 			echo img_object('', 'group', 'class="pictofixedwidth"').$form->select_dolgroups(0, 'groupid', 1, '', 0, '', array(), '0', false, 'minwidth100imp widthcentpercentminusxx maxwidth400 groupselectcontact');
@@ -384,6 +385,7 @@ print "<!-- TEMPLATE CONTACTS HOOK BEGIN HERE -->\n";
 if (is_object($hookmanager)) {
 	$hookmanager->initHooks(array('contacttpl'));
 	$parameters = array();
+	// @phan-suppress-next-line PhanTypeMismatchArgumentNullable
 	$reshook = $hookmanager->executeHooks('formContactTpl', $parameters, $object, $action);
 }
 print "<!-- END PHP TEMPLATE CONTACTS -->\n";
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index 31c19e08a7c..30d32ca1f6f 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -1,9 +1,11 @@
 <?php
+
 /* Copyright (C)    2013      Cédric Salvador     <csalvador@gpcsolutions.fr>
  * Copyright (C)    2013-2014 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C)	2015	  Marcos García		  <marcosgdf@gmail.com>
  * Copyright (C) 	2019	  Nicolas ZABOURI     <info@inovea-conseil.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -40,6 +42,14 @@ if (empty($langs) || !is_object($langs)) {
 	print "Error, template page can't be called as URL";
 	exit(1);
 }
+'
+@phan-var-force array<array{name:string,path:string,level1name:string,relativename:string,fullname:string,date:string,size:int,perm:int,type:string,position_name:string,cover:string,keywords:string,acl:string,rowid:int,label:string,share:string}> $filearray
+@phan-var-force ?int<0,1> $permtoedit
+@phan-var-force ?int<0,1> $permission
+@phan-var-force int<0,1> $permissiontoadd
+@phan-var-force ?string $savingdocmask
+@phan-var-force ?string $param
+';
 
 
 $langs->load("link");
@@ -67,7 +77,7 @@ if (in_array($modulepart, array('product', 'produit', 'societe', 'user', 'ticket
 	$disablemove = 0;
 }
 $parameters = array();
-$reshook = $hookmanager->executeHooks('isLinkedDocumentObjectNotMovable', $parameters, $object);
+$reshook = $hookmanager->executeHooks('isLinkedDocumentObjectNotMovable', $parameters, $object);  // @phan-suppress-current-line PhanTypeMismatchArgumentNullable
 if ($reshook) {
 	$disablemove = $hookmanager->resArray['disablemove'];
 }
@@ -191,7 +201,7 @@ $formfile->listOfLinks(
 	$object,
 	$permission,
 	$action,
-	GETPOSTINT('linkid'),
+	(string) GETPOSTINT('linkid'),
 	$param,
 	'formaddlink',
 	array('afterlinktitle' => $formToAddALink, 'showhideaddbutton' => 1)
diff --git a/htdocs/core/tpl/extrafields_edit.tpl.php b/htdocs/core/tpl/extrafields_edit.tpl.php
index 7d72a0cae3b..e2d6f68df44 100644
--- a/htdocs/core/tpl/extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/extrafields_edit.tpl.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2014	    Maxime Kohlhaas			<support@atm-consulting.fr>
  * Copyright (C) 2014	    Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -24,15 +25,15 @@
  * $parameters
  */
 
- /**
- * @var CommonObject $object
- * @var Conf $conf
- * @var ExtraFields $extrafields
- * @var HookManager $hookmanager
- * @var Translate $langs
- * @var string $action
- * @var array<string,mixed> $parameters
- */
+/**
+* @var CommonObject $object
+* @var Conf $conf
+* @var ExtraFields $extrafields
+* @var HookManager $hookmanager
+* @var Translate $langs
+* @var string $action
+* @var array<string,mixed> $parameters
+*/
 
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
@@ -62,6 +63,7 @@ if (!isset($parameters)) {
 @phan-var-force Conf $conf
 @phan-var-force Translate $conf
 @phan-var-force array<string,mixed> $parameters
+@phan-var-force ?string $tpl_context
 ';
 
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index 372e4341b90..d5b4979dcce 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -1,10 +1,16 @@
 <?php
 
+/* Copyright (C) 2025		MDW	<mdeweerd@users.noreply.github.com>
+ */
+
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit(1);
 }
+'
+@phan-var-force ?int<0,1> $disablesortlink
+';
 
 if (empty($extrafieldsobjectkey) && is_object($object)) {
 	$extrafieldsobjectkey = $object->table_element;
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index 7f46d5e76cc..63318ea609e 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -35,6 +35,14 @@ if (empty($conf) || !is_object($conf)) {
 	exit;
 }
 
+'
+@phan-var-force Website $website
+@phan-var-force string $filepathnoext
+@phan-var-force string $pageid
+@phan-var-force EcmDirectory $ecmdir
+@phan-var-force int $section
+';
+
 ?>
 
 <!-- BEGIN PHP TEMPLATE core/tpl/filemanager.tpl.php -->
@@ -50,8 +58,6 @@ if (empty($module)) {
 	$module = 'ecm';
 }
 
-'@phan-var-force Website $website';
-
 $permtoadd = 0;
 $permtoupload = 0;
 $showroot = 0;
@@ -106,6 +112,7 @@ if ($module == 'ecm') {
 	print '</a>';
 }
 if ($permtoadd && GETPOSTISSET('website')) {	// If on file manager to manage medias of a web site
+	// @phan-suppress-next-line PhanTypeExpectedObjectPropAccess
 	print '<a id="agenerateimgwebp" href="'.$_SERVER["PHP_SELF"].'?action=confirmconvertimgwebp&token='.newToken().'&website='.urlencode($website->ref).'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans("GenerateImgWebp")).'">';
 	print img_picto('', 'images', '', 0, 0, 0, '', 'size15x flip marginrightonly');
 	print '</a>';
@@ -218,7 +225,7 @@ if ($action == 'confirmconvertimgwebp') {
 	$formquestion['section'] = array('type' => 'hidden', 'value' => $section, 'name' => 'section');
 	$formquestion['filetoregenerate'] = array('type' => 'hidden', 'value' => $file, 'name' => 'filetoregenerate');
 	if ($module == 'medias') {
-		$formquestion['website'] = array('type' => 'hidden', 'value' => $website->ref, 'name' => 'website');
+		$formquestion['website'] = array('type' => 'hidden', 'value' => $website->ref, 'name' => 'website');  // @phan-suppress-current-line PhanTypeExpectedObjectPropAccess
 	}
 	$param = '';
 	if (!empty($sortfield)) {
diff --git a/htdocs/core/tpl/formlayoutai.tpl.php b/htdocs/core/tpl/formlayoutai.tpl.php
index 4bae7f2551d..79e6db0ba9c 100644
--- a/htdocs/core/tpl/formlayoutai.tpl.php
+++ b/htdocs/core/tpl/formlayoutai.tpl.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2024  Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -54,6 +54,9 @@ if (empty($htmlname)) {
 @phan-var-force ?FormMail 		$formmail
 @phan-var-force string 			$showlinktolayout
 @phan-var-force string			$showlinktolayoutlabel
+@phan-var-force string          $showlinktoai
+@phan-var-force string          $showlinktoailabel
+@phan-var-force ?string         $out
 ';
 
 if (!isset($out)) {
diff --git a/htdocs/core/tpl/list_print_total.tpl.php b/htdocs/core/tpl/list_print_total.tpl.php
index d79d844484c..397328e146a 100644
--- a/htdocs/core/tpl/list_print_total.tpl.php
+++ b/htdocs/core/tpl/list_print_total.tpl.php
@@ -1,5 +1,7 @@
 <?php
+
 /* Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW					<mdeweerd@users.noreply.github.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
@@ -21,7 +23,10 @@
  * @var Form $form
  * @var Translate $langs
  */
-'@phan-var-force array{nbfield:int,type?:array<int,string>,pos?:array<int,int>,val?:array<int,float>} $totalarray';
+'
+@phan-var-force array{nbfield:int,type?:array<int,string>,pos?:array<int,int>,val?:array<int,float>} $totalarray
+@phan-var-force ?string $sqlfields
+';
 
 if (!function_exists('printTotalValCell')) { // allow two list with total on same screen
 
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 996bf17dcef..5b6da9dc1de 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -1,8 +1,9 @@
 <?php
+
 /* Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013-2014  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2015	    Marcos García		    <marcosgdf@gmail.com>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -55,8 +56,12 @@
  * @var int[] $arrayofselected
  */
 '
+@phan-var-force string $string
 @phan-var-force CommonObject $objecttmp
 @phan-var-force int[] $toselect
+@phan-var-force ?string $uploaddir
+@phan-var-force int<0,1> $withmaindocfilemail
+@phan-var-force string $sendto
 ';
 
 if (!empty($sall) || !empty($search_all)) {
@@ -81,7 +86,7 @@ if ($massaction == 'preclonetasks') {
 	$formquestion = array(
 		// TODO If list of project is long and project is not on a thirdparty, the combo may be very long.
 		// Solution: Allow only sameproject for cloning tasks ?
-		array('type' => 'other', 'name' => 'projectid', 'label' => $langs->trans('Project') .': ', 'value' => $form->selectProjects($object->id, 'projectid', '', 0, 1, '', 0, array(), $object->socid, '1', 1, '', null, 1)),
+		array('type' => 'other', 'name' => 'projectid', 'label' => $langs->trans('Project') .': ', 'value' => $form->selectProjects($object->id, 'projectid', '', 0, 1, '', 0, array(), $object->socid, '1', 1, '', array(), 1)),
 	);
 	print $form->formconfirm($_SERVER['PHP_SELF'] . '?id=' . $object->id . $selected, $langs->trans('ConfirmMassClone'), '', 'clonetasks', $formquestion, '', 1, 300, 590);
 }
@@ -113,7 +118,7 @@ if ($massaction == 'preaffecttag' && isModEnabled('category')) {
 				'type' => 'other',
 				'name' => 'affecttag_'.$categ_type['code'],
 				'label' => '',
-				'value' => $form->multiselectarray('contcats_'.$categ_type['code'], $categ_arbo_tmp, GETPOST('contcats_'.$categ_type['code'], 'array'), null, null, '', 0, '60%', '', '', $langs->transnoentitiesnoconv("SelectTheTagsToAssign"))
+				'value' => $form->multiselectarray('contcats_'.$categ_type['code'], $categ_arbo_tmp, GETPOST('contcats_'.$categ_type['code'], 'array'), 0, 0, '', 0, '60%', '', '', $langs->transnoentitiesnoconv("SelectTheTagsToAssign"))
 			);
 		}
 		$formquestion[] = array(
@@ -418,7 +423,7 @@ if ($massaction == 'presetcommercial') {
 	$formquestion[] = array('type' => 'other',
 			'name' => 'affectedcommercial',
 			'label' => $form->editfieldkey('AllocateCommercial', 'commercial_id', '', $object, 0),
-			'value' => $form->multiselectarray('commercial', $userlist, null, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0, '', '', '', 1));
+			'value' => $form->multiselectarray('commercial', $userlist, array(), 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0, '', '', '', 1));
 	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmAllocateCommercial"), $langs->trans("ConfirmAllocateCommercialQuestion", count($toselect)), "affectcommercial", $formquestion, 1, 0, 200, 500, 1);
 }
 if ($massaction == 'unsetcommercial') {
@@ -427,7 +432,7 @@ if ($massaction == 'unsetcommercial') {
 	$formquestion[] = array('type' => 'other',
 		'name' => 'unassigncommercial',
 		'label' => $form->editfieldkey('UnallocateCommercial', 'commercial_id', '', $object, 0),
-		'value' => $form->multiselectarray('commercial', $userlist, null, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0, '', '', '', 1));
+		'value' => $form->multiselectarray('commercial', $userlist, array(), 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0, '', '', '', 1));
 	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmUnallocateCommercial"), $langs->trans("ConfirmUnallocateCommercialQuestion", count($toselect)), "unassigncommercial", $formquestion, 1, 0, 200, 500, 1);
 }
 
@@ -437,7 +442,7 @@ if ($massaction == 'preapproveleave') {
 
 // Allow Pre-Mass-Action hook (eg for confirmation dialog)
 if (empty($toselect)) {
-	$toselect=[];
+	$toselect = [];
 }
 $parameters = array(
 	'toselect' => &$toselect,
@@ -445,6 +450,7 @@ $parameters = array(
 	'massaction' => $massaction
 );
 
+// @phan-suppress-next-line PhanTypeMismatchArgumentNullable
 $reshook = $hookmanager->executeHooks('doPreMassActions', $parameters, $object, $action);
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index 00a07c89b85..c78acbae1e0 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2013      Florian Henry	   <florian.henry@open-concept.pro>
  * Copyright (C) 2014-2020 Laurent Destailleur <eldy@destailleur.fr>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -31,6 +32,11 @@ if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
 	exit(1);
 }
+'
+@phan-var-force ?int<0,1> $permissionnote
+@phan-var-force string $moreparam
+@phan-var-force ?int $colwidth
+';
 
 // $permissionnote 	must be defined by caller. For example $permissionnote=$user->rights->module->create
 // $cssclass   		must be defined by caller. For example $cssclass='fieldtitle'
@@ -126,7 +132,7 @@ print '<div class="tagtable border table-border tableforfield centpercent">'."\n
 print '<div class="tagtr table-border-row">'."\n";
 $editmode = (GETPOST('action', 'aZ09') == 'edit'.$note_public);
 print '<div class="tagtd tagtdnote tdtop'.($editmode ? '' : ' sensiblehtmlcontent').' table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
-print $form->editfieldkey((empty($textNotePub) ? "NotePublic" : $textNotePub), $note_public, $value_public, $object, $permission, $typeofdatapub, $moreparam, '', 0);
+print $form->editfieldkey((empty($textNotePub) ? "NotePublic" : $textNotePub), $note_public, $value_public, $object, $permission, $typeofdatapub, $moreparam, 0, 0);
 print '</div>'."\n";
 print '<div class="tagtd wordbreak table-val-border-col'.($editmode ? '' : ' sensiblehtmlcontent').'">'."\n";
 print $form->editfieldval("NotePublic", $note_public, $value_public, $object, $permission, $typeofdatapub, '', null, null, $moreparam, 1)."\n";
@@ -137,7 +143,7 @@ if (empty($user->socid)) {
 	print '<div class="tagtr table-border-row">'."\n";
 	$editmode = (GETPOST('action', 'aZ09') == 'edit'.$note_private);
 	print '<div class="tagtd tagtdnote tdtop'.($editmode ? '' : ' sensiblehtmlcontent').' table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
-	print $form->editfieldkey((empty($textNotePrive) ? "NotePrivate" : $textNotePrive), $note_private, $value_private, $object, $permission, $typeofdatapriv, $moreparam, '', 0);
+	print $form->editfieldkey((empty($textNotePrive) ? "NotePrivate" : $textNotePrive), $note_private, $value_private, $object, $permission, $typeofdatapriv, $moreparam, 0, 0);
 	print '</div>'."\n";
 	print '<div class="tagtd wordbreak table-val-border-col'.($editmode ? '' : ' sensiblehtmlcontent').'">'."\n";
 	print $form->editfieldval("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdatapriv, '', null, null, $moreparam, 1);
diff --git a/htdocs/core/tpl/object_discounts.tpl.php b/htdocs/core/tpl/object_discounts.tpl.php
index f1cd115e531..d768eb3e92e 100644
--- a/htdocs/core/tpl/object_discounts.tpl.php
+++ b/htdocs/core/tpl/object_discounts.tpl.php
@@ -1,6 +1,8 @@
 <?php
+
 /* Copyright (C) 2018		ATM Consulting		<support@atm-consulting.fr>
  * Copyright (C) 2021-2024  Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW					<mdeweerd@users.noreply.github.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
@@ -17,7 +19,7 @@
  *
  * Needs the following variables defined:
  * $object					Proposal, order, invoice (including supplier versions)
- * $thirdparty				Thirdparty of object
+ * $thirdparty				Third party of object
  * $absolute_discount		Amount of fixed discounts available
  * $absolute_creditnote		Amount of credit notes available
  * $discount_type			0 => Customer discounts, 1 => Supplier discounts
@@ -30,6 +32,16 @@
  */
 print '<!-- BEGIN object_discounts.tpl.php -->'."\n";
 
+'
+@phan-var-force Propal|Commande|CommandeFournisseur|Facture|FactureFournisseur $object
+@phan-var-force Societe $thirdparty
+@phan-var-force string $backtopage
+@phan-var-force string $filtercreditnote
+@phan-var-force string $filterabsolutediscount
+@phan-var-force int<0,1> $discount_type
+@phan-var-force int $resteapayer
+';
+
 $objclassname = get_class($object);
 $isInvoice = in_array($object->element, array('facture', 'invoice', 'facture_fourn', 'invoice_supplier'));
 $isNewObject = empty($object->id) && empty($object->rowid);
@@ -91,6 +103,7 @@ if ($absolute_discount > 0) {
 	} else {
 		// Discount available of type fixed amount (not credit note)
 		$more = $addabsolutediscount;
+		// TODO: Check $resteapayer - is '$maxvalue' in form_remise_dispo()
 		$form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, GETPOST('discountid'), 'remise_id', $thirdparty->id, $absolute_discount, $filterabsolutediscount, $resteapayer, $more, 0, $discount_type);
 	}
 }
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 96cfc189c13..eca7e1a0c16 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -12,6 +12,7 @@
  * Copyright (C) 2022       OpenDSI             <support@open-dsi.fr>
  * Copyright (C) 2022       Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024       Alexandre Spangaro  <alexandre@inovea-conseil.com>
+ * Copyright (C) 2025		MDW					<mdeweerd@users.noreply.github.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
@@ -50,8 +51,13 @@ if (empty($object) || !is_object($object)) {
 	exit;
 }
 
-'@phan-var-force CommonObject $this
- @phan-var-force CommonObject $object';
+'
+@phan-var-force CommonObject $this
+@phan-var-force CommonObject $object
+@phan-var-force Societe $buyer
+@phan-var-force Societe $seller
+@phan-var-force int<0,1> $usehm
+';
 
 $usemargins = 0;
 if (isModEnabled('margin') && !empty($object->element) && in_array($object->element, array('facture', 'facturerec', 'propal', 'commande'))) {
@@ -457,6 +463,7 @@ if ($nolinesbefore) {
 		}
 		print '<td class="nobottom linecolvat right">';
 		$coldisplay++;
+		$type_tva = 0;
 		if ($object->element == 'propal' || $object->element == 'commande' || $object->element == 'facture' || $object->element == 'facturerec') {
 			$type_tva = 1;
 		} elseif ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier' || $object->element == 'invoice_supplier_rec') {
@@ -487,7 +494,7 @@ if ($nolinesbefore) {
 		<td class="nobottom linecoluttc right">
 			<input type="text" name="price_ttc" id="price_ttc" class="flat right width50" value="<?php echo(GETPOSTISSET("price_ttc") ? GETPOST("price_ttc", 'alpha', 2) : ''); ?>">
 		</td>
-			<?php
+					<?php
 	}
 	$coldisplay++;
 	?>
@@ -526,21 +533,21 @@ if ($nolinesbefore) {
 			$coldisplay++; ?>
 			<td class="nobottom margininfos linecolmargin right">
 				<!-- For predef product -->
-					<?php if (isModEnabled("product") || isModEnabled("service")) { ?>
+						<?php if (isModEnabled("product") || isModEnabled("service")) { ?>
 					<select id="fournprice_predef" name="fournprice_predef" class="flat minwidth75imp maxwidth150" style="display: none;"></select>
-					<?php } ?>
+						<?php } ?>
 				<!-- For free product -->
 				<input type="text" id="buying_price" name="buying_price" class="flat maxwidth75 right" value="<?php echo(GETPOSTISSET("buying_price") ? GETPOST("buying_price", 'alpha', 2) : ''); ?>">
 			</td>
-				<?php
-				if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
-					echo '<td class="nobottom nowraponall margininfos right"><input class="flat right width40" type="text" id="np_marginRate" name="np_marginRate" value="'.(GETPOSTISSET("np_marginRate") ? GETPOST("np_marginRate", 'alpha', 2) : '').'"><span class="np_marginRate opacitymedium hideonsmartphone">%</span></td>';
-					$coldisplay++;
-				}
-				if (getDolGlobalString('DISPLAY_MARK_RATES')) {
-					echo '<td class="nobottom nowraponall margininfos right"><input class="flat right width40" type="text" id="np_markRate" name="np_markRate" value="'.(GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : '').'"><span class="np_markRate opacitymedium hideonsmartphone">%</span></td>';
-					$coldisplay++;
-				}
+						<?php
+						if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
+							echo '<td class="nobottom nowraponall margininfos right"><input class="flat right width40" type="text" id="np_marginRate" name="np_marginRate" value="'.(GETPOSTISSET("np_marginRate") ? GETPOST("np_marginRate", 'alpha', 2) : '').'"><span class="np_marginRate opacitymedium hideonsmartphone">%</span></td>';
+							$coldisplay++;
+						}
+						if (getDolGlobalString('DISPLAY_MARK_RATES')) {
+								echo '<td class="nobottom nowraponall margininfos right"><input class="flat right width40" type="text" id="np_markRate" name="np_markRate" value="'.(GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : '').'"><span class="np_markRate opacitymedium hideonsmartphone">%</span></td>';
+								$coldisplay++;
+						}
 		}
 	}
 	$coldisplay += $colspan;
@@ -561,6 +568,8 @@ if ((isModEnabled("service") || ($object->element == 'contrat')) && $dateSelecto
 	$date_end = dol_mktime(GETPOSTINT('date_starthour'), GETPOSTINT('date_startmin'), 0, GETPOSTINT('date_endmonth'), GETPOSTINT('date_endday'), GETPOSTINT('date_endyear'));
 
 	$prefillDates = false;
+	$date_start_prefill = 0;
+	$date_end_prefill = 0;
 
 	if (getDolGlobalString('MAIN_FILL_SERVICE_DATES_FROM_LAST_SERVICE_LINE') && !empty($object->lines)) {
 		for ($i = count($object->lines) - 1; $i >= 0; $i--) {
@@ -815,7 +824,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 				}
 			}
 		});
-			<?php
+							<?php
 		} ?>
 
 		/* When changing predefined product, we reload list of supplier prices required for margin combo */
@@ -932,7 +941,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 								if (getDolGlobalInt('PRODUIT_AUTOFILL_DESC') == 1) {
 									if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) { ?>
 							var proddesc = data.desc_trans;
-										<?php
+														<?php
 									} else { ?>
 							var proddesc = data.desc;
 										<?php
@@ -947,7 +956,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 									editor.setData(proddesc);
 								}
 							}
-										<?php
+														<?php
 									} else { ?>
 							jQuery('#dp_desc').text(proddesc);
 										<?php
@@ -959,13 +968,13 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 								jQuery.each(data.array_options, function( key, value ) {
 									jQuery('div[class*="det'+key.replace('options_','_extras_')+'"] > #'+key).val(value);
 								});
-									<?php
+													<?php
 								} ?>
 						},
 						'json'
 					);
 				}
-					<?php
+							<?php
 			}
 
 			if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 58ccc4e50ff..b34c3e3a33f 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2017		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2022		OpenDSI				<support@open-dsi.fr>
- * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Alexandre Spangaro  <alexandre@inovea-conseil.com>
  * Copyright (C) 2024       Frédéric France		  <frederic.france@free.fr>
  *
@@ -75,6 +75,7 @@ if (empty($object) || !is_object($object)) {
 @phan-var-force ?Product $product_static
 @phan-var-force string $text
 @phan-var-force string $description
+@phan-var-force Object $objp
 ';
 
 global $mysoc;
@@ -128,7 +129,7 @@ $coldisplay = 0;
 <?php
 
 
-$parameters = ['line' => $line, 'i' =>& $i, 'coldisplay' =>& $coldisplay];
+$parameters = ['line' => $line, 'i' => & $i, 'coldisplay' => & $coldisplay];
 $reshook = $hookmanager->executeHooks('objectLineView_BeforeProduct', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
@@ -274,7 +275,7 @@ if (($line->info_bits & 2) == 2) {
 	}
 
 
-	$parameters = ['line' => $line, 'i' =>& $i, 'coldisplay' =>& $coldisplay];
+	$parameters = ['line' => $line, 'i' => & $i, 'coldisplay' => & $coldisplay];
 	$reshook = $hookmanager->executeHooks('objectLineView_BeforeProductExtrafield', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Line extrafield
@@ -288,7 +289,7 @@ if (($line->info_bits & 2) == 2) {
 	}
 }
 
-$parameters = ['line' => $line, 'i' =>& $i, 'coldisplay' =>& $coldisplay];
+$parameters = ['line' => $line, 'i' => & $i, 'coldisplay' => & $coldisplay];
 $reshook = $hookmanager->executeHooks('objectLineView_ProductSupplier', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (empty($reshook)) {
diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index 9853bffe6c5..5b5b2dbb025 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2003-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2004-2019	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2009-2012	Regis Houssin			    <regis.houssin@inodbox.com>
@@ -7,7 +8,7 @@
  * Copyright (C) 2013       Florian Henry		  	  <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2017-2024  Frédéric France       <frederic.france@free.fr>
- * Copyright (C) 2024		    MDW							      <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							      <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2023-2024  Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1486,6 +1487,7 @@ class FactureFournisseurRec extends CommonInvoice
 					'facturerec' => $facturerec, // it's an object which PHP passes by "reference", so modifiable by hooks.
 					'this'       => $this, // it's an object which PHP passes by "reference", so modifiable by hooks.
 				);
+				// @phan-suppress-next-line PhanTypeMismatchArgumentNullable
 				$reshook = $hookmanager->executeHooks('afterCreationOfRecurringInvoice', $parameters, $new_fac_fourn); // note: $facture can be modified by hooks (warning: $facture can be null)
 
 				$i++;
diff --git a/htdocs/hrm/core/tpl/objectline_view.tpl.php b/htdocs/hrm/core/tpl/objectline_view.tpl.php
index 937a359ce94..2fb438a9f55 100644
--- a/htdocs/hrm/core/tpl/objectline_view.tpl.php
+++ b/htdocs/hrm/core/tpl/objectline_view.tpl.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -72,6 +72,7 @@ $coldisplay = 0;
 <?php } ?>
 	<td class="linecollabel"><?php $coldisplay++; ?><div id="line_<?php print $line->id; ?>"></div>
 <?php
+$resSkill = 0;
 if ($line->fk_skill > 0) {
 	$skill = new Skill($this->db);
 	$resSkill = $skill->fetch($line->fk_skill);
@@ -93,9 +94,9 @@ if ($line->fk_skill > 0) {
 <?php
 
 // Add description in form
-if ($line->fk_skill > 0 && $resSkill > 0) {
-	//print $skill->description;
-}
+//if ($line->fk_skill > 0 && $resSkill > 0) {
+//print $skill->description;
+//}
 
 ?>
 	</td>
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index e72ccc48706..13e953b0fb1 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2005		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2006-2023	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2010-2012	Regis Houssin			<regis.houssin@inodbox.com>
@@ -7,7 +8,7 @@
  * Copyright (C) 2018-2024  Frédéric France			<frederic.france@free.fr>
  * Copyright (C) 2019-2021	Christophe Battarel		<christophe@altairis.fr>
  * Copyright (C) 2023		Gauthier VERDOL			<gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Vincent de Grandpré		<vincent@de-grandpre.quebec>
  * Copyright (C) 2024		Solution Libre SAS		<contact@solution-libre.fr>
  *
@@ -50,6 +51,9 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formintervention.class.php';
  * @var Translate $langs
  * @var User $user
  */
+'
+@phan-var-force ?string $uploaddir
+';
 
 // Load translation files required by the page
 $langsLoad = array('projects', 'bills', 'orders', 'companies');
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 3010abe863e..2eca6baf62a 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2021		Waël Almoman	    	<info@almoman.com>
  * Copyright (C) 2021		Dorian Vabre			<dorian.vabre@gmail.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -52,7 +52,7 @@ if (!defined('NOBROWSERNOTIF')) {
 }
 
 if (!defined('XFRAMEOPTIONS_ALLOWALL')) {
-		define('XFRAMEOPTIONS_ALLOWALL', '1');
+	define('XFRAMEOPTIONS_ALLOWALL', '1');
 }
 
 // For MultiCompany module.
@@ -2153,6 +2153,7 @@ if ($action != 'dopayment') {
 			'source' => $source,
 			'object' => $object
 		];
+		// @phan-suppress-next-line PhanTypeMismatchArgumentNullable
 		$reshook = $hookmanager->executeHooks('doCheckStatus', $parameters, $object, $action);
 		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -2816,6 +2817,7 @@ if (preg_match('/^dopayment/', $action)) {			// If we chose/clicked on the payme
 		'tag' => GETPOST("tag", 'alpha'),
 		'dopayment' => GETPOST('dopayment', 'alpha')
 	];
+	// @phan-suppress-next-line PhanTypeMismatchArgumentNullable
 	$reshook = $hookmanager->executeHooks('doPayment', $parameters, $object, $action);
 	if ($reshook < 0) {
 		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index e50ffb1e687..ac7f9eec351 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -1,10 +1,11 @@
 <?php
+
 /* Copyright (C) 2001-2005	Rodolphe Quiedeville		<rodolphe@quiedeville.org>
  * Copyright (C) 2004-2015	Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010	Regis Houssin				<regis.houssin@capnetworks.com>
  * Copyright (C) 2016		Ferran Marcet				<fmarcet@2byte.es>
  * Copyright (C) 2023-2024	Alexandre Spangaro			<alexandre@inovea-conseil.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Benjamin Falière			<benjamin.faliere@altairis.fr>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
@@ -642,6 +643,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_s
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.rowid = ee.fk_target";
 // Add table from hooks
 $parameters = array();
+// @phan-suppress-next-line PhanTypeMismatchArgumentNullable
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= " WHERE e.entity IN (".getEntity('reception').")";
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index 64983e640de..165f96b6ad3 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2004-2014  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2008       Raphael Bertrand        <raphael.bertrand@resultic.fr>
@@ -9,7 +10,7 @@
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2017       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -696,7 +697,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 		if (empty($hidetop)) {
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
 			if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
-				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
+				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
diff --git a/htdocs/salaries/virement_request.php b/htdocs/salaries/virement_request.php
index de001535e3f..ed686d356ca 100644
--- a/htdocs/salaries/virement_request.php
+++ b/htdocs/salaries/virement_request.php
@@ -1,9 +1,10 @@
 <?php
+
 /* Copyright (C) 2005-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Charlie BENKE           <charlie@patas-monkey.com>
  * Copyright (C) 2017-2019  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2021		Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -367,6 +368,7 @@ $sql .= " AND p.fk_salary = s.rowid";
 $sql .= " AND s.entity IN (".getEntity('tax').")";
 $sql .= " ORDER BY dp DESC";
 
+$resteapayer = 0;
 //print $sql;
 $resql = $db->query($sql);
 if ($resql) {
@@ -560,7 +562,7 @@ if ($resql) {
 
 	$tmpuser = new User($db);
 
-	$num = $db->num_rows($result);
+	$num = $db->num_rows($resql);
 	if ($num > 0) {
 		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 026e4723736..64a4ff39cd3 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2002-2004  Rodolphe Quiedeville        <rodolphe@quiedeville.org>
  * Copyright (C) 2003       Jean-Louis Bergamo          <jlb@j1b.org>
  * Copyright (C) 2004-2015  Laurent Destailleur         <eldy@users.sourceforge.net>
@@ -7,7 +8,7 @@
  * Copyright (C) 2015-2016  Marcos García               <marcosgdf@gmail.com>
  * Copyright (C) 2015-2024  Alexandre Spangaro          <alexandre@inovea-conseil.com>
  * Copyright (C) 2021       Gauthier VERDOL             <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024       MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -114,8 +115,8 @@ if (empty($account->userid)) {
 
 // Define value to know what current user can do on users
 $selfpermission = ($user->id == $id && $user->hasRight('user', 'self', 'creer'));
-$usercanadd = (!empty($user->admin) || $user->hasRight('user', 'user', 'creer') || $user->hasRight('hrm', 'write_personal_information', 'write') );
-$usercanread = (!empty($user->admin) || $user->hasRight('user', 'user', 'lire') || $user->hasRight('hrm', 'read_personal_information', 'read') );
+$usercanadd = (!empty($user->admin) || $user->hasRight('user', 'user', 'creer') || $user->hasRight('hrm', 'write_personal_information', 'write'));
+$usercanread = (!empty($user->admin) || $user->hasRight('user', 'user', 'lire') || $user->hasRight('hrm', 'read_personal_information', 'read'));
 $permissiontoaddbankaccount = ($user->hasRight('salaries', 'write') || $user->hasRight('hrm', 'employee', 'write') || $user->hasRight('user', 'user', 'creer') || $selfpermission);
 $permissiontoreadhr = $user->hasRight('hrm', 'read_personal_information', 'read') || $user->hasRight('hrm', 'write_personal_information', 'write');
 $permissiontowritehr = $user->hasRight('hrm', 'write_personal_information', 'write');
@@ -1035,6 +1036,10 @@ if ($id && ($action == 'edit' || $action == 'create') && $permissiontoaddbankacc
 	foreach ($bankaccount->getFieldsToShow(1) as $val) {
 		$require = false;
 		$tooltip = '';
+		$name = 'UNKNOWN';
+		$size = '8';
+		$content = 'UNKNOWN';
+
 		if ($val == 'BankCode') {
 			$name = 'code_banque';
 			$size = 8;

From 564cd737a15a9db7b23243c853cc16a4c88e5070 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 18 Jan 2025 16:15:31 +0100
Subject: [PATCH 241/602] Qual: Fix PhanTypeMismatchArgumentNullable by
 updating PHPdoc of target function

# Qual: Fix PhanTypeMismatchArgumentNullable by updating PHPdoc of target function

Reduce the number PhanTypeMismatchArgumentNullable by updating the phpdoc
of the function that is called.  Done when the called function allows null
(empty check, or `if` test).
---
 htdocs/core/lib/functions.lib.php | 56 +++++++++++++++----------------
 htdocs/core/lib/price.lib.php     |  6 ++--
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c38c902e1c6..9a37d1404bf 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3427,7 +3427,7 @@ function dol_strftime($fmt, $ts = false, $is_gmt = false)
  *	Output date in a string format according to outputlangs (or langs if not defined).
  * 	Return charset is always UTF-8, except if encodetoouput is defined. In this case charset is output charset
  *
- *	@param	int|string	$time			GM Timestamps date
+ *	@param	null|int|string	$time		GM Timestamps date
  *	@param	string		$format      	Output date format (tag of strftime function)
  *										"%d %b %Y",
  *										"%d/%m/%Y %H:%M",
@@ -3449,7 +3449,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 	global $conf, $langs;
 
 	// If date undefined or "", we return ""
-	if (dol_strlen($time) == 0) {
+	if (dol_strlen((string) $time) == 0) {
 		return ''; // $time=0 allowed (it means 01/01/1970 00:00:00)
 	}
 
@@ -5788,7 +5788,7 @@ function img_error($titlealt = 'default')
  *	Show next logo
  *
  *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
-*	@param	string	$moreatt	Add more attribute on img tag (For example 'style="float: right"')
+ *	@param	string	$moreatt	Add more attribute on img tag (For example 'style="float: right"')
  *	@return string      		Return img tag
  */
 function img_next($titlealt = 'default', $moreatt = '')
@@ -6264,16 +6264,16 @@ function dol_print_error_email($prefixcode, $errormessage = '', $errormessages =
 /**
  *	Show title line of an array
  *
- *	@param	string	$name        Label of field
+ *	@param	?string	$name        Label of field
  *	@param	string	$file        Url used when we click on sort picto
  *	@param	string	$field       Field to use for new sorting
  *	@param	string	$begin       ("" by default)
  *	@param	string	$moreparam   Add more parameters on sort url links ("" by default)
  *	@param  string	$moreattrib  Options of attribute td ("" by default)
- *	@param  string	$sortfield   Current field used to sort
- *	@param  string	$sortorder   Current sort order
+ *	@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, for example 'mycss '.
- *  @param	string	$tooltip	 Tooltip
+ *  @param	?string	$tooltip	 Tooltip
  *  @param	int		$forcenowrapcolumntitle		No need for use 'wrapcolumntitle' css style
  *	@return	void
  */
@@ -6285,19 +6285,19 @@ function print_liste_field_titre($name, $file = "", $field = "", $begin = "", $m
 /**
  *	Get title line of an array
  *
- *	@param	string	$name        		Translation key of field to show or complete HTML string to show
- *	@param	int		$thead		 		0=To use with standard table format, 1=To use inside <thead><tr>, 2=To use with <div>
- *	@param	string	$file        		Url used when we click on sort picto
- *	@param	string	$field       		Field to use for new sorting. Empty if this field is not sortable. Example "t.abc" or "t.abc,t.def"
- *	@param	string	$begin       		("" by default)
- *	@param	string	$moreparam   		Add more parameters on sort url links ("" by default)
- *	@param  string	$moreattrib  		Add more attributes on th ("" by default). To add more css class, use param $prefix.
- *	@param  string	$sortfield   		Current field used to sort (Ex: 'd.datep,d.id')
- *	@param  string	$sortorder   		Current sort order (Ex: 'asc,desc')
- *  @param	string	$prefix		 		Prefix for css. Use space after prefix to add your own CSS tag, for example 'mycss '.
- *  @param	int 	$disablesortlink	1=Disable sort link
- *  @param	string	$tooltip	 		Tooltip
- *  @param	int 	$forcenowrapcolumntitle		No need for use 'wrapcolumntitle' css style
+ *	@param	?string		$name			Translation key of field to show or complete HTML string to show
+ *	@param	int<0,2>	$thead	 		0=To use with standard table format, 1=To use inside <thead><tr>, 2=To use with <div>
+ *	@param	string		$file			Url used when we click on sort picto
+ *	@param	string		$field			Field to use for new sorting. Empty if this field is not sortable. Example "t.abc" or "t.abc,t.def"
+ *	@param	string		$begin       		("" by default)
+ *	@param	string		$moreparam		Add more parameters on sort url links ("" by default)
+ *	@param  string		$moreattrib		Add more attributes on th ("" by default). To add more css class, use param $prefix.
+ *	@param  ?string		$sortfield	 	Current field used to sort (Ex: 'd.datep,d.id')
+ *	@param  ?string		$sortorder		Current sort order (Ex: 'asc,desc')
+ *  @param	string		$prefix	 		Prefix for css. Use space after prefix to add your own CSS tag, for example 'mycss '.
+ *  @param	int<0,1>	$disablesortlink	1=Disable sort link
+ *  @param	?string		$tooltip 		Tooltip
+ *  @param	int<0,1> 	$forcenowrapcolumntitle		No need to use 'wrapcolumntitle' css style
  *	@return	string
  */
 function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin = "", $moreparam = "", $moreattrib = "", $sortfield = "", $sortorder = "", $prefix = "", $disablesortlink = 0, $tooltip = '', $forcenowrapcolumntitle = 0)
@@ -6309,7 +6309,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 		$prefix .= 'right '; // For backward compatibility
 	}
 
-	$sortorder = strtoupper($sortorder);
+	$sortorder = strtoupper((string) $sortorder);
 	$out = '';
 	$sortimg = '';
 
@@ -6318,7 +6318,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 		$tag = 'div';
 	}
 
-	$tmpsortfield = explode(',', $sortfield);
+	$tmpsortfield = explode(',', (string) $sortfield);
 	$sortfield1 = trim($tmpsortfield[0]); // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'
 	$tmpfield = explode(',', $field);
 	$field1 = trim($tmpfield[0]); // If $field is 'd.datep,d.id', it becomes 'd.datep'
@@ -6496,8 +6496,8 @@ function load_fiche_titre($title, $morehtmlright = '', $picto = 'generic', $pict
  *	@param	int|null    $page				Numero of page to show in navigation links (required)
  *	@param	string	    $file				Url of page (required)
  *	@param	string	    $options         	More parameters for links ('' by default, does not include sortfield neither sortorder). Value must be 'urlencoded' before calling function.
- *	@param	string    	$sortfield       	Field to sort on ('' by default)
- *	@param	string	    $sortorder       	Order to sort ('' by default)
+ *	@param	?string    	$sortfield       	Field to sort on ('' by default)
+ *	@param	?string	    $sortorder       	Order to sort ('' by default)
  *	@param	string	    $morehtmlcenter     String in the middle ('' by default). We often find here string $massaction coming from $form->selectMassAction()
  *	@param	int		    $num				Number of records found by select with limit+1
  *	@param	int|string  $totalnboflines		Total number of records/lines for all pages (if known). Use a negative value of number to not show number. Use '' if unknown.
@@ -7148,8 +7148,8 @@ function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round
  *
  * 	@param	float|string	$vatrate	        Vat rate. Can be '8.5' or '8.5 (VATCODEX)' for example
  * 	@param  int			$local		         	Local tax to search and return (1 or 2 return only tax rate 1 or tax rate 2)
- *  @param  Societe		$thirdparty_buyer    	Object of buying third party
- *  @param	Societe		$thirdparty_seller		Object of selling third party ($mysoc if not defined)
+ *  @param  ?Societe	$thirdparty_buyer    	Object of buying third party
+ *  @param	?Societe	$thirdparty_seller		Object of selling third party ($mysoc if not defined)
  *  @param	int			$vatnpr					If vat rate is NPR or not
  * 	@return	int<0,0>|string	   					0 if not found, localtax rate if found (Can be '20', '-19:-15:-9')
  *  @see get_default_tva()
@@ -7417,8 +7417,8 @@ function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid
  *
  *  @param	int|string  $vatrate			VAT ID or Rate+Code. Value can be value or the string with code into parenthesis or rowid if $firstparamisid is 1. Example: '8.5' or '8.5 (8.5NPR)' or 123.
  *  @param	int<0,2>    $local              Number of localtax (1 or 2, or 0 to return 1 & 2)
- *  @param	Societe	    $buyer         		Company object
- *  @param	Societe	    $seller        		Company object
+ *  @param	?Societe	$buyer         		Company object
+ *  @param	?Societe    $seller        		Company object
  *  @param  int<0,1>    $firstparamisid     1 if first param is ID into table instead of Rate+code (use this if you can)
  *  @return	array{}|array{0:string,1:int|string,2:string,3:string}|array{0:string,1:int|string,2:string,3:int|string,4:string,5:string}		array(localtax_type1('1-6' or '0' if not found), rate localtax1, localtax_type2, rate localtax2, accountancycodecust, accountancycodesupp)
  *  @see getTaxesFromId()
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index 259e2e02353..11df59e893a 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2012      Cédric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2012-2014 Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -47,8 +47,8 @@
  *		@param 	float	$remise_percent_global		0
  *		@param	string	$price_base_type 			'HT'=Unit price parameter $pu is HT, 'TTC'=Unit price parameter $pu is TTC (HT+VAT but not Localtax. TODO Add also mode 'INCT' when pu is price HT+VAT+LT1+LT2)
  *		@param	int		$info_bits					Miscellaneous information on line
- *		@param	int<0,1>	$type						0/1=Product/service
- *		@param  Societe|string $seller				Thirdparty seller (we need $seller->country_id property). Provided only if seller is the supplier, otherwise $seller will be $mysoc.
+ *		@param	int<0,1>	$type					0/1=Product/service
+ *		@param  string|Societe|string $seller		Third party seller (we need $seller->country_id property). Provided only if seller is the supplier, otherwise $seller will be $mysoc.
  *		@param  array{0:string,1:int|string,2:string,3:string}|array{0:string,1:int|string,2:string,3:int|string,4:string,5:string}	$localtaxes_array			Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
  *		@param  float	$progress					Situation invoices progress (value from 0 to 100, 100 by default)
  *		@param  float	$multicurrency_tx           Currency rate (1 by default)

From fdef25e5de93501ddc607c8887de9fdc1f1a7d49 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 18 Jan 2025 16:29:23 +0100
Subject: [PATCH 242/602] Qual: Fix PhanTypeMismatchArgument with phpdoc type
 change in called function

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c524c79e080..b074d83b067 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -101,18 +101,18 @@ class Form
 	/**
 	 * Output key field for an editable field
 	 *
-	 * @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 (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.
-	 * @param 	int 	$fieldrequired 	1 if we want to show field as mandatory using the "fieldrequired" CSS.
-	 * @param 	int 	$notabletag 	1=Do not output table tags but output a ':', 2=Do not output table tags and no ':', 3=Do not output table tags but output a ' '
-	 * @param 	string 	$paramid 		Key of parameter for id ('id', 'socid')
-	 * @param 	string 	$help 			Tooltip help
-	 * @return  string                  HTML edit field
+	 * @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 (on the page we show)
+	 * @param 	int<0,1>	$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.
+	 * @param 	int			$fieldrequired 	1 if we want to show field as mandatory using the "fieldrequired" CSS.
+	 * @param 	int<0,3>	$notabletag 	1=Do not output table tags but output a ':', 2=Do not output table tags and no ':', 3=Do not output table tags but output a ' '
+	 * @param 	string		$paramid 		Key of parameter for id ('id', 'socid')
+	 * @param 	string		$help 			Tooltip help
+	 * @return  string						HTML edit field
 	 */
 	public function editfieldkey($text, $htmlname, $preselected, $object, $perm, $typeofdata = 'string', $moreparam = '', $fieldrequired = 0, $notabletag = 0, $paramid = 'id', $help = '')
 	{
@@ -6065,7 +6065,7 @@ class Form
 	 * @param 	int 		$socid 				Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
 	 * @param 	string 		$selected 			Id preselected project
 	 * @param 	string 		$htmlname 			Name of select field
-	 * @param 	int 		$discard_closed 	Discard closed projects (0=Keep,1=hide completely except $selected,2=Disable)
+	 * @param 	int<0,2>	$discard_closed 	Discard closed projects (0=Keep,1=hide completely except $selected,2=Disable)
 	 * @param 	int 		$maxlength 			Max length
 	 * @param 	int 		$forcefocus 		Force focus on field (works with javascript only)
 	 * @param 	int<0,1>	$nooutput 			No print is done. String is returned.
@@ -11722,10 +11722,10 @@ class Form
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 
 	/**
-	* Load into cache list of invoice subtypes
-	*
-	* @return int             Nb of lines loaded, <0 if KO
-	*/
+	 * Load into cache list of invoice subtypes
+	 *
+	 * @return int             Nb of lines loaded, <0 if KO
+	 */
 	public function load_cache_invoice_subtype()
 	{
 		// phpcs:enable
@@ -11768,15 +11768,15 @@ class Form
 
 
 	/**
-	* Return list of invoice subtypes.
-	*
-	* @param int		$selected     	Id of invoice subtype to preselect by default
-	* @param string		$htmlname     	Select field name
-	* @param int<0,1>	$addempty     	Add an empty entry
-	* @param int<0,1>	$noinfoadmin  	0=Add admin info, 1=Disable admin info
-	* @param string $morecss       	Add more CSS on select tag
-	* @return string  				String for the HTML select component
-	*/
+	 * Return list of invoice subtypes.
+	 *
+	 * @param int		$selected		Id of invoice subtype to preselect by default
+	 * @param string	$htmlname		Select field name
+	 * @param int<0,1>	$addempty		Add an empty entry
+	 * @param int<0,1>	$noinfoadmin	0=Add admin info, 1=Disable admin info
+	 * @param string	$morecss		Add more CSS on select tag
+	 * @return string					String for the HTML select component
+	 */
 	public function getSelectInvoiceSubtype($selected = 0, $htmlname = 'subtypeid', $addempty = 0, $noinfoadmin = 0, $morecss = '')
 	{
 		global $langs, $user;

From dd418533d7c9fe8e70d9cf21a1a0a74360b547da Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 18 Jan 2025 16:56:54 +0100
Subject: [PATCH 243/602] Qual: Update PHPdoc - $page is a url, not an int

---
 htdocs/compta/facture/note-rec.php         | 23 +++++++++++-----------
 htdocs/compta/paiement/document.php        | 11 ++++++-----
 htdocs/core/class/html.form.class.php      |  8 ++++----
 htdocs/fourn/facture/note-rec.php          |  7 ++++---
 htdocs/hrm/core/tpl/skilldet.fiche.tpl.php |  4 ++--
 5 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/htdocs/compta/facture/note-rec.php b/htdocs/compta/facture/note-rec.php
index 61da109eb4a..42aa5138c86 100644
--- a/htdocs/compta/facture/note-rec.php
+++ b/htdocs/compta/facture/note-rec.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2013      Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -117,7 +118,7 @@ if (empty($object->id)) {
 }
 
 
-if ($id > 0 ) {
+if ($id > 0) {
 	$object = new FactureRec($db);
 	$object->fetch($id);
 
@@ -129,7 +130,7 @@ if ($id > 0 ) {
 
 	print dol_get_fiche_head($head, 'note', $langs->trans("InvoiceCustomer"), -1, 'bill');
 
-		// Object card
+	// Object card
 	// ------------------------------------------------------------
 	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
@@ -152,7 +153,7 @@ if ($id > 0 ) {
 			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');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
@@ -184,18 +185,18 @@ if ($id > 0 ) {
 
 	$substitutionarray = getCommonSubstitutionArray($langs, 2, null, $object);
 
-	$substitutionarray['__INVOICE_PREVIOUS_MONTH__'] = $langs->trans("PreviousMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'), '%m') . ')';
+	$substitutionarray['__INVOICE_PREVIOUS_MONTH__'] = $langs->trans("PreviousMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree((int) $dateexample, -1, 'm'), '%m') . ')';
 	$substitutionarray['__INVOICE_MONTH__'] = $langs->trans("MonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($dateexample, '%m') . ')';
-	$substitutionarray['__INVOICE_NEXT_MONTH__'] = $langs->trans("NextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'), '%m') . ')';
-	$substitutionarray['__INVOICE_PREVIOUS_MONTH_TEXT__'] = $langs->trans("TextPreviousMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'), '%B') . ')';
+	$substitutionarray['__INVOICE_NEXT_MONTH__'] = $langs->trans("NextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree((int) $dateexample, 1, 'm'), '%m') . ')';
+	$substitutionarray['__INVOICE_PREVIOUS_MONTH_TEXT__'] = $langs->trans("TextPreviousMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree((int) $dateexample, -1, 'm'), '%B') . ')';
 	$substitutionarray['__INVOICE_MONTH_TEXT__'] = $langs->trans("TextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($dateexample, '%B') . ')';
-	$substitutionarray['__INVOICE_NEXT_MONTH_TEXT__'] = $langs->trans("TextNextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'), '%B') . ')';
-	$substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = $langs->trans("PreviousYearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, -1, 'y'), '%Y') . ')';
+	$substitutionarray['__INVOICE_NEXT_MONTH_TEXT__'] = $langs->trans("TextNextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree((int) $dateexample, 1, 'm'), '%B') . ')';
+	$substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = $langs->trans("PreviousYearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree((int) $dateexample, -1, 'y'), '%Y') . ')';
 	$substitutionarray['__INVOICE_YEAR__'] = $langs->trans("YearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($dateexample, '%Y') . ')';
-	$substitutionarray['__INVOICE_NEXT_YEAR__'] = $langs->trans("NextYearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, 1, 'y'), '%Y') . ')';
+	$substitutionarray['__INVOICE_NEXT_YEAR__'] = $langs->trans("NextYearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree((int) $dateexample, 1, 'y'), '%Y') . ')';
 	// Only on template invoices
-	$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = $langs->trans("DateNextInvoiceBeforeGen") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(($object->date_when ? $object->date_when : dol_now()), 'dayhour') . ')';
-	$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = $langs->trans("DateNextInvoiceAfterGen") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree(($object->date_when ? $object->date_when : dol_now()), $object->frequency, $object->unit_frequency), 'dayhour') . ')';
+	$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = $langs->trans("DateNextInvoiceBeforeGen") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(($object->date_when ? (int) $object->date_when : dol_now()), 'dayhour') . ')';
+	$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = $langs->trans("DateNextInvoiceAfterGen") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree(($object->date_when ? (int) $object->date_when : dol_now()), $object->frequency, $object->unit_frequency), 'dayhour') . ')';
 	$substitutionarray['__INVOICE_COUNTER_CURRENT__'] = $object->nb_gen_done;
 	$substitutionarray['__INVOICE_COUNTER_MAX__'] = $object->nb_gen_max;
 
diff --git a/htdocs/compta/paiement/document.php b/htdocs/compta/paiement/document.php
index e4d761b0da3..428ea6d9d10 100644
--- a/htdocs/compta/paiement/document.php
+++ b/htdocs/compta/paiement/document.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
  * Copyright (C) 2021      Jesus Jerez       	 <jesusballesteros@protonmail.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -51,7 +52,7 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'banks', 'companies', 'suppliers', 'other'));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -105,7 +106,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
  * View
  */
 
-$form = new	Form($db);
+$form = new Form($db);
 
 $title = $langs->trans('Payment')." - ".$langs->trans('Documents');
 llxHeader('', $title);
@@ -120,8 +121,8 @@ if ($object->id > 0) {
 	$morehtmlref = '<div class="refidno">';
 
 	// Date of payment
-	$morehtmlref .= $form->editfieldkey("Date", 'datep', $object->date, $object, $object->statut == 0 && ($user->hasRight('facture', 'creer')), 'datehourpicker', '', 0, 3).': ';
-	$morehtmlref .= $form->editfieldval("Date", 'datep', $object->date, $object, $object->statut == 0 && ($user->hasRight('facture', 'creer')), 'datehourpicker', '', null, $langs->trans('PaymentDateUpdateSucceeded'));
+	$morehtmlref .= $form->editfieldkey("Date", 'datep', $object->date, $object, (int) ($object->statut == 0 && ($user->hasRight('facture', 'creer'))), 'datehourpicker', '', 0, 3).': ';
+	$morehtmlref .= $form->editfieldval("Date", 'datep', $object->date, $object, (int) ($object->statut == 0 && ($user->hasRight('facture', 'creer'))), 'datehourpicker', '', null, $langs->trans('PaymentDateUpdateSucceeded'));
 
 	// Payment mode
 	$morehtmlref .= '<br>'.$langs->trans('PaymentMode').' : ';
@@ -158,7 +159,7 @@ if ($object->id > 0) {
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 	// Build file list
-	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
 	$totalsize = 0;
 	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b074d83b067..311012ac087 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6061,7 +6061,7 @@ class Form
 	/**
 	 * Show a form to select a project
 	 *
-	 * @param 	int 		$page 				Page
+	 * @param 	string 		$page 				Page
 	 * @param 	int 		$socid 				Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
 	 * @param 	string 		$selected 			Id preselected project
 	 * @param 	string 		$htmlname 			Name of select field
@@ -6117,7 +6117,7 @@ class Form
 	/**
 	 * Show a form to select payment conditions
 	 *
-	 * @param int 		$page 				Page
+	 * @param string 	$page 				Page
 	 * @param string 	$selected 			Id condition pre-selectionne
 	 * @param string 	$htmlname 			Name of select html field
 	 * @param int 		$addempty 			Add empty entry
@@ -6178,7 +6178,7 @@ class Form
 	/**
 	 *  Show a form to select a delivery delay
 	 *
-	 * @param 	int 		$page 		Page
+	 * @param 	string 		$page 		Page
 	 * @param 	string 		$selected 	Id condition pre-selectionne
 	 * @param 	string 		$htmlname 	Name of select html field
 	 * @param 	int 		$addempty 	Add an empty entry
@@ -9067,7 +9067,7 @@ class Form
 	 * @param 	string 		$morecss 			Add more class to css styles
 	 * @param 	int 		$callurlonselect 	If set to 1, some code is added so an url return by the ajax is called when value is selected.
 	 * @param 	string 		$placeholder 		String to use as placeholder
-	 * @param 	integer 	$acceptdelayedhtml 	1 = caller is requesting to have html js content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
+	 * @param 	int<0,1> 	$acceptdelayedhtml 	1 = caller is requesting to have html js content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
 	 * @return  string                      	HTML select string
 	 * @see selectArrayFilter(), ajax_combobox() in ajax.lib.php
 	 */
diff --git a/htdocs/fourn/facture/note-rec.php b/htdocs/fourn/facture/note-rec.php
index c9556d5cab9..12e4782886d 100644
--- a/htdocs/fourn/facture/note-rec.php
+++ b/htdocs/fourn/facture/note-rec.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2013      Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -118,7 +119,7 @@ if (empty($object->id)) {
 }
 
 
-if ($id > 0 ) {
+if ($id > 0) {
 	$object = new FactureFournisseurRec($db);
 	$object->fetch($id);
 
@@ -130,7 +131,7 @@ if ($id > 0 ) {
 
 	print dol_get_fiche_head($head, 'note', $langs->trans("InvoiceCustomer"), -1, 'bill');
 
-		// Object card
+	// Object card
 	// ------------------------------------------------------------
 	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
@@ -142,7 +143,7 @@ if ($id > 0 ) {
 	}
 	$morehtmlref .= '<div class="refidno">';
 	//Ref supplier
-	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, '', 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>' . $langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
diff --git a/htdocs/hrm/core/tpl/skilldet.fiche.tpl.php b/htdocs/hrm/core/tpl/skilldet.fiche.tpl.php
index 5284c0b132a..292d4038f31 100644
--- a/htdocs/hrm/core/tpl/skilldet.fiche.tpl.php
+++ b/htdocs/hrm/core/tpl/skilldet.fiche.tpl.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+/* Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -41,7 +41,7 @@ if (!empty($object->table_element_line)) {
 @phan-var-force string $note_private
 @phan-var-force int $colwidth
 @phan-var-force string $moreparam
-@phan-var-force bool $permission
+@phan-var-force int $permission
 @phan-var-force string $typeofdata
 @phan-var-force string $value_public
 @phan-var-force string $value_private

From ba53bd741d65cf2fb59057d2266b97901cd98370 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 15 Jan 2025 02:00:58 +0100
Subject: [PATCH 244/602] Qual: Update phan baseline

---
 dev/tools/phan/baseline.txt                   | 105 ++++++++----------
 dev/tools/phan/config.php                     |   8 +-
 dev/tools/phan/config_extended.php            |   6 +-
 htdocs/core/class/html.form.class.php         |   4 +-
 .../task/doc/doc_generic_task_odt.modules.php |   4 +-
 .../societe/mod_codecompta_digitaria.php      |   2 +-
 .../stock/doc/pdf_standard_stock.modules.php  |   2 +-
 7 files changed, 57 insertions(+), 74 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 45b35ff7fec..565cb2ab972 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,34 +9,34 @@
  */
 return [
     // # Issue statistics:
-    // PhanUndeclaredProperty : 560+ occurrences
-    // PhanPossiblyUndeclaredGlobalVariable : 300+ occurrences
-    // PhanUndeclaredGlobalVariable : 280+ occurrences
-    // PhanTypeMismatchArgumentProbablyReal : 200+ occurrences
+    // PhanUndeclaredProperty : 540+ occurrences
+    // PhanPossiblyUndeclaredGlobalVariable : 260+ occurrences
+    // PhanUndeclaredGlobalVariable : 250+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 180+ occurrences
-    // PhanTypeMismatchProperty : 130+ occurrences
+    // PhanTypeMismatchArgumentProbablyReal : 180+ occurrences
+    // PhanTypeMismatchProperty : 140+ occurrences
     // PhanPluginUnknownArrayMethodParamType : 120+ occurrences
+    // PhanPluginUndeclaredVariableIsset : 45+ occurrences
     // PhanRedefineFunction : 45+ occurrences
-    // PhanTypeExpectedObjectPropAccess : 45+ occurrences
-    // PhanPluginUnknownPropertyType : 30+ occurrences
-    // PhanTypeMismatchArgumentNullableInternal : 30+ occurrences
+    // PhanTypeExpectedObjectPropAccess : 40+ occurrences
     // PhanTypeInvalidDimOffset : 25+ occurrences
-    // PhanPossiblyUndeclaredVariable : 20+ occurrences
-    // PhanTypeMismatchDimFetch : 20+ occurrences
+    // PhanTypeMismatchDimFetch : 25+ occurrences
+    // PhanTypeMismatchArgumentNullableInternal : 20+ occurrences
     // PhanUndeclaredConstant : 15+ occurrences
     // PhanPluginEmptyStatementIf : 10+ occurrences
     // PhanTypeComparisonFromArray : 10+ occurrences
     // PhanUndeclaredMethod : 10+ occurrences
-    // PhanEmptyForeach : 8 occurrences
     // PhanPluginUnknownObjectMethodCall : 8 occurrences
-    // PhanPluginBothLiteralsBinaryOp : 7 occurrences
+    // PhanEmptyForeach : 7 occurrences
     // PhanPluginSuspiciousParamPosition : 7 occurrences
+    // PhanPluginBothLiteralsBinaryOp : 6 occurrences
     // PhanPluginDuplicateExpressionBinaryOp : 6 occurrences
     // PhanTypeArraySuspiciousNull : 6 occurrences
     // PhanParamTooMany : 5 occurrences
     // PhanPluginDuplicateArrayKey : 4 occurrences
     // PhanEmptyFQSENInClasslike : 3 occurrences
     // PhanInvalidFQSENInClasslike : 3 occurrences
+    // PhanPossiblyUndeclaredVariable : 2 occurrences
     // PhanTypeMismatchDimAssignment : 2 occurrences
     // PhanTypeMismatchDimFetchNullable : 2 occurrences
     // PhanTypeMismatchReturn : 2 occurrences
@@ -58,7 +58,7 @@ return [
         'htdocs/api/class/api_login.class.php' => ['PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/api/class/api_setup.class.php' => ['PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/api/class/api_status.class.php' => ['PhanPluginUnknownArrayMethodReturnType'],
-        'htdocs/asset/class/asset.class.php' => ['PhanTypeInvalidDimOffset'],
+        'htdocs/asset/class/asset.class.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanTypeInvalidDimOffset'],
         'htdocs/asset/class/assetdepreciationoptions.class.php' => ['PhanTypeInvalidDimOffset'],
         'htdocs/asset/class/assetmodel.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/asset/tpl/accountancy_codes_edit.tpl.php' => ['PhanTypeMismatchArgumentProbablyReal'],
@@ -131,7 +131,7 @@ return [
         'htdocs/core/actions_addupdatedelete.inc.php' => ['PhanTypeMismatchDimFetch', 'PhanUndeclaredProperty'],
         'htdocs/core/actions_massactions.inc.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/actions_printing.inc.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/actions_sendmails.inc.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/core/actions_sendmails.inc.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/core/ajax/ajaxdirtree.php' => ['PhanTypeMismatchProperty', 'PhanUndeclaredGlobalVariable'],
         'htdocs/core/class/canvas.class.php' => ['PhanParamTooMany', 'PhanUndeclaredMethod'],
         'htdocs/core/class/ccountry.class.php' => ['PhanUndeclaredProperty'],
@@ -151,7 +151,6 @@ return [
         'htdocs/core/class/notify.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/class/timespent.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
         'htdocs/core/lib/admin.lib.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/lib/customreports.lib.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/lib/files.lib.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/lib/functions2.lib.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/lib/pdf.lib.php' => ['PhanUndeclaredProperty'],
@@ -175,42 +174,22 @@ return [
         'htdocs/core/modules/oauth/github_oauthcallback.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/project/doc/pdf_timespent.modules.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/propale/doc/pdf_azur.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/propale/doc/pdf_cyan.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/reception/doc/pdf_squille.modules.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/societe/mod_codecompta_aquarium.php' => ['PhanPluginUnknownPropertyType'],
-        'htdocs/core/modules/societe/mod_codecompta_digitaria.php' => ['PhanPluginUnknownPropertyType', 'PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentNullableInternal'],
-        'htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php' => ['PhanPluginUnknownPropertyType', 'PhanPossiblyUndeclaredVariable'],
-        'htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php' => ['PhanPossiblyUndeclaredVariable'],
-        'htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
-        'htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php' => ['PhanPossiblyUndeclaredVariable'],
-        'htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php' => ['PhanPossiblyUndeclaredVariable'],
-        'htdocs/core/modules/supplier_order/modules_commandefournisseur.php' => ['PhanPluginUnknownPropertyType'],
-        'htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php' => ['PhanPluginUnknownPropertyType'],
+        'htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php' => ['PhanTypeMismatchProperty'],
+        'htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php' => ['PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php' => ['PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php' => ['PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php' => ['PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanPluginDuplicateArrayKey'],
-        'htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php' => ['PhanPossiblyUndeclaredVariable'],
-        'htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php' => ['PhanPossiblyUndeclaredVariable'],
         'htdocs/core/modules/workstation/mod_workstation_advanced.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/search_page.php' => ['PhanEmptyForeach', 'PhanPluginBothLiteralsBinaryOp'],
-        'htdocs/core/tpl/ajaxrow.tpl.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/core/tpl/commonfields_view.tpl.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/core/tpl/document_actions_post_headers.tpl.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/core/tpl/extrafields_view.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/tpl/filemanager.tpl.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeExpectedObjectPropAccess', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/core/tpl/formlayoutai.tpl.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/core/tpl/massactions_pre.tpl.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/core/tpl/notes.tpl.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/core/tpl/object_discounts.tpl.php' => ['PhanTypeMismatchArgumentNullableInternal', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/core/tpl/objectline_create.tpl.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/core/tpl/objectline_view.tpl.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/core/tpl/massactions_pre.tpl.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/tpl/objectline_view.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/tpl/onlinepaymentlinks.tpl.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/core/tpl/passwordforgotten.tpl.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/core/tpl/passwordreset.tpl.php' => ['PhanUndeclaredGlobalVariable'],
@@ -226,15 +205,16 @@ return [
         'htdocs/cron/list.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/debugbar/class/DataCollector/DolMemoryCollector.php' => ['PhanTypeMismatchReturn'],
         'htdocs/debugbar/class/DataCollector/DolQueryCollector.php' => ['PhanTypeMismatchReturn'],
-        'htdocs/delivery/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/delivery/card.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
         'htdocs/delivery/class/delivery.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/delivery/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/document.php' => ['PhanRedefineFunction'],
         'htdocs/don/admin/donation.php' => ['PhanUndeclaredMethod'],
-        'htdocs/don/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/don/card.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/don/class/api_donations.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/don/class/don.class.php' => ['PhanParamTooMany'],
         'htdocs/don/document.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/don/index.php' => ['PhanPluginUndeclaredVariableIsset'],
         'htdocs/don/info.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
         'htdocs/don/list.php' => ['PhanTypeMismatchProperty'],
         'htdocs/don/note.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
@@ -259,7 +239,7 @@ return [
         'htdocs/expedition/document.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/expedition/list.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
         'htdocs/expedition/note.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/expedition/shipment.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/expedition/shipment.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/expensereport/card.php' => ['PhanPluginBothLiteralsBinaryOp', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
         'htdocs/expensereport/class/api_expensereports.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/expensereport/payment/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
@@ -270,12 +250,12 @@ return [
         'htdocs/expensereport/tpl/expensereport_linktofile.tpl.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/expensereport/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/externalsite/frames.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/fichinter/card-rec.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/fichinter/card-rec.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/fichinter/class/api_interventions.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanUndeclaredProperty'],
         'htdocs/fichinter/class/fichinterrec.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/fichinter/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/fichinter/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/filefunc.inc.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/filefunc.inc.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
         'htdocs/fourn/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/fourn/class/api_supplier_invoices.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/fourn/class/api_supplier_orders.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgumentProbablyReal'],
@@ -289,7 +269,6 @@ return [
         'htdocs/fourn/contact.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/fourn/facture/card-rec.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/fourn/facture/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchProperty'],
-        'htdocs/fourn/facture/list-rec.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/fourn/facture/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/fourn/facture/paiement.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
@@ -308,7 +287,7 @@ return [
         'htdocs/hrm/class/skill.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/hrm/class/skilldet.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/hrm/class/skillrank.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/hrm/core/tpl/objectline_view.tpl.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/hrm/core/tpl/objectline_view.tpl.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/hrm/evaluation_list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/hrm/job_agenda.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/hrm/job_card.php' => ['PhanUndeclaredGlobalVariable'],
@@ -319,10 +298,12 @@ return [
         'htdocs/imports/emptyexample.php' => ['PhanRedefineFunction', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/imports/import.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/install/check.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal'],
-        'htdocs/install/fileconf.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
+        'htdocs/install/fileconf.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable'],
+        'htdocs/install/inc.php' => ['PhanPluginUndeclaredVariableIsset'],
         'htdocs/install/index.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/install/repair.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
+        'htdocs/install/repair.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/install/step2.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal', 'PhanUndeclaredProperty'],
+        'htdocs/install/step5.php' => ['PhanPluginUndeclaredVariableIsset'],
         'htdocs/install/upgrade.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal'],
         'htdocs/intracommreport/card.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
@@ -347,6 +328,7 @@ return [
         'htdocs/opcachepreload.php' => ['PhanEmptyForeach'],
         'htdocs/opensurvey/card.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/opensurvey/class/opensurveysondage.class.php' => ['PhanTypeMismatchProperty'],
+        'htdocs/opensurvey/list.php' => ['PhanPluginUndeclaredVariableIsset'],
         'htdocs/opensurvey/results.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal', 'PhanUndeclaredGlobalVariable'],
         'htdocs/opensurvey/wizard/choix_date.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/opensurvey/wizard/create_survey.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
@@ -363,11 +345,12 @@ return [
         'htdocs/product/class/html.formproduct.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/class/productfournisseurprice.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
         'htdocs/product/document.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
+        'htdocs/product/index.php' => ['PhanPluginUndeclaredVariableIsset'],
         'htdocs/product/inventory/card.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/product/inventory/class/inventory.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/inventory/inventory.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/product/inventory/list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/product/list.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
+        'htdocs/product/list.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/product/price.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/product/reassort.php' => ['PhanTypeExpectedObjectPropAccessButGotNull'],
         'htdocs/product/stats/card.php' => ['PhanTypeComparisonFromArray'],
@@ -377,8 +360,8 @@ return [
         'htdocs/product/stock/class/entrepot.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/stock/info.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/product/stock/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/movement_card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/movement_list.php' => ['PhanPluginBothLiteralsBinaryOp', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/product/stock/movement_card.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/product/stock/movement_list.php' => ['PhanPluginBothLiteralsBinaryOp', 'PhanPluginUndeclaredVariableIsset', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/product/stock/product.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/product/stock/productlot_card.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/stock/productlot_list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
@@ -401,7 +384,7 @@ return [
         'htdocs/projet/element.php' => ['PhanUndeclaredProperty'],
         'htdocs/projet/ganttchart.inc.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
         'htdocs/projet/ganttview.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/projet/graph_opportunities.inc.php' => ['PhanUndeclaredGlobalVariable'],
+        'htdocs/projet/graph_opportunities.inc.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanUndeclaredGlobalVariable'],
         'htdocs/projet/stats/index.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/projet/tasks.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/projet/tasks/comment.php' => ['PhanTypeMismatchArgumentProbablyReal'],
@@ -436,6 +419,7 @@ return [
         'htdocs/public/project/viewandvote.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
         'htdocs/public/recruitment/view.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
         'htdocs/public/stripe/ipn.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/public/test/test_arrays.php' => ['PhanPluginUndeclaredVariableIsset'],
         'htdocs/public/ticket/create_ticket.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchDimFetchNullable', 'PhanTypeMismatchProperty'],
         'htdocs/public/ticket/view.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/public/webportal/tpl/menu.tpl.php' => ['PhanUndeclaredProperty'],
@@ -447,13 +431,13 @@ return [
         'htdocs/reception/class/reception.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/reception/contact.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/reception/dispatch.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/reception/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/reception/list.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/reception/note.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/recruitment/admin/setup.php' => ['PhanEmptyForeach'],
         'htdocs/recruitment/admin/setup_candidatures.php' => ['PhanEmptyForeach'],
         'htdocs/recruitment/class/recruitmentcandidature.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/recruitment/class/recruitmentjobposition.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
+        'htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php' => ['PhanUndeclaredProperty'],
         'htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php' => ['PhanUndeclaredProperty'],
         'htdocs/recruitment/index.php' => ['PhanUndeclaredGlobalVariable'],
@@ -466,7 +450,6 @@ return [
         'htdocs/recruitment/recruitmentjobposition_list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/recruitment/recruitmentjobposition_note.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/salaries/admin/salaries.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/salaries/card.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/salaries/class/api_salaries.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/salaries/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
         'htdocs/salaries/paiement_salary.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
@@ -477,7 +460,7 @@ return [
         'htdocs/societe/class/api_thirdparties.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
         'htdocs/societe/class/societe.class.php' => ['PhanTypeMismatchProperty'],
         'htdocs/societe/consumption.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/societe/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/societe/list.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/societe/paymentmodes.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeExpectedObjectPropAccess', 'PhanUndeclaredGlobalVariable'],
         'htdocs/societe/price.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/societe/tpl/linesalesrepresentative.tpl.php' => ['PhanTypeMismatchArgumentProbablyReal'],
@@ -491,9 +474,10 @@ return [
         'htdocs/takepos/ajax/ajax.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
         'htdocs/takepos/floors.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/takepos/freezone.php' => ['PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/takepos/index.php' => ['PhanPluginUndeclaredVariableIsset'],
         'htdocs/takepos/invoice.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
         'htdocs/takepos/pay.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/takepos/split.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/takepos/split.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/theme/eldy/badges.inc.php' => ['PhanRedefineFunction'],
         'htdocs/theme/eldy/btn.inc.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/theme/eldy/dropdown.inc.php' => ['PhanUndeclaredGlobalVariable'],
@@ -512,7 +496,6 @@ return [
         'htdocs/ticket/class/ticket.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/ticket/index.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal'],
         'htdocs/ticket/list.php' => ['PhanTypeComparisonFromArray'],
-        'htdocs/user/bank.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/user/card.php' => ['PhanTypeMismatchProperty'],
         'htdocs/user/class/api_users.class.php' => ['PhanTypeMismatchProperty'],
         'htdocs/user/class/user.class.php' => ['PhanUndeclaredProperty'],
diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index fff6adccf1a..b13c4c1e769 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+/* Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  */
 define('DOL_PROJECT_ROOT', __DIR__.'/../../..');
@@ -367,7 +367,7 @@ return [
 		// can also be written as 'vendor/phan/phan/.phan/plugins/AlwaysReturnPlugin.php'
 		'DeprecateAliasPlugin',
 		//'EmptyMethodAndFunctionPlugin',
-		// 'InvalidVariableIssetPlugin',
+		'InvalidVariableIssetPlugin',
 		//'MoreSpecificElementTypePlugin',
 		'NoAssertPlugin',
 		'NotFullyQualifiedUsagePlugin',
@@ -450,8 +450,8 @@ return [
 		'PhanPluginRedundantAssignment',				// Not essential, useless
 		'PhanPluginDuplicateCatchStatementBody',  // Requires PHP7.1 - 50+ occurrences
 
-		// 'PhanPluginUnknownArrayMethodParamType',	// Too many troubles to manage. Is enabled in config_extended only.
-		// 'PhanPluginUnknownArrayMethodReturnType',	// Too many troubles to manage. Is enabled in config_extended only.
+		// 'PhanPluginUnknownArrayMethodParamType',	// All fixed, except in api_*
+		// 'PhanPluginUnknownArrayMethodReturnType',	// All fixed, except in api_*
 		// 'PhanUndeclaredGlobalVariable',			// Helps identify variables that are not set/defined - add '@phan-var-force TYPE $varname' in tpl or includes to help type the variable
 		// 'PhanPluginUnknownObjectMethodCall',	// False positive for some class. Is enabled in config_extended only.
 		'PhanTypeSuspiciousNonTraversableForeach',  // Reports on `foreach ($object as $key => $value)` which works without php notices, so we ignore it because this is intentional in the code.
diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
index 0d0abaa19b8..38cd62d20f6 100644
--- a/dev/tools/phan/config_extended.php
+++ b/dev/tools/phan/config_extended.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+/* Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  */
 
@@ -95,8 +95,8 @@ $config['suppress_issue_types'] = [
 		'PhanPluginRedundantAssignment',				// Not essential, useless
 		'PhanPluginDuplicateCatchStatementBody',  // Requires PHP7.1 - 50+ occurrences
 
-		'PhanPluginUnknownArrayMethodParamType',	// this option costs more time to be supported than it solves time
-		'PhanPluginUnknownArrayMethodReturnType',	// this option costs more time to be supported than it solves time
+		'PhanPluginUnknownArrayMethodParamType',	// All fixed, except in api_* at this time
+		'PhanPluginUnknownArrayMethodReturnType',	// All fixed, except in api_* at this time
 		'PhanTypeSuspiciousNonTraversableForeach',  // Reports on `foreach ($object as $key => $value)` which works without php notices, so we ignore it because this is intentional in the code.
 ];
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 311012ac087..5b24dee1120 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -211,7 +211,7 @@ class Form
 	 *                                  '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 formatted price instead of numeric value, or a select combo). Use '' to use same than $value
 	 * @param ?CommonObject	$extObject 	External object ???
-	 * @param ?string|?array<string,string>	$custommsg 		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
+	 * @param string|array<string,string>|null	$custommsg 		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
 	 * @param string 	$moreparam 		More param to add on the form on action href URL parameter
 	 * @param int<0,1>	$notabletag 	Do no output table tags
 	 * @param string 	$formatfunc 	Call a specific method of $object->$formatfunc to output field in view mode (For example: 'dol_print_email')
@@ -490,7 +490,7 @@ class Form
 	 * @param 	string 	$inputType 	Type of input ('string', 'numeric', 'datepicker' ('day' do not work, don't know why), 'textarea:rows:cols', 'ckeditor:dolibarr_zzz:width:height:?:1:rows:cols', 'select:loadmethod:savemethod:buttononly')
 	 * @param 	?string $editvalue 	When in edit mode, use this value as $value instead of value
 	 * @param 	?CommonObject	$extObject 	External object
-	 * @param 	?string|?array<string,string>	$custommsg 	String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
+	 * @param 	string|array<string,string>|null	$custommsg 	String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
 	 * @return  string              HTML edit in place
 	 */
 	protected function editInPlace($object, $value, $htmlname, $condition, $inputType = 'textarea', $editvalue = null, $extObject = null, $custommsg = null)
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 6583ef2dfd1..30771eba7b0 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -648,8 +648,8 @@ class doc_generic_task_odt extends ModelePDFTask
 								$soc->fetch($contact['socid']);
 								$contact['socname'] = $soc->name;
 							} else {
-								dol_syslog(get_class().'::'.__METHOD__.' Unexpected contact source:'.$contact['source'], LOG_ERR);
-								continue;
+								dol_syslog(get_class().'::'.__METHOD__.' Unexpected contact source:'.$contact['source'], LOG_WARNING);
+								$objectdetail = null;
 							}
 							$contact['fullname'] = is_object($objectdetail) ? $objectdetail->getFullName($outputlangs, 1) : null;
 
diff --git a/htdocs/core/modules/societe/mod_codecompta_digitaria.php b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
index 52c74f78ac6..4ccb0c151a4 100644
--- a/htdocs/core/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
@@ -258,7 +258,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 
 					if ($i <= 9) {
 						$a = 1;
-					} elseif ($i >= 10 && $i <= 99) {
+					} elseif ($i <= 99) {  // Also >= 10
 						$a = 2;
 					} else {  // ($i >= 100 && $i <= 999) {
 						$a = 3;
diff --git a/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php b/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php
index e32ed25a551..9b1d95ab7bd 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php
@@ -80,7 +80,7 @@ class pdf_standard_stock extends ModelePDFStock
 	public $postotalht;
 
 	/**
-	 * @var float
+	 * @var int
 	 */
 	public $tabTitleHeight;
 

From 907a874988784f733161f9b45c9b490eadc67319 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 Jan 2025 13:52:55 +0100
Subject: [PATCH 245/602] Update project.lib.php

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

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 9ec5e33b555..d2e88073697 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2006-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2010      Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011      Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2018-2024 Frédéric France      <frederic.france@free.fr>
+ * Copyright (C) 2018-2025 Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2022      Charlene Benke       <charlene@patas-monkey.com>
  * Copyright (C) 2023      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
@@ -1419,7 +1419,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
  * @param	int			$preselectedday			Preselected day
  * @param   array<int,array{morning:int<0,1>,afternoon:int<0,1>}>	$isavailable	Array with data that say if user is available for several days for morning and afternoon
  * @param	int			$oldprojectforbreak		Old project id of last project break
- * @param	string[]	$arrayfields		    Array of additional column
+ * @param	array<string, array<string, int|string>> $arrayfields		    Array of additional column
  * @param	Extrafields	$extrafields		    Object extrafields
  * @return  array<int,int>						Array with time spent for $fuser for each day of week on tasks in $lines and subtasks
  */
@@ -1822,7 +1822,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
  * @param   int<0,2>	$restricteditformytask	0=No restriction, 1=Enable add time only if task is assigned to me, 2=Enable add time only if tasks is assigned to me and hide others
  * @param   array<int,array{morning:int<0,1>,afternoon:int<0,1>}>	$isavailable	Array with data that say if user is available for several days for morning and afternoon
  * @param	int			$oldprojectforbreak		Old project id of last project break
- * @param	string[]	$arrayfields		    Array of additional column
+ * @param	array<string, array<string, int|string>> $arrayfields		    Array of additional column
  * @param	Extrafields	$extrafields		    Object extrafields
  * @return  array<int,int>						Array with time spent for $fuser for each day of week on tasks in $lines and subtasks
  */
@@ -2229,7 +2229,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
  * @param   array<int,array{morning:int<0,1>,afternoon:int<0,1>}>	$isavailable	Array with data that say if user is available for several days for morning and afternoon
  * @param	int			$oldprojectforbreak		Old project id of last project break
  * @param	string[]		$TWeek				Array of week numbers ('02', ...
- * @param	string[]	$arrayfields		    Array of additional column
+ * @param	array<string, array<string, int|string>> $arrayfields		    Array of additional column
  * @param	Extrafields	$extrafields		    Object extrafields
  * @return  array<string,int>					Array with time spent for $fuser for each day of week on tasks in $lines and subtasks (index is string, month is '01', ...)
  */

From 837b2ff06079da158c049a72d583e0879e858a02 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 27 Jan 2025 13:59:12 +0100
Subject: [PATCH 246/602] FIX wrong left margin (v18 to develop ?)

---
 htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 555079ad3bc..a56088b5a40 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -317,7 +317,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				$desc = dol_htmlentitiesbr($text, 1);
 				//print $outputlangs->convToOutputCharset($desc); exit;
 
-				$pdf->writeHTMLCell(180, 3, 10, $tab_top + 5, $outputlangs->convToOutputCharset($desc), 0, 1);
+				$pdf->writeHTMLCell(180, 3, $this->posxdesc - 1, $tab_top + 5, $outputlangs->convToOutputCharset($desc), 0, 1);
 				$nexY = $pdf->GetY();
 
 				$pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);

From d6034cf16a1665ea849d5c61af8afabef91d5d8a 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 Jan 2025 14:00:59 +0100
Subject: [PATCH 247/602] Update project.lib.php

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

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index d2e88073697..1ad13aca7c5 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -593,7 +593,7 @@ function project_admin_prepare_head()
  * @param   int         $projectidfortotallink  0 or Id of project to use on total line (link to see all time consumed for project)
  * @param   string      $dummy					Not used.
  * @param   int         $showbilltime           Add the column 'TimeToBill' and 'TimeBilled'
- * @param   array<string,null|int|float|string>	$arrayfields	Array with displayed column information
+ * @param   array<string, array<string, int|string>>	$arrayfields	Array with displayed column information
  * @param   string[]    $arrayofselected        Array with selected fields
  * @return	int									Nb of tasks shown
  */

From e5a0ea8f250ebc3b58723f3506defa37d3461380 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 27 Jan 2025 14:34:50 +0100
Subject: [PATCH 248/602] Fix warning

---
 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 43ce05648b1..05e38eb57d2 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -9498,7 +9498,7 @@ class Form
 				}
 
 				// Note: $val['checked'] <> 0 means we must show the field into the combo list  @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset
-				$listoffieldsforselection .= '<li><input type="checkbox" id="checkbox' . $key . '" value="' . $key . '"' . ((!array_key_exists('checked', $val) || empty($val['checked']) || $val['checked'] == '-1') ? '' : ' checked="checked"') . ' data-position="'.$val['position'].'" /><label for="checkbox' . $key . '">' . dol_escape_htmltag($langs->trans($val['label'])) . '</label></li>';
+				$listoffieldsforselection .= '<li><input type="checkbox" id="checkbox' . $key . '" value="' . $key . '"' . ((!array_key_exists('checked', $val) || empty($val['checked']) || $val['checked'] == '-1') ? '' : ' checked="checked"') . ' data-position="'.(empty($val['position']) ? '' : $val['position']).'" /><label for="checkbox' . $key . '">' . dol_escape_htmltag($langs->trans($val['label'])) . '</label></li>';
 				$listcheckedstring .= (empty($val['checked']) ? '' : $key . ',');
 			}
 		}

From 10982b208f9914a17d80e8a27e6f076dc337221c Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 27 Jan 2025 14:37:00 +0100
Subject: [PATCH 249/602] Fix warnings

---
 htdocs/admin/tools/ui/components/icons.php | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/tools/ui/components/icons.php b/htdocs/admin/tools/ui/components/icons.php
index e8f8b365f97..1044bf21458 100644
--- a/htdocs/admin/tools/ui/components/icons.php
+++ b/htdocs/admin/tools/ui/components/icons.php
@@ -17,17 +17,20 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/agpl-3.0.html>.
  */
 
-$res=0;
-if (! $res && file_exists("../../main.inc.php")) : $res=@include '../../main.inc.php';
-endif;
-if (! $res && file_exists("../../../main.inc.php")) : $res=@include '../../../main.inc.php';
-endif;
-if (! $res && file_exists("../../../../main.inc.php")) : $res=@include '../../../../main.inc.php';
-endif;
+// Load Dolibarr environment
+require '../../../../main.inc.php';
+
+/**
+ * @var DoliDB $db
+ * @var HookManager $hookmanager
+ * @var Translate $langs
+ * @var User $user
+ */
 
 // Protection if external user
-if ($user->socid > 0) : accessforbidden();
-endif;
+if ($user->socid > 0) {
+	accessforbidden();
+}
 
 // Includes
 dol_include_once('admin/tools/ui/class/documentation.class.php');

From 4b393fdd47e7582b58d8b7e542105fd0b0170fe1 Mon Sep 17 00:00:00 2001
From: tnegre <tnegre@open-dsi.fr>
Date: Mon, 27 Jan 2025 14:24:37 +0100
Subject: [PATCH 250/602] fix: use default values for extrafields checkboxes

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 6cfae7ec8fe..69371e17123 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -9371,6 +9371,13 @@ abstract class CommonObject
 							}
 						}
 
+						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('checkbox'))) {
+							if ($action == 'create') {
+								$value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) || $value) ? $value : explode(',', $extrafields->attributes[$this->table_element]['default'][$key]);
+							}
+						}
+
+
 						$labeltoshow = $langs->trans($label);
 						$helptoshow = $langs->trans($extrafields->attributes[$this->table_element]['help'][$key]);
 						if ($display_type == 'card') {

From 729e6c4aba1a596be4e1ff054f8c9f18cf491601 Mon Sep 17 00:00:00 2001
From: tnegre <tnegre@open-dsi.fr>
Date: Mon, 27 Jan 2025 15:12:24 +0100
Subject: [PATCH 251/602] Revert "set empty value for choice"

This reverts commit e8aaa51edcf65d9feacb7000ee6e657419670275.
---
 htdocs/ticket/list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 9f1f30a3e7f..9e69271f09c 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -856,11 +856,11 @@ foreach ($object->fields as $key => $val) {
 			print '</td>';
 		} elseif ($key == 'category_code') {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-			$formTicket->selectGroupTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key, '', 2, '&nbsp;', 1, 0, (!empty($val['css']) ? $val['css'] : 'maxwidth150'));
+			$formTicket->selectGroupTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key, '', 2, 1, 1, 0, (!empty($val['css']) ? $val['css'] : 'maxwidth150'));
 			print '</td>';
 		} elseif ($key == 'severity_code') {
 			print '<td class="liste_titre center'.($cssforfield ? ' '.$cssforfield : '').'">';
-			$formTicket->selectSeveritiesTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key, '', 2, '&nbsp;', 1, 0, (!empty($val['css']) ? $val['css'] : 'maxwidth150'));
+			$formTicket->selectSeveritiesTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key, '', 2, 1, 1, 0, (!empty($val['css']) ? $val['css'] : 'maxwidth150'));
 			print '</td>';
 		} elseif ($key == 'fk_user_assign' || $key == 'fk_user_create') {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';

From bc5ce5b0869f992a9ec4d25545d9eac2d46a63ba Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 27 Jan 2025 15:35:45 +0100
Subject: [PATCH 252/602] Doc

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

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index d94ade62111..43965bb6c7d 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3148,7 +3148,7 @@ a.tmenuimage:hover{
 
 /* To show text of top menu according to option THEME_TOPMENU_DISABLE_IMAGE */
 
-/* Text hidden by default */
+/* Text hidden by default when option THEME_TOPMENU_DISABLE_IMAGE */
 <?php if (in_array(getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE'), array(2, 3, 4))) { ?>
 .tmenulabel:not(.menuhider), .tmenulabel:not(.menuhider)::before {
 	 display: none;
@@ -3161,7 +3161,7 @@ span.tmenuimage:not(.menuhider), span.tmenuimage:not(.menuhider)::before {
 	margin-top: 8px !important;
 }
 
-div.tmenucenter {	/* we must have a field length of top menu to avoid size to change when in mode text on hover */
+div.tmenucenter {	/* we set a size of each top menu entry to avoid size to change when in mode "text on hover". Note: When no reduction and full menu shown, there is no width forced, we rely on short labels only. */
 	width: 80px;
 	overflow: hidden;
 	text-overflow: ellipsis;

From 87e6d267e6f7b1cd7452daa7c0c57f313730bef6 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 27 Jan 2025 16:47:39 +0100
Subject: [PATCH 253/602] fix php warning in dol_convertToWord when negative
 numbers

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

diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php
index f349368078a..b724ef34594 100644
--- a/htdocs/core/lib/functionsnumtoword.lib.php
+++ b/htdocs/core/lib/functionsnumtoword.lib.php
@@ -51,7 +51,7 @@ function dol_convertToWord($num, $langs, $currency = '', $centimes = false)
 	} else {
 		$TNum = explode('.', (string) $num);
 
-		$num = (int) $TNum[0];
+		$num = abs((int) $TNum[0]);
 		$words = array();
 		$list1 = array(
 			'',

From 9bb9ecd304ba00e5a52c0eeb43d5719597855a69 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 27 Jan 2025 17:20:55 +0100
Subject: [PATCH 254/602] fix: phpwarning version 8.0 for TVA calulation

---
 htdocs/compta/facture/card.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 6c670b38406..c8c5822bb19 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -875,11 +875,29 @@ if (empty($reshook)) {
 				if ($line->product_type < 9 && $line->total_ht != 0) { // Remove lines with product_type greater than or equal to 9 and no need to create discount if amount is null
 					$keyforvatrate = $line->tva_tx.($line->vat_src_code ? ' ('.$line->vat_src_code.')' : '');
 
+					if (!isset($amount_ht[$keyforvatrate])) {
+						$amount_ht[$keyforvatrate]=0;
+					}
 					$amount_ht[$keyforvatrate] += $line->total_ht;
+					if (!isset($amount_tva[$keyforvatrate])) {
+						$amount_tva[$keyforvatrate]=0;
+					}
 					$amount_tva[$keyforvatrate] += $line->total_tva;
+					if (!isset($amount_ttc[$keyforvatrate])) {
+						$amount_ttc[$keyforvatrate]=0;
+					}
 					$amount_ttc[$keyforvatrate] += $line->total_ttc;
+					if (!isset($multicurrency_amount_ht[$keyforvatrate])) {
+						$multicurrency_amount_ht[$keyforvatrate]=0;
+					}
 					$multicurrency_amount_ht[$keyforvatrate] += $line->multicurrency_total_ht;
+					if (!isset($multicurrency_amount_tva[$keyforvatrate])) {
+						$multicurrency_amount_tva[$keyforvatrate]=0;
+					}
 					$multicurrency_amount_tva[$keyforvatrate] += $line->multicurrency_total_tva;
+					if (!isset($multicurrency_amount_ttc[$keyforvatrate])) {
+						$multicurrency_amount_ttc[$keyforvatrate]=0;
+					}
 					$multicurrency_amount_ttc[$keyforvatrate] += $line->multicurrency_total_ttc;
 					$i++;
 				}

From 440c08346fbf80adf4d7a00d1c63c78e9cdb7486 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 27 Jan 2025 18:13:25 +0100
Subject: [PATCH 255/602] Fix responsive

---
 htdocs/societe/paymentmodes.php | 36 +++++++++++++++++----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 774e274a426..9c964a7fb4b 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -1582,7 +1582,6 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		if (isModEnabled('prelevement')) {
 			print_liste_field_titre("RUM");
 			print_liste_field_titre("DateRUM");
-			print_liste_field_titre("WithdrawMode");
 		}
 		print_liste_field_titre("Default", '', '', '', '', '', '', '', 'center ');
 		if (!getDolGlobalInt('SOCIETE_DISABLE_BANKACCOUNT') && getDolGlobalInt("SOCIETE_RIB_ALLOW_ONLINESIGN")) {
@@ -1678,11 +1677,10 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				// RUM
 				//print '<td>'.$prelevement->buildRumNumber($object->code_client, $rib->datec, $rib->id).'</td>';
 				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($rib->rum).'">'.dol_escape_htmltag($rib->rum).'</td>';
+				print '<br><span class="opacitymedium">'.dol_escape_htmltag($rib->frstrecur).'</span>';	// FRST or RCUR
 
+				// Date
 				print '<td>'.dol_print_date($rib->date_rum, 'day').'</td>';
-
-				// FRST or RCUR
-				print '<td>'.dol_escape_htmltag($rib->frstrecur).'</td>';
 			}
 
 			// Default
@@ -1722,7 +1720,12 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 					$modelselected = getDolGlobalString('BANKADDON_PDF');
 				}
 
-				$out .= $form->selectarray('modelrib'.$rib->id, $modellist, $modelselected, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100 maxwidth125');
+				$morecss = 'maxwidth125';
+				if ($conf->browser->layout == 'phone') {
+					$morecss = 'maxwidth100';
+				}
+
+				$out .= $form->selectarray('modelrib'.$rib->id, $modellist, $modelselected, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100 '.$morecss);
 				$out .= ajax_combobox('modelrib'.$rib->id);
 
 				// Language code (if multilang)
@@ -1730,14 +1733,10 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 					$formadmin = new FormAdmin($db);
 					$defaultlang = $langs->getDefaultLang();
-					$morecss = 'maxwidth150';
-					if ($conf->browser->layout == 'phone') {
-						$morecss = 'maxwidth100';
-					}
 					$out .= $formadmin->select_language($defaultlang, 'lang_idrib'.$rib->id, 0, array(), 0, 0, 0, $morecss);
 				}
 				// Button
-				$out .= '<input class="button buttongen reposition nomargintop nomarginbottom" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
+				$out .= '<input class="button buttongen reposition nomargintop nomarginbottom '.$morecss.'" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
 				$out .= ' type="submit" value="'.$buttonlabel.'"';
 				$out .= '>';
 				$out .= '</form>';
@@ -1846,15 +1845,10 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			if (isModEnabled('prelevement')) {
 				// RUM
 				print '<td>';
-				//var_dump($src);
 				print '</td>';
+
 				// Date
 				print '<td>';
-				//var_dump($src);
-				print '</td>';
-				// Mode mandate
-				print '<td>';
-				//var_dump($src);
 				print '</td>';
 			}
 
@@ -1900,7 +1894,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		if ($nbremote == 0 && $nblocal == 0) {
 			$colspan = 10;
 			if (isModEnabled('prelevement')) {
-				$colspan += 3;
+				$colspan += 2;
 			}
 			if (!getDolGlobalInt('SOCIETE_DISABLE_BANKACCOUNT') && getDolGlobalInt("SOCIETE_RIB_ALLOW_ONLINESIGN")) {
 				$colspan++;
@@ -2125,6 +2119,7 @@ if ($socid && $action == 'editcard' && $permissiontoaddupdatepaymentinformation)
 
 	print '<br>';
 
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="border centpercent">';
 
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td>';
@@ -2150,6 +2145,7 @@ if ($socid && $action == 'editcard' && $permissiontoaddupdatepaymentinformation)
 
 	print '</table>';
 	print '</div>';
+	print '</div>';
 
 	print dol_get_fiche_end();
 
@@ -2171,6 +2167,7 @@ if ($socid && $action == 'create' && $permissiontoaddupdatepaymentinformation) {
 
 	print '<br>';
 
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="border centpercent">';
 
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td>';
@@ -2247,10 +2244,12 @@ if ($socid && $action == 'create' && $permissiontoaddupdatepaymentinformation) {
 	print "</textarea></td></tr>";
 
 	print '</table>';
+	print '</div>';
 
 	if (isModEnabled('prelevement')) {
 		print '<br>';
 
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="border centpercent">';
 
 		// RUM
@@ -2271,6 +2270,7 @@ if ($socid && $action == 'create' && $permissiontoaddupdatepaymentinformation) {
 		print '<td><input class="minwidth300" type="text" name="stripe_card_ref" value="'.GETPOST('stripe_card_ref', 'alpha').'"></td></tr>';
 
 		print '</table>';
+		print '</div>';
 	}
 
 	print '</div>';
@@ -2296,6 +2296,7 @@ if ($socid && $action == 'createcard' && $permissiontoaddupdatepaymentinformatio
 
 	print '<br>';
 
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="border centpercent">';
 
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td>';
@@ -2320,6 +2321,7 @@ if ($socid && $action == 'createcard' && $permissiontoaddupdatepaymentinformatio
 	print '<td><input class="minwidth300" type="text" name="stripe_card_ref" value="'.GETPOST('stripe_card_ref', 'alpha').'"></td></tr>';
 
 	print '</table>';
+	print '</div>';
 
 	print '</div>';
 

From b9f10cbc332ddcd2ebcd3f63855d6b325ce31334 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 27 Jan 2025 18:17:36 +0100
Subject: [PATCH 256/602] Fix css

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

diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 9c964a7fb4b..8982b74f1b1 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -1676,8 +1676,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			if (isModEnabled('prelevement')) {
 				// RUM
 				//print '<td>'.$prelevement->buildRumNumber($object->code_client, $rib->datec, $rib->id).'</td>';
-				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($rib->rum).'">'.dol_escape_htmltag($rib->rum).'</td>';
-				print '<br><span class="opacitymedium">'.dol_escape_htmltag($rib->frstrecur).'</span>';	// FRST or RCUR
+				print '<td class="tdoverflowmax100 small" title="'.dolPrintHTMLForAttribute($rib->rum).'">'.dolPrintHTML($rib->rum);
+				print '<br><span class="opacitymedium">'.dolPrintHTML($rib->frstrecur).'</span>';	// FRST or RCUR
+				print '</td>';
 
 				// Date
 				print '<td>'.dol_print_date($rib->date_rum, 'day').'</td>';

From 6dcaaf9276712f15e3a0267f7b7a9ca489473e77 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 27 Jan 2025 18:22:49 +0100
Subject: [PATCH 257/602] Better look of feel of bank page

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

diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 8982b74f1b1..8e63d16d8f7 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -1575,7 +1575,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print '<tr class="liste_titre">';
 		print_liste_field_titre("Label");
 		print_liste_field_titre($form->textwithpicto($langs->trans('ExternalSystemID'), $langs->trans("IDOfPaymentInAnExternalSystem")));		// external system ID
-		print_liste_field_titre("Bank");
+		//print_liste_field_titre("Bank");
 		print_liste_field_titre("RIB");
 		print_liste_field_titre("IBAN");
 		print_liste_field_titre("BIC");
@@ -1603,7 +1603,10 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 			print '<tr class="oddeven">';
 			// Label
-			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($rib->label).'">'.dol_escape_htmltag($rib->label).'</td>';
+			print '<td class="tdoverflowmax150" title="'.dolPrintHTMLForAttribute($rib->label).'">'.dolPrintHTML($rib->label);
+			print '<span class="opacitymedium">'.dolPrintHTML($rib->bank).'</span>';
+			print '</td>';
+
 			// External system ID
 			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($rib->stripe_card_ref.(empty($rib->stripe_account) ? '' : ' - '.$rib->stripe_account)).'">';
 			if (!empty($rib->stripe_card_ref) && !empty($rib->ext_payment_site)) {
@@ -1623,8 +1626,10 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			}
 			print dol_escape_htmltag($rib->stripe_card_ref);
 			print '</td>';
+
 			// Bank name
-			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($rib->bank).'">'.dol_escape_htmltag($rib->bank).'</td>';
+			//print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($rib->bank).'">'.dol_escape_htmltag($rib->bank).'</td>';
+
 			// Account number
 			$string = '';
 			foreach ($rib->getFieldsToShow() as $val) {
@@ -1645,15 +1650,16 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				//}
 				if (!empty($rib->label) && $rib->number) {
 					if (!checkBanForAccount($rib)) {
-						$string .= ' '.img_picto($langs->trans("ValueIsNotValid"), 'warning');
+						$string .= img_picto($langs->trans("ValueIsNotValid"), 'warning', 'class="pictofixedwidth"').$string;
 					} else {
-						$string .= ' '.img_picto($langs->trans("ValueIsValid"), 'info');
+						$string .= img_picto($langs->trans("ValueIsValid"), 'info', 'class="pictofixedwidth"').$string;
 					}
 				}
 			}  // EndFor $rib_list as $rib
 			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($string).'">';
 			print $string;
 			print '</td>';
+
 			// IBAN
 			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($rib->iban).'">';
 			if (!empty($rib->iban)) {

From 3b6f36f2ae4034dea93e163ae68a2471c7b1f275 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 27 Jan 2025 18:25:14 +0100
Subject: [PATCH 258/602] Missing br

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

diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 8e63d16d8f7..19ab49a4ab4 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -1604,7 +1604,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			print '<tr class="oddeven">';
 			// Label
 			print '<td class="tdoverflowmax150" title="'.dolPrintHTMLForAttribute($rib->label).'">'.dolPrintHTML($rib->label);
-			print '<span class="opacitymedium">'.dolPrintHTML($rib->bank).'</span>';
+			print '<br><span class="opacitymedium">'.dolPrintHTML($rib->bank).'</span>';
 			print '</td>';
 
 			// External system ID

From c631d667514d3702d31b8178110fc443e2d564be Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 27 Jan 2025 18:26:56 +0100
Subject: [PATCH 259/602] CSS

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

diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 19ab49a4ab4..acf931e6d84 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -1743,7 +1743,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 					$out .= $formadmin->select_language($defaultlang, 'lang_idrib'.$rib->id, 0, array(), 0, 0, 0, $morecss);
 				}
 				// Button
-				$out .= '<input class="button buttongen reposition nomargintop nomarginbottom '.$morecss.'" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
+				$out .= '<input class="button buttongen reposition nomargintop nomarginbottom small '.$morecss.'" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
 				$out .= ' type="submit" value="'.$buttonlabel.'"';
 				$out .= '>';
 				$out .= '</form>';

From 1f02f68422a76a137df0eaaf4657fdadb8de0b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 27 Jan 2025 18:53:37 +0100
Subject: [PATCH 260/602] clean phpstan baseline

---
 dev/build/phpstan/phpstan-baseline.neon | 482 +-----------------------
 1 file changed, 4 insertions(+), 478 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 51aaca26db7..8e71cfc7fa8 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -1884,12 +1884,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/admin/workstation.php
 
-		-
-			message: '#^Variable \$arrayofparameters might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/admin/workstation.php
-
 		-
 			message: '#^Variable \$label might not be defined\.$#'
 			identifier: variable.undefined
@@ -1986,12 +1980,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/api/class/api_documents.class.php
 
-		-
-			message: '#^Variable \$relativefile might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/api/class/api_documents.class.php
-
 		-
 			message: '#^Method Login\:\:index\(\) return type has no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
@@ -3720,12 +3708,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/comm/action/pertype.php
 
-		-
-			message: '#^Parameter \#3 \$status of function print_actions_filter expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/comm/action/pertype.php
-
 		-
 			message: '#^Result of && is always false\.$#'
 			identifier: booleanAnd.alwaysFalse
@@ -3756,18 +3738,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/comm/action/pertype.php
 
-		-
-			message: '#^Call to function is_array\(\) with array\{\} will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: ../../../htdocs/comm/action/peruser.php
-
-		-
-			message: '#^If condition is always false\.$#'
-			identifier: if.alwaysFalse
-			count: 1
-			path: ../../../htdocs/comm/action/peruser.php
-
 		-
 			message: '#^Loose comparison using \!\= between ''show_peruser'' and ''show_day'' will always evaluate to true\.$#'
 			identifier: notEqual.alwaysTrue
@@ -3786,34 +3756,16 @@ parameters:
 			count: 1
 			path: ../../../htdocs/comm/action/peruser.php
 
-		-
-			message: '#^Loose comparison using \=\= between ''show_peruser'' and ''list'' will always evaluate to false\.$#'
-			identifier: equal.alwaysFalse
-			count: 1
-			path: ../../../htdocs/comm/action/peruser.php
-
 		-
 			message: '#^Loose comparison using \=\= between ''show_peruser'' and ''show_day'' will always evaluate to false\.$#'
 			identifier: equal.alwaysFalse
 			count: 2
 			path: ../../../htdocs/comm/action/peruser.php
 
-		-
-			message: '#^Loose comparison using \=\= between ''show_peruser'' and ''show_month'' will always evaluate to false\.$#'
-			identifier: equal.alwaysFalse
-			count: 1
-			path: ../../../htdocs/comm/action/peruser.php
-
-		-
-			message: '#^Loose comparison using \=\= between ''show_peruser'' and ''show_peruser'' will always evaluate to true\.$#'
-			identifier: equal.alwaysTrue
-			count: 2
-			path: ../../../htdocs/comm/action/peruser.php
-
 		-
 			message: '#^Loose comparison using \=\= between ''show_peruser'' and ''show_week'' will always evaluate to false\.$#'
 			identifier: equal.alwaysFalse
-			count: 2
+			count: 1
 			path: ../../../htdocs/comm/action/peruser.php
 
 		-
@@ -3831,7 +3783,7 @@ parameters:
 		-
 			message: '#^Ternary operator condition is always true\.$#'
 			identifier: ternary.alwaysTrue
-			count: 10
+			count: 6
 			path: ../../../htdocs/comm/action/peruser.php
 
 		-
@@ -3843,12 +3795,6 @@ parameters:
 		-
 			message: '#^Variable \$mode in empty\(\) always exists and is not falsy\.$#'
 			identifier: empty.variable
-			count: 2
-			path: ../../../htdocs/comm/action/peruser.php
-
-		-
-			message: '#^Variable \$s might not be defined\.$#'
-			identifier: variable.undefined
 			count: 1
 			path: ../../../htdocs/comm/action/peruser.php
 
@@ -9342,18 +9288,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/class/conf.class.php
 
-		-
-			message: '#^Property Conf\:\:\$delivery_note has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/class/conf.class.php
-
-		-
-			message: '#^Property Conf\:\:\$expedition_bon has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/class/conf.class.php
-
 		-
 			message: '#^Property Conf\:\:\$expensereport \(stdClass\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -9366,66 +9300,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/class/conf.class.php
 
-		-
-			message: '#^Property Conf\:\:\$format_date_hour_sec_short has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/class/conf.class.php
-
-		-
-			message: '#^Property Conf\:\:\$format_date_hour_short has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/class/conf.class.php
-
-		-
-			message: '#^Property Conf\:\:\$format_date_hour_text has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/class/conf.class.php
-
-		-
-			message: '#^Property Conf\:\:\$format_date_hour_text_short has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/class/conf.class.php
-
-		-
-			message: '#^Property Conf\:\:\$format_date_short has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/class/conf.class.php
-
-		-
-			message: '#^Property Conf\:\:\$format_date_short_java has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/class/conf.class.php
-
-		-
-			message: '#^Property Conf\:\:\$format_date_text has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/class/conf.class.php
-
-		-
-			message: '#^Property Conf\:\:\$format_date_text_short has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/class/conf.class.php
-
-		-
-			message: '#^Property Conf\:\:\$format_hour_short has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/class/conf.class.php
-
-		-
-			message: '#^Property Conf\:\:\$format_hour_short_duration has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/class/conf.class.php
-
 		-
 			message: '#^Property Conf\:\:\$main_checkbox_left_column \(int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -9444,30 +9318,12 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/class/conf.class.php
 
-		-
-			message: '#^Property Conf\:\:\$mycompany has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/class/conf.class.php
-
 		-
 			message: '#^Property Conf\:\:\$product \(stdClass\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
 			count: 1
 			path: ../../../htdocs/core/class/conf.class.php
 
-		-
-			message: '#^Property Conf\:\:\$project \(stdClass\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 1
-			path: ../../../htdocs/core/class/conf.class.php
-
-		-
-			message: '#^Property Conf\:\:\$projet has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/class/conf.class.php
-
 		-
 			message: '#^Property Conf\:\:\$propal \(stdClass\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -9477,12 +9333,6 @@ parameters:
 		-
 			message: '#^Result of && is always false\.$#'
 			identifier: booleanAnd.alwaysFalse
-			count: 2
-			path: ../../../htdocs/core/class/conf.class.php
-
-		-
-			message: '#^Variable \$mc might not be defined\.$#'
-			identifier: variable.undefined
 			count: 1
 			path: ../../../htdocs/core/class/conf.class.php
 
@@ -14238,12 +14088,6 @@ parameters:
 			count: 3
 			path: ../../../htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
 
-		-
-			message: '#^Variable \$objectdetail might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
-
 		-
 			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Propal given\.$#'
 			identifier: argument.type
@@ -14496,60 +14340,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/societe/mod_codeclient_monkey.php
 
-		-
-			message: '#^Property mod_codecompta_aquarium\:\:\$position has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/societe/mod_codecompta_aquarium.php
-
-		-
-			message: '#^Property mod_codecompta_aquarium\:\:\$prefixcustomeraccountancycode has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/societe/mod_codecompta_aquarium.php
-
-		-
-			message: '#^Property mod_codecompta_aquarium\:\:\$prefixsupplieraccountancycode has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/societe/mod_codecompta_aquarium.php
-
-		-
-			message: '#^Comparison operation "\<\=" between int\<100, 999\> and 999 is always true\.$#'
-			identifier: smallerOrEqual.alwaysTrue
-			count: 1
-			path: ../../../htdocs/core/modules/societe/mod_codecompta_digitaria.php
-
-		-
-			message: '#^Property mod_codecompta_digitaria\:\:\$customeraccountancycodecharacternumber has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/societe/mod_codecompta_digitaria.php
-
-		-
-			message: '#^Property mod_codecompta_digitaria\:\:\$position has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/societe/mod_codecompta_digitaria.php
-
-		-
-			message: '#^Property mod_codecompta_digitaria\:\:\$supplieraccountancycodecharacternumber has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/societe/mod_codecompta_digitaria.php
-
-		-
-			message: '#^Variable \$a might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/core/modules/societe/mod_codecompta_digitaria.php
-
-		-
-			message: '#^Variable \$thirdpartylabelexample might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/core/modules/societe/mod_codecompta_digitaria.php
-
 		-
 			message: '#^Property mod_codecompta_panicum\:\:\$position has no type specified\.$#'
 			identifier: missingType.property
@@ -14574,24 +14364,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
 
-		-
-			message: '#^Property pdf_standard_stock\:\:\$wref has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php
-
-		-
-			message: '#^Variable \$lastmovementdate might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php
-
-		-
-			message: '#^Variable \$pricemin might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php
-
 		-
 			message: '#^Parameter \#4 \$posy of method pdf_eagle\:\:_tableau_tot\(\) expects int, float given\.$#'
 			identifier: argument.type
@@ -14604,18 +14376,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
 
-		-
-			message: '#^Variable \$carac_emetteur_name might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
-
-		-
-			message: '#^Left side of && is always true\.$#'
-			identifier: booleanAnd.leftAlwaysTrue
-			count: 1
-			path: ../../../htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
-
 		-
 			message: '#^Property CommonDocGenerator\:\:\$cols \(array\<string, array\{rank\: int, width\: float\|int, status\: bool, title\: array\{textkey\: string, label\: string, align\: string, padding\: array\{float, float, float, float\}\}, content\: array\{align\: string, padding\: array\{float, float, float, float\}\}\}\>\) does not accept non\-empty\-array\<string, array\{rank\: 0, width\: false, status\: true, title\: array\{textkey\: ''Designation'', align\: ''L'', padding\: array\{0\.5, 1, 0\.5, 1\.5\}\}, content\: array\{align\: ''L'', padding\: array\{1, 0\.5, 1, 1\.5\}\}\}\|array\{rank\: int, width\: float\|int, status\: bool, title\: array\{textkey\: string, label\: string, align\: string, padding\: array\{float, float, float, float\}\}, content\: array\{align\: string, padding\: array\{float, float, float, float\}\}\}\>\.$#'
 			identifier: assign.propertyType
@@ -14688,24 +14448,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
 
-		-
-			message: '#^Variable \$carac_emetteur_name might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
-
-		-
-			message: '#^Variable \$pmp might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
-
-		-
-			message: '#^Variable \$realpath might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
-
 		-
 			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, FactureFournisseur given\.$#'
 			identifier: argument.type
@@ -14730,12 +14472,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
 
-		-
-			message: '#^Variable \$objectref might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
-
 		-
 			message: '#^Parameter \#4 \$posy of method pdf_canelle\:\:_tableau_tot\(\) expects int, float given\.$#'
 			identifier: argument.type
@@ -14796,12 +14532,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
 
-		-
-			message: '#^Variable \$objectref might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
-
 		-
 			message: '#^Left side of \|\| is always false\.$#'
 			identifier: booleanOr.leftAlwaysFalse
@@ -14970,12 +14700,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
 
-		-
-			message: '#^Variable \$max might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
-
 		-
 			message: '#^Parameter \#3 \$posy of method pdf_standard_supplierpayment\:\:_tableau_cheque\(\) expects int, float given\.$#'
 			identifier: argument.type
@@ -14988,36 +14712,6 @@ parameters:
 			count: 6
 			path: ../../../htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
 
-		-
-			message: '#^Property pdf_standard_supplierpayment\:\:\$posxdate has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
-
-		-
-			message: '#^Property pdf_standard_supplierpayment\:\:\$posxreffacture has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
-
-		-
-			message: '#^Property pdf_standard_supplierpayment\:\:\$posxreffacturefourn has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
-
-		-
-			message: '#^Property pdf_standard_supplierpayment\:\:\$posxtotalttc has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
-
-		-
-			message: '#^Property pdf_standard_supplierpayment\:\:\$posxtype has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
-
 		-
 			message: '#^Parameter \#1 \$line of method CommonDocGenerator\:\:get_substitutionarray_lines\(\) expects CommonObjectLine, CommonObject\|stdClass given\.$#'
 			identifier: argument.type
@@ -15168,18 +14862,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
 
-		-
-			message: '#^Variable \$contactobject might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
-
-		-
-			message: '#^Variable \$contactobject might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
-
 		-
 			message: '#^Call to function is_array\(\) with string will always evaluate to false\.$#'
 			identifier: function.impossibleType
@@ -15780,30 +15462,12 @@ parameters:
 			count: 5
 			path: ../../../htdocs/core/tpl/objectline_create.tpl.php
 
-		-
-			message: '#^Variable \$date_end_prefill might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/objectline_create.tpl.php
-
-		-
-			message: '#^Variable \$date_start_prefill might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/objectline_create.tpl.php
-
 		-
 			message: '#^Variable \$seller might not be defined\.$#'
 			identifier: variable.undefined
 			count: 4
 			path: ../../../htdocs/core/tpl/objectline_create.tpl.php
 
-		-
-			message: '#^Variable \$type_tva might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/objectline_create.tpl.php
-
 		-
 			message: '#^Variable \$usehm might not be defined\.$#'
 			identifier: variable.undefined
@@ -15894,12 +15558,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/tpl/originproductline.tpl.php
 
-		-
-			message: '#^Variable \$shippingline might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
-
 		-
 			message: '#^Property CommonObject\:\:\$fk_project \(int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -19806,24 +19464,12 @@ parameters:
 			count: 4
 			path: ../../../htdocs/holiday/card_group.php
 
-		-
-			message: '#^Variable \$endhalfdaykey might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/holiday/card_group.php
-
 		-
 			message: '#^Variable \$errors might not be defined\.$#'
 			identifier: variable.undefined
 			count: 1
 			path: ../../../htdocs/holiday/card_group.php
 
-		-
-			message: '#^Variable \$starthalfdaykey might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/holiday/card_group.php
-
 		-
 			message: '#^Call to function method_exists\(\) with \$this\(Holiday\) and ''getLibStatut'' will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -20487,7 +20133,7 @@ parameters:
 		-
 			message: '#^Variable \$line might not be defined\.$#'
 			identifier: variable.undefined
-			count: 13
+			count: 12
 			path: ../../../htdocs/hrm/core/tpl/objectline_view.tpl.php
 
 		-
@@ -24540,12 +24186,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/product/inventory/inventory.php
 
-		-
-			message: '#^Offset ''help'' on array\{label\: string, checked\: string, enabled\?\: string, type\?\: string, langfile\?\: string\} in empty\(\) does not exist\.$#'
-			identifier: empty.offset
-			count: 1
-			path: ../../../htdocs/product/list.php
-
 		-
 			message: '#^Ternary operator condition is always true\.$#'
 			identifier: ternary.alwaysTrue
@@ -24978,12 +24618,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/product/stock/class/mouvementstock.class.php
 
-		-
-			message: '#^Variable \$fk_product_stock might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/product/stock/class/mouvementstock.class.php
-
 		-
 			message: '#^Negated boolean expression is always true\.$#'
 			identifier: booleanNot.alwaysTrue
@@ -25716,12 +25350,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/projet/activity/perday.php
 
-		-
-			message: '#^Parameter \#13 \$arrayfields of function projectLinesPerDay expects array\<string\>, array\<string, array\<string, string\>\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/projet/activity/perday.php
-
 		-
 			message: '#^Parameter \#4 \$month of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
 			identifier: argument.type
@@ -25788,12 +25416,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/projet/activity/permonth.php
 
-		-
-			message: '#^Parameter \#14 \$arrayfields of function projectLinesPerMonth expects array\<string\>, array\<string, array\<string, string\>\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/projet/activity/permonth.php
-
 		-
 			message: '#^Parameter \#7 \$projectsrole of function projectLinesPerMonth expects string, array\<int, string\>\|int given\.$#'
 			identifier: argument.type
@@ -25848,12 +25470,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/projet/activity/perweek.php
 
-		-
-			message: '#^Parameter \#13 \$arrayfields of function projectLinesPerWeek expects array\<string\>, array\<string, array\<string, string\>\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/projet/activity/perweek.php
-
 		-
 			message: '#^Parameter \#7 \$projectsrole of function projectLinesPerWeek expects string, array\<int, string\>\|int given\.$#'
 			identifier: argument.type
@@ -26466,12 +26082,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/projet/tasks.php
 
-		-
-			message: '#^Parameter \#13 \$arrayfields of function projectLinesa expects array\<string, float\|int\|string\|null\>, array\<string, array\<string, string\>\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/projet/tasks.php
-
 		-
 			message: '#^Ternary operator condition is always true\.$#'
 			identifier: ternary.alwaysTrue
@@ -29298,18 +28908,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/salaries/virement_request.php
 
-		-
-			message: '#^Variable \$resteapayer might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/salaries/virement_request.php
-
-		-
-			message: '#^Variable \$result might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/salaries/virement_request.php
-
 		-
 			message: '#^Variable \$mc might not be defined\.$#'
 			identifier: variable.undefined
@@ -29427,7 +29025,7 @@ parameters:
 		-
 			message: '#^Ternary operator condition is always true\.$#'
 			identifier: ternary.alwaysTrue
-			count: 4
+			count: 3
 			path: ../../../htdocs/societe/card.php
 
 		-
@@ -29964,12 +29562,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/stripe/class/stripe.class.php
 
-		-
-			message: '#^Variable \$invoice might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/stripe/class/stripe.class.php
-
 		-
 			message: '#^Variable \$setupintent in empty\(\) always exists and is always falsy\.$#'
 			identifier: empty.variable
@@ -30558,12 +30150,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/theme/eldy/dropdown.inc.php
 
-		-
-			message: '#^Parameter \#2 \$steps of function colorAdjustBrightness expects int, string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/theme/eldy/global.inc.php
-
 		-
 			message: '#^Variable \$theme might not be defined\.$#'
 			identifier: variable.undefined
@@ -30858,12 +30444,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/ticket/class/api_tickets.class.php
 
-		-
-			message: '#^Variable \$user_action might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: ../../../htdocs/ticket/class/api_tickets.class.php
-
 		-
 			message: '#^Call to function property_exists\(\) with CTicketCategory and ''date_creation'' will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -31182,36 +30762,12 @@ parameters:
 			count: 1
 			path: ../../../htdocs/user/bank.php
 
-		-
-			message: '#^Variable \$content might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/user/bank.php
-
 		-
 			message: '#^Variable \$countrynotdefined might not be defined\.$#'
 			identifier: variable.undefined
 			count: 1
 			path: ../../../htdocs/user/bank.php
 
-		-
-			message: '#^Variable \$moreparam might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/user/bank.php
-
-		-
-			message: '#^Variable \$name might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/user/bank.php
-
-		-
-			message: '#^Variable \$size might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/user/bank.php
-
 		-
 			message: '#^Call to function is_array\(\) with array\<string\> will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -32178,36 +31734,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/website/class/website.class.php
 
-		-
-			message: '#^Variable \$aliasesarray might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/website/class/website.class.php
-
-		-
-			message: '#^Variable \$destdir might not be defined\.$#'
-			identifier: variable.undefined
-			count: 13
-			path: ../../../htdocs/website/class/website.class.php
-
-		-
-			message: '#^Variable \$destdirrel might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/website/class/website.class.php
-
-		-
-			message: '#^Variable \$maxrowid might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/website/class/website.class.php
-
-		-
-			message: '#^Variable \$newidforhome might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/website/class/website.class.php
-
 		-
 			message: '#^Negated boolean expression is always true\.$#'
 			identifier: booleanNot.alwaysTrue

From f250f7caa50bf86f837ca1ced84b311cea1ae051 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 18 Jan 2025 23:15:39 +0100
Subject: [PATCH 261/602] Qual: Fix Phan notices

# Qual: Fix phan notices
---
 dev/tools/phan/stubs/multicompany.php         |  4 +-
 htdocs/core/class/dolgraph.class.php          |  8 ++--
 htdocs/core/class/html.formcron.class.php     | 11 ++---
 htdocs/core/tpl/onlinepaymentlinks.tpl.php    |  4 ++
 htdocs/core/tpl/passwordforgotten.tpl.php     | 26 ++++++++----
 htdocs/core/tpl/passwordreset.tpl.php         | 27 +++++++++---
 htdocs/core/tpl/resource_add.tpl.php          |  8 +++-
 ...interface_50_modLdap_Ldapsynchro.class.php |  6 +--
 ...terface_50_modTicket_TicketEmail.class.php | 42 +++++++++++++++----
 htdocs/cron/card.php                          |  3 +-
 htdocs/cron/list.php                          |  5 ++-
 .../DataCollector/DolMemoryCollector.php      |  4 +-
 .../class/DataCollector/DolQueryCollector.php |  4 +-
 htdocs/delivery/card.php                      | 21 +++++++---
 htdocs/delivery/class/delivery.class.php      |  6 +--
 htdocs/delivery/tpl/linkedobjectblock.tpl.php |  5 ++-
 htdocs/document.php                           |  7 +++-
 htdocs/don/admin/donation.php                 |  4 +-
 htdocs/don/card.php                           | 29 +++++++------
 htdocs/don/class/donstats.class.php           |  5 +--
 htdocs/don/class/paymentdonation.class.php    |  4 +-
 htdocs/don/document.php                       | 15 ++++---
 htdocs/don/index.php                          |  8 ++--
 htdocs/don/info.php                           | 14 ++++---
 htdocs/don/note.php                           | 14 ++++---
 htdocs/don/paiement/list.php                  | 23 +++++-----
 htdocs/don/payment/card.php                   |  3 +-
 htdocs/don/payment/payment.php                |  4 +-
 htdocs/don/stats/index.php                    | 11 +++--
 htdocs/don/tpl/linkedobjectblock.tpl.php      |  6 ++-
 30 files changed, 216 insertions(+), 115 deletions(-)

diff --git a/dev/tools/phan/stubs/multicompany.php b/dev/tools/phan/stubs/multicompany.php
index 0f2ba3b4e74..33c25d99c23 100644
--- a/dev/tools/phan/stubs/multicompany.php
+++ b/dev/tools/phan/stubs/multicompany.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+/* Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  *
  * Note: in this context Entity == Company.
  */
@@ -31,7 +31,7 @@ class ActionsMulticompany
 	}
 
 	/**
-	 * @param string $entity
+	 * @param int $entity
 	 * @return void
 	 */
 	public function getInfo($entity)
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 79cff89f228..81fc746874d 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (c) 2003-2006  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (c) 2004-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -55,7 +55,9 @@ class DolGraph
 	private $_library; // Graphic library to use (jflot, chart, artichow)
 
 	/**
-	 * @var array<array{0:string,1:float,1:float}> Array of data
+	 * @var array<array<string|int|float>> Array of data
+	 * @phpstan-var array<array{0:string|int,1:float,2?:float,3?:float,...}>
+	 * @phan-var array<array{0:string|int,1:float,2?:float,3?:float,4?:float}>
 	 */
 	public $data; // Data of graph: array(array('abs1',valA1,valB1), array('abs2',valA2,valB2), ...)
 	/**
@@ -364,7 +366,7 @@ class DolGraph
 	/**
 	 * Set data
 	 *
-	 * @param 	array<array{0:string,1:float,2:float}>	$data		Data
+	 * @param 	array<array{0:string|int,1:float,2?:float}>	$data		Data
 	 * @return	void
 	 * @see draw_jflot() for syntax of data array
 	 */
diff --git a/htdocs/core/class/html.formcron.class.php b/htdocs/core/class/html.formcron.class.php
index 69730aaca51..fde4fd8e3f3 100644
--- a/htdocs/core/class/html.formcron.class.php
+++ b/htdocs/core/class/html.formcron.class.php
@@ -1,6 +1,7 @@
 <?php
 /*
  * Copyright (C) 2013   Florian Henry      <florian.henry@open-concept.pro>
+ * Copyright (C) 2025		MDW					<mdeweerd@users.noreply.github.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
@@ -53,12 +54,12 @@ class FormCron extends Form
 	/**
 	 *  Display On Off selector
 	 *
-	 *  @param  string      $htmlname       Html control name
-	 *  @param  integer     $selected       selected value
-	 *  @param  integer     $readonly       Select is read only or not
-	 *  @return string                      HTML select field
+	 *  @param  string		$htmlname	Html control name
+	 *  @param  string		$selected	Selected value
+	 *  @param  int<0,1>	$readonly	Select is read only or not
+	 *  @return string					HTML select field
 	 */
-	public function select_typejob($htmlname, $selected = 0, $readonly = 0)
+	public function select_typejob($htmlname, $selected = '', $readonly = 0)
 	{
 		// phpcs:enable
 		global $langs;
diff --git a/htdocs/core/tpl/onlinepaymentlinks.tpl.php b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
index 3964d67232d..aae89f8a135 100644
--- a/htdocs/core/tpl/onlinepaymentlinks.tpl.php
+++ b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017 Laurent Destailleur <eldy@destailleur.fr>
+ * Copyright (C) 2025		MDW					<mdeweerd@users.noreply.github.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
@@ -19,6 +20,9 @@
  * @var Translate $langs
  * @var string $servicename
  */
+'
+@phan-var-force string $servicename
+';
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index d01fb3a5f99..edfaae9154c 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2009-2010  Regis Houssin 			<regis.houssin@inodbox.com>
  * Copyright (C) 2011-2024  Laurent Destailleur 	<eldy@users.sourceforge.net>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -34,13 +34,25 @@ if (!defined('NOBROWSERNOTIF')) {
  * @var string $disabled
  * @var string $dol_url_root
  * @var string $focus_element
- * @var string $mode
+ * @var string $mode Contains (list of) authentication methods - example "http","dolibarr","openid,dolibarr"
  * @var string $message
  * @var string $title
  * @var string $urllogo
- * @var string $user
+ * @var User $user
  * @var string $username
  */
+'
+@phan-var-force string $captcha
+@phan-var-force string $disabled
+@phan-var-force string $dol_url_root
+@phan-var-force string $focus_element
+@phan-var-force string $mode
+@phan-var-force string $message
+@phan-var-force string $title
+@phan-var-force string $urllogo
+@phan-var-force User $user
+@phan-var-force string $username
+';
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
@@ -130,10 +142,10 @@ $(document).ready(function () {
 
 <div class="login_center center"<?php
 if (!getDolGlobalString('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 !getDolGlobalString('MAIN_LOGIN_BACKGROUND') ? ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; '.$backstyle.'"' : '';
+	$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 !getDolGlobalString('MAIN_LOGIN_BACKGROUND') ? ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; '.$backstyle.'"' : '';
 }
 ?>>
 <div class="login_vertical_align">
diff --git a/htdocs/core/tpl/passwordreset.tpl.php b/htdocs/core/tpl/passwordreset.tpl.php
index 05a7ccfb7ae..98f43014dc9 100644
--- a/htdocs/core/tpl/passwordreset.tpl.php
+++ b/htdocs/core/tpl/passwordreset.tpl.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2022 	Laurent Destailleur 	<eldy@users.sourceforge.net>
  * Copyright (C) 2024	Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -40,11 +41,27 @@ if (!defined('NOBROWSERNOTIF')) {
  * @var string $passworduidhash
  * @var string $title
  * @var string $urllogo
- * @var string $user
+ * @var User $user
  * @var string $username
  *
  * @var int $setnewpassword
  */
+// Only vars provided by including page - htdocs/user/passwordforgotten.php:
+// $newpass1 and $newpass2 are not set!!!
+'
+@phan-var-force string $captcha
+@phan-var-force string $disabled
+@phan-var-force string $dol_url_root
+@phan-var-force string $focus_element
+@phan-var-force string $mode
+@phan-var-force string $message
+@phan-var-force string $title
+@phan-var-force string $urllogo
+@phan-var-force User $user
+@phan-var-force string $username
+@phan-var-force string $setnewpassword
+@phan-var-force string $passworduidhash
+';
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
@@ -163,10 +180,10 @@ $(document).ready(function () {
 
 <div class="login_center center"<?php
 if (!getDolGlobalString('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 !getDolGlobalString('MAIN_LOGIN_BACKGROUND') ? ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; '.$backstyle.'"' : '';
+	$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 !getDolGlobalString('MAIN_LOGIN_BACKGROUND') ? ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; '.$backstyle.'"' : '';
 }
 ?>>
 <div class="login_vertical_align">
diff --git a/htdocs/core/tpl/resource_add.tpl.php b/htdocs/core/tpl/resource_add.tpl.php
index 3cc89537d5b..613af878a1a 100644
--- a/htdocs/core/tpl/resource_add.tpl.php
+++ b/htdocs/core/tpl/resource_add.tpl.php
@@ -1,6 +1,7 @@
 <!-- BEGIN TEMPLATE resource_add.tpl.php -->
 <?php
 /* Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -25,6 +26,11 @@
  * @var int $element_id
  * @var string $element_ref
  */
+'
+@phan-var-force string $element
+@phan-var-force int $element_id
+@phan-var-force string $element_ref
+';
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
@@ -56,7 +62,7 @@ $out .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline
 $out .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
 $events = array();
 $out .= img_picto('', 'resource', 'class="pictofixedwidth"');
-$out .= $formresources->select_resource_list(0, 'fk_resource', [], 1, 1, 0, $events, '', 2, 0);
+$out .= $formresources->select_resource_list(0, 'fk_resource', '', 1, 1, 0, $events, '', 2, 0);
 $out .= '</div>';
 
 $out .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block marginleftonly"><label for="resbusy">'.$langs->trans('Busy').'</label> ';
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 77ad283a178..4b3310b39ea 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2005-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2021	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -308,7 +308,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 				if ($result > 0) {
 					if (empty($object->oldcopy) || !is_object($object->oldcopy)) {
 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
-						$object->oldcopy = clone $object;
+						$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
 					}
 
 					$oldinfo = $object->oldcopy->_load_ldap_info();
@@ -529,7 +529,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 					if (!method_exists($object->oldcopy, '_load_ldap_info')) {
 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the method ->_load_ldap_info onto object", LOG_WARNING);
-						$object->oldcopy = clone $object;
+						$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
 					}
 
 					$oldinfo = $object->oldcopy->_load_ldap_info();
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 1cd6aebb3c8..a949d332bc2 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -88,7 +88,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 								$body_assignee = 'TicketAssignedEmailBody';
 								$see_ticket_assignee = 'SeeThisTicketIntomanagementInterface';
 
-								$old_MAIN_MAIL_AUTO_COPY_TO = null;  // For static analysis
+								$old_MAIN_MAIL_AUTOCOPY_TO = null;  // For static analysis
 								if (getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO')) {
 									$old_MAIN_MAIL_AUTOCOPY_TO = getDolGlobalString('MAIN_MAIL_AUTOCOPY_TO');
 									$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
@@ -300,15 +300,41 @@ class InterfaceTicketEmail extends DolibarrTriggers
 					}
 
 					$contactid = empty($object->context['contactid']) ? 0 : $object->context['contactid'];
-					$res = 0;
 					$contactObj = null;
 
 					if ($contactid > 0) {
-						// TODO This security test has no sens. We must check that $contactid is inside $linked_contacts[]['id'] when $linked_contacts[]['source'] = 'external' or 'thirdparty'
-						// Refuse email if not
-						$contactObj = new Contact($this->db);
-						$res = $contactObj->fetch($contactid);
-						if (! in_array($contactObj, $linked_contacts)) {
+						// Security test:
+						// Check that $contactid is inside $linked_contacts[]['id'] when $linked_contacts[]['source'] = 'external' or 'thirdparty'
+						$is_linked_contact_id = in_array(
+							$contactid,
+							array_column(  // Get 'id' value from contacts (that are external or thirdparty)
+								array_filter(  // Filter contacts with 'external' or 'thirdparty' source:
+									$linked_contacts,
+									/**
+									 * Return if contact source is external or thirdparty
+									 *
+									 * @param array{source:string,id:int,rowid:int,email:string,civility:string,firstname:string,lastname:string,labeltype:string,libelle:string,socid:int,code:string,status:int,statuscontact:string,fk_c_typecontact:string,phone:string,phone_mobile:string,nom:string} $contact
+									 * @return bool
+									 */
+									static function ($contact) {
+										return in_array($contact['source'], ['external', 'thirdparty']);
+									}
+								),
+								'id'
+							)
+						);
+
+						if ($is_linked_contact_id) {
+							// Seems accepted contact, try to fetch it.
+							$contactObj = new Contact($this->db);
+							$res = $contactObj->fetch($contactid);
+							if ($res <= 0) {
+								// Could not fetch contact, so bad contact anyway (should not happen)
+								$contactObj = null;
+							}
+						}
+
+						if ($contactObj === null) {
 							$error_msg = $langs->trans('Error'). ': ';
 							$error_msg .= $langs->transnoentities('TicketWrongContact');
 							setEventMessages($error_msg, [], 'errors');
@@ -318,7 +344,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 					}
 
 					$sendto = '';
-					if ($contactObj !== null && $res > 0 && !empty($contactObj->email) && !empty($contactObj->statut)) {
+					if ($contactObj !== null && !empty($contactObj->email) && !empty($contactObj->statut)) {
 						$sendto = $contactObj->email;
 					} elseif (!empty($linked_contacts) && ($contactid == -2 || (GETPOST('massaction', 'alpha') == 'close' && GETPOST('confirm', 'alpha') == 'yes'))) {
 						// if sending to all contacts or sending to contacts while mass closing
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index e2b6210775f..4427fa04c45 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2013-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2024	Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -235,7 +236,7 @@ if ($action == 'inactive' && $permissiontoadd) {
 
 // Action clone object
 if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) {
-	if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers')) {
+	if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers')) {  // @phan-suppress-current-line PhanPluginBothLiteralsBinaryOp
 		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 	} else {
 		$objectutil = dol_clone($object, 1); // We clone to avoid to denaturate loaded object when setting some properties for clone or if createFromClone modifies the object. We use the native clone to keep this->db valid.
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 36769c6ec44..a114e4c1ed6 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2013		Florian Henry				<florian.henry@open-concept.pro>
  * Copyright (C) 2013-2021	Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2019-2024	Frédéric France				<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -616,6 +616,9 @@ if ($num > 0) {
 			$texttoshow .= $langs->trans('CronCommand').': '.dol_trunc($obj->command);
 			$texttoshow .= '<br>'.$langs->trans('CronArgs').': '.$obj->params;
 			$texttoshow .= '<br>'.$langs->trans('Comment').': '.$langs->trans($obj->note);
+		} else {
+			$texttoshow = '';
+			$texttoshow = '';
 		}
 		print '<span class="classfortooltip" title="'.dol_escape_htmltag($texttoshow, 1, 1).'">'.$text.'</a>';
 		print '</td>';
diff --git a/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php b/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php
index c40249ed59e..c731fe4e128 100644
--- a/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2023	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -32,7 +32,7 @@ class DolMemoryCollector extends MemoryCollector
 	/**
 	 *	Return value of indicator
 	 *
-	 *  @return array{peak_usage:string,peak_usage_str:string}		Array
+	 *  @return array{peak_usage:int,peak_usage_str:string}		Array
 	 */
 	public function collect()
 	{
diff --git a/htdocs/debugbar/class/DataCollector/DolQueryCollector.php b/htdocs/debugbar/class/DataCollector/DolQueryCollector.php
index 5070d5eb8f3..1dafcc39a1b 100644
--- a/htdocs/debugbar/class/DataCollector/DolQueryCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolQueryCollector.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2023	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -102,7 +102,7 @@ class DolQueryCollector extends DataCollector implements Renderable, AssetProvid
 	/**
 	 *	Return widget settings
 	 *
-	 *  @return array<string,array{icon?:string,widget?:string,tooltip?:string,map:string,default:string}>      Array
+	 *  @return array<string,array{icon?:string,widget?:string,tooltip?:string,map:string,default:int|string}>      Array
 	 */
 	public function getWidgets()
 	{
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index 00a0f8f1d82..d0a1be598b0 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2015	    Claudio Aschieri		<c.aschieri@19.coop>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -113,6 +114,7 @@ $permissiondellink = $user->hasRight('expedition', 'delivery', 'supprimer'); //
 include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';     // Must be 'include', not 'include_once'
 
 if ($action == 'add' && $permissiontoadd) {
+	$array_options = array();
 	$db->begin();
 
 	$object->date_delivery = dol_now();
@@ -134,9 +136,9 @@ if ($action == 'add' && $permissiontoadd) {
 	for ($i = 0; $i < $num; $i++) {
 		$qty = "qtyl".$i;
 		$idl = "idl".$i;
-		$qtytouse = price2num(GETPOST($qty));
+		$qtytouse = price2num(GETPOSTFLOAT($qty));
 		if ($qtytouse > 0) {
-			$object->addline(GETPOST($idl), price2num($qtytouse), $arrayoptions);
+			$object->addline(GETPOSTINT($idl), (float) price2num($qtytouse), $array_options);
 		}
 	}
 
@@ -171,6 +173,7 @@ if ($action == 'add' && $permissiontoadd) {
 		$model = $object->model_pdf;
 		$ret = $object->fetch($id); // Reload to get new records
 
+		// Phan does not use suggested tyhpe for $hide*, ignore: @phan-suppress-next-line PhanTypeMismatchArgument
 		$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		if ($result < 0) {
 			dol_print_error($db, $object->error, $object->errors);
@@ -238,7 +241,7 @@ if ($action == 'update_extras_line' && $permissiontoadd) {
 	for ($i = 0; $i < $num; $i++) {
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
-		$array_options[$i] = $extrafields->getOptionalsFromPost($extralabelsline, $i);
+		$array_options[$i] = $extrafields->getOptionalsFromPost($extralabelsline, (string) $i);
 		// Unset extrafield
 		if (is_array($extralabelsline)) {
 			// Get extra fields
@@ -259,6 +262,12 @@ if ($action == 'update_extras_line' && $permissiontoadd) {
 // Actions to build doc
 $upload_dir = $conf->expedition->dir_output.'/receipt';
 include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+// Provided by include of ...builddoc...:
+'
+@phan-var-force int<0,1> $hidedetails
+@phan-var-force int<0,1> $hidedesc
+@phan-var-force int<0,1> $hideref
+';
 
 include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
@@ -352,7 +361,7 @@ if ($action == 'create') {
 					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, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, (string) $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 				} else {
 					if (!empty($objectsrc->fk_project)) {
 						$proj = new Project($db);
@@ -583,7 +592,7 @@ if ($action == 'create') {
 						$text .= ' - '.$label;
 						$description = (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE') ? '' : dol_htmlentitiesbr($object->lines[$i]->description));
 						//print $description;
-						print $form->textwithtooltip($text, $description, 3, '', '', $i);
+						print $form->textwithtooltip($text, $description, 3, 0, '', (string) $i);
 						//print_date_range($object->lines[$i]->date_start, $object->lines[$i]->date_end);
 						if (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE')) {
 							print (!empty($object->lines[$i]->description) && $object->lines[$i]->description != $object->lines[$i]->product_label) ? '<br>'.dol_htmlentitiesbr($object->lines[$i]->description) : '';
@@ -598,7 +607,7 @@ if ($action == 'create') {
 
 						if (!empty($object->lines[$i]->label)) {
 							$text .= ' <strong>'.$object->lines[$i]->label.'</strong>';
-							print $form->textwithtooltip($text, $object->lines[$i]->description, 3, '', '', $i);
+							print $form->textwithtooltip($text, $object->lines[$i]->description, 3, 0, '', (string) $i);
 						} else {
 							print $text.' '.nl2br($object->lines[$i]->description);
 						}
diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index 4256a27ff6b..2f2f8c1bd88 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2013      Florian Henry	     <florian.henry@open-concept.pro>
  * Copyright (C) 2014-2015 Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2023-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -770,8 +770,8 @@ class Delivery extends CommonObject
 	/**
 	 *	Return clickable name (with picto eventually)
 	 *
-	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
-	 *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@param	int<0,2>	$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
+	 *  @param  int<-1,1>	$save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								Chaine avec URL
 	 */
 	public function getNomUrl($withpicto = 0, $save_lastsearch_value = -1)
diff --git a/htdocs/delivery/tpl/linkedobjectblock.tpl.php b/htdocs/delivery/tpl/linkedobjectblock.tpl.php
index fa6257b7e82..bd3a93dc3e0 100644
--- a/htdocs/delivery/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/delivery/tpl/linkedobjectblock.tpl.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2010-2011	Regis Houssin <regis.houssin@inodbox.com>
  * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
  * Copyright (C) 2014       Marcos García <marcosgdf@gmail.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -44,6 +44,7 @@ $total = 0;
 $ilink = 0;
 foreach ($linkedObjectBlock as $key => $objectlink) {
 	/** @var Delivery $objectlink */
+	'@phan-var-force Delivery $objectlink';
 	$ilink++;
 
 	$trclass = 'oddeven';
@@ -53,7 +54,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	echo '<tr class="'.$trclass.'" >';
 	echo '<td class="linkedcol-element tdoverflowmax100">'.$langs->trans("Delivery");
 	if (!empty($showImportButton) && getDolGlobalString('MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES')) {
-		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines&amp;token='.newToken().'" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
+		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, 0).'&amp;action=selectlines&amp;token='.newToken().'" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
 	}
 	echo '</td>';
 	echo '<td class="linkedcol-name tdoverflowmax150" >'.$objectlink->getNomUrl(1).'</td>';
diff --git a/htdocs/document.php b/htdocs/document.php
index 067eac0d7bb..7f8a17c3d0e 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2010	   Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2022	    Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -94,6 +95,7 @@ if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias')) {
  * @param	int				$disablenofollow	Disable the "nofollow" on meta robot header
  * @param	int				$disablenoindex		Disable the "noindex" on meta robot header
  * @return	void
+ * @phan-suppress PhanRedefineFunction
  */
 function llxHeader($head = '', $title = '', $help_url = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $morequerystring = '', $morecssonbody = '', $replacemainareaby = '', $disablenofollow = 0, $disablenoindex = 0)
 {
@@ -106,6 +108,7 @@ function llxHeader($head = '', $title = '', $help_url = '', $target = '', $disab
  * @param	string	$zone						'private' (for private pages) or 'public' (for public pages)
  * @param	int		$disabledoutputofmessages	Clear all messages stored into session without displaying them
  * @return	void
+ * @phan-suppress PhanRedefineFunction
  */
 function llxFooter($comment = '', $zone = 'private', $disabledoutputofmessages = 0)
 {
@@ -168,7 +171,7 @@ if (in_array($modulepart, array('facture_paiement', 'unpaid'))) {
  */
 
 // If we have a hash public (hashp), we guess the original_file.
-$ecmfile='';
+$ecmfile = '';
 if (!empty($hashp)) {
 	include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 	$ecmfile = new EcmFiles($db);
@@ -210,7 +213,7 @@ if (preg_match('/\.(html|htm)$/i', $original_file)) {
 	$attachment = false;
 }
 if (isset($_GET["attachment"])) {
-	$attachment = GETPOST("attachment", 'alpha') ?true:false;
+	$attachment = GETPOST("attachment", 'alpha') ? true : false;
 }
 if (getDolGlobalString('MAIN_DISABLE_FORCE_SAVEAS')) {
 	$attachment = false;
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index e0bc65d8939..ef2af45fedb 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2015-2020  Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2015       Benoit Bruchard			<benoitb21@gmail.com>
  * Copyright (C) 2019       Thibault FOUCART		<support@ptibogxiv.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -298,7 +298,7 @@ if (is_resource($handle)) {
 				$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
 				$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 				print '<td class="center">';
-				print $form->textwithpicto('', $htmltooltip, -1, 0);
+				print $form->textwithpicto('', $htmltooltip, -1, 'info');
 				print '</td>';
 
 				// Preview
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 3f6e19412e7..0660940beb4 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2015-2016  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2019  Thibault FOUCART        <support@ptibogxiv.net>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -74,6 +75,7 @@ if ($id > 0 || $ref) {
 	$object->fetch($id, $ref);
 }
 
+$soc = null;
 if (!empty($socid) && $socid > 0) {
 	$soc = new Societe($db);
 	if ($socid > 0) {
@@ -374,6 +376,7 @@ llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-donation page-card')
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formcompany = new FormCompany($db);
+$formproject = null;
 if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
@@ -397,7 +400,7 @@ if ($action == 'create') {
 	// Company
 	if (isModEnabled("societe") && getDolGlobalString('DONATION_USE_THIRDPARTIES')) {
 		// Thirdparty
-		if (!empty($soc) && $soc->id > 0) {
+		if (is_object($soc) && $soc->id > 0) {
 			print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
 			print '<td>';
 			print $soc->getNomUrl(1);
@@ -419,7 +422,7 @@ if ($action == 'create') {
 			print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
 			print '<td>';
 			$filter = '((s.client:IN:1,2,3) AND (status:=:1))';
-			print $form->select_company('', 'socid', $filter, 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+			print $form->select_company('', 'socid', $filter, 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
 			// Option to reload page to retrieve customer information. Note, this clear other input
 			if (getDolGlobalString('RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED')) {
 				print '<script type="text/javascript">
@@ -483,14 +486,14 @@ if ($action == 'create') {
 	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
 	$selected = GETPOSTINT('modepayment');
 	print img_picto('', 'payment', 'class="pictofixedwidth"');
-	print $form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx', 1);
+	print $form->select_types_paiements((string) $selected, 'modepayment', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx', 1);
 	print "</td></tr>\n";
 
 	// Public note
 	print '<tr>';
 	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
-	if (!isset($note_public)) {
+	if (!isset($note_public)) {  // Does not seem set before! @phan-suppress-current-line PhanPluginUndeclaredVariableIsset
 		$note_public = $object->getDefaultCreateValueFor('note_public');
 	}
 	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', false, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
@@ -502,7 +505,7 @@ if ($action == 'create') {
 		print '<tr>';
 		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
 		print '<td>';
-		if (!isset($note_private)) {
+		if (!isset($note_private)) {  // Does not seem set before! @phan-suppress-current-line PhanPluginUndeclaredVariableIsset
 			$note_private = $object->getDefaultCreateValueFor('note_private');
 		}
 		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', false, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
@@ -510,10 +513,10 @@ if ($action == 'create') {
 		print '</td></tr>';
 	}
 
-	if (isModEnabled('project')) {
+	if (isModEnabled('project') && $formproject !== null) {
 		print "<tr><td>".$langs->trans("Project")."</td><td>";
 		print img_picto('', 'project', 'class="pictofixedwidth"');
-		print $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
+		print $formproject->select_projects(-1, (string) $projectid, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
 		print "</td></tr>\n";
 	}
 
@@ -635,7 +638,7 @@ if (!empty($id) && $action == 'edit') {
 
 		$langs->load('projects');
 		print '<tr><td>'.$langs->trans('Project').'</td><td>';
-		$formproject->select_projects(-1, $object->fk_project, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
+		$formproject->select_projects(-1, (string) $object->fk_project, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
 		print '</td></tr>';
 	}
 
@@ -695,7 +698,7 @@ if (!empty($id) && $action != 'edit') {
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (isModEnabled('project')) {
+	if (isModEnabled('project') && $formproject !== null) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($user->hasRight('don', 'creer')) {
@@ -708,11 +711,11 @@ if (!empty($id) && $action != 'edit') {
 				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
 				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
 				$morehtmlref .= '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1, 0, 'maxwidth500');
+				$morehtmlref .= $formproject->select_projects($object->socid, (string) $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1, 0, 'maxwidth500');
 				$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, $object->socid, (string) $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
@@ -769,7 +772,7 @@ if (!empty($id) && $action != 'edit') {
 
 	// Payment mode
 	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
-	$form->form_modes_reglement(null, $object->mode_reglement_id, 'none');
+	$form->form_modes_reglement('', (string) $object->mode_reglement_id, 'none');
 	print "</td></tr>\n";
 
 	// Other attributes
@@ -937,7 +940,7 @@ if (!empty($id) && $action != 'edit') {
 	$filename = dol_sanitizeFileName((string) $object->id);
 	$filedir = $conf->don->dir_output."/".dol_sanitizeFileName((string) $object->id);
 	$urlsource = $_SERVER['PHP_SELF'].'?rowid='.$object->id;
-	$genallowed	= (($object->paid == 0 || $user->admin) && $user->hasRight('don', 'lire'));
+	$genallowed	= (int) (($object->paid == 0 || $user->admin) && $user->hasRight('don', 'lire'));
 	$delallowed	= $user->hasRight('don', 'creer');
 
 	print $formfile->showdocuments('donation', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf);
diff --git a/htdocs/don/class/donstats.class.php b/htdocs/don/class/donstats.class.php
index b0e8440e2f7..a884e621d13 100644
--- a/htdocs/don/class/donstats.class.php
+++ b/htdocs/don/class/donstats.class.php
@@ -3,7 +3,7 @@
  * Copyright (c) 2005-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011      Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -91,7 +91,7 @@ class DonationStats extends Stats
 		$this->join = '';
 
 		if ($status == 0 || $status == 1 || $status == 2) {
-			$this->where = ' d.fk_statut IN ('.$this->db->sanitize($status).')';
+			$this->where = ' d.fk_statut IN ('.((int) $status).')';
 		} elseif ($status == 3) {
 			$this->where = ' d.fk_statut IN (-1)';
 		} elseif ($status == 4) {
@@ -140,7 +140,6 @@ class DonationStats extends Stats
 	 * Return shipments number per year
 	 *
 	 * @return	array<array{0:int,1:int}>				Array of nb each year
-	 *
 	 */
 	public function getNbByYear()
 	{
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index 4386b581976..6ccd7a1827a 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2015       Alexandre Spangaro	  		<aspangaro@open-dsi.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -637,7 +637,7 @@ class PaymentDonation extends CommonObject
 			// Insert payment into llx_bank
 			$bank_line_id = $acc->addline(
 				$this->datep,
-				$this->paymenttype, // Payment mode id or code ("CHQ or VIR for example")
+				(string) $this->paymenttype, // Payment mode id or code ("CHQ or VIR for example")
 				$label,
 				$amount,
 				$this->num_payment,
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 1550989cd71..443c3ed2e7e 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
  * Copyright (C) 2015      Alexandre Spangaro    <aspangaro@open-dsi.fr>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -76,6 +77,8 @@ if (!$sortfield) {
 	$sortfield = "name";
 }
 
+$formproject = null;
+
 $object = new Don($db);
 if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
@@ -142,23 +145,23 @@ if ($object->id) {
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (isModEnabled('project')) {
+	if (isModEnabled('project') && $formproject !== null) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($user->hasRight('don', '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> : ';
-			}
+			//if ($action != 'classify') {
+			// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			//}
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 				$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($object->socid, (string) $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, $object->socid, (string) $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index 2df4cdbdcfe..1143951cb00 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2019       Nicolas ZABOURI         <info@inovea-conseil.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -99,10 +99,8 @@ print load_fiche_titre($langs->trans("DonationsArea"), '', 'object_donation');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-if (!isset($listofsearchfields) || !is_array($listofsearchfields)) {
-	// Ensure $listofsearchfields is an array
-	$listofsearchfields = array();
-}
+$listofsearchfields = array();
+
 if (getDolGlobalString('MAIN_SEARCH_FORM_ON_HOME_AREAS')) {     // TODO Add a search into global search combo so we can remove this
 	if (isModEnabled('don') && $user->hasRight('don', 'lire')) {
 		$listofsearchfields['search_donation'] = array('text' => 'Donation');
diff --git a/htdocs/don/info.php b/htdocs/don/info.php
index baeed65feda..3e7514e16d2 100644
--- a/htdocs/don/info.php
+++ b/htdocs/don/info.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015-2016	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -80,6 +81,7 @@ $help_url = 'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones|DE:M
 
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-donation page-card_info');
 
+$formproject = null;
 $form = new Form($db);
 if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
@@ -95,23 +97,23 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(!empty($socid) ? '?socid='
 
 $morehtmlref = '<div class="refidno">';
 // Project
-if (isModEnabled('project')) {
+if (isModEnabled('project') && $formproject !== null) {
 	$langs->load("projects");
 	$morehtmlref .= $langs->trans('Project').' ';
 	if ($user->hasRight('don', '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> : ';
-		}
+		//if ($action != 'classify') {
+		// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+		//}
 		if ($action == 'classify') {
 			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 			$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($object->socid, (string) $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, $object->socid, (string) $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 		}
 	} else {
 		if (!empty($object->fk_project)) {
diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index 9e0abfd0da1..d0d1c2cb5f4 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2016      Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -98,6 +99,7 @@ $help_url = 'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones|DE:M
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-donation page-card_notes');
 
 $form = new Form($db);
+$formproject = null;
 if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
@@ -114,23 +116,23 @@ if ($id > 0 || !empty($ref)) {
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (isModEnabled('project')) {
+	if (isModEnabled('project') && $formproject !== null) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($user->hasRight('don', '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> : ';
-			}
+			//if ($action != 'classify') {
+			// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			//}
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 				$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($object->socid, (string) $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, $object->socid, (string) $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/don/paiement/list.php b/htdocs/don/paiement/list.php
index 5fd82766651..b8cfe449719 100644
--- a/htdocs/don/paiement/list.php
+++ b/htdocs/don/paiement/list.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2019       Thibault FOUCART        <support@ptibogxiv.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -87,6 +87,9 @@ if (!$sortfield) {
 
 $search_all = trim(GETPOST('search_all', 'alphanohtml'));
 
+$morejs = array();
+$morecss = array();
+
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
 	'pd.rowid' => "RefPayment",
@@ -96,17 +99,17 @@ $fieldstosearchall = array(
 );
 
 $arrayfields = array(
-	'pd.rowid'				=> array('label' => "RefPayment", 'checked' => 1, 'position' => 10),
-	'pd.datep'			=> array('label' => "Date", 'checked' => 1, 'position' => 20),
-	's.nom'				=> array('label' => "ThirdParty", 'checked' => 1, 'position' => 30),
-	'c.code'			=> array('label' => "Type", 'checked' => 1, 'position' => 40),
-	'pd.num_paiement'	=> array('label' => "Numero", 'checked' => 1, 'position' => 50, 'tooltip' => "ChequeOrTransferNumber"),
-	'transaction'		=> array('label' => "BankTransactionLine", 'checked' => 1, 'position' => 60, 'enabled' => (isModEnabled("bank"))),
-	'ba.label'			=> array('label' => "BankAccount", 'checked' => 1, 'position' => 70, 'enabled' => (isModEnabled("bank"))),
-	'pd.amount'			=> array('label' => "Amount", 'checked' => 1, 'position' => 80),
+	'pd.rowid'			=> array('label' => "RefPayment", 'checked' => '1', 'position' => 10),
+	'pd.datep'			=> array('label' => "Date", 'checked' => '1', 'position' => 20),
+	's.nom'				=> array('label' => "ThirdParty", 'checked' => '1', 'position' => 30),
+	'c.code'			=> array('label' => "Type", 'checked' => '1', 'position' => 40),
+	'pd.num_paiement'	=> array('label' => "Numero", 'checked' => '1', 'position' => 50, 'tooltip' => "ChequeOrTransferNumber"),
+	'transaction'		=> array('label' => "BankTransactionLine", 'checked' => '1', 'position' => 60, 'enabled' => (string) (isModEnabled("bank"))),
+	'ba.label'			=> array('label' => "BankAccount", 'checked' => '1', 'position' => 70, 'enabled' => (string) (isModEnabled("bank"))),
+	'pd.amount'			=> array('label' => "Amount", 'checked' => '1', 'position' => 80),
 );
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked:string,position?:int,help?:string,enabled?:string}> $arrayfields';  // dol_sort_array looses type for Phan
 
 $optioncss = GETPOST('optioncss', 'alpha');
 $moreforfilter = GETPOST('moreforfilter', 'alpha');
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 383737aad42..b2ba19b8983 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2015       Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2019-2024	Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -43,6 +43,7 @@ if (isModEnabled("bank")) {
 
 // Load translation files required by the page
 $langs->loadLangs(array("bills", "banks", "companies", "donations"));
+$outputlangs = $langs;
 
 // Security check
 $id = GETPOST('rowid') ? GETPOSTINT('rowid') : GETPOSTINT('id');
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index dbdbe39b67c..b60990d8a8f 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2015       Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -155,7 +155,7 @@ $form = new Form($db);
 $title = $langs->trans("Payment");
 llxHeader('', $title, '', '', 0, 0, '', '', '', 'mod-donation page-payment');
 
-
+$sumpaid = 0;
 $sql = "SELECT sum(p.amount) as total";
 $sql .= " FROM ".MAIN_DB_PREFIX."payment_donation as p";
 $sql .= " WHERE p.fk_donation = ".((int) $chid);
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index cd3946db761..acc0eadac5b 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2015      Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -168,7 +168,7 @@ if (!$mesg) {
 	$px3->SetLegend($legend);
 	$px3->SetYLabel($langs->trans("AmountAverage"));
 	$px3->SetMaxValue($px3->GetCeilMaxValue());
-	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetMinValue((int) $px3->GetFloorMinValue());
 	$px3->SetWidth($WIDTH);
 	$px3->SetHeight($HEIGHT);
 	$px3->SetShading(3);
@@ -238,14 +238,17 @@ if (isModEnabled('category')) {
 	print '<tr><td>'.$cat_label.'</td><td>';
 	$cate_arbo = $form->select_all_categories($cat_type, '', 'parent', 0, 0, 1);
 	print img_picto('', 'category', 'class="pictofixedwidth"');
-	print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), 0, 0, 'widthcentpercentminusx maxwidth300');
+	if (is_array($cate_arbo) && is_array($cate_arbo[0])) {
+		print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), 0, 0, 'widthcentpercentminusx maxwidth300');
+	}
+
 	print '</td></tr>';
 }
 
 // User
 print '<tr><td>'.$langs->trans("CreatedBy").'</td><td>';
 print img_picto('', 'user', 'class="pictofixedwidth"');
-print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
+print $form->select_dolusers($userid, 'userid', 1, null, 0, '', '', '0', 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
 print '</td></tr>';
 
 // Status
diff --git a/htdocs/don/tpl/linkedobjectblock.tpl.php b/htdocs/don/tpl/linkedobjectblock.tpl.php
index 9cff8839b7d..9bb0df0bd19 100644
--- a/htdocs/don/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/don/tpl/linkedobjectblock.tpl.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
  * Copyright (C) 2014       Marcos García <marcosgdf@gmail.com>
  * Copyright (C) 2017       Charlene Benke <cf.benke@patas-monkey.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -32,6 +32,7 @@ $langs->load("donations");
 
 $total = 0;
 $ilink = 0;
+$lastObjectLink = null;
 foreach ($linkedObjectBlock as $key => $objectlink) {
 	$ilink++;
 
@@ -47,9 +48,10 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	print '<td class="right">';
 	$total += $objectlink->total_ht;
 	echo price($objectlink->total_ht);
+	$lastObjectLink = $objectlink;
 }
 print '</td>';
-print '<td class="right">'.$objectlink->getLibStatut(3).'</td>';
+print '<td class="right">'.(is_object($lastObjectLink) ? $lastObjectLink->getLibStatut(3) : '').'</td>';
 print '</tr>';
 
 if (count($linkedObjectBlock) > 1) {

From 49315de959cf03b0ac10b56a54ae8d07ee148766 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 18 Jan 2025 23:20:29 +0100
Subject: [PATCH 262/602] Qual: Update phan baseline

---
 dev/tools/phan/baseline.txt | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 565cb2ab972..7007834787e 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -10,8 +10,8 @@
 return [
     // # Issue statistics:
     // PhanUndeclaredProperty : 540+ occurrences
-    // PhanPossiblyUndeclaredGlobalVariable : 260+ occurrences
-    // PhanUndeclaredGlobalVariable : 250+ occurrences
+    // PhanPossiblyUndeclaredGlobalVariable : 250+ occurrences
+    // PhanUndeclaredGlobalVariable : 220+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 180+ occurrences
     // PhanTypeMismatchArgumentProbablyReal : 180+ occurrences
     // PhanTypeMismatchProperty : 140+ occurrences
@@ -23,27 +23,26 @@ return [
     // PhanTypeMismatchDimFetch : 25+ occurrences
     // PhanTypeMismatchArgumentNullableInternal : 20+ occurrences
     // PhanUndeclaredConstant : 15+ occurrences
-    // PhanPluginEmptyStatementIf : 10+ occurrences
     // PhanTypeComparisonFromArray : 10+ occurrences
     // PhanUndeclaredMethod : 10+ occurrences
     // PhanPluginUnknownObjectMethodCall : 8 occurrences
     // PhanEmptyForeach : 7 occurrences
+    // PhanPluginEmptyStatementIf : 7 occurrences
     // PhanPluginSuspiciousParamPosition : 7 occurrences
-    // PhanPluginBothLiteralsBinaryOp : 6 occurrences
     // PhanPluginDuplicateExpressionBinaryOp : 6 occurrences
     // PhanTypeArraySuspiciousNull : 6 occurrences
     // PhanParamTooMany : 5 occurrences
+    // PhanPluginBothLiteralsBinaryOp : 5 occurrences
     // PhanPluginDuplicateArrayKey : 4 occurrences
     // PhanEmptyFQSENInClasslike : 3 occurrences
     // PhanInvalidFQSENInClasslike : 3 occurrences
-    // PhanPossiblyUndeclaredVariable : 2 occurrences
     // PhanTypeMismatchDimAssignment : 2 occurrences
     // PhanTypeMismatchDimFetchNullable : 2 occurrences
-    // PhanTypeMismatchReturn : 2 occurrences
     // PhanTypeSuspiciousStringExpression : 2 occurrences
     // PhanAccessMethodProtected : 1 occurrence
     // PhanPluginDuplicateExpressionAssignmentOperation : 1 occurrence
     // PhanPluginUnknownArrayPropertyType : 1 occurrence
+    // PhanPossiblyUndeclaredVariable : 1 occurrence
     // PhanTypeExpectedObjectPropAccessButGotNull : 1 occurrence
 
     // Currently, file_suppressions and directory_suppressions are the only supported suppressions
@@ -190,38 +189,20 @@ return [
         'htdocs/core/tpl/extrafields_view.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/tpl/massactions_pre.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/tpl/objectline_view.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/tpl/onlinepaymentlinks.tpl.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/core/tpl/passwordforgotten.tpl.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/core/tpl/passwordreset.tpl.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/core/tpl/resource_add.tpl.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
         'htdocs/core/tpl/resource_view.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php' => ['PhanTypeMismatchProperty'],
         'htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeExpectedObjectPropAccess'],
         'htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/cron/card.php' => ['PhanPluginBothLiteralsBinaryOp'],
-        'htdocs/cron/list.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/debugbar/class/DataCollector/DolMemoryCollector.php' => ['PhanTypeMismatchReturn'],
-        'htdocs/debugbar/class/DataCollector/DolQueryCollector.php' => ['PhanTypeMismatchReturn'],
-        'htdocs/delivery/card.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
         'htdocs/delivery/class/delivery.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/delivery/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/document.php' => ['PhanRedefineFunction'],
         'htdocs/don/admin/donation.php' => ['PhanUndeclaredMethod'],
-        'htdocs/don/card.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/don/class/api_donations.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/don/class/don.class.php' => ['PhanParamTooMany'],
-        'htdocs/don/document.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/don/index.php' => ['PhanPluginUndeclaredVariableIsset'],
-        'htdocs/don/info.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/don/document.php' => ['PhanUndeclaredGlobalVariable'],
+        'htdocs/don/info.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/don/list.php' => ['PhanTypeMismatchProperty'],
-        'htdocs/don/note.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/don/paiement/list.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/don/payment/card.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/don/payment/payment.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/don/tpl/linkedobjectblock.tpl.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
+        'htdocs/don/note.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/ecm/dir_card.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/ecm/index.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/emailcollector/class/emailcollector.class.php' => ['PhanUndeclaredProperty'],

From 581b079e14118108a0a7896ab594296e8a5d8c3c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 27 Jan 2025 19:32:38 +0100
Subject: [PATCH 263/602] Qual: Spelling fixes, cleanup exceptions

# Qual: Spelling fixes, cleanup exceptions

Fix some spelling and cleanup ignored lines
---
 dev/tools/codespell/codespell-lines-ignore.txt   | 16 ++--------------
 htdocs/core/class/commonobjectline.class.php     |  4 ++--
 htdocs/core/lib/functions.lib.php                |  2 +-
 .../interface_50_modTicket_TicketEmail.class.php |  6 +++---
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/dev/tools/codespell/codespell-lines-ignore.txt b/dev/tools/codespell/codespell-lines-ignore.txt
index 687afec36f4..9eee54b90d6 100644
--- a/dev/tools/codespell/codespell-lines-ignore.txt
+++ b/dev/tools/codespell/codespell-lines-ignore.txt
@@ -1,13 +1,10 @@
 								$objMod->dictionaries = $objMod->{"dictionnaries"}; // For backward compatibility
 							if (empty($objMod->dictionaries) && !empty($objMod->{"dictionnaries"})) {
 							print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&id_entrepot='.$entrepotstatic->id.'&action=transfert&pdluoid='.$pdluo->id.'&token='.newToken().'">';
-						$object->date_ech = $object->periode;
 						$reponsesadd = str_split($obj->reponses);
 						$sql .= " SET reponses = '".$db->escape($reponsesadd)."'";
 						$sql .= " SET reponses = '0".$db->escape($obj->reponses)."'";
 						$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0);
-						//$pice = '<i class="fas fa-briefcase inline-block"></i>';
-						//$typea = ($objp->typea == 'birth') ? $picb : $pice;
 						print '<td class="center"><a href="'.DOL_URL_ROOT.'/product/stock/product.php?dwid='.$object->id.'&id='.$objp->rowid.'&action=transfert&token='.newToken().'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$id).'">';
 					$dateemail = dol_stringtotime((string) $overview[0]->udate, 'gmt');
 					$pice = '<i class="fas fa-briefcase inline-block"></i>';
@@ -33,7 +30,6 @@
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=transfert&token='.newToken().'">'.$langs->trans("TransferStock").'</a>';
 			$action = 'transfert';
 			$date_com = dol_mktime(GETPOSTINT('rehour'), GETPOSTINT('remin'), GETPOSTINT('resec'), GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'));
-			$date_next_execution = (GETPOST('remonth') ? dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')) : -1);
 			$date_next_execution = dol_mktime($rehour, $remin, 0, $remonth, $reday, $reyear);
 			$datesubscription = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
 			$ensemblereponses = $obj->reponses;
@@ -55,7 +51,6 @@
 			preg_match('/:([!<>=\s]+|in|notin|like|notlike):/', $tmpcrit, $reg);
 			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert&token='.newToken().'">'.$langs->trans("TransferStock").'</a>';
 			print '<span class="opacitymedium">'.$langs->trans("ClinkOnALinkOfColumn", $langs->transnoentitiesnoconv("Referers")).'</span>';
-			print '<td class="center nowraponall">'.dol_print_date($db->jdate($obj->period), 'day').'</td>';
 		"sme",
 		$action = 'transfert';
 		$cle_rib = strtolower(checkES($rib, $CCC));
@@ -71,7 +66,6 @@
 		$reday = GETPOSTINT('reday');
 		$sql .= "   (cs.periode IS NOT NULL AND cs.periode between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
 		$sql .= " OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
-		$sql .= ", '".$this->db->idate($this->period)."'";
 		$sql .= ", cs.libelle as label, cs.fk_type, cs.amount, cs.fk_projet as fk_project, cs.paye, cs.periode as period, cs.import_key";
 		$sql .= ", periode = '".$this->db->idate($this->period ? $this->period : $this->periode)."'";
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, fk_account, fk_mode_reglement, libelle, date_ech, periode, amount, fk_projet, entity, fk_user_author, fk_user, date_creation)";
@@ -82,14 +76,11 @@
 		$this->periode = $this->date_creation + 3600 * 24 * 30;
 		$title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('Referers');
 		$title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('Referers');
-		$title = $langs->transnoentities("Balance")." - ".$langs->transnoentities("AllTime");
 		if (!empty($arrayfields['cs.periode']['checked'])) {
 		if ($newamount == 0 || empty($this->date_ech) || (empty($this->period) && empty($this->periode))) {
 		if ($user->hasRight('stock', 'mouvement', 'creer')) {
 		if (GETPOSTISSET("reday") && GETPOSTISSET("remonth") && GETPOSTISSET("reyear")) {
-		if (empty($reyear) || empty($remonth) || empty($reday)) {
 	 *  @param  float|string	$selectedrate       Force preselected vat rate. Can be '8.5' or '8.5 (NOO)' for example. Use '' for no forcing.
-	$datepaid = dol_mktime(12, 0, 0, GETPOST("remonth"), GETPOST("reday"), GETPOST("reyear"));
 	$datepaid = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
 	$datepaye = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
 	$datepaye = dol_mktime(GETPOSTINT("rehour"), GETPOSTINT("remin"), GETPOSTINT("resec"), GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
@@ -100,7 +91,6 @@
 	$inj += preg_match('/on(dblclick|drop|durationchange|emptied|end|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)[a-z]*\s*=/i', $val);
 	$opensurveysondage->mail_admin = $_SESSION['adresse'];
 	$pdf->SetXY($savx, $savy);
-	$reday = GETPOST('reday');
 	$savy = $pdf->getY();
 	$somethingshown = $formactions->showactions($object, 'mouvement', 0, 1, '', $MAXEVENT, '', $morehtmlcenter); // Show all action for product
 	$sql .= "   (cs.periode IS NOT NULL AND cs.periode between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
@@ -125,7 +115,6 @@
 	print '<option value="1"'.(GETPOST('mouvement') ? ' selected="selected"' : '').'>'.$langs->trans("Delete").'</option>';
 	print '<select name="mouvement" id="mouvement" class="minwidth100 valignmiddle">';
 	print '<td class="left" width="25%">'.$langs->trans("Referers").'</td>';
-	print '<td class="right">'.$langs->trans("NbOfMembers").' <span class="opacitymedium">('.$langs->trans("AllTime").')</span></td>';
 	print ajax_combobox("mouvement");
 	print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.lastname,cs.periode", "", $param, 'class="left"', $sortfield, $sortorder);
 	print_liste_field_titre($arrayfields['cs.amount']['label'], $_SERVER["PHP_SELF"], "cs.amount,cs.periode", '', $param, 'class="right"', $sortfield, $sortorder);
@@ -142,7 +131,7 @@
           - creat,unitl,alltime,datas,referers
           - informations,medias,uptodate,reenable,crypted,developpers
           - ned
- * Copyright (C) 2019   	Cedric Ancelin          <icedo.anc@gmail.com>
+ * Copyright (C) 2019		Cedric Ancelin			<icedo.anc@gmail.com>
 $permissiontoadd = $user->hasRight('stock', 'mouvement', 'creer');
 $permissiontodelete = $user->hasRight('stock', 'mouvement', 'creer'); // There is no deletion permission for stock movement as we should never delete
 $permissiontoread = $user->hasRight('stock', 'mouvement', 'lire');
@@ -150,6 +139,7 @@ $sql .= " GROUP BY cs.rowid, cs.fk_type, cs.fk_user, cs.amount, cs.date_ech, cs.
 $sql .= " cs.amount, cs.date_ech, cs.libelle as label, cs.paye, cs.periode as period, cs.fk_account,";
 $sql .= " cs.rowid, cs.libelle as label_sc, cs.fk_type as type, cs.periode as period, cs.date_ech, cs.amount as total, cs.paye,";
 $sql = "SELECT id_users, nom as name, id_sondage, reponses";
+$sql = "SELECT id_users, nom as name, id_sondage, reponses, tms, date_creation";
 $sql = 'SELECT nom as name, reponses';
 $title = $langs->trans("Referers", $object->name);
 $usercancreate = $user->hasRight('stock', 'mouvement', 'creer');
@@ -170,8 +160,6 @@ if (!$user->hasRight('stock', 'mouvement', 'lire')) {
 if (!empty($arrayfields['cs.periode']['checked'])) {
 if ($action == "transfert") {
 print $langs->trans("Developpers").':';
-print '<td class="right">'.$langs->trans("NbOfMembers").' <span class="opacitymedium">('.$langs->trans("AllTime").')</span></td>';
 print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.periode", "", $param, '', $sortfield, $sortorder, 'center ');
 select#date_startday, select#date_startmonth, select#date_endday, select#date_endmonth, select#reday, select#remonth
 select#date_startday, select#date_startmonth, select#date_endday, select#date_endmonth, select#reday, select#remonth,
-$sql = "SELECT id_users, nom as name, id_sondage, reponses, tms, date_creation";
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index 484ead2770d..173cd852be1 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2006-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -332,7 +332,7 @@ abstract class CommonObjectLine extends CommonObject
 	}
 
 	/**
-	 * Return clicable link of object line (with eventually picto)
+	 * Return clickable link of object line (optionally with picto)
 	 * May (should) also return information about the associated "parent" object.
 	 * To overload
 	 *
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9a37d1404bf..27c1b697b5e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1940,7 +1940,7 @@ function dol_escape_js($stringtoescape, $mode = 0, $noescapebackslashn = 0)
 }
 
 /**
- *  Returns text escaped by RFC 3986 for inclusion into a clicable link.
+ *  Returns text escaped by RFC 3986 for inclusion into a clickable link.
  *  This method can be used on the ...in links like href="javascript:..." because when clicking on such links, the browserfirst decode the strind
  *  and then interpret content that can be javascript.
  *  Usage of this escapement should be limited to links href="javascript:...". For common URL, use urlencode instead.
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 1cd6aebb3c8..9c7fc226cf6 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -347,7 +347,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 	 * @param string 	$sendto			Addresses to send the mail, format "first@address.net, second@address.net," etc.
 	 * @param string 	$base_subject	email subject. Non-translated string.
 	 * @param string 	$body			email body (first line). Non-translated string.
-	 * @param Ticket 	$object			the ticket thet the email refers to
+	 * @param Ticket 	$object			the ticket that the email refers to
 	 * @param Translate $langs			the translation object
 	 * @return void
 	 */
@@ -420,7 +420,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 	 * @param string 	$base_subject	email subject. Non-translated string.
 	 * @param string	$body			email body (first line). Non-translated string.
 	 * @param string 	$see_ticket		string indicating the ticket public address
-	 * @param Ticket 	$object			the ticket thet the email refers to
+	 * @param Ticket 	$object			the ticket that the email refers to
 	 * @param Translate $langs			the translation object
 	 * @return void
 	 */
@@ -516,7 +516,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 	 * @param string 	$base_subject	email subject. Non-translated string.
 	 * @param string	$body			email body (first line). Non-translated string.
 	 * @param string 	$see_ticket		string indicating the ticket public address
-	 * @param Ticket 	$object			the ticket thet the email refers to
+	 * @param Ticket 	$object			the ticket that the email refers to
 	 * @param Translate $langs			the translation object
 	 * @return void
 	 */

From 11cb6282b628314d7fd9069fd391c08bd818c6f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 27 Jan 2025 19:55:39 +0100
Subject: [PATCH 264/602] clean phpstan baseline

---
 dev/build/phpstan/phpstan-baseline.neon      | 6 ------
 htdocs/expedition/class/expedition.class.php | 9 +++++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 8e71cfc7fa8..4fc54d336a2 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -17064,12 +17064,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/expedition/class/expedition.class.php
 
-		-
-			message: '#^Variable \$line might not be defined\.$#'
-			identifier: variable.undefined
-			count: 77
-			path: ../../../htdocs/expedition/class/expedition.class.php
-
 		-
 			message: '#^Negated boolean expression is always true\.$#'
 			identifier: booleanNot.alwaysTrue
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 10f7f21e68e..61e50c14373 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2015       Claudio Aschieri        <c.aschieri@19.coop>
  * Copyright (C) 2016-2024	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2020       Lenin Rivas         	<lenin@leninrivas.com>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.fr>
@@ -1716,6 +1716,7 @@ class Expedition extends CommonObject
 
 			$num = $this->db->num_rows($resql);
 			$i = 0;
+			$line = new ExpeditionLigne($this->db);
 			$lineindex = 0;
 			$originline = 0;
 
@@ -1741,8 +1742,8 @@ class Expedition extends CommonObject
 					$line->qty_shipped += $obj->qty_shipped;
 				} else {
 					$line = new ExpeditionLigne($this->db);		// new group to start
-					$line->entrepot_id    	= $obj->fk_entrepot;	// this is a property of a shipment line
-					$line->qty_shipped    	= $obj->qty_shipped;	// this is a property of a shipment line
+					$line->entrepot_id = $obj->fk_entrepot;	// this is a property of a shipment line
+					$line->qty_shipped = $obj->qty_shipped;	// this is a property of a shipment line
 				}
 
 				$detail_entrepot              = new stdClass();
@@ -1772,7 +1773,7 @@ class Expedition extends CommonObject
 				$line->product_ref = $obj->product_ref;
 				$line->product_label = $obj->product_label;
 				$line->libelle        	= $obj->product_label; // TODO deprecated
-				$line->product_barcode  = $obj->product_barcode; // Barcode number product
+				$line->product_barcode = $obj->product_barcode; // Barcode number product
 				$line->product_tosell = $obj->product_tosell;
 				$line->product_tobuy = $obj->product_tobuy;
 				$line->product_tobatch = $obj->product_tobatch;

From e0e03f1a1ab9da0a535ab163d15c3c18c9e1e2d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 27 Jan 2025 20:01:20 +0100
Subject: [PATCH 265/602] fix phpstan

---
 dev/build/phpstan/phpstan-baseline.neon | 24 ------------------------
 htdocs/core/tpl/card_presend.tpl.php    | 10 +++++++++-
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 4fc54d336a2..8a8f9700581 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -15006,24 +15006,6 @@ parameters:
 			count: 12
 			path: ../../../htdocs/core/tpl/card_presend.tpl.php
 
-		-
-			message: '#^Variable \$defaulttopic might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/core/tpl/card_presend.tpl.php
-
-		-
-			message: '#^Variable \$diroutput might not be defined\.$#'
-			identifier: variable.undefined
-			count: 4
-			path: ../../../htdocs/core/tpl/card_presend.tpl.php
-
-		-
-			message: '#^Variable \$file might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/core/tpl/card_presend.tpl.php
-
 		-
 			message: '#^Variable \$hidedesc might not be defined\.$#'
 			identifier: variable.undefined
@@ -15066,12 +15048,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/tpl/card_presend.tpl.php
 
-		-
-			message: '#^Variable \$object might not be defined\.$#'
-			identifier: variable.undefined
-			count: 36
-			path: ../../../htdocs/core/tpl/card_presend.tpl.php
-
 		-
 			message: '#^Variable \$user might not be defined\.$#'
 			identifier: variable.undefined
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index d29932c2c20..38eca727f3a 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2022	    Charlene Benke           <charlene@patas-monkey.com>
  * Copyright (C) 2023       Maxime Nicolas          <maxime@oarces.com>
  * Copyright (C) 2023       Benjamin GREMBI         <benjamin@oarces.com>
- * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024-2025  Frédéric France			<frederic.france@free.fr>
  * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -31,6 +31,14 @@
  * $arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...);
  * $file
  */
+/**
+ * @var int<0,1> $diroutput
+ * @var string $defaulttopic
+ * @var string $defaulttopiclang
+ * @var string[] $arrayoffamiliestoexclude
+ * @var string $file
+ * @var CommonObject $object
+ */
 '
 @phan-var-force int<0,1> $diroutput
 @phan-var-force string $defaulttopic

From fe2cdc47cc8867004bccc2b83e9592cc8bc34706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 27 Jan 2025 20:15:12 +0100
Subject: [PATCH 266/602] fix phpstan

---
 dev/build/phpstan/phpstan-baseline.neon        | 18 ------------------
 .../modules/societe/mod_codeclient_monkey.php  |  8 +++++++-
 .../modules/societe/mod_codecompta_panicum.php |  5 ++++-
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 8a8f9700581..3253d7ce1c2 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -14328,24 +14328,6 @@ parameters:
 			count: 3
 			path: ../../../htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
 
-		-
-			message: '#^Property mod_codeclient_monkey\:\:\$prefixcustomer has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/societe/mod_codeclient_monkey.php
-
-		-
-			message: '#^Property mod_codeclient_monkey\:\:\$prefixsupplier has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/societe/mod_codeclient_monkey.php
-
-		-
-			message: '#^Property mod_codecompta_panicum\:\:\$position has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/societe/mod_codecompta_panicum.php
-
 		-
 			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Entrepot given\.$#'
 			identifier: argument.type
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index fa62b16021e..159f9114faf 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2006-2007	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2006-2012	Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024-2025  Frédéric France			<frederic.france@free.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -39,7 +39,13 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	public $version = 'dolibarr';
 
 	// variables not inherited
+	/**
+	 * @var string
+	 */
 	public $prefixcustomer = 'CU';
+	/**
+	 * @var string
+	 */
 	public $prefixsupplier = 'SU';
 
 
diff --git a/htdocs/core/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php
index f16bb7b7ea4..41c6a65a46f 100644
--- a/htdocs/core/modules/societe/mod_codecompta_panicum.php
+++ b/htdocs/core/modules/societe/mod_codecompta_panicum.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024-2025  Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -48,6 +48,9 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
 	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
+	/**
+	 * @var int
+	 */
 	public $position = 10;
 
 

From 306e66e3d7bd19480204edebe68f87e46b683c22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 27 Jan 2025 20:44:10 +0100
Subject: [PATCH 267/602] fix phpstan

---
 dev/build/phpstan/phpstan-baseline.neon       | 78 -------------------
 htdocs/core/lib/pdf.lib.php                   |  4 +-
 .../stocktransfer/doc/pdf_eagle.modules.php   | 10 +--
 .../doc/pdf_eagle_proforma.modules.php        | 14 ++--
 4 files changed, 14 insertions(+), 92 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 3253d7ce1c2..547c9334fbd 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -12090,12 +12090,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/commande/doc/pdf_einstein.modules.php
 
-		-
-			message: '#^Parameter \#5 \$w of function pdf_writelinedesc expects int, float given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/commande/doc/pdf_einstein.modules.php
-
 		-
 			message: '#^Property Commande\:\:\$availability \(string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -12276,12 +12270,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php
 
-		-
-			message: '#^Parameter \#5 \$w of function pdf_writelinedesc expects int, float given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php
-
 		-
 			message: '#^Property CommonDocGenerator\:\:\$cols \(array\<string, array\{rank\: int, width\: float\|int, status\: bool, title\: array\{textkey\: string, label\: string, align\: string, padding\: array\{float, float, float, float\}\}, content\: array\{align\: string, padding\: array\{float, float, float, float\}\}\}\>\) does not accept non\-empty\-array\<string, array\{rank\: 10, width\: int, status\: false, title\: array\{textkey\: ''Photo'', label\: '' ''\}, content\: array\{padding\: array\{0, 0, 0, 0\}\}, border\-left\: false\}\|array\{rank\: int, width\: float\|int, status\: bool, title\: array\{textkey\: string, label\: string, align\: string, padding\: array\{float, float, float, float\}\}, content\: array\{align\: string, padding\: array\{float, float, float, float\}\}\}\>\.$#'
 			identifier: assign.propertyType
@@ -12330,12 +12318,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
 
-		-
-			message: '#^Parameter \#5 \$w of function pdf_writelinedesc expects int, float given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
-
 		-
 			message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -12462,12 +12444,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
 
-		-
-			message: '#^Parameter \#5 \$w of function pdf_writelinedesc expects int, float given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
-
 		-
 			message: '#^Ternary operator condition is always false\.$#'
 			identifier: ternary.alwaysFalse
@@ -12558,12 +12534,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 
-		-
-			message: '#^Parameter \#5 \$w of function pdf_writelinedesc expects int, float given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php
-
 		-
 			message: '#^Property CommonInvoice\:\:\$type \(int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -13746,12 +13716,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
 
-		-
-			message: '#^Parameter \#5 \$w of function pdf_writelinedesc expects int, float given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
-
 		-
 			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Mo given\.$#'
 			identifier: argument.type
@@ -14130,12 +14094,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/propale/doc/pdf_azur.modules.php
 
-		-
-			message: '#^Parameter \#5 \$w of function pdf_writelinedesc expects int, float given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/propale/doc/pdf_azur.modules.php
-
 		-
 			message: '#^Property CommonObject\:\:\$multicurrency_tx \(array\<float\>\|float\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -14298,12 +14256,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/reception/doc/pdf_squille.modules.php
 
-		-
-			message: '#^Parameter \#5 \$w of function pdf_writelinedesc expects int, float given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/reception/doc/pdf_squille.modules.php
-
 		-
 			message: '#^Property Reception\:\:\$trueWeight \(float\|int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -14346,18 +14298,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
 
-		-
-			message: '#^Parameter \#4 \$posy of method pdf_eagle\:\:_tableau_tot\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
-
-		-
-			message: '#^Parameter \#5 \$w of function pdf_writelinedesc expects int, float given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
-
 		-
 			message: '#^Property CommonDocGenerator\:\:\$cols \(array\<string, array\{rank\: int, width\: float\|int, status\: bool, title\: array\{textkey\: string, label\: string, align\: string, padding\: array\{float, float, float, float\}\}, content\: array\{align\: string, padding\: array\{float, float, float, float\}\}\}\>\) does not accept non\-empty\-array\<string, array\{rank\: 0, width\: false, status\: true, title\: array\{textkey\: ''Designation'', align\: ''L'', padding\: array\{0\.5, 1, 0\.5, 1\.5\}\}, content\: array\{align\: ''L'', padding\: array\{1, 0\.5, 1, 1\.5\}\}\}\|array\{rank\: int, width\: float\|int, status\: bool, title\: array\{textkey\: string, label\: string, align\: string, padding\: array\{float, float, float, float\}\}, content\: array\{align\: string, padding\: array\{float, float, float, float\}\}\}\>\.$#'
 			identifier: assign.propertyType
@@ -14466,12 +14406,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
 
-		-
-			message: '#^Parameter \#5 \$w of function pdf_writelinedesc expects int, float given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
-
 		-
 			message: '#^Property CommonObject\:\:\$multicurrency_tx \(array\<float\>\|float\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -14658,12 +14592,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
 
-		-
-			message: '#^Parameter \#5 \$w of function pdf_writelinedesc expects int, float given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
-
 		-
 			message: '#^Property CommandeFournisseur\:\:\$multicurrency_tx \(float\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -14712,12 +14640,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
 
-		-
-			message: '#^Parameter \#5 \$w of function pdf_writelinedesc expects int, float given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
-
 		-
 			message: '#^Property SupplierProposal\:\:\$multicurrency_tx \(float\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 010d5f87eed..3945810f622 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1431,8 +1431,8 @@ function pdf_writeLinkedObjects(&$pdf, $object, $outputlangs, $posx, $posy, $w,
  *	@param	CommonObject	$object				Object
  *	@param	int				$i					Current line number
  *  @param  Translate		$outputlangs		Object lang for output
- *  @param  int				$w					Width
- *  @param  int				$h					Height
+ *  @param  float			$w					Width
+ *  @param  float			$h					Height
  *  @param  float			$posx				Pos x
  *  @param  float			$posy				Pos y
  *  @param  int<0,1>		$hideref       		Hide reference
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
index 2a6b0cc2676..702ffad456a 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2012 Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2018-2024 Frédéric France      <frederic.france@free.fr>
+ * Copyright (C) 2018-2025  Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2021 	   Gauthier VERDOL 	    <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	   Nick Fragoulis
@@ -775,12 +775,12 @@ class pdf_eagle extends ModelePDFStockTransfer
 	 *
 	 *	@param	TCPDF			$pdf            Object PDF
 	 *	@param  StockTransfer	$object         Object StockTransfer
-	 *	@param  int				$deja_regle     Amount already paid
-	 *	@param	int				$posy			Start Position
+	 *	@param  float			$already_paid   Amount already paid / not used
+	 *	@param	float			$posy			Start Position
 	 *	@param	Translate		$outputlangs	Object langs
-	 *	@return int								Position for suite
+	 *	@return float							Position for suite
 	 */
-	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function _tableau_tot(&$pdf, $object, $already_paid, $posy, $outputlangs)
 	{
 		// phpcs:enable
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
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 d9375e93809..de6a8693412 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
@@ -843,11 +843,11 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 	/**
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
-	 *   @param		TCPDF		$pdf     		Object PDF
-	 *   @param		Object		$object			Object to show
-	 *   @param		int			$posy			Y
-	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	int							Pos y
+	 *   @param		TCPDF			$pdf     		Object PDF
+	 *   @param		StockTransfer	$object			Object to show
+	 *   @param		int				$posy			Y
+	 *   @param		Translate		$outputlangs	Langs object
+	 *   @return	int								Pos y
 	 */
 	protected function drawInfoTable(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -1186,7 +1186,7 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 	 *  Show top header of page.
 	 *
 	 *  @param	TCPDF			$pdf     		Object PDF
-	 *  @param  Object			$object     	Object to show
+	 *  @param  StockTransfer	$object     	Object to show
 	 *  @param  int<0,1>		$showaddress    0=no, 1=yes
 	 *  @param  Translate		$outputlangs	Object lang for output
 	 *  @param	string			$titlekey		Translation key to show as title of document
@@ -1207,7 +1207,7 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == 0 && getDolGlobalString('STOCKTRANSFER_DRAFT_WATERMARK')) {
+		if ($object->status == 0 && getDolGlobalString('STOCKTRANSFER_DRAFT_WATERMARK')) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', getDolGlobalString('COMMANDE_DRAFT_WATERMARK'));
 		}
 

From 377043686afdaa099fe6d6682697e0d5c5ea835f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 27 Jan 2025 21:22:52 +0100
Subject: [PATCH 268/602] fix phpstan

---
 dev/build/phpstan/phpstan-baseline.neon   | 12 ------------
 htdocs/core/class/commoninvoice.class.php | 10 +++++-----
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 547c9334fbd..1fdf94c462b 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -5580,12 +5580,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/compta/facture/class/facture.class.php
 
-		-
-			message: '#^Parameter \#2 \$alreadypaid of method CommonInvoice\:\:getLibStatut\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/compta/facture/class/facture.class.php
-
 		-
 			message: '#^Parameter \#4 \$txtva of method Facture\:\:addline\(\) expects float, string given\.$#'
 			identifier: argument.type
@@ -18378,12 +18372,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/fourn/class/fournisseur.facture.class.php
 
-		-
-			message: '#^Parameter \#2 \$alreadypaid of method CommonInvoice\:\:getLibStatut\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/fourn/class/fournisseur.facture.class.php
-
 		-
 			message: '#^Parameter \#2 \$pu of function calcul_price_total expects float, string given\.$#'
 			identifier: argument.type
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 13561f2de64..bc0cd86198c 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2012		Cédric Salvador				<csalvador@gpcsolutions.fr>
  * Copyright (C) 2012-2014	Raphaël Doursenaud			<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2023		Nick Fragoulis
- * Copyright (C) 2024		Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024-2025  Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
@@ -905,9 +905,9 @@ abstract class CommonInvoice extends CommonObject
 	/**
 	 *  Return label of object status
 	 *
-	 *  @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
-	 *  @param      integer	$alreadypaid    0=No payment already done, >0=Some payments were already done (we recommend to put here amount paid if you have it, 1 otherwise)
-	 *  @return     string			        Label of status
+	 *  @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
+	 *  @param      int|float	$alreadypaid    0=No payment already done, >0=Some payments were already done (we recommend to put here float amount paid if you have it, 1 otherwise)
+	 *  @return     string			        	Label of status
 	 */
 	public function getLibStatut($mode = 0, $alreadypaid = -1)
 	{
@@ -921,7 +921,7 @@ abstract class CommonInvoice extends CommonObject
 	 *	@param    	int			$paye          	Status field paye (or $recur)
 	 *	@param      int			$status        	Id status
 	 *	@param      int<0,6>	$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
-	 *	@param		int			$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommend to put here amount paid if you have it, -1 otherwise)
+	 *	@param		int|float	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommend to put here float amount paid if you have it, -1 otherwise)
 	 *	@param		int			$type			Type invoice. If -1, we use $this->type
 	 *  @param		int			$nbofopendirectdebitorcredittransfer	Nb of open direct debit or credit transfer
 	 *	@return     string						Label of status

From 4616a2f636a40c2780a9b099f530bed856e75c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 27 Jan 2025 22:00:15 +0100
Subject: [PATCH 269/602] fix phpstan

---
 dev/build/phpstan/phpstan-baseline.neon       | 180 ------------------
 .../core/modules/bank/doc/pdf_ban.modules.php |   8 +-
 .../bank/doc/pdf_sepamandate.modules.php      |  14 +-
 .../commande/doc/pdf_einstein.modules.php     |  14 +-
 .../contract/doc/pdf_strato.modules.php       |   8 +-
 .../delivery/doc/pdf_storm.modules.php        |   6 +-
 .../delivery/doc/pdf_typhon.modules.php       |   6 +-
 .../expedition/doc/pdf_espadon.modules.php    |  10 +-
 .../expedition/doc/pdf_rouget.modules.php     |  10 +-
 .../pdf_standard_expensereport.modules.php    |  10 +-
 .../modules/facture/doc/pdf_crabe.modules.php |  26 +--
 .../facture/doc/pdf_octopus.modules.php       |  12 +-
 .../modules/mrp/doc/pdf_vinci.modules.php     |  14 +-
 .../modules/propale/doc/pdf_azur.modules.php  |  16 +-
 .../reception/doc/pdf_squille.modules.php     |  12 +-
 .../doc/pdf_canelle.modules.php               |  10 +-
 .../supplier_order/doc/pdf_cornas.modules.php |  12 +-
 .../doc/pdf_muscadet.modules.php              |  14 +-
 .../pdf_standard_supplierpayment.modules.php  |  12 +-
 .../doc/pdf_zenith.modules.php                |   8 +-
 20 files changed, 111 insertions(+), 291 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 1fdf94c462b..6c3e6857cc3 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -11964,12 +11964,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/bank/doc/pdf_ban.modules.php
 
-		-
-			message: '#^Parameter \#3 \$tab_height of method pdf_ban\:\:_tableau\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/bank/doc/pdf_ban.modules.php
-
 		-
 			message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -11982,18 +11976,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
 
-		-
-			message: '#^Parameter \#3 \$posy of method pdf_sepamandate\:\:_tableau_info\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
-
-		-
-			message: '#^Parameter \#3 \$tab_height of method pdf_sepamandate\:\:_tableau\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
-
 		-
 			message: '#^Property modTcpdfbarcode\:\:\$is2d has no type specified\.$#'
 			identifier: missingType.property
@@ -12072,18 +12054,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
 
-		-
-			message: '#^Parameter \#3 \$posy of method pdf_einstein\:\:_tableau_info\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/commande/doc/pdf_einstein.modules.php
-
-		-
-			message: '#^Parameter \#4 \$posy of method pdf_einstein\:\:_tableau_tot\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/commande/doc/pdf_einstein.modules.php
-
 		-
 			message: '#^Property Commande\:\:\$availability \(string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -12234,12 +12204,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
 
-		-
-			message: '#^Parameter \#3 \$tab_height of method pdf_strato\:\:tabSignature\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/contract/doc/pdf_strato.modules.php
-
 		-
 			message: '#^Ternary operator condition is always false\.$#'
 			identifier: ternary.alwaysFalse
@@ -12252,12 +12216,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php
 
-		-
-			message: '#^Parameter \#3 \$posy of method pdf_storm\:\:_tableau_info\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/delivery/doc/pdf_storm.modules.php
-
 		-
 			message: '#^Parameter \#4 \$columnText of method CommonDocGenerator\:\:printStdColumnContent\(\) expects string, float given\.$#'
 			identifier: argument.type
@@ -12306,12 +12264,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
 
-		-
-			message: '#^Parameter \#3 \$posy of method pdf_typhon\:\:_tableau_info\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
-
 		-
 			message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -12354,12 +12306,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
 
-		-
-			message: '#^Parameter \#4 \$posy of method pdf_espadon\:\:_tableau_tot\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
-
 		-
 			message: '#^Property CommonDocGenerator\:\:\$cols \(array\<string, array\{rank\: int, width\: float\|int, status\: bool, title\: array\{textkey\: string, label\: string, align\: string, padding\: array\{float, float, float, float\}\}, content\: array\{align\: string, padding\: array\{float, float, float, float\}\}\}\>\) does not accept non\-empty\-array\<string, array\{rank\: 10, width\: false, status\: true, title\: array\{textkey\: ''Designation'', align\: ''L'', padding\: array\{0\.5, 0\.5, 0\.5, 0\.5\}\}, content\: array\{align\: ''L'', padding\: array\{1, 0\.5, 1, 1\.5\}\}\}\|array\{rank\: int, width\: float\|int, status\: bool, title\: array\{textkey\: string, label\: string, align\: string, padding\: array\{float, float, float, float\}\}, content\: array\{align\: string, padding\: array\{float, float, float, float\}\}\}\>\.$#'
 			identifier: assign.propertyType
@@ -12432,30 +12378,12 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/expedition/doc/pdf_merou.modules.php
 
-		-
-			message: '#^Parameter \#4 \$posy of method pdf_rouget\:\:_tableau_tot\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
-
 		-
 			message: '#^Ternary operator condition is always false\.$#'
 			identifier: ternary.alwaysFalse
 			count: 1
 			path: ../../../htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
 
-		-
-			message: '#^Parameter \#3 \$posy of method pdf_standard_expensereport\:\:tablePayments\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
-
-		-
-			message: '#^Parameter \#3 \$tab_height of method pdf_standard_expensereport\:\:_tableau\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 6
-			path: ../../../htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
-
 		-
 			message: '#^Ternary operator condition is always false\.$#'
 			identifier: ternary.alwaysFalse
@@ -12510,24 +12438,6 @@ parameters:
 			count: 6
 			path: ../../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 
-		-
-			message: '#^Parameter \#3 \$posy of method pdf_crabe\:\:_tableau_info\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php
-
-		-
-			message: '#^Parameter \#4 \$posy of method pdf_crabe\:\:_tableau_tot\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php
-
-		-
-			message: '#^Parameter \#5 \$heightforfooter of method pdf_crabe\:\:_tableau_versements\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php
-
 		-
 			message: '#^Property CommonInvoice\:\:\$type \(int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -12564,18 +12474,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/facture/doc/pdf_octopus.modules.php
 
-		-
-			message: '#^Parameter \#3 \$tab_height of method pdf_octopus\:\:_tableFirstPage\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/facture/doc/pdf_octopus.modules.php
-
-		-
-			message: '#^Parameter \#3 \$tab_height of method pdf_octopus\:\:_tableau\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 3
-			path: ../../../htdocs/core/modules/facture/doc/pdf_octopus.modules.php
-
 		-
 			message: '#^Property CommonInvoice\:\:\$type \(int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -13746,12 +13644,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
 
-		-
-			message: '#^Parameter \#3 \$posy of method pdf_vinci\:\:_tableau_info\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
-
 		-
 			message: '#^Parameter \#4 \$columnText of method CommonDocGenerator\:\:printStdColumnContent\(\) expects string, float given\.$#'
 			identifier: argument.type
@@ -14076,18 +13968,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/propale/doc/pdf_azur.modules.php
 
-		-
-			message: '#^Parameter \#3 \$posy of method pdf_azur\:\:_tableau_info\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/propale/doc/pdf_azur.modules.php
-
-		-
-			message: '#^Parameter \#4 \$posy of method pdf_azur\:\:_tableau_tot\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/propale/doc/pdf_azur.modules.php
-
 		-
 			message: '#^Property CommonObject\:\:\$multicurrency_tx \(array\<float\>\|float\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -14244,12 +14124,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
 
-		-
-			message: '#^Parameter \#4 \$posy of method pdf_squille\:\:_tableau_tot\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/reception/doc/pdf_squille.modules.php
-
 		-
 			message: '#^Property Reception\:\:\$trueWeight \(float\|int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -14388,18 +14262,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
 
-		-
-			message: '#^Parameter \#4 \$posy of method pdf_canelle\:\:_tableau_tot\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
-
-		-
-			message: '#^Parameter \#5 \$heightforfooter of method pdf_canelle\:\:_tableau_versements\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
-
 		-
 			message: '#^Property CommonObject\:\:\$multicurrency_tx \(array\<float\>\|float\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -14448,18 +14310,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
 
-		-
-			message: '#^Parameter \#3 \$posy of method pdf_cornas\:\:_tableau_info\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
-
-		-
-			message: '#^Parameter \#4 \$posy of method pdf_cornas\:\:_tableau_tot\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
-
 		-
 			message: '#^Property CommandeFournisseur\:\:\$multicurrency_tx \(float\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -14574,18 +14424,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
 
-		-
-			message: '#^Parameter \#3 \$posy of method pdf_muscadet\:\:_tableau_info\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
-
-		-
-			message: '#^Parameter \#4 \$posy of method pdf_muscadet\:\:_tableau_tot\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
-
 		-
 			message: '#^Property CommandeFournisseur\:\:\$multicurrency_tx \(float\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -14604,18 +14442,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
 
-		-
-			message: '#^Parameter \#3 \$posy of method pdf_standard_supplierpayment\:\:_tableau_cheque\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
-
-		-
-			message: '#^Parameter \#3 \$tab_height of method pdf_standard_supplierpayment\:\:_tableau\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 6
-			path: ../../../htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
-
 		-
 			message: '#^Parameter \#1 \$line of method CommonDocGenerator\:\:get_substitutionarray_lines\(\) expects CommonObjectLine, CommonObject\|stdClass given\.$#'
 			identifier: argument.type
@@ -14652,12 +14478,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
 
-		-
-			message: '#^Parameter \#4 \$posy of method pdf_zenith\:\:_tableau_tot\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
-
 		-
 			message: '#^Property CommonDocGenerator\:\:\$cols \(array\<string, array\{rank\: int, width\: float\|int, status\: bool, title\: array\{textkey\: string, label\: string, align\: string, padding\: array\{float, float, float, float\}\}, content\: array\{align\: string, padding\: array\{float, float, float, float\}\}\}\>\) does not accept non\-empty\-array\<string, array\{rank\: 0, width\: false, status\: true, title\: array\{textkey\: ''Designation'', align\: ''L'', padding\: array\{0\.5, 0\.5, 0\.5, 0\.5\}\}, content\: array\{align\: ''L'', padding\: array\{1, 0\.5, 1, 1\.5\}\}\}\|array\{rank\: int, width\: float\|int, status\: bool, title\: array\{textkey\: string, label\: string, align\: string, padding\: array\{float, float, float, float\}\}, content\: array\{align\: string, padding\: array\{float, float, float, float\}\}\}\>\.$#'
 			identifier: assign.propertyType
diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
index cf9664fe761..ab5c06aa008 100644
--- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2016 		Laurent Destailleur 		<eldy@users.sourceforge.net>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024-2025  Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2024	    Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -284,9 +284,9 @@ class pdf_ban extends ModeleBankAccountDoc
 	 *   Show table for lines
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
-	 *   @param		int 		$tab_top		Top position of table
-	 *   @param		int 		$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y
+	 *   @param		float		$tab_top		Top position of table
+	 *   @param		float		$tab_height		Height of table (rectangle)
+	 *   @param		float		$nexY			Y
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		Hide top bar of array
 	 *   @param		int			$hidebottom		Hide bottom bar of array
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index d0c2e8a41b1..be1a81ddfac 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2016       Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2020       Josep Lluís Amador   <joseplluis@lliuretic.cat>
  * Copyright (C) 2024		MDW					 <mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024		Frédéric France		 <frederic.france@free.fr>
+ * Copyright (C) 2024-2025  Frédéric France		 <frederic.france@free.fr>
  * Copyright (C) 2024	    Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -485,9 +485,9 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	 *   Show table for lines
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
-	 *   @param		int 		$tab_top		Top position of table
-	 *   @param		int 		$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y
+	 *   @param		float		$tab_top		Top position of table
+	 *   @param		float		$tab_height		Height of table (rectangle)
+	 *   @param		float		$nexY			Y
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		Hide top bar of array
 	 *   @param		int			$hidebottom		Hide bottom bar of array
@@ -509,7 +509,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	 *
 	 *   @param		TCPDF				$pdf     		Object PDF
 	 *   @param		CompanyBankAccount	$object			Object to show
-	 *   @param		int					$posy			Y
+	 *   @param		float				$posy			Y
 	 *   @param		Translate			$outputlangs	Langs object
 	 *   @return	float
 	 */
@@ -546,9 +546,9 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	 *
 	 *	@param	TCPDF				$pdf           	Object PDF
 	 *	@param  CompanyBankAccount	$object         Object invoice
-	 *	@param	int					$posy			Position depart
+	 *	@param	float				$posy			Position depart
 	 *	@param	Translate			$outputlangs	Object langs
-	 *	@return int									Position pour suite
+	 *	@return float								Position pour suite
 	 */
 	protected function _signature_area(&$pdf, $object, $posy, $outputlangs)
 	{
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index b678fc7e9b4..39c393568bf 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2012		Cedric Salvador				<csalvador@gpcsolutions.fr>
  * Copyright (C) 2015		Marcos García				<marcosgdf@gmail.com>
  * Copyright (C) 2017-2018	Ferran Marcet				<fmarcet@2byte.es>
- * Copyright (C) 2018-2024	Frédéric France				<frederic.france@free.fr>
+ * Copyright (C) 2018-2025  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Nick Fragoulis
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
@@ -714,9 +714,9 @@ class pdf_einstein extends ModelePDFCommandes
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		Commande	$object			Object to show
-	 *   @param		int			$posy			Y
+	 *   @param		float		$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	int
+	 *   @return	float
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -898,11 +898,11 @@ class pdf_einstein extends ModelePDFCommandes
 	 *
 	 *	@param	TCPDF		$pdf            Object PDF
 	 *	@param  Commande	$object         Object invoice
-	 *	@param  int			$deja_regle     Montant deja regle
-	 *	@param	int			$posy			Position depart
+	 *	@param  float		$deja_regle     Montant deja regle
+	 *	@param	float		$posy			Position depart
 	 *	@param	Translate	$outputlangs	Object langs
 	 *  @param  Translate	$outputlangsbis	Object lang for output bis
-	 *	@return int							Position pour suite
+	 *	@return float						Position pour suite
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs, $outputlangsbis = null)
 	{
@@ -1225,7 +1225,7 @@ class pdf_einstein extends ModelePDFCommandes
 	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		float|int	$tab_top		Top position of table
 	 *   @param		float|int	$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y (not used)
+	 *   @param		float		$nexY			Y (not used)
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
 	 *   @param		int			$hidebottom		Hide bottom bar of array
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index e58fb460ea1..f5f86c6008a 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2011		Fabrice CHERRIER
  * Copyright (C) 2013-2024  Philippe Grand	            <philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Marcos García               <marcosgdf@gmail.com>
- * Copyright (C) 2018-2024  Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2018-2025  Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	    Nick Fragoulis
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
@@ -526,7 +526,7 @@ class pdf_strato extends ModelePDFContract
 	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		float|int	$tab_top		Top position of table
 	 *   @param		float|int	$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y
+	 *   @param		float		$nexY			Y
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		Hide top bar of array
 	 *   @param		int			$hidebottom		Hide bottom bar of array
@@ -578,8 +578,8 @@ class pdf_strato extends ModelePDFContract
 	 * Show footer signature of page
 	 *
 	 * @param   TCPDF       $pdf            Object PDF
-	 * @param   int         $tab_top        tab height position
-	 * @param   int         $tab_height     tab height
+	 * @param   float       $tab_top        tab height position
+	 * @param   float       $tab_height     tab height
 	 * @param   Translate   $outputlangs    Object language for output
 	 * @return void
 	 */
diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
index 74e9375dcac..4db4e14fe06 100644
--- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2020      John BOTELLA
  * Copyright (C) 2024-2025	MDW					 <mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024      Frédéric France       <frederic.france@free.fr>
+ * Copyright (C) 2024-2025  Frédéric France       <frederic.france@free.fr>
  * Copyright (C) 2024	   Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -608,7 +608,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		Delivery	$object			Object to show
-	 *   @param		int			$posy			Y
+	 *   @param		float		$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	void
 	 */
@@ -639,7 +639,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		float|int	$tab_top		Top position of table
 	 *   @param		float|int	$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y (not used)
+	 *   @param		float		$nexY			Y (not used)
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
 	 *   @param		int			$hidebottom		Hide bottom bar of array
diff --git a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
index 5841616cda7..75249c60d89 100644
--- a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2011-2021 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2024-2025	MDW					 <mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024      Frédéric France       <frederic.france@free.fr>
+ * Copyright (C) 2024-2025  Frédéric France       <frederic.france@free.fr>
  * Copyright (C) 2024	   Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -609,7 +609,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		Delivery	$object			Object to show
-	 *   @param		int			$posy			Y
+	 *   @param		float		$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	void
 	 */
@@ -639,7 +639,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		float|int	$tab_top		Top position of table
 	 *   @param		float|int	$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y (not used)
+	 *   @param		float		$nexY			Y (not used)
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
 	 *   @param		int			$hidebottom		Hide bottom bar of array
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index f5873eaeeb3..ec08b9cc21e 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2012  Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin				<regis.houssin@inodbox.com>
  * Copyright (C) 2014-2015  Marcos García				<marcosgdf@gmail.com>
- * Copyright (C) 2018-2024  Frédéric France				<frederic.france@free.fr>
+ * Copyright (C) 2018-2025  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2023 		Charlene Benke				<charlene@patas-monkey.com>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	    Nick Fragoulis
@@ -831,10 +831,10 @@ class pdf_espadon extends ModelePdfExpedition
 	 *
 	 *	@param	TCPDF		$pdf            Object PDF
 	 *	@param  Expedition	$object         Object expedition
-	 *	@param  int			$deja_regle     Amount already paid
-	 *	@param	int         $posy           Start Position
+	 *	@param  float		$deja_regle     Amount already paid
+	 *	@param	float       $posy           Start Position
 	 *	@param	Translate	$outputlangs	Object langs
-	 *	@return int							Position for suite
+	 *	@return float						Position for suite
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
@@ -938,7 +938,7 @@ class pdf_espadon extends ModelePdfExpedition
 	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		float|int	$tab_top		Top position of table
 	 *   @param		float|int	$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y
+	 *   @param		float		$nexY			Y
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		Hide top bar of array
 	 *   @param		int			$hidebottom		Hide bottom bar of array
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 9d54b5b4e88..d10193f90b0 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2012	Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin				<regis.houssin@inodbox.com>
  * Copyright (C) 2014-2015	Marcos García				<marcosgdf@gmail.com>
- * Copyright (C) 2018-2024	Frédéric France				<frederic.france@free.fr>
+ * Copyright (C) 2018-2025  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Nick Fragoulis
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
@@ -716,10 +716,10 @@ class pdf_rouget extends ModelePdfExpedition
 	 *
 	 *	@param	TCPDF		$pdf            Object PDF
 	 *	@param  Expedition	$object         Object expedition
-	 *	@param  int			$deja_regle     Amount already paid
-	 *	@param	int         $posy           Start Position
+	 *	@param  float		$deja_regle     Amount already paid
+	 *	@param	float       $posy           Start Position
 	 *	@param	Translate	$outputlangs	Object langs
-	 *	@return int							Position for suite
+	 *	@return float						Position for suite
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
@@ -832,7 +832,7 @@ class pdf_rouget extends ModelePdfExpedition
 	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		float|int	$tab_top		Top position of table
 	 *   @param		float|int	$tab_height		Height of table (angle)
-	 *   @param		int			$nexY			Y
+	 *   @param		float		$nexY			Y
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		Hide top bar of array
 	 *   @param		int			$hidebottom		Hide bottom bar of array
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
index 925ff9efce6..52d72c00e62 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2015       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2016-2023  Philippe Grand          <philippe.grand@atoo-net.com>
- * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2018       Francis Appels          <francis.appels@z-application.com>
  * Copyright (C) 2019       Markus Welters          <markus@welters.de>
  * Copyright (C) 2019       Rafael Ingenleuf        <ingenleuf@welters.de>
@@ -902,9 +902,9 @@ class pdf_standard_expensereport extends ModeleExpenseReport
 	 *   Show table for lines
 	 *
 	 *   @param     TCPDF		$pdf     		Object PDF
-	 *   @param		int			$tab_top		Tab top
-	 *   @param		int			$tab_height		Tab height
-	 *   @param		int			$nexY			next y
+	 *   @param		float		$tab_top		Tab top
+	 *   @param		float		$tab_height		Tab height
+	 *   @param		float		$nexY			next y
 	 *   @param		Translate	$outputlangs	Output langs
 	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
 	 *   @param		int			$hidebottom		Hide bottom bar of array
@@ -1025,7 +1025,7 @@ class pdf_standard_expensereport extends ModeleExpenseReport
 	 *
 	 *  @param	TCPDF			$pdf            Object PDF
 	 *  @param  ExpenseReport	$object         Object expensereport
-	 *  @param  int				$posy           Position y in PDF
+	 *  @param  float			$posy           Position y in PDF
 	 *  @param  Translate		$outputlangs    Object langs for output
 	 *  @return int             				Return integer <0 if KO, >0 if OK
 	 */
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index b751a886983..97c8787a3ee 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2012-2014	Raphaël Doursenaud			<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2015		Marcos García				<marcosgdf@gmail.com>
  * Copyright (C) 2017-2018	Ferran Marcet				<fmarcet@2byte.es>
- * Copyright (C) 2018-2024  Frédéric France				<frederic.france@free.fr>
+ * Copyright (C) 2018-2025  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2022-2024	Anthony Berton				<anthony.berton@bb2a.fr>
  * Copyright (C) 2022		Charlene Benke				<charlene@patas-monkey.com>
  * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
@@ -955,10 +955,10 @@ class pdf_crabe extends ModelePDFFactures
 	 *
 	 *  @param	TCPDF		$pdf            	Object PDF
 	 *  @param  Facture		$object         	Object invoice
-	 *  @param  int			$posy           	Position y in PDF
+	 *  @param  float		$posy           	Position y in PDF
 	 *  @param  Translate	$outputlangs    	Object langs for output
-	 *  @param  int			$heightforfooter 	Height for footer
-	 *  @return int             				Return integer <0 if KO, >0 if OK
+	 *  @param  float		$heightforfooter 	Height for footer
+	 *  @return float             				Return integer <0 if KO, >0 if OK
 	 */
 	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs, $heightforfooter = 0)
 	{
@@ -1114,10 +1114,10 @@ class pdf_crabe extends ModelePDFFactures
 	 * @param Facture		$object				Object invoice
 	 * @param Translate		$outputlangs		Object langs for output
 	 * @param int			$default_font_size	Font size
-	 * @param int			$tab3_posx			pos x
-	 * @param int 			$tab3_top			pos y
-	 * @param int 			$tab3_width			width
-	 * @param int 			$tab3_height		height
+	 * @param float			$tab3_posx			pos x
+	 * @param float			$tab3_top			pos y
+	 * @param float			$tab3_width			width
+	 * @param float			$tab3_height		height
 	 * @return void
 	 */
 	protected function _tableau_versements_header($pdf, $object, $outputlangs, $default_font_size, $tab3_posx, $tab3_top, $tab3_width, $tab3_height)
@@ -1154,10 +1154,10 @@ class pdf_crabe extends ModelePDFFactures
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		Facture		$object			Object to show
-	 *   @param		int			$posy			Y
+	 *   @param		float		$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param  	Translate	$outputlangsbis	Object lang for output bis
-	 *   @return	int							Pos y
+	 *   @return	float						Pos y
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs, $outputlangsbis)
 	{
@@ -1445,11 +1445,11 @@ class pdf_crabe extends ModelePDFFactures
 	 *
 	 *	@param	TCPDF		$pdf            Object PDF
 	 *	@param  Facture		$object         Object invoice
-	 *	@param  int			$deja_regle     Amount already paid (in the currency of invoice)
-	 *	@param	int			$posy			Position depart
+	 *	@param  float		$deja_regle     Amount already paid (in the currency of invoice)
+	 *	@param	float		$posy			Position depart
 	 *	@param	Translate	$outputlangs	Object langs
 	 *  @param  Translate	$outputlangsbis	Object lang for output bis
-	 *	@return int							Position pour suite
+	 *	@return float						Position pour suite
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs, $outputlangsbis)
 	{
diff --git a/htdocs/core/modules/facture/doc/pdf_octopus.modules.php b/htdocs/core/modules/facture/doc/pdf_octopus.modules.php
index ae9408a933d..067a3a126b1 100644
--- a/htdocs/core/modules/facture/doc/pdf_octopus.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_octopus.modules.php
@@ -2040,9 +2040,9 @@ class pdf_octopus extends ModelePDFFactures
 	 *   Show table for lines
 	 *
 	 *   @param		TCPDI|TCPDF	$pdf			Object PDF
-	 *   @param		int 		$tab_top		Top position of table
-	 *   @param		int 		$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y (not used)
+	 *   @param		float		$tab_top		Top position of table
+	 *   @param		float		$tab_height		Height of table (rectangle)
+	 *   @param		float		$nexY			Y (not used)
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int<-1,1>	$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
 	 *   @param		int<0,1>	$hidebottom		Hide bottom bar of array
@@ -2839,9 +2839,9 @@ class pdf_octopus extends ModelePDFFactures
 	 *   Show table for lines
 	 *
 	 *   @param		TCPDI|TCPDF	$pdf			Object PDF
-	 *   @param		int  		$tab_top		Top position of table
-	 *   @param		int 		$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y (not used)
+	 *   @param		float 		$tab_top		Top position of table
+	 *   @param		float		$tab_height		Height of table (rectangle)
+	 *   @param		float		$nexY			Y (not used)
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int<-1,1>	$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
 	 *   @param		int<0,1>	$hidebottom		Hide bottom bar of array
diff --git a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
index 9fde1bfb432..db63002175f 100644
--- a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
+++ b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
@@ -627,7 +627,7 @@ class pdf_vinci extends ModelePDFMo
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Mo			$object			Object order
-	 *	@param	int			$posy			Position y in PDF
+	 *	@param	float		$posy			Position y in PDF
 	 *	@param	Translate	$outputlangs	Object langs for output
 	 *	@return int							Return integer <0 if KO, >0 if OK
 	 */
@@ -644,9 +644,9 @@ class pdf_vinci extends ModelePDFMo
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		Mo			$object			Object to show
-	 *   @param		int			$posy			Y
+	 *   @param		float		$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	integer
+	 *   @return	float
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -705,12 +705,12 @@ class pdf_vinci extends ModelePDFMo
 	/**
 	 *	Show total to pay
 	 *
-	 *	@param	TCPDF		$pdf           Object PDF
+	 *	@param	TCPDF		$pdf            Object PDF
 	 *	@param  Facture		$object         Object invoice
-	 *	@param  int			$deja_regle     Montant deja regle
-	 *	@param	int			$posy			Position depart
+	 *	@param  float		$deja_regle     Montant deja regle
+	 *	@param	float		$posy			Position depart
 	 *	@param	Translate	$outputlangs	Object langs
-	 *	@return int							Position pour suite
+	 *	@return float						Position pour suite
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 03d5134db0e..b443dee4474 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -895,7 +895,7 @@ class pdf_azur extends ModelePDFPropales
 	 *
 	 *  @param	TCPDF		$pdf            Object PDF
 	 *  @param  Propal		$object         Object proposal
-	 *  @param  int			$posy           Position y in PDF
+	 *  @param  float		$posy           Position y in PDF
 	 *  @param  Translate	$outputlangs    Object langs for output
 	 *  @return int             			Return integer <0 if KO, >0 if OK
 	 */
@@ -912,9 +912,9 @@ class pdf_azur extends ModelePDFPropales
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		Propal		$object			Object to show
-	 *   @param		int			$posy			Y
+	 *   @param		float		$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	int
+	 *   @return	float
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -1097,11 +1097,11 @@ class pdf_azur extends ModelePDFPropales
 	 *
 	 *	@param	TCPDF		$pdf            Object PDF
 	 *	@param  Propal		$object         Object propal
-	 *	@param  int			$deja_regle     Amount already paid
-	 *	@param	int			$posy			Start position
+	 *	@param  float		$deja_regle     Amount already paid
+	 *	@param	float		$posy			Start position
 	 *	@param	Translate	$outputlangs	Object langs
 	 *  @param  Translate	$outputlangsbis	Object lang for output bis
-	 *	@return int							Position for continuation
+	 *	@return float						Position for continuation
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs, $outputlangsbis = null)
 	{
@@ -1833,9 +1833,9 @@ class pdf_azur extends ModelePDFPropales
 	 *
 	 *	@param	TCPDF		$pdf            Object PDF
 	 *	@param  Propal		$object         Object proposal
-	 *	@param	int			$posy			Position depart
+	 *	@param	float		$posy			Position depart
 	 *	@param	Translate	$outputlangs	Object langs
-	 *	@return int							Position pour suite
+	 *	@return float						Position pour suite
 	 */
 	protected function _signature_area(&$pdf, $object, $posy, $outputlangs)
 	{
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 35d4e0fe107..9d9a0d28f8e 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2018	    Quentin Vial-Gouteyron   <quentin.vial-gouteyron@atm-consulting.fr>
- * Copyright (C) 2023-2024  Frédéric France          <frederic.france@free.fr>
+ * Copyright (C) 2023-2025  Frédéric France          <frederic.france@free.fr>
  * Copyright (C) 2024-2025	MDW						 <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	    Nick Fragoulis
  *
@@ -687,12 +687,12 @@ class pdf_squille extends ModelePdfReception
 	 *
 	 *	@param	TCPDF		$pdf            Object PDF
 	 *	@param  Reception	$object         Object reception
-	 *	@param  int			$deja_regle     Montant deja regle
-	 *	@param	int			$posy			Position depart
+	 *	@param  float		$deja_regle     Montant deja regle
+	 *	@param	float		$posy			Position depart
 	 *	@param	Translate	$outputlangs	Object langs
-	 *  @param	int			$totalOrdered	Total ordered
-	 *  @param	int			$totalAmount	Total amount
-	 *	@return int							Position pour suite
+	 *  @param	float		$totalOrdered	Total ordered
+	 *  @param	float		$totalAmount	Total amount
+	 *	@return float						Position pour suite
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs, $totalOrdered, $totalAmount = 0)
 	{
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 3e8769e6c01..d5f4c3e16a7 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -616,10 +616,10 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 *
 	 *	@param	TCPDF				$pdf            Object PDF
 	 *	@param  FactureFournisseur	$object         Object invoice
-	 *	@param  int					$deja_regle     Amount already paid (in the currency of invoice)
-	 *	@param	int					$posy			Position depart
+	 *	@param  float				$deja_regle     Amount already paid (in the currency of invoice)
+	 *	@param	float				$posy			Position depart
 	 *	@param	Translate			$outputlangs	Object langs
-	 *	@return int									Position of cursor after output
+	 *	@return float								Position of cursor after output
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
@@ -946,9 +946,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 *
 	 *  @param  TCPDF       $pdf            	Object PDF
 	 *  @param  Object		$object         	Object to show
-	 *  @param  int         $posy           	Position y in PDF
+	 *  @param  float       $posy           	Position y in PDF
 	 *  @param  Translate   $outputlangs    	Object langs for output
-	 *  @param  int			$heightforfooter 	Height for footer
+	 *  @param  float		$heightforfooter 	Height for footer
 	 *  @return int                             Return integer <0 if KO, >0 if OK
 	 */
 	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs, $heightforfooter = 0)
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 aa68bdd09e7..4811fd9b1a0 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -851,7 +851,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  CommandeFournisseur		$object			Object order
-	 *	@param	int			$posy			Position y in PDF
+	 *	@param	float		$posy			Position y in PDF
 	 *	@param	Translate	$outputlangs	Object langs for output
 	 *	@return int							Return integer <0 if KO, >0 if OK
 	 */
@@ -868,9 +868,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		CommandeFournisseur		$object			Object to show
-	 *   @param		int			$posy			Y
+	 *   @param		float		$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	integer
+	 *   @return	float
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -933,10 +933,10 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	 *
 	 *	@param	TCPDF		$pdf           Object PDF
 	 *	@param  CommandeFournisseur	$object         Object invoice
-	 *	@param  int			$deja_regle     Montant deja regle
-	 *	@param	int			$posy			Position depart
+	 *	@param  float		$deja_regle     Montant deja regle
+	 *	@param	float		$posy			Position depart
 	 *	@param	Translate	$outputlangs	Object langs
-	 *	@return int							Position pour suite
+	 *	@return float						Position pour suite
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
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 384dd3fdd68..c0c3f1ef183 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -714,7 +714,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  CommandeFournisseur		$object			Object order
-	 *	@param	int			$posy			Position y in PDF
+	 *	@param	float		$posy			Position y in PDF
 	 *	@param	Translate	$outputlangs	Object langs for output
 	 *	@return int							Return integer <0 if KO, >0 if OK
 	 */
@@ -731,9 +731,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		CommandeFournisseur	$object	Object to show
-	 *   @param		int			$posy			Y
+	 *   @param		float		$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	integer
+	 *   @return	float
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -795,10 +795,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 *
 	 *  @param	TCPDF		$pdf            Object PDF
 	 *	@param  CommandeFournisseur	$object Object CommandeFournisseur
-	 *	@param  int			$deja_regle     Amount already paid
-	 *	@param	int			$posy			Position depart
+	 *	@param  float		$deja_regle     Amount already paid
+	 *	@param	float		$posy			Position depart
 	 *	@param	Translate	$outputlangs	Object langs
-	 *	@return int							Position pour suite
+	 *	@return float						Position pour suite
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
@@ -1000,7 +1000,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		float|int	$tab_top		Top position of table
 	 *   @param		float|int	$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y (not used)
+	 *   @param		float		$nexY			Y (not used)
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		Hide top bar of array
 	 *   @param		int			$hidebottom		Hide bottom bar of array
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
index 29d582b9b7b..3f9c8cc9288 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010-2014  Laurent Destailleur         <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Marcos García               <marcosgdf@gmail.com>
  * Copyright (C) 2022       Ferran Marcet               <fmarcet@2byte.es>
- * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024-2025  Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	    Nick Fragoulis
  *
@@ -517,9 +517,9 @@ class pdf_standard_supplierpayment extends ModelePDFSuppliersPayments
 	 *
 	 *	@param	TCPDF			$pdf			Object PDF
 	 *	@param  PaiementFourn	$object         Object PaiementFourn
-	 *	@param	int				$posy			Position depart
+	 *	@param	float			$posy			Position depart
 	 *	@param	Translate		$outputlangs	Object langs
-	 *	@return int								Position pour suite
+	 *	@return float							Position pour suite
 	 */
 	protected function _tableau_cheque(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -578,9 +578,9 @@ class pdf_standard_supplierpayment extends ModelePDFSuppliersPayments
 	 *   Show table for lines
 	 *
 	 *   @param		TCPDF		$pdf     		Object PDF
-	 *   @param		integer		$tab_top		Top position of table
-	 *   @param		integer		$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y (not used)
+	 *   @param		float		$tab_top		Top position of table
+	 *   @param		float		$tab_height		Height of table (rectangle)
+	 *   @param		float		$nexY			Y (not used)
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		Hide top bar of array
 	 *   @param		int			$hidebottom		Hide bottom bar of array
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
index 9376cdadf73..16cd7001f6d 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
@@ -833,7 +833,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 	 *
 	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  SupplierProposal		$object			Object supplier propsal
-	 *	@param	int			$posy			Position y in PDF
+	 *	@param	float		$posy			Position y in PDF
 	 *	@param	Translate	$outputlangs	Object langs for output
 	 *	@return int							Return integer <0 if KO, >0 if OK
 	 */
@@ -915,10 +915,10 @@ class pdf_zenith extends ModelePDFSupplierProposal
 	 *
 	 *	@param	TCPDF		$pdf            Object PDF
 	 *	@param  SupplierProposal $object    Object supplier proposal
-	 *	@param  int			$deja_regle     Montant deja regle
-	 *	@param	int			$posy			Position depart
+	 *	@param  float		$deja_regle     Montant deja regle
+	 *	@param	float		$posy			Position depart
 	 *	@param	Translate	$outputlangs	Object langs
-	 *	@return int							Position pour suite
+	 *	@return float						Position pour suite
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{

From 63b56ade21632f2f8592c6e36cb84510b723ca12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 27 Jan 2025 22:15:37 +0100
Subject: [PATCH 270/602] fix phpstan

---
 dev/build/phpstan/phpstan-baseline.neon       | 24 --------
 .../printsheet/doc/pdf_tcpdflabel.class.php   | 56 +++++++++++--------
 2 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 6c3e6857cc3..db038b860de 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -13776,30 +13776,6 @@ parameters:
 			count: 6
 			path: ../../../htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
 
-		-
-			message: '#^Property pdf_tcpdflabel\:\:\$_align2d has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
-
-		-
-			message: '#^Property pdf_tcpdflabel\:\:\$_style1d has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
-
-		-
-			message: '#^Property pdf_tcpdflabel\:\:\$_style2d has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
-
-		-
-			message: '#^Property pdf_tcpdflabel\:\:\$_xres has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
-
 		-
 			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Product given\.$#'
 			identifier: argument.type
diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
index ca15b14e565..b4c19919715 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2006-2013 Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2015 Francis Appels  <francis.appels@yahoo.com>
  * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.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
@@ -36,36 +36,48 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonstickergenerator.class.php';
 class pdf_tcpdflabel extends CommonStickerGenerator
 {
 	// define 1d barcode style
+	/**
+	 * @var array{position: '', align: 'C', stretch: bool, fitwidth: bool, cellfitalign: '', border: bool, hpadding: 'auto', vpadding: 'auto', fgcolor: array{0: 0, 1: 0, 2: 0}, bgcolor: bool, text: bool, font: 'helvetica', fontsize: 8, stretchtext: 4}
+	 */
 	private $_style1d = array(
-					'position' => '',
-					'align' => 'C',
-					'stretch' => false,
-					'fitwidth' => true,
-					'cellfitalign' => '',
-					'border' => false,
-					'hpadding' => 'auto',
-					'vpadding' => 'auto',
-					'fgcolor' => array(0, 0, 0),
-					'bgcolor' => false,
-					'text' => true,
-					'font' => 'helvetica',
-					'fontsize' => 8,
-					'stretchtext' => 4
+		'position' => '',
+		'align' => 'C',
+		'stretch' => false,
+		'fitwidth' => true,
+		'cellfitalign' => '',
+		'border' => false,
+		'hpadding' => 'auto',
+		'vpadding' => 'auto',
+		'fgcolor' => array(0, 0, 0),
+		'bgcolor' => false,
+		'text' => true,
+		'font' => 'helvetica',
+		'fontsize' => 8,
+		'stretchtext' => 4
 	);
 
 	// set style for 2d barcode
+	/**
+	 * @var array{border: bool, vpadding: 'auto', hpadding: 'auto', fgcolor: array{0: 0, 1: 0, 2: 0}, bgcolor: bool, module_width: 1, module_height: 1}
+	 */
 	private $_style2d = array(
-					'border' => false,
-					'vpadding' => 'auto',
-					'hpadding' => 'auto',
-					'fgcolor' => array(0, 0, 0),
-					'bgcolor' => false,
-					'module_width' => 1, // width of a single module in points
-					'module_height' => 1 // height of a single module in points
+		'border' => false,
+		'vpadding' => 'auto',
+		'hpadding' => 'auto',
+		'fgcolor' => array(0, 0, 0),
+		'bgcolor' => false,
+		'module_width' => 1, // width of a single module in points
+		'module_height' => 1 // height of a single module in points
 	);
 
+	/**
+	 * @var string
+	 */
 	private $_align2d = 'N';
 
+	/**
+	 * @var float
+	 */
 	private $_xres = 0.4;
 
 	/**

From 14f01979910e6c1c0742a99e779275b9f74427c2 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 28 Jan 2025 01:05:12 +0100
Subject: [PATCH 271/602] Debug v21

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

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 6760f7e88a2..04a18bc25b3 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -322,14 +322,14 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 		$tplcontent .= "// Now fix the content for SEO or multilanguage\n";
 		// Old method for custom SEO
 		if (strpos($objectpage->content, '$__PAGE__KEYWORDS__') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"keywords\" content=\".*?\" \/>/ms", "<meta name=\"keywords\" content=\"" . dolPrintHTMLForAttribute($__PAGE__KEYWORDS__, 1) . "\"  />", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"keywords\" content=\".*?\" \/>/ms", "<meta name=\"keywords\" content=\"" . dolPrintHTMLForAttribute($__PAGE__KEYWORDS__ ?? "", 1) . "\"  />", $tmp);'."\n";
 		}
 		if (strpos($objectpage->content, '$__PAGE__TITLE__') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/^<title>.*?<\/title>/ms", "<title>" . dolPrintHTMLForAttribute($__PAGE__TITLE__, 1) . "</title>", $tmp);'."\n";
-			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"title\" content=\".*?\" \/>/ms", "<meta name=\"title\" content=\"" . dolPrintHTMLForAttribute($__PAGE__TITLE__, 1) . "\"  />", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<title>.*?<\/title>/ms", "<title>" . dolPrintHTMLForAttribute($__PAGE__TITLE__ ?? "", 1) . "</title>", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"title\" content=\".*?\" \/>/ms", "<meta name=\"title\" content=\"" . dolPrintHTMLForAttribute($__PAGE__TITLE__ ?? "", 1) . "\"  />", $tmp);'."\n";
 		}
 		if (strpos($objectpage->content, '$__PAGE__DESC__') !== false) {
-			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"description\" content=\".*?\" \/>/ms", "<meta name=\"description\" content=\"" . dolPrintHTMLForAttribute($__PAGE__DESC__, 1) . "\"  />", $tmp);'."\n";
+			$tplcontent .= '$tmp = preg_replace("/^<meta name=\"description\" content=\".*?\" \/>/ms", "<meta name=\"description\" content=\"" . dolPrintHTMLForAttribute($__PAGE__DESC__ ?? "", 1) . "\"  />", $tmp);'."\n";
 		}
 		// New method for custom SEO
 		if (strpos($objectpage->content, 'define("__SEO_PAGE_LANG__"') !== false) {

From e225f041496609e978c2a9a527407287df70c6e6 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 28 Jan 2025 02:33:44 +0100
Subject: [PATCH 272/602] Debug v21 - Fix wrapper

---
 htdocs/website/samples/wrapper.php | 43 +++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index fe55987a77a..eadc7c68a53 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -64,9 +64,21 @@ if (!empty($hashp)) {
 			if ($moduleparttocheck == $modulepart) {
 				// We remove first level of directory
 				$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
-				//var_dump($original_file); exit;
+				//var_dump($original_file); exit(0);
 			} else {
+				// Security options
+
+				// X-Content-Type-Options
+				header("X-Content-Type-Options: nosniff");
+
+				// X-Frame-Options
+				if (!getDolGlobalString('WEBSITE_ALLOW_FRAMES_ON_ALL_PAGES')) {
+					header("X-Frame-Options: SAMEORIGIN");
+				}
+
+				http_response_code(401);
 				print 'Bad link. File is from another module part.';
+				exit(1);
 			}
 		} else {
 			$modulepart = $moduleparttocheck;
@@ -77,8 +89,19 @@ if (!empty($hashp)) {
 			$original_file = getImageFileNameForSize($original_file, $extname);
 		}
 	} else {
+		// Security options
+
+		// X-Content-Type-Options
+		header("X-Content-Type-Options: nosniff");
+
+		// X-Frame-Options
+		if (!getDolGlobalString('WEBSITE_ALLOW_FRAMES_ON_ALL_PAGES')) {
+			header("X-Frame-Options: SAMEORIGIN");
+		}
+
+		http_response_code(404);
 		print "ErrorFileNotFoundWithSharedLink";
-		exit;
+		exit(2);
 	}
 }
 
@@ -196,15 +219,19 @@ if ($rss) {
 				$error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
 				dol_syslog("build_exportfile ".$error, LOG_ERR);
 				dol_delete_file($outputfiletmp, 0, 1);
+
+				http_response_code(500);
 				print $error;
-				exit(-1);
+				exit(3);
 			}
 		} else {
 			dol_syslog("build_exportfile build_xxxfile function fails to for format=".$format." outputfiletmp=".$outputfile, LOG_ERR);
 			dol_delete_file($outputfiletmp, 0, 1);
 			$langs->load("errors");
+
+			http_response_code(500);
 			print $langs->trans("ErrorFailToCreateFile", $outputfile);
-			exit(-1);
+			exit(4);
 		}
 	}
 
@@ -245,7 +272,7 @@ if ($rss) {
 		}
 
 		// header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
-		exit;
+		exit(5);
 	}
 } elseif ($modulepart == "mycompany" && preg_match('/^\/?logos\//', $original_file)) {
 	// Get logos
@@ -265,8 +292,9 @@ if ($rss) {
 	// Security:
 	// Limit access if permissions are wrong
 	if (!$accessallowed) {
+		http_response_code(403);
 		print 'Access forbidden';
-		exit;
+		exit(6);
 	}
 
 	// For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
@@ -284,8 +312,9 @@ if ($rss) {
 
 	// This test if file exists should be useless. We keep it to find bug more easily
 	if (!file_exists($fullpath_original_file_osencoded)) {
+		http_response_code(404);
 		print "ErrorFileDoesNotExists: ".dol_escape_htmltag($original_file);
-		exit;
+		exit(7);
 	}
 
 	// Permissions are ok and file found, so we return it

From 37146ff8f4f9257a8bb081921356a661a06cadab Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 28 Jan 2025 08:49:29 +0100
Subject: [PATCH 273/602] FIX hide duplicate help

---
 htdocs/admin/defaultvalues.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 7a1fafd861e..43f4dffe6d9 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -345,7 +345,9 @@ print '</td>';
 if ($mode != 'focus' && $mode != 'mandatory') {
 	print '<td>';
 	print '<input type="text" class="flat maxwidth100onsmartphone" name="defaultvalue" value="'.dol_escape_htmltag($defaultvalue).'">';
-	print $form->textwithpicto('', $texthelp, 1, 'list-alt', 'paddingleftimp cursorpointer', 0, 2, 'subsitutiontooltip');
+	if ($mode != 'sortorder') {
+		print $form->textwithpicto('', $texthelp, 1, 'list-alt', 'paddingleftimp cursorpointer', 0, 2, 'subsitutiontooltip');
+	}
 	print '</td>';
 }
 // Limit to superadmin

From 0958934849cdfd5746146462187170e2c96f5b39 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 Jan 2025 10:05:18 +0100
Subject: [PATCH 274/602] give a chance to use origin_type instead deprecated
 origin

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 69371e17123..3aa18de36e9 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4182,7 +4182,11 @@ abstract class CommonObject
 	{
 		// phpcs:enable
 		global $user, $hookmanager, $action;
-		$origin = (!empty($origin) ? $origin : $this->origin);
+
+		if (empty($this->origin_type) && !empty($this->origin)) {
+			$this->origin_type = $this->origin;
+		}
+		$origin = (!empty($origin) ? $origin : $this->origin_type);
 		$origin_id = (!empty($origin_id) ? $origin_id : $this->origin_id);
 		$f_user = isset($f_user) ? $f_user : $user;
 

From c6d7f2155d282b2280fb8b7706a8d7e875c628f2 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 Jan 2025 12:13:49 +0100
Subject: [PATCH 275/602] fix typo

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

diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 77251d73be8..fa59796f54e 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -223,7 +223,7 @@ if ($permission) {
 
 // Prepare list
 
-// TODO: replace this with 1 single direct SQL (for both eyernal and external string to use $db->sort($sortfield, $sortorder)
+// TODO: replace this with 1 single direct SQL (for both internal and external string to use $db->sort($sortfield, $sortorder)
 $list = array();
 foreach (array('internal', 'external') as $source) {
 	if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) {

From 4d1cd18936c32d095358a436a90a9d6ae49be3c0 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 28 Jan 2025 12:36:52 +0100
Subject: [PATCH 276/602] Fix translate can accept only 4 subtitutions

---
 htdocs/core/class/translate.class.php | 2 +-
 htdocs/core/lib/admin.lib.php         | 2 +-
 htdocs/langs/en_US/admin.lang         | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 0560bd5be94..20f39fab005 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -699,7 +699,7 @@ class Translate
 				$str
 			);
 
-			$str = preg_replace('/%\)/', '__percent_parenthesis__', $str);
+			$str = preg_replace('/([^%])%([^0sd])/', '__percent_parenthesis__', $str);
 
 			if (strpos($key, 'Format') !== 0) {
 				try {
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 00ba1f85417..e596c104eec 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1229,7 +1229,7 @@ function activateModule($value, $withdeps = 1, $noconfverification = 0)
 							if ($activateerr) {
 								$ret['errors'][] = $activateerr;
 							}
-							$ret['errors'][] = $langs->trans('activateModuleDependNotSatisfied', $objMod->name, $modulestring);
+							$ret['errors'][] = $langs->trans('activateModuleDependNotSatisfied', $objMod->name, $modulestring, $objMod->name).'<br>'.$langs->trans('activateModuleDependNotSatisfied2', $modulestring, $objMod->name);
 						}
 					}
 				}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d77cb396d54..3850bf243ea 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2105,7 +2105,8 @@ AddSubstitutions=Add keys substitutions
 DetectionNotPossible=Detection not possible
 UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
 ListOfAvailableAPIs=List of available APIs
-activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
+activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%s" may not work correctly.
+activateModuleDependNotSatisfied2=Please install module "%s" or disable module "%s" if you want to be safe from any surprise.
 CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
 LandingPage=Landing page
 SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments

From 136575d9671c864bcc18813cf61083a9323ddb60 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 Jan 2025 12:47:44 +0100
Subject: [PATCH 277/602] fix page title

---
 htdocs/expedition/contact.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 058cf084894..3818847e84e 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -135,7 +135,7 @@ if (empty($reshook)) {
 
 $help_url = 'EN:Module_Shipments|FR:Module_Expéditions|ES:M&oacute;dulo_Expediciones|DE:Modul_Lieferungen';
 
-llxHeader('', $langs->trans('Order'), $help_url, '', 0, 0, '', '', '', 'mod-expedition page-card_contact');
+llxHeader('', $langs->trans('Shipment'), $help_url, '', 0, 0, '', '', '', 'mod-expedition page-card_contact');
 
 $form = new Form($db);
 $formcompany = new FormCompany($db);
@@ -151,12 +151,9 @@ $userstatic = new User($db);
 /* *************************************************************************** */
 
 if ($id > 0 || !empty($ref)) {
-	$langs->trans("OrderCard");
-
 	$head = shipping_prepare_head($object);
 	print dol_get_fiche_head($head, 'contact', $langs->trans("Shipment"), -1, $object->picto);
 
-
 	// Shipment card
 	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 

From 9021b3485cf67ec2a2ecdc3209a72e15443c88ce Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 28 Jan 2025 13:33:49 +0100
Subject: [PATCH 278/602] Fix protection translate with bad %

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

diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 20f39fab005..688be96d260 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -699,7 +699,7 @@ class Translate
 				$str
 			);
 
-			$str = preg_replace('/([^%])%([^0sd])/', '__percent_parenthesis__', $str);
+			$str = preg_replace('/([^%])%([^%0sdmYIMpHSBb])/', '\1__percent_parenthesis__\2', $str);
 
 			if (strpos($key, 'Format') !== 0) {
 				try {

From 83bc7b70a04546876a93ef519b988421d3a54c71 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Tue, 28 Jan 2025 13:34:49 +0100
Subject: [PATCH 279/602] Backport from v20 missing executeHooks
 printFieldListFrom in product list page

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

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index e99857ee454..9e5c8772293 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -484,6 +484,11 @@ if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units cu ON cu.rowid = p.fk_unit";
 }
 
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
 $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
 if ($sall) {
 	// Clean $fieldstosearchall

From 70b4ead012176cd4deb43c4a587d234bdb71541c Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 28 Jan 2025 13:57:07 +0100
Subject: [PATCH 280/602] Fix protection translate with bad %

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

diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 688be96d260..1151ec349cc 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -699,7 +699,7 @@ class Translate
 				$str
 			);
 
-			$str = preg_replace('/([^%])%([^%0sdmYIMpHSBb])/', '\1__percent_parenthesis__\2', $str);
+			$str = preg_replace('/([^%])%([^%0sdmYIMpHSBb])/', '\1__percent_with_bad_specifier__\2', $str);
 
 			if (strpos($key, 'Format') !== 0) {
 				try {
@@ -710,7 +710,7 @@ class Translate
 				}
 			}
 
-			$str = str_replace('__percent_parenthesis__', '%)', $str);
+			$str = str_replace('__percent_with_bad_specifier__', '%', $str);
 
 			// Encode string into HTML
 			$str = htmlentities($str, ENT_COMPAT, $this->charset_output); // Do not convert simple quotes in translation (strings in html are embraced by "). Use dol_escape_htmltag around text in HTML content

From f9ec70f1db6d6aca417b398d15fbf38f897191c9 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 28 Jan 2025 14:05:59 +0100
Subject: [PATCH 281/602] FIX compatibility with multicompany

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

diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 0e7bd908c9a..674f0ea1a39 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -86,7 +86,7 @@ $tablib[32] = "DictionaryAccountancyCategory";
 
 // Requests to extract data
 $tabsql = array();
-$tabsql[32] = "SELECT a.rowid as rowid, a.code as code, a.label, a.range_account, a.category_type, a.formula, a.position as position, a.fk_country as country_id, c.code as country_code, c.label as country, a.active FROM ".MAIN_DB_PREFIX."c_accounting_category as a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_country=c.rowid and c.active=1";
+$tabsql[32] = "SELECT a.rowid as rowid, a.code as code, a.label, a.range_account, a.category_type, a.formula, a.position as position, a.fk_country as country_id, c.code as country_code, c.label as country, a.active FROM ".MAIN_DB_PREFIX."c_accounting_category as a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_country=c.rowid AND c.active=1 AND a.entity IN (".getEntity('c_accounting_category').")";
 
 // Criteria to sort dictionaries
 $tabsqlsort = array();
@@ -98,11 +98,11 @@ $tabfield[32] = "code,label,range_account,category_type,formula,position,country
 
 // Name of editing fields for record modification
 $tabfieldvalue = array();
-$tabfieldvalue[32] = "code,label,range_account,category_type,formula,position,country_id";
+$tabfieldvalue[32] = "code,label,range_account,category_type,formula,position,country_id,entity";
 
 // Name of the fields in the table for inserting a record
 $tabfieldinsert = array();
-$tabfieldinsert[32] = "code,label,range_account,category_type,formula,position,fk_country";
+$tabfieldinsert[32] = "code,label,range_account,category_type,formula,position,fk_country,entity";
 
 // Name of the rowid if the field is not of type autoincrement
 // Example: "" if id field is "rowid" and has autoincrement on

From b647b4dc3fffc5e0b650ed00b6bf41c3cee01bb7 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 Jan 2025 14:29:48 +0100
Subject: [PATCH 282/602] Update llx_c_type_contact.sql

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

diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql
index 39813dfb70f..15987bf45ab 100644
--- a/htdocs/install/mysql/data/llx_c_type_contact.sql
+++ b/htdocs/install/mysql/data/llx_c_type_contact.sql
@@ -74,6 +74,7 @@ insert into llx_c_type_contact (element, source, code, libelle, active ) values
 insert into llx_c_type_contact (element, source, code, libelle, active ) values ('commande', 'external', 'SHIPPING',      'Contact client livraison commande', 1);
 
 -- Shipment / Expedition
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('expedition', 'internal', 'SALESREPFOLL',  'Responsable suivi de l\'expédition', 1);
 insert into llx_c_type_contact (element, source, code, libelle, active ) values ('expedition', 'external', 'CUSTOMER',      'Customer shipping contact', 1);
 insert into llx_c_type_contact (element, source, code, libelle, active ) values ('expedition', 'external', 'SHIPPING',      'Loading facility', 1);
 insert into llx_c_type_contact (element, source, code, libelle, active ) values ('expedition', 'external', 'DELIVERY',      'Delivery facility', 1);

From 4b23a78f7f96ce6067f7150fa11f085b99d6bd30 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 Jan 2025 14:32:09 +0100
Subject: [PATCH 283/602] Update expedition.class.php

---
 htdocs/expedition/class/expedition.class.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 10f7f21e68e..2cab8ad7e33 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1609,6 +1609,13 @@ class Expedition extends CommonObject
 					$error++;
 				}
 
+				if (!$error) {
+					// Delete linked contacts
+					$res = $this->delete_linked_contact();
+					if ($res < 0) {
+						$error++;
+					}
+				}
 				if (!$error) {
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."expedition";
 					$sql .= " WHERE rowid = ".((int) $this->id);

From 8639c26e4b1f05d555fdb983a1a6ed683bfd8fca Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 28 Jan 2025 14:37:42 +0100
Subject: [PATCH 284/602] Debug v21

---
 htdocs/core/lib/product.lib.php | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 0e5d27dd316..f13d2df07b8 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -572,7 +572,7 @@ function show_stats_for_company($product, $socid)
 		print '<tr><td>';
 		print '<a href="'.DOL_URL_ROOT.'/product/stats/facturerec.php?id='.$product->id.'">'.img_object('', 'bill', 'class="pictofixedwidth"').$langs->trans("RecurringInvoiceTemplate").'</a>';
 		print '</td><td class="right">';
-		print $product->stats_facture['customers'];
+		print $product->stats_facturerec['customers'];
 		print '</td><td class="right">';
 		print $product->stats_facturerec['nb'];
 		print '</td><td class="right">';
@@ -599,6 +599,27 @@ function show_stats_for_company($product, $socid)
 		print '</td>';
 		print '</tr>';
 	}
+	// Supplier template invoices
+	/* TODO
+	if (isModEnabled("invoice") && $user->hasRight('fournisseur', 'facture', 'lire')) {
+		$nblines++;
+		$ret = $product->load_stats_facture_fournisseurrec($socid);
+		if ($ret < 0) {
+			dol_print_error($db);
+		}
+		$langs->load("bills");
+		print '<tr><td>';
+		print '<a href="'.DOL_URL_ROOT.'/product/stats/facture_facturerec.php?id='.$product->id.'">'.img_object('', 'bill', 'class="pictofixedwidth"').$langs->trans("RecurringInvoiceTemplate").'</a>';
+		print '</td><td class="right">';
+		print $product->stats_facturefournrec['customers'];
+		print '</td><td class="right">';
+		print $product->stats_facturefournrec['nb'];
+		print '</td><td class="right">';
+		print $product->stats_facturefournrec['qty'];
+		print '</td>';
+		print '</tr>';
+	}
+	*/
 
 	// Shipments
 	if (isModEnabled('shipping') && $user->hasRight('shipping', 'lire')) {

From a48e6d5d7deafa75835918e562d5a72276d00120 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 28 Jan 2025 14:39:46 +0100
Subject: [PATCH 285/602] Sync transifex

---
 htdocs/langs/am_ET/admin.lang             | 105 +++++--
 htdocs/langs/am_ET/banks.lang             |   7 +-
 htdocs/langs/am_ET/blockedlog.lang        |   8 +-
 htdocs/langs/am_ET/categories.lang        |   9 +-
 htdocs/langs/am_ET/companies.lang         |  19 +-
 htdocs/langs/am_ET/compta.lang            |   8 +-
 htdocs/langs/am_ET/datapolicy.lang        |   9 +-
 htdocs/langs/am_ET/errors.lang            |  17 +-
 htdocs/langs/am_ET/exports.lang           |  12 +-
 htdocs/langs/am_ET/hrm.lang               |  13 +-
 htdocs/langs/am_ET/mails.lang             |  48 ++--
 htdocs/langs/am_ET/main.lang              |  62 ++++-
 htdocs/langs/am_ET/members.lang           |  32 ++-
 htdocs/langs/am_ET/salaries.lang          |   4 +-
 htdocs/langs/am_ET/website.lang           |  35 ++-
 htdocs/langs/ar_SA/admin.lang             | 277 +++++++++++--------
 htdocs/langs/ar_SA/assets.lang            |  44 +--
 htdocs/langs/ar_SA/banks.lang             |   7 +-
 htdocs/langs/ar_SA/blockedlog.lang        |   8 +-
 htdocs/langs/ar_SA/categories.lang        |  17 +-
 htdocs/langs/ar_SA/companies.lang         |  18 +-
 htdocs/langs/ar_SA/compta.lang            |   8 +-
 htdocs/langs/ar_SA/datapolicy.lang        |   9 +-
 htdocs/langs/ar_SA/errors.lang            |  17 +-
 htdocs/langs/ar_SA/exports.lang           |  12 +-
 htdocs/langs/ar_SA/hrm.lang               |  15 +-
 htdocs/langs/ar_SA/mails.lang             |  48 ++--
 htdocs/langs/ar_SA/main.lang              |  49 +++-
 htdocs/langs/ar_SA/members.lang           |  32 ++-
 htdocs/langs/ar_SA/products.lang          |  19 +-
 htdocs/langs/ar_SA/salaries.lang          |   4 +-
 htdocs/langs/ar_SA/website.lang           |  35 ++-
 htdocs/langs/az_AZ/admin.lang             | 105 +++++--
 htdocs/langs/az_AZ/banks.lang             |   7 +-
 htdocs/langs/az_AZ/blockedlog.lang        |   8 +-
 htdocs/langs/az_AZ/categories.lang        |   9 +-
 htdocs/langs/az_AZ/companies.lang         |  19 +-
 htdocs/langs/az_AZ/compta.lang            |   8 +-
 htdocs/langs/az_AZ/datapolicy.lang        |   9 +-
 htdocs/langs/az_AZ/errors.lang            |  17 +-
 htdocs/langs/az_AZ/exports.lang           |  12 +-
 htdocs/langs/az_AZ/hrm.lang               |  13 +-
 htdocs/langs/az_AZ/mails.lang             |  48 ++--
 htdocs/langs/az_AZ/main.lang              |  56 +++-
 htdocs/langs/az_AZ/members.lang           |  32 ++-
 htdocs/langs/az_AZ/salaries.lang          |   4 +-
 htdocs/langs/az_AZ/website.lang           |  35 ++-
 htdocs/langs/bg_BG/admin.lang             | 105 +++++--
 htdocs/langs/bg_BG/banks.lang             |   7 +-
 htdocs/langs/bg_BG/blockedlog.lang        |   8 +-
 htdocs/langs/bg_BG/categories.lang        |   9 +-
 htdocs/langs/bg_BG/companies.lang         |  16 +-
 htdocs/langs/bg_BG/compta.lang            |   8 +-
 htdocs/langs/bg_BG/datapolicy.lang        |   9 +-
 htdocs/langs/bg_BG/errors.lang            |  17 +-
 htdocs/langs/bg_BG/exports.lang           |  12 +-
 htdocs/langs/bg_BG/hrm.lang               |  13 +-
 htdocs/langs/bg_BG/mails.lang             |  48 ++--
 htdocs/langs/bg_BG/main.lang              |  51 +++-
 htdocs/langs/bg_BG/members.lang           |  32 ++-
 htdocs/langs/bg_BG/products.lang          |  19 +-
 htdocs/langs/bg_BG/salaries.lang          |   4 +-
 htdocs/langs/bg_BG/website.lang           |  35 ++-
 htdocs/langs/bn_BD/admin.lang             | 105 +++++--
 htdocs/langs/bn_BD/banks.lang             |   7 +-
 htdocs/langs/bn_BD/blockedlog.lang        |   8 +-
 htdocs/langs/bn_BD/categories.lang        |   9 +-
 htdocs/langs/bn_BD/companies.lang         |  19 +-
 htdocs/langs/bn_BD/compta.lang            |   8 +-
 htdocs/langs/bn_BD/datapolicy.lang        |   9 +-
 htdocs/langs/bn_BD/errors.lang            |  17 +-
 htdocs/langs/bn_BD/exports.lang           |  12 +-
 htdocs/langs/bn_BD/hrm.lang               |  13 +-
 htdocs/langs/bn_BD/mails.lang             |  48 ++--
 htdocs/langs/bn_BD/main.lang              |  56 +++-
 htdocs/langs/bn_BD/members.lang           |  32 ++-
 htdocs/langs/bn_BD/salaries.lang          |   4 +-
 htdocs/langs/bn_BD/website.lang           |  35 ++-
 htdocs/langs/bn_IN/admin.lang             | 105 +++++--
 htdocs/langs/bn_IN/banks.lang             |   7 +-
 htdocs/langs/bn_IN/blockedlog.lang        |   8 +-
 htdocs/langs/bn_IN/categories.lang        |   9 +-
 htdocs/langs/bn_IN/companies.lang         |  19 +-
 htdocs/langs/bn_IN/compta.lang            |   8 +-
 htdocs/langs/bn_IN/datapolicy.lang        |   9 +-
 htdocs/langs/bn_IN/errors.lang            |  17 +-
 htdocs/langs/bn_IN/exports.lang           |  12 +-
 htdocs/langs/bn_IN/hrm.lang               |  13 +-
 htdocs/langs/bn_IN/mails.lang             |  48 ++--
 htdocs/langs/bn_IN/main.lang              |  56 +++-
 htdocs/langs/bn_IN/members.lang           |  32 ++-
 htdocs/langs/bn_IN/salaries.lang          |   4 +-
 htdocs/langs/bn_IN/website.lang           |  35 ++-
 htdocs/langs/bs_BA/admin.lang             | 105 +++++--
 htdocs/langs/bs_BA/banks.lang             |   7 +-
 htdocs/langs/bs_BA/blockedlog.lang        |   8 +-
 htdocs/langs/bs_BA/categories.lang        |   9 +-
 htdocs/langs/bs_BA/companies.lang         |  19 +-
 htdocs/langs/bs_BA/compta.lang            |   8 +-
 htdocs/langs/bs_BA/datapolicy.lang        |   9 +-
 htdocs/langs/bs_BA/errors.lang            |  17 +-
 htdocs/langs/bs_BA/exports.lang           |  12 +-
 htdocs/langs/bs_BA/hrm.lang               |  13 +-
 htdocs/langs/bs_BA/mails.lang             |  48 ++--
 htdocs/langs/bs_BA/main.lang              |  49 +++-
 htdocs/langs/bs_BA/members.lang           |  32 ++-
 htdocs/langs/bs_BA/salaries.lang          |   4 +-
 htdocs/langs/bs_BA/website.lang           |  35 ++-
 htdocs/langs/ca_ES/admin.lang             | 321 +++++++++++++---------
 htdocs/langs/ca_ES/banks.lang             |   9 +-
 htdocs/langs/ca_ES/blockedlog.lang        |   8 +-
 htdocs/langs/ca_ES/categories.lang        |   9 +-
 htdocs/langs/ca_ES/companies.lang         |  30 +-
 htdocs/langs/ca_ES/compta.lang            |  36 ++-
 htdocs/langs/ca_ES/datapolicy.lang        |   9 +-
 htdocs/langs/ca_ES/errors.lang            |  39 ++-
 htdocs/langs/ca_ES/exports.lang           |   6 +-
 htdocs/langs/ca_ES/hrm.lang               |  13 +-
 htdocs/langs/ca_ES/mails.lang             |  60 ++--
 htdocs/langs/ca_ES/main.lang              |  65 ++++-
 htdocs/langs/ca_ES/members.lang           |  37 +--
 htdocs/langs/ca_ES/products.lang          |  21 +-
 htdocs/langs/ca_ES/salaries.lang          |   4 +-
 htdocs/langs/ca_ES/website.lang           |  48 ++--
 htdocs/langs/cs_CZ/admin.lang             | 105 +++++--
 htdocs/langs/cs_CZ/banks.lang             |   7 +-
 htdocs/langs/cs_CZ/companies.lang         |  16 +-
 htdocs/langs/cs_CZ/errors.lang            |  17 +-
 htdocs/langs/cs_CZ/exports.lang           |  12 +-
 htdocs/langs/cs_CZ/mails.lang             |  54 ++--
 htdocs/langs/cs_CZ/main.lang              |  49 +++-
 htdocs/langs/cs_CZ/products.lang          |  19 +-
 htdocs/langs/cs_CZ/website.lang           |  35 ++-
 htdocs/langs/cy_GB/admin.lang             | 105 +++++--
 htdocs/langs/cy_GB/banks.lang             |   9 +-
 htdocs/langs/cy_GB/blockedlog.lang        |   8 +-
 htdocs/langs/cy_GB/categories.lang        |   9 +-
 htdocs/langs/cy_GB/companies.lang         |  19 +-
 htdocs/langs/cy_GB/compta.lang            |   8 +-
 htdocs/langs/cy_GB/datapolicy.lang        |   9 +-
 htdocs/langs/cy_GB/errors.lang            |  17 +-
 htdocs/langs/cy_GB/exports.lang           |   6 +-
 htdocs/langs/cy_GB/hrm.lang               |  13 +-
 htdocs/langs/cy_GB/mails.lang             |  48 ++--
 htdocs/langs/cy_GB/main.lang              |  58 +++-
 htdocs/langs/cy_GB/members.lang           |  32 ++-
 htdocs/langs/cy_GB/salaries.lang          |   4 +-
 htdocs/langs/cy_GB/website.lang           |  35 ++-
 htdocs/langs/da_DK/admin.lang             | 107 ++++++--
 htdocs/langs/da_DK/banks.lang             |   9 +-
 htdocs/langs/da_DK/bills.lang             |   8 +
 htdocs/langs/da_DK/blockedlog.lang        |  10 +-
 htdocs/langs/da_DK/categories.lang        |   9 +-
 htdocs/langs/da_DK/companies.lang         |  20 +-
 htdocs/langs/da_DK/compta.lang            |   8 +-
 htdocs/langs/da_DK/datapolicy.lang        |   9 +-
 htdocs/langs/da_DK/errors.lang            |  17 +-
 htdocs/langs/da_DK/exports.lang           |   6 +-
 htdocs/langs/da_DK/hrm.lang               |  10 +-
 htdocs/langs/da_DK/mails.lang             |  48 ++--
 htdocs/langs/da_DK/main.lang              |  48 +++-
 htdocs/langs/da_DK/members.lang           |  32 ++-
 htdocs/langs/da_DK/products.lang          |  21 +-
 htdocs/langs/da_DK/salaries.lang          |   4 +-
 htdocs/langs/da_DK/website.lang           |  32 ++-
 htdocs/langs/de_AT/mails.lang             |   3 -
 htdocs/langs/de_AT/website.lang           |   2 -
 htdocs/langs/de_CH/admin.lang             |   8 +-
 htdocs/langs/de_CH/banks.lang             |   2 +
 htdocs/langs/de_CH/bills.lang             |   2 -
 htdocs/langs/de_CH/categories.lang        |   5 +-
 htdocs/langs/de_CH/companies.lang         |   6 +-
 htdocs/langs/de_CH/mails.lang             |   6 -
 htdocs/langs/de_CH/main.lang              |   6 +-
 htdocs/langs/de_CH/products.lang          |  34 ++-
 htdocs/langs/de_CH/website.lang           |   1 -
 htdocs/langs/de_DE/accountancy.lang       |  28 +-
 htdocs/langs/de_DE/admin.lang             | 131 ++++++---
 htdocs/langs/de_DE/banks.lang             |   9 +-
 htdocs/langs/de_DE/bills.lang             |  42 +--
 htdocs/langs/de_DE/blockedlog.lang        |   8 +-
 htdocs/langs/de_DE/cashdesk.lang          |   2 +-
 htdocs/langs/de_DE/categories.lang        |   9 +-
 htdocs/langs/de_DE/commercial.lang        |  18 +-
 htdocs/langs/de_DE/companies.lang         |  22 +-
 htdocs/langs/de_DE/compta.lang            |  18 +-
 htdocs/langs/de_DE/datapolicy.lang        |   9 +-
 htdocs/langs/de_DE/deliveries.lang        |   3 +-
 htdocs/langs/de_DE/ecm.lang               |   4 +
 htdocs/langs/de_DE/errors.lang            |  19 +-
 htdocs/langs/de_DE/exports.lang           |  14 +-
 htdocs/langs/de_DE/hrm.lang               |  10 +-
 htdocs/langs/de_DE/install.lang           |  13 +-
 htdocs/langs/de_DE/interventions.lang     |   5 +-
 htdocs/langs/de_DE/languages.lang         |   4 +
 htdocs/langs/de_DE/mails.lang             |  46 ++--
 htdocs/langs/de_DE/main.lang              |  16 +-
 htdocs/langs/de_DE/members.lang           |  32 ++-
 htdocs/langs/de_DE/modulebuilder.lang     |  11 +-
 htdocs/langs/de_DE/orders.lang            |  26 +-
 htdocs/langs/de_DE/products.lang          |  25 +-
 htdocs/langs/de_DE/salaries.lang          |   6 +-
 htdocs/langs/de_DE/sendings.lang          |   6 +-
 htdocs/langs/de_DE/stocks.lang            |  17 +-
 htdocs/langs/de_DE/ticket.lang            |  20 +-
 htdocs/langs/de_DE/users.lang             |  14 +-
 htdocs/langs/de_DE/website.lang           |  36 ++-
 htdocs/langs/de_DE/withdrawals.lang       |  10 +-
 htdocs/langs/el_GR/admin.lang             | 103 +++++--
 htdocs/langs/el_GR/banks.lang             |   7 +-
 htdocs/langs/el_GR/bills.lang             |   8 +
 htdocs/langs/el_GR/blockedlog.lang        |  10 +-
 htdocs/langs/el_GR/categories.lang        |   9 +-
 htdocs/langs/el_GR/companies.lang         |  18 +-
 htdocs/langs/el_GR/compta.lang            |  16 +-
 htdocs/langs/el_GR/datapolicy.lang        |   9 +-
 htdocs/langs/el_GR/errors.lang            |  17 +-
 htdocs/langs/el_GR/exports.lang           |   8 +-
 htdocs/langs/el_GR/hrm.lang               |  10 +-
 htdocs/langs/el_GR/mails.lang             |  50 ++--
 htdocs/langs/el_GR/main.lang              |  14 +-
 htdocs/langs/el_GR/members.lang           |  34 ++-
 htdocs/langs/el_GR/products.lang          |  15 +-
 htdocs/langs/el_GR/salaries.lang          |   4 +-
 htdocs/langs/el_GR/website.lang           |  30 +-
 htdocs/langs/en_GB/exports.lang           |   5 -
 htdocs/langs/en_IE/admin.lang             |   2 +
 htdocs/langs/en_IE/main.lang              |  21 ++
 htdocs/langs/en_IE/products.lang          |   5 +
 htdocs/langs/en_US/main.lang              |   1 +
 htdocs/langs/en_US/products.lang          |   8 +-
 htdocs/langs/es_AR/banks.lang             |   2 +-
 htdocs/langs/es_AR/companies.lang         |   4 +-
 htdocs/langs/es_AR/exports.lang           |   2 +
 htdocs/langs/es_AR/mails.lang             |  18 --
 htdocs/langs/es_AR/main.lang              |   7 +-
 htdocs/langs/es_CL/admin.lang             |  11 +-
 htdocs/langs/es_CL/banks.lang             |   3 +-
 htdocs/langs/es_CL/companies.lang         |   3 +-
 htdocs/langs/es_CL/compta.lang            |   1 -
 htdocs/langs/es_CL/exports.lang           |   3 -
 htdocs/langs/es_CL/mails.lang             |  18 --
 htdocs/langs/es_CL/main.lang              |   2 -
 htdocs/langs/es_CL/website.lang           |   3 -
 htdocs/langs/es_CO/admin.lang             |  14 +-
 htdocs/langs/es_CO/banks.lang             |   3 +-
 htdocs/langs/es_CO/blockedlog.lang        |   1 -
 htdocs/langs/es_CO/categories.lang        |   2 +
 htdocs/langs/es_CO/companies.lang         |   4 +-
 htdocs/langs/es_CO/errors.lang            |   1 -
 htdocs/langs/es_CO/exports.lang           |   3 -
 htdocs/langs/es_CO/mails.lang             |  19 --
 htdocs/langs/es_CO/main.lang              |   4 +-
 htdocs/langs/es_CO/members.lang           |   6 +-
 htdocs/langs/es_CO/website.lang           |   5 -
 htdocs/langs/es_CR/admin.lang             |  23 +-
 htdocs/langs/es_CR/banks.lang             |   4 +-
 htdocs/langs/es_CR/bills.lang             |   1 +
 htdocs/langs/es_CR/categories.lang        |   2 +
 htdocs/langs/es_CR/companies.lang         |   4 +-
 htdocs/langs/es_CR/exports.lang           |   3 -
 htdocs/langs/es_CR/mails.lang             |  18 --
 htdocs/langs/es_CR/main.lang              |   5 +-
 htdocs/langs/es_CR/members.lang           |   1 +
 htdocs/langs/es_CR/products.lang          |   6 +-
 htdocs/langs/es_CR/website.lang           |   1 -
 htdocs/langs/es_CU/admin.lang             |  15 +-
 htdocs/langs/es_CU/banks.lang             |   3 +-
 htdocs/langs/es_CU/blockedlog.lang        |   1 -
 htdocs/langs/es_CU/categories.lang        |   2 +
 htdocs/langs/es_CU/companies.lang         |   3 +-
 htdocs/langs/es_CU/compta.lang            |   5 +-
 htdocs/langs/es_CU/errors.lang            |   1 -
 htdocs/langs/es_CU/exports.lang           |   2 -
 htdocs/langs/es_CU/mails.lang             |  19 --
 htdocs/langs/es_CU/main.lang              |   9 +-
 htdocs/langs/es_CU/members.lang           |   8 +-
 htdocs/langs/es_CU/website.lang           |   5 -
 htdocs/langs/es_EC/admin.lang             |  11 +-
 htdocs/langs/es_EC/banks.lang             |   3 +-
 htdocs/langs/es_EC/companies.lang         |   7 +-
 htdocs/langs/es_EC/exports.lang           |   4 +-
 htdocs/langs/es_EC/mails.lang             |  17 --
 htdocs/langs/es_EC/main.lang              |   7 +-
 htdocs/langs/es_EC/products.lang          |   4 +-
 htdocs/langs/es_EC/website.lang           |   5 -
 htdocs/langs/es_ES/admin.lang             | 219 +++++++++------
 htdocs/langs/es_ES/banks.lang             |  13 +-
 htdocs/langs/es_ES/bills.lang             |  10 +-
 htdocs/langs/es_ES/blockedlog.lang        |   8 +-
 htdocs/langs/es_ES/categories.lang        |   9 +-
 htdocs/langs/es_ES/companies.lang         |  20 +-
 htdocs/langs/es_ES/compta.lang            |  12 +-
 htdocs/langs/es_ES/datapolicy.lang        |   9 +-
 htdocs/langs/es_ES/errors.lang            |  47 ++--
 htdocs/langs/es_ES/exports.lang           |  12 +-
 htdocs/langs/es_ES/hrm.lang               |  13 +-
 htdocs/langs/es_ES/mails.lang             |  64 ++---
 htdocs/langs/es_ES/main.lang              |  51 +++-
 htdocs/langs/es_ES/members.lang           |  32 ++-
 htdocs/langs/es_ES/products.lang          |  27 +-
 htdocs/langs/es_ES/salaries.lang          |   4 +-
 htdocs/langs/es_ES/website.lang           |  32 ++-
 htdocs/langs/es_MX/banks.lang             |   2 +
 htdocs/langs/es_MX/companies.lang         |   5 +-
 htdocs/langs/es_MX/exports.lang           |   1 +
 htdocs/langs/es_MX/main.lang              |   4 +
 htdocs/langs/es_VE/admin.lang             |   3 +-
 htdocs/langs/es_VE/products.lang          |   4 +
 htdocs/langs/et_EE/admin.lang             | 173 ++++++++----
 htdocs/langs/et_EE/banks.lang             |   7 +-
 htdocs/langs/et_EE/categories.lang        |   9 +-
 htdocs/langs/et_EE/companies.lang         |  26 +-
 htdocs/langs/et_EE/exports.lang           |  12 +-
 htdocs/langs/et_EE/mails.lang             |  58 ++--
 htdocs/langs/et_EE/main.lang              |  51 +++-
 htdocs/langs/et_EE/products.lang          | 115 ++++----
 htdocs/langs/eu_ES/exports.lang           |  40 ++-
 htdocs/langs/fa_IR/admin.lang             | 177 +++++++-----
 htdocs/langs/fa_IR/banks.lang             |   7 +-
 htdocs/langs/fa_IR/companies.lang         |  20 +-
 htdocs/langs/fa_IR/exports.lang           |  14 +-
 htdocs/langs/fa_IR/mails.lang             |  54 ++--
 htdocs/langs/fa_IR/main.lang              |  49 +++-
 htdocs/langs/fa_IR/products.lang          |  27 +-
 htdocs/langs/fi_FI/admin.lang             | 209 ++++++++------
 htdocs/langs/fi_FI/banks.lang             |  27 +-
 htdocs/langs/fi_FI/blockedlog.lang        |  10 +-
 htdocs/langs/fi_FI/categories.lang        |   9 +-
 htdocs/langs/fi_FI/companies.lang         |  40 +--
 htdocs/langs/fi_FI/compta.lang            |  76 ++---
 htdocs/langs/fi_FI/datapolicy.lang        |   9 +-
 htdocs/langs/fi_FI/errors.lang            |  21 +-
 htdocs/langs/fi_FI/exports.lang           |  18 +-
 htdocs/langs/fi_FI/hrm.lang               |  13 +-
 htdocs/langs/fi_FI/mails.lang             |  48 ++--
 htdocs/langs/fi_FI/main.lang              | 101 +++++--
 htdocs/langs/fi_FI/members.lang           |  11 +-
 htdocs/langs/fi_FI/products.lang          |  35 ++-
 htdocs/langs/fi_FI/salaries.lang          |   4 +-
 htdocs/langs/fi_FI/website.lang           |  32 ++-
 htdocs/langs/fr_CA/admin.lang             |  44 +--
 htdocs/langs/fr_CA/banks.lang             |  34 ++-
 htdocs/langs/fr_CA/blockedlog.lang        |   3 +-
 htdocs/langs/fr_CA/categories.lang        |  35 +++
 htdocs/langs/fr_CA/companies.lang         | 118 ++++++++
 htdocs/langs/fr_CA/compta.lang            | 135 +++++++++
 htdocs/langs/fr_CA/datapolicy.lang        |   1 -
 htdocs/langs/fr_CA/errors.lang            | 189 +++++++++++++
 htdocs/langs/fr_CA/eventorganization.lang |  72 +++++
 htdocs/langs/fr_CA/exports.lang           |  58 +++-
 htdocs/langs/fr_CA/hrm.lang               |  47 ++++
 htdocs/langs/fr_CA/mails.lang             |  80 ++++--
 htdocs/langs/fr_CA/main.lang              | 276 ++++++++++++++++++-
 htdocs/langs/fr_CA/members.lang           | 127 +++++++++
 htdocs/langs/fr_CA/salaries.lang          |  18 ++
 htdocs/langs/fr_CA/website.lang           | 210 +++++++++++++-
 htdocs/langs/fr_CH/members.lang           |   2 -
 htdocs/langs/fr_CM/companies.lang         |   2 +-
 htdocs/langs/fr_FR/admin.lang             | 109 ++++++--
 htdocs/langs/fr_FR/banks.lang             |   5 +-
 htdocs/langs/fr_FR/bills.lang             |  13 +-
 htdocs/langs/fr_FR/blockedlog.lang        |  10 +-
 htdocs/langs/fr_FR/categories.lang        |   9 +-
 htdocs/langs/fr_FR/companies.lang         |   6 +-
 htdocs/langs/fr_FR/compta.lang            |   8 +-
 htdocs/langs/fr_FR/datapolicy.lang        |   9 +-
 htdocs/langs/fr_FR/errors.lang            |  17 +-
 htdocs/langs/fr_FR/exports.lang           |   4 +-
 htdocs/langs/fr_FR/hrm.lang               |  10 +-
 htdocs/langs/fr_FR/mails.lang             |  46 ++--
 htdocs/langs/fr_FR/members.lang           |   8 +-
 htdocs/langs/fr_FR/products.lang          |  18 +-
 htdocs/langs/fr_FR/salaries.lang          |   1 -
 htdocs/langs/fr_FR/website.lang           |  17 +-
 htdocs/langs/gl_ES/admin.lang             | 103 +++++--
 htdocs/langs/gl_ES/banks.lang             |  17 +-
 htdocs/langs/gl_ES/bills.lang             |  14 +-
 htdocs/langs/gl_ES/blockedlog.lang        |   8 +-
 htdocs/langs/gl_ES/categories.lang        |   9 +-
 htdocs/langs/gl_ES/companies.lang         |  16 +-
 htdocs/langs/gl_ES/compta.lang            |  24 +-
 htdocs/langs/gl_ES/datapolicy.lang        |   9 +-
 htdocs/langs/gl_ES/errors.lang            |  17 +-
 htdocs/langs/gl_ES/exports.lang           |  10 +-
 htdocs/langs/gl_ES/hrm.lang               |  10 +-
 htdocs/langs/gl_ES/mails.lang             |  48 ++--
 htdocs/langs/gl_ES/main.lang              |  48 +++-
 htdocs/langs/gl_ES/members.lang           |   7 +-
 htdocs/langs/gl_ES/mrp.lang               |   6 +
 htdocs/langs/gl_ES/opensurvey.lang        |   5 +-
 htdocs/langs/gl_ES/products.lang          |  39 ++-
 htdocs/langs/gl_ES/projects.lang          |   4 +
 htdocs/langs/gl_ES/salaries.lang          |   6 +-
 htdocs/langs/gl_ES/stripe.lang            |   2 +
 htdocs/langs/he_IL/admin.lang             | 105 +++++--
 htdocs/langs/he_IL/banks.lang             |   7 +-
 htdocs/langs/he_IL/blockedlog.lang        |   8 +-
 htdocs/langs/he_IL/categories.lang        |   9 +-
 htdocs/langs/he_IL/companies.lang         |  19 +-
 htdocs/langs/he_IL/compta.lang            |   8 +-
 htdocs/langs/he_IL/datapolicy.lang        |   9 +-
 htdocs/langs/he_IL/errors.lang            |  17 +-
 htdocs/langs/he_IL/exports.lang           |  12 +-
 htdocs/langs/he_IL/hrm.lang               |  13 +-
 htdocs/langs/he_IL/mails.lang             |  48 ++--
 htdocs/langs/he_IL/main.lang              |  56 +++-
 htdocs/langs/he_IL/members.lang           |  32 ++-
 htdocs/langs/he_IL/salaries.lang          |   4 +-
 htdocs/langs/he_IL/website.lang           |  35 ++-
 htdocs/langs/hr_HR/admin.lang             | 105 +++++--
 htdocs/langs/hr_HR/banks.lang             |   7 +-
 htdocs/langs/hr_HR/blockedlog.lang        |   8 +-
 htdocs/langs/hr_HR/categories.lang        |   9 +-
 htdocs/langs/hr_HR/companies.lang         |  16 +-
 htdocs/langs/hr_HR/compta.lang            |  10 +-
 htdocs/langs/hr_HR/datapolicy.lang        |   9 +-
 htdocs/langs/hr_HR/errors.lang            |  17 +-
 htdocs/langs/hr_HR/exports.lang           |  12 +-
 htdocs/langs/hr_HR/hrm.lang               |  13 +-
 htdocs/langs/hr_HR/mails.lang             |  48 ++--
 htdocs/langs/hr_HR/main.lang              |  49 +++-
 htdocs/langs/hr_HR/members.lang           |  34 ++-
 htdocs/langs/hr_HR/products.lang          |  19 +-
 htdocs/langs/hr_HR/salaries.lang          |   4 +-
 htdocs/langs/hr_HR/website.lang           |  35 ++-
 htdocs/langs/hu_HU/admin.lang             | 105 +++++--
 htdocs/langs/hu_HU/banks.lang             |   7 +-
 htdocs/langs/hu_HU/blockedlog.lang        |   8 +-
 htdocs/langs/hu_HU/categories.lang        |   9 +-
 htdocs/langs/hu_HU/companies.lang         |  16 +-
 htdocs/langs/hu_HU/compta.lang            |   8 +-
 htdocs/langs/hu_HU/datapolicy.lang        |   9 +-
 htdocs/langs/hu_HU/errors.lang            |  17 +-
 htdocs/langs/hu_HU/exports.lang           |   4 +-
 htdocs/langs/hu_HU/hrm.lang               |  13 +-
 htdocs/langs/hu_HU/mails.lang             |  48 ++--
 htdocs/langs/hu_HU/main.lang              |  49 +++-
 htdocs/langs/hu_HU/members.lang           |   7 +-
 htdocs/langs/hu_HU/products.lang          |  15 +-
 htdocs/langs/hu_HU/salaries.lang          |   4 +-
 htdocs/langs/hu_HU/website.lang           |  30 +-
 htdocs/langs/id_ID/admin.lang             | 105 +++++--
 htdocs/langs/id_ID/banks.lang             |   7 +-
 htdocs/langs/id_ID/blockedlog.lang        |   8 +-
 htdocs/langs/id_ID/categories.lang        |   9 +-
 htdocs/langs/id_ID/companies.lang         |  19 +-
 htdocs/langs/id_ID/compta.lang            |   8 +-
 htdocs/langs/id_ID/datapolicy.lang        |   9 +-
 htdocs/langs/id_ID/errors.lang            |  17 +-
 htdocs/langs/id_ID/exports.lang           |   6 +-
 htdocs/langs/id_ID/hrm.lang               |  13 +-
 htdocs/langs/id_ID/mails.lang             |  48 ++--
 htdocs/langs/id_ID/main.lang              |  58 +++-
 htdocs/langs/id_ID/members.lang           |   7 +-
 htdocs/langs/id_ID/salaries.lang          |   4 +-
 htdocs/langs/id_ID/website.lang           |  30 +-
 htdocs/langs/is_IS/admin.lang             | 115 +++++---
 htdocs/langs/is_IS/companies.lang         |  19 +-
 htdocs/langs/is_IS/exports.lang           |  12 +-
 htdocs/langs/is_IS/mails.lang             |  54 ++--
 htdocs/langs/is_IS/main.lang              |  49 +++-
 htdocs/langs/is_IS/products.lang          |  87 ++++--
 htdocs/langs/it_IT/admin.lang             | 109 ++++++--
 htdocs/langs/it_IT/banks.lang             |   9 +-
 htdocs/langs/it_IT/blockedlog.lang        |   8 +-
 htdocs/langs/it_IT/categories.lang        |   9 +-
 htdocs/langs/it_IT/companies.lang         |  18 +-
 htdocs/langs/it_IT/compta.lang            |   8 +-
 htdocs/langs/it_IT/datapolicy.lang        |   9 +-
 htdocs/langs/it_IT/errors.lang            |  21 +-
 htdocs/langs/it_IT/exports.lang           |   6 +-
 htdocs/langs/it_IT/hrm.lang               |  13 +-
 htdocs/langs/it_IT/mails.lang             |  48 ++--
 htdocs/langs/it_IT/main.lang              |  59 +++-
 htdocs/langs/it_IT/members.lang           |   7 +-
 htdocs/langs/it_IT/orders.lang            |   8 +-
 htdocs/langs/it_IT/products.lang          |  15 +-
 htdocs/langs/it_IT/salaries.lang          |   4 +-
 htdocs/langs/it_IT/website.lang           |  30 +-
 htdocs/langs/ja_JP/admin.lang             | 119 +++++---
 htdocs/langs/ja_JP/banks.lang             |   7 +-
 htdocs/langs/ja_JP/blockedlog.lang        |   8 +-
 htdocs/langs/ja_JP/categories.lang        |   9 +-
 htdocs/langs/ja_JP/companies.lang         |  18 +-
 htdocs/langs/ja_JP/compta.lang            |  12 +-
 htdocs/langs/ja_JP/datapolicy.lang        |   9 +-
 htdocs/langs/ja_JP/errors.lang            |  17 +-
 htdocs/langs/ja_JP/exports.lang           |   8 +-
 htdocs/langs/ja_JP/hrm.lang               |  10 +-
 htdocs/langs/ja_JP/mails.lang             |  46 ++--
 htdocs/langs/ja_JP/main.lang              |  48 +++-
 htdocs/langs/ja_JP/members.lang           |   5 +-
 htdocs/langs/ja_JP/products.lang          |  15 +-
 htdocs/langs/ja_JP/salaries.lang          |   4 +-
 htdocs/langs/ja_JP/website.lang           |  30 +-
 htdocs/langs/kk_KZ/admin.lang             | 105 +++++--
 htdocs/langs/kk_KZ/banks.lang             |   7 +-
 htdocs/langs/kk_KZ/blockedlog.lang        |   8 +-
 htdocs/langs/kk_KZ/categories.lang        |   9 +-
 htdocs/langs/kk_KZ/companies.lang         |  19 +-
 htdocs/langs/kk_KZ/compta.lang            |   8 +-
 htdocs/langs/kk_KZ/datapolicy.lang        |   9 +-
 htdocs/langs/kk_KZ/errors.lang            |  17 +-
 htdocs/langs/kk_KZ/exports.lang           |   6 +-
 htdocs/langs/kk_KZ/hrm.lang               |  13 +-
 htdocs/langs/kk_KZ/mails.lang             |  48 ++--
 htdocs/langs/kk_KZ/main.lang              |  56 +++-
 htdocs/langs/kk_KZ/members.lang           |   7 +-
 htdocs/langs/kk_KZ/salaries.lang          |   4 +-
 htdocs/langs/kk_KZ/website.lang           |  30 +-
 htdocs/langs/km_KH/admin.lang             | 107 ++++++--
 htdocs/langs/km_KH/banks.lang             |   7 +-
 htdocs/langs/km_KH/blockedlog.lang        |   8 +-
 htdocs/langs/km_KH/categories.lang        |   9 +-
 htdocs/langs/km_KH/companies.lang         |  19 +-
 htdocs/langs/km_KH/compta.lang            |   8 +-
 htdocs/langs/km_KH/errors.lang            |  17 +-
 htdocs/langs/km_KH/exports.lang           |   6 +-
 htdocs/langs/km_KH/hrm.lang               |  13 +-
 htdocs/langs/km_KH/mails.lang             |  48 ++--
 htdocs/langs/km_KH/main.lang              |  56 +++-
 htdocs/langs/km_KH/members.lang           |   7 +-
 htdocs/langs/km_KH/salaries.lang          |   4 +-
 htdocs/langs/km_KH/website.lang           |  30 +-
 htdocs/langs/kn_IN/companies.lang         |  19 +-
 htdocs/langs/kn_IN/main.lang              |  91 +++++-
 htdocs/langs/ko_KR/companies.lang         |  19 +-
 htdocs/langs/ko_KR/main.lang              |  56 +++-
 htdocs/langs/lo_LA/admin.lang             | 105 +++++--
 htdocs/langs/lo_LA/banks.lang             |   7 +-
 htdocs/langs/lo_LA/blockedlog.lang        |   8 +-
 htdocs/langs/lo_LA/categories.lang        |   9 +-
 htdocs/langs/lo_LA/companies.lang         |  19 +-
 htdocs/langs/lo_LA/compta.lang            |   8 +-
 htdocs/langs/lo_LA/datapolicy.lang        |   9 +-
 htdocs/langs/lo_LA/errors.lang            |  17 +-
 htdocs/langs/lo_LA/exports.lang           |  12 +-
 htdocs/langs/lo_LA/hrm.lang               |  13 +-
 htdocs/langs/lo_LA/mails.lang             |  48 ++--
 htdocs/langs/lo_LA/main.lang              |  56 +++-
 htdocs/langs/lo_LA/members.lang           |  32 ++-
 htdocs/langs/lo_LA/salaries.lang          |   4 +-
 htdocs/langs/lo_LA/website.lang           |  35 ++-
 htdocs/langs/lt_LT/admin.lang             | 117 +++++---
 htdocs/langs/lt_LT/banks.lang             |   7 +-
 htdocs/langs/lt_LT/companies.lang         |  19 +-
 htdocs/langs/lt_LT/exports.lang           |  12 +-
 htdocs/langs/lt_LT/mails.lang             |  54 ++--
 htdocs/langs/lt_LT/main.lang              |  49 +++-
 htdocs/langs/lt_LT/products.lang          |  87 ++++--
 htdocs/langs/lv_LV/admin.lang             | 105 +++++--
 htdocs/langs/lv_LV/banks.lang             |   9 +-
 htdocs/langs/lv_LV/blockedlog.lang        |   8 +-
 htdocs/langs/lv_LV/categories.lang        |   9 +-
 htdocs/langs/lv_LV/companies.lang         |  20 +-
 htdocs/langs/lv_LV/compta.lang            |   8 +-
 htdocs/langs/lv_LV/datapolicy.lang        |   9 +-
 htdocs/langs/lv_LV/errors.lang            |  31 ++-
 htdocs/langs/lv_LV/exports.lang           |   6 +-
 htdocs/langs/lv_LV/hrm.lang               |  13 +-
 htdocs/langs/lv_LV/mails.lang             |  60 ++--
 htdocs/langs/lv_LV/main.lang              |  55 +++-
 htdocs/langs/lv_LV/members.lang           |  35 +--
 htdocs/langs/lv_LV/products.lang          |  21 +-
 htdocs/langs/lv_LV/salaries.lang          |   4 +-
 htdocs/langs/lv_LV/website.lang           |  36 ++-
 htdocs/langs/mk_MK/admin.lang             | 105 +++++--
 htdocs/langs/mk_MK/banks.lang             |   7 +-
 htdocs/langs/mk_MK/blockedlog.lang        |   8 +-
 htdocs/langs/mk_MK/categories.lang        |   9 +-
 htdocs/langs/mk_MK/companies.lang         |  19 +-
 htdocs/langs/mk_MK/compta.lang            |   8 +-
 htdocs/langs/mk_MK/datapolicy.lang        |   9 +-
 htdocs/langs/mk_MK/errors.lang            |  17 +-
 htdocs/langs/mk_MK/exports.lang           |   4 +-
 htdocs/langs/mk_MK/hrm.lang               |  13 +-
 htdocs/langs/mk_MK/mails.lang             |  48 ++--
 htdocs/langs/mk_MK/main.lang              |  55 +++-
 htdocs/langs/mk_MK/members.lang           |   7 +-
 htdocs/langs/mk_MK/salaries.lang          |   4 +-
 htdocs/langs/mk_MK/website.lang           |  30 +-
 htdocs/langs/nb_NO/admin.lang             |  99 +++++--
 htdocs/langs/nb_NO/banks.lang             |   9 +-
 htdocs/langs/nb_NO/bills.lang             |   8 +
 htdocs/langs/nb_NO/blockedlog.lang        |   8 +-
 htdocs/langs/nb_NO/categories.lang        |  11 +-
 htdocs/langs/nb_NO/companies.lang         |  16 +-
 htdocs/langs/nb_NO/compta.lang            |   8 +-
 htdocs/langs/nb_NO/datapolicy.lang        |   9 +-
 htdocs/langs/nb_NO/errors.lang            |  19 +-
 htdocs/langs/nb_NO/exports.lang           |   6 +-
 htdocs/langs/nb_NO/hrm.lang               |  10 +-
 htdocs/langs/nb_NO/mails.lang             |  46 ++--
 htdocs/langs/nb_NO/main.lang              |  49 +++-
 htdocs/langs/nb_NO/members.lang           |  34 ++-
 htdocs/langs/nb_NO/products.lang          |  23 +-
 htdocs/langs/nb_NO/salaries.lang          |   4 +-
 htdocs/langs/nb_NO/website.lang           |  30 +-
 htdocs/langs/nl_BE/admin.lang             |  12 +-
 htdocs/langs/nl_BE/assets.lang            |  22 +-
 htdocs/langs/nl_BE/banks.lang             |  17 +-
 htdocs/langs/nl_BE/companies.lang         |   5 +-
 htdocs/langs/nl_BE/mails.lang             |  15 -
 htdocs/langs/nl_BE/main.lang              |  44 ++-
 htdocs/langs/nl_BE/orders.lang            |   4 +-
 htdocs/langs/nl_BE/website.lang           |   4 +-
 htdocs/langs/nl_NL/admin.lang             | 113 +++++---
 htdocs/langs/nl_NL/banks.lang             |   7 +-
 htdocs/langs/nl_NL/blockedlog.lang        |  10 +-
 htdocs/langs/nl_NL/categories.lang        |   9 +-
 htdocs/langs/nl_NL/companies.lang         |  20 +-
 htdocs/langs/nl_NL/compta.lang            |   8 +-
 htdocs/langs/nl_NL/datapolicy.lang        |   9 +-
 htdocs/langs/nl_NL/errors.lang            |  19 +-
 htdocs/langs/nl_NL/exports.lang           |   4 +-
 htdocs/langs/nl_NL/hrm.lang               |  13 +-
 htdocs/langs/nl_NL/mails.lang             |  50 ++--
 htdocs/langs/nl_NL/main.lang              |  51 +++-
 htdocs/langs/nl_NL/members.lang           |   7 +-
 htdocs/langs/nl_NL/products.lang          |  15 +-
 htdocs/langs/nl_NL/salaries.lang          |   4 +-
 htdocs/langs/nl_NL/website.lang           |  32 ++-
 htdocs/langs/pl_PL/admin.lang             | 151 ++++++----
 htdocs/langs/pl_PL/banks.lang             |   7 +-
 htdocs/langs/pl_PL/blockedlog.lang        |   8 +-
 htdocs/langs/pl_PL/categories.lang        |   9 +-
 htdocs/langs/pl_PL/companies.lang         |  50 ++--
 htdocs/langs/pl_PL/compta.lang            |  10 +-
 htdocs/langs/pl_PL/datapolicy.lang        |   9 +-
 htdocs/langs/pl_PL/errors.lang            |  17 +-
 htdocs/langs/pl_PL/exports.lang           |  18 +-
 htdocs/langs/pl_PL/hrm.lang               |  13 +-
 htdocs/langs/pl_PL/mails.lang             |  50 ++--
 htdocs/langs/pl_PL/main.lang              |  53 +++-
 htdocs/langs/pl_PL/members.lang           |  38 +--
 htdocs/langs/pl_PL/products.lang          |  15 +-
 htdocs/langs/pl_PL/salaries.lang          |   4 +-
 htdocs/langs/pl_PL/website.lang           |  41 +--
 htdocs/langs/pt_BR/admin.lang             |  19 +-
 htdocs/langs/pt_BR/banks.lang             |   2 +-
 htdocs/langs/pt_BR/blockedlog.lang        |   1 -
 htdocs/langs/pt_BR/categories.lang        |   2 +
 htdocs/langs/pt_BR/companies.lang         |   4 +-
 htdocs/langs/pt_BR/datapolicy.lang        |   1 +
 htdocs/langs/pt_BR/errors.lang            |   1 -
 htdocs/langs/pt_BR/exports.lang           |   3 +-
 htdocs/langs/pt_BR/mails.lang             |   5 -
 htdocs/langs/pt_BR/main.lang              |   6 +-
 htdocs/langs/pt_BR/products.lang          |   9 +-
 htdocs/langs/pt_BR/website.lang           |   5 -
 htdocs/langs/pt_MZ/admin.lang             |  15 +-
 htdocs/langs/pt_MZ/blockedlog.lang        |   1 -
 htdocs/langs/pt_MZ/companies.lang         |   5 +-
 htdocs/langs/pt_MZ/errors.lang            |   7 -
 htdocs/langs/pt_MZ/exports.lang           |  69 ++++-
 htdocs/langs/pt_MZ/main.lang              |   5 +-
 htdocs/langs/pt_MZ/website.lang           |   5 -
 htdocs/langs/pt_PT/admin.lang             | 105 +++++--
 htdocs/langs/pt_PT/banks.lang             |   7 +-
 htdocs/langs/pt_PT/blockedlog.lang        |   8 +-
 htdocs/langs/pt_PT/categories.lang        |   9 +-
 htdocs/langs/pt_PT/companies.lang         |  15 +-
 htdocs/langs/pt_PT/compta.lang            |   8 +-
 htdocs/langs/pt_PT/datapolicy.lang        |   9 +-
 htdocs/langs/pt_PT/errors.lang            |  17 +-
 htdocs/langs/pt_PT/exports.lang           |  12 +-
 htdocs/langs/pt_PT/hrm.lang               |  13 +-
 htdocs/langs/pt_PT/mails.lang             |  48 ++--
 htdocs/langs/pt_PT/main.lang              |  49 +++-
 htdocs/langs/pt_PT/members.lang           |  32 ++-
 htdocs/langs/pt_PT/products.lang          |  19 +-
 htdocs/langs/pt_PT/salaries.lang          |   4 +-
 htdocs/langs/pt_PT/website.lang           |  35 ++-
 htdocs/langs/ro_RO/admin.lang             | 105 +++++--
 htdocs/langs/ro_RO/banks.lang             |  19 +-
 htdocs/langs/ro_RO/bills.lang             |   8 +
 htdocs/langs/ro_RO/blockedlog.lang        |  12 +-
 htdocs/langs/ro_RO/categories.lang        |  13 +-
 htdocs/langs/ro_RO/companies.lang         |  20 +-
 htdocs/langs/ro_RO/compta.lang            |   8 +-
 htdocs/langs/ro_RO/datapolicy.lang        |   9 +-
 htdocs/langs/ro_RO/errors.lang            |  17 +-
 htdocs/langs/ro_RO/exports.lang           |  16 +-
 htdocs/langs/ro_RO/hrm.lang               |  10 +-
 htdocs/langs/ro_RO/mails.lang             |  46 ++--
 htdocs/langs/ro_RO/main.lang              |  48 +++-
 htdocs/langs/ro_RO/members.lang           |  34 ++-
 htdocs/langs/ro_RO/products.lang          |  33 ++-
 htdocs/langs/ro_RO/salaries.lang          |   4 +-
 htdocs/langs/ro_RO/website.lang           |  32 ++-
 htdocs/langs/ru_RU/admin.lang             | 105 +++++--
 htdocs/langs/ru_RU/banks.lang             |   7 +-
 htdocs/langs/ru_RU/blockedlog.lang        |   8 +-
 htdocs/langs/ru_RU/categories.lang        |  13 +-
 htdocs/langs/ru_RU/companies.lang         |  18 +-
 htdocs/langs/ru_RU/compta.lang            |   8 +-
 htdocs/langs/ru_RU/datapolicy.lang        |   9 +-
 htdocs/langs/ru_RU/errors.lang            |  17 +-
 htdocs/langs/ru_RU/exports.lang           |  12 +-
 htdocs/langs/ru_RU/hrm.lang               |  13 +-
 htdocs/langs/ru_RU/mails.lang             |  48 ++--
 htdocs/langs/ru_RU/main.lang              |  49 +++-
 htdocs/langs/ru_RU/members.lang           |  32 ++-
 htdocs/langs/ru_RU/products.lang          |  21 +-
 htdocs/langs/ru_RU/propal.lang            |   6 +-
 htdocs/langs/ru_RU/salaries.lang          |   4 +-
 htdocs/langs/ru_RU/website.lang           |  35 ++-
 htdocs/langs/sk_SK/admin.lang             | 105 +++++--
 htdocs/langs/sk_SK/banks.lang             |   7 +-
 htdocs/langs/sk_SK/blockedlog.lang        |   8 +-
 htdocs/langs/sk_SK/categories.lang        |   9 +-
 htdocs/langs/sk_SK/companies.lang         |  17 +-
 htdocs/langs/sk_SK/compta.lang            |   8 +-
 htdocs/langs/sk_SK/datapolicy.lang        |   9 +-
 htdocs/langs/sk_SK/errors.lang            |  17 +-
 htdocs/langs/sk_SK/exports.lang           |  12 +-
 htdocs/langs/sk_SK/hrm.lang               |  13 +-
 htdocs/langs/sk_SK/mails.lang             |  48 ++--
 htdocs/langs/sk_SK/main.lang              |  49 +++-
 htdocs/langs/sk_SK/members.lang           |  32 ++-
 htdocs/langs/sk_SK/products.lang          |  19 +-
 htdocs/langs/sk_SK/salaries.lang          |   4 +-
 htdocs/langs/sk_SK/website.lang           |  35 ++-
 htdocs/langs/sl_SI/admin.lang             | 105 +++++--
 htdocs/langs/sl_SI/banks.lang             |   7 +-
 htdocs/langs/sl_SI/blockedlog.lang        |   8 +-
 htdocs/langs/sl_SI/categories.lang        |   9 +-
 htdocs/langs/sl_SI/companies.lang         |  16 +-
 htdocs/langs/sl_SI/compta.lang            |   8 +-
 htdocs/langs/sl_SI/datapolicy.lang        |   9 +-
 htdocs/langs/sl_SI/errors.lang            |  17 +-
 htdocs/langs/sl_SI/exports.lang           |  12 +-
 htdocs/langs/sl_SI/hrm.lang               |  13 +-
 htdocs/langs/sl_SI/mails.lang             |  48 ++--
 htdocs/langs/sl_SI/main.lang              |  49 +++-
 htdocs/langs/sl_SI/members.lang           |  32 ++-
 htdocs/langs/sl_SI/products.lang          |  19 +-
 htdocs/langs/sl_SI/salaries.lang          |   4 +-
 htdocs/langs/sl_SI/website.lang           |  35 ++-
 htdocs/langs/sq_AL/admin.lang             | 105 +++++--
 htdocs/langs/sq_AL/banks.lang             |   7 +-
 htdocs/langs/sq_AL/blockedlog.lang        |   8 +-
 htdocs/langs/sq_AL/categories.lang        |   9 +-
 htdocs/langs/sq_AL/companies.lang         |  19 +-
 htdocs/langs/sq_AL/compta.lang            |   8 +-
 htdocs/langs/sq_AL/datapolicy.lang        |   9 +-
 htdocs/langs/sq_AL/errors.lang            |  17 +-
 htdocs/langs/sq_AL/exports.lang           |  12 +-
 htdocs/langs/sq_AL/hrm.lang               |  13 +-
 htdocs/langs/sq_AL/mails.lang             |  48 ++--
 htdocs/langs/sq_AL/main.lang              |  56 +++-
 htdocs/langs/sq_AL/members.lang           |  32 ++-
 htdocs/langs/sq_AL/salaries.lang          |   4 +-
 htdocs/langs/sq_AL/website.lang           |  35 ++-
 htdocs/langs/sr_RS/admin.lang             | 115 +++++---
 htdocs/langs/sr_RS/banks.lang             |   7 +-
 htdocs/langs/sr_RS/companies.lang         |  19 +-
 htdocs/langs/sr_RS/exports.lang           |  12 +-
 htdocs/langs/sr_RS/mails.lang             |  54 ++--
 htdocs/langs/sr_RS/main.lang              |  49 +++-
 htdocs/langs/sr_RS/products.lang          |  19 +-
 htdocs/langs/sv_SE/admin.lang             | 105 +++++--
 htdocs/langs/sv_SE/banks.lang             |   7 +-
 htdocs/langs/sv_SE/blockedlog.lang        |   8 +-
 htdocs/langs/sv_SE/categories.lang        |   9 +-
 htdocs/langs/sv_SE/companies.lang         |  18 +-
 htdocs/langs/sv_SE/compta.lang            |   8 +-
 htdocs/langs/sv_SE/datapolicy.lang        |   9 +-
 htdocs/langs/sv_SE/errors.lang            |  17 +-
 htdocs/langs/sv_SE/exports.lang           |   4 +-
 htdocs/langs/sv_SE/hrm.lang               |  13 +-
 htdocs/langs/sv_SE/mails.lang             |  48 ++--
 htdocs/langs/sv_SE/main.lang              |  49 +++-
 htdocs/langs/sv_SE/members.lang           |   9 +-
 htdocs/langs/sv_SE/products.lang          |  17 +-
 htdocs/langs/sv_SE/salaries.lang          |   4 +-
 htdocs/langs/sv_SE/website.lang           |  35 ++-
 htdocs/langs/sw_SW/admin.lang             | 105 +++++--
 htdocs/langs/sw_SW/banks.lang             |   7 +-
 htdocs/langs/sw_SW/blockedlog.lang        |   8 +-
 htdocs/langs/sw_SW/categories.lang        |   9 +-
 htdocs/langs/sw_SW/companies.lang         |  29 +-
 htdocs/langs/sw_SW/compta.lang            |  30 +-
 htdocs/langs/sw_SW/datapolicy.lang        |   9 +-
 htdocs/langs/sw_SW/errors.lang            |  17 +-
 htdocs/langs/sw_SW/exports.lang           |  16 +-
 htdocs/langs/sw_SW/hrm.lang               |  13 +-
 htdocs/langs/sw_SW/mails.lang             |  48 ++--
 htdocs/langs/sw_SW/main.lang              |  60 +++-
 htdocs/langs/sw_SW/members.lang           |  44 +--
 htdocs/langs/sw_SW/website.lang           |  35 ++-
 htdocs/langs/ta_IN/admin.lang             | 105 +++++--
 htdocs/langs/ta_IN/banks.lang             |   7 +-
 htdocs/langs/ta_IN/blockedlog.lang        |   8 +-
 htdocs/langs/ta_IN/categories.lang        |  11 +-
 htdocs/langs/ta_IN/companies.lang         |  19 +-
 htdocs/langs/ta_IN/compta.lang            |   8 +-
 htdocs/langs/ta_IN/errors.lang            |  17 +-
 htdocs/langs/ta_IN/exports.lang           |  12 +-
 htdocs/langs/ta_IN/hrm.lang               |  13 +-
 htdocs/langs/ta_IN/mails.lang             |  50 ++--
 htdocs/langs/ta_IN/main.lang              |  56 +++-
 htdocs/langs/ta_IN/members.lang           |  32 ++-
 htdocs/langs/ta_IN/website.lang           |  35 ++-
 htdocs/langs/tg_TJ/admin.lang             | 105 +++++--
 htdocs/langs/tg_TJ/banks.lang             |   7 +-
 htdocs/langs/tg_TJ/blockedlog.lang        |   8 +-
 htdocs/langs/tg_TJ/categories.lang        |   9 +-
 htdocs/langs/tg_TJ/companies.lang         |  19 +-
 htdocs/langs/tg_TJ/compta.lang            |   8 +-
 htdocs/langs/tg_TJ/datapolicy.lang        |   9 +-
 htdocs/langs/tg_TJ/errors.lang            |  17 +-
 htdocs/langs/tg_TJ/exports.lang           |   6 +-
 htdocs/langs/tg_TJ/hrm.lang               |  13 +-
 htdocs/langs/tg_TJ/mails.lang             |  48 ++--
 htdocs/langs/tg_TJ/main.lang              |  56 +++-
 htdocs/langs/tg_TJ/members.lang           |  32 ++-
 htdocs/langs/tg_TJ/salaries.lang          |   4 +-
 htdocs/langs/tg_TJ/website.lang           |  35 ++-
 htdocs/langs/th_TH/admin.lang             | 149 ++++++----
 htdocs/langs/th_TH/banks.lang             |   7 +-
 htdocs/langs/th_TH/blockedlog.lang        |   8 +-
 htdocs/langs/th_TH/categories.lang        |   9 +-
 htdocs/langs/th_TH/commercial.lang        |  24 +-
 htdocs/langs/th_TH/companies.lang         |  23 +-
 htdocs/langs/th_TH/compta.lang            |  24 +-
 htdocs/langs/th_TH/contracts.lang         |  83 +++---
 htdocs/langs/th_TH/cron.lang              |   2 +-
 htdocs/langs/th_TH/datapolicy.lang        |   9 +-
 htdocs/langs/th_TH/donations.lang         |  17 +-
 htdocs/langs/th_TH/ecm.lang               |   6 +-
 htdocs/langs/th_TH/errors.lang            | 115 ++++----
 htdocs/langs/th_TH/exports.lang           |  18 +-
 htdocs/langs/th_TH/holiday.lang           |  17 +-
 htdocs/langs/th_TH/hrm.lang               |  13 +-
 htdocs/langs/th_TH/install.lang           |  31 ++-
 htdocs/langs/th_TH/interventions.lang     |  16 +-
 htdocs/langs/th_TH/ldap.lang              |  24 +-
 htdocs/langs/th_TH/mails.lang             |  60 ++--
 htdocs/langs/th_TH/main.lang              |  95 +++++--
 htdocs/langs/th_TH/members.lang           |  36 +--
 htdocs/langs/th_TH/other.lang             |  26 +-
 htdocs/langs/th_TH/paypal.lang            |  55 ++--
 htdocs/langs/th_TH/printing.lang          |  42 +--
 htdocs/langs/th_TH/products.lang          |  27 +-
 htdocs/langs/th_TH/projects.lang          |  15 +-
 htdocs/langs/th_TH/propal.lang            |   6 +-
 htdocs/langs/th_TH/salaries.lang          |   4 +-
 htdocs/langs/th_TH/sendings.lang          |  13 +-
 htdocs/langs/th_TH/stocks.lang            |  33 ++-
 htdocs/langs/th_TH/stripe.lang            |   6 +-
 htdocs/langs/th_TH/website.lang           |  35 ++-
 htdocs/langs/th_TH/withdrawals.lang       |  10 +-
 htdocs/langs/tr_TR/accountancy.lang       |  32 ++-
 htdocs/langs/tr_TR/admin.lang             | 169 ++++++++----
 htdocs/langs/tr_TR/agenda.lang            |   1 +
 htdocs/langs/tr_TR/banks.lang             |   9 +-
 htdocs/langs/tr_TR/bills.lang             |  36 ++-
 htdocs/langs/tr_TR/blockedlog.lang        |   8 +-
 htdocs/langs/tr_TR/boxes.lang             |  28 +-
 htdocs/langs/tr_TR/cashdesk.lang          |   2 +-
 htdocs/langs/tr_TR/categories.lang        |   9 +-
 htdocs/langs/tr_TR/commercial.lang        |  30 +-
 htdocs/langs/tr_TR/companies.lang         |  22 +-
 htdocs/langs/tr_TR/compta.lang            |   8 +-
 htdocs/langs/tr_TR/contracts.lang         |   8 +
 htdocs/langs/tr_TR/datapolicy.lang        |   9 +-
 htdocs/langs/tr_TR/deliveries.lang        |   3 +-
 htdocs/langs/tr_TR/ecm.lang               |  14 +-
 htdocs/langs/tr_TR/errors.lang            |  17 +-
 htdocs/langs/tr_TR/eventorganization.lang |   6 +-
 htdocs/langs/tr_TR/exports.lang           |   6 +-
 htdocs/langs/tr_TR/holiday.lang           |   8 +-
 htdocs/langs/tr_TR/hrm.lang               |  13 +-
 htdocs/langs/tr_TR/install.lang           |   1 +
 htdocs/langs/tr_TR/interventions.lang     |  17 +-
 htdocs/langs/tr_TR/intracommreport.lang   |   4 +-
 htdocs/langs/tr_TR/languages.lang         |   4 +
 htdocs/langs/tr_TR/mails.lang             |  48 ++--
 htdocs/langs/tr_TR/main.lang              |  59 +++-
 htdocs/langs/tr_TR/members.lang           |   7 +-
 htdocs/langs/tr_TR/products.lang          |  15 +-
 htdocs/langs/tr_TR/salaries.lang          |   4 +-
 htdocs/langs/tr_TR/website.lang           |  30 +-
 htdocs/langs/uk_UA/admin.lang             | 105 +++++--
 htdocs/langs/uk_UA/banks.lang             |   7 +-
 htdocs/langs/uk_UA/blockedlog.lang        |   8 +-
 htdocs/langs/uk_UA/categories.lang        |   9 +-
 htdocs/langs/uk_UA/companies.lang         |  19 +-
 htdocs/langs/uk_UA/compta.lang            |   8 +-
 htdocs/langs/uk_UA/datapolicy.lang        |   9 +-
 htdocs/langs/uk_UA/errors.lang            |  17 +-
 htdocs/langs/uk_UA/exports.lang           |  12 +-
 htdocs/langs/uk_UA/hrm.lang               |  13 +-
 htdocs/langs/uk_UA/mails.lang             |  48 ++--
 htdocs/langs/uk_UA/main.lang              |  49 +++-
 htdocs/langs/uk_UA/members.lang           |  32 ++-
 htdocs/langs/uk_UA/salaries.lang          |   4 +-
 htdocs/langs/uk_UA/website.lang           |  35 ++-
 htdocs/langs/ur_PK/admin.lang             | 105 +++++--
 htdocs/langs/ur_PK/banks.lang             |   7 +-
 htdocs/langs/ur_PK/blockedlog.lang        |   8 +-
 htdocs/langs/ur_PK/categories.lang        |  21 +-
 htdocs/langs/ur_PK/companies.lang         |  19 +-
 htdocs/langs/ur_PK/compta.lang            |   8 +-
 htdocs/langs/ur_PK/datapolicy.lang        |   9 +-
 htdocs/langs/ur_PK/errors.lang            |  17 +-
 htdocs/langs/ur_PK/exports.lang           |  12 +-
 htdocs/langs/ur_PK/hrm.lang               |  13 +-
 htdocs/langs/ur_PK/mails.lang             |  48 ++--
 htdocs/langs/ur_PK/main.lang              |  56 +++-
 htdocs/langs/ur_PK/members.lang           |  32 ++-
 htdocs/langs/ur_PK/salaries.lang          |   4 +-
 htdocs/langs/ur_PK/website.lang           |  35 ++-
 htdocs/langs/uz_UZ/admin.lang             | 105 +++++--
 htdocs/langs/uz_UZ/banks.lang             |   9 +-
 htdocs/langs/uz_UZ/blockedlog.lang        |   8 +-
 htdocs/langs/uz_UZ/categories.lang        |   9 +-
 htdocs/langs/uz_UZ/companies.lang         |  19 +-
 htdocs/langs/uz_UZ/compta.lang            |   8 +-
 htdocs/langs/uz_UZ/datapolicy.lang        |   9 +-
 htdocs/langs/uz_UZ/errors.lang            |  17 +-
 htdocs/langs/uz_UZ/exports.lang           |   6 +-
 htdocs/langs/uz_UZ/hrm.lang               |  13 +-
 htdocs/langs/uz_UZ/mails.lang             |  48 ++--
 htdocs/langs/uz_UZ/main.lang              |  56 +++-
 htdocs/langs/uz_UZ/members.lang           |  32 ++-
 htdocs/langs/uz_UZ/salaries.lang          |   4 +-
 htdocs/langs/uz_UZ/website.lang           |  35 ++-
 htdocs/langs/vi_VN/admin.lang             | 105 +++++--
 htdocs/langs/vi_VN/banks.lang             |   7 +-
 htdocs/langs/vi_VN/blockedlog.lang        |   8 +-
 htdocs/langs/vi_VN/categories.lang        |  11 +-
 htdocs/langs/vi_VN/companies.lang         |  10 +-
 htdocs/langs/vi_VN/compta.lang            |   8 +-
 htdocs/langs/vi_VN/datapolicy.lang        |   9 +-
 htdocs/langs/vi_VN/errors.lang            |  17 +-
 htdocs/langs/vi_VN/exports.lang           |  12 +-
 htdocs/langs/vi_VN/hrm.lang               |  13 +-
 htdocs/langs/vi_VN/mails.lang             |  48 ++--
 htdocs/langs/vi_VN/main.lang              |  49 +++-
 htdocs/langs/vi_VN/members.lang           |  32 ++-
 htdocs/langs/vi_VN/products.lang          |  19 +-
 htdocs/langs/vi_VN/salaries.lang          |   4 +-
 htdocs/langs/vi_VN/website.lang           |  35 ++-
 htdocs/langs/zh_CN/admin.lang             | 107 ++++++--
 htdocs/langs/zh_CN/banks.lang             |   9 +-
 htdocs/langs/zh_CN/blockedlog.lang        |   8 +-
 htdocs/langs/zh_CN/categories.lang        |   9 +-
 htdocs/langs/zh_CN/companies.lang         |  22 +-
 htdocs/langs/zh_CN/compta.lang            |   8 +-
 htdocs/langs/zh_CN/datapolicy.lang        |   9 +-
 htdocs/langs/zh_CN/errors.lang            |  19 +-
 htdocs/langs/zh_CN/exports.lang           |  12 +-
 htdocs/langs/zh_CN/hrm.lang               |  61 ++--
 htdocs/langs/zh_CN/install.lang           |   9 +-
 htdocs/langs/zh_CN/ldap.lang              |   6 +-
 htdocs/langs/zh_CN/mails.lang             |  48 ++--
 htdocs/langs/zh_CN/main.lang              |  49 +++-
 htdocs/langs/zh_CN/members.lang           |  32 ++-
 htdocs/langs/zh_CN/other.lang             |  10 +-
 htdocs/langs/zh_CN/products.lang          |  19 +-
 htdocs/langs/zh_CN/users.lang             |  32 ++-
 htdocs/langs/zh_CN/website.lang           |  39 ++-
 htdocs/langs/zh_HK/admin.lang             | 117 +++++---
 htdocs/langs/zh_HK/banks.lang             |   7 +-
 htdocs/langs/zh_HK/blockedlog.lang        |   8 +-
 htdocs/langs/zh_HK/categories.lang        |   9 +-
 htdocs/langs/zh_HK/companies.lang         |  18 +-
 htdocs/langs/zh_HK/compta.lang            |   8 +-
 htdocs/langs/zh_HK/datapolicy.lang        |   9 +-
 htdocs/langs/zh_HK/errors.lang            |  17 +-
 htdocs/langs/zh_HK/exports.lang           |   4 +-
 htdocs/langs/zh_HK/hrm.lang               |  10 +-
 htdocs/langs/zh_HK/mails.lang             |  48 ++--
 htdocs/langs/zh_HK/main.lang              |  48 +++-
 htdocs/langs/zh_HK/members.lang           |   7 +-
 htdocs/langs/zh_HK/products.lang          |  15 +-
 htdocs/langs/zh_HK/salaries.lang          |   4 +-
 htdocs/langs/zh_HK/website.lang           |  32 ++-
 htdocs/langs/zh_TW/admin.lang             | 105 +++++--
 htdocs/langs/zh_TW/banks.lang             |   7 +-
 htdocs/langs/zh_TW/blockedlog.lang        |   8 +-
 htdocs/langs/zh_TW/categories.lang        |   9 +-
 htdocs/langs/zh_TW/companies.lang         |  16 +-
 htdocs/langs/zh_TW/compta.lang            |   8 +-
 htdocs/langs/zh_TW/datapolicy.lang        |   9 +-
 htdocs/langs/zh_TW/errors.lang            |  17 +-
 htdocs/langs/zh_TW/exports.lang           |  12 +-
 htdocs/langs/zh_TW/hrm.lang               |  13 +-
 htdocs/langs/zh_TW/mails.lang             |  52 ++--
 htdocs/langs/zh_TW/main.lang              |  49 +++-
 htdocs/langs/zh_TW/members.lang           |  32 ++-
 htdocs/langs/zh_TW/products.lang          |  19 +-
 htdocs/langs/zh_TW/salaries.lang          |   4 +-
 htdocs/langs/zh_TW/users.lang             |  24 +-
 htdocs/langs/zh_TW/website.lang           |  35 ++-
 998 files changed, 17832 insertions(+), 7773 deletions(-)
 delete mode 100644 htdocs/langs/en_GB/exports.lang
 create mode 100644 htdocs/langs/en_IE/admin.lang
 create mode 100644 htdocs/langs/en_IE/main.lang
 create mode 100644 htdocs/langs/en_IE/products.lang
 create mode 100644 htdocs/langs/es_AR/exports.lang
 create mode 100644 htdocs/langs/fr_CA/eventorganization.lang

diff --git a/htdocs/langs/am_ET/admin.lang b/htdocs/langs/am_ET/admin.lang
index f49c024852d..e65ffc348fa 100644
--- a/htdocs/langs/am_ET/admin.lang
+++ b/htdocs/langs/am_ET/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=የፋይሎች ትክክለኛነት ፍተ
 FileIntegritySomeFilesWereRemovedOrModified=የፋይሎች ትክክለኛነት ማረጋገጥ አልተሳካም። አንዳንድ ፋይሎች ተስተካክለዋል፣ ተወግደዋል ወይም ታክለዋል።
 GlobalChecksum=ዓለም አቀፍ ቼክ
 MakeIntegrityAnalysisFrom=የመተግበሪያ ፋይሎችን ታማኝነት ትንተና ያድርጉ
-LocalSignature=የተከተተ የአካባቢ ፊርማ (አስተማማኝ ያነሰ)
-RemoteSignature=የርቀት ፊርማ (ይበልጥ አስተማማኝ)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=የጎደሉ ፋይሎች
 FilesUpdated=የተሻሻሉ ፋይሎች
 FilesModified=የተሻሻሉ ፋይሎች
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=በአንዳንድ አጀንዳዎች ምርጫ ብቻ 
 Security=ደህንነት
 Passwords=የይለፍ ቃሎች
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=በ conf.php ውስጥ የተከማቸ የውሂብ ጎታ ይለፍ ቃል ያመስጥር። ይህንን አማራጭ ለማንቃት በጥብቅ ይመከራል.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=የተፈጠሩ ፒዲኤፍ ፋይሎችን ይጠብቁ። የጅምላ ፒዲኤፍ መፈጠርን ስለሚሰብር ይህ አይመከርም።
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=የተሰላ መስክ
-ComputedFormulaDesc=ተለዋዋጭ የተሰላ እሴት ለማግኘት ሌሎች የነገሮችን ወይም ማንኛውንም ፒኤችፒ ኮድ በመጠቀም ቀመር ማስገባት ይችላሉ። "?" ን ጨምሮ ማንኛውንም ፒኤችፒ ተስማሚ ቀመሮችን መጠቀም ትችላለህ። ሁኔታ ኦፕሬተር፣ እና የሚከተለው አለምአቀፍ ነገር፡- <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>ማስጠንቀቂያ</strong>ንብረቶቹን ከፈለጉ አልተጫነም ፣ ልክ እንደ ሁለተኛው ምሳሌ እራስዎ ነገሩን ወደ ቀመርዎ ያቅርቡ።<br>የተሰላ መስክ መጠቀም ማለት ምንም አይነት ዋጋ ከበይነገጽ ማስገባት አይችሉም ማለት ነው። እንዲሁም የአገባብ ስህተት ካለ ቀመሩ ምንም ነገር ሊመልስ አይችልም።<br><br>የቀመር ምሳሌ፡<br>$objectoffield-> id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield-> id + 2 * $user->መታወቂያ) * ( int) substr($mysoc->zip, 1, 2)<br><br>ነገርን እንደገና ለመጫን<br>(($reloadedobj = አዲስ ሶሺየት($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0? $reloadedobj->array_options['options_extrafield key'] * $reloadedobj- > ዋና / 5: '-1')<br><br>የነገሮችን እና የወላጅ ቁስን ለመጫን የሚያስገድድ ሌላ የቀመር ምሳሌ፡- <br>(($reloadedobj = አዲስ ተግባር($db)) && ($reloadedobj->fetchNoCompute($objectoffield-> id) > 0) && ($secondloadedobj = አዲስ ፕሮጀክት( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0))? $secondloadedobj->ref: 'የወላጅ ፕሮጀክት አልተገኘም'
+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'
 Computedpersistent=የተሰላ መስክ ያከማቹ
 ComputedpersistentDesc=የተሰሉ ተጨማሪ መስኮች በመረጃ ቋቱ ውስጥ ይቀመጣሉ፣ ነገር ግን እሴቱ የሚሰላው የዚህ መስክ ነገር ሲቀየር ብቻ ነው። የተሰላው መስክ በሌሎች ነገሮች ወይም በአለምአቀፍ መረጃ ላይ የሚመረኮዝ ከሆነ ይህ ዋጋ የተሳሳተ ሊሆን ይችላል!!
 ExtrafieldParamHelpPassword=ይህንን መስክ ባዶ መተው ማለት ይህ ዋጋ ያለ ማመስጠር ይከማቻል ማለት ነው (መስክ በስክሪኑ ላይ በኮከቦች ተደብቋል)።<br><br>አስገባ እሴት 'ዶልክሪፕት' እሴትን በሚቀለበስ ምስጠራ ስልተቀመር ለመመስረት። አጽዳ ውሂብ አሁንም ሊታወቅ እና ሊስተካከል ይችላል ነገር ግን ወደ የውሂብ ጎታ የተመሰጠረ ነው።<br><br>'auto' (ወይም 'md5') አስገባ፣ 'sha256'፣ 'password_hash'፣ ...) የማይቀለበስ የሃሽ ይለፍ ቃል ወደ ዳታቤዝ ለማስቀመጥ ነባሪውን የይለፍ ቃል ምስጠራ አልጎሪዝም ለመጠቀም (ወይም md5፣ sha256፣ password_hash...) ለመጠቀም (የመጀመሪያውን እሴት ለማውጣት ምንም መንገድ የለም)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- የእራስዎን የኢሜል አገልግሎት አቅራቢ SMTP አገልጋይ ኢሜይሎችን ለመላክ እንዲሁ አስደሳች ነው ስለዚህ ከመተግበሪያው የተላኩ ኢሜይሎች በሙሉ ወደ የመልእክት ሳጥንዎ "የተላኩ" ማውጫ ውስጥ ይቀመጣሉ።
 WarningPHPMailD=ስለዚህ የኢሜል መላኪያ ዘዴን ወደ "SMTP" እሴት ለመቀየር ይመከራል.
 WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
-WarningPHPMail2=የኢሜል SMTP አቅራቢዎ የኢሜል ደንበኛን ለአንዳንድ የአይፒ አድራሻዎች መገደብ ካለበት (በጣም አልፎ አልፎ) ይህ የመልእክት ተጠቃሚ ወኪሉ (MUA) ለኢአርፒ CRM መተግበሪያዎ የአይፒ አድራሻ ነው፡ <strong>%s</strong>።
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=የሂሳብ አያያዝ (ቀላል)
 Module10Desc=በመረጃ ቋት ይዘት ላይ በመመስረት ቀላል የሂሳብ ዘገባዎች (መጽሔቶች ፣ ማዞሪያ)። ምንም የሂሳብ ደብተር አይጠቀምም.
 Module20Name=ፕሮፖዛል
 Module20Desc=የንግድ ፕሮፖዛል አስተዳደር
-Module22Name=የጅምላ ኢሜይሎች
-Module22Desc=የጅምላ ኢሜል መላክን ያስተዳድሩ
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=ጉልበት
 Module23Desc=የኃይል ፍጆታን መከታተል
 Module25Name=የሽያጭ ትዕዛዞች
@@ -847,10 +848,10 @@ Permission212=የትእዛዝ መስመሮች
 Permission213=መስመር አግብር
 Permission214=ስልክ ያዋቅሩ
 Permission215=አቅራቢዎችን ያዋቅሩ
-Permission221=ኢሜይሎችን ያንብቡ
-Permission222=ኢሜይሎችን ይፍጠሩ/ያሻሽሉ (ርዕስ፣ ተቀባዮች...)
-Permission223=ኢሜይሎችን አረጋግጥ (መላክን ይፈቅዳል)
-Permission229=ኢሜይሎችን ሰርዝ
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=ተቀባዮችን እና መረጃን ይመልከቱ
 Permission238=ደብዳቤዎችን በእጅ ይላኩ።
 Permission239=ከተረጋገጠ ወይም ከተላኩ በኋላ መልእክቶችን ሰርዝ
@@ -1105,6 +1106,7 @@ DictionaryStaff=የሰራተኞች ብዛት
 DictionaryAvailability=የማድረስ መዘግየት
 DictionaryOrderMethods=የትዕዛዝ ዘዴዎች
 DictionarySource=የውሳኔ ሃሳቦች / ትዕዛዞች አመጣጥ
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=ለሪፖርቶች ግላዊ ቡድኖች
 DictionaryAccountancysystem=የመለያዎች ሰንጠረዥ ሞዴሎች
 DictionaryAccountancyJournal=የሂሳብ መጽሔቶች
@@ -1134,11 +1136,11 @@ BackToDictionaryList=ወደ መዝገበ ቃላት ዝርዝር ተመለስ
 TypeOfRevenueStamp=የግብር ማህተም አይነት
 VATManagement=የሽያጭ ታክስ አስተዳደር
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=በነባሪነት የታቀደው የሽያጭ ታክስ 0 ነው ይህም እንደ ማህበራት፣ ግለሰቦች ወይም ትናንሽ ኩባንያዎች ላሉ ጉዳዮች ሊያገለግል ይችላል።
 VATIsUsedExampleFR=በፈረንሳይ ማለት እውነተኛ የፊስካል ሥርዓት ያላቸው ኩባንያዎች ወይም ድርጅቶች ማለት ነው (ቀላል እውነተኛ ወይም መደበኛ እውነተኛ)። ተ.እ.ታ የታወጀበት ሥርዓት።
 VATIsNotUsedExampleFR=በፈረንሣይ ውስጥ፣ የሽያጭ ታክስ ያልታወቁ ማኅበራት ወይም ኩባንያዎች፣ ድርጅቶች ወይም ሊበራል ሙያዎች ማይክሮ ኢንተርፕራይዝ የፊስካል ሥርዓትን (የሽያጭ ታክስ በፍራንቻይዝ) የመረጡ እና ያለ ምንም የሽያጭ ታክስ መግለጫ የፍራንቻይዝ የሽያጭ ታክስ የከፈሉ ማኅበራት ማለት ነው። ይህ ምርጫ "ተገቢ ያልሆነ የሽያጭ ታክስ - art-293B of CGI" የሚለውን ማጣቀሻ በደረሰኞች ላይ ያሳያል።
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=የሽያጭ ታክስ ዓይነት
 LTRate=ደረጃ ይስጡ
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=በግብር አወቃቀሩ መሰረት (%s ይመ
 LabelUsedByDefault=ለኮድ ምንም ትርጉም ካልተገኘ በነባሪነት ጥቅም ላይ የዋለ መለያ
 LabelOnDocuments=በሰነዶች ላይ መለያ
 LabelOrTranslationKey=መለያ ወይም የትርጉም ቁልፍ
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=የደንበኛ/ሻጭ ተእታ ቁጥር ወደ ጥምር ዝር
 AddAdressInList=የደንበኛ/የአቅራቢውን አድራሻ ወደ ጥምር ዝርዝሮች አሳይ።<br>ሦስተኛ ወገኖች በ« «The Big Company corp. - 21 jump street 123456 Big Town - USA» የሚል የስም ፎርማት ይዘው ብቅ ይላሉ። ቢግ ኩባንያ ኮርፖሬሽን".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=ለሶስተኛ ወገኖች ተመራጭ የማጓጓዣ ዘዴን ይጠይቁ።
-FieldEdition=የመስክ እትም %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=ምሳሌ፡ +2 (የጊዜ ሰቅ ማካካሻ ችግሮች ካጋጠሙ ብቻ ይሙሉ)
 GetBarCode=የአሞሌ ኮድ ያግኙ
 NumberingModules=የቁጥር ሞዴሎች
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=የክፍያ መጠየቂያ ቀንን እስከ ማረጋገ
 SuggestedPaymentModesIfNotDefinedInInvoice=በክፍያ መጠየቂያ መጠየቂያ መጠየቂያ መጠየቂያ መጠየቂያ ደረሰኝ ላይ በነባሪነት ካልተገለጸ የክፍያ ሁኔታ
 SuggestPaymentByRIBOnAccount=በመለያው ላይ በማውጣት ክፍያን ይጠቁሙ
 SuggestPaymentByChequeToAddress=ክፍያ በቼክ ይጠቁሙ ወደ
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=በክፍያ መጠየቂያዎች ላይ ነፃ ጽሑፍ
 WatermarkOnDraftInvoices=በረቂቅ ደረሰኞች ላይ ያለው የውሃ ምልክት (ባዶ ከሆነ ምንም)
 PaymentsNumberingModule=የክፍያዎች ቁጥር አሰጣጥ ሞዴል
@@ -1718,6 +1723,7 @@ CompressionOfResources=የኤችቲቲፒ ምላሾች መጨናነቅ
 CompressionOfResourcesDesc=ለምሳሌ የ Apache መመሪያን በመጠቀም "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=አሁን ባለው አሳሾች እንዲህ ዓይነቱን ራስ-ሰር ማግኘት አይቻልም
 DefaultValuesDesc=አዲስ መዝገብ ሲፈጥሩ ለመጠቀም የሚፈልጉትን ነባሪ እሴት፣ እና/ወይም ነባሪ ማጣሪያዎችን ወይም መዝገቦችን ሲዘረዝሩ የመደርደር ቅደም ተከተል እዚህ ሊገልጹ ይችላሉ።
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=ነባሪ እሴቶች (በቅጾች ላይ ለመጠቀም)
 DefaultSearchFilters=ነባሪ የፍለጋ ማጣሪያዎች
 DefaultSortOrder=ነባሪ የመደርደር ትዕዛዞች
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=የቁጥር ሞጁሎችን በመላክ ላይ
 SendingsAbility=ለደንበኛ ማቅረቢያዎች የመላኪያ ወረቀቶችን ይደግፉ
 NoNeedForDeliveryReceipts=በአብዛኛዎቹ ሁኔታዎች የማጓጓዣ ሉሆች ለደንበኞች ማቅረቢያ (የሚላኩ ምርቶች ዝርዝር) እና በደንበኛ ለተቀበሉ እና ለተፈረሙ ሉሆች ያገለግላሉ። ስለዚህ የምርት ማቅረቢያ ደረሰኝ የተባዛ ባህሪ ነው እና ብዙም አይነቃም።
 FreeLegalTextOnShippings=በመላክ ላይ ነፃ ጽሑፍ
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=የምርት ማቅረቢያ ደረሰኝ ቁጥር መስጫ ሞጁል
 DeliveryOrderModel=ምርቶች ማቅረቢያ ደረሰኝ ሞዴል
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=በመላኪያ ደረሰኞች ላይ ነፃ 
 ##### FCKeditor #####
 AdvancedEditor=የላቀ አርታዒ
 ActivateFCKeditor=የላቀ አርታዒን ያግብሩ ለ፡-
-FCKeditorForNotePublic=WYSIWYG የመስክ መፍጠር/እትም “የሕዝብ ማስታወሻዎች” ንጥረ ነገሮች
-FCKeditorForNotePrivate=WYSIWYG የመስክ መፍጠር/እትም “የግል ማስታወሻዎች” ንጥረ ነገሮች
-FCKeditorForCompany=WYSIWYG የንጥረ ነገሮች መስክ መግለጫ መፍጠር/እትም (ከምርቶች/አገልግሎቶች በስተቀር)
-FCKeditorForProductDetails=WYSIWYG የምርት መግለጫ ወይም የነገሮች መስመሮች መፍጠር/እትም (የፕሮፖዛል መስመሮች፣ ትዕዛዞች፣ ደረሰኞች፣ ወዘተ...)።
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=ማስጠንቀቂያ፡ ይህንን አማራጭ ለዚህ ጉዳይ መጠቀም የፒዲኤፍ ፋይሎችን በሚገነቡበት ጊዜ በልዩ ቁምፊዎች እና በገጽ ቅርጸት ላይ ችግር ሊፈጥር ስለሚችል በቁም ነገር አይመከርም።
-FCKeditorForMailing= WYSIWYG ለጅምላ ኢሜይሎች መፍጠር/እትም (መሳሪያዎች->ኢሜይል መላኪያ)
-FCKeditorForUserSignature=WYSIWYG የተጠቃሚ ፊርማ መፍጠር/ እትም።
-FCKeditorForMail=ለሁሉም ደብዳቤዎች WYSIWYG መፍጠር/እትም (ከመሳሪያዎች->ኢሜል መላኪያ በስተቀር)
-FCKeditorForTicket=WYSIWYG መፍጠር/ትኬት ለቲኬቶች
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=የአክሲዮን ሞጁል ማዋቀር
 IfYouUsePointOfSaleCheckModule=በነባሪ የቀረበውን የሽያጭ ነጥብ ሞጁል (POS) ከተጠቀሙ ወይም ውጫዊ ሞጁል፣ ይህ ማዋቀር በእርስዎ POS ሞጁል ችላ ሊባል ይችላል። አብዛኛዎቹ የPOS ሞጁሎች በነባሪነት የተቀየሱት ደረሰኝ ወዲያው እንዲፈጥሩ እና እዚህ ያሉት አማራጮች ምንም ቢሆኑም ክምችት እንዲቀንስ ነው። ስለዚህ ከPOSዎ ሽያጭ ሲመዘገቡ የአክሲዮን ቅነሳ ከፈለጉ ወይም ካልፈለጉ፣ የPOS ሞጁሉን ማዋቀርም ያረጋግጡ።
@@ -1867,7 +1874,6 @@ Buy=ግዛ
 Sell=መሸጥ
 InvoiceDateUsed=ጥቅም ላይ የዋለው የክፍያ መጠየቂያ ቀን
 YourCompanyDoesNotUseVAT=ኩባንያዎ ተ.እ.ታን (ቤት - ማዋቀር - ኩባንያ/ድርጅት) እንደማይጠቀም ተገልጿል፣ ስለዚህ ለማዋቀር ምንም የተእታ አማራጮች የሉም።
-AccountancyCode=የሂሳብ ኮድ
 AccountancyCodeSell=የሽያጭ መለያ። ኮድ
 AccountancyCodeBuy=መለያ ይግዙ። ኮድ
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=አዲስ ግብር በሚፈጥሩበት ጊዜ "ክፍያውን በራስ-ሰር ፍጠር" የሚለውን አመልካች ሳጥኑ በነባሪነት ባዶ ያድርጉት
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = ምናሌ አጀንዳን በሚመርጡበት ጊዜ በ
 AGENDA_EVENT_PAST_COLOR = ያለፈው ክስተት ቀለም
 AGENDA_EVENT_CURRENT_COLOR = የአሁኑ ክስተት ቀለም
 AGENDA_EVENT_FUTURE_COLOR = የወደፊት ክስተት ቀለም
-AGENDA_REMINDER_BROWSER = የክስተቱን አስታዋሽ አንቃ <b>በተጠቃሚ አሳሽ</b> (የማስታወስ ቀን ሲደርስ ብቅ ባይ በአሳሹ ይታያል። እያንዳንዱ ተጠቃሚ ይችላል። ከአሳሹ ማሳወቂያ ማዋቀሩ ውስጥ እንደዚህ ያሉ ማሳወቂያዎችን ያሰናክሉ)።
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = የድምጽ ማሳወቂያን አንቃ
-AGENDA_REMINDER_EMAIL = የክስተት አስታዋሽ አንቃ <b>በኢሜል</b> (አስታውስ አማራጭ/መዘግየት በእያንዳንዱ ክስተት ሊገለጽ ይችላል)።
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = ማሳሰቢያ፡ አስታዋሹ በትክክለኛው ጊዜ መላኩን ለማረጋገጥ የታቀደው ስራ ድግግሞሽ %s በቂ መሆን አለበት።
 AGENDA_SHOW_LINKED_OBJECT = የተገናኘውን ነገር ወደ አጀንዳ እይታ አሳይ
 AGENDA_USE_EVENT_TYPE = የክስተቶች አይነቶችን ተጠቀም (በምናሌ ማዋቀር -> መዝገበ-ቃላት -> የአጀንዳ ክስተቶች አይነት)
 AGENDA_USE_EVENT_TYPE_DEFAULT = የክስተት ፍጠር ቅጽ ላይ ለክስተቱ አይነት ይህን ነባሪ እሴት በራስ ሰር ያዋቅሩት
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = ወደ ውጪ መላክ አገናኝን የመፍቀድ ቁልፍ
 PastDelayVCalExport=ያለፈውን ክስተት ወደ ውጭ አትላክ
 SecurityKey = የሚስጥራዊ ቁልፍ
@@ -2006,7 +2017,7 @@ BackupZipWizard=የሰነዶች መዝገብ ቤት ለመገንባት ጠንቋ
 SomethingMakeInstallFromWebNotPossible=በሚከተሉት ምክንያቶች የውጭ ሞጁል መጫን ከድር በይነገጽ የማይቻል ነው.
 SomethingMakeInstallFromWebNotPossible2=በዚህ ምክንያት፣ እዚህ ላይ የተገለጸው የማሻሻል ሂደት አንድ ልዩ ተጠቃሚ ሊያደርገው የሚችለው በእጅ የሚሰራ ሂደት ነው።
 InstallModuleFromWebHasBeenDisabledContactUs=የውጫዊ ሞጁሎችን ወይም ተለዋዋጭ ድር ጣቢያዎችን መጫን ወይም ማልማት፣ ከመተግበሪያው፣ በአሁኑ ጊዜ ለደህንነት ዓላማ ተቆልፏል። ይህንን ባህሪ ማንቃት ከፈለጉ እባክዎ ያነጋግሩን።
-InstallModuleFromWebHasBeenDisabledByFile=የውጫዊ ሞጁል ከመተግበሪያው መጫን በአስተዳዳሪዎ ተሰናክሏል። ይህንን እንዲፈቅድ <strong>%s</strong> ፋይሉን እንዲያስወግድ መጠየቅ አለብህ። ባህሪ.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=የመዳፊት እንቅስቃሴ ሲያልፍ የጠረጴዛ መስመሮችን ያድምቁ
 HighlightLinesColor=አይጤው ሲያልፍ የመስመሩን ቀለም ያድምቁ (ያለ ድምቀት 'ffffff' ይጠቀሙ)
@@ -2036,6 +2047,7 @@ Enter0or1=0 ወይም 1 ያስገቡ
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=እዚህ በቅንፍ መካከል ያስገቡ፣ የምንዛሬ ምልክቱን የሚወክል ባይት ቁጥር ዝርዝር። ለምሳሌ፡ ለ$፣ አስገባ [36] - ለብራዚል እውነተኛ R$ [82,36] - ለ€፣ አስገባ [8364]
 ColorFormat=የ RGB ቀለም በHEX ቅርጸት ነው፣ ለምሳሌ፡ FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=የአዶ ስም በቅርጸት፡<br>- image.png ለምስል ፋይል አሁን ባለው የገጽታ ማውጫ ውስጥ<br>- image.png@module ፋይል ወደ ሞጁሉ ማውጫ /img/ ከሆነ<br>- fa-xxx ለ FontAwesome fa-xxx picto<br>- - fontawesome_xxx_fa_color_size ለFontAwesome fa-xxx picto (ከቅድመ ቅጥያ፣ ቀለም እና መጠን ስብስብ ጋር)
 PositionIntoComboList=ወደ ጥምር ዝርዝሮች ውስጥ የመስመር አቀማመጥ
 SellTaxRate=የሽያጭ ታክስ መጠን
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=በላኪ አድራሻ ፍሬም ላይ ድንበሮችን ደብቅ
 MAIN_PDF_NO_RECIPENT_FRAME=በተቀባይ አድራሻ ፍሬም ላይ ድንበሮችን ደብቅ
 MAIN_PDF_HIDE_CUSTOMER_CODE=የደንበኛ ኮድ ደብቅ
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=የላኪ/የኩባንያውን ስም በአድራሻ ብሎክ ደብቅ
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=የክፍያ ሁኔታዎችን ደብቅ
 PROPOSAL_PDF_HIDE_PAYMENTMODE=የክፍያ ሁነታን ደብቅ
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=አይመከርም
 ARestrictedPath=አንዳንድ የተገደበ የውሂብ ፋይሎች ዱካ
 CheckForModuleUpdate=የውጪ ሞጁሎች ዝማኔዎችን ያረጋግጡ
 CheckForModuleUpdateHelp=ይህ እርምጃ አዲስ ስሪት መኖሩን ለማረጋገጥ ከውጫዊ ሞጁሎች አርታዒዎች ጋር ይገናኛል።
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=ማሻሻያ አለ።
 NoExternalModuleWithUpdate=ለውጫዊ ሞጁሎች ምንም ዝማኔዎች አልተገኙም።
 SwaggerDescriptionFile=የSwagger API መግለጫ ፋይል (ለምሳሌ ከ redoc ጋር ለመጠቀም)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=የመላኪያ አድራሻ አሳይ
 INVOICE_SHOW_SHIPPING_ADDRESSMore=በአንዳንድ አገሮች ውስጥ አስገዳጅ ምልክት (ፈረንሳይ, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=የማህበራዊ አውታረ መረብ ዩአርኤል አገናኝ። የማህበራዊ አውታረ መረብ መታወቂያ ለያዘው ተለዋዋጭ ክፍል {socialid}ን ይጠቀሙ።
 IfThisCategoryIsChildOfAnother=ይህ ምድብ የሌላ ሰው ልጅ ከሆነ
 DarkThemeMode=የጨለማ ገጽታ ሁነታ
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=ማስጠንቀቂያ፡ ሞጁ
 WarningModuleHasChangedSecurityCsrfParameter=ማስጠንቀቂያ፡ ሞጁሉ %s የአብነትዎን የCSRF ደህንነት አሰናክሏል። ይህ እርምጃ ተጠርጣሪ ነው እና የእርስዎ ጭነት ከአሁን በኋላ ደህንነቱ ላይጠበቅ ይችላል። እባክዎን ማብራሪያ ለማግኘት የሞጁሉን ደራሲ ያነጋግሩ።
 EMailsInGoingDesc=ገቢ ኢሜይሎች የሚተዳደሩት በሞጁሉ %s ነው። የሚገቡ ኢሜይሎችን መደገፍ ከፈለጉ ማንቃት እና ማዋቀር አለብዎት።
 MAIN_IMAP_USE_PHPIMAP=ቤተኛ ከPHP IMAP ይልቅ የPHP-IMAP ቤተ-መጽሐፍትን ለIMAP ተጠቀም። ይህ ለIMAP የOAuth2 ግንኙነትንም ይፈቅዳል (ሞዱል OAuth እንዲሁ መንቃት አለበት።)
-MAIN_CHECKBOX_LEFT_COLUMN=በግራ በኩል የመስክ እና የመስመር ምርጫን አምድ አሳይ (በቀኝ በኩል በነባሪ)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=በነባሪነት አልተፈጠረም። በሞጁል ማግበር ላይ ብቻ የተፈጠረ።
 CSSPage=የሲኤስኤስ ዘይቤ
 Defaultfortype=ነባሪ
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/am_ET/banks.lang b/htdocs/langs/am_ET/banks.lang
index a0a5c65e2a0..b67129ba2ae 100644
--- a/htdocs/langs/am_ET/banks.lang
+++ b/htdocs/langs/am_ET/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=ቀሪ ሂሳብን ጨርስ
 CurrentBalance=የአሁኑ ሒሳብ
 FutureBalance=የወደፊት ሚዛን
 ShowAllTimeBalance=ከመጀመሪያው ሚዛን አሳይ
-AllTime=ከመጀመሪያው
 Reconciliation=እርቅ
 RIB=የባንክ ሂሳብ ቁጥር
 IBAN=IBAN ቁጥር
@@ -133,7 +132,7 @@ DeleteTransaction=ግቤትን ሰርዝ
 ConfirmDeleteTransaction=እርግጠኛ ነዎት ይህን ግቤት መሰረዝ ይፈልጋሉ?
 ThisWillAlsoDeleteBankRecord=ይህ የመነጨ የባንክ ግቤትንም ይሰርዛል
 BankMovements=እንቅስቃሴዎች
-PlannedTransactions=የታቀዱ ግቤቶች
+PlannedTransactions=Upcoming entries
 Graph=ግራፎች
 ExportDataset_banque_1=የባንክ ግቤቶች እና የሂሳብ መግለጫ
 ExportDataset_banque_2=የተቀማጭ ወረቀት
@@ -151,7 +150,7 @@ FutureTransaction=የወደፊት ግብይት. ማስታረቅ አልተቻለ
 SelectChequeTransactionAndGenerate=በቼክ ማስቀመጫ ደረሰኝ ውስጥ የሚካተቱትን ቼኮች ይምረጡ/አጣሩ። ከዚያ "ፍጠር" ን ጠቅ ያድርጉ።
 SelectPaymentTransactionAndGenerate=በ%s የተቀማጭ ደረሰኝ ውስጥ የሚካተቱትን ሰነዶች ይምረጡ/አጣሩ። ከዚያ "ፍጠር" ን ጠቅ ያድርጉ።
 InputReceiptNumber=ከማስታረቅ ጋር የተያያዘውን የባንክ መግለጫ ይምረጡ። ሊደረደር የሚችል የቁጥር እሴት ተጠቀም
-InputReceiptNumberBis=አአአአአ ወይም አአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአ አአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአአዉንዉንዉንዉን
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=ለማስታረቅ?
 ThenCheckLinesAndConciliate=ከዚያ በባንክ መግለጫው ውስጥ ያሉትን መስመሮች ያረጋግጡ እና ጠቅ ያድርጉ
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=ይህ ተግባር ከነቃ ለዴቢት ወይም 
 BankColorizeMovementName1=ለዴቢት እንቅስቃሴ የበስተጀርባ ቀለም
 BankColorizeMovementName2=ለክሬዲት እንቅስቃሴ የበስተጀርባ ቀለም
 IfYouDontReconcileDisableProperty=በአንዳንድ የባንክ ሂሳቦች ላይ የባንክ ማስታረቅን ካላደረጉ፣ ይህን ማስጠንቀቂያ ለማስወገድ በእነሱ ላይ ያለውን ንብረት "%s" ያሰናክሉ።
-NoBankAccountDefined=ምንም የባንክ ሂሳብ አልተገለጸም።
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=በባንክ ሂሳብ ውስጥ ምንም መዝገብ አልተገኘም። በተለምዶ ይህ የሚከሰተው በባንክ ሂሳቡ ውስጥ ካለው የግብይት ዝርዝር (ለምሳሌ የባንክ ሂሳቡን በማስታረቅ ወቅት) መዝገብ በእጅ ሲሰረዝ ነው። ሌላው ምክንያት ክፍያው የተቀዳው ሞጁሉ "%s" ሲሰናከል ነው።
 AlreadyOneBankAccount=አስቀድሞ አንድ የባንክ ሒሳብ ተገልጿል
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA ፋይል ተለዋጭ
diff --git a/htdocs/langs/am_ET/blockedlog.lang b/htdocs/langs/am_ET/blockedlog.lang
index 26036d91b89..6d887813656 100644
--- a/htdocs/langs/am_ET/blockedlog.lang
+++ b/htdocs/langs/am_ET/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=የማይለወጡ ምዝግብ ማስታወሻዎች
 ShowAllFingerPrintsMightBeTooLong=ሁሉንም በማህደር የተቀመጡ ምዝግብ ማስታወሻዎችን አሳይ (ረጃጅም ሊሆን ይችላል)
 ShowAllFingerPrintsErrorsMightBeTooLong=ሁሉንም ልክ ያልሆኑ የማህደር ምዝግብ ማስታወሻዎችን አሳይ (ረጃጅም ሊሆን ይችላል)
 DownloadBlockChain=የጣት አሻራዎችን አውርድ
-KoCheckFingerprintValidity=በማህደር የተቀመጠ የምዝግብ ማስታወሻ ግቤት ልክ አይደለም። ይህ ማለት አንድ ሰው (ሰርጎ ገዳይ?) የዚህን መዝገብ የተወሰነ ውሂብ ከተመዘገበ በኋላ አሻሽሏል ወይም ቀድሞውንም በማህደር የተቀመጠውን መዝገብ ሰርዞ (ከዚህ በፊት # መኖሩን ያረጋግጡ) ወይም የቀደመውን መዝገብ ቼክ አሻሽሏል ማለት ነው።
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=በማህደር የተቀመጠ የምዝግብ ማስታወሻ ትክክለኛ ነው። በዚህ መስመር ላይ ያለው መረጃ አልተቀየረም እና መግቢያው የቀደመውን ይከተላል።
 OkCheckFingerprintValidityButChainIsKo=በማህደር የተቀመጠ መዝገብ ከቀዳሚው ጋር ሲነጻጸር የሚሰራ ይመስላል ነገር ግን ሰንሰለቱ ከዚህ ቀደም ተበላሽቷል።
 AddedByAuthority=በርቀት ባለስልጣን ውስጥ ተከማችቷል
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=የምዝግብ ማስታወሻ ዝርዝሮች
 ListOfTrackedEvents=ክትትል የሚደረግባቸው ክስተቶች ዝርዝር
 Fingerprint=የጣት አሻራ
 DownloadLogCSV=በማህደር የተቀመጡ ምዝግብ ማስታወሻዎችን ወደ ውጪ ላክ (CSV)
-DataOfArchivedEvent=በማህደር የተቀመጠ ክስተት ሙሉ መረጃ
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=ዋናው ነገር (አይነት %s, id %s አልተገናኘም (የተቀመጠ የማይለወጥ ውሂብ ለማግኘት 'ሙሉ ውሂብ' የሚለውን አምድ ይመልከቱ)
 BlockedLogAreRequiredByYourCountryLegislation=የማይለወጥ የምዝግብ ማስታወሻዎች ሞጁል በአገርዎ ህግ ሊያስፈልግ ይችላል። ይህንን ሞጁል ማሰናከል ወደፊት የሚደረጉ ግብይቶች ከህግ እና ከህጋዊ ሶፍትዌሮች አጠቃቀም ጋር በተያያዘ በታክስ ኦዲት ሊረጋገጡ ስለማይችሉ ዋጋ ቢስ ሊያደርጋቸው ይችላል።
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=የማይለወጥ የምዝግብ ማስታወሻዎች ሞጁል ገቢር የተደረገው በአገርዎ ህግ ምክንያት ነው። ይህንን ሞጁል ማሰናከል ወደፊት የሚደረጉ ግብይቶች ከህግ እና ከህጋዊ ሶፍትዌሮች አጠቃቀም ጋር በተያያዘ በታክስ ኦዲት ሊረጋገጡ ስለማይችሉ ዋጋ ቢስ ሊያደርጋቸው ይችላል።
@@ -30,6 +32,7 @@ BlockedLogEnabled=ክስተቶችን ወደ የማይለወጡ ምዝግብ ማ
 BlockedLogDisabled=አንዳንድ ቅጂዎች ከተደረጉ በኋላ ክስተቶችን ወደ የማይቀየሩ ምዝግብ ማስታወሻዎች የሚከታተልበት ስርዓት ተሰናክሏል። ሰንሰለቱ እንደተሰበረ ለመከታተል ልዩ የጣት አሻራ አስቀመጥን።
 BlockedLogDisabledBis=ክስተቶችን ወደ የማይለወጡ ምዝግብ ማስታወሻዎች የሚከታተልበት ስርዓት ተሰናክሏል። ይህ ሊሆን የቻለው እስካሁን ምንም መዝገብ ስላልተሰራ ነው።
 LinkHasBeenDisabledForPerformancePurpose=ለአፈጻጸም ዓላማ፣ ከሰነዱ ጋር ቀጥተኛ ግንኙነት ከ100ኛው መስመር በኋላ አይታይም።
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=የደንበኛ ደረሰኝ ምክንያታዊ በሆነ መልኩ ተሰርዟል።
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=የደንበኛ ክፍያ ምክንያታዊ ስረ
 logPAYMENT_VARIOUS_CREATE=ክፍያ (ለክፍያ መጠየቂያ አልተሰጠም) ተፈጥሯል።
 logPAYMENT_VARIOUS_DELETE=ክፍያ (ለክፍያ መጠየቂያ ያልተሰጠ) ምክንያታዊ ስረዛ
 logPAYMENT_VARIOUS_MODIFY=ክፍያ (ለክፍያ መጠየቂያ አልተሰጠም) ተሻሽሏል።
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/am_ET/categories.lang b/htdocs/langs/am_ET/categories.lang
index 21839418ee8..969f60b8e8e 100644
--- a/htdocs/langs/am_ET/categories.lang
+++ b/htdocs/langs/am_ET/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=የእውቂያ መለያዎች / ምድቦች አካባ
 AccountsCategoriesArea=የባንክ መለያ መለያዎች / ምድቦች አካባቢ
 ProjectsCategoriesArea=የፕሮጀክት መለያዎች / ምድቦች አካባቢ
 UsersCategoriesArea=የተጠቃሚ መለያዎች / ምድቦች አካባቢ
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=ንዑስ ምድቦች
 CatList=የመለያዎች / ምድቦች ዝርዝር
 CatListAll=የመለያዎች/የምድቦች ዝርዝር (ሁሉም ዓይነቶች)
@@ -90,9 +91,10 @@ CategoriesSetup=መለያዎች / ምድቦች ማዋቀር
 CategorieRecursiv=ከወላጅ መለያ/ምድብ ጋር በራስ ሰር ማገናኘት።
 CategorieRecursivHelp=ምርጫው በርቶ ከሆነ አንድን ነገር ወደ ንዑስ ምድብ ሲጨምሩ ነገሩ ወደ የወላጅ ምድቦችም ይታከላል።
 AddProductServiceIntoCategory=ለምርቱ/አገልግሎት ምድብ መድብ
-AddCustomerIntoCategory=ምድብ ለደንበኛ መድብ
-AddSupplierIntoCategory=ምድብ ለአቅራቢው መድብ
-AssignCategoryTo=ምድብ ለ
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=መለያ/መደብ አሳይ
 ByDefaultInList=በነባሪ ዝርዝር ውስጥ
 ChooseCategory=ምድብ ይምረጡ
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=ገጽ-የመያዣ ምድቦች
 KnowledgemanagementsCategoriesArea=KM መጣጥፍ ምድቦች
 UseOrOperatorForCategories=ለምድብ የ'OR' ኦፕሬተርን ተጠቀም
 AddObjectIntoCategory=ወደ ምድብ መድብ
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/am_ET/companies.lang b/htdocs/langs/am_ET/companies.lang
index cc1d278bbd9..a4536c61baa 100644
--- a/htdocs/langs/am_ET/companies.lang
+++ b/htdocs/langs/am_ET/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=አገሪቱ በአውሮፓ ኢኮኖሚክ ማህበረሰብ 
 PriceFormatInCurrentLanguage=የዋጋ ማሳያ ቅርጸት አሁን ባለው ቋንቋ እና ምንዛሬ
 ThirdPartyName=የሶስተኛ ወገን ስም
 ThirdPartyEmail=የሶስተኛ ወገን ኢሜይል
-ThirdParty=ሶስተኛ ወገን
-ThirdParties=ሦስተኛ ወገኖች
+ThirdParty=Third party
+ThirdParties=Third parties
 ThirdPartyProspects=ተስፋዎች
 ThirdPartyProspectsStats=ተስፋዎች
 ThirdPartyCustomers=ደንበኞች
@@ -65,6 +65,7 @@ State=ግዛት/አውራጃ
 StateId=የግዛት መታወቂያ
 StateCode=ግዛት / ግዛት ኮድ
 StateShort=ግዛት
+DepartmentBuyer=Buyer's state/province
 Region=ክልል
 Region-State=ክልል - ግዛት
 Country=ሀገር
@@ -78,7 +79,7 @@ Chat=ተወያይ
 PhonePro=አውቶቡስ. ስልክ
 PhonePerso=ፐርስ. ስልክ
 PhoneMobile=ሞባይል
-No_Email=የጅምላ ኢሜይሎችን እምቢ ይበሉ
+No_Email=Refuse mass emails
 Fax=ፋክስ
 Zip=አካባቢያዊ መለያ ቁጥር
 Town=ከተማ
@@ -382,11 +383,12 @@ ExportCardToFormat=ካርድ ወደ ቅርጸት ይላኩ።
 ContactNotLinkedToCompany=እውቂያ ከማንኛውም ሶስተኛ ወገን ጋር አልተገናኘም።
 DolibarrLogin=Dolibarr መግቢያ
 NoDolibarrAccess=የዶሊባርር መዳረሻ የለም።
-ExportDataset_company_1=የሶስተኛ ወገኖች (ኩባንያዎች / መሠረቶች / አካላዊ ሰዎች) እና ንብረታቸው
-ExportDataset_company_2=እውቂያዎች እና ንብረቶቻቸው
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=የሶስተኛ ወገኖች እና ንብረቶቻቸው
 ImportDataset_company_2=የሶስተኛ ወገኖች ተጨማሪ እውቂያዎች / አድራሻዎች እና ባህሪያት
-ImportDataset_company_3=የሶስተኛ ወገኖች የባንክ ሂሳቦች
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=የሶስተኛ ወገን የሽያጭ ተወካዮች (የሽያጭ ተወካዮችን/ተጠቃሚዎችን ለኩባንያዎች ይመድቡ)
 PriceLevel=የዋጋ ደረጃ
 PriceLevelLabels=የዋጋ ደረጃ መለያዎች
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=የአስተዳዳሪ(ዎች) ስም (ዋና ሥራ አስኪያጅ፣ ዳይሬክተር፣ ፕሬዚዳንት...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=ሶስተኛ ወገኖችን አዋህድ
-ConfirmMergeThirdparties=እርግጠኛ ነዎት የተመረጠውን ሶስተኛ አካል አሁን ካለው ጋር ማዋሃድ ይፈልጋሉ? ሁሉም የተገናኙ ነገሮች (ደረሰኞች, ትዕዛዞች, ...) ወደ የአሁኑ ሶስተኛ ወገን ይንቀሳቀሳሉ, ከዚያ በኋላ የተመረጠው ሶስተኛ አካል ይሰረዛል.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=ሶስተኛ ወገኖች ተዋህደዋል
 SaleRepresentativeLogin=የሽያጭ ተወካይ መግቢያ
 SaleRepresentativeFirstname=የሽያጭ ተወካይ የመጀመሪያ ስም
@@ -460,3 +462,6 @@ ExternalSystemID=የውጭ ስርዓት መታወቂያ
 IDOfPaymentInAnExternalSystem=የመክፈያ ሁነታ መታወቂያ ወደ ውጫዊ ስርዓት (እንደ Stripe፣ Paypal፣ ...)
 AADEWebserviceCredentials=ADE Webservice ምስክርነቶች
 ThirdPartyMustBeACustomerToCreateBANOnStripe=የሶስተኛ ወገን የባንክ መረጃውን በ Stripe በኩል ለመፍጠር ደንበኛ መሆን አለበት።
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/am_ET/compta.lang b/htdocs/langs/am_ET/compta.lang
index 11ba4b3d7b5..31327a10955 100644
--- a/htdocs/langs/am_ET/compta.lang
+++ b/htdocs/langs/am_ET/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=የደንበኛ ደረሰኝ ክፍያ
 PaymentSupplierInvoice=የሻጭ ደረሰኝ ክፍያ
 PaymentSocialContribution=የማህበራዊ/የፋይናንስ ታክስ ክፍያ
 PaymentVat=የተጨማሪ እሴት ታክስ ክፍያ
-AutomaticCreationPayment=ክፍያውን በራስ-ሰር ይመዝግቡ
+AutomaticCreationPayment=Also record the payment
 ListPayment=የክፍያዎች ዝርዝር
 ListOfCustomerPayments=የደንበኛ ክፍያዎች ዝርዝር
 ListOfSupplierPayments=የአቅራቢ ክፍያዎች ዝርዝር
@@ -118,10 +118,14 @@ SocialContributionsPayments=የማህበራዊ/የፋይናንስ ታክስ ክ
 ShowVatPayment=የተ.እ.ታ ክፍያን አሳይ
 TotalToPay=የሚከፈልበት ጠቅላላ
 BalanceVisibilityDependsOnSortAndFilters=ቀሪ ሂሳብ በዚህ ዝርዝር ውስጥ የሚታየው ሠንጠረዥ በ%s ላይ ከተደረደረ እና በ1 የባንክ አካውንት ላይ (ሌላ ማጣሪያ ከሌለው) ከተጣራ ብቻ ነው።
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=የደንበኛ የሂሳብ ኮድ
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=የአቅራቢ የሂሳብ ኮድ
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=ኩስት መለያ ኮድ
 SupplierAccountancyCodeShort=ሱፕ. መለያ ኮድ
+UserAccountancyCodeShort=User account. code
 AccountNumber=መለያ ቁጥር
 NewAccountingAccount=አዲስ መለያ
 Turnover=የማዞሪያ ደረሰኝ ተከፍሏል።
@@ -129,7 +133,9 @@ TurnoverCollected=ማዞሪያ ተሰብስቧል
 SalesTurnoverMinimum=ዝቅተኛ ማዞሪያ
 ByExpenseIncome=በወጪ እና ገቢ
 ByThirdParties=በሶስተኛ ወገኖች
+ByProjects=By projects
 ByUserAuthorOfInvoice=በክፍያ መጠየቂያ ደራሲ
+DetailedListLowercase=detailed list
 CheckReceipt=የተቀማጭ ወረቀት
 CheckReceiptShort=የተቀማጭ ወረቀት
 LastCheckReceiptShort=የቅርብ ጊዜ %s የተቀማጭ ወረቀቶች
diff --git a/htdocs/langs/am_ET/datapolicy.lang b/htdocs/langs/am_ET/datapolicy.lang
index bd46345f7c7..950bff437cf 100644
--- a/htdocs/langs/am_ET/datapolicy.lang
+++ b/htdocs/langs/am_ET/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = የውሂብ ግላዊነት መመሪያ
 Module4100Desc = የውሂብ ግላዊነትን ለማስተዳደር ሞጁል (ከGDPR ጋር መስማማት)
 # Administration page
 datapolicySetup = የሞዱል ውሂብ የግላዊነት መመሪያ ማዋቀር
-Deletion = የውሂብ መሰረዝ
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s ወራት
 ONE_YEAR = 1 ዓመት
 NB_YEARS = %s ዓመታት
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = ፕሮስፔክተር/ደንበኛ
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = ወይም ተስፋ/ ደንበኛም አይደለም።
 DATAPOLICY_CONTACT_FOURNISSEUR = አቅራቢ
 DATAPOLICY_ADHERENT = አባል
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = ለሁሉም ተዛማጅ እውቂያዎች የGDPR ኢሜል መላክ ይችላሉ (እስካሁን ኢሜይል ላላገኙ እና ስለ GDPR ስምምነታቸው ምንም ነገር ላላመዘገቡበት)። ይህንን ለማድረግ የሚከተለውን አዝራር ይጠቀሙ.
 SendAgreement = ኢሜይሎችን ላክ
 AllAgreementSend = ሁሉም ኢሜይሎች ተልከዋል።
 TXTLINKDATAPOLICYACCEPT = ለ "ስምምነት" አገናኝ ጽሑፍ
 TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: የግል መረጃን ማካሄድ
 DATAPOLICY_consentement = የግል መረጃን ለማስኬድ የተገኘ ስምምነት
diff --git a/htdocs/langs/am_ET/errors.lang b/htdocs/langs/am_ET/errors.lang
index cf14cd9f0ea..90e70f820fb 100644
--- a/htdocs/langs/am_ET/errors.lang
+++ b/htdocs/langs/am_ET/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=ማውጫ መፍጠር አልተሳካም። የድር አገልጋይ ተጠቃሚ ወደ Dolibarr ሰነዶች ማውጫ ውስጥ የመፃፍ ፍቃድ እንዳለው ያረጋግጡ። ፓራሜትር <b>safe_mode</b> በዚህ ፒኤችፒ ላይ ከነቃ የዶሊባርር php ፋይሎች ባለቤት መሆናቸውን ያረጋግጡ የድር አገልጋይ ተጠቃሚ (ወይም ቡድን)።
 ErrorNoMailDefinedForThisUser=ለዚህ ተጠቃሚ ምንም ደብዳቤ አልተገለጸም።
 ErrorSetupOfEmailsNotComplete=ኢሜይሎችን ማዋቀር አልተጠናቀቀም።
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=ይህ ባህሪ ለመስራት ጃቫስክሪፕት እንዲነቃ ያስፈልገዋል። ይህንን በማዋቀር - ማሳያ ይለውጡ።
 ErrorTopMenuMustHaveAParentWithId0=የ«ከፍተኛ» ዓይነት ምናሌ የወላጅ ምናሌ ሊኖረው አይችልም። በወላጅ ምናሌ ውስጥ 0 ን ያስቀምጡ ወይም የ'ግራ' አይነት ምናሌን ይምረጡ።
 ErrorLeftMenuMustHaveAParentId=የ'ግራ' አይነት ሜኑ የወላጅ መታወቂያ ሊኖረው ይገባል።
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=ሰቀላ በPHP/Apache ተሰኪ ታግዷል።
 ErrorFileSizeTooLarge=የፋይል መጠን በጣም ትልቅ ነው ወይም ፋይል አልተሰጠም።
 ErrorFieldTooLong=መስክ %s በጣም ረጅም ነው።
 ErrorSizeTooLongForIntType=ለ int አይነት መጠኑ በጣም ረጅም ነው (%s ከፍተኛ አሃዞች)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=ለሕብረቁምፊ አይነት መጠኑ በጣም ረጅም ነው (%s ቻርልስ ከፍተኛ)
 ErrorNoValueForSelectType=እባክዎ ለተመረጠው ዝርዝር ዋጋ ይሙሉ
 ErrorNoValueForCheckBoxType=እባክዎን የአመልካች ሳጥን ዝርዝር ዋጋ ይሙሉ
@@ -138,8 +140,9 @@ ErrorBadValueForCode=ለደህንነት ኮድ መጥፎ እሴት። በአዲ
 ErrorBothFieldCantBeNegative=መስኮች %s እና %s ሁለቱም አሉታዊ ሊሆኑ አይችሉም
 ErrorFieldCantBeNegativeOnInvoice=መስክ <strong>%s</strong> በዚህ አይነት ላይ አሉታዊ ሊሆን አይችልም። የቅናሽ መስመር ማከል ከፈለጉ መጀመሪያ ቅናሹን ይፍጠሩ (ከመስክ '%s በሶስተኛ ወገን ካርድ ውስጥ) እና በክፍያ መጠየቂያው ላይ ይተግብሩ።
 ErrorLinesCantBeNegativeForOneVATRate=የመስመሮች ጠቅላላ (የታክስ የተጣራ) ለተሰጠ ዋጋ ቢስ ያልሆነ የተጨማሪ እሴት ታክስ ዋጋ አሉታዊ ሊሆን አይችልም (ለተእታ መጠን አሉታዊ ድምር ተገኝቷል <b>%s </b>%%)።
-ErrorLinesCantBeNegativeOnDeposits=መስመሮች በተቀማጭ ገንዘብ ውስጥ አሉታዊ ሊሆኑ አይችሉም። ይህን ካደረግክ በመጨረሻ ደረሰኝ ላይ ተቀማጩን መጠቀም ስትፈልግ ችግሮች ያጋጥሙሃል።
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=የደንበኛ ደረሰኞች የመስመር መጠን አሉታዊ ሊሆን አይችልም።
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=የተጠቃሚ መለያ <b>%s</b>የድር አገልጋይ ለማስፈጸም ምንም ፍቃድ የለውም የሚለውን ነው።
 ErrorNoActivatedBarcode=ምንም አይነት የአሞሌ ኮድ አልነቃም።
 ErrUnzipFails=በዚፕ ማህደር %sን ዚፕ መክፈት አልተሳካም
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=የእርስዎ ፒኤችፒ መለኪያ upload_max_filesize (%s) ከPHP መለኪያ post_max_size (%s) ከፍ ያለ ነው። ይህ ወጥነት ያለው ማዋቀር አይደለም።
 WarningPasswordSetWithNoAccount=ለዚህ አባል የይለፍ ቃል ተቀናብሯል። ሆኖም የተጠቃሚ መለያ አልተፈጠረም። ስለዚህ ይህ የይለፍ ቃል ተከማችቷል ነገር ግን ወደ ዶሊባርር ለመግባት መጠቀም አይቻልም። በውጫዊ ሞጁል/በይነገጽ ጥቅም ላይ ሊውል ይችላል ነገር ግን ለአባል ምንም አይነት መግቢያም ሆነ የይለፍ ቃል መግለጽ ካላስፈለገዎት ከአባላት ሞጁል ቅንብር "ለእያንዳንዱ አባል መግቢያን ያስተዳድሩ" የሚለውን አማራጭ ማሰናከል ይችላሉ። መግቢያን ማስተዳደር ከፈለጉ ነገር ግን ምንም የይለፍ ቃል የማይፈልጉ ከሆነ ይህንን ማስጠንቀቂያ ለማስወገድ ይህንን መስክ ባዶ ማቆየት ይችላሉ። ማሳሰቢያ፡ አባሉ ከተጠቃሚ ጋር የተገናኘ ከሆነ ኢሜል እንደ መግቢያ መጠቀምም ይችላል።
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = የስዊስQR ደረሰኝ በክሬዲት ማስተላለፍ ክፍያዎች እንዲከፈሉ በተዘጋጁ ደረሰኞች ላይ ብቻ መጨመር ይችላል።
 SwissQrCreditorAddressInvalid = የአበዳሪው አድራሻ ልክ ያልሆነ ነው (ዚፕ እና ከተማ ተቀናብረዋል? (%s)
 SwissQrCreditorInformationInvalid = የአበዳሪው መረጃ ለ IBAN (%s) ልክ ያልሆነ ነው፡ %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/am_ET/exports.lang b/htdocs/langs/am_ET/exports.lang
index 5a6ca800842..42e3717405f 100644
--- a/htdocs/langs/am_ET/exports.lang
+++ b/htdocs/langs/am_ET/exports.lang
@@ -46,10 +46,16 @@ LineLabel=የመስመር መለያ
 LineDescription=የመስመር መግለጫ
 LineUnitPrice=የአንድ መስመር ዋጋ
 LineVATRate=የተጨማሪ እሴት ታክስ የመስመር ተመን
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=ለመስመር ብዛት
 LineTotalHT=መጠን ሳይጨምር ለመስመር ግብር
 LineTotalTTC=ለመስመር ከግብር ጋር መጠን
 LineTotalVAT=ለመስመር የቫት መጠን
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=የመስመር አይነት (0=ምርት፣ 1=አገልግሎት)
 FileWithDataToImport=ለማስመጣት በመረጃ ፋይል ያድርጉ
 FileToImport=ለማስመጣት የምንጭ ፋይል
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=እሱን ለመምረጥ የ%s አዶን ጠቅ በ
 ChooseFileToImport=ፋይሉን ስቀል ከዚያም የ%s አዶን ጠቅ በማድረግ ፋይሉን እንደ ምንጭ አስመጪ ፋይል ለመምረጥ...
 SourceFileFormat=የምንጭ ፋይል ቅርጸት
 FieldsInSourceFile=በምንጭ ፋይል ውስጥ ያሉ መስኮች
-FieldsInTargetDatabase=በዶሊባርር ዳታቤዝ ውስጥ ያሉ የዒላማ መስኮች (ደፋር=አስገዳጅ)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=ምንም መስኮች የሉም
 MoveField=የመስክ አምድ ቁጥር %s አንቀሳቅስ
 ExampleOfImportFile=የማስመጣት_ፋይል_ምሳሌ
@@ -76,8 +82,8 @@ NowClickToTestTheImport=የፋይልዎ ቅርጸት (መስክ እና ሕብረ
 RunSimulateImportFile=የማስመጣት ማስመሰልን ያሂዱ
 FieldNeedSource=ይህ መስክ ከምንጩ ፋይል ውሂብ ይፈልጋል
 SomeMandatoryFieldHaveNoSource=አንዳንድ የግዴታ መስኮች ከውሂብ ፋይል ምንጭ የላቸውም
-InformationOnSourceFile=በምንጭ ፋይል ላይ መረጃ
-InformationOnTargetTables=በዒላማ መስኮች ላይ መረጃ
+InformationOnSourceFile=Source file
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=ወደ ውጭ ለመላክ ቢያንስ አንድ የምንጭ መስክ በመስኮቹ አምድ ውስጥ ይቀይሩ
 SelectFormat=ይህን የማስመጣት ፋይል ቅርጸት ይምረጡ
 RunImportFile=ውሂብ አስመጣ
diff --git a/htdocs/langs/am_ET/hrm.lang b/htdocs/langs/am_ET/hrm.lang
index b1d095b2d58..776949a3563 100644
--- a/htdocs/langs/am_ET/hrm.lang
+++ b/htdocs/langs/am_ET/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=ለሥራው መገለጫ አስፈላጊ ደረጃ
-RequiredRankShort=ተፈላጊ ደረጃ
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=ከዚህ የስራ መገለጫዎች ጋር ያሉ ቦታዎች
-EmployeeRank=ለዚህ ችሎታ የሰራተኛ ደረጃ
-EmployeeRankShort=የሰራተኛ ደረጃ
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=የሰራተኛ አቀማመጥ
 EmployeePositions=የሰራተኛ ቦታዎች
 EmployeesInThisPosition=በዚህ ቦታ ላይ ያሉ ሰራተኞች
@@ -72,6 +72,9 @@ AddSkill=ወደ ሥራ መገለጫ ችሎታዎችን ያክሉ
 RequiredSkills=ለዚህ የሥራ መገለጫ የሚያስፈልጉ ክህሎቶች
 UserRank=የተጠቃሚ ደረጃ
 SkillList=የክህሎት ዝርዝር
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=ደረጃ አስቀምጥ
 TypeKnowHow=ተረዳ
 TypeHowToBe=እንዴት መሆን እንደሚቻል
@@ -95,3 +98,5 @@ NeedBusinessTravels=የንግድ ጉዞዎች ያስፈልጉታል
 NoDescription=መግለጫ የለም።
 TheJobProfileHasNoSkillsDefinedFixBefore=የዚህ ሰራተኛ የተገመገመ የስራ መገለጫ በእሱ ላይ የተገለጸ ችሎታ የለውም. እባክህ ችሎታ(ዎች) ጨምር፣ ከዛ ሰርዝ እና ግምገማውን እንደገና አስጀምር።
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/am_ET/mails.lang b/htdocs/langs/am_ET/mails.lang
index 38008cdb435..2af5c839c28 100644
--- a/htdocs/langs/am_ET/mails.lang
+++ b/htdocs/langs/am_ET/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=ኢሜል መላክ
 EMailing=ኢሜል መላክ
-EMailings=ኢሜይሎች
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=ሁሉም ኢሜይሎች
+AllEMailings=All mass eMails
 MailCard=የኢሜል ካርድ
 MailRecipients=ተቀባዮች
 MailRecipient=ተቀባይ
@@ -26,19 +26,19 @@ MailFile=የተያያዙ ፋይሎች
 MailMessage=የኢሜል አካል
 SubjectNotIn=በርዕሰ ጉዳይ ላይ አይደለም።
 BodyNotIn=በሰውነት ውስጥ አይደለም
-ShowEMailing=ኢሜል መላክን አሳይ
-ListOfEMailings=የኢሜል መላኪያዎች ዝርዝር
-NewMailing=አዲስ ኢሜል ማድረግ
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=ኢሜል መላክን ያርትዑ
-ResetMailing=ኢሜል መላክን እንደገና ላክ
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=ኢሜል መላክን ሰርዝ
-PreviewMailing=ኢሜል መላክን አስቀድመው ይመልከቱ
-CreateMailing=ኢሜል ፍጠር
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=ትክክለኛ ኢሜል መላክ
+ValidMailing=Valid mass Email
 MailingStatusDraft=ረቂቅ
 MailingStatusValidated=ተረጋግጧል
 MailingStatusSent=ተልኳል።
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=ኢሜል እንዲሰበሰብ ሁሉም ማጣሪያ
 LineInFile=መስመር %s በፋይል ውስጥ
 RecipientSelectionModules=ለተቀባዩ ምርጫ የተገለጹ ጥያቄዎች
 MailSelectedRecipients=የተመረጡ ተቀባዮች
-MailingArea=የኢሜይል አድራሻዎች አካባቢ
-LastMailings=የቅርብ ጊዜ %s ኢሜይሎች
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=የዒላማዎች ስታቲስቲክስ
 NbOfCompaniesContacts=ልዩ እውቂያዎች/አድራሻዎች
 MailNoChangePossible=ለተረጋገጠ ኢሜይል ተቀባዮች ሊለወጡ አይችሉም
-SearchAMailing=የደብዳቤ መላኪያ ፍለጋ
-SendMailing=ኢሜይል ላክ
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=የተላከው በ
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=ኢሜል መላክ በትእዛዝ መስመር ሊከናወን ይችላል. ለሁሉም ተቀባዮች ኢሜይል ለመላክ የአገልጋይ አስተዳዳሪዎ የሚከተለውን ትዕዛዝ እንዲያስጀምር ይጠይቁ፡
 MailingNeedCommand2=ነገር ግን በክፍለ-ጊዜ ለመላክ ከሚፈልጉት ከፍተኛው የኢሜይሎች ብዛት ጋር ግቤት MAILING_LIMIT_SENDBYWEB በመጨመር በመስመር ላይ መላክ ይችላሉ። ለዚህ፣ ወደ ቤት ይሂዱ - ማዋቀር - ሌላ።
 ConfirmSendingEmailing=ከዚህ ማያ ገጽ በቀጥታ ኢሜል መላክ ከፈለጉ፣ እባክዎን እርግጠኛ መሆንዎን ያረጋግጡ ኢሜል አሁን ከአሳሽዎ መላክ ይፈልጋሉ?
-LimitSendingEmailing=ማሳሰቢያ፡ ከድር በይነገጽ ኢሜይሎችን መላክ ብዙ ጊዜ ለደህንነት እና ለጊዜ ማብቂያ ምክንያት ነው <b>%s</b> ተቀባዮች ለእያንዳንዱ የመላኪያ ክፍለ ጊዜ።
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=ዝርዝር አጽዳ
 ToClearAllRecipientsClickHere=ለዚህ ኢሜይል የተቀባዩን ዝርዝር ለማጽዳት እዚህ ጠቅ ያድርጉ
 ToAddRecipientsChooseHere=ከዝርዝሩ ውስጥ በመምረጥ ተቀባዮችን ያክሉ
-NbOfEMailingsReceived=የጅምላ ኢሜይሎች ደርሰዋል
-NbOfEMailingsSend=የጅምላ ኢሜይሎች ተልከዋል።
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=የመታወቂያ መዝገብ
 DeliveryReceipt=መላኪያ Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=ብዙ ተቀባዮችን ለመለየት <b>comma</b> መለያየትን መጠቀም ትችላለህ።
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=ለዚህ ክስተት አይነት እና ኩባን
 ANotificationsWillBeSent=1 አውቶማቲክ ማሳወቂያ በኢሜል ይላካል
 SomeNotificationsWillBeSent=%s አውቶማቲክ ማሳወቂያዎች በኢሜይል ይላካሉ
 AddNewNotification=ለአዲስ አውቶማቲክ የኢሜይል ማሳወቂያ (ዒላማ/ክስተት) ይመዝገቡ
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=የኢሜይል መላክ ውቅር ወደ «%s' ተዋቅሯል። ይህ ሁነታ የጅምላ ኢሜል ለመላክ መጠቀም አይቻልም።
 MailSendSetupIs2=መለኪያውን ለመቀየር በመጀመሪያ ከአስተዳዳሪ መለያ ወደ ሜኑ %sቤት - ማዋቀር - ኢሜይሎች%s ውስጥ መግባት አለብህ መለኪያ <strong>'%s'</strong> ሁነታን ለመጠቀም '<spanecf> class=0 </span> በዚህ ሁነታ፣ በበይነመረብ አገልግሎት አቅራቢዎ የቀረበውን የSMTP አገልጋይ ማዋቀር እና የጅምላ ኢሜል መላክ ባህሪን መጠቀም ይችላሉ።
 MailSendSetupIs3=የእርስዎን የSMTP አገልጋይ እንዴት ማዋቀር እንደሚችሉ ላይ ማንኛቸውም ጥያቄዎች ካሉዎት፣ %sን መጠየቅ ይችላሉ።
@@ -183,7 +185,7 @@ Information=መረጃ
 ContactsWithThirdpartyFilter=የሶስተኛ ወገን ማጣሪያ ያላቸው እውቂያዎች
 Unanswered=መልስ አላገኘም።
 Answered=ብለው መለሱ
-IsNotAnAnswer=መልስ አይደለም (የመጀመሪያ ኢሜል)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=የመጀመሪያ ኢሜል መልስ ነው።
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=አዲስ እውቂያ ሲፈጥሩ የመስክ ነባሪ እሴት %s
@@ -199,6 +201,6 @@ ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/am_ET/main.lang b/htdocs/langs/am_ET/main.lang
index 3999875bec8..f65f9d48f41 100644
--- a/htdocs/langs/am_ET/main.lang
+++ b/htdocs/langs/am_ET/main.lang
@@ -23,12 +23,12 @@ FormatDateShortJQueryInput=mm/dd/yy
 FormatHourShortJQuery=HH:MI
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H፡%M
-FormatDateTextShort=%b %d፣ %Y
+FormatDateTextShort=%b %d, %Y
 FormatDateText=%B %d, %Y
 FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
-FormatDateHourTextShort=%b %d፣ %Y፣ %I:%M %p
-FormatDateHourText=%B %d፣ %Y፣ %I:%M %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=የውሂብ ጎታ ግንኙነት
 NoTemplateDefined=ለዚህ ኢሜይል አይነት ምንም አብነት የለም።
 AvailableVariables=የሚገኙ ተለዋዋጮች
@@ -37,6 +37,7 @@ Translation=ትርጉም
 Translations=ትርጉሞች
 CurrentTimeZone=TimeZone PHP (አገልጋይ)
 EmptySearchString=ባዶ ያልሆነ የፍለጋ መስፈርት ያስገቡ
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=የቀን መስፈርት ያስገቡ
 NoRecordFound=ምንም መዝገብ አልተገኘም።
 NoRecordDeleted=ምንም መዝገብ አልተሰረዘም
@@ -45,6 +46,7 @@ NoError=ምንም ስህተት የለም።
 Error=ስህተት
 Errors=ስህተቶች
 ErrorFieldRequired=መስክ '%s ያስፈልጋል
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=መስክ '%s መጥፎ እሴት አለው
 ErrorFileDoesNotExists=ፋይል %s የለም
 ErrorFailedToOpenFile=ፋይልን መክፈት አልተሳካም %s
@@ -308,6 +310,7 @@ DateBuild=የግንባታ ቀን ሪፖርት ያድርጉ
 DatePayment=የሚከፈልበት ቀን
 DateApprove=የፀደቀበት ቀን
 DateApprove2=የጸደቀበት ቀን (ሁለተኛ ማረጋገጫ)
+PendingSince=Pending since
 RegistrationDate=የምዝገባ ቀን
 UserCreation=የፍጥረት ተጠቃሚ
 UserModification=የማሻሻያ ተጠቃሚ
@@ -495,7 +498,7 @@ ActionRunningNotStarted=መጀመር
 ActionRunningShort=በሂደት ላይ
 ActionDoneShort=ጨርሷል
 ActionUncomplete=ያልተሟላ
-LatestLinkedEvents=የቅርብ ጊዜ %s የተገናኙ ክስተቶች
+LatestLinkedEvents=The last %s events
 CompanyFoundation=ኩባንያ / ድርጅት
 Accountant=አካውንታንት
 ContactsForCompany=የዚህ ሶስተኛ ወገን እውቂያዎች
@@ -503,6 +506,7 @@ ContactsAddressesForCompany=የዚህ ሶስተኛ ወገን እውቂያዎች/
 AddressesForCompany=የዚህ ሶስተኛ ወገን አድራሻዎች
 ActionsOnCompany=የዚህ ሶስተኛ ወገን ክስተቶች
 ActionsOnContact=የዚህ እውቂያ/አድራሻ ክስተቶች
+ActionsOnUser=Events for this user
 ActionsOnContract=ለዚህ ውል ዝግጅቶች
 ActionsOnMember=ስለዚህ አባል ክስተቶች
 ActionsOnProduct=ስለዚህ ምርት ክስተቶች
@@ -720,6 +724,8 @@ TextUsedInTheMessageBody=የኢሜል አካል
 SendAcknowledgementByMail=የማረጋገጫ ኢሜይል ላክ
 SendMail=ኢሜይል ላክ
 Email=ኢሜይል
+EMail=Email
+EMails=Emails
 NoEMail=ኢሜይል የለም።
 AlreadyRead=አስቀድመው አንብበዋል
 NotRead=ያልተነበበ
@@ -792,7 +798,7 @@ Notes=ማስታወሻዎች
 AddNewLine=አዲስ መስመር ያክሉ
 AddFile=ፋይል አክል
 FreeZone=ነፃ የጽሑፍ ምርት
-FreeLineOfType=የነጻ ጽሑፍ ንጥል፣ አይነት፡
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=ክሎን ነገር ከዋና ዋና ባህሪያቱ ጋር
 ReGeneratePDF=ፒዲኤፍን እንደገና ፍጠር
 PDFMerge=ፒዲኤፍ ውህደት
@@ -878,12 +884,14 @@ toward=ወደ
 Access=መዳረሻ
 SelectAction=እርምጃ ይምረጡ
 SelectTargetUser=ኢላማ ተጠቃሚ/ሰራተኛ ይምረጡ
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=ወደ ቅንጥብ ሰሌዳ ለመቅዳት Ctrl+C ይጠቀሙ
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=ኦሪጅናል የፋይል ስም
 SetDemandReason=ምንጭ አዘጋጅ
 SetBankAccount=የባንክ ሂሳብን ይግለጹ
 AccountCurrency=የመለያ ምንዛሬ
+AccountancyCode=Accounting Code
 ViewPrivateNote=ማስታወሻዎችን ይመልከቱ
 XMoreLines=%s መስመር(ዎች) ተደብቋል
 ShowMoreLines=ብዙ/ያነሱ መስመሮችን አሳይ
@@ -924,6 +932,7 @@ ConfirmMassDeletionQuestion=እርግጠኛ ነዎት %s የተመረጠውን 
 ConfirmMassClone=የጅምላ ክሎኑ ማረጋገጫ
 ConfirmMassCloneQuestion=ለመዝለል ፕሮጀክት ይምረጡ
 ConfirmMassCloneToOneProject=ክሎኑን ወደ ፕሮጀክት %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=ተዛማጅ ነገሮች
 ClassifyBilled=የሚከፈልበትን መድብ
 ClassifyUnbilled=ያልተከፈለበትን መድብ
@@ -960,10 +969,11 @@ PrivateDownloadLinkDesc=መግባት አለብህ እና ፋይሉን ለማየ
 Download=አውርድ
 DownloadDocument=ሰነድ አውርድ
 DownloadSignedDocument=የተፈረመ ሰነድ ያውርዱ
-ActualizeCurrency=የምንዛሬ ተመን ያዘምኑ
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=የበጀት ዓመት
 ModuleBuilder=ሞጁል እና መተግበሪያ ገንቢ
 SetMultiCurrencyCode=ምንዛሬ አዘጋጅ
+SetMultiCurrencyRate=Set currency rate
 BulkActions=የጅምላ ድርጊቶች
 ClickToShowHelp=የመሳሪያ ምክር እገዛን ለማሳየት ጠቅ ያድርጉ
 WebSite=ድህረገፅ
@@ -1103,6 +1113,7 @@ PayedBy=የተከፈለው በ
 PayedTo=ተከፍሏል።
 Monthly=ወርሃዊ
 Quarterly=በየሩብ ዓመቱ
+Quarter=Quarter
 Annual=አመታዊ
 Local=አካባቢያዊ
 Remote=የርቀት
@@ -1145,6 +1156,7 @@ ContactDefault_project_task=ተግባር
 ContactDefault_propal=ፕሮፖዛል
 ContactDefault_supplier_proposal=የአቅራቢ ፕሮፖዛል
 ContactDefault_ticket=ትኬት
+ContactDefault_societe=Third party
 ContactAddedAutomatically=እውቂያ ከሶስተኛ ወገን የእውቂያ ሚናዎች ታክሏል።
 More=ተጨማሪ
 ShowDetails=ዝርዝሩን አሳይ
@@ -1187,6 +1199,8 @@ SetSupervisor=ተቆጣጣሪውን ያዘጋጁ
 CreateExternalUser=የውጭ ተጠቃሚን ይፍጠሩ
 ConfirmAffectTag=የጅምላ መለያ ምደባ
 ConfirmAffectUser=የጅምላ ተጠቃሚ ምደባ
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=በእያንዳንዱ ፕሮጀክት/እድል ላይ የተሰጠ ሚና
 TasksRole=በእያንዳንዱ ተግባር ላይ የተሰጠ ሚና (ጥቅም ላይ ከዋለ)
 ConfirmSetSupervisor=የጅምላ ሱፐርቫይዘር አዘጋጅ
@@ -1238,6 +1252,9 @@ CommercialsAffected=የሽያጭ ተወካዮች ተመድበዋል
 CommercialAffected=የሽያጭ ተወካይ ተመድቧል
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=መልእክትህ
 YourMessageHasBeenReceived=መልእክትህ ደርሷል። በተቻለ ፍጥነት መልስ እንሰጥዎታለን ወይም እናገኝዎታለን።
 UrlToCheck=ለመፈተሽ ዩአርኤል
@@ -1280,6 +1297,7 @@ AmountSalary=የደመወዝ መጠን
 InvoiceSubtype=የክፍያ መጠየቂያ ንዑስ ዓይነት
 ConfirmMassReverse=የጅምላ ተገላቢጦሽ ማረጋገጫ
 ConfirmMassReverseQuestion=እርግጠኛ ነዎት %s የተመረጠውን መዝገብ(ዎች) መቀልበስ ይፈልጋሉ?
+ConfirmActionXxx=Confirm action %s
 ElementType=Element type
 ElementId=Element Id
 Encrypted=Encrypted
@@ -1299,3 +1317,35 @@ AllEntities=All entities
 TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
+auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/am_ET/members.lang b/htdocs/langs/am_ET/members.lang
index 1d2b3190309..8141addf5be 100644
--- a/htdocs/langs/am_ET/members.lang
+++ b/htdocs/langs/am_ET/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=የደንበኝነት ምዝገባ የሚያስፈል
 DeleteType=ሰርዝ
 VoteAllowed=ድምጽ መስጠት ተፈቅዷል
 Physical=ግለሰብ
-Moral=ኮርፖሬሽን
-MorAndPhy=ኮርፖሬሽን እና ግለሰብ
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=እንደገና አንቃ
 ExcludeMember=አባል አግልል።
 Exclude=አያካትትም።
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=የአባላት ስታቲስቲክስ በክልል
 NbOfMembers=ጠቅላላ የአባላት ብዛት
 NbOfActiveMembers=አጠቃላይ የአሁን ንቁ አባላት ብዛት
 NoValidatedMemberYet=ምንም የተረጋገጡ አባላት አልተገኙም።
-MembersByCountryDesc=ይህ ማያ ገጽ የአባላትን ስታቲስቲክስ በአገሮች ያሳየዎታል። ግራፎች እና ገበታዎች በጎግል ኦንላይን ግራፍ አገልግሎት እና እንዲሁም የሚሰራ የበይነመረብ ግንኙነት መኖር ላይ የተመካ ነው።
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=ይህ ስክሪን በክፍለ ሃገር/በክልሎች/በካንቶን የአባላትን ስታቲስቲክስ ያሳየዎታል።
 MembersByTownDesc=ይህ ማያ ገጽ በከተማ የአባላትን ስታቲስቲክስ ያሳየዎታል።
 MembersByNature=ይህ ማያ ገጽ በተፈጥሮው የአባላትን ስታቲስቲክስ ያሳየዎታል።
@@ -208,25 +209,25 @@ NewMemberbyWeb=አዲስ አባል ታክሏል። መጽደቅን በመጠባ
 NewMemberForm=አዲስ የአባልነት ቅጽ
 SubscriptionsStatistics=የአስተዋጽዖዎች ስታቲስቲክስ
 NbOfSubscriptions=የመዋጮዎች ብዛት
-AmountOfSubscriptions=ከመዋጮ የተሰበሰበ መጠን
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=ማዞሪያ (ለድርጅት) ወይም በጀት (ለመሠረት)
-DefaultAmount=ነባሪ መዋጮ መጠን (በአባል ዓይነት ደረጃ ምንም መጠን ካልተገለጸ ብቻ ጥቅም ላይ ይውላል)
-MinimumAmount=ዝቅተኛው መጠን (የመዋጮ መጠን ነጻ ሲሆን ብቻ ጥቅም ላይ ይውላል)
-CanEditAmount=የደንበኝነት ምዝገባ መጠን በአባሉ ሊገለጽ ይችላል።
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=ጎብኚው የአባላት አይነት ምንም ይሁን ምን የአስተዋጽኦውን መጠን መምረጥ/ማርትዕ ይችላል።
 AmountIsLowerToMinimumNotice=መጠኑ ከዝቅተኛው %s ያነሰ ነው
 MEMBER_NEWFORM_PAYONLINE=ከመስመር ላይ ምዝገባ በኋላ በራስ ሰር ወደ የመስመር ላይ ክፍያ ገጽ ይቀይሩ
 ByProperties=በተፈጥሮ
 MembersStatisticsByProperties=የአባላት ስታቲስቲክስ በተፈጥሮ
-VATToUseForSubscriptions=ለመዋጮዎች የሚውል የተእታ መጠን
-NoVatOnSubscription=ለመዋጮዎች ተ.እ.ታ የለም።
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=ለመዋጮ መስመር ወደ ደረሰኝ የሚያገለግል ምርት፡ %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=ስም ወይም ኩባንያ
 SubscriptionRecorded=አስተዋጽዖ ተመዝግቧል
 NoEmailSentToMember=ምንም ኢሜይል ወደ አባል አልተላከም።
 EmailSentToMember=ኢሜይል በ%s ላይ ለአባል ተልኳል
-SendReminderForExpiredSubscriptionTitle=ጊዜው ያለፈባቸው አስተዋጽዖዎች አስታዋሽ በኢሜይል ይላኩ።
-SendReminderForExpiredSubscription=አስተዋጽዖ ጊዜው ሊያበቃ ሲል ለአባላት አስታዋሽ በኢሜይል ይላኩ (ልኬቱ ማስታወሻውን ለመላክ አባልነት ከማብቃቱ የቀኖች ብዛት ነው። በሰሚኮሎን የሚለዩ የቀኖች ዝርዝር ሊሆን ይችላል፣ ለምሳሌ '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=አባልነት ለአሁኑ ጊዜ ይከፈላል (እስከ %s ድረስ)
 YouMayFindYourInvoiceInThisEmail=ደረሰኝህን ከዚህ ኢሜይል ጋር ተያይዘው ልታገኘው ትችላለህ
 XMembersClosed=%s አባል(ዎች) ተዘግቷል
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=ለእያንዳንዱ መዋጮ ደረሰኝ ለማ
 MemberFirstname=የአባል ስም
 MemberLastname=የአባት ስም
 MemberCodeDesc=የአባል ኮድ፣ ለሁሉም አባላት ልዩ
-MemberSubscriptionStartFirstDayOf=የአባልነት መጀመሪያ ቀን ከመጀመሪያ ቀን ጋር ይዛመዳል
-MemberSubscriptionStartAfter=የደንበኝነት ምዝገባው የሚጀምርበት ቀን ከመታደሱ በስተቀር (ለምሳሌ +3m = +3 ወራት፣ -5d = -5 ቀናት፣ +1Y = +1 ዓመት) ከመግባቱ በፊት ያለው ዝቅተኛ ጊዜ።
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/am_ET/salaries.lang b/htdocs/langs/am_ET/salaries.lang
index 56dabbef867..577b49519c5 100644
--- a/htdocs/langs/am_ET/salaries.lang
+++ b/htdocs/langs/am_ET/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=አዲስ ደመወዝ
 AddSalary=ደሞዝ ጨምር
 NewSalaryPayment=አዲስ የደመወዝ ካርድ
 AddSalaryPayment=የደመወዝ ክፍያ ጨምር
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=የደመወዝ ክፍያ
 SalariesPayments=የደመወዝ ክፍያዎች
 SalariesPaymentsOf=የ%s የደመወዝ ክፍያዎች
@@ -27,7 +29,7 @@ FillFieldFirst=መጀመሪያ የሰራተኛውን መስክ ይሙሉ
 UpdateAmountWithLastSalary=የመጨረሻውን የደመወዝ መጠን ያዘጋጁ
 MakeTransferRequest=የማስተላለፊያ ጥያቄ አቅርቡ
 VirementOrder=የብድር ማስተላለፍ ጥያቄ
-BankTransferAmount=የብድር ማስተላለፍ መጠን
 WithdrawalReceipt=የዱቤ ማስተላለፍ ትዕዛዝ
 OrderWaiting=በመጠባበቅ ላይ ያለ ትዕዛዝ
 FillEndOfMonth=በወሩ መጨረሻ ሙላ
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/am_ET/website.lang b/htdocs/langs/am_ET/website.lang
index 8b24e9054f0..e312d36f648 100644
--- a/htdocs/langs/am_ET/website.lang
+++ b/htdocs/langs/am_ET/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=ሌሎች ስሞችን/ተለዋጭ ስሞችን (ለምሳ
 WEBSITE_CSS_URL=የውጪ የሲኤስኤስ ፋይል URL
 WEBSITE_CSS_INLINE=የሲኤስኤስ ፋይል ይዘት (ለሁሉም ገጾች የተለመደ)
 WEBSITE_JS_INLINE=የጃቫስክሪፕት ፋይል ይዘት (ለሁሉም ገጾች የተለመደ)
-WEBSITE_HTML_HEADER=በኤችቲኤምኤል ራስጌ ስር መደመር (ለሁሉም ገጾች የተለመደ)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=ሮቦት ፋይል (robots.txt)
 WEBSITE_HTACCESS=የድር ጣቢያ .htaccess ፋይል
 WEBSITE_MANIFEST_JSON=የድረ-ገጽ manifest.json ፋይል
@@ -56,16 +56,17 @@ ReadPerm=አንብብ
 WritePerm=ጻፍ
 TestDeployOnWeb=በድር ላይ ሞክር/አሰማር
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=በውጫዊ የድር አገልጋይ የሚቀርበው የቨርቹዋል አስተናጋጅ ዩአርኤል አልተገለጸም።
 NoPageYet=እስካሁን ምንም ገጾች የሉም
 YouCanCreatePageOrImportTemplate=አዲስ ገጽ መፍጠር ወይም ሙሉ የድር ጣቢያ አብነት ማስመጣት ይችላሉ።
 SyntaxHelp=በተወሰኑ የአገባብ ምክሮች ላይ እገዛ
 YouCanEditHtmlSourceckeditor=በአርታዒ ውስጥ ያለውን "ምንጭ" ቁልፍን በመጠቀም የኤችቲኤምኤል ምንጭ ኮድን ማርትዕ ይችላሉ።
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=ከማጋራት አገናኝ ጋር ለተጋራ ምስል (የፋይል ማጋሪያ ሃሽ ቁልፍን በመጠቀም ክፈት መዳረሻ)፣ አገባብ የሚከተለው ነው፡<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;<span class='070translate'd </span><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=ክሎን ገጽ/መያዣ
 CloneSite=Clone ጣቢያ
@@ -87,15 +88,15 @@ WebsiteAccount=የድር ጣቢያ መለያ
 WebsiteAccounts=የድር ጣቢያ መለያዎች
 AddWebsiteAccount=የድር ጣቢያ መለያ ይፍጠሩ
 BackToListForThirdParty=ለሶስተኛ ወገኖች ወደ ዝርዝር ተመለስ
-DisableSiteFirst=መጀመሪያ ድር ጣቢያ አሰናክል
+DisableSiteFirst=Put website offline first
 MyContainerTitle=የእኔ የድር ጣቢያ ርዕስ
 AnotherContainer=የሌላ ገጽ/ኮንቴይነር ይዘትን እንዴት ማካተት እንደሚቻል ነው (የተቀየረ ንኡስ ኮንቴይነር ላይኖር ስለሚችል ተለዋዋጭ ኮድ ካነቁ እዚህ ስህተት ሊኖርዎት ይችላል)
 SorryWebsiteIsCurrentlyOffLine=ይቅርታ፣ ይህ ድር ጣቢያ በአሁኑ ጊዜ ከመስመር ውጭ ነው። እባክህ በኋላ ተመለስ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=ለእያንዳንዱ ድር ጣቢያ / ሶስተኛ ወገን የድረ-ገጽ መለያዎችን (መግባት / ማለፊያ) ለማከማቸት ሰንጠረዡን ያንቁ
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=መጀመሪያ ነባሪውን መነሻ ገጽ መግለፅ አለብህ
-OnlyEditionOfSourceForGrabbedContentFuture=ማስጠንቀቂያ፡- የውጭ ድረ-ገጽን በማስመጣት ድረ-ገጽ መፍጠር ልምድ ላላቸው ተጠቃሚዎች የተጠበቀ ነው። እንደ ምንጭ ገጽ ውስብስብነት፣ የማስመጣት ውጤት ከመጀመሪያው ሊለያይ ይችላል። እንዲሁም የምንጭ ገጹ የተለመዱ የሲኤስኤስ ስታይል ወይም እርስ በርስ የሚጋጩ ጃቫስክሪፕት የሚጠቀም ከሆነ በዚህ ገጽ ላይ ሲሰራ የድረ-ገጽ አርታኢውን ገጽታ ወይም ገፅታዎች ሊሰብር ይችላል። ይህ ዘዴ ገጽ ለመፍጠር ፈጣኑ መንገድ ነው ነገር ግን አዲሱን ገጽዎን ከባዶ ወይም ከተጠቆመው ገጽ አብነት ለመፍጠር ይመከራል።<br>እንዲሁም የውስጠ-መስመር አርታኢው ላይሰራ እንደሚችል ልብ ይበሉ። በተያዘ ውጫዊ ገጽ ላይ ጥቅም ላይ ሲውል ትክክለኛነት.
-OnlyEditionOfSourceForGrabbedContent=ይዘት ከውጭ ጣቢያ ሲነጠቅ የኤችቲኤምኤል ምንጭ እትም ብቻ ነው የሚቻለው
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=እንዲሁም በ css እና ገጽ ላይ የተገኙ ምስሎችን ይያዙ።
 ImagesShouldBeSavedInto=ምስሎች ወደ ማውጫ ውስጥ መቀመጥ አለባቸው
 WebsiteRootOfImages=ለድር ጣቢያ ምስሎች ስርወ ማውጫ
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Remove filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Categories
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index cedb112c526..f27a9f3269e 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=طباعة مرجع وفترة عنصر المنتج في PDF
-BoldLabelOnPDF=طباعة الملصق الخاص بمنتج المنتج بالخط العريض في ملف PDF
+BoldRefAndPeriodOnPDF=طباعة المرجع وفترة المنتج بصيغة المستندات المنقولة -PDF-
+BoldLabelOnPDF=طباعة ملصق المنتج بخط عريض في ملف صيغة المستندات المنقولة -PDF-
 Foundation=أساس
 Version=الإصدار
 Publisher=الناشر
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=لقد نجح فحص سلامة الملفا
 FileIntegritySomeFilesWereRemovedOrModified=فشل فحص سلامة الملفات. تم تعديل بعض الملفات أو إزالتها أو إضافتها.
 GlobalChecksum=تفحص نهائي عام
 MakeIntegrityAnalysisFrom=إجراء تحليل سلامة لملفات التطبيق من
-LocalSignature=توقيع محلي مضمن (أقل موثوقية)
-RemoteSignature=التوقيع عن بعد (أكثر موثوقية)
+LocalSignature=توقيع محلي مضمن
+RemoteSignature=توقيع بعيد بعيد
 FilesMissing=ملفات مفقودة
 FilesUpdated=ملفات محدثة
 FilesModified=ملفات معدلة
@@ -89,7 +89,7 @@ NotAvailableWhenAjaxDisabled=غير متوفر عندما يكون أجاكس م
 AllowToSelectProjectFromOtherCompany=في مستند تابع لطرف ثالث ، يمكن اختيار مشروع مرتبط بجهة خارجية أخرى
 TimesheetPreventAfterFollowingMonths=منع وقت التسجيل المستغرق بعد عدد الأشهر التالية
 PROJECT_DISPLAY_LINKED_BY_CONTACT=عرض مشروع المرتبط بجهة اتصال مشتركة
-PROJECT_DISPLAY_LINKED_BY_CONTACT_help=This option adds a new list on Project tab with all projects linked to thirdparty via a contact relationship
+PROJECT_DISPLAY_LINKED_BY_CONTACT_help=يضيف هذا الخيار قائمة جديدة في نافذة مشروع تحتوي على جميع المشاريع المرتبطة بأطراف خارجية عبر علاقة جهة اتصال
 JavascriptDisabled=الجافا سكربت معطل
 UsePreviewTabs=إستخدم زر المعاينة
 ShowPreview=آظهر المعاينة
@@ -226,14 +226,14 @@ CompatibleUpTo=متوافق مع الإصدار %s
 NotCompatible=لا تبدو هذه الوحدة متوافقة مع Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=تتطلب هذه الوحدة تحديثًا لـ Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=انظر في السوق
-SeeSetupOfModule=انظر إعداد وحدة٪ الصورة
+SeeSetupOfModule=انظر إلى إعداد الوحدة %s
 SeeSetupPage=راجع صفحة الإعداد على %s
 SeeReportPage=راجع صفحة التقرير على %s
 SetOptionTo=اضبط الخيار <b> %s </b> على %s
 Updated=محدث
 AchatTelechargement=شراء / تنزيل
 GoModuleSetupArea=لنشر / تثبيت وحدة نمطية جديدة ، انتقل إلى منطقة إعداد الوحدة النمطية: <a href="%s"> %s </a>.
-DoliStoreDesc=DoliStore ، في السوق الرسمي لتخطيط موارد المؤسسات وحدات Dolibarr / خارجي إدارة علاقات العملاء
+DoliStoreDesc=سوق دولي -DoliStore- ، هو السوق الرسمي لنظام تخطيط موارد المؤسسات دوليبار -Dolibarr ERP/CRM- الذي تجد فيه الوحدات اﻹضافية الخارجية
 DoliPartnersDesc=قائمة الشركات التي تقدم وحدات أو ميزات مطورة حسب الطلب. <br> ملاحظة: نظرًا لأن Dolibarr هو تطبيق مفتوح المصدر ، فإن <i> أي شخص لديه خبرة في برمجة PHP يجب أن يكون قادرًا على تطوير وحدة نمطية.
 WebSiteDesc=مواقع الويب الخارجية لمزيد من الوحدات الإضافية (غير الأساسية) ...
 DevelopYourModuleDesc=بعض الحلول لتطوير الوحدة الخاصة بك ...
@@ -250,8 +250,8 @@ Required=مطلوب
 UsedOnlyWithTypeOption=المستخدمة من قبل بعض خيار جدول فقط
 Security=الأمن
 Passwords=كلمة السر
-DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=تشفير كلمة مرور قاعدة البيانات المخزنة في ملف conf.php. يوصى بشدة بتنشيط هذا الخيار.
+DoNotStoreClearPassword=كلمات المرور المشفرة مخزنة في قاعدة البيانات.
+MainDbPasswordFileConfEncrypted=قم بإخفاء كلمة مرور قاعدة البيانات المخزنة في ملف الإعدادات conf.php. يوصى بتنشيط هذا الخيار.
 InstrucToEncodePass=لديك كلمة السر المشفرة في ملف <b>conf.php،</b> استبدال الخط <br> <b>$ dolibarr_main_db_pass = "..."؛</b> <br> بواسطة <br> <b>$ dolibarr_main_db_pass = "crypted:٪ ليالي".</b>
 InstrucToClearPass=لديك كلمة مرور فك الشفرة (واضح) في ملف <b>conf.php،</b> استبدال الخط <br> <b>$ dolibarr_main_db_pass = "crypted: ...".</b> <br> بواسطة <br> <b>$ dolibarr_main_db_pass = "%s".</b>
 ProtectAndEncryptPdfFiles=حماية صيغة المستندات المتنقلة . غير منصوح به لانه يوقف التوليد الكمي للملفات بصيغة المستندات المتنقلة
@@ -303,13 +303,13 @@ MAIN_MAIL_AUTOCOPY_TO= نسخ (نسخة كربونية) كل رسائل البر
 MAIN_DISABLE_ALL_MAILS=تعطيل جميع عمليات إرسال البريد الإلكتروني (لأغراض الاختبار أو العروض التوضيحية)
 MAIN_MAIL_FORCE_SENDTO=إرسال جميع رسائل البريد الإلكترونية الى (بدلا عن المستلم الحقيقي لاغراض التطوير والتجربة)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=اقتراح عناوين بريد الموظفين الإلكتروني (إذا كان موجودا) في حقل المستلمين عند ارنشاء رسالة بريد جديدة
-MAIN_MAIL_NO_WITH_TO_SELECTED=Disable the selection of a default recipient when writing an email, even if there is only 1 possible choice
+MAIN_MAIL_NO_WITH_TO_SELECTED=تعطيل اختيار المستلم الافتراضي عند كتابة بريد إلكتروني، حتى لو كان هناك خيار 1 فقط ممكن
 MAIN_MAIL_SENDMODE=طريقة الإرسال
-MAIN_MAIL_SMTPS_ID=SMTP username or ID (if sending server requires an authentication)
-MAIN_MAIL_SMTPS_PW=SMTP password or token (if sending server requires an authentication)
+MAIN_MAIL_SMTPS_ID=اسم مستخدم أو معرف بروتوكول نقل البريد البسيط -SMTP- (إذا كان الخادم المرسل يطالب بالمصادقة)
+MAIN_MAIL_SMTPS_PW=كلمة مرور أو رمز بروتوكول نقل البريد البسيط -SMTP- (إذا كان الخادم المرسل يطالب بالمصادقة)
 MAIN_MAIL_EMAIL_TLS=استخدم تشفير TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=استخدم تشفير TLS (STARTTLS)
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Allow connection to mail servers that are using self-signed certificates
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=السماح بالاتصال بخوادم البريد التي تستخدم شهادات موقعة ذاتيًا
 MAIN_MAIL_EMAIL_DKIM_ENABLED=استخدم DKIM لإنشاء توقيع البريد الإلكتروني
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=مجال البريد الإلكتروني للاستخدام مع dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=اسم محدد dkim
@@ -343,7 +343,7 @@ MenuHandlers=قائمة مناولي
 MenuAdmin=قائمة تحرير
 DoNotUseInProduction=لا تستخدمها مع المنتج
 ThisIsProcessToFollow=إجراء الترقية:
-ThisIsAlternativeProcessToFollow=This is an alternative deployment process you can run manually:
+ThisIsAlternativeProcessToFollow=هذه عملية نشر بديلة يمكنك تشغيلها يدويًا:
 StepNb=الخطوة %s
 FindPackageFromWebSite=ابحث عن حزمة توفر الميزات التي تحتاجها (على سبيل المثال على موقع الويب الرسمي %s).
 DownloadPackageFromWebSite=قم بتنزيل الحزمة (على سبيل المثال من موقع الويب الرسمي %s).
@@ -374,8 +374,8 @@ GenericMaskCodes4c=<u>مثال على المنتج الذي تم إنشاؤه ب
 GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
 GenericMaskCodes5b=<b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=العودة للتخصيص وفقا لعدد محدد القناع.
-DateStartThatModel=Disable use of this numbering rule for all thirdparties created before
-DateStartThatModelHelp=You can disable elephant numbering rule for thirdparties created before a date (for example, because they were imported by a migration, from another software using a different rule). Let that field empty to have the rule applied on all thirdparties.
+DateStartThatModel=تعطيل استخدام قاعدة الترقيم هذه لجميع الجهات الخارجية التي تم إنشاؤها قبل
+DateStartThatModelHelp=يمكنك تعطيل قاعدة ترقيم الفيل -الترقيم الفريد- للجهات الخارجية التي تم إنشاؤها قبل تاريخ معين (على سبيل المثال، لأنها تم استيرادها بواسطة عملية ترحيل، من برنامج آخر يستخدم قاعدة مختلفة). اترك هذا الحقل فارغًا لتطبيق القاعدة على جميع الجهات الخارجية.
 ServerAvailableOnIPOrPort=الخدمة متاحة في معالجة <b>٪ ق %s</b> على الميناء
 ServerNotAvailableOnIPOrPort=الخدمة غير متاحة في التصدي <b>٪ ق %s</b> على الميناء
 DoTestServerAvailability=اختبار خدمة التوصيل
@@ -397,7 +397,7 @@ LanguageFile=ملف اللغة
 ExamplesWithCurrentSetup=أمثلة مع التكوين الحالي
 ListOfDirectories=قائمة الدلائل المفتوحة قوالب
 ListOfDirectoriesForModelGenODT=قائمة الدلائل التي تحتوي على قوالب ملفات مع شكل المفتوحة. <br><br> ضع هنا المسار الكامل من الدلائل. <br> إضافة إرجاع بين الدليل ايه. <br> لإضافة دليل وحدة GED، أضيف هنا <b>DOL_DATA_ROOT / ECM / yourdirectoryname.</b> <br><br> الملفات في هذه الدلائل يجب أن ينتهي <b>.odt</b> أو <b>.ods.</b>
-NumberOfModelFilesFound=Number of ODT/ODS template files found
+NumberOfModelFilesFound=عدد ملفات القوالب بصيغة -ODT/ODS- التي تم العثور عليها
 ExampleOfDirectoriesForModelGen=أمثلة على بناء الجملة: <br> c: \\ myapp \\ mydocumentdir \\ mysubdir <br> / home / myapp / mydocumentdir / mysubdir <br> DOL_DATA_ROOT / ecm / ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> لمعرفة كيفية إنشاء قوالب المستند ODT، قبل تخزينها في تلك الدلائل، وقراءة وثائق ويكي:
 FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
@@ -458,16 +458,17 @@ ExtrafieldSelect=Select list
 ExtrafieldSelectList=Select from table
 ExtrafieldSeparator=فاصل (ليس حقلاً)
 ExtrafieldPassword=الرمز السري
-ExtrafieldRadio=Radio buttons (1 choice only)
-ExtrafieldCheckBox=Select list (n choices)
-ExtrafieldCheckBoxFromList=Select from table (n choices)
+ExtrafieldRadio=أزرار الاختيار (اختيار 1 فقط)
+ExtrafieldCheckBox=حدد القائمة (عدد الخيارات)
+ExtrafieldCheckBoxFromList=اختر من الجدول (عدد الخيارات)
 ExtrafieldLink=رابط إلى كائن
-ExtrafieldPointGeo=Geometric Point
-ExtrafieldMultiPointGeo=Geometric Multi Point
-ExtrafieldLinestringGeo=Geometric Linestring
-ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldPointGeo=نقطة هندسية
+ExtrafieldMultiPointGeo=نقاط هندسية متعددة
+ExtrafieldLinestringGeo=خط هندسي
+ExtrafieldPolygonGeo=مضلع هندسي
+ExtrafieldStars=النجوم
 ComputedFormula=المجال المحسوب
-ComputedFormulaDesc=يمكنك إدخال صيغة هنا باستخدام خصائص أخرى للكائن أو أي ترميز PHP للحصول على قيمة محسوبة ديناميكية. يمكنك استخدام أي صيغ متوافقة مع PHP بما في ذلك "؟" عامل تشغيل الحالة، و الكائن العام التالي: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield </strong>.<br><strong>تحذير</strong> : إذا كنت بحاجة إلى خصائص كائن لم يتم تحميله، فما عليك سوى جلب الكائن إلى الصيغة الخاصة بك كما في المثال الثاني.<br>يعني استخدام حقل محسوب أنه يمكنك' أدخل بنفسك أي قيمة من الواجهة. وأيضًا، إذا كان هناك خطأ في بناء الجملة، فقد لا تُرجع الصيغة شيئًا.<br><br>مثال على الصيغة:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>مثال لإعادة تحميل الكائن<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj- >capital / 5: '-1')<br><br>مثال آخر لصيغة فرض تحميل الكائن و كائنه الأصلي:<br>(($reloadedobj = new مهمة($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($ Secondloadedobj = جديد مشروع($db)) && ($ Secondloadedobj->fetchNoCompute($reloadedobj) ->fk_project) > 0)) ؟ $ Secondloadedobj->ref: 'لم يتم العثور على الأصل مشروع'
+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'
 Computedpersistent=تخزين المجال المحسوب
 ComputedpersistentDesc=سيتم تخزين الحقول الإضافية المحسوبة في قاعدة البيانات ، ومع ذلك ، سيتم إعادة حساب القيمة فقط عند تغيير كائن هذا الحقل. إذا كان الحقل المحسوب يعتمد على كائنات أخرى أو بيانات عالمية ، فقد تكون هذه القيمة خاطئة !!
 ExtrafieldParamHelpPassword=ترك هذا الحقل فارغًا يعني أنه سيتم تخزين هذه القيمة بدون تشفير (يتم إخفاء الحقل فقط بالنجوم على الشاشة).<br><br>أدخل القيمة "dolcrypt" لتشفير القيمة باستخدام خوارزمية تشفير قابلة للعكس. لا يزال من الممكن معرفة البيانات الواضحة و وتحريرها ولكن يتم تشفيرها في قاعدة البيانات.<br><br> أدخل "تلقائي" (أو "md5"، "sha256"، "password_hash"، ...) لاستخدام خوارزمية تشفير كلمة المرور الافتراضية (أو md5، sha256،password_hash...) لحفظ كلمة المرور المجزأة غير القابلة للعكس في قاعدة البيانات (لا توجد طريقة لاسترداد القيمة الأصلية)
@@ -514,16 +515,16 @@ ModuleCompanyCodeSupplierDigitaria=%s متبوعًا باسم المورد ال
 Use3StepsApproval=بشكل افتراضي ، يجب إنشاء أوامر الشراء والموافقة عليها من قبل مستخدمين مختلفين (خطوة واحدة / مستخدم للإنشاء وخطوة واحدة / مستخدم للموافقة. لاحظ أنه إذا كان لدى المستخدم إذن للإنشاء والموافقة ، فستكون خطوة واحدة / مستخدم كافية) . يمكنك أن تطلب من خلال هذا الخيار تقديم خطوة ثالثة / موافقة مستخدم ، إذا كان المبلغ أعلى من قيمة مخصصة (لذلك ستكون 3 خطوات ضرورية: 1 = التحقق من الصحة ، 2 = الموافقة الأولى و 3 = الموافقة الثانية إذا كان المبلغ كافياً). <br> اضبط هذا على فارغ إذا كانت موافقة واحدة (خطوتان) كافية ، اضبطه على قيمة منخفضة جدًا (0.1) إذا كانت الموافقة الثانية (3 خطوات) مطلوبة دائمًا.
 UseDoubleApproval=استخدم موافقة من 3 خطوات عندما يكون المبلغ (بدون ضريبة) أعلى من ...
 WarningPHPMail=NOTICE: The setup to send emails from the application is using the default generic setup (called "%s"). This choice needs no technical knowledge and no particular setup.<br>However, it is often better to setup outgoing emails to use the other method (called "%s") to use the email server of your Email Service Provider, instead of the default setup for several reasons:
-WarningPHPMailA=- Using the server of the Email Service Provider increases the trustworthiness of your email, so it increases the deliverability without being flagged as SPAM
-WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into myname@mymaildomain.com) is protected by a SPF + a DMARC record, your email may be flagged as SPAM because your DMARC rule defined into DNS zone of the domain of the sender (mymaildomain.com) does not allow the sending as a generic sender. In such a case, you must disable the DMARC for the domain (or set it to p=none like done by @gmail.com) or, better, if you have the technical knowledge, use the other method to send emails using the SMTP server of your own email provider.
+WarningPHPMailA=- يؤدي استخدام خادم مزود خدمة البريد الإلكتروني إلى زيادة موثوقية بريدك الإلكتروني، وبالتالي يزيد من إمكانية توصيله دون تصنيفه على أنه بريد عشوائي
+WarningPHPMailB=- إذا كان نطاق بريدك الإلكتروني (الجزء mymaildomain.com إلى myname@mymaildomain.com) محميًا بواسطة إطار عمل سياسة المرسل -SPF- و سجل بروتوكول مصادقة الرسائل مع النطاق و الإبلاغ عنها -DMARC-، فقد يتم تصنيف بريدك الإلكتروني على أنه عشوائي لأن سجل بروتوكول مصادقة الرسائل مع النطاق و الإبلاغ عنها -DMARC- المحددة في نظام أسماء النطاقات -DNS- لنطاق المرسل (mymaildomain.com) لا تسمح بالإرسال كمرسل عام. في مثل هذه الحالة، يجب تعطيل  بروتوكول مصادقة الرسائل مع النطاق و الإبلاغ عنها DMARC للنطاق (أو ضبطه على p=none كما فعلت @gmail.com) أو، والأفضل من ذلك، إذا كانت لديك المعرفة الفنية، استخدم الطريقة الأخرى لإرسال رسائل البريد الإلكتروني باستخدام خادم بروتوكول نقل البريد البسيط -SMTP- الخاص بمزود البريد الإلكتروني الخاص بك.
 WarningPHPMailC=- يعد استخدام خادم SMTP الخاص بموفر خدمة البريد الإلكتروني الخاص بك لإرسال رسائل البريد الإلكتروني أمرًا مثيرًا للاهتمام أيضًا ، لذا سيتم أيضًا حفظ جميع رسائل البريد الإلكتروني المرسلة من التطبيق في دليل "البريد المرسل" الخاص بصندوق البريد الخاص بك.
 WarningPHPMailD=ولذلك يوصى بتغيير طريقة إرسال رسائل البريد الإلكتروني إلى القيمة "SMTP".
 WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
-WarningPHPMail2=إذا كان موفر البريد الإلكتروني SMTP بحاجة إلى تقييد عميل البريد الإلكتروني لبعض عناوين IP (نادر جدًا) ، فهذا هو عنوان IP الخاص بوكيل مستخدم البريد (MUA) لتطبيق ERP CRM الخاص بك: <strong> %s </strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
-WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
-SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
-ActualMailDNSRecordFound=Actual %s record found (for email %s) : %s
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
+WarningPHPMailSPF=إذا كان اسم النطاق في عنوان البريد الإلكتروني للمرسل محميًا بسجل إطار عمل سياسة المرسل -SPF- (اسأل مسجل اسم النطاق الخاص بك عنه)، فيجب عليك إضافة عناوين بروتوكول الإنترنت -IP- التالية أو إدخالها في إطار عمل سياسة المرسل -SPF- الخاص بنظام أسماء النطاقات -DNS- الخاص بنطاقك:<strong>%s</strong>.
+WarningPHPMailSPFDMARC=إذا كان اسم النطاق في عنوان البريد الإلكتروني للمرسل محميًا بسجل بوتوكول مصادقة الرسائل مع النطاق و اﻹبلاغ عنها -DMARC- مختلف عن p=none (اسأل عنه مسجل اسم النطاق الخاص بك )، فيجب عليك إزالة بوتوكول مصادقة الرسائل مع النطاق و اﻹبلاغ عنها -DMARC-، أو تغييره إلى p=none مثل @gmail.com) أو استخدام طريقة إرسال أخرى.
+SPFAndDMARCInformation=سجل إطار عمل سياسة المرسل -SPF- و مصادقة الرسائل وإعداد التقارير والتوافق معها بناءً على النطاق -DMARK- في نظام أسماء النطاقات -DNS- لعناوين البريد الإلكتروني الرئيسية
+ActualMailDNSRecordFound=تم العثور على السجل الفعلي %s (للبريد %s) : %s
 ClickToShowDescription=انقر لإظهار الوصف
 DependsOn=تحتاج هذه الوحدة إلى الوحدة (الوحدات)
 RequiredBy=هذه الوحدة مطلوبة من قبل الوحدة (الوحدات)
@@ -544,7 +545,7 @@ WatermarkOnDraftExpenseReports=علامة مائية على مسودة تقار
 ProjectIsRequiredOnExpenseReports=المشروع إلزامي لإدخال تقرير المصاريف
 PrefillExpenseReportDatesWithCurrentMonth=قم بملء تاريخي البدء والانتهاء لتقرير المصاريف الجديد مسبقًا بتواريخ البدء والانتهاء للشهر الحالي
 ForceExpenseReportsLineAmountsIncludingTaxesOnly=فرض إدخال مبالغ تقرير المصاريف دائمًا مع الضرائب
-BlockExpenseReportLineCreationIfNotBetweenDates=Block line creation if the date of the added line is not in the expense report range
+BlockExpenseReportLineCreationIfNotBetweenDates=حظر إنشاء السطر إذا لم يكن تاريخ السطر المضاف ضمن نطاق تقرير المصروفات
 AttachMainDocByDefault=اضبط هذا على <b>نعم</b> إذا كنت تريد إرفاق المستند الرئيسي افتراضيًا بالبريد الإلكتروني (إن أمكن)
 FilesAttachedToEmail=أرفق ملف
 SendEmailsReminders=إرسال تذكير جدول الأعمال عن طريق رسائل البريد الإلكتروني
@@ -567,8 +568,8 @@ Module10Name=محاسبة (مبسطة)
 Module10Desc=تقارير محاسبية بسيطة (مجلات ، معدل دوران) بناءً على محتوى قاعدة البيانات. لا يستخدم أي جدول دفتر الأستاذ.
 Module20Name=مقترحات
 Module20Desc=مقترحات تجارية إدارة
-Module22Name=رسائل البريد الإلكتروني الجماعية
-Module22Desc=إدارة البريد الإلكتروني الجماعي
+Module22Name=حملة البريد الإلكتروني الجماعية
+Module22Desc=إدارة حملة البريد الإلكتروني الجماعية/الضخمة
 Module23Name=طاقة
 Module23Desc=مراقبة استهلاك الطاقة
 Module25Name=اوامر البيع
@@ -667,7 +668,7 @@ Module2200Desc=استخدم التعبيرات الرياضية للتوليد 
 Module2300Name=المهام المجدولة
 Module2300Desc=إدارة الوظائف المجدولة (الاسم المستعار كرون أو جدول كرونو)
 Module2400Name=الأحداث / الأجندة
-Module2400Desc=Manage manual and automatic events. Use the calendar to record events manually. Log also events automatically for tracking purposes or record manual events or meetings. This is the principal module for good Customer and/or Vendor Relationship Management.
+Module2400Desc=إدارة الأحداث اليدوية والآلية. استخدم التقويم لتسجيل الأحداث يدويًا. سجل الأحداث أيضًا تلقائيًا لأغراض التتبع أو سجل الأحداث أو الاجتماعات يدويًا. هذه هي الوحدة الأساسية لإدارة علاقات العملاء و/أو الموردين بشكل جيد.
 Module2430Name=جدولة المواعيد عبر الإنترنت
 Module2430Desc=يوفر نظام حجز المواعيد عبر الإنترنت. يتيح ذلك لأي شخص حجز موعد، وفقًا للنطاقات أو التوفر المحدد مسبقًا.
 Module2500Name=DMS / ECM
@@ -685,8 +686,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP التحويلات Maxmind القدرات
 Module3200Name=المحفوظات غير القابلة للتغيير
 Module3200Desc=تمكين سجل غير قابل للتغيير لأحداث العمل. يتم أرشفة الأحداث في الوقت الحقيقي. السجل هو جدول للقراءة فقط للأحداث المتسلسلة التي يمكن تصديرها. قد تكون هذه الوحدة إلزامية لبعض البلدان.
-Module3300Name=نموذج منشئ
-Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
+Module3300Name=منشئ الوحده
+Module3300Desc=أداة RAD (تطوير التطبيقات السريع - منخفض الكود وبدون كود) لمساعدة المطورين أو المستخدمين المتقدمين على بناء الوحدة / التطبيق الخاص بهم.
 Module3400Name=الشبكات الاجتماعية
 Module3400Desc=قم بتمكين حقول الشبكات الاجتماعية في عناوين وعناوين الأطراف الثالثة (سكايب ، تويتر ، فيسبوك ، ...).
 Module4000Name=HRM
@@ -800,7 +801,7 @@ Permission116=التحويلات بين الحسابات
 Permission117=إدارة إرسال الشيكات
 Permission121=قراءة الغير مرتبطة المستخدم
 Permission122=إنشاء / تغيير الغير مرتبطة المستخدم
-Permission122b=Not effective for external users (always limited to their third party).
+Permission122b=غير فعال للمستخدمين الخارجيين (يقتصر دائمًا على الطرف الثالث).
 Permission125=حذف الغير مرتبطة المستخدم
 Permission126=الصادرات الغير
 Permission130=إنشاء / تعديل معلومات الدفع الخاصة بأطراف ثالثة
@@ -847,10 +848,10 @@ Permission212=من أجل خطوط
 Permission213=تفعيل خط
 Permission214=إعداد الهاتف
 Permission215=الإعداد موفري
-Permission221=قراءة الرسائل
-Permission222=إنشاء / تعديل الرسائل (الموضوع، المتلقين ...)
-Permission223=التحقق من صحة الرسائل (يسمح بإرسال)
-Permission229=حذف الرسائل
+Permission221=قراءة رسائل البريد الإلكتروني الجماعية
+Permission222=إنشاء/تعديل رسائل البريد الإلكتروني الجماعية (الموضوع، المستلمون...)
+Permission223=التحقق من صحة رسائل البريد الإلكتروني الجماعية (يسمح بالإرسال)
+Permission229=حذف رسائل البريد الإلكتروني الجماعية
 Permission237=عرض المتلقين والمعلومات
 Permission238=إرسال الرسائل يدويا
 Permission239=حذف الرسائل بعد التحقق من صحة أو إرسالها
@@ -866,9 +867,9 @@ PermissionAdvanced253=إنشاء / تعديل المستخدمين خارجي /
 Permission254=حذف أو تعطيل المستخدمين الآخرين
 Permission255=إنشاء / تعديل بلده معلومات المستخدم
 Permission256=تعديل بنفسه كلمة المرور
-Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is linked as a sale representative).
-Permission262b=Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).
-Permission262c=Not effective for projects (only rules on project permissions, visibility and users assignment matter).
+Permission262=توسيع نطاق الوصول إلى جميع الأطراف الثالثة وكائناتها (وليس فقط الأطراف الثالثة التي يرتبط بها المستخدم كممثل مبيعات).
+Permission262b=غير فعال للمستخدمين الخارجيين (يقتصر دائمًا على أنفسهم بالنسبة للعروض والطلبات والفواتير والعقود وما إلى ذلك).
+Permission262c=غير فعال بالنسبة للمشاريع (فقط القواعد المتعلقة بأذونات المشروع والرؤية وتعيين المستخدمين مهمة).
 Permission263=قم بتوسيع الوصول إلى جميع الأطراف الثالثة بدون كائناتهم (ليس فقط الأطراف الثالثة التي يكون المستخدم ممثل بيع لها). <br> غير فعال للمستخدمين الخارجيين (يقتصر الأمر دائمًا على أنفسهم فيما يتعلق بالعروض والأوامر والفواتير والعقود وما إلى ذلك). <br> غير فعال للمشاريع (فقط القواعد المتعلقة بأذونات المشروع والرؤية ومسائل التعيين).
 Permission271=قراءة في كاليفورنيا
 Permission272=قراءة الفواتير
@@ -901,7 +902,7 @@ Permission401=قراءة خصومات
 Permission402=إنشاء / تعديل الخصومات
 Permission403=تحقق من الخصومات
 Permission404=حذف خصومات
-Permission431=Use Debug Bar
+Permission431=استخدم شريط التصحيح
 Permission511=اقرأ الرواتب والمدفوعات (لك ومرؤوسيك)
 Permission512=إنشاء / تعديل الرواتب والمدفوعات
 Permission514=حذف الرواتب والمدفوعات
@@ -928,12 +929,12 @@ Permission609=احذف الملصقات
 Permission611=اقرأ سمات المتغيرات
 Permission612=إنشاء / تحديث سمات المتغيرات
 Permission613=حذف سمات المتغيرات
-Permission651=Read Bills of Materials
-Permission652=Create/Update Bills of Materials
-Permission653=Delete Bills of Materials
-Permission661=Read Manufacturing Order (MO)
-Permission662=Create/Update Manufacturing Order (MO)
-Permission663=Delete Manufacturing Order (MO)
+Permission651=قراءة فواتير المواد
+Permission652=إنشاء/تحديث فواتير المواد
+Permission653=حذف فواتير المواد
+Permission661=قراءة أمر التصنيع (MO)
+Permission662=إنشاء/تحديث أمر التصنيع (MO)
+Permission663=حذف أمر التصنيع (MO)
 Permission701=قراءة التبرعات
 Permission702=إنشاء / تعديل والهبات
 Permission703=حذف التبرعات
@@ -945,7 +946,7 @@ Permission776=دفع نفقة تقارير
 Permission777=قراءة جميع تقارير المصاريف (حتى تلك الخاصة بالمستخدم وليس المرؤوسين)
 Permission778=إنشاء / تعديل تقارير المصروفات للجميع
 Permission779=تقارير حساب التصدير
-Permission1001=Read warehouses and stocks
+Permission1001=قراءة المستودعات والمخزونات
 Permission1002=إنشاء / تعديل المستودعات
 Permission1003=حذف المستودعات
 Permission1004=قراءة تحركات الأسهم
@@ -1005,7 +1006,7 @@ Permission2515=إعداد وثائق وأدلة
 Permission2610=إنشاء/تعديل مفتاح API للمستخدمين
 Permission2801=استخدام عميل FTP في وضع القراءة (تصفح وتحميل فقط)
 Permission2802=العميل استخدام بروتوكول نقل الملفات في وضع الكتابة (حذف أو تحميل الملفات)
-Permission3201=Read archived events and fingerprints
+Permission3201=قراءة الأحداث المؤرشفة والبصمات
 Permission3301=إنشاء وحدات جديدة
 Permission4001=اقرأ المهارة / الوظيفة / المنصب
 Permission4002=إنشاء / تعديل المهارة / الوظيفة / المنصب
@@ -1042,9 +1043,9 @@ Permission50152=تحرير بنود المبيعات
 Permission50153=تحرير سطور المبيعات المطلوبة
 Permission50201=قراءة المعاملات
 Permission50202=استيراد المعاملات
-Permission50331=Read objects of Zapier
-Permission50332=Create/Update objects of Zapier
-Permission50333=Delete objects of Zapier
+Permission50331=قراءة كائنات زابير -Zapier-
+Permission50332=إنشاء/تحديث كائنات زابير -Zapier-
+Permission50333=حذف كائنات زابير -Zapier-
 Permission50401=ربط المنتجات والفواتير بحسابات محاسبية
 Permission50411=قراءة العمليات في دفتر الأستاذ
 Permission50412=كتابة / تحرير العمليات في دفتر الأستاذ
@@ -1069,16 +1070,16 @@ Permission63002=إنشاء / تعديل الموارد
 Permission63003=حذف الموارد
 Permission63004=ربط الموارد بأحداث جدول الأعمال
 Permission64001=السماح بالطباعة المباشرة
-Permission67001=Allow printing of receipts
+Permission67001=السماح بطباعة الإيصالات
 Permission68001=قراءة تقرير intracomm
 Permission68002=إنشاء / تعديل تقرير intracomm
 Permission68004=حذف تقرير intracomm
-Permission941601=Read receptions
-Permission941602=Create and modify receptions
-Permission941603=Validate receptions
-Permission941604=Send receptions by email
-Permission941605=Export receptions
-Permission941606=Delete receptions
+Permission941601=قراءة اﻹيصالات
+Permission941602=إنشاء و تعديل الاستقبال
+Permission941603=التحقق من صحة الإيصالات
+Permission941604=إرسال اﻹيصالات عبر البريد الإلكتروني
+Permission941605=تصدير الإيصالات
+Permission941606=حذف الإيصالات
 DictionaryCompanyType=أنواع الجهات الخارجية
 DictionaryCompanyJuridicalType=الكيانات القانونية الخارجية
 DictionaryProspectLevel=المستوى المحتمل المحتمل للشركات
@@ -1105,6 +1106,7 @@ DictionaryStaff=عدد الموظفين
 DictionaryAvailability=تأخير تسليم
 DictionaryOrderMethods=طرق الطلب
 DictionarySource=أصل مقترحات / أوامر
+DictionaryAccountancyReport=تقارير محاسبية مخصصة
 DictionaryAccountancyCategory=مجموعات مخصصة للتقارير
 DictionaryAccountancysystem=نماذج للتخطيط للحسابات
 DictionaryAccountancyJournal=Accounting journals
@@ -1133,12 +1135,12 @@ BackToModuleList=العودة إلى قائمة الوحدات
 BackToDictionaryList=رجوع إلى قائمة القواميس
 TypeOfRevenueStamp=نوع الطابع الضريبي
 VATManagement=إدارة ضريبة المبيعات
-VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedStandard=عند إنشاء المستندات (العروض والفواتير والطلبات...)، يتم تعيين معدل ضريبة المبيعات الافتراضي وفقًا للقواعد القياسية (اعتمادًا على بلد البائع والمشتري)
+VATIsUsedDesc=افتراضيًا عند إنشاء العروض والفواتير والطلبات وما إلى ذلك، يتبع معدل ضريبة المبيعات القاعدة القياسية النشطة:<br> إذا لم يكن البائع خاضعًا لضريبة المبيعات، فإن ضريبة المبيعات تنتقل افتراضيًا إلى 0. نهاية القاعدة. <br>إذا كانت ولاية المشتري أو المقاطعة لديها قاعدة ضريبة القيمة المضافة من قاموس معدلات ضريبة القيمة المضافة، فهذا هو معدل ضريبة القيمة المضافة الافتراضي. نهاية القاعدة.<br> إذا كانت (دولة البائع = دولة المشتري)، فإن ضريبة المبيعات تساوي افتراضيًا ضريبة مبيعات المنتج في دولة البائع. نهاية القاعدة.<br> إذا كان البائع والمشتري في اﻹتحاد الأوروبي وكانت البضائع منتجات مرتبطة بالنقل (النقل البري والشحن وشركات الطيران)، فإن ضريبة القيمة المضافة الافتراضية هي 0. تعتمد هذه القاعدة على دولة البائع - يرجى استشارة المحاسب الخاص بك. يجب على المشتري دفع ضريبة القيمة المضافة إلى مكتب الجمارك في بلده وليس للبائع. نهاية القاعدة. <br>إذا كان البائع والمشتري في المجتمع الأوروبي ولم يكن المشتري شركة (برقم ضريبة القيمة المضافة المسجل داخل المجتمع)، فإن ضريبة القيمة المضافة تنتقل افتراضيًا إلى معدل ضريبة القيمة المضافة لبلد البائع. نهاية القاعدة. <br>إذا كان البائع والمشتري كلاهما في المجتمع الأوروبي وكان المشتري شركة (لديها رقم ضريبة القيمة المضافة داخل المجتمع الأوروبي مسجل)، فإن ضريبة القيمة المضافة تكون 0 افتراضيًا. نهاية القاعدة.<br> في أي حالة أخرى، يكون الافتراضي المقترح هو ضريبة المبيعات = 0. نهاية القاعدة.
 VATIsNotUsedDesc=بشكل افتراضي ، تكون ضريبة المبيعات المقترحة هي 0 والتي يمكن استخدامها في حالات مثل الجمعيات أو الأفراد أو الشركات الصغيرة.
 VATIsUsedExampleFR=في فرنسا ، يعني ذلك الشركات أو المؤسسات التي لديها نظام مالي حقيقي (حقيقي مبسط أو عادي حقيقي). نظام يتم فيه إعلان ضريبة القيمة المضافة.
 VATIsNotUsedExampleFR=في فرنسا ، يُقصد به الجمعيات غير المصرح بها عن ضريبة المبيعات أو الشركات أو المنظمات أو المهن الحرة التي اختارت النظام المالي للمؤسسات الصغيرة (ضريبة المبيعات في الامتياز) ودفعت ضريبة مبيعات الامتياز بدون أي إقرار بضريبة المبيعات. سيعرض هذا الاختيار المرجع "ضريبة المبيعات غير القابلة للتطبيق - المادة 293B من CGI" على الفواتير.
-VATType=Tax type
+VATType=استخدام الضرائب
 ##### Local Taxes #####
 TypeOfSaleTaxes=نوع ضريبة المبيعات
 LTRate=معدل
@@ -1174,9 +1176,10 @@ NoLocalTaxXForThisCountry=وفقًا لإعداد الضرائب (انظر %s -
 LabelUsedByDefault=العلامة التي يستخدمها التقصير إذا لم يمكن العثور على ترجمة للقانون
 LabelOnDocuments=علامة على وثائق
 LabelOrTranslationKey=التسمية أو مفتاح الترجمة
-TranslationFound=Translation found
-TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
-TranslationKey=Translation key
+LabelTranslatedInCurrentLanguage=تمت ترجمة العلامة إلى اللغة الحالية
+TranslationFound=تم العثور على الترجمة
+TheTranslationIsSearchedFromKey=يتم البحث عن الترجمة من مفتاح الترجمة:<b>%s</b>
+TranslationKey=مفتاح الترجمة
 ValueOfConstantKey=قيمة ثابت التكوين
 ConstantIsOn=الخيار %s قيد التشغيل
 NbOfDays=لا أيام
@@ -1214,9 +1217,9 @@ DefaultMenuManager= معيار مدير القائمة
 DefaultMenuSmartphoneManager=الهاتف الذكي القائمة مدير
 Skin=التصميم
 DefaultSkin=التصميم الإفتراضي
-MaxSizeList=Max length for lists
+MaxSizeList=الحد الأقصى لطول القوائم
 DefaultMaxSizeList=افتراضي الطول الاقصى للقوائم
-MaxSizeShortList=Max length for short lists
+MaxSizeShortList=الحد الأقصى لطول القوائم القصيرة
 DefaultMaxSizeShortList=الطول الأقصى الافتراضي للقوائم القصيرة (أي في بطاقة العميل)
 DisplayGrandTotalInList=عرض الإجمالي الكلي (لجميع الصفحات) في تذييل القوائم
 MessageOfDay=رسالة اليوم
@@ -1226,8 +1229,8 @@ BackgroundImageLogin=صورة الخلفية
 PermanentLeftSearchForm=دائم البحث عن شكل القائمة اليمنى
 DefaultLanguage=اللغة الافتراضية
 EnableMultilangInterface=قم بتمكين دعم متعدد اللغات للعلاقات مع العملاء أو البائعين
-EnableShowLogo=Show the company logos in the menu
-THEME_MENU_COLORLOGO=Show main menu images in color
+EnableShowLogo=إظهار شعارات الشركة في القائمة
+THEME_MENU_COLORLOGO=إظهار صور القائمة الرئيسية بالألوان
 CompanyInfo=الشركة | المؤسسة
 CompanyIds=هويات الشركة / المنظمة
 CompanyAddress=عنوان
@@ -1289,7 +1292,7 @@ BrowserName=اسم المتصفح
 BrowserOS=متصفح OS
 ListOfSecurityEvents=قائمة الأحداث الأمنية لدوليبار
 SecurityEventsPurged=تم إزالة الأحداث الأمنية
-SecurityEvent=Security event
+SecurityEvent=حدث أمني
 TrackableSecurityEvents=الأحداث الأمنية التي يمكن تتبعها
 LogEventDesc=تمكين التسجيل لأحداث أمنية محددة. تسجيل المسؤولين عبر القائمة <b> %s - %s </b>. تحذير ، يمكن لهذه الميزة إنشاء كمية كبيرة من البيانات في قاعدة البيانات.
 AreaForAdminOnly=يمكن تعيين معطيات الإعدادات بواسطة المستخدم المسؤول <b> </b> فقط.
@@ -1353,7 +1356,7 @@ AdvancedNumRefModelDesc=إرجاع الرقم المرجعي بالتنسيق %s
 SimpleNumRefNoDateModelDesc=إرجاع الرقم المرجعي بالتنسيق %s-nnnn حيث nnnn عبارة عن رقم تزايد تلقائي متسلسل بدون إعادة تعيين
 ShowProfIdInAddress=إظهار الهوية المهنية مع العناوين
 ShowVATIntaInAddress=إخفاء رقم ضريبة القيمة المضافة داخل المجتمع
-ShowLegalFormInAddress=Show the legal form with addresses
+ShowLegalFormInAddress=إظهار النموذج القانوني مع العناوين
 TranslationUncomplete=ترجمة جزئية
 MAIN_DISABLE_METEO=تعطيل الإبهام الطقس
 MeteoStdMod=الوضع القياسي
@@ -1429,9 +1432,9 @@ PreloadOPCode=يتم استخدام OPCode مسبقة التحميل
 AddRefInList=عرض مرجع العميل / البائع. في قوائم التحرير والسرد. <br> ستظهر الجهات الخارجية بتنسيق اسم "CC12345 - SC45678 - The Big Company corp." بدلاً من "The Big Company Corp".
 AddVatInList=عرض رقم ضريبة القيمة المضافة للعميل / البائع في قوائم التحرير والسرد.
 AddAdressInList=Display Customer/Vendor address into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
-AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
+AddEmailPhoneTownInContactList=عرض البريد الإلكتروني لجهة الاتصال (أو الهواتف إذا لم يتم تعريفها) والمدينة في قوائم مجمعة.<br> ستظهر جهات الاتصال بالتنسيق التالي "محمد عبدالله - moh.abdullah@example.com - الرياض" أو "محمد عبدالله - 0555555555 - الرياض" بدلاً من "محمد عبدالله".
 AskForPreferredShippingMethod=اسأل عن طريقة الشحن المفضلة للأطراف الثالثة.
-FieldEdition=طبعة من ميدان%s
+FieldEdition=تعديل الحقل %s
 FillThisOnlyIfRequired=مثال: +2 (ملء إلا إذا تعوض توقيت المشاكل من ذوي الخبرة)
 GetBarCode=الحصول على الباركود
 NumberingModules=نماذج الترقيم
@@ -1458,10 +1461,10 @@ HRMSetup=HRM وحدة الإعداد
 CompanySetup=وحدة الإعداد للشركات
 CompanyCodeChecker=خيارات الإنشاء التلقائي لرموز العملاء / البائعين
 AccountCodeManager=خيارات الإنشاء التلقائي لأكواد محاسبة العملاء / البائعين
-NotificationsDesc=Email notifications can be sent automatically on certain events.<br>Recipients of notifications can be defined:
-NotificationsDescUser=* per user (on the tab "Notifications" of a user)
-NotificationsDescContact=* per third-party contacts (on the tab "Notifications" of a third party)
-NotificationsDescGlobal=* or by setting global email addresses (on the setup page of the module).
+NotificationsDesc=يمكن إرسال إشعارات البريد الإلكتروني تلقائيًا بشأن أحداث معينة.<br> ويمكن تحديد مستلمي الإشعارات:
+NotificationsDescUser=* لكل مستخدم (في نافذة "الإشعارات" للمستخدم)
+NotificationsDescContact=* لكل جهات اتصال تابعة لجهة خارجية (في نافذة "الإشعارات" التابعة لجهة خارجية)
+NotificationsDescGlobal=* أو عن طريق إعداد عناوين البريد الإلكتروني العامة (على صفحة إعداد الوحدة).
 ModelModules=قوالب المستندات
 DocumentModelOdt=إنشاء المستندات من قوالب OpenDocument (ملفات .ODT / .ODS من LibreOffice ، OpenOffice ، KOffice ، TextEdit ، ...)
 WatermarkOnDraft=علامة مائية على مشروع الوثيقة
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=قوة تاريخ الفاتورة تاريخ المصادقة
 SuggestedPaymentModesIfNotDefinedInInvoice=وضع المدفوعات المقترح على الفاتورة بشكل افتراضي إذا لم يتم تحديده في الفاتورة
 SuggestPaymentByRIBOnAccount=اقترح الدفع عن طريق السحب على الحساب
 SuggestPaymentByChequeToAddress=اقترح الدفع بشيك ل
+InvoicePaymentManageStructuredCommunication=إنشاء محادثات منظمة لسداد الفاتورة
+InvoicePaymentManageStructuredCommunicationHelp=في بعض البلدان، من الضروري عرض مرجع منظم لتسهيل المدفوعات ومقارنتها
 FreeLegalTextOnInvoices=نص حر على الفواتير
 WatermarkOnDraftInvoices=العلامة المائية على مشروع الفواتير (أي إذا فارغ)
 PaymentsNumberingModule=المدفوعات نموذج الترقيم
@@ -1497,16 +1502,16 @@ InvoiceOptionCategoryOfOperations=اعرض "فئة العمليات" المذك
 InvoiceOptionCategoryOfOperationsHelp=حسب الحالة ستظهر الإشارة على شكل:<br>- فئة العمليات: تسليم البضائع<br>- فئة العمليات العمليات: تقديم الخدمات<br>- فئة العمليات: مختلط - تسليم البضائع وتقديم الخدمات
 InvoiceOptionCategoryOfOperationsYes1=نعم، أسفل كتلة العنوان
 InvoiceOptionCategoryOfOperationsYes2=نعم، في الزاوية اليسرى السفلى
-InvoiceClassifyBilledSupplierOrderWithoutInvoice=Disallow the classification of an order as billed without invoice.
-InvoiceClassifyBilledSupplierOrderWithoutInvoiceHelp=An order can be classified as billed by default. If this conf is set to true, it will be not.
+InvoiceClassifyBilledSupplierOrderWithoutInvoice=عدم السماح بتصنيف الطلب على أنه تم تحصيله دون وجود فاتورة.
+InvoiceClassifyBilledSupplierOrderWithoutInvoiceHelp=يمكن تصنيف الطلب على أنه يتم تحصيله افتراضيًا. إذا تم تعيين هذا الإعداد على أنه صحيح، فلن يتم تحصيله.
 ##### Supplier Orders #####
-SupplierOrderClassifyBilledWithoutInvoice=Disallow the classification of a purchase order as billed without invoice.
-SupplierOrderClassifyBilledWithoutInvoiceHelp=A supplier order can be classified as billed by default. If this conf is set to true, it will be not.
+SupplierOrderClassifyBilledWithoutInvoice=عدم السماح بتصنيف طلب الشراء على أنه مصدر -تم إصدارة- بدون فاتورة.
+SupplierOrderClassifyBilledWithoutInvoiceHelp=يمكن تصنيف طلب المورد على أنه يتم تحصيله افتراضيًا. إذا تم تعيين هذا اﻹعداد على أنه صحيح، فلن يتم تحصيله.
 ##### Proposals #####
 PropalSetup=وحدة إعداد مقترحات تجارية
 ProposalsNumberingModules=اقتراح نماذج تجارية الترقيم
 ProposalsPDFModules=اقتراح نماذج الوثائق التجارية
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payment mode by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=طريقة الدفع المقترحة افتراضيًا إذا لم يتم تحديدها في الاقتراح
 FreeLegalTextOnProposal=نص تجارية حرة على مقترحات
 WatermarkOnDraftProposal=العلامة المائية على مشاريع المقترحات التجارية (أي إذا فارغ)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=اسأل عن وجهة الحساب المصرفي للاقتراح
@@ -1548,8 +1553,8 @@ MemberCodeChecker=خيارات الإنشاء التلقائي لرموز عضو
 AdherentLoginRequired=إدارة معلومات تسجيل الدخول/كلمة المرور لكل عضو
 AdherentLoginRequiredDesc=أضف قيمة لتسجيل الدخول و وكلمة المرور في الملف عضو. إذا كان عضو مرتبطًا بمستخدم، فسيتم تحديث تسجيل الدخول عضو و ستقوم كلمة المرور أيضًا بتحديث كلمة مرور تسجيل دخول المستخدم و.
 AdherentMailRequired=البريد الإلكتروني مطلوب لإنشاء عضو جديد
-MemberSendInformationByMailByDefault=The checkbox to send an email confirmation to members (validation or new subscription) is on by default
-MemberCreateAnExternalUserForSubscriptionValidated=Create automatically an external user (with a login to connect to the application) after an online payment of a membership subscription
+MemberSendInformationByMailByDefault=يتم تفعيل مربع الاختيار لإرسال تأكيد عبر البريد الإلكتروني إلى الأعضاء (التحقق أو الاشتراك الجديد) بشكل افتراضي
+MemberCreateAnExternalUserForSubscriptionValidated=إنشاء مستخدم خارجي تلقائيًا (مع تسجيل دخول للاتصال بالتطبيق) بعد الدفع عبر الإنترنت لاشتراك العضوية
 VisitorCanChooseItsPaymentMode=يمكن للزائر الاختيار من بين أي طرق دفع متاحة
 MEMBER_REMINDER_EMAIL=قم بتمكين التذكير التلقائي <b> عبر البريد الإلكتروني </b> بالاشتراكات منتهية الصلاحية. ملاحظة: يجب تمكين الوحدة النمطية <strong> %s </strong> وإعدادها بشكل صحيح لإرسال التذكيرات.
 MembersDocModules=قوالب المستندات للوثائق التي تم إنشاؤها من سجل الأعضاء
@@ -1697,7 +1702,7 @@ ForANonAnonymousAccess=لصحتها accès (لكتابة الحصول على س
 PerfDolibarr=الإعداد أداء / تحسين تقرير
 YouMayFindPerfAdviceHere=تقدم هذه الصفحة بعض الفحوصات أو النصائح المتعلقة بالأداء.
 NotInstalled=غير مثبت.
-Installed=Installed.
+Installed=تم التثبيت
 NotSlowedDownByThis=لا تبطئ من قبل هذا.
 NotRiskOfLeakWithThis=لا يوجد خطر تسرب مع هذا.
 ApplicativeCache=مخبأ تطبيقي
@@ -1718,6 +1723,7 @@ CompressionOfResources=ضغط الردود HTTP
 CompressionOfResourcesDesc=على سبيل المثال باستخدام توجيه Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=مثل هذا الكشف التلقائي غير ممكن مع المتصفحات الحالية
 DefaultValuesDesc=هنا يمكنك تحديد القيمة الافتراضية التي ترغب في استخدامها عند إنشاء سجل جديد ، و / أو عوامل التصفية الافتراضية أو ترتيب الفرز عند إدراج السجلات.
+DefaultValuesHelpText=يمكنك استخدام قيمة واحدة أو قيم مفصولة بفاصلة لاختيارات متعددة. يمكنك أيضًا استخدام علامات الاستبدال (انظر القائمة أدناه).
 DefaultCreateForm=القيم الافتراضية (لاستخدامها في النماذج)
 DefaultSearchFilters=مرشحات البحث الافتراضية
 DefaultSortOrder=أوامر الفرز الافتراضية
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Sendings ترقيم الوحدات
 SendingsAbility=أوراق دعم الشحن للشحنات العملاء
 NoNeedForDeliveryReceipts=في معظم الحالات ، يتم استخدام أوراق الشحن كأوراق لتسليمات العملاء (قائمة المنتجات المراد إرسالها) والأوراق التي تم استلامها وتوقيعها من قبل العميل. ومن ثم فإن إيصال تسليم المنتجات يعد ميزة مكررة ونادرًا ما يتم تنشيطه.
 FreeLegalTextOnShippings=النص الحر على الشحنات
+DontPrefillShipmentQty = لا تقم بملء كميات الأسطر مسبقًا عند إنشاء الشحنة
 ##### Deliveries #####
 DeliveryOrderNumberingModules=تلقي شحنات المنتجات الترقيم وحدة
 DeliveryOrderModel=تلقي شحنات المنتجات النموذجية
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=النص الحر على إيصالات التس
 ##### FCKeditor #####
 AdvancedEditor=محرر متقدم
 ActivateFCKeditor=تفعيل محرر متقدم ل:
-FCKeditorForNotePublic=إنشاء/إصدار WYSIWYG لحقل "الملاحظات العامة" للعناصر
-FCKeditorForNotePrivate=إنشاء/إصدار WYSIWYG لحقل "الملاحظات الخاصة" للعناصر
-FCKeditorForCompany=إنشاء/إصدار WYSIWYG للوصف الميداني للعناصر (باستثناء المنتجات/الخدمات)
-FCKeditorForProductDetails=إنشاء/إصدار WYSIWYG لوصف المنتجات أو سطور للكائنات (سطور العروض، والأوامر، والفواتير، وما إلى ذلك...).
+FCKeditorForNotePublic=إنشاء/تعديل حقل "الملاحظات العامة" للعناصر باستخدام محرر ما تراه هو ما تحصل عليه -WYSIWYG-
+FCKeditorForNotePrivate=إنشاء/تعديل حقل "الملاحظات الخاصة" للعناصر باستخدام محرر ما تراه هو ما تحصل عليه -WYSIWYG-
+FCKeditorForCompany=إنشاء/تعديل وصف الحقل للعناصر (باستثناء المنتجات/الخدمات) باستخدام محرر ما تراه هو ما تحصل عليه -WYSIWYG-
+FCKeditorForProductDetails=إنشاء/تعديل وصف المنتجات أو أسطر الكائنات (أسطر العروض، الطلبات، الفواتير، إلخ ...) بإستخدام محرر ما تراه هو ما تحصل عليه -WYSIWYG-.
 FCKeditorForProductDetails2=تحذير: لا يُنصح بشدة باستخدام هذا الخيار في هذه الحالة لأنه قد يؤدي إلى حدوث مشكلات مع تنسيقات الصفحات و الخاصة عند إنشاء ملفات PDF.
-FCKeditorForMailing= إنشاء/إصدار WYSIWYG لرسائل البريد الإلكتروني الجماعية (الأدوات->البريد الإلكتروني)
-FCKeditorForUserSignature=إنشاء/إصدار WYSIWYG لتوقيع المستخدم
-FCKeditorForMail=إنشاء/إصدار WYSIWYG لكل البريد (باستثناء الأدوات->البريد الإلكتروني)
-FCKeditorForTicket=إنشاء/إصدار WYSIWYG للتذاكر
+FCKeditorForMailing= إنشاء/تعديل رسائل البريد الإلكتروني الجماعية (أدوات-> رسائل البريد الإلكتروني الجماعية) بإستخدام محرر ما تراه هو ما تحصل عليه -WYSIWYG-
+FCKeditorForUserSignature=إنشاء/تعديل توقيع المستخدم باستخدام  محرر ما تراه هو ما تحصل عليه -WYSIWYG-
+FCKeditorForMail=إنشاء/تعديل جميع رسائل البريد الإلكتروني (باستثناء الأدوات-> رسائل البريد الإلكتروني الجماعية) بإستخدام محرر ما تراه هو ما تحصل عليه -WYSIWYG-
+FCKeditorForTicket=إنشاء/تعديل التذاكر بإستخدام محرر ما تراه هو ما تحصل عليه -WYSIWYG-
 ##### Stock #####
 StockSetup=إعداد وحدة المخزون
 IfYouUsePointOfSaleCheckModule=إذا كنت تستخدم وحدة نقطة البيع (POS) التي يتم توفيرها افتراضيًا أو وحدة خارجية ، فقد يتم تجاهل هذا الإعداد بواسطة وحدة نقطة البيع الخاصة بك. تم تصميم معظم وحدات نقاط البيع بشكل افتراضي لإنشاء فاتورة على الفور وتقليل المخزون بغض النظر عن الخيارات هنا. لذلك إذا كنت بحاجة إلى انخفاض في المخزون أم لا عند تسجيل عملية بيع من نقاط البيع الخاصة بك ، فتحقق أيضًا من إعداد وحدة نقاط البيع الخاصة بك.
@@ -1867,7 +1874,6 @@ Buy=يشتري
 Sell=يبيع
 InvoiceDateUsed=فاتورة تاريخ المستخدمة
 YourCompanyDoesNotUseVAT=تم تعريف شركتك على أنها لا تستخدم ضريبة القيمة المضافة (المنزل - الإعداد - الشركة / المنظمة) ، لذلك لا توجد خيارات ضريبة القيمة المضافة للإعداد.
-AccountancyCode=كود المحاسبة
 AccountancyCodeSell=حساب بيع. رمز
 AccountancyCodeBuy=شراء الحساب. رمز
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=اترك مربع الاختيار "إنشاء الدفع تلقائيًا" فارغًا بشكل افتراضي عند إنشاء ضريبة جديدة
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = أي طريقة عرض تريد فتحها بشكل افت
 AGENDA_EVENT_PAST_COLOR = لون الحدث الماضي
 AGENDA_EVENT_CURRENT_COLOR = لون الحدث الحالي
 AGENDA_EVENT_FUTURE_COLOR = لون الحدث المستقبلي
-AGENDA_REMINDER_BROWSER = قم بتمكين تذكير الحدث <b> على متصفح المستخدم </b> (عند الوصول إلى تاريخ التذكير ، تظهر نافذة منبثقة بواسطة المتصفح. يمكن لكل مستخدم تعطيل هذه الإشعارات من إعداد إعلام المتصفح الخاص به).
+AGENDA_REMINDER_BROWSER = السماح بتذكيرات الأحداث <b>على متصفح المستخدم</b>
+AGENDA_REMINDER_BROWSERHelp = عند الوصول إلى تاريخ التذكير، تظهر نافذة منبثقة في المتصفح). يتم تحديد خيار التذكير/التأخير بواسطة المستخدم عند إنشاء الحدث.
 AGENDA_REMINDER_BROWSER_SOUND = تمكين الإعلام الصوتي
-AGENDA_REMINDER_EMAIL = تمكين تذكير الحدث <b> عن طريق رسائل البريد الإلكتروني </b> (يمكن تحديد خيار التذكير / التأخير في كل حدث).
+AGENDA_REMINDER_EMAIL = السماح بتذكير الأحداث <b>عبر رسائل البريد الإلكتروني</b>
 AGENDA_REMINDER_EMAIL_NOTE = ملاحظة: يجب أن يكون تكرار المهمة المجدولة %s كافيًا للتأكد من إرسال التذكير في اللحظة الصحيحة.
 AGENDA_SHOW_LINKED_OBJECT = إظهار الكائن المرتبط في عرض جدول الأعمال
 AGENDA_USE_EVENT_TYPE = استخدام أنواع الأحداث (المُدارة في إعداد القائمة -> القواميس -> نوع أحداث جدول الأعمال)
 AGENDA_USE_EVENT_TYPE_DEFAULT = قم بتعيين هذه القيمة الافتراضية تلقائيًا لنوع الحدث في نموذج إنشاء الحدث
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = استخدم التذكير الافتراضي لهذه الأحداث
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = سيتم ملء نموذج إشعار التذكير التلقائي افتراضيًا عند إنشاء الحدث
+AGENDA_DEFAULT_REMINDER_OFFSET = فترة التذكير الافتراضية قبل الحدث
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = قالب البريد الإلكتروني الذي سيتم استخدامه للتذكير الافتراضي
 PasswordTogetVCalExport = مفتاح ربط تصدير تأذن
 PastDelayVCalExport=لا تصدر الحدث الأكبر من
 SecurityKey = مفتاح الامان
@@ -1899,7 +1910,7 @@ ClickToDialUseTelLinkDesc=استخدم هذه الطريقة إذا كان ال
 CashDesk=نقطة البيع
 CashDeskSetup=إعداد وحدة نقاط البيع
 CashDeskThirdPartyForSell=طرف ثالث عام افتراضي لاستخدامه في المبيعات
-ForbidSalesToTheDefaultCustomer=Do not allow to record sales on a generic third party (must use a different third party for each sale)
+ForbidSalesToTheDefaultCustomer=لا تسمح بتسجيل المبيعات على جهة خارجية عامة (يجب استخدام جهة خارجية مختلفة لكل عملية بيع)
 CashDeskBankAccountForSell=الحساب النقدي لاستخدامها لتبيع
 CashDeskBankAccountForCheque=الحساب الافتراضي المراد استخدامه لتلقي المدفوعات بشيك
 CashDeskBankAccountForCB=حساب لاستخدام لاستلام المبالغ النقدية عن طريق بطاقات الائتمان
@@ -1913,7 +1924,7 @@ CashDeskYouDidNotDisableStockDecease=لم تقم بتعطيل خفض المخز
 CashDeskForceDecreaseStockLabel=تم فرض انخفاض مخزون المنتجات الدفعية.
 CashDeskForceDecreaseStockDesc=التقليل أولاً من خلال أقدم تواريخ الأكل والبيع.
 CashDeskReaderKeyCodeForEnter=رمز ASCII الرئيسي لـ "Enter" المحدد في قارئ الباركود (مثال: 13)
-CashDeskDefaultProject=Assign new POS sales (invoices) to a project
+CashDeskDefaultProject=تعيين مبيعات نقاط البيع الجديدة (الفواتير) لمشروع
 ##### Bookmark #####
 BookmarkSetup=إعداد وحدة المرجعية
 BookmarkDesc=تسمح لك هذه الوحدة بإدارة الإشارات المرجعية. يمكنك أيضًا إضافة اختصارات إلى أي صفحات Dolibarr أو مواقع ويب خارجية في القائمة اليسرى.
@@ -1974,7 +1985,7 @@ DeleteFiscalYear=حذف فترة المحاسبة
 ConfirmDeleteFiscalYear=هل أنت متأكد من حذف هذه الفترة المحاسبية؟
 ShowFiscalYear=عرض فترة المحاسبة
 ##### Assets #####
-AssetNumberingModules=Assets numbering module
+AssetNumberingModules=وحدة ترقيم الأصول
 AlwaysEditable=يمكن دائما أن تعدل
 MAIN_APPLICATION_TITLE=إجبار اسم المرئي من التطبيق (تحذير: وضع اسمك هنا قد كسر ميزة تسجيل الدخول التدوين الآلي عند استخدام تطبيقات الهاتف المتحرك DoliDroid)
 NbMajMin=الحد الأدنى لعدد الأحرف الكبيرة
@@ -1994,10 +2005,10 @@ ExpenseReportsRulesSetup=إعداد تقارير نفقات الوحدة - ال
 ExpenseReportNumberingModules=وحدة ترقيم تقارير المصاريف
 NoModueToManageStockIncrease=تم تفعيل أي وحدة قادرة على إدارة زيادة المخزون التلقائي. وسوف يتم زيادة الأسهم على الإدخال اليدوي فقط.
 YouMayFindNotificationsFeaturesIntoModuleNotification=قد تجد خيارات لإشعارات البريد الإلكتروني عن طريق تمكين وتكوين وحدة "الإعلام".
-TemplatesForNotifications=Emails templates for notifications
+TemplatesForNotifications=قوالب رسائل البريد الإلكتروني للإشعارات
 ListOfNotificationsPerUser=قائمة الإخطارات التلقائية لكل مستخدم *
 ListOfNotificationsPerUserOrContact=قائمة الإخطارات التلقائية الممكنة (في حدث العمل) المتاحة لكل مستخدم * أو لكل جهة اتصال **
-ListOfFixedNotifications=Global recipients emails for automatic email notifications
+ListOfFixedNotifications=رسائل البريد الإلكتروني للمستلمين العالميين لإشعارات البريد الإلكتروني التلقائية
 GoOntoUserCardToAddMore=انتقل إلى علامة التبويب "التنبيهات" للمستخدم لإضافة أو إزالة الإشعارات للمستخدمين
 GoOntoContactCardToAddMore=انتقل إلى علامة التبويب "التنبيهات" الخاصة بطرف ثالث لإضافة أو إزالة إشعارات جهات الاتصال / العناوين
 Threshold=عتبة
@@ -2006,7 +2017,7 @@ BackupZipWizard=معالج لبناء أرشيف دليل المستندات
 SomethingMakeInstallFromWebNotPossible=تركيب وحدة خارجية غير ممكن من واجهة ويب للسبب التالي:
 SomethingMakeInstallFromWebNotPossible2=لهذا السبب ، فإن عملية الترقية الموضحة هنا هي عملية يدوية لا يجوز إلا لمستخدم ذي امتيازات القيام بها.
 InstallModuleFromWebHasBeenDisabledContactUs=تثبيت أو تطوير الوحدات الخارجية أو مواقع الويب الديناميكية، من التطبيق، مقفل حاليًا لأغراض أمنية. يرجى الاتصال بنا إذا كنت بحاجة إلى تمكين هذه الميزة.
-InstallModuleFromWebHasBeenDisabledByFile=تثبيت وحدة خارجية من التطبيق قد تم تعطيلها من قبل المسؤول. يجب أن يطلب منه إزالة <strong>الملف٪ s</strong> للسماح هذه الميزة.
+InstallModuleFromWebHasBeenDisabledByFile=لقد قام المسؤول بتعطيل تثبيت الوحدة الخارجية من التطبيق واستخدام الميزات التي تسمح بتشغيل التعليمات البرمجية على الخادم. يجب عليك أن تطلب منه إزالة الملف <strong>%s</strong> للسماح بهذه الميزة.
 ConfFileMustContainCustom=يحتاج تثبيت أو بناء وحدة خارجية من التطبيق إلى حفظ ملفات الوحدة النمطية في الدليل <strong> %s </strong>. لكي تتم معالجة هذا الدليل بواسطة Dolibarr ، يجب عليك إعداد <strong> conf / conf.php </strong> لإضافة سطري التوجيه: <br> <strong> $ dolibarr_main_url_root_alt = '/root_alt؛ </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s / مخصص' ؛ </strong>
 HighlightLinesOnMouseHover=تسليط الضوء على خطوط الجدول عندما يمر تحرك الماوس فوق
 HighlightLinesColor=قم بتمييز لون الخط عندما يمر الماوس فوقه (استخدم "ffffff" لعدم التمييز)
@@ -2023,7 +2034,7 @@ BackgroundColor=لون الخلفية
 TopMenuBackgroundColor=لون الخلفية لقائمة الأعلى
 TopMenuDisableImages=رمز أو نص في القائمة العلوية
 LeftMenuBackgroundColor=لون الخلفية القائمة اليمنى
-LeftmenuId=Left menu ID
+LeftmenuId=معرف القائمة اليسرى
 BackgroundTableTitleColor=لون الخلفية لخط عنوان الجدول
 BackgroundTableTitleTextColor=لون نص سطر عنوان الجدول
 BackgroundTableTitleTextlinkColor=لون النص لخط ارتباط عنوان الجدول
@@ -2033,9 +2044,10 @@ MinimumNoticePeriod=الحد الأدنى لمدة إشعار (يجب أن يت
 NbAddedAutomatically=عدد الأيام تضاف إلى العدادات من المستخدمين (تلقائيا) كل شهر
 EnterAnyCode=يحتوي هذا الحقل على مرجع لتعريف الخط. أدخل أي قيمة من اختيارك ، ولكن بدون أحرف خاصة.
 Enter0or1=أدخل 0 أو 1
-EnterYesOrNo=Enter Yes or No
+EnterYesOrNo=أدخل نعم أو لا
 UnicodeCurrency=أدخل هنا بين الأقواس ، قائمة رقم البايت الذي يمثل رمز العملة. على سبيل المثال: بالنسبة إلى $ ، أدخل [36] - للبرازيل ريال R $ [82،36] - لـ € ، أدخل [8364]
 ColorFormat=لون RGB بصيغة HEX ، على سبيل المثال: FF0000
+NumberFormatForATotalPrice=تنسيق الرقم للسعر الإجمالي %s
 PictoHelp=اسم الأيقونة بالتنسيق:<br>- image.png لملف صورة في دليل السمة الحالي<br>- image.png@نموذج إذا كان الملف موجودًا في الدليل /img/ الخاص بوحدة نمطية<br>- fa-xxx لصورة FontAwesome fa-xxx<br>- Fontawesome_xxx_fa_color_size لصورة FontAwesome fa-xxx (مع بادئة، مجموعة حجم اللون و)
 PositionIntoComboList=موقف خط في قوائم السرد
 SellTaxRate=معدل ضريبة المبيعات
@@ -2097,7 +2109,7 @@ AddMenus=أضف القوائم
 AddPermissions=أضف أذونات
 AddExportProfiles=إضافة ملفات تعريف التصدير
 AddImportProfiles=إضافة ملفات تعريف الاستيراد
-AddWebsiteTemplates=Add website templates for the website module
+AddWebsiteTemplates=إضافة قوالب موقع الويب لوحدة موقع الويب
 AddOtherPagesOrServices=أضف صفحات أو خدمات أخرى
 AddModels=إضافة وثيقة أو قوالب ترقيم
 AddSubstitutions=أضف بدائل المفاتيح
@@ -2115,7 +2127,7 @@ BaseCurrency=العملة المرجعية للشركة (انتقل إلى إع
 WarningNoteModuleInvoiceForFrenchLaw=هذه الوحدة %s متوافقة مع القوانين الفرنسية (Loi Finance 2016).
 WarningNoteModulePOSForFrenchLaw=تتوافق هذه الوحدة %s مع القوانين الفرنسية (Loi Finance 2016) لأنه يتم تنشيط الوحدة النمطية السجلات غير القابلة للعكس تلقائيًا.
 WarningInstallationMayBecomeNotCompliantWithLaw=أنت تحاول تثبيت الوحدة النمطية %s وهي وحدة خارجية. يعني تنشيط وحدة خارجية أنك تثق في ناشر هذه الوحدة وأنك متأكد من أن هذه الوحدة لا تؤثر سلبًا على سلوك التطبيق الخاص بك ، وأنها متوافقة مع قوانين بلدك (%s). إذا قدمت الوحدة ميزة غير قانونية ، فإنك تصبح مسؤولاً عن استخدام البرامج غير القانونية.
-WarningExperimentalFeatureInvoiceSituationNeedToUpgradeToProgressiveMode=If you are using the experimental mode for situation invoices, you will need to update your data to switch from the experimental mode to the official mode. You can contact a partner to help you with this task. A list of preferred partners is available by following <a href="%s" target="_blank">this link</a>
+WarningExperimentalFeatureInvoiceSituationNeedToUpgradeToProgressiveMode=إذا كنت تستخدم الوضع التجريبي لفواتير الحالات، فستحتاج إلى تحديث بياناتك للتبديل من الوضع التجريبي إلى الوضع الرسمي. يمكنك الاتصال بشريك لمساعدتك في هذه المهمة. تتوفر قائمة بالشركاء المفضلين باتباع <a href="%s" target="_blank">هذا الرابط</a>
 MAIN_PDF_MARGIN_LEFT=الهامش الايسر على ملفات صيغة المستندات المتنقلة
 MAIN_PDF_MARGIN_RIGHT=الهامش الايمن لملفات صيغة المستندات المتنقلة
 MAIN_PDF_MARGIN_TOP=الهامش العلوي لصيغة المستندات المتنقلة
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=إخفاء الحدود في إطار عنوان المرسل
 MAIN_PDF_NO_RECIPENT_FRAME=إخفاء الحدود في إطار عنوان المستلم
 MAIN_PDF_HIDE_CUSTOMER_CODE=إخفاء رمز العميل
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=إخفاء اسم المرسل / الشركة في كتلة العنوان
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=إخفاء شروط المدفوعات
 PROPOSAL_PDF_HIDE_PAYMENTMODE=إخفاء وضع الدفع
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=لا ينصح
 ARestrictedPath=بعض المسارات المقيدة لملفات البيانات
 CheckForModuleUpdate=تحقق من وجود تحديثات الوحدات الخارجية
 CheckForModuleUpdateHelp=سيتصل هذا الإجراء بمحرري الوحدات الخارجية للتحقق من توفر إصدار جديد.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=تحديث متاح
 NoExternalModuleWithUpdate=لم يتم العثور على تحديثات للوحدات الخارجية
 SwaggerDescriptionFile=ملف وصف Swagger API (للاستخدام مع redoc على سبيل المثال)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=عرض عنوان الشحن
 INVOICE_SHOW_SHIPPING_ADDRESSMore=الإشارة الإجبارية في بعض البلدان (فرنسا،...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=رابط URL للشبكة الاجتماعية. استخدم {socialid} للجزء المتغير الذي يحتوي على معرف الشبكة الاجتماعية.
 IfThisCategoryIsChildOfAnother=إذا كانت هذه الفئة تابعة لفئة أخرى
 DarkThemeMode=وضع المظهر الداكن
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=تحذير: قام نموذج %
 WarningModuleHasChangedSecurityCsrfParameter=تحذير: قام نموذج %s بتعطيل أمان CSRF لمثيلك. هذا الإجراء مشكوك فيه و وقد لا يكون التثبيت الخاص بك آمنًا بعد الآن. الرجاء الاتصال بمؤلف نموذج للحصول على التوضيح.
 EMailsInGoingDesc=تتم إدارة رسائل البريد الإلكتروني الواردة بواسطة نموذج %s. يجب عليك تمكين و وتهيئته إذا كنت بحاجة إلى دعم رسائل البريد الإلكتروني الواردة.
 MAIN_IMAP_USE_PHPIMAP=استخدم مكتبة PHP-IMAP لـ IMAP بدلاً من PHP IMAP الأصلي. ويسمح هذا أيضًا باستخدام اتصال OAuth2 لـ IMAP (نموذج يجب أيضًا تنشيط OAuth).
-MAIN_CHECKBOX_LEFT_COLUMN=إظهار عمود تحديد سطر الحقل و على اليسار (على اليمين بشكل افتراضي)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=لم يتم إنشاؤها بشكل افتراضي. تم الإنشاء عند تنشيط نموذج فقط.
 CSSPage=نمط CSS
 Defaultfortype=افتراضي
@@ -2489,7 +2510,7 @@ AiDescription=ميزات الذكاء الاصطناعي (AI).
 AiDescriptionLong=يوفر ميزات الذكاء الاصطناعي (AI) في أجزاء مختلفة من التطبيق. تحتاج إلى واجهة برمجة تطبيقات AI خارجية.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=إعداد نموذج للذكاء الاصطناعي
 AiCustomPrompt=موجه مخصص لمنظمة العفو الدولية
 AI_CONFIGURATIONS_PROMPT=موجه مخصص
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=يطالب الذكاء الاصطناعي المخصص با
 EnterAnIP=أدخل عنوان IP
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=عرض عنوان الشحن
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/ar_SA/assets.lang b/htdocs/langs/ar_SA/assets.lang
index 3eceebee63a..0cbc4c801eb 100644
--- a/htdocs/langs/ar_SA/assets.lang
+++ b/htdocs/langs/ar_SA/assets.lang
@@ -4,18 +4,14 @@
 # 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/>.
 
-#
 # Generic
-#
 NewAsset=أصل جديد
 AccountancyCodeAsset=كود المحاسبة (الأصول)
 AccountancyCodeDepreciationAsset=كود المحاسبة (حساب إهلاك الاصول)
@@ -25,50 +21,34 @@ DeleteType=حذف
 DeleteAnAssetType=حذف نموذج أصل
 ConfirmDeleteAssetType=هل أنت متأكد أنك تريد حذف نموذج الأصول هذا؟
 ShowTypeCard=عرض الموديل "%s"
-
 # Module label 'ModuleAssetsName'
 ModuleAssetsName=الأصول
 # Module description 'ModuleAssetsDesc'
 ModuleAssetsDesc=وصف الأصول
-
-#
 # Admin page
-#
 AssetSetup=إعداد الأصول
 AssetSetupPage=صفحة إعداد الأصول
 ExtraFieldsAssetModel=السمات التكميلية (نموذج الأصول)
-
 AssetsType=نموذج الأصول
 AssetsTypeId=معرف نموذج الأصل
 AssetsTypeLabel=تسمية نموذج الأصول
 AssetsTypes=نماذج الأصول
 ASSET_ACCOUNTANCY_CATEGORY=مجموعة محاسبة الأصول الثابتة
-
-#
+ASSET_DEPRECIATION_DURATION_PER_YEAR=الفترة النسبية بالأيام لحساب الاستهلاك على مدار سنة واحدة
 # Menu
-#
 MenuAssets=الأصول
 MenuNewAsset=أصل جديد
 MenuAssetModels=أصول النموذج
 MenuListAssets=قائمة
 MenuNewAssetModel=نموذج الأصول الجديدة
 MenuListAssetModels=قائمة
-
-#
 # Module
-#
 ConfirmDeleteAsset=هل تريد حقًا إزالة هذا الأصل؟
-
-#
 # Tab
-#
 AssetDepreciationOptions=خيارات الإهلاك
 AssetAccountancyCodes=حسابات المحاسبة
 AssetDepreciation=الاستهلاك
-
-#
 # Asset
-#
 Asset=أصل
 Assets=الأصول
 AssetReversalAmountHT=مبلغ عكسي (بدون ضرائب)
@@ -89,32 +69,20 @@ AssetNotDepreciated=غير مستهلكة
 AssetDisposal=ازالة
 AssetConfirmDisposalAsk=هل أنت متأكد من أنك تريد التخلص من الأصل <b> %s </b>؟
 AssetConfirmReOpenAsk=هل أنت متأكد من أنك تريد إعادة فتح الأصل <b> %s </b>؟
-
-#
 # Asset status
-#
 AssetInProgress=قيد التنفيذ
 AssetDisposed=استبعاده
 AssetRecorded=محسوب
-
-#
 # Asset disposal
-#
 AssetDisposalDate=تاريخ التصرف
 AssetDisposalAmount=قيمة التخلص
 AssetDisposalType=نوع التخلص
 AssetDisposalDepreciated=استهلاك سنة التحويل
 AssetDisposalSubjectToVat=يخضع التصرف لضريبة القيمة المضافة
-
-#
 # Asset model
-#
 AssetModel=نموذج الأصول
 AssetModels=نماذج الأصول
-
-#
 # Asset depreciation options
-#
 AssetDepreciationOptionEconomic=الاستهلاك الاقتصادي
 AssetDepreciationOptionAcceleratedDepreciation=الاستهلاك المعجل (الضريبة)
 AssetDepreciationOptionDepreciationType=نوع الإهلاك
@@ -122,7 +90,6 @@ AssetDepreciationOptionDepreciationTypeLinear=خطي
 AssetDepreciationOptionDepreciationTypeDegressive=الانحدار
 AssetDepreciationOptionDepreciationTypeExceptional=استثنائي
 AssetDepreciationOptionDegressiveRate=معدل الانحدار
-AssetDepreciationOptionAcceleratedDepreciation=الاستهلاك المعجل (الضريبة)
 AssetDepreciationOptionDuration=مدة
 AssetDepreciationOptionDurationType=اكتب المدة
 AssetDepreciationOptionDurationTypeAnnual=سنوي
@@ -132,10 +99,7 @@ AssetDepreciationOptionRate=معدل (%%)
 AssetDepreciationOptionAmountBaseDepreciationHT=قاعدة الإهلاك (باستثناء ضريبة القيمة المضافة)
 AssetDepreciationOptionAmountBaseDeductibleHT=الوعاء القابل للخصم (باستثناء ضريبة القيمة المضافة)
 AssetDepreciationOptionTotalAmountLastDepreciationHT=إجمالي مبلغ الاستهلاك الأخير (باستثناء ضريبة القيمة المضافة)
-
-#
 # Asset accountancy codes
-#
 AssetAccountancyCodeDepreciationEconomic=الاستهلاك الاقتصادي
 AssetAccountancyCodeAsset=أصل
 AssetAccountancyCodeDepreciationAsset=الاستهلاك
@@ -149,10 +113,7 @@ AssetAccountancyCodeDepreciationAcceleratedDepreciation=الاستهلاك ال
 AssetAccountancyCodeAcceleratedDepreciation=الحساب
 AssetAccountancyCodeEndowmentAcceleratedDepreciation=مصاريف الاستهلاك
 AssetAccountancyCodeProvisionAcceleratedDepreciation=التملك / المخصصات
-
-#
 # Asset depreciation
-#
 AssetBaseDepreciationHT=أساس الإهلاك (باستثناء ضريبة القيمة المضافة)
 AssetDepreciationBeginDate=بدء الاستهلاك
 AssetDepreciationDuration=مدة
@@ -164,10 +125,7 @@ AssetResidualHT=القيمة المتبقية (باستثناء ضريبة ال
 AssetDispatchedInBookkeeping=تم تسجيل الإهلاك
 AssetFutureDepreciationLine=الاستهلاك المستقبلي
 AssetDepreciationReversal=انعكاس، ارتداد، انقلاب
-
-#
 # Errors
-#
 AssetErrorAssetOrAssetModelIDNotProvide=لم يتم تقديم معرف الأصل أو النموذج الذي تم العثور عليه
 AssetErrorFetchAccountancyCodesForMode=خطأ عند استرداد حسابات المحاسبة لوضع الإهلاك "%s"
 AssetErrorDeleteAccountancyCodesForMode=حدث خطأ عند حذف حسابات المحاسبة من وضع الإهلاك "%s"
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index 0a6f62d38b6..72c22e76b0f 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=الرصيد النهائي
 CurrentBalance=الرصيد الحالي
 FutureBalance=الميزانية المستقبلة
 ShowAllTimeBalance=عرض الرصيد من البداية
-AllTime=من البداية
 Reconciliation=التسوية
 RIB=رقم الحساب المصرفي
 IBAN=رقم الآيبان
@@ -133,7 +132,7 @@ DeleteTransaction=حذف المعاملة
 ConfirmDeleteTransaction=هل تريد بالتأكيد حذف هذه المعاملة؟
 ThisWillAlsoDeleteBankRecord=سيؤدي هذا أيضا إلى حذف القيد البنكي الذي تم إنشاؤه
 BankMovements=حركات
-PlannedTransactions=المعاملات المخططة
+PlannedTransactions=Upcoming entries
 Graph=الرسوم البيانية
 ExportDataset_banque_1=القيود البنكية وكشف الحساب
 ExportDataset_banque_2=قسيمة الإيداع
@@ -151,7 +150,7 @@ FutureTransaction=الصفقة المستقبلية. غير قادر على ال
 SelectChequeTransactionAndGenerate=قم بتحديد / تصفية الشيكات لتضمينها في إيصال إيداع الشيك واضغط على "إنشاء".
 SelectPaymentTransactionAndGenerate=حدد/قم بتصفية المستندات التي سيتم تضمينها في إيصال الإيداع %s. ثم انقر على "إنشاء".
 InputReceiptNumber=اختر كشف الحساب المصرفي المتعلق بالتوفيق. استخدم قيمة رقمية قابلة للفرز
-InputReceiptNumberBis=YYYYMM أو YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=للتسوية؟
 ThenCheckLinesAndConciliate=ثم، تحقق من السطور الحالية في كشف الحساب البنكي وانقر
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=إذا تم تمكين هذه الوظيفة ، يمك
 BankColorizeMovementName1=لون الخلفية لحركة الخصم
 BankColorizeMovementName2=لون الخلفية لحركة الائتمان
 IfYouDontReconcileDisableProperty=إذا لم تقم بإجراء التسويات البنكية على بعض الحسابات المصرفية ، فقم بتعطيل الخاصية "%s" عليها لإزالة هذا التحذير.
-NoBankAccountDefined=لم يتم تحديد حساب مصرفي
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=لا يوجد سجل في الحساب المصرفي. عادةً ما يحدث هذا عندما يتم حذف سجل يدويًا من قائمة المعاملات في الحساب المصرفي (على سبيل المثال أثناء تسوية الحساب المصرفي). سبب آخر هو أنه تم تسجيل الدفعة عندما تم تعطيل الوحدة النمطية "%s".
 AlreadyOneBankAccount=تم تحديد حساب مصرفي واحد بالفعل
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=متغير ملف SEPA
diff --git a/htdocs/langs/ar_SA/blockedlog.lang b/htdocs/langs/ar_SA/blockedlog.lang
index 23d7bc61d5f..fff78233559 100644
--- a/htdocs/langs/ar_SA/blockedlog.lang
+++ b/htdocs/langs/ar_SA/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=سجلات غير قابلة للتغيير
 ShowAllFingerPrintsMightBeTooLong=إظهار كافة السجلات المؤرشفة (قد تكون طويلة)
 ShowAllFingerPrintsErrorsMightBeTooLong=إظهار كافة سجلات الأرشيف غير الصالحة (قد تكون طويلة)
 DownloadBlockChain=تنزيل بصمات الأصابع
-KoCheckFingerprintValidity=إدخال السجل المؤرشف غير صالح. هذا يعني أن شخصًا ما (متسلل؟) قد قام بتعديل بعض بيانات هذا السجل بعد تسجيله ، أو قام بمسح السجل المؤرشف السابق (تحقق من وجود هذا السطر مع الرقم السابق) أو قام بتعديل المجموع الاختباري للسجل السابق.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=سجل السجل المؤرشف صالح. لم يتم تعديل البيانات الموجودة في هذا السطر ويتبع الإدخال السابق.
 OkCheckFingerprintValidityButChainIsKo=يبدو السجل المؤرشف صالحًا مقارنةً بالسجل السابق ولكن السلسلة تالفة سابقًا.
 AddedByAuthority=مخزنة في سلطة بعيدة
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=تفاصيل السجل
 ListOfTrackedEvents=قائمة الأحداث المتعقبة
 Fingerprint=بصمة
 DownloadLogCSV=تصدير السجلات المؤرشفة (CSV)
-DataOfArchivedEvent=البيانات الكاملة للحدث المؤرشف
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=الكائن الأصلي (اكتب %s ، معرف %s) غير مرتبط (راجع عمود "البيانات الكاملة" للحصول على بيانات محفوظة غير قابلة للتغيير)
 BlockedLogAreRequiredByYourCountryLegislation=قد تكون وحدة السجلات غير القابلة للتغيير مطلوبة بموجب تشريعات بلدك. قد يؤدي تعطيل هذه الوحدة إلى إبطال أي معاملات مستقبلية فيما يتعلق بالقانون واستخدام البرامج القانونية حيث لا يمكن التحقق من صحتها من خلال تدقيق ضريبي.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=تم تنشيط وحدة السجلات غير القابلة للتغيير بسبب تشريعات بلدك. قد يؤدي تعطيل هذه الوحدة إلى جعل أي معاملات مستقبلية غير صالحة فيما يتعلق بالقانون واستخدام البرامج القانونية حيث لا يمكن التحقق من صحتها عن طريق التدقيق الضريبي.
@@ -30,6 +32,7 @@ BlockedLogEnabled=تم تفعيل نظام لتتبع الأحداث إلى سج
 BlockedLogDisabled=تم تعطيل نظام لتتبع الأحداث إلى سجلات غير قابلة للتغيير بعد إجراء بعض التسجيلات. قمنا بحفظ بصمة إصبع خاصة لتتبع السلسلة على أنها مكسورة
 BlockedLogDisabledBis=تم تعطيل نظام لتتبع الأحداث إلى سجلات غير قابلة للتغيير. هذا ممكن لأنه لم يتم عمل أي سجل حتى الآن.
 LinkHasBeenDisabledForPerformancePurpose=لأغراض الأداء، لا يظهر الرابط المباشر للمستند بعد السطر المائة.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=فاتورة العميل محذوفة منطقيا
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=الحذف المنطقي لدفع العميل
 logPAYMENT_VARIOUS_CREATE=تم إنشاء الدفعة (لم يتم تعيينها لفاتورة)
 logPAYMENT_VARIOUS_DELETE=الحذف المنطقي للدفع (غير مخصص لفاتورة)
 logPAYMENT_VARIOUS_MODIFY=تم تعديل الدفعة (لم يتم تعيينها لفاتورة)
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang
index 93114599ee2..fe91e1a322e 100644
--- a/htdocs/langs/ar_SA/categories.lang
+++ b/htdocs/langs/ar_SA/categories.lang
@@ -8,7 +8,7 @@ In=في
 AddIn=اضف الى
 modify=تعديل
 Classify=صنف
-CategoriesArea=منطقة الكلمات / الفئات 
+CategoriesArea=منطقة الكلمات / الفئات
 ProductsCategoriesArea=منطقة علامات / فئات المنتج / الخدمة
 SuppliersCategoriesArea=منطقة علامات / فئات البائعين
 CustomersCategoriesArea=منطقة علامات / فئات العملاء
@@ -17,6 +17,7 @@ ContactsCategoriesArea=علامات الاتصال / منطقة الفئات
 AccountsCategoriesArea=منطقة علامات / فئات الحساب المصرفي
 ProjectsCategoriesArea=علامات المشروع / منطقة الفئات
 UsersCategoriesArea=علامات المستخدم / منطقة الفئات
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=الفئات الفرعية
 CatList=قائمة العلامات / الفئات
 CatListAll=قائمة العلامات / الفئات (جميع الأنواع)
@@ -35,7 +36,7 @@ ProductIsInCategories=المنتج / الخدمة مرتبط بـ العلاما
 CompanyIsInCustomersCategories=هذا الطرف الثالث مرتبط  بـ العملاء / العملاء المحتملون العلامات / فئات التالية 
 CompanyIsInSuppliersCategories=هذا الطرف الثالث مرتبط بعلامات / فئات البائعين التالية
 MemberIsInCategories=هذا العضو مرتبط  بـ علامات / فئات الأعضاء التالية
-ContactIsInCategories=ويرتبط هذا الاتصال إلى علامات / فئات جهات الاتصال التالية 
+ContactIsInCategories=ويرتبط هذا الاتصال إلى علامات / فئات جهات الاتصال التالية
 ProductHasNoCategory=هذا المنتج / الخدمة ليست في أي علامات / فئات
 CompanyHasNoCategory=هذا الطرف الثالث ليس في أي علامات / فئات
 MemberHasNoCategory=هذا العضو ليس في أي علامات / فئات
@@ -66,7 +67,7 @@ ProjectsCategoriesShort=علامات / فئات المشاريع 
 UsersCategoriesShort=علامات المستخدمين / الفئات
 StockCategoriesShort=علامات / فئات المستودعات
 ThisCategoryHasNoItems=هذه الفئة لا تحتوي على أي عناصر.
-CategId=معرف العلامة / الفئة 
+CategId=معرف العلامة / الفئة
 ParentCategory=العلامة الأصلية / الفئة
 ParentCategoryID=معرف الأصل وسم/category
 ParentCategoryLabel=تسمية العلامة / الفئة الأصل
@@ -86,13 +87,14 @@ CatProjectsLinks=الروابط بين المشاريع والعلامات / ا
 CatUsersLinks=الروابط بين المستخدمين والعلامات / الفئات
 DeleteFromCat=إزالة من العلامة / الفئة
 ExtraFieldsCategories=سمات تكميلية
-CategoriesSetup=إعداد العلامات / الفئات 
+CategoriesSetup=إعداد العلامات / الفئات
 CategorieRecursiv=ربط مع العلامة / الفئة الاب تلقائيا
 CategorieRecursivHelp=إذا كان الخيار قيد التشغيل، فعند إضافة كائن إلى فئة فرعية، سيتم إضافة الكائن أيضًا إلى الفئات الأصلية.
 AddProductServiceIntoCategory=تعيين فئة للمنتج/الخدمة
-AddCustomerIntoCategory=تعيين فئة للعميل
-AddSupplierIntoCategory=تعيين فئة للمورد
-AssignCategoryTo=تعيين فئة إلى
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=إظهار العلامة / الفئة
 ByDefaultInList=افتراضيا في القائمة
 ChooseCategory=اختر الفئة
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=فئات حاوية الصفحة
 KnowledgemanagementsCategoriesArea=فئات مقالة KM
 UseOrOperatorForCategories=استخدم عامل التشغيل "OR" للفئات
 AddObjectIntoCategory=تعيين إلى الفئة
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index cc6b15aecfa..62a34e8e305 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -34,7 +34,7 @@ PriceFormatInCurrentLanguage=تنسيق عرض السعر باللغة والع
 ThirdPartyName=اسم الطرف الثالث
 ThirdPartyEmail=البريد الإلكتروني للطرف الثالث
 ThirdParty=طرف ثالث
-ThirdParties=الأطراف الثالثة
+ThirdParties=أطراف ثالثة
 ThirdPartyProspects=فرص
 ThirdPartyProspectsStats=فرص
 ThirdPartyCustomers=العملاء
@@ -65,6 +65,7 @@ State=الولاية / المقاطعة
 StateId=معرف الدولة
 StateCode=رمز الولاية / المقاطعة
 StateShort=الولاية
+DepartmentBuyer=Buyer's state/province
 Region=المنطقة
 Region-State=المنطقة - الولاية
 Country=الدولة
@@ -78,7 +79,7 @@ Chat=دردشة
 PhonePro=أوتوبيس. هاتف
 PhonePerso=الهاتف الشخصي
 PhoneMobile=الجوال
-No_Email=رفض الرسائل الإلكترونية الجماعية
+No_Email=Refuse mass emails
 Fax=الفاكس
 Zip=الرمز البريدي
 Town=مدينة
@@ -382,12 +383,12 @@ ExportCardToFormat=تصدير البطاقة إلى التنسيق
 ContactNotLinkedToCompany=جهة الاتصال ليست مرتبطة بأي طرف ثالث
 DolibarrLogin=تسجيل الدخول الى دوليبار
 NoDolibarrAccess=لا يوجد وصول دوليبار
-ExportDataset_company_1=الأطراف الثالثة (الشركات / المؤسسات / الأشخاص الطبيعيون) وممتلكاتهم
-ExportDataset_company_2=جهات الاتصال وخصائصها
-ExportDataset_company_3=حسابات بنكية لأطراف ثالثة
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=جهات اتصال | عناوين وسمات إضافية للأطراف الثالثة
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=الأطراف الثالثة وممتلكاتهم
 ImportDataset_company_2=جهات اتصال | عناوين وسمات إضافية للأطراف الثالثة
-ImportDataset_company_3=حسابات بنكية لأطراف ثالثة
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=ممثلو مبيعات اطراف ثالثة (تعيين مندوبي مبيعات / مستخدمين للشركات)
 PriceLevel=مستوى السعر
 PriceLevelLabels=تسميات مستوى السعر
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=اسم المدير (المديرون) (الرئيس التنفيذي ، المدير ، الرئيس)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=دمج أطراف ثالثة
-ConfirmMergeThirdparties=هل أنت متأكد أنك تريد دمج الطرف الثالث المختار مع الطرف الحالي؟ سيتم نقل جميع العناصر المرتبطة (الفواتير ، الطلبات ، ...) إلى الطرف الثالث الحالي ، وبعد ذلك سيتم حذف الطرف الثالث المختار.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=تم دمج الأطراف الثالثة
 SaleRepresentativeLogin=تسجيل دخول مندوب مبيعات
 SaleRepresentativeFirstname=الاسم الأول لمندوب المبيعات
@@ -461,3 +462,6 @@ ExternalSystemID=معرف النظام الخارجي
 IDOfPaymentInAnExternalSystem=معرف طريقة الدفع في نظام خارجي (مثل Stripe، Paypal، ...)
 AADEWebserviceCredentials=بيانات اعتماد خدمة الويب AADE
 ThirdPartyMustBeACustomerToCreateBANOnStripe=يجب أن يكون الطرف الثالث العميل للسماح بإنشاء معلوماته المصرفية على جانب Stripe
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index 7048a928f96..e60179cbdaf 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=الزبون تسديد الفاتورة
 PaymentSupplierInvoice=دفع فاتورة البائع
 PaymentSocialContribution=اجتماعي / دفع الضرائب المالية
 PaymentVat=دفع ضريبة القيمة المضافة
-AutomaticCreationPayment=سجل الدفع تلقائيًا
+AutomaticCreationPayment=Also record the payment
 ListPayment=قائمة المدفوعات
 ListOfCustomerPayments=قائمة مدفوعات العملاء
 ListOfSupplierPayments=قائمة مدفوعات البائعين
@@ -118,10 +118,14 @@ SocialContributionsPayments=الاجتماعية المدفوعات / الضرا
 ShowVatPayment=وتظهر دفع ضريبة القيمة المضافة
 TotalToPay=على دفع ما مجموعه
 BalanceVisibilityDependsOnSortAndFilters=يظهر الرصيد في هذه القائمة فقط إذا تم فرز الجدول على %s وتصفيته على حساب مصرفي واحد (بدون عوامل تصفية أخرى)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=كود محاسبة العملاء
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=كود محاسبة البائع
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=الزبون. حساب. رمز
 SupplierAccountancyCodeShort=سوب. حساب. رمز
+UserAccountancyCodeShort=User account. code
 AccountNumber=رقم الحساب
 NewAccountingAccount=حساب جديد
 Turnover=Turnover invoiced
@@ -129,7 +133,9 @@ TurnoverCollected=Turnover collected
 SalesTurnoverMinimum=الحد الأدنى من معدل الدوران
 ByExpenseIncome=By expenses & incomes
 ByThirdParties=بو أطراف ثالثة
+ByProjects=By projects
 ByUserAuthorOfInvoice=فاتورة من قبل المؤلف
+DetailedListLowercase=detailed list
 CheckReceipt=قسيمة الإيداع
 CheckReceiptShort=قسيمة الإيداع
 LastCheckReceiptShort=أحدث %s قسائم الإيداع
diff --git a/htdocs/langs/ar_SA/datapolicy.lang b/htdocs/langs/ar_SA/datapolicy.lang
index 18bf9ec7c02..605cd3c6e9a 100644
--- a/htdocs/langs/ar_SA/datapolicy.lang
+++ b/htdocs/langs/ar_SA/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = سياسة خصوصية البيانات
 Module4100Desc = نموذج لإدارة خصوصية البيانات (التوافق مع اللائحة العامة لحماية البيانات)
 # Administration page
 datapolicySetup = نموذج إعداد سياسة خصوصية البيانات
-Deletion = حذف البيانات
-datapolicySetupPage = وفقًا لقوانين بلدانك (مثال <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">المادة 5</a> من اللائحة العامة لحماية البيانات)، يجب الاحتفاظ بالبيانات الشخصية لفترة من الوقت. بما لا يتجاوز المدة المطلوبة للبيانات للغرض الذي تم جمعها من أجله، باستثناء الأغراض الأرشفية.<br>سيتم الحذف تلقائيًا بعد مدة معينة دون أحداث (المدة والتي ستشير إليها أدناه).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s شهر
 ONE_YEAR = 1 سنة
 NB_YEARS = %s سنة
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = احتمال/العميل
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = ولا احتمال/ ولا العميل
 DATAPOLICY_CONTACT_FOURNISSEUR = المورد
 DATAPOLICY_ADHERENT = عضو
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = يمكنك إرسال بريد إلكتروني بالقانون العام لحماية البيانات (GDPR) إلى جميع جهات الاتصال ذات الصلة (الذين لم يتلقوا بعد رسالة بريد إلكتروني و والتي لم تسجل أي شيء بشأن اتفاقية القانون العام لحماية البيانات الخاصة بهم). للقيام بذلك، استخدم الزر التالي.
 SendAgreement = إرسال رسائل البريد الإلكتروني
 AllAgreementSend = تم إرسال كافة رسائل البريد الإلكتروني
 TXTLINKDATAPOLICYACCEPT = نص الرابط "الاتفاقية"
 TXTLINKDATAPOLICYREFUSE = نص الرابط "الخلاف"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = اللائحة العامة لحماية البيانات: معالجة البيانات الشخصية
 DATAPOLICY_consentement = تم الحصول على الموافقة لمعالجة البيانات الشخصية
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 5f6e80c9d7f..b520979cea9 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=فشل إنشاء دليل. تأكد من أن خادم الويب المستخدم أذونات لكتابة وثائق Dolibarr في الدليل. إذا تم تمكين المعلم <b>safe_mode</b> على هذا PHP ، تحقق من أن ملفات Dolibarr php تملك لخدمة الويب المستخدم (أو مجموعة).
 ErrorNoMailDefinedForThisUser=البريد لا يعرف لهذا المستخدم
 ErrorSetupOfEmailsNotComplete=لم يكتمل إعداد رسائل البريد الإلكتروني
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=تحتاج هذه الميزة إلى تفعيل JavaScript حتى تعمل. قم بتغيير هذا في الإعداد - العرض.
 ErrorTopMenuMustHaveAParentWithId0=وهناك قائمة من نوع 'توب' لا يمكن أن يكون أحد الوالدين القائمة. 0 وضعت في القائمة أو الأم في اختيار قائمة من نوع 'اليسار'.
 ErrorLeftMenuMustHaveAParentId=وهناك قائمة من نوع 'اليسار' يجب أن يكون لها هوية الوالد.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=حظر حمل من قبل البرنامج المسا
 ErrorFileSizeTooLarge=حجم الملف كبير جدًا أو لم يتم توفير الملف.
 ErrorFieldTooLong=الحقل %s طويل جدًا.
 ErrorSizeTooLongForIntType=طويل جدا بالنسبة نوع INT (%s أرقام كحد أقصى) حجم
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=وقتا طويلا لنوع السلسلة (%s حرف كحد أقصى) حجم
 ErrorNoValueForSelectType=يرجى ملء قيمة لقائمة مختارة
 ErrorNoValueForCheckBoxType=يرجى ملء قيمة لقائمة مربع
@@ -138,8 +140,9 @@ ErrorBadValueForCode=سيئة قيمة لرمز الحماية. حاول مرة
 ErrorBothFieldCantBeNegative=ويمكن لحقول %s و%s لا تكون سلبية
 ErrorFieldCantBeNegativeOnInvoice=لا يمكن أن يكون الحقل <strong>%s</strong> سالبًا في هذا النوع من فاتورة. إذا كنت بحاجة إلى إضافة سطر خصم، فما عليك سوى إنشاء الخصم أولاً (من الحقل '%s' في بطاقة الطرف الثالث) و قم بتطبيقه على فاتورة.
 ErrorLinesCantBeNegativeForOneVATRate=لا يمكن أن يكون إجمالي البنود (صافي الضريبة) سالبًا لمعدل ضريبة القيمة المضافة غير الفارغ (تم العثور على إجمالي سلبي لمعدل ضريبة القيمة المضافة <b> %s </b> %%).
-ErrorLinesCantBeNegativeOnDeposits=لا يمكن أن تكون الأسطر سالبة في الإيداع. ستواجه مشاكل عندما تحتاج إلى استهلاك الإيداع في الفاتورة النهائية إذا قمت بذلك.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=كمية لخط في فواتير العملاء لا يمكن أن يكون سلبيا
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=<b>%s</b> تستخدم حساب مستخدم لتنفيذ خادم الويب لا يوجد لديه إذن لذلك
 ErrorNoActivatedBarcode=لا يوجد نوع الباركود تفعيلها
 ErrUnzipFails=فشل بفك٪ الصورة مع ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=معلمة PHP upload_max_filesize (%s) أعلى من معلمة PHP post_max_size (%s). هذا ليس إعداد ثابت.
 WarningPasswordSetWithNoAccount=تم تعيين كلمة مرور لهذا العضو. ومع ذلك، تم إنشاء أي حساب المستخدم. لذلك يتم تخزين كلمة المرور هذه ولكن لا يمكن استخدامها للدخول إلى Dolibarr. ويمكن استخدامه من قبل وحدة / واجهة خارجية ولكن إذا كنت لا تحتاج إلى تعريف أي تسجيل دخول أو كلمة المرور لأحد أفراد، يمكنك تعطيل خيار "إدارة تسجيل دخول لكل عضو" من إعداد وحدة الأعضاء. إذا كنت بحاجة إلى إدارة تسجيل الدخول ولكن لا تحتاج إلى أي كلمة المرور، يمكنك الحفاظ على هذا الحقل فارغا لتجنب هذا التحذير. ملاحظة: يمكن أيضا أن تستخدم البريد الإلكتروني لتسجيل الدخول إذا تم ربط عضو إلى المستخدم.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = لا يمكن إضافة SwissQR فاتورة إلا على الفواتير التي تم تعيينها ليتم دفعها من خلال دفعات تحويل الائتمان.
 SwissQrCreditorAddressInvalid = عنوان الدائن غير صالح (هل تم تعيين مدينة ZIP و؟ (%s)
 SwissQrCreditorInformationInvalid = معلومات الدائن غير صالحة لرقم IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=تم تعريف %s بالفعل كج
 ErrorThisGroupIsAlreadyDefinedAsThisType=تم بالفعل تعريف جهات الاتصال بهذه المجموعة كجهة اتصال لهذا النوع.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/ar_SA/exports.lang b/htdocs/langs/ar_SA/exports.lang
index dc12146b78f..5f5777414c9 100644
--- a/htdocs/langs/ar_SA/exports.lang
+++ b/htdocs/langs/ar_SA/exports.lang
@@ -46,10 +46,16 @@ LineLabel=تسمية الخط
 LineDescription=وصف خط
 LineUnitPrice=سعر الوحدة من خط
 LineVATRate=ضريبة القيمة المضافة من سعر الخط
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=خط للكمية
 LineTotalHT=المبلغ غير شامل. ضريبة للخط
 LineTotalTTC=المبلغ تمشيا مع ضريبة
 LineTotalVAT=مبلغ الضريبة على القيمة المضافة لخط
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Type of line (0=product, 1=نوع الخط (0= منتج الخدمة= 1)
 FileWithDataToImport=ملف استيراد البيانات
 FileToImport=مصدر لاستيراد ملف
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=اختر تنسيق الملف لاستخدامه ك
 ChooseFileToImport=قم بتحميل الملف ثم انقر فوق أيقونة %s لتحديد الملف كملف استيراد المصدر ...
 SourceFileFormat=مصدر تنسيق ملف
 FieldsInSourceFile=الحقول في ملف المصدر
-FieldsInTargetDatabase=الحقول المستهدفة في قاعدة بيانات Dolibarr (جريئة = إلزامي)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=لا الحقول
 MoveField=تحرك %s حقل رقم العمود
 ExampleOfImportFile=Example_of_import_file
@@ -76,8 +82,8 @@ NowClickToTestTheImport=تحقق من أن تنسيق الملف (محددات 
 RunSimulateImportFile=قم بتشغيل محاكاة الاستيراد
 FieldNeedSource=يتطلب هذا المجال البيانات من الملف المصدر
 SomeMandatoryFieldHaveNoSource=بعض الحقول إلزامية ليس لديها مصدر من ملف البيانات
-InformationOnSourceFile=معلومات عن الملف المصدر
-InformationOnTargetTables=معلومات عن الهدف الحقول
+InformationOnSourceFile=ملف المصدر
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=التبديل حقل واحد على الأقل مصدر في عمود من الحقول لتصدير
 SelectFormat=اختيار تنسيق الملف هذا الاستيراد
 RunImportFile=بيانات الاستيراد
diff --git a/htdocs/langs/ar_SA/hrm.lang b/htdocs/langs/ar_SA/hrm.lang
index a605fb574a9..900c84e0f20 100644
--- a/htdocs/langs/ar_SA/hrm.lang
+++ b/htdocs/langs/ar_SA/hrm.lang
@@ -17,7 +17,7 @@ DictionaryFunction=إدارة الموارد البشرية - المسميات 
 Employees=الموظفين
 Employee=الموظف
 NewEmployee=موظف جديد
-ListOfEmployees=قائمة الموظفين 
+ListOfEmployees=قائمة الموظفين
 HrmSetup=HRM وحدة الإعداد
 SkillsManagement=إدارة المهارات
 HRM_MAXRANK=أقصى عدد من المستويات لترتيب مهارة
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=الرتبة المطلوبة للملف الوظيفي
-RequiredRankShort=الرتبة المطلوبة
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=المناصب مع هذه التشكيلات الوظيفية
-EmployeeRank=رتبة الموظف لهذه المهارة
-EmployeeRankShort=رتبة موظف
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=منصب الموظف
 EmployeePositions=مناصب الموظفين
 EmployeesInThisPosition=موظفين في هذا المنصب
@@ -72,6 +72,9 @@ AddSkill=إضافة المهارات إلى الملف الشخصي للوظيف
 RequiredSkills=المهارات المطلوبة لهذا الملف الوظيفي
 UserRank=رتبة المستخدم
 SkillList=قائمة المهارات
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=حفظ الرتبة
 TypeKnowHow=أعرف كيف
 TypeHowToBe=كيف تكون
@@ -95,3 +98,5 @@ NeedBusinessTravels=بحاجة إلى رحلات عمل
 NoDescription=بدون وصف
 TheJobProfileHasNoSkillsDefinedFixBefore=لا يحتوي ملف تعريف الوظيفة الذي تم تقييمه لهذا الموظف على أي مهارة محددة فيه. الرجاء إضافة المهارة (المهارات)، ثم حذف و ثم إعادة تشغيل التقييم.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index acdaca68a89..d054132ef3f 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=مراسلة
 EMailing=مراسلة
-EMailings=EMailings
+EMailings=Mass EMails
 SMSings=الرسائل القصيرة
-AllEMailings=جميع eMailings
+AllEMailings=All mass eMails
 MailCard=بطاقة الإنترنت
 MailRecipients=المستفيدون
 MailRecipient=المتلقي
@@ -26,19 +26,19 @@ MailFile=الملفات المرفقة
 MailMessage=هيئة البريد الإلكتروني
 SubjectNotIn=ليس في الموضوع
 BodyNotIn=ليس في الجسد
-ShowEMailing=وتظهر مراسلة
-ListOfEMailings=قائمة emailings
-NewMailing=مراسلة جديدة
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=الرسائل القصيرة الجديدة
-EditMailing=تحرير مراسلة
-ResetMailing=إعادة إرساله عبر البريد الإلكتروني
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=حذف البريد الإلكتروني
-PreviewMailing=معاينة مراسلة
-CreateMailing=إنشاء مراسلة
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=اختبار
-ValidMailing=صحيح مراسلة
+ValidMailing=Valid mass Email
 MailingStatusDraft=مسودة
 MailingStatusValidated=صادق
 MailingStatusSent=أرسل
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=يجب أن تتطابق جميع المرشحات حت
 LineInFile=خط المستندات في ملف ٪
 RecipientSelectionModules=حددت لطلبات المستفيدين الاختيار
 MailSelectedRecipients=اختيار المستفيدين
-MailingArea=EMailings المنطقة
-LastMailings=Latest %s emailings
+MailingArea=رسائل البريد الإلكتروني الجماعية
+LastMailings=Latest %s mass emails
 TargetsStatistics=أهداف الإحصاءات
 NbOfCompaniesContacts=فريدة من شركات الاتصالات
 MailNoChangePossible=صادق المتلقين للمراسلة لا يمكن تغيير
-SearchAMailing=البحث البريدية
-SendMailing=إرسال البريد الإلكتروني
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=أرسلها
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=ولكن يمكنك إرسالها عبر الإنترنت عن طريق إضافة معلمة MAILING_LIMIT_SENDBYWEB مع قيمة الحد الأقصى لعدد من رسائل البريد الإلكتروني التي تريد إرسالها من خلال هذه الدورة.
 ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=يتم إرسال من emailings من واجهة الويب في عدة مرات لأسباب أمنية ومهلة <b>والمستفيدين٪ الصورة</b> في وقت لكل دورة ارسال: ملاحظة.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=لائحة واضحة
 ToClearAllRecipientsClickHere=من الواضح أن المستفيدين قائمة لهذا البريد الإلكتروني ، انقر على زر
 ToAddRecipientsChooseHere=إضافة إلى المتلقين ، وتختار في هذه القوائم
-NbOfEMailingsReceived=وتلقى كتلة emailings
-NbOfEMailingsSend=emailings الجماعية أرسلت
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=رقم قياسي
 DeliveryReceipt=Delivery Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=يمكنك استخدام <b>الفاصلة</b> فاصل لتحديد عدد من المتلقين.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=لا توجد إخطارات تلقائية بالبر
 ANotificationsWillBeSent=سيتم إرسال إشعار تلقائي واحد عبر البريد الإلكتروني
 SomeNotificationsWillBeSent=%s سيتم إرسال إشعارات تلقائية عبر البريد الإلكتروني
 AddNewNotification=اشترك في إشعار تلقائي جديد بالبريد الإلكتروني (الهدف / الحدث)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=وقد تم تكوين إرسال البريد الإلكتروني الإعداد ل'٪ ق'. هذا الوضع لا يمكن أن تستخدم لإرسال إرساله عبر البريد الإلكتروني الشامل.
 MailSendSetupIs2=يجب عليك أولا الذهاب، مع حساب مشرف، في القائمة٪ sHome - إعداد - رسائل البريد الإلكتروني٪ s إلى تغيير المعلمة <strong>'٪ ق'</strong> لاستخدام وضع '٪ ق'. مع هذا الوضع، يمكنك إدخال الإعداد خادم SMTP المقدمة من قبل موفر خدمة الإنترنت واستخدام قداس ميزة البريد الإلكتروني.
 MailSendSetupIs3=إذا كان لديك أي أسئلة حول كيفية إعداد ملقم SMTP الخاص بك، يمكنك أن تطلب إلى٪ s.
@@ -183,7 +185,7 @@ Information=معلومات
 ContactsWithThirdpartyFilter=جهات الاتصال مع مرشح طرف ثالث
 Unanswered=لم يتم الرد عليها
 Answered=محلول
-IsNotAnAnswer=ليس إجابة (البريد الإلكتروني الأولي)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=هي إجابة رسالة بريد إلكتروني أولية
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=القيمة الافتراضية للحقل "%s" عند تكوين جهة اتصال جديدة
@@ -199,6 +201,6 @@ ModelTemplate=قالب البريد الإلكتروني
 YouCanChooseAModelForYouMailContent= يمكنك اختيار أحد نماذج القوالب أو إنشاء نموذج باستخدام الذكاء الاصطناعي
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 67fa2284218..2ab47e46840 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -37,6 +37,7 @@ Translation=الترجمة
 Translations=ترجمات
 CurrentTimeZone=حسب توقيت خادم البي إتش بي
 EmptySearchString=أدخل معايير بحث غير فارغة
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=أدخل معايير التاريخ
 NoRecordFound=لا يوجد سجلات
 NoRecordDeleted=لم يتم حذف أي سجل
@@ -45,6 +46,7 @@ NoError=لا خطأ
 Error=خطأ
 Errors=أخطاء
 ErrorFieldRequired=الحقل "%s" مطلوب
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=يحتوي الحقل "%s" على قيمة غير صالحة
 ErrorFileDoesNotExists=الملف %s غير موجود
 ErrorFailedToOpenFile=فشل فى فتح الملف %s
@@ -308,6 +310,7 @@ DateBuild=تاريخ إنشاء التقرير
 DatePayment=تاريخ السداد
 DateApprove=تاريخ الموافقة
 DateApprove2=تاريخ الموافقة (موافقة الثانية)
+PendingSince=Pending since
 RegistrationDate=تاريخ التسجيل
 UserCreation=المستخدم المنشأ
 UserModification=المستخدم المعدل
@@ -495,7 +498,7 @@ ActionRunningNotStarted=للبدأ
 ActionRunningShort=في تقدم
 ActionDoneShort=تم الانتهاء
 ActionUncomplete=غير مكتمل
-LatestLinkedEvents=أحدث %s أحداث المرتبطة
+LatestLinkedEvents=The last %s events
 CompanyFoundation=الشركة | المؤسسة
 Accountant=المحاسب
 ContactsForCompany=اتصالات لهذا الطرف الثالث
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=هيئة البريد الإلكتروني
 SendAcknowledgementByMail=إرسال بريد إلكتروني للتأكيد
 SendMail=إرسال بريد إلكتروني
 Email=بريد الالكتروني
+EMail=بريد الالكتروني
+EMails=رسائل البريد الإلكترونية
 NoEMail=لا بريد إلكتروني
 AlreadyRead=مقروء
 NotRead=غير مقروء
@@ -793,7 +798,7 @@ Notes=ملاحظات
 AddNewLine=إضافة بند جديد
 AddFile=إضافة ملف
 FreeZone=منتج - نص حر
-FreeLineOfType=صنف - نص حر ، نوع:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=استنساخ الكائن بسماته الرئيسية
 ReGeneratePDF=أعد انتاج ملف PDF
 PDFMerge=دمج PDF
@@ -879,12 +884,14 @@ toward=باتجاه
 Access=وصول
 SelectAction=حدد العمل
 SelectTargetUser=حدد المستخدم | الموظف المستهدف
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=استخدم Ctrl + C للنسخ إلى الحافظة
 SaveUploadedFileWithMask=حفظ الملف على الخادم باسم "<strong> %s </strong>" (وإلا "%s")
 OriginFileName=اسم الملف الأصلي
 SetDemandReason=تعيين المصدر
 SetBankAccount=تحديد الحساب المصرفي
 AccountCurrency=عملة الحساب
+AccountancyCode=Accounting Code
 ViewPrivateNote=عرض الملاحظات
 XMoreLines=%s بند (بنود) مخفي
 ShowMoreLines=عرض المزيد | أقل من البنود
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=هل أنت متأكد من أنك تريد حذف %
 ConfirmMassClone=تأكيد الاستنساخ بالجملة
 ConfirmMassCloneQuestion=حدد مشروع للاستنساخ فيه
 ConfirmMassCloneToOneProject=استنساخ إلى مشروع %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=كائنات ذات صلة
 ClassifyBilled=تصنيف الفواتير
 ClassifyUnbilled=تصنيف غير مفوترة
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=تحتاج إلى تسجيل الدخول وتحتاج 
 Download=تحميل
 DownloadDocument=تحميل مستند
 DownloadSignedDocument=قم بتنزيل الوثيقة الموقعة
-ActualizeCurrency=تحديث سعر العملة
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=السنة المالية
 ModuleBuilder=الوحدة النمطية ومنشئ التطبيق
 SetMultiCurrencyCode=تعيين العملة
+SetMultiCurrencyRate=Set currency rate
 BulkActions=جملة إجراءات
 ClickToShowHelp=انقر لإظهار تعليمات تلميح الأدوات
 WebSite=الموقع الكتروني
@@ -1104,6 +1113,7 @@ PayedBy=مدفوع بــ
 PayedTo=مدفوع لــ
 Monthly=شهريا
 Quarterly=ربع سنوى
+Quarter=Quarter
 Annual=سنوي
 Local=محلي
 Remote=بعيد
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=مهمة
 ContactDefault_propal=عرض
 ContactDefault_supplier_proposal=عرض المورد
 ContactDefault_ticket=تذكرة
+ContactDefault_societe=طرف ثالث
 ContactAddedAutomatically=تمت إضافة جهة الاتصال من أدوار جهة اتصال خارجية
 More=أكثر
 ShowDetails=عرض التفاصيل
@@ -1242,6 +1253,7 @@ CommercialAffected=تم تعيين مندوب مبيعات
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=رسالة
+Emailing=Emailing
 Progression=تقدم
 YourMessage=رسالتك
 YourMessageHasBeenReceived=وقد وردت الرسالة. سنقوم بالرد أو الاتصال بك في أقرب وقت ممكن.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=إضافة
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=من البداية
+Transferred=Transferred
diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
index c2616b05f80..770705ff29a 100644
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=إذا كان الاشتراك مطلوبًا، فيج
 DeleteType=حذف
 VoteAllowed=يسمح التصويت
 Physical=الفرد
-Moral=مؤسَّسة
-MorAndPhy=شركة وفرد
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=إعادة التمكين
 ExcludeMember=استبعاد عضو
 Exclude=استبعاد
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=إحصائيات الأعضاء حسب المنطقة
 NbOfMembers=إجمالي عدد الأعضاء
 NbOfActiveMembers=العدد الإجمالي للأعضاء النشطين الحاليين
 NoValidatedMemberYet=العثور على أي أعضاء التحقق من صحة
-MembersByCountryDesc=تظهر لك هذه الشاشة إحصائيات الأعضاء حسب الدول. تعتمد الرسوم البيانية والمخططات على مدى توفر خدمة الرسم البياني عبر الإنترنت من Google بالإضافة إلى توفر اتصال إنترنت فعال.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=تظهر لك هذه الشاشة إحصائيات الأعضاء حسب الولاية / المقاطعات / الكانتون.
 MembersByTownDesc=تظهر لك هذه الشاشة إحصائيات الأعضاء حسب المدينة.
 MembersByNature=تظهر لك هذه الشاشة إحصائيات الأعضاء حسب الطبيعة.
@@ -208,25 +209,25 @@ NewMemberbyWeb=وأضاف عضو جديد. تنتظر الموافقة
 NewMemberForm=الأعضاء الجدد في شكل
 SubscriptionsStatistics=إحصاءات المساهمات
 NbOfSubscriptions=عدد المساهمات
-AmountOfSubscriptions=المبلغ المحصل من المساهمات
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=دوران (لشركة) أو الميزانية (على أساس)
-DefaultAmount=المبلغ الافتراضي للمساهمة (يُستخدم فقط إذا لم يتم تحديد أي مبلغ على مستوى النوع عضو)
-MinimumAmount=الحد الأدنى للمبلغ (يستخدم فقط عندما يكون مبلغ المساهمة مجانيًا)
-CanEditAmount=يمكن تحديد مبلغ الاشتراك بواسطة عضو
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=يمكن للزائر اختيار/تعديل مبلغ مساهمته بغض النظر عن نوع عضو
 AmountIsLowerToMinimumNotice=المبلغ أقل من الحد الأدنى %s
 MEMBER_NEWFORM_PAYONLINE=بعد التسجيل عبر الإنترنت، انتقل تلقائيًا إلى صفحة الدفع عبر الإنترنت
 ByProperties=بالطبيعة
 MembersStatisticsByProperties=إحصائيات الأعضاء حسب الطبيعة
-VATToUseForSubscriptions=معدل ضريبة القيمة المضافة لاستخدامه في المساهمات
-NoVatOnSubscription=لا ضريبة القيمة المضافة للمساهمات
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=المنتج المستخدم لبند المساهمة في الفاتورة: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=الإسم أو الشركة
 SubscriptionRecorded=تم تسجيل المساهمة
 NoEmailSentToMember=لم يتم إرسال بريد إلكتروني للعضو
 EmailSentToMember=تم إرسال البريد الإلكتروني إلى العضو على %s
-SendReminderForExpiredSubscriptionTitle=إرسال تذكير عبر البريد الإلكتروني للمساهمات منتهية الصلاحية
-SendReminderForExpiredSubscription=أرسل تذكيرًا عبر البريد الإلكتروني إلى أعضاء عندما تكون المساهمة على وشك الانتهاء (المعلمة هي عدد الأيام قبل نهاية العضوية لإرسال التذكير. ويمكن أن تكون قائمة أيام مفصولة بفاصلة منقوطة ، على سبيل المثال '10;5;0;-5')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=العضوية مدفوعة للفترة الحالية (حتى %s)
 YouMayFindYourInvoiceInThisEmail=قد تجد فاتورتك مرفقة بهذا البريد الإلكتروني
 XMembersClosed=%s من الأعضاء مغلقين
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=الطرف الثالث هو الكيان القا
 MemberFirstname=الاسم الأول للعضو
 MemberLastname=اسم العائلة للعضو
 MemberCodeDesc=عضو كود فريد لجميع أعضاء
-MemberSubscriptionStartFirstDayOf=تاريخ بدء العضوية يتوافق مع اليوم الأول من أ
-MemberSubscriptionStartAfter=الحد الأدنى للفترة قبل دخول تاريخ البدء حيز التنفيذ الاشتراك باستثناء التجديدات (على سبيل المثال +3 شهر = +3 أشهر، -5 يوم = -5 أيام، +1Y = +1 عام )
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=ترتبط العضوية بمعاملة موفقة لذا لا يسمح بهذا التعديل.
 ConfirmMassSubsriptionCreation=تأكيد إنشاء الاشتراك
 ConfirmMassSubsriptionCreationQuestion=هل أنت متأكد أنك تريد إنشاء %s الاشتراك(s) المحدد؟
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index 4169524f054..03c66402dfc 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -97,7 +97,6 @@ ShowService=عرض الخدمة
 ProductsAndServicesArea=منطقة المنتجات والخدمات
 ProductsArea=منطقة المنتجات
 ServicesArea=منطقة الخدمات
-ListOfStockMovements=قائمة الحركات المخزون
 BuyingPrice=سعر الشراء
 PriceForEachProduct=المنتجات بأسعار محددة
 SupplierCard=بطاقة البائع
@@ -145,6 +144,7 @@ WithoutDiscount=بدون خصم
 VATRateForSupplierProduct=Tax Rate (for this vendor/product)
 DiscountQtyMin=خصم على هذه الكمية.
 NoPriceDefinedForThisSupplier=لم يتم تحديد سعر / كمية لهذا البائع / المنتج
+NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
 NoSupplierPriceDefinedForThisProduct=لم يتم تحديد سعر البائع / الكمية لهذا المنتج
 PredefinedItem=عنصر محدد مسبقًا
 PredefinedProducts=Predefined Product
@@ -171,7 +171,7 @@ BuyingPrices=شراء أسعار
 CustomerPrices=أسعار العميل
 SuppliersPrices=أسعار المورد
 SuppliersPricesOfProductsOrServices=أسعار البائعين (للمنتجات أو الخدمات)
-CustomCode=الجمارك | السلع | رمز النظام المنسق
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=بلد المنشأ
 RegionStateOrigin=منطقة المنشأ
 StateOrigin=الولاية | مقاطعة المنشأ
@@ -209,6 +209,7 @@ unitL=لتر
 unitT=طن
 unitKG=كجم
 unitG=غرام
+unitGAL=غالون
 unitMG=مغلم
 unitLB=جنيه
 unitOZ=أوقية
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=تنسيق الطلب هو {"URL": "http://exam
 UpdateInterval=تحديث الفاصل الزمني (دقائق)
 LastUpdated=اخر تحديث
 CorrectlyUpdated=تحديثها بشكل صحيح
-PropalMergePdfProductActualFile=استخدام الملفات لإضافة إلى PDF دازور هي / هو
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=اختر ملفات PDF
 IncludingProductWithTag=بما في ذلك المنتجات / الخدمات مع العلامة
 DefaultPriceRealPriceMayDependOnCustomer=سعر افتراضي، السعر الحقيقي قد تعتمد على العملاء
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=تمت إعادة حساب كمية الخط وفق
 
 #Attributes
 Attributes=الصفات
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=سمات متغيرة
 ProductAttributes=سمات متغيرة للمنتجات
 ProductAttributeName=سمة المتغير %s
@@ -395,6 +400,8 @@ ErrorDestinationProductNotFound=المنتج الوجهة غير موجود
 ErrorProductCombinationNotFound=لم يتم العثور على صيغة المنتج
 ActionAvailableOnVariantProductOnly=الإجراء متاح فقط على متغير المنتج
 ProductsPricePerCustomer=أسعار المنتجات لكل عميل
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=السمات الإضافية (أسعار الموردين)
 DeleteLinkedProduct=احذف المنتج الفرعي المرتبط بالمجموعة
 AmountUsedToUpdateWAP=مبلغ الوحدة المطلوب استخدامه لتحديث متوسط السعر المرجح
@@ -403,7 +410,8 @@ PMPValueShort=الواب
 mandatoryperiod=فترات إلزامية
 mandatoryPeriodNeedTobeSet=ملاحظة: يجب تحديد الفترة (تاريخ البدء والانتهاء)
 mandatoryPeriodNeedTobeSetMsgValidate=تتطلب الخدمة فترة بداية ونهاية
-mandatoryHelper=حدد هذا إذا كنت تريد رسالة إلى المستخدم عند إنشاء / التحقق من صحة فاتورة ، أو عرض تجاري ، أو أمر مبيعات دون إدخال تاريخ بدء وانتهاء في سطور هذه الخدمة. <br> لاحظ أن الرسالة تحذير وليست خطأ حظر.
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
+mandatoryHelper2=Note that the message is a warning and not a blocking error.
 DefaultBOM=الافتراضي BOM
 DefaultBOMDesc=يوصى باستخدام قائمة مكونات الصنف الافتراضية لتصنيع هذا المنتج. يمكن تعيين هذا الحقل فقط إذا كانت طبيعة المنتج "%s".
 Rank=مرتبة
@@ -435,3 +443,6 @@ AllowStockMovementVariantParentHelp=افتراضيًا، يكون الأصل ل
 ConfirmSetToDraftInventory=هل أنت متأكد أنك تريد الرجوع إلى المسودة حالة؟<br>ستتم إعادة تعيين الكميات المحددة حاليًا في المخزون.
 WarningLineProductNotToSell=تم استنساخ المنتج أو الخدمة "%s" للبيع و
 PriceLabel=السعر تسمية
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/ar_SA/salaries.lang b/htdocs/langs/ar_SA/salaries.lang
index ff8110b42a2..d484279d173 100644
--- a/htdocs/langs/ar_SA/salaries.lang
+++ b/htdocs/langs/ar_SA/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=راتب جديد
 AddSalary=أضف الراتب
 NewSalaryPayment=بطاقة راتب جديدة
 AddSalaryPayment=اضافة دفع الراتب
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=دفع الرواتب
 SalariesPayments=مدفوعات الرواتب
 SalariesPaymentsOf=مدفوعات الرواتب %s
@@ -27,7 +29,7 @@ FillFieldFirst=املأ حقل الموظف أولاً
 UpdateAmountWithLastSalary=تعيين مقدار آخر راتب
 MakeTransferRequest=تقديم طلب النقل
 VirementOrder=طلب تحويل رصيد
-BankTransferAmount=مبلغ تحويل الائتمان
 WithdrawalReceipt=أمر تحويل رصيد
 OrderWaiting=في انتظار طلب
 FillEndOfMonth=املأ بنهاية الشهر
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index 4eb63b1a054..d03cffe62d6 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=إستخدم هنا قائمة من اسماء\\القاب
 WEBSITE_CSS_URL=رابط خارجي لملف المظهر
 WEBSITE_CSS_INLINE=محتوى ملف مظهر (مشترك بين كل الصفحات)
 WEBSITE_JS_INLINE=محتوى ملف JavaScript (مشترك بين جميع الصفحات)
-WEBSITE_HTML_HEADER=ترويسات لغة ترميز النصوص التشعبية (مشتركة بين كل الصفحات)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=محتوى ملف الروبوتات النصي
 WEBSITE_HTACCESS=محتوى ملف ضبط الوصول
 WEBSITE_MANIFEST_JSON=ملف قوائم جسون للموقع
@@ -56,16 +56,17 @@ ReadPerm=قرأ
 WritePerm=التعديل والكتابة
 TestDeployOnWeb=تجربة \\نشر على الانترنت
 PreviewSiteServedByWebServer=<u>إستعراض %s في علامة تبويب جديدة.</u><br><br> الرابط %s سيتم إنشائه بواسطة خادم خارجي (اباتشي او انجنكس مثلاً). لابد ان تثبت هذا الخادم بنفسك وتقوم بإعداده ليشير الى المسار : <br><strong>%s</strong><br>الرابط المخدوم بواسطة خادم خارجي هو : <br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>إستعراض %s في علامة تبويب جديدة.</u><br><br> الرابط %s سيتم إنشائه بواسطة خادم نظام دوليبار وبذالك لا يحتاج لتثبيت خادم خارجي (مثل اباتشي او انجنكس) .<br>المزعج في الامر ان روابط الصفحات صعبة للمستخدمين وستحتوي على مسار نظام دوليبار.<br> الرابط المخدوم بواسطة دوليبار :<br><strong>%s</strong><br><br>لإستخدام خادمك الخاص لتقديم موقعك الإلكتروني قم بأنشاء خادم إفتراضي (كما في اباتشي) واجعله يشير الى المسار<br><strong>%s</strong><br>ثم قم باضافة الرابط في إعدادات الموقع الإلكتروني ثم قم بالضغط على "تجربة\\نشر موقعك الإلكتروني"
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=رابط الخادم الافتراضي المخدوم بواسطة خادم خارجي غير معرف
 NoPageYet=لا يوجد صفحات بعد
 YouCanCreatePageOrImportTemplate=يمكنك انشاء صفحة جديدة او إستيراد موقع إلكتروني كامل
 SyntaxHelp=مساعدة ونصائح في تكريب جمل معينة
 YouCanEditHtmlSourceckeditor=يمكن تحرير مصدر  لغة ترميز النصوص التشعبية باستخدام زر "تحرير المصدر" في المحرر
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> لتضمين  <strong>الصورة</strong> المخزنة في دليل <strong>المستندات</strong> ، استخدم المجمّع <strong>viewimage.php</strong>.<br>على سبيل المثال، لـ صورة في المستندات/الوسائط (دليل مفتوح للوصول العام)، الصيغة هي:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt; </strong><br>
-YouCanEditHtmlSource2=لتضمين صورة مشاركة عن طريق رابط المشاركة (وصول عام باستخدام رمز دالة الملف) إستخدم تركيب الجملة التالي:<br><strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>مزيد من الأمثلة على HTML أو التعليمات البرمجية الديناميكية متاحة على <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">وثائق الويكي</a>.<br>
 ClonePage=نسخ الصفحة\\الحاوية
 CloneSite=نسخ الموقع
@@ -87,15 +88,15 @@ WebsiteAccount=حساب موقع إلكتروني
 WebsiteAccounts=حسابات الموقع
 AddWebsiteAccount=إنشاء حساب موقع إلكتروني
 BackToListForThirdParty=العودة إلى قائمة الأطراف الثالثة
-DisableSiteFirst=عطل الموقع الإلكتروني اولاً
+DisableSiteFirst=Put website offline first
 MyContainerTitle=عنوان موقعي
 AnotherContainer=هذه هي الطريقة لتضمين محتوى صفحة\\حاوية اخرى (ربما يظهر لك خطأ عند تمكين المحتوى المتحرك وذلك لان الحاوية الجزئية المضمنة غير موجودة!)
 SorryWebsiteIsCurrentlyOffLine=للأسف، هذا الموقع غير متصل حاليا. يرجى العودة في وقت لاحق...
-WEBSITE_USE_WEBSITE_ACCOUNTS=تمكين جدول الموقع الالكتروني
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=تمكين جدول لتخزين حسابات الموقع الإلكتروني (إسم المستخدم\\كلمة السر) لكل موقع إلكتروني \\ طرف ثالث
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=لابد ان تُعرف الصفحة الرئيسية المبدئية اولاً
-OnlyEditionOfSourceForGrabbedContentFuture=تحذير: إنشاء صفحة ويب عن طريق استيراد صفحة ويب خارجية هو أمر محجوز للمستخدمين ذوي الخبرة. اعتمادًا على مدى تعقيد الصفحة المصدر، قد تختلف نتيجة الاستيراد عن الصفحة الأصلية. وأيضًا إذا كانت الصفحة المصدر تستخدم أنماط CSS شائعة أو JavaScript متعارضة، فقد يؤدي ذلك إلى تعطيل مظهر محرر موقع الويب أو ميزاته عند العمل على هذه الصفحة. تعد هذه الطريقة طريقة أسرع لإنشاء صفحة ولكن يوصى بإنشاء صفحتك الجديدة من البداية أو من قالب صفحة مقترح.<br>لاحظ أيضًا أن المحرر المضمن قد لا يعمل صحيحة عند استخدامها على صفحة خارجية تم الإمساك بها.
-OnlyEditionOfSourceForGrabbedContent=يتاح فقط مصدر لغة ترميز النصوص التشعبية عند الأستجلاب من موقع خارجي
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=جلب الصور الموجودة في الصفحة او في ملف المظهر ايضاً.
 ImagesShouldBeSavedInto=يجب ان تُحفظ الصور في مسار
 WebsiteRootOfImages=المسار الجذر لصور الموقع الإلكتروني
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=إزالة فلتر
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=الفئات
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/az_AZ/admin.lang b/htdocs/langs/az_AZ/admin.lang
index 6b231264404..4819524c275 100644
--- a/htdocs/langs/az_AZ/admin.lang
+++ b/htdocs/langs/az_AZ/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Faylların bütövlüyü yoxlanışı keçdi,
 FileIntegritySomeFilesWereRemovedOrModified=Faylların bütövlüyünün yoxlanılması uğursuz oldu. Bəzi fayllar dəyişdirildi, silindi və ya əlavə edildi.
 GlobalChecksum=Qlobal yoxlama məbləği
 MakeIntegrityAnalysisFrom=Tətbiq fayllarının bütövlüyünü təhlil edin
-LocalSignature=Daxili yerli imza (daha az etibarlı)
-RemoteSignature=Uzaqdan uzaq imza (daha etibarlı)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Çatışmayan Fayllar
 FilesUpdated=Yenilənmiş Fayllar
 FilesModified=Dəyişdirilmiş Fayllar
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Yalnız bəzi gündəm variantları tərəfindən istifad
 Security=Təhlükəsizlik
 Passwords=Parollar
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=conf.php-də saxlanılan verilənlər bazası parolunu şifrələyin. Bu seçimi aktivləşdirmək tövsiyə olunur.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Yaradılmış PDF fayllarını qoruyun. Bu, toplu PDF generasiyasını pozduğu üçün TÖVSİYƏ EDİLMİR.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Hesablanmış sahə
-ComputedFormulaDesc=Dinamik hesablanmış dəyər əldə etmək üçün burada obyektin digər xassələrindən və ya hər hansı PHP kodlaşdırmasından istifadə edərək düstur daxil edə bilərsiniz. Siz "?" daxil olmaqla istənilən PHP uyğun düsturlardan istifadə edə bilərsiniz. şərt operatoru və aşağıdakı qlobal obyekt: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>XƏBƏRDARLIQ</strong>: Əgər obyektin xassələrinə ehtiyacınız varsa yüklənməyib, sadəcə olaraq ikinci misalda olduğu kimi obyekti düsturunuza gətirin.<br>Hesablanmış sahədən istifadə etməklə siz özünüzə interfeysdən heç bir dəyər daxil edə bilməyəcəksiniz. Həmçinin, sintaksis xətası olarsa, formula heç nə qaytara bilməz.<br><br>Düstur nümunəsi:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Obyekti yenidən yükləmək üçün nümunə<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] $j- >capital / 5: '-1')<br><br>Obyektin və onun əsas obyektinin yüklənməsini məcbur etmək üçün düsturun digər nümunəsi: <br>(($reloadedobj = yeni Tapşırıq($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = yeni Layihə( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Valideyn layihə tapılmadı'
+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'
 Computedpersistent=Hesablanmış sahəni saxla
 ComputedpersistentDesc=Hesablanmış əlavə sahələr verilənlər bazasında saxlanılacaq, lakin dəyər yalnız bu sahənin obyekti dəyişdirildikdə yenidən hesablanacaq. Hesablanmış sahə digər obyektlərdən və ya qlobal məlumatlardan asılıdırsa, bu dəyər yanlış ola bilər!
 ExtrafieldParamHelpPassword=Bu sahənin boş qalması o deməkdir ki, bu dəyər ŞİFRELƏMƏSİZ saxlanacaq (sahə ekranda sadəcə ulduzlarla gizlənib).<br><br>Daxil edin dəyəri geri çevrilən şifrələmə alqoritmi ilə kodlaşdırmaq üçün 'dolcrypt' dəyəri. Təmiz data hələ də bilinə və redaktə edilə bilər, lakin verilənlər bazasında şifrələnir.<br><br>'Auto' (və ya 'md5') daxil edin. 'sha256', 'password_hash', ...) defolt parol şifrələmə alqoritmindən (və ya md5, sha256, password_hash...) istifadə etmək üçün geri qaytarıla bilməyən haşlanmış parolu verilənlər bazasında saxlamaq (orijinal dəyəri əldə etmək üçün heç bir yol yoxdur)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- E-poçt göndərmək üçün öz E-poçt Xidməti Provayderinizin SMTP serverindən istifadə etmək də maraqlıdır, ona görə də proqramdan göndərilən bütün e-poçtlar poçt qutunuzun “Göndərilmiş” kataloqunda saxlanacaq.
 WarningPHPMailD=Buna görə də e-poçtların göndərilmə üsulunu "SMTP" dəyərinə dəyişdirmək tövsiyə olunur.
 WarningPHPMailDbis=Əgər həqiqətən e-poçt göndərmək üçün defolt "PHP" metodunu saxlamaq istəyirsinizsə, bu xəbərdarlığa məhəl qoymayın və ya %sburaya klikləməklə onu silin%s.
-WarningPHPMail2=E-poçt SMTP provayderiniz e-poçt müştərisini bəzi IP ünvanlarla məhdudlaşdırmalıdırsa (çox nadirdir), bu, ERP CRM tətbiqiniz üçün poçt istifadəçisi agentinin (MUA) IP ünvanıdır: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Mühasibat uçotu (sadələşdirilmiş)
 Module10Desc=Verilənlər bazası məzmununa əsaslanan sadə mühasibat hesabatları (jurnallar, dövriyyə). Heç bir dəftər masasından istifadə etmir.
 Module20Name=Təkliflər
 Module20Desc=Kommersiya təkliflərinin idarə edilməsi
-Module22Name=Kütləvi E-poçtlar
-Module22Desc=Toplu e-poçt göndərişini idarə edin
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Enerji
 Module23Desc=Enerji istehlakının monitorinqi
 Module25Name=Satış Sifarişləri
@@ -847,10 +848,10 @@ Permission212=Sifariş xətləri
 Permission213=Xətti aktivləşdirin
 Permission214=Telefonun qurulması
 Permission215=Quraşdırma təminatçıları
-Permission221=E-poçtları oxuyun
-Permission222=E-poçt göndərişlərini yaradın/dəyişdirin (mövzu, alıcılar...)
-Permission223=E-poçt göndərişlərini təsdiqləyin (göndərməyə imkan verir)
-Permission229=E-poçt göndərişlərini silin
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Qəbul edənlərə və məlumatlara baxın
 Permission238=Məktubları əl ilə göndərin
 Permission239=Təsdiqləndikdən və ya göndərildikdən sonra məktubları silin
@@ -1105,6 +1106,7 @@ DictionaryStaff=İşçilərin sayı
 DictionaryAvailability=Çatdırılma gecikməsi
 DictionaryOrderMethods=Sifariş üsulları
 DictionarySource=Təkliflərin/sifarişlərin mənşəyi
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Hesabatlar üçün fərdiləşdirilmiş qruplar
 DictionaryAccountancysystem=Hesablar planı üçün modellər
 DictionaryAccountancyJournal=Mühasibat jurnalları
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Lüğətlər siyahısına qayıt
 TypeOfRevenueStamp=Vergi möhürü növü
 VATManagement=Satış vergisinin idarə edilməsi
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Defolt olaraq təklif olunan Satış vergisi 0-dır və assosiasiyalar, fiziki şəxslər və ya kiçik şirkətlər kimi hallar üçün istifadə edilə bilər.
 VATIsUsedExampleFR=Fransada bu, real fiskal sistemi olan şirkətlər və ya təşkilatlar deməkdir (Sadələşdirilmiş real və ya normal real). ƏDV-nin bəyan edildiyi sistem.
 VATIsNotUsedExampleFR=Fransada bu, Satış vergisi bəyan edilməyən birliklər və ya mikro müəssisə fiskal sistemini (françayzinqdə satış vergisi) seçmiş və heç bir Satış vergisi bəyannaməsi olmadan françayzinq Satış vergisi ödəmiş şirkətlər, təşkilatlar və ya liberal peşələr deməkdir. Bu seçim fakturalarda "Tətbiq olunmayan Satış vergisi - Art-293B of CGI" arayışını göstərəcək.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Satış vergisinin növü
 LTRate=Qiymətləndirmə
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Vergilərin quraşdırılmasına uyğun olaraq (Bax: %
 LabelUsedByDefault=Kod üçün tərcümə tapılmasa, defolt olaraq istifadə olunan etiket
 LabelOnDocuments=Sənədlərdə etiket
 LabelOrTranslationKey=Etiket və ya tərcümə açarı
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=Müştəri/Satıcı ƏDV nömrəsini birləşdirilmiş siyahılarda
 AddAdressInList=Müştəri/Təchizçi ünvanını birləşdirilmiş siyahılarda göstərin.<br>Üçüncü tərəflər "" əvəzinə "The Big Company corp. - 21 jump street 123456 Big town - USA" ad formatı ilə görünəcəklər. The Big Company Corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Üçüncü tərəflər üçün üstünlük verilən göndərmə üsulunu soruşun.
-FieldEdition=%s sahəsinin buraxılışı
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Nümunə: +2 (yalnız saat qurşağının dəyişməsi ilə bağlı problemlər olduqda doldurun)
 GetBarCode=Barkod alın
 NumberingModules=Nömrələmə modelləri
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Faktura tarixini doğrulama tarixinə məcbur edin
 SuggestedPaymentModesIfNotDefinedInInvoice=Fakturada müəyyən edilmədikdə, defolt olaraq fakturada təklif olunan ödənişlər rejimi
 SuggestPaymentByRIBOnAccount=Hesabdan çıxarmaqla ödəniş etməyi təklif edin
 SuggestPaymentByChequeToAddress=Çeklə ödəməyi təklif edin
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Faktura üzrə pulsuz mətn
 WatermarkOnDraftInvoices=Qaralama fakturalarda su nişanı (boş olduqda heç biri yoxdur)
 PaymentsNumberingModule=Ödənişlərin nömrələnməsi modeli
@@ -1718,6 +1723,7 @@ CompressionOfResources=HTTP cavablarının sıxılması
 CompressionOfResourcesDesc=Məsələn, Apache direktivindən istifadə edərək "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Belə avtomatik aşkarlama cari brauzerlərdə mümkün deyil
 DefaultValuesDesc=Burada siz yeni qeyd yaradarkən istifadə etmək istədiyiniz standart dəyəri və/yaxud qeydləri sadalayarkən standart filtrləri və ya çeşidləmə sırasını təyin edə bilərsiniz.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Defolt dəyərlər (formalarda istifadə etmək üçün)
 DefaultSearchFilters=Defolt axtarış filtrləri
 DefaultSortOrder=Defolt çeşidləmə sifarişləri
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Nömrələmə modullarını göndərir
 SendingsAbility=Müştərilərin çatdırılması üçün göndərmə vərəqlərini dəstəkləyin
 NoNeedForDeliveryReceipts=Əksər hallarda, göndərmə vərəqləri həm müştərinin çatdırılması üçün vərəq (göndəriləcək məhsulların siyahısı), həm də müştəri tərəfindən qəbul edilən və imzalanan vərəqlər kimi istifadə olunur. Beləliklə, məhsulun çatdırılması qəbzi təkrarlanan xüsusiyyətdir və nadir hallarda aktivləşdirilir.
 FreeLegalTextOnShippings=Pulsuz mətn göndərmə
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Məhsulların çatdırılması qəbzinin nömrələnməsi modulu
 DeliveryOrderModel=Məhsulların çatdırılma qəbzi modeli
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Çatdırılma qəbzləri üzrə pulsuz mətn
 ##### FCKeditor #####
 AdvancedEditor=Təkmil redaktor
 ActivateFCKeditor=Qabaqcıl redaktoru aktivləşdirin:
-FCKeditorForNotePublic=WYSIWYG elementlərin "ictimai qeydlər" sahəsinin yaradılması/nəşri
-FCKeditorForNotePrivate=WYSIWYG elementlərin "özəl qeydləri" sahəsinin yaradılması/nəşri
-FCKeditorForCompany=WYSIWYG elementlərin sahə təsvirinin yaradılması/nəşri (məhsullar/xidmətlər istisna olmaqla)
-FCKeditorForProductDetails=WYSIWYG məhsul təsvirinin və ya obyektlər üçün sətirlərin yaradılması/nəşri (təklif sətirləri, sifarişlər, fakturalar və s...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Xəbərdarlıq: Bu halda bu seçimdən istifadə ciddi şəkildə tövsiyə edilmir, çünki bu, PDF faylları yaratarkən xüsusi simvollar və səhifə formatı ilə bağlı problemlər yarada bilər.
-FCKeditorForMailing= Kütləvi e-poçt göndərişləri üçün WYSIWYG yaradılması/nəşri (Alətlər->e-poçt)
-FCKeditorForUserSignature=WYSIWYG istifadəçi imzasının yaradılması/nəşri
-FCKeditorForMail=Bütün məktublar üçün WYSIWYG yaradılması/nəşri (Alətlər->e-poçtdan başqa)
-FCKeditorForTicket=Biletlər üçün WYSIWYG yaradılması/nəşri
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Stok modulunun qurulması
 IfYouUsePointOfSaleCheckModule=Defolt olaraq təmin edilən Satış Nöqtəsi modulundan (POS) və ya xarici moduldan istifadə edirsinizsə, bu quraşdırma POS modulunuz tərəfindən nəzərə alına bilər. Əksər POS modulları buradakı seçimlərdən asılı olmayaraq dərhal faktura yaratmaq və ehtiyatı azaltmaq üçün standart olaraq tərtib edilmişdir. Beləliklə, POS-dan satışı qeydiyyatdan keçirərkən səhmlərin azalmasına ehtiyacınız varsa, ya yoxsa, POS modulunun quraşdırılmasını da yoxlayın.
@@ -1867,7 +1874,6 @@ Buy=al
 Sell=Sat
 InvoiceDateUsed=İstifadə olunan faktura tarixi
 YourCompanyDoesNotUseVAT=Şirkətinizin ƏDV-dən istifadə etməməsi müəyyən edilib (Ev - Quraşdırma - Şirkət/Təşkilat), ona görə də quraşdırmaq üçün ƏDV variantları yoxdur.
-AccountancyCode=Mühasibat Məcəlləsi
 AccountancyCodeSell=Satış hesabı. kod
 AccountancyCodeBuy=Satınalma hesabı. kod
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Yeni vergi yaradarkən standart olaraq "Ödənişi avtomatik yarat" qutusunu boş saxlayın
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Gündəlik menyusunu seçərkən defolt olaraq hansı gör
 AGENDA_EVENT_PAST_COLOR = Keçmiş hadisə rəngi
 AGENDA_EVENT_CURRENT_COLOR = Cari hadisə rəngi
 AGENDA_EVENT_FUTURE_COLOR = Gələcək hadisə rəngi
-AGENDA_REMINDER_BROWSER = İstifadəçinin brauzerində <b></b> tədbir xatırladıcısını aktivləşdirin (Xatırlatma tarixinə çatdıqda, brauzer pop-up göstərilir. Hər bir istifadəçi edə bilər belə bildirişləri onun brauzer bildirişi quraşdırmasından söndürün).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Səsli bildirişi aktivləşdirin
-AGENDA_REMINDER_EMAIL = Tədbir xatırladıcısını aktivləşdirin <b>e-poçtlarla</b> (xatırlatma seçimi/gecikmə hər tədbirdə müəyyən edilə bilər).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Qeyd: Planlaşdırılmış işin %s tezliyi xatırlatmaların düzgün anda göndərilməsinə əmin olmaq üçün kifayət qədər olmalıdır.
 AGENDA_SHOW_LINKED_OBJECT = Əlaqədar obyekti gündəm görünüşündə göstərin
 AGENDA_USE_EVENT_TYPE = Tədbir növlərindən istifadə edin (menyuda idarə olunur Quraşdırma -> Lüğətlər -> Gündəlik hadisələrinin növü)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Hadisə yaratma formasında hadisə növü üçün bu standart dəyəri avtomatik təyin edin
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = İxrac keçidinə icazə vermək üçün açar
 PastDelayVCalExport=Daha köhnə hadisəni ixrac etməyin
 SecurityKey = Təhlükəsizlik Açarı
@@ -2006,7 +2017,7 @@ BackupZipWizard=Sənədlərin arxivini yaratmaq üçün sehrbazdır
 SomethingMakeInstallFromWebNotPossible=Xarici modulun quraşdırılması aşağıdakı səbəblərə görə veb interfeysdən mümkün deyil:
 SomethingMakeInstallFromWebNotPossible2=Bu səbəbdən, burada təsvir edilən təkmilləşdirmə prosesi yalnız imtiyazlı istifadəçinin yerinə yetirə biləcəyi əl ilə həyata keçirilən prosesdir.
 InstallModuleFromWebHasBeenDisabledContactUs=Tətbiqdən xarici modulların və ya dinamik veb-saytların quraşdırılması və ya inkişafı təhlükəsizlik məqsədi ilə hazırda kilidlənib. Bu funksiyanı aktivləşdirmək lazımdırsa, bizimlə əlaqə saxlayın.
-InstallModuleFromWebHasBeenDisabledByFile=Tətbiqdən xarici modulun quraşdırılması administratorunuz tərəfindən deaktiv edilib. Buna icazə vermək üçün ondan <strong>%s</strong> faylını silməsini xahiş etməlisiniz. xüsusiyyət.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Siçan hərəkəti üzərindən keçəndə cədvəl xətlərini vurğulayın
 HighlightLinesColor=Siçan üzərindən keçəndə xəttin rəngini vurğulayın (vurğulanmamaq üçün "ffffff" istifadə edin)
@@ -2036,6 +2047,7 @@ Enter0or1=0 və ya 1 daxil edin
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Buraya mötərizələr arasında daxil edin, valyuta simvolunu təmsil edən bayt nömrəsinin siyahısı. Məsələn: $ üçün, daxil edin [36] - brazil real R$ üçün [82,36] - € üçün, daxil edin [8364]
 ColorFormat=RGB rəngi HEX formatındadır, məsələn: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Formatda ikona adı:<br>- cari tema qovluğuna şəkil faylı üçün image.png<br>- image.png@module fayl modulun /img/ kataloqundadırsa<br>- FontAwesome fa-xxx picto üçün fa-xxx<br>- FontAwesome fa-xxx picto üçün fontawesome_xxx_fa_color_size (prefiks, rəng və ölçü dəsti ilə)
 PositionIntoComboList=Xəttin kombo siyahılara yerləşdirilməsi
 SellTaxRate=Satış vergisi dərəcəsi
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Göndərən ünvan çərçivəsindəki sərhədləri gizlədin
 MAIN_PDF_NO_RECIPENT_FRAME=Alıcı ünvan çərçivəsindəki sərhədləri gizlədin
 MAIN_PDF_HIDE_CUSTOMER_CODE=Müştəri kodunu gizlədin
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Ünvan blokunda göndərənin/şirkətin adını gizlədin
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Ödəniş şərtlərini gizlədin
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Ödəniş rejimini gizlədin
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=Məsləhət deyil
 ARestrictedPath=Data faylları üçün bəzi məhdud yol
 CheckForModuleUpdate=Xarici modul yeniləmələrini yoxlayın
 CheckForModuleUpdateHelp=Bu əməliyyat yeni versiyanın mövcud olub olmadığını yoxlamaq üçün xarici modulların redaktorlarına qoşulacaq.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Yeniləmə mövcuddur
 NoExternalModuleWithUpdate=Xarici modullar üçün yeniləmə tapılmadı
 SwaggerDescriptionFile=Swagger API təsvir faylı (məsələn redoc ilə istifadə üçün)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Göndərmə ünvanını göstərin
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Bəzi ölkələrdə məcburi göstərici (Fransa, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Sosial şəbəkənin url linki. Sosial şəbəkə ID-sini ehtiva edən dəyişən hissə üçün {socialid} istifadə edin.
 IfThisCategoryIsChildOfAnother=Əgər bu kateqoriya başqasının övladıdırsa
 DarkThemeMode=Qaranlıq mövzu rejimi
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Xəbərdarlıq: %s modulu hər
 WarningModuleHasChangedSecurityCsrfParameter=Xəbərdarlıq: %s modulu nümunənizin CSRF təhlükəsizliyini deaktiv etdi. Bu əməliyyat şübhəlidir və quraşdırmanız daha təhlükəsiz ola bilməz. Zəhmət olmasa izahat üçün modulun müəllifi ilə əlaqə saxlayın.
 EMailsInGoingDesc=Daxil olan e-poçtlar %s modulu tərəfindən idarə olunur. Daxil olan e-poçtları dəstəkləmək lazımdırsa, onu aktivləşdirib konfiqurasiya etməlisiniz.
 MAIN_IMAP_USE_PHPIMAP=Doğma PHP IMAP əvəzinə IMAP üçün PHP-IMAP kitabxanasından istifadə edin. Bu, həmçinin IMAP üçün OAuth2 bağlantısından istifadə etməyə imkan verir (modul OAuth da aktivləşdirilməlidir).
-MAIN_CHECKBOX_LEFT_COLUMN=Solda sahə və sətir seçimi üçün sütunu göstərin (defolt olaraq sağda)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Defolt olaraq yaradılmayıb. Yalnız modul aktivləşdirildikdə yaradılmışdır.
 CSSPage=CSS üslubu
 Defaultfortype=Defolt
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/az_AZ/banks.lang b/htdocs/langs/az_AZ/banks.lang
index 2ec8a43e5b8..b9e51fe3d12 100644
--- a/htdocs/langs/az_AZ/banks.lang
+++ b/htdocs/langs/az_AZ/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Son balans
 CurrentBalance=Cari balans
 FutureBalance=Gələcək balans
 ShowAllTimeBalance=Başdan balansı göstərin
-AllTime=Başdan
 Reconciliation=Barışıq
 RIB=Bank hesab nömrəsi
 IBAN=IBAN nömrəsi
@@ -133,7 +132,7 @@ DeleteTransaction=Girişi silin
 ConfirmDeleteTransaction=Bu girişi silmək istədiyinizə əminsiniz?
 ThisWillAlsoDeleteBankRecord=Bu, həmçinin yaradılmış bank girişini siləcək
 BankMovements=Hərəkətlər
-PlannedTransactions=Planlaşdırılmış girişlər
+PlannedTransactions=Upcoming entries
 Graph=Qrafiklər
 ExportDataset_banque_1=Bank qeydləri və hesabdan çıxarış
 ExportDataset_banque_2=Depozit blankı
@@ -151,7 +150,7 @@ FutureTransaction=Gələcək əməliyyat. Razılaşmaq mümkün deyil.
 SelectChequeTransactionAndGenerate=Çek depozit qəbzinə daxil edilməli olan çekləri seçin/filtr edin. Sonra, "Yarat" düyməsini basın.
 SelectPaymentTransactionAndGenerate=%s depozit qəbzinə daxil ediləcək sənədləri seçin/filtrləyin. Sonra, "Yarat" düyməsini basın.
 InputReceiptNumber=Razılaşma ilə bağlı bank çıxarışını seçin. Çeşidlənən rəqəmli dəyərdən istifadə edin
-InputReceiptNumberBis=YYYYMM və ya YYYYMM
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Barışmaq üçün?
 ThenCheckLinesAndConciliate=Sonra, bank çıxarışında olan sətirləri yoxlayın və üzərinə klikləyin
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Bu funksiya aktivdirsə, siz debet və ya kredit hərə
 BankColorizeMovementName1=Debet hərəkəti üçün fon rəngi
 BankColorizeMovementName2=Kredit hərəkəti üçün fon rəngi
 IfYouDontReconcileDisableProperty=Bəzi bank hesabları üzrə bank üzləşdirmələrini etməsəniz, bu xəbərdarlığı aradan qaldırmaq üçün onlarda "%s" mülkiyyətini deaktiv edin.
-NoBankAccountDefined=Heç bir bank hesabı müəyyən edilməyib
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Bank hesabında qeyd tapılmadı. Bir qayda olaraq, bu, qeyd bank hesabındakı əməliyyatlar siyahısından əl ilə silindikdə (məsələn, bank hesabının tutuşdurulması zamanı) baş verir. Digər səbəb isə ödənişin "%s" modulu söndürüldükdə qeydə alınmasıdır.
 AlreadyOneBankAccount=Artıq bir bank hesabı müəyyən edilib
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA fayl variantı
diff --git a/htdocs/langs/az_AZ/blockedlog.lang b/htdocs/langs/az_AZ/blockedlog.lang
index fe0d8a7ec43..99a6b004aad 100644
--- a/htdocs/langs/az_AZ/blockedlog.lang
+++ b/htdocs/langs/az_AZ/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Dəyişməz qeydlər
 ShowAllFingerPrintsMightBeTooLong=Bütün arxivləşdirilmiş qeydləri göstərin (uzun ola bilər)
 ShowAllFingerPrintsErrorsMightBeTooLong=Bütün etibarlı olmayan arxiv qeydlərini göstərin (uzun ola bilər)
 DownloadBlockChain=Barmaq izlərini yükləyin
-KoCheckFingerprintValidity=Arxivləşdirilmiş jurnal girişi etibarlı deyil. Bu o deməkdir ki, kimsə (haker?) bu qeydin bəzi məlumatlarını qeydə alındıqdan sonra dəyişdirib və ya əvvəlki arxivləşdirilmiş qeydi silib (əvvəlki # ilə həmin xəttin mövcud olduğunu yoxlayın) və ya əvvəlki qeydin yoxlama məbləğini dəyişdirib.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Arxivləşdirilmiş jurnal qeydi etibarlıdır. Bu sətirdəki məlumatlar dəyişdirilməyib və giriş əvvəlkini izləyir.
 OkCheckFingerprintValidityButChainIsKo=Arxivləşdirilmiş jurnal əvvəlki ilə müqayisədə etibarlı görünür, lakin zəncir əvvəllər pozulub.
 AddedByAuthority=Uzaqdan idarədə saxlanılır
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Giriş Təfərrüatları
 ListOfTrackedEvents=İzlənən hadisələrin siyahısı
 Fingerprint=Barmaq izi
 DownloadLogCSV=Arxivləşdirilmiş qeydləri ixrac edin (CSV)
-DataOfArchivedEvent=Arxivlənmiş hadisənin tam məlumatları
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Orijinal obyekt (növ %s, id %s) əlaqələndirilməyib (dəyişdirilə bilməyən yadda saxlanılan data əldə etmək üçün "Tam data" sütununa baxın)
 BlockedLogAreRequiredByYourCountryLegislation=Dəyişdirilməz Qeydlər modulu ölkənizin qanunvericiliyi ilə tələb oluna bilər. Bu modulun qeyri-aktiv edilməsi, vergi yoxlaması ilə təsdiq edilə bilməyəcəyi üçün qanun və hüquqi proqram təminatının istifadəsi baxımından gələcək əməliyyatları etibarsız edə bilər.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Dəyişməz Qeydlər modulu ölkənizin qanunvericiliyinə görə aktiv edilib. Bu modulun qeyri-aktiv edilməsi, vergi yoxlaması ilə təsdiq edilə bilməyəcəyi üçün qanun və hüquqi proqram təminatının istifadəsi baxımından gələcək əməliyyatları etibarsız edə bilər.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Hadisələri dəyişdirilə bilməyən jurnallarda izləmək 
 BlockedLogDisabled=Bəzi qeydlər aparıldıqdan sonra hadisələri dəyişdirilə bilməyən jurnallarda izləmək üçün sistem söndürüldü. Zənciri qırıq kimi izləmək üçün xüsusi Barmaq izini saxladıq
 BlockedLogDisabledBis=Hadisələri dəyişdirilə bilməyən jurnallarda izləmək üçün sistem deaktiv edilib. Bu, hələ heç bir qeyd edilmədiyi üçün mümkündür.
 LinkHasBeenDisabledForPerformancePurpose=Performans məqsədi ilə sənədə birbaşa keçid 100-cü sətirdən sonra göstərilmir.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Müştəri fakturası məntiqi olaraq silindi
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Müştəri ödənişinin məntiqi silinməsi
 logPAYMENT_VARIOUS_CREATE=Ödəniş (qaimə-fakturaya təyin edilməyib) yaradıldı
 logPAYMENT_VARIOUS_DELETE=Ödəniş (qaimə-fakturaya təyin edilməyib) məntiqi silinmə
 logPAYMENT_VARIOUS_MODIFY=Ödəniş (qaimə-fakturaya təyin edilməyib) dəyişdirildi
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/az_AZ/categories.lang b/htdocs/langs/az_AZ/categories.lang
index 194c89162fd..31bf46b222d 100644
--- a/htdocs/langs/az_AZ/categories.lang
+++ b/htdocs/langs/az_AZ/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Əlaqə etiketləri/kateqoriyalar sahəsi
 AccountsCategoriesArea=Bank hesabı etiketləri/kateqoriyalar sahəsi
 ProjectsCategoriesArea=Layihə etiketləri/kateqoriyaları sahəsi
 UsersCategoriesArea=İstifadəçi etiketləri/kateqoriyaları sahəsi
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Alt kateqoriyalar
 CatList=Teqlərin/kateqoriyaların siyahısı
 CatListAll=Teqlərin/kateqoriyaların siyahısı (bütün növlər)
@@ -90,9 +91,10 @@ CategoriesSetup=Teqlərin/kateqoriyaların quraşdırılması
 CategorieRecursiv=Avtomatik olaraq ana teq/kateqoriya ilə əlaqələndirin
 CategorieRecursivHelp=Seçim aktivdirsə, altkateqoriyaya obyekt əlavə etdiyiniz zaman, obyekt əsas kateqoriyalara da əlavə olunacaq.
 AddProductServiceIntoCategory=Məhsula/xidmətə kateqoriya təyin edin
-AddCustomerIntoCategory=Müştəriyə kateqoriya təyin edin
-AddSupplierIntoCategory=Təchizatçıya kateqoriya təyin edin
-AssignCategoryTo=kateqoriya təyin edin
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Teq/kateqoriya göstərin
 ByDefaultInList=Siyahıda standart olaraq
 ChooseCategory=Kateqoriya seçin
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Səhifə-Konteyner Kateqoriyaları
 KnowledgemanagementsCategoriesArea=KM məqalə kateqoriyaları
 UseOrOperatorForCategories=Kateqoriyalar üçün "OR" operatorundan istifadə edin
 AddObjectIntoCategory=Kateqoriyaya təyin edin
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/az_AZ/companies.lang b/htdocs/langs/az_AZ/companies.lang
index 680b847f58b..840129cbe95 100644
--- a/htdocs/langs/az_AZ/companies.lang
+++ b/htdocs/langs/az_AZ/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Ölkə Avropa İqtisadi Birliyinin tərkibindədir
 PriceFormatInCurrentLanguage=Cari dildə və valyutada qiymət ekran formatı
 ThirdPartyName=Üçüncü tərəf adı
 ThirdPartyEmail=Üçüncü tərəf e-poçtu
-ThirdParty=Üçüncü tərəf
-ThirdParties=Üçüncü tərəflər
+ThirdParty=Third party
+ThirdParties=Third parties
 ThirdPartyProspects=Perspektivlər
 ThirdPartyProspectsStats=Perspektivlər
 ThirdPartyCustomers=Müştərilər
@@ -65,6 +65,7 @@ State=Ştat/vilayət
 StateId=Dövlət ID
 StateCode=Dövlət/vilayət kodu
 StateShort=dövlət
+DepartmentBuyer=Buyer's state/province
 Region=Region
 Region-State=Region - Dövlət
 Country=ölkə
@@ -78,7 +79,7 @@ Chat=Söhbət
 PhonePro=avtobus. telefon
 PhonePerso=Pers. telefon
 PhoneMobile=Mobil
-No_Email=Toplu e-poçt göndərişlərindən imtina edin
+No_Email=Refuse mass emails
 Fax=Faks
 Zip=Poçt kodu
 Town=Şəhər
@@ -382,11 +383,12 @@ ExportCardToFormat=Kartı formata ixrac edin
 ContactNotLinkedToCompany=Heç bir üçüncü tərəflə əlaqəsi olmayan əlaqə
 DolibarrLogin=Dolibarr giriş
 NoDolibarrAccess=Dolibarr girişi yoxdur
-ExportDataset_company_1=Üçüncü tərəflər (şirkətlər/fondlar/fiziki şəxslər) və onların xassələri
-ExportDataset_company_2=Kontaktlar və onların xüsusiyyətləri
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Üçüncü tərəflər və onların xassələri
 ImportDataset_company_2=Üçüncü tərəflərin əlavə kontaktları/ünvanları və atributları
-ImportDataset_company_3=Üçüncü tərəflərin bank hesabları
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Üçüncü tərəflərin Satış nümayəndələri (şirkətlərə satış nümayəndələri/istifadəçiləri təyin edin)
 PriceLevel=Qiymət Səviyyəsi
 PriceLevelLabels=Qiymət Səviyyəsi Etiketləri
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Menecer(lər)in adı (baş direktor, direktor, prezident...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Üçüncü tərəfləri birləşdirin
-ConfirmMergeThirdparties=Seçilmiş üçüncü tərəfi indiki tərəflə birləşdirmək istədiyinizə əminsiniz? Bütün əlaqəli obyektlər (qaimə-fakturalar, sifarişlər, ...) cari üçüncü tərəfə köçürüləcək, bundan sonra seçilmiş üçüncü tərəf silinəcək.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Üçüncü tərəflər birləşdirilib
 SaleRepresentativeLogin=Satış nümayəndəsinin girişi
 SaleRepresentativeFirstname=Satış nümayəndəsinin adı
@@ -460,3 +462,6 @@ ExternalSystemID=Xarici sistem identifikatoru
 IDOfPaymentInAnExternalSystem=Xarici sistemə ödəniş rejiminin ID-si (Stripe, Paypal, ... kimi)
 AADEWebserviceCredentials=AADE Veb Xidməti Etibarnamələri
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Stripe tərəfində bank məlumatının yaradılmasına icazə vermək üçün üçüncü tərəf müştəri olmalıdır
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/az_AZ/compta.lang b/htdocs/langs/az_AZ/compta.lang
index c175823680b..2e22f2fc5e5 100644
--- a/htdocs/langs/az_AZ/compta.lang
+++ b/htdocs/langs/az_AZ/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Müştəri faktura ödənişi
 PaymentSupplierInvoice=satıcı faktura ödənişi
 PaymentSocialContribution=Sosial/fiskal vergi ödənişi
 PaymentVat=ƏDV ödənişi
-AutomaticCreationPayment=Ödənişi avtomatik qeyd edin
+AutomaticCreationPayment=Also record the payment
 ListPayment=Ödənişlərin siyahısı
 ListOfCustomerPayments=Müştəri ödənişlərinin siyahısı
 ListOfSupplierPayments=Satıcı ödənişlərinin siyahısı
@@ -118,10 +118,14 @@ SocialContributionsPayments=Sosial/fiskal vergi ödənişləri
 ShowVatPayment=ƏDV ödənişini göstərin
 TotalToPay=Ödəmək üçün cəmi
 BalanceVisibilityDependsOnSortAndFilters=Balans bu siyahıda yalnız cədvəl %s üzrə çeşidlənibsə və 1 bank hesabında filtrlənibsə (başqa filtrlər olmadan) görünə bilər.
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Müştəri uçotu kodu
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Satıcı mühasibat kodu
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Cust. hesab. kod
 SupplierAccountancyCodeShort=Sup. hesab. kod
+UserAccountancyCodeShort=User account. code
 AccountNumber=Hesab nömrəsi
 NewAccountingAccount=Yeni hesab
 Turnover=Dövriyyə faktura
@@ -129,7 +133,9 @@ TurnoverCollected=Dövriyyə yığılıb
 SalesTurnoverMinimum=Minimum dövriyyə
 ByExpenseIncome=Xərclər və gəlirlər üzrə
 ByThirdParties=Üçüncü şəxslər tərəfindən
+ByProjects=By projects
 ByUserAuthorOfInvoice=Faktura müəllifi tərəfindən
+DetailedListLowercase=detailed list
 CheckReceipt=Depozit blankı
 CheckReceiptShort=Depozit blankı
 LastCheckReceiptShort=Ən son %s depozit slipləri
diff --git a/htdocs/langs/az_AZ/datapolicy.lang b/htdocs/langs/az_AZ/datapolicy.lang
index f26f8130653..1d090522134 100644
--- a/htdocs/langs/az_AZ/datapolicy.lang
+++ b/htdocs/langs/az_AZ/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Məlumat Məxfilik Siyasəti
 Module4100Desc = Məlumat Məxfiliyini idarə etmək üçün modul (GDPR ilə uyğunluq)
 # Administration page
 datapolicySetup = Modul Məlumatlarının Məxfilik Siyasətinin Quraşdırılması
-Deletion = Məlumatların silinməsi
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s ay
 ONE_YEAR = 1 il
 NB_YEARS = %s il
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Perspektiv/Müştəri
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Nə perspektiv/Nə müştəri
 DATAPOLICY_CONTACT_FOURNISSEUR = Təchizatçı
 DATAPOLICY_ADHERENT = Üzv
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Siz bütün müvafiq kontaktlarınıza (hələ e-poçt almamış və GDPR müqaviləsi haqqında heç nə qeydiyyatdan keçirmədiyiniz) GDPR e-poçtu göndərə bilərsiniz. Bunu etmək üçün aşağıdakı düyməni istifadə edin.
 SendAgreement = E-poçt göndərin
 AllAgreementSend = Bütün e-poçtlar göndərildi
 TXTLINKDATAPOLICYACCEPT = "Razılaşma" linki üçün mətn
 TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: Şəxsi məlumatların emalı
 DATAPOLICY_consentement = Şəxsi məlumatların emalı üçün alınan razılıq
diff --git a/htdocs/langs/az_AZ/errors.lang b/htdocs/langs/az_AZ/errors.lang
index 02376842e5f..1c60f7b740b 100644
--- a/htdocs/langs/az_AZ/errors.lang
+++ b/htdocs/langs/az_AZ/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Kataloq yaratmaq alınmadı. Veb server istifadəçisinin Dolibarr sənədlər qovluğuna yazmaq icazəsi olduğunu yoxlayın. Bu PHP-də <b>safe_mode</b> parametri aktivdirsə, Dolibarr php fayllarının veb server istifadəçisinə (və ya qrupa) məxsus olduğunu yoxlayın.
 ErrorNoMailDefinedForThisUser=Bu istifadəçi üçün heç bir poçt təyin olunmayıb
 ErrorSetupOfEmailsNotComplete=E-poçtların quraşdırılması tamamlanmayıb
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Bu funksiyanın işləməsi üçün JavaScript-in aktivləşdirilməsi lazımdır. Bunu quraşdırma - ekranda dəyişdirin.
 ErrorTopMenuMustHaveAParentWithId0="Yuxarı" tipli menyunun əsas menyusu ola bilməz. Əsas menyuda 0 qoyun və ya "Sol" tipli menyu seçin.
 ErrorLeftMenuMustHaveAParentId="Sol" tipli menyunun valideyn identifikatoru olmalıdır.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Yükləmə PHP/Apache plagini tərəfindən bloklanıb
 ErrorFileSizeTooLarge=Fayl ölçüsü çox böyükdür və ya fayl təmin edilməyib.
 ErrorFieldTooLong=%s sahəsi çox uzundur.
 ErrorSizeTooLongForIntType=Ölçü int növü üçün çox uzundur (%s rəqəm maksimum)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Ölçü sətir növü üçün çox uzundur (%s simvol maksimum)
 ErrorNoValueForSelectType=Lütfən, seçim siyahısı üçün dəyəri doldurun
 ErrorNoValueForCheckBoxType=Zəhmət olmasa qeyd qutusu siyahısı üçün dəyəri doldurun
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Təhlükəsizlik kodu üçün pis dəyər. Yeni dəyərlə
 ErrorBothFieldCantBeNegative=%s və %s sahələrinin hər ikisi mənfi ola bilməz
 ErrorFieldCantBeNegativeOnInvoice=<strong>%s</strong> sahəsi bu invo tipində mənfi ola bilməz. Endirim xəttini əlavə etmək lazımdırsa, əvvəlcə endirimi yaradın (üçüncü tərəf kartındakı '%s' sahəsindən) və onu fakturaya tətbiq edin.
 ErrorLinesCantBeNegativeForOneVATRate=Verilmiş sıfır olmayan ƏDV dərəcəsi üçün sətirlərin cəmi (vergi çıxılmaqla) mənfi ola bilməz (ƏDV dərəcəsi üçün mənfi cəmi tapıldı <b>%s </b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Depozitdə xətlər mənfi ola bilməz. Bunu etsəniz, son fakturada depoziti istifadə etməli olduğunuz zaman problemlərlə üzləşəcəksiniz.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Müştəri fakturalarına daxil olan sətirin miqdarı mənfi ola bilməz
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Veb server üçün istifadə edilən <b>%s</b> istifadəçi hesabının icazəsi yoxdur ki
 ErrorNoActivatedBarcode=Heç bir barkod növü aktivləşdirilməyib
 ErrUnzipFails=ZipArchive ilə %s arxivini açmaq alınmadı
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP parametriniz upload_max_filesize (%s) PHP post_max_size parametrindən (%s) yüksəkdir. Bu ardıcıl quraşdırma deyil.
 WarningPasswordSetWithNoAccount=Bu üzv üçün parol təyin edildi. Bununla belə, heç bir istifadəçi hesabı yaradılmayıb. Beləliklə, bu parol saxlanılır, lakin Dolibarr-a daxil olmaq üçün istifadə edilə bilməz. O, xarici modul/interfeys tərəfindən istifadə oluna bilər, lakin əgər üzv üçün hər hansı bir giriş və ya parol təyin etməyə ehtiyac yoxdursa, siz Üzv modulunun quraşdırılmasından "Hər bir üzv üçün girişi idarə et" seçimini söndürə bilərsiniz. Əgər siz girişi idarə etməlisinizsə, lakin heç bir parola ehtiyacınız yoxdursa, bu xəbərdarlığın qarşısını almaq üçün bu sahəni boş saxlaya bilərsiniz. Qeyd: Üzv bir istifadəçi ilə bağlıdırsa, e-poçt da giriş kimi istifadə edilə bilər.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR faktura yalnız kredit köçürmə ödənişləri ilə ödəniləcək hesab-fakturalara əlavə edilə bilər.
 SwissQrCreditorAddressInvalid = Kreditor ünvanı yanlışdır (Poçt və şəhər təyin olunub? (%s)
 SwissQrCreditorInformationInvalid = Kreditor məlumatı IBAN üçün etibarsızdır (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/az_AZ/exports.lang b/htdocs/langs/az_AZ/exports.lang
index 758fd218eb6..f9e915ab3ae 100644
--- a/htdocs/langs/az_AZ/exports.lang
+++ b/htdocs/langs/az_AZ/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Xəttin etiketi
 LineDescription=Xəttin təsviri
 LineUnitPrice=Xəttin vahid qiyməti
 LineVATRate=Xəttin ƏDV dərəcəsi
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Xətt üçün kəmiyyət
 LineTotalHT=Məbləğ istisna olmaqla xətt üçün vergi
 LineTotalTTC=Xətt üçün vergi ilə məbləğ
 LineTotalVAT=Xətt üçün ƏDV məbləği
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Xəttin növü (0=məhsul, 1=xidmət)
 FileWithDataToImport=İdxal ediləcək data ilə fayl
 FileToImport=İdxal etmək üçün mənbə faylı
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=İdxal fayl formatı kimi istifadə ediləcək fayl f
 ChooseFileToImport=Faylı yükləyin, sonra faylı mənbə idxal faylı kimi seçmək üçün %s ikonasına klikləyin...
 SourceFileFormat=Mənbə fayl formatı
 FieldsInSourceFile=Mənbə faylındakı sahələr
-FieldsInTargetDatabase=Dolibarr verilənlər bazasında hədəf sahələri (qalın=məcburi)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Sahə yoxdur
 MoveField=Sahənin sütun nömrəsini köçürün %s
 ExampleOfImportFile=İdxal_faylının_nümunəsi
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Faylınızın fayl formatının (sahə və sətir ayır
 RunSimulateImportFile=İdxal Simulyasiyasını işə salın
 FieldNeedSource=Bu sahə mənbə fayldan məlumat tələb edir
 SomeMandatoryFieldHaveNoSource=Bəzi məcburi sahələrin məlumat faylından mənbəyi yoxdur
-InformationOnSourceFile=Mənbə faylı haqqında məlumat
-InformationOnTargetTables=Hədəf sahələr haqqında məlumat
+InformationOnSourceFile=Source file
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Eksport etmək üçün sahələr sütununda ən azı bir mənbə sahəsini dəyişin
 SelectFormat=Bu idxal fayl formatını seçin
 RunImportFile=Data Import
diff --git a/htdocs/langs/az_AZ/hrm.lang b/htdocs/langs/az_AZ/hrm.lang
index 58092b4f8e6..d02c2e9c88c 100644
--- a/htdocs/langs/az_AZ/hrm.lang
+++ b/htdocs/langs/az_AZ/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=İş profili üçün tələb olunan dərəcə
-RequiredRankShort=Tələb olunan dərəcə
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Bu iş profilləri ilə vəzifələr
-EmployeeRank=Bu bacarıq üçün işçi rütbəsi
-EmployeeRankShort=İşçi rütbəsi
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=İşçi mövqeyi
 EmployeePositions=İşçi mövqeləri
 EmployeesInThisPosition=Bu vəzifədə olan işçilər
@@ -72,6 +72,9 @@ AddSkill=İş profilinə bacarıqlar əlavə edin
 RequiredSkills=Bu iş profili üçün tələb olunan bacarıqlar
 UserRank=İstifadəçi dərəcəsi
 SkillList=Bacarıqların siyahısı
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Rütbəni saxla
 TypeKnowHow=Nou-hau
 TypeHowToBe=Necə olmaq
@@ -95,3 +98,5 @@ NeedBusinessTravels=İşgüzar səfərlər lazımdır
 NoDescription=təsvirsiz
 TheJobProfileHasNoSkillsDefinedFixBefore=Bu işçinin qiymətləndirilən iş profilində müəyyən edilmiş bacarıq yoxdur. Zəhmət olmasa bacarıq(lar) əlavə edin, sonra silin və qiymətləndirməni yenidən başladın.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/az_AZ/mails.lang b/htdocs/langs/az_AZ/mails.lang
index a89c6e0831f..91cc53a698c 100644
--- a/htdocs/langs/az_AZ/mails.lang
+++ b/htdocs/langs/az_AZ/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=E-poçt
 EMailing=E-poçt
-EMailings=E-poçt göndərişləri
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=Bütün e-poçtlar
+AllEMailings=All mass eMails
 MailCard=E-poçt kartı
 MailRecipients=Qəbul edənlər
 MailRecipient=alıcı
@@ -26,19 +26,19 @@ MailFile=Əlavə edilmiş fayllar
 MailMessage=E-poçt orqanı
 SubjectNotIn=Mövzuda deyil
 BodyNotIn=Bədəndə deyil
-ShowEMailing=E-poçt göndərişini göstərin
-ListOfEMailings=E-poçt göndərişlərinin siyahısı
-NewMailing=Yeni e-poçt
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=E-poçt göndərişini redaktə edin
-ResetMailing=E-poçtu yenidən göndərin
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=E-poçtu silin
-PreviewMailing=E-poçt göndərişinə ön baxış
-CreateMailing=E-poçt yaradın
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=Etibarlı e-poçt
+ValidMailing=Valid mass Email
 MailingStatusDraft=Qaralama
 MailingStatusValidated=Təsdiqlənmişdir
 MailingStatusSent=Göndərildi
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=E-poçtun toplanması üçün bütün filtrlər uyğun
 LineInFile=Faylda %s sətri
 RecipientSelectionModules=Alıcının seçimi üçün müəyyən edilmiş sorğular
 MailSelectedRecipients=Seçilmiş alıcılar
-MailingArea=Elektron poçt sahəsi
-LastMailings=Ən son %s e-poçtları
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Hədəflər statistikası
 NbOfCompaniesContacts=Unikal kontaktlar/ünvanlar
 MailNoChangePossible=Təsdiqlənmiş e-poçt üçün alıcılar dəyişdirilə bilməz
-SearchAMailing=Poçt axtarın
-SendMailing=E-poçt göndərin
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=tərəfindən göndərildi
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=E-poçt göndərilməsi əmr satırından həyata keçirilə bilər. E-poçtu bütün alıcılara göndərmək üçün server administratorunuzdan aşağıdakı əmri işə salmasını xahiş edin:
 MailingNeedCommand2=Siz seansla göndərmək istədiyiniz maksimum e-poçt sayının dəyəri ilə MAILING_LIMIT_SENDBYWEB parametrini əlavə etməklə onları onlayn göndərə bilərsiniz. Bunun üçün Əsas səhifə - Quraşdırma - Digər bölməsinə keçin.
 ConfirmSendingEmailing=E-poçtu birbaşa bu ekrandan göndərmək istəyirsinizsə, lütfən, brauzerinizdən indi e-poçt göndərmək istədiyinizə əmin olduğunuzu təsdiqləyin?
-LimitSendingEmailing=Qeyd: Veb interfeysdən e-poçtların göndərilməsi təhlükəsizlik və vaxt aşımı səbəbləri ilə bir neçə dəfə həyata keçirilir, <b>%s</b> hər göndərmə sessiyası üçün eyni anda alıcılar.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Siyahını təmizləyin
 ToClearAllRecipientsClickHere=Bu e-poçt üçün alıcı siyahısını təmizləmək üçün bura klikləyin
 ToAddRecipientsChooseHere=Siyahılardan seçim edərək alıcıları əlavə edin
-NbOfEMailingsReceived=Kütləvi e-poçtlar qəbul edildi
-NbOfEMailingsSend=Kütləvi e-poçt göndərildi
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=şəxsiyyət qeydi
 DeliveryReceipt=Çatdırılma Aktı.
 YouCanUseCommaSeparatorForSeveralRecipients=Bir neçə alıcını müəyyən etmək üçün <b>vergül</b> ayırıcıdan istifadə edə bilərsiniz.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Bu hadisə növü və şirkət üçün avtomatik e-po
 ANotificationsWillBeSent=1 avtomatik bildiriş e-poçt vasitəsilə göndəriləcək
 SomeNotificationsWillBeSent=%s avtomatik bildirişlər e-poçt vasitəsilə göndəriləcək
 AddNewNotification=Yeni avtomatik e-poçt bildirişinə abunə olun (hədəf/tədbir)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=E-poçt göndərmə konfiqurasiyası '%s' üçün quraşdırılıb. Bu rejim kütləvi e-poçt göndərmək üçün istifadə edilə bilməz.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=SMTP serverinizi necə quraşdırmaq barədə hər hansı sualınız varsa, %s ünvanına müraciət edə bilərsiniz.
@@ -183,7 +185,7 @@ Information=Məlumat
 ContactsWithThirdpartyFilter=Üçüncü tərəf filtri ilə kontaktlar
 Unanswered=Cavabsız
 Answered=Cavab verdi
-IsNotAnAnswer=Cavab yoxdur (ilkin e-poçt)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=İlkin e-poçtun cavabıdır
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Yeni kontakt yaratarkən '%s' sahəsi üçün defolt dəyər
@@ -199,6 +201,6 @@ ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/az_AZ/main.lang b/htdocs/langs/az_AZ/main.lang
index f9a91bc4467..eb057a93ea6 100644
--- a/htdocs/langs/az_AZ/main.lang
+++ b/htdocs/langs/az_AZ/main.lang
@@ -37,6 +37,7 @@ Translation=Tərcümə
 Translations=Tərcümələr
 CurrentTimeZone=Saat qurşağı PHP (server)
 EmptySearchString=Boş olmayan axtarış meyarlarını daxil edin
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Tarix meyarını daxil edin
 NoRecordFound=Heç bir qeyd tapılmadı
 NoRecordDeleted=Heç bir qeyd silinməyib
@@ -45,6 +46,7 @@ NoError=Səhv yoxdur
 Error=Xəta
 Errors=Səhvlər
 ErrorFieldRequired='%s' sahəsi tələb olunur
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat='%s' sahəsi pis dəyərə malikdir
 ErrorFileDoesNotExists=%s faylı mövcud deyil
 ErrorFailedToOpenFile=%s faylını açmaq alınmadı
@@ -308,6 +310,7 @@ DateBuild=Quraşdırma tarixini bildirin
 DatePayment=Ödəniş tarixi
 DateApprove=Təsdiq tarixi
 DateApprove2=Təsdiq tarixi (ikinci təsdiq)
+PendingSince=Pending since
 RegistrationDate=Qeydiyyat tarixi
 UserCreation=Yaradıcı istifadəçi
 UserModification=Modifikasiya istifadəçisi
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Başlamaq
 ActionRunningShort=Davam edir
 ActionDoneShort=Bitdi
 ActionUncomplete=Natamam
-LatestLinkedEvents=Ən son %s əlaqəli tədbirlər
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Şirkət/Təşkilat
 Accountant=Mühasib
 ContactsForCompany=Bu üçüncü tərəf üçün kontaktlar
@@ -503,6 +506,7 @@ ContactsAddressesForCompany=Bu üçüncü tərəf üçün kontaktlar/ünvanlar
 AddressesForCompany=Bu üçüncü tərəf üçün ünvanlar
 ActionsOnCompany=Bu üçüncü tərəf üçün tədbirlər
 ActionsOnContact=Bu əlaqə/ünvan üçün tədbirlər
+ActionsOnUser=Events for this user
 ActionsOnContract=Bu müqavilə üçün tədbirlər
 ActionsOnMember=Bu üzv haqqında hadisələr
 ActionsOnProduct=Bu məhsul haqqında hadisələr
@@ -720,6 +724,8 @@ TextUsedInTheMessageBody=E-poçt orqanı
 SendAcknowledgementByMail=Təsdiq e-poçtu göndərin
 SendMail=E-poçt göndər
 Email=E-poçt
+EMail=Email
+EMails=Emails
 NoEMail=E-poçt yoxdur
 AlreadyRead=Artıq oxudum
 NotRead=Oxunmamış
@@ -792,7 +798,7 @@ Notes=Qeydlər
 AddNewLine=Yeni xətt əlavə edin
 AddFile=Fayl əlavə edin
 FreeZone=Pulsuz mətn məhsulu
-FreeLineOfType=Sərbəst mətn elementi, növü:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Obyekti əsas atributları ilə klonlayın
 ReGeneratePDF=PDF-i yenidən yaradın
 PDFMerge=PDF Birləşməsi
@@ -878,12 +884,14 @@ toward=doğru
 Access=Giriş
 SelectAction=Fəaliyyət seçin
 SelectTargetUser=Hədəf istifadəçi/işçi seçin
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Panoya kopyalamaq üçün Ctrl+C istifadə edin
 SaveUploadedFileWithMask=Faylı serverdə "<strong>%s</strong>" adı ilə yadda saxlayın %s")
 OriginFileName=Orijinal fayl adı
 SetDemandReason=Mənbə təyin edin
 SetBankAccount=Bank hesabını müəyyənləşdirin
 AccountCurrency=Hesab valyutası
+AccountancyCode=Accounting Code
 ViewPrivateNote=Qeydlərə baxın
 XMoreLines=%s sətir(lər) gizlədilib
 ShowMoreLines=Daha çox/az xətləri göstərin
@@ -924,6 +932,7 @@ ConfirmMassDeletionQuestion=%s seçilmiş qeydləri silmək istədiyinizə əmin
 ConfirmMassClone=Toplu klon təsdiqi
 ConfirmMassCloneQuestion=Klonlaşdırmaq üçün layihəni seçin
 ConfirmMassCloneToOneProject=%s layihəsini klonlayın
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Əlaqədar Obyektlər
 ClassifyBilled=Hesablanmış təsnifat
 ClassifyUnbilled=Faturasız təsnifləşdirin
@@ -960,10 +969,11 @@ PrivateDownloadLinkDesc=Siz daxil olmalısınız və fayla baxmaq və ya yüklə
 Download=Yüklə
 DownloadDocument=Sənədi yükləyin
 DownloadSignedDocument=İmzalanmış sənədi yükləyin
-ActualizeCurrency=Valyuta məzənnəsini yeniləyin
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Büdcə ili, Maliyyə ili
 ModuleBuilder=Modul və Tətbiq Qurucusu
 SetMultiCurrencyCode=Valyuta təyin edin
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Kütləvi hərəkətlər
 ClickToShowHelp=Alət ipucu yardımını göstərmək üçün klikləyin
 WebSite=Veb sayt
@@ -1103,6 +1113,7 @@ PayedBy=tərəfindən ödənilir
 PayedTo=ödənildi
 Monthly=Aylıq
 Quarterly=Rüblük
+Quarter=Quarter
 Annual=İllik
 Local=yerli
 Remote=Uzaqdan
@@ -1145,6 +1156,7 @@ ContactDefault_project_task=Tapşırıq
 ContactDefault_propal=Təklif
 ContactDefault_supplier_proposal=Təchizatçı Təklifi
 ContactDefault_ticket=Bilet
+ContactDefault_societe=Third party
 ContactAddedAutomatically=Üçüncü tərəf kontakt rollarından kontakt əlavə edildi
 More=Daha çox
 ShowDetails=Detalları göstərin
@@ -1187,6 +1199,8 @@ SetSupervisor=Nəzarətçini təyin edin
 CreateExternalUser=Xarici istifadəçi yaradın
 ConfirmAffectTag=Toplu Tag Təyinatı
 ConfirmAffectUser=Toplu İstifadəçi Təyinatı
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=Hər bir layihə/imkanda təyin olunmuş rol
 TasksRole=Hər tapşırıq üçün təyin edilmiş rol (istifadə edildikdə)
 ConfirmSetSupervisor=Toplu Nəzarətçi Dəsti
@@ -1238,6 +1252,9 @@ CommercialsAffected=Satış nümayəndələri təyin olunub
 CommercialAffected=Satış nümayəndəsi təyin edildi
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=Sənin mesajın
 YourMessageHasBeenReceived=Mesajınız qəbul edildi. Ən qısa zamanda cavab verəcəyik və ya sizinlə əlaqə saxlayacağıq.
 UrlToCheck=Yoxlamaq üçün URL
@@ -1280,6 +1297,7 @@ AmountSalary=Əmək haqqı məbləği
 InvoiceSubtype=Faktura alt növü
 ConfirmMassReverse=Toplu tərs təsdiqləmə
 ConfirmMassReverseQuestion=%s seçilmiş qeydləri geri qaytarmaq istədiyinizə əminsiniz?
+ConfirmActionXxx=Confirm action %s
 ElementType=Element type
 ElementId=Element Id
 Encrypted=Encrypted
@@ -1299,3 +1317,35 @@ AllEntities=All entities
 TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
+auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/az_AZ/members.lang b/htdocs/langs/az_AZ/members.lang
index eaf17d38520..6672c48556b 100644
--- a/htdocs/langs/az_AZ/members.lang
+++ b/htdocs/langs/az_AZ/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Abunəlik tələb olunarsa, üzvün yenilənməsi üç
 DeleteType=Sil
 VoteAllowed=Səs verməyə icazə verilir
 Physical=Fərdi
-Moral=Korporasiya
-MorAndPhy=Korporativ və Fərdi
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Yenidən aktivləşdirin
 ExcludeMember=Üzvü xaric edin
 Exclude=İstisna etmək
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Bölgələr üzrə üzvlərin statistikası
 NbOfMembers=Üzvlərin ümumi sayı
 NbOfActiveMembers=Cari aktiv üzvlərin ümumi sayı
 NoValidatedMemberYet=Doğrulanmış üzv tapılmadı
-MembersByCountryDesc=Bu ekran sizə ölkələr üzrə üzvlərin statistikasını göstərir. Qrafiklər və diaqramlar Google onlayn qrafik xidmətinin mövcudluğundan, eləcə də işləyən internet bağlantısının mövcudluğundan asılıdır.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Bu ekran sizə əyalət/vilayətlər/kanton üzrə üzvlərin statistikasını göstərir.
 MembersByTownDesc=Bu ekran sizə şəhərlər üzrə üzvlərin statistikasını göstərir.
 MembersByNature=Bu ekran sizə üzvlərin təbiətinə görə statistikasını göstərir.
@@ -208,25 +209,25 @@ NewMemberbyWeb=Yeni üzv əlavə edildi. Təsdiqin gözlənilməsi
 NewMemberForm=Yeni üzv forması
 SubscriptionsStatistics=Töhfələrin statistikası
 NbOfSubscriptions=Töhfələrin sayı
-AmountOfSubscriptions=Əmanətlərdən yığılan məbləğ
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=Dövriyyə (şirkət üçün) və ya Büdcə (vəqf üçün)
-DefaultAmount=Defolt töhfə məbləği (yalnız üzv növü səviyyəsində heç bir məbləğ müəyyən edilmədikdə istifadə olunur)
-MinimumAmount=Minimum məbləğ (yalnız töhfə məbləği pulsuz olduqda istifadə olunur)
-CanEditAmount=Abunə məbləği üzv tərəfindən müəyyən edilə bilər
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=Ziyarətçi üzv növündən asılı olmayaraq öz töhfəsinin məbləğini seçə/redaktə edə bilər
 AmountIsLowerToMinimumNotice=Məbləğ minimum %sdan aşağıdır
 MEMBER_NEWFORM_PAYONLINE=Onlayn qeydiyyatdan sonra avtomatik olaraq onlayn ödəniş səhifəsinə keçin
 ByProperties=Təbiətcə
 MembersStatisticsByProperties=Təbiətinə görə üzvlərin statistikası
-VATToUseForSubscriptions=töhfələr üçün istifadə ƏDV dərəcəsi
-NoVatOnSubscription=töhfələr üçün ƏDV yoxdur
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Fakturaya töhfə xətti üçün istifadə edilən məhsul: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=Adı və ya şirkət
 SubscriptionRecorded=Töhfə qeydə alınıb
 NoEmailSentToMember=Üzvə e-poçt göndərilməyib
 EmailSentToMember=E-məktub %s ünvanında üzvə göndərildi
-SendReminderForExpiredSubscriptionTitle=Vaxtı keçmiş töhfələr üçün e-poçtla xatırlatma göndərin
-SendReminderForExpiredSubscription=Töhfənin müddəti bitmək üzrə olan zaman üzvlərə e-poçt vasitəsilə xatırlatma göndərin (parametr xatırladıcının göndərilməsi üçün üzvlük müddətinin bitməsinə qədər olan günlərin sayıdır. Bu, nöqtəli vergüllə ayrılmış günlərin siyahısı ola bilər, məsələn, '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Cari dövr üçün ödənilmiş üzvlük (%s-a qədər)
 YouMayFindYourInvoiceInThisEmail=Siz fakturanızı bu e-poçta əlavə edilmiş tapa bilərsiniz
 XMembersClosed=%s üzv(lər) bağlanıb
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Üçüncü tərəf hər bir töhfə üçün faktura
 MemberFirstname=Üzv adı
 MemberLastname=Üzv soyadı
 MemberCodeDesc=Bütün üzvlər üçün unikal olan Üzv Kodu
-MemberSubscriptionStartFirstDayOf=Üzvlüyün başlanğıc tarixi a-nın ilk gününə uyğundur
-MemberSubscriptionStartAfter=Abunəliyin başlanğıc tarixinin qüvvəyə minməsindən əvvəlki minimum müddət, yeniləmələr istisna olmaqla (məsələn, +3m = +3 ay, -5g = -5 gün, +1Y = +1 il)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/az_AZ/salaries.lang b/htdocs/langs/az_AZ/salaries.lang
index fdd8c8ee60a..a5b2bd7fbc4 100644
--- a/htdocs/langs/az_AZ/salaries.lang
+++ b/htdocs/langs/az_AZ/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Yeni maaş
 AddSalary=Maaş əlavə edin
 NewSalaryPayment=Yeni maaş kartı
 AddSalaryPayment=Əmək haqqı ödənişi əlavə edin
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Əmək haqqının ödənilməsi
 SalariesPayments=Əmək haqqı ödənişləri
 SalariesPaymentsOf=%s əmək haqqı ödənişləri
@@ -27,7 +29,7 @@ FillFieldFirst=Əvvəlcə işçi sahəsini doldurun
 UpdateAmountWithLastSalary=Son əmək haqqının məbləğini təyin edin
 MakeTransferRequest=Transfer sorğusu edin
 VirementOrder=Kredit köçürmə sorğusu
-BankTransferAmount=Kredit köçürmə məbləği
 WithdrawalReceipt=Kredit köçürmə sifarişi
 OrderWaiting=Gözləyən sifariş
 FillEndOfMonth=Ayın sonu ilə doldurun
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/az_AZ/website.lang b/htdocs/langs/az_AZ/website.lang
index 1e533693046..3b71faff231 100644
--- a/htdocs/langs/az_AZ/website.lang
+++ b/htdocs/langs/az_AZ/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Burada digər adların/ləqəblərin siyahısını istifad
 WEBSITE_CSS_URL=Xarici CSS faylının URL-i
 WEBSITE_CSS_INLINE=CSS fayl məzmunu (bütün səhifələr üçün ümumi)
 WEBSITE_JS_INLINE=JavaScript fayl məzmunu (bütün səhifələr üçün ümumi)
-WEBSITE_HTML_HEADER=HTML başlığının altındakı əlavə (bütün səhifələr üçün ümumi)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot faylı (robots.txt)
 WEBSITE_HTACCESS=Veb sayt .htaccess faylı
 WEBSITE_MANIFEST_JSON=Veb sayt manifest.json faylı
@@ -56,16 +56,17 @@ ReadPerm=Oxuyun
 WritePerm=yaz
 TestDeployOnWeb=Vebdə sınaqdan keçirin/yerləşdirin
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=Xarici veb server tərəfindən xidmət edilən virtual hostun URL-i müəyyən edilməyib
 NoPageYet=Hələ səhifə yoxdur
 YouCanCreatePageOrImportTemplate=Siz yeni səhifə yarada və ya tam veb sayt şablonunu idxal edə bilərsiniz
 SyntaxHelp=Xüsusi sintaksis məsləhətləri üzrə yardım
 YouCanEditHtmlSourceckeditor=Siz redaktorda "Mənbə" düyməsini istifadə edərək HTML mənbə kodunu redaktə edə bilərsiniz.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Paylaşım linki ilə paylaşılan şəkil üçün (faylın paylaşma heş açarından istifadə edərək açıq giriş) sintaksis belədir:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;<span class='notransa606f </span><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Səhifəni/konteyneri klonlayın
 CloneSite=Klon saytı
@@ -87,15 +88,15 @@ WebsiteAccount=Veb sayt hesabı
 WebsiteAccounts=Veb sayt hesabları
 AddWebsiteAccount=Veb sayt hesabı yaradın
 BackToListForThirdParty=Üçüncü tərəflər üçün siyahıya qayıt
-DisableSiteFirst=Əvvəlcə veb saytı söndürün
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Veb saytımın başlığı
 AnotherContainer=Başqa səhifənin/konteynerin məzmununu necə daxil etmək olar (daxil edilmiş alt konteyner mövcud olmaya bilər, çünki dinamik kodu aktiv etsəniz, burada xəta ola bilər)
 SorryWebsiteIsCurrentlyOffLine=Üzr istəyirik, bu vebsayt hazırda offlinedır. Zəhmət olmasa daha sonra qayıdın...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Hər bir vebsayt/üçüncü tərəf üçün veb sayt hesablarını (giriş/keçmə) saxlamaq üçün cədvəli aktivləşdirin
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Əvvəlcə standart Əsas səhifəni təyin etməlisiniz
-OnlyEditionOfSourceForGrabbedContentFuture=Xəbərdarlıq: Xarici veb səhifəni idxal etməklə veb səhifə yaratmaq təcrübəli istifadəçilər üçün nəzərdə tutulub. Mənbə səhifəsinin mürəkkəbliyindən asılı olaraq, idxalın nəticəsi orijinaldan fərqli ola bilər. Həmçinin mənbə səhifə ümumi CSS üslublarından və ya ziddiyyətli JavaScript-dən istifadə edirsə, bu səhifədə işləyərkən Vebsayt redaktorunun görünüşünü və ya xüsusiyyətlərini poza bilər. Bu üsul səhifə yaratmağın daha sürətli yoludur, lakin yeni səhifənizi sıfırdan və ya təklif olunan səhifə şablonundan yaratmaq tövsiyə olunur.<br>Həmçinin nəzərə alın ki, daxili redaktor işləməyə bilər. tutulan xarici səhifədə istifadə edildikdə düzgündür.
-OnlyEditionOfSourceForGrabbedContent=Məzmun xarici saytdan götürüldükdə yalnız HTML mənbəyinin nəşri mümkündür
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=CSS və səhifədə tapılan şəkilləri də götürün.
 ImagesShouldBeSavedInto=Şəkillər kataloqda saxlanmalıdır
 WebsiteRootOfImages=Veb sayt şəkilləri üçün kök kataloqu
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Remove filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Categories
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index fdfed84c568..29e17cb8090 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Проверката за целостта н
 FileIntegritySomeFilesWereRemovedOrModified=Проверката за целостта на файловете е неуспешна. Някои файлове са били променени, премахнати или добавени.
 GlobalChecksum=Глобална контролна сума
 MakeIntegrityAnalysisFrom=Извършване на анализ за целостта на файловете в системата от
-LocalSignature=Вграден локален подпис (по-малко надежден)
-RemoteSignature=Отдалечен подпис (по-надежден)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Липсващи файлове
 FilesUpdated=Актуализирани файлове
 FilesModified=Променени файлове
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Използва се само от някаква опц
 Security=Сигурност
 Passwords=Пароли
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Криптиране на паролата за базата данни, съхранена в conf.php. Силно се препоръчва да активирате тази опция.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=За да кодирате парола, във файла <b>conf.php</b> заменете реда <br><b>$dolibarr_main_db_pass="...";</b><br>с<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=За да декодирате парола, във файла <b>conf.php</b> заменете реда <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>с<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Защитаване на генерирани PDF файлове. Това НЕ се препоръчва, тъй като прекъсва генерирането на общ PDF.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Изчислено поле
-ComputedFormulaDesc=Тук можете да въведете формула, използвайки други свойства на обект или произволно PHP кодиране, за да получите динамична изчислена стойност. Можете да използвате всички PHP съвместими формули, включително "?" оператор на условие и следния глобален обект: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>ПРЕДУПРЕЖДЕНИЕ</strong>: Ако имате нужда от свойства на обект не е заредено, просто извлечете сами обекта във вашата формула, както във втория пример.<br>Използването на изчислено поле означава, че не можете да въведете сами никаква стойност от интерфейса. Освен това, ако има синтактична грешка, формулата може да не върне нищо.<br><br>Пример за формула:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Пример за презареждане на обект<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj- >capital / 5: '-1')<br><br>Друг пример за формула за принудително зареждане на обект и неговия родителски обект: <br>(($reloadedobj = нова задача($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = нов проект( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0))? $secondloadedobj->ref: 'Родителският проект не е намерен'
+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'
 Computedpersistent=Запазване на изчисленото поле
 ComputedpersistentDesc=Изчислените допълнителни полета ще бъдат съхранени в базата данни, но стойността ще бъде преизчислена само когато обектът на това поле бъде променен. Ако изчисленото поле зависи от други обекти или глобални данни, тази стойност може да е грешна!!
 ExtrafieldParamHelpPassword=Оставянето на това поле празно означава, че тази стойност ще бъде съхранена БЕЗ криптиране (полето е само скрито със звезди на екрана).<br><br>Въведете стойност 'dolcrypt' за кодиране на стойност с обратим алгоритъм за криптиране. Ясните данни все още могат да бъдат известни и редактирани, но са шифровани в базата данни.<br><br>Въведете „auto“ (или „md5“, 'sha256', 'password_hash', ...), за да използвате алгоритъма за криптиране на паролата по подразбиране (или md5, sha256, password_hash...), за да запазите необратимата хеширана парола в база данни (няма начин за извличане на оригиналната стойност)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Използването на SMTP сървъра на вашия собствен доставчик на имейл услуги за изпращане на имейли също е интересно, така че всички имейли, изпратени от приложението, също ще бъдат запазени в директорията „Изпратени“ на вашата пощенска кутия.
 WarningPHPMailD=Поради това се препоръчва да промените метода на изпращане на имейли на стойността "SMTP".
 WarningPHPMailDbis=Ако наистина искате да запазите метода по подразбиране "PHP" за изпращане на имейли, просто игнорирайте това предупреждение или го премахнете, като %sщракнете тук%s.
-WarningPHPMail2=Ако вашият SMTP доставчик трябва да ограничи имейл клиента до някои IP адреси (много рядко), това е IP адресът на потребителския агент за поща (MUA) за вашето ERP CRM приложение: <strong>%s</strong> .
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Счетоводство (опростено)
 Module10Desc=Опростени счетоводни отчети (дневник, оборот) въз основа на съдържанието в базата данни. Не използва сметкоплан.
 Module20Name=Предложения
 Module20Desc=Управление на търговски предложения
-Module22Name=Масови имейли
-Module22Desc=Управление на масови имейли
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Енергия
 Module23Desc=Мониторинг на потреблението на енергия
 Module25Name=Поръчки за продажба
@@ -847,10 +848,10 @@ Permission212=Поръчка на линия
 Permission213=Активиране на линия
 Permission214=Настройка на телефония
 Permission215=Настройка на доставчици
-Permission221=Преглед на имейли
-Permission222=Създаване / променяне на имейли (тема, получатели, ...)
-Permission223=Валидиране на имейли (позволява изпращане)
-Permission229=Изтриване на имейли
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Преглед на получатели и информация
 Permission238=Ръчно изпращане на имейли
 Permission239=Изтриване на писма след валидиране или изпращане
@@ -1105,6 +1106,7 @@ DictionaryStaff=Брой служители
 DictionaryAvailability=Забавяне на доставка
 DictionaryOrderMethods=Методи за поръчка
 DictionarySource=Произход на предложения / поръчки
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Персонализирани групи за отчети
 DictionaryAccountancysystem=Модели за сметкоплан
 DictionaryAccountancyJournal=Счетоводни дневници
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Назад към списъка с речници
 TypeOfRevenueStamp=Вид на данъчния печат (бандерол)
 VATManagement=Управление на данък върху продажбите (ДДС)
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=По подразбиране предложената ставка на ДДС е 0, което може да се използва за случаи като асоциации, физически лица или малки фирми.
 VATIsUsedExampleFR=Във Франция това означава дружества или организации, които имат реална фискална система (опростена реална или нормална реална). Система, в която е деклариран ДДС.
 VATIsNotUsedExampleFR=Във Франция това означава асоциации, които не декларират данък върху продажбите или компании, организации, или свободни професии, които са избрали фискалната система за микропредприятия (данък върху продажбите във франчайз) и са платили франчайз данък върху продажбите без декларация за данък върху продажбите. Този избор ще покаже информация за "Неприложим данък върху продажбите - art-293B от CGI" във фактурите.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Вид данък върху продажбите
 LTRate=Ставка
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Според настройката на данъци
 LabelUsedByDefault=Име, използвано по подразбиране, ако не може да бъде намерен превод за кода
 LabelOnDocuments=Текст в документи
 LabelOrTranslationKey=Име или ключ за превод
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=Показване на Клиент/ДДС номер на дос
 AddAdressInList=Показване на Клиент/адрес на доставчик в комбинирани списъци.<br>Трети страни ще се покажат с формат на името „The Big Компания corp. - 21 jump street 123456 Big town - САЩ" вместо "The Big Компания corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Запитване към контрагенти за предпочитан начин на доставка
-FieldEdition=Издание на поле %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Пример: +2 (попълнете само ако има проблеми с компенсирането на часовата зона)
 GetBarCode=Получаване на баркод
 NumberingModules=Модели за номериране
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Принуждаване на датата на фактура
 SuggestedPaymentModesIfNotDefinedInInvoice=Предложен режим на плащане по фактура по подразбиране, ако не е дефиниран във фактурата
 SuggestPaymentByRIBOnAccount=Да се предлага плащане по сметка
 SuggestPaymentByChequeToAddress=Да се предлага плащане с чек
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Свободен текст във фактури
 WatermarkOnDraftInvoices=Воден знак върху чернови фактури (няма, ако е празно)
 PaymentsNumberingModule=Модел за номериране на плащания
@@ -1718,6 +1723,7 @@ CompressionOfResources=Компресиране на HTTP отговори
 CompressionOfResourcesDesc=Например с помощта на Apache директивата "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Такова автоматично откриване не е възможно с настоящите браузъри
 DefaultValuesDesc=Тук може да дефинирате стойността по подразбиране, която искате да използвате, когато създавате нов запис заедно с филтрите по подразбиране или реда за сортиране на записите в списъка.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Стойности по подразбиране (за използване в формуляри)
 DefaultSearchFilters=Филтри за търсене по подразбиране
 DefaultSortOrder=Редове за сортиране по подразбиране
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Модели за номериране на пратк
 SendingsAbility=Поддържани листове за доставки към клиенти
 NoNeedForDeliveryReceipts=В повечето случаи експедиционните формуляри се използват както за формуляри за доставка на клиенти (списък на продуктите, които трябва да бъдат изпратени), така и за формуляри, които са получени и подписани от клиента. Следователно разписката за доставка на продукти е дублираща функция и рядко се активира.
 FreeLegalTextOnShippings=Свободен текст в пратки
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Модели за номериране на разписки за доставка
 DeliveryOrderModel=Шаблони на документи за разписки за доставка
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Свободен текст в разписки
 ##### FCKeditor #####
 AdvancedEditor=Разширен редактор
 ActivateFCKeditor=Активиране на разширен редактор за:
-FCKeditorForNotePublic=WYSIWYG създаване/редактиране на полето "публични бележки" на елементи
-FCKeditorForNotePrivate=WYSIWYG създаване/редактиране на полето "лични бележки" на елементи
-FCKeditorForCompany=WYSIWYG създаване/редактиране на полето Описание от елементи (с изключение на продукти/услуги)
-FCKeditorForProductDetails=WYSIWYG създаване/редактиране на продукти Описание или редове за обекти (редове с предложения, поръчки, фактури и др...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Предупреждение: Използването на тази опция за този случай сериозно не се препоръчва, тъй като може да създаде проблеми със специални знаци и форматиране на страници при създаване на PDF файлове.
-FCKeditorForMailing= WYSIWYG създаване/издание за масови имейли (Инструменти->eMailing)
-FCKeditorForUserSignature=WYSIWYG създаване/редактиране на потребителски подпис
-FCKeditorForMail=WYSIWYG създаване/редактиране за цялата поща (с изключение на Tools->eMailing)
-FCKeditorForTicket=WYSIWYG създаване/издание за тикети
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Настройка на модул Наличности
 IfYouUsePointOfSaleCheckModule=Ако използвате модула точка за продажби (ПОС), предоставен по подразбиране или чрез външен модул, тази настройка може да бъде игнорирана от вашия ПОС модул. Повечето ПОС модули по подразбиране са разработени да създават веднага фактура, след което да намаляват наличностите, независимо от опциите тук. В случай, че имате нужда или не от автоматично намаляване на наличностите при регистриране на продажба от ПОС проверете и настройката на вашия ПОС модул.
@@ -1867,7 +1874,6 @@ Buy=Покупка
 Sell=Продажба
 InvoiceDateUsed=Използва се дата на фактурата
 YourCompanyDoesNotUseVAT=Вашата фирма не е определила да използва ДДС (Начало - Настройки - Фирма / Организация), така че няма опции за настройка на ДДС.
-AccountancyCode=Счетоводен код
 AccountancyCodeSell=Счетоводен код за продажба
 AccountancyCodeBuy=Счетоводен код за покупка
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Оставете квадратчето за отметка „автоматично създаване на плащане“ празно по подразбиране, когато създавате нов данък
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Кой изглед искате да отворите п
 AGENDA_EVENT_PAST_COLOR = Минало събитие Цвят
 AGENDA_EVENT_CURRENT_COLOR = Текущо събитие Цвят
 AGENDA_EVENT_FUTURE_COLOR = Бъдещо събитие Цвят
-AGENDA_REMINDER_BROWSER = Активиране на напомнянето за събитие <b>в браузъра на потребителя</b> (Когато се стигне до напомняне Дата , изскачащ прозорец се показва от браузъра. Всеки потребител може да деактивира такова Известия от настройката на своя браузър Известие).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Активиране на звуково известяване
-AGENDA_REMINDER_EMAIL = Активиране на напомняне за събитие <b>чрез имейли</b> (опция/закъснение за напомняне може да се дефинира за всяко събитие).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Забележка: Честотата на планираното задание %s трябва да е достатъчна, за да сте сигурни, че напомнянията се изпращат в правилния момент.
 AGENDA_SHOW_LINKED_OBJECT = Показване на свързания обект в календара
 AGENDA_USE_EVENT_TYPE = Използване на видове събития (управлявани в меню Настройка - Речници - Видове събития в календара)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Автоматично задаване на стойност по подразбиране за вид събитие във формуляра при създаване на събитие
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Ключ за оторизация на връзката за експортиране
 PastDelayVCalExport=Да не се експортират събития по-стари от
 SecurityKey = Ключ за защита
@@ -2006,7 +2017,7 @@ BackupZipWizard=Асистент за създаване на архив на д
 SomethingMakeInstallFromWebNotPossible=Инсталирането на външен модул не е възможно от уеб интерфейса, поради следната причина:
 SomethingMakeInstallFromWebNotPossible2=Поради тази причина описаният тук процес за актуализация е ръчен процес, който може да се изпълнява само от потребител със съответните права.
 InstallModuleFromWebHasBeenDisabledContactUs=Инсталирането или разработката на външни модули или динамични уебсайтове от приложението в момента е заключено за целите на сигурността. Моля, свържете се с нас, ако трябва да активирате тази функция.
-InstallModuleFromWebHasBeenDisabledByFile=Инсталирането на външен модул в приложението е деактивирано от администратора на системата. Трябва да го помолите да премахне файла <strong>%s</strong>, за да разреши тази функция.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Инсталирането или създаването на външен модул в приложението е необходимо да съхрани файловете на модула в директорията <strong>%s</strong>. За да се обработва тази директория от Dolibarr, трябва да настроите вашият <strong>conf/conf.php</strong> файл да съдържа двете директивни линии: <br> <strong>$dolibarr_main_url_root_alt = '/custom';</strong> <br> <strong>$dolibarr_main_document_root_alt = '%s/custom';</strong>
 HighlightLinesOnMouseHover=Маркиране на редове в таблица, когато мишката преминава отгоре
 HighlightLinesColor=Цвят на подчертания ред при преминаване на мишката отгоре (използвайте 'ffffff', ако не искате да се подчертава)
@@ -2036,6 +2047,7 @@ Enter0or1=Въведете 0 или 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Въведете тук между скобите, десетичен код, който представлява символа на валутата. Например: за $, въведете [36] - за Бразилски Реал R$ [82,36] - за €, въведете [8364]
 ColorFormat=RGB цвета е в HEX формат, например: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Име на иконата във формат:<br>- image.png за файл с изображение в текущата директория на тема<br>- image.png@module ако файлът е в директорията /img/ на модул<br>- fa-xxx за снимка на FontAwesome fa-xxx<br>- fontawesome_xxx_fa_color_size за снимка на FontAwesome fa-xxx (с префикс, Цвят и набор от размери)
 PositionIntoComboList=Позиция на реда в комбинирани списъци
 SellTaxRate=Данъчна ставка върху продажбите
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Скриване на границите на адресната рамка на подателя
 MAIN_PDF_NO_RECIPENT_FRAME=Скриване на границите на адресната рамка на получателя
 MAIN_PDF_HIDE_CUSTOMER_CODE=Скриване на кода Клиент
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Скриване на името на подателя/Компания в адресния блок
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Скриване на условията за плащане
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Скриване на режима плащане
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=Не се препоръчва
 ARestrictedPath=Някои ограничени пътища за файлове с данни
 CheckForModuleUpdate=Проверете за актуализации на външни модули
 CheckForModuleUpdateHelp=Това действие ще се свърже с редактори на външни модули, за да провери дали е налична нова версия.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Налична е актуализация
 NoExternalModuleWithUpdate=Няма намерени актуализации за външни модули
 SwaggerDescriptionFile=Swagger API Описание файл (за използване с redoc например)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Показване на доставка адре
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Задължително указание в някои страни (Франция, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=URL връзка към социалната мрежа. Използвайте {socialid} за променливата част, която съдържа идентификатора на социалната мрежа.
 IfThisCategoryIsChildOfAnother=Ако този Категория е дъщерен на друг
 DarkThemeMode=Режим на тъмна тема
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Предупреждение: 
 WarningModuleHasChangedSecurityCsrfParameter=Предупреждение: модулът %s е деактивирал CSRF сигурността на вашето копие. Това действие е подозрително и вашата инсталация може повече да не е защитена. Моля, свържете се с автора на модула за обяснение.
 EMailsInGoingDesc=Входящите имейли се управляват от модула %s. Трябва да го активирате и конфигурирате, ако трябва да поддържате входящи имейли.
 MAIN_IMAP_USE_PHPIMAP=Използвайте PHP-IMAP библиотеката за IMAP вместо естествения PHP IMAP. Това също позволява използването на OAuth2 връзка за IMAP (модулът OAuth също трябва да бъде активиран).
-MAIN_CHECKBOX_LEFT_COLUMN=Показване на колоната за избор на поле и ред отляво (отдясно по подразбиране)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Не е създаден по подразбиране. Създаден само при активиране на модула.
 CSSPage=CSS стил
 Defaultfortype=По подразбиране
@@ -2489,7 +2510,7 @@ AiDescription=Екстри на AI(Изкуствен интелект)
 AiDescriptionLong=Предлага функции на изкуствен интелект (AI) в различни части на приложението. Изисква външен API за изкуствен интелект.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=Настройки на AI модул
 AiCustomPrompt=AI специфична команда
 AI_CONFIGURATIONS_PROMPT=Специфична команда
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI специфични заявки за функции
 EnterAnIP=Въведете  IP адрес
 ConvertInto=Конвертирай в
 YouAreHere=Вие сте тук
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang
index 990fe08dbf8..338d95598c6 100644
--- a/htdocs/langs/bg_BG/banks.lang
+++ b/htdocs/langs/bg_BG/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Краен баланс
 CurrentBalance=Текущ баланс
 FutureBalance=Бъдещ баланс
 ShowAllTimeBalance=Показване на баланса от начало
-AllTime=От начало
 Reconciliation=Съгласуване
 RIB=Номер на банкова сметка
 IBAN=IBAN номер
@@ -133,7 +132,7 @@ DeleteTransaction=Изтриване на транзакция
 ConfirmDeleteTransaction=Сигурни ли сте, че искате да изтриете тази транзакция?
 ThisWillAlsoDeleteBankRecord=Това ще изтрие и генерираната банкова транзакция
 BankMovements=Движения
-PlannedTransactions=Планирани транзакции
+PlannedTransactions=Upcoming entries
 Graph=Графики
 ExportDataset_banque_1=Банкови транзакции и извлечение по сметка
 ExportDataset_banque_2=Депозитна разписка
@@ -151,7 +150,7 @@ FutureTransaction=Бъдеща транзакция. Не може да се с
 SelectChequeTransactionAndGenerate=Изберете/филтрирайте чековете, които трябва да бъдат включени в разписката за чек депозит. След това щракнете върху „Създаване“.
 SelectPaymentTransactionAndGenerate=Изберете/филтрирайте документите, които трябва да бъдат включени в разписката за депозит %s. След това щракнете върху „Създаване“.
 InputReceiptNumber=Изберете банковото извлечение, свързано с помирението. Използвайте числова стойност с възможност за сортиране
-InputReceiptNumberBis=ГГГГММ или ГГГГММДД
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Да се съгласува ли?
 ThenCheckLinesAndConciliate=След това проверете редовете в банковото извлечение и кликнете
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Ако тази функция е активирана
 BankColorizeMovementName1=Цвят на фона за дебитно движение
 BankColorizeMovementName2=Цвят на фона за кредитно движение
 IfYouDontReconcileDisableProperty=Ако не правите банкови равнения на някои банкови сметки, деактивирайте свойството „%s“ за тях, за да премахнете това предупреждение.
-NoBankAccountDefined=Няма дефинирана банкова сметка
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Няма открит запис в банковата сметка. Обикновено това се случва, когато запис е изтрит ръчно от списъка с транзакции в банковата сметка (например по време на съгласуване на банковата сметка). Друга причина е, че плащане е записан, когато модулът „%s“ е деактивиран.
 AlreadyOneBankAccount=Вече е дефинирана една банкова сметка
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA файлов вариант
diff --git a/htdocs/langs/bg_BG/blockedlog.lang b/htdocs/langs/bg_BG/blockedlog.lang
index 855bad71187..157b666592a 100644
--- a/htdocs/langs/bg_BG/blockedlog.lang
+++ b/htdocs/langs/bg_BG/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Неизменими регистри
 ShowAllFingerPrintsMightBeTooLong=Показване на всички архивирани регистри (може да са дълги)
 ShowAllFingerPrintsErrorsMightBeTooLong=Показване на всички невалидни архивирани регистри (може да са дълги)
 DownloadBlockChain=Изтегляне на идентификационни данни
-KoCheckFingerprintValidity=Архивираният запис в регистрационния файл не е валиден. Това означава, че някой (хакер?) е променил някои данни от този запис, след като е бил записан, или е изтрил предишния архивиран запис (проверете, че редът с предходния # съществува) или е променил контролната сума на предишния запис.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Записът в архивираният регистър е валиден. Данните от този ред не са променени и записът следва предишния.
 OkCheckFingerprintValidityButChainIsKo=Архивираният регистър изглежда валиден в сравнение с предишния, но веригата е повредена от преди това.
 AddedByAuthority=Съхранено в отдалечен орган
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Подробности в регистъра
 ListOfTrackedEvents=Списък на проследени събития
 Fingerprint=Идентификационни данни
 DownloadLogCSV=Експортиране на архивирани регистри (CSV)
-DataOfArchivedEvent=Пълни данни за архивирано събитие
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Първоначалният обект (тип %s, id %s) не е свързан (вижте колоната 'Пълни данни', за да получите неизменими запазени данни)
 BlockedLogAreRequiredByYourCountryLegislation=Модулът неизменими регистри може да се изисква от законодателството на вашата държава. Деактивирането на този модул може да направи всички бъдещи транзакции невалидни по отношение на закона и използването на легален софтуер, тъй като те не могат да бъдат потвърдени при данъчен одит.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Модулът неизменими регистри е активиран, поради законодателството на вашата държава. Деактивирането на този модул може да направи всички бъдещи транзакции невалидни по отношение на закона и използването на легален софтуер, тъй като те не могат да бъдат потвърдени при данъчен одит.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Системата за проследяване на съби
 BlockedLogDisabled=Системата за проследяване на събития в непроменими регистрационни файлове е деактивирана, след като е направен известен запис. Запазихме специален пръстов отпечатък, за да проследим веригата като счупена
 BlockedLogDisabledBis=Системата за проследяване на събития в непроменими регистрационни файлове е деактивирана. Това е възможно, защото все още не е направен запис.
 LinkHasBeenDisabledForPerformancePurpose=За целите на ефективността директната връзка към документа не се показва след 100-ия ред.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Фактурата за продажба е логически изтрита
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Плащането от клиент е логиче
 logPAYMENT_VARIOUS_CREATE=Плащането (не е свързано с фактура) е създадено
 logPAYMENT_VARIOUS_DELETE=Плащането (не е свързано с фактура) е логически изтрито
 logPAYMENT_VARIOUS_MODIFY=Плащането (не е свързано с фактура) е променено
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang
index 2aaab3c1501..ac67a928eac 100644
--- a/htdocs/langs/bg_BG/categories.lang
+++ b/htdocs/langs/bg_BG/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Етикети за контакт/област Кате
 AccountsCategoriesArea=Етикети за банкови сметки/зона Категории
 ProjectsCategoriesArea=Етикети на проекта/област Категории
 UsersCategoriesArea=Потребителски етикети/област Категории
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Подкатегории
 CatList=Списък с тагове / категории
 CatListAll=Списък с тагове/Категории (всички типове)
@@ -90,9 +91,10 @@ CategoriesSetup=Настройка на тагове / категории
 CategorieRecursiv=Автоматично свързване с главния таг / категория
 CategorieRecursivHelp=Ако опцията е включена, когато добавите обект в подкатегория, обектът също ще бъде добавен в родителската Категории.
 AddProductServiceIntoCategory=Присвоете Категория към продукта/услугата
-AddCustomerIntoCategory=Присвояване на Категория на Клиент
-AddSupplierIntoCategory=Присвояване на Категория на доставчик
-AssignCategoryTo=Присвояване на Категория на
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Показване на таг / категория
 ByDefaultInList=По подразбиране в списъка
 ChooseCategory=Избиране на категория
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Страница-контейнер Категори
 KnowledgemanagementsCategoriesArea=Статия за KM Категории
 UseOrOperatorForCategories=Използвайте оператор „ИЛИ“ за Категории
 AddObjectIntoCategory=Присвояване на Категория
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index 29a4cc8be2c..0cade6806d0 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -65,6 +65,7 @@ State=Област
 StateId=Държавна лична карта
 StateCode=Код на област
 StateShort=Област
+DepartmentBuyer=Buyer's state/province
 Region=Регион
 Region-State=Регион - Област
 Country=Държава
@@ -78,7 +79,7 @@ Chat=Чат с
 PhonePro=автобус. телефон
 PhonePerso=Дом. телефон
 PhoneMobile=Моб. телефон
-No_Email=Отхвърляне на масови имейли
+No_Email=Refuse mass emails
 Fax=Факс
 Zip=Пощ. код
 Town=Град
@@ -382,12 +383,12 @@ ExportCardToFormat=Карта за експортиране във формат
 ContactNotLinkedToCompany=Контактът не е свързан с нито един контрагент
 DolibarrLogin=Dolibarr потребител
 NoDolibarrAccess=Няма достъп до Dolibarr
-ExportDataset_company_1=Контрагенти (фирми / фондации / физически лица) и техните характеристики
-ExportDataset_company_2=Контакти и техните характеристики
-ExportDataset_company_3=Банкови сметки на контрагенти
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Допълнителни контакти / адреси и атрибути към контрагента
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Контрагенти и техните характеристики
 ImportDataset_company_2=Допълнителни контакти / адреси и атрибути към контрагента
-ImportDataset_company_3=Банкови сметки на контрагенти
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Търговски представители за контрагента (назначени търговски представители / потребители към фирмите)
 PriceLevel=Ценово ниво
 PriceLevelLabels=Имена на ценови нива
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Име на управител (изпълнителен директор, директор, президент...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Обединяване на контрагенти
-ConfirmMergeThirdparties=Сигурни ли сте, че искате да обедините избраната трета страна с текущата? Всички свързани обекти (фактури, поръчки, ...) ще бъдат преместени към текущата трета страна, след което избраната трета страна ще бъде изтрита.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Контрагентите са обединени
 SaleRepresentativeLogin=Входна информация за търговски представител
 SaleRepresentativeFirstname=Собствено име на търговския представител
@@ -461,3 +462,6 @@ ExternalSystemID=ID на външната система
 IDOfPaymentInAnExternalSystem=ID на режима плащане във външна система (като Stripe, Paypal, ...)
 AADEWebserviceCredentials=Идентификационни данни за уеб услуга на AADE
 ThirdPartyMustBeACustomerToCreateBANOnStripe=контрагент трябва да е Клиент, за да позволи създаването на неговата банкова информация от страна на Stripe
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index b28750756e9..cd6a6097b70 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Плащане на фактура за продажба
 PaymentSupplierInvoice=Плащане на фактура за покупка
 PaymentSocialContribution=Плащане на социален / фискален данък
 PaymentVat=Плащане на ДДС
-AutomaticCreationPayment=автоматично запишете плащане
+AutomaticCreationPayment=Also record the payment
 ListPayment=Списък на плащания
 ListOfCustomerPayments=Списък на клиентски плащания
 ListOfSupplierPayments=Списък на плащания към доставчици
@@ -118,10 +118,14 @@ SocialContributionsPayments=Плащания на социални / фиска
 ShowVatPayment=Показване на плащане на ДДС
 TotalToPay=Общо за плащане
 BalanceVisibilityDependsOnSortAndFilters=Салдото се вижда в този списък само ако таблицата е сортирана по %s и филтрирана по 1 банкова сметка (без други филтри)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Счетоводен код на клиент
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Счетоводен код на доставчик
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Счет. код на клиент
 SupplierAccountancyCodeShort=Счет. код на доставчик
+UserAccountancyCodeShort=User account. code
 AccountNumber=Номер на сметка
 NewAccountingAccount=Нова сметка
 Turnover=Фактуриран оборот
@@ -129,7 +133,9 @@ TurnoverCollected=Натрупан оборот
 SalesTurnoverMinimum=Минимален оборот
 ByExpenseIncome=По разходи и приходи
 ByThirdParties=По контрагенти
+ByProjects=By projects
 ByUserAuthorOfInvoice=По автор на фактура
+DetailedListLowercase=detailed list
 CheckReceipt=Депозитна разписка
 CheckReceiptShort=Депозитна разписка
 LastCheckReceiptShort=Последни %s фишове за депозит
diff --git a/htdocs/langs/bg_BG/datapolicy.lang b/htdocs/langs/bg_BG/datapolicy.lang
index 27aaf178111..da155d21a7f 100644
--- a/htdocs/langs/bg_BG/datapolicy.lang
+++ b/htdocs/langs/bg_BG/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Политика за поверителност на данн
 Module4100Desc = Модул за управление на поверителността на данните (съответствие с GDPR)
 # Administration page
 datapolicySetup = Настройка на политиката за поверителност на данните на модула
-Deletion = Изтриване на данни
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s месеца
 ONE_YEAR = Една година
 NB_YEARS = %s години
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Проспект/Клиент
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Нито перспектива/Нито Клиент
 DATAPOLICY_CONTACT_FOURNISSEUR = Доставчик
 DATAPOLICY_ADHERENT = Член
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Можете да изпратите имейл за GDPR до всички ваши съответни контакти (които все още не са получили имейл и за които не сте регистрирали нищо относно тяхното споразумение за GDPR). За да направите това, използвайте следния бутон.
 SendAgreement = Изпращайте имейли
 AllAgreementSend = Всички имейли са изпратени
 TXTLINKDATAPOLICYACCEPT = Текст за връзката "договор"
 TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: Обработка на лични данни
 DATAPOLICY_consentement = Получено съгласие за обработка на лични данни
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 1fd3e7b56e8..372619ea180 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Неуспешно създаване на директория. Уверете се, че уеб сървър потребител има разрешение да пишат в Dolibarr документи. Ако параметър <b>safe_mode</b> е разрешен в тази PHP, проверете дали Dolibarr PHP файлове притежава за потребителя на уеб сървъра (или група).
 ErrorNoMailDefinedForThisUser=Няма дефиниран имейл за този потребител
 ErrorSetupOfEmailsNotComplete=Настройката на имейлите не е завършена
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Тази функция се нуждае от активиране на JavaScript, за да работи. Променете това в настройка - дисплей.
 ErrorTopMenuMustHaveAParentWithId0=Меню от тип 'Горно' не може да има главно меню. Поставете 0 за главно меню или изберете меню от тип 'Ляво'.
 ErrorLeftMenuMustHaveAParentId=Менюто на &quot;левицата&quot; тип трябва да имат родителски идентификатор.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Качи блокиран от PHP / Apache плъги
 ErrorFileSizeTooLarge=Размерът на файла е твърде голям или файлът не е предоставен.
 ErrorFieldTooLong=Полето %s е твърде дълго
 ErrorSizeTooLongForIntType=Размер твърде дълго за Вътрешна (%s цифри максимум)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Размер твърде дълго за низ тип (%s символа максимум)
 ErrorNoValueForSelectType=Моля попълнете стойност за списък избиране
 ErrorNoValueForCheckBoxType=Моля попълнете стойност за списък отметки
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Неправилен защитен код. Опитайт
 ErrorBothFieldCantBeNegative=Полетата %s и %s не може да бъде едновременно отрицателен
 ErrorFieldCantBeNegativeOnInvoice=Полето <strong>%s</strong> не може да бъде отрицателно за този тип фактура. Ако трябва да добавите ред за отстъпка, просто първо създайте отстъпката (от полето „%s“ в контрагент карта) и приложете го към фактурата.
 ErrorLinesCantBeNegativeForOneVATRate=Общата сума на редовете (без данъка) не може да бъде отрицателна за дадена ненулева ставка на ДДС (Намерена е отрицателна обща сума за ставка на ДДС <b>%s </b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Редовете не могат да бъдат отрицателни при депозит. Ще се сблъскате с проблеми, когато включите депозита в окончателната фактура.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Количество за ред в клиентска фактура не може да бъде отрицателно
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Потребителски акаунт <b>%s</b> използват за извършване на уеб сървър не разполага с разрешение за това
 ErrorNoActivatedBarcode=Няма активиран тип баркод
 ErrUnzipFails=Неуспех да разархивирате %s с ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Вашата стойност на PHP параметър upload_max_filesize (%s) е по-голяма от стойността на PHP параметър post_max_size (%s). Това не е последователна настройка.
 WarningPasswordSetWithNoAccount=За този член бе зададена парола. Въпреки това, не е създаден потребителски акаунт. Така че тази парола е съхранена, но не може да се използва за влизане в Dolibarr. Може да се използва от външен модул/интерфейс, но ако не е необходимо да дефинирате потребителско име или парола за член може да деактивирате опцията "Управление на вход за всеки член" от настройката на модула Членове. Ако трябва да управлявате вход, но не се нуждаете от парола, можете да запазите това поле празно, за да избегнете това предупреждение. Забележка: Имейлът може да се използва и като вход, ако членът е свързан с потребител.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = Фактурата SwissQR може да се добавя само към фактури, настроени да се плащат с плащания с кредитен превод.
 SwissQrCreditorAddressInvalid = Адресът на кредитора е невалиден (пощенски код и град зададени ли са? (%s)
 SwissQrCreditorInformationInvalid = Информацията за кредитора е невалидна за IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/bg_BG/exports.lang b/htdocs/langs/bg_BG/exports.lang
index 1992b169c59..0a4f1571e18 100644
--- a/htdocs/langs/bg_BG/exports.lang
+++ b/htdocs/langs/bg_BG/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Име на ред
 LineDescription=Описание на ред
 LineUnitPrice=Единична цена на ред
 LineVATRate=ДДС ставка на ред
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Количество за ред
 LineTotalHT=Сума без данък за ред
 LineTotalTTC=Сума с данък за ред
 LineTotalVAT=Размер на ДДС за ред
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Тип ред (0 = продукт, 1 = услуга)
 FileWithDataToImport=Файл с данни за импортиране
 FileToImport=Входен файл за импортиране
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=Изберете формата на файла, ко
 ChooseFileToImport=Прикачете файл, след това кликнете върху иконата %s, за да изберете файла като източник при импортиране...
 SourceFileFormat=Формат на входния файл
 FieldsInSourceFile=Полета във входния файл
-FieldsInTargetDatabase=Целеви полета в базата данни на Dolibarr (удебелен шрифт = задължително)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Няма полета
 MoveField=Преместете номер на колоната на полето %s
 ExampleOfImportFile=Пример_с_файл_за_импортиране
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Проверете дали файловият форм
 RunSimulateImportFile=Стартиране на симулация за импортиране
 FieldNeedSource=Това поле изисква данни от файла източник
 SomeMandatoryFieldHaveNoSource=Някои задължителни полета нямат данни във входния файл
-InformationOnSourceFile=Информация за входния файл
-InformationOnTargetTables=Информация за целевите полета
+InformationOnSourceFile=Изходен файл
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Изберете поне едно начално поле от колоните с полета, за да експортирате
 SelectFormat=Изберете този формат на файл за импортиране
 RunImportFile=Импортиране на данни
diff --git a/htdocs/langs/bg_BG/hrm.lang b/htdocs/langs/bg_BG/hrm.lang
index d5158348687..4362d668113 100644
--- a/htdocs/langs/bg_BG/hrm.lang
+++ b/htdocs/langs/bg_BG/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=Необходим ранг за длъжностния профил
-RequiredRankShort=Задължителен ранг
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Позиции с този профил на работа
-EmployeeRank=Служител ранг за това умение
-EmployeeRankShort=Служител ранг
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Служител позиция
 EmployeePositions=Служител позиции
 EmployeesInThisPosition=Служители на тази позиция
@@ -72,6 +72,9 @@ AddSkill=Добавете умения към работния профил
 RequiredSkills=Необходими умения за този профил на работа
 UserRank=Потребителски ранг
 SkillList=Списък с умения
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Запазване на ранга
 TypeKnowHow=Знаеш как
 TypeHowToBe=Как да бъде
@@ -95,3 +98,5 @@ NeedBusinessTravels=Имате нужда от бизнес пътувания
 NoDescription=Не Описание
 TheJobProfileHasNoSkillsDefinedFixBefore=В оценения профил на длъжността на този Служител няма определени умения. Моля, добавете умение(я), след това изтрийте и рестартирайте оценката.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index ee594183ccd..8bce0126c29 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Масови имейли
 EMailing=Масови имейли
-EMailings=Масови имейли
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=Всички масови имейли
+AllEMailings=All mass eMails
 MailCard=Карта
 MailRecipients=Получатели
 MailRecipient=Получател
@@ -26,19 +26,19 @@ MailFile=Прикачени файлове
 MailMessage=Тяло на имейла
 SubjectNotIn=Не е в тема
 BodyNotIn=Не е в съобщение
-ShowEMailing=Показване на масови имейли
-ListOfEMailings=Списък на масови имейли
-NewMailing=Нов масов имейл
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=Променяне на масов имейл
-ResetMailing=Повторно изпращане на масов имейл
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Изтриване на масов имейл
-PreviewMailing=Преглед на масови имейли
-CreateMailing=Създаване на масов имейл
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Тест
-ValidMailing=Валидиране на масов имейл
+ValidMailing=Valid mass Email
 MailingStatusDraft=Чернова
 MailingStatusValidated=Валидиран
 MailingStatusSent=Изпратен
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Всички филтри трябва да съвпа
 LineInFile=Ред %s във файл
 RecipientSelectionModules=Възможни начини за избор на получател
 MailSelectedRecipients=Избрани получатели
-MailingArea=Секция с масови имейли
-LastMailings=Масови имейли: %s последни
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Целева статистика
 NbOfCompaniesContacts=Уникални контакти / адреси
 MailNoChangePossible=Получателите на валидирани масови имейли не могат да бъдат променяни
-SearchAMailing=Търсене на масов имейл
-SendMailing=Изпращане на масов имейл
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Изпратен от
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Изпращането на масов имейл може да се извърши от командния ред. Помолете администратора на сървъра да стартира следната команда, за да изпрати масовия имейл до всички получатели:
 MailingNeedCommand2=Все пак може да ги изпратите онлайн, като добавите параметър MAILING_LIMIT_SENDBYWEB със стойност за максималния брой имейли, които искате да изпратите за сесия. За тази цел, отидете в Начало - Настройка - Други настройки.
 ConfirmSendingEmailing=Ако искате да изпратите масов имейл директно от този екран, моля, потвърдете, че сте сигурни, че искате да изпратите масов имейл сега от браузъра си?
-LimitSendingEmailing=Забележка: Изпращането на масов имейл от уеб интерфейса се извършва на няколко пъти, поради причини свързани с сигурността и времето за изчакване, <b>%s</b> получатели по време на всяка сесия за изпращане.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Изчисти списъка
 ToClearAllRecipientsClickHere=Кликнете тук, за да изчистите списъка с получатели за това изпращане по масов имейл
 ToAddRecipientsChooseHere=Добавете получатели, като изберете от списъците
-NbOfEMailingsReceived=Брой получени масови имейли
-NbOfEMailingsSend=Брой изпратени масови имейли
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID запис
 DeliveryReceipt=Потвърждаване на доставка
 YouCanUseCommaSeparatorForSeveralRecipients=Може да използвате разделител <b>запетая</b>, за да укажете няколко получатели.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Не е планиран автоматичен име
 ANotificationsWillBeSent=1 автоматичен Известие ще бъде изпратен по имейл
 SomeNotificationsWillBeSent=%s автоматично Известия ще бъде изпратено по имейл
 AddNewNotification=Абонирайте се за нов автоматичен имейл Известие (цел/събитие)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Конфигурацията за изпращане на имейл е настроена на '%s'. Този режим не може да се използва за изпращане на масови имейли.
 MailSendSetupIs2=Трябва първо да отидете с администраторски акаунт в меню %sНачало - Настройка - Имейли%s и да промените параметър <strong>'%s'</strong>, за да използвате режим '%s'. С този режим може да въведете настройки за SMTP сървъра, предоставен от вашия доставчик на интернет услуги и да използвате функцията за изпращане на масови имейли.
 MailSendSetupIs3=Ако имате някакви въпроси как да настроите вашия SMTP сървър, може да се обърнете към %s.
@@ -183,7 +185,7 @@ Information=Информация
 ContactsWithThirdpartyFilter=Контакти с филтър за контрагент
 Unanswered=Без отговор
 Answered=Отговорен
-IsNotAnAnswer=Не отговаря (първоначален имейл)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Това е отговор на първоначален имейл
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Стойност по подразбиране за полето „%s“ при създаване на нов контакт
@@ -199,6 +201,6 @@ ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index e79aa6ece6e..2992db3113c 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -37,6 +37,7 @@ Translation=Превод
 Translations=Преводи
 CurrentTimeZone=Времева зона на PHP (сървър)
 EmptySearchString=Въведете непразни критерии за търсене
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Въведете Дата критерии
 NoRecordFound=Няма намерен запис
 NoRecordDeleted=Няма изтрит запис
@@ -45,6 +46,7 @@ NoError=Няма грешка
 Error=Грешка
 Errors=Грешки
 ErrorFieldRequired=Поле '%s' е задължително
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Поле '%s' има грешна стойност
 ErrorFileDoesNotExists=Файл '%s' не съществува
 ErrorFailedToOpenFile=Неуспешно отваряне на файл '%s'
@@ -308,6 +310,7 @@ DateBuild=Дата на съставяне на отчета
 DatePayment=Дата на плащане
 DateApprove=Дата на одобрение
 DateApprove2=Дата на одобрение (второ одобрение)
+PendingSince=Pending since
 RegistrationDate=Дата на регистрация
 UserCreation=Създаващ потребител
 UserModification=Променящ потребител
@@ -495,7 +498,7 @@ ActionRunningNotStarted=За започване
 ActionRunningShort=В процес
 ActionDoneShort=Завършено
 ActionUncomplete=Незавършено
-LatestLinkedEvents=Свързани събития: %s последни
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Фирма / Организация
 Accountant=Счетоводител
 ContactsForCompany=Контакти за този контрагент
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=Текст на имейла
 SendAcknowledgementByMail=Изпращане на имейл потвърждение
 SendMail=Изпращане на имейл
 Email=Имейл
+EMail=Имейл
+EMails=Имейли
 NoEMail=Няма имейл
 AlreadyRead=Вече е прочетено
 NotRead=Непрочетен
@@ -744,7 +749,7 @@ ValidatedRecordWhereFound = Някои от избраните записи ве
 AutomaticCode=Автоматичен код
 FeatureDisabled=Функцията е изключена
 MoveBox=Преместване на джаджа
-Offered=100%
+Offered=100%%
 NotEnoughPermissions=Вие нямате разрешение за това действие
 UserNotInHierachy=Това действие е запазено за надзорните органи на този потребител
 SessionName=Име на сесия
@@ -793,7 +798,7 @@ Notes=Бележки
 AddNewLine=Добавяне на нов ред
 AddFile=Добавяне на файл
 FreeZone=Продукт със свободен текст
-FreeLineOfType=Елемент със свободен текст, тип:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Клониране на обекта с неговите основни атрибути
 ReGeneratePDF=Повторно генериране на PDF
 PDFMerge=Обединяване на PDF файлове
@@ -879,12 +884,14 @@ toward=към
 Access=Достъп
 SelectAction=Избиране на действие
 SelectTargetUser=Изберете целеви потребител / служител
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Използвайте Ctrl + C, за да копирате в клипборда
 SaveUploadedFileWithMask=Съхраняване на файла с име '<strong>%s</strong>' (иначе '%s')
 OriginFileName=Оригинално име на файл
 SetDemandReason=Определете източник
 SetBankAccount=Дефиниране на банкова сметка
 AccountCurrency=Валута на сметката
+AccountancyCode=Счетоводен код
 ViewPrivateNote=Преглед на бележки
 XMoreLines=%s ред(а) е(са) скрит(и)
 ShowMoreLines=Показване на повече / по-малко редове
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Сигурни ли сте, че искате да 
 ConfirmMassClone=Потвърждение за групово клониране
 ConfirmMassCloneQuestion=Изберете проект, към който да клонирате
 ConfirmMassCloneToOneProject=Клониране към проект %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Свързани обекти
 ClassifyBilled=Класифицирайте таксувани
 ClassifyUnbilled=Класифицирайте нефактурирани
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Трябва да сте влезли и се нужда
 Download=Изтегляне
 DownloadDocument=Изтегляне на документ
 DownloadSignedDocument=Изтегляне на подписан документ
-ActualizeCurrency=Актуализиране на валутния курс
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Фискална година
 ModuleBuilder=Дизайнер за модули и приложения
 SetMultiCurrencyCode=Определяне на валута
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Масови действия
 ClickToShowHelp=Кликнете, за да покажете помощната подсказка
 WebSite=Уебсайт
@@ -1104,6 +1113,7 @@ PayedBy=Платено от
 PayedTo=Платено на
 Monthly=Месечно
 Quarterly=Тримесечно
+Quarter=Quarter
 Annual=Годишно
 Local=Локално
 Remote=Отдалечено
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Задача
 ContactDefault_propal=Офериране
 ContactDefault_supplier_proposal=Запитване за доставка
 ContactDefault_ticket=Тикет
+ContactDefault_societe=Контрагент
 ContactAddedAutomatically=Добавен е контакт от контрагент роли за контакт
 More=Повече
 ShowDetails=Показване на детайли
@@ -1242,6 +1253,7 @@ CommercialAffected=Назначен търговски представител
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=Съобщение
+Emailing=Emailing
 Progression=Прогрес
 YourMessage=Твоето съобщение
 YourMessageHasBeenReceived=Вашето съобщение е получено. Ние ще отговорим или ще се свържем с вас възможно най-скоро.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=От начало
+Transferred=Transferred
diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
index c9ed5590d60..25daf8347fe 100644
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Ако се изисква абонамент, абон
 DeleteType=Изтриване
 VoteAllowed=Може да гласува
 Physical=Индивидуален
-Moral=корпорация
-MorAndPhy=Корпорация и физическо лице
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Активирайте отново
 ExcludeMember=Изключване на член
 Exclude=Изключете
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Статистика за членове по реги
 NbOfMembers=Общ брой членове
 NbOfActiveMembers=Общ брой текущи активни членове
 NoValidatedMemberYet=Не са намерени валидирани членове
-MembersByCountryDesc=Този екран ви показва статистиката на членовете по държави. Графиките и диаграмите зависят от наличността на услугата за онлайн графики на Google, както и от наличието на работеща интернет връзка.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Този екран ви показва статистика на членовете по щат/провинция/кантон.
 MembersByTownDesc=Този екран ви показва статистика на членовете по градове.
 MembersByNature=Този екран ви показва статистика на членовете по природа.
@@ -208,25 +209,25 @@ NewMemberbyWeb=Добавен е нов член. Очаква одобрени
 NewMemberForm=Формуляр за нов член
 SubscriptionsStatistics=Статистика на вноските
 NbOfSubscriptions=Брой вноски
-AmountOfSubscriptions=Събрана сума от вноски
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=Оборот (за фирма) или бюджет (за организация)
-DefaultAmount=Размер на вноската по подразбиране (използва се само ако не е дефинирана сума на ниво тип член)
-MinimumAmount=Минимална сума (използва се само когато сумата на вноската е безплатна)
-CanEditAmount=Размерът на абонамента може да бъде определен от члена
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=Посетителят може да избере/редактира сумата на своята вноска независимо от вида член
 AmountIsLowerToMinimumNotice=Сумата е по-ниска от минималната %s
 MEMBER_NEWFORM_PAYONLINE=След онлайн регистрацията превключете автоматично към онлайн страницата плащане
 ByProperties=По произход
 MembersStatisticsByProperties=Статистика за членове по произход
-VATToUseForSubscriptions=Ставка на ДДС, която да се използва за вноски
-NoVatOnSubscription=Без ДДС за вноски
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Продукт, използван за ред за дарение във фактурата: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=Име или фирма
 SubscriptionRecorded=Приносът е записан
 NoEmailSentToMember=Няма изпратен имейл до член
 EmailSentToMember=Имейл, изпратен до член на %s
-SendReminderForExpiredSubscriptionTitle=Изпратете напомняне по имейл за изтекли вноски
-SendReminderForExpiredSubscription=Изпращайте напомняне по имейл до членовете, когато приносът е на път да изтече (параметърът е броят дни преди края на членството за изпращане на напомнянето. Може да бъде списък с дни, разделени с точка и запетая, например '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Членството е платено за текущия период (до %s)
 YouMayFindYourInvoiceInThisEmail=Може да откриете вашата фактура, прикачена към този имейл.
 XMembersClosed=%s член(а) е(са) приключен(и)
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Трета страна е юридическото
 MemberFirstname=Първо име на член
 MemberLastname=Фамилия на член
 MemberCodeDesc=Членски код, уникален за всички членове
-MemberSubscriptionStartFirstDayOf=Началото Дата на членство съответства на първия ден от
-MemberSubscriptionStartAfter=Минимален период преди влизането в сила на началото Дата на абонамент с изключение на подновяванията (пример +3m = +3 месеца, -5d = -5 дни, +1Y = +1 година )
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index c684f7b723e..580bd0d51bf 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -97,7 +97,6 @@ ShowService=Показване на услуга
 ProductsAndServicesArea=Секция с продукти и услуги
 ProductsArea=Секция с продукти
 ServicesArea=Секция с услуги
-ListOfStockMovements=Списък с движения на наличности
 BuyingPrice=Покупна цена
 PriceForEachProduct=Продукти със специфични цени
 SupplierCard=Карта
@@ -145,6 +144,7 @@ WithoutDiscount=Без отстъпка
 VATRateForSupplierProduct=Tax Rate (for this vendor/product)
 DiscountQtyMin=Отстъпка за това количество
 NoPriceDefinedForThisSupplier=Няма дефинирана цена / количество за този доставчик / продукт
+NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
 NoSupplierPriceDefinedForThisProduct=Няма дефинирана цена / количество за този продукт
 PredefinedItem=Предварително дефиниран елемент
 PredefinedProducts=Predefined Product
@@ -171,7 +171,7 @@ BuyingPrices=Покупни цени
 CustomerPrices=Клиентски цени
 SuppliersPrices=Доставни цени
 SuppliersPricesOfProductsOrServices=Доставни цени (на продукти / услуги)
-CustomCode=Митнически|Стока|ХС код
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Страна на произход
 RegionStateOrigin=Регион на произход
 StateOrigin=Държава|Провинция на произход
@@ -209,6 +209,7 @@ unitL=Литър
 unitT=тон
 unitKG=кг
 unitG=Грам
+unitGAL=галон
 unitMG=мг
 unitLB=паунд
 unitOZ=унция
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Формат на запитването {"URL"
 UpdateInterval=Интервал на актуализиране (минути)
 LastUpdated=Последна актуализация
 CorrectlyUpdated=Правилно актуализирано
-PropalMergePdfProductActualFile=Файловете използвани за добавяне в PDF Azur са
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=Избиране на PDF файлове
 IncludingProductWithTag=Включително продукти/услуги с етикета
 DefaultPriceRealPriceMayDependOnCustomer=Цена по подразбиране, реалната цена може да зависи от клиента
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=Количеството за реда е преи
 
 #Attributes
 Attributes=Атрибути
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Атрибути на вариант
 ProductAttributes=Атрибути на вариант за продукти
 ProductAttributeName=Атрибут на вариант %s
@@ -395,6 +400,8 @@ ErrorDestinationProductNotFound=Търсеният продукт не е нам
 ErrorProductCombinationNotFound=Няма намерен вариант на продукта
 ActionAvailableOnVariantProductOnly=Действието е достъпно само за варианта на продукта
 ProductsPricePerCustomer=Цени на продукта в зависимост от клиента
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Допълнителни атрибути (цени на доставчици)
 DeleteLinkedProduct=Изтриване на подпродукт, свързан с комбинацията
 AmountUsedToUpdateWAP=Единична сума, която да се използва за актуализиране на среднопретеглената цена
@@ -403,7 +410,8 @@ PMPValueShort=СИЦ
 mandatoryperiod=Задължителни периоди
 mandatoryPeriodNeedTobeSet=Забележка: Периодът (начало и край Дата) трябва да бъде дефиниран
 mandatoryPeriodNeedTobeSetMsgValidate=Една услуга изисква начален и краен период
-mandatoryHelper=Поставете отметка, ако искате съобщение до потребителя при създаване/потвърждаване на фактура, Търговска оферта, поръчка за продажба без въвеждане на начало и край Дата по линии с тази услуга.<br>Имайте предвид, че съобщението е предупреждение, а не блокираща грешка.
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
+mandatoryHelper2=Note that the message is a warning and not a blocking error.
 DefaultBOM=Спецификация по подразбиране
 DefaultBOMDesc=Спецификацията по подразбиране, която се препоръчва да се използва за производството на този продукт. Това поле може да се зададе само ако естеството на продукта е „%s“.
 Rank=Ранг
@@ -435,3 +443,6 @@ AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtu
 ConfirmSetToDraftInventory=Сигурни ли сте, че искате, за да се върнете към състояние на чернова?<br>Количествата, зададени в момента в инвентара, ще бъдат нулирани.
 WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned
 PriceLabel=Price label
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/bg_BG/salaries.lang b/htdocs/langs/bg_BG/salaries.lang
index 18198344094..56820f279e6 100644
--- a/htdocs/langs/bg_BG/salaries.lang
+++ b/htdocs/langs/bg_BG/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Нова заплата
 AddSalary=Добавете заплата
 NewSalaryPayment=Нова карта за заплата
 AddSalaryPayment=Добавяне на плащане на заплата
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Плащане на заплата
 SalariesPayments=Плащания на заплати
 SalariesPaymentsOf=Плащания на заплати на %s
@@ -27,7 +29,7 @@ FillFieldFirst=Първо попълнете полето Служител
 UpdateAmountWithLastSalary=Определете размера на последната заплата
 MakeTransferRequest=Направете превод Искане
 VirementOrder=Кредитен превод Искане
-BankTransferAmount=Сума на кредитния превод
 WithdrawalReceipt=Нареждане за кредитен превод
 OrderWaiting=Чакаща поръчка
 FillEndOfMonth=Попълнете с края на месеца
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
index 4ec010e8350..740b1e93b6f 100644
--- a/htdocs/langs/bg_BG/website.lang
+++ b/htdocs/langs/bg_BG/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Използвайте списъка тук с други
 WEBSITE_CSS_URL=URL адрес на външен CSS файл
 WEBSITE_CSS_INLINE=Съдържание на CSS файл (общо за всички страници)
 WEBSITE_JS_INLINE=Съдържание на JavaScript файл (общо за всички страници)
-WEBSITE_HTML_HEADER=Добавка в долната част на HTML заглавието (обща за всички страници)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Съдържание на robots файл (robots.txt)
 WEBSITE_HTACCESS=Съдържание на .htaccess файл
 WEBSITE_MANIFEST_JSON=Съдържание на manifest.json файл
@@ -56,16 +56,17 @@ ReadPerm=Четене
 WritePerm=Писане
 TestDeployOnWeb=Тестване / внедряване в интернет
 PreviewSiteServedByWebServer=<u>Преглеждане на %s в нов раздел.</u> <br><br> %s ще се обслужва от външен уеб сървър (като Apache, Nginx, IIS). Трябва да инсталирате и настроите този сървър, преди да посочите директория: <br> <strong>%s</strong> <br> URL адрес, обслужван от външен сървър: <br> <strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Визуализирайте %s в нов раздел.</u><br><br>%s ще се обслужва от сървър на Dolibarr, така че не се нуждае от допълнителен уеб сървър (като Apache, Nginx, IIS), които трябва да бъдат инсталирани.<br>Неудобното е, че URL адресите на страниците не са удобни за потребителя и започват с пътя на вашия Dolibarr.<br>URL адрес, обслужван от Dolibarr:<br><strong>%s</strong><br><br>За да използвате собствен външен уеб сървър за обслужвайте този уеб сайт, създайте виртуален хост на вашия уеб сървър, който сочи към директория<br><strong>%s</strong><br>след това въведете името на този виртуален сървър в свойствата на този уебсайт и щракнете върху връзка „Тестване/внедряване в мрежата“.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL адресът на виртуалния хост, обслужван от външен уеб сървър, не е дефиниран.
 NoPageYet=Все още няма страници
 YouCanCreatePageOrImportTemplate=Може да създадете нова страница или да импортирате пълен шаблон на уебсайт
 SyntaxHelp=Помощ с конкретни съвети за синтаксиса
 YouCanEditHtmlSourceckeditor=Може да редактирате изходния HTML код с помощта на бутона 'Код' в редактора.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=За изображение, споделено с връзка за споделяне (отворен достъп чрез хеш ключа за споделяне на файла), синтаксисът е:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong> <br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Още примери за HTML или динамичен код са налични в <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">документацията на wiki</a>.<br>
 ClonePage=Клониране на страница / контейнер
 CloneSite=Клониране на сайт
@@ -87,15 +88,15 @@ WebsiteAccount=Уебсайт профил
 WebsiteAccounts=Уебсайт профили
 AddWebsiteAccount=Създаване на уебсайт профил
 BackToListForThirdParty=Назад към списъка за контрагенти
-DisableSiteFirst=Първо деактивирайте уебсайта
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Заглавието на моя уебсайт
 AnotherContainer=Ето как да включите съдържание от друга страница / контейнер (тук може да получите грешка, ако активирате динамичен код, защото вграденият подконтейнер може да не съществува).
 SorryWebsiteIsCurrentlyOffLine=За съжаление този уебсайт в момента не е наличен. Моля, върнете се по-късно ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Активиране на таблица с уебсайт профили
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Активирайте таблица, която да съхранява уебсайт профили (потребителски имена / пароли) за всеки уебсайт / контрагент
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Първо трябва да дефинирате началната страница по подразбиране
-OnlyEditionOfSourceForGrabbedContentFuture=Предупреждение: Създаването на уеб страница чрез импортиране на външна уеб страница е запазено за опитни потребители. В зависимост от сложността на изходната страница, резултатът от импортирането може да се различава от оригинала. Освен това, ако изходната страница използва общи CSS стилове или конфликтен JavaScript, това може да наруши външния вид или функциите на редактора на уебсайта, когато работите на тази страница. Този метод е по-бърз начин за създаване на страница, но се препоръчва да създадете новата си страница от нулата или от предложен шаблон за страница.<br>Имайте предвид също, че вграденият редактор може да не работи коректност, когато се използва на взета външна страница.
-OnlyEditionOfSourceForGrabbedContent=Когато съдържанието е прихванато от външен сайт е възможно само издание с изходен HTML код.
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Прихващане на изображения открити в CSS и страница.
 ImagesShouldBeSavedInto=Изображенията трябва да бъдат записани в директория
 WebsiteRootOfImages=Основна директория за уебсайт изображения
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Премахване на филтър
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Категории
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index ad97ae6660b..cf0bbc8ca03 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=ফাইলের অখণ্ডতা প
 FileIntegritySomeFilesWereRemovedOrModified=ফাইল অখণ্ডতা পরীক্ষা ব্যর্থ হয়েছে. কিছু ফাইল পরিবর্তিত, সরানো বা যোগ করা হয়েছে।
 GlobalChecksum=গ্লোবাল চেকসাম
 MakeIntegrityAnalysisFrom=থেকে অ্যাপ্লিকেশন ফাইলের অখণ্ডতা বিশ্লেষণ করুন
-LocalSignature=এম্বেড করা স্থানীয় স্বাক্ষর (কম নির্ভরযোগ্য)
-RemoteSignature=দূরবর্তী দূরবর্তী স্বাক্ষর (আরো নির্ভরযোগ্য)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=অনুপস্থিত ফাইল
 FilesUpdated=আপডেট করা ফাইল
 FilesModified=পরিবর্তিত ফাইল
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=শুধুমাত্র কিছু এজেন্
 Security=নিরাপত্তা
 Passwords=পাসওয়ার্ড
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=conf.php এ সংরক্ষিত ডাটাবেস পাসওয়ার্ড এনক্রিপ্ট করুন। এই বিকল্পটি সক্রিয় করার জন্য দৃঢ়ভাবে সুপারিশ করা হয়।
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=উত্পন্ন পিডিএফ ফাইল সুরক্ষিত. এটি বাঞ্ছনীয় নয় কারণ এটি বাল্ক পিডিএফ তৈরি করে।
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=গণনা করা ক্ষেত্র
-ComputedFormulaDesc=ডায়নামিক কম্পিউটেড মান পেতে আপনি এখানে বস্তুর অন্যান্য বৈশিষ্ট্য বা যেকোনো পিএইচপি কোডিং ব্যবহার করে একটি সূত্র লিখতে পারেন। আপনি "?" সহ যেকোনো পিএইচপি সামঞ্জস্যপূর্ণ সূত্র ব্যবহার করতে পারেন। কন্ডিশন অপারেটর, এবং নিম্নলিখিত গ্লোবাল অবজেক্ট: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong> >।<br><strong>সতর্কতা</strong>: আপনার যদি কোনো বস্তুর বৈশিষ্ট্যের প্রয়োজন হয় লোড করা হয়নি, দ্বিতীয় উদাহরণের মত আপনার সূত্রে বস্তুটিকে নিয়ে আসুন।<br>একটি গণনা করা ক্ষেত্র ব্যবহার করার অর্থ হল আপনি ইন্টারফেস থেকে নিজেকে কোনো মান লিখতে পারবেন না। এছাড়াও, যদি একটি সিনট্যাক্স ত্রুটি থাকে তবে সূত্রটি কিছুই ফেরত দিতে পারে না।<br><br>সূত্রের উদাহরণ:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>অবজেক্ট পুনরায় লোড করার উদাহরণ<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldreloadedkey'*-j >capital / 5: '-1')<br><br>অবজেক্ট এবং এর মূল বস্তুকে জোর করে লোড করার জন্য সূত্রের অন্য উদাহরণ: <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = নতুন প্রকল্প( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0))? $secondloadedobj->রেফ: 'প্যারেন্ট প্রজেক্ট পাওয়া যায়নি'
+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'
 Computedpersistent=কম্পিউটেড ফিল্ড স্টোর করুন
 ComputedpersistentDesc=গণনা করা অতিরিক্ত ক্ষেত্রগুলি ডাটাবেসে সংরক্ষণ করা হবে, তবে, এই ক্ষেত্রের অবজেক্টটি পরিবর্তিত হলেই মানটি পুনরায় গণনা করা হবে। যদি গণনা করা ক্ষেত্রটি অন্যান্য অবজেক্ট বা গ্লোবাল ডেটার উপর নির্ভর করে তবে এই মানটি ভুল হতে পারে!!
 ExtrafieldParamHelpPassword=এই ক্ষেত্রটি ফাঁকা রাখার অর্থ হল এই মানটি এনক্রিপশন ছাড়াই সংরক্ষণ করা হবে (ক্ষেত্রটি স্ক্রিনে তারা দিয়ে লুকানো আছে)।<br><br>এন্টার করুন একটি বিপরীত এনক্রিপশন অ্যালগরিদমের সাথে মান এনকোড করতে মান 'ডলক্রিপ্ট'। পরিষ্কার ডেটা এখনও জানা এবং সম্পাদনা করা যেতে পারে তবে ডেটাবেসে এনক্রিপ্ট করা হয়৷<br><br>'অটো' (বা 'md5' লিখুন, 'sha256', 'password_hash', ...) ডিফল্ট পাসওয়ার্ড এনক্রিপশন অ্যালগরিদম ব্যবহার করতে (বা md5, sha256, password_hash...) ডাটাবেসে নন-রিভার্সিবল হ্যাশড পাসওয়ার্ড সংরক্ষণ করতে (মূল মান পুনরুদ্ধারের কোনো উপায় নেই)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- ইমেল পাঠানোর জন্য আপনার নিজস্ব ইমেল পরিষেবা প্রদানকারীর SMTP সার্ভার ব্যবহার করাও আকর্ষণীয় তাই অ্যাপ্লিকেশন থেকে পাঠানো সমস্ত ইমেলগুলি আপনার মেলবক্সের "প্রেরিত" ডিরেক্টরিতেও সংরক্ষিত হবে৷
 WarningPHPMailD=তাই ই-মেইল পাঠানোর পদ্ধতিকে "SMTP" মানতে পরিবর্তন করার পরামর্শ দেওয়া হচ্ছে।
 WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
-WarningPHPMail2=যদি আপনার ইমেল SMTP প্রদানকারীর ইমেল ক্লায়েন্টকে কিছু আইপি ঠিকানায় সীমাবদ্ধ করতে হয় (খুব বিরল), এটি আপনার ERP CRM অ্যাপ্লিকেশনের জন্য মেল ব্যবহারকারী এজেন্টের (MUA) IP ঠিকানা: <strong>%s</strong>।
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=অ্যাকাউন্টিং (সরলীকৃত)
 Module10Desc=ডাটাবেস বিষয়বস্তুর উপর ভিত্তি করে সহজ অ্যাকাউন্টিং রিপোর্ট (জার্নাল, টার্নওভার)। কোনো লেজার টেবিল ব্যবহার করে না।
 Module20Name=প্রস্তাব
 Module20Desc=বাণিজ্যিক প্রস্তাব ব্যবস্থাপনা
-Module22Name=গণ ইমেইলিং
-Module22Desc=বাল্ক ইমেল পরিচালনা করুন
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=শক্তি
 Module23Desc=শক্তি খরচ নিরীক্ষণ
 Module25Name=বিক্রয় আদেশ
@@ -847,10 +848,10 @@ Permission212=অর্ডার লাইন
 Permission213=লাইন সক্রিয় করুন
 Permission214=টেলিফোনি সেটআপ করুন
 Permission215=সেটআপ প্রদানকারী
-Permission221=ইমেলগুলি পড়ুন
-Permission222=ইমেলগুলি তৈরি/পরিবর্তন করুন (বিষয়, প্রাপক...)
-Permission223=ইমেলগুলি যাচাই করুন (প্রেরণের অনুমতি দেয়)
-Permission229=ইমেলগুলি মুছুন
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=প্রাপক এবং তথ্য দেখুন
 Permission238=ম্যানুয়ালি মেইলিং পাঠান
 Permission239=যাচাই বা পাঠানোর পরে মেইলিং মুছুন
@@ -1105,6 +1106,7 @@ DictionaryStaff=কর্মচারীর সংখ্যা
 DictionaryAvailability=দেরীতে বিলি
 DictionaryOrderMethods=অর্ডার পদ্ধতি
 DictionarySource=প্রস্তাব/আদেশের উত্স
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=প্রতিবেদনের জন্য ব্যক্তিগতকৃত গোষ্ঠী
 DictionaryAccountancysystem=অ্যাকাউন্টের চার্টের জন্য মডেল
 DictionaryAccountancyJournal=অ্যাকাউন্টিং জার্নাল
@@ -1134,11 +1136,11 @@ BackToDictionaryList=অভিধান তালিকায় ফিরে 
 TypeOfRevenueStamp=ট্যাক্স স্ট্যাম্পের প্রকার
 VATManagement=বিক্রয় কর ব্যবস্থাপনা
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=ডিফল্টরূপে প্রস্তাবিত বিক্রয় কর হল 0 যা সমিতি, ব্যক্তি বা ছোট কোম্পানির মতো ক্ষেত্রে ব্যবহার করা যেতে পারে।
 VATIsUsedExampleFR=ফ্রান্সে, এর অর্থ একটি বাস্তব আর্থিক ব্যবস্থা (সরলীকৃত বাস্তব বা স্বাভাবিক বাস্তব) রয়েছে এমন কোম্পানি বা সংস্থা। একটি সিস্টেম যেখানে ভ্যাট ঘোষণা করা হয়।
 VATIsNotUsedExampleFR=ফ্রান্সে, এর অর্থ হল অ-বিক্রয় কর ঘোষিত সংস্থা বা কোম্পানি, সংস্থা বা উদার পেশা যারা মাইক্রো এন্টারপ্রাইজ ফিসকাল সিস্টেম (ফ্রাঞ্চাইজে সেলস ট্যাক্স) বেছে নিয়েছে এবং কোনও সেলস ট্যাক্স ঘোষণা ছাড়াই একটি ফ্র্যাঞ্চাইজ সেলস ট্যাক্স প্রদান করেছে। এই পছন্দটি ইনভয়েসে "অপ্রযোজ্য বিক্রয় কর - CGI-এর আর্ট-293B" রেফারেন্স প্রদর্শন করবে।
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=বিক্রয় করের ধরন
 LTRate=হার
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=করের সেটআপ অনুযায়ী
 LabelUsedByDefault=কোডের জন্য কোন অনুবাদ পাওয়া না গেলে ডিফল্টরূপে লেবেল ব্যবহার করা হয়
 LabelOnDocuments=নথিতে লেবেল
 LabelOrTranslationKey=লেবেল বা অনুবাদ কী
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=কম্বো তালিকায় গ্রাহক/বি
 AddAdressInList=কম্বো তালিকায় গ্রাহক/বিক্রেতার ঠিকানা প্রদর্শন করুন৷<br>তৃতীয় পক্ষগুলি "The Big Company corp. - 21 jump street 123456 Big town - USA" এর নামের বিন্যাস সহ প্রদর্শিত হবে৷ বিগ কোম্পানি কর্পোরেশন"।
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=তৃতীয় পক্ষের জন্য পছন্দের শিপিং পদ্ধতির জন্য জিজ্ঞাসা করুন।
-FieldEdition=ক্ষেত্রের সংস্করণ %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=উদাহরণ: +2 (শুধুমাত্র টাইমজোন অফসেট সমস্যার সম্মুখীন হলেই পূরণ করুন)
 GetBarCode=বারকোড পান
 NumberingModules=নম্বরিং মডেল
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=বৈধকরণ তারিখে চালান তার
 SuggestedPaymentModesIfNotDefinedInInvoice=ইনভয়েসে সংজ্ঞায়িত না থাকলে ডিফল্টরূপে ইনভয়েসে প্রস্তাবিত পেমেন্ট মোড
 SuggestPaymentByRIBOnAccount=অ্যাকাউন্টে প্রত্যাহার করে অর্থ প্রদানের পরামর্শ দিন
 SuggestPaymentByChequeToAddress=চেকের মাধ্যমে অর্থ প্রদানের পরামর্শ দিন
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=চালান বিনামূল্যে পাঠ্য
 WatermarkOnDraftInvoices=খসড়া চালানে ওয়াটারমার্ক (খালি না থাকলে কিছুই নয়)
 PaymentsNumberingModule=পেমেন্ট নম্বরিং মডেল
@@ -1718,6 +1723,7 @@ CompressionOfResources=HTTP প্রতিক্রিয়াগুলির
 CompressionOfResourcesDesc=উদাহরণস্বরূপ Apache নির্দেশিকা ব্যবহার করে "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=বর্তমান ব্রাউজারগুলির সাথে এমন একটি স্বয়ংক্রিয় সনাক্তকরণ সম্ভব নয়
 DefaultValuesDesc=এখানে আপনি একটি নতুন রেকর্ড তৈরি করার সময় আপনি যে ডিফল্ট মান ব্যবহার করতে চান তা নির্ধারণ করতে পারেন, এবং/অথবা ডিফল্ট ফিল্টার বা বাছাই ক্রম যখন আপনি রেকর্ড তালিকাভুক্ত করেন।
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=ডিফল্ট মান (ফর্মে ব্যবহার করতে)
 DefaultSearchFilters=ডিফল্ট অনুসন্ধান ফিল্টার
 DefaultSortOrder=ডিফল্ট বাছাই আদেশ
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=নাম্বারিং মডিউল পাঠ
 SendingsAbility=গ্রাহক ডেলিভারি জন্য শিপিং শীট সমর্থন
 NoNeedForDeliveryReceipts=বেশিরভাগ ক্ষেত্রে, শিপিং শীটগুলি গ্রাহকের ডেলিভারির জন্য শীট (প্রেরনের জন্য পণ্যের তালিকা) এবং গ্রাহকের দ্বারা প্রাপ্ত এবং স্বাক্ষরিত শীট হিসাবে উভয়ই ব্যবহৃত হয়। তাই পণ্য সরবরাহের রসিদ একটি সদৃশ বৈশিষ্ট্য এবং খুব কমই সক্রিয় করা হয়।
 FreeLegalTextOnShippings=চালান বিনামূল্যে পাঠ্য
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=পণ্য বিতরণ রসিদ নম্বর মডিউল
 DeliveryOrderModel=পণ্য বিতরণ রসিদ মডেল
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=বিতরণ রসিদ বিনামূ
 ##### FCKeditor #####
 AdvancedEditor=উন্নত সম্পাদক
 ActivateFCKeditor=এর জন্য উন্নত সম্পাদক সক্রিয় করুন:
-FCKeditorForNotePublic=উপাদানগুলির "পাবলিক নোট" ক্ষেত্রের WYSIWYG সৃষ্টি/সংস্করণ
-FCKeditorForNotePrivate=উপাদানগুলির "ব্যক্তিগত নোট" ক্ষেত্রের WYSIWYG সৃষ্টি/সংস্করণ
-FCKeditorForCompany=উপাদানগুলির ক্ষেত্রের বর্ণনার WYSIWYG তৈরি/সংস্করণ (পণ্য/পরিষেবা ছাড়া)
-FCKeditorForProductDetails=পণ্যের বর্ণনার WYSIWYG তৈরি/সংস্করণ বা বস্তুর লাইন (প্রস্তাব, অর্ডার, চালান, ইত্যাদি...)।
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=সতর্কতা: এই ক্ষেত্রে এই বিকল্পটি ব্যবহার করা গুরুতরভাবে সুপারিশ করা হয় না কারণ এটি পিডিএফ ফাইল তৈরি করার সময় বিশেষ অক্ষর এবং পৃষ্ঠা বিন্যাসের সমস্যা তৈরি করতে পারে।
-FCKeditorForMailing= গণ ইমেলিংয়ের জন্য WYSIWYG তৈরি/সংস্করণ (সরঞ্জাম->ইমেলিং)
-FCKeditorForUserSignature=ব্যবহারকারীর স্বাক্ষরের WYSIWYG সৃষ্টি/সংস্করণ
-FCKeditorForMail=সমস্ত মেলের জন্য WYSIWYG তৈরি/সংস্করণ (সরঞ্জাম->ইমেলিং ব্যতীত)
-FCKeditorForTicket=টিকিটের জন্য WYSIWYG তৈরি/সংস্করণ
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=স্টক মডিউল সেটআপ
 IfYouUsePointOfSaleCheckModule=আপনি যদি ডিফল্ট বা একটি বাহ্যিক মডিউল দ্বারা সরবরাহিত পয়েন্ট অফ সেল মডিউল (POS) ব্যবহার করেন, তাহলে এই সেটআপটি আপনার POS মডিউল দ্বারা উপেক্ষা করা হতে পারে। বেশিরভাগ POS মডিউলগুলি ডিফল্টভাবে ডিজাইন করা হয়েছে অবিলম্বে একটি চালান তৈরি করতে এবং এখানে বিকল্পগুলি নির্বিশেষে স্টক হ্রাস করতে। তাই আপনার POS থেকে বিক্রয় নিবন্ধন করার সময় আপনার স্টক হ্রাসের প্রয়োজন বা না থাকলে, আপনার POS মডিউল সেটআপও পরীক্ষা করে দেখুন।
@@ -1867,7 +1874,6 @@ Buy=কেনা
 Sell=বিক্রয়
 InvoiceDateUsed=চালানের তারিখ ব্যবহার করা হয়েছে
 YourCompanyDoesNotUseVAT=আপনার কোম্পানিকে ভ্যাট ব্যবহার না করার জন্য সংজ্ঞায়িত করা হয়েছে (হোম - সেটআপ - কোম্পানি/সংস্থা), তাই সেটআপ করার জন্য কোনও ভ্যাট বিকল্প নেই৷
-AccountancyCode=অ্যাকাউন্টিং কোড
 AccountancyCodeSell=বিক্রয় হিসাব। কোড
 AccountancyCodeBuy=ক্রয় অ্যাকাউন্ট। কোড
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=একটি নতুন ট্যাক্স তৈরি করার সময় ডিফল্টরূপে "স্বয়ংক্রিয়ভাবে অর্থপ্রদান তৈরি করুন" চেকবক্সটি খালি রাখুন
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = মেনু এজেন্ডা নির্বাচ
 AGENDA_EVENT_PAST_COLOR = অতীত ঘটনার রঙ
 AGENDA_EVENT_CURRENT_COLOR = বর্তমান ইভেন্টের রঙ
 AGENDA_EVENT_FUTURE_COLOR = ভবিষ্যতের ইভেন্টের রঙ
-AGENDA_REMINDER_BROWSER = ইভেন্ট অনুস্মারক সক্ষম করুন <b>ব্যবহারকারীর ব্রাউজারে</b> (যখন স্মরণ করিয়ে দেওয়ার তারিখে পৌঁছে যায়, তখন ব্রাউজার দ্বারা একটি পপআপ দেখানো হয়। প্রতিটি ব্যবহারকারী করতে পারেন এর ব্রাউজার বিজ্ঞপ্তি সেটআপ থেকে এই ধরনের বিজ্ঞপ্তিগুলি অক্ষম করুন)।
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = শব্দ বিজ্ঞপ্তি সক্রিয় করুন
-AGENDA_REMINDER_EMAIL = ইভেন্ট অনুস্মারক সক্ষম করুন <b>ইমেল দ্বারা</b> (প্রতিটি ইভেন্টে অনুস্মারক বিকল্প/বিলম্ব সংজ্ঞায়িত করা যেতে পারে)।
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = দ্রষ্টব্য: নির্ধারিত কাজের ফ্রিকোয়েন্সি %s সঠিক মুহুর্তে অনুস্মারক পাঠানো হয়েছে তা নিশ্চিত করার জন্য যথেষ্ট হতে হবে।
 AGENDA_SHOW_LINKED_OBJECT = এজেন্ডা ভিউতে লিঙ্ক করা অবজেক্ট দেখান
 AGENDA_USE_EVENT_TYPE = ইভেন্টের ধরন ব্যবহার করুন (মেনু সেটআপে পরিচালিত -> অভিধান -> এজেন্ডা ইভেন্টের ধরন)
 AGENDA_USE_EVENT_TYPE_DEFAULT = ইভেন্ট তৈরি ফর্মে ইভেন্টের প্রকারের জন্য স্বয়ংক্রিয়ভাবে এই ডিফল্ট মান সেট করুন
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = রপ্তানি লিঙ্ক অনুমোদন করার কী
 PastDelayVCalExport=এর চেয়ে পুরানো ইভেন্ট রপ্তানি করবেন না
 SecurityKey = নিরাপত্তা কী
@@ -2006,7 +2017,7 @@ BackupZipWizard=নথির ডিরেক্টরির সংরক্ষ
 SomethingMakeInstallFromWebNotPossible=নিম্নলিখিত কারণে ওয়েব ইন্টারফেস থেকে বাহ্যিক মডিউল ইনস্টল করা সম্ভব নয়:
 SomethingMakeInstallFromWebNotPossible2=এই কারণে, এখানে বর্ণিত আপগ্রেড করার প্রক্রিয়াটি একটি ম্যানুয়াল প্রক্রিয়া শুধুমাত্র একজন বিশেষ সুবিধাপ্রাপ্ত ব্যবহারকারী সম্পাদন করতে পারেন।
 InstallModuleFromWebHasBeenDisabledContactUs=অ্যাপ্লিকেশন থেকে বাহ্যিক মডিউল বা গতিশীল ওয়েবসাইটগুলির ইনস্টল বা বিকাশ বর্তমানে নিরাপত্তার উদ্দেশ্যে লক করা আছে। আপনি যদি এই বৈশিষ্ট্যটি সক্ষম করতে চান তাহলে অনুগ্রহ করে আমাদের সাথে যোগাযোগ করুন৷
-InstallModuleFromWebHasBeenDisabledByFile=অ্যাপ্লিকেশন থেকে বহিরাগত মডিউল ইনস্টল আপনার প্রশাসক দ্বারা নিষ্ক্রিয় করা হয়েছে. এটির অনুমতি দেওয়ার জন্য আপনাকে অবশ্যই তাকে <strong>%s</strong> ফাইলটি সরাতে বলতে হবে বৈশিষ্ট্য
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=মাউস সরে গেলে টেবিল লাইন হাইলাইট করুন
 HighlightLinesColor=মাউস অতিক্রম করার সময় লাইনের রঙ হাইলাইট করুন (হাইলাইট না করার জন্য 'ffffff' ব্যবহার করুন)
@@ -2036,6 +2047,7 @@ Enter0or1=0 বা 1 লিখুন
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=এখানে ধনুর্বন্ধনীর মধ্যে লিখুন, বাইট নম্বরের তালিকা যা মুদ্রার প্রতীককে উপস্থাপন করে। উদাহরণস্বরূপ: $ এর জন্য, লিখুন [36] - ব্রাজিলের আসল R$ [82,36] - € এর জন্য, [8364] লিখুন
 ColorFormat=RGB রঙটি HEX ফর্ম্যাটে, যেমন: FF0000৷
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=বিন্যাসে আইকনের নাম:<br>- বর্তমান থিম ডিরেক্টরিতে একটি চিত্র ফাইলের জন্য image.png<br>- image.png@module যদি ফাইলটি একটি মডিউলের /img/ ডিরেক্টরিতে থাকে<br>- একটি FontAwesome fa-xxx ছবির জন্য fa-xxx<br>- একটি FontAwesome fa-xxx পিক্টোর জন্য fontawesome_xxx_fa_color_size (উপসর্গ, রঙ এবং আকার সেট সহ)
 PositionIntoComboList=কম্বো তালিকায় লাইনের অবস্থান
 SellTaxRate=বিক্রয় করের হার
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=প্রেরকের ঠিকানা ফ্রেমে সীমানা লুকান
 MAIN_PDF_NO_RECIPENT_FRAME=প্রাপকের ঠিকানা ফ্রেমে সীমানা লুকান
 MAIN_PDF_HIDE_CUSTOMER_CODE=গ্রাহক কোড লুকান
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=ঠিকানা ব্লকে প্রেরক/কোম্পানীর নাম লুকান
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=পেমেন্ট শর্ত লুকান
 PROPOSAL_PDF_HIDE_PAYMENTMODE=পেমেন্ট মোড লুকান
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=সুপারিশ করা হয় না
 ARestrictedPath=ডেটা ফাইলের জন্য কিছু সীমাবদ্ধ পথ
 CheckForModuleUpdate=বাহ্যিক মডিউল আপডেটের জন্য পরীক্ষা করুন
 CheckForModuleUpdateHelp=এই ক্রিয়াটি একটি নতুন সংস্করণ উপলব্ধ কিনা তা পরীক্ষা করতে বাহ্যিক মডিউলগুলির সম্পাদকদের সাথে সংযোগ করবে৷
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=একটি আপডেট উপলব্ধ
 NoExternalModuleWithUpdate=বাহ্যিক মডিউলগুলির জন্য কোন আপডেট পাওয়া যায়নি
 SwaggerDescriptionFile=Swagger API বর্ণনা ফাইল (উদাহরণস্বরূপ redoc এর সাথে ব্যবহারের জন্য)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=শিপিং ঠিকানা দেখান
 INVOICE_SHOW_SHIPPING_ADDRESSMore=কিছু দেশে বাধ্যতামূলক ইঙ্গিত (ফ্রান্স, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=সামাজিক নেটওয়ার্কের ইউআরএল লিঙ্ক। সামাজিক নেটওয়ার্ক আইডি ধারণ করে এমন পরিবর্তনশীল অংশের জন্য {socialid} ব্যবহার করুন।
 IfThisCategoryIsChildOfAnother=এই শ্রেনী যদি অন্য একজনের সন্তান হয়
 DarkThemeMode=গাঢ় থিম মোড
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=সতর্কতা: মড
 WarningModuleHasChangedSecurityCsrfParameter=সতর্কতা: মডিউল %s আপনার উদাহরণের CSRF নিরাপত্তা নিষ্ক্রিয় করেছে। এই ক্রিয়াটি সন্দেহজনক এবং আপনার ইনস্টলেশন আর সুরক্ষিত নাও হতে পারে৷ ব্যাখ্যার জন্য মডিউল লেখকের সাথে যোগাযোগ করুন.
 EMailsInGoingDesc=ইনকামিং ইমেলগুলি %s মডিউল দ্বারা পরিচালিত হয়৷ আপনি যদি ইনগোয়িং ইমেলগুলিকে সমর্থন করতে চান তবে আপনাকে অবশ্যই এটি সক্ষম এবং কনফিগার করতে হবে৷
 MAIN_IMAP_USE_PHPIMAP=নেটিভ PHP IMAP-এর পরিবর্তে IMAP-এর জন্য PHP-IMAP লাইব্রেরি ব্যবহার করুন। এটি IMAP এর জন্য একটি OAuth2 সংযোগ ব্যবহারের অনুমতি দেয় (মডিউল OAuthও সক্রিয় করা আবশ্যক)৷
-MAIN_CHECKBOX_LEFT_COLUMN=বাম দিকে ক্ষেত্র এবং লাইন নির্বাচনের জন্য কলাম দেখান (ডিফল্টরূপে ডানদিকে)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=ডিফল্টরূপে তৈরি করা হয় না. শুধুমাত্র মডিউল অ্যাক্টিভেশনে তৈরি করা হয়েছে।
 CSSPage=CSS শৈলী
 Defaultfortype=ডিফল্ট
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang
index af06c424b74..082e39709e3 100644
--- a/htdocs/langs/bn_BD/banks.lang
+++ b/htdocs/langs/bn_BD/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=End balance
 CurrentBalance=Current balance
 FutureBalance=Future balance
 ShowAllTimeBalance=Show balance from start
-AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
@@ -133,7 +132,7 @@ DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Movements
-PlannedTransactions=Planned entries
+PlannedTransactions=Upcoming entries
 Graph=গ্রাফ
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
@@ -151,7 +150,7 @@ FutureTransaction=ভবিষ্যতের লেনদেন। মিটম
 SelectChequeTransactionAndGenerate=চেক জমার রসিদে অন্তর্ভুক্ত করা চেকগুলি নির্বাচন/ফিল্টার করুন। তারপরে, "তৈরি করুন" এ ক্লিক করুন।
 SelectPaymentTransactionAndGenerate=%s জমার রসিদে অন্তর্ভুক্ত করা নথিগুলি নির্বাচন/ফিল্টার করুন৷ তারপরে, "তৈরি করুন" এ ক্লিক করুন।
 InputReceiptNumber=সমঝোতার সাথে সম্পর্কিত ব্যাঙ্ক স্টেটমেন্ট বেছে নিন। একটি বাছাইযোগ্য সংখ্যাসূচক মান ব্যবহার করুন
-InputReceiptNumberBis=YYYYMM বা YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=To reconcile?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=এই ফাংশনটি সক্ষম হলে,
 BankColorizeMovementName1=ডেবিট আন্দোলনের জন্য পটভূমির রঙ
 BankColorizeMovementName2=ক্রেডিট আন্দোলনের জন্য পটভূমির রঙ
 IfYouDontReconcileDisableProperty=আপনি যদি কিছু ব্যাঙ্ক অ্যাকাউন্টে ব্যাঙ্ক পুনর্মিলন না করেন, তাহলে এই সতর্কতা অপসারণের জন্য তাদের উপর "%s" সম্পত্তি অক্ষম করুন।
-NoBankAccountDefined=কোনো ব্যাঙ্ক অ্যাকাউন্ট সংজ্ঞায়িত করা হয়নি
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=ব্যাঙ্ক অ্যাকাউন্টে কোনও রেকর্ড পাওয়া যায়নি। সাধারণত, এটি ঘটে যখন ব্যাঙ্ক অ্যাকাউন্টের লেনদেনের তালিকা থেকে একটি রেকর্ড ম্যানুয়ালি মুছে ফেলা হয় (উদাহরণস্বরূপ ব্যাঙ্ক অ্যাকাউন্টের পুনর্মিলনের সময়)। আরেকটি কারণ হল যখন মডিউল "%s" নিষ্ক্রিয় ছিল তখন অর্থপ্রদান রেকর্ড করা হয়েছিল৷
 AlreadyOneBankAccount=ইতিমধ্যে একটি ব্যাঙ্ক অ্যাকাউন্ট সংজ্ঞায়িত করা হয়েছে৷
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA ফাইলের বৈকল্পিক
diff --git a/htdocs/langs/bn_BD/blockedlog.lang b/htdocs/langs/bn_BD/blockedlog.lang
index c9d1f3af6da..8ace9b04779 100644
--- a/htdocs/langs/bn_BD/blockedlog.lang
+++ b/htdocs/langs/bn_BD/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=অপরিবর্তনীয় লগ
 ShowAllFingerPrintsMightBeTooLong=সমস্ত সংরক্ষণাগারভুক্ত লগ দেখান (দীর্ঘ হতে পারে)
 ShowAllFingerPrintsErrorsMightBeTooLong=সমস্ত অ-বৈধ সংরক্ষণাগার লগ দেখান (দীর্ঘ হতে পারে)
 DownloadBlockChain=আঙ্গুলের ছাপ ডাউনলোড করুন
-KoCheckFingerprintValidity=সংরক্ষণাগারভুক্ত লগ এন্ট্রি বৈধ নয়. এর অর্থ কেউ (একজন হ্যাকার?) এই রেকর্ডের কিছু ডেটা রেকর্ড করার পরে পরিবর্তন করেছে, বা আগের সংরক্ষণাগারভুক্ত রেকর্ডটি মুছে দিয়েছে (আগের # বিদ্যমান আছে সেই লাইনটি পরীক্ষা করে দেখুন) বা পূর্ববর্তী রেকর্ডের চেকসাম পরিবর্তন করেছেন।
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=সংরক্ষণাগারভুক্ত লগ রেকর্ড বৈধ। এই লাইনের ডেটা পরিবর্তন করা হয়নি এবং এন্ট্রিটি আগেরটি অনুসরণ করে।
 OkCheckFingerprintValidityButChainIsKo=সংরক্ষণাগারভুক্ত লগটি আগেরটির তুলনায় বৈধ বলে মনে হচ্ছে তবে চেইনটি আগে দূষিত হয়েছিল৷
 AddedByAuthority=দূরবর্তী কর্তৃপক্ষের মধ্যে সংরক্ষিত
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=লগ বিবরণ
 ListOfTrackedEvents=ট্র্যাক করা ইভেন্টের তালিকা
 Fingerprint=আঙুলের ছাপ
 DownloadLogCSV=সংরক্ষণাগারভুক্ত লগ রপ্তানি করুন (CSV)
-DataOfArchivedEvent=আর্কাইভ করা ইভেন্টের সম্পূর্ণ ডেটা
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=আসল বস্তু (টাইপ %s, id %s) লিঙ্কযুক্ত নয় (অপরিবর্তনীয় সংরক্ষিত ডেটা পেতে 'সম্পূর্ণ ডেটা' কলাম দেখুন)
 BlockedLogAreRequiredByYourCountryLegislation=আপনার দেশের আইন দ্বারা অপরিবর্তনীয় লগ মডিউল প্রয়োজন হতে পারে। এই মডিউলটি নিষ্ক্রিয় করা ভবিষ্যতের যেকোন লেনদেন আইন এবং আইনি সফ্টওয়্যার ব্যবহারের ক্ষেত্রে অবৈধ হতে পারে কারণ সেগুলি ট্যাক্স অডিট দ্বারা যাচাই করা যায় না।
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=আপনার দেশের আইনের কারণে অপরিবর্তনীয় লগ মডিউল সক্রিয় করা হয়েছে। এই মডিউলটি অক্ষম করা হলে ভবিষ্যতের যেকোনো লেনদেন আইন এবং আইনি সফ্টওয়্যার ব্যবহারের ক্ষেত্রে অবৈধ হয়ে যেতে পারে কারণ সেগুলি ট্যাক্স অডিট দ্বারা যাচাই করা যায় না।
@@ -30,6 +32,7 @@ BlockedLogEnabled=অপরিবর্তনীয় লগগুলিতে
 BlockedLogDisabled=কিছু রেকর্ডিং সম্পন্ন হওয়ার পরে অপরিবর্তনীয় লগগুলিতে ইভেন্ট ট্র্যাক করার সিস্টেমটি নিষ্ক্রিয় করা হয়েছে। চেইনটিকে ভাঙা হিসাবে ট্র্যাক করতে আমরা একটি বিশেষ আঙুলের ছাপ সংরক্ষণ করেছি
 BlockedLogDisabledBis=অপরিবর্তনীয় লগগুলিতে ইভেন্ট ট্র্যাক করার সিস্টেম নিষ্ক্রিয় করা হয়েছে৷ এটি সম্ভব কারণ এখনও কোন রেকর্ড করা হয়নি।
 LinkHasBeenDisabledForPerformancePurpose=কার্য সম্পাদনের উদ্দেশ্যে, 100 তম লাইনের পরে নথিতে সরাসরি লিঙ্ক দেখানো হয় না।
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=গ্রাহক চালান যৌক্তিকভাবে মুছে ফেলা হয়েছে
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=গ্রাহক পেমেন্ট যৌক্
 logPAYMENT_VARIOUS_CREATE=অর্থপ্রদান (একটি চালানে বরাদ্দ করা হয়নি) তৈরি করা হয়েছে৷
 logPAYMENT_VARIOUS_DELETE=অর্থপ্রদান (একটি চালানে বরাদ্দ করা হয়নি) যৌক্তিক মুছে ফেলা
 logPAYMENT_VARIOUS_MODIFY=অর্থপ্রদান (একটি চালানে বরাদ্দ করা হয়নি) পরিবর্তিত হয়েছে৷
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/bn_BD/categories.lang b/htdocs/langs/bn_BD/categories.lang
index 108be18f318..bbcef3bd2f5 100644
--- a/htdocs/langs/bn_BD/categories.lang
+++ b/htdocs/langs/bn_BD/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=যোগাযোগ ট্যাগ/বিভাগ এ
 AccountsCategoriesArea=ব্যাঙ্ক অ্যাকাউন্ট ট্যাগ/বিভাগ এলাকা
 ProjectsCategoriesArea=প্রকল্প ট্যাগ/বিভাগ এলাকা
 UsersCategoriesArea=ব্যবহারকারীর ট্যাগ/বিভাগ এলাকা
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=উপ-শ্রেণী
 CatList=List of tags/categories
 CatListAll=ট্যাগ/বিভাগের তালিকা (সব ধরনের)
@@ -90,9 +91,10 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=যদি বিকল্পটি চালু থাকে, আপনি যখন একটি উপশ্রেণীতে একটি অবজেক্ট যোগ করেন, তখন অবজেক্টটিও প্যারেন্ট ক্যাটাগরিতে যোগ করা হবে।
 AddProductServiceIntoCategory=পণ্য/পরিষেবার জন্য বিভাগ বরাদ্দ করুন
-AddCustomerIntoCategory=গ্রাহককে বিভাগ বরাদ্দ করুন
-AddSupplierIntoCategory=সরবরাহকারীকে বিভাগ বরাদ্দ করুন
-AssignCategoryTo=কে বিভাগ বরাদ্দ করুন
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=বিভাগ নির্বাচন
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=পৃষ্ঠা-ধারক বিভাগ
 KnowledgemanagementsCategoriesArea=KM নিবন্ধ বিভাগ
 UseOrOperatorForCategories=বিভাগের জন্য 'OR' অপারেটর ব্যবহার করুন
 AddObjectIntoCategory=বিভাগে বরাদ্দ করুন
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index 835d0bd804c..b25126b1379 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=দেশটি ইউরোপীয় অর্থনৈতি
 PriceFormatInCurrentLanguage=বর্তমান ভাষা এবং মুদ্রায় মূল্য প্রদর্শন বিন্যাস
 ThirdPartyName=তৃতীয় পক্ষের নাম
 ThirdPartyEmail=তৃতীয় পক্ষের ইমেল
-ThirdParty=তৃতীয় পক্ষ
-ThirdParties=তৃতীয় পক্ষ
+ThirdParty=Third party
+ThirdParties=Third parties
 ThirdPartyProspects=সম্ভাবনা
 ThirdPartyProspectsStats=সম্ভাবনা
 ThirdPartyCustomers=গ্রাহকদের
@@ -65,6 +65,7 @@ State=রাজ্য/প্রদেশ
 StateId=রাজ্য আইডি
 StateCode=রাজ্য/প্রদেশ কোড
 StateShort=অবস্থা
+DepartmentBuyer=Buyer's state/province
 Region=অঞ্চল
 Region-State=অঞ্চল - রাজ্য
 Country=দেশ
@@ -78,7 +79,7 @@ Chat=চ্যাট
 PhonePro=বাস। ফোন
 PhonePerso=পারস ফোন
 PhoneMobile=মুঠোফোন
-No_Email=বাল্ক ইমেল প্রত্যাখ্যান
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=জিপ কোড
 Town=শহর
@@ -382,11 +383,12 @@ ExportCardToFormat=ফরম্যাটে কার্ড রপ্তান
 ContactNotLinkedToCompany=যোগাযোগ কোনো তৃতীয় পক্ষের সাথে লিঙ্ক করা নেই
 DolibarrLogin=Dolibarr লগইন
 NoDolibarrAccess=Dolibarr অ্যাক্সেস নেই
-ExportDataset_company_1=তৃতীয় পক্ষ (কোম্পানী/ফাউন্ডেশন/ভৌতিক ব্যক্তি) এবং তাদের বৈশিষ্ট্য
-ExportDataset_company_2=পরিচিতি এবং তাদের বৈশিষ্ট্য
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=তৃতীয় পক্ষ এবং তাদের বৈশিষ্ট্য
 ImportDataset_company_2=তৃতীয় পক্ষের অতিরিক্ত পরিচিতি/ঠিকানা এবং বৈশিষ্ট্য
-ImportDataset_company_3=তৃতীয় পক্ষের ব্যাঙ্ক অ্যাকাউন্ট
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=তৃতীয় পক্ষের বিক্রয় প্রতিনিধি (কোম্পানিগুলিতে বিক্রয় প্রতিনিধি/ব্যবহারকারীকে বরাদ্দ করুন)
 PriceLevel=মূল্যস্তর
 PriceLevelLabels=মূল্য স্তর লেবেল
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=ম্যানেজার(দের) নাম (সিইও, ডিরেক্টর, প্রেসিডেন্ট...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=তৃতীয় পক্ষকে একত্রিত করুন
-ConfirmMergeThirdparties=আপনি কি বর্তমানের সাথে নির্বাচিত তৃতীয় পক্ষকে মার্জ করার বিষয়ে নিশ্চিত? সমস্ত লিঙ্ক করা বস্তু (চালান, আদেশ, ...) বর্তমান তৃতীয় পক্ষের কাছে সরানো হবে, তারপরে নির্বাচিত তৃতীয় পক্ষ মুছে ফেলা হবে৷
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=তৃতীয় পক্ষকে একীভূত করা হয়েছে
 SaleRepresentativeLogin=বিক্রয় প্রতিনিধির লগইন
 SaleRepresentativeFirstname=বিক্রয় প্রতিনিধির প্রথম নাম
@@ -460,3 +462,6 @@ ExternalSystemID=বাহ্যিক সিস্টেম আইডি
 IDOfPaymentInAnExternalSystem=একটি বাহ্যিক সিস্টেমে পেমেন্ট মোডের আইডি (যেমন স্ট্রাইপ, পেপ্যাল, ...)
 AADEWebserviceCredentials=AADE ওয়েবসার্ভিস শংসাপত্র
 ThirdPartyMustBeACustomerToCreateBANOnStripe=স্ট্রাইপ সাইডে তার ব্যাঙ্কের তথ্য তৈরি করার অনুমতি দেওয়ার জন্য তৃতীয় পক্ষকে অবশ্যই একজন গ্রাহক হতে হবে
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
index 5f6de5255eb..ac6d1c386bd 100644
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=গ্রাহক চালান পেমেন্ট
 PaymentSupplierInvoice=বিক্রেতা চালান পেমেন্ট
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=ভ্যাট প্রদান
-AutomaticCreationPayment=স্বয়ংক্রিয়ভাবে পেমেন্ট রেকর্ড
+AutomaticCreationPayment=Also record the payment
 ListPayment=অর্থপ্রদানের তালিকা
 ListOfCustomerPayments=গ্রাহক পেমেন্ট তালিকা
 ListOfSupplierPayments=বিক্রেতা পেমেন্ট তালিকা
@@ -118,10 +118,14 @@ SocialContributionsPayments=সামাজিক/আর্থিক কর প
 ShowVatPayment=ভ্যাট পেমেন্ট দেখান
 TotalToPay=পরিশোধ করতে মোট
 BalanceVisibilityDependsOnSortAndFilters=সারণীটি %s এ সাজানো থাকলে এবং 1টি ব্যাঙ্ক অ্যাকাউন্টে ফিল্টার করা থাকলেই এই তালিকায় ব্যালেন্স দেখা যায় (অন্য কোনো ফিল্টার ছাড়াই)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=গ্রাহক অ্যাকাউন্টিং কোড
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=বিক্রেতা অ্যাকাউন্টিং কোড
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=কাস্ট। অ্যাকাউন্ট কোড
 SupplierAccountancyCodeShort=Sup. অ্যাকাউন্ট কোড
+UserAccountancyCodeShort=User account. code
 AccountNumber=Account number
 NewAccountingAccount=New account
 Turnover=টার্নওভার চালান
@@ -129,7 +133,9 @@ TurnoverCollected=টার্নওভার সংগৃহীত
 SalesTurnoverMinimum=ন্যূনতম টার্নওভার
 ByExpenseIncome=ব্যয় এবং আয় দ্বারা
 ByThirdParties=তৃতীয় পক্ষের দ্বারা
+ByProjects=By projects
 ByUserAuthorOfInvoice=চালান লেখক দ্বারা
+DetailedListLowercase=detailed list
 CheckReceipt=Deposit slip
 CheckReceiptShort=Deposit slip
 LastCheckReceiptShort=সর্বশেষ %s জমা স্লিপ
diff --git a/htdocs/langs/bn_BD/datapolicy.lang b/htdocs/langs/bn_BD/datapolicy.lang
index b064cfa6a0d..d3c630f6810 100644
--- a/htdocs/langs/bn_BD/datapolicy.lang
+++ b/htdocs/langs/bn_BD/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = ডেটা গোপনীয়তা নীতি
 Module4100Desc = ডেটা গোপনীয়তা পরিচালনা করার মডিউল (জিডিপিআরের সাথে সামঞ্জস্যপূর্ণ)
 # Administration page
 datapolicySetup = মডিউল ডেটা গোপনীয়তা নীতি সেটআপ
-Deletion = ডেটা মুছে ফেলা
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s মাস
 ONE_YEAR = 1 বছর
 NB_YEARS = %s বছর
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = প্রত্যাশা গ্রাহ
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = না সম্ভাবনা/না গ্রাহক
 DATAPOLICY_CONTACT_FOURNISSEUR = সরবরাহকারী
 DATAPOLICY_ADHERENT = সদস্য
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = আপনি আপনার সমস্ত প্রাসঙ্গিক পরিচিতিদের একটি GDPR ইমেল পাঠাতে পারেন (যারা এখনও একটি ইমেল পাননি এবং যার জন্য আপনি তাদের GDPR চুক্তি সম্পর্কে কিছু নিবন্ধন করেননি)। এটি করতে, নিম্নলিখিত বোতামটি ব্যবহার করুন।
 SendAgreement = ইমেইল পাঠান
 AllAgreementSend = সব ইমেইল পাঠানো হয়েছে
 TXTLINKDATAPOLICYACCEPT = লিঙ্কের জন্য পাঠ্য "চুক্তি"
 TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = জিডিপিআর: ব্যক্তিগত তথ্য প্রক্রিয়াকরণ
 DATAPOLICY_consentement = ব্যক্তিগত তথ্য প্রক্রিয়াকরণের জন্য সম্মতি প্রাপ্ত
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index ad74c9c11a1..35c0a7c00bd 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=ইমেল সেটআপ সম্পূর্ণ হয়নি
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=এই বৈশিষ্ট্যটি কাজ করার জন্য জাভাস্ক্রিপ্ট সক্রিয় করা প্রয়োজন. সেটআপ - প্রদর্শনে এটি পরিবর্তন করুন।
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
 ErrorFileSizeTooLarge=ফাইলের আকার খুব বড় বা ফাইল দেওয়া হয়নি৷
 ErrorFieldTooLong=%s ক্ষেত্রটি অত্যন্ত দীর্ঘ৷
 ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
 ErrorNoValueForSelectType=Please fill value for select list
 ErrorNoValueForCheckBoxType=Please fill value for checkbox list
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
 ErrorFieldCantBeNegativeOnInvoice=এই ধরনের চালানের ক্ষেত্রে <strong>%s</strong> নেতিবাচক হতে পারে না। আপনি যদি একটি ডিসকাউন্ট লাইন যোগ করতে চান তবে প্রথমে ডিসকাউন্ট তৈরি করুন (তৃতীয় পক্ষের কার্ডে '%s' ফিল্ড থেকে) এবং চালানে এটি প্রয়োগ করুন।
 ErrorLinesCantBeNegativeForOneVATRate=প্রদত্ত শূন্য ভ্যাট হারের জন্য মোট লাইন (করের নেট) ঋণাত্মক হতে পারে না (ভ্যাট হারের জন্য একটি ঋণাত্মক মোট পাওয়া গেছে <b>%s </b>%%)।
-ErrorLinesCantBeNegativeOnDeposits=একটি ডিপোজিটে লাইন ঋণাত্মক হতে পারে না। আপনি সমস্যার সম্মুখীন হবেন যখন আপনি যদি তা করেন তাহলে চূড়ান্ত চালানে আমানত গ্রহণ করতে হবে।
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=আপনার PHP প্যারামিটার upload_max_filesize (%s) PHP প্যারামিটার post_max_size (%s) থেকে বেশি। এটি একটি ধারাবাহিক সেটআপ নয়।
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = সুইসকিউআর ইনভয়েস শুধুমাত্র ক্রেডিট ট্রান্সফার পেমেন্টের সাথে প্রদান করা সেট ইনভয়েসে যোগ করা যেতে পারে।
 SwissQrCreditorAddressInvalid = পাওনাদারের ঠিকানা অবৈধ (জিপ এবং শহর সেট আছে? (%s)
 SwissQrCreditorInformationInvalid = IBAN (%s) এর জন্য পাওনাদারের তথ্য অবৈধ: %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/bn_BD/exports.lang b/htdocs/langs/bn_BD/exports.lang
index 50fc51b8575..c48cce1b4ac 100644
--- a/htdocs/langs/bn_BD/exports.lang
+++ b/htdocs/langs/bn_BD/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Label of line
 LineDescription=Description of line
 LineUnitPrice=Unit price of line
 LineVATRate=VAT Rate of line
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Quantity for line
 LineTotalHT=পরিমাণ বাদ। লাইনের জন্য ট্যাক্স
 LineTotalTTC=Amount with tax for line
 LineTotalVAT=Amount of VAT for line
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=এটি নির্বাচন করতে %s 
 ChooseFileToImport=ফাইল আপলোড করুন তারপর সোর্স ইম্পোর্ট ফাইল হিসাবে ফাইল নির্বাচন করতে %s আইকনে ক্লিক করুন...
 SourceFileFormat=Source file format
 FieldsInSourceFile=Fields in source file
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=No fields
 MoveField=Move field column number %s
 ExampleOfImportFile=Example_of_import_file
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Check that the file format (field and string delimiters)
 RunSimulateImportFile=আমদানি সিমুলেশন চালান
 FieldNeedSource=This field requires data from the source file
 SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
-InformationOnSourceFile=Information on source file
-InformationOnTargetTables=Information on target fields
+InformationOnSourceFile=Source file
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Switch at least one source field in the column of fields to export
 SelectFormat=Choose this import file format
 RunImportFile=তথ্য আমদানি
diff --git a/htdocs/langs/bn_BD/hrm.lang b/htdocs/langs/bn_BD/hrm.lang
index 33ea065dd58..c319305a5ef 100644
--- a/htdocs/langs/bn_BD/hrm.lang
+++ b/htdocs/langs/bn_BD/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=কাজের প্রোফাইলের জন্য প্রয়োজনীয় র‌্যাঙ্ক
-RequiredRankShort=প্রয়োজনীয় পদমর্যাদা
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=এই কাজের প্রোফাইলের সাথে অবস্থান
-EmployeeRank=এই দক্ষতার জন্য কর্মচারী পদমর্যাদা
-EmployeeRankShort=কর্মচারী পদমর্যাদা
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=কর্মচারী অবস্থান
 EmployeePositions=কর্মচারী পদ
 EmployeesInThisPosition=এই পদে কর্মচারীরা
@@ -72,6 +72,9 @@ AddSkill=কাজের প্রোফাইলে দক্ষতা যো
 RequiredSkills=এই কাজের প্রোফাইলের জন্য প্রয়োজনীয় দক্ষতা
 UserRank=ব্যবহারকারীর পদমর্যাদা
 SkillList=দক্ষতার তালিকা
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=পদমর্যাদা সংরক্ষণ করুন
 TypeKnowHow=জানি-কিভাবে
 TypeHowToBe=কিভাবে হবে
@@ -95,3 +98,5 @@ NeedBusinessTravels=ব্যবসায়িক ভ্রমণ প্রয
 NoDescription=বর্ণনা নাই
 TheJobProfileHasNoSkillsDefinedFixBefore=এই কর্মচারীর মূল্যায়নকৃত কাজের প্রোফাইলে কোন দক্ষতা সংজ্ঞায়িত করা নেই। দক্ষতা(গুলি) যোগ করুন, তারপর মুছে ফেলুন এবং মূল্যায়ন পুনরায় আরম্ভ করুন.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/bn_BD/mails.lang b/htdocs/langs/bn_BD/mails.lang
index 7682c088708..266be84340a 100644
--- a/htdocs/langs/bn_BD/mails.lang
+++ b/htdocs/langs/bn_BD/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=ইমেইলিং
 EMailing=ইমেইলিং
-EMailings=ইমেইলিং
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=সমস্ত ইমেইলিং
+AllEMailings=All mass eMails
 MailCard=ইমেইল কার্ড
 MailRecipients=প্রাপক
 MailRecipient=প্রাপক
@@ -26,19 +26,19 @@ MailFile=সংযুক্ত ফাইল
 MailMessage=ইমেইল বডি
 SubjectNotIn=সাবজেক্টে নয়
 BodyNotIn=শরীরে নয়
-ShowEMailing=ইমেল দেখান
-ListOfEMailings=ইমেইলের তালিকা
-NewMailing=নতুন ইমেইল
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=ইমেল সম্পাদনা করুন
-ResetMailing=ইমেল পুনরায় পাঠান
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=ইমেল মুছুন
-PreviewMailing=পূর্বরূপ ইমেল
-CreateMailing=ইমেল তৈরি করুন
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=বৈধ ইমেইল
+ValidMailing=Valid mass Email
 MailingStatusDraft=Draft
 MailingStatusValidated=Validated
 MailingStatusSent=পাঠানো হয়েছে
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=একটি ইমেল সংগ্রহ করা
 LineInFile=লাইন %s ফাইলে
 RecipientSelectionModules=প্রাপকের নির্বাচনের জন্য সংজ্ঞায়িত অনুরোধ
 MailSelectedRecipients=নির্বাচিত প্রাপক
-MailingArea=ইমেইল এলাকা
-LastMailings=সর্বশেষ %s ইমেল
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=লক্ষ্য পরিসংখ্যান
 NbOfCompaniesContacts=অনন্য পরিচিতি/ঠিকানা
 MailNoChangePossible=বৈধ ইমেল করার জন্য প্রাপক পরিবর্তন করা যাবে না
-SearchAMailing=মেইলিং অনুসন্ধান করুন
-SendMailing=ইমেইল পাঠান
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=পাঠানো
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=একটি ইমেল পাঠানো কমান্ড লাইন থেকে সঞ্চালিত করা যেতে পারে. সমস্ত প্রাপককে ইমেল পাঠাতে আপনার সার্ভার প্রশাসককে নিম্নলিখিত কমান্ডটি চালু করতে বলুন:
 MailingNeedCommand2=তবে আপনি সেশনের মাধ্যমে পাঠাতে চান এমন সর্বাধিক সংখ্যক ইমেলের মান সহ প্যারামিটার MAILING_LIMIT_SENDBYWEB যোগ করে সেগুলি অনলাইনে পাঠাতে পারেন৷ এর জন্য, হোম - সেটআপ - অন্যান্য এ যান।
 ConfirmSendingEmailing=আপনি যদি এই স্ক্রীন থেকে সরাসরি ইমেল পাঠাতে চান, তাহলে অনুগ্রহ করে নিশ্চিত করুন যে আপনি এখন আপনার ব্রাউজার থেকে ইমেল পাঠাতে চান?
-LimitSendingEmailing=দ্রষ্টব্য: ওয়েব ইন্টারফেস থেকে ইমেল পাঠানো নিরাপত্তা এবং সময় শেষ হওয়ার কারণে বেশ কয়েকবার করা হয়, <b>%s</b> প্রতিটি সেন্ডিং সেশনের জন্য এক সময়ে প্রাপক।
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=লিস্ট পরিষ্কার করো
 ToClearAllRecipientsClickHere=এই ইমেলের জন্য প্রাপক তালিকা সাফ করতে এখানে ক্লিক করুন
 ToAddRecipientsChooseHere=তালিকা থেকে বেছে নিয়ে প্রাপকদের যোগ করুন
-NbOfEMailingsReceived=গণ ইমেল প্রাপ্ত
-NbOfEMailingsSend=গণ ইমেল পাঠানো হয়েছে
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=আইডি রেকর্ড
 DeliveryReceipt=ডেলিভারি Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=আপনি বেশ কিছু প্রাপককে নির্দিষ্ট করতে <b>কমা</b> বিভাজক ব্যবহার করতে পারেন।
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=এই ইভেন্টের ধরন এবং 
 ANotificationsWillBeSent=1টি স্বয়ংক্রিয় বিজ্ঞপ্তি ইমেলের মাধ্যমে পাঠানো হবে
 SomeNotificationsWillBeSent=%s স্বয়ংক্রিয় বিজ্ঞপ্তি ইমেলের মাধ্যমে পাঠানো হবে
 AddNewNotification=একটি নতুন স্বয়ংক্রিয় ইমেল বিজ্ঞপ্তিতে সদস্যতা নিন (লক্ষ্য/ইভেন্ট)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=ইমেল পাঠানোর কনফিগারেশন '%s'-এ সেটআপ করা হয়েছে। এই মোডটি ব্যাপক ইমেল পাঠাতে ব্যবহার করা যাবে না।
 MailSendSetupIs2=প্যারামিটার পরিবর্তন করতে আপনাকে প্রথমে একটি প্রশাসক অ্যাকাউন্ট সহ মেনু %sহোম - সেটআপ - ইমেল%s এ যেতে হবে <strong>'%s'</strong> মোড ব্যবহার করার জন্য </span>' এই মোডের মাধ্যমে, আপনি আপনার ইন্টারনেট পরিষেবা প্রদানকারী দ্বারা প্রদত্ত SMTP সার্ভারের সেটআপ প্রবেশ করতে পারেন এবং গণ ইমেল বৈশিষ্ট্য ব্যবহার করতে পারেন।
 MailSendSetupIs3=আপনার SMTP সার্ভার কিভাবে সেটআপ করবেন সে সম্পর্কে আপনার কোনো প্রশ্ন থাকলে, আপনি %s-কে জিজ্ঞাসা করতে পারেন।
@@ -183,7 +185,7 @@ Information=তথ্য
 ContactsWithThirdpartyFilter=তৃতীয় পক্ষের ফিল্টারের সাথে পরিচিতি
 Unanswered=উত্তরহীন
 Answered=উত্তর দিয়েছেন
-IsNotAnAnswer=উত্তর নয় (প্রাথমিক ইমেল)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=এটি একটি প্রাথমিক ইমেলের একটি উত্তর
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=একটি নতুন পরিচিতি তৈরি করার সময় '%s' ক্ষেত্রের ডিফল্ট মান
@@ -199,6 +201,6 @@ ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index b25c59408fc..0ef45cc4755 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -37,6 +37,7 @@ Translation=অনুবাদ
 Translations=অনুবাদ
 CurrentTimeZone=টাইমজোন পিএইচপি (সার্ভার)
 EmptySearchString=অ খালি অনুসন্ধান মানদণ্ড লিখুন
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=একটি তারিখ মানদণ্ড লিখুন
 NoRecordFound=পাওয়া কোন রেকর্ড
 NoRecordDeleted=কোনো রেকর্ড মুছে ফেলা হয়নি
@@ -45,6 +46,7 @@ NoError=কোন ত্রুটি নেই
 Error=ত্রুটি
 Errors=ত্রুটি
 ErrorFieldRequired=ক্ষেত্র '%s' প্রয়োজন
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=ফিল্ড '%s' এর মান খারাপ
 ErrorFileDoesNotExists=ফাইল %s বিদ্যমান নেই
 ErrorFailedToOpenFile=%s ফাইল খুলতে ব্যর্থ হয়েছে
@@ -308,6 +310,7 @@ DateBuild=বিল্ড তারিখ রিপোর্ট করুন
 DatePayment=পরিশোধের তারিখ
 DateApprove=অনুমোদনের তারিখ
 DateApprove2=অনুমোদনের তারিখ (দ্বিতীয় অনুমোদন)
+PendingSince=Pending since
 RegistrationDate=নিবন্ধনের তারিখ
 UserCreation=সৃষ্টি ব্যবহারকারী
 UserModification=পরিবর্তন ব্যবহারকারী
@@ -495,7 +498,7 @@ ActionRunningNotStarted=শুরুতেই
 ActionRunningShort=চলমান
 ActionDoneShort=সমাপ্ত
 ActionUncomplete=অসম্পূর্ণ
-LatestLinkedEvents=সাম্প্রতিক %s লিঙ্ক করা ইভেন্ট
+LatestLinkedEvents=The last %s events
 CompanyFoundation=কোম্পানি/সংস্থা
 Accountant=হিসাবরক্ষক
 ContactsForCompany=এই তৃতীয় পক্ষের জন্য পরিচিতি
@@ -503,6 +506,7 @@ ContactsAddressesForCompany=এই তৃতীয় পক্ষের জন
 AddressesForCompany=এই তৃতীয় পক্ষের জন্য ঠিকানা
 ActionsOnCompany=এই তৃতীয় পক্ষের জন্য ইভেন্ট
 ActionsOnContact=এই যোগাযোগ/ঠিকানার জন্য ইভেন্ট
+ActionsOnUser=Events for this user
 ActionsOnContract=এই চুক্তির জন্য ইভেন্ট
 ActionsOnMember=এই সদস্য সম্পর্কে ঘটনা
 ActionsOnProduct=এই পণ্য সম্পর্কে ইভেন্ট
@@ -720,6 +724,8 @@ TextUsedInTheMessageBody=ইমেইল বডি
 SendAcknowledgementByMail=নিশ্চিতকরণ ইমেল পাঠান
 SendMail=ইমেইল পাঠান
 Email=ইমেইল
+EMail=Email
+EMails=Emails
 NoEMail=কোনো ইমেল নেই
 AlreadyRead=ইতিমধ্যেই পড়েছি
 NotRead=অপঠিত
@@ -792,7 +798,7 @@ Notes=মন্তব্য
 AddNewLine=নতুন লাইন যোগ করুন
 AddFile=নথি যুক্ত করা
 FreeZone=ফ্রি-টেক্সট পণ্য
-FreeLineOfType=ফ্রি-টেক্সট আইটেম, টাইপ করুন:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=ক্লোন অবজেক্ট এর প্রধান বৈশিষ্ট্য সহ
 ReGeneratePDF=পিডিএফ পুনরায় তৈরি করুন
 PDFMerge=PDF মার্জ
@@ -878,12 +884,14 @@ toward=দিকে
 Access=অ্যাক্সেস
 SelectAction=কর্ম নির্বাচন করুন
 SelectTargetUser=লক্ষ্য ব্যবহারকারী/কর্মচারী নির্বাচন করুন
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=ক্লিপবোর্ডে কপি করতে Ctrl+C ব্যবহার করুন
 SaveUploadedFileWithMask=সার্ভারে ফাইল সংরক্ষণ করুন "<strong>%s</strong>" (অন্যথায় " %s")
 OriginFileName=আসল ফাইলের নাম
 SetDemandReason=উৎস সেট করুন
 SetBankAccount=ব্যাঙ্ক অ্যাকাউন্ট সংজ্ঞায়িত করুন
 AccountCurrency=অ্যাকাউন্ট মুদ্রা
+AccountancyCode=Accounting Code
 ViewPrivateNote=নোট দেখুন
 XMoreLines=%s লাইন(গুলি) লুকানো আছে
 ShowMoreLines=বেশি/কম লাইন দেখান
@@ -924,6 +932,7 @@ ConfirmMassDeletionQuestion=আপনি কি %s নির্বাচিত 
 ConfirmMassClone=বাল্ক ক্লোন নিশ্চিতকরণ
 ConfirmMassCloneQuestion=ক্লোন করার জন্য প্রকল্প নির্বাচন করুন
 ConfirmMassCloneToOneProject=প্রকল্পের ক্লোন %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=সম্পর্কিত বস্তু
 ClassifyBilled=শ্রেণীবদ্ধ বিল করা
 ClassifyUnbilled=বিলবিহীন শ্রেণিবদ্ধ করুন
@@ -960,10 +969,11 @@ PrivateDownloadLinkDesc=আপনাকে লগ ইন করতে হবে
 Download=ডাউনলোড করুন
 DownloadDocument=ডকুমেন্ট ডাউনলোড করুন
 DownloadSignedDocument=স্বাক্ষরিত নথি ডাউনলোড করুন
-ActualizeCurrency=মুদ্রার হার আপডেট করুন
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=অর্থবছর
 ModuleBuilder=মডিউল এবং অ্যাপ্লিকেশন নির্মাতা
 SetMultiCurrencyCode=মুদ্রা সেট করুন
+SetMultiCurrencyRate=Set currency rate
 BulkActions=বিপুল কর্ম
 ClickToShowHelp=টুলটিপ সাহায্য দেখানোর জন্য ক্লিক করুন
 WebSite=ওয়েবসাইট
@@ -1103,6 +1113,7 @@ PayedBy=দ্বারা পরিশোধ করা হয়
 PayedTo=দেওয়া
 Monthly=মাসিক
 Quarterly=ত্রৈমাসিক
+Quarter=Quarter
 Annual=বার্ষিক
 Local=স্থানীয়
 Remote=দূরবর্তী
@@ -1145,6 +1156,7 @@ ContactDefault_project_task=টাস্ক
 ContactDefault_propal=প্রস্তাব
 ContactDefault_supplier_proposal=সরবরাহকারীর প্রস্তাব
 ContactDefault_ticket=টিকিট
+ContactDefault_societe=Third party
 ContactAddedAutomatically=তৃতীয় পক্ষের পরিচিতি ভূমিকা থেকে পরিচিতি যোগ করা হয়েছে
 More=আরও
 ShowDetails=বিস্তারিত দেখাও
@@ -1187,6 +1199,8 @@ SetSupervisor=সুপারভাইজার সেট করুন
 CreateExternalUser=বাহ্যিক ব্যবহারকারী তৈরি করুন
 ConfirmAffectTag=বাল্ক ট্যাগ অ্যাসাইনমেন্ট
 ConfirmAffectUser=বাল্ক ইউজার অ্যাসাইনমেন্ট
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=প্রতিটি প্রকল্প/সুযোগের উপর দায়িত্ব বরাদ্দ করা হয়েছে
 TasksRole=প্রতিটি টাস্কে ভূমিকা বরাদ্দ করা হয়েছে (যদি ব্যবহার করা হয়)
 ConfirmSetSupervisor=বাল্ক সুপারভাইজার সেট
@@ -1238,6 +1252,9 @@ CommercialsAffected=বিক্রয় প্রতিনিধি নিয
 CommercialAffected=বিক্রয় প্রতিনিধি নিয়োগ
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=তোমার বার্তা
 YourMessageHasBeenReceived=আপনার বার্তা গৃহীত হয়েছে। আমরা যত তাড়াতাড়ি সম্ভব উত্তর দেব বা আপনার সাথে যোগাযোগ করব।
 UrlToCheck=চেক করার জন্য ইউআরএল
@@ -1280,6 +1297,7 @@ AmountSalary=বেতনের পরিমাণ
 InvoiceSubtype=চালান সাবটাইপ
 ConfirmMassReverse=বাল্ক বিপরীত নিশ্চিতকরণ
 ConfirmMassReverseQuestion=আপনি কি %s নির্বাচিত রেকর্ড (গুলি) বিপরীত করতে চান?
+ConfirmActionXxx=Confirm action %s
 ElementType=Element type
 ElementId=Element Id
 Encrypted=Encrypted
@@ -1299,3 +1317,35 @@ AllEntities=All entities
 TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
+auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/bn_BD/members.lang b/htdocs/langs/bn_BD/members.lang
index 370fe123e2d..5bdfcf2e222 100644
--- a/htdocs/langs/bn_BD/members.lang
+++ b/htdocs/langs/bn_BD/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=যদি সাবস্ক্রিপশনের 
 DeleteType=মুছে ফেলা
 VoteAllowed=ভোট অনুমোদিত
 Physical=স্বতন্ত্র
-Moral=কর্পোরেশন
-MorAndPhy=কর্পোরেশন এবং ব্যক্তি
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=পুনরায় সক্ষম করুন
 ExcludeMember=একজন সদস্যকে বাদ দিন
 Exclude=বাদ দিন
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=অঞ্চল অনুসারে সদস্য
 NbOfMembers=মোট সদস্য সংখ্যা
 NbOfActiveMembers=বর্তমান সক্রিয় সদস্যের মোট সংখ্যা
 NoValidatedMemberYet=কোন বৈধ সদস্য পাওয়া যায়নি
-MembersByCountryDesc=এই স্ক্রীনটি আপনাকে দেশ অনুসারে সদস্যদের পরিসংখ্যান দেখায়। গ্রাফ এবং চার্টগুলি Google অনলাইন গ্রাফ পরিষেবার প্রাপ্যতার পাশাপাশি একটি কার্যকরী ইন্টারনেট সংযোগের প্রাপ্যতার উপর নির্ভর করে৷
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=এই স্ক্রীন আপনাকে রাজ্য/প্রদেশ/ক্যান্টন অনুসারে সদস্যদের পরিসংখ্যান দেখায়।
 MembersByTownDesc=এই স্ক্রীনটি আপনাকে শহর অনুসারে সদস্যদের পরিসংখ্যান দেখায়।
 MembersByNature=এই স্ক্রিনটি আপনাকে প্রকৃতি অনুসারে সদস্যদের পরিসংখ্যান দেখায়।
@@ -208,25 +209,25 @@ NewMemberbyWeb=নতুন সদস্য যোগ করা হয়েছ
 NewMemberForm=নতুন সদস্য ফর্ম
 SubscriptionsStatistics=অবদান পরিসংখ্যান
 NbOfSubscriptions=অবদানের সংখ্যা
-AmountOfSubscriptions=অবদান থেকে সংগৃহীত পরিমাণ
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=টার্নওভার (কোম্পানির জন্য) বা বাজেট (একটি ভিত্তির জন্য)
-DefaultAmount=অবদানের ডিফল্ট পরিমাণ (সদস্য প্রকার স্তরে কোনো পরিমাণ সংজ্ঞায়িত না হলেই ব্যবহার করা হয়)
-MinimumAmount=ন্যূনতম পরিমাণ (অবদানের পরিমাণ বিনামূল্যে হলেই ব্যবহৃত হয়)
-CanEditAmount=সদস্যতার পরিমাণ সদস্য দ্বারা সংজ্ঞায়িত করা যেতে পারে
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=সদস্যের ধরন নির্বিশেষে দর্শক তার অবদানের পরিমাণ চয়ন/সম্পাদনা করতে পারে
 AmountIsLowerToMinimumNotice=পরিমাণটি সর্বনিম্ন %s থেকে কম
 MEMBER_NEWFORM_PAYONLINE=অনলাইন রেজিস্ট্রেশনের পরে, অনলাইন পেমেন্ট পৃষ্ঠায় স্বয়ংক্রিয়ভাবে স্যুইচ করুন
 ByProperties=প্রকৃতিগতভাবে
 MembersStatisticsByProperties=প্রকৃতির সদস্যদের পরিসংখ্যান
-VATToUseForSubscriptions=অবদানের জন্য ব্যবহার করার জন্য ভ্যাট হার
-NoVatOnSubscription=অবদানের জন্য কোন ভ্যাট নেই
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=ইনভয়েসে অবদান লাইনের জন্য ব্যবহৃত পণ্য: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=নাম বা কোম্পানি
 SubscriptionRecorded=অবদান নথিভুক্ত
 NoEmailSentToMember=সদস্যকে কোনো ইমেল পাঠানো হয়নি
 EmailSentToMember=%s-এ সদস্যকে ইমেল পাঠানো হয়েছে
-SendReminderForExpiredSubscriptionTitle=মেয়াদোত্তীর্ণ অবদানের জন্য ইমেলের মাধ্যমে অনুস্মারক পাঠান
-SendReminderForExpiredSubscription=যখন অবদানের মেয়াদ শেষ হতে চলেছে তখন সদস্যদের ইমেলের মাধ্যমে অনুস্মারক পাঠান (অনুস্মারক পাঠানোর জন্য সদস্যতা শেষ হওয়ার আগের দিনগুলির সংখ্যা। এটি একটি সেমিকোলন দ্বারা পৃথক করা দিনের তালিকা হতে পারে, উদাহরণস্বরূপ '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=বর্তমান সময়ের জন্য সদস্যতা প্রদান করা হয়েছে (%s পর্যন্ত)
 YouMayFindYourInvoiceInThisEmail=আপনি এই ইমেলের সাথে আপনার চালান সংযুক্ত দেখতে পারেন
 XMembersClosed=%s সদস্য(গুলি) বন্ধ
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=একটি তৃতীয় পক্ষ হল
 MemberFirstname=সদস্যের প্রথম নাম
 MemberLastname=সদস্য পদবি
 MemberCodeDesc=সদস্য কোড, সকল সদস্যের জন্য অনন্য
-MemberSubscriptionStartFirstDayOf=একটি সদস্যতার শুরুর তারিখ a এর প্রথম দিনের সাথে মিলে যায়
-MemberSubscriptionStartAfter=নবায়ন ব্যতীত সাবস্ক্রিপশন শুরু হওয়ার তারিখে প্রবেশের ন্যূনতম সময়কাল (উদাহরণ +3m = +3 মাস, -5d = -5 দিন, +1Y = +1 বছর)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/bn_BD/salaries.lang b/htdocs/langs/bn_BD/salaries.lang
index 18a442a6aaa..20453c81d59 100644
--- a/htdocs/langs/bn_BD/salaries.lang
+++ b/htdocs/langs/bn_BD/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=নতুন বেতন
 AddSalary=বেতন যোগ করুন
 NewSalaryPayment=নতুন বেতন কার্ড
 AddSalaryPayment=বেতন প্রদান যোগ করুন
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=বেতন প্রদান
 SalariesPayments=বেতন প্রদান
 SalariesPaymentsOf=%s এর বেতন প্রদান
@@ -27,7 +29,7 @@ FillFieldFirst=প্রথমে কর্মচারী ক্ষেত্র
 UpdateAmountWithLastSalary=শেষ বেতনের পরিমাণ নির্ধারণ করুন
 MakeTransferRequest=স্থানান্তরের অনুরোধ করুন
 VirementOrder=ক্রেডিট ট্রান্সফার অনুরোধ
-BankTransferAmount=ক্রেডিট স্থানান্তরের পরিমাণ
 WithdrawalReceipt=ক্রেডিট ট্রান্সফার অর্ডার
 OrderWaiting=আদেশ করা
 FillEndOfMonth=মাসের শেষে পূরণ করুন
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
index d261cd0b3e1..4c866aab88b 100644
--- a/htdocs/langs/bn_BD/website.lang
+++ b/htdocs/langs/bn_BD/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=এখানে অন্যান্য নাম/উপ
 WEBSITE_CSS_URL=বাহ্যিক CSS ফাইলের URL
 WEBSITE_CSS_INLINE=CSS ফাইলের বিষয়বস্তু (সব পৃষ্ঠায় সাধারণ)
 WEBSITE_JS_INLINE=জাভাস্ক্রিপ্ট ফাইলের বিষয়বস্তু (সব পৃষ্ঠায় সাধারণ)
-WEBSITE_HTML_HEADER=HTML হেডারের নীচে সংযোজন (সমস্ত পৃষ্ঠায় সাধারণ)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=রোবট ফাইল (robots.txt)
 WEBSITE_HTACCESS=ওয়েবসাইট .htaccess ফাইল
 WEBSITE_MANIFEST_JSON=ওয়েবসাইট manifest.json ফাইল
@@ -56,16 +56,17 @@ ReadPerm=পড়ুন
 WritePerm=লিখুন
 TestDeployOnWeb=ওয়েবে পরীক্ষা/নিয়োগ করুন
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>একটি নতুন ট্যাবে %s পূর্বরূপ দেখুন।</u><br><br> %s Dolibarr সার্ভার দ্বারা পরিবেশন করা হবে তাই এটির কোনো অতিরিক্ত ওয়েব সার্ভারের প্রয়োজন নেই (যেমন Apache, Nginx, IIS) ইনস্টল করতে হবে।<br>অসুবিধে হল যে পৃষ্ঠাগুলির URLগুলি ব্যবহারকারী বান্ধব নয় এবং আপনার Dolibarr এর পথ দিয়ে শুরু হয়৷<span class= Dolibarr দ্বারা পরিবেশিত URL /span></strong><br><br>এতে আপনার নিজস্ব বাহ্যিক ওয়েব সার্ভার ব্যবহার করতে এই ওয়েব সাইটটি পরিবেশন করুন, আপনার ওয়েব সার্ভারে একটি ভার্চুয়াল হোস্ট তৈরি করুন যা নির্দেশিকা নির্দেশ করে<br><strong>%s</strong><br>তারপর এই ওয়েবসাইটের বৈশিষ্ট্যগুলিতে এই ভার্চুয়াল সার্ভারের নাম লিখুন এবং ক্লিক করুন লিঙ্ক "টেস্ট/ডেপ্লয় অন ওয়েব"।
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=বহিরাগত ওয়েব সার্ভার দ্বারা পরিবেশিত ভার্চুয়াল হোস্টের URL সংজ্ঞায়িত করা হয়নি
 NoPageYet=এখনো কোনো পৃষ্ঠা নেই
 YouCanCreatePageOrImportTemplate=আপনি একটি নতুন পৃষ্ঠা তৈরি করতে পারেন বা একটি সম্পূর্ণ ওয়েবসাইট টেমপ্লেট আমদানি করতে পারেন৷
 SyntaxHelp=নির্দিষ্ট সিনট্যাক্স টিপস সাহায্য
 YouCanEditHtmlSourceckeditor=আপনি সম্পাদকের "উৎস" বোতাম ব্যবহার করে HTML সোর্স কোড সম্পাদনা করতে পারেন।
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=একটি শেয়ার লিঙ্কের সাথে শেয়ার করা একটি ছবির জন্য (ফাইলের শেয়ারিং হ্যাশ কী ব্যবহার করে খোলা অ্যাক্সেস), সিনট্যাক্স হল:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;016f7f7f7012 <br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>এইচটিএমএল বা ডায়নামিক কোডের আরও উদাহরণ <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">উইকি ডকুমেন্টেশনb0e40dc6587এ উপলব্ধ >।<br>
 ClonePage=ক্লোন পৃষ্ঠা/ধারক
 CloneSite=ক্লোন সাইট
@@ -87,15 +88,15 @@ WebsiteAccount=ওয়েবসাইট অ্যাকাউন্ট
 WebsiteAccounts=ওয়েবসাইট অ্যাকাউন্ট
 AddWebsiteAccount=ওয়েব সাইট অ্যাকাউন্ট তৈরি করুন
 BackToListForThirdParty=তৃতীয় পক্ষের জন্য তালিকায় ফিরে যান
-DisableSiteFirst=প্রথমে ওয়েবসাইট অক্ষম করুন
+DisableSiteFirst=Put website offline first
 MyContainerTitle=আমার ওয়েব সাইটের শিরোনাম
 AnotherContainer=এইভাবে অন্য পৃষ্ঠা/কন্টেইনারের বিষয়বস্তু অন্তর্ভুক্ত করতে হয় (আপনি যদি ডায়নামিক কোড সক্ষম করেন তাহলে এখানে একটি ত্রুটি থাকতে পারে কারণ এমবেডেড সাবকন্টেইনারটি নাও থাকতে পারে)
 SorryWebsiteIsCurrentlyOffLine=দুঃখিত, এই ওয়েবসাইটটি বর্তমানে অফ লাইন। দয়া করে পরে ফিরে আসবেন...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=প্রতিটি ওয়েবসাইট/তৃতীয় পক্ষের জন্য ওয়েব সাইট অ্যাকাউন্ট (লগইন/পাস) সংরক্ষণ করতে টেবিলটি সক্ষম করুন
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=আপনাকে প্রথমে ডিফল্ট হোম পেজ নির্ধারণ করতে হবে
-OnlyEditionOfSourceForGrabbedContentFuture=সতর্কতা: একটি বহিরাগত ওয়েব পৃষ্ঠা আমদানি করে একটি ওয়েব পৃষ্ঠা তৈরি করা অভিজ্ঞ ব্যবহারকারীদের জন্য সংরক্ষিত৷ উৎস পৃষ্ঠার জটিলতার উপর নির্ভর করে, আমদানির ফলাফল মূল থেকে ভিন্ন হতে পারে। এছাড়াও যদি উত্স পৃষ্ঠাটি সাধারণ CSS শৈলী বা বিরোধপূর্ণ জাভাস্ক্রিপ্ট ব্যবহার করে, তাহলে এই পৃষ্ঠায় কাজ করার সময় এটি ওয়েবসাইট সম্পাদকের চেহারা বা বৈশিষ্ট্যগুলি ভেঙে দিতে পারে। এই পদ্ধতিটি একটি পৃষ্ঠা তৈরি করার একটি দ্রুত উপায় কিন্তু এটি স্ক্র্যাচ থেকে বা একটি প্রস্তাবিত পৃষ্ঠার টেমপ্লেট থেকে আপনার নতুন পৃষ্ঠা তৈরি করার সুপারিশ করা হয়৷<br>এটাও মনে রাখবেন যে ইনলাইন সম্পাদক কাজ নাও করতে পারে একটি গ্র্যাবড বাহ্যিক পৃষ্ঠায় ব্যবহার করার সময় সঠিকতা।
-OnlyEditionOfSourceForGrabbedContent=এইচটিএমএল উৎসের শুধুমাত্র সংস্করণ সম্ভব যখন বিষয়বস্তু একটি বহিরাগত সাইট থেকে দখল করা হয়
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=সিএসএস এবং পৃষ্ঠায় পাওয়া চিত্রগুলিও ধরুন।
 ImagesShouldBeSavedInto=ছবিগুলি ডিরেক্টরিতে সংরক্ষণ করা উচিত
 WebsiteRootOfImages=ওয়েবসাইট ইমেজ জন্য রুট ডিরেক্টরি
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Remove filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Categories
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/bn_IN/admin.lang b/htdocs/langs/bn_IN/admin.lang
index b6ebbe6b665..eca841b88ac 100644
--- a/htdocs/langs/bn_IN/admin.lang
+++ b/htdocs/langs/bn_IN/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=ফাইলের অখণ্ডতা প
 FileIntegritySomeFilesWereRemovedOrModified=ফাইলের অখণ্ডতা পরীক্ষা ব্যর্থ হয়েছে৷ কিছু ফাইল পরিবর্তিত, সরানো বা যোগ করা হয়েছে।
 GlobalChecksum=গ্লোবাল চেকসাম
 MakeIntegrityAnalysisFrom=থেকে অ্যাপ্লিকেশন ফাইলের অখণ্ডতা বিশ্লেষণ করুন
-LocalSignature=এম্বেড করা স্থানীয় স্বাক্ষর (কম নির্ভরযোগ্য)
-RemoteSignature=দূরবর্তী দূরবর্তী স্বাক্ষর (আরো নির্ভরযোগ্য)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=অনুপস্থিত ফাইল
 FilesUpdated=আপডেট করা ফাইল
 FilesModified=পরিবর্তিত ফাইল
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=শুধুমাত্র কিছু এজেন্
 Security=নিরাপত্তা
 Passwords=পাসওয়ার্ড
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=conf.php এ সংরক্ষিত ডাটাবেস পাসওয়ার্ড এনক্রিপ্ট করুন। এই বিকল্পটি সক্রিয় করার জন্য দৃঢ়ভাবে সুপারিশ করা হয়।
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=উত্পন্ন পিডিএফ ফাইল রক্ষা করুন. এটি বাঞ্ছনীয় নয় কারণ এটি বাল্ক পিডিএফ তৈরি করে।
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=গণনা করা ক্ষেত্র
-ComputedFormulaDesc=ডায়নামিক কম্পিউটেড মান পেতে আপনি এখানে বস্তুর অন্যান্য বৈশিষ্ট্য বা যেকোনো পিএইচপি কোডিং ব্যবহার করে একটি সূত্র লিখতে পারেন। আপনি "?" সহ যেকোনো পিএইচপি সামঞ্জস্যপূর্ণ সূত্র ব্যবহার করতে পারেন। কন্ডিশন অপারেটর, এবং নিম্নলিখিত গ্লোবাল অবজেক্ট: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong> >।<br><strong>সতর্কতা</strong>: আপনার যদি কোনো বস্তুর বৈশিষ্ট্যের প্রয়োজন হয় লোড করা হয়নি, দ্বিতীয় উদাহরণের মত আপনার সূত্রে বস্তুটিকে নিয়ে আসুন।<br>একটি গণনা করা ক্ষেত্র ব্যবহার করার অর্থ হল আপনি ইন্টারফেস থেকে নিজেকে কোনো মান লিখতে পারবেন না। এছাড়াও, যদি একটি সিনট্যাক্স ত্রুটি থাকে তবে সূত্রটি কিছুই ফেরত দিতে পারে না।<br><br>সূত্রের উদাহরণ:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>অবজেক্ট পুনরায় লোড করার উদাহরণ<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldreloadedkey'*-j >capital / 5: '-1')<br><br>অবজেক্ট এবং এর মূল বস্তুকে জোর করে লোড করার জন্য সূত্রের অন্য উদাহরণ: <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = নতুন প্রকল্প( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0))? $secondloadedobj->রেফ: 'প্যারেন্ট প্রজেক্ট পাওয়া যায়নি'
+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'
 Computedpersistent=কম্পিউটেড ফিল্ড স্টোর করুন
 ComputedpersistentDesc=গণনা করা অতিরিক্ত ক্ষেত্রগুলি ডাটাবেসে সংরক্ষণ করা হবে, তবে, এই ক্ষেত্রের অবজেক্টটি পরিবর্তিত হলেই মানটি পুনরায় গণনা করা হবে। যদি গণনা করা ক্ষেত্রটি অন্যান্য অবজেক্ট বা গ্লোবাল ডেটার উপর নির্ভর করে তবে এই মানটি ভুল হতে পারে!!
 ExtrafieldParamHelpPassword=এই ক্ষেত্রটি ফাঁকা রাখার অর্থ হল এই মানটি এনক্রিপশন ছাড়াই সংরক্ষণ করা হবে (ক্ষেত্রটি স্ক্রিনে তারা দিয়ে লুকানো আছে)।<br><br>এন্টার করুন একটি বিপরীত এনক্রিপশন অ্যালগরিদমের সাথে মান এনকোড করতে মান 'ডলক্রিপ্ট'। পরিষ্কার ডেটা এখনও জানা এবং সম্পাদনা করা যেতে পারে তবে ডেটাবেসে এনক্রিপ্ট করা হয়৷<br><br>'অটো' (বা 'md5' লিখুন, 'sha256', 'password_hash', ...) ডিফল্ট পাসওয়ার্ড এনক্রিপশন অ্যালগরিদম ব্যবহার করতে (বা md5, sha256, password_hash...) ডাটাবেসে নন-রিভার্সিবল হ্যাশড পাসওয়ার্ড সংরক্ষণ করতে (মূল মান পুনরুদ্ধারের কোনো উপায় নেই)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- ইমেল পাঠানোর জন্য আপনার নিজস্ব ইমেল পরিষেবা প্রদানকারীর SMTP সার্ভার ব্যবহার করাও আকর্ষণীয় তাই অ্যাপ্লিকেশন থেকে পাঠানো সমস্ত ইমেলগুলি আপনার মেলবক্সের "প্রেরিত" ডিরেক্টরিতেও সংরক্ষিত হবে৷
 WarningPHPMailD=তাই ই-মেইল পাঠানোর পদ্ধতিকে "SMTP" মানতে পরিবর্তন করার পরামর্শ দেওয়া হচ্ছে।
 WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
-WarningPHPMail2=যদি আপনার ইমেল SMTP প্রদানকারীর ইমেল ক্লায়েন্টকে কিছু আইপি ঠিকানায় সীমাবদ্ধ করতে হয় (খুব বিরল), এটি আপনার ERP CRM অ্যাপ্লিকেশনের জন্য মেল ব্যবহারকারী এজেন্টের (MUA) IP ঠিকানা: <strong>%s</strong>।
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=অ্যাকাউন্টিং (সরলীকৃত)
 Module10Desc=ডাটাবেস বিষয়বস্তুর উপর ভিত্তি করে সহজ অ্যাকাউন্টিং রিপোর্ট (জার্নাল, টার্নওভার)। কোনো লেজার টেবিল ব্যবহার করে না।
 Module20Name=প্রস্তাব
 Module20Desc=বাণিজ্যিক প্রস্তাব ব্যবস্থাপনা
-Module22Name=গণ ইমেইলিং
-Module22Desc=বাল্ক ইমেল পরিচালনা করুন
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=শক্তি
 Module23Desc=শক্তি খরচ নিরীক্ষণ
 Module25Name=বিক্রয় আদেশ
@@ -847,10 +848,10 @@ Permission212=অর্ডার লাইন
 Permission213=লাইন সক্রিয় করুন
 Permission214=টেলিফোনি সেটআপ করুন
 Permission215=সেটআপ প্রদানকারী
-Permission221=ইমেলগুলি পড়ুন
-Permission222=ইমেলগুলি তৈরি/পরিবর্তন করুন (বিষয়, প্রাপক...)
-Permission223=ইমেলগুলি যাচাই করুন (প্রেরণের অনুমতি দেয়)
-Permission229=ইমেলগুলি মুছুন
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=প্রাপক এবং তথ্য দেখুন
 Permission238=ম্যানুয়ালি মেইলিং পাঠান
 Permission239=যাচাই বা পাঠানোর পরে মেইলিং মুছুন
@@ -1105,6 +1106,7 @@ DictionaryStaff=কর্মচারীর সংখ্যা
 DictionaryAvailability=দেরীতে বিলি
 DictionaryOrderMethods=অর্ডার পদ্ধতি
 DictionarySource=প্রস্তাব/আদেশের উত্স
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=প্রতিবেদনের জন্য ব্যক্তিগতকৃত গোষ্ঠী
 DictionaryAccountancysystem=অ্যাকাউন্টের চার্টের জন্য মডেল
 DictionaryAccountancyJournal=অ্যাকাউন্টিং জার্নাল
@@ -1134,11 +1136,11 @@ BackToDictionaryList=অভিধান তালিকায় ফিরে 
 TypeOfRevenueStamp=ট্যাক্স স্ট্যাম্পের প্রকার
 VATManagement=বিক্রয় কর ব্যবস্থাপনা
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=ডিফল্টরূপে প্রস্তাবিত বিক্রয় কর হল 0 যা সমিতি, ব্যক্তি বা ছোট কোম্পানির মতো ক্ষেত্রে ব্যবহার করা যেতে পারে।
 VATIsUsedExampleFR=ফ্রান্সে, এর অর্থ একটি বাস্তব আর্থিক ব্যবস্থা (সরলীকৃত বাস্তব বা স্বাভাবিক বাস্তব) রয়েছে এমন কোম্পানি বা সংস্থা। একটি সিস্টেম যেখানে ভ্যাট ঘোষণা করা হয়।
 VATIsNotUsedExampleFR=ফ্রান্সে, এর অর্থ হল অ-বিক্রয় কর ঘোষিত সংস্থা বা কোম্পানি, সংস্থা বা উদার পেশা যারা মাইক্রো এন্টারপ্রাইজ ফিসকাল সিস্টেম (ফ্রাঞ্চাইজে সেলস ট্যাক্স) বেছে নিয়েছে এবং কোনও সেলস ট্যাক্স ঘোষণা ছাড়াই একটি ফ্র্যাঞ্চাইজ সেলস ট্যাক্স প্রদান করেছে। এই পছন্দটি ইনভয়েসে "অপ্রযোজ্য বিক্রয় কর - CGI-এর আর্ট-293B" রেফারেন্স প্রদর্শন করবে।
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=বিক্রয় করের ধরন
 LTRate=হার
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=করের সেটআপ অনুযায়ী
 LabelUsedByDefault=কোডের জন্য কোন অনুবাদ পাওয়া না গেলে ডিফল্টরূপে লেবেল ব্যবহার করা হয়
 LabelOnDocuments=নথিতে লেবেল
 LabelOrTranslationKey=লেবেল বা অনুবাদ কী
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=কম্বো তালিকায় গ্রাহক/বি
 AddAdressInList=কম্বো তালিকায় গ্রাহক/বিক্রেতার ঠিকানা প্রদর্শন করুন৷<br>তৃতীয় পক্ষগুলি "The Big Company corp. - 21 jump street 123456 Big town - USA" এর নামের বিন্যাস সহ প্রদর্শিত হবে৷ বিগ কোম্পানি কর্পোরেশন"।
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=তৃতীয় পক্ষের জন্য পছন্দের শিপিং পদ্ধতির জন্য জিজ্ঞাসা করুন।
-FieldEdition=ক্ষেত্রের সংস্করণ %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=উদাহরণ: +2 (শুধুমাত্র টাইমজোন অফসেট সমস্যার সম্মুখীন হলেই পূরণ করুন)
 GetBarCode=বারকোড পান
 NumberingModules=নম্বরিং মডেল
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=বৈধকরণ তারিখে চালান তার
 SuggestedPaymentModesIfNotDefinedInInvoice=ইনভয়েসে সংজ্ঞায়িত না থাকলে ডিফল্টরূপে ইনভয়েসে প্রস্তাবিত পেমেন্ট মোড
 SuggestPaymentByRIBOnAccount=অ্যাকাউন্টে প্রত্যাহার করে অর্থ প্রদানের পরামর্শ দিন
 SuggestPaymentByChequeToAddress=চেকের মাধ্যমে অর্থ প্রদানের পরামর্শ দিন
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=চালান বিনামূল্যে পাঠ্য
 WatermarkOnDraftInvoices=খসড়া চালানে ওয়াটারমার্ক (খালি না থাকলে কিছুই নয়)
 PaymentsNumberingModule=পেমেন্ট নম্বরিং মডেল
@@ -1718,6 +1723,7 @@ CompressionOfResources=HTTP প্রতিক্রিয়াগুলির
 CompressionOfResourcesDesc=উদাহরণস্বরূপ Apache নির্দেশিকা ব্যবহার করে "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=বর্তমান ব্রাউজারগুলির সাথে এমন একটি স্বয়ংক্রিয় সনাক্তকরণ সম্ভব নয়
 DefaultValuesDesc=এখানে আপনি একটি নতুন রেকর্ড তৈরি করার সময় আপনি যে ডিফল্ট মান ব্যবহার করতে চান তা নির্ধারণ করতে পারেন, এবং/অথবা ডিফল্ট ফিল্টার বা বাছাই ক্রম যখন আপনি রেকর্ড তালিকাভুক্ত করেন।
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=ডিফল্ট মান (ফর্মে ব্যবহার করতে)
 DefaultSearchFilters=ডিফল্ট অনুসন্ধান ফিল্টার
 DefaultSortOrder=ডিফল্ট বাছাই আদেশ
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=নাম্বারিং মডিউল পাঠ
 SendingsAbility=গ্রাহক ডেলিভারি জন্য শিপিং শীট সমর্থন
 NoNeedForDeliveryReceipts=বেশিরভাগ ক্ষেত্রে, শিপিং শীটগুলি গ্রাহকের ডেলিভারির জন্য শীট (প্রেরনের জন্য পণ্যের তালিকা) এবং গ্রাহকের দ্বারা প্রাপ্ত এবং স্বাক্ষরিত শীট হিসাবে উভয়ই ব্যবহৃত হয়। তাই পণ্য সরবরাহের রসিদ একটি সদৃশ বৈশিষ্ট্য এবং খুব কমই সক্রিয় করা হয়।
 FreeLegalTextOnShippings=চালান বিনামূল্যে পাঠ্য
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=পণ্য বিতরণ রসিদ নম্বর মডিউল
 DeliveryOrderModel=পণ্য বিতরণ রসিদ মডেল
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=বিতরণ রসিদ বিনামূ
 ##### FCKeditor #####
 AdvancedEditor=উন্নত সম্পাদক
 ActivateFCKeditor=এর জন্য উন্নত সম্পাদক সক্রিয় করুন:
-FCKeditorForNotePublic=উপাদানগুলির "পাবলিক নোট" ক্ষেত্রের WYSIWYG সৃষ্টি/সংস্করণ
-FCKeditorForNotePrivate=উপাদানগুলির "ব্যক্তিগত নোট" ক্ষেত্রের WYSIWYG সৃষ্টি/সংস্করণ
-FCKeditorForCompany=উপাদানগুলির ক্ষেত্রের বর্ণনার WYSIWYG তৈরি/সংস্করণ (পণ্য/পরিষেবা ছাড়া)
-FCKeditorForProductDetails=পণ্যের বর্ণনার WYSIWYG তৈরি/সংস্করণ বা বস্তুর লাইন (প্রস্তাব, অর্ডার, চালান, ইত্যাদি...)।
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=সতর্কতা: এই ক্ষেত্রে এই বিকল্পটি ব্যবহার করা গুরুতরভাবে সুপারিশ করা হয় না কারণ এটি পিডিএফ ফাইল তৈরি করার সময় বিশেষ অক্ষর এবং পৃষ্ঠা বিন্যাসের সমস্যা তৈরি করতে পারে।
-FCKeditorForMailing= গণ ইমেলিংয়ের জন্য WYSIWYG তৈরি/সংস্করণ (সরঞ্জাম->ইমেলিং)
-FCKeditorForUserSignature=ব্যবহারকারীর স্বাক্ষরের WYSIWYG সৃষ্টি/সংস্করণ
-FCKeditorForMail=সমস্ত মেলের জন্য WYSIWYG তৈরি/সংস্করণ (সরঞ্জাম->ইমেলিং ব্যতীত)
-FCKeditorForTicket=টিকিটের জন্য WYSIWYG তৈরি/সংস্করণ
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=স্টক মডিউল সেটআপ
 IfYouUsePointOfSaleCheckModule=আপনি যদি ডিফল্ট বা একটি বাহ্যিক মডিউল দ্বারা সরবরাহিত পয়েন্ট অফ সেল মডিউল (POS) ব্যবহার করেন তবে এই সেটআপটি আপনার POS মডিউল দ্বারা উপেক্ষা করা হতে পারে। বেশিরভাগ POS মডিউলগুলি ডিফল্টভাবে ডিজাইন করা হয়েছে অবিলম্বে একটি চালান তৈরি করতে এবং এখানে বিকল্পগুলি নির্বিশেষে স্টক হ্রাস করতে। সুতরাং আপনার POS থেকে বিক্রয় নিবন্ধন করার সময় আপনার স্টক হ্রাসের প্রয়োজন বা না থাকলে, আপনার POS মডিউল সেটআপও পরীক্ষা করে দেখুন।
@@ -1867,7 +1874,6 @@ Buy=কেনা
 Sell=বিক্রয়
 InvoiceDateUsed=চালানের তারিখ ব্যবহার করা হয়েছে
 YourCompanyDoesNotUseVAT=আপনার কোম্পানিকে ভ্যাট ব্যবহার না করার জন্য সংজ্ঞায়িত করা হয়েছে (হোম - সেটআপ - কোম্পানি/সংস্থা), তাই সেটআপ করার জন্য কোনও ভ্যাট বিকল্প নেই৷
-AccountancyCode=অ্যাকাউন্টিং কোড
 AccountancyCodeSell=বিক্রয় হিসাব। কোড
 AccountancyCodeBuy=ক্রয় অ্যাকাউন্ট। কোড
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=একটি নতুন ট্যাক্স তৈরি করার সময় ডিফল্টরূপে "স্বয়ংক্রিয়ভাবে অর্থপ্রদান তৈরি করুন" চেকবক্সটি খালি রাখুন
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = মেনু এজেন্ডা নির্বাচ
 AGENDA_EVENT_PAST_COLOR = অতীত ঘটনার রঙ
 AGENDA_EVENT_CURRENT_COLOR = বর্তমান ইভেন্টের রঙ
 AGENDA_EVENT_FUTURE_COLOR = ভবিষ্যতের ইভেন্টের রঙ
-AGENDA_REMINDER_BROWSER = ইভেন্ট অনুস্মারক সক্ষম করুন <b>ব্যবহারকারীর ব্রাউজারে</b> (যখন স্মরণ করিয়ে দেওয়ার তারিখে পৌঁছে যায়, তখন ব্রাউজার দ্বারা একটি পপআপ দেখানো হয়। প্রতিটি ব্যবহারকারী করতে পারেন এর ব্রাউজার বিজ্ঞপ্তি সেটআপ থেকে এই ধরনের বিজ্ঞপ্তিগুলি অক্ষম করুন)।
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = শব্দ বিজ্ঞপ্তি সক্রিয় করুন
-AGENDA_REMINDER_EMAIL = ইভেন্ট অনুস্মারক সক্ষম করুন <b>ইমেল দ্বারা</b> (প্রতিটি ইভেন্টে অনুস্মারক বিকল্প/বিলম্ব সংজ্ঞায়িত করা যেতে পারে)।
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = দ্রষ্টব্য: নির্ধারিত কাজের ফ্রিকোয়েন্সি %s সঠিক মুহুর্তে অনুস্মারক পাঠানো হয়েছে তা নিশ্চিত করার জন্য যথেষ্ট হতে হবে।
 AGENDA_SHOW_LINKED_OBJECT = এজেন্ডা ভিউতে লিঙ্ক করা অবজেক্ট দেখান
 AGENDA_USE_EVENT_TYPE = ইভেন্টের ধরন ব্যবহার করুন (মেনু সেটআপে পরিচালিত -> অভিধান -> এজেন্ডা ইভেন্টের ধরন)
 AGENDA_USE_EVENT_TYPE_DEFAULT = ইভেন্ট তৈরি ফর্মে ইভেন্টের প্রকারের জন্য স্বয়ংক্রিয়ভাবে এই ডিফল্ট মান সেট করুন
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = রপ্তানি লিঙ্ক অনুমোদন করার কী
 PastDelayVCalExport=এর চেয়ে পুরানো ইভেন্ট রপ্তানি করবেন না
 SecurityKey = নিরাপত্তা কী
@@ -2006,7 +2017,7 @@ BackupZipWizard=নথির ডিরেক্টরির সংরক্ষ
 SomethingMakeInstallFromWebNotPossible=নিম্নলিখিত কারণে ওয়েব ইন্টারফেস থেকে বাহ্যিক মডিউল ইনস্টল করা সম্ভব নয়:
 SomethingMakeInstallFromWebNotPossible2=এই কারণে, এখানে বর্ণিত আপগ্রেড করার প্রক্রিয়াটি একটি ম্যানুয়াল প্রক্রিয়া শুধুমাত্র একজন বিশেষ সুবিধাপ্রাপ্ত ব্যবহারকারী সম্পাদন করতে পারেন।
 InstallModuleFromWebHasBeenDisabledContactUs=অ্যাপ্লিকেশন থেকে বাহ্যিক মডিউল বা গতিশীল ওয়েবসাইটগুলির ইনস্টল বা বিকাশ বর্তমানে নিরাপত্তার উদ্দেশ্যে লক করা আছে। আপনি যদি এই বৈশিষ্ট্যটি সক্ষম করতে চান তাহলে অনুগ্রহ করে আমাদের সাথে যোগাযোগ করুন৷
-InstallModuleFromWebHasBeenDisabledByFile=অ্যাপ্লিকেশন থেকে বহিরাগত মডিউল ইনস্টল আপনার প্রশাসক দ্বারা নিষ্ক্রিয় করা হয়েছে. এটির অনুমতি দেওয়ার জন্য আপনাকে অবশ্যই তাকে <strong>%s</strong> ফাইলটি সরাতে বলতে হবে বৈশিষ্ট্য
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=মাউস সরে গেলে টেবিল লাইন হাইলাইট করুন
 HighlightLinesColor=মাউস অতিক্রম করার সময় লাইনের রঙ হাইলাইট করুন (হাইলাইট না করার জন্য 'ffffff' ব্যবহার করুন)
@@ -2036,6 +2047,7 @@ Enter0or1=0 বা 1 লিখুন
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=এখানে ধনুর্বন্ধনীর মধ্যে লিখুন, বাইট নম্বরের তালিকা যা মুদ্রার প্রতীককে উপস্থাপন করে। উদাহরণস্বরূপ: $ এর জন্য, লিখুন [36] - ব্রাজিলের আসল R$ [82,36] - € এর জন্য, [8364] লিখুন
 ColorFormat=RGB রঙটি HEX ফর্ম্যাটে, যেমন: FF0000৷
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=বিন্যাসে আইকনের নাম:<br>- বর্তমান থিম ডিরেক্টরিতে একটি চিত্র ফাইলের জন্য image.png<br>- image.png@module যদি ফাইলটি একটি মডিউলের /img/ ডিরেক্টরিতে থাকে<br>- একটি FontAwesome fa-xxx ছবির জন্য fa-xxx<br>- একটি FontAwesome fa-xxx পিক্টোর জন্য fontawesome_xxx_fa_color_size (উপসর্গ, রঙ এবং আকার সেট সহ)
 PositionIntoComboList=কম্বো তালিকায় লাইনের অবস্থান
 SellTaxRate=বিক্রয় করের হার
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=প্রেরকের ঠিকানা ফ্রেমে সীমানা লুকান
 MAIN_PDF_NO_RECIPENT_FRAME=প্রাপকের ঠিকানা ফ্রেমে সীমানা লুকান
 MAIN_PDF_HIDE_CUSTOMER_CODE=গ্রাহক কোড লুকান
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=ঠিকানা ব্লকে প্রেরক/কোম্পানীর নাম লুকান
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=পেমেন্ট শর্ত লুকান
 PROPOSAL_PDF_HIDE_PAYMENTMODE=পেমেন্ট মোড লুকান
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=সুপারিশ করা হয় না
 ARestrictedPath=ডেটা ফাইলের জন্য কিছু সীমাবদ্ধ পথ
 CheckForModuleUpdate=বাহ্যিক মডিউল আপডেটের জন্য পরীক্ষা করুন
 CheckForModuleUpdateHelp=এই ক্রিয়াটি একটি নতুন সংস্করণ উপলব্ধ কিনা তা পরীক্ষা করতে বাহ্যিক মডিউলগুলির সম্পাদকদের সাথে সংযোগ করবে৷
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=একটি আপডেট উপলব্ধ
 NoExternalModuleWithUpdate=বাহ্যিক মডিউলগুলির জন্য কোন আপডেট পাওয়া যায়নি
 SwaggerDescriptionFile=Swagger API বর্ণনা ফাইল (উদাহরণস্বরূপ redoc এর সাথে ব্যবহারের জন্য)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=শিপিং ঠিকানা দেখান
 INVOICE_SHOW_SHIPPING_ADDRESSMore=কিছু দেশে বাধ্যতামূলক ইঙ্গিত (ফ্রান্স, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=সামাজিক নেটওয়ার্কের ইউআরএল লিঙ্ক। সামাজিক নেটওয়ার্ক আইডি ধারণ করে এমন পরিবর্তনশীল অংশের জন্য {socialid} ব্যবহার করুন।
 IfThisCategoryIsChildOfAnother=এই শ্রেনীর যদি অন্য একজনের সন্তান হয়
 DarkThemeMode=গাঢ় থিম মোড
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=সতর্কতা: মড
 WarningModuleHasChangedSecurityCsrfParameter=সতর্কতা: মডিউল %s আপনার উদাহরণের CSRF নিরাপত্তা নিষ্ক্রিয় করেছে। এই ক্রিয়াটি সন্দেহজনক এবং আপনার ইনস্টলেশন আর সুরক্ষিত নাও হতে পারে৷ ব্যাখ্যার জন্য মডিউল লেখকের সাথে যোগাযোগ করুন.
 EMailsInGoingDesc=ইনকামিং ইমেলগুলি %s মডিউল দ্বারা পরিচালিত হয়৷ আপনি যদি ইনগোয়িং ইমেলগুলিকে সমর্থন করতে চান তবে আপনাকে অবশ্যই এটি সক্ষম এবং কনফিগার করতে হবে৷
 MAIN_IMAP_USE_PHPIMAP=নেটিভ PHP IMAP-এর পরিবর্তে IMAP-এর জন্য PHP-IMAP লাইব্রেরি ব্যবহার করুন। এটি IMAP এর জন্য একটি OAuth2 সংযোগ ব্যবহারের অনুমতি দেয় (মডিউল OAuthও সক্রিয় করা আবশ্যক)৷
-MAIN_CHECKBOX_LEFT_COLUMN=বাম দিকে ক্ষেত্র এবং লাইন নির্বাচনের জন্য কলাম দেখান (ডিফল্টরূপে ডানদিকে)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=ডিফল্টরূপে তৈরি করা হয় না. শুধুমাত্র মডিউল অ্যাক্টিভেশনে তৈরি করা হয়েছে।
 CSSPage=CSS শৈলী
 Defaultfortype=ডিফল্ট
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/bn_IN/banks.lang b/htdocs/langs/bn_IN/banks.lang
index 03a6ca86748..be86b8f2d9b 100644
--- a/htdocs/langs/bn_IN/banks.lang
+++ b/htdocs/langs/bn_IN/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=শেষ ভারসাম্য
 CurrentBalance=বর্তমান হিসাব
 FutureBalance=ভবিষ্যতের ভারসাম্য
 ShowAllTimeBalance=শুরু থেকে ব্যালেন্স দেখান
-AllTime=শুরু থেকেই
 Reconciliation=মিলন
 RIB=ব্যাংক একাউন্ট নম্বর
 IBAN=ইবান সংখ্যা
@@ -133,7 +132,7 @@ DeleteTransaction=লেখা মুছে ফেলো
 ConfirmDeleteTransaction=আপনি কি এই এন্ট্রি মুছে ফেলার বিষয়ে নিশ্চিত?
 ThisWillAlsoDeleteBankRecord=এটি জেনারেট করা ব্যাঙ্ক এন্ট্রিও মুছে দেবে৷
 BankMovements=আন্দোলন
-PlannedTransactions=পরিকল্পিত এন্ট্রি
+PlannedTransactions=Upcoming entries
 Graph=গ্রাফ
 ExportDataset_banque_1=ব্যাঙ্ক এন্ট্রি এবং অ্যাকাউন্ট স্টেটমেন্ট
 ExportDataset_banque_2=আমানত স্লিপ
@@ -151,7 +150,7 @@ FutureTransaction=ভবিষ্যতের লেনদেন। মিটম
 SelectChequeTransactionAndGenerate=চেক জমার রসিদে অন্তর্ভুক্ত করা চেকগুলি নির্বাচন/ফিল্টার করুন। তারপরে, "তৈরি করুন" এ ক্লিক করুন।
 SelectPaymentTransactionAndGenerate=%s জমার রসিদে অন্তর্ভুক্ত করা নথিগুলি নির্বাচন/ফিল্টার করুন৷ তারপরে, "তৈরি করুন" এ ক্লিক করুন।
 InputReceiptNumber=সমঝোতার সাথে সম্পর্কিত ব্যাঙ্ক স্টেটমেন্ট বেছে নিন। একটি বাছাইযোগ্য সংখ্যাসূচক মান ব্যবহার করুন
-InputReceiptNumberBis=YYYYMM বা YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=মিটমাট করা?
 ThenCheckLinesAndConciliate=তারপর, ব্যাঙ্ক স্টেটমেন্টে উপস্থিত লাইনগুলি পরীক্ষা করুন এবং ক্লিক করুন
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=এই ফাংশনটি সক্ষম হলে,
 BankColorizeMovementName1=ডেবিট আন্দোলনের জন্য পটভূমির রঙ
 BankColorizeMovementName2=ক্রেডিট আন্দোলনের জন্য পটভূমির রঙ
 IfYouDontReconcileDisableProperty=আপনি যদি কিছু ব্যাঙ্ক অ্যাকাউন্টে ব্যাঙ্ক পুনর্মিলন না করেন, তাহলে এই সতর্কতা মুছে ফেলার জন্য তাদের উপর "%s" সম্পত্তি অক্ষম করুন।
-NoBankAccountDefined=কোন ব্যাঙ্ক অ্যাকাউন্ট সংজ্ঞায়িত
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=ব্যাঙ্ক অ্যাকাউন্টে কোনও রেকর্ড পাওয়া যায়নি। সাধারণত, এটি ঘটে যখন ব্যাঙ্ক অ্যাকাউন্টের লেনদেনের তালিকা থেকে একটি রেকর্ড ম্যানুয়ালি মুছে ফেলা হয় (উদাহরণস্বরূপ ব্যাঙ্ক অ্যাকাউন্টের পুনর্মিলনের সময়)। আরেকটি কারণ হল যখন মডিউল "%s" নিষ্ক্রিয় ছিল তখন অর্থপ্রদান রেকর্ড করা হয়েছিল৷
 AlreadyOneBankAccount=ইতিমধ্যে একটি ব্যাঙ্ক অ্যাকাউন্ট সংজ্ঞায়িত করা হয়েছে৷
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA ফাইলের বৈকল্পিক
diff --git a/htdocs/langs/bn_IN/blockedlog.lang b/htdocs/langs/bn_IN/blockedlog.lang
index 19456d83fc3..60ffdfd098c 100644
--- a/htdocs/langs/bn_IN/blockedlog.lang
+++ b/htdocs/langs/bn_IN/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=অপরিবর্তনীয় লগ
 ShowAllFingerPrintsMightBeTooLong=সমস্ত সংরক্ষণাগারভুক্ত লগ দেখান (দীর্ঘ হতে পারে)
 ShowAllFingerPrintsErrorsMightBeTooLong=সমস্ত অ-বৈধ সংরক্ষণাগার লগ দেখান (দীর্ঘ হতে পারে)
 DownloadBlockChain=আঙ্গুলের ছাপ ডাউনলোড করুন
-KoCheckFingerprintValidity=সংরক্ষণাগারভুক্ত লগ এন্ট্রি বৈধ নয়. এর অর্থ কেউ (একজন হ্যাকার?) এই রেকর্ডের কিছু ডেটা রেকর্ড করার পরে পরিবর্তন করেছে, বা আগের সংরক্ষণাগারভুক্ত রেকর্ডটি মুছে দিয়েছে (আগের # বিদ্যমান আছে সেই লাইনটি পরীক্ষা করে দেখুন) বা পূর্ববর্তী রেকর্ডের চেকসাম পরিবর্তন করেছেন।
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=সংরক্ষণাগারভুক্ত লগ রেকর্ড বৈধ। এই লাইনের ডেটা পরিবর্তন করা হয়নি এবং এন্ট্রিটি আগেরটি অনুসরণ করে।
 OkCheckFingerprintValidityButChainIsKo=সংরক্ষণাগারভুক্ত লগটি আগেরটির তুলনায় বৈধ বলে মনে হচ্ছে তবে চেইনটি আগে দূষিত হয়েছিল৷
 AddedByAuthority=দূরবর্তী কর্তৃপক্ষের মধ্যে সংরক্ষিত
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=লগ বিবরণ
 ListOfTrackedEvents=ট্র্যাক করা ইভেন্টের তালিকা
 Fingerprint=আঙুলের ছাপ
 DownloadLogCSV=সংরক্ষণাগারভুক্ত লগ রপ্তানি করুন (CSV)
-DataOfArchivedEvent=আর্কাইভ করা ইভেন্টের সম্পূর্ণ ডেটা
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=আসল বস্তু (টাইপ %s, id %s) লিঙ্কযুক্ত নয় (অপরিবর্তনীয় সংরক্ষিত ডেটা পেতে 'সম্পূর্ণ ডেটা' কলাম দেখুন)
 BlockedLogAreRequiredByYourCountryLegislation=আপনার দেশের আইন দ্বারা অপরিবর্তনীয় লগ মডিউল প্রয়োজন হতে পারে। এই মডিউলটি অক্ষম করলে ভবিষ্যতের যেকোন লেনদেন আইন এবং আইনি সফ্টওয়্যার ব্যবহারের ক্ষেত্রে অবৈধ হতে পারে কারণ সেগুলি ট্যাক্স অডিট দ্বারা যাচাই করা যায় না।
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=আপনার দেশের আইনের কারণে অপরিবর্তনীয় লগ মডিউল সক্রিয় করা হয়েছে। এই মডিউলটি নিষ্ক্রিয় করা ভবিষ্যতের যেকোন লেনদেন আইন এবং আইনি সফ্টওয়্যার ব্যবহারের ক্ষেত্রে অবৈধ হতে পারে কারণ সেগুলি ট্যাক্স অডিট দ্বারা যাচাই করা যায় না।
@@ -30,6 +32,7 @@ BlockedLogEnabled=অপরিবর্তনীয় লগগুলিতে
 BlockedLogDisabled=কিছু রেকর্ডিং সম্পন্ন হওয়ার পর অপরিবর্তনীয় লগগুলিতে ইভেন্ট ট্র্যাক করার সিস্টেমটি নিষ্ক্রিয় করা হয়েছে৷ চেইনটিকে ভাঙা হিসাবে ট্র্যাক করতে আমরা একটি বিশেষ ফিঙ্গারপ্রিন্ট সংরক্ষণ করেছি
 BlockedLogDisabledBis=অপরিবর্তনীয় লগগুলিতে ইভেন্ট ট্র্যাক করার সিস্টেম নিষ্ক্রিয় করা হয়েছে৷ এটি সম্ভব কারণ এখনও কোন রেকর্ড করা হয়নি।
 LinkHasBeenDisabledForPerformancePurpose=কার্য সম্পাদনের উদ্দেশ্যে, 100 তম লাইনের পরে নথিতে সরাসরি লিঙ্ক দেখানো হয় না।
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=গ্রাহক চালান যৌক্তিকভাবে মুছে ফেলা হয়েছে
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=গ্রাহক অর্থপ্রদান য
 logPAYMENT_VARIOUS_CREATE=অর্থপ্রদান (একটি চালানে বরাদ্দ করা হয়নি) তৈরি করা হয়েছে৷
 logPAYMENT_VARIOUS_DELETE=অর্থপ্রদান (একটি চালানে বরাদ্দ করা হয়নি) যৌক্তিক মুছে ফেলা
 logPAYMENT_VARIOUS_MODIFY=অর্থপ্রদান (একটি চালানে বরাদ্দ করা হয়নি) সংশোধন করা হয়েছে৷
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/bn_IN/categories.lang b/htdocs/langs/bn_IN/categories.lang
index 6ee423cae44..7c2872819b2 100644
--- a/htdocs/langs/bn_IN/categories.lang
+++ b/htdocs/langs/bn_IN/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=যোগাযোগ ট্যাগ/বিভাগ এ
 AccountsCategoriesArea=ব্যাঙ্ক অ্যাকাউন্ট ট্যাগ/বিভাগ এলাকা
 ProjectsCategoriesArea=প্রকল্প ট্যাগ/বিভাগ এলাকা
 UsersCategoriesArea=ব্যবহারকারীর ট্যাগ/বিভাগ এলাকা
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=উপ-শ্রেণী
 CatList=ট্যাগ/বিভাগের তালিকা
 CatListAll=ট্যাগ/বিভাগের তালিকা (সব ধরনের)
@@ -90,9 +91,10 @@ CategoriesSetup=ট্যাগ/বিভাগ সেটআপ
 CategorieRecursiv=স্বয়ংক্রিয়ভাবে অভিভাবক ট্যাগ/বিভাগের সাথে লিঙ্ক করুন
 CategorieRecursivHelp=যদি বিকল্পটি চালু থাকে, আপনি যখন একটি উপশ্রেণীতে একটি অবজেক্ট যোগ করেন, তখন অবজেক্টটিও প্যারেন্ট ক্যাটাগরিতে যোগ করা হবে।
 AddProductServiceIntoCategory=পণ্য/পরিষেবার জন্য বিভাগ বরাদ্দ করুন
-AddCustomerIntoCategory=গ্রাহককে বিভাগ বরাদ্দ করুন
-AddSupplierIntoCategory=সরবরাহকারীকে বিভাগ বরাদ্দ করুন
-AssignCategoryTo=কে বিভাগ বরাদ্দ করুন
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=ট্যাগ/বিভাগ দেখান
 ByDefaultInList=তালিকায় ডিফল্টরূপে
 ChooseCategory=বিভাগ নির্বাচন
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=পৃষ্ঠা-ধারক বিভাগ
 KnowledgemanagementsCategoriesArea=KM নিবন্ধ বিভাগ
 UseOrOperatorForCategories=বিভাগের জন্য 'OR' অপারেটর ব্যবহার করুন
 AddObjectIntoCategory=বিভাগে বরাদ্দ করুন
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/bn_IN/companies.lang b/htdocs/langs/bn_IN/companies.lang
index f8161e21a98..3efb540061f 100644
--- a/htdocs/langs/bn_IN/companies.lang
+++ b/htdocs/langs/bn_IN/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=দেশটি ইউরোপীয় অর্থনৈতি
 PriceFormatInCurrentLanguage=বর্তমান ভাষা এবং মুদ্রায় মূল্য প্রদর্শন বিন্যাস
 ThirdPartyName=তৃতীয় পক্ষের নাম
 ThirdPartyEmail=তৃতীয় পক্ষের ইমেল
-ThirdParty=তৃতীয় পক্ষ
-ThirdParties=তৃতীয় পক্ষ
+ThirdParty=Third party
+ThirdParties=Third parties
 ThirdPartyProspects=সম্ভাবনা
 ThirdPartyProspectsStats=সম্ভাবনা
 ThirdPartyCustomers=গ্রাহকদের
@@ -65,6 +65,7 @@ State=রাজ্য/প্রদেশ
 StateId=রাজ্য আইডি
 StateCode=রাজ্য/প্রদেশ কোড
 StateShort=অবস্থা
+DepartmentBuyer=Buyer's state/province
 Region=অঞ্চল
 Region-State=অঞ্চল - রাজ্য
 Country=দেশ
@@ -78,7 +79,7 @@ Chat=চ্যাট
 PhonePro=বাস। ফোন
 PhonePerso=পারস ফোন
 PhoneMobile=মুঠোফোন
-No_Email=বাল্ক ইমেল প্রত্যাখ্যান
+No_Email=Refuse mass emails
 Fax=ফ্যাক্স
 Zip=জিপ কোড
 Town=শহর
@@ -382,11 +383,12 @@ ExportCardToFormat=ফরম্যাটে কার্ড রপ্তান
 ContactNotLinkedToCompany=যোগাযোগ কোনো তৃতীয় পক্ষের সাথে লিঙ্ক করা নেই
 DolibarrLogin=Dolibarr লগইন
 NoDolibarrAccess=Dolibarr অ্যাক্সেস নেই
-ExportDataset_company_1=তৃতীয় পক্ষ (কোম্পানী/ফাউন্ডেশন/ভৌতিক ব্যক্তি) এবং তাদের বৈশিষ্ট্য
-ExportDataset_company_2=পরিচিতি এবং তাদের বৈশিষ্ট্য
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=তৃতীয় পক্ষ এবং তাদের বৈশিষ্ট্য
 ImportDataset_company_2=তৃতীয় পক্ষের অতিরিক্ত পরিচিতি/ঠিকানা এবং বৈশিষ্ট্য
-ImportDataset_company_3=তৃতীয় পক্ষের ব্যাঙ্ক অ্যাকাউন্ট
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=তৃতীয় পক্ষের বিক্রয় প্রতিনিধি (কোম্পানিগুলিতে বিক্রয় প্রতিনিধি/ব্যবহারকারীকে বরাদ্দ করুন)
 PriceLevel=মূল্যস্তর
 PriceLevelLabels=মূল্য স্তর লেবেল
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=ম্যানেজার(দের) নাম (সিইও, ডিরেক্টর, প্রেসিডেন্ট...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=তৃতীয় পক্ষকে একত্রিত করুন
-ConfirmMergeThirdparties=আপনি কি বর্তমানের সাথে নির্বাচিত তৃতীয় পক্ষকে মার্জ করার বিষয়ে নিশ্চিত? সমস্ত লিঙ্ক করা বস্তু (চালান, আদেশ, ...) বর্তমান তৃতীয় পক্ষের কাছে সরানো হবে, তারপরে নির্বাচিত তৃতীয় পক্ষ মুছে ফেলা হবে৷
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=তৃতীয় পক্ষকে একীভূত করা হয়েছে
 SaleRepresentativeLogin=বিক্রয় প্রতিনিধির লগইন
 SaleRepresentativeFirstname=বিক্রয় প্রতিনিধির প্রথম নাম
@@ -460,3 +462,6 @@ ExternalSystemID=বাহ্যিক সিস্টেম আইডি
 IDOfPaymentInAnExternalSystem=একটি বাহ্যিক সিস্টেমে পেমেন্ট মোডের আইডি (যেমন স্ট্রাইপ, পেপ্যাল, ...)
 AADEWebserviceCredentials=AADE ওয়েবসার্ভিস শংসাপত্র
 ThirdPartyMustBeACustomerToCreateBANOnStripe=স্ট্রাইপ সাইডে তার ব্যাঙ্কের তথ্য তৈরি করার অনুমতি দেওয়ার জন্য তৃতীয় পক্ষকে অবশ্যই একজন গ্রাহক হতে হবে
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/bn_IN/compta.lang b/htdocs/langs/bn_IN/compta.lang
index 0d170302967..3928e9a34ed 100644
--- a/htdocs/langs/bn_IN/compta.lang
+++ b/htdocs/langs/bn_IN/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=গ্রাহক চালান পেমেন্ট
 PaymentSupplierInvoice=বিক্রেতা চালান প্রদান
 PaymentSocialContribution=সামাজিক/আর্থিক কর প্রদান
 PaymentVat=ভ্যাট প্রদান
-AutomaticCreationPayment=স্বয়ংক্রিয়ভাবে পেমেন্ট রেকর্ড
+AutomaticCreationPayment=Also record the payment
 ListPayment=অর্থপ্রদানের তালিকা
 ListOfCustomerPayments=গ্রাহক পেমেন্ট তালিকা
 ListOfSupplierPayments=বিক্রেতা পেমেন্ট তালিকা
@@ -118,10 +118,14 @@ SocialContributionsPayments=সামাজিক/আর্থিক কর প
 ShowVatPayment=ভ্যাট পেমেন্ট দেখান
 TotalToPay=পরিশোধ করতে মোট
 BalanceVisibilityDependsOnSortAndFilters=সারণীটি %s এ সাজানো থাকলে এবং 1টি ব্যাঙ্ক অ্যাকাউন্টে ফিল্টার করা থাকলেই এই তালিকায় ব্যালেন্স দেখা যায় (অন্য কোনো ফিল্টার ছাড়াই)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=গ্রাহক অ্যাকাউন্টিং কোড
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=বিক্রেতা অ্যাকাউন্টিং কোড
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=কাস্ট। অ্যাকাউন্ট কোড
 SupplierAccountancyCodeShort=Sup. অ্যাকাউন্ট কোড
+UserAccountancyCodeShort=User account. code
 AccountNumber=হিসাব নাম্বার
 NewAccountingAccount=নতুন হিসাব
 Turnover=টার্নওভার চালান
@@ -129,7 +133,9 @@ TurnoverCollected=টার্নওভার সংগৃহীত
 SalesTurnoverMinimum=ন্যূনতম টার্নওভার
 ByExpenseIncome=খরচ এবং আয় দ্বারা
 ByThirdParties=তৃতীয় পক্ষের দ্বারা
+ByProjects=By projects
 ByUserAuthorOfInvoice=চালান লেখক দ্বারা
+DetailedListLowercase=detailed list
 CheckReceipt=আমানত স্লিপ
 CheckReceiptShort=আমানত স্লিপ
 LastCheckReceiptShort=সর্বশেষ %s জমা স্লিপ
diff --git a/htdocs/langs/bn_IN/datapolicy.lang b/htdocs/langs/bn_IN/datapolicy.lang
index d6cf39293f1..c7b474e2d87 100644
--- a/htdocs/langs/bn_IN/datapolicy.lang
+++ b/htdocs/langs/bn_IN/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = ডেটা গোপনীয়তা নীতি
 Module4100Desc = ডেটা গোপনীয়তা পরিচালনার মডিউল (জিডিপিআরের সাথে সামঞ্জস্যপূর্ণ)
 # Administration page
 datapolicySetup = মডিউল ডেটা গোপনীয়তা নীতি সেটআপ
-Deletion = ডেটা মুছে ফেলা
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s মাস
 ONE_YEAR = 1 বছর
 NB_YEARS = %s বছর
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = প্রত্যাশা গ্রাহ
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = না সম্ভাবনা/না গ্রাহক
 DATAPOLICY_CONTACT_FOURNISSEUR = সরবরাহকারী
 DATAPOLICY_ADHERENT = সদস্য
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = আপনি আপনার সমস্ত প্রাসঙ্গিক পরিচিতিদের একটি GDPR ইমেল পাঠাতে পারেন (যারা এখনও একটি ইমেল পাননি এবং যার জন্য আপনি তাদের GDPR চুক্তি সম্পর্কে কিছু নিবন্ধন করেননি)। এটি করতে, নিম্নলিখিত বোতামটি ব্যবহার করুন।
 SendAgreement = ইমেইল পাঠান
 AllAgreementSend = সব ইমেইল পাঠানো হয়েছে
 TXTLINKDATAPOLICYACCEPT = লিঙ্কের জন্য পাঠ্য "চুক্তি"
 TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = জিডিপিআর: ব্যক্তিগত তথ্য প্রক্রিয়াকরণ
 DATAPOLICY_consentement = ব্যক্তিগত তথ্য প্রক্রিয়াকরণের জন্য সম্মতি প্রাপ্ত
diff --git a/htdocs/langs/bn_IN/errors.lang b/htdocs/langs/bn_IN/errors.lang
index d3d763014ac..ffbc66db8ba 100644
--- a/htdocs/langs/bn_IN/errors.lang
+++ b/htdocs/langs/bn_IN/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=একটি ডিরেক্টরি তৈরি করতে ব্যর্থ হয়েছে৷ ওয়েব সার্ভার ব্যবহারকারীর ডলিবার ডকুমেন্ট ডিরেক্টরিতে লেখার অনুমতি আছে কিনা তা পরীক্ষা করুন। যদি এই PHP-এ প্যারামিটার <b>safe_mode</b> সক্ষম করা থাকে, তাহলে দেখুন Dolibarr php ফাইলগুলি ওয়েব সার্ভার ব্যবহারকারীর (বা গ্রুপ) মালিকানাধীন।
 ErrorNoMailDefinedForThisUser=এই ব্যবহারকারীর জন্য কোনো মেল সংজ্ঞায়িত করা হয়নি
 ErrorSetupOfEmailsNotComplete=ইমেল সেটআপ সম্পূর্ণ হয়নি
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=এই বৈশিষ্ট্যটি কাজ করার জন্য জাভাস্ক্রিপ্ট সক্রিয় করা প্রয়োজন। সেটআপ - প্রদর্শনে এটি পরিবর্তন করুন।
 ErrorTopMenuMustHaveAParentWithId0='টপ' টাইপের একটি মেনুতে একটি মূল মেনু থাকতে পারে না। মূল মেনুতে 0 রাখুন বা 'বাম' টাইপের একটি মেনু বেছে নিন।
 ErrorLeftMenuMustHaveAParentId='বাম' টাইপের একটি মেনুতে একটি অভিভাবক আইডি থাকতে হবে।
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=একটি PHP/Apache প্লাগইন দ্
 ErrorFileSizeTooLarge=ফাইলের আকার খুব বড় বা ফাইল দেওয়া হয়নি৷
 ErrorFieldTooLong=%s ক্ষেত্রটি অত্যন্ত দীর্ঘ৷
 ErrorSizeTooLongForIntType=int টাইপের জন্য সাইজ অনেক বড় (%s সংখ্যা সর্বাধিক)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=স্ট্রিং টাইপের জন্য সাইজ অনেক বড় (%s অক্ষর সর্বাধিক)
 ErrorNoValueForSelectType=নির্বাচন তালিকার জন্য মান পূরণ করুন
 ErrorNoValueForCheckBoxType=চেকবক্স তালিকার জন্য মান পূরণ করুন
@@ -138,8 +140,9 @@ ErrorBadValueForCode=নিরাপত্তা কোডের জন্য 
 ErrorBothFieldCantBeNegative=ক্ষেত্র %s এবং %s উভয়ই নেতিবাচক হতে পারে না
 ErrorFieldCantBeNegativeOnInvoice=এই ধরনের চালানের ক্ষেত্রে <strong>%s</strong> নেতিবাচক হতে পারে না। আপনি যদি একটি ডিসকাউন্ট লাইন যোগ করতে চান তবে প্রথমে ডিসকাউন্ট তৈরি করুন (তৃতীয় পক্ষের কার্ডে '%s' ফিল্ড থেকে) এবং চালানে এটি প্রয়োগ করুন।
 ErrorLinesCantBeNegativeForOneVATRate=প্রদত্ত শূন্য ভ্যাট হারের জন্য মোট লাইন (করের নেট) ঋণাত্মক হতে পারে না (ভ্যাট হারের জন্য একটি ঋণাত্মক মোট পাওয়া গেছে <b>%s </b>%%)।
-ErrorLinesCantBeNegativeOnDeposits=একটি ডিপোজিটে লাইন ঋণাত্মক হতে পারে না। আপনি সমস্যার সম্মুখীন হবেন যখন আপনি যদি তা করেন তাহলে চূড়ান্ত চালানে আমানত গ্রহণ করতে হবে।
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=গ্রাহক চালানগুলিতে লাইনের পরিমাণ নেতিবাচক হতে পারে না
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=ওয়েব সার্ভার চালানোর জন্য ব্যবহৃত ব্যবহারকারীর অ্যাকাউন্ট <b>%s</b> ব্যবহার করার অনুমতি নেই যে
 ErrorNoActivatedBarcode=কোন বারকোড টাইপ সক্রিয় করা হয়নি
 ErrUnzipFails=ZipArchive দিয়ে %s আনজিপ করতে ব্যর্থ হয়েছে
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=আপনার PHP প্যারামিটার upload_max_filesize (%s) PHP প্যারামিটার post_max_size (%s) থেকে বেশি। এটি একটি সামঞ্জস্যপূর্ণ সেটআপ নয়।
 WarningPasswordSetWithNoAccount=এই সদস্যের জন্য একটি পাসওয়ার্ড সেট করা হয়েছে৷ তবে কোনো ব্যবহারকারীর অ্যাকাউন্ট তৈরি হয়নি। তাই এই পাসওয়ার্ড সংরক্ষণ করা হয় কিন্তু Dolibarr লগইন করতে ব্যবহার করা যাবে না. এটি একটি বাহ্যিক মডিউল/ইন্টারফেস দ্বারা ব্যবহার করা যেতে পারে কিন্তু যদি আপনাকে কোনো সদস্যের জন্য কোনো লগইন বা পাসওয়ার্ড নির্ধারণ করতে না হয়, তাহলে আপনি সদস্য মডিউল সেটআপ থেকে "প্রতিটি সদস্যের জন্য একটি লগইন পরিচালনা করুন" বিকল্পটি নিষ্ক্রিয় করতে পারেন৷ আপনার যদি লগইন পরিচালনা করতে হয় কিন্তু কোনো পাসওয়ার্ডের প্রয়োজন না হয়, তাহলে এই সতর্কতা এড়াতে আপনি এই ক্ষেত্রটি খালি রাখতে পারেন। দ্রষ্টব্য: সদস্য যদি ব্যবহারকারীর সাথে সংযুক্ত থাকে তবে ইমেলটি লগইন হিসাবেও ব্যবহার করা যেতে পারে।
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = সুইসকিউআর ইনভয়েস শুধুমাত্র ক্রেডিট ট্রান্সফার পেমেন্টের সাথে প্রদান করা সেট ইনভয়েসে যোগ করা যেতে পারে।
 SwissQrCreditorAddressInvalid = পাওনাদারের ঠিকানা অবৈধ (জিপ এবং শহর সেট আছে? (%s)
 SwissQrCreditorInformationInvalid = IBAN (%s) এর জন্য পাওনাদারের তথ্য অবৈধ: %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/bn_IN/exports.lang b/htdocs/langs/bn_IN/exports.lang
index 00988332004..bb8bf064113 100644
--- a/htdocs/langs/bn_IN/exports.lang
+++ b/htdocs/langs/bn_IN/exports.lang
@@ -46,10 +46,16 @@ LineLabel=লাইনের লেবেল
 LineDescription=লাইনের বর্ণনা
 LineUnitPrice=লাইনের ইউনিট মূল্য
 LineVATRate=লাইনের ভ্যাট হার
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=লাইনের জন্য পরিমাণ
 LineTotalHT=পরিমাণ বাদ। লাইনের জন্য ট্যাক্স
 LineTotalTTC=লাইনের জন্য ট্যাক্স সহ পরিমাণ
 LineTotalVAT=লাইনের জন্য ভ্যাটের পরিমাণ
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=লাইনের ধরন (0=পণ্য, 1=পরিষেবা)
 FileWithDataToImport=আমদানি করতে ডেটা সহ ফাইল করুন
 FileToImport=উৎস ফাইল আমদানি করতে
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=এটি নির্বাচন করতে %s 
 ChooseFileToImport=ফাইল আপলোড করুন তারপর সোর্স ইম্পোর্ট ফাইল হিসাবে ফাইল নির্বাচন করতে %s আইকনে ক্লিক করুন...
 SourceFileFormat=সোর্স ফাইল ফরম্যাট
 FieldsInSourceFile=উৎস ফাইলে ক্ষেত্র
-FieldsInTargetDatabase=ডলিবার ডাটাবেসের লক্ষ্য ক্ষেত্রগুলি (বোল্ড = বাধ্যতামূলক)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=কোনো ক্ষেত্র নেই
 MoveField=ফিল্ড কলাম নম্বর %s সরান
 ExampleOfImportFile=ইমপোর্ট_ফাইলের_উদাহরণ
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Check that the file format (field and string delimiters)
 RunSimulateImportFile=আমদানি সিমুলেশন চালান
 FieldNeedSource=এই ক্ষেত্রের উৎস ফাইল থেকে ডেটা প্রয়োজন
 SomeMandatoryFieldHaveNoSource=কিছু বাধ্যতামূলক ক্ষেত্র ডেটা ফাইল থেকে কোন উৎস নেই
-InformationOnSourceFile=সোর্স ফাইলের তথ্য
-InformationOnTargetTables=লক্ষ্য ক্ষেত্র তথ্য
+InformationOnSourceFile=Source file
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=রপ্তানি করতে ক্ষেত্রের কলামে অন্তত একটি উৎস ক্ষেত্র পরিবর্তন করুন
 SelectFormat=এই আমদানি ফাইল বিন্যাস নির্বাচন করুন
 RunImportFile=তথ্য আমদানি
diff --git a/htdocs/langs/bn_IN/hrm.lang b/htdocs/langs/bn_IN/hrm.lang
index 39824db2b4b..a000d6d59b4 100644
--- a/htdocs/langs/bn_IN/hrm.lang
+++ b/htdocs/langs/bn_IN/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=কাজের প্রোফাইলের জন্য প্রয়োজনীয় র‌্যাঙ্ক
-RequiredRankShort=প্রয়োজনীয় পদমর্যাদা
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=এই কাজের প্রোফাইলের সাথে অবস্থান
-EmployeeRank=এই দক্ষতার জন্য কর্মচারী পদমর্যাদা
-EmployeeRankShort=কর্মচারী পদমর্যাদা
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=কর্মচারী অবস্থান
 EmployeePositions=কর্মচারী পদ
 EmployeesInThisPosition=এই পদে কর্মচারীরা
@@ -72,6 +72,9 @@ AddSkill=কাজের প্রোফাইলে দক্ষতা যো
 RequiredSkills=এই কাজের প্রোফাইলের জন্য প্রয়োজনীয় দক্ষতা
 UserRank=ব্যবহারকারীর পদমর্যাদা
 SkillList=দক্ষতার তালিকা
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=র্যাঙ্ক সংরক্ষণ করুন
 TypeKnowHow=জানি-কিভাবে
 TypeHowToBe=কিভাবে হবে
@@ -95,3 +98,5 @@ NeedBusinessTravels=ব্যবসায়িক ভ্রমণ প্রয
 NoDescription=বর্ণনা নাই
 TheJobProfileHasNoSkillsDefinedFixBefore=এই কর্মচারীর মূল্যায়নকৃত কাজের প্রোফাইলে কোন দক্ষতা সংজ্ঞায়িত করা নেই। দক্ষতা(গুলি) যোগ করুন, তারপর মুছে ফেলুন এবং মূল্যায়ন পুনরায় আরম্ভ করুন.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/bn_IN/mails.lang b/htdocs/langs/bn_IN/mails.lang
index a20764812e3..278f75039a1 100644
--- a/htdocs/langs/bn_IN/mails.lang
+++ b/htdocs/langs/bn_IN/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=ইমেইলিং
 EMailing=ইমেইলিং
-EMailings=ইমেইলিং
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=সমস্ত ইমেইলিং
+AllEMailings=All mass eMails
 MailCard=ইমেইল কার্ড
 MailRecipients=প্রাপক
 MailRecipient=প্রাপক
@@ -26,19 +26,19 @@ MailFile=সংযুক্ত ফাইল
 MailMessage=ইমেইল বডি
 SubjectNotIn=সাবজেক্টে নয়
 BodyNotIn=শরীরে নয়
-ShowEMailing=ইমেল দেখান
-ListOfEMailings=ইমেইলের তালিকা
-NewMailing=নতুন ইমেইল
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=ইমেল সম্পাদনা করুন
-ResetMailing=ইমেল পুনরায় পাঠান
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=ইমেল মুছুন
-PreviewMailing=পূর্বরূপ ইমেল
-CreateMailing=ইমেল তৈরি করুন
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=বৈধ ইমেইল
+ValidMailing=Valid mass Email
 MailingStatusDraft=খসড়া
 MailingStatusValidated=যাচাই করা হয়েছে
 MailingStatusSent=পাঠানো হয়েছে
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=একটি ইমেল সংগ্রহ করা
 LineInFile=ফাইলে %s লাইন
 RecipientSelectionModules=প্রাপকের নির্বাচনের জন্য সংজ্ঞায়িত অনুরোধ
 MailSelectedRecipients=নির্বাচিত প্রাপক
-MailingArea=ইমেইল এলাকা
-LastMailings=সর্বশেষ %s ইমেল
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=লক্ষ্য পরিসংখ্যান
 NbOfCompaniesContacts=অনন্য পরিচিতি/ঠিকানা
 MailNoChangePossible=বৈধ ইমেল করার জন্য প্রাপক পরিবর্তন করা যাবে না
-SearchAMailing=মেইলিং অনুসন্ধান করুন
-SendMailing=ইমেইল পাঠান
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=পাঠানো
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=একটি ইমেল পাঠানো কমান্ড লাইন থেকে সঞ্চালিত করা যেতে পারে. সমস্ত প্রাপককে ইমেল পাঠাতে আপনার সার্ভার প্রশাসককে নিম্নলিখিত কমান্ডটি চালু করতে বলুন:
 MailingNeedCommand2=তবে আপনি সেশনের মাধ্যমে পাঠাতে চান এমন সর্বাধিক সংখ্যক ইমেলের মান সহ প্যারামিটার MAILING_LIMIT_SENDBYWEB যোগ করে সেগুলি অনলাইনে পাঠাতে পারেন৷ এর জন্য, হোম - সেটআপ - অন্যান্য এ যান।
 ConfirmSendingEmailing=আপনি যদি এই স্ক্রীন থেকে সরাসরি ইমেল পাঠাতে চান, তাহলে অনুগ্রহ করে নিশ্চিত করুন যে আপনি এখন আপনার ব্রাউজার থেকে ইমেল পাঠাতে চান?
-LimitSendingEmailing=দ্রষ্টব্য: ওয়েব ইন্টারফেস থেকে ইমেল পাঠানো নিরাপত্তা এবং সময় শেষ হওয়ার কারণে বেশ কয়েকবার করা হয়, <b>%s</b> প্রতিটি সেন্ডিং সেশনের জন্য এক সময়ে প্রাপক।
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=লিস্ট পরিষ্কার করো
 ToClearAllRecipientsClickHere=এই ইমেলের জন্য প্রাপক তালিকা সাফ করতে এখানে ক্লিক করুন
 ToAddRecipientsChooseHere=তালিকা থেকে বেছে নিয়ে প্রাপকদের যোগ করুন
-NbOfEMailingsReceived=গণ ইমেল প্রাপ্ত
-NbOfEMailingsSend=গণ ইমেল পাঠানো হয়েছে
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=আইডি রেকর্ড
 DeliveryReceipt=ডেলিভারি Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=আপনি বেশ কিছু প্রাপককে নির্দিষ্ট করতে <b>কমা</b> বিভাজক ব্যবহার করতে পারেন।
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=এই ইভেন্টের ধরন এবং 
 ANotificationsWillBeSent=1টি স্বয়ংক্রিয় বিজ্ঞপ্তি ইমেলের মাধ্যমে পাঠানো হবে
 SomeNotificationsWillBeSent=%s স্বয়ংক্রিয় বিজ্ঞপ্তি ইমেলের মাধ্যমে পাঠানো হবে
 AddNewNotification=একটি নতুন স্বয়ংক্রিয় ইমেল বিজ্ঞপ্তিতে সদস্যতা নিন (লক্ষ্য/ইভেন্ট)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=ইমেল পাঠানোর কনফিগারেশন '%s'-এ সেটআপ করা হয়েছে। এই মোডটি ব্যাপক ইমেল পাঠাতে ব্যবহার করা যাবে না।
 MailSendSetupIs2=প্যারামিটার পরিবর্তন করতে আপনাকে প্রথমে একটি প্রশাসক অ্যাকাউন্ট সহ মেনু %sহোম - সেটআপ - ইমেল%s এ যেতে হবে <strong>'%s'</strong> মোড ব্যবহার করার জন্য </span>' এই মোডের মাধ্যমে, আপনি আপনার ইন্টারনেট পরিষেবা প্রদানকারী দ্বারা প্রদত্ত SMTP সার্ভারের সেটআপ প্রবেশ করতে পারেন এবং গণ ইমেল বৈশিষ্ট্য ব্যবহার করতে পারেন।
 MailSendSetupIs3=আপনার SMTP সার্ভার কিভাবে সেটআপ করবেন সে সম্পর্কে আপনার কোনো প্রশ্ন থাকলে, আপনি %s-কে জিজ্ঞাসা করতে পারেন।
@@ -183,7 +185,7 @@ Information=তথ্য
 ContactsWithThirdpartyFilter=তৃতীয় পক্ষের ফিল্টারের সাথে পরিচিতি
 Unanswered=উত্তরহীন
 Answered=উত্তর দিয়েছেন
-IsNotAnAnswer=উত্তর নয় (প্রাথমিক ইমেল)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=এটি একটি প্রাথমিক ইমেলের একটি উত্তর
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=একটি নতুন পরিচিতি তৈরি করার সময় '%s' ক্ষেত্রের ডিফল্ট মান
@@ -199,6 +201,6 @@ ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/bn_IN/main.lang b/htdocs/langs/bn_IN/main.lang
index 84561a7e7df..61593651f76 100644
--- a/htdocs/langs/bn_IN/main.lang
+++ b/htdocs/langs/bn_IN/main.lang
@@ -37,6 +37,7 @@ Translation=অনুবাদ
 Translations=অনুবাদ
 CurrentTimeZone=টাইমজোন পিএইচপি (সার্ভার)
 EmptySearchString=অ খালি অনুসন্ধান মানদণ্ড লিখুন
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=একটি তারিখ মানদণ্ড লিখুন
 NoRecordFound=পাওয়া কোন রেকর্ড
 NoRecordDeleted=কোনো রেকর্ড মুছে ফেলা হয়নি
@@ -45,6 +46,7 @@ NoError=কোন ত্রুটি নেই
 Error=ত্রুটি
 Errors=ত্রুটি
 ErrorFieldRequired=ক্ষেত্র '%s' প্রয়োজন
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=ফিল্ড '%s' এর মান খারাপ
 ErrorFileDoesNotExists=ফাইল %s বিদ্যমান নেই
 ErrorFailedToOpenFile=%s ফাইল খুলতে ব্যর্থ হয়েছে
@@ -308,6 +310,7 @@ DateBuild=বিল্ড তারিখ রিপোর্ট করুন
 DatePayment=পরিশোধের তারিখ
 DateApprove=অনুমোদনের তারিখ
 DateApprove2=অনুমোদনের তারিখ (দ্বিতীয় অনুমোদন)
+PendingSince=Pending since
 RegistrationDate=নিবন্ধনের তারিখ
 UserCreation=সৃষ্টি ব্যবহারকারী
 UserModification=পরিবর্তন ব্যবহারকারী
@@ -495,7 +498,7 @@ ActionRunningNotStarted=শুরুতেই
 ActionRunningShort=চলমান
 ActionDoneShort=সমাপ্ত
 ActionUncomplete=অসম্পূর্ণ
-LatestLinkedEvents=সাম্প্রতিক %s লিঙ্ক করা ইভেন্ট
+LatestLinkedEvents=The last %s events
 CompanyFoundation=কোম্পানি/সংস্থা
 Accountant=হিসাবরক্ষক
 ContactsForCompany=এই তৃতীয় পক্ষের জন্য পরিচিতি
@@ -503,6 +506,7 @@ ContactsAddressesForCompany=এই তৃতীয় পক্ষের জন
 AddressesForCompany=এই তৃতীয় পক্ষের জন্য ঠিকানা
 ActionsOnCompany=এই তৃতীয় পক্ষের জন্য ইভেন্ট
 ActionsOnContact=এই যোগাযোগ/ঠিকানার জন্য ইভেন্ট
+ActionsOnUser=Events for this user
 ActionsOnContract=এই চুক্তির জন্য ইভেন্ট
 ActionsOnMember=এই সদস্য সম্পর্কে ঘটনা
 ActionsOnProduct=এই পণ্য সম্পর্কে ইভেন্ট
@@ -720,6 +724,8 @@ TextUsedInTheMessageBody=ইমেইল বডি
 SendAcknowledgementByMail=নিশ্চিতকরণ ইমেল পাঠান
 SendMail=ইমেইল পাঠান
 Email=ইমেইল
+EMail=Email
+EMails=Emails
 NoEMail=কোনো ইমেল নেই
 AlreadyRead=ইতিমধ্যেই পড়েছি
 NotRead=অপঠিত
@@ -792,7 +798,7 @@ Notes=মন্তব্য
 AddNewLine=নতুন লাইন যোগ করুন
 AddFile=নথি যুক্ত করা
 FreeZone=ফ্রি-টেক্সট পণ্য
-FreeLineOfType=ফ্রি-টেক্সট আইটেম, টাইপ করুন:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=ক্লোন অবজেক্ট এর প্রধান বৈশিষ্ট্য সহ
 ReGeneratePDF=পিডিএফ পুনরায় তৈরি করুন
 PDFMerge=PDF মার্জ
@@ -878,12 +884,14 @@ toward=দিকে
 Access=অ্যাক্সেস
 SelectAction=কর্ম নির্বাচন করুন
 SelectTargetUser=লক্ষ্য ব্যবহারকারী/কর্মচারী নির্বাচন করুন
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=ক্লিপবোর্ডে কপি করতে Ctrl+C ব্যবহার করুন
 SaveUploadedFileWithMask=সার্ভারে ফাইল সংরক্ষণ করুন "<strong>%s</strong>" (অন্যথায় " %s")
 OriginFileName=আসল ফাইলের নাম
 SetDemandReason=উৎস সেট করুন
 SetBankAccount=ব্যাঙ্ক অ্যাকাউন্ট সংজ্ঞায়িত করুন
 AccountCurrency=অ্যাকাউন্ট মুদ্রা
+AccountancyCode=Accounting Code
 ViewPrivateNote=নোট দেখুন
 XMoreLines=%s লাইন(গুলি) লুকানো আছে
 ShowMoreLines=বেশি/কম লাইন দেখান
@@ -924,6 +932,7 @@ ConfirmMassDeletionQuestion=আপনি কি %s নির্বাচিত 
 ConfirmMassClone=বাল্ক ক্লোন নিশ্চিতকরণ
 ConfirmMassCloneQuestion=ক্লোন করার জন্য প্রকল্প নির্বাচন করুন
 ConfirmMassCloneToOneProject=প্রকল্পের ক্লোন %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=সম্পর্কিত বস্তু
 ClassifyBilled=শ্রেণীবদ্ধ বিল করা
 ClassifyUnbilled=বিলবিহীন শ্রেণিবদ্ধ করুন
@@ -960,10 +969,11 @@ PrivateDownloadLinkDesc=আপনাকে লগ ইন করতে হবে
 Download=ডাউনলোড করুন
 DownloadDocument=ডকুমেন্ট ডাউনলোড করুন
 DownloadSignedDocument=স্বাক্ষরিত নথি ডাউনলোড করুন
-ActualizeCurrency=মুদ্রার হার আপডেট করুন
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=অর্থবছর
 ModuleBuilder=মডিউল এবং অ্যাপ্লিকেশন নির্মাতা
 SetMultiCurrencyCode=মুদ্রা সেট করুন
+SetMultiCurrencyRate=Set currency rate
 BulkActions=বিপুল কর্ম
 ClickToShowHelp=টুলটিপ সাহায্য দেখানোর জন্য ক্লিক করুন
 WebSite=ওয়েবসাইট
@@ -1103,6 +1113,7 @@ PayedBy=দ্বারা পরিশোধ করা হয়
 PayedTo=দেওয়া
 Monthly=মাসিক
 Quarterly=ত্রৈমাসিক
+Quarter=Quarter
 Annual=বার্ষিক
 Local=স্থানীয়
 Remote=দূরবর্তী
@@ -1145,6 +1156,7 @@ ContactDefault_project_task=টাস্ক
 ContactDefault_propal=প্রস্তাব
 ContactDefault_supplier_proposal=সরবরাহকারীর প্রস্তাব
 ContactDefault_ticket=টিকিট
+ContactDefault_societe=Third party
 ContactAddedAutomatically=তৃতীয় পক্ষের পরিচিতি ভূমিকা থেকে পরিচিতি যোগ করা হয়েছে
 More=আরও
 ShowDetails=বিস্তারিত দেখাও
@@ -1187,6 +1199,8 @@ SetSupervisor=সুপারভাইজার সেট করুন
 CreateExternalUser=বাহ্যিক ব্যবহারকারী তৈরি করুন
 ConfirmAffectTag=বাল্ক ট্যাগ অ্যাসাইনমেন্ট
 ConfirmAffectUser=বাল্ক ইউজার অ্যাসাইনমেন্ট
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=প্রতিটি প্রকল্প/সুযোগের উপর দায়িত্ব বরাদ্দ করা হয়েছে
 TasksRole=প্রতিটি টাস্কে ভূমিকা বরাদ্দ করা হয়েছে (যদি ব্যবহার করা হয়)
 ConfirmSetSupervisor=বাল্ক সুপারভাইজার সেট
@@ -1238,6 +1252,9 @@ CommercialsAffected=বিক্রয় প্রতিনিধি নিয
 CommercialAffected=বিক্রয় প্রতিনিধি নিয়োগ
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=তোমার বার্তা
 YourMessageHasBeenReceived=আপনার বার্তা গৃহীত হয়েছে। আমরা যত তাড়াতাড়ি সম্ভব উত্তর দেব বা আপনার সাথে যোগাযোগ করব।
 UrlToCheck=চেক করার জন্য ইউআরএল
@@ -1280,6 +1297,7 @@ AmountSalary=বেতনের পরিমাণ
 InvoiceSubtype=চালান সাবটাইপ
 ConfirmMassReverse=বাল্ক বিপরীত নিশ্চিতকরণ
 ConfirmMassReverseQuestion=আপনি কি %s নির্বাচিত রেকর্ড(গুলি) বিপরীত করতে চান?
+ConfirmActionXxx=Confirm action %s
 ElementType=Element type
 ElementId=Element Id
 Encrypted=Encrypted
@@ -1299,3 +1317,35 @@ AllEntities=All entities
 TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
+auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/bn_IN/members.lang b/htdocs/langs/bn_IN/members.lang
index d6aadaa3939..1cc7c80a799 100644
--- a/htdocs/langs/bn_IN/members.lang
+++ b/htdocs/langs/bn_IN/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=যদি সাবস্ক্রিপশনের 
 DeleteType=মুছে ফেলা
 VoteAllowed=ভোট অনুমোদিত
 Physical=স্বতন্ত্র
-Moral=কর্পোরেশন
-MorAndPhy=কর্পোরেশন এবং ব্যক্তি
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=পুনরায় সক্ষম করুন
 ExcludeMember=একজন সদস্যকে বাদ দিন
 Exclude=বাদ দিন
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=অঞ্চল অনুসারে সদস্য
 NbOfMembers=মোট সদস্য সংখ্যা
 NbOfActiveMembers=বর্তমান সক্রিয় সদস্যের মোট সংখ্যা
 NoValidatedMemberYet=কোন বৈধ সদস্য পাওয়া যায়নি
-MembersByCountryDesc=এই স্ক্রিনটি আপনাকে দেশ অনুসারে সদস্যদের পরিসংখ্যান দেখায়। গ্রাফ এবং চার্টগুলি Google অনলাইন গ্রাফ পরিষেবার প্রাপ্যতার পাশাপাশি একটি কার্যকরী ইন্টারনেট সংযোগের প্রাপ্যতার উপর নির্ভর করে৷
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=এই স্ক্রীন আপনাকে রাজ্য/প্রদেশ/ক্যান্টন অনুসারে সদস্যদের পরিসংখ্যান দেখায়।
 MembersByTownDesc=এই স্ক্রীনটি আপনাকে শহর অনুসারে সদস্যদের পরিসংখ্যান দেখায়।
 MembersByNature=এই স্ক্রিনটি আপনাকে প্রকৃতি অনুসারে সদস্যদের পরিসংখ্যান দেখায়।
@@ -208,25 +209,25 @@ NewMemberbyWeb=নতুন সদস্য যোগ করা হয়েছ
 NewMemberForm=নতুন সদস্য ফর্ম
 SubscriptionsStatistics=অবদান পরিসংখ্যান
 NbOfSubscriptions=অবদানের সংখ্যা
-AmountOfSubscriptions=অবদান থেকে সংগৃহীত পরিমাণ
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=টার্নওভার (একটি কোম্পানির জন্য) বা বাজেট (একটি ভিত্তির জন্য)
-DefaultAmount=অবদানের ডিফল্ট পরিমাণ (সদস্য প্রকার স্তরে কোনো পরিমাণ সংজ্ঞায়িত না হলেই ব্যবহার করা হয়)
-MinimumAmount=ন্যূনতম পরিমাণ (অবদানের পরিমাণ বিনামূল্যে হলেই ব্যবহৃত হয়)
-CanEditAmount=সদস্যতার পরিমাণ সদস্য দ্বারা সংজ্ঞায়িত করা যেতে পারে
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=সদস্যের ধরন নির্বিশেষে দর্শক তার অবদানের পরিমাণ চয়ন/সম্পাদনা করতে পারে
 AmountIsLowerToMinimumNotice=পরিমাণটি সর্বনিম্ন %s থেকে কম
 MEMBER_NEWFORM_PAYONLINE=অনলাইন রেজিস্ট্রেশনের পরে, অনলাইন পেমেন্ট পৃষ্ঠায় স্বয়ংক্রিয়ভাবে স্যুইচ করুন
 ByProperties=প্রকৃতিগতভাবে
 MembersStatisticsByProperties=প্রকৃতির সদস্যদের পরিসংখ্যান
-VATToUseForSubscriptions=অবদানের জন্য ব্যবহার করার জন্য ভ্যাট হার
-NoVatOnSubscription=অবদানের জন্য কোন ভ্যাট নেই
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=ইনভয়েসে অবদান লাইনের জন্য ব্যবহৃত পণ্য: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=নাম বা কোম্পানি
 SubscriptionRecorded=অবদান নথিভুক্ত
 NoEmailSentToMember=সদস্যকে কোনো ইমেল পাঠানো হয়নি
 EmailSentToMember=%s-এ সদস্যকে ইমেল পাঠানো হয়েছে
-SendReminderForExpiredSubscriptionTitle=মেয়াদোত্তীর্ণ অবদানের জন্য ইমেলের মাধ্যমে অনুস্মারক পাঠান
-SendReminderForExpiredSubscription=যখন অবদানের মেয়াদ শেষ হতে চলেছে তখন সদস্যদের ইমেলের মাধ্যমে অনুস্মারক পাঠান (অনুস্মারক পাঠানোর জন্য সদস্যতা শেষ হওয়ার আগের দিনগুলির সংখ্যা। এটি একটি সেমিকোলন দ্বারা পৃথক করা দিনের তালিকা হতে পারে, উদাহরণস্বরূপ '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=বর্তমান সময়ের জন্য সদস্যতা প্রদান করা হয়েছে (%s পর্যন্ত)
 YouMayFindYourInvoiceInThisEmail=আপনি এই ইমেলের সাথে আপনার চালান সংযুক্ত দেখতে পারেন
 XMembersClosed=%s সদস্য(গুলি) বন্ধ
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=একটি তৃতীয় পক্ষ হল
 MemberFirstname=সদস্যের প্রথম নাম
 MemberLastname=সদস্য পদবি
 MemberCodeDesc=সদস্য কোড, সকল সদস্যের জন্য অনন্য
-MemberSubscriptionStartFirstDayOf=একটি সদস্যতার শুরুর তারিখ a এর প্রথম দিনের সাথে মিলে যায়
-MemberSubscriptionStartAfter=নবায়ন ব্যতীত সাবস্ক্রিপশন শুরু হওয়ার তারিখে প্রবেশের ন্যূনতম সময়কাল (উদাহরণ +3m = +3 মাস, -5d = -5 দিন, +1Y = +1 বছর)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/bn_IN/salaries.lang b/htdocs/langs/bn_IN/salaries.lang
index 18a442a6aaa..20453c81d59 100644
--- a/htdocs/langs/bn_IN/salaries.lang
+++ b/htdocs/langs/bn_IN/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=নতুন বেতন
 AddSalary=বেতন যোগ করুন
 NewSalaryPayment=নতুন বেতন কার্ড
 AddSalaryPayment=বেতন প্রদান যোগ করুন
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=বেতন প্রদান
 SalariesPayments=বেতন প্রদান
 SalariesPaymentsOf=%s এর বেতন প্রদান
@@ -27,7 +29,7 @@ FillFieldFirst=প্রথমে কর্মচারী ক্ষেত্র
 UpdateAmountWithLastSalary=শেষ বেতনের পরিমাণ নির্ধারণ করুন
 MakeTransferRequest=স্থানান্তরের অনুরোধ করুন
 VirementOrder=ক্রেডিট ট্রান্সফার অনুরোধ
-BankTransferAmount=ক্রেডিট স্থানান্তরের পরিমাণ
 WithdrawalReceipt=ক্রেডিট ট্রান্সফার অর্ডার
 OrderWaiting=আদেশ করা
 FillEndOfMonth=মাসের শেষে পূরণ করুন
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/bn_IN/website.lang b/htdocs/langs/bn_IN/website.lang
index 195947ad724..a151e97341c 100644
--- a/htdocs/langs/bn_IN/website.lang
+++ b/htdocs/langs/bn_IN/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=এখানে অন্যান্য নাম/উপ
 WEBSITE_CSS_URL=বাহ্যিক CSS ফাইলের URL
 WEBSITE_CSS_INLINE=CSS ফাইলের বিষয়বস্তু (সব পৃষ্ঠায় সাধারণ)
 WEBSITE_JS_INLINE=জাভাস্ক্রিপ্ট ফাইলের বিষয়বস্তু (সব পৃষ্ঠায় সাধারণ)
-WEBSITE_HTML_HEADER=HTML হেডারের নীচে সংযোজন (সমস্ত পৃষ্ঠায় সাধারণ)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=রোবট ফাইল (robots.txt)
 WEBSITE_HTACCESS=ওয়েবসাইট .htaccess ফাইল
 WEBSITE_MANIFEST_JSON=ওয়েবসাইট manifest.json ফাইল
@@ -56,16 +56,17 @@ ReadPerm=পড়ুন
 WritePerm=লিখুন
 TestDeployOnWeb=ওয়েবে পরীক্ষা/নিয়োগ করুন
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>একটি নতুন ট্যাবে %s পূর্বরূপ দেখুন।</u><br><br> %s Dolibarr সার্ভার দ্বারা পরিবেশিত হবে তাই এটির কোনো অতিরিক্ত ওয়েব সার্ভারের প্রয়োজন নেই (যেমন Apache, Nginx, IIS) ইনস্টল করতে হবে।<br>অসুবিধে হল যে পৃষ্ঠাগুলির URLগুলি ব্যবহারকারী বান্ধব নয় এবং আপনার Dolibarr এর পথ দিয়ে শুরু হয়৷<span class= Dolibarr দ্বারা পরিবেশিত URL /span></strong><br><br>এতে আপনার নিজস্ব বাহ্যিক ওয়েব সার্ভার ব্যবহার করতে এই ওয়েব সাইটটি পরিবেশন করুন, আপনার ওয়েব সার্ভারে একটি ভার্চুয়াল হোস্ট তৈরি করুন যা নির্দেশিকা নির্দেশ করে<br><strong>%s</strong><br>তারপর এই ওয়েবসাইটের বৈশিষ্ট্যগুলিতে এই ভার্চুয়াল সার্ভারের নাম লিখুন এবং ক্লিক করুন লিঙ্ক "টেস্ট/ডেপ্লয় অন ওয়েব"।
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=বহিরাগত ওয়েব সার্ভার দ্বারা পরিবেশিত ভার্চুয়াল হোস্টের URL সংজ্ঞায়িত করা হয়নি
 NoPageYet=এখনো কোনো পৃষ্ঠা নেই
 YouCanCreatePageOrImportTemplate=আপনি একটি নতুন পৃষ্ঠা তৈরি করতে পারেন বা একটি সম্পূর্ণ ওয়েবসাইট টেমপ্লেট আমদানি করতে পারেন৷
 SyntaxHelp=নির্দিষ্ট সিনট্যাক্স টিপস সাহায্য
 YouCanEditHtmlSourceckeditor=আপনি সম্পাদকের "উৎস" বোতামটি ব্যবহার করে HTML উত্স কোড সম্পাদনা করতে পারেন৷
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=একটি শেয়ার লিঙ্কের সাথে শেয়ার করা একটি ছবির জন্য (ফাইলের শেয়ারিং হ্যাশ কী ব্যবহার করে খোলা অ্যাক্সেস), সিনট্যাক্স হল:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;016f7f7f7012 <br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>এইচটিএমএল বা ডায়নামিক কোডের আরও উদাহরণ <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">উইকি ডকুমেন্টেশনb0e40dc6587এ উপলব্ধ >।<br>
 ClonePage=ক্লোন পৃষ্ঠা/ধারক
 CloneSite=ক্লোন সাইট
@@ -87,15 +88,15 @@ WebsiteAccount=ওয়েবসাইট অ্যাকাউন্ট
 WebsiteAccounts=ওয়েবসাইট অ্যাকাউন্ট
 AddWebsiteAccount=ওয়েব সাইট অ্যাকাউন্ট তৈরি করুন
 BackToListForThirdParty=তৃতীয় পক্ষের জন্য তালিকায় ফিরে যান
-DisableSiteFirst=প্রথমে ওয়েবসাইট অক্ষম করুন
+DisableSiteFirst=Put website offline first
 MyContainerTitle=আমার ওয়েব সাইটের শিরোনাম
 AnotherContainer=এইভাবে অন্য পৃষ্ঠা/কন্টেইনারের বিষয়বস্তু অন্তর্ভুক্ত করতে হয় (আপনি যদি ডায়নামিক কোড সক্ষম করেন তাহলে এখানে একটি ত্রুটি থাকতে পারে কারণ এমবেডেড সাবকন্টেইনারটি নাও থাকতে পারে)
 SorryWebsiteIsCurrentlyOffLine=দুঃখিত, এই ওয়েবসাইটটি বর্তমানে অফ লাইন। অনুগ্রহ করে পরে ফিরে আসবেন...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=প্রতিটি ওয়েবসাইট/তৃতীয় পক্ষের জন্য ওয়েব সাইট অ্যাকাউন্ট (লগইন/পাস) সংরক্ষণ করতে টেবিলটি সক্ষম করুন
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=আপনাকে প্রথমে ডিফল্ট হোম পেজ নির্ধারণ করতে হবে
-OnlyEditionOfSourceForGrabbedContentFuture=সতর্কতা: একটি বহিরাগত ওয়েব পৃষ্ঠা আমদানি করে একটি ওয়েব পৃষ্ঠা তৈরি করা অভিজ্ঞ ব্যবহারকারীদের জন্য সংরক্ষিত৷ উৎস পৃষ্ঠার জটিলতার উপর নির্ভর করে, আমদানির ফলাফল মূল থেকে ভিন্ন হতে পারে। এছাড়াও যদি উত্স পৃষ্ঠাটি সাধারণ CSS শৈলী বা বিরোধপূর্ণ জাভাস্ক্রিপ্ট ব্যবহার করে, তাহলে এই পৃষ্ঠায় কাজ করার সময় এটি ওয়েবসাইট সম্পাদকের চেহারা বা বৈশিষ্ট্যগুলি ভেঙে দিতে পারে। এই পদ্ধতিটি একটি পৃষ্ঠা তৈরি করার একটি দ্রুত উপায় কিন্তু এটি স্ক্র্যাচ থেকে বা একটি প্রস্তাবিত পৃষ্ঠার টেমপ্লেট থেকে আপনার নতুন পৃষ্ঠা তৈরি করার সুপারিশ করা হয়৷<br>এটাও মনে রাখবেন যে ইনলাইন সম্পাদক কাজ নাও করতে পারে একটি গ্র্যাবড বাহ্যিক পৃষ্ঠায় ব্যবহার করার সময় সঠিকতা।
-OnlyEditionOfSourceForGrabbedContent=এইচটিএমএল উত্সের শুধুমাত্র সংস্করণ সম্ভব যখন বিষয়বস্তু একটি বহিরাগত সাইট থেকে দখল করা হয়
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=সিএসএস এবং পৃষ্ঠায় পাওয়া চিত্রগুলিও ধরুন।
 ImagesShouldBeSavedInto=ছবিগুলি ডিরেক্টরিতে সংরক্ষণ করা উচিত
 WebsiteRootOfImages=ওয়েবসাইট ইমেজ জন্য রুট ডিরেক্টরি
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Remove filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Categories
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index d4dbdad5e3d..2205b3fee5e 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Provjera integriteta datoteka je prošla, me
 FileIntegritySomeFilesWereRemovedOrModified=Provjera integriteta datoteka nije uspjela. Neki fajlovi su izmijenjeni, uklonjeni ili dodani.
 GlobalChecksum=Globalni kontrolni zbir
 MakeIntegrityAnalysisFrom=Napravite analizu integriteta datoteka aplikacije iz
-LocalSignature=Ugrađeni lokalni potpis (manje pouzdan)
-RemoteSignature=Daljinski daljinski potpis (pouzdaniji)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Fajlovi koji nedostaju
 FilesUpdated=Ažurirani fajlovi
 FilesModified=Modified Files
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Koristi se samo za neke opcije dnevnog reda
 Security=Sigurnost
 Passwords=Lozinke
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Šifrirajte lozinku baze podataka pohranjenu u conf.php. Preporučuje se aktiviranje ove opcije.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Da bi lozinka bila dekodirana (obrisana) u datoteku <b>conf.php</b>, zamijenite redak <br><b>$dolibarr_main_db_pass="crypted:...";</b>'<span' ><br></span>od<br><b>$dolibarr_main_db_pass="<span>fccfda19bz0</span><b>$dolibarr_main_db_pass="<span>fccfda19bz0</span>fccfda19bz0</span> ";</b>
 ProtectAndEncryptPdfFiles=Zaštitite generirane PDF datoteke. Ovo se NE preporučuje jer prekida masovno generiranje PDF-a.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Izračunato polje
-ComputedFormulaDesc=Ovdje možete unijeti formulu koristeći druga svojstva objekta ili bilo koje PHP kodiranje da biste dobili dinamičku izračunatu vrijednost. Možete koristiti bilo koju PHP kompatibilnu formulu uključujući "?" operator uvjeta, i sljedeći globalni objekat: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield </strong>.<br><strong>UPOZORENJE<span><br></span><strong>UPOZORENJE<span>b01cf607f67 </span>: Ako su vam potrebna svojstva objekta koji nije učitan, samo dohvatite sebi objekat u svoju formulu kao u drugom primjeru.<br>Upotreba izračunatog polja znači da možete' t unesite sebi bilo koju vrijednost iz interfejsa. Također, ako postoji sintaksička greška, formula može ništa vratiti.<br><br>Primjer formule:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Primjer za ponovno učitavanje objekta<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * >capital / 5: '-1')<br><br>Drugi primjer formule za prisilno učitavanje objekta i njegov nadređeni objekat:<br>(($reloadedobj = novi zadatak($db)) && ($reloadedobj->fetchNoCompute-($objectoffield) ) > 0) && ($secondloadedobj = novi projekat($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Nadređeni projekat nije pronađen'
+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'
 Computedpersistent=Spremite izračunato polje
 ComputedpersistentDesc=Izračunata dodatna polja će biti pohranjena u bazi podataka, međutim, vrijednost će biti ponovo izračunata samo kada se promijeni objekt ovog polja. Ako izračunato polje ovisi o drugim objektima ili globalnim podacima, ova vrijednost može biti pogrešna!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored WITHOUT encryption (field is just hidden with stars on screen).<br><br>Enter value 'dolcrypt' to encode value with a reversible encryption algorithm. Clear data can still be known and edited but is encrypted into database.<br><br>Enter 'auto' (or 'md5', 'sha256', 'password_hash', ...) to use the default password encryption algorithm (or md5, sha256, password_hash...) to save the non reversible hashed password into database (no way to retrieve original value)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Korištenje SMTP servera vašeg vlastitog dobavljača usluga e-pošte za slanje e-pošte je također zanimljivo tako da će svi emailovi poslati iz aplikacije također biti sačuvani u vašem direktoriju "Poslano" vašeg poštanskog sandučeta.
 WarningPHPMailD=Stoga je preporučljivo promijeniti način slanja e-pošte na vrijednost "SMTP".
 WarningPHPMailDbis=Ako zaista želite zadržati zadanu "PHP" metodu za slanje e-pošte, samo zanemarite ovo upozorenje ili ga uklonite tako što ćete %skliknuti ovdje%s.
-WarningPHPMail2=Ako vaš SMTP provajder e-pošte treba da ograniči klijenta e-pošte na neke IP adrese (vrlo rijetko), ovo je IP adresa korisničkog agenta e-pošte (MUA) za vašu ERP CRM aplikaciju: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Računovodstvo (pojednostavljeno)
 Module10Desc=Jednostavni računovodstveni izvještaji (dnevnici, promet) zasnovani na sadržaju baze podataka. Ne koristi tablicu glavne knjige.
 Module20Name=Prijedlozi
 Module20Desc=Upravljanje komercijalnim ponudama
-Module22Name=Mass Emailings
-Module22Desc=Upravljajte masovnim slanjem e-pošte
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energija
 Module23Desc=Praćenje potrošnje energije
 Module25Name=Sales Orders
@@ -847,10 +848,10 @@ Permission212=Redovi narudžbi
 Permission213=Aktivirajte liniju
 Permission214=Postavke telefonije
 Permission215=Postavke nabavljača
-Permission221=Čitajte mejlove
-Permission222=Kreirati/izmijeniti email poruke (tema, primaoci...)
-Permission223=Potvrdite emailove (omogućava slanje)
-Permission229=Izbrišite e-poruke
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Prikaži informacije o primaocima i
 Permission238=Ručno slanje pošte
 Permission239=Izbrišite poštu nakon validacije ili poslane
@@ -1105,6 +1106,7 @@ DictionaryStaff=Broj zaposlenih
 DictionaryAvailability=Kašnjenje isporuke
 DictionaryOrderMethods=Načini naručivanja
 DictionarySource=Porijeklo prijedloga/naloga
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Personalizirane grupe za izvještaje
 DictionaryAccountancysystem=Modeli za kontni plan
 DictionaryAccountancyJournal=Računovodstveni časopisi
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Povratak na listu rječnika
 TypeOfRevenueStamp=Vrsta porezne marke
 VATManagement=Upravljanje porezom na promet
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Podrazumevano je predloženi porez na promet 0 koji se može koristiti za slučajeve kao što su udruženja, pojedinci ili male kompanije.
 VATIsUsedExampleFR=U Francuskoj, to znači kompanije ili organizacije koje imaju stvarni fiskalni sistem (pojednostavljeni realni ili normalni real). Sistem u kojem se deklarira PDV.
 VATIsNotUsedExampleFR=U Francuskoj, to znači udruženja koja nisu prijavljena poreza na promet ili kompanije, organizacije ili slobodne profesije koje su odabrale fiskalni sistem mikro preduzeća (porez na promet u franšizi) i su platile franšizu za prodaju poreza bez ikakve prijave poreza na promet. Ovaj izbor će prikazati referencu "Neprimenjivi porez na promet - art-293B CGI" na fakturama.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Vrsta poreza na promet
 LTRate=Stopa
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Prema postavci poreza (Pogledajte %s - %s - %s) , vaš
 LabelUsedByDefault=Oznaka se koristi po defaultu ako se ne može pronaći prijevod za kod
 LabelOnDocuments=Oznaka na dokumentima
 LabelOrTranslationKey=Oznaka ili ključ za prijevod
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=Prikažite PDV broj kupca/prodavača u kombinovane liste.
 AddAdressInList=Prikažite adresu kupca/prodavca u kombinovanim listama.<br>Treće strane će se pojaviti sa formatom naziva "The Big Company corp. - 21 Jump street 123456 Big town - USA" umjesto " The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Zatražite željeni način dostave za treće strane.
-FieldEdition=Izdanje polja %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Primjer: +2 (popuniti samo ako imate problema sa ofsetima vremenskih zona)
 GetBarCode=Preuzeti barkod
 NumberingModules=Modeli numerisanja
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Forsirajte datum fakture na datum validacije
 SuggestedPaymentModesIfNotDefinedInInvoice=Predloženi način plaćanja na fakturi podrazumevano ako nije definisan na fakturi
 SuggestPaymentByRIBOnAccount=Predložite plaćanje isplatom na račun
 SuggestPaymentByChequeToAddress=Predložite plaćanje čekom na
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Besplatan tekst na fakturama
 WatermarkOnDraftInvoices=Vodeni žig na nacrte faktura (ništa, ako je prazno)
 PaymentsNumberingModule=Model numeracije plaćanja
@@ -1718,6 +1723,7 @@ CompressionOfResources=Kompresija HTTP odgovora
 CompressionOfResourcesDesc=Na primjer korištenjem Apache direktive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Takva automatska detekcija nije moguća sa trenutnim pretraživačima
 DefaultValuesDesc=Ovdje možete definirati zadanu vrijednost koju želite koristiti prilikom kreiranja novog zapisa, i/ili zadane filtere ili redoslijed sortiranja kada navodite zapise.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Zadane vrijednosti (za korištenje na obrascima)
 DefaultSearchFilters=Zadani filteri za pretraživanje
 DefaultSortOrder=Zadani redoslijed sortiranja
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Moduli za numerisanje slanja
 SendingsAbility=Podrška otpremnim listovima za isporuke kupaca
 NoNeedForDeliveryReceipts=U većini slučajeva, otpremni listovi se koriste i kao listovi za isporuke kupaca (lista proizvoda za slanje) i listovi koji se primaju i potpisan od strane kupca. Stoga je potvrda o isporuci proizvoda duplicirana funkcija i koja se rijetko aktivira.
 FreeLegalTextOnShippings=Besplatan tekst o pošiljkama
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Modul numeracije računa o isporuci proizvoda
 DeliveryOrderModel=Model prijema isporuke proizvoda
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Besplatan tekst na potvrdama o isporuci
 ##### FCKeditor #####
 AdvancedEditor=Napredni uređivač
 ActivateFCKeditor=Aktivirajte napredni uređivač za:
-FCKeditorForNotePublic=WYSIWYG kreiranje/izdanje polja "javne napomene" elemenata
-FCKeditorForNotePrivate=WYSIWYG kreiranje/izdanje polja "privatne bilješke" elemenata
-FCKeditorForCompany=WYSIWYG kreiranje/izdanje opisa polja elemenata (osim proizvoda/usluga)
-FCKeditorForProductDetails=WYSIWYG kreiranje/izdanje opisa proizvoda ili linija za objekte (redovi ponuda, narudžbi, faktura, itd...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Upozorenje: Upotreba ove opcije u ovom slučaju se ozbiljno ne preporučuje jer može stvoriti probleme s formatiranjem stranica specijalnih znakova i prilikom pravljenja PDF datoteka.
-FCKeditorForMailing= Kreiranje/izdanje WYSIWYG-a za masovne slanje e-pošte (Alati->E-pošta)
-FCKeditorForUserSignature=WYSIWYG kreiranje/izdanje korisničkog potpisa
-FCKeditorForMail=Kreiranje/izdanje WYSIWYG za svu poštu (osim Alati->E-pošta)
-FCKeditorForTicket=WYSIWYG kreiranje/izdanje za ulaznice
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Podešavanje Stock modula
 IfYouUsePointOfSaleCheckModule=Ako koristite modul za prodajno mjesto (POS) koji je zadano predviđen ili eksterni modul, vaš POS modul može zanemariti ovo podešavanje. Većina POS modula je dizajnirana prema zadanim postavkama da odmah kreiraju fakturu i smanjuju zalihe bez obzira na opcije ovdje. Dakle, ako trebate ili ne da imate smanjenje zaliha prilikom registracije prodaje sa vašeg POS-a, provjerite i postavke vašeg POS modula.
@@ -1867,7 +1874,6 @@ Buy=Kupi
 Sell=Prodaj
 InvoiceDateUsed=Korišten datum fakture
 YourCompanyDoesNotUseVAT=Vaša kompanija je definirana da ne koristi PDV (Home - Setup - Company/Organization), tako da nema PDV opcija za podešavanje.
-AccountancyCode=Računovodstveni kod
 AccountancyCodeSell=Prodajni račun. kod
 AccountancyCodeBuy=Kupovina računa. kod
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Ostavite potvrdni okvir „Automatski kreiraj plaćanje“ prazan prema zadanim postavkama kada kreirate novi porez
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Koji prikaz želite da otvorite podrazumevano kada izabere
 AGENDA_EVENT_PAST_COLOR = Boja prošlog događaja
 AGENDA_EVENT_CURRENT_COLOR = Boja trenutnog događaja
 AGENDA_EVENT_FUTURE_COLOR = Boja budućeg događaja
-AGENDA_REMINDER_BROWSER = Omogući podsjetnik na događaj <b>na korisnikovom pregledniku</b> (Kada se dostigne datum podsjetnika, preglednik prikazuje skočni prozor. Svaki korisnik može onemogućiti takva obavještenja iz podešavanja obavještenja preglednika).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Omogući zvučno obavještenje
-AGENDA_REMINDER_EMAIL = Omogući podsjetnik na događaj <b>e-porukom</b> (opcija podsjetnika/odgoda se može definirati za svaki događaj).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Napomena: Učestalost zakazanog posla %s mora biti dovoljna da bude siguran da je podsjetnik poslat u pravom trenutku.
 AGENDA_SHOW_LINKED_OBJECT = Prikaži povezani objekt u prikazu dnevnog reda
 AGENDA_USE_EVENT_TYPE = Koristi vrste događaja (upravlja se u meniju Podešavanje -> Rječnici -> Vrsta događaja dnevnog reda)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Automatski postavite ovu zadanu vrijednost za tip događaja u obrascu za kreiranje događaja
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Ključ za autorizaciju veze za izvoz
 PastDelayVCalExport=Nemojte izvoziti događaj stariji od
 SecurityKey = Sigurnosni ključ
@@ -2006,7 +2017,7 @@ BackupZipWizard=Čarobnjak za izgradnju direktorija arhive dokumenata
 SomethingMakeInstallFromWebNotPossible=Instalacija eksternog modula nije moguća sa web sučelja iz sljedećeg razloga:
 SomethingMakeInstallFromWebNotPossible2=Iz tog razloga, proces za nadogradnju opisan ovdje je ručni proces koji samo privilegirani korisnik može izvršiti.
 InstallModuleFromWebHasBeenDisabledContactUs=Instalacija ili razvoj vanjskih modula ili dinamičkih web stranica iz aplikacije je trenutno zaključan iz sigurnosnih razloga. Molimo kontaktirajte nas ako trebate omogućiti ovu funkciju.
-InstallModuleFromWebHasBeenDisabledByFile=Vaš administrator je onemogućio instalaciju eksternog modula iz aplikacije. Morate ga zamoliti da ukloni datoteku <strong>%s</strong> kako bi ovo dozvolio karakteristika.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Označite linije tabele kada pređete mišem
 HighlightLinesColor=Označite boju linije kada miš prijeđe (koristite 'ffffff' za bez isticanja)
@@ -2036,6 +2047,7 @@ Enter0or1=Unesite 0 ili 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Unesite ovdje između zagrada, listu brojeva bajtova koji predstavljaju simbol valute. Na primjer: za $, unesite [36] - za brazilski real R$ [82,36] - za €, unesite [8364]
 ColorFormat=RGB boja je u HEX formatu, npr.: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Ime ikone u formatu:<br>- image.png za datoteku slike u trenutni direktorij teme<br>- image.png@module ako je datoteka u direktoriju /img/ modula<br>- fa-xxx za FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size za FontAwesome fa-xxx sliku (sa prefiksom, postavljena veličina i)
 PositionIntoComboList=Položaj linije u kombinovanim listama
 SellTaxRate=Stopa poreza na promet
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Sakrij granice na okviru adrese pošiljaoca
 MAIN_PDF_NO_RECIPENT_FRAME=Sakrij ivice na okviru adrese primaoca
 MAIN_PDF_HIDE_CUSTOMER_CODE=Sakrij šifru kupca
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Sakrij ime pošiljaoca/kompanije u bloku adrese
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Sakrij uslove plaćanja
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Sakrij način plaćanja
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=Nije preporuceno
 ARestrictedPath=Neka ograničena putanja za datoteke sa podacima
 CheckForModuleUpdate=Provjerite ima li ažuriranja vanjskih modula
 CheckForModuleUpdateHelp=Ova akcija će se povezati s uređivačima vanjskih modula kako bi provjerili da li je dostupna nova verzija.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Dostupno je ažuriranje
 NoExternalModuleWithUpdate=Nisu pronađena ažuriranja za vanjske module
 SwaggerDescriptionFile=Swagger API datoteka opisa (za korištenje s redoc na primjer)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Pokaži adresu za dostavu
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Obavezna indikacija u nekim zemljama (Francuska, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Url link društvene mreže. Koristite {socialid} za varijabilni dio koji sadrži ID društvene mreže.
 IfThisCategoryIsChildOfAnother=Ako je ova kategorija dijete druge
 DarkThemeMode=Način rada tamne teme
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Upozorenje: modul %s je postavi
 WarningModuleHasChangedSecurityCsrfParameter=Upozorenje: modul %s je onemogućio CSRF sigurnost vaše instance. Ova radnja je sumnjiva i da vaša instalacija više neće biti osigurana. Molimo kontaktirajte autora modula za objašnjenje.
 EMailsInGoingDesc=Dolaznom e-poštom upravlja modul %s. Morate omogućiti i da biste ga konfigurirali ako trebate podržavati dolaznu e-poštu.
 MAIN_IMAP_USE_PHPIMAP=Koristite PHP-IMAP biblioteku za IMAP umjesto izvornog PHP IMAP-a. Ovo također omogućava korištenje OAuth2 veze za IMAP (modul OAuth također mora biti aktiviran).
-MAIN_CHECKBOX_LEFT_COLUMN=Prikaži kolonu za odabir linije i polja na lijevoj strani (desno prema zadanim postavkama)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Nije kreirano po defaultu. Kreirano samo nakon aktivacije modula.
 CSSPage=CSS Style
 Defaultfortype=Uobičajeni
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
index 19efd209e75..68e487571d6 100644
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Krajnje stanje
 CurrentBalance=Tekuće stanje
 FutureBalance=Buduće stanje
 ShowAllTimeBalance=Prikaži stanje od početka
-AllTime=Od početka
 Reconciliation=Izmirenje
 RIB=Broj bankovnog računa
 IBAN=IBAN broj
@@ -133,7 +132,7 @@ DeleteTransaction=Obriši unos
 ConfirmDeleteTransaction=Da li ste sigurni da želite obrisati ovaj unos?
 ThisWillAlsoDeleteBankRecord=Ovim će se također obrisati i generisana bankovna transakcija
 BankMovements=Promet
-PlannedTransactions=Planirane transakcije
+PlannedTransactions=Upcoming entries
 Graph=Grafovi
 ExportDataset_banque_1=Bankovne transakcije i izvod s računa
 ExportDataset_banque_2=Priznanica depozita
@@ -151,7 +150,7 @@ FutureTransaction=Buduća transakcija. Ne mogu se pomiriti.
 SelectChequeTransactionAndGenerate=Odaberite/filtrirajte čekove koji će biti uključeni u potvrdu o depozitu. Zatim kliknite na "Kreiraj".
 SelectPaymentTransactionAndGenerate=Odaberite/filtrirajte dokumente koji će biti uključeni u %s potvrdu o depozitu. Zatim kliknite na "Kreiraj".
 InputReceiptNumber=Odaberite bankovni izvod koji se odnosi na mirenje. Koristite numeričku vrijednost koja se može sortirati
-InputReceiptNumberBis=GGGGMM ili GGGGMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Za izmirenje?
 ThenCheckLinesAndConciliate=Zatim, provjerite tekst prisutan u izvodu banke i kliknite
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Ako je ova funkcija omogućena, možete odabrati određ
 BankColorizeMovementName1=Boja pozadine za kretanje zaduženja
 BankColorizeMovementName2=Boja pozadine za kretanje kredita
 IfYouDontReconcileDisableProperty=Ako ne izvršite usaglašavanje banaka na nekim bankovnim računima, onemogućite svojstvo "%s" na njima da uklonite ovo upozorenje.
-NoBankAccountDefined=Nije definisan bankovni račun
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Na bankovnom računu nije pronađen nikakav zapis. Obično se to dešava kada je zapis ručno obrisan sa liste transakcija na bankovnom računu (na primer, tokom usaglašavanja bankovnog računa). Drugi razlog je taj što je uplata zabilježena kada je modul "%s" bio onemogućen.
 AlreadyOneBankAccount=Već je definiran jedan bankovni račun
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA varijanta fajla
diff --git a/htdocs/langs/bs_BA/blockedlog.lang b/htdocs/langs/bs_BA/blockedlog.lang
index dd1ea5853c3..a3d8443937a 100644
--- a/htdocs/langs/bs_BA/blockedlog.lang
+++ b/htdocs/langs/bs_BA/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Nepromjenjivi dnevniki
 ShowAllFingerPrintsMightBeTooLong=Prikaži sve arhivirane zapisnike (mogu biti dugačke)
 ShowAllFingerPrintsErrorsMightBeTooLong=Prikaži sve nevažeće arhivske zapise (mogu biti dugačke)
 DownloadBlockChain=Preuzmite otiske prstiju
-KoCheckFingerprintValidity=Arhivirani unos dnevnika nije važeći. To znači da je neko (haker?) izmijenio neke podatke ovog zapisa nakon što je snimljen, ili je obrisao prethodni arhivirani zapis (provjerite da postoji red sa prethodnim #) ili je izmijenio kontrolnu sumu prethodnog zapisa.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Arhivirani zapis dnevnika je važeći. Podaci u ovom redu nisu izmijenjeni i unos slijedi prethodni.
 OkCheckFingerprintValidityButChainIsKo=Arhivirani dnevnik izgleda validan u poređenju sa prethodnim, ali lanac je prethodno oštećen.
 AddedByAuthority=Pohranjeno u udaljenom autoritetu
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Detalji dnevnika
 ListOfTrackedEvents=Lista praćenih događaja
 Fingerprint=Otisak prsta
 DownloadLogCSV=Izvezi arhivirane zapisnike (CSV)
-DataOfArchivedEvent=Puni podaci arhiviranog događaja
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Originalni objekat (tip %s, id %s) nije povezan (pogledajte kolonu 'Puni podaci' da dobijete nepromjenjive sačuvane podatke)
 BlockedLogAreRequiredByYourCountryLegislation=Modul nepromjenjivih dnevnika može biti potreban zakonima vaše zemlje. Onemogućavanje ovog modula može učiniti sve buduće transakcije nevažećim s obzirom na zakon i korištenje legalnog softvera jer se ne mogu potvrditi poreznom revizijom.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Modul nepromjenjivih dnevnika je aktiviran zbog zakonodavstva vaše zemlje. Onemogućavanje ovog modula može učiniti sve buduće transakcije nevažećim u skladu sa zakonom i o upotrebi legalnog softvera jer se ne mogu potvrditi poreskom revizijom.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Omogućen je sistem za praćenje događaja u nepromjenjive dne
 BlockedLogDisabled=Sistem za praćenje događaja u nepromjenjive dnevnike je onemogućen nakon nekog snimanja. Sačuvali smo poseban otisak prsta da pratimo lanac kao pokvaren
 BlockedLogDisabledBis=Sistem za praćenje događaja u nepromjenjive dnevnike je onemogućen. Ovo je moguće jer još nije napravljena evidencija.
 LinkHasBeenDisabledForPerformancePurpose=U svrhu izvedbe, direktna veza na dokument se ne prikazuje nakon 100. reda.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Račun klijenta je logično izbrisan
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Logično brisanje plaćanja korisnika
 logPAYMENT_VARIOUS_CREATE=Plaćanje (nije dodijeljeno fakturi) kreirano
 logPAYMENT_VARIOUS_DELETE=Plaćanje (nije dodijeljeno fakturi) logično brisanje
 logPAYMENT_VARIOUS_MODIFY=Plaćanje (nije dodijeljeno fakturi) izmijenjeno
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang
index 69734e3b7f3..4ad8be17a67 100644
--- a/htdocs/langs/bs_BA/categories.lang
+++ b/htdocs/langs/bs_BA/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Područje sa oznakama/kategorijama kontakata
 AccountsCategoriesArea=Oznake/kategorije bankovnog računa
 ProjectsCategoriesArea=Oznake/kategorije projekta
 UsersCategoriesArea=Područje korisničkih oznaka/kategorija
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Podkategorije
 CatList=List of tags/categories
 CatListAll=Lista oznaka/kategorija (sve vrste)
@@ -90,9 +91,10 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Ako je opcija uključena, kada dodate objekat u potkategoriju, objekat će takođe biti dodan u nadređene kategorije.
 AddProductServiceIntoCategory=Dodijelite kategoriju proizvodu/usluzi
-AddCustomerIntoCategory=Dodijelite kategoriju kupcu
-AddSupplierIntoCategory=Dodijelite kategoriju dobavljaču
-AssignCategoryTo=Dodijelite kategoriju
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Odaberite kategoriju
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Kategorije kontejnera stranica
 KnowledgemanagementsCategoriesArea=Kategorije KM članaka
 UseOrOperatorForCategories=Za kategorije koristite operator 'OR'
 AddObjectIntoCategory=Dodijelite kategoriji
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index d6371bdf8a8..ded7356a946 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Država je unutar Evropske ekonomske zajednice
 PriceFormatInCurrentLanguage=Format prikaza cijene u trenutnoj valuti i jezika
 ThirdPartyName=Ime treće strane
 ThirdPartyEmail=E-pošta treće strane
-ThirdParty=Treća stranka
-ThirdParties=Treće strane
+ThirdParty=Subjekt
+ThirdParties=Subjekti
 ThirdPartyProspects=Mogući klijenti
 ThirdPartyProspectsStats=Mogući klijenti
 ThirdPartyCustomers=Kupci
@@ -65,6 +65,7 @@ State=Država/Provincija
 StateId=Državni ID
 StateCode=Šifra države/pokrajine
 StateShort=Pokrajina
+DepartmentBuyer=Buyer's state/province
 Region=Region
 Region-State=Regija - Zemlja
 Country=Država
@@ -78,7 +79,7 @@ Chat=Chat
 PhonePro=Autobus. telefon
 PhonePerso=Privatni telefon
 PhoneMobile=Mobitel
-No_Email=Odbijte masovne slanje e-pošte
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=Poštanski broj
 Town=Grad
@@ -382,11 +383,12 @@ ExportCardToFormat=Izvod podataka u formatu
 ContactNotLinkedToCompany=Kontakt nije povezan sa nekim od subjekata
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=Nema Dolibarr pristupa
-ExportDataset_company_1=Treće strane (kompanije/fondacije/fizičke osobe) i njihova svojstva
-ExportDataset_company_2=Kontakti i njihova svojstva
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Svojstva trećih strana i
 ImportDataset_company_2=Dodatni kontakti/adrese trećih strana i atributi
-ImportDataset_company_3=Bankovni računi trećih strana
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Predstavnici prodaje trećih strana (dodijelite prodajne predstavnike/korisnike kompanijama)
 PriceLevel=Price Level
 PriceLevelLabels=Oznake nivoa cijena
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Ime menadžer(a) (CEO, direktor, predsjednik...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Spoji subjekte
-ConfirmMergeThirdparties=Jeste li sigurni da želite spojiti odabranu treću stranu sa trenutnom? Svi povezani objekti (fakture, narudžbe,...) bit će premješteni na trenutnu treću stranu, nakon čega će odabrana treća strana biti izbrisana.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Treće strane su spojene
 SaleRepresentativeLogin=Pristup za predstavnika prodaje
 SaleRepresentativeFirstname=Ime predstavnika prodaje
@@ -460,3 +462,6 @@ ExternalSystemID=ID eksternog sistema
 IDOfPaymentInAnExternalSystem=ID načina plaćanja u eksterni sistem (kao što je Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE Webservice Credentials
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Treća strana mora biti klijent da bi dozvolila kreiranje svojih bankovnih podataka na strani Stripea
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index 9b4d35806fa..bfd4bf5366e 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Plaćanje računa kupca
 PaymentSupplierInvoice=plaćanje fakture dobavljača
 PaymentSocialContribution=Plaćanje socijalnog/fiskalnog poreza
 PaymentVat=Plaćanje PDVa
-AutomaticCreationPayment=Automatski evidentirajte uplatu
+AutomaticCreationPayment=Also record the payment
 ListPayment=Spisak plaćanja
 ListOfCustomerPayments=Spisak uplata kupca
 ListOfSupplierPayments=Spisak plaćanja dobavljača
@@ -118,10 +118,14 @@ SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 BalanceVisibilityDependsOnSortAndFilters=Stanje je vidljivo na ovoj listi samo ako je tabela sortirana na %s i filtrirana na 1 bankovnom računu (bez drugih filtera)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Knjigovodstveni kod kupaca
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Knjigovodstvena šifra dobavljača
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
+UserAccountancyCodeShort=User account. code
 AccountNumber=Kod računa
 NewAccountingAccount=Novi račun
 Turnover=Promet fakturisan
@@ -129,7 +133,9 @@ TurnoverCollected=Promet prikupljen
 SalesTurnoverMinimum=Minimalni promet
 ByExpenseIncome=By expenses & incomes
 ByThirdParties=Po subjektu
+ByProjects=By projects
 ByUserAuthorOfInvoice=By invoice author
+DetailedListLowercase=detailed list
 CheckReceipt=Priznanica depozita
 CheckReceiptShort=Priznanica depozita
 LastCheckReceiptShort=Najnovije %s uplatnice
diff --git a/htdocs/langs/bs_BA/datapolicy.lang b/htdocs/langs/bs_BA/datapolicy.lang
index 99739dec5d8..0df0acb463e 100644
--- a/htdocs/langs/bs_BA/datapolicy.lang
+++ b/htdocs/langs/bs_BA/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Politika privatnosti podataka
 Module4100Desc = Modul za upravljanje privatnošću podataka (usklađenost s GDPR-om)
 # Administration page
 datapolicySetup = Podešavanje politike privatnosti podataka modula
-Deletion = Brisanje podataka
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s mjeseci
 ONE_YEAR = 1 godina
 NB_YEARS = %s godina
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Potencijal/Kupac
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Ni potencijalni/ni kupac
 DATAPOLICY_CONTACT_FOURNISSEUR = Dobavljač
 DATAPOLICY_ADHERENT = Član
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Možete poslati GDPR e-poruku svim svojim relevantnim kontaktima (koji još nisu primili e-poštu i za koju niste registrirali ništa o njihovom GDPR ugovoru). Da biste to učinili, koristite sljedeće dugme.
 SendAgreement = Šalji e-poštu
 AllAgreementSend = Svi emailovi su poslani
 TXTLINKDATAPOLICYACCEPT = Tekst za link "sporazum"
 TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR : Obrada ličnih podataka
 DATAPOLICY_consentement = Dobivena saglasnost za obradu ličnih podataka
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index adcab55af96..f411aecbccc 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Postavljanje e-pošte nije završeno
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Za ovu funkciju je potreban JavaScript da bi se aktivirao. Promijenite ovo u podešavanjima - prikazu.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
 ErrorFileSizeTooLarge=Veličina datoteke je prevelika ili datoteka nije navedena.
 ErrorFieldTooLong=Polje %s je predugačko.
 ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
 ErrorNoValueForSelectType=Please fill value for select list
 ErrorNoValueForCheckBoxType=Please fill value for checkbox list
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
 ErrorFieldCantBeNegativeOnInvoice=Polje <strong>%s</strong> ne može biti negativno na ovoj vrsti fakture. Ako trebate dodati liniju popusta, samo prvo kreirajte popust (iz polja '%s' na kartici treće strane) i primijeniti na fakturu.
 ErrorLinesCantBeNegativeForOneVATRate=Ukupan broj redova (bez poreza) ne može biti negativan za datu stopu PDV-a koja nije nula (Pronađen negativan zbroj za stopu PDV-a <b>%s </b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Linije ne mogu biti negativne u depozitu. Suočićete se sa problemima kada ćete morati da potrošite depozit u konačnoj fakturi ako to učinite.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Vaš PHP parametar upload_max_filesize (%s) je veći od PHP parametra post_max_size (%s). Ovo nije dosljedna postavka.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR faktura se može dodati samo na fakture postavljene da se plaćaju plaćanjem kreditnim transferom.
 SwissQrCreditorAddressInvalid = Adresa kreditora je nevažeća (da li je ZIP i postavljen na grad? (%s)
 SwissQrCreditorInformationInvalid = Podaci o kreditoru su nevažeći za IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/bs_BA/exports.lang b/htdocs/langs/bs_BA/exports.lang
index 837bc2b30e1..a7b9c4775dd 100644
--- a/htdocs/langs/bs_BA/exports.lang
+++ b/htdocs/langs/bs_BA/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Label of line
 LineDescription=Description of line
 LineUnitPrice=Unit price of line
 LineVATRate=VAT Rate of line
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Quantity for line
 LineTotalHT=Iznos bez porez za liniju
 LineTotalTTC=Amount with tax for line
 LineTotalVAT=Amount of VAT for line
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=Odaberite format datoteke koji ćete koristiti kao fo
 ChooseFileToImport=Otpremite datoteku, a zatim kliknite na ikonu %s da odaberete datoteku kao izvornu datoteku za uvoz...
 SourceFileFormat=Source file format
 FieldsInSourceFile=Fields in source file
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=No fields
 MoveField=Move field column number %s
 ExampleOfImportFile=Example_of_import_file
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Check that the file format (field and string delimiters)
 RunSimulateImportFile=Pokrenite simulaciju uvoza
 FieldNeedSource=This field requires data from the source file
 SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
-InformationOnSourceFile=Information on source file
-InformationOnTargetTables=Information on target fields
+InformationOnSourceFile=Source file
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Switch at least one source field in the column of fields to export
 SelectFormat=Choose this import file format
 RunImportFile=Uvoz podataka
diff --git a/htdocs/langs/bs_BA/hrm.lang b/htdocs/langs/bs_BA/hrm.lang
index 2f03e7cd573..c270db6f865 100644
--- a/htdocs/langs/bs_BA/hrm.lang
+++ b/htdocs/langs/bs_BA/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=Potreban čin za profil posla
-RequiredRankShort=Potreban čin
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Pozicije sa ovim profilima poslova
-EmployeeRank=Rang zaposlenika za ovu vještinu
-EmployeeRankShort=Čin zaposlenih
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Položaj zaposlenih
 EmployeePositions=Pozicije zaposlenih
 EmployeesInThisPosition=Zaposleni na ovoj poziciji
@@ -72,6 +72,9 @@ AddSkill=Dodajte vještine u profil posla
 RequiredSkills=Vještine potrebne za ovaj profil posla
 UserRank=User Rank
 SkillList=Lista vještina
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Sačuvaj rang
 TypeKnowHow=Znanje
 TypeHowToBe=Kako biti
@@ -95,3 +98,5 @@ NeedBusinessTravels=Potrebna su poslovna putovanja
 NoDescription=Bez opisa
 TheJobProfileHasNoSkillsDefinedFixBefore=Procijenjeni profil radnog mjesta ovog zaposlenika nema definirane vještine. Molimo dodajte vještinu(e), a zatim izbrišite i ponovo pokrenite evaluaciju.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index 7e196da11dd..44b8fe0b631 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=E-pošta
 EMailing=E-pošta
-EMailings=E-pošte
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=Sva e-pošta
+AllEMailings=All mass eMails
 MailCard=Kartica e-pošte
 MailRecipients=Primaoci
 MailRecipient=Primalac
@@ -26,19 +26,19 @@ MailFile=Priloženi fajlovi
 MailMessage=Tekst emaila
 SubjectNotIn=Ne u predmetu
 BodyNotIn=Ne u telu
-ShowEMailing=Prikažu e-poštu
-ListOfEMailings=Lista e-pošta
-NewMailing=Nova e-pošta
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=Uredi e-poštu
-ResetMailing=Ponovo pošalji e-poštu
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Obriši e-poštu
-PreviewMailing=Pregledati e-poštu
-CreateMailing=Kreirati e-poštu
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=Potvrdi e-poštu
+ValidMailing=Valid mass Email
 MailingStatusDraft=Nacrt
 MailingStatusValidated=Potvrđeno
 MailingStatusSent=Poslano
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Svi filteri se moraju podudarati da bi se prikupljala e
 LineInFile=Linija %s u fajlu
 RecipientSelectionModules=Definisani zahtjevi za odabir primaoca
 MailSelectedRecipients=Odabrani primaoci
-MailingArea=Područje za e-poštu
-LastMailings=Latest %s emailings
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Mete statistike
 NbOfCompaniesContacts=Jedinstveni kontakti/adrese
 MailNoChangePossible=Primaoci za potvrđenu e-poštu ne mogu biti promijenjeni
-SearchAMailing=Traži e-poštu
-SendMailing=Pošalji e-poštu
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Poslano od
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Možete ih poslati online dodavanjem parametra MAILING_LIMIT_SENDBYWEB sa vrijednosti za maksimalni broj e-mailova koje želite poslati po sesiji. Za ovo idite na Početna - Postavke - Ostalo
 ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Očisti listu
 ToClearAllRecipientsClickHere=Klikni ovdje da očistite listu primaoca za ovu e-poštu
 ToAddRecipientsChooseHere=Odaberi primaoce biranjem sa liste
-NbOfEMailingsReceived=Masovno slanje e-pošte primljeno
-NbOfEMailingsSend=Mass emailings sent
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID zapisa
 DeliveryReceipt=Delivery Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Možete koristiti <b>zarez</b> kao separator da biste naveli više primaoca.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Nisu planirana automatska obavještenja putem e-pošte
 ANotificationsWillBeSent=1 automatsko obavještenje će biti poslano putem e-pošte
 SomeNotificationsWillBeSent=%s automatska obavještenja će se slati putem e-pošte
 AddNewNotification=Pretplatite se na novo automatsko obavještenje putem e-pošte (cilj/događaj)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -183,7 +185,7 @@ Information=Inromacije
 ContactsWithThirdpartyFilter=Kontakti sa filterom treće strane
 Unanswered=Bez odgovora
 Answered=Odgovoreno
-IsNotAnAnswer=Nije odgovor (početni email)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Odgovor je na početni email
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Zadana vrijednost za polje '%s' prilikom kreiranja novog kontakta
@@ -199,6 +201,6 @@ ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 97c9b3b7b60..d05214fa207 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -37,6 +37,7 @@ Translation=Prevod
 Translations=Prevodi
 CurrentTimeZone=Vremenska zona PHP (servera)
 EmptySearchString=Unesite neprazne kriterije pretraživanja
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Unesite kriterij datuma
 NoRecordFound=Nije pronađen zapis
 NoRecordDeleted=Nijedan zapis nije obrisan
@@ -45,6 +46,7 @@ NoError=Nema greške
 Error=Greška
 Errors=Greške
 ErrorFieldRequired=Polje '%s' je obavezno
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Polje '%s' ima nevaljanu vrijednost
 ErrorFileDoesNotExists=Datoteka %s ne postoji
 ErrorFailedToOpenFile=Neuspjelo otvaranje datoteke %s
@@ -308,6 +310,7 @@ DateBuild=Datum izrade izvještaja
 DatePayment=Datum plaćanja
 DateApprove=Datum odobrenja
 DateApprove2=Datum odobrenja (drugo odobrenje)
+PendingSince=Pending since
 RegistrationDate=Datum registracije
 UserCreation=Kreiranje korisnika
 UserModification=Izmjena korisnika
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Treba započeti
 ActionRunningShort=U toku
 ActionDoneShort=Završeno
 ActionUncomplete=Nepotpuno
-LatestLinkedEvents=Posljednjih %s povezanih događaja
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Kompanija/organizacija
 Accountant=Računovođa
 ContactsForCompany=Kontakti za ovaj subjekt
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=Tekst emaila
 SendAcknowledgementByMail=Pošalji konfirmacijski email
 SendMail=Pošalji e-mail
 Email=email
+EMail=email
+EMails=Emails
 NoEMail=nema emaila
 AlreadyRead=Već sam pročitao
 NotRead=Nepročitano
@@ -793,7 +798,7 @@ Notes=Napomene
 AddNewLine=Dodaj novi red
 AddFile=Dodaj datoteku
 FreeZone=Proizvod slobodnog teksta
-FreeLineOfType=Stavka slobodnog teksta, tip:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Kloniraj objekt sa njegovim osnovnim osobinama
 ReGeneratePDF=Ponovo generirajte PDF
 PDFMerge=PDF spajanje
@@ -879,12 +884,14 @@ toward=prema
 Access=Pristup
 SelectAction=Odaberi akciju
 SelectTargetUser=Odaberi ciljnog korisnika/zaposlenika
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Koristite Ctrl+C za kopiranje u međuspremnik copy to clipboard
 SaveUploadedFileWithMask=Spremi datoteku na server pod imenom "<strong>%s</strong>" (inače "%s")
 OriginFileName=Originalno ime datoteke
 SetDemandReason=Postavi izvor
 SetBankAccount=Definiraj bankovni račun
 AccountCurrency=Valuta računa
+AccountancyCode=Accounting Code
 ViewPrivateNote=Vidi zabilješke
 XMoreLines=%s red(ova) skriveno
 ShowMoreLines=Pokaži više/manje redova
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Jeste li sigurni da želite izbrisati %s odabrane za
 ConfirmMassClone=Masovna potvrda kloniranja
 ConfirmMassCloneQuestion=Odaberite projekat za kloniranje
 ConfirmMassCloneToOneProject=Kloniraj u projekat %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Povezani objekti
 ClassifyBilled=Klasificirati Naplaćeno
 ClassifyUnbilled=Klasifikujte nenaplaćeno
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Morate biti prijavljeni i potrebne su vam dozvole za pre
 Download=Skidanje
 DownloadDocument=Skidanje dokumenta
 DownloadSignedDocument=Preuzmite potpisani dokument
-ActualizeCurrency=Ažuriraj kurs valute
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Fiskalna godina
 ModuleBuilder=Modul i Application Builder
 SetMultiCurrencyCode=Postavi valutu
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Masovne akcije
 ClickToShowHelp=Klikni za prikaz pomoći
 WebSite=Website
@@ -1104,6 +1113,7 @@ PayedBy=Platio
 PayedTo=Plaćeno
 Monthly=Mjesečno
 Quarterly=Tromjesečno
+Quarter=Quarter
 Annual=Godišnje
 Local=Lokalni
 Remote=Udaljeni
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Zadatak
 ContactDefault_propal=Prijedlog
 ContactDefault_supplier_proposal=Supplier Proposal
 ContactDefault_ticket=Ulaznica
+ContactDefault_societe=Subjekt
 ContactAddedAutomatically=Kontakt je dodan iz kontakt uloga treće strane
 More=Više
 ShowDetails=Pokaži detalje
@@ -1242,6 +1253,7 @@ CommercialAffected=Dodijeljen predstavnik prodaje
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=Poruka
+Emailing=Emailing
 Progression=Napredak
 YourMessage=Tvoja poruka
 YourMessageHasBeenReceived=Vaša poruka je primljena. Odgovorit ćemo ili kontaktirati Vas u najkraćem mogućem roku.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Dodaj
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Od početka
+Transferred=Transferred
diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
index 8cef73854aa..eece756a102 100644
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Ako je pretplata potrebna, pretplata s datumom početka
 DeleteType=Obriši
 VoteAllowed=Glasanje dozvoljeno
 Physical=Pojedinac
-Moral=Corporation
-MorAndPhy=Korporacija i Pojedinac
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Ponovo omogući
 ExcludeMember=Isključi člana
 Exclude=Isključi
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Statistika članova po regijama
 NbOfMembers=Ukupan broj članova
 NbOfActiveMembers=Ukupan broj trenutno aktivnih članova
 NoValidatedMemberYet=Nisu pronađeni validirani članovi
-MembersByCountryDesc=Ovaj ekran vam prikazuje statistiku članova po zemljama. Grafikoni i grafikoni zavise od dostupnosti Google online graf usluge kao i od dostupnosti funkcionalne internet veze.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Ovaj ekran vam prikazuje statistiku članova po državi/pokrajinama/kantonu.
 MembersByTownDesc=Ovaj ekran vam prikazuje statistiku članova po gradovima.
 MembersByNature=Ovaj ekran vam prikazuje statistiku članova po prirodi.
@@ -208,25 +209,25 @@ NewMemberbyWeb=Dodan je novi član. Čeka se odobrenje
 NewMemberForm=Novi obrazac za članstvo
 SubscriptionsStatistics=Statistika doprinosa
 NbOfSubscriptions=Broj doprinosa
-AmountOfSubscriptions=Iznos prikupljen od doprinosa
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=Promet (za kompaniju) ili budžet (za fondaciju)
-DefaultAmount=Zadani iznos doprinosa (koristi se samo ako iznos nije definiran na nivou vrste člana)
-MinimumAmount=Minimalni iznos (koristi se samo kada je iznos doprinosa besplatan)
-CanEditAmount=Iznos pretplate može odrediti član
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=Posjetilac može birati/urediti iznos svog doprinosa bez obzira na vrstu člana
 AmountIsLowerToMinimumNotice=Iznos je manji od minimalnog %s
 MEMBER_NEWFORM_PAYONLINE=Nakon online registracije, automatski se prebacite na stranicu za online plaćanje
 ByProperties=Po prirodi
 MembersStatisticsByProperties=Statistika članova po prirodi
-VATToUseForSubscriptions=Stopa PDV-a koja se koristi za doprinose
-NoVatOnSubscription=Bez PDV-a na doprinose
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Proizvod korišten za liniju doprinosa u fakturi: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=Ime ili kompanija
 SubscriptionRecorded=Doprinos zabilježen
 NoEmailSentToMember=Članu nije poslana email adresa
 EmailSentToMember=E-mail poslan članu na %s
-SendReminderForExpiredSubscriptionTitle=Pošaljite podsjetnik e-poštom za istekle doprinose
-SendReminderForExpiredSubscription=Pošaljite podsjetnik e-poštom članovima kada doprinos istekne (parametar je broj dana prije kraja članstva za slanje podsjetnika. To može biti lista dana odvojenih tačkom i zarezom, na primjer '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Plaćeno članstvo za tekući period (do %s)
 YouMayFindYourInvoiceInThisEmail=Vašu fakturu možete pronaći u prilogu ove e-pošte
 XMembersClosed=%s član(ovi) zatvoreni
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Treće lice je pravno lice koje će se koristiti na
 MemberFirstname=Ime člana
 MemberLastname=Člansko prezime
 MemberCodeDesc=Kod člana, jedinstven za sve članove
-MemberSubscriptionStartFirstDayOf=Datum početka članstva odgovara prvom danu a
-MemberSubscriptionStartAfter=Minimalni period prije stupanja na snagu datuma početka pretplate osim obnova (primjer +3m = +3 mjeseca, -5d = -5 dana, +1Y = +1 godina)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/bs_BA/salaries.lang b/htdocs/langs/bs_BA/salaries.lang
index 2345c9de89d..c7d4cafafff 100644
--- a/htdocs/langs/bs_BA/salaries.lang
+++ b/htdocs/langs/bs_BA/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Nova plata
 AddSalary=Dodajte platu
 NewSalaryPayment=Nova platna kartica
 AddSalaryPayment=Dodajte isplatu plate
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Isplata plate
 SalariesPayments=Isplate plata
 SalariesPaymentsOf=Isplate plata od %s
@@ -27,7 +29,7 @@ FillFieldFirst=Prvo popunite polje za zaposlene
 UpdateAmountWithLastSalary=Odredite iznos zadnje plate
 MakeTransferRequest=Napravite zahtjev za transfer
 VirementOrder=Zahtjev za prijenos kredita
-BankTransferAmount=Iznos kreditnog transfera
 WithdrawalReceipt=Nalog za prijenos kredita
 OrderWaiting=Narudžba na čekanju
 FillEndOfMonth=Napunite do kraja mjeseca
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
index 003786fdd5d..d452e2fe33e 100644
--- a/htdocs/langs/bs_BA/website.lang
+++ b/htdocs/langs/bs_BA/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Koristite ovdje listu drugih imena/pseudonima tako da se st
 WEBSITE_CSS_URL=URL eksterne CSS datoteke
 WEBSITE_CSS_INLINE=Sadržaj CSS fajla (zajednički za sve stranice)
 WEBSITE_JS_INLINE=Sadržaj JavaScript datoteke (zajednički za sve stranice)
-WEBSITE_HTML_HEADER=Dodatak na dnu HTML zaglavlja (zajedničko za sve stranice)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Datoteka robota (robots.txt)
 WEBSITE_HTACCESS=Datoteka web stranice .htaccess
 WEBSITE_MANIFEST_JSON=Datoteka manifest.json web stranice
@@ -56,16 +56,17 @@ ReadPerm=Pročitaj
 WritePerm=Pisati
 TestDeployOnWeb=Testirajte / implementirajte na webu
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Pregled %s na novoj kartici.</u><br><br>%s će služiti Dolibarr server tako da mu ne treba nikakav dodatni web server (kao Apache, Nginx, IIS) za instaliranje.<br>Nezgodno je to što URL-ovi stranica nisu prilagođeni korisniku i počnite s putanjom vašeg Dolibarra.<br>URL koju poslužuje Dolibarr:<br>b0e7843947c06bz span>%s</strong><br>b031492zcc Da biste koristili vlastiti vanjski web server za posluživanje ove web stranice, kreirajte virtualni host na svom web serveru koji pokazuje na direktorij<br> <strong>%s</strong><br> unesite ovo ime19bz0 virtuelni server u svojstvima ove web stranice i kliknite na vezu "Test/Deploy on the web".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL virtuelnog hosta kojeg opslužuje vanjski web server nije definiran
 NoPageYet=Još nema stranica
 YouCanCreatePageOrImportTemplate=Možete kreirati novu stranicu ili uvesti cijeli predložak web stranice
 SyntaxHelp=Pomoć za specifične savjete o sintaksi
 YouCanEditHtmlSourceckeditor=Možete uređivati HTML izvorni kod koristeći dugme "Izvor" u uređivaču.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Za sliku koja se dijeli s vezom za dijeljenje (otvoreni pristup koristeći hash ključ za dijeljenje datoteke), sintaksa je:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;0af665dc71f09 <br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Više primjera HTML ili dinamičkog koda dostupno je na <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">wiki dokumentacijib0e40dc6087 >.<br>
 ClonePage=Kloniraj stranicu/kontejner
 CloneSite=Clone site
@@ -87,15 +88,15 @@ WebsiteAccount=Račun web stranice
 WebsiteAccounts=Nalozi za web stranicu
 AddWebsiteAccount=Kreirajte račun web stranice
 BackToListForThirdParty=Povratak na listu za treće strane
-DisableSiteFirst=Prvo onemogućite web stranicu
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Naslov moje web stranice
 AnotherContainer=Ovako možete uključiti sadržaj druge stranice/kontejnera (ovdje možete imati grešku ako omogućite dinamički kod jer ugrađeni podkontejner možda ne postoji)
 SorryWebsiteIsCurrentlyOffLine=Žao nam je, ova web stranica je trenutno van mreže. Molim vas vratite se kasnije...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Omogućite tablicu za pohranjivanje računa web stranice (login/pass) za svaku web stranicu / treću stranu
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Prvo morate definirati zadanu početnu stranicu
-OnlyEditionOfSourceForGrabbedContentFuture=Upozorenje: Kreiranje web stranice uvozom vanjske web stranice rezervirano je za iskusne korisnike. U zavisnosti od složenosti izvorne stranice, rezultat uvoza može se razlikovati od originala. Također, ako izvorna stranica koristi uobičajene CSS stilove ili konfliktni JavaScript, to može narušiti izgled ili karakteristike uređivača web stranice kada radite na ovoj stranici. Ova metoda je brži način za kreiranje stranice, ali se preporučuje da kreirate novu stranicu ispočetka ili iz predloženog šablona stranice.<br>Imajte na umu da ugrađeni uređivač možda neće raditi ispravnost kada se koristi na preuzetoj vanjskoj stranici.
-OnlyEditionOfSourceForGrabbedContent=Moguće je samo izdanje HTML izvora kada je sadržaj preuzet sa eksterne stranice
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Uzmite i slike pronađene na css i stranici.
 ImagesShouldBeSavedInto=Slike treba pohraniti u direktorij
 WebsiteRootOfImages=Korijenski direktorij za slike web stranice
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Ukloni filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Kategorije
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 4e4a79b9b69..6a88c61efa3 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=La comprovació d'integritat dels fitxers ha
 FileIntegritySomeFilesWereRemovedOrModified=La comprovació d'integritat dels fitxers ha fallat. Alguns fitxers s'han modificat, eliminat o afegit.
 GlobalChecksum=Suma de control global
 MakeIntegrityAnalysisFrom=Feu anàlisi d'integritat dels fitxers de l'aplicació des de
-LocalSignature=Signatura local incrustada (menys fiable)
-RemoteSignature=Signatura a distància remota (més fiable)
+LocalSignature=Signatura local incrustada
+RemoteSignature=Signatura remota
 FilesMissing=Falten fitxers
 FilesUpdated=Fitxers actualitzats
 FilesModified=Fitxers modificats
@@ -43,8 +43,8 @@ PermissionsOnFiles=Permisos als fitxers
 PermissionsOnFilesInWebRoot=Permisos als fitxers del directori arrel web
 PermissionsOnFile=Permisos al fitxer %s
 NoSessionFound=La vostra configuració de PHP sembla que no permet la llista de sessions actives. El directori utilitzat per a desar les sessions (<b>%s</b>) pot estar protegit (per exemple, amb els permisos del sistema operatiu o per la directiva PHP open_basedir).
-DBStoringCharset=Conjunt de caràcters de base de dades per emmagatzemar dades
-DBSortingCharset=Conjunt de caràcters de la base de dades per ordenar les dades
+DBStoringCharset=Conjunt de caràcters de la base de dades per a emmagatzemar dades
+DBSortingCharset=Conjunt de caràcters de la base de dades per a ordenar les dades
 HostCharset=Conjunt de caràcters de l'amfitrió
 ClientCharset=Conjunt de caràcters del client
 ClientSortingCharset=Col·lecció de clients
@@ -59,7 +59,7 @@ UserInterface=Interfície d'usuari
 GUISetup=Mostra
 SetupArea=Configuració
 UploadNewTemplate=Penja plantilles noves
-FormToTestFileUploadForm=Formulari per provar la càrrega del fitxer (segons la configuració)
+FormToTestFileUploadForm=Formulari per a provar la càrrega del fitxer (segons la configuració)
 ModuleMustBeEnabled=El mòdul/aplicació <b>%s</b> ha d'estar activat
 ModuleIsEnabled=S'ha habilitat el mòdul/aplicació <b>%s</b>
 IfModuleEnabled=Nota: sí només és efectiu si el mòdul <b>%s</b> està activat
@@ -80,8 +80,8 @@ DisableJavascript=Desactiveu les funcions JavaScript i Ajax
 DisableJavascriptNote=Nota: només amb finalitats de prova o depuració. Per a l'optimització per a persones cegues o navegadors de text, potser preferiu utilitzar la configuració del perfil de l'usuari
 UseSearchToSelectCompanyTooltip=A més, si teniu un gran nombre de tercers (> 100.000), podeu augmentar la velocitat establint la constant COMPANY_DONOTSEARCH_ANYWHERE a 1 a Configuració->Altres. La cerca es limitarà a l'inici de la cadena.
 UseSearchToSelectContactTooltip=A més, si teniu un gran nombre de tercers (> 100.000), podeu augmentar la velocitat establint la constant CONTACT_DONOTSEARCH_ANYWHERE a 1 a Configuració->Altres. La cerca es limitarà a l'inici de la cadena.
-DelaiedFullListToSelectCompany=Espereu fins que es premeu una tecla abans de carregar el contingut de la llista combinada de tercers.<br>Això pot augmentar el rendiment si teniu un gran nombre de tercers, però és menys convenient.
-DelaiedFullListToSelectContact=Espereu fins que es prem una tecla abans de carregar el contingut de la llista combinada de contactes.<br>Això pot augmentar el rendiment si teniu un gran nombre de contactes, però és menys convenient.
+DelaiedFullListToSelectCompany=Espereu fins que es premi una tecla abans de carregar el contingut de la llista combinada de tercers.<br>Això pot augmentar el rendiment si teniu un gran nombre de tercers, però és menys útil.
+DelaiedFullListToSelectContact=Espereu fins que es premi una tecla abans de carregar el contingut de la llista combinada de contactes.<br>Això pot augmentar el rendiment si teniu un gran nombre de contactes, però és menys útil.
 NumberOfKeyToSearch=Nombre de caràcters per a activar la cerca: %s
 NumberOfBytes=Nombre de bytes
 SearchString=Cadena de cerca
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Només l'utilitzen algunes opcions d'agenda
 Security=Seguretat
 Passwords=Contrasenyes
 DoNotStoreClearPassword=Xifra les contrasenyes emmagatzemades a la base de dades.
-MainDbPasswordFileConfEncrypted=Xifra la contrasenya de la base de dades emmagatzemada a conf.php. És molt recomanable activar aquesta opció.
+MainDbPasswordFileConfEncrypted=Ofusca la contrasenya de la base de dades emmagatzemada a conf.php. Es recomana activar aquesta opció.
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protegiu els fitxers PDF generats. Això NO es recomana perquè trenca la generació massiva de PDF.
@@ -272,7 +272,7 @@ SocialNetworks=Xarxes socials
 SocialNetworkId=Identificador de la xarxa social
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 ForAnswersSeeForum=Per a qualsevol altra pregunta/ajuda, podeu utilitzar el fòrum de Dolibarr:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
-HelpCenterDesc1=Aquí teniu alguns recursos per obtenir ajuda i suport amb Dolibarr.
+HelpCenterDesc1=Aquí teniu alguns recursos per a obtenir ajuda i suport amb Dolibarr.
 HelpCenterDesc2=Alguns d'aquests recursos només estan disponibles a <b>anglès</b>.
 CurrentMenuHandler=Actual gestor del menú
 MeasuringUnit=Unitat de mesura
@@ -364,18 +364,18 @@ LastActivationVersion=Última versió d'activació
 UpdateServerOffline=Actualitza el servidor fora de línia
 WithCounter=Gestionar un comptador
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated to the customer. This counter dedicated to customer is reset at same time as the global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
-GenericMaskCodes2b=<b>{uuuu}</b> the n first characters of the lastname of the user that creates the object (n is number of "u").
+GenericMaskCodes2=<b>{cccc}</b> el codi de client en n caràcters<br><b>{cccc000}</b>el codi de client en n caràcters és seguit d'un mostrador dedicat al client. Aquest comptador dedicat al client es restableix al mateix temps que el comptador global.<br><b>{tttt}</b> El codi del tipus de tercer en n caràcters (vegeu el menú Inici - Configuració - Diccionari - Tipus de tercers). Si afegiu aquesta etiqueta, el comptador serà diferent per a cada tipus de tercer.<br>
+GenericMaskCodes2b=<b>{uuuu}</b> els n primers caràcters del cognom de l'usuari que crea l'objecte (n és el nombre de «u»).
 GenericMaskCodes3=Tots els altres caràcters de la màscara romandran intactes.<br>No es permeten espais.<br>
 GenericMaskCodes3EAN=Tots els altres caràcters de la màscara es mantindran intactes (excepte * o ? a la 13a posició de l'EAN13).<br>No es permeten espais.<br> span>A EAN13, l'últim caràcter després de l'últim } a la 13a posició hauria de ser * o ? . Se substituirà per la clau calculada.<br>
 GenericMaskCodes4a=<u>Exemple del 99è %s del tercer TheCompany, amb data 2023-01-31:</u><br>
 GenericMaskCodes4b=<u>Exemple de tercers creat el 2023-01-31:</u><br> >
 GenericMaskCodes4c=<u>Exemple del producte creat el 31/01/2023:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericMaskCodes5b=<b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> donarà <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> donarà <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5b=<b>IN{yy}{mm}-{0000} -{t}</b> donarà <b>IN2301-0099-A</b> si el tipus d'empresa és «Responsable Inscripto» amb codi per al tipus «A_RI»
 GenericNumRefModelDesc=Retorna un número personalitzable segons una màscara definida.
-DateStartThatModel=Disable use of this numbering rule for all thirdparties created before
-DateStartThatModelHelp=You can disable elephant numbering rule for thirdparties created before a date (for example, because they were imported by a migration, from another software using a different rule). Let that field empty to have the rule applied on all thirdparties.
+DateStartThatModel=Desactiveu l'ús d'aquesta regla de numeració per a tots els tercers creats abans
+DateStartThatModelHelp=Podeu desactivar la regla de numeració «elephant» per a tercers creats abans d'una data (per exemple, perquè s'han importat mitjançant una migració, des d'un altre programari amb una regla diferent). Deixeu que aquest camp estigui buit perquè la regla s'apliqui a tots els tercers.
 ServerAvailableOnIPOrPort=El servidor està disponible a l'adreça <b>%s</b> al port <b>%s</b>
 ServerNotAvailableOnIPOrPort=El servidor no està disponible a l'adreça <b>%s</b> al port <b>%s</b>
 DoTestServerAvailability=Prova la connectivitat del servidor
@@ -458,23 +458,24 @@ ExtrafieldSelect=Seleccioneu la llista
 ExtrafieldSelectList=Seleccioneu de la taula
 ExtrafieldSeparator=Separador (no un camp)
 ExtrafieldPassword=Contrasenya
-ExtrafieldRadio=Radio buttons (1 choice only)
-ExtrafieldCheckBox=Select list (n choices)
-ExtrafieldCheckBoxFromList=Select from table (n choices)
+ExtrafieldRadio=Botons de tipus ràdio (només 1 opció)
+ExtrafieldCheckBox=Llista de selecció (n opcions)
+ExtrafieldCheckBoxFromList=Seleccioneu de la taula (n opcions)
 ExtrafieldLink=Enllaç a un objecte
 ExtrafieldPointGeo=Punt geomètric
 ExtrafieldMultiPointGeo=Multipunt geomètric
 ExtrafieldLinestringGeo=Línia geomètrica
 ExtrafieldPolygonGeo=Polígon geomètric
+ExtrafieldStars=Estrelles
 ComputedFormula=Camp calculat
-ComputedFormulaDesc=Podeu introduir aquí una fórmula utilitzant altres propietats de l'objecte o qualsevol codificació PHP per obtenir un valor calculat dinàmic. Podeu utilitzar qualsevol fórmula compatible amb PHP, inclòs el "?" operador de condició i l'objecte global següent: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>ADVERTIMENT</strong>: si necessiteu propietats d'un objecte no s'ha carregat, només cal que busqueu l'objecte a la vostra fórmula com en el segon exemple.<br>Utilitzar un camp calculat vol dir que no podeu introduir cap valor des de la interfície. A més, si hi ha un error de sintaxi, és possible que la fórmula no retorni 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 tornar a carregar l'objecte<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] *- $reloadedob >capital / 5: '-1')<br><br>Un altre exemple de fórmula per forçar la càrrega de l'objecte i el seu objecte pare: <br>(($reloadedobj = tasca nova ($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = projecte nou( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'No s'ha trobat el projecte principal'
+ComputedFormulaDesc=Podeu introduir aquí una fórmula utilitzant altres propietats de l'objecte o qualsevol codificació PHP per obtenir un valor calculat dinàmic. Podeu utilitzar qualsevol fórmula compatible amb PHP, inclòs el "?" operador de condició i l'objecte global següent: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>ADVERTIMENT</strong>: si necessiteu propietats d'un objecte no carregat, només cal que traieu l'objecte a la vostra fórmula com en el segon exemple.<br>L'ús d'un camp calculat vol dir que no podeu introduir cap valor des de la interfície. A més, si hi ha un error de sintaxi, és possible que la fórmula no retorni 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 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 forçar la càrrega de l'objecte i el seu objecte pare:<br>(($reloadedobj = nova tasca ($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = projecte nou ($db) )) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0))? $secondloadedobj->ref: 'No s'ha trobat el projecte principal'
 Computedpersistent=Emmagatzema el camp calculat
 ComputedpersistentDesc=Els camps addicionals calculats s'emmagatzemaran a la base de dades, però el valor només es tornarà a calcular 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'amaga amb estrelles a la pantalla).<br><br>Introduïu valor 'dolcrypt' per codificar el valor amb un algorisme de xifratge reversible. Les dades esborrades encara es poden conèixer i editar, però s'encripten a la base de dades.<br><br>Introduïu 'auto' (o 'md5', 'sha256', 'password_hash', ...) per a utilitzar l'algorisme de xifratge de contrasenya predeterminat (o md5, sha256, password_hash...) per a desar la contrasenya hash no reversible a la base de dades (no hi ha manera de recuperar el valor original)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarily a primary int key<br>- filtersql is a condition. It must use the USF syntax. Example: (active:=:1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>If you want to filter on extrafields use syntax  extra.fieldcode=... (where fieldcode is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=La llista de valors prové d'una taula<br>Sintaxi: table_name:label_field:id_field::filtersql<br>Exemple: c_typent:libelle: ::filtersql<br><br>- id_field és necessàriament una clau int primària<br>- filtersql és una condició . Ha d'utilitzar la sintaxi USF. Exemple: (active:=:1) per mostrar només el valor actiu<br>També podeu utilitzar $ID$ al filtre, que és l'identificador actual de l'objecte actual<br>Si voleu filtrar els camps extra, utilitzeu la sintaxi extra.fieldcode=... (on el codi de camp és el codi de extracamp)<br><br>Per tal que la llista depengui d'una altra llista d'atributs complementària:<br> c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>Per tal que la llista depengui d'una altra llista:<br>c_typent:libelle:id:b049271e8181fc parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Els paràmetres han de ser ObjectName:Classpath<br>Sintaxi: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Manteniu-lo buit per a un separador simple<br>Definiu-lo a 1 per a un separador que es replega (obert per defecte per a una sessió nova, llavors l'estat es manté per a cada sessió d'usuari)<br>Definiu-ho a 2 per a un separador que es replega (es replega de manera predeterminada per a una sessió nova, llavors l'estat es manté abans de cada sessió d'usuari)
 LibraryToBuildPDF=Biblioteca utilitzada per a la generació de PDF
@@ -482,7 +483,7 @@ LocalTaxDesc=Alguns països poden aplicar dos o tres impostos a cada línia de f
 SMS=SMS
 LinkToTestClickToDial=Introduïu un número de telèfon a trucar per a mostrar un enllaç per a provar l'URL de ClickToDial per a l'usuari <strong>%s</strong>
 RefreshPhoneLink=Actualitza l'enllaç
-LinkToTest=Enllaç clicable generat per a l'usuari <strong>%s</strong> (feu clic al número de telèfon per provar )
+LinkToTest=Enllaç clicable generat per a l'usuari <strong>%s</strong> (feu clic al número de telèfon per a provar)
 KeepEmptyToUseDefault=Manteniu-lo buit per utilitzar el valor predeterminat
 KeepThisEmptyInMostCases=En la majoria dels casos, podeu mantenir aquest camp buit.
 DefaultLink=Enllaç per defecte
@@ -513,21 +514,21 @@ ModuleCompanyCodeCustomerDigitaria=%s seguit del nom del client truncat pel nomb
 ModuleCompanyCodeSupplierDigitaria=%s seguit del nom del proveïdor truncat pel nombre de caràcters: %s per al codi de comptabilitat del proveïdor.
 Use3StepsApproval=De manera predeterminada, les comandes de compra han de ser creades i aprovades per 2 usuaris diferents (un pas/usuari per crear i un pas/usuari per aprovar. Tingueu en compte que si l'usuari té tant permís per crear com per aprovar, n'hi haurà prou amb un pas/usuari). . Podeu demanar amb aquesta opció que introduïu un tercer pas/aprovació de l'usuari, si l'import és superior a un valor dedicat (per tant, seran necessaris 3 passos: 1=validació, 2=primera aprovació i 3=segona aprovació si l'import és suficient). <br>Definiu-lo com a buit si n'hi ha prou amb una aprovació (2 passos), establiu-lo en un valor molt baix (0,1) si sempre cal una segona aprovació (3 passos).
 UseDoubleApproval=Utilitzeu una aprovació de 3 passos quan l'import (sense impostos) sigui superior a...
-WarningPHPMail=NOTICE: The setup to send emails from the application is using the default generic setup (called "%s"). This choice needs no technical knowledge and no particular setup.<br>However, it is often better to setup outgoing emails to use the other method (called "%s") to use the email server of your Email Service Provider, instead of the default setup for several reasons:
-WarningPHPMailA=- Using the server of the Email Service Provider increases the trustworthiness of your email, so it increases the deliverability without being flagged as SPAM
-WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into myname@mymaildomain.com) is protected by a SPF + a DMARC record, your email may be flagged as SPAM because your DMARC rule defined into DNS zone of the domain of the sender (mymaildomain.com) does not allow the sending as a generic sender. In such a case, you must disable the DMARC for the domain (or set it to p=none like done by @gmail.com) or, better, if you have the technical knowledge, use the other method to send emails using the SMTP server of your own email provider.
+WarningPHPMail=AVÍS: La configuració per enviar correus electrònics des de l'aplicació utilitza la configuració genèrica predeterminada (anomenada "%s"). Aquesta elecció no necessita coneixements tècnics i cap configuració particular.<br>No obstant això, sovint és millor configurar els correus electrònics de sortida per utilitzar l'altre mètode (anomenat " %s") per utilitzar el servidor de correu electrònic del vostre proveïdor de serveis de correu electrònic, en lloc de la configuració predeterminada per diversos motius:
+WarningPHPMailA=- L'ús del servidor del proveïdor de serveis de correu electrònic augmenta la fiabilitat del vostre correu electrònic, de manera que augmenta la capacitat de lliurament sense ser marcat com a Correu borssa
+WarningPHPMailB=- Si el domini del vostre correu electrònic (la part mymaildomain.com a myname@mymaildomain.com) està protegit per un SPF + un registre DMARC, el vostre correu electrònic es pot marcar com a SPAM perquè la vostra regla DMARC està definida a la zona DNS del domini del vostre correu electrònic. remitent (mymaildomain.com) no permet l'enviament com a remitent genèric. En aquest cas, heu de desactivar el DMARC per al domini (o establir-lo a p=none com ho ha fet @gmail.com) o, millor, si teniu coneixements tècnics, utilitzeu l'altre mètode per enviar correus electrònics mitjançant l'SMTP. servidor del vostre propi proveïdor de correu electrònic.
 WarningPHPMailC=- Utilitzar el servidor SMTP del vostre propi proveïdor de serveis de correu electrònic per enviar correus electrònics també és interessant, de manera que tots els correus electrònics enviats des de l'aplicació també es desaran al directori "Enviats" de la vostra bústia de correu.
 WarningPHPMailD=Per tant, es recomana canviar el mètode d'enviament dels correus electrònics al valor "SMTP".
 WarningPHPMailDbis=Si realment voleu mantenir el mètode "PHP" predeterminat per enviar correus electrònics, simplement ignoreu aquest avís o elimineu-lo %sfent clic aquí%s.
-WarningPHPMail2=Si el vostre proveïdor d'SMTP de correu electrònic ha de restringir el client de correu electrònic a algunes adreces IP (molt rara), aquesta és l'adreça IP de l'agent d'usuari de correu (MUA) per a la vostra aplicació ERP CRM: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
-WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
-SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
-ActualMailDNSRecordFound=Actual %s record found (for email %s) : %s
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
+WarningPHPMailSPF=Si el nom de domini de la vostra adreça de correu electrònic del remitent està protegit per un registre SPF (demaneu al registrador del vostre nom de domini), heu d'afegir les següents IP o entrada al registre SPF del DNS del vostre domini:  <strong>%s</strong>.
+WarningPHPMailSPFDMARC=Si el nom de domini de l'adreça de correu electrònic del remitent està protegit per un registre DMARC diferent de p=none (demaneu al registrador del vostre nom de domini), heu d'eliminar el vostre registre DMARC o establir-lo com a p=none com a @gmail.com) o bé utilitzar l'enviament d'un altre mètode.
+SPFAndDMARCInformation=Registre DNS SPF i DMARC per a les adreces de correu electrònic principals
+ActualMailDNSRecordFound=S'ha trobat el registre %s actual (per al correu electrònic %s): %s
 ClickToShowDescription=Feu clic per a mostrar la descripció
 DependsOn=Aquest mòdul necessita el mòdul(s)
 RequiredBy=Aquest mòdul és requerit pel mòdul(s)
-TheKeyIsTheNameOfHtmlField=Aquest és el nom del camp HTML. Es requereixen coneixements tècnics per llegir el contingut de la pàgina HTML per obtenir el nom clau d'un camp.
+TheKeyIsTheNameOfHtmlField=Aquest és el nom del camp HTML. Es requereixen coneixements tècnics per a llegir el contingut de la pàgina HTML per a obtenir el nom clau d'un camp.
 PageUrlForDefaultValues=Heu d'introduir el camí relatiu de l'URL de la pàgina. Si incloeu paràmetres a l'URL, serà efectiu si tots els paràmetres de l'URL consultat tenen el valor definit aquí.
 PageUrlForDefaultValuesCreate=<br>Exemple:<br>Per al formulari per crear un tercer nou, és <strong>%s</strong>.<br>Per a l'URL dels mòduls externs instal·lats a directori personalitzat, no inclogueu el "custom/", així que utilitzeu un camí com <strong>mymodule/mypage.php</strong> i no personalitzat /mymodule/mypage.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>
@@ -567,8 +568,8 @@ Module10Name=Comptabilitat (simplificada)
 Module10Desc=Activació d'informes simples de comptabilitat (diaris, vendes) a partir del contingut de la base de dades. No utilitza cap taula de comptabilitat.
 Module20Name=Pressupostos
 Module20Desc=Gestió de pressupostos/propostes comercials
-Module22Name=Enviament de correus massius
-Module22Desc=Gestiona els missatges de correu electrònic massius
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energia
 Module23Desc=Realitza el seguiment del consum d'energies
 Module25Name=Comanda de vendes
@@ -667,7 +668,7 @@ Module2200Desc=Utilitza expressions matemàtiques per a la generació automàtic
 Module2300Name=Tasques programades
 Module2300Desc=Gestió de tasques programades (àlies cron o taula de crons)
 Module2400Name=Esdeveniments/Agenda
-Module2400Desc=Manage manual and automatic events. Use the calendar to record events manually. Log also events automatically for tracking purposes or record manual events or meetings. This is the principal module for good Customer and/or Vendor Relationship Management.
+Module2400Desc=Gestionar esdeveniments manuals i automàtics. Utilitzeu el calendari per gravar esdeveniments manualment. Registreu també esdeveniments automàticament amb finalitats de seguiment o registreu esdeveniments o reunions manuals. Aquest és el mòdul principal per a una bona gestió de relacions amb clients i/o venedors.
 Module2430Name=Programació de cites en línia
 Module2430Desc=Proporciona un sistema de reserva de cites en línia. Això permet que qualsevol persona pugui reservar una cita, segons els rangs o les disponibilitats predefinits.
 Module2500Name=SGD / GCE
@@ -847,10 +848,10 @@ Permission212=Demanar línies
 Permission213=Activa la línia
 Permission214=Configurar la telefonia
 Permission215=Configurar proveïdors
-Permission221=Consulta enviaments de correu electrònic
-Permission222=Crear/modificar E-Mails (assumpte, destinataris, etc.)
-Permission223=Validar enviaments per correu electrònic (permet l’enviament)
-Permission229=Eliminar E-Mails
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Veure els destinataris i la informació
 Permission238=Enviar els e-mails manualment
 Permission239=Elimina els e-mails després de la seva validació o el seu enviament
@@ -868,7 +869,7 @@ Permission255=Eliminar o desactivar altres usuaris
 Permission256=Consultar els seus permisos
 Permission262=Ampliar l'accés a tots els tercers I als seus objectes (no només a tercers als quals l'usuari està vinculat com a representant comercial).
 Permission262b=No efectiu per als usuaris externs (sempre limitats a ells mateixos per a propostes, comandes, factures, contractes, etc.).
-Permission262c=Not effective for projects (only rules on project permissions, visibility and users assignment matter).
+Permission262c=No és efectiu per als projectes (només importen les regles sobre permisos de projecte, visibilitat i assignació d'usuaris).
 Permission263=Amplieu l'accés a tots els tercers SENSE els seus objectes (no només a tercers dels quals l'usuari és representant de la venda). <br> No és efectiu per a usuaris externs (sempre limitat a ells mateixos per a propostes, comandes, factures, contractes, etc.). <br> No és eficaç per als projectes (només les regles sobre permisos, visibilitat i assignació de projectes).
 Permission271=Consultar el CA
 Permission272=Consultar les factures
@@ -897,10 +898,10 @@ Permission352=Consultar els permisos de grups
 Permission353=Crear/modificar grups i els seus permisos
 Permission354=Eliminar o desactivar grups
 Permission358=Exportar usuaris
-Permission401=Consultar havers
-Permission402=Crear/modificar havers
+Permission401=Consulta els descomptes
+Permission402=Crea/modifica descomptes
 Permission403=Valida els descomptes
-Permission404=Eliminar havers
+Permission404=Elimina els descomptes
 Permission431=Utilitzeu la barra de depuració
 Permission511=Llegiu els sous i els pagaments (vostres i subordinats)
 Permission512=Crear / modificar salaris i pagaments
@@ -945,7 +946,7 @@ Permission776=Pagar informes de despeses
 Permission777=Llegeix tots els informes de despeses (fins i tot els dels usuaris no subordinats)
 Permission778=Crea/modifica informes de despeses de tothom
 Permission779=Exportar informes de despeses
-Permission1001=Read warehouses and stocks
+Permission1001=Consulta els magatzems i estocs
 Permission1002=Crear/modificar els magatzems
 Permission1003=Eliminar magatzems
 Permission1004=Consulta moviments d'estoc
@@ -1051,7 +1052,7 @@ Permission50412=Escriure / editar les operacions en el llibre major
 Permission50414=Suprimeix les operacions en el llibre major
 Permission50415=Elimineu totes les operacions per any i diari en llibre major
 Permission50418=Operacions d’exportació del llibre major
-Permission50420=Informes d'informe i d'exportació (facturació, saldo, revistes, llibre major)
+Permission50420=Informe i informes d'exportació (facturació, saldo, diaris, llibre major)
 Permission50430=Definiu els períodes fiscals. Validar transaccions i tancar períodes fiscals.
 Permission50440=Gestionar el gràfic de comptes, configurar la comptabilitat
 Permission51001=Llegiu actius
@@ -1105,6 +1106,7 @@ DictionaryStaff=Nombre d'empleats
 DictionaryAvailability=Temps de lliurament
 DictionaryOrderMethods=Mètodes de comanda
 DictionarySource=Orígens de pressupostos/comandes
+DictionaryAccountancyReport=Informes comptables personalitzats
 DictionaryAccountancyCategory=Grups personalitzats per informes
 DictionaryAccountancysystem=Models de plans comptables
 DictionaryAccountancyJournal=Diari de comptabilitat
@@ -1133,12 +1135,12 @@ BackToModuleList=Torna a la llista de mòduls
 BackToDictionaryList=Torna a la llista de Diccionaris
 TypeOfRevenueStamp=Tipus de segell fiscal
 VATManagement=Gestió IVA
-VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedStandard=Quan es creen documents (propostes, factures, comandes...), el tipus de l'impost de vendes per defecte s'estableix segons les normes estàndard (segons els països venedors i compradors)
+VATIsUsedDesc=De manera predeterminada, quan es creen propostes, factures, comandes, etc., la taxa de l'impost de vendes segueix la regla estàndard activa:<br>Si el venedor no està subjecte a l'impost de vendes, l'impost de vendes és 0 per defecte. . Final de la regla.<br>Si L'estat o la província del comprador té una regla d'IVA del diccionari de taxes de l'IVA, llavors és la taxa d'IVA predeterminada. Final de la regla.<br>Si (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 són tots dos a la Comunitat Europea i les mercaderies són productes relacionats amb el transport (transport, enviament, línia aèria), l'IVA predeterminat és 0. Això La regla depèn del país del venedor; consulteu amb el vostre comptable. L'IVA l'ha de pagar el comprador a l'oficina de duana del seu país i no al venedor. Final de la regla.<br>Si el venedor i el comprador són tots dos a la Comunitat Europea i el comprador no és una empresa (amb un número d'IVA intracomunitari registrat), l'IVA serà predeterminat. el tipus d'IVA del país del venedor. Final de la regla.<br>Si el venedor i el comprador són tots dos a la Comunitat Europea i el comprador és una empresa (amb un número d'IVA intracomunitari registrat), l'IVA és 0. per defecte. Final de la regla.<br>En qualsevol altre cas, el valor predeterminat proposat és Impost sobre vendes=0. Final de 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, 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.
-VATType=Tipus d'impost
+VATType=Ús d'impostos
 ##### Local Taxes #####
 TypeOfSaleTaxes=Tipus d'impost de vendes
 LTRate=Tarifa
@@ -1174,8 +1176,9 @@ NoLocalTaxXForThisCountry=Segons la configuració d’impostos (vegeu %s - %s -
 LabelUsedByDefault=Nom utilitzat per defecte si no es troba cap traducció del codi
 LabelOnDocuments=Nom als documents
 LabelOrTranslationKey=Nom o clau de traducció
+LabelTranslatedInCurrentLanguage=Etiqueta traduïda a l'idioma actual
 TranslationFound=Traducció trobada
-TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
+TheTranslationIsSearchedFromKey=La traducció es cerca des de la clau de traducció: <b>%s</b>
 TranslationKey=Clau de traducció
 ValueOfConstantKey=Valor d’una constant de configuració
 ConstantIsOn=L'opció %s està activada
@@ -1400,7 +1403,7 @@ TranslationOverwriteDesc=També podeu substituir les cadenes omplint la taula se
 TranslationOverwriteDesc2=Podeu utilitzar l’altra pestanya per a ajudar-vos a saber quina clau de traducció heu d’utilitzar
 TranslationString=Cadena de traducció
 CurrentTranslationString=Cadena de traducció actual
-WarningAtLeastKeyOrTranslationRequired=Es necessita un criteri de cerca com a mínim per cadena o clau de traducció
+WarningAtLeastKeyOrTranslationRequired=Es requereix un criteri de cerca com a mínim per a la clau o la cadena de traducció
 NewTranslationStringToShow=Cadena de traducció nova per a mostrar
 OriginalValueWas=La traducció original s'ha sobreescrit. El valor original era: <br><br>%s
 TransKeyWithoutOriginalValue=Heu obligat una nova traducció de la clau de traducció '<strong> %s </strong>' que no existeix en cap fitxer d'idioma
@@ -1421,7 +1424,7 @@ SearchOptim=Cerca optimització
 YouHaveXObjectUseComboOptim=Teniu %s %s a la base de dades. Podeu entrar a la configuració del mòdul per a habilitar la càrrega de la llista combinada en l'esdeveniment de tecla premuda.
 YouHaveXObjectUseSearchOptim=Teniu %s %s a la base de dades. Podeu afegir la constant %s a 1 a Inici-Configuració-Altres.
 YouHaveXObjectUseSearchOptimDesc=Això limita la cerca al començament de les cadenes, cosa que fa que la base de dades pugui utilitzar índexs i hauríeu d'obtenir una resposta immediata.
-YouHaveXObjectAndSearchOptimOn=Teniu %s %s a la base de dades i la constant %s s'estableix en %s a Home-Setup-Other.
+YouHaveXObjectAndSearchOptimOn=Tens %s %s a la base de dades i la constant %s està establerta en %s a Inici-Configuració-Altres.
 BrowserIsOK=Esteu utilitzant el navegador web %s. Aquest navegador està bé per a la seguretat i el rendiment.
 BrowserIsKO=Esteu utilitzant el navegador web %s. Es considera que aquest navegador és una mala elecció per a la seguretat, el rendiment i la fiabilitat. Recomanem utilitzar Firefox, Chrome, Opera o Safari.
 PHPModuleLoaded=Es carrega el component PHP %s
@@ -1431,7 +1434,7 @@ AddVatInList=Mostra el número d'IVA del client/proveïdor a les llistes combina
 AddAdressInList=Mostra l'adreça del client/proveïdor a les llistes combinades.<br>Els tercers apareixeran amb el format de nom "The Big Company corp. - 21 jump street 123456 Big town - USA" en lloc de " The Big Company Corp".
 AddEmailPhoneTownInContactList=Mostra el correu electrònic de contacte (o els telèfons si no està definit) i la ciutat en llistes combinades.<br>Els contactes apareixeran amb el format de nom "Dupond Durand - dupond.durand@example.com - París " o "Dupond Durand - 06 07 59 65 66 - París" en lloc de "Dupond Durand".
 AskForPreferredShippingMethod=Demaneu un mètode d'enviament preferit per a tercers.
-FieldEdition=Edició del camp %s
+FieldEdition=Modificació del camp %s
 FillThisOnlyIfRequired=Exemple: +2 (ompliu només si es produeixen problemes de compensació de la zona horària)
 GetBarCode=Obté el codi de barres
 NumberingModules=Models de numeració
@@ -1458,7 +1461,7 @@ HRMSetup=Configuració de mòdul de gestió de recursos humans
 CompanySetup=Configuració del mòdul d'empreses
 CompanyCodeChecker=Opcions per a la generació automàtica de codis de client / proveïdor
 AccountCodeManager=Opcions per a la generació automàtica de comptes comptables de client/proveïdor
-NotificationsDesc=Email notifications can be sent automatically on certain events.<br>Recipients of notifications can be defined:
+NotificationsDesc=Les notificacions per correu electrònic es poden enviar automàticament en determinats esdeveniments.<br>Es poden definir els destinataris de les notificacions:
 NotificationsDescUser=* per usuari (a la pestanya «Notificacions» d'un usuari)
 NotificationsDescContact=* per contactes de tercers (a la pestanya «Notificacions» d'un tercer)
 NotificationsDescGlobal=* o configurant adreces de correu electrònic globals (a la pàgina de configuració del mòdul).
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Forçar la data de factura a la data de validació
 SuggestedPaymentModesIfNotDefinedInInvoice=Mode de pagament per defecte suggerit per a la factura, quan no estigui definit a la factura
 SuggestPaymentByRIBOnAccount=Suggereix el pagament per retirada per compte
 SuggestPaymentByChequeToAddress=Suggereix el pagament amb xec a
+InvoicePaymentManageStructuredCommunication=Genera comunicació estructurada per al pagament de factures
+InvoicePaymentManageStructuredCommunicationHelp=En alguns països, és necessari mostrar una referència estructurada per a facilitar els pagaments i la seva conciliació
 FreeLegalTextOnInvoices=Text lliure en factures
 WatermarkOnDraftInvoices=Marca d'aigua en les factures esborrany (en cas d'estar buit)
 PaymentsNumberingModule=Model de numeració de pagaments
@@ -1497,16 +1502,16 @@ InvoiceOptionCategoryOfOperations=Mostra la menció «categoria d'operacions» a
 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
-InvoiceClassifyBilledSupplierOrderWithoutInvoice=Disallow the classification of an order as billed without invoice.
-InvoiceClassifyBilledSupplierOrderWithoutInvoiceHelp=An order can be classified as billed by default. If this conf is set to true, it will be not.
+InvoiceClassifyBilledSupplierOrderWithoutInvoice=No permetre la classificació d'una comanda com a facturada sense factura.
+InvoiceClassifyBilledSupplierOrderWithoutInvoiceHelp=Una comanda es pot classificar com a facturada de manera predeterminada. Si s'activa aquesta configuració, no ho serà.
 ##### Supplier Orders #####
-SupplierOrderClassifyBilledWithoutInvoice=Disallow the classification of a purchase order as billed without invoice.
-SupplierOrderClassifyBilledWithoutInvoiceHelp=A supplier order can be classified as billed by default. If this conf is set to true, it will be not.
+SupplierOrderClassifyBilledWithoutInvoice=No permetre la classificació d'una comanda de compra com a facturada sense factura.
+SupplierOrderClassifyBilledWithoutInvoiceHelp=Una comanda de proveïdor es pot classificar com a facturada per defecte. Si s'activa aquesta configuració, no ho serà.
 ##### Proposals #####
 PropalSetup=Configuració del mòdul Pressupostos
 ProposalsNumberingModules=Models de numeració de pressupostos
 ProposalsPDFModules=Models de documents de pressupostos
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payment mode by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Mode de pagament suggerit per defecte si no està definit a la proposta
 FreeLegalTextOnProposal=Text lliure en pressupostos
 WatermarkOnDraftProposal=Marca d'aigua en pressupostos esborrany (en cas d'estar buit)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar compte bancari del pressupost
@@ -1548,8 +1553,8 @@ MemberCodeChecker=Opcions per a la generació automàtica de codis de soci
 AdherentLoginRequired=Gestiona un compte d'usuari/contrasenya per a cada soci
 AdherentLoginRequiredDesc=Afegeix un valor per al nom i la contrasenya a l'arxiu de membres. Si el membre està enllaçat a un usuari, actualitzant el nom i la contrasenya del membre també actualitza el nom i contrasenya de l'usuari.
 AdherentMailRequired=Cal un correu electrònic per a crear un soci nou
-MemberSendInformationByMailByDefault=The checkbox to send an email confirmation to members (validation or new subscription) is on by default
-MemberCreateAnExternalUserForSubscriptionValidated=Create automatically an external user (with a login to connect to the application) after an online payment of a membership subscription
+MemberSendInformationByMailByDefault=La casella de selecció per a enviar una confirmació per correu electrònic als socis (validació o subscripció nova) està activada de manera predeterminada
+MemberCreateAnExternalUserForSubscriptionValidated=Creeu automàticament un usuari extern (amb un inici de sessió per a connectar-vos a l'aplicació) després d'un pagament en línia d'una subscripció de soci
 VisitorCanChooseItsPaymentMode=El visitant pot triar entre qualsevol forma de pagament disponible
 MEMBER_REMINDER_EMAIL=Activa el recordatori automàtic <b> per correu electrònic </b> de les subscripcions caducades. Nota: El mòdul <strong> %s </strong> s'ha d'habilitar i configurar correctament per a enviar recordatoris.
 MembersDocModules=Plantilles de documents per a documents generats a partir del registre de socis
@@ -1676,7 +1681,7 @@ LDAPFieldCompanyExample=Exemple: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Exemple: objectsid
 LDAPFieldEndLastSubscription=Data final d'afiliació
-LDAPFieldTitle=Càrrec
+LDAPFieldTitle=Lloc de treball
 LDAPFieldTitleExample=Exemple:títol
 LDAPFieldGroupid=Identificador de grup
 LDAPFieldGroupidExample=Exemple : gidnumber
@@ -1718,6 +1723,7 @@ CompressionOfResources=Compressió de les respostes HTTP
 CompressionOfResourcesDesc=Per exemple, utilitzant la directiva Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=La detecció automàtica no és possible amb els navegadors actuals
 DefaultValuesDesc=Aquí podeu definir el valor predeterminat que voleu utilitzar quan creeu un registre nou, i / o filtres predeterminats o l'ordre de classificació quan enumereu els registres.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Valors predeterminats (per a utilitzar en formularis)
 DefaultSearchFilters=Filtres de cerca per defecte
 DefaultSortOrder=Tipus d'ordenació per defecte
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Mòduls de numeració d'enviaments
 SendingsAbility=Suport en fulles d'expedició per entregues de clients
 NoNeedForDeliveryReceipts=En la majoria dels casos, els fulls d'enviament s'utilitzen tant com a fulls de lliurament de clients (llista de productes a enviar) i fulls rebuts i signats pel client. Per tant, el rebut de lliurament del producte és una característica duplicada i rarament s'activa.
 FreeLegalTextOnShippings=Text lliure en els enviaments
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Mòdul de numeració de rebut de lliuraments de productes
 DeliveryOrderModel=Model de rebut de lliuraments de productes
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Text lliure en els rebuts de lliurament
 ##### FCKeditor #####
 AdvancedEditor=Editor avançat
 ActivateFCKeditor=Activar editor avançat per a :
-FCKeditorForNotePublic=WYSIWYG creació/edició del camp "notes públiques" d'elements
-FCKeditorForNotePrivate=Creació/edició WYSIWYG del camp "notes privades" d'elements
-FCKeditorForCompany=Creació / edició de WYSIWYG de la descripció del camp d'elements (excepte productes / serveis)
-FCKeditorForProductDetails=Creació/edició WYSIWYG de descripció de productes o línies per objectes (línies de pressupostos, comandes, factures, etc...).
+FCKeditorForNotePublic=Creació/modificació WYSIWYG del camp "notes públiques" d'elements
+FCKeditorForNotePrivate=Creació/modificació WYSIWYG del camp "notes privades" d'elements
+FCKeditorForCompany=Creació/modificació WYSIWYG del camp descripció dels elements (excepte productes/serveis)
+FCKeditorForProductDetails=Creació/modificació WYSIWYG de descripció de productes o línies per objectes (línies de propostes, comandes, factures, etc...).
 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ó WYSIWYG dels correus electrònics (Eines -> Enviament de correu)
-FCKeditorForUserSignature=Creació/edició WYSIWYG de la signatura de l'usuari
-FCKeditorForMail=Creació/edició WYSIWYG per a tot el correu (excepte Eines->Enviament de correu)
-FCKeditorForTicket=Creació / edició de WYSIWYG per a entrades
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=Creació/modificació WYSIWYG de la signatura de l'usuari
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=Creació/modificació de WYSIWYG per a tiquets
 ##### Stock #####
 StockSetup=Configuració del mòdul d'Estoc
 IfYouUsePointOfSaleCheckModule=Si utilitzeu el mòdul Punt de Venda (TPV) proporcionat per defecte o un mòdul extern, el vostre mòdul TPV pot ignorar aquesta configuració. La majoria de mòduls TPV estan dissenyats per defecte per a crear una factura immediatament i reduir l'estoc, independentment de les opcions aquí. Per tant, si necessiteu o no una reducció d’estoc en registrar una venda des del vostre TPV, comproveu també la configuració del mòdul TPV.
@@ -1867,7 +1874,6 @@ Buy=Compra
 Sell=Venda
 InvoiceDateUsed=Data utilitzada de factura
 YourCompanyDoesNotUseVAT=La vostra empresa s'ha definit per a no utilitzar l'IVA (Inici - Configuració - Empresa/Organització), de manera que no hi ha opcions d'IVA per a configurar.
-AccountancyCode=Codi comptable
 AccountancyCodeSell=Codi comptable vendes
 AccountancyCodeBuy=Codi comptable compres
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mantenir buida per defecte la casella “Crea automàticament el pagament” quan es crea un nou impost
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Quina vista voleu obrir de manera predeterminada en selecc
 AGENDA_EVENT_PAST_COLOR = Color de l'esdeveniment passat
 AGENDA_EVENT_CURRENT_COLOR = Color de l'esdeveniment actual
 AGENDA_EVENT_FUTURE_COLOR = Color de l'esdeveniment futur
-AGENDA_REMINDER_BROWSER = Activa el recordatori d'esdeveniments <b> al navegador de l'usuari </b> (Quan s'arriba a la data de recordatori, el navegador mostra una finestra emergent. Cada usuari pot desactivar aquestes notificacions des de la configuració de notificacions del navegador).
+AGENDA_REMINDER_BROWSER = Permet els recordatoris d'esdeveniments <b>al navegador de l'usuari</b>
+AGENDA_REMINDER_BROWSERHelp = Quan s'arriba a la data del recordatori, el navegador mostra una finestra emergent). L'usuari defineix l'opció/retard de recordatori en la creació de l'esdeveniment.
 AGENDA_REMINDER_BROWSER_SOUND = Habilita les notificacions sonores
-AGENDA_REMINDER_EMAIL = Activa el recordatori d'esdeveniments <b> per correu electrònic </b> (es pot definir l'opció de recordatori/retard a cada esdeveniment).
+AGENDA_REMINDER_EMAIL = Permet els recordatoris d'esdeveniments <b>per correu electrònic</b>
 AGENDA_REMINDER_EMAIL_NOTE = Nota: La freqüència de la tasca programada %s ha de ser suficient per  a assegurar-se que el recordatori s'envia en el moment correcte.
 AGENDA_SHOW_LINKED_OBJECT = Mostra l'objecte vinculat a la vista d'agenda
 AGENDA_USE_EVENT_TYPE = Utilitzeu tipus d'esdeveniments (gestionats en el menú Configuració -> Diccionaris -> Tipus d'esdeveniments d'agenda)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Estableix automàticament aquest valor predeterminat per al tipus d'esdeveniment en el formulari de creació de l'esdeveniment
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Utilitzeu el recordatori predeterminat en aquests esdeveniments
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = El formulari de notificació de recordatori automàtic s'omplirà de manera predeterminada en la creació de l'esdeveniment
+AGENDA_DEFAULT_REMINDER_OFFSET = Període de recordatori predeterminat abans de l'esdeveniment
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Plantilla de correu electrònic per utilitzar com a recordatori predeterminat
 PasswordTogetVCalExport = Clau per a autoritzar l'enllaç d'exportació
 PastDelayVCalExport=No exportar els esdeveniments de més de
 SecurityKey = Clau de seguretat
@@ -1974,7 +1985,7 @@ DeleteFiscalYear=Eliminar any fiscal
 ConfirmDeleteFiscalYear=Esteu segur d'eliminar aquest any fiscal?
 ShowFiscalYear=Mostra el període comptable
 ##### Assets #####
-AssetNumberingModules=Assets numbering module
+AssetNumberingModules=Mòdul de numeració d'actius
 AlwaysEditable=Sempre es pot editar
 MAIN_APPLICATION_TITLE=Força el nom visible de l'aplicació (advertència: definir el vostre propi nom aquí pot trencar la funció d'inici de sessió d'emplenament automàtic quan s'utilitza l'aplicació mòbil DoliDroid)
 NbMajMin=Nombre mínim de caràcters en majúscules
@@ -1994,10 +2005,10 @@ ExpenseReportsRulesSetup=Configurar mòdul Informes de despeses - Regles
 ExpenseReportNumberingModules=Mòdul de numeració d'informes de despeses
 NoModueToManageStockIncrease=No s'ha activat cap mòdul capaç de gestionar l'increment automàtic d'estoc. L’increment d’estoc es farà només amb entrada manual.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Podeu trobar opcions de notificacions per correu electrònic habilitant i configurant el mòdul "Notificació".
-TemplatesForNotifications=Emails templates for notifications
+TemplatesForNotifications=Plantilles de correu electrònic per a notificacions
 ListOfNotificationsPerUser=Llista de notificacions automàtiques per usuari *
 ListOfNotificationsPerUserOrContact=Llista de possibles notificacions automàtiques (en un esdeveniment comercial) disponibles per usuari* o per contacte**
-ListOfFixedNotifications=Global recipients emails for automatic email notifications
+ListOfFixedNotifications=Correus electrònics de destinataris globals per a notificacions de correu electrònic automàtiques
 GoOntoUserCardToAddMore=Aneu a la pestanya «Notificacions» d'un usuari per a afegir o eliminar notificacions per als usuaris
 GoOntoContactCardToAddMore=Aneu a la pestanya "Notificacions" d'un tercer per a afegir o eliminar notificacions de contactes/adreces
 Threshold=Valor mínim/llindar
@@ -2006,8 +2017,8 @@ 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ó que es descriu aquí és un procés manual que només pot realitzar un usuari amb privilegis.
 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>
+InstallModuleFromWebHasBeenDisabledByFile=El vostre administrador ha desactivat la instal·lació del mòdul extern des de l'aplicació i l'ús de les funcions que permeten executar codi al servidor. Heu de demanar-li que suprimi el fitxer <strong>%s</strong> per permetre-ho. característica.
+ConfFileMustContainCustom=Per a instal·lar o crear un mòdul extern des de l'aplicació cal desar els fitxers del mòdul al directori <strong>%s</strong>. Perquè Dolibarr processi aquest directori, heu de configurar el vostre <strong>conf/conf.php</strong> per a afegir les 2 línies directrius: <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
 HighlightLinesColor=Ressalteu el color de la línia quan el ratolí passa (utilitzeu 'ffffff' per no ressaltar)
 HighlightLinesChecked=Ressalteu el color de la línia quan està marcada (utilitzeu 'ffffff' per no ressaltar)
@@ -2033,9 +2044,10 @@ MinimumNoticePeriod=Període mínim d’avís (la vostra sol·licitud de permís
 NbAddedAutomatically=Nombre de dies afegits als comptadors d'usuaris (automàticament) cada mes
 EnterAnyCode=Aquest camp conté una referència per a identificar la línia. Introduïu qualsevol valor que trieu, però sense caràcters especials.
 Enter0or1=Introdueix 0 o 1
-EnterYesOrNo=Enter Yes or No
+EnterYesOrNo=Introduïu Sí o No
 UnicodeCurrency=Introduïu aquí entre claudàtors, la llista del nombre de bytes que representa el símbol de moneda. Per exemple: per $, introduïu [36] - per al real de Brasil R$ [82,36] - per €, introduïu [8364]
 ColorFormat=El color RGB es troba en format HEX, per exemple: FF0000
+NumberFormatForATotalPrice=Format de nombre per al preu total %s
 PictoHelp=Nom de la icona en format: <br> - image.png per a un fitxer d'imatge al directori del tema actual <br> - image.png@module si el fitxer es troba al directori /img/ d'un mòdul <br> - fa-xxx per a una fontAwesome fa-xxx picto <br> - fontawesome_xxx_fa_color_size per a un picto FontAwesome fa-xxx (amb prefix, color i mida conjunta)
 PositionIntoComboList=Posició de la línia a les llistes desplegables
 SellTaxRate=Taxa d'impost de vendes
@@ -2097,7 +2109,7 @@ AddMenus=Afegeix menús
 AddPermissions=Afegeix permisos
 AddExportProfiles=Afegeix perfils d'exportació
 AddImportProfiles=Afegeix perfils d'importació
-AddWebsiteTemplates=Add website templates for the website module
+AddWebsiteTemplates=Afegiu plantilles de lloc web per al mòdul de lloc web
 AddOtherPagesOrServices=Afegeix altres pàgines o serveis
 AddModels=Afegeix document o model de numeració
 AddSubstitutions=Afegeix claus de substitució
@@ -2115,7 +2127,7 @@ BaseCurrency=Moneda de referència de l'empresa (anar a la configuració de l'em
 WarningNoteModuleInvoiceForFrenchLaw=Aquest mòdul %s compleix les lleis franceses (Loi Finances 2016).
 WarningNoteModulePOSForFrenchLaw=Aquest mòdul %s compleix les lleis franceses (Loi Finances 2016) perquè el mòdul Logs no reversibles s'activa automàticament.
 WarningInstallationMayBecomeNotCompliantWithLaw=Esteu intentant instal·lar el mòdul %s que és un mòdul extern. L'activació d'un mòdul extern significa que confieu en l'editor d'aquest mòdul i que esteu segur que aquest mòdul no afecta negativament el comportament de la vostra aplicació i que compleix les lleis del vostre país (%s). Si el mòdul presenta una característica il·legal, vostè es fa responsable de l'ús de programari il·legal.
-WarningExperimentalFeatureInvoiceSituationNeedToUpgradeToProgressiveMode=If you are using the experimental mode for situation invoices, you will need to update your data to switch from the experimental mode to the official mode. You can contact a partner to help you with this task. A list of preferred partners is available by following <a href="%s" target="_blank">this link</a>
+WarningExperimentalFeatureInvoiceSituationNeedToUpgradeToProgressiveMode=Si utilitzeu el mode experimental per a les factures de situació, haureu d'actualitzar les vostres dades per canviar del mode experimental al mode oficial. Pots contactar amb un soci per ajudar-te amb aquesta tasca. Hi ha disponible una llista de socis preferits seguint <a href="%s" target="_blank">aquest enllaç</a>
 MAIN_PDF_MARGIN_LEFT=Marge esquerre al PDF
 MAIN_PDF_MARGIN_RIGHT=Marge dret al PDF
 MAIN_PDF_MARGIN_TOP=Marge superior al PDF
@@ -2127,11 +2139,16 @@ MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Amplada de la columna si s'afegeix una imatge
 MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Oculta la columna de preu unitari quan es requereix textualment
 MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Oculta la columna de preu total quan es requereix textualment
 MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Oculta la columna de preu unitari a les comandes
-MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Amaga la columna del preu total a les comandes de compra
 MAIN_PDF_NO_SENDER_FRAME=Amaga les vores del marc d’adreça del remitent
 MAIN_PDF_NO_RECIPENT_FRAME=Amaga les vores del marc de l'adreça del destinatari
 MAIN_PDF_HIDE_CUSTOMER_CODE=Amaga el codi de client
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Amaga el codi comptable del client
 MAIN_PDF_HIDE_SENDER_NAME=Amaga el nom del remitent / empresa al bloc d’adreces
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Amaga les condicions de pagament
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Amaga el mode de pagament
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Afegiu un marcatge ocult a l'àrea de signatura per permetre que l'eina de signatura electrònica la reutilitzi. Pot ser utilitzat per eines externes o en el futur per la funció de signatura en línia.
@@ -2146,7 +2163,7 @@ COMPANY_DIGITARIA_CLEAN_REGEX=Filtre Regex al valor net (COMPANY_DIGITARIA_CLEAN
 DuplicateForbidden=Duplicat prohibit
 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=Data Protection Officer (DPO, Data Privacy or GDPR contact, ...)
+GDPRContact=Delegat de Protecció de Dades (DPO, privacitat de dades o contacte 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=Text d'ajuda que es mostrarà a la descripció d'informació
 HelpOnTooltipDesc=Posa text o una tecla de traducció aquí perquè el text es mostri en una descripció emergent quan aquest camp aparegui en un formulari
@@ -2190,7 +2207,7 @@ EmailCollectorHideMailHeaders=No inclogueu el contingut de la capçalera del cor
 EmailCollectorHideMailHeadersHelp=Quan està activat, les capçaleres de correu electrònic no s'afegeixen al final del contingut del correu electrònic que es desa com a esdeveniment de l'agenda.
 EmailCollectorConfirmCollectTitle=Confirmació de recollida de correu electrònic
 EmailCollectorConfirmCollect=Vols executar aquest col·leccionista ara?
-EmailCollectorExampleToCollectTicketRequestsDesc=Recolliu correus electrònics que coincideixin amb algunes regles i creeu automàticament un bitllet (module Ticket ha d'estar habilitat) amb la informació del correu electrònic. Podeu utilitzar aquest col·lector si proporcioneu algun suport per correu electrònic, de manera que la vostra sol·licitud de bitllet es generarà automàticament. Activeu també Collect_Responses per recollir les respostes del vostre client directament a la vista de tickets (heu de respondre des de Dolibarr).
+EmailCollectorExampleToCollectTicketRequestsDesc=Recolliu correus electrònics que coincideixin amb algunes regles i creeu automàticament un tiquet (el mòdul Tiquet ha d'estar habilitat) amb la informació del correu electrònic. Podeu utilitzar aquest col·lector si proporcioneu algun suport per correu electrònic, de manera que la vostra sol·licitud de tiquet es generarà automàticament. Activeu també Collect_Responses per a recollir les respostes del vostre client directament a la vista de tiquets (heu de respondre des de Dolibarr).
 EmailCollectorExampleToCollectTicketRequests=Exemple de recollida de la sol·licitud de tiquet (només el primer missatge)
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Escanegeu el directori "Enviat" de la vostra bústia de correu per a trobar correus electrònics que s'han enviat com a resposta d'un altre correu electrònic directament des del vostre programari de correu electrònic i no des de Dolibarr. Si es troba aquest correu electrònic, l'esdeveniment de resposta es registra a Dolibarr
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Exemple de recollida de respostes de correu electrònic enviades des d'un programari de correu electrònic extern
@@ -2204,7 +2221,7 @@ NoNewEmailToProcess=No hi ha cap correu electrònic nou (filtres coincidents) pe
 NothingProcessed=No s'ha fet res
 RecordEvent=Enregistrar un esdeveniment a l'agenda (amb el tipus de correu electrònic enviat o rebut)
 CreateLeadAndThirdParty=Creeu un client potencial (i un tercer si cal)
-CreateTicketAndThirdParty=Creeu o completeu un bitllet (enllaçat a un tercer si el tercer s'ha carregat per una operació anterior o s'ha endevinat a partir d'un rastrejador a la capçalera del correu electrònic, sense que un tercer faci el contrari)
+CreateTicketAndThirdParty=Creeu o completeu un tiquet (enllaçat a un tercer si el tercer s'ha carregat per una operació anterior o s'ha endevinat a partir d'un rastrejador a la capçalera del correu electrònic, sense que un tercer faci el contrari)
 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)
@@ -2219,7 +2236,7 @@ CreateCandidature=Crea sol·licitud de feina
 FormatZip=Format Zip
 MainMenuCode=Codi d'entrada del menú (menú principal)
 ECMAutoTree=Mostra l'arbre ECM automàtic
-OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a string from email header, subject or body into a temporary variable:<br>tmp_var1=EXTRACT:HEADER:My regex ([^\n]*)<br>tmp_var2=EXTRACT:SUBJECT:My refex ([^\n]*)<br>tmp_var3=EXTRACT:BODY:My regex ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a new line to extract or set several properties.
+OperationParamDesc=Definiu les regles que s'han d'utilitzar per extreure algunes dades o establir valors per a l'operació.<br><br>Exemple per extreure una cadena del correu electrònic capçalera, tema o cos en una variable temporal:<br>tmp_var1=EXTRACT:HEADER:La meva expressió regular ([^\n]*)<br>tmp_var2=EXTRACT:SUBJECT:El meu referent ([^\n]*)<br>tmp_var3=EXTRACT:BODY:La meva expressió regular ([^\n]*)<br><br>Exemples per definir les propietats d'un objecte per crear:<br>objproperty1=SET: un valor codificat dur<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY: un valor (el valor només s'estableix si la propietat encara no està definida)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT :([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:El nom de la meva empresa és\\s([^\\s]*)<br><br>Utilitzeu una línia nova per extreure o establir diverses propietats.
 OpeningHours=Horari d'obertura
 OpeningHoursDesc=Introduïu aquí l'horari habitual d'obertura de la vostra empresa.
 ResourceSetup=Configuració del mòdul de recursos
@@ -2249,7 +2266,7 @@ GeneralOptions=Opcions generals
 LogsLinesNumber=Nombre de línies que es mostraran a la pestanya de registres
 UseDebugBar=Utilitzeu la barra de depuració
 DEBUGBAR_LOGS_LINES_NUMBER=Nombre d’últimes línies de registre que cal mantenir a la consola
-WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatically output
+WarningValueHigherSlowsDramaticalyOutput=Avís, els valors més alts frenen dràsticament la sortida
 ModuleActivated=El mòdul %s està activat i alenteix la interfície
 ModuleActivatedWithTooHighLogLevel=El mòdul %s s'activa amb un nivell de registre massa alt (intenta utilitzar un nivell inferior per a millors rendiments i seguretat)
 ModuleSyslogActivatedButLevelNotTooVerbose=El mòdul %s està activat i el nivell de registre (%s) és correcte (no massa detallat)
@@ -2265,7 +2282,7 @@ LargerThan=Major que
 IfTrackingIDFoundEventWillBeLinked=Tingueu en compte que si es troba un identificador de seguiment d'un objecte al correu electrònic, o si el correu electrònic és una resposta d'un correu electrònic ja recollit i enllaçat a un objecte, l'esdeveniment creat s'enllaçarà automàticament amb l'objecte relacionat conegut.
 WithGMailYouCanCreateADedicatedPassword=Amb un GMail account, si heu activat els 2 passos validation, es recomana b0635760368  una segona contrasenya dedicada per a la Application en lloc d'utilitzar la vostra pròpia contrasenya account de https://myaccount.google .com/.
 EmailCollectorTargetDir=Pot ser un comportament desitjat moure el correu electrònic a una altra etiqueta/directori quan s'ha processat correctament. Només heu d'establir aquí el nom del directori per utilitzar aquesta funció (NO feu servir caràcters especials al nom). Tingueu en compte que també heu d'utilitzar un compte d'inici de sessió de lectura/escriptura.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing third party in your database (search will be done on the defined property among 'id','name','name_alias','email'). The found (or created) third party will be used for following actions that need it.<br>For example, if you want to create a third party with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=EXTRACT:HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+EmailCollectorLoadThirdPartyHelp=Podeu utilitzar aquesta acció per utilitzar el contingut del correu electrònic per trobar i carregar un tercer existent a la vostra base de dades (la cerca es farà a la propietat definida entre 'id', 'name', 'name_alias', 'email'). El tercer trobat (o creat) s'utilitzarà per seguir les accions que ho necessitin.<br>Per exemple, si voleu crear un tercer amb un nom extret d'una cadena " Nom: nom per trobar' present al cos, utilitzeu el correu electrònic del remitent com a correu electrònic, podeu configurar el camp de paràmetres com aquest:<br>'email=EXTRACT:HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2 ;'<br>
 FilterSearchImapHelp=Avís: molts servidors de correu electrònic (com Gmail) estan fent cerques de paraules completes quan cerquen en una cadena i no retornaran un resultat si la cadena només es troba parcialment en una paraula. Per aquest motiu també, utilitzar caràcters especials en una cerca s'ignoraran els criteris si no formen part de paraules existents. <br>Per a fer una cerca d'exclusió en una paraula (retorna el correu electrònic si no es troba la paraula), pots utilitzar el ! caràcter abans de la paraula (pot no funcionar en alguns servidors de correu).
 EndPointFor=Punt final per %s: %s
 DeleteEmailCollector=Suprimeix el recollidor de correu electrònic
@@ -2273,14 +2290,14 @@ ConfirmDeleteEmailCollector=Esteu segur que voleu suprimir aquest recollidor de
 RecipientEmailsWillBeReplacedWithThisValue=Els correus electrònics destinataris sempre se substituiran per aquest valor
 AtLeastOneDefaultBankAccountMandatory=Cal definir com a mínim un compte bancari per defecte
 RESTRICT_ON_IP=Permet l'accés de l'API només a determinades IP de client (no es permet el comodí, utilitza l'espai entre els valors). Buit significa que tots els clients poden accedir.
-StaticIPsOfUsers=If applicable, list of all static IPs of users
+StaticIPsOfUsers=Si escau, llista de totes les IP estàtiques dels usuaris
 IPListExample=127.0.0.1 192.168.0.2 [:: 1]
 BaseOnSabeDavVersion=Basat en la versió de la biblioteca SabreDAV
 NotAPublicIp=No és una IP pública
 MakeAnonymousPing=Feu un Ping anònim '+1' al servidor de la fundació Dolibarr (només es fa una vegada després de la instal·lació) per a permetre que la fundació compti el nombre d'instal·lacions de Dolibarr.
 FeatureNotAvailableWithReceptionModule=Funció no disponible quan el mòdul Recepció està habilitat
 EmailTemplate=Plantilla per correu electrònic
-EmailTemplateHelp=You can create emails templates from menu %s - %s
+EmailTemplateHelp=Podeu crear plantilles de correu electrònic des del menú %s - %s
 EMailsWillHaveMessageID=Els correus electrònics tindran una capçalera "Message-ID" que coincideixi amb aquesta sintaxi
 PDF_SHOW_PROJECT=Mostra el projecte al document
 ShowProjectLabel=Nom del projecte
@@ -2289,7 +2306,7 @@ THIRDPARTY_ALIAS=Nom de tercer - Àlies de tercer
 ALIAS_THIRDPARTY=Àlies de tercer -  Nom de tercer
 PDFIn2Languages=Mostra les etiquetes al PDF en 2 idiomes diferents (és possible que aquesta funció no funcioni en alguns idiomes)
 PDF_USE_ALSO_LANGUAGE_CODE=Si voleu que alguns textos del vostre PDF es copiïn en 2 idiomes diferents en el mateix PDF generat, heu d’establir aquí aquest segon idioma perquè el PDF generat contingui 2 idiomes diferents en la mateixa pàgina, l’escollit en generar el PDF i aquesta (només poques plantilles de PDF admeten això). Mantingueu-lo buit per a 1 idioma per PDF.
-PDF_USE_A=PDF documents format
+PDF_USE_A=Format de documents PDF
 FafaIconSocialNetworksDesc=Introduïu aquí el codi de la icona de FontAwesome. Si no sabeu què és FontAwesome, podeu utilitzar el llibre genèric d’adreces.
 RssNote=Nota: cada definició de canal RSS proporciona un giny que heu d'activar perquè estigui disponible al tauler
 JumpToBoxes=Ves a Configuració -> Ginys
@@ -2306,7 +2323,7 @@ YouMayFindSecurityAdviceHere=Podeu trobar assessorament de seguretat aquí
 ModuleActivatedMayExposeInformation=Aquesta extensió PHP pot exposar dades delicades. Si no la necessiteu, desactiveu-la.
 ModuleActivatedDoNotUseInProduction=S'ha habilitat un mòdul dissenyat per al desenvolupament. No l'activeu en un entorn de producció.
 CombinationsSeparator=Caràcter separador per a combinacions de productes
-SeeLinkToOnlineDocumentation=Vegeu l'enllaç a la documentació en línia al menú superior per obtenir exemples
+SeeLinkToOnlineDocumentation=Vegeu l'enllaç a la documentació en línia al menú superior per a obtenir exemples
 SHOW_SUBPRODUCT_REF_IN_PDF=Si s'utilitza la funció "%s" del mòdul <b> %s </b>, mostra els detalls dels subproductes d'un kit en el PDF.
 AskThisIDToYourBank=Poseu-vos en contacte amb el vostre banc per a obtenir aquesta identificació
 AdvancedModeOnly=Permís disponible només en mode de permís avançat
@@ -2324,6 +2341,8 @@ NotRecommended=No es recomana
 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.
+CheckForModuleUpdateHelp2=També es fa una connexió a %s per comprovar si alguns dels vostres mòduls externs han estat denunciats com a programari maliciós per la comunitat.
+YourIPWillBeRevealedToThisExternalProviders=La vostra IP es revelarà a tots aquests proveïdors externs.
 ModuleUpdateAvailable=Hi ha disponible una actualització
 NoExternalModuleWithUpdate=No s'han trobat actualitzacions per a mòduls externs
 SwaggerDescriptionFile=Fitxer de descripció de l'API Swagger (per a utilitzar-lo amb redoc, per exemple)
@@ -2347,7 +2366,7 @@ DashboardDisableBlockProject=Desactiva el polze per als projectes
 DashboardDisableBlockCustomer=Desactiveu el polze per als clients
 DashboardDisableBlockSupplier=Desactiveu el polze per als proveïdors
 DashboardDisableBlockContract=Desactiva el polze per als contractes
-DashboardDisableBlockTicket=Desactiva el polze per a les entrades
+DashboardDisableBlockTicket=Desactiveu el polze per als tiquets
 DashboardDisableBlockBank=Desactiveu el polze per als bancs
 DashboardDisableBlockAdherent=Desactiveu el polze per a les subscripcions
 DashboardDisableBlockExpenseReport=Desactiveu el polze per als informes de despeses
@@ -2395,8 +2414,10 @@ INVOICE_ADD_EPC_QR_CODE=Mostra el codi QR EPC a les factures (amb un compte banc
 INVOICE_ADD_EPC_QR_CODEMore=Aquesta funció us permet afegir o eliminar un codi QR EPC a les vostres factures, cosa que facilita les transferències de crèdit SEPA automàtiques. Habilitar aquesta opció ajuda els vostres clients a fer pagaments fàcilment escanejant el codi QR, reduint els errors d'entrada manual. Utilitzeu aquesta funció si teniu clients a països com Àustria, Bèlgica, Finlàndia, Alemanya i els Països Baixos on aquest sistema és compatible. Desactiveu-lo si no és necessari per a les vostres operacions comercials o base de clients.
 INVOICE_SHOW_SHIPPING_ADDRESS=Mostra l'adreça d'enviament
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Indicació obligatòria en alguns països (França, ...)
-SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
-SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Mostra el contacte de facturació a proposta
+SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=Per defecte, el contacte només apareix per a la facturació
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Enllaç URL de la xarxa social. Utilitzeu {socialid} per a la part variable que conté l'identificador de la xarxa social.
 IfThisCategoryIsChildOfAnother=Si aquesta categoria és fill d'una altra
 DarkThemeMode=Mode de tema fosc
@@ -2430,7 +2451,7 @@ CssOnEdit=CSS a les pàgines d'edició
 CssOnView=CSS a les pàgines de visualització
 CssOnList=CSS als llistats
 HelpCssOnEditDesc=El CSS utilitzat en editar el camp.<br>Exemple: «minwiwdth100 maxwidth500 widthcentpercentminusx»
-HelpCssOnViewDesc=The CSS used when viewing the field.<br>Example: "longmessagecut"
+HelpCssOnViewDesc=El CSS utilitzat en visualitzar el camp.<br>Exemple: "longmessagecut"
 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
@@ -2442,7 +2463,7 @@ DesktopsAndSmartphones=Escriptoris i telèfons intel·ligents
 AllowOnlineSign=Permet la signatura en línia
 AllowExternalDownload=Permet la baixada externa (sense iniciar sessió, mitjançant un enllaç compartit)
 DeadlineDayVATSubmission=Dia límit per a la presentació de l'IVA el mes següent
-MaxNumberOfAttachementOnForms=Max number of joined files in a form
+MaxNumberOfAttachementOnForms=Nombre màxim de fitxers units en un formulari
 IfDefinedUseAValueBeetween=Si està definit, utilitzeu un valor entre %s i %s
 Reload=Recarregar
 ConfirmReload=Confirmeu la recàrrega del mòdul
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Avís: el mòdul %s ha establer
 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)
+MAIN_CHECKBOX_LEFT_COLUMN=Mostra la columna per a la selecció de camps i línies a l'esquerra (a la dreta està desactivada)
 NotAvailableByDefaultEnabledOnModuleActivation=No creat per defecte. Creat només amb l'activació del mòdul.
 CSSPage=Estil CSS
 Defaultfortype=Defecte
@@ -2462,7 +2483,7 @@ AllowOnLineSignDesc=Un enllaç per permetre signar en línia un document bancari
 AtBottomOfPage=A la part inferior de la pàgina
 FailedAuth=autenticacions fallides
 MaxNumberOfFailedAuth=Nombre màxim d'autenticacions fallides en 24 hores per a denegar l'inici de sessió.
-AllowPasswordResetBySendingANewPassByEmail=Si un user A té aquest permís, and encara que el user no és un "Admin" user, A té permís per restablir la contrasenya de qualsevol altre  user B, la nova contrasenya s'enviarà a la email de l'altra user B, però no ho farà. ser visible per a A. Si el user A té la marca "Admin", també podrà saber quina és la nova contrasenya generada de B perquè pugui prendre el control de B user account.
+AllowPasswordResetBySendingANewPassByEmail=Si un usuari A té aquest permís, i fins i tot si l'usuari A no és un usuari «administrador», a A se li permet restablir la contrasenya de qualsevol altre usuari B, la nova contrasenya s'enviarà al correu electrònic de l'altre usuari B, però no serà visible per a A. Si l'usuari A té el senyalador «administrador», també podrà saber quina és la nova contrasenya generada de B i així podrà prendre el control del compte d'usuari B.
 AllowAnyPrivileges=Si un user A té aquest permís, pot create un user amb tots els privilegis, feu servir aquest user B, o concediu-vos qualsevol altre group amb qualsevol permís. Per tant, vol dir que user A té tots els privilegis empresarials (només es prohibirà l'accés al sistema a les pàgines Setup)
 ThisValueCanBeReadBecauseInstanceIsNotInProductionMode=Aquest valor pot ser read perquè la vostra instància no està configurada en mode de producció
 SeeConfFile=Vegeu dins de conf.php file a server
@@ -2488,19 +2509,20 @@ CustomPrompt=Indicacions personalitzades
 AiDescription=Característiques d'IA (Intel·ligència Artificial).
 AiDescriptionLong=Proporciona funcions d'IA (Intel·ligència artificial) en diferents parts de l'aplicació. Necessiteu una API d'IA externa.
 AI_API_KEY=Clau per a l'API d'IA
-AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Servei que s'utilitza per a funcions d'IA
+AI_API_URL=URL del punt final per a l'API AI
+AI_API_SERVICE=AI service to use
 AiSetup=Configuració del mòdul AI
 AiCustomPrompt=Sol·licitud personalitzada d'IA
 AI_CONFIGURATIONS_PROMPT=Indicació personalitzada
 TextGeneration=Generació de textos
 ImageGeneration=Generació d'imatges
 VideoGeneration=Generació de vídeo
-AudioGeneration=Audio generation
+AudioGeneration=Generació d'àudio
 AIPromptForFeatures=Sol·licituds personalitzades d'IA per a funcions
 EnterAnIP=Introduïu una adreça IP
 ConvertInto=Convertir en
 YouAreHere=Estàs aquí
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Mostra el codi de barres al document PDF d'enviament
 BARCODE_ON_RECEPTION_PDF=Mostra el codi de barres al document PDF de recepció
 BARCODE_ON_STOCKTRANSFER_PDF=Mostra el codi de barres al document PDF de transferència estoc
@@ -2517,44 +2539,71 @@ SendToUrl=Envia a l'URL
 WebsiteTemplateWasCopied=Les plantilles de lloc web "%s" proporcionades per aquest mòdul s'han desat al directori de plantilles de llocs web (/doctemplates/websites) i estan a punt per ser importades com a web nova lloc.
 EnabledByDefaultAtInstall=Activat per defecte a la instal·lació
 VulnerableToRCEAttack=Sou vulnerable als atacs RCE mitjançant la funció personalitzada dol_json_decode
-OpenIDconnectSetup=Configuration of the OpenID Connect module
-MainAuthenticationOidcClientIdName=Client ID
-MainAuthenticationOidcClientIdDesc=OpenID Connect Client ID
-MainAuthenticationOidcClientSecretName=Client secret
-MainAuthenticationOidcClientSecretDesc=OpenID Connect Client Secret
+OpenIDconnectSetup=Configuració del mòdul OpenID Connect
+MainAuthenticationOidcClientIdName=ID de client
+MainAuthenticationOidcClientIdDesc=OpenID Connect ID de client
+MainAuthenticationOidcClientSecretName=Secret del client
+MainAuthenticationOidcClientSecretDesc=Secret del client OpenID Connect
 MainAuthenticationOidcScopesName=Àmbits
-MainAuthenticationOidcScopesDesc=OpenID scopes to allow access to user information
-MainAuthenticationOidcAuthorizeUrlName=Authorize URL
-MainAuthenticationOidcAuthorizeUrlDesc=(example: https://example.com/oauth2/authorize)
-MainAuthenticationOidcTokenUrlName=Token URL
-MainAuthenticationOidcTokenUrlDesc=(example: https://example.com/oauth2/token)
-MainAuthenticationOidcUserinfoUrlName=User info URL
-MainAuthenticationOidcUserinfoUrlDesc=(example: https://example.com/oauth2/userinfo)
-MainAuthenticationOidcLogoutUrlName=Logout URL
-MainAuthenticationOidcLogoutUrlDesc=(example: https://example.com/oauth2/logout)
+MainAuthenticationOidcScopesDesc=Àmbits OpenID per permetre l'accés a la informació de l'usuari
+MainAuthenticationOidcAuthorizeUrlName=Autoritza l'URL
+MainAuthenticationOidcAuthorizeUrlDesc=(exemple: https://example.com/oauth2/authorize)
+MainAuthenticationOidcTokenUrlName=URL del testimoni
+MainAuthenticationOidcTokenUrlDesc=(exemple: https://example.com/oauth2/token)
+MainAuthenticationOidcUserinfoUrlName=URL d'informació de l'usuari
+MainAuthenticationOidcUserinfoUrlDesc=(exemple: https://example.com/oauth2/userinfo)
+MainAuthenticationOidcLogoutUrlName=URL de tancament de sessió
+MainAuthenticationOidcLogoutUrlDesc=(exemple: https://example.com/oauth2/logout)
 MainAuthenticationOidcRedirectUrlName=URL de redirecció
-MainAuthenticationOidcRedirectUrlDesc=Redirect URL to authorize on the OpenID provider side
-MainAuthenticationOidcLogoutRedirectUrlName=Dolibarr logout URL
-MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on the OpenID provider side
-MainAuthenticationOidcLoginClaimName=Login claim
-MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
-BlackListWords=Black list of words
-AddBlackList=Add to black list
-FediverseSetup=Configuration of fediverse section
-ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
+MainAuthenticationOidcRedirectUrlDesc=URL de redirecció per autoritzar al costat del proveïdor d'OpenID
+MainAuthenticationOidcLogoutRedirectUrlName=URL de sortida de Dolibarr
+MainAuthenticationOidcLogoutRedirectUrlDesc=URL de sortida de Dolibarr per autoritzar al costat del proveïdor d'OpenID
+MainAuthenticationOidcLoginClaimName=Reclamació d'inici de sessió
+MainAuthenticationOidcLoginClaimDesc=Reclamació OpenID Connect que coincideix amb l'inici de sessió d'usuari de Dolibarr. Si no està definit o buit, el correu electrònic és per defecte
+BlackListWords=Llista negra de paraules
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
+AddBlackList=Afegeix a la llista negra
+FediverseSetup=Configuració de la secció fediverse
+ConfigImportSocialNetwork=Configuració de xarxes socials compatibles amb Fediverse
 Fediverse=Fediverse
-NewSocialNetwork=New Fediverse social network
-SocialNetworkUrl=Fediverse API URL
-SocialNetworksNote=Each social network definition provides a widget that you must enable to have it available in dashboard
-ConfirmDeleteSocialNetwork= Are you sure want to delete this record ?
-AnOwnerMustBeSetIfEmailTemplateIsPrivate=An owner must be set if the email template is set as private
-ContactsDefaultRoles=For third parties of the "individual" type, a contact can be created simultaneously. Define here the roles that will be systematically assigned to this contact.
-MenuDict=Dictionary
-AddMoreParams=Add more parameters for connection (cookies, tokens, ...)<br> Example: token : value token
-ParamName=Name of parameter
-ParamValue=Value of parameter
-ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
-HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+NewSocialNetwork=Nova xarxa social Fediverse
+SocialNetworkUrl=URL de l'API Fediverse
+SocialNetworksNote=Cada definició de xarxa social proporciona un widget que heu d'activar perquè estigui disponible al tauler
+ConfirmDeleteSocialNetwork= Esteu segur que voleu suprimir aquest registre?
+AnOwnerMustBeSetIfEmailTemplateIsPrivate=S'ha d'establir un propietari si la plantilla de correu electrònic està definida com a privada
+ContactsDefaultRoles=Per a tercers de tipus "individual", es pot crear un contacte simultàniament. Definiu aquí els rols que s'assignaran sistemàticament a aquest contacte.
+MenuDict=Diccionari
+AddMoreParams=Afegiu més paràmetres per a la connexió (galetes, testimonis,...)<br> Exemple: testimoni : testimoni de valor
+ParamName=Nom del paràmetre
+ParamValue=Valor del paràmetre
+ConfirmDeleteParamOfSocialNetwork=Esteu segur que voleu suprimir aquest paràmetre?
+HelpMariaDBToGetPossibleValues=Podeu obtenir una llista de valors possibles executant l'ordre SQL següent: %s
+HelpMariaDBToGetValue=Aquest valor s'ha recuperat amb l'ordre: %s
+PDFBoxFrameRoundedCorners=Marcs amb cantonades arrodonides
+MAIN_PDF_FRAME_CORNER_RADIUS=El valor predeterminat del radi de cantonada és 0, de manera que no hi ha cantonades arrodonides. Trieu valors entre 1 i 3 per augmentar el radi de les cantonades i afegir cantonades arrodonides als marcs
 Captcha=Captcha
-CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
-DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+CaptchaDesc=Si voleu protegir la vostra pàgina d'inici de sessió amb un Captcha, podeu triar quin utilitzar aquí
+DolibarrStandardCaptcha=Un captcha natiu generat per Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Mostra l'adreça d'enviament
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Indicació obligatòria en alguns països (França, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Mostra l'anàlisi de la iva per tarifa
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=Teniu una mida màxima predeterminada per a les llistes establerta a <b>%s</b> línies. Aquest és un valor gran que cal desplaçar-se per a veure totes les respostes. És millor tenir un valor inferior a <b>%s</b> i utilitzar paginació per a veure el registre sobre aquest número. Canvieu-ho al menú Inici - Configuració - Visualització.
+RoundBorders=Vores rodones
+CheckIfModuleIsNotBlackListed=Bloqueja la instal·lació dels mòduls que es troben a la <b>Llista negra remota</b>
+CheckIfModuleIsNotBlackListedHelp=Alguns mòduls poden ser proporcionats per algunes empreses que no respecten les normes de bona voluntat del projecte (incompliment del GDPR, infracció de les normes d'ús de la marca Dolibarr, etc.). En marcar aquesta casella, es farà una sol·licitud al servidor del projecte per veure si s'ha rebut un informe sobre aquest mòdul i us protegirà bloquejant el desplegament dels mòduls marcats.
+DatabaseEncryption=Xifrat a la base de dades
+AlgorithmFor=Algorisme per a: %s
+SensitiveData=Dades sensibles
+ToolToDecryptAString=Eina per a desxifrar una cadena
+Decrypt=Desxifrar
+FilesIntegrityDesc=Si voleu comprovar la integritat dels fitxers en lloc de la base de dades, podeu fer-ho utilitzant <a href="%s">aquesta eina</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=Hi ha més de %s respostes amb el vostre filtre. Afegeix més filtres...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index e2425331a4b..4c50f8396c0 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Saldo final
 CurrentBalance=Saldo actual
 FutureBalance=Saldo previst
 ShowAllTimeBalance=Mostra el saldo des de l'inici
-AllTime=Des del principi
 Reconciliation=Conciliació
 RIB=Compte bancari
 IBAN=Identificador IBAN
@@ -133,7 +132,7 @@ DeleteTransaction=Eliminar registre
 ConfirmDeleteTransaction=Esteu segur que voleu suprimir aquest registre?
 ThisWillAlsoDeleteBankRecord=Açò eliminarà també els registres bancaris generats
 BankMovements=Moviments
-PlannedTransactions=Registres prevists
+PlannedTransactions=Properes entrades
 Graph=Gràfics
 ExportDataset_banque_1=Registres bancaris i extractes
 ExportDataset_banque_2=Resguard
@@ -151,8 +150,8 @@ FutureTransaction=Transacció futura. No és possible conciliar.
 SelectChequeTransactionAndGenerate=Seleccioneu/filtreu els xecs que s'han d'incloure a la remesa de xecs. A continuació, feu clic a «Crea».
 SelectPaymentTransactionAndGenerate=Seleccioneu/filtreu els documents que s'han d'incloure al %s rebut de dipòsit. A continuació, feu clic a «Crear».
 InputReceiptNumber=Trieu l'extracte bancari relacionat amb la conciliació. Utilitzeu un valor numèric ordenable
-InputReceiptNumberBis=AAAAMM o AAAAMMDD
-EventualyAddCategory=Optionally, a category in which to classify the operations
+InputReceiptNumberBis=AAAAMM
+EventualyAddCategory=Opcionalment, una categoria en la qual classificar les operacions
 ToConciliate=A conciliar?
 ThenCheckLinesAndConciliate=A continuació, comproveu les línies presents en l'extracte bancari i feu clic
 DefaultRIB=Codi BAN per defecte
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Si aquesta funció està habilitada, podeu triar un col
 BankColorizeMovementName1=Color de fons pel moviment de dèbit
 BankColorizeMovementName2=Color de fons pel moviment de crèdit
 IfYouDontReconcileDisableProperty=Si no feu les conciliacions bancàries en alguns comptes bancaris, desactiveu la propietat «%s» per a eliminar aquest advertiment.
-NoBankAccountDefined=No s'ha definit cap compte bancari
+NoBankAccountDefined=No s'ha trobat cap compte bancari
 NoRecordFoundIBankcAccount=No s'ha trobat cap registre al compte bancari. Normalment, això passa quan un registre s'ha suprimit manualment de la llista de transaccions al compte bancari (per exemple, durant una conciliació del compte bancari). Un altre motiu és que el pagament es va registrar quan el mòdul «%s» estava desactivat.
 AlreadyOneBankAccount=Ja s'ha definit un compte bancari
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Variant del fitxer SEPA
diff --git a/htdocs/langs/ca_ES/blockedlog.lang b/htdocs/langs/ca_ES/blockedlog.lang
index 2d5168bf5f9..1d3633180ec 100644
--- a/htdocs/langs/ca_ES/blockedlog.lang
+++ b/htdocs/langs/ca_ES/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Registres inalterables
 ShowAllFingerPrintsMightBeTooLong=Mostra tots els registres arxivats (pot ser llarg)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostra tots els registres d'arxiu no vàlids (pot ser llarg)
 DownloadBlockChain=Baixa les empremtes dactilars
-KoCheckFingerprintValidity=L'entrada de registre arxivada no és vàlida. Significa que algú (un pirata informàtic?) ha modificat algunes dades d'aquest registre després d'haver-lo enregistrat, o ha esborrat el registre arxivat anterior (comproveu que existeixi la línia amb la numeració anterior) o ha modificat la suma de verificació del registre anterior.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=El registre del registre arxivat és vàlid. Les dades d'aquesta línia no s'han modificat i l'entrada segueix l'anterior.
 OkCheckFingerprintValidityButChainIsKo=El registre arxivat sembla ser vàlid en comparació amb l'anterior, però la cadena s'ha corromput prèviament.
 AddedByAuthority=Emmagatzemat a l'autoritat remota
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Detalls del registre
 ListOfTrackedEvents=Llista d'esdeveniments seguits
 Fingerprint=Empremtes dactilars
 DownloadLogCSV=Exporta els registres arxivats (CSV)
-DataOfArchivedEvent=Dades completes de l'esdeveniment arxivat
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Objecte original (tipus %s, identificador %s) no enllaçat (vegeu la columna "Dades completes" per a obtenir dades desades inalterables)
 BlockedLogAreRequiredByYourCountryLegislation=El mòdul de registres inalterables pot ser requerit per la legislació del vostre país. La desactivació d'aquest mòdul pot fer que qualsevol transacció futura sigui invàlida pel que fa a la llei i l'ús del programari legal, ja que no es pot validar mitjançant una auditoria fiscal.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=El mòdul de registres inalterables s'ha activat a causa de la legislació del vostre país. La desactivació d'aquest mòdul pot fer que qualsevol transacció futura sigui invàlida pel que fa a la llei i l'ús del programari legal, ja que no es pot validar mitjançant una auditoria fiscal.
@@ -30,6 +32,7 @@ BlockedLogEnabled=S'ha habilitat el sistema per a fer el seguiment d'esdevenimen
 BlockedLogDisabled=El sistema per a fer el seguiment d'esdeveniments en registres inalterables s'ha desactivat després de fer algunes gravacions. Hem desat una empremta digital especial per a fer un seguiment de la cadena com a trencada
 BlockedLogDisabledBis=S'ha desactivat el sistema per a fer el seguiment d'esdeveniments en registres inalterables. Això és possible perquè encara no s'ha fet cap registre.
 LinkHasBeenDisabledForPerformancePurpose=A efectes de rendiment, l'enllaç directe al document no es mostra després de la línia 100.
+SavedOnLine=Desat en línia
 
 ## logTypes
 logBILL_DELETE=S'ha suprimit la factura del client lògicament
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Lògica de liquidació del pagament del client
 logPAYMENT_VARIOUS_CREATE=S'ha creat el pagament (no assignat a una factura)
 logPAYMENT_VARIOUS_DELETE=Supressió lògica de pagament (no assignada a una factura)
 logPAYMENT_VARIOUS_MODIFY=S'ha modificat el pagament (no assignat a una factura)
+logBLOCKEDLOG_EXPORT=Exportació de registres inalterables a un fitxer
diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
index bb98c6fdbd3..3de687aa90f 100644
--- a/htdocs/langs/ca_ES/categories.lang
+++ b/htdocs/langs/ca_ES/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Àrea d'etiquetes / categories de contacte
 AccountsCategoriesArea=Àrea d'etiquetes / categories de comptes bancaris
 ProjectsCategoriesArea=Àrea d'etiquetes / categories del projecte
 UsersCategoriesArea=Àrea d'etiquetes / categories d'usuari
+Bank_linesCategoriesArea==Àrea d'etiquetes/categories de línies bancàries
 SubCats=Subcategories
 CatList=Llistat d'etiquetes
 CatListAll=Llista d'etiquetes (tots els tipus)
@@ -90,9 +91,10 @@ CategoriesSetup=Configuració d'etiquetes
 CategorieRecursiv=Enllaça amb l'etiqueta mare automàticament
 CategorieRecursivHelp=Si l'opció està activada, quan afegiu un objecte a una subcategoria, l'objecte també s'afegirà a les categories mares.
 AddProductServiceIntoCategory=Assigna una etiqueta al producte/servei
-AddCustomerIntoCategory=Assigna la categoria al client
-AddSupplierIntoCategory=Assigna la categoria al proveïdor
-AssignCategoryTo=Assigna una categoria a
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Mostra etiqueta
 ByDefaultInList=Per defecte en el llistat
 ChooseCategory=Tria la categoria
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Categories de Pàgines/Contenidors
 KnowledgemanagementsCategoriesArea=Categories de l'article KM
 UseOrOperatorForCategories=Utilitzeu l'operador «OR» per a les categories
 AddObjectIntoCategory=Assigna a l'etiqueta
+FichintersCategoriesArea=Categories d'intervenció
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index d16a3dfef6e..3b2b0c71a2d 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -56,7 +56,7 @@ Lastname=Cognoms
 Firstname=Nom
 RefEmployee=Referència de l'empleat
 NationalRegistrationNumber=Número de registre nacional
-PostOrFunction=Càrrec laboral
+PostOrFunction=Lloc de treball
 UserTitle=Títol cortesia
 NatureOfThirdParty=Naturalesa del tercer
 NatureOfContact=Natura del contacte
@@ -65,6 +65,7 @@ State=Província
 StateId=ID de l'estat
 StateCode=Codi Estat/Província
 StateShort=Estat
+DepartmentBuyer=Estat/província del comprador
 Region=Regió
 Region-State=Regió - Estat
 Country=País
@@ -78,12 +79,12 @@ Chat=Xat
 PhonePro=Tel. feina
 PhonePerso=Tel. personal
 PhoneMobile=Mòbil
-No_Email=No enviar correus massius
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=Codi postal
 Town=Població
 Web=Web
-Poste= Càrrec
+Poste= Posició
 DefaultLang=Idioma per defecte
 VATIsUsed=Subjecte a IVA
 VATIsUsedWhenSelling=Això defineix si aquest tercer inclou o no un impost de vendes quan fa una factura als seus propis clients
@@ -155,7 +156,7 @@ ProfId4CH=Num registre de comerç
 ProfId5CH=Número EORI
 ProfId1CL=R.U.T.
 ProfId1CM=Id. prof. 1 (Registre Mercantil)
-ProfId2CM=Id. prof. 2 (Unique Tax Identification Number)
+ProfId2CM=Id. prof. 2 (Número d'identificació fiscal únic)
 ProfId3CM=Id. prof. 3 (núm. decret de creació)
 ProfId4CM=Id. prof. 4 (Núm. de certificat de dipòsit)
 ProfId5CM=Id. prof. 5 (altres)
@@ -260,12 +261,12 @@ CompanyHasNoRelativeDiscount=Aquest client no té descompte relatiu per defecte
 HasRelativeDiscountFromSupplier=Teniu un descompte predeterminat de <b>%s%%</b> amb aquest proveïdor
 HasNoRelativeDiscountFromSupplier=No hi ha descompte relatiu predeterminat amb aquest proveïdor
 CompanyHasAbsoluteDiscount=Aquest client té descomptes disponibles (notes de crèdit o bestretes) per <b>%s</b> %s
-CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b>
-CompanyHasCreditNote=This customer still has credit notes for <b>%s</b>
+CompanyHasDownPaymentOrCommercialDiscount=Aquest client té descomptes disponibles (comercials, pagaments inicials) per a <b>%s</b>
+CompanyHasCreditNote=Aquest client encara té notes de crèdit per a <b>%s</b>
 HasNoAbsoluteDiscountFromSupplier=No hi ha descompte/crèdit disponible d'aquest proveïdor
 HasAbsoluteDiscountFromSupplier=Disposes de descomptes (notes de crèdits o pagaments pendents) per a <b> %s </b> %s d'aquest proveïdor
-HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> from this vendor
-HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> from this vendor
+HasDownPaymentOrCommercialDiscountFromSupplier=Teniu descomptes disponibles (comercials, pagaments inicials) per a <b>%s</b> d'aquest venedor
+HasCreditNoteFromSupplier=Teniu notes de crèdit per a <b>%s</b> d'aquest proveïdor
 CompanyHasNoAbsoluteDiscount=Aquest client no té més descomptes fixos disponibles
 CustomerAbsoluteDiscountAllUsers=Descomptes absoluts dels clients (concedits per tots els usuaris)
 CustomerAbsoluteDiscountMy=Descomptes absoluts dels clients (concedits per tu mateix)
@@ -382,12 +383,12 @@ ExportCardToFormat=Exporta fitxa a format
 ContactNotLinkedToCompany=Contacte no vinculat a un tercer
 DolibarrLogin=Nom d'usuari de Dolibarr
 NoDolibarrAccess=Sense accés d'usuari
-ExportDataset_company_1=Tercers (empreses/entitats/persones físiques) i propietats
-ExportDataset_company_2=Contactes i propietats
-ExportDataset_company_3=Comptes Bancaris de tercers
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Contactes/Adreces i atributs addicionals de tercers
+ExportDataset_company_3=Modes de pagament de tercers (comptes bancaris)
 ImportDataset_company_1=Tercers i les seves propietats
 ImportDataset_company_2=Contactes/Adreces i atributs addicionals de tercers
-ImportDataset_company_3=Comptes Bancaris de tercers
+ImportDataset_company_3=Modes de pagament de tercers (comptes bancaris)
 ImportDataset_company_4=Tercers/Comercials (Assigna usuaris comercials / tercers)
 PriceLevel=Nivell de preus
 PriceLevelLabels=Noms de nivell de preu
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Codi gratuït sense verificació.
 ManagingDirectors=Nom del gerent(s) (CEO, director, president ...)
 MergeOriginThirdparty=Tercer duplicat (el tercer que voleu suprimir)
 MergeThirdparties=Fusionar tercers
-ConfirmMergeThirdparties=Esteu segur que voleu combinar el tercer triat amb l'actual? Tots els objectes enllaçats (factures, comandes...) es mouran al tercer actual, i després se suprimirà el tercer triat.
+ConfirmMergeThirdparties=Esteu segur que voleu combinar el tercer escollit amb l'actual? Tots els objectes enllaçats (factures, comandes, ...) es traslladaran al tercer actual, després s'eliminarà el tercer escollit.
 ThirdpartiesMergeSuccess=S'han fusionat els tercers
 SaleRepresentativeLogin=Nom d'usuari de l'agent comercial
 SaleRepresentativeFirstname=Nom de l'agent comercial
@@ -461,3 +462,6 @@ ExternalSystemID=ID del sistema extern
 IDOfPaymentInAnExternalSystem=ID de la forma de pagament en un sistema extern (com Stripe, Paypal, ...)
 AADEWebserviceCredentials=Credencials del servei web AADE
 ThirdPartyMustBeACustomerToCreateBANOnStripe=El tercer ha de ser un client per a permetre la creació de la seva informació bancària a Stripe
+NewSocNameForClone=Nou nom de l'empresa
+ConfirmCloneThirdparties=Esteu segur que voleu clonar l'empresa <b>%s</b>?
+SocialNetworksBusiness=Xarxes socials per a l'empresa
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index a85df5c0aa4..8395e1e66db 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -16,8 +16,8 @@ Account=Compte
 Accountparent=Compte pare
 Accountsparent=Comptes pare
 Income=Ingressos
-Outcome=Despeses
-MenuReportInOut=Resultat / Exercici
+Outcome=Despesa
+MenuReportInOut=Ingressos / Despeses
 ReportInOut=Saldo d'ingressos i despeses
 ReportTurnover=Volum de vendes facturat
 ReportTurnoverCollected=Facturació recaptada
@@ -25,7 +25,7 @@ PaymentsNotLinkedToInvoice=Pagaments vinculats a cap factura, per la qual cosa s
 PaymentsNotLinkedToUser=Pagaments no vinculats a un usuari
 Profit=Benefici
 AccountingResult=Resultat comptable
-BalanceBefore=Balanç (abans)
+BalanceBefore=Saldo (anterior)
 Balance=Saldo
 Debit=Dèbit
 Credit=Crèdit
@@ -42,10 +42,10 @@ VATBalance=Saldo tributari
 VATPaid=Impost pagat
 LT1Summary=Resum d'impostos 2
 LT2Summary=Resum fiscal 3
-LT1SummaryES=Balanç del RE
-LT2SummaryES=Balanç d'IRPF
-LT1SummaryIN=Balanç RE
-LT2SummaryIN=Balanç IRPF
+LT1SummaryES=Saldo del RE
+LT2SummaryES=Saldo d'IRPF
+LT1SummaryIN=Saldo CGST
+LT2SummaryIN=Saldo SGST
 LT1Paid=Impostos pagats 2
 LT2Paid=Impostos pagats 3
 LT1PaidES=RE pagat
@@ -74,7 +74,7 @@ SocialContributionsNondeductibles=Impostos varis no deduïbles
 DateOfSocialContribution=Data de l’impost social o fiscal
 LabelContrib=Nom d'aportació
 TypeContrib=Tipus d'aportació
-MenuSpecialExpenses=Pagaments especials
+MenuSpecialExpenses=Despeses especials
 MenuTaxAndDividends=Impostos i càrregues
 MenuSocialContributions=Impostos varis
 MenuNewSocialContribution=Impost varis nou
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Cobrament factura a client
 PaymentSupplierInvoice=Pagament de la factura del proveïdor
 PaymentSocialContribution=Pagament d'impost varis
 PaymentVat=Pagament IVA
-AutomaticCreationPayment=Registre automàtic del pagament
+AutomaticCreationPayment=Also record the payment
 ListPayment=Llistat de pagaments
 ListOfCustomerPayments=Llistat de cobraments de clients
 ListOfSupplierPayments=Llista de pagaments a proveïdors
@@ -118,18 +118,24 @@ SocialContributionsPayments=Pagaments d'impostos varis
 ShowVatPayment=Veure pagaments IVA
 TotalToPay=Total a pagar
 BalanceVisibilityDependsOnSortAndFilters=El saldo només es pot veure en aquesta llista si la taula està ordenada amb %s i es filtra en 1 compte bancari (sense altres filtres)
+CustomerAccountancyCodeGeneral=Codi comptable general
 CustomerAccountancyCode=Codi comptable del client
+SupplierAccountancyCodeGeneral=Codi comptable general
 SupplierAccountancyCode=Codi de comptabilitat del proveïdor
+UserAccountancyCodeGeneral=Codi comptable general
 CustomerAccountancyCodeShort=Codi compt. cli.
 SupplierAccountancyCodeShort=Codi compt. prov.
+UserAccountancyCodeShort=Codi de compte d'usuari
 AccountNumber=Número de compte
 NewAccountingAccount=Compte nou
 Turnover=Facturació facturada
 TurnoverCollected=Facturació recaptada
 SalesTurnoverMinimum=Facturació mínima
-ByExpenseIncome=Per despeses & ingressos
+ByExpenseIncome=Per despeses i ingressos
 ByThirdParties=Per tercer
+ByProjects=Per projectes
 ByUserAuthorOfInvoice=Per autor de la factura
+DetailedListLowercase=llista detallada
 CheckReceipt=Resguard
 CheckReceiptShort=Resguard
 LastCheckReceiptShort=Últims %s registres de dipòsit
@@ -172,7 +178,7 @@ CalcModeLT2Debt=Metode <b>%sIRPF a factures a client%s</b>
 CalcModeLT2Rec= Metode <b>%sIRPF a factures de proveïdors%s</b>
 AnnualSummaryDueDebtMode=Saldo d'ingressos i despeses, resum anual
 AnnualSummaryInputOutputMode=Saldo d'ingressos i despeses, resum anual
-AnnualByCompanies=Saldo d'ingressos i despeses, per grups de compte predefinits
+AnnualByCompanies=Saldo d'ingressos i despeses, per grups de comptes predefinits
 AnnualByCompaniesDueDebtMode=Saldo d'ingressos i despeses, detall per grups predefinits, mode <b> %sReclamacions-Deutes%s</b> és a dir <b>Comptabilitat de compromisos</b>.
 AnnualByCompaniesInputOutputMode=Saldo d'ingressos i despeses, detall per grups predefinits, mode <b> %sIngresos-Despeses%s</b> és a dir <b>comptabilitat d'efectiu</b>.
 SeeReportInInputOutputMode=Mostra<b>%sl'anàlisi de pagaments%s</b> per a obtenir un càlcul basat en <b>pagaments registrats</b> fets fins i tot si encara no estan comptabilitzats al llibre major
@@ -185,9 +191,9 @@ RulesResultInOut=- Inclou els pagaments reals fets en factures, despeses, IVA i
 RulesCADue=- Inclou les factures degudes al client tant si són pagades com si no. <br> - Es basa en la data de facturació d'aquestes factures. <br>
 RulesCAIn=- Inclou tots els pagaments efectius de factures rebuts dels clients. <br> - Es basa en la data de pagament d'aquestes factures <br>
 RulesCATotalSaleJournal=Inclou totes les línies de crèdit del Diari de venda.
-RulesSalesTurnoverOfIncomeAccounts=Inclou (crèdit-dèbit) de línies per a comptes de producte del grup INGRESSOS
-RulesAmountOnInOutBookkeepingRecord=Inclou un registre al vostre Llibre Major amb comptes comptables que tenen el grup "DESPESA" o "INGRÉS"
-RulesResultBookkeepingPredefined=Inclou un registre al vostre Llibre Major amb comptes comptables que tenen el grup "DESPESA" o "INGRÉS"
+RulesSalesTurnoverOfIncomeAccounts=Inclou (crèdit - dèbit) de línies per a comptes de producte del grup INCOME
+RulesAmountOnInOutBookkeepingRecord=Inclou un registre al vostre Llibre Major amb comptes comptables que té el grup "EXPENSE" o "INCOME"
+RulesResultBookkeepingPredefined=Inclou un registre al vostre Llibre Major amb comptes comptables que té el grup "EXPENSE" o "INCOME"
 RulesResultBookkeepingPersonalized=Mostra un registre al vostre Llibre Major amb comptes comptables <b> agrupats per grups personalitzats </b>
 SeePageForSetup=Veure el menú <a href="%s"> %s </a> per a configurar-lo
 DepositsAreNotIncluded=- Les factures de bestreta no estan incloses
@@ -295,7 +301,7 @@ PurchaseTurnoverCollected=Volum de compres recollit
 RulesPurchaseTurnoverDue=- Inclou les factures pendents del proveïdor, tant si es paguen com si no. <br>- Es basa en la data de factura d'aquestes factures.<br>
 RulesPurchaseTurnoverIn=- Inclou tots els pagaments efectius de les factures fetes als proveïdors.<br>- Es basa en la data de pagament d'aquestes factures<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Inclou totes les línies de dèbit del diari de compra.
-RulesPurchaseTurnoverOfExpenseAccounts=Inclou (dèbit-crèdit) de línies per a comptes de producte del grup DESPESES
+RulesPurchaseTurnoverOfExpenseAccounts=Inclou (dèbit - crèdit) de línies per a comptes de producte del grup EXPENSE
 ReportPurchaseTurnover=Volum de compres facturat
 ReportPurchaseTurnoverCollected=Volum de compres recollit
 IncludeVarpaysInResults = Incloure varis pagaments als informes
diff --git a/htdocs/langs/ca_ES/datapolicy.lang b/htdocs/langs/ca_ES/datapolicy.lang
index d0d7aa930c7..839c10b52a9 100644
--- a/htdocs/langs/ca_ES/datapolicy.lang
+++ b/htdocs/langs/ca_ES/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Política de privadesa de dades
 Module4100Desc = Mòdul de gestió de la privadesa de dades (conformitat amb el GDPR)
 # Administration page
 datapolicySetup = Configuració de la política de privadesa de dades del mòdul
-Deletion = Supressió de dades
-datapolicySetupPage = En funció de les lleis dels vostres països (Exemple <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> del RGPD), les dades personals s'han de conservar durant un període. sense excedir la durada que les dades siguin necessàries per a la finalitat per a la qual van ser recollides, excepte per a finalitats d'arxiu.<br>L'eliminació es farà automàticament després d'un cert temps sense esdeveniments (la durada que haureu indicat a continuació).
+DataDeletion=Supressió de dades
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s mesos
 ONE_YEAR = 1 any
 NB_YEARS = %s anys
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Client potencial/client
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Ni prospecte/Ni client
 DATAPOLICY_CONTACT_FOURNISSEUR = Proveïdor
 DATAPOLICY_ADHERENT = Soci
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Podeu enviar un correu electrònic de GDPR a tots els vostres contactes rellevants (que encara no han rebut cap correu electrònic i per als quals no heu registrat res sobre el seu acord de GDPR). Per a fer-ho, utilitzeu el botó següent.
 SendAgreement = Envieu correus electrònics
 AllAgreementSend = S'han enviat tots els correus electrònics
 TXTLINKDATAPOLICYACCEPT = Text per a l'enllaç "acord"
 TXTLINKDATAPOLICYREFUSE = Text per a l'enllaç «desacord»
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: Tractament de dades personals
 DATAPOLICY_consentement = Consentiment obtingut per al tractament de dades personals
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index a0ca64da285..f62acdb4aec 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error en crear fitxers d'imatge (que es
 ErrorFailedToCreateDir=Error en la creació d'una carpeta. Comprovi que l'usuari del servidor web té drets d'escriptura en les carpetes de documents de Dolibarr. Si el paràmetre <b>safe_mode</b> està actiu en aquest PHP, Comproveu que els fitxers php dolibarr pertanyen a l'usuari del servidor web.
 ErrorNoMailDefinedForThisUser=E-Mail no definit per a aquest usuari
 ErrorSetupOfEmailsNotComplete=La configuració dels correus electrònics no s'ha completat
+ErrorAccountingClosureSetupNotComplete=La configuració dels comptes de tancament no s'ha completat
 ErrorFeatureNeedJavascript=Aquesta funció necessita que JavaScript estigui activat per funcionar. Canvieu-ho a la pantalla de configuració.
 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
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Càrrega bloquejada per un connector PHP/Apache.
 ErrorFileSizeTooLarge=La mida del fitxer és massa gran o no s'ha proporcionat el fitxer.
 ErrorFieldTooLong=El camp %s és massa llarg.
 ErrorSizeTooLongForIntType=Longitud del camp massa llarg per al tipus int (màxim %s xifres)
+ErrorSizeForStarsType=La mida de l'estrella ha de ser un nombre entre 1 i 10
 ErrorSizeTooLongForVarcharType=Longitud del camp massa llarg per al tipus cadena (màxim %s xifres)
 ErrorNoValueForSelectType=Els valors de la llista han de ser indicats
 ErrorNoValueForCheckBoxType=Empleneu el valor de la llista de caselles de selecció
@@ -95,7 +97,7 @@ ErrorRecordHasAtLeastOneChildOfType=L'objecte %s té almenys un fill del tipus %
 ErrorRecordIsUsedCantDelete=No es pot eliminar el registre. Ja s'utilitza o s'inclou en un altre objecte.
 ErrorModuleRequireJavascript=JavaScript no s'ha de desactivar perquè aquesta funció funcioni. Per a activar/desactivar JavaScript, aneu al menú Inici->Configuració->Entorn.
 ErrorPasswordsMustMatch=Les 2 contrasenyes indicades s'han de correspondre
-ErrorContactEMail=S'ha produït un error tècnic. Si us plau, poseu-vos en contacte amb l'administrador al correu electrònic següent <b>%s</b> i proporcioneu l'error. codi <b>%s</b> al missatge o afegiu una còpia de pantalla de aquesta pàgina.
+ErrorContactEMail=S'ha produït un error tècnic. Si us plau, poseu-vos en contacte amb l'administrador al correu electrònic següent <b>%s</b> i proporcioneu el codi d'error <b>%s</b> del missatge o afegiu una còpia de pantalla d'aquesta pàgina.
 ErrorWrongValueForField=Camp <b> %s </b>: '<b> %s </b>' no coincideix amb la regla regex <b> %s </b>
 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>
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Valor incorrecte per codi de seguretat. Torna a intentar-ho
 ErrorBothFieldCantBeNegative=Els camps %s i %s no poden ser negatius
 ErrorFieldCantBeNegativeOnInvoice=El camp <strong>%s</strong> no pot ser negatiu en aquest tipus de factura. Si necessiteu afegir una línia de descompte, primer heu de crear el descompte (des del camp '%s' de la targeta de tercers) i aplicar-lo a la factura.
 ErrorLinesCantBeNegativeForOneVATRate=El total de línies (net d’impostos) no pot ser negatiu per a un tipus d’IVA determinat no nul (s’ha trobat un total negatiu per a l’IVA <b> %s </b> %%).
-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
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=La quantitat a les línies de factures a client no poden ser negatives
+ErrorQtyForSupplierInvoiceCantBeNegative=La quantitat de la línia a les factures dels proveïdors no pot ser negativa
 ErrorWebServerUserHasNotPermission=El compte d'execució del servidor web <b>%s</b> no disposa dels permisos per això
 ErrorNoActivatedBarcode=No s'ha activat cap mena de codi de barres
 ErrUnzipFails=No s'ha pogut descomprimir el fitxer %s amb ZipArchive
@@ -222,7 +225,7 @@ ErrorUserNotAssignedToTask=Cal assignar l'usuari a la tasca per a poder introdui
 ErrorTaskAlreadyAssigned=La tasca també està assignada a l'usuari
 ErrorModuleFileSeemsToHaveAWrongFormat=Pareix que el mòdul té un format incorrecte.
 ErrorModuleFileSeemsToHaveAWrongFormat2=Al ZIP d'un mòdul ha d'haver necessàriament com a mínim un d'aquests directoris: <strong>%s</strong> o <strong>%s</strong>
-ErrorFilenameDosNotMatchDolibarrPackageRules=The file name of the module package (<strong>%s</strong>) does not match the expected name syntax: <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=El nom de fitxer del paquet del mòdul (<strong>%s</strong>) coincideix amb la sintaxi del nom esperada: <strong>%s</strong>
 ErrorDuplicateTrigger=Error, nom de disparador %s duplicat. Ja es troba carregat des de %s.
 ErrorNoWarehouseDefined=Error, no hi ha magatzems definits.
 ErrorBadLinkSourceSetButBadValueForRef=L'enllaç que utilitzeu no és vàlid. Es defineix una "font" de pagament, però el valor de "ref" no és vàlid.
@@ -303,8 +306,8 @@ ErrorThirpdartyOrMemberidIsMandatory=És obligatori un tercer o membre de la soc
 ErrorFailedToWriteInTempDirectory=No s'ha pogut escriure al directori temporal
 ErrorQuantityIsLimitedTo=La quantitat està limitada a %s
 ErrorFailedToLoadThirdParty=No s'ha pogut trobar/carregar un tercer d'id=%s, correu electrònic=%s, nom= %s
-ErrorThisPaymentModeIsNotDirectDebit=The payment mode is not direct debit
-ErrorThisPaymentModeIsNotCreditTransfer=The payment mode is not credit transfer
+ErrorThisPaymentModeIsNotDirectDebit=La modalitat de pagament no és domiciliació bancària
+ErrorThisPaymentModeIsNotCreditTransfer=La manera de pagament no és transferència de crèdit
 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=No s'ha trobat la taula <b>%s</b>
@@ -335,11 +338,18 @@ ErrorDictionaryNotFound=No s'ha trobat el diccionari <b>%s</b>
 ErrorFailedToCreateSymLinkToMedias=No s'ha pogut create el simbòlic Link %s per apuntar a %s
 ErrorCheckTheCommandInsideTheAdvancedOptions=Check el command utilitzat per a l'exportació a les opcions avançades de l'exportació
 ErrorEndTimeMustBeGreaterThanStartTime=L'hora de finalització ha de ser superior a l'hora d'inici
-ErrorIncoherentDates=Start date must be earlier than end date
-ErrorEndHourIsNull=End date field cannot be empty
-ErrorStartHourIsNull=Start date field cannot be empty
-ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
+ErrorIncoherentDates=La data d'inici ha de ser anterior a la data de finalització
+ErrorEndHourIsNull=El camp de la data de finalització no pot estar buit
+ErrorStartHourIsNull=El camp de la data d'inici no pot estar buit
+ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Massa línies per processar. Si us plau, utilitzeu un filtre més selectiu.
 ErrorEmptyValueForQty=La quantitat no pot ser zero.
+ErrorNoCloneWithoutName=El nou usuari ha de tenir un nom
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = La quantitat demanada no pot ser inferior a la quantitat enviada.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, la creació d'un pagament diferent en un compte bancari amb una moneda diferent de la moneda de l'empresa encara no s'admet.
+ErrorStreamMustBeEnabled=El flux PHP %s no està disponible. Comproveu els vostres mòduls PHP i el paràmetre de Dolibarr $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # 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.
 WarningPasswordSetWithNoAccount=S'ha establert una contrasenya per a aquest soci. Tot i això, no s'ha creat cap compte d'usuari. Per tant, aquesta contrasenya s’emmagatzema però no es pot utilitzar per a iniciar la sessió a Dolibarr. Pot ser utilitzat per un mòdul/interfície extern, però si no necessiteu definir cap inici de sessió ni contrasenya per a un soci, podeu desactivar l'opció "Gestiona un inici de sessió per a cada soci" des de la configuració del mòdul Socis. Si heu de gestionar un inici de sessió però no necessiteu cap contrasenya, podeu mantenir aquest camp buit per a evitar aquesta advertència. Nota: El correu electrònic també es pot utilitzar com a inici de sessió si el soci està enllaçat amb un usuari.
@@ -365,7 +375,7 @@ WarningYourLoginWasModifiedPleaseLogin=S'ha modificat el vostre nom d'usuari. Pe
 WarningYourPasswordWasModifiedPleaseLogin=S'ha modificat la teva contrasenya. Per motius de seguretat, haureu d'iniciar sessió ara amb la vostra nova contrasenya.
 WarningAnEntryAlreadyExistForTransKey=Ja existeix una entrada per la clau de traducció d'aquest idioma
 WarningNumberOfRecipientIsRestrictedInMassAction=Advertència: el nombre de destinataris diferents està limitat a <b> %s </b> quan s'utilitzen les accions massives a les llistes.
-WarningDateOfLineMustBeInExpenseReportRange=Advertència, la data de la línia no està dins del rang de l'informe de despeses
+WarningDateOfLineMustBeInExpenseReportRange=Advertència, la data de la línia no està dins l'interval de l'informe de despeses
 WarningProjectDraft=El projecte encara està en mode esborrany. No oblidis validar-lo si tens previst utilitzar tasques.
 WarningProjectClosed=El projecte està tancat. Primer l'has de tornar a obrir.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Algunes transaccions bancàries es van suprimir després que es generés el rebut que les conté. Per tant, el nombre de xecs i el total de rebuts poden diferir del nombre i el total a la llista.
@@ -386,8 +396,12 @@ WarningCommentNotFound=Avís: no es poden trobar els comentaris d'inici i/o fina
 WarningAlreadyReverse=estoc moviment ja invertit
 WarningParentIDDoesNotExistAnymore=Aquest identificador parental ja no existeix
 WarningReadBankAlsoAllowedIfUserHasPermission=Avís, també es permet llegir el compte bancari amb el permís per gestionar el pla de comptes
-WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
+WarningNoDataTransferedInAccountancyYet=Tingueu en compte que no hi ha dades a la taula comptable. Transferiu les vostres dades registrades a l'aplicació a la secció de comptabilitat o canvieu el mode de càlcul per analitzar les dades registrades fora de la comptabilitat.
 WarningChangingThisMayBreakStopTaskScheduler=Avís, canviar aquest valor pot desactivar el planificador
+WarningAmountOfFileDiffersFromSumOfLines=Advertència, la quantitat de fitxer (%s) difereix de la suma de línies (%s)
+WarningModuleAffiliatedToAReportedCompany=Advertència, s'ha informat d'aquest mòdul a la fundació Dolibarr com a publicat per una empresa que utilitza pràctiques il·legals (incompliment de les normes d'ús de la marca Dolibarr, recollida de dades sense el vostre consentiment o implementació de programari maliciós).
+WarningModuleAffiliatedToAPiratPlatform=Aneu amb compte quan obteniu un mòdul (de pagament o gratuït) d'una plataforma no oficial sospitosa com %s
+
 SwissQrOnlyVIR = SwissQR invoice només es pot afegir a invoices establert per ser paid Transfer pagaments.
 SwissQrCreditorAddressInvalid = L'adreça del creditor no és vàlida (s'han definit el codi postal i la ciutat? (%s)
 SwissQrCreditorInformationInvalid = La informació del creditor no és vàlida per a l'IBAN (%s): %s
@@ -422,4 +436,5 @@ OperNotDefined=Forma de pagament no definida
 ErrorThisContactXIsAlreadyDefinedAsThisType=%s ja està definit com a contacte per a aquest tipus.
 ErrorThisGroupIsAlreadyDefinedAsThisType=Els contactes amb aquest grup ja estan definits com a contacte d'aquest tipus.
 EmptyMessageNotAllowedError=No es permet el missatge buit
-ErrorIsNotInError=%s is not in error
+ErrorIsNotInError=%s no té error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/ca_ES/exports.lang b/htdocs/langs/ca_ES/exports.lang
index 6c70675a295..fe145ce8a65 100644
--- a/htdocs/langs/ca_ES/exports.lang
+++ b/htdocs/langs/ca_ES/exports.lang
@@ -67,7 +67,7 @@ ChooseFormatOfFileToImport=Trieu el format de fitxer que voleu utilitzar com a f
 ChooseFileToImport=Carregueu el fitxer i feu clic a la icona %s per a seleccionar el fitxer com a fitxer d'importació d'origen...
 SourceFileFormat=Format de l'arxiu origen
 FieldsInSourceFile=Camps en el fitxer origen
-FieldsInTargetDatabase=Camps destinació a la base de dades Dolibarr (*=obligatori)
+FieldsInTargetDatabase=Camps de destinació a la base de dades Dolibarr
 NoFields=Cap camp
 MoveField=Moure camp columna número %s
 ExampleOfImportFile=Exemple_de_fitxer_importacio
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Comproveu que el format del fitxer (delimitadors de camp
 RunSimulateImportFile=Executeu la simulació d'importació
 FieldNeedSource=Aquest camp requereix les dades de l'arxiu d'origen
 SomeMandatoryFieldHaveNoSource=Alguns camps obligatoris no tenen camp font a l'arxiu d'origen
-InformationOnSourceFile=Informació de l'arxiu origen
-InformationOnTargetTables=Informació sobre els camps de destinació
+InformationOnSourceFile=Arxiu font
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Bascular com a mínim un camp origen a la columna de camps a exportar
 SelectFormat=Seleccioneu aquest format de fitxer d'importació
 RunImportFile=Importa dades
diff --git a/htdocs/langs/ca_ES/hrm.lang b/htdocs/langs/ca_ES/hrm.lang
index 8d357348a5f..bee02384bff 100644
--- a/htdocs/langs/ca_ES/hrm.lang
+++ b/htdocs/langs/ca_ES/hrm.lang
@@ -46,11 +46,11 @@ NewEval=Nova avaluació de competències
 ValidateEvaluation=Validació de l'avaluació de competències
 ConfirmValidateEvaluation=Esteu segur que voleu validar aquesta avaluació de competències amb la referència <b>%s</b>?
 EvaluationCard=Avaluació de competències
-RequiredRank=Grau requerit per al perfil de feina
-RequiredRankShort=Grau requerit
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Posicions amb aquest perfil laboral
-EmployeeRank=Classificació dels empleats per a aquesta habilitat
-EmployeeRankShort=Grau d'empleat
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Càrrec d'empleat
 EmployeePositions=Càrrecs dels empleats
 EmployeesInThisPosition=Empleats en aquesta posició
@@ -72,6 +72,9 @@ AddSkill=Afegiu habilitats al perfil de feina
 RequiredSkills=Competències necessàries per a aquest perfil laboral
 UserRank=Rank d'usuari
 SkillList=Llista d'habilitats
+SkillCreated=S'han creat les habilitats %s
+SkillRank=Grau d'habilitat
+ShowSkillRank=Mostra el grau d'habilitats
 SaveRank=Guardar rang
 TypeKnowHow=Saber com
 TypeHowToBe=Com ser
@@ -95,3 +98,5 @@ NeedBusinessTravels=Necessites viatges de negocis
 NoDescription=Sense descripció
 TheJobProfileHasNoSkillsDefinedFixBefore=La feina avaluada Profile d'aquesta Employee no té cap habilitat definida. Si us plau, afegiu habilitats i, a continuació, delete and reinicieu l'avaluació.
 PDFStandardHrmEvaluation=Plantilla estàndard per generar un document PDF per a una avaluació de competències
+SkillNotRequired=No es requereix habilitat
+LinkToUserCreated=Enllaçar a un empleat si el sol·licitant ha estat contractat i convertit en usuari.
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index 89809929eb0..b8976584544 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Enviament de correu
 EMailing=Enviament de correu
-EMailings=Enviaments de correu
+EMailings=Mass EMails
 SMSings=SMS
-AllEMailings=Tots els enviaments de correu
+AllEMailings=All mass eMails
 MailCard=Fitxa d'enviament de correu
 MailRecipients=Destinataris
 MailRecipient=Destinatari
@@ -26,19 +26,19 @@ MailFile=Fitxers adjunts
 MailMessage=Text utilitzat en el cos del missatge
 SubjectNotIn=No està subjecte
 BodyNotIn=No en el cos
-ShowEMailing=Mostra l'enviament de correu
-ListOfEMailings=Llista d'enviaments de correu
-NewMailing=Enviament de correu nou
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Nou sms
-EditMailing=Edita l'enviament de correu
-ResetMailing=Nou enviament
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Suprimeix l'enviament de correu
-PreviewMailing=Previsualitza l'enviament de correu
-CreateMailing=Crear un enviament de correu
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Restableix l'estat per error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Prova
-ValidMailing=Valida l'enviament de correu
+ValidMailing=Valid mass Email
 MailingStatusDraft=Esborrany
 MailingStatusValidated=Validat
 MailingStatusSent=Enviat
@@ -55,7 +55,7 @@ ErrorMailRecipientIsEmpty=L'adreça del destinatari és buida
 WarningNoEMailsAdded=Cap nou e-mail a afegir a la llista destinataris.
 ConfirmValidMailing=Esteu segur que voleu validar aquest enviament de correu?
 ConfirmResetMailing=Advertència, en reinicialitzar l'enviament de correu <b>%s</b>, es permetrà tornar a enviar aquest correu electrònic en un correu massiu. Estàs segur que vols fer això?
-ConfirmResetMailingTargetMassactionQuestion=Are you sure you want to reset the status of the selected recipients (this may means that email will be resent if you use the Send email feature of the emailing) ?
+ConfirmResetMailingTargetMassactionQuestion=Esteu segur que voleu restablir l'estat dels destinataris seleccionats (això pot significar que el correu electrònic es tornarà a enviar si feu servir la funció d'enviament de correu electrònic del correu electrònic)?
 ConfirmDeleteMailing=Esteu segur que voleu suprimir aquesta adreça electrònica?
 NbOfUniqueEMails=Nombre de correus electrònics exclusius
 NbOfUniquePhones=Nombre de telèfons únics
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Tots els filtres han de coincidir perquè es reculli un
 LineInFile=Línia %s al fitxer
 RecipientSelectionModules=Mòduls de selecció dels destinataris
 MailSelectedRecipients=Destinataris seleccionats
-MailingArea=Àrea d'enviaments de correu
-LastMailings=Últims %s enviaments de correu
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Estadístiques destinataris
 NbOfCompaniesContacts=Contactes/adreces únics
 MailNoChangePossible=Els destinataris dels enviaments de correu validats no es poden canviar
-SearchAMailing=Cerca un enviament de correu
-SendMailing=Envia el correu massiu
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Enviat per
 AdvancedAlternative=Alternativa avançada
 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?
-LimitSendingEmailing=Nota: L'enviament de missatges massius de correu electrònic des de la interfície web es realitza diverses vegades per motius de seguretat i temps d'espera, <b> %s </b> als destinataris de cada sessió d'enviament.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Buidar llista
 ToClearAllRecipientsClickHere=Feu clic aquí per a esborrar la llista de destinataris d’aquest correu electrònic
 ToAddRecipientsChooseHere=Afegiu destinataris escollint entre les llistes
-NbOfEMailingsReceived=Enviaments de correu massiu rebuts
-NbOfEMailingsSend=E-mails massius enviats
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID registre
 DeliveryReceipt=Confirmació de lliurament
 YouCanUseCommaSeparatorForSeveralRecipients=Podeu utilitzar el separador <b>coma</b> per a especificar diversos destinataris.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=No hi ha previstes notificacions automàtiques per cor
 ANotificationsWillBeSent=S'enviarà 1 notificació automàtica per correu electrònic
 SomeNotificationsWillBeSent=S'enviaran %s notificacions automàtiques per correu electrònic
 AddNewNotification=Subscriviu-vos a una nova notificació automàtica per correu electrònic (destinatari/esdeveniment)
-ListOfActiveNotifications=Subscripcions actives (objectius/esdeveniments) per a la notificació automàtica per correu electrònic
+ListOfActiveNotifications=Subscripcions actives
+ListOfActiveNotificationsHelp=Llista de parelles %s/%s subscrites per a la notificació automàtica per correu electrònic
 ListOfNotificationsDone=S'envien notificacions per correu electrònic automàtiques
+ListOfNotificationsDoneHelp=Llista de notificacions per correu electrònic anteriors enviades
 MailSendSetupIs=La configuració de l'enviament de correu electrònic s'ha configurat a '%s'. Aquest mode no es pot utilitzar per a enviar correus electrònics massius.
 MailSendSetupIs2=Primer heu d’anar, amb un compte d’administrador, al menú %sInici - Configuració - Correus electrònics%s per a canviar el paràmetre <strong>'%s'</strong> per a utilitzar el mode '%s'. Amb aquest mode, podeu introduir la configuració del servidor SMTP proporcionat pel vostre proveïdor de serveis d'Internet i utilitzar la funció de correu electrònic massiu.
 MailSendSetupIs3=Si teniu cap pregunta sobre com configurar el servidor SMTP, podeu demanar-li a %s.
@@ -177,15 +179,15 @@ NoContactWithCategoryFound=No s'ha trobat cap categoria enllaçada a alguns cont
 NoContactLinkedToThirdpartieWithCategoryFound=No s'ha trobat cap categoria vinculada a tercers
 OutGoingEmailSetup=Correus electrònics de sortida
 InGoingEmailSetup=Correus electrònics entrants
-OutGoingEmailSetupForEmailing=Outgoing emails (%s)
+OutGoingEmailSetupForEmailing=Correus electrònics de sortida (%s)
 DefaultOutgoingEmailSetup=La mateixa configuració que el correu electrònic de sortida global
 Information=Informació
 ContactsWithThirdpartyFilter=Contactes amb filtre de tercers
 Unanswered=Sense resposta
 Answered=Respost
-IsNotAnAnswer=No és resposta (correu electrònic inicial)
+IsNotAnAnswer=No és resposta (és un correu electrònic inicial)
 IsAnAnswer=És la resposta d’un correu electrònic inicial
-RecordCreatedByEmailCollector=Record created by the Email Collector %s
+RecordCreatedByEmailCollector=Registre creat pel col·leccionista de correu electrònic %s
 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.
@@ -193,12 +195,12 @@ NoMoreRecipientToSendTo=No hi ha més destinatari a qui enviar el correu electr
 EmailOptedOut=El propietari del correu electrònic ha sol·licitat no contactar amb ell amb aquest correu electrònic
 EvenUnsubscribe=Inclou correus electrònics de desactivació
 EvenUnsubscribeDesc=Incloeu correus electrònics de desactivació quan seleccioneu correus electrònics com a objectius. Útil per a correus electrònics de servei obligatori, per exemple.
-XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s operations done)
+XEmailsDoneYActionsDone=Correus electrònics %s prequalificats, correus electrònics %s processats correctament (per a operacions %s fet)
 YouCanMakeSomeInstructionForEmail=Podeu fer algunes instruccions per al vostre correu electrònic (Exemple: generar imatge a la plantilla de correu electrònic...)
 ModelTemplate=Plantilla de correu electrònic
 YouCanChooseAModelForYouMailContent= Podeu triar un dels models de plantilla o generar-ne un amb IA
 TitleOfMailHolder=El títol del correu electrònic va aquí
 ContentOfMailHolder=El contingut del correu electrònic arriba aquí...
-LastNews=Last News
-ListProducts= List of products
-PasswordReset=Password reset
+LastNews=Últimes notícies
+ListProducts= Llista de productes
+PasswordReset=Restableix la contrasenya
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 070ef5c24d2..d870d864681 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -37,6 +37,7 @@ Translation=Traducció
 Translations=Traduccions
 CurrentTimeZone=Fus horari PHP (Servidor)
 EmptySearchString=Introduïu criteris de cerca no buits
+EnterNonEmptyLinesFirst=introduïu primer línies no buides
 EnterADateCriteria=Introduïu un criteri de data
 NoRecordFound=No s'han trobat registres
 NoRecordDeleted=Sense registres eliminats
@@ -45,6 +46,7 @@ NoError=Cap error
 Error=Error
 Errors=Errors
 ErrorFieldRequired=El camp '%s' és obligatori
+CustomMandatoryFieldRule=Regla personalitzada del "camp obligatori".
 ErrorFieldFormat=El camp '%s' té un valor incorrecte
 ErrorFileDoesNotExists=El fitxer %s no existeix
 ErrorFailedToOpenFile=Impossible obrir el fitxer %s
@@ -308,6 +310,7 @@ DateBuild=Data generació de l'informe
 DatePayment=Data pagament
 DateApprove=Data d'aprovació
 DateApprove2=Data d'aprovació (segona aprovació)
+PendingSince=Pendent des de llavors
 RegistrationDate=Data d'enregistrament
 UserCreation=Usuari de creació
 UserModification=Usuari de modificació
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Començar
 ActionRunningShort=En progrés
 ActionDoneShort=Acabat
 ActionUncomplete=Incomplet
-LatestLinkedEvents=Últims %s esdeveniments vinculats
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Empresa/Organització
 Accountant=Comptador
 ContactsForCompany=Contactes d'aquest tercer
@@ -503,7 +506,7 @@ ContactsAddressesForCompany=Contactes/adreces d'aquest tercer
 AddressesForCompany=Adreces d'aquest tercer
 ActionsOnCompany=Esdeveniments per a aquest tercer
 ActionsOnContact=Esdeveniments per a aquest contacte / adreça
-ActionsOnUser=Events for this user
+ActionsOnUser=Esdeveniments per a aquest usuari
 ActionsOnContract=Esdeveniments per a aquest contracte
 ActionsOnMember=Esdeveniments d'aquest soci
 ActionsOnProduct=Esdeveniments sobre aquest producte
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=Text utilitzat en el cos del missatge
 SendAcknowledgementByMail=Envia el correu electrònic de confirmació
 SendMail=Envia e-mail
 Email=Correu electrònic
+EMail=Correu electrònic
+EMails=Correus electrònics
 NoEMail=Sense correu electrònic
 AlreadyRead=Ja llegides
 NotRead=No llegit
@@ -793,7 +798,7 @@ Notes=Notes
 AddNewLine=Afegeix una línia nova
 AddFile=Afegeix un fitxer
 FreeZone=Producte de text lliure
-FreeLineOfType=Element de text lliure, escriviu:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Clonar l'objecte amb aquests atributs principals
 ReGeneratePDF=Torna a generar el PDF
 PDFMerge=Fussió PDF
@@ -879,12 +884,14 @@ toward=cap a
 Access=Accés
 SelectAction=Selecciona acció
 SelectTargetUser=Selecciona l'usuari/empleat de destí
+ClickToCopyToClipboard=Feu clic per copiar al porta-retalls
 HelpCopyToClipboard=Utilitzeu Ctrl+C per a copiar al porta-retalls
 SaveUploadedFileWithMask=Desa el fitxer al servidor amb el nom "<strong> %s </strong>" (en cas contrari "%s")
 OriginFileName=Nom original de l'arxiu
 SetDemandReason=Indica l'origen
 SetBankAccount=Definir el compte bancari
 AccountCurrency=Moneda del compte
+AccountancyCode=Codi comptable
 ViewPrivateNote=Veure notes
 XMoreLines=%s línia(es)  oculta(es)
 ShowMoreLines=Mostra més/menys línies
@@ -901,7 +908,7 @@ Denied=Denegat
 ListOf=Llista de %s
 ListOfTemplates=Llistat de plantilles
 Gender=Sexe
-Genderman=Home
+Genderman=Mascle
 Genderwoman=Dona
 Genderother=Altres
 ViewList=Vista llistat
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Esteu segur que voleu suprimir els (s) registre (s)
 ConfirmMassClone=Confirma la clonació massiva
 ConfirmMassCloneQuestion=Seleccioneu el projecte per a clonar
 ConfirmMassCloneToOneProject=Clonar al projecte %s
+ObjectClonedSuccessfuly=Objecte clonat correctament
 RelatedObjects=Objectes relacionats
 ClassifyBilled=Marca com a Facturat
 ClassifyUnbilled=Marca com a No facturat
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Cal estar registrat i amb permisos per a visualitzar o d
 Download=Descarrega
 DownloadDocument=Baixar el document
 DownloadSignedDocument=Descarregar document signat
-ActualizeCurrency=Actualitza el canvi de divisa
+ActualizeCurrency=Utilitzeu l'últim tipus conegut de la moneda
 Fiscalyear=Any fiscal
 ModuleBuilder=Generador de mòduls i aplicacions
 SetMultiCurrencyCode=Estableix moneda
+SetMultiCurrencyRate=Estableix el tipus de moneda
 BulkActions=Accions massives
 ClickToShowHelp=Feu clic per a mostrar l'ajuda desplegable
 WebSite=Lloc web
@@ -1104,6 +1113,7 @@ PayedBy=Pagat per
 PayedTo=Pagat a
 Monthly=Mensual
 Quarterly=Trimestral
+Quarter=Quarter
 Annual=Anual
 Local=Local
 Remote=Remot
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Tasca
 ContactDefault_propal=Pressupost
 ContactDefault_supplier_proposal=Proposta de proveïdor
 ContactDefault_ticket=Tiquet
+ContactDefault_societe=Tercer
 ContactAddedAutomatically=Contacte afegit a partir de rols de contacte de tercers
 More=Més
 ShowDetails=Mostrar detalls
@@ -1177,7 +1188,7 @@ PublicVendorName=Nom públic del proveïdor
 DateOfBirth=Data de naixement
 SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=El testimoni de seguretat ha caducat, de manera que l'acció s'ha anul·lat. Torna-ho a provar.
 UpToDate=Actualitzat
-OutOfDate=Obsolet
+OutOfDate=Caducat
 EventReminder=Recordatori d'esdeveniments
 UpdateForAllLines=Actualització per a totes les línies
 OnHold=Fora de servei
@@ -1189,7 +1200,7 @@ CreateExternalUser=Crea un usuari extern
 ConfirmAffectTag=Assignació d'etiquetes massives
 ConfirmAffectUser=Assignació massiva d'usuaris
 ContactRole=Rol de contacte
-ContactRoles=Contact roles
+ContactRoles=Rols de contacte
 ProjectRole=Rol assignat a cada projecte/oportunitat
 TasksRole=Rol assignat a cada tasca (si s'utilitza)
 ConfirmSetSupervisor=Estableix el supervisor massivament
@@ -1231,7 +1242,7 @@ CanceledHidden=Anul·lació oculta
 CanceledShown=Anul·lació visible
 Terminate=Dona de baixa
 Terminated=Baixa
-Position=Càrrec
+Position=Posició
 AddLineOnPosition=Afegeix una línia a la posició (al final si està buida)
 ConfirmAllocateCommercial=Assigna la confirmació del representant de vendes
 ConfirmUnallocateCommercial=Esteu segur que voleu anul·lar l'assignació dels representants de vendes de tots els tercers seleccionats?
@@ -1242,6 +1253,7 @@ CommercialAffected=Agent comercial assignat
 CommercialsDisaffected=Representants de vendes desenllaçats
 CommercialDisaffected=Representant de vendes desenllaçat
 Message=Missatge
+Emailing=Emailing
 Progression=Progrés
 YourMessage=El teu missatge
 YourMessageHasBeenReceived=S'ha rebut el teu missatge. Et respondrem o contactarem al més aviat possible.
@@ -1270,7 +1282,7 @@ InProgress=En progrés
 DateOfPrinting=Data d'impressió
 ClickFullScreenEscapeToLeave=Feu clic aquí per a canviar al mode de pantalla completa. Premeu ESCAPE per a sortir del mode de pantalla completa.
 UserNotYetValid=Encara no vàlid
-UserExpired=No al dia
+UserExpired=Caducat
 LinkANewFile=Enllaça un fitxer/document nou
 LinkedFiles=Arxius i documents enllaçats
 NoLinkFound=No hi ha enllaços registrats
@@ -1285,7 +1297,7 @@ AmountSalary=Import del salari
 InvoiceSubtype=Subtipus de factura
 ConfirmMassReverse=Confirmació inversa massiva
 ConfirmMassReverseQuestion=Esteu segur que voleu revertir els %s registres seleccionats?
-ConfirmActionXxx=Confirm action %s
+ConfirmActionXxx=Confirmeu l'acció %s
 ElementType=Tipus d'element
 ElementId=Id. de l'element
 Encrypted=Encriptat
@@ -1305,4 +1317,35 @@ AllEntities=Totes les entitats
 TranslationOfKey=Traducció de la clau AnyTranslationKey
 SignedStatus=Estat signat
 NbRecordQualified=Nombre de registres qualificats
-auto=auto
+auto=automàtic
+UploadFile=Importació directa del document
+OrClickToSelectAFile=o feu clic per seleccionar un fitxer al disc
+NetTotal=Total net
+VATAmount=Import de l'IVA
+TotalDiscount=Descompte total
+TotalHTBeforeDiscount=Total net abans del descompte
+Contains=Conté
+DoesNotContain=No conté
+Is=És
+IsNot=No és
+StartsWith=Comença amb
+EndsWith=Acaba amb
+IsBefore=És menor
+IsAfter=És major
+IsOnOrBefore=És menor o igual
+IsOnOrAfter=És major o igual
+IsHigherThan=És major a
+IsHigherThanOrEqual=És major o igual
+IsLowerThan=És mejor a
+IsLowerThanOrEqual=És menor o igual
+addToFilter=Afegeix
+FilterAssistance=Editor de filtres
+Operator=Operador
+AllFieldsRequired=Tots els camps són obligatoris.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Des del principi
+Transferred=Transferred
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index eed44307d28..d56dbc8b1a2 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -54,7 +54,7 @@ MemberStatusDraftShort=Esborrany
 MemberStatusActive=Validat (contribució en espera)
 MemberStatusActiveShort=Validat
 MemberStatusActiveLate=La contribució ha caducat
-MemberStatusActiveLateShort=No al dia
+MemberStatusActiveLateShort=Caducat
 MemberStatusPaid=Afiliacions al dia
 MemberStatusPaidShort=Al dia
 MemberStatusExcluded=Soci exclòs
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Si es requereix una subscripció, s'ha de registrar una
 DeleteType=Elimina
 VoteAllowed=Vot autoritzat
 Physical=Individual
-Moral=Entitat
-MorAndPhy=Entitat i Particular
+Moral=Entitat jurídica
+MorAndPhy=Entitat jurídica i particular
 Reenable=Torna a activar
 ExcludeMember=Exclou un soci
 Exclude=Excloure
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Estadístiques de socis per regió
 NbOfMembers=Nombre total de membres
 NbOfActiveMembers=Nombre total de membres actius actuals
 NoValidatedMemberYet=No s'ha trobat cap soci validat
-MembersByCountryDesc=Aquesta pantalla mostra les estadístiques dels membres per països. Els gràfics i els gràfics depenen de la disponibilitat del servei de gràfics en línia de Google, així com de la disponibilitat d’una connexió a Internet que funcioni.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Aquesta pantalla us mostra les estadístiques dels membres per estat / províncies / cantó.
 MembersByTownDesc=Aquesta pantalla us mostra les estadístiques dels membres per ciutat.
 MembersByNature=Aquesta pantalla us mostra estadístiques dels membres per naturalesa.
@@ -208,25 +209,25 @@ NewMemberbyWeb=S'ha afegit un soci nou. Esperant l'aprovació
 NewMemberForm=Formulari de soci nou
 SubscriptionsStatistics=Estadístiques de contribucions
 NbOfSubscriptions=Nombre de contribucions
-AmountOfSubscriptions=Amount collected from membership payments
+AmountOfSubscriptions=Import recaptat de les quotes dels socis
 TurnoverOrBudget=Volum de vendes (empresa) o Pressupost (associació o col.lectiu)
-DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
-MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
-CanEditAmount=Membership amount can be defined by the member
+DefaultAmount=Import per defecte del pagament de la pertinença (només s'utilitza si no es defineix cap import al nivell de tipus de membre)
+MinimumAmount=Import mínim del pagament de la subscripció (té prioritat sobre els imports predeterminats)
+CanEditAmount=L'import de l'abonament pot ser definit pel membre
 CanEditAmountDetail=El visitant pot triar/editar la quantitat de la seva contribució independentment del tipus de soci
 AmountIsLowerToMinimumNotice=L'import és inferior al mínim %s
 MEMBER_NEWFORM_PAYONLINE=Després del registre en línia, canvieu automàticament a la pàgina de pagament en línia
 ByProperties=Per naturalesa
 MembersStatisticsByProperties=Estadístiques dels membres per naturalesa
-VATToUseForSubscriptions=VAT rate to use for membership payment
-NoVatOnSubscription=No VAT for membership payment
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
+VATToUseForSubscriptions=Taxa d'IVA que s'utilitzarà per al pagament de la subscripció
+NoVatOnSubscription=Sense IVA per al pagament de la subscripció
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producte utilitzat per a la línia de subscripció a la factura: %s
 NameOrCompany=Nom o empresa
 SubscriptionRecorded=Contribució registrada
 NoEmailSentToMember=No s'ha enviat un correu electrònic al membre
 EmailSentToMember=Correu electrònic enviat a membre a %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
-SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+SendReminderForExpiredSubscriptionTitle=Envieu un recordatori per correu electrònic per a la subscripció caducada
+SendReminderForExpiredSubscription=Envieu un recordatori per correu electrònic als membres quan la subscripció estigui a punt de caducar (el paràmetre és el nombre de dies abans de la finalització de la subscripció per enviar el recordatori. Pot ser una llista de dies separats per un punt i coma, per exemple '10;5;0;-5 ')
 MembershipPaid=Membres pagats pel període actual (fins a %s)
 YouMayFindYourInvoiceInThisEmail=Podeu trobar la factura adjunta a aquest correu electrònic
 XMembersClosed=%s soci(s) tancat(s)
@@ -237,11 +238,11 @@ 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
-MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
-MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
-NoCorrection=No correction
-MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
-MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
+MemberSubscriptionStartFirstDayOf=Força que la data suggerida d'una afiliació correspongui al primer dia d'a
+MemberSubscriptionStartAfter=Període mínim abans de l'entrada en vigor de la data d'inici d'una primera subscripció de soci (excepte les renovacions)
+NoCorrection=Cap correcció
+MemberSubscriptionStartAfterDesc=Exemple: +3m = +3 mesos, -5d = -5 dies, +1Y = +1 any
+MemberSubscriptionStartAfterDesc2=Aquesta és la data suggerida per crear una primera subscripció de membre en comparació amb la data actual. Per a la renovació, la data suggerida per defecte continuarà sent la finalització de l'anterior membre.
 SubscriptionLinkedToConciliatedTransaction=La pertinença està vinculada a una transacció conciliada, per la qual cosa no es permet aquesta modificació.
 ConfirmMassSubsriptionCreation=Confirmeu la creació de la subscripció
 ConfirmMassSubsriptionCreationQuestion=Esteu segur que voleu crear les %s subscripcions seleccionades?
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index f6b789cb898..9cceac2462e 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -97,7 +97,6 @@ ShowService=Mostrar servei
 ProductsAndServicesArea=Àrea productes i serveis
 ProductsArea=Àrea Productes
 ServicesArea=Àrea Serveis
-ListOfStockMovements=Llista de moviments d’estoc
 BuyingPrice=Preu de compra
 PriceForEachProduct=Productes amb preus específics
 SupplierCard=Fitxa de proveïdor
@@ -145,7 +144,7 @@ WithoutDiscount=Sense descompte
 VATRateForSupplierProduct=Taxa impositiva (per a aquest venedor/producte)
 DiscountQtyMin=Descompte per aquesta quantitat.
 NoPriceDefinedForThisSupplier=Sense preu ni quantitat definida per aquest proveïdor / producte
-NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
+NoProductPriceDefinedForThisSupplier=No s'ha definit el preu/quantitat del producte per a aquest venedor
 NoSupplierPriceDefinedForThisProduct=No hi ha cap preu / quantitat de proveïdor definit per a aquest producte
 PredefinedItem=Element predefinit
 PredefinedProducts=Producte predefinit
@@ -172,7 +171,7 @@ BuyingPrices=Preus de compra
 CustomerPrices=Preus de client
 SuppliersPrices=Preus del proveïdor
 SuppliersPricesOfProductsOrServices=Preus del proveïdor (de productes o serveis)
-CustomCode=Duanes | Productes bàsics | Codi HS
+CustomCode=Duanes|Mercaderies|HS|Codi TARIC
 CountryOrigin=País d'origen
 RegionStateOrigin=Regió d'origen
 StateOrigin=Estat | Província d'origen
@@ -210,6 +209,7 @@ unitL=Litre
 unitT=tona
 unitKG=kg
 unitG=Gram
+unitGAL=galó
 unitMG=mg
 unitLB=lliura
 unitOZ=unça
@@ -312,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=El format per a la sol·licitud és {"URL": "ht
 UpdateInterval=Interval d'actualització (minuts)
 LastUpdated=Última actualització
 CorrectlyUpdated=Actualitzat correctament
-PropalMergePdfProductActualFile=Els fitxers que s’utilitzen per a afegir-se al PDF Azur són
+PropalMergePdfProductActualFile=Fitxer PDF per incloure a les propostes PDF si el producte forma part de la proposta...
 PropalMergePdfProductChooseFile=Selecciona fitxers PDF
 IncludingProductWithTag=Incloent productes/serveis amb l'etiqueta
 DefaultPriceRealPriceMayDependOnCustomer=Preu predeterminat, el preu real pot dependre del client
@@ -349,6 +349,10 @@ QtyRecalculatedWithPackaging=La quantitat de la línia es recalcula segons els e
 
 #Attributes
 Attributes=Atributs
+ProductAttributeExtrafields=Atributs de variants extracamps
+ProductAttributeExtrafieldsSetup=Configuració dels camps extra d'atributs Variant
+ProductAttributeValueExtrafields=Valors d'atributs de variants extracamps
+ProductAttributeValueExtrafieldsSetup=Configuració de camps extra de valors d'atributs Variant
 VariantAttributes=Atributs de variants
 ProductAttributes=Atributs de variants per a productes
 ProductAttributeName=Atribut %s
@@ -396,6 +400,8 @@ ErrorDestinationProductNotFound=No s'ha trobat el producte de destí
 ErrorProductCombinationNotFound=Variant de producte no trobada
 ActionAvailableOnVariantProductOnly=Acció només disponible sobre la variant del producte
 ProductsPricePerCustomer=Preus dels productes per clients
+ProductLevelExtraFields=Atributs addicionals (preu de nivell)
+ProductCustomerExtraFields=Atributs addicionals (preu del client)
 ProductSupplierExtraFields=Atributs addicionals (preus de proveïdors)
 DeleteLinkedProduct=Suprimeix el producte fill enllaçat a la combinació
 AmountUsedToUpdateWAP=Import unitari a utilitzar per a actualitzar el Preu Mitjà Ponderat
@@ -404,8 +410,8 @@ PMPValueShort=PMP
 mandatoryperiod=Períodes obligatoris
 mandatoryPeriodNeedTobeSet=Nota: Cal definir el període (data d'inici i final).
 mandatoryPeriodNeedTobeSetMsgValidate=Un servei requereix un període d'inici i de finalització
-mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
-mandatoryHelper2=Note that the message is a warning and not a blocking error.
+mandatoryHelper=Marqueu-ho si voleu un missatge a l'usuari en crear/validar una factura, proposta comercial, comanda de venda sense introduir data d'inici i finalització a les línies d'aquest servei.
+mandatoryHelper2=Tingueu en compte que el missatge és un avís i no un error de bloqueig.
 DefaultBOM=LDM per defecte
 DefaultBOMDesc=La Llista de Materials predeterminada recomanada per a fabricar aquest producte. Aquest camp només es pot establir si la naturalesa del producte és «%s».
 Rank=Classificació
@@ -437,3 +443,6 @@ AllowStockMovementVariantParentHelp=De manera predeterminada, un pare d'una vari
 ConfirmSetToDraftInventory=Esteu segur que voleu tornar a l'estat d'esborrany?<br>Les quantitats establertes actualment a l'inventari es restabliran.
 WarningLineProductNotToSell=El producte o servei "%s" no es pot vendre i s'ha clonat
 PriceLabel=Etiqueta de preu
+GenerateImage=Generar imatge
+GenerateWithAI=Genera amb IA
+PriceByCustomeAndMultiPricesAbility=Preus diferents per a cada client + Diversos segments de preu per producte/servei (cada client es troba en un segment de preu)
diff --git a/htdocs/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang
index 30ac32ec228..ce7d40e3732 100644
--- a/htdocs/langs/ca_ES/salaries.lang
+++ b/htdocs/langs/ca_ES/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Salari nou
 AddSalary=Afegeix el sou
 NewSalaryPayment=Fitxa de salari nova
 AddSalaryPayment=Afegeix pagament de sou
+SalaryID=ID salarial
+SalaryAmount=Import del salari
 SalaryPayment=Pagament de sous
 SalariesPayments=Pagaments de sous
 SalariesPaymentsOf=Pagaments de sous de %s
@@ -27,7 +29,7 @@ FillFieldFirst=Empleneu primer el camp dels empleats
 UpdateAmountWithLastSalary=Establiu l'import de l'últim sou
 MakeTransferRequest=Fes una sol·licitud de transferència
 VirementOrder=Sol·licitud de transferència de crèdit
-BankTransferAmount=Import de la transferència de crèdit
 WithdrawalReceipt=Ordre de transferència bancària
 OrderWaiting=Comanda pendent
 FillEndOfMonth=Ompliu amb final de mes
+UserPaySlip=Full de pagament
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index d17db531ecd..6c11449aed0 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Utilitzeu aquí la llista d'altres noms/àlies, per la qual
 WEBSITE_CSS_URL=URL del fitxer CSS extern
 WEBSITE_CSS_INLINE=Fitxer de contingut CSS (comú a totes les pàgines)
 WEBSITE_JS_INLINE=Contingut del fitxer JavaScript (comú a totes les pàgines)
-WEBSITE_HTML_HEADER=Afegit a la part inferior de l'encapçalament HTML (comú a totes les pàgines)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Fitxer per robots (robots.txt)
 WEBSITE_HTACCESS=Fitxer .htaccess del lloc web
 WEBSITE_MANIFEST_JSON=Arxiu del lloc web manifest.json
@@ -46,26 +46,27 @@ RealURL=URL real
 ViewWebsiteInProduction=Visualitza el lloc web utilitzant els URL d'inici
 Virtualhost=Host virtual o nom de domini
 VirtualhostDesc=El nom de l'amfitrió o domini virtual (per exemple: www.mywebsite.com, mybigcompany.net, ...)
-ToDeployYourWebsiteOnLiveYouHave3Solutions=To deploy this website live, you have 3 solutions...
+ToDeployYourWebsiteOnLiveYouHave3Solutions=Per implementar aquest lloc web en producció, teniu 3 solucions...
 SetHereVirtualHost=<u>Utilitzeu-lo amb Apache/NGinx/...</u><br>Creeu al vostre servidor web (Apache, Nginx, ...) un host virtual dedicat amb PHP habilitat i un directori arrel a<br><strong>%s</strong>
 ExampleToUseInApacheVirtualHostConfig=Exemple per a utilitzar a la configuració de l'amfitrió virtual d'Apache:
-YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server by running
-YouCanAlsoDeployToAnotherWHP=<u>Run your web site inside a Dolibarr web Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a>
+YouCanAlsoTestWithPHPS=<u>S'utilitza amb un servidor PHP incrustat</u><br>A l'entorn de desenvolupament, podeu prefereix provar el lloc amb el servidor web incrustat PHP executant-lo
+YouCanAlsoDeployToAnotherWHP=<u>Executeu el vostre lloc web dins d'un proveïdor d'allotjament web Dolibarr</u><br>If no teniu disponible un servidor web com Apache o NGinx Internet, podeu exportar i importar el vostre lloc web a una altra instància de Dolibarr proporcionada per un altre proveïdor d'allotjament de Dolibarr que proporcioni una integració completa amb el mòdul del lloc web. Podeu trobar una llista d'alguns proveïdors d'allotjament de Dolibarr a <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Comproveu també que l'usuari del VIRTUAL HOST (per exemple www-data) té permisos <strong>%s</strong> sobre els fitxers a <br><strong>%s</strong>
 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 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».
+PreviewSiteServedByDolibarr=<u>Previsualitza %s en una pestanya nova.</u><br><br>El %s serà servit pel servidor Dolibarr, de manera que no necessita cap servidor web addicional (com Apache, Nginx, IIS) instal·lat.<br>L'inconvenient és que els URL de les pàgines no són fàcils d'utilitzar i comencen amb el camí del vostre Dolibarr.<br>URL ofert per Dolibarr:<br> <strong>%s</strong><br><br>span>1 Per implementar o provar amb el vostre propi servidor web extern (com ara Apache, Nginx, Lighttp) utilitzeu l'enllaç "%s".
 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
 SyntaxHelp=Ajuda sobre consells de sintaxi específica
 YouCanEditHtmlSourceckeditor=Podeu editar el codi font HTML usant el botó "Codi font" a l'editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Per incloure un  <strong>imatge</strong> emmagatzemat al director de <strong>documentsb9z0f65fc0<strong></span> , utilitzeu l'embolcall <strong>viewimage.php</strong>.<br>, per exemple, una imatge a documents/mitjans (directori obert per a accés públic), la sintaxi és:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"b0018c7d31ecz0 </strong><br>
-YouCanEditHtmlSource2=Per a una imatge compartida amb un enllaç compartit (accés obert utilitzant la clau hash de compartició del fitxer), la sintaxi és:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource3=Per obtenir l'URL de la imatge d'un objecte PHP, utilitzeu<br><strong>&lt;&lt; span>img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Podeu incloure codi PHP en aquesta font utilitzant les etiquetes <strong>&lt;?php ?&gt;b70f65fc09 /span>. Les variables globals següents estan disponibles: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<span class='notranslate'><br><br><span class="fa fa-bug paddingright"></span> També podeu incloure contingut d'una altra pàgina/contenidor amb la sintaxi següent:<br> span><span class='notranslate'><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br>b0342fc9bz0<span> /span><span class='notranslate'><span class="fa fa-bug paddingright"></span> Podeu fer una redirecció a una altra pàgina/contenidor amb la sintaxi següent (Nota: no envieu cap contingut abans d'una redirecció) :<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>També podeu fer una redirecció amb els paràmetres GET: <br><strong>&lt;?php redirectToContainer('alias_to', 'redirect,_0_to', 'redirectTo' 0, $array_of_get_params); ?&gt;</strong><br>b0342fc9bz0<span> /span><span class='notranslate'><span class="fa fa-link paddingright"></span> Per afegir un enllaç a una altra pàgina, utilitzeu la sintaxi:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink<0 class='notranslate'>&lt;</span>a&gt;</strong>b0319bzcc</strong>b0319bzcc ><br><p><span class="fa fa-bug paddingright">b014d7f165b Podeu configurar dinàmicament el títol de la pàgina i <span class='notranslate'><strong>Metaetiquetes de SEO</strong> (títol, paraules clau, descripció). Simplement definiu les variables següents:<br> <code>$__PAGE__TITLE__ = "Valor del títol...";b1z08a8b77 <br> <code>$__PAGE__KEYWORDS__ = "paraula clau1, paraula clau2, paraula clau3..."; // Separat per comes</code><br> <code>$___PAGE =Descripció ;</code></p><br>b0d9a138z0<br>b0d9a138 <span class='notranslate'></span> Per incloure un <strong>enllaç per baixar</strong> un fitxer emmagatzemat al  class='notranslate'><strong>documents</strong>, utilitzeu el directori <strong>document.php</strong> wrapper:<br>Exemple, per a un fitxer en documents/ecm (cal registrar-se), la sintaxi és:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Per a un fitxer en documents o mitjans (directori obert per a l'accés públic), la sintaxi és: <br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Per a un fitxer compartit amb un enllaç compartit (accés obert mitjançant la clau hash per compartir del fitxer), la sintaxi és:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt; </strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Per incloure un <strong>imatge</strong> emmagatzemat als <strong>mitjans de comunicació<span directori class='notranslate'></strong></span> (directori obert per a l'accés públic), utilitzeu el camí relatiu que comença per <strong>/mediasb0a65dc071f , exemple:<br><strong>&lt;img src="/medias/image/myimagepath/filename ext"&gt;</strong><br>
+YouCanEditHtmlSource2=Per a una imatge compartida amb un enllaç per compartir (accés obert mitjançant la clau hash per compartir del fitxer), utilitzeu l'embolcall:<br><strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong>b0319bzcc
+YouCanEditHtmlSource3=Per a obtenir l'URL de la imatge d'un objecte PHP, utilitzeu<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=Per obtenir l'URL d'una imatge dins del contingut html d'un article, utilitzeu<br><strong> &lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"b0012c7z0</be08c7zc><span> span class='notranslate'></strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Clona la pàgina/contenidor
 CloneSite=Clona el lloc
@@ -87,15 +88,15 @@ WebsiteAccount=Compte del lloc web
 WebsiteAccounts=Comptes de lloc web
 AddWebsiteAccount=Crear un compte de lloc web
 BackToListForThirdParty=Torna a la llista de tercers
-DisableSiteFirst=Deshabilita primer el lloc web
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Títol del meu lloc web
 AnotherContainer=Així s’inclou contingut d’una altra pàgina / contenidor (pot ser que tingueu un error aquí si activeu el codi dinàmic perquè pot no existir el subconjunt incrustat)
 SorryWebsiteIsCurrentlyOffLine=Ho sentim, actualment aquest lloc web està fora de línia. Per favor com a més endavant ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Activa la taula del compte del lloc web
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activeu la taula per a emmagatzemar comptes de lloc web (nom d'usuari / contrasenya) per a cada lloc web / tercer
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Primer heu de definir la pàgina d'inici predeterminada
-OnlyEditionOfSourceForGrabbedContentFuture=Avís: la creació d'una pàgina web mitjançant la importació d'una pàgina web externa està reservada per a usuaris experimentats. Depenent de la complexitat de la pàgina d'origen, el resultat de la importació pot ser diferent de l'original. A més, si la pàgina d'origen utilitza estils CSS comuns o JavaScript conflictiu, pot trencar l'aspecte o les funcions de l'editor del lloc web quan es treballa en aquesta pàgina. Aquest mètode és una manera més ràpida de crear una pàgina, però es recomana crear la vostra pàgina nova des de zero o des d'una plantilla de pàgina suggerida.<br>Tingueu en compte també que l'editor en línia pot no funcionar correcta quan s'utilitza en una pàgina externa agafada.
-OnlyEditionOfSourceForGrabbedContent=Només l'edició de codi HTML és possible quan el contingut s'ha capturat d'un lloc extern
+OnlyEditionOfSourceForGrabbedContentFuture=Avís: la creació d'una pàgina web mitjançant la importació d'una pàgina web externa està reservada per a usuaris experimentats. Depenent de la complexitat de la pàgina d'origen, el resultat de la importació pot ser diferent de l'original. A més, si la pàgina d'origen utilitza estils CSS comuns o JavaScript conflictiu, pot trencar l'aspecte o les funcions de l'editor del lloc web quan es treballa en aquesta pàgina. Aquest mètode és una manera més ràpida de crear una pàgina, però es recomana crear la vostra pàgina nova des de zero o des d'una plantilla de pàgina suggerida.<br>Tingueu en compte també que l'editor en línia pot no funcionar correctament quan s'utilitza en una pàgina externa agafada.
+OnlyEditionOfSourceForGrabbedContent=Només és possible la modificació de la font HTML quan el contingut s'agafa d'un lloc extern
 GrabImagesInto=Agafa també imatges trobades dins del css i a la pàgina.
 ImagesShouldBeSavedInto=Les imatges s'han de desar al directori
 WebsiteRootOfImages=Directori arrel d'imatges del lloc web
@@ -126,7 +127,7 @@ Dynamiccontent=Exemple d’una pàgina amb contingut dinàmic
 EditInLineOnOff=El mode &quot;Edita en línia&quot; és %s
 ShowSubContainersOnOff=El mode d'execució del «contingut dinàmic» és %s
 GlobalCSSorJS=Fitxer CSS / JS / Capçalera global del lloc web
-BackToHomePage=Torna a la pàgina principal...
+BackToHomePage=Torna a la pàgina d'inici...
 TranslationLinks=Enllaços de traducció
 YouTryToAccessToAFileThatIsNotAWebsitePage=Intenteu accedir a una pàgina que no està disponible. <br> (ref = %s, type = %s, status = %s)
 UseTextBetween5And70Chars=Per a bones pràctiques de SEO, utilitzeu un text d'entre 5 i 70 caràcters
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Tanqueu la sessió del vostre compte de client
 filteredByVersion=Filtrat per versió
 removeFilter=Eliminar filtre
 viewMyCart=Veure el meu carretó de la compra
+Shipping=Shipping
 freeShipping=Enviament gratuït!
 noProducts=No hi ha productes
 nbrItemsInCart=Hi ha <span class="ajax_cart_quantity">0</span> articles al vostre carretó.
@@ -271,8 +273,8 @@ totalTaxIncl=Total (IVA inclòs)
 clickToClose=Feu clic per tancar
 sidebarCategories=categories
 noSubCat=NoSubCat
-specialPromo=Promotions
-allSpecials=All promotions
+specialPromo=Promocions
+allSpecials=Totes les promocions
 newProducts=Nous productes
 allNewProducts= Tots els productes nous
 view=Visualització:
@@ -284,14 +286,15 @@ productNameAToZ=Nom del producte: de la A a la Z
 productNameZToA=Nom del producte: Z a A
 referenceLowestFirst=Referència: el més baix primer
 referenceHighestFirst=Referència: el més alt primer
+productPerPage=products per page
 perPage=per pàgina
 showAll=Mostrar tots
 showing= Mostrant
 nbrOfProducts= Hi ha productes %s.
 noResultsHaveBeenFound=S'han trobat 0 resultats.
-noResultsWereFound= No s'han trobat resultats.
+noResultsWereFound=No s'han trobat resultats.
 addToCart=Afegeix a la cistella
-backHome=Torna a casa
+backHome=Torna a Inici
 priceDrop=Baixada de preu
 condition=Condició
 otherViews=Altres vistes
@@ -302,10 +305,11 @@ lastUpdate=Darrera actualització
 contactSupport=Com contactar amb l'assistència
 noProductToDisplay=Error, no hi ha producte per mostrar
 yourCompanyInformation=Informació de la teva empresa
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=Aquest correu electrònic ja està registrat.
 firstnameContainsLettersOnly=<b>El nom</b> només ha de contenir lletres i espais
 lastnameContainsLettersOnly=<b>El cognom</b> només ha de contenir lletres i espais
-passwordCriteria=<b>La contrasenya</b> ha de complir els criteris següents:<br>- 12 caràcters<br>- 1 lletra majúscula<br>- 1 dígit<br>- Sense caràcters especials <br>- Eviteu repetir caràcters més de 3 vegades<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=S'ha produït un error.
 accountCreation=Crea un compte
 errorsOccurred=Hi ha %s error%s
@@ -357,3 +361,7 @@ subtract=Sostreure
 LoginCheckout=Inicieu sessió i procediu a la compra
 paymentSuccessProcessed=El vostre pagament s'ha processat correctament.
 youWillBeRedirectedToOrderPage=En breu se us redirigirà a la pàgina de detalls de la comanda.
+WebPortalSetupNotComplete=La configuració del portal web no s'ha completat
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 42ceab0c085..7396395e009 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Kontrola integrity souborů prošla, byly př
 FileIntegritySomeFilesWereRemovedOrModified=Kontrola integrity souborů se nezdařila. Některé soubory byly upraveny, odstraněny nebo přidány.
 GlobalChecksum=Celkový kontrolní součet
 MakeIntegrityAnalysisFrom=Proveďte analýzu integrity aplikačních souborů z
-LocalSignature=Vložený místní podpis (méně spolehlivé)
-RemoteSignature=Remote vzdálený podpis (spolehlivější)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Chybějící soubory
 FilesUpdated=Aktualizované soubory
 FilesModified=Upravené soubory
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Používaný některými volby programu jednání pouze
 Security=Zabezpečení
 Passwords=Hesla
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Šifrování hesla databáze uloženého v conf.php. Důrazně doporučujeme tuto možnost aktivovat.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=Pro uložení zašifrovaného hesla do <b>conf.php</b>, nahraďte řádku <br> <b>$dolibarr_main_db_pass="..."</b> <br> hodnotou <br> <b>$dolibarr_main_db_pass="crypted:%s"</b>
 InstrucToClearPass=Pro uložení nezašifrovaného (čistého)  hesla do <b>conf.php</b>, nahraďte řádku <br> <b>$dolibarr_main_db_pass="crypted:..."</b> <br> hodnotou <br> <b>$dolibarr_main_db_pass="%s"</b>
 ProtectAndEncryptPdfFiles=Přidat ochranu generovaných souborů PDF.  Nedoporučuje se, zablokuje hromadné generování PDF
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Vypočtené pole
-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=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'
 Computedpersistent=Uložte vypočítané pole
 ComputedpersistentDesc=Vypočítaná další pole pole budou uložena do databáze, hodnota však bude přepočítána pouze při změně objektu tohoto pole. Pokud vypočítané pole závisí na jiných objektech nebo globálních datech, může být tato hodnota špatná !!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored WITHOUT encryption (field is just hidden with stars on screen).<br><br>Enter value 'dolcrypt' to encode value with a reversible encryption algorithm. Clear data can still be known and edited but is encrypted into database.<br><br>Enter 'auto' (or 'md5', 'sha256', 'password_hash', ...) to use the default password encryption algorithm (or md5, sha256, password_hash...) to save the non reversible hashed password into database (no way to retrieve original value)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
 WarningPHPMailD=It is therefore recommended to change the sending method of e-mails to the value "SMTP".
 WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
-WarningPHPMail2=Pokud je váš poskytovatel e-mailových služeb SMTP povinen omezit e-mailový klient na některé adresy IP (velmi vzácné), jedná se o adresu IP agentu uživatele pošty (MUA) pro aplikaci ERP CRM: <strong> %s </strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Účetnictví (zjednodušené)
 Module10Desc=Jednoduché účetní výkazy (časopisy, obrat) založené na obsahu databáze. Nepoužívá žádný tabulkový záznam.
 Module20Name=Návrhy
 Module20Desc=Komerční návrh řízení
-Module22Name=Hromadné e-mailové zprávy
-Module22Desc=Spravujte hromadné zasílání e-mailů
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energie
 Module23Desc=Sledování spotřeby energií
 Module25Name=Prodejní objednávky
@@ -847,10 +848,10 @@ Permission212=Objednací
 Permission213=Aktivace linku
 Permission214=Nastavení telefonie
 Permission215=Nastavení poskytovatele
-Permission221=Přečtěte si e-mail
-Permission222=Vytvářejte/upravujte e-maily (téma, příjemci ...)
-Permission223=Ověření e-mailů (umožňuje odesílání)
-Permission229=Odstraňte e-maily
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Zobrazit příjemce a informace
 Permission238=Ručně posílat e-maily
 Permission239=Odstranit e-maily po ověření nebo odeslány
@@ -1105,6 +1106,7 @@ DictionaryStaff=Počet zaměstnanců
 DictionaryAvailability=Zpoždění dodávky
 DictionaryOrderMethods=Order methods
 DictionarySource=Původ nabídky/objednávky
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Personalizované skupiny pro přehledy
 DictionaryAccountancysystem=Modely pro účetní osnovy
 DictionaryAccountancyJournal=účetní deníky
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Zpět na seznam slovníků
 TypeOfRevenueStamp=Typ daňové známky
 VATManagement=Řízení daní z prodeje
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Ve výchozím nastavení je navrhovaná daň z prodeje 0, která může být použita pro případy, jako jsou sdružení, fyzické osoby nebo malé společnosti.
 VATIsUsedExampleFR=Ve Francii to znamená, že společnosti nebo organizace mají skutečný fiskální systém (zjednodušený reálný nebo normální reálný). Systém, v němž je uvedena DPH.
 VATIsNotUsedExampleFR=Ve Francii se jedná o sdružení, která jsou prohlášena za nepodléhající daň z prodeje, nebo společnosti, organizace nebo svobodné profese, které si vybraly daňový systém pro mikropodniky (daně z prodeje ve franchise) a zaplatili daň z prodeje bez daně z prodeje bez prohlášení o daních z prodeje. Tato volba zobrazí na fakturách odkaz "Neuplatňuje se daň z prodeje - art-293B CGI".
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Druh daně z obratu
 LTRate=Rychlost
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Podle nastavení daní (viz %s - %s - %s), vaše země
 LabelUsedByDefault=Štítek používaný ve výchozím nastavení, pokud nelze najít žádný překlad pro kód
 LabelOnDocuments=Štítek na dokumenty
 LabelOrTranslationKey=Popisek nebo překladový klíč
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=Display Customer/Vendor VAT number into combo lists.
 AddAdressInList=Display Customer/Vendor address into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Požádejte o preferovanou způsob přepravy pro subjekty.
-FieldEdition=Editace položky %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Příklad: +2 (vyplňte pouze v případě, že se vyskytly problémy s posunem časových pásem)
 GetBarCode=Získat čárový kód
 NumberingModules=Modely číslování
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Vynutit datum fakturace k datu ověření
 SuggestedPaymentModesIfNotDefinedInInvoice=Doporučený režim platby na faktuře ve výchozím nastavení, pokud není na faktuře definován
 SuggestPaymentByRIBOnAccount=Navrhněte platbu výběrem na účet
 SuggestPaymentByChequeToAddress=Navrhněte platbu šekem na
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Volný text na fakturách
 WatermarkOnDraftInvoices=Vodoznak na návrh faktur (není-li prázdný)
 PaymentsNumberingModule=Model číslování plateb
@@ -1718,6 +1723,7 @@ CompressionOfResources=Komprese odpovědí HTTP
 CompressionOfResourcesDesc=Například pomocí Apache direktiva "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Taková automatická detekce není možné u současných prohlížečů
 DefaultValuesDesc=Zde můžete definovat výchozí hodnotu, kterou chcete použít při vytváření nového záznamu a / nebo výchozí filtry nebo pořadí řazení při zadávání záznamů.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Výchozí hodnoty (pro použití na formulářích)
 DefaultSearchFilters=Výchozí vyhledávací filtry
 DefaultSortOrder=Výchozí řazení objednávek
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Moduly číslování pošty
 SendingsAbility=Podpora zásilka listy pro dodávky zákazníkům
 NoNeedForDeliveryReceipts=Ve většině případů se přepravní listy používají jak jako listy pro dodávky od zákazníků (seznam výrobků, které mají být odesílány), tak i listy, které obdrží a podepisuje zákazník. Příjem zásilek produktů je duplicitní funkcí a je zřídka aktivován.
 FreeLegalTextOnShippings=Volný text o přepravě
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produkty dodávky příjem číslování modul
 DeliveryOrderModel=Produkty dodávky přijetí modelu
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Volný text na potvrzení o doručení
 ##### FCKeditor #####
 AdvancedEditor=Rozšířené editor
 ActivateFCKeditor=Aktivujte pokročilý editor pro:
-FCKeditorForNotePublic=WYSIWYG creation/edition of the field "public notes" of elements
-FCKeditorForNotePrivate=WYSIWYG creation/edition of the field "private notes" of elements
-FCKeditorForCompany=WYSIWYG creation/edition of the field description of elements (except products/services)
-FCKeditorForProductDetails=WYSIWYG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, 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.
-FCKeditorForMailing= WYSIWYG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWYG creation/edition of user signature
-FCKeditorForMail=WYSIWYG creation/edition for all mail (except Tools->eMailing)
-FCKeditorForTicket=WYSIWYG creation/edition for tickets
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Konfigurace modulu Sklady
 IfYouUsePointOfSaleCheckModule=Používáte-li standardně dodávaný modul POS (POS) nebo externí modul, může toto nastavení vaše POS modul ignorovat. Většina POS modulů je standardně navržena tak, aby okamžitě vytvořila fakturu a snížila zásobu bez ohledu na možnosti zde. Pokud tedy při registraci prodeje z vašeho POS potřebujete nebo nemáte pokles akcií, zkontrolujte také nastavení POS modulu.
@@ -1867,7 +1874,6 @@ Buy=Koupit
 Sell=Prodávat
 InvoiceDateUsed=Faktura použita data
 YourCompanyDoesNotUseVAT=Vaše společnost byla definována tak, aby nepoužívala DPH (Domovská stránka - Nastavení - Společnost / Organizace), takže neexistují žádné možnosti nastavení DPH.
-AccountancyCode=Účetní kód
 AccountancyCodeSell=Prodej účtu. kód
 AccountancyCodeBuy=Nákup účet. kód
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Which view do you want to open by default when selecting m
 AGENDA_EVENT_PAST_COLOR = Past event color
 AGENDA_EVENT_CURRENT_COLOR = Current event color
 AGENDA_EVENT_FUTURE_COLOR = Future event color
-AGENDA_REMINDER_BROWSER = Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Povolit zvukové upozornění
-AGENDA_REMINDER_EMAIL = Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT = Zobrazit propojený objekt do zobrazení agendy
 AGENDA_USE_EVENT_TYPE = Používejte typy událostí (spravované v menu Nastavení -> Slovníky -> Typ událostí agendy)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Automaticky nastavte tuto výchozí hodnotu pro typ události ve formuláři pro tvorbu událostí
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Klíč pro autorizaci exportního odkazu
 PastDelayVCalExport=Neexportovat události starší než
 SecurityKey = Security Key
@@ -2006,7 +2017,7 @@ BackupZipWizard=Průvodce vytvořením adresáře archivů dokumentů
 SomethingMakeInstallFromWebNotPossible=Instalace externího modulu není možné z webového rozhraní z tohoto důvodu:
 SomethingMakeInstallFromWebNotPossible2=Z tohoto důvodu je zde popsaný proces upgradu ruční proces, který může provádět pouze privilegovaný uživatel.
 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.
-InstallModuleFromWebHasBeenDisabledByFile=Instalace externího modulu z aplikace byla deaktivována správcem. Musíte požádat jej, aby odstranil soubor <strong> %s </strong>, aby tuto funkci povolil.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Instalace nebo sestavení externího modulu z aplikace vyžaduje uložení souborů modulu do adresáře <strong> %s </strong>. Chcete-li, aby tento adresář zpracoval Dolibarr, musíte nastavit <strong> conf / conf.php </strong> a přidat 2 směrné řádky: <br> <strong> $ dolibarr_main_url_root'alt '/'; </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s / custom'; </strong>
 HighlightLinesOnMouseHover=Zvýrazněte řádky tabulky, když pohyb myší projde
 HighlightLinesColor=Zvýrazněte barvu čáry, když myš přejde (použijte "ffffff"aby nebylo zvýrazněno)
@@ -2036,6 +2047,7 @@ Enter0or1=Zadejte 0 nebo 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Zde zadejte mezi zarážkami, seznam čísel bytu, který představuje symbol měny. Například: pro $, zadejte [36] - pro Brazílii skutečné R $ [82,36] - za €, zadejte [8364]
 ColorFormat=RGB barva je ve formátu HEX, např. FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Icon name in format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
 PositionIntoComboList=Umístění řádku do seznamů combo
 SellTaxRate=Sales tax rate
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
 MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipient address frame
 MAIN_PDF_HIDE_CUSTOMER_CODE=Hide customer code
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Hide sender/company name in address block
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Hide payments conditions
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Hide payment mode
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=Not recommended
 ARestrictedPath=Some restricted path for data files
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Show shipping address
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
 DarkThemeMode=Dark theme mode
@@ -2450,7 +2471,7 @@ 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)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Not created by default. Created on module activation only.
 CSSPage=CSS Style
 Defaultfortype=Standardní
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang
index e5deec3e770..e9236b864d3 100644
--- a/htdocs/langs/cs_CZ/banks.lang
+++ b/htdocs/langs/cs_CZ/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Konečný zůstatek
 CurrentBalance=Běžný zůstatek
 FutureBalance=Budoucí zůstatek
 ShowAllTimeBalance=Zobrazit zůstatky od začátku
-AllTime=Od začátku
 Reconciliation=Vyrovnání
 RIB=Číslo bankovního účtu
 IBAN=IBAN
@@ -133,7 +132,7 @@ DeleteTransaction=Smazat záznam
 ConfirmDeleteTransaction=Opravdu chcete tuto položku smazat?
 ThisWillAlsoDeleteBankRecord=Toto odstraní vznikající bankovní transakce
 BankMovements=Pohyby
-PlannedTransactions=Plánované záznamy
+PlannedTransactions=Upcoming entries
 Graph=Grafy
 ExportDataset_banque_1=Bankovní záznamy a výpis z účtu
 ExportDataset_banque_2=Vkladní lístek
@@ -151,7 +150,7 @@ FutureTransaction=Budoucí transakce. Nedá se sladit.
 SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 SelectPaymentTransactionAndGenerate=Select/filter the documents which are to be included in the %s deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value
-InputReceiptNumberBis=RRRRMM nebo RRRRMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=To reconcile?
 ThenCheckLinesAndConciliate=Poté zkontrolujte řádky, které jsou ve výpisu z účtu a klikněte na tlačítko
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Pokud je tato funkce povolena, můžete vybrat konkrét
 BankColorizeMovementName1=Barva pozadí pro debetní pohyb
 BankColorizeMovementName2=Barva pozadí pro pohyb úvěru
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
-NoBankAccountDefined=No bank account defined
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
 AlreadyOneBankAccount=Already one bank account defined
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA file variant
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index 01a56d1fb8f..88ef02ec9ea 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -65,6 +65,7 @@ State=Stát/Okres
 StateId=State ID
 StateCode=Kód státu / provincie
 StateShort=Stát
+DepartmentBuyer=Buyer's state/province
 Region=Kraj
 Region-State=Region - stát
 Country=Země
@@ -78,7 +79,7 @@ Chat=Chat
 PhonePro=Bus. phone
 PhonePerso=Telefon osobní
 PhoneMobile=Mobil
-No_Email=Odmítnout hromadné e-maily
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=PSČ
 Town=Město
@@ -382,12 +383,12 @@ ExportCardToFormat=Exportovat kartu do formátu
 ContactNotLinkedToCompany=Kontakt není spojen s žádným subjektem
 DolibarrLogin=Přihlášení do Dolibarru
 NoDolibarrAccess=Žádný přístup k Dolibarr
-ExportDataset_company_1=Subjekty (společnosti / nadace / fyzické osoby) a jejich vlastnosti
-ExportDataset_company_2=Kontakty a jejich vlastnosti
-ExportDataset_company_3=Bankovní účty subjektů
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Dodatečné kontakty / adresy a atributy subjektů
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Subjekty a jejich vlastnosti
 ImportDataset_company_2=Dodatečné kontakty / adresy a atributy subjektů
-ImportDataset_company_3=Bankovní účty subjektů
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Obchodní zástupci subjektů (přiřazení obchodních zástupců / uživatelů společnostem)
 PriceLevel=Cenová hladina
 PriceLevelLabels=Štítek cenové hladiny
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Jméno vedoucího (CEO, ředitel, předseda ...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Sloučit subjekty
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Subjekty byly sloučeny
 SaleRepresentativeLogin=Přihlášení obchodního zástupce
 SaleRepresentativeFirstname=Jméno obchodního zástupce
@@ -461,3 +462,6 @@ ExternalSystemID=External system ID
 IDOfPaymentInAnExternalSystem=ID of the payment mode into an external system (like Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE Webservice Credentials
 ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index d50bb1f824b..2552ccf9b6b 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Nepodařilo se vytvořit adresář. Zkontrolujte, zda má uživatel webového serveru oprávnění zapisovat do adresáře dokumentů Dolibarr. Pokud je v tomto PHP aktivován parametr <b> safe_mode</b>, zkontrolujte, zda jsou soubory Dolibarr php vlastní uživateli (nebo skupinou) webového serveru.
 ErrorNoMailDefinedForThisUser=Pro tohoto uživatele není definován žádný e-mail
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=This feature needs JavaScript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=Nabídka typu "Top" nemůže mít nadřazenou nabídku. Vložte 0 do rodičovského menu nebo zvolte nabídku typu "Vlevo".
 ErrorLeftMenuMustHaveAParentId=Nabídka typu "Left" musí mít nadřazený identifikátor.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Nahrávání blokováno pluginem PHP / Apache.
 ErrorFileSizeTooLarge=File size is too large or file not provided.
 ErrorFieldTooLong=Pole %s je příliš dlouhé.
 ErrorSizeTooLongForIntType=Velikost příliš dlouhá pro typ int (%s číslice maximum)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Velikost příliš dlouho typu string (%s znaků maximum)
 ErrorNoValueForSelectType=Vyplňte prosím hodnotu pro vybraný seznam
 ErrorNoValueForCheckBoxType=Vyplňte prosím hodnotu pro seznam zaškrtávacích políček
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Špatná hodnota pro bezpečnostní kód. Zkuste znovu s no
 ErrorBothFieldCantBeNegative=Pole %s a %s nemohou být záporná
 ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in third-party card) and apply it to the invoice.
 ErrorLinesCantBeNegativeForOneVATRate=Celkový počet řádků (bez daně) nemůže být záporný pro danou neplatnou sazbu DPH (Nalezený záporný součet pro sazbu DPH <b> %s </b> %%).
-ErrorLinesCantBeNegativeOnDeposits=Linky nemohou být v záloze záporné. Pokud tak učiníte, budete čelit problémům, kdy budete muset složit zálohu v konečné faktuře.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Množství řádku do zákaznických faktur nemůže být záporné
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Uživatelský účet <b> %s </b>, který byl použit k provádění webového serveru, nemá k tomu povolení
 ErrorNoActivatedBarcode=Žádný typ čárového kódu není aktivován
 ErrUnzipFails=Nepodařilo se rozbalit %s s ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Váš parametr PHP upload_max_filesize (%s) je vyšší než parametr PHP post_max_size (%s). Toto není konzistentní nastavení.
 WarningPasswordSetWithNoAccount=Pro tohoto člena bylo nastaveno heslo. Nebyl však vytvořen žádný uživatelský účet. Toto heslo je uloženo, ale nemůže být použito pro přihlášení k Dolibarr. Může být použito externím modulem / rozhraním, ale pokud nemáte pro člena definováno žádné přihlašovací jméno ani heslo, můžete vypnout možnost "Správa přihlášení pro každého člena" z nastavení modulu člena. Pokud potřebujete spravovat přihlašovací údaje, ale nepotřebujete žádné heslo, můžete toto pole ponechat prázdné, abyste se tomuto varování vyhnuli. Poznámka: E-mail může být také použit jako přihlašovací jméno, pokud je člen připojen k uživateli.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR invoice can only be added on invoices set to be paid with credit transfer payments.
 SwissQrCreditorAddressInvalid = Creditor address is invalid (are ZIP and city set? (%s)
 SwissQrCreditorInformationInvalid = Creditor information is invalid for IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/cs_CZ/exports.lang b/htdocs/langs/cs_CZ/exports.lang
index 2859d8fb6da..b7dfb3fda9c 100644
--- a/htdocs/langs/cs_CZ/exports.lang
+++ b/htdocs/langs/cs_CZ/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Označení řádku
 LineDescription=Popis řádku
 LineUnitPrice=Jednotková cena z řádku
 LineVATRate=Sazba DPH z řádku
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Množství pro řádek
 LineTotalHT=Částka bez. daň ma řádku
 LineTotalTTC=Částka s DPH za řádek
 LineTotalVAT=Částka DPH za řádek
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Použitý typ řádku (0 = produkt, 1 = služba)
 FileWithDataToImport=Soubor s daty pro import
 FileToImport=Zdrojový soubor k importu
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=Vyberte formát souboru, který chcete použít jako
 ChooseFileToImport=Pro nahrání souboru klepněte na ikonku %s pro výběr souboru jako zdrojový soubor importu ...
 SourceFileFormat=Zdrojový soubor
 FieldsInSourceFile=Pole ve zdrojovém souboru
-FieldsInTargetDatabase=Cílové pole v Dolibarr databázi (tučně = povinná)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Žádné položky
 MoveField=Přesuňte pole na číslo sloupce %s
 ExampleOfImportFile=Example_of_import_file
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Zkontrolujte, zda formát souboru (oddělovače polí a
 RunSimulateImportFile=Spustit simulaci importu
 FieldNeedSource=Toto pole vyžaduje data ze zdrojového souboru
 SomeMandatoryFieldHaveNoSource=Některá povinná pole nemají zdroje z datového souboru
-InformationOnSourceFile=Informace o zdrojovém souboru
-InformationOnTargetTables=Informace o cílových oblastech,
+InformationOnSourceFile=Zdrojový soubor
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Přepnutí alespoň jeden zdrojový pole ve sloupci polí pro export
 SelectFormat=Zvolte tuto importu souboru ve formátu
 RunImportFile=Import dat
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index 8b9652961fe..5f0d58b1388 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Mail
 EMailing=Mail
-EMailings=Maily
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=Všechny e-maily
+AllEMailings=All mass eMails
 MailCard=E-mailová karta
 MailRecipients=Příjemci
 MailRecipient=Příjemce
@@ -26,17 +26,19 @@ MailFile=Přiložené soubory
 MailMessage=Tělo e-mailu
 SubjectNotIn=Není v předmětu
 BodyNotIn=Není v těle
-ShowEMailing=Zobrazit mail
-ListOfEMailings=Seznam zpráv
-NewMailing=Nové odeslání
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=Upravit mail
-ResetMailing=Odpovědět
-DeleteMailing=Odstranit mail
-PreviewMailing=Náhled zprávy
-CreateMailing=Vytvořit mail
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=Platný e-mail
+ValidMailing=Valid mass Email
 MailingStatusDraft=Návrh
 MailingStatusValidated=Ověřené
 MailingStatusSent=Odesláno
@@ -53,6 +55,7 @@ ErrorMailRecipientIsEmpty=Příjemce e-mailu chybí
 WarningNoEMailsAdded=Žádné nové maily nebyly přidány do seznamu příjemců.
 ConfirmValidMailing=Opravdu chcete tuto e-mailovou zprávu ověřit?
 ConfirmResetMailing=Upozorňujeme, že opětovným inicializováním e-mailu <b> %s </b> povolíte opětovné odeslání tohoto e-mailu hromadnou poštou. Opravdu to chcete udělat?
+ConfirmResetMailingTargetMassactionQuestion=Are you sure you want to reset the status of the selected recipients (this may means that email will be resent if you use the Send email feature of the emailing) ?
 ConfirmDeleteMailing=Jste si jisti, že chcete smazat tento emailling?
 NbOfUniqueEMails=Počet unikátních e-mailů
 NbOfUniquePhones=No. of unique phones
@@ -105,24 +108,24 @@ EmailCollectorFilterDesc=All filters must match to have an email being collected
 LineInFile=Řádek  %s v souboru
 RecipientSelectionModules=Definované požadavky na výběr příjemce
 MailSelectedRecipients=Vybraní příjemci
-MailingArea=EMailings oblast
-LastMailings=Nejnovější %s e-mailů
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Cílové statistiky
 NbOfCompaniesContacts=Unikátní kontakty/adresy
 MailNoChangePossible=Příjemce pro validované rozesílání nelze změnit
-SearchAMailing=Hledat mailing
-SendMailing=Poslat zprávy
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Odeslal
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Odesílání e-mailů lze provést z příkazového řádku. Požádejte správce serveru o spuštění následujícího příkazu k odeslání e-mailu všem příjemcům:
 MailingNeedCommand2=Můžete odeslat všem on-line přidáním parametru MAILING_LIMIT_SENDBYWEB s hodnotou max počet e-mailů, které chcete poslat v této dávce. K aktivaci přejděte na Domů - Nastavení - Ostatní.
 ConfirmSendingEmailing=Chcete-li odeslat e-mail přímo z této obrazovky, potvrďte, že jste si jisti, že chcete poslat e-maily nyní z vašeho prohlížeče?
-LimitSendingEmailing=Poznámka: Odeslání zpráv z webového rozhraní se provádí v několika časech z důvodů bezpečnostního a časového limitu max.<b>%s</b> příjemcům najednou pro každou odesílání relaci.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Vymazat seznam
 ToClearAllRecipientsClickHere=Klikněte zde pro vymazání seznamu příjemců tohoto rozesílání
 ToAddRecipientsChooseHere=Přidejte příjemce výběrem ze seznamu
-NbOfEMailingsReceived=Hromadné zprávy obdržel
-NbOfEMailingsSend=Hromadný mail odeslán
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID záznamu
 DeliveryReceipt=Delivery Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Můžete použít <b>čárkový</b> oddělovač pro zadání více příjemců.
@@ -139,8 +142,10 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Konfigurace odesílání e-maiů byla nastavena tak, aby '%s'. Tento režim nelze použít k odesílání hromadných e-mailů.
 MailSendSetupIs2=Nejprve je nutné jít s admin účtem, do nabídky%sHome - Nastavení - e-maily%s pro změnu parametru <strong>"%s"</strong> do režimu použít "%s". V tomto režimu, můžete zadat nastavení serveru SMTP vašeho  poskytovatele služeb internetu a používat hromadnou e-mailovou funkci.
 MailSendSetupIs3=Pokud máte nějaké otázky o tom, jak nastavit SMTP server, můžete se zeptat na%s, nebo si prostudujte dokumentaci vašeho poskytovatele. \nPoznámka: V současné době bohužel většina serverů nasazuje služby pro filtrování nevyžádané pošty a různé způsoby ověřování odesilatele. Bez detailnějších znalostí a nastavení vašeho SMTP serveru se vám bude vracet většina zpráv jako nedoručené.
@@ -174,15 +179,15 @@ NoContactWithCategoryFound=No category found linked to some contacts/addresses
 NoContactLinkedToThirdpartieWithCategoryFound=No category found linked to some thirdparties
 OutGoingEmailSetup=Outgoing emails
 InGoingEmailSetup=Incoming emails
-OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+OutGoingEmailSetupForEmailing=Outgoing emails (%s)
 DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informace
 ContactsWithThirdpartyFilter=Kontakty s filtrem subjektu
 Unanswered=Unanswered
 Answered=Odpovězeno
-IsNotAnAnswer=Is not answer (initial email)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Is an answer of an initial email
-RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+RecordCreatedByEmailCollector=Record created by the Email Collector %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.
@@ -190,9 +195,12 @@ NoMoreRecipientToSendTo=No more recipient to send the email to
 EmailOptedOut=Email owner has requested to not contact him with this email anymore
 EvenUnsubscribe=Include opt-out emails
 EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Useful for mandatory service emails for example.
-XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s operations done)
 YouCanMakeSomeInstructionForEmail=You can make some instructions for your Email (Example: generate image in email template...)
 ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
+LastNews=Latest News
+ListProducts= List of products
+PasswordReset=Password reset
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 48cb4f8f8f4..93848e32fb3 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -37,6 +37,7 @@ Translation=Překlad
 Translations=Translations
 CurrentTimeZone=Časové pásmo PHP (server)
 EmptySearchString=Enter non empty search criteria
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Enter a date criteria
 NoRecordFound=Nebyl nalezen žádný záznam
 NoRecordDeleted=Žádný záznam nebyl smazán
@@ -45,6 +46,7 @@ NoError=Žádná chyba
 Error=Chyba
 Errors=Chyby
 ErrorFieldRequired=Pole '%s' je povinné
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Pole '%s' obsahuje špatnou hodnotu
 ErrorFileDoesNotExists=Soubor %s neexistuje
 ErrorFailedToOpenFile=Nepodařilo se otevřít soubor %s
@@ -308,6 +310,7 @@ DateBuild=Zadejte datum sestavení
 DatePayment=Datum platby
 DateApprove=Schválené datum
 DateApprove2=Schválené datum (druhé schválení)
+PendingSince=Pending since
 RegistrationDate=Datum registrace
 UserCreation=Vytvořit uživatele
 UserModification=Upravit uživatele
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Chcete-li začít
 ActionRunningShort=probíhá
 ActionDoneShort=Ukončený
 ActionUncomplete=Neúplný
-LatestLinkedEvents=Nejnovější události spojené s %s
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Společnost/Organizace
 Accountant=Účetní
 ContactsForCompany=Kontakty pro tento subjekt
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=E-mail obsah
 SendAcknowledgementByMail=Zaslat potvrzovací e-mail
 SendMail=Odeslat e-mail
 Email=E-mail
+EMail=E-mail
+EMails=Emaily
 NoEMail=Žádný e-mail
 AlreadyRead=Již jste si přečetli
 NotRead=Nepřečtený
@@ -793,7 +798,7 @@ Notes=Poznámky
 AddNewLine=Přidat nový řádek
 AddFile=Přidat soubor
 FreeZone=Produkt s volným textem
-FreeLineOfType=Volně textová položka, typ:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Duplikovat objekt s jeho hlavními atributy
 ReGeneratePDF=Znovu generovat PDF
 PDFMerge=Spojit PDF
@@ -879,12 +884,14 @@ toward=k
 Access=Přístup
 SelectAction=Vybrat akci
 SelectTargetUser=Vyberte cílového uživatele / zaměstnance
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Použijte Ctrl + C pro zkopírování do schránky
 SaveUploadedFileWithMask=Uložit soubor na server s názvem "<strong>%s</strong>" (iinak "%s")
 OriginFileName=Originální název sounoru
 SetDemandReason=Nastavení zdroje
 SetBankAccount=Definujte bankovní účet
 AccountCurrency=Měna účtu
+AccountancyCode=Účetní kód
 ViewPrivateNote=Zobrazit poznámky
 XMoreLines=%s řádky(ů) skryto
 ShowMoreLines=Zobrazit více/méně řádků
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Opravdu chcete odstranit vybraný záznam(y) %s?
 ConfirmMassClone=Bulk clone confirmation
 ConfirmMassCloneQuestion=Select project to clone to
 ConfirmMassCloneToOneProject=Clone to project %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Související objekty
 ClassifyBilled=Classify Billed
 ClassifyUnbilled=Classify Unbilled
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=You need to be logged and you need permissions to view o
 Download=Stažení
 DownloadDocument=Stáhnout dokument
 DownloadSignedDocument=Download signed document
-ActualizeCurrency=Aktualizovat měnovou sazbu
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Fiskální rok
 ModuleBuilder=Tvůrce modulů a aplikací
 SetMultiCurrencyCode=Nastavte měnu
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Hromadné akce
 ClickToShowHelp=Kliknutím zobrazíte nápovědu nápovědy
 WebSite=webová stránka
@@ -1104,6 +1113,7 @@ PayedBy=Placeno
 PayedTo=Placené k
 Monthly=Měsíční
 Quarterly=Čtvrtletní
+Quarter=Quarter
 Annual=Roční
 Local=Místní
 Remote=Dálkový
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Úkol
 ContactDefault_propal=Nabídka
 ContactDefault_supplier_proposal=Návrh dodavatele
 ContactDefault_ticket=Lístek
+ContactDefault_societe=Subjekt
 ContactAddedAutomatically=Contact added from third-party contact roles
 More=Více
 ShowDetails=Ukázat detaily
@@ -1242,6 +1253,7 @@ CommercialAffected=Sales representative assigned
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=Zpráva
+Emailing=Emailing
 Progression=Progres
 YourMessage=Your message
 YourMessageHasBeenReceived=Your message has been received. We will answer or contact you as soon as possible.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Přidat
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Od začátku
+Transferred=Transferred
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 7c5ab52e717..31309220b89 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -97,7 +97,6 @@ ShowService=Zobrazit servis
 ProductsAndServicesArea=Oblasti produktů a služeb
 ProductsArea=Oblast produktu
 ServicesArea=Poskytování služeb v oblasti
-ListOfStockMovements=Seznam skladových pohybů
 BuyingPrice=Nákupní cena
 PriceForEachProduct=Produkty se specifickými cenami
 SupplierCard=Prodejní karta
@@ -145,6 +144,7 @@ WithoutDiscount=Without discount
 VATRateForSupplierProduct=Tax Rate (for this vendor/product)
 DiscountQtyMin=Sleva pro tento počet.
 NoPriceDefinedForThisSupplier=Pro tento dodavatel / produkt není definována žádná cena / množství
+NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
 NoSupplierPriceDefinedForThisProduct=Pro tento produkt není definována cena / množství prodejce
 PredefinedItem=Predefined item
 PredefinedProducts=Předdefinovaný produkt
@@ -171,7 +171,7 @@ BuyingPrices=Nákupní ceny
 CustomerPrices=Zákaznické ceny
 SuppliersPrices=Ceny prodejců
 SuppliersPricesOfProductsOrServices=Ceny prodejců (produktů nebo služeb)
-CustomCode=Customs|Commodity|HS code
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Země původu
 RegionStateOrigin=Region of origin
 StateOrigin=State|Province of origin
@@ -209,6 +209,7 @@ unitL=Litr
 unitT=tón
 unitKG=kg
 unitG=Gram
+unitGAL=galon
 unitMG=mg
 unitLB=libra
 unitOZ=unce
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Formát požadavku je {"URL": "http://example.c
 UpdateInterval=Interval aktualizace (minuty)
 LastUpdated=Poslední aktualizace
 CorrectlyUpdated=Správně aktualizováno
-PropalMergePdfProductActualFile=Soubory používají k přidání do PDF Azur template are/is
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=Vyberte soubory PDF
 IncludingProductWithTag=Including products/services with the tag
 DefaultPriceRealPriceMayDependOnCustomer=Výchozí cena, skutečná cena může záviset na zákazníkovi
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=Množství linky bylo přepočítáno podle obalu d
 
 #Attributes
 Attributes=Atributy
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Atributy variant
 ProductAttributes=Atributy variant pro produkty
 ProductAttributeName=Atribut varianty %s
@@ -395,6 +400,8 @@ ErrorDestinationProductNotFound=Cílový produkt nebyl nalezen
 ErrorProductCombinationNotFound=Produkt nebyl nalezen
 ActionAvailableOnVariantProductOnly=Akce je k dispozici pouze u varianty výrobku
 ProductsPricePerCustomer=Ceny produktů na zákazníky
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Další atributy (dodavatelské ceny)
 DeleteLinkedProduct=Odstraňte podřízený produkt spojený s kombinací
 AmountUsedToUpdateWAP=Unit amount to use to update the Weighted Average Price
@@ -403,7 +410,8 @@ PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
 mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
+mandatoryHelper2=Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
@@ -435,3 +443,6 @@ AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtu
 ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
 WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned
 PriceLabel=Price label
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
index 05d8e72a574..e798ad92421 100644
--- a/htdocs/langs/cs_CZ/website.lang
+++ b/htdocs/langs/cs_CZ/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Zde použijte seznam dalších jmén / aliasů, aby byla st
 WEBSITE_CSS_URL=URL externího souboru CSS
 WEBSITE_CSS_INLINE=Obsah souboru CSS (společný pro všechny stránky)
 WEBSITE_JS_INLINE=JavaScript file content (common to all pages)
-WEBSITE_HTML_HEADER=Přidání v dolní části hlavičky HTML (společné pro všechny stránky)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Soubor pro roboty (soubor robots.txt)
 WEBSITE_HTACCESS=Soubor .htaccess
 WEBSITE_MANIFEST_JSON=Soubor manifest.json webové stránky
@@ -56,16 +56,17 @@ ReadPerm=Číst
 WritePerm=Zápis
 TestDeployOnWeb=Testování / nasazení na webu
 PreviewSiteServedByWebServer= <u> Náhled %s na nové kartě. </u> <br> <br> %s bude sloužit externímu webovém serveru (jako Apache, Nginx, IIS). Musíte nainstalovat a nastavit tento server předtím, než přejdete k adresáři: <br> <strong> %s </strong> <br> Adresa URL obsluhovaná externím serverem: <br> <strong> %s </strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=Adresa URL virtuálního hostitele obsluhovaného externím webovým serverem není definována
 NoPageYet=Zatím žádné stránky
 YouCanCreatePageOrImportTemplate=Můžete vytvořit novou stránku nebo importovat úplnou šablonu webových stránek
 SyntaxHelp=Nápověda ke konkrétním tipům pro syntaxi
 YouCanEditHtmlSourceckeditor=Zdrojový kód HTML můžete upravit pomocí tlačítka "Zdroj" v editoru.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Pro obraz sdílený pomocí sdíleného odkazu (otevřený přístup pomocí klíče sdílení hash souboru) je syntaxe: <br> <strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Klonovat stránku / kontejner
 CloneSite=Kopie stránky
@@ -87,15 +88,15 @@ WebsiteAccount=Účet webových stránek
 WebsiteAccounts=Účty webových stránek
 AddWebsiteAccount=Vytvořte účet webových stránek
 BackToListForThirdParty=Back to list for the third parties
-DisableSiteFirst=Nejprve zakažte web
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Název mé webové stránky
 AnotherContainer=Takto lze zahrnout obsah jiné stránky / kontejneru (pokud povolíte dynamický kód, protože integrovaný subdodavatel nemusí existovat, může se zde vyskytnout chyba)
 SorryWebsiteIsCurrentlyOffLine=Je nám líto, ale tento web je nyní offline. Vraťte se prosím později ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Povolte tabulku účtu webových stránek
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktivujte tabulku pro ukládání účtů webových stránek (login / heslo) pro každý web / třetí stranu
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Nejprve musíte definovat výchozí domovskou stránku
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correctty when used on a grabbed external page.
-OnlyEditionOfSourceForGrabbedContent=Pouze vydání zdroje HTML je možné, pokud byl obsah chycen z externího webu
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Uchopte také obrázky do css a stránky.
 ImagesShouldBeSavedInto=Obrázky je třeba uložit do adresáře
 WebsiteRootOfImages=Kořenový adresář pro obrázky webových stránek
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Vyjměte filtr
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Kategorie
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/cy_GB/admin.lang b/htdocs/langs/cy_GB/admin.lang
index 693605250e0..11c2c003b68 100644
--- a/htdocs/langs/cy_GB/admin.lang
+++ b/htdocs/langs/cy_GB/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Mae gwiriad cywirdeb ffeiliau wedi mynd heibi
 FileIntegritySomeFilesWereRemovedOrModified=Mae'r gwiriad cywirdeb ffeiliau wedi methu. Cafodd rhai ffeiliau eu haddasu, eu dileu neu eu hychwanegu.
 GlobalChecksum=Gwiriad byd-eang
 MakeIntegrityAnalysisFrom=Gwneud dadansoddiad cywirdeb o ffeiliau cais o
-LocalSignature=Llofnod lleol wedi'i fewnosod (llai dibynadwy)
-RemoteSignature=Llofnod pell o bell (mwy dibynadwy)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Ffeiliau Coll
 FilesUpdated=Ffeiliau wedi'u Diweddaru
 FilesModified=Ffeiliau wedi'u Haddasu
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Defnyddir gan rai opsiwn agenda yn unig
 Security=Diogelwch
 Passwords=Cyfrineiriau
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Amgryptio cyfrinair cronfa ddata wedi'i storio yn conf.php. Argymhellir yn gryf actifadu'r opsiwn hwn.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=I gael cyfrinair wedi'i amgodio i'r ffeil <b> conf.php </b>, disodli'r llinell <br> <b> $dolibarr_main_db_pass="..."; </b> <br> gan <br> <b> $dolibarr_main_db_pass="crypted:%s"; </b>
 InstrucToClearPass=I gael cyfrinair wedi'i ddatgodio (clir) i'r ffeil <b> conf.php </b>, disodli'r llinell <br> <b> $dolibarr_main_db_pass;" </b> <br> gan <br> <b> $dolibarr_main_db_pass="%s"; </b>
 ProtectAndEncryptPdfFiles=Diogelu ffeiliau PDF a gynhyrchir. NID yw hyn yn cael ei argymell gan ei fod yn torri cynhyrchu PDF swmp.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Maes cyfrifiadurol
-ComputedFormulaDesc=Gallwch chi nodi fformiwla yma gan ddefnyddio priodweddau gwrthrych arall neu unrhyw godio PHP i gael gwerth cyfrifiadurol deinamig. Gallwch ddefnyddio unrhyw fformiwlâu sy'n gydnaws â PHP gan gynnwys y "?" gweithredwr cyflwr, a gwrthrych cyffredinol canlynol: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong> >.<br><strong>RHYBUDD</strong>: Os oes angen priodweddau gwrthrych arnoch heb ei lwytho, dim ond nôl y gwrthrych i'ch fformiwla fel yn yr ail enghraifft. Hefyd, os oes gwall cystrawen, gall y fformiwla ddychwelyd dim.<br><br>Enghraifft o fformiwla:<br>$objectoffield->id < 10 ? round($objectoffield-> id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Enghraifft i ail-lwytho gwrthrych<br>(($reloadedobj = Societe newydd($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkeyed'] *- $reloaded >cyfalaf / 5: '-1')<br><br>Enghraifft arall o fformiwla i orfodi llwyth gwrthrych a'i riant wrthrych: <br>(($reloadedobj = Tasg newydd($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id)) > 0) && ($secondloadedobj = Prosiect newydd( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Heb ganfod prosiect rhiant'
+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'
 Computedpersistent=Storio maes cyfrifiadurol
 ComputedpersistentDesc=Bydd meysydd ychwanegol a gyfrifir yn cael eu storio yn y gronfa ddata, fodd bynnag, dim ond pan fydd gwrthrych y maes hwn yn cael ei newid y bydd y gwerth yn cael ei ailgyfrifo. Os yw'r maes a gyfrifwyd yn dibynnu ar wrthrychau eraill neu ddata byd-eang efallai bod y gwerth hwn yn anghywir!!
 ExtrafieldParamHelpPassword=Mae gadael y maes hwn yn wag yn golygu y bydd y gwerth hwn yn cael ei storio HEB amgryptio (mae'r maes newydd ei guddio gyda sêr ar y sgrin).<br><br>Enter gwerth 'dolcrypt' i amgodio gwerth gydag algorithm amgryptio cildroadwy. Mae modd gwybod a golygu data clir o hyd ond mae wedi'i amgryptio i'r gronfa ddata.<br><br>Rhowch 'auto' (neu 'md5', 'sha256', 'password_hash', ...) i ddefnyddio'r algorithm amgryptio cyfrinair rhagosodedig (neu md5, sha256, password_hash...) i gadw'r cyfrinair stwnsh anwrthdroadwy yn y gronfa ddata (dim ffordd i adalw'r gwerth gwreiddiol)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Mae defnyddio gweinydd SMTP eich Darparwr Gwasanaeth E-bost eich hun i anfon e-byst hefyd yn ddiddorol felly bydd yr holl negeseuon e-bost a anfonir o'r cais hefyd yn cael eu cadw yn eich cyfeiriadur "Anfonwyd" o'ch blwch post.
 WarningPHPMailD=Argymhellir felly newid y dull anfon e-byst i'r gwerth "SMTP".
 WarningPHPMailDbis=Os ydych chi wir eisiau cadw'r dull "PHP" rhagosodedig i anfon e-byst, anwybyddwch y rhybudd hwn, neu ei ddileu trwy %s clicio yma%s.
-WarningPHPMail2=Os oes angen i'ch darparwr SMTP e-bost gyfyngu cleient e-bost i rai cyfeiriadau IP (prin iawn), dyma gyfeiriad IP yr asiant defnyddiwr post (MUA) ar gyfer eich cais CRM ERP: <strong> %s </strong> .
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Cyfrifeg (syml)
 Module10Desc=Adroddiadau cyfrifo syml (cyfnodolion, trosiant) yn seiliedig ar gynnwys cronfa ddata. Nid yw'n defnyddio unrhyw fwrdd cyfriflyfr.
 Module20Name=Cynigion
 Module20Desc=Rheoli cynigion masnachol
-Module22Name=E-byst Torfol
-Module22Desc=Rheoli e-bostio swmp
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Egni
 Module23Desc=Monitro'r defnydd o egni
 Module25Name=Gorchmynion Gwerthu
@@ -847,10 +848,10 @@ Permission212=Llinellau archebu
 Permission213=Actifadu llinell
 Permission214=Gosod Teleffoni
 Permission215=Gosod darparwyr
-Permission221=Darllen e-byst
-Permission222=Creu/addasu e-byst (pwnc, derbynwyr...)
-Permission223=Dilysu e-byst (yn caniatáu anfon)
-Permission229=Dileu negeseuon e-bost
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Gweld derbynwyr a gwybodaeth
 Permission238=Anfon post â llaw
 Permission239=Dileu postiadau ar ôl eu dilysu neu eu hanfon
@@ -1105,6 +1106,7 @@ DictionaryStaff=Nifer y Gweithwyr
 DictionaryAvailability=Oedi cyflwyno
 DictionaryOrderMethods=Dulliau archebu
 DictionarySource=Tarddiad cynigion/gorchmynion
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Grwpiau personol ar gyfer adroddiadau
 DictionaryAccountancysystem=Modelau ar gyfer siart cyfrifon
 DictionaryAccountancyJournal=Cylchgronau cyfrifeg
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Yn ôl i'r rhestr Geiriaduron
 TypeOfRevenueStamp=Math o stamp treth
 VATManagement=Rheoli Treth Gwerthu
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Yn ddiofyn, y dreth Gwerthiant arfaethedig yw 0 y gellir ei defnyddio ar gyfer achosion fel cymdeithasau, unigolion neu gwmnïau bach.
 VATIsUsedExampleFR=Yn Ffrainc, mae'n golygu cwmnïau neu sefydliadau sydd â system gyllidol go iawn (Simplified real neu normal real). System lle mae TAW yn cael ei datgan.
 VATIsNotUsedExampleFR=Yn Ffrainc, mae'n golygu cymdeithasau nad ydynt yn datgan treth Gwerthu neu gwmnïau, sefydliadau neu broffesiynau rhyddfrydol sydd wedi dewis y system gyllidol micro-fenter (Treth werthu mewn masnachfraint) ac wedi talu Treth Gwerthu masnachfraint heb unrhyw ddatganiad Treth Gwerthiant. Bydd y dewis hwn yn dangos y cyfeirnod "Treth Gwerthiant Amherthnasol - art-293B o CGI" ar anfonebau.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Math o dreth gwerthu
 LTRate=Cyfradd
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Yn ôl y drefn o drethi (Gweler %s - %s - %s), nid oes
 LabelUsedByDefault=Label a ddefnyddir yn ddiofyn os na ellir dod o hyd i gyfieithiad ar gyfer cod
 LabelOnDocuments=Label ar ddogfennau
 LabelOrTranslationKey=Label neu allwedd cyfieithu
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=Arddangos rhif TAW Cwsmer/Gwerthwr i restrau combo.
 AddAdressInList=Arddangos cyfeiriad Cwsmer/Gwerthwr i restrau combo.<br>Bydd Trydydd Partïon yn ymddangos gyda fformat enw o "The Big Company Corp. - 21 jump street 123456 Big town - USA" yn lle " Corff y Cwmni Mawr".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Gofynnwch am y dull cludo a ffefrir ar gyfer Trydydd Partïon.
-FieldEdition=Argraffiad maes %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Enghraifft: +2 (llenwi dim ond os ceir problemau gwrthbwyso cylchfa amser)
 GetBarCode=Cael cod bar
 NumberingModules=Modelau rhifo
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Gorfodi dyddiad anfoneb i'r dyddiad dilysu
 SuggestedPaymentModesIfNotDefinedInInvoice=Modd talu a awgrymir ar anfoneb yn ddiofyn os nad yw wedi'i ddiffinio ar yr anfoneb
 SuggestPaymentByRIBOnAccount=Awgrymu taliad trwy godi arian ar gyfrif
 SuggestPaymentByChequeToAddress=Awgrymu taliad gyda siec i
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Testun am ddim ar anfonebau
 WatermarkOnDraftInvoices=Dyfrnod ar anfonebau drafft (dim os yn wag)
 PaymentsNumberingModule=Model rhifo taliadau
@@ -1718,6 +1723,7 @@ CompressionOfResources=Cywasgu ymatebion HTTP
 CompressionOfResourcesDesc=Er enghraifft gan ddefnyddio cyfarwyddeb Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Nid yw canfodiad awtomatig o'r fath yn bosibl gyda phorwyr cyfredol
 DefaultValuesDesc=Yma gallwch ddiffinio'r gwerth rhagosodedig yr hoffech ei ddefnyddio wrth greu cofnod newydd, a/neu hidlwyr rhagosodedig neu'r drefn ddidoli pan fyddwch yn rhestru cofnodion.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Gwerthoedd rhagosodedig (i'w defnyddio ar ffurflenni)
 DefaultSearchFilters=Hidlyddion chwilio diofyn
 DefaultSortOrder=Gorchmynion didoli rhagosodedig
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Yn anfon modiwlau rhifo
 SendingsAbility=Cefnogi taflenni cludo ar gyfer danfoniadau cwsmeriaid
 NoNeedForDeliveryReceipts=Yn y rhan fwyaf o achosion, defnyddir taflenni cludo fel taflenni ar gyfer danfoniadau cwsmeriaid (rhestr o gynhyrchion i'w hanfon) a thaflenni sy'n cael eu derbyn a'u llofnodi gan y cwsmer. Felly mae derbynneb danfon cynnyrch yn nodwedd ddyblyg ac anaml y caiff ei actifadu.
 FreeLegalTextOnShippings=Testun am ddim ar gludo nwyddau
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Modiwl rhifo derbynneb danfoniadau cynhyrchion
 DeliveryOrderModel=Model derbynneb danfon nwyddau
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Testun am ddim ar dderbynebau danfon
 ##### FCKeditor #####
 AdvancedEditor=Golygydd uwch
 ActivateFCKeditor=Ysgogi golygydd uwch ar gyfer:
-FCKeditorForNotePublic=WYSIWYG creu/argraffiad o'r maes "nodiadau cyhoeddus" o elfennau
-FCKeditorForNotePrivate=WYSIWYG creu/rhifyn y maes "nodiadau preifat" o elfennau
-FCKeditorForCompany=WYSIWYG creu/argraffiad o ddisgrifiad maes o elfennau (ac eithrio cynnyrch/gwasanaethau)
-FCKeditorForProductDetails=WYSIWYG creu/argraffiad o ddisgrifiad cynnyrch neu linellau ar gyfer gwrthrychau (llinellau cynigion, archebion, anfonebau, ac ati...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Rhybudd: Nid yw defnyddio'r opsiwn hwn ar gyfer yr achos hwn yn cael ei argymell o ddifrif gan y gall greu problemau gyda nodau arbennig a fformatio tudalennau wrth adeiladu ffeiliau PDF.
-FCKeditorForMailing= Creu/rhifyn WYSIWYG ar gyfer e-byst torfol (Tools->E-Bost)
-FCKeditorForUserSignature=WYSIWYG creu/argraffiad llofnod defnyddiwr
-FCKeditorForMail=Creu/argraffiad WYSIWYG ar gyfer pob post (ac eithrio Offer-> e-bost)
-FCKeditorForTicket=Creu/argraffiad WYSIWYG ar gyfer tocynnau
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Gosod modiwl stoc
 IfYouUsePointOfSaleCheckModule=Os ydych chi'n defnyddio'r modiwl Pwynt Gwerthu (POS) a ddarperir yn ddiofyn neu fodiwl allanol, efallai y bydd eich modiwl POS yn anwybyddu'r gosodiad hwn. Mae'r rhan fwyaf o fodiwlau POS wedi'u cynllunio yn ddiofyn i greu anfoneb ar unwaith a lleihau stoc waeth beth fo'r opsiynau yma. Felly os oes angen gostyngiad mewn stoc arnoch neu beidio wrth gofrestru gwerthiant o'ch POS, gwiriwch hefyd eich gosodiad modiwl POS.
@@ -1867,7 +1874,6 @@ Buy=Prynwch
 Sell=Gwerthu
 InvoiceDateUsed=Dyddiad anfoneb a ddefnyddiwyd
 YourCompanyDoesNotUseVAT=Diffiniwyd eich cwmni i beidio â defnyddio TAW (Cartref - Setup - Cwmni/Sefydliad), felly nid oes unrhyw opsiynau TAW i'w sefydlu.
-AccountancyCode=Cod Cyfrifo
 AccountancyCodeSell=Cyfrif gwerthu. côd
 AccountancyCodeBuy=Cyfrif prynu. côd
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Cadwch y blwch ticio “Creu'r taliad yn awtomatig” yn wag yn ddiofyn wrth greu treth newydd
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Pa wedd ydych chi am ei hagor yn ddiofyn wrth ddewis Agend
 AGENDA_EVENT_PAST_COLOR = Lliw digwyddiad y gorffennol
 AGENDA_EVENT_CURRENT_COLOR = Lliw digwyddiad cyfredol
 AGENDA_EVENT_FUTURE_COLOR = Lliw digwyddiad yn y dyfodol
-AGENDA_REMINDER_BROWSER = Galluogi nodyn atgoffa digwyddiad <b> ar borwr defnyddiwr </b> (Pan gyrhaeddir y dyddiad atgoffa, bydd y porwr yn dangos naidlen. Gall pob defnyddiwr analluogi hysbysiadau o'r fath o osod hysbysiadau ei borwr).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Galluogi hysbysiad sain
-AGENDA_REMINDER_EMAIL = Galluogi nodyn atgoffa digwyddiad <b> trwy e-byst </b> (gellir diffinio opsiwn atgoffa / oedi ar bob digwyddiad).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Sylwer: Rhaid i amlder y swydd a drefnwyd %s fod yn ddigon i sicrhau bod yr atgoffa'n cael ei anfon ar yr adeg gywir.
 AGENDA_SHOW_LINKED_OBJECT = Dangos gwrthrych cysylltiedig i wedd agenda
 AGENDA_USE_EVENT_TYPE = Defnyddiwch fathau o ddigwyddiadau (a reolir yn y ddewislen Gosod -> Geiriaduron -> Math o ddigwyddiadau agenda)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Gosodwch y gwerth rhagosodedig hwn yn awtomatig ar gyfer y math o ddigwyddiad ar ffurf creu digwyddiad
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Allwedd i awdurdodi dolen allforio
 PastDelayVCalExport=Peidiwch ag allforio digwyddiad hŷn na
 SecurityKey = Allwedd diogelwch
@@ -2006,7 +2017,7 @@ BackupZipWizard=Dewin i adeiladu'r cyfeiriadur archif o ddogfennau
 SomethingMakeInstallFromWebNotPossible=Nid yw'n bosibl gosod modiwl allanol o'r rhyngwyneb gwe am y rheswm canlynol:
 SomethingMakeInstallFromWebNotPossible2=Am y rheswm hwn, mae'r broses uwchraddio a ddisgrifir yma yn broses â llaw y gall defnyddiwr breintiedig yn unig ei chyflawni.
 InstallModuleFromWebHasBeenDisabledContactUs=Gosod neu ddatblygu modiwlau allanol neu wefannau deinamig, o'r cais, yn cael ei gloi ar hyn o bryd at ddiben diogelwch. Cysylltwch â ni os oes angen i chi alluogi'r nodwedd hon.
-InstallModuleFromWebHasBeenDisabledByFile=Mae gosod modiwl allanol o'r rhaglen wedi'i analluogi gan eich gweinyddwr. Rhaid ichi ofyn iddo dynnu'r ffeil <strong> %s </strong> i ganiatáu'r nodwedd hon.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Mae angen i osod neu adeiladu modiwl allanol o'r cymhwysiad arbed ffeiliau'r modiwl yn y cyfeiriadur <strong> %s </strong> . Er mwyn i'r cyfeiriadur hwn gael ei brosesu gan Dolibarr, rhaid i chi osod eich <strong> conf/conf.php </strong> i ychwanegu'r 2 linell gyfarwyddeb: <br> <strong> $_dolibarr_main; </strong> <br> <strong> $dolibarr_main_document_root_alt= '%s/custom'; </strong>
 HighlightLinesOnMouseHover=Amlygwch linellau tabl pan fydd symudiad y llygoden yn mynd drosodd
 HighlightLinesColor=Amlygwch liw'r llinell pan fydd y llygoden yn pasio drosodd (defnyddiwch 'ffffff' am ddim uchafbwynt)
@@ -2036,6 +2047,7 @@ Enter0or1=Rhowch 0 neu 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Rhowch yma rhwng braces, rhestr o rif beit sy'n cynrychioli'r symbol arian cyfred. Er enghraifft: ar gyfer $, nodwch [36] - ar gyfer brazil real R$ [82,36] - am €, nodwch [8364]
 ColorFormat=Mae'r lliw RGB mewn fformat HEX, ee: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Enw eicon mewn fformat: <br> - image.png ar gyfer ffeil delwedd i'r cyfeiriadur thema cyfredol<br> - image.png@module os yw ffeil i mewn i gyfeiriadur /img/ modiwl<br> - fa-xxx ar gyfer llun FontAwesome fa-xxx<br>- fontawesome_xxx_fa_color_size ar gyfer llun FontAwesome fa-xxx (gyda set rhagddodiad, lliw a maint)
 PositionIntoComboList=Safle'r llinell mewn rhestrau combo
 SellTaxRate=Cyfradd treth gwerthu
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Cuddio borderi ar ffrâm cyfeiriad anfonwr
 MAIN_PDF_NO_RECIPENT_FRAME=Cuddio borderi ar ffrâm cyfeiriad y derbynnydd
 MAIN_PDF_HIDE_CUSTOMER_CODE=Cuddio cod cwsmer
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Cuddio enw'r anfonwr/cwmni yn y bloc cyfeiriad
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Cuddio amodau taliadau
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Cuddio modd talu
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=Heb ei argymell
 ARestrictedPath=Rhai llwybr cyfyngedig ar gyfer ffeiliau data
 CheckForModuleUpdate=Gwiriwch am ddiweddariadau modiwlau allanol
 CheckForModuleUpdateHelp=Bydd y weithred hon yn cysylltu â golygyddion modiwlau allanol i wirio a oes fersiwn newydd ar gael.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Mae diweddariad ar gael
 NoExternalModuleWithUpdate=Ni chanfuwyd unrhyw ddiweddariadau ar gyfer modiwlau allanol
 SwaggerDescriptionFile=Ffeil ddisgrifiad Swagger API (i'w ddefnyddio gyda redoc er enghraifft)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Dangos cyfeiriad cludo
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Arwydd gorfodol mewn rhai gwledydd (Ffrainc, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Cyswllt url rhwydwaith cymdeithasol. Defnyddiwch {socialid} ar gyfer y rhan newidyn sy'n cynnwys ID y rhwydwaith cymdeithasol.
 IfThisCategoryIsChildOfAnother=Os yw'r categori hwn yn blentyn i un arall
 DarkThemeMode=Modd thema dywyll
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Rhybudd: mae'r modiwl %s wedi g
 WarningModuleHasChangedSecurityCsrfParameter=Rhybudd: mae'r modiwl %s wedi analluogi diogelwch CSRF eich achos. Mae'r weithred hon yn amheus ac mae'n bosibl na fydd eich gosodiad wedi'i ddiogelu mwyach. Cysylltwch ag awdur y modiwl am eglurhad.
 EMailsInGoingDesc=Mae e-byst sy'n dod i mewn yn cael eu rheoli gan y modiwl %s. Rhaid i chi ei alluogi a'i ffurfweddu os oes angen i chi gefnogi e-byst sy'n mynd i mewn.
 MAIN_IMAP_USE_PHPIMAP=Defnyddiwch y llyfrgell PHP-IMAP ar gyfer IMAP yn lle PHP IMAP brodorol. Mae hyn hefyd yn caniatáu defnyddio cysylltiad OAuth2 ar gyfer IMAP (rhaid gweithredu modiwl OAuth hefyd).
-MAIN_CHECKBOX_LEFT_COLUMN=Dangoswch y golofn ar gyfer dewis maes a llinell ar y chwith (ar y dde yn ddiofyn)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Heb ei greu yn ddiofyn. Wedi'i greu ar actifadu modiwl yn unig.
 CSSPage=Arddull CSS
 Defaultfortype=Diofyn
@@ -2489,7 +2510,7 @@ AiDescription=Nodweddion AI (Deallusrwydd Artiffisial).
 AiDescriptionLong=Yn darparu nodweddion AI (Deallusrwydd Artiffisial) mewn gwahanol rannau o'r cais. Angen API AI allanol.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=Gosodiad modiwl AI
 AiCustomPrompt=AI arferiad brydlon
 AI_CONFIGURATIONS_PROMPT=Anogwr personol
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=Anogwyr personol AI ar gyfer nodweddion
 EnterAnIP=Rhowch gyfeiriad IP
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/cy_GB/banks.lang b/htdocs/langs/cy_GB/banks.lang
index 8eaa46f6f55..63ba204aacd 100644
--- a/htdocs/langs/cy_GB/banks.lang
+++ b/htdocs/langs/cy_GB/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Cydbwysedd diwedd
 CurrentBalance=Balans presennol
 FutureBalance=Cydbwysedd yn y dyfodol
 ShowAllTimeBalance=Dangos cydbwysedd o'r dechrau
-AllTime=O'r dechrau
 Reconciliation=Cymod
 RIB=Rhif Cyfrif Banc
 IBAN=rhif IBAN
@@ -133,7 +132,7 @@ DeleteTransaction=Dileu cofnod
 ConfirmDeleteTransaction=Ydych chi'n siŵr eich bod am ddileu'r cofnod hwn?
 ThisWillAlsoDeleteBankRecord=Bydd hyn hefyd yn dileu cofnod banc a gynhyrchir
 BankMovements=Symudiadau
-PlannedTransactions=Cofnodion wedi'u cynllunio
+PlannedTransactions=Upcoming entries
 Graph=Graffiau
 ExportDataset_banque_1=Cofnodion banc a datganiad cyfrif
 ExportDataset_banque_2=Slip blaendal
@@ -151,8 +150,8 @@ FutureTransaction=Trafodiad yn y dyfodol. Methu cysoni.
 SelectChequeTransactionAndGenerate=Dewiswch/hidlo'r sieciau sydd i'w cynnwys yn y dderbynneb blaendal siec. Yna, cliciwch ar "Creu".
 SelectPaymentTransactionAndGenerate=Dewiswch/hidlo'r dogfennau sydd i'w cynnwys yn y dderbynneb blaendal %s. Yna, cliciwch ar "Creu".
 InputReceiptNumber=Dewiswch y cyfriflen banc sy'n gysylltiedig â'r cymodi. Defnyddiwch werth rhifol y gellir ei drefnu
-InputReceiptNumberBis=YYYYMM neu YYYYMMDD
-EventualyAddCategory=Yn y pen draw, nodwch gategori ar gyfer dosbarthu'r cofnodion
+InputReceiptNumberBis=YYYYMM
+EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=I gymodi?
 ThenCheckLinesAndConciliate=Yna, gwiriwch y llinellau sy'n bresennol yn y cyfriflen banc a chliciwch
 DefaultRIB=BAN ddiofyn
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Os yw'r swyddogaeth hon wedi'i galluogi, gallwch ddewis
 BankColorizeMovementName1=Lliw cefndir ar gyfer symudiad debyd
 BankColorizeMovementName2=Lliw cefndir ar gyfer symudiad credyd
 IfYouDontReconcileDisableProperty=Os na fyddwch yn gwneud y cysoniadau banc ar rai cyfrifon banc, analluoga'r eiddo "%s" arnynt i gael gwared ar y rhybudd hwn.
-NoBankAccountDefined=Dim cyfrif banc wedi'i ddiffinio
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Heb ganfod cofnod yn y cyfrif banc. Yn gyffredin, mae hyn yn digwydd pan fydd cofnod wedi'i ddileu â llaw o'r rhestr o drafodion yn y cyfrif banc (er enghraifft yn ystod cysoniad o'r cyfrif banc). Rheswm arall yw bod y taliad wedi'i gofnodi pan oedd y modiwl "%s" yn anabl.
 AlreadyOneBankAccount=Eisoes un cyfrif banc wedi'i ddiffinio
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Amrywiad ffeil SEPA
diff --git a/htdocs/langs/cy_GB/blockedlog.lang b/htdocs/langs/cy_GB/blockedlog.lang
index f7602bdcd17..9b0bc9c1659 100644
--- a/htdocs/langs/cy_GB/blockedlog.lang
+++ b/htdocs/langs/cy_GB/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Logiau na ellir eu newid
 ShowAllFingerPrintsMightBeTooLong=Dangos yr holl logiau sydd wedi'u harchifo (gall fod yn hir)
 ShowAllFingerPrintsErrorsMightBeTooLong=Dangos pob log archif nad yw'n ddilys (gall fod yn hir)
 DownloadBlockChain=Lawrlwythwch olion bysedd
-KoCheckFingerprintValidity=Nid yw cofnod log wedi'i archifo yn ddilys. Mae'n golygu bod rhywun (haciwr?) wedi addasu rhywfaint o ddata'r cofnod hwn ar ôl iddo gael ei recordio, neu wedi dileu'r cofnod archif blaenorol (gwiriwch fod y llinell â # blaenorol yn bodoli) neu wedi addasu siec swm y cofnod blaenorol.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Mae cofnod log wedi'i archifo yn ddilys. Ni addaswyd y data ar y llinell hon ac mae'r cofnod yn dilyn yr un blaenorol.
 OkCheckFingerprintValidityButChainIsKo=Mae log wedi'i archifo yn ymddangos yn ddilys o'i gymharu â'r un blaenorol ond roedd y gadwyn wedi'i llygru o'r blaen.
 AddedByAuthority=Wedi'i storio mewn awdurdod anghysbell
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Manylion Log
 ListOfTrackedEvents=Rhestr o ddigwyddiadau wedi'u tracio
 Fingerprint=Olion bysedd
 DownloadLogCSV=Allforio logiau wedi'u harchifo (CSV)
-DataOfArchivedEvent=Data llawn o'r digwyddiad a archifwyd
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Gwrthrych gwreiddiol (math %s, id %s) heb ei gysylltu (gweler y golofn 'Data llawn' i gael data sydd wedi'i gadw na ellir ei newid)
 BlockedLogAreRequiredByYourCountryLegislation=Mae'n bosibl y bydd angen modiwl Logiau na ellir eu newid yn ôl deddfwriaeth eich gwlad. Gallai analluogi’r modiwl hwn wneud unrhyw drafodion yn y dyfodol yn annilys o ran y gyfraith a’r defnydd o feddalwedd gyfreithiol gan na allant gael eu dilysu gan archwiliad treth.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Gweithredwyd modiwl Logiau Unalterable oherwydd deddfwriaeth eich gwlad. Gallai analluogi’r modiwl hwn wneud unrhyw drafodion yn y dyfodol yn annilys o ran y gyfraith a’r defnydd o feddalwedd gyfreithiol gan na ellir eu dilysu gan archwiliad treth.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Mae system i olrhain digwyddiadau i mewn i logiau na ellir eu
 BlockedLogDisabled=Mae'r system i olrhain digwyddiadau i mewn i logiau na ellir eu newid wedi'i hanalluogi ar ôl i rywfaint o recordio gael ei wneud. Rydym yn arbed Olion Bysedd arbennig i olrhain y gadwyn fel torri
 BlockedLogDisabledBis=Mae'r system i olrhain digwyddiadau i mewn i logiau na ellir eu newid wedi'i hanalluogi. Mae hyn yn bosibl oherwydd ni wnaed unrhyw gofnod eto.
 LinkHasBeenDisabledForPerformancePurpose=At ddibenion perfformiad, ni ddangosir cyswllt uniongyrchol â'r ddogfen ar ôl y 100fed llinell.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Anfoneb cwsmer wedi'i dileu yn rhesymegol
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Dileu rhesymegol taliad cwsmer
 logPAYMENT_VARIOUS_CREATE=Taliad (heb ei aseinio i anfoneb) wedi'i greu
 logPAYMENT_VARIOUS_DELETE=Taliad (heb ei neilltuo i anfoneb) dileu rhesymegol
 logPAYMENT_VARIOUS_MODIFY=Taliad (heb ei aseinio i anfoneb) wedi'i addasu
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/cy_GB/categories.lang b/htdocs/langs/cy_GB/categories.lang
index 150121a69b3..2aad7b3c53a 100644
--- a/htdocs/langs/cy_GB/categories.lang
+++ b/htdocs/langs/cy_GB/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Ardal tagiau/categorïau cyswllt
 AccountsCategoriesArea=Ardal tagiau/categorïau cyfrif banc
 ProjectsCategoriesArea=Ardal tagiau/categorïau prosiect
 UsersCategoriesArea=Ardal tagiau defnyddiwr/categorïau
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Is-gategorïau
 CatList=Rhestr o dagiau/categorïau
 CatListAll=Rhestr o dagiau/categorïau (pob math)
@@ -90,9 +91,10 @@ CategoriesSetup=Gosod tagiau/categorïau
 CategorieRecursiv=Cysylltwch â thag/categori rhiant yn awtomatig
 CategorieRecursivHelp=Os yw'r opsiwn ymlaen, pan fyddwch chi'n ychwanegu gwrthrych i is-gategori, bydd y gwrthrych hefyd yn cael ei ychwanegu at y categorïau rhiant.
 AddProductServiceIntoCategory=Neilltuo categori i'r cynnyrch / gwasanaeth
-AddCustomerIntoCategory=Neilltuo categori i gwsmer
-AddSupplierIntoCategory=Neilltuo categori i gyflenwr
-AssignCategoryTo=Neilltuo categori i
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Dangos tag/categori
 ByDefaultInList=Yn ddiofyn yn y rhestr
 ChooseCategory=Dewiswch gategori
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Categorïau Cynhwysydd Tudalen
 KnowledgemanagementsCategoriesArea=Categorïau erthygl KM
 UseOrOperatorForCategories=Defnyddiwch weithredwr 'OR' ar gyfer categorïau
 AddObjectIntoCategory=Neilltuo i'r categori
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/cy_GB/companies.lang b/htdocs/langs/cy_GB/companies.lang
index e09fd153ef4..f6b0c9b7269 100644
--- a/htdocs/langs/cy_GB/companies.lang
+++ b/htdocs/langs/cy_GB/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Mae'r wlad y tu mewn i'r Gymuned Economaidd Ewropeaidd
 PriceFormatInCurrentLanguage=Fformat arddangos pris yn yr iaith gyfredol ac arian cyfred
 ThirdPartyName=Enw trydydd parti
 ThirdPartyEmail=E-bost trydydd parti
-ThirdParty=Trydydd parti
-ThirdParties=Trydydd partïon
+ThirdParty=Third party
+ThirdParties=Third parties
 ThirdPartyProspects=Rhagolygon
 ThirdPartyProspectsStats=Rhagolygon
 ThirdPartyCustomers=Cwsmeriaid
@@ -65,6 +65,7 @@ State=Talaith/Talaith
 StateId=ID y wladwriaeth
 StateCode=Cod y Wladwriaeth/Talaith
 StateShort=Cyflwr
+DepartmentBuyer=Buyer's state/province
 Region=Rhanbarth
 Region-State=Rhanbarth - Talaith
 Country=Gwlad
@@ -78,7 +79,7 @@ Chat=Sgwrsio
 PhonePro=Bws. ffôn
 PhonePerso=Pers. ffôn
 PhoneMobile=Symudol
-No_Email=Gwrthod negeseuon e-bost swmp
+No_Email=Refuse mass emails
 Fax=Ffacs
 Zip=Côd post
 Town=Dinas
@@ -382,11 +383,12 @@ ExportCardToFormat=Allforio cerdyn i fformat
 ContactNotLinkedToCompany=Nid yw'r cyswllt yn gysylltiedig ag unrhyw drydydd parti
 DolibarrLogin=Mewngofnod Dolibarr
 NoDolibarrAccess=Dim mynediad i Ddolibarr
-ExportDataset_company_1=Trydydd partïon (cwmnïau/sylfeini/pobl gorfforol) a’u priodweddau
-ExportDataset_company_2=Cysylltiadau a'u heiddo
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Trydydd partïon a'u priodweddau
 ImportDataset_company_2=Cysylltiadau/cyfeiriadau a phriodoleddau ychwanegol trydydd parti
-ImportDataset_company_3=Cyfrifon banc trydydd parti
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Cynrychiolwyr gwerthu trydydd parti (aseinio cynrychiolwyr gwerthu/defnyddwyr i gwmnïau)
 PriceLevel=Lefel Pris
 PriceLevelLabels=Labeli Lefel Pris
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Enw'r rheolwr(wyr) (Prif Swyddog Gweithredol, cyfarwyddwr, llywydd...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Cyfuno trydydd parti
-ConfirmMergeThirdparties=A ydych yn siŵr eich bod am gyfuno'r trydydd parti a ddewiswyd â'r un presennol? Bydd yr holl wrthrychau cysylltiedig (anfonebau, archebion, ...) yn cael eu symud i'r trydydd parti cyfredol, ac ar ôl hynny bydd y trydydd parti a ddewiswyd yn cael ei ddileu.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Mae trydydd partïon wedi'u huno
 SaleRepresentativeLogin=Mewngofnodi cynrychiolydd gwerthu
 SaleRepresentativeFirstname=Enw cyntaf y cynrychiolydd gwerthu
@@ -460,3 +462,6 @@ ExternalSystemID=ID system allanol
 IDOfPaymentInAnExternalSystem=ID y modd talu i mewn i system allanol (fel Stripe, Paypal, ...)
 AADEWebserviceCredentials=Manylion gwasanaeth gwe AADE
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Rhaid i'r trydydd parti fod yn gwsmer i ganiatáu creu ei wybodaeth banc ar ochr Stripe
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/cy_GB/compta.lang b/htdocs/langs/cy_GB/compta.lang
index 97ae6d013d3..835f7dc8f44 100644
--- a/htdocs/langs/cy_GB/compta.lang
+++ b/htdocs/langs/cy_GB/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Taliad anfoneb cwsmer
 PaymentSupplierInvoice=taliad anfoneb y gwerthwr
 PaymentSocialContribution=Taliad treth cymdeithasol/cyllidol
 PaymentVat=Taliad TAW
-AutomaticCreationPayment=Cofnodwch y taliad yn awtomatig
+AutomaticCreationPayment=Also record the payment
 ListPayment=Rhestr o daliadau
 ListOfCustomerPayments=Rhestr o daliadau cwsmeriaid
 ListOfSupplierPayments=Rhestr o daliadau gwerthwr
@@ -118,10 +118,14 @@ SocialContributionsPayments=Taliadau trethi cymdeithasol/cyllidol
 ShowVatPayment=Dangos taliad TAW
 TotalToPay=Cyfanswm i dalu
 BalanceVisibilityDependsOnSortAndFilters=Mae balans i'w weld yn y rhestr hon dim ond os yw'r tabl wedi'i ddidoli ar %s a'i hidlo ar 1 cyfrif banc (heb unrhyw hidlwyr eraill)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Cod cyfrifo cwsmeriaid
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Cod cyfrifo gwerthwr
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Cust. cyfrif. côd
 SupplierAccountancyCodeShort=Sup. cyfrif. côd
+UserAccountancyCodeShort=User account. code
 AccountNumber=Rhif cyfrif
 NewAccountingAccount=Cyfrif newydd
 Turnover=Trosiant wedi'i anfonebu
@@ -129,7 +133,9 @@ TurnoverCollected=Trosiant wedi'i gasglu
 SalesTurnoverMinimum=Isafswm trosiant
 ByExpenseIncome=Trwy dreuliau ac incwm
 ByThirdParties=Gan drydydd partïon
+ByProjects=By projects
 ByUserAuthorOfInvoice=Gan awdur anfoneb
+DetailedListLowercase=detailed list
 CheckReceipt=Slip blaendal
 CheckReceiptShort=Slip blaendal
 LastCheckReceiptShort=Slipiau blaendal diweddaraf %s
diff --git a/htdocs/langs/cy_GB/datapolicy.lang b/htdocs/langs/cy_GB/datapolicy.lang
index 7e0d0dab55d..5d2701e76a5 100644
--- a/htdocs/langs/cy_GB/datapolicy.lang
+++ b/htdocs/langs/cy_GB/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Polisi Preifatrwydd Data
 Module4100Desc = Modiwl i reoli Preifatrwydd Data (Cydymffurfiaeth â'r GDPR)
 # Administration page
 datapolicySetup = Gosod Polisi Preifatrwydd Data Modiwl
-Deletion = Dileu data
-datapolicySetupPage = Yn dibynnu ar gyfreithiau eich gwledydd (Enghraifft <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Erthygl 5</a> o'r GDPR), rhaid cadw data personol am gyfnod heb fod yn hwy na'r hyd y mae angen y data at y diben y'i casglwyd ar ei gyfer, ac eithrio at ddibenion archifol.<br>Bydd y dilead yn cael ei wneud yn awtomatig ar ôl cyfnod penodol heb ddigwyddiadau (yr hyd y byddwch wedi'i nodi isod).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s mis
 ONE_YEAR = 1 flwyddyn
 NB_YEARS = %s mlynedd
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Rhagolygon/Cwsmer
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Na gobaith/Na chwsmer
 DATAPOLICY_CONTACT_FOURNISSEUR = Cyflenwr
 DATAPOLICY_ADHERENT = Aelod
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Gallwch anfon e-bost GDPR at eich holl gysylltiadau perthnasol (nad ydynt wedi derbyn e-bost eto ac nad ydych wedi cofrestru unrhyw beth am eu cytundeb GDPR ar ei gyfer). I wneud hyn, defnyddiwch y botwm canlynol.
 SendAgreement = Anfon e-byst
 AllAgreementSend = Mae pob e-bost wedi'i anfon
 TXTLINKDATAPOLICYACCEPT = Testun ar gyfer y ddolen "cytundeb"
 TXTLINKDATAPOLICYREFUSE = Testun ar gyfer y ddolen "anghytundeb"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR : Prosesu data personol
 DATAPOLICY_consentement = Cafwyd caniatâd i brosesu data personol
diff --git a/htdocs/langs/cy_GB/errors.lang b/htdocs/langs/cy_GB/errors.lang
index 102f29614de..14c5669011e 100644
--- a/htdocs/langs/cy_GB/errors.lang
+++ b/htdocs/langs/cy_GB/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Wedi methu creu cyfeiriadur. Gwiriwch fod gan ddefnyddiwr gweinydd Gwe ganiatâd i ysgrifennu i gyfeiriadur dogfennau Dolibarr. Os yw paramedr <b> safe_mode </b> wedi'i alluogi ar y PHP hwn, gwiriwch fod ffeiliau php Dolibarr yn berchen i ddefnyddiwr gweinydd gwe (neu grŵp).
 ErrorNoMailDefinedForThisUser=Dim post wedi'i ddiffinio ar gyfer y defnyddiwr hwn
 ErrorSetupOfEmailsNotComplete=Nid yw gosod e-byst yn gyflawn
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Mae angen i JavaScript gael ei actifadu i weithio ar y nodwedd hon. Newidiwch hyn yn y gosodiad - arddangos.
 ErrorTopMenuMustHaveAParentWithId0=Ni all dewislen o'r math 'Top' gael dewislen rhiant. Rhowch 0 yn newislen rhiant neu dewiswch ddewislen o'r math 'Chwith'.
 ErrorLeftMenuMustHaveAParentId=Rhaid i ddewislen o'r math 'Chwith' gael ID rhiant.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Llwythiad wedi'i rwystro gan ategyn PHP/Apache.
 ErrorFileSizeTooLarge=Mae maint y ffeil yn rhy fawr neu ni ddarparwyd y ffeil.
 ErrorFieldTooLong=Mae maes %s yn rhy hir.
 ErrorSizeTooLongForIntType=Maint yn rhy hir ar gyfer math int (uchafswm digid %s)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Maint yn rhy hir ar gyfer math o linyn (uchafswm siars %s)
 ErrorNoValueForSelectType=Llenwch y gwerth ar gyfer y rhestr ddethol
 ErrorNoValueForCheckBoxType=Llenwch y gwerth ar gyfer rhestr blychau ticio
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Gwerth gwael ar gyfer cod diogelwch. Ceisiwch eto gyda gwer
 ErrorBothFieldCantBeNegative=Ni all meysydd %s ac %s fod yn negyddol
 ErrorFieldCantBeNegativeOnInvoice=Ni all maes <strong>%s</strong> fod yn negyddol ar y math hwn o anfoneb. Os oes angen i chi ychwanegu llinell ddisgownt, crëwch y gostyngiad yn gyntaf (o'r maes '%s ' mewn cerdyn trydydd parti) a'i gymhwyso i'r anfoneb.
 ErrorLinesCantBeNegativeForOneVATRate=Ni all cyfanswm y llinellau (net o dreth) fod yn negyddol ar gyfer cyfradd TAW nad yw'n nwl a roddir (Canfuwyd cyfanswm negyddol ar gyfer cyfradd TAW <b> %s </b> %%).
-ErrorLinesCantBeNegativeOnDeposits=Ni all llinellau fod yn negyddol mewn blaendal. Byddwch yn wynebu problemau pan fydd angen i chi ddefnyddio'r blaendal yn yr anfoneb derfynol os gwnewch hynny.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Ni all y swm ar gyfer llinell i anfonebau cwsmeriaid fod yn negyddol
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Nid oes gan y cyfrif defnyddiwr <b> %s </b> a ddefnyddir i weithredu gweinydd gwe ganiatâd ar gyfer hynny
 ErrorNoActivatedBarcode=Dim math cod bar wedi'i actifadu
 ErrUnzipFails=Wedi methu dadsipio %s gyda ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Mae eich paramedr PHP upload_max_filesize (%s) yn uwch na pharamedr PHP post_max_size (%s). Nid yw hwn yn drefniant cyson.
 WarningPasswordSetWithNoAccount=Gosodwyd cyfrinair ar gyfer yr aelod hwn. Fodd bynnag, ni chrëwyd unrhyw gyfrif defnyddiwr. Felly mae'r cyfrinair hwn yn cael ei storio ond ni ellir ei ddefnyddio i fewngofnodi i Ddolibarr. Gellir ei ddefnyddio gan fodiwl/rhyngwyneb allanol ond os nad oes angen i chi ddiffinio unrhyw fewngofnodi na chyfrinair ar gyfer aelod, gallwch analluogi opsiwn "Rheoli mewngofnodi ar gyfer pob aelod" o osod modiwl Aelod. Os oes angen i chi reoli mewngofnodi ond nad oes angen unrhyw gyfrinair arnoch, gallwch gadw'r maes hwn yn wag er mwyn osgoi'r rhybudd hwn. Nodyn: Gellir defnyddio e-bost hefyd fel mewngofnodi os yw'r aelod yn gysylltiedig â defnyddiwr.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = Dim ond ar anfonebau a osodwyd i'w talu gyda thaliadau trosglwyddo credyd y gellir ychwanegu anfoneb SwissQR.
 SwissQrCreditorAddressInvalid = Cyfeiriad credydwr yn annilys (a yw ZIP a dinas wedi'u gosod? (%s)
 SwissQrCreditorInformationInvalid = Mae gwybodaeth credydwyr yn annilys ar gyfer IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=Mae %s eisoes wedi'i ddiffinio fel c
 ErrorThisGroupIsAlreadyDefinedAsThisType=Mae'r cysylltiadau â'r grŵp hwn eisoes wedi'u diffinio fel cyswllt ar gyfer y math hwn.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/cy_GB/exports.lang b/htdocs/langs/cy_GB/exports.lang
index afe0bc9e6cf..7c4176e8f9d 100644
--- a/htdocs/langs/cy_GB/exports.lang
+++ b/htdocs/langs/cy_GB/exports.lang
@@ -67,7 +67,7 @@ ChooseFormatOfFileToImport=Dewiswch y fformat ffeil i'w ddefnyddio fel fformat f
 ChooseFileToImport=Llwythwch ffeil i fyny ac yna cliciwch ar yr eicon %s i ddewis ffeil fel ffeil mewnforio ffynhonnell...
 SourceFileFormat=Fformat ffeil ffynhonnell
 FieldsInSourceFile=Meysydd yn y ffeil ffynhonnell
-FieldsInTargetDatabase=Meysydd targed yng nghronfa ddata Dolibarr (bold = gorfodol)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Dim caeau
 MoveField=Symud rhif colofn maes %s
 ExampleOfImportFile=Enghraifft_o_mewnforio_ffeil
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Gwiriwch fod fformat ffeil (amffinyddion maes a llinyn)
 RunSimulateImportFile=Rhedeg Mewnforio Efelychu
 FieldNeedSource=Mae'r maes hwn angen data o'r ffeil ffynhonnell
 SomeMandatoryFieldHaveNoSource=Nid oes gan rai meysydd gorfodol ffynhonnell o ffeil ddata
-InformationOnSourceFile=Gwybodaeth ar ffeil ffynhonnell
-InformationOnTargetTables=Gwybodaeth am feysydd targed
+InformationOnSourceFile=Source file
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Newidiwch o leiaf un maes ffynhonnell yn y golofn meysydd i'w allforio
 SelectFormat=Dewiswch y fformat ffeil mewnforio hwn
 RunImportFile=Mewnforio Data
diff --git a/htdocs/langs/cy_GB/hrm.lang b/htdocs/langs/cy_GB/hrm.lang
index 0ceb21909fb..93b61b7f456 100644
--- a/htdocs/langs/cy_GB/hrm.lang
+++ b/htdocs/langs/cy_GB/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=Safle gofynnol ar gyfer y proffil swydd
-RequiredRankShort=Safle gofynnol
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Swyddi gyda'r proffiliau swydd hwn
-EmployeeRank=Safle gweithiwr ar gyfer y sgil hwn
-EmployeeRankShort=Safle gweithiwr
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Swydd gweithiwr
 EmployeePositions=Swyddi gweithwyr
 EmployeesInThisPosition=Gweithwyr yn y sefyllfa hon
@@ -72,6 +72,9 @@ AddSkill=Ychwanegu sgiliau at broffil swydd
 RequiredSkills=Sgiliau gofynnol ar gyfer y proffil swydd hwn
 UserRank=Safle Defnyddiwr
 SkillList=Rhestr sgiliau
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Cadw rheng
 TypeKnowHow=Gwybod sut
 TypeHowToBe=Sut i fod
@@ -95,3 +98,5 @@ NeedBusinessTravels=Angen teithiau busnes
 NoDescription=Dim disgrifiad
 TheJobProfileHasNoSkillsDefinedFixBefore=Nid oes unrhyw sgil wedi'i ddiffinio ar broffil swydd gwerthusol y gweithiwr hwn. Ychwanegwch sgil(iau), yna dilëwch ac ailgychwynwch y gwerthusiad.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/cy_GB/mails.lang b/htdocs/langs/cy_GB/mails.lang
index 11cff63453d..d0af760d898 100644
--- a/htdocs/langs/cy_GB/mails.lang
+++ b/htdocs/langs/cy_GB/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=E-bostio
 EMailing=E-bostio
-EMailings=E-byst
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=Pob e-bost
+AllEMailings=All mass eMails
 MailCard=Cerdyn e-bost
 MailRecipients=Derbynwyr
 MailRecipient=Derbynnydd
@@ -26,19 +26,19 @@ MailFile=Ffeiliau wedi'u hatodi
 MailMessage=Corff e-bost
 SubjectNotIn=Ddim mewn Pwnc
 BodyNotIn=Ddim yn y Corff
-ShowEMailing=Dangos e-bostio
-ListOfEMailings=Rhestr o negeseuon e-bost
-NewMailing=E-bostio newydd
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Sms newydd
-EditMailing=Golygu e-byst
-ResetMailing=Ail-anfon e-bost
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Dileu e-bostio
-PreviewMailing=Rhagolwg o'r e-bostio
-CreateMailing=Creu e-bostio
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Prawf
-ValidMailing=E-bostio dilys
+ValidMailing=Valid mass Email
 MailingStatusDraft=Drafft
 MailingStatusValidated=Wedi'i ddilysu
 MailingStatusSent=Anfonwyd
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Rhaid i bob hidlydd gyfateb i gael e-bost yn cael ei ga
 LineInFile=Llinell %s yn y ffeil
 RecipientSelectionModules=Ceisiadau diffiniedig ar gyfer dewis derbynnydd
 MailSelectedRecipients=Derbynwyr dethol
-MailingArea=Maes e-byst
-LastMailings=Yr e-byst %s diweddaraf
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Ystadegau targedau
 NbOfCompaniesContacts=Cysylltiadau/cyfeiriadau unigryw
 MailNoChangePossible=Nid oes modd newid y sawl sy'n derbyn e-byst dilys
-SearchAMailing=Chwilio drwy'r post
-SendMailing=Anfon e-bost
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Anfonwyd gan
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Gellir anfon e-bost o'r llinell orchymyn. Gofynnwch i'ch gweinyddwr gweinyddwr lansio'r gorchymyn canlynol i anfon yr e-bost at yr holl dderbynwyr:
 MailingNeedCommand2=Fodd bynnag, gallwch eu hanfon ar-lein trwy ychwanegu paramedr MAILING_LIMIT_SENDBYWEB gyda gwerth uchafswm yr e-byst rydych am eu hanfon fesul sesiwn. Ar gyfer hyn, ewch ymlaen Cartref - Gosod - Arall.
 ConfirmSendingEmailing=Os ydych am anfon e-byst yn uniongyrchol o'r sgrin hon, cadarnhewch eich bod yn siŵr eich bod am anfon e-byst nawr o'ch porwr ?
-LimitSendingEmailing=Nodyn: Anfonir e-byst o ryngwyneb gwe sawl gwaith am resymau diogelwch a goramser, <b> %s </b> derbynwyr ar y tro ar gyfer pob sesiwn anfon.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Rhestr glir
 ToClearAllRecipientsClickHere=Cliciwch yma i glirio'r rhestr derbynwyr ar gyfer yr e-bost hwn
 ToAddRecipientsChooseHere=Ychwanegwch dderbynwyr trwy ddewis o'r rhestrau
-NbOfEMailingsReceived=Derbyniwyd e-byst torfol
-NbOfEMailingsSend=Anfonwyd e-byst torfol
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=Cofnod ID
 DeliveryReceipt=Cludo Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Gallwch ddefnyddio'r gwahanydd atalnod <b> </b> i nodi sawl derbynnydd.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Nid oes unrhyw hysbysiadau e-bost awtomatig wedi'u cyn
 ANotificationsWillBeSent=Bydd 1 hysbysiad awtomatig yn cael ei anfon trwy e-bost
 SomeNotificationsWillBeSent=%s bydd hysbysiadau awtomatig yn cael eu hanfon trwy e-bost
 AddNewNotification=Tanysgrifio i hysbysiad e-bost awtomatig newydd (targed/digwyddiad)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Mae ffurfweddiad anfon e-bost wedi'i osod i '%s'. Ni ellir defnyddio'r modd hwn i anfon e-byst torfol.
 MailSendSetupIs2=Yn gyntaf rhaid i chi fynd, gyda chyfrif gweinyddol, i'r ddewislen %sHome - Gosod - EMails%s i newid paramedr <strong> '%s' a0a65d0709f usefc modec. Gyda'r modd hwn, gallwch chi nodi gosodiad y gweinydd SMTP a ddarperir gan eich Darparwr Gwasanaeth Rhyngrwyd a defnyddio nodwedd e-bostio Offeren.
 MailSendSetupIs3=Os oes gennych unrhyw gwestiynau ar sut i osod eich gweinydd SMTP, gallwch ofyn i %s.
@@ -183,7 +185,7 @@ Information=Gwybodaeth
 ContactsWithThirdpartyFilter=Cysylltiadau â hidlydd trydydd parti
 Unanswered=Heb ateb
 Answered=Atebwyd
-IsNotAnAnswer=Ddim yn ateb (e-bost cychwynnol)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Yn ateb e-bost cychwynnol
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Gwerth rhagosodedig ar gyfer maes '%s' wrth greu cyswllt newydd
@@ -199,6 +201,6 @@ ModelTemplate=Templed e-bost
 YouCanChooseAModelForYouMailContent= Gallwch ddewis un o fodelau templed neu gynhyrchu un gydag AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/cy_GB/main.lang b/htdocs/langs/cy_GB/main.lang
index d6c8b0102d2..3adfad6f9a5 100644
--- a/htdocs/langs/cy_GB/main.lang
+++ b/htdocs/langs/cy_GB/main.lang
@@ -22,7 +22,7 @@ FormatDateShortJQuery=dd/mm/yy
 FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShortJQuery=HH:MI
 FormatHourShort=%I:%M %p
-FormatHourShortDuration=% H: %M
+FormatHourShortDuration=%H:%M
 FormatDateTextShort=%b %d, %Y
 FormatDateText=%B %d, %Y
 FormatDateHourShort=%d/%m/%Y %I:%M %p
@@ -37,6 +37,7 @@ Translation=Cyfieithiad
 Translations=Cyfieithiadau
 CurrentTimeZone=TimeZone PHP (gweinydd)
 EmptySearchString=Rhowch feini prawf chwilio nad ydynt yn wag
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Rhowch feini prawf dyddiad
 NoRecordFound=Heb ganfod cofnod
 NoRecordDeleted=Dim cofnod wedi'i ddileu
@@ -45,6 +46,7 @@ NoError=Dim gwall
 Error=Gwall
 Errors=Gwallau
 ErrorFieldRequired=Mae angen maes '%s'
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Mae gan faes '%s' werth drwg
 ErrorFileDoesNotExists=Nid yw'r ffeil %s yn bodoli
 ErrorFailedToOpenFile=Wedi methu agor y ffeil %s
@@ -308,6 +310,7 @@ DateBuild=Rhoi gwybod am ddyddiad adeiladu
 DatePayment=Dyddiad talu
 DateApprove=Dyddiad cymeradwyo
 DateApprove2=Dyddiad cymeradwyo (ail gymeradwyaeth)
+PendingSince=Pending since
 RegistrationDate=Dyddiad cofrestru
 UserCreation=Defnyddiwr creu
 UserModification=Defnyddiwr addasu
@@ -495,7 +498,7 @@ ActionRunningNotStarted=I ddechrau
 ActionRunningShort=Ar y gweill
 ActionDoneShort=Wedi gorffen
 ActionUncomplete=Anghyflawn
-LatestLinkedEvents=Digwyddiadau cysylltiedig %s diweddaraf
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Cwmni/Sefydliad
 Accountant=Cyfrifydd
 ContactsForCompany=Cysylltiadau ar gyfer y trydydd parti hwn
@@ -503,6 +506,7 @@ ContactsAddressesForCompany=Cysylltiadau/cyfeiriadau ar gyfer y trydydd parti hw
 AddressesForCompany=Cyfeiriadau ar gyfer y trydydd parti hwn
 ActionsOnCompany=Digwyddiadau ar gyfer y trydydd parti hwn
 ActionsOnContact=Digwyddiadau ar gyfer y cyswllt/cyfeiriad hwn
+ActionsOnUser=Events for this user
 ActionsOnContract=Digwyddiadau ar gyfer y contract hwn
 ActionsOnMember=Digwyddiadau am yr aelod hwn
 ActionsOnProduct=Digwyddiadau am y cynnyrch hwn
@@ -720,6 +724,8 @@ TextUsedInTheMessageBody=Corff e-bost
 SendAcknowledgementByMail=Anfon e-bost cadarnhau
 SendMail=Anfon e-bost
 Email=Ebost
+EMail=Email
+EMails=Emails
 NoEMail=Dim e-bost
 AlreadyRead=Wedi darllen yn barod
 NotRead=Heb ei ddarllen
@@ -792,7 +798,7 @@ Notes=Nodiadau
 AddNewLine=Ychwanegu llinell newydd
 AddFile=Ychwanegu ffeil
 FreeZone=Cynnyrch testun rhydd
-FreeLineOfType=Eitem testun rhydd, math:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Clonio gwrthrych gyda'i brif nodweddion
 ReGeneratePDF=Ail-greu PDF
 PDFMerge=Cyfuno PDF
@@ -878,12 +884,14 @@ toward=tuag at
 Access=Mynediad
 SelectAction=Dewiswch weithred
 SelectTargetUser=Dewiswch y defnyddiwr/gweithiwr targed
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Defnyddiwch Ctrl+C i gopïo i'r clipfwrdd
 SaveUploadedFileWithMask=Cadw ffeil ar y gweinydd gyda'r enw " <strong> %s </strong> " (fel arall "%s")
 OriginFileName=Enw ffeil gwreiddiol
 SetDemandReason=Gosod ffynhonnell
 SetBankAccount=Diffinio Cyfrif Banc
 AccountCurrency=Arian cyfred cyfrif
+AccountancyCode=Accounting Code
 ViewPrivateNote=Gweld nodiadau
 XMoreLines=%s llinell(au) wedi'u cuddio
 ShowMoreLines=Dangos mwy/llai o linellau
@@ -924,6 +932,7 @@ ConfirmMassDeletionQuestion=A ydych yn siŵr eich bod am ddileu'r cofnod(au) %s
 ConfirmMassClone=Cadarnhad clôn swmp
 ConfirmMassCloneQuestion=Dewiswch brosiect i glonio iddo
 ConfirmMassCloneToOneProject=Clonio i daflunio %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Gwrthrychau Cysylltiedig
 ClassifyBilled=Dosbarthu Bil
 ClassifyUnbilled=Dosbarthu Heb ei Fil
@@ -960,10 +969,11 @@ PrivateDownloadLinkDesc=Mae angen i chi fod wedi mewngofnodi ac mae angen caniat
 Download=Lawrlwythwch
 DownloadDocument=Lawrlwytho dogfen
 DownloadSignedDocument=Lawrlwythwch ddogfen wedi'i llofnodi
-ActualizeCurrency=Diweddaru cyfradd arian cyfred
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Blwyddyn ariannol
 ModuleBuilder=Adeiladwr Modiwl a Chymhwysiad
 SetMultiCurrencyCode=Gosod arian cyfred
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Gweithrediadau swmp
 ClickToShowHelp=Cliciwch i ddangos cymorth cyngor
 WebSite=Gwefan
@@ -1103,6 +1113,7 @@ PayedBy=Talwyd gan
 PayedTo=Talwyd i
 Monthly=Yn fisol
 Quarterly=Chwarterol
+Quarter=Quarter
 Annual=Blynyddol
 Local=Lleol
 Remote=Anghysbell
@@ -1145,6 +1156,7 @@ ContactDefault_project_task=Tasg
 ContactDefault_propal=Cynnig
 ContactDefault_supplier_proposal=Cynnig Cyflenwr
 ContactDefault_ticket=Tocyn
+ContactDefault_societe=Third party
 ContactAddedAutomatically=Ychwanegwyd cyswllt o rolau cyswllt trydydd parti
 More=Mwy
 ShowDetails=Dangos Manylion
@@ -1187,6 +1199,8 @@ SetSupervisor=Gosod y goruchwyliwr
 CreateExternalUser=Creu defnyddiwr allanol
 ConfirmAffectTag=Aseiniad Tag Swmp
 ConfirmAffectUser=Aseiniad Defnyddiwr Swmp
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=Rōl wedi'i neilltuo ar gyfer pob prosiect/cyfle
 TasksRole=Rôl wedi'i neilltuo ar gyfer pob tasg (os caiff ei defnyddio)
 ConfirmSetSupervisor=Set Swmp Goruchwyliwr
@@ -1238,6 +1252,9 @@ CommercialsAffected=Cynrychiolwyr gwerthu wedi'u neilltuo
 CommercialAffected=Cynrychiolydd gwerthu wedi'i neilltuo
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=Dy neges
 YourMessageHasBeenReceived=Mae eich neges wedi dod i law. Byddwn yn ateb neu'n cysylltu â chi cyn gynted â phosibl.
 UrlToCheck=Url i wirio
@@ -1280,6 +1297,7 @@ AmountSalary=Swm cyflog
 InvoiceSubtype=Is-deip anfoneb
 ConfirmMassReverse=Cadarnhad Swmp Gwrthdroi
 ConfirmMassReverseQuestion=A ydych yn siŵr eich bod am wrthdroi'r %s cofnod(au) a ddewiswyd?
+ConfirmActionXxx=Confirm action %s
 ElementType=Math o elfen
 ElementId=Elfen Id
 Encrypted=Wedi'i amgryptio
@@ -1299,3 +1317,35 @@ AllEntities=All entities
 TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
+auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/cy_GB/members.lang b/htdocs/langs/cy_GB/members.lang
index 333e8a6dea7..e26bdafcffa 100644
--- a/htdocs/langs/cy_GB/members.lang
+++ b/htdocs/langs/cy_GB/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Os oes angen tanysgrifiad, rhaid cofnodi tanysgrifiad g
 DeleteType=Dileu
 VoteAllowed=Caniatawyd pleidlais
 Physical=Unigol
-Moral=Gorfforaeth
-MorAndPhy=Corfforaeth ac Unigol
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Ail-alluogi
 ExcludeMember=Gwahardd aelod
 Exclude=Eithrio
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Ystadegau Aelodau fesul rhanbarth
 NbOfMembers=Cyfanswm yr aelodau
 NbOfActiveMembers=Cyfanswm yr aelodau gweithredol presennol
 NoValidatedMemberYet=Ni chanfuwyd unrhyw aelodau dilys
-MembersByCountryDesc=Mae'r sgrin hon yn dangos ystadegau aelodau fesul gwlad. Mae graffiau a siartiau yn dibynnu ar argaeledd gwasanaeth graffiau ar-lein Google yn ogystal ag argaeledd cysylltiad rhyngrwyd gweithredol.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Mae'r sgrin hon yn dangos ystadegau aelodau fesul gwladwriaeth/taleithiau/canton.
 MembersByTownDesc=Mae'r sgrin hon yn dangos ystadegau aelodau fesul tref.
 MembersByNature=Mae'r sgrin hon yn dangos ystadegau aelodau yn ôl natur i chi.
@@ -208,25 +209,25 @@ NewMemberbyWeb=Ychwanegwyd aelod newydd. Aros am gymeradwyaeth
 NewMemberForm=Ffurflen aelod newydd
 SubscriptionsStatistics=Ystadegau cyfraniadau
 NbOfSubscriptions=Nifer y cyfraniadau
-AmountOfSubscriptions=Swm a gasglwyd o gyfraniadau
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=Trosiant (ar gyfer cwmni) neu Gyllideb (ar gyfer sylfaen)
-DefaultAmount=Swm cyfraniad rhagosodedig (defnyddir dim ond os nad oes swm wedi'i ddiffinio ar lefel math aelod)
-MinimumAmount=Isafswm (a ddefnyddir dim ond pan fydd swm y cyfraniad yn rhad ac am ddim)
-CanEditAmount=Gall yr aelod ddiffinio swm y tanysgrifiad
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=Gall yr ymwelydd ddewis/golygu swm ei gyfraniad waeth beth fo'r math o aelod
 AmountIsLowerToMinimumNotice=Mae'r swm yn is na'r isafswm %s
 MEMBER_NEWFORM_PAYONLINE=Ar ôl cofrestru ar-lein, newidiwch yn awtomatig i'r dudalen talu ar-lein
 ByProperties=Wrth natur
 MembersStatisticsByProperties=Ystadegau aelodau yn ôl natur
-VATToUseForSubscriptions=Cyfradd TAW i'w defnyddio ar gyfer cyfraniadau
-NoVatOnSubscription=Dim TAW ar gyfer cyfraniadau
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Cynnyrch a ddefnyddir ar gyfer llinell gyfraniad i'r anfoneb: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=Enw neu gwmni
 SubscriptionRecorded=Cyfraniad wedi'i gofnodi
 NoEmailSentToMember=Dim e-bost wedi'i anfon at yr aelod
 EmailSentToMember=E-bost wedi'i anfon at aelod yn %s
-SendReminderForExpiredSubscriptionTitle=Anfonwch nodyn atgoffa trwy e-bost ar gyfer cyfraniadau sydd wedi dod i ben
-SendReminderForExpiredSubscription=Anfonwch nodyn atgoffa trwy e-bost at aelodau pan fydd cyfraniad ar fin dod i ben (paramedr yw nifer y dyddiau cyn diwedd aelodaeth i anfon y nodyn atgoffa. Gall fod yn rhestr o ddyddiau wedi'u gwahanu gan hanner colon, er enghraifft '10;5; 0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Talwyd aelodaeth am y cyfnod cyfredol (tan %s)
 YouMayFindYourInvoiceInThisEmail=Mae'n bosibl y bydd eich anfoneb wedi'i hatodi i'r e-bost hwn
 XMembersClosed=%s aelod(au) ar gau
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Trydydd parti yw’r endid cyfreithiol a ddefnyddir
 MemberFirstname=Enw cyntaf aelod
 MemberLastname=Cyfenw aelod
 MemberCodeDesc=Cod Aelodau, sy'n unigryw i bob aelod
-MemberSubscriptionStartFirstDayOf=Mae dyddiad cychwyn aelodaeth yn cyfateb i ddiwrnod cyntaf a
-MemberSubscriptionStartAfter=Isafswm cyfnod cyn i ddyddiad cychwyn tanysgrifiad ddod i rym ac eithrio adnewyddiadau (enghraifft +3m = +3 mis, -5d = -5 diwrnod, +1Y = +1 flwyddyn)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Mae aelodaeth yn gysylltiedig â thrafodiad wedi'i gymodi felly ni chaniateir yr addasiad hwn.
 ConfirmMassSubsriptionCreation=Cadarnhau creu tanysgrifiad
 ConfirmMassSubsriptionCreationQuestion=Ydych chi'n siŵr eich bod am greu'r tanysgrifiad(au) dewisiedig %s?
diff --git a/htdocs/langs/cy_GB/salaries.lang b/htdocs/langs/cy_GB/salaries.lang
index cf956496082..10820410edd 100644
--- a/htdocs/langs/cy_GB/salaries.lang
+++ b/htdocs/langs/cy_GB/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Cyflog newydd
 AddSalary=Ychwanegu cyflog
 NewSalaryPayment=Cerdyn cyflog newydd
 AddSalaryPayment=Ychwanegu taliad cyflog
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Taliad cyflog
 SalariesPayments=Taliadau cyflogau
 SalariesPaymentsOf=Taliadau cyflogau o %s
@@ -27,7 +29,7 @@ FillFieldFirst=Llenwch y maes gweithiwr yn gyntaf
 UpdateAmountWithLastSalary=Swm penodol o gyflog diwethaf
 MakeTransferRequest=Gwneud cais trosglwyddo
 VirementOrder=Cais am drosglwyddo credyd
-BankTransferAmount=Swm y trosglwyddiad credyd
 WithdrawalReceipt=Gorchymyn trosglwyddo credyd
 OrderWaiting=Archeb yn yr arfaeth
 FillEndOfMonth=Llenwch â diwedd y mis
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/cy_GB/website.lang b/htdocs/langs/cy_GB/website.lang
index a030926feda..6fdd8c0ea8a 100644
--- a/htdocs/langs/cy_GB/website.lang
+++ b/htdocs/langs/cy_GB/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Defnyddiwch yma restr o enwau/aliasau eraill fel y gellir c
 WEBSITE_CSS_URL=URL y ffeil CSS allanol
 WEBSITE_CSS_INLINE=Cynnwys ffeil CSS (cyffredin i bob tudalen)
 WEBSITE_JS_INLINE=Cynnwys ffeil JavaScript (cyffredin i bob tudalen)
-WEBSITE_HTML_HEADER=Ychwanegiad ar waelod Pennawd HTML (cyffredin i bob tudalen)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Ffeil robot (robots.txt)
 WEBSITE_HTACCESS=Gwefan .htaccess ffeil
 WEBSITE_MANIFEST_JSON=Ffeil manifest.json gwefan
@@ -56,16 +56,17 @@ ReadPerm=Darllen
 WritePerm=Ysgrifennu
 TestDeployOnWeb=Profi/defnyddio ar y we
 PreviewSiteServedByWebServer= <u> Rhagolwg %s mewn tab newydd. </u> <br> <br> Bydd yr %s yn cael ei wasanaethu gan weinydd gwe allanol (fel Apache, Nginx, IIS). Mae'n rhaid i chi osod a gosod y gweinydd hwn o'r blaen i bwyntio at y cyfeiriadur: <br> <strong> %s </strong> URL a wasanaethir gan weinydd allanol: a0397bfcf a0342603 a0342bz03 a0342bfcf a03470604 a0342bz03606fcf a0342bz0
-PreviewSiteServedByDolibarr= <u> Rhagolwg %s mewn tab newydd. </u> <br> <br> Bydd yr %s yn cael ei wasanaethu gan weinydd Dolibarr felly nid oes angen unrhyw weinydd gwe ychwanegol (fel Apache, Nginx, IIS) i'w osod. <br> Yr anghyfleus yw nad yw URLau tudalennau yn hawdd eu defnyddio a dechreuwch gyda llwybr eich Dolibarr. <br> URL wasanaethir gan Dolibarr: <br> <strong> %s </strong> <br> <br> I ddefnyddio eich gweinydd gwe allanol eu hunain i wasanaethu wefan hon, yn creu llu rhithwir ar eich gweinydd gwe bod pwyntiau ar gyfeiriadur <br> <strong> %s </strong> <br> yna rhowch enw'r hwn gweinydd rhithwir ym mhhriodweddau'r wefan hon a chliciwch ar y ddolen "Test/Deploy on the web".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL y gwesteiwr rhithwir a wasanaethir gan weinydd gwe allanol heb ei ddiffinio
 NoPageYet=Dim tudalennau eto
 YouCanCreatePageOrImportTemplate=Gallwch greu tudalen newydd neu fewnforio templed gwefan llawn
 SyntaxHelp=Cymorth ar awgrymiadau cystrawen penodol
 YouCanEditHtmlSourceckeditor=Gallwch olygu cod ffynhonnell HTML gan ddefnyddio'r botwm "Ffynhonnell" yn y golygydd.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Ar gyfer delwedd a rennir gyda dolen rhannu (mynediad agored gan ddefnyddio'r allwedd rhannu hash o ffeil), cystrawen yw: <br> <strong> &lt;img src="/viewimage.php?hashp=123456790012..."
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Mwy o enghreifftiau o HTML neu god deinamig ar gael ar <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">dogfennaeth wici</a> >.<br>
 ClonePage=Tudalen clonio/cynhwysydd
 CloneSite=Safle clôn
@@ -87,15 +88,15 @@ WebsiteAccount=Cyfrif gwefan
 WebsiteAccounts=Cyfrifon gwefan
 AddWebsiteAccount=Creu cyfrif gwefan
 BackToListForThirdParty=Yn ôl i'r rhestr ar gyfer y trydydd parti
-DisableSiteFirst=Analluoga'r wefan yn gyntaf
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Teitl fy ngwefan
 AnotherContainer=Dyma sut i gynnwys cynnwys tudalen/cynhwysydd arall (efallai bod gennych chi wall yma os ydych chi'n galluogi cod deinamig oherwydd efallai nad yw'r is-gynhwysydd wedi'i fewnosod yn bodoli)
 SorryWebsiteIsCurrentlyOffLine=Mae'n ddrwg gennym, nid yw'r wefan hon ar-lein ar hyn o bryd. Dewch yn ôl yn nes ymlaen...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Galluogi'r tabl i storio cyfrifon gwefan (mewngofnodi/pasio) ar gyfer pob gwefan / trydydd parti
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Yn gyntaf rhaid i chi ddiffinio'r dudalen Hafan rhagosodedig
-OnlyEditionOfSourceForGrabbedContentFuture=Rhybudd: Mae creu tudalen we trwy fewnforio tudalen we allanol wedi'i gadw ar gyfer defnyddwyr profiadol. Yn dibynnu ar gymhlethdod y dudalen ffynhonnell, gall canlyniad mewnforio fod yn wahanol i'r gwreiddiol. Hefyd, os yw'r dudalen ffynhonnell yn defnyddio arddulliau CSS cyffredin neu JavaScript sy'n gwrthdaro, gall dorri edrychiad neu nodweddion golygydd y Wefan wrth weithio ar y dudalen hon. Mae'r dull hwn yn ffordd gyflymach o greu tudalen ond argymhellir creu eich tudalen newydd o'r dechrau neu o dempled tudalen a awgrymir.<br>Sylwch hefyd efallai na fydd y golygydd mewnol yn gweithio cywirdeb pan gaiff ei ddefnyddio ar dudalen allanol a gipiwyd.
-OnlyEditionOfSourceForGrabbedContent=Dim ond argraffiad o ffynhonnell HTML sy'n bosibl pan gipiwyd cynnwys o wefan allanol
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Cydio hefyd delweddau a ddarganfuwyd i mewn i css a thudalen.
 ImagesShouldBeSavedInto=Dylid cadw delweddau yn y cyfeiriadur
 WebsiteRootOfImages=Cyfeiriadur gwraidd ar gyfer delweddau gwefan
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Remove filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Categories
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 904fcb4f336..78f4868f7b2 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Kontrol af filernes integritet er bestået, m
 FileIntegritySomeFilesWereRemovedOrModified=Kontrol af filernes integritet mislykkedes. Nogle filer er ændret, fjernet eller tilføjet.
 GlobalChecksum=Global kontrolsum
 MakeIntegrityAnalysisFrom=Lav integritets kontrol af programfiler fra
-LocalSignature=Lokal signatur (mindre pålidelig)
-RemoteSignature=Fjernsignatur (mere pålidelig)
+LocalSignature=Indlejret lokal signatur
+RemoteSignature=Fjern signatur
 FilesMissing=Manglende filer
 FilesUpdated=Opdaterede filer
 FilesModified=Ændrede filer
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Bruges kun af nogle dagsorden muligheder
 Security=Sikkerhed
 Passwords=Adgangskoder
 DoNotStoreClearPassword=Krypter adgangskoder gemt i databasen.
-MainDbPasswordFileConfEncrypted=Krypter database adgangskode gemt i conf.php. Det anbefales kraftigt at aktivere denne mulighed.
+MainDbPasswordFileConfEncrypted=Tilsløring af databaseadgangskoden, der er gemt i conf.php. Det anbefales at aktivere denne mulighed.
 InstrucToEncodePass=For at få adgangskoden indkodet i filen <b>conf.php</b>, skal du erstatte linjen<br><b>$dolibarr_main_db_pass="..."; </b><br>med <br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=For at få adgangskoden afkodet (dekrypteret) i filen <b>conf.php</b>, skal du udskifte linjen<br><b>$dolibarr_main_db_pass";</b><br>med<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Beskyt genererede PDF-filer. Dette anbefales IKKE, da det bryder masse generering af PDF.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometrisk punkt
 ExtrafieldMultiPointGeo=Geometrisk multipunkt
 ExtrafieldLinestringGeo=Geometrisk linjestreng
 ExtrafieldPolygonGeo=Geometrisk polygon
+ExtrafieldStars=Stjerner
 ComputedFormula=Beregnet felt
-ComputedFormulaDesc=Du kan her indtaste en formel ved hjælp af andre egenskaber for objektet eller enhver PHP-kodning for at få en dynamisk beregnet værdi. Du kan bruge alle PHP-kompatible formler inklusive "?" betingelsesoperator og følgende globale objekt: <strong> $db, $conf, $langs, $mysoc, $user, $objectoffield </strong> . <br> <strong> ADVARSEL </strong> : Hvis du har brug for egenskaber for et objekt, der ikke er indlæst, skal du bare hente objektet ind i din formel som i det andet eksempel. <br> Brug af et beregnet felt betyder, at du ikke kan indtaste dig selv nogen værdi fra grænsefladen. Hvis der er en syntaksfejl, vil formlen muligvis ikke returnere noget. <br> <br> Eksempel på formel: <br> $objectoffield->id < 10 ? round($objectoffield-> id / 2, 2): ($objectoffield->id + 2 *$user->oc, 1,2) ) <br> <br> Eksempel på genindlæsning af objekt <br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoftionsfield_>id)' >$rebjreoptions]field->id-$' > ->hovedstad / 5: '-1') <br> <br> Andet eksempel på formel til at tvinge belastning af objektet og dets overordnede objekt: <br> (($reloadedobj = new Task($db)) && ($reloadfield ->id) > 0) && ($secondloadedobj = nyt projekt($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Overordnet projekt blev ikke fundet'
+ComputedFormulaDesc=Du kan her indtaste en formel ved hjælp af andre egenskaber for objektet eller enhver PHP-kodning for at få en dynamisk beregnet værdi. Du kan bruge alle PHP-kompatible formler inklusive "?" betingelsesoperator og følgende globale objekt: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>ADVARSEL</strong>: Hvis du har brug for egenskaber for et objekt, er det bare ikke indlæst hent selv objektet ind i din formel som i det andet eksempel.<br>Brug af et beregnet felt betyder, at du ikke kan indtaste dig selv nogen værdi fra grænsefladen. Hvis der er en syntaksfejl, returnerer formlen muligvis ikke noget.<br><br>Eksempel på formel:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Eksempel på genindlæsning af objekt<br>((($reloadedobj = new Societe($db)) && $reloadedobj->fetchNoCompute($objectoffield) ->id) > 0) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->kapital / 5: '-1')<br><br> Andet eksempel på formel til at tvinge belastning af objektet og dets overordnede objekt:<br>(($reloadedobj = ny opgave($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = nyt projekt($db) )) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Overordnet projekt blev ikke fundet'
 Computedpersistent=Gem beregnet felt
 ComputedpersistentDesc=Beregnet ekstra felter vil blive gemt i databasen, dog vil værdien først blive genberegnet, når objektet i dette felt ændres. Hvis det beregnede felt afhænger af andre objekter eller globale data, kan denne værdi være forkert!!
 ExtrafieldParamHelpPassword=At lade dette felt stå tomt betyder, at denne værdi vil blive gemt UDEN kryptering (feltet er bare skjult med stjerner på skærmen).<br><br>Enter værdi 'dolcrypt' for at indkode værdi med en reversibel krypteringsalgoritme. Tydelige data kan stadig kendes og redigeres, men de er krypteret i databasen.<br><br>Indtast 'auto' (eller 'md5', 'sha256', 'password_hash', ...) for at bruge standardkodeordskrypteringsalgoritmen (eller md5, sha256, password_hash...) for at gemme den ikke-reversible hashed-kodeord i databasen (ingen måde at hente den oprindelige værdi på)
@@ -519,7 +520,7 @@ WarningPHPMailB=- Hvis domænet for din e-mail (delen af mitmaildomæne.com til
 WarningPHPMailC=- Det er også interessant at bruge SMTP-serveren fra din egen e-mail-tjenesteudbyder til at sende e-mails, så alle e-mails, der sendes fra applikationen, vil også blive gemt i din "Sendte" mappe i din postkasse.
 WarningPHPMailD=Det anbefales derfor at ændre afsendelsesmetoden for e-mails til værdien "SMTP".
 WarningPHPMailDbis=Hvis du virkelig vil beholde standardmetoden "PHP" til at sende e-mails, skal du bare ignorere denne advarsel eller fjerne den ved at %sklikke her%s.
-WarningPHPMail2=Hvis din e-mail SMTP-udbyder har brug for at begrænse e-mail klienten til nogle IP-adresser (meget sjældent), er dette IP-adressen på mailbrugeragenten (MUA) til din ERP CRM-applikation: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=Hvis domænenavnet i din afsender-e-mailadresse er beskyttet af en SPF-record (spørg din domænenavnsregistrator), skal du tilføje følgende IP'er eller indtastning i SPF-posten for dit domænes DNS:  <strong>%s</strong>.
 WarningPHPMailSPFDMARC=Hvis domænenavnet i din afsender-e-mailadresse er beskyttet af en anden DMARC-record end p=none (spørg din domænenavnsregistrator), skal du fjerne din DMARC-record eller indstille den til p=none like do @gmail.com) eller bruge at sende en anden metode.
 SPFAndDMARCInformation=SPF- og DMARC-DNS-post for hoved-e-mailadresser
@@ -567,8 +568,8 @@ Module10Name=Regnskab (forenklet)
 Module10Desc=Simple regnskabsrapporter (journaler, omsætning) baseret på databaseindhold. Bruger ikke nogen hovedbogs tabel.
 Module20Name=Tilbud
 Module20Desc=Tilbudshåndtering
-Module22Name=Masse e-mails
-Module22Desc=Administrer masse e-mailing
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energi
 Module23Desc=Overvågning af energiforbrug
 Module25Name=Salgsordrer
@@ -847,10 +848,10 @@ Permission212=Bestil linjer
 Permission213=Aktiver linje
 Permission214=Opsætning af telefoni
 Permission215=Opsætning af udbydere
-Permission221=Læs e-mails
-Permission222=Opret/rediger e-mails (emne, modtagere...)
-Permission223=Valider e-mails (tillader afsendelse)
-Permission229=Slet e-mails
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Se modtagere og info
 Permission238=Send mails manuelt
 Permission239=Slet mails efter validering eller sendt
@@ -1105,6 +1106,7 @@ DictionaryStaff=Antal medarbejdere
 DictionaryAvailability=Leveringsforsinkelse
 DictionaryOrderMethods=Bestillingsmetoder
 DictionarySource=Oprindelse af tilbud/ordrer
+DictionaryAccountancyReport=Personlige regnskabsrapporter
 DictionaryAccountancyCategory=Personlige grupper til rapporter
 DictionaryAccountancysystem=Modeller til kontoplan
 DictionaryAccountancyJournal=Bogføringsjournaler
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Tilbage til ordbogslisten
 TypeOfRevenueStamp=Type af stempelmærker
 VATManagement=Sales Tax Management
 VATIsUsedStandard=Ved oprettelse af dokumenter (forslag, fakturaer, ordrer...), er standardmomssatsen fastsat i henhold til standardreglerne (afhængigt af sælger- og køberlande)
-VATIsUsedDesc=Som standard ved oprettelse af forslag, fakturaer, ordrer osv. følger momssatsen den aktive standardregel:<br>Hvis sælgeren ikke er underlagt moms, er momsen som standard 0 . Slut på regel.<br>Hvis (sælgers land = købers land), er momsen som standard lig med momsen for produktet i sælgers land. Slut på regel.<br>Hvis sælger og køber begge er i Det Europæiske Fællesskab, og varer er transportrelaterede produkter (transport, forsendelse, flyselskab), er standardmomsen 0. Denne reglen afhænger af sælgers land - kontakt venligst din revisor. Momsen skal betales af køberen til toldkontoret i deres land og ikke til sælgeren. Slut på regel.<br>Hvis sælger og køber begge er i Det Europæiske Fællesskab, og køberen ikke er en virksomhed (med et registreret momsnummer inden for Fællesskabet), vil momsen som standard være momssatsen i sælgers land. Slut på regel.<br>Hvis sælger og køber begge er i Det Europæiske Fællesskab, og køberen er en virksomhed (med et registreret momsnummer inden for Fællesskabet), er momsen 0 som standard. Slut på regel.<br>I alle andre tilfælde er den foreslåede standard Moms=0. Slut på reglen.
+VATIsUsedDesc=Som standard ved oprettelse af forslag, fakturaer, ordrer osv. følger momssatsen den aktive standardregel:<br>Hvis sælgeren ikke er underlagt moms, er momsen som standard 0 Slut på regel.<br>Hvis køber angiver eller. provinsen har en momsregel fra momssatsordbogen, så er det standardmomssatsen. Slut på reglen.<br>Hvis (sælgers land = købers land), er momsen som standard lig med momsen for produktet i sælgers land. Slut på regel.<br>Hvis sælger og køber begge er i Det Europæiske Fællesskab, og varer er transportrelaterede produkter (transport, forsendelse, flyselskab), er standardmomsen 0. Denne reglen afhænger af sælgers land - kontakt venligst din revisor. Momsen skal betales af køberen til toldkontoret i deres land og ikke til sælgeren. Slut på regel.<br>Hvis sælger og køber begge er i Det Europæiske Fællesskab, og køberen ikke er en virksomhed (med et registreret momsnummer inden for Fællesskabet), vil momsen som standard være momssatsen i sælgers land. Slut på regel.<br>Hvis sælger og køber begge er i Det Europæiske Fællesskab, og køberen er en virksomhed (med et registreret momsnummer inden for Fællesskabet), er momsen 0 som standard. Slut på regel.<br>I alle andre tilfælde er den foreslåede standard Moms=0. Slut på reglen.
 VATIsNotUsedDesc=Som standard er den foreslåede momssats 0, som kan bruges af mange foreninger, enkeltpersoner eller små virksomheder.
 VATIsUsedExampleFR=I Frankrig betyder det virksomheder eller organisationer, der har et reelt skattesystem (forenklet reelt eller normalt reelt). Et system, hvor der angives moms.
 VATIsNotUsedExampleFR=I Frankrig betyder det foreninger, der ikke er angivet omsætningsafgift, eller virksomheder, organisationer eller liberale erhverv, der har valgt mikrovirksomhedens skattesystem (omsætningsafgift i franchise) og betalt en franchiseomsætningsafgift uden nogen momsangivelse. Dette valg vil vise referencen "Ikke relevant moms - art-293B of CGI" på fakturaer.
-VATType=Skatteart
+VATType=Skatteforbrug
 ##### Local Taxes #####
 TypeOfSaleTaxes=Momstype
 LTRate=Sats
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=I henhold til opsætningen af skatter (se %s - %s - %s
 LabelUsedByDefault=Etiket som bruges som standard, hvis der ikke kan findes en oversættelse af koden
 LabelOnDocuments=Etiket på dokumenter
 LabelOrTranslationKey=Etiket eller oversættelsesnøgle
+LabelTranslatedInCurrentLanguage=Etiket oversat til det aktuelle sprog
 TranslationFound=Oversættelse fundet
 TheTranslationIsSearchedFromKey=Oversættelsen søges fra oversættelsesnøglen: <b>%s</b>
 TranslationKey=Oversættelsesnøgle
@@ -1431,7 +1434,7 @@ AddVatInList=Vis kundens/leverandørens momsnummer i kombinationslister.
 AddAdressInList=Vis kunde-/leverandøradresse i kombinationslister.<br>Tredjeparter vises med navneformatet "The Big Company corp. - 21 jump street 123456 Big town - USA" i stedet for " The Big Company Corp".
 AddEmailPhoneTownInContactList=Vis kontakt-e-mail (eller telefoner, hvis de ikke er defineret) og by i kombinationslister.<br>Kontaktpersoner vises med navneformatet "Dupond Durand - dupond.durand@example.com - Paris " eller "Dupond Durand - 06 07 59 65 66 - Paris" i stedet for "Dupond Durand".
 AskForPreferredShippingMethod=Spørg om foretrukket forsendelsesmetode for tredjeparter.
-FieldEdition=Udgave af felt %s
+FieldEdition=Ændring af felt %s
 FillThisOnlyIfRequired=Eksempel: +2 (udfyld kun, hvis der er problemer med tidszone forskydning)
 GetBarCode=Få stregkode
 NumberingModules=Nummererings modeller
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Tving fakturadato til godkendelsesdato
 SuggestedPaymentModesIfNotDefinedInInvoice=Foreslået betalingsmetode på faktura som standard, hvis den ikke er defineret på fakturaen
 SuggestPaymentByRIBOnAccount=Foreslå betaling ved hævning på konto
 SuggestPaymentByChequeToAddress=Foreslå betaling med check til
+InvoicePaymentManageStructuredCommunication=Generer struktureret kommunikation til fakturabetaling
+InvoicePaymentManageStructuredCommunicationHelp=I nogle lande er det nødvendigt at vise en struktureret reference for at lette betalinger og deres afstemning
 FreeLegalTextOnInvoices=Fritekst på fakturaer
 WatermarkOnDraftInvoices=Vandmærke på udkast til fakturaer (ingen, hvis tom)
 PaymentsNumberingModule=Betalingsnummereringsmodel
@@ -1718,6 +1723,7 @@ CompressionOfResources=Komprimering af HTTP svar
 CompressionOfResourcesDesc=For eksempel ved at bruge Apache direktivet "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=En sådan automatisk registrering er ikke mulig med nuværende browsere
 DefaultValuesDesc=Her kan du definere den standardværdi, du ønsker at bruge, når du opretter en ny post, og/eller standardfiltre eller sorteringsrækkefølgen, når du angiver poster.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Standardværdier (til brug på formularer)
 DefaultSearchFilters=Standard søgefiltre
 DefaultSortOrder=Standard sorteringsrækkefølger
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Forsendelsnummererings moduler
 SendingsAbility=Support følgeseddel til kundeleverancer
 NoNeedForDeliveryReceipts=I de fleste tilfælde bruges følgesedler både som plukliste til kundeleverancer (liste over varer, der skal sendes) og dokument der modtages og underskrives af kunden. Derfor er kvitteringen for vareleverancer en duplikeret funktion og er sjældent aktiveret.
 FreeLegalTextOnShippings=Fritekst på forsendelser
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Følgeseddelsnummereringsmodul
 DeliveryOrderModel=Følgeseddelmodel
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Fritekst på følgesedler
 ##### FCKeditor #####
 AdvancedEditor=Avanceret editor
 ActivateFCKeditor=Aktiver avanceret editor for:
-FCKeditorForNotePublic=WYSIWYG oprettelse/udgave af feltet "offentlige noter" af elementer
-FCKeditorForNotePrivate=WYSIWYG oprettelse/udgave af feltet "private notes" af elementer
-FCKeditorForCompany=WYSIWYG oprettelse/udgave af feltbeskrivelsen af elementer (undtagen produkter/tjenester)
-FCKeditorForProductDetails=WYSIWYG oprettelse/udgave af produktbeskrivelse eller linjer til objekter (linjer med forslag, ordrer, fakturaer, osv...).
+FCKeditorForNotePublic=WYSIWYG oprettelse/ændring af feltet "offentlige noter" af elementer
+FCKeditorForNotePrivate=WYSIWYG oprettelse/ændring af feltet "private notes" af elementer
+FCKeditorForCompany=WYSIWYG oprettelse/ændring af feltbeskrivelsen af elementer (undtagen produkter/tjenester)
+FCKeditorForProductDetails=WYSIWYG oprettelse/ændring af produktbeskrivelse eller linjer for objekter (linjer af forslag, ordrer, fakturaer, osv...).
 FCKeditorForProductDetails2=Advarsel: Brug af denne mulighed til dette tilfælde anbefales seriøst ikke, da det kan skabe problemer med specialtegn og sideformatering, når du bygger PDF-filer.
-FCKeditorForMailing= WYSIWYG oprettelse/udgave til masse-e-mails (Værktøjer->e-mailing)
-FCKeditorForUserSignature=WYSIWYG oprettelse/udgave af brugersignatur
-FCKeditorForMail=WYSIWYG oprettelse/udgave for al post (undtagen Værktøjer->e-mailing)
-FCKeditorForTicket=WYSIWYG oprettelse/udgave for billetter
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG oprettelse/ændring af brugersignatur
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG oprettelse/ændring af billetter
 ##### Stock #####
 StockSetup=Opsætning af lagermodul
 IfYouUsePointOfSaleCheckModule=Hvis du bruger Point of Sale-modulet (POS), der leveres som standard, eller et eksternt modul, kan denne opsætning blive ignoreret af dit POS-modul. De fleste POS-moduler er som standard designet til at oprette en faktura med det samme og reducere lagerbeholdningen uanset mulighederne her. Så hvis du har brug for eller ikke at have en lagernedgang, når du registrerer et salg fra din POS, så tjek også din POS-modulopsætning.
@@ -1867,7 +1874,6 @@ Buy=Købe
 Sell=Sælge
 InvoiceDateUsed=Fakturadato brugt
 YourCompanyDoesNotUseVAT=Din virksomhed er blevet defineret til ikke at bruge moms (Hjem - Opsætning - Virksomhed/Organisation), så der er ingen momsmuligheder at sætte op.
-AccountancyCode=Regnskabskode
 AccountancyCodeSell=Salgskonto. kode
 AccountancyCodeBuy=Købskonto. kode
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Hold afkrydsningsfeltet "Opret automatisk betalingen" tomt som standard, når du opretter en ny skat
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Hvilken visning vil du som standard åbne, når du vælger
 AGENDA_EVENT_PAST_COLOR = Farve på tidligere begivenheder
 AGENDA_EVENT_CURRENT_COLOR = Aktuel begivenhedsfarve
 AGENDA_EVENT_FUTURE_COLOR = Fremtidig begivenhed farve
-AGENDA_REMINDER_BROWSER = Aktiver hændelsespåmindelse <b>på brugerens browser</b> (Når påmindelsesdatoen er nået, vises en pop op af browseren. Hver bruger kan deaktivere sådanne meddelelser fra sin browsermeddelelsesopsætning).
+AGENDA_REMINDER_BROWSER = Tillad begivenhedspåmindelser <b>i brugerens browser</b>
+AGENDA_REMINDER_BROWSERHelp = Når påmindelsesdatoen er nået, vises en popup af browseren). Påmind mulighed/forsinkelse defineres af brugeren ved oprettelse af begivenhed.
 AGENDA_REMINDER_BROWSER_SOUND = Aktiver lydmeddelelse
-AGENDA_REMINDER_EMAIL = Aktiver begivenhedspåmindelse <b>via e-mails</b> (påmindelsesmulighed/forsinkelse kan defineres for hver begivenhed).
+AGENDA_REMINDER_EMAIL = Tillad begivenhedspåmindelser <b>via e-mails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Bemærk: Hyppigheden af det planlagte job %s skal være nok til at være sikker på, at påmindelsen sendes på det rigtige tidspunkt.
 AGENDA_SHOW_LINKED_OBJECT = Vis linket objekt i tidsplanvisning
 AGENDA_USE_EVENT_TYPE = Brug begivenhedstyper (administreret i menuen Opsætning -> Ordbøger -> Tidsplan begivenheds typer)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Indstil automatisk denne standardværdi for begivenhedstype i begivenhedsoprettelsesformularen
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Brug standardpåmindelse om disse begivenheder
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = Formularen til automatisk påmindelse vil blive udfyldt som standard ved oprettelse af begivenheden
+AGENDA_DEFAULT_REMINDER_OFFSET = Standard påmindelsesperiode før begivenheden
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = E-mailskabelon, der skal bruges til standardpåmindelse
 PasswordTogetVCalExport = Nøgle til at godkende eksportlink
 PastDelayVCalExport=Eksporter ikke begivenhed ældre end
 SecurityKey = Sikkerhedsnøgle
@@ -2006,7 +2017,7 @@ BackupZipWizard=Guiden til at opbygge arkivet af dokumenter
 SomethingMakeInstallFromWebNotPossible=Installation af eksternt modul er ikke mulig fra webgrænsefladen af følgende årsag:
 SomethingMakeInstallFromWebNotPossible2=Af denne grund er processen til opgradering beskrevet her en manuel proces, som kun en privilegeret bruger kan udføre.
 InstallModuleFromWebHasBeenDisabledContactUs=Installation eller udvikling af eksterne moduler eller dynamiske websteder fra applikationen er i øjeblikket låst af sikkerhedsmæssige årsager. Kontakt os venligst, hvis du har brug for at aktivere denne funktion.
-InstallModuleFromWebHasBeenDisabledByFile=Installation af eksternt modul fra applikationen er blevet deaktiveret af din administrator. Du skal bede ham om at fjerne filen <strong>%s</strong> for at tillade denne funktion.
+InstallModuleFromWebHasBeenDisabledByFile=Installation af eksternt modul fra applikation og brug af funktioner, der tillader at køre kode på serveren, er blevet deaktiveret af din administrator. Du skal bede ham om at fjerne filen <strong>%s</strong> for at tillade dette funktion.
 ConfFileMustContainCustom=Installation eller opbygning af et eksternt modul fra applikationen skal gemme modulfilerne i mappen <strong>%s</strong>. For at få denne mappe behandlet af Dolibarr, skal du konfigurere din <strong>conf/conf.php</strong> for at tilføje de 2 direktivlinjer:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Fremhæv tabellinjer, når musen bevæges over
 HighlightLinesColor=Fremhæv farven på linjen, når musen bevæges over (brug 'ffffff' for ingen fremhævelse)
@@ -2036,6 +2047,7 @@ Enter0or1=Indtast 0 eller 1
 EnterYesOrNo=Indtast Ja eller Nej
 UnicodeCurrency=Indtast her mellem firkantede parenteser, liste over byte nummer, der repræsenterer valutasymbolet. For eksempel: for $, indtast [36] - for Brasiliansk real R$ [82,36] - for €, indtast [8364]
 ColorFormat=RGB-farven er i HEX-format, f.eks.: FF0000
+NumberFormatForATotalPrice=Talformat for den samlede pris %s
 PictoHelp=Ikonnavn i formatet:<br>- image.png for en billedfil til den aktuelle temamappe<br>- image.png@module hvis filen er i mappen /img/ i et modul<br>- fa-xxx for en FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size for et FontAwesome fa-xxx-billede (med præfiks, farve og størrelse indstillet)
 PositionIntoComboList=Placering af linje i kombinationslister
 SellTaxRate=momssats
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Skjul kolonnen samle
 MAIN_PDF_NO_SENDER_FRAME=Skjul kanter på afsenderadresserammen
 MAIN_PDF_NO_RECIPENT_FRAME=Skjul kanter på modtageradresserammen
 MAIN_PDF_HIDE_CUSTOMER_CODE=Skjul kundekode
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Skjul kundekontokode
 MAIN_PDF_HIDE_SENDER_NAME=Skjul afsender/virksomhedsnavn i adresseblok
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Skjul betalingsbetingelser
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Skjul betalingsmåde
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Tilføj en skjult markering i signaturområdet for at tillade elektronisk signaturværktøj at genbruge det. Kan bruges af eksterne værktøjer eller i fremtiden af online signaturfunktionen.
@@ -2324,6 +2341,8 @@ NotRecommended=Ikke anbefalet
 ARestrictedPath=En eller anden begrænset sti til datafiler
 CheckForModuleUpdate=Se efter opdateringer til eksterne moduler
 CheckForModuleUpdateHelp=Denne handling vil oprette forbindelse til redaktører af eksterne moduler for at kontrollere om en ny version er tilgængelig.
+CheckForModuleUpdateHelp2=Der oprettes også en forbindelse til %s for at kontrollere, om nogle af dine eksterne moduler er blevet rapporteret som malware af fællesskabet.
+YourIPWillBeRevealedToThisExternalProviders=Din IP vil blive afsløret til alle disse eksterne udbydere.
 ModuleUpdateAvailable=En opdatering er tilgængelig
 NoExternalModuleWithUpdate=Ingen opdateringer fundet for eksterne moduler
 SwaggerDescriptionFile=Swagger API beskrivelsesfil (til brug med for eksempel redoc)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Vis leveringsadresse
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Obligatorisk angivelse i nogle lande (Frankrig, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Vis faktureringskontakt på forslag
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=Som standard vises kontakten kun til fakturering
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=URL-link til socialt netværk. Brug {socialid} til den variable del, der indeholder det sociale netværks-id.
 IfThisCategoryIsChildOfAnother=Hvis denne kategori er en under kategori af en anden
 DarkThemeMode=Mørkt tematilstand
@@ -2450,7 +2471,7 @@ 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)
+MAIN_CHECKBOX_LEFT_COLUMN=Vis kolonnen for felt- og linjevalg til venstre (til højre er deaktiveret)
 NotAvailableByDefaultEnabledOnModuleActivation=Ikke oprettet som standard. Kun oprettet ved modulaktivering.
 CSSPage=CSS stil
 Defaultfortype=Standard
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) funktioner
 AiDescriptionLong=Giver AI (Artificial Intelligence) funktioner i forskellige dele af applikationen. Har brug for ekstern AI API.
 AI_API_KEY=Nøgle til AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Tjeneste til brug for AI-funktioner
+AI_API_SERVICE=AI service to use
 AiSetup=AI-modulopsætning
 AiCustomPrompt=AI tilpasset prompt
 AI_CONFIGURATIONS_PROMPT=Brugerdefineret prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI brugerdefinerede prompter om funktioner
 EnterAnIP=Indtast en IP-adresse
 ConvertInto=Konverter til
 YouAreHere=Du er her
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Vis stregkoden på forsendelses-PDF-dokumentet
 BARCODE_ON_RECEPTION_PDF=Vis stregkoden på modtagelses-PDF-dokumentet
 BARCODE_ON_STOCKTRANSFER_PDF=Vis stregkoden på lageroverførsels-PDF-dokumentet
@@ -2529,7 +2551,7 @@ MainAuthenticationOidcAuthorizeUrlDesc=(eksempel: https://example.com/oauth2/aut
 MainAuthenticationOidcTokenUrlName=Token URL
 MainAuthenticationOidcTokenUrlDesc=(eksempel: https://example.com/oauth2/token)
 MainAuthenticationOidcUserinfoUrlName=Bruger info URL
-MainAuthenticationOidcUserinfoUrlDesc=(eksempel: https://example.com/oauth2/brugerinfo)
+MainAuthenticationOidcUserinfoUrlDesc=(eksempel: https://example.com/oauth2/userinfo)
 MainAuthenticationOidcLogoutUrlName=Logout URL
 MainAuthenticationOidcLogoutUrlDesc=(eksempel: https://example.com/oauth2/logout)
 MainAuthenticationOidcRedirectUrlName=Omdiriger URL
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout-URL for at godkende
 MainAuthenticationOidcLoginClaimName=Login krav
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect-krav, der matcher Dolibarr-brugerlogin. Hvis den ikke er indstillet eller tom, er e-mail som standard
 BlackListWords=Sort liste over ord
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Tilføj til sortliste
 FediverseSetup=Konfiguration af fediverse sektion
 ConfigImportSocialNetwork=Konfiguration af sociale netværk, der er kompatible med Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Navn på parameter
 ParamValue=Værdi af parameter
 ConfirmDeleteParamOfSocialNetwork=Er du sikker på, at du vil slette denne parameter?
 HelpMariaDBToGetPossibleValues=Du kan få en liste over mulige værdier ved at køre følgende SQL-kommando: %s
+HelpMariaDBToGetValue=Denne værdi blev hentet med kommandoen: %s
+PDFBoxFrameRoundedCorners=Rammer med afrundede hjørner
+MAIN_PDF_FRAME_CORNER_RADIUS=Standardværdien for hjørneradius er 0, så ingen afrundede hjørner. Vælg værdier mellem 1-3 for at øge hjørneradius og tilføje afrundede hjørner til rammer
 Captcha=Captcha
 CaptchaDesc=Hvis du vil beskytte din login-side med en Captcha, kan du vælge, hvilken du vil bruge her
 DolibarrStandardCaptcha=En indbygget captcha genereret af Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Vis leveringsadresse
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Obligatorisk angivelse i nogle lande (Frankrig, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Vis momsanalyse pr. rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=Du har en standard maks. størrelse for lister indstillet til <b>%s</b> . Dette er en stor værdi, der skal rulles for at se alle svarene. Det er bedre at have en værdi lavere end <b>%s</b> og bruge paginering for at se post over dette nummer. Skift dette i menuen Home - Setup - Display.
+RoundBorders=Runde kanter
+CheckIfModuleIsNotBlackListed=Bloker installation for moduler fundet i <b>Fjernsortlisten</b>
+CheckIfModuleIsNotBlackListedHelp=Nogle moduler kan leveres af nogle virksomheder, der ikke respekterer projektets regler for goodwill (manglende overholdelse af GDPR, overtrædelse af reglerne for brug af Dolibarr-varemærket osv.). Ved at markere dette felt vil der blive sendt en anmodning til projektserveren for at se, om der er modtaget en rapport om dette modul, og det vil beskytte dig ved at blokere implementeringen af markerede moduler
+DatabaseEncryption=Kryptering i database
+AlgorithmFor=Algoritme for: %s
+SensitiveData=Følsomme data
+ToolToDecryptAString=Værktøj til at dekryptere en streng
+Decrypt=Dekrypter
+FilesIntegrityDesc=Hvis du vil kontrollere filernes integritet i stedet for databasen, kan du gøre det ved at bruge <a href="%s">dette værktøj</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=Der er mere end %s svar med dit filter. Tilføj venligst flere filtre...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index e79abc3db69..739b6ab9de3 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Slutbalance
 CurrentBalance=Nuværende balance
 FutureBalance=Fremtidig saldo
 ShowAllTimeBalance=Vis saldo fra start
-AllTime=Fra starten
 Reconciliation=Afstemning
 RIB=Bankkontonummer
 IBAN=IBAN nummer
@@ -133,7 +132,7 @@ DeleteTransaction=Slet indtastning
 ConfirmDeleteTransaction=Er du sikker på, at du vil slette denne post?
 ThisWillAlsoDeleteBankRecord=Dette vil også slette genereret bankindtastning
 BankMovements=bevægelser
-PlannedTransactions=Planlagte poster
+PlannedTransactions=Kommende indlæg
 Graph=Grafer
 ExportDataset_banque_1=Bankkonti og kontoudtog
 ExportDataset_banque_2=Depositum
@@ -151,8 +150,8 @@ FutureTransaction=Fremtidig transaktion. Kan ikke forene.
 SelectChequeTransactionAndGenerate=Vælg / filtrer de checks, der skal medtages i checkindbetalingen. Klik derefter på "Opret".
 SelectPaymentTransactionAndGenerate=Vælg/filtrer de dokumenter, der skal medtages i %s indbetalingskvittering. Klik derefter på "Opret".
 InputReceiptNumber=Vælg det kontoudtog, der er relateret til mæglingen. Brug en sorterbar numerisk værdi
-InputReceiptNumberBis=ÅÅÅÅMM eller ÅÅÅÅMMDD
-EventualyAddCategory=Til sidst skal du angive en kategori, hvor klasserne skal klassificeres
+InputReceiptNumberBis=ÅÅÅÅMM
+EventualyAddCategory=Eventuelt en kategori, hvori operationerne skal klassificeres
 ToConciliate=Skal afstemmes?
 ThenCheckLinesAndConciliate=Kontroller derefter linjerne i kontoudtoget og klik
 DefaultRIB=Standard BAN
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Hvis denne funktion er aktiveret, kan du vælge specifi
 BankColorizeMovementName1=Baggrundsfarve til debetbevægelse
 BankColorizeMovementName2=Baggrundsfarve til kreditbevægelse
 IfYouDontReconcileDisableProperty=Hvis du ikke foretager bankafstemninger på nogle bankkonti, skal du deaktivere ejerskab "%s" på dem for at fjerne denne advarsel.
-NoBankAccountDefined=Ingen bankkonto defineret
+NoBankAccountDefined=Ingen bankkonto fundet
 NoRecordFoundIBankcAccount=Ingen registrering fundet på bankkontoen. Dette sker normalt, når en post er slettet manuelt fra listen over transaktioner på bankkontoen (for eksempel under en afstemning af bankkontoen). En anden grund er, at betalingen blev registreret, da modulet "%s" blev deaktiveret.
 AlreadyOneBankAccount=Allerede en bankkonto defineret
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA fil variant
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index 21e1726aaad..4f7400b39b2 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -169,6 +169,7 @@ BillTo=Til
 ShippingTo=Sendes til
 ActionsOnBill=Handlinger for faktura
 ActionsOnBillRec=Handlinger på tilbagevendende faktura
+InvoicesGeneratedFromRec=Genererede fakturaer
 RecurringInvoiceTemplate=Skabelon / tilbagevendende faktura
 NoQualifiedRecurringInvoiceTemplateFound=Ingen tilbagevendende fakturaskabelon er kvalificeret til generation.
 FoundXQualifiedRecurringInvoiceTemplate=%s tilbagevendende skabelonfaktura(r) kvalificeret til generering.
@@ -182,6 +183,7 @@ LastCustomersBills=Seneste %s kundefakturaer
 LastSuppliersBills=Seneste %s leverandørfakturaer
 AllBills=Alle fakturaer
 AllCustomerTemplateInvoices=Alle fakturaerskabelon
+AllSupplierTemplateInvoices=Alle fakturaerskabelon
 OtherBills=Andre fakturaer
 DraftBills=Udkast til fakturaer
 CustomersDraftInvoices=Igangværende kundefakturaer
@@ -419,6 +421,7 @@ InvoiceAutoValidate=Validér fakturaer automatisk
 GeneratedFromRecurringInvoice=Genereret fra skabelon tilbagevendende faktura %s
 DateIsNotEnough=Dato er endnu ikke nået
 InvoiceGeneratedFromTemplate=Faktura %s genereret fra tilbagevendende fakturaskabelon %s
+InvoiceGeneratedFromTemplateError=Error Invoice %s generated from recurring template invoice %s : %s
 GeneratedFromTemplate=Genereres fra skabelonfaktura %s
 WarningInvoiceDateInFuture=Advarsel, fakturadato er højere end den aktuelle dato
 WarningInvoiceDateTooFarInFuture=Advarsel, fakturadato er for langt fra den aktuelle dato
@@ -495,6 +498,8 @@ IBANNumber=IBAN kontonummer
 IBAN=IBAN
 CustomerIBAN=IBAN fra kunde
 SupplierIBAN=IBAN af sælger
+DebitBankAccount = Direkte debitering bankkonto
+SetDebitBankAccount = Definer direkte debiteringsbankkonto
 BIC=BIC / SWIFT
 BICNumber=BIC/SWIFT-kode
 ExtraInfos=Ekstra infos
@@ -513,10 +518,12 @@ PrettyLittleSentence=Accept the amount of payments due by checks issued in my na
 IntracommunityVATNumber=Moms ID inden for Fællesskabet
 PaymentByChequeOrderedTo=Checkbetalinger (inklusive skat) betales til %s, send til
 PaymentByChequeOrderedToShort=Checkbetalinger (inkl. Skat) skal betales til
+StructuredCommunication=Struktureret kommunikation
 SendTo=sendes til
 PaymentByTransferOnThisBankAccount=Betaling ved overførsel til følgende bankkonto
 VATIsNotUsedForInvoice=* Ikke gældende moms kunst-293B af CGI
 VATIsNotUsedForInvoiceAsso=* Ikke gældende moms art-261-7 i CGI
+VATIsNotUsedReverseChargeProcedure=* Non applicable VAT art-259-1 of CGI
 LawApplicationPart1=Ved anvendelse af loven 80.335 af 12/05/80
 LawApplicationPart2=varerne forbliver ejendom
 LawApplicationPart3=Sælgeren indtil fuld betaling af
@@ -661,6 +668,7 @@ MentionCategoryOfOperations0=Levering af varer
 MentionCategoryOfOperations1=Levering af tjenester
 MentionCategoryOfOperations2=Blandet - Levering af varer & levering af tjenester
 Salaries=Lønninger
+InvoiceSubtype=Fakturaundertype
 SalaryInvoice=Løn
 BillsAndSalaries=Regninger og lønninger
 CreateCreditNoteWhenClientInvoiceExists=Denne mulighed er kun aktiveret, når der findes validerede fakturaer for en kunde, eller når konstant INVOICE_CREDIT_NOTE_STANDALONE bruges (nyttigt for nogle lande)
diff --git a/htdocs/langs/da_DK/blockedlog.lang b/htdocs/langs/da_DK/blockedlog.lang
index 6a3c440a41f..7e05b0923f0 100644
--- a/htdocs/langs/da_DK/blockedlog.lang
+++ b/htdocs/langs/da_DK/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Uændrede logfiler
 ShowAllFingerPrintsMightBeTooLong=Vis alle arkiverede logfiler (kan være lang)
 ShowAllFingerPrintsErrorsMightBeTooLong=Vis alle ikke-gyldige arkivlogfiler (kan være lange)
 DownloadBlockChain=Download fingeraftryk
-KoCheckFingerprintValidity=Arkiveret log post er ikke gyldig. Det betyder, at nogen (en hacker?) Har ændret nogle data i denne post, efter at den blev optaget, eller har slettet den tidligere arkiverede post (kontroller, at linjen med forrige # findes) eller har ændret kontrolsum for den tidligere post.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Den arkiverede log optegnelse er gyldig. Dataene på denne linje blev ikke ændret, og posten følger den foregående.
 OkCheckFingerprintValidityButChainIsKo=Arkiveret log synes at være gyldig i forhold til den foregående, men kæden blev ødelagt tidligere.
 AddedByAuthority=Gemt i ekstern myndighed
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Log detaljer
 ListOfTrackedEvents=Liste over sporede begivenheder
 Fingerprint=Fingeraftryk
 DownloadLogCSV=Eksporter arkiverede logfiler (CSV)
-DataOfArchivedEvent=Fuldstændig data for arkiveret begivenhed
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Originalobjekt (type %s, id %s) ikke forbundet (se kolonnen "Fuld data" for at få uforanderlige gemte data)
 BlockedLogAreRequiredByYourCountryLegislation=Modulet "Uændrede logfiler" kan kræves af lovgivningen i dit land. Deaktivering af dette modul kan gøre eventuelle fremtidige transaktioner ugyldige med hensyn til loven og brugen af ​​lovlig bogføringsprogram, da de ikke kan bekræftes af en skattekontrol.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Modulet "Uændrede logfiler" blev aktiveret på grund af lovgivningen i dit land. Deaktivering af dette modul kan gøre eventuelle fremtidige transaktioner ugyldige med hensyn til loven og brugen af ​​lovlig bogføringsprogram, da de ikke kan bekræftes af en skattekontrol.
@@ -30,6 +32,7 @@ BlockedLogEnabled=System til at spore hændelser i logfiler, der ikke kan ændre
 BlockedLogDisabled=Systemet til at spore hændelser i logfiler, der ikke kan ændres, er blevet deaktiveret, efter at der er foretaget nogle optagelser. Vi gemte et særligt fingeraftryk for at spore kæden som knækket
 BlockedLogDisabledBis=System til at spore hændelser i logfiler, der ikke kan ændres, er blevet deaktiveret. Dette er muligt, fordi der ikke er blevet registreret endnu.
 LinkHasBeenDisabledForPerformancePurpose=Af hensyn til ydeevnen vises et direkte link til dokumentet ikke efter den 100. linje.
+SavedOnLine=Gemt på nettet
 
 ## logTypes
 logBILL_DELETE=Kundefaktura slettes logisk
@@ -37,7 +40,7 @@ logBILL_PAYED=Kundefaktura udbetalt
 logBILL_SENTBYMAIL=Kundefaktura sendes via mail
 logBILL_UNPAYED=Kundefaktura indstillet ubetalt
 logBILL_VALIDATE=Kundefaktura bekræftet
-logCASHCONTROL_VALIDATE=Optagelse ved lukning af kasse apparatet 
+logCASHCONTROL_VALIDATE=Optagelse ved lukning af kasse apparatet
 logDOC_DOWNLOAD=Nedhentning af et bekræftet dokument for at udskrive eller sende
 logDOC_PREVIEW=Forhåndsvisning af et bekræftet dokument for at udskrive eller downloade
 logDONATION_PAYMENT_CREATE=Donation betaling oprettet
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Kundebetaling logisk sletning
 logPAYMENT_VARIOUS_CREATE=Betaling (ikke tildelt en faktura) oprettet
 logPAYMENT_VARIOUS_DELETE=Betaling (ikke tildelt en faktura) logisk sletning
 logPAYMENT_VARIOUS_MODIFY=Betaling (ikke tildelt en faktura) ændret
+logBLOCKEDLOG_EXPORT=Eksport af uforanderlige logfiler til en fil
diff --git a/htdocs/langs/da_DK/categories.lang b/htdocs/langs/da_DK/categories.lang
index 0c12de08c66..37cce7d80e9 100644
--- a/htdocs/langs/da_DK/categories.lang
+++ b/htdocs/langs/da_DK/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Kontakt tags / kategorier område
 AccountsCategoriesArea=Bankkontomærker / kategoriområde
 ProjectsCategoriesArea=Projekt tags / kategorier område
 UsersCategoriesArea=Bruger tags / kategorier område
+Bank_linesCategoriesArea==Bank linjer tags/kategorier område
 SubCats=Sub-kategorier
 CatList=Liste over tags/kategorier
 CatListAll=Liste over tags / kategorier (alle typer)
@@ -90,9 +91,10 @@ CategoriesSetup=Tags/kategorier opsætning
 CategorieRecursiv=Link med forældre tag/kategori automatisk
 CategorieRecursivHelp=Hvis indstillingen er slået til, vil objektet også blive tilføjet til de overordnede kategorier, når du tilføjer et objekt til en underkategori.
 AddProductServiceIntoCategory=Tildel kategori til produktet/tjenesten
-AddCustomerIntoCategory=Tildel kategori til kunde
-AddSupplierIntoCategory=Tildel kategori til leverandør
-AssignCategoryTo=Tildel kategori til
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Vis tag/kategori
 ByDefaultInList=Som standard i liste
 ChooseCategory=Vælg kategori
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Side-containerkategorier
 KnowledgemanagementsCategoriesArea=KM artikel Kategorier
 UseOrOperatorForCategories=Brug 'ELLER' operator til kategorier
 AddObjectIntoCategory=Tildel til kategorien
+FichintersCategoriesArea=Interventionskategorier
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index cd26f33ad0e..ce83d35520e 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Landet er inden for Den Europæiske Union
 PriceFormatInCurrentLanguage=Prisvisningsformat i det aktuelle sprog og valuta
 ThirdPartyName=Tredjeparts navn
 ThirdPartyEmail=Tredjeparts e-mail
-ThirdParty=Tredjepart
-ThirdParties=Tredjeparter
+ThirdParty=Tredjemands
+ThirdParties=Tredje partier
 ThirdPartyProspects=Kundeemner
 ThirdPartyProspectsStats=Kundeemner
 ThirdPartyCustomers=Kunder
@@ -65,6 +65,7 @@ State=Stat/provins
 StateId=Stats kode
 StateCode=Stats-/provinskode
 StateShort=Stat
+DepartmentBuyer=Købers stat/provins
 Region=Region
 Region-State=Region - Stat
 Country=Land
@@ -78,7 +79,7 @@ Chat=Chat
 PhonePro=Firma telefon
 PhonePerso=Privat telefon
 PhoneMobile=Mobil
-No_Email=Afvis massemails
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=Postnummer
 Town=By
@@ -382,12 +383,12 @@ ExportCardToFormat=Eksporter kort til format
 ContactNotLinkedToCompany=Kontakt ikke knyttet til nogen tredjepart
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=Ingen Dolibarr adgang
-ExportDataset_company_1=Tredjeparter (virksomheder/fonde/fysiske personer) og deres egenskaber
-ExportDataset_company_2=Kontakter og deres egenskaber
-ExportDataset_company_3=Tredjeparts bankkonti
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Tredjeparts yderligere kontakter/adresser og attributter
+ExportDataset_company_3=Tredjeparts betalingsmåder (bankkonti)
 ImportDataset_company_1=Tredjeparter og deres egenskaber
 ImportDataset_company_2=Tredjeparts yderligere kontakter/adresser og attributter
-ImportDataset_company_3=Tredjeparts bankkonti
+ImportDataset_company_3=Tredjeparts betalingsmåder (bankkonti)
 ImportDataset_company_4=Tredjeparts salgsrepræsentanter (tildel salgsrepræsentanter/brugere til virksomheder)
 PriceLevel=Prisniveau
 PriceLevelLabels=Prisniveau etiketter
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Gratis kode uden bekræftelse.
 ManagingDirectors=Lederens navn (administrerende direktør, direktør, formand...)
 MergeOriginThirdparty=Duplikeret tredjepart (den tredjepart, du vil slette)
 MergeThirdparties=Flet tredjeparter
-ConfirmMergeThirdparties=Er du sikker på, at du vil flette den valgte tredjepart med den nuværende? Alle tilknyttede objekter (fakturaer, ordrer, ...) vil blive flyttet til den aktuelle tredjepart, hvorefter den valgte tredjepart vil blive slettet.
+ConfirmMergeThirdparties=Er du sikker på, at du vil flette den valgte tredjepart med den nuværende? Alle tilknyttede objekter (fakturaer, ordrer, ...) vil blive flyttet til den aktuelle tredjepart, derefter vil den valgte tredjepart blive slettet.
 ThirdpartiesMergeSuccess=Tredjeparter er blevet flettet
 SaleRepresentativeLogin=Login af salgsrepræsentant
 SaleRepresentativeFirstname=Fornavn på salgsrepræsentant
@@ -461,3 +462,6 @@ ExternalSystemID=Eksternt system-id
 IDOfPaymentInAnExternalSystem=ID for betalingstilstanden til et eksternt system (som Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE Webservice-legitimationsoplysninger
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Tredjeparten skal være kunde for at tillade oprettelsen af sine bankoplysninger på Stripe-siden
+NewSocNameForClone=Nyt firmanavn
+ConfirmCloneThirdparties=Er du sikker på, at du vil klone <b>%s</b> virksomhed?
+SocialNetworksBusiness=Sociale netværk til virksomheden
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index a2531162c6c..b91bf10cc77 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Betaling for kundefaktura
 PaymentSupplierInvoice=leverandør faktura betaling
 PaymentSocialContribution=Betaling af skat/afgift
 PaymentVat=Betaling af moms
-AutomaticCreationPayment=Registrer automatisk betalingen
+AutomaticCreationPayment=Also record the payment
 ListPayment=Oversigt over betalinger
 ListOfCustomerPayments=Oversigt over kundebetalinger
 ListOfSupplierPayments=Liste over leverandørbetalinger
@@ -118,10 +118,14 @@ SocialContributionsPayments=Betalinger af skat/afgift
 ShowVatPayment=Vis momsbetaling
 TotalToPay=At betale i alt
 BalanceVisibilityDependsOnSortAndFilters=Saldo er kun synlig på denne liste, hvis tabellen er sorteret på %s og filtreret på 1 bankkonto (uden andre filtre)
+CustomerAccountancyCodeGeneral=Generel regnskabskode
 CustomerAccountancyCode=Regnskabskode for kunde
+SupplierAccountancyCodeGeneral=Generel regnskabskode
 SupplierAccountancyCode=Sælgers regnskabskode
+UserAccountancyCodeGeneral=Generel regnskabskode
 CustomerAccountancyCodeShort=Cust. konto. kode
 SupplierAccountancyCodeShort=Sup. konto. kode
+UserAccountancyCodeShort=Brugerkonto. kode
 AccountNumber=Kontonummer
 NewAccountingAccount=Ny konto
 Turnover=Omsætning faktureret
@@ -129,7 +133,9 @@ TurnoverCollected=Omsætning indsamlet
 SalesTurnoverMinimum=Mindsteomsætning
 ByExpenseIncome=Udgifter og indtægter
 ByThirdParties=Tredjemand
+ByProjects=Ved projekter
 ByUserAuthorOfInvoice=Fakturaforfatter
+DetailedListLowercase=detaljeret liste
 CheckReceipt=Depositum
 CheckReceiptShort=Depositum
 LastCheckReceiptShort=Seneste %s indbetalingskort
diff --git a/htdocs/langs/da_DK/datapolicy.lang b/htdocs/langs/da_DK/datapolicy.lang
index 313c119e4f9..bbf34f58600 100644
--- a/htdocs/langs/da_DK/datapolicy.lang
+++ b/htdocs/langs/da_DK/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Databeskyttelsespolitik
 Module4100Desc = Modul til at administrere databeskyttelse (overensstemmelse med GDPR)
 # Administration page
 datapolicySetup = Opsætning af moduldatabeskyttelsespolitik
-Deletion = Sletning af data
-datapolicySetupPage = Afhængigt af lovene i dine lande (eksempel <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Artikel 5</a> i GDPR), skal personoplysninger opbevares i en periode ikke overskrider den varighed, dataene er nødvendige til det formål, hvortil de blev indsamlet, undtagen til arkiveringsformål.<br>Sletningen vil ske automatisk efter en vis varighed uden begivenheder (varigheden som du vil have angivet nedenfor).
+DataDeletion=Sletning af data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s måneder
 ONE_YEAR = 1 år
 NB_YEARS = %s års
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Kundeemne/kunde
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Heller kunde/kunde
 DATAPOLICY_CONTACT_FOURNISSEUR = Leverandør
 DATAPOLICY_ADHERENT = Medlem
-DATAPOLICY_Tooltip_SETUP=Definer forsinkelsen uden interaktion, hvorefter du ønsker, at posten automatisk skal slettes.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Du kan sende en GDPR-e-mail til alle dine relevante kontakter (som endnu ikke har modtaget en e-mail, og som du ikke har registreret noget om deres GDPR-aftale for). For at gøre dette skal du bruge følgende knap.
 SendAgreement = Send emails
 AllAgreementSend = Alle e-mails er blevet sendt
 TXTLINKDATAPOLICYACCEPT = Tekst til linket "aftale"
 TXTLINKDATAPOLICYREFUSE = Tekst til linket "uenighed"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: Behandling af personoplysninger
 DATAPOLICY_consentement = Indhentet samtykke til behandling af personoplysninger
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 4db26fcef80..4d307e16c0e 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Fejl ved oprettelse af billedfiler (fund
 ErrorFailedToCreateDir=Det lykkedes ikke at oprette en mappe. Kontroller, at web-server bruger har tilladelse til at skrive i Dolibarr dokument mappen. Hvis parameteren <b>safe_mode</b> er aktiveret i PHP, kontroller at Dolibarr php filer ejes af web-server bruger (eller gruppe).
 ErrorNoMailDefinedForThisUser=Ingen e-mail defineret for denne bruger
 ErrorSetupOfEmailsNotComplete=Opsætningen af e-mails er ikke afsluttet
+ErrorAccountingClosureSetupNotComplete=Opsætning af lukkekonti er ikke fuldført
 ErrorFeatureNeedJavascript=Denne funktion kræver, at JavaScript er aktiveret for at virke. Ændre dette i opsætning - display.
 ErrorTopMenuMustHaveAParentWithId0=En menu af type 'Top' kan ikke have en moder menu. Angiv 0 i moder menu eller vælg en menu af typen »Venstre«.
 ErrorLeftMenuMustHaveAParentId=En menu af typen »Venstre« skal have en forælder id.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Upload blokeret af et PHP / Apache plugin.
 ErrorFileSizeTooLarge=Filstørrelsen er for stor, eller filen er ikke angivet.
 ErrorFieldTooLong=Feltet%s er for langt.
 ErrorSizeTooLongForIntType=Størrelse for lang for typen heltal (%s cifre maksimum)
+ErrorSizeForStarsType=Stjernestørrelsen skal være et tal mellem 1 og 10
 ErrorSizeTooLongForVarcharType=Størrelse for lang for typen streng (%s tegn maksimum)
 ErrorNoValueForSelectType=Venligst udfyld værdi for valgte liste
 ErrorNoValueForCheckBoxType=Venligst udfyld værdi for afkrydsnings listen
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Ugyldig værdi for sikkerheds kode. Prøv igen med en ny v
 ErrorBothFieldCantBeNegative=Felterne %s og %s kan ikke begge være negative
 ErrorFieldCantBeNegativeOnInvoice=Feltet <strong>%s</strong> kan ikke være negativt på denne type faktura. Hvis du skal tilføje en rabatlinje, skal du blot oprette rabatten først (fra feltet '%s' på tredjepartskortet) og anvende den på fakturaen.
 ErrorLinesCantBeNegativeForOneVATRate=Det samlede antal linjer (netto af skat) kan ikke være negativt for en given ikke nul-momssats (Fandt en negativ sum for momssats <b>%s</b> %%).
-ErrorLinesCantBeNegativeOnDeposits=Linjer kan ikke være negative for et depositum. Du vil opleve problemer, når du bliver nødt til at bruge deponering i den endelige faktura, hvis du gør det.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Mængde for linjen på kunde fakturaer kan ikke være negativ
+ErrorQtyForSupplierInvoiceCantBeNegative=Mængde for linje til leverandørfakturaer kan ikke være negativ
 ErrorWebServerUserHasNotPermission=Brugerkonto <b>%s</b> der anvendes til at starte web-server har ikke tilladelse til dette
 ErrorNoActivatedBarcode=Ingen stregkode type aktiveret
 ErrUnzipFails=Udpakning fejlede for %s med ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=Slutdatofeltet må ikke være tomt
 ErrorStartHourIsNull=Startdato-feltet må ikke være tomt
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=For mange linjer til at behandle. Brug venligst et mere selektivt filter.
 ErrorEmptyValueForQty=Mængden kan ikke være nul.
+ErrorNoCloneWithoutName=Den nye bruger skal have et navn
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = Den bestilte mængde kan ikke være mindre end den afsendte mængde.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Fejl, oprettelse af en forskellig betaling på en bankkonto med en anden valuta end virksomhedens valuta er endnu ikke understøttet.
+ErrorStreamMustBeEnabled=PHP-strømmen %s er ikke tilgængelig. Tjek dine PHP-moduler og Dolibarr-parameteren $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # 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.
 WarningPasswordSetWithNoAccount=Der blev angivet en adgangskode til dette medlem. Der blev dog ikke oprettet en brugerkonto. Så denne adgangskode er gemt, men kan ikke bruges til at logge ind på Dolibarr. Det kan bruges af et eksternt modul/interface, men hvis du ikke behøver at definere noget login eller adgangskode for et medlem, kan du deaktivere muligheden "Administrer et login for hvert medlem" fra medlemsmodulets opsætning. Hvis du har brug for at administrere et login, men ikke har brug for nogen adgangskode, kan du holde dette felt tomt for at undgå denne advarsel. Bemærk: E-mail kan også bruges som login, hvis medlemmet er knyttet til en bruger.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=Dette forældre-id findes ikke længere
 WarningReadBankAlsoAllowedIfUserHasPermission=Advarsel, læsning af bankkonto er også tilladt med tilladelse til at administrere kontoplan
 WarningNoDataTransferedInAccountancyYet=Bemærk venligst, at der ikke er data i regnskabstabellen. Overfør venligst dine data, der er registreret i applikationen, til regnskabssektionen, eller skift beregningstilstanden for at analysere de data, der er registreret uden for regnskabet.
 WarningChangingThisMayBreakStopTaskScheduler=Advarsel, ændring af denne værdi kan deaktivere skemalæggeren
+WarningAmountOfFileDiffersFromSumOfLines=Advarsel, mængden af fil (%s) adskiller sig fra summen af linjer (%s)
+WarningModuleAffiliatedToAReportedCompany=Advarsel, dette modul er blevet rapporteret til Dolibarr-fonden som udgivet af en virksomhed, der bruger ulovlig praksis (manglende overholdelse af reglerne for brug af Dolibarr-mærket, indsamling af dine data uden dit samtykke eller implementering af malware).
+WarningModuleAffiliatedToAPiratPlatform=Vær forsigtig, når du får et modul (betalt eller gratis) fra en mistænkelig ikke-officiel platform som %s
+
 SwissQrOnlyVIR = SwissQR-faktura kan kun tilføjes på fakturaer, der skal betales med kreditoverførselsbetalinger.
 SwissQrCreditorAddressInvalid = Kreditoradressen er ugyldig (er postnummer og by angivet? (%s)
 SwissQrCreditorInformationInvalid = Kreditoroplysninger er ugyldige for IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s er allerede defineret som kontakt
 ErrorThisGroupIsAlreadyDefinedAsThisType=Kontakterne med denne gruppe er allerede defineret som kontaktpersoner for denne type.
 EmptyMessageNotAllowedError=Tom besked er ikke tilladt
 ErrorIsNotInError=%s er ikke i fejl
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/da_DK/exports.lang b/htdocs/langs/da_DK/exports.lang
index a8e26a71349..a0a28f49082 100644
--- a/htdocs/langs/da_DK/exports.lang
+++ b/htdocs/langs/da_DK/exports.lang
@@ -67,7 +67,7 @@ ChooseFormatOfFileToImport=Vælg det filformat, der skal bruges som importfilfor
 ChooseFileToImport=Upload fil og klik derefter på ikonet %s for at vælge fil som kilde importfil ...
 SourceFileFormat=Kilde filformat
 FieldsInSourceFile=Områder i kildefilen
-FieldsInTargetDatabase=Målfelter i Dolibarr database (fed = obligatorisk)
+FieldsInTargetDatabase=Målfelter i Dolibarr-databasen
 NoFields=Ingen felter
 MoveField=Flyt feltet kolonne nummer %s
 ExampleOfImportFile=Example_of_import_file
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Kontroller, at filformatet (felt- og streng afgrænsere)
 RunSimulateImportFile=Kør Impulsimulering
 FieldNeedSource=This field requires data from the source file
 SomeMandatoryFieldHaveNoSource=Nogle obligatoriske felter er ingen kilde fra datafil
-InformationOnSourceFile=Oplysninger om kildefil
-InformationOnTargetTables=Oplysninger om målet felter
+InformationOnSourceFile=Kildefil
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Switch mindst én kilde felt i kolonnen for felter for at eksportere
 SelectFormat=Vælg denne import filformat
 RunImportFile=Importer data
diff --git a/htdocs/langs/da_DK/hrm.lang b/htdocs/langs/da_DK/hrm.lang
index d9191132a0e..3c5552d6397 100644
--- a/htdocs/langs/da_DK/hrm.lang
+++ b/htdocs/langs/da_DK/hrm.lang
@@ -46,11 +46,11 @@ NewEval=Ny kompetencevurdering
 ValidateEvaluation=Validere kompetencevurdering
 ConfirmValidateEvaluation=Er du sikker på, at du vil validere denne kompetencevurdering med referencen <b>%s</b>?
 EvaluationCard=Kompetencevurdering
-RequiredRank=Påkrævet rang for jobprofilen
-RequiredRankShort=Påkrævet rang
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Stillinger med denne jobprofil
-EmployeeRank=Medarbejderrangering for denne færdighed
-EmployeeRankShort=Medarbejder rang
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Medarbejder stilling
 EmployeePositions=Medarbejder stillinger
 EmployeesInThisPosition=Medarbejdere i denne stilling
@@ -98,3 +98,5 @@ NeedBusinessTravels=Har brug for forretningsrejser
 NoDescription=Ingen beskrivelse
 TheJobProfileHasNoSkillsDefinedFixBefore=Den evaluerede jobprofil for denne medarbejder har ingen færdigheder defineret. Tilføj venligst færdighed(er), slet og genstart evalueringen.
 PDFStandardHrmEvaluation=Standardskabelon til at generere et PDF-dokument til en kompetencevurdering
+SkillNotRequired=Færdighed ikke påkrævet
+LinkToUserCreated=Link til en medarbejder, hvis ansøgeren er ansat og omdannet til bruger.
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index 21933c9bb71..50c1880aea4 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Emailing
 EMailing=Emailing
-EMailings=EMailings
+EMailings=Mass EMails
 SMSings=SMS-beskeder
-AllEMailings=Alle eMailings
+AllEMailings=All mass eMails
 MailCard=Emailing kortet
 MailRecipients=Modtagere
 MailRecipient=Recipient
@@ -26,19 +26,19 @@ MailFile=Vedhæftede filer
 MailMessage=Email indhold
 SubjectNotIn=Ikke i emne
 BodyNotIn=Ikke i kroppen
-ShowEMailing=Vis emailing
-ListOfEMailings=Liste over emailings
-NewMailing=Ny emailing
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Ny sms
-EditMailing=Rediger emailing
-ResetMailing=Gensend emailing
-ConfirmResetMailingTargetMassaction=Bekræftelse af nulstilling af målstatus
-ResetMailingTargetMassaction=Nulstil målstatus
-DeleteMailing=Slet emailing
-PreviewMailing=Preview emailing
-CreateMailing=Opret emailing
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Nulstil status ved en fejl
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=Gyldig emailing
+ValidMailing=Valid mass Email
 MailingStatusDraft=Udkast
 MailingStatusValidated=Bekræftet
 MailingStatusSent=Sendt
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Alle filtre skal matche for at have en e-mail, der inds
 LineInFile=Line %s filtjenester
 RecipientSelectionModules=Defineret anmodninger om modtagernes udvælgelse
 MailSelectedRecipients=Udvalgte modtagere
-MailingArea=EMailings område
-LastMailings=Latest %s emailings
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Mål statistik
 NbOfCompaniesContacts=Unikke kontakter af virksomheder
 MailNoChangePossible=Modtagere til bekræftede emailing kan ikke ændres
-SearchAMailing=Søg mailing
-SendMailing=Send emailing
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Sendt af
 AdvancedAlternative=Avanceret alternativ
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Du kan dog sende dem online ved at tilføje parameter MAILING_LIMIT_SENDBYWEB med værdi af maksimalt antal e-mails, du vil sende efter session. Til dette skal du gå til Hjem - Opsætning - Andet.
 ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Ryd liste
 ToClearAllRecipientsClickHere=At rydde modtagernes liste for denne e-mail, skal du klikke på knappen
 ToAddRecipientsChooseHere=Hvis du vil tilføje modtagere, skal du vælge i disse lister
-NbOfEMailingsReceived=Masse emailings modtaget
-NbOfEMailingsSend=Mass emailings sent
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID record
 DeliveryReceipt=Leverings Bekr.
 YouCanUseCommaSeparatorForSeveralRecipients=Du kan bruge <b>comma</b> separator til at angive flere modtagere.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Ingen automatiske e-mail-underretninger er planlagt fo
 ANotificationsWillBeSent=1 automatisk underretning sendes via e-mail
 SomeNotificationsWillBeSent=%s automatiske meddelelser sendes via e-mail
 AddNewNotification=Abonner på en ny automatisk e-mail-underretning (mål / begivenhed)
-ListOfActiveNotifications=Aktive abonnementer (mål/begivenheder) for automatisk e-mail notifikation
+ListOfActiveNotifications=Aktive abonnementer
+ListOfActiveNotificationsHelp=Liste over par %s/%s, der abonnerer på automatisk e-mailbesked
 ListOfNotificationsDone=Automatisk e-mail-meddelelser sendt
+ListOfNotificationsDoneHelp=Liste over tidligere sendt e-mailmeddelelser
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -183,7 +185,7 @@ Information=Information
 ContactsWithThirdpartyFilter=Kontakter med tredjepart filter
 Unanswered=Ubesvaret
 Answered=Besvaret
-IsNotAnAnswer=Er ikke svar (indledende e-mail)
+IsNotAnAnswer=Er ikke svar (er en indledende e-mail)
 IsAnAnswer=Er et svar på en indledende e-mail
 RecordCreatedByEmailCollector=Post oprettet af e-mail-samleren %s
 DefaultBlacklistMailingStatus=Standardværdi for feltet '%s' ved oprettelse af en ny kontaktperson
@@ -199,6 +201,6 @@ ModelTemplate=Email skabelon
 YouCanChooseAModelForYouMailContent= Du kan vælge en af skabelonmodellerne eller generere en med AI
 TitleOfMailHolder=Titlen på e-mailen står her
 ContentOfMailHolder=Indholdet af e-mail står her...
-LastNews=Sidste nyt
+LastNews=Seneste nyheder
 ListProducts= Liste over produkter
 PasswordReset=Nulstilling af adgangskode
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 06aad230402..f071c9980a7 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -37,6 +37,7 @@ Translation=Oversættelse
 Translations=Oversættelser
 CurrentTimeZone=Tidszone PHP (server)
 EmptySearchString=Indtast ikke tomme søgekriterier
+EnterNonEmptyLinesFirst=indtast ikke tomme linjer først
 EnterADateCriteria=Indtast et datokriterie
 NoRecordFound=Ingen post fundet
 NoRecordDeleted=Ingen post slettet
@@ -309,6 +310,7 @@ DateBuild=Rapport genereret den
 DatePayment=Betalingsdato
 DateApprove=Godkendelsesdato
 DateApprove2=Godkendelsesdato (anden godkendelse)
+PendingSince=Afventer siden
 RegistrationDate=Registrerings dato
 UserCreation=Oprettet af
 UserModification=Ændret af
@@ -496,7 +498,7 @@ ActionRunningNotStarted=Ikke startet
 ActionRunningShort=I gang
 ActionDoneShort=Færdig
 ActionUncomplete=Ufuldstændig
-LatestLinkedEvents=Seneste %s linkede begivenheder
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Virksomhed/Organisation
 Accountant=Revisor
 ContactsForCompany=Kontakter for denne tredjepart
@@ -722,6 +724,8 @@ TextUsedInTheMessageBody=Email indhold
 SendAcknowledgementByMail=Send bekræftelses Email
 SendMail=Send e-mail
 Email=E-mail
+EMail=E-mail
+EMails=E-mails
 NoEMail=Ingen Email
 AlreadyRead=Har allerede læst
 NotRead=Ulæst
@@ -794,7 +798,7 @@ Notes=Noter
 AddNewLine=Tilføj ny linje
 AddFile=Tilføj fil
 FreeZone=Fritekst produkt
-FreeLineOfType=Fritekst artikel, type:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Klon formål med sine vigtigste attributter
 ReGeneratePDF=Re-generer PDF
 PDFMerge=PDF Sammenflet
@@ -880,12 +884,14 @@ toward=mod
 Access=Adgang
 SelectAction=Vælg handling
 SelectTargetUser=Vælg målbruger/medarbejder
+ClickToCopyToClipboard=Klik for at kopiere til udklipsholder
 HelpCopyToClipboard=Brug Ctrl+C for at kopiere til udklipsholderen
 SaveUploadedFileWithMask=Gem filen på serveren med navnet "<strong>%s</strong>" (ellers "%s")
 OriginFileName=Orginal filnavn
 SetDemandReason=Sæt kilden
 SetBankAccount=Definér bankkonto
 AccountCurrency=Konto møntsort
+AccountancyCode=Regnskabskode
 ViewPrivateNote=Vis noter
 XMoreLines=%s linje(r) skjult
 ShowMoreLines=Vis flere/færre linjer
@@ -926,6 +932,7 @@ ConfirmMassDeletionQuestion=Er du sikker på, at du vil slette den/de valgt/valg
 ConfirmMassClone=Bulk klon bekræftelse
 ConfirmMassCloneQuestion=Vælg det projekt, der skal klones til
 ConfirmMassCloneToOneProject=Klon for at projektere %s
+ObjectClonedSuccessfuly=Objekt klonet med succes
 RelatedObjects=Relaterede objekter
 ClassifyBilled=Klassificer faktureret
 ClassifyUnbilled=Klassificer Ufaktureret
@@ -962,10 +969,11 @@ PrivateDownloadLinkDesc=Du skal være logget, og du skal have tilladelse til at
 Download=Hent
 DownloadDocument=Hent dokument
 DownloadSignedDocument=Download underskrevet dokument
-ActualizeCurrency=Opdater valutakurs
+ActualizeCurrency=Brug den sidst kendte kurs for valutaen
 Fiscalyear=Regnskabsår
 ModuleBuilder=Modul og applikationsbygger
 SetMultiCurrencyCode=Indstil valuta
+SetMultiCurrencyRate=Indstil valutakurs
 BulkActions=Masse handlinger
 ClickToShowHelp=Klik for at vise værktøjs tips
 WebSite=Internet side
@@ -1105,6 +1113,7 @@ PayedBy=Betalt af
 PayedTo=Betalt til
 Monthly=Månedlige
 Quarterly=Kvartalsvis
+Quarter=Kvartal
 Annual=Årligt
 Local=Lokal
 Remote=Fjern
@@ -1147,6 +1156,7 @@ ContactDefault_project_task=Opgave
 ContactDefault_propal=Tilbud
 ContactDefault_supplier_proposal=Leverandørforslag
 ContactDefault_ticket=Opgave
+ContactDefault_societe=Tredjemands
 ContactAddedAutomatically=Kontakt tilføjet fra tredjeparts kontaktroller
 More=Mere
 ShowDetails=Vis detaljer
@@ -1243,6 +1253,7 @@ CommercialAffected=Salgsrepræsentant tildelt
 CommercialsDisaffected=Salgsrepræsentanter fjernet linket
 CommercialDisaffected=Sælger er fjernet
 Message=Besked
+Emailing=Emailing
 Progression=Fremskridt
 YourMessage=Din besked
 YourMessageHasBeenReceived=Din besked er modtaget. Vi svarer eller kontakter dig hurtigst muligt.
@@ -1307,3 +1318,34 @@ TranslationOfKey=Oversættelse af nøglen AnyTranslationKey
 SignedStatus=Underskrevet status
 NbRecordQualified=Antal kvalificerede poster
 auto=auto
+UploadFile=Direkte import af dokument
+OrClickToSelectAFile=eller klik for at vælge en fil på disken
+NetTotal=Netto i alt
+VATAmount=momsbeløb
+TotalDiscount=Samlet rabat
+TotalHTBeforeDiscount=Samlet netto før rabat
+Contains=Indeholder
+DoesNotContain=Indeholder ikke
+Is=Er
+IsNot=er ikke
+StartsWith=Starter med
+EndsWith=Slutter med
+IsBefore=Er før
+IsAfter=Er efter
+IsOnOrBefore=Er før eller lig
+IsOnOrAfter=Er efter eller lig
+IsHigherThan=Er højere end
+IsHigherThanOrEqual=Er højere end eller lig
+IsLowerThan=Er lavere end
+IsLowerThanOrEqual=Er lavere end eller lig
+addToFilter=Tilføje
+FilterAssistance=Filter editor
+Operator=Operatør
+AllFieldsRequired=Alle felter er obligatoriske.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Fra starten
+Transferred=Transferred
diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
index 72b5e3ba757..0c5b8941a56 100644
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Hvis der kræves abonnement, skal der registreres et ab
 DeleteType=Slet
 VoteAllowed=Afstemning tilladt
 Physical=Individuel
-Moral=virksomhed
-MorAndPhy=Firma og enkeltperson
+Moral=Juridisk enhed
+MorAndPhy=Juridisk enhed og enkeltperson
 Reenable=Genaktiver
 ExcludeMember=Ekskluder et medlem
 Exclude=Udelukke
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Medlemsstatistik efter region
 NbOfMembers=Samlet antal medlemmer
 NbOfActiveMembers=Samlet antal nuværende aktive medlemmer
 NoValidatedMemberYet=Ingen bekræftede medlemmer fundet
-MembersByCountryDesc=Dette skærmbillede viser medlemsstatistikker efter lande. Grafer og diagrammer afhænger af tilgængeligheden af Googles online graftjeneste samt af tilgængeligheden af en fungerende internetforbindelse.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Denne skærm viser dig statistikker over medlemmer efter stat / provinser / kantoner.
 MembersByTownDesc=Denne skærm viser statistikker over medlemmer efter by.
 MembersByNature=Denne skærm viser dig statistikker over medlemmer efter natur.
@@ -208,25 +209,25 @@ NewMemberbyWeb=Nyt medlem tilføjet. Afventer godkendelse
 NewMemberForm=Nyt medlem formular
 SubscriptionsStatistics=Bidragsstatistik
 NbOfSubscriptions=Antal bidrag
-AmountOfSubscriptions=Beløb opkrævet fra bidrag
+AmountOfSubscriptions=Beløb opkrævet fra medlemsbetalinger
 TurnoverOrBudget=Omsætning (for et selskab) eller Budget (en fond)
-DefaultAmount=Standardbeløb for bidrag (bruges kun, hvis der ikke er defineret noget beløb på medlemstypeniveau)
-MinimumAmount=Minimumsbeløb (bruges kun, når bidragsbeløbet er gratis)
-CanEditAmount=Abonnementsbeløb kan defineres af medlemmet
+DefaultAmount=Standardbeløb for medlemsbetaling (bruges kun, hvis intet beløb er defineret på medlemstypeniveau)
+MinimumAmount=Minimumsbeløb for medlemsbetaling (har fortrinsret til eventuelle standardbeløb)
+CanEditAmount=Medlemsbeløbet kan defineres af medlemmet
 CanEditAmountDetail=Besøgende kan vælge/redigere beløbet for sit bidrag uanset medlemstype
 AmountIsLowerToMinimumNotice=Beløbet er lavere end minimumsbeløbet %s
 MEMBER_NEWFORM_PAYONLINE=Efter online-registreringen skiftes automatisk til onlinebetalingssiden
 ByProperties=Af natur
 MembersStatisticsByProperties=Medlemsstatistik af natur
-VATToUseForSubscriptions=momssats til brug for bidrag
-NoVatOnSubscription=Ingen moms for bidrag
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt brugt til bidragslinje til faktura: %s
+VATToUseForSubscriptions=momssats til brug for medlemsbetaling
+NoVatOnSubscription=Ingen moms for medlemsbetaling
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt brugt til medlemskabslinje til faktura: %s
 NameOrCompany=Navn eller firma
 SubscriptionRecorded=Bidrag registreret
 NoEmailSentToMember=Ingen email sendt til medlem
 EmailSentToMember=E-mail sendt til medlem på %s
-SendReminderForExpiredSubscriptionTitle=Send påmindelse via e -mail for udløbne bidrag
-SendReminderForExpiredSubscription=Send påmindelse via e-mail til medlemmer, når bidrag er ved at udløbe (parameter er antal dage før afslutning af medlemskab for at sende påmindelsen. Det kan være en liste over dage adskilt af et semikolon, for eksempel '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send påmindelse via e-mail for udløbet medlemskab
+SendReminderForExpiredSubscription=Send påmindelse via e-mail til medlemmer, når medlemskabet er ved at udløbe (parameter er antal dage før afslutning af medlemskab for at sende påmindelsen. Det kan være en liste over dage adskilt af et semikolon, for eksempel '10;5;0;-5 ')
 MembershipPaid=Medlemskab betalt for indeværende periode (indtil %s)
 YouMayFindYourInvoiceInThisEmail=Du kan muligvis finde din faktura knyttet til denne e-mail
 XMembersClosed=%s medlem(er) låst
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=En tredjepart er den juridiske enhed, der vil blive
 MemberFirstname=Medlemmets fornavn
 MemberLastname=Medlemmets efternavn
 MemberCodeDesc=Medlemskode, unik for alle medlemmer
-MemberSubscriptionStartFirstDayOf=Startdatoen for et medlemskab svarer til den første dag i en
-MemberSubscriptionStartAfter=Minimumsperiode før ikrafttrædelsen af startdatoen for et abonnement undtagen fornyelser (eksempel +3m = +3 måneder, -5d = -5 dage, +1Y = +1 år)
+MemberSubscriptionStartFirstDayOf=Tving den foreslåede dato for et medlemskab til at svare til den første dag i en
+MemberSubscriptionStartAfter=Minimumsperiode før ikrafttrædelsen af startdatoen for et første medlemskabsabonnement (eksklusive fornyelser)
+NoCorrection=Ingen rettelse
+MemberSubscriptionStartAfterDesc=Eksempel: +3m = +3 måneder, -5d = -5 dage, +1Y = +1 år
+MemberSubscriptionStartAfterDesc2=Dette er den foreslåede dato, når du opretter et første medlemskabsabonnement sammenlignet med den aktuelle dato. For fornyelse vil den foreslåede dato som standard forblive slutningen af det tidligere medlemskab.
 SubscriptionLinkedToConciliatedTransaction=Medlemskab er knyttet til en forsonet transaktion, så denne ændring er ikke tilladt.
 ConfirmMassSubsriptionCreation=Bekræft oprettelse af abonnement
 ConfirmMassSubsriptionCreationQuestion=Er du sikker på, at du vil oprette de %s valgte abonnement(er)?
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index 97fc5db3161..7a6d2274fc3 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -97,7 +97,6 @@ ShowService=Vis ydelse
 ProductsAndServicesArea=Varer og ydelser
 ProductsArea=Varer
 ServicesArea=Ydelser
-ListOfStockMovements=Liste over lagerbevægelser
 BuyingPrice=Købspris
 PriceForEachProduct=Produkter med specifikke priser
 SupplierCard=Sælgerkort
@@ -145,6 +144,7 @@ WithoutDiscount=Uden rabat
 VATRateForSupplierProduct=Afgiftssats (for denne leverandør/produkt)
 DiscountQtyMin=Rabat for denne mængde.
 NoPriceDefinedForThisSupplier=Ingen pris / antal defineret for denne leverandør / produkt
+NoProductPriceDefinedForThisSupplier=Ingen produktpris/antal defineret for denne leverandør
 NoSupplierPriceDefinedForThisProduct=Der er ikke defineret nogen leverandørpris / antal for dette produkt
 PredefinedItem=Foruddefineret vare
 PredefinedProducts=Foruddefineret produkt
@@ -171,7 +171,7 @@ BuyingPrices=Købspriser
 CustomerPrices=Kundepriser
 SuppliersPrices=Leverandørpriser
 SuppliersPricesOfProductsOrServices=Sælgerpriser (af produkter eller tjenester)
-CustomCode=Told | VITA-kode
+CustomCode=Told|Vare|HS|TARIC-kode
 CountryOrigin=Oprindelsesland
 RegionStateOrigin=Oprindelsesregion
 StateOrigin=Stat | Oprindelsesprovins
@@ -209,6 +209,7 @@ unitL=Liter
 unitT=ton
 unitKG=kg
 unitG=Gram
+unitGAL=gallon
 unitMG=mg
 unitLB=pund
 unitOZ=unse
@@ -233,7 +234,7 @@ unitFT3=ft³
 unitIN3=in³
 unitOZ3=unse
 unitgallon=gallon
-ProductCodeModel=Skabelon for vare-ref 
+ProductCodeModel=Skabelon for vare-ref
 ServiceCodeModel=Service ref skabelon
 CurrentProductPrice=Nuværende pris
 AlwaysUseNewPrice=Brug altid den aktuelle pris for vare/ydelse
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Format for anmodning er {"URL": "http://example
 UpdateInterval=Opdateringsinterval (minutter)
 LastUpdated=Seneste opdatering
 CorrectlyUpdated=Korrekt opdateret
-PropalMergePdfProductActualFile=Filer bruges til at tilføje til PDF Azur er / er
+PropalMergePdfProductActualFile=PDF-fil, der skal inkluderes i PDF-forslagene, hvis produktet er en del af forslaget...
 PropalMergePdfProductChooseFile=Vælg PDF-filer
 IncludingProductWithTag=Inklusive produkter/tjenester med mærket
 DefaultPriceRealPriceMayDependOnCustomer=Standard pris, reel pris kan afhænge af kunde
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=Mængden af linjen blev beregnet om efter leverand
 
 #Attributes
 Attributes=Attributter
+ProductAttributeExtrafields=Variant attributter ekstrafelter
+ProductAttributeExtrafieldsSetup=Opsætning af ekstrafelter for variantattributter
+ProductAttributeValueExtrafields=Variantattributter værdier ekstrafelter
+ProductAttributeValueExtrafieldsSetup=Opsætning af variantattributter værdier ekstrafelter
 VariantAttributes=Variant attributter
 ProductAttributes=Variant attributter for produkter
 ProductAttributeName=Variant attribut %s
@@ -395,6 +400,8 @@ ErrorDestinationProductNotFound=Destination produkt ikke fundet
 ErrorProductCombinationNotFound=Varevariant ikke fundet
 ActionAvailableOnVariantProductOnly=Handling kun tilgængelig på variant af produkt
 ProductsPricePerCustomer=Produktpriser pr. Kunde
+ProductLevelExtraFields=Yderligere attributter (niveaupris)
+ProductCustomerExtraFields=Yderligere attributter (kundepris)
 ProductSupplierExtraFields=Yderligere attributter (leverandørpriser)
 DeleteLinkedProduct=Slet det underordnede produkt, der er knyttet til kombinationen
 AmountUsedToUpdateWAP=Enhedsbeløb, der skal bruges til at opdatere den vægtede gennemsnitspris
@@ -403,7 +410,8 @@ PMPValueShort=WAP
 mandatoryperiod=Obligatoriske perioder
 mandatoryPeriodNeedTobeSet=Bemærk: Periode (start- og slutdato) skal defineres
 mandatoryPeriodNeedTobeSetMsgValidate=En service kræver en start- og slutperiode
-mandatoryHelper=Marker dette, hvis du ønsker en besked til brugeren ved oprettelse/validering af en faktura, kommercielt forslag, salgsordre uden at indtaste en start- og slutdato på linjer med denne service. <br> Bemærk, at meddelelsen er en advarsel og ikke en blokeringsfejl.
+mandatoryHelper=Marker dette, hvis du ønsker en besked til brugeren ved oprettelse/validering af en faktura, kommercielt forslag, salgsordre uden at indtaste en start- og slutdato på linjer med denne service.
+mandatoryHelper2=Bemærk, at meddelelsen er en advarsel og ikke en blokeringsfejl.
 DefaultBOM=Standard BOM
 DefaultBOMDesc=Standardstyklisten anbefales at bruge til fremstilling af dette produkt. Dette felt kan kun angives, hvis produktets art er '%s'.
 Rank=Rang
@@ -435,3 +443,6 @@ AllowStockMovementVariantParentHelp=Som standard er en forælder til en variant
 ConfirmSetToDraftInventory=Er du sikker på, at du vil gå tilbage til Kladdestatus?<br>De mængder, der i øjeblikket er indstillet i beholdningen, nulstilles.
 WarningLineProductNotToSell=Produktet eller tjenesten "%s" skal ikke sælges og blev klonet
 PriceLabel=Prismærke
+GenerateImage=Generer billede
+GenerateWithAI=Generer med AI
+PriceByCustomeAndMultiPricesAbility=Forskellige priser for hver kunde + Flere prissegmenter pr. produkt/service (hver kunde er i ét prissegment)
diff --git a/htdocs/langs/da_DK/salaries.lang b/htdocs/langs/da_DK/salaries.lang
index f49425dd6ac..db61c6b938e 100644
--- a/htdocs/langs/da_DK/salaries.lang
+++ b/htdocs/langs/da_DK/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Ny løn
 AddSalary=Tilføj løn
 NewSalaryPayment=Nyt lønkort
 AddSalaryPayment=Tilføj lønbetaling
+SalaryID=Løn ID
+SalaryAmount=Lønbeløb
 SalaryPayment=Løn betaling
 SalariesPayments=Lønudbetalinger
 SalariesPaymentsOf=Lønudbetalinger på %s
@@ -27,7 +29,7 @@ FillFieldFirst=Udfyld medarbejderfeltet først
 UpdateAmountWithLastSalary=Sæt beløb for sidste løn
 MakeTransferRequest=Foretag overførselsanmodning
 VirementOrder=Kreditoverførselsanmodning
-BankTransferAmount=Kreditoverførselsbeløb
 WithdrawalReceipt=Kredit overførsels ordre
 OrderWaiting=Afventende ordre
 FillEndOfMonth=Fyld med slutningen af måneden
+UserPaySlip=Lønseddel
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index f55aa8b6bed..287f0beafe9 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Brug her en liste over andre navne / aliaser, så siden kan
 WEBSITE_CSS_URL=URL for ekstern CSS-fil
 WEBSITE_CSS_INLINE=CSS-fil indhold (fælles for alle sider)
 WEBSITE_JS_INLINE=JavaScript fil indhold (fælles for alle sider)
-WEBSITE_HTML_HEADER=Tilføjelse nederst på HTML-overskrift (fælles for alle sider)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Robotfil (robots.txt)
 WEBSITE_HTACCESS=Websted .htaccess fil
 WEBSITE_MANIFEST_JSON=Webstedets manifest.json fil
@@ -56,16 +56,17 @@ ReadPerm=Læs
 WritePerm=Skriv
 TestDeployOnWeb=Test / implementer på nettet
 PreviewSiteServedByWebServer=<u> Se %s i en ny fane. </u> <br> <br> %s vil blive serveret af en ekstern webserver (som Apache, Nginx, IIS). Du skal installere og konfigurere denne server før du peger på biblioteket: <br> <strong> %s </strong> <br> URL serveret af ekstern server: <br> <strong> %s </strong>
-PreviewSiteServedByDolibarr= <u> Eksempel %s i en ny fane. </u> <br> <br> %s vil blive serveret af Dolibarr-serveren, så den ikke behøver nogen ekstra webserver (som Apache, Nginx, IIS), der skal installeres. <br> Det ubelejlige er, at webadresserne til sider ikke er brugervenlige og starter med stien til din Dolibarr. <br> URL tjent med Dolibarr: <br> <strong> %s </strong> <br> <br> For at bruge din egen eksterne webserver til at tjene denne hjemmeside, oprette en virtuel vært på din webserver, der peger på mappen <br> <strong> %s </strong> <br> derefter indtaste navnet på denne virtuelle server i egenskaberne af dette websted og klik på linket "Test / Implementering på nettet".
+PreviewSiteServedByDolibarr=<u>Se forhåndsvisning af %s på en ny fane.</u><br><br>%s vil blive serveret af Dolibarr-serveren, så den behøver ikke nogen ekstra webserver (som Apache, Nginx, IIS) skal installeres.<br>Det ubelejlige er, at sidernes URL'er ikke er brugervenlige og starter med stien til din Dolibarr.<br>URL tjent af Dolibarr:<br><strong><span class='notranslate2ecz8b<04fec2ecz8b /span></strong><br><br>For at implementere eller teste ved hjælp af din egen eksterne webserver (som Apache, Nginx, Lighttp) bruger linket "%s".
 VirtualHostUrlNotDefined=URL til den virtuelle vært, der serveres af en ekstern webserver, der ikke er defineret
 NoPageYet=Ingen sider endnu
 YouCanCreatePageOrImportTemplate=Du kan oprette en ny side eller importere en fuld hjemmeside skabelon
 SyntaxHelp=Hjælp til specifikke syntax tips
 YouCanEditHtmlSourceckeditor=Du kan redigere HTML-kildekode ved hjælp af knappen "Kilde" i editoren.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> At inkludere en  <strong>image</strong> gemt i <strong>dokumenterne</strong>direktorie , brug <strong>viewimage.php</strong>-indpakningen.<br>,Example, et billede i dokumenter/medier (åben mappe til offentlig adgang), syntaks er:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"</strong><br>
-YouCanEditHtmlSource2=For et billede, der deles med et delingslink (åben adgang ved hjælp af deling af hash-nøglen til filen), er syntaks: <br> <strong> &lt;img src = "/ viewimage.php? Hashp = 12345679012 ..." </strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Du kan inkludere PHP-kode i denne kilde ved hjælp af tags <strong>&lt;?php ?&gt;<span class='01a66fccz01a665d9d0 </span>. Følgende globale variabler er tilgængelige: $conf, $db, $mysoc, $user, $websted, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> Du kan også inkludere af en anden side/beholder med følgende syntaks:<br><strong>&lt;? php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br>b03492bzfcc<fda /span><span class='notranslate'><span class="fa fa-bug paddingright"></span> Du kan foretage en omdirigering til en anden side/beholder med følgende syntaks (Bemærk: udskriv ikke nogen indhold før en omdirigering):<br><strong>&lt;?php redirectToContainer alias_of_container_to_redirect_to'); ?&gt;</strong><br>Du kan også lave en omdirigering med GET-parametre: <br><strong>&lt;?php redirectToContainer('container_to', 'container_alias_of', 'container_to' 0, 0, $array_of_get_params); ?&gt;</strong><br>b03492bzfcc<fda /span><span class='notranslate'><span class="fa fa-link paddingright"></span> For at tilføje et link til en anden side skal du bruge syntaksen:<br> <strong>&lt;a href="alias_of_page_to_link_to.php"b0012c7z0</0be12c7z0 >mylink<span class='notranslate'>&lt;a&gt;</strong> <br><br><p>b02bd88d791translate'><spanlate'0 '></span> Du kan dynamisk indstille sidetitlen og <strong>SEO-metatags</strong>, søgeord, ). Definer blot følgende variabler:<br> <code>$__PAGE__TITLE__ = "Titelværdi …";<span class='notranslate67b'>7d08a8a67b>b316dz0 </span><br> <code>$__PAGE__KEYWORDS__ = "søgeord1, søgeord2, søgeord3 …"; // Kommasepareret</code><br> <code>____PAGE_DEscriptionSC ;</code></p><br>840d /span><span class='notranslate'></span> At inkludere et <strong>link til download</strong> en fil gemt i mappen <strong>documents</strong>, skal du bruge <strong>document.php</span> </strong> wrapper:<br>Eksempel, for en fil til dokumenter/ecm (skal logges), er syntaksen:<br><strong>&lt;a href="/document.php?modulepart=[ecm&file relative_dir/]filename.ext"&gt;</strong><br> tilFor en fil dokumenter/medier (åben mappe for offentlig adgang), syntaks er:<br><strong>&lt; /span>a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"<span class='notranslate'>&gt;</strong> <br>For en fil, der deles med et delingslink (åben adgang ved hjælp af filens hash-nøgle), er syntaksen:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"b0012c7dcbe</span087 ><span class='notranslate'></strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> At inkludere en  <strong>image</strong> gemt i <strong>medier</strong> Bibliotek (bibliotek åben for offentlig adgang), brug den relative sti, der starter med <strong>/medias</strong>, eksempel:<br><strong>&lt;img src="/medias/image/.myimagepath/filename" span class='notranslate'>&gt;</strong><br>
+YouCanEditHtmlSource2=For et billede, der er delt med et delelink (åben adgang ved hjælp af filens hashnøgle til deling), skal du bruge wrapperen:<br><strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt; </strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=For at få URL'en til et billede i et html-indhold i en artikel brug<br><strong>  &lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?b0012c>b0012c>class ='notranslate'>&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Klon side / container
 CloneSite=Klon website
@@ -87,15 +88,15 @@ WebsiteAccount=Websitetskonto
 WebsiteAccounts=Websitetskonti
 AddWebsiteAccount=Opret websitet konto
 BackToListForThirdParty=Tilbage til listen for tredjeparter
-DisableSiteFirst=Deaktiver hjemmesiden først
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Min hjemmeside titel
 AnotherContainer=Sådan inkluderer du indhold på en anden side / beholder (du har muligvis en fejl her, hvis du aktiverer dynamisk kode, fordi den indlejrede underbeholder muligvis ikke findes)
 SorryWebsiteIsCurrentlyOffLine=Beklager, dette websted er i øjeblikket offline. Kom tilbage senere ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Aktiver webstedskontotabellen
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktivér tabellen til at gemme webstedskonti (login / pass) for hver webside / tredjepart
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Du skal først definere standard startside
-OnlyEditionOfSourceForGrabbedContentFuture=Advarsel: Oprettelse af en webside ved at importere en ekstern webside er forbeholdt erfarne brugere. Afhængigt af kildesidens kompleksitet kan resultatet af importen afvige fra originalen. Også hvis kildesiden bruger almindelige CSS-stile eller modstridende JavaScript, kan det ødelægge udseendet eller funktionerne i websted-editoren, når du arbejder på denne side. Denne metode er en hurtigere måde at oprette en side på, men det anbefales at oprette din nye side fra bunden eller fra en foreslået sideskabelon.<br>Bemærk også, at inline-editoren muligvis ikke virker korrekthed, når det bruges på en grebet ekstern side.
-OnlyEditionOfSourceForGrabbedContent=Kun udgave af HTML-kilde er mulig, når indhold blev taget fra et eksternt websted
+OnlyEditionOfSourceForGrabbedContentFuture=Advarsel: Oprettelse af en webside ved at importere en ekstern webside er forbeholdt erfarne brugere. Afhængigt af kildesidens kompleksitet kan resultatet af importen afvige fra originalen. Også hvis kildesiden bruger almindelige CSS-stile eller modstridende JavaScript, kan det ødelægge udseendet eller funktionerne i websted-editoren, når du arbejder på denne side. Denne metode er en hurtigere måde at oprette en side på, men det anbefales at oprette din nye side fra bunden eller fra en foreslået sideskabelon.<br>Bemærk også, at inline-editoren muligvis ikke virker korrekt, når det bruges på en grebet ekstern side.
+OnlyEditionOfSourceForGrabbedContent=Kun HTML-kildeændring er mulig, når indhold hentes fra et eksternt websted
 GrabImagesInto=Grib også billeder fundet i css og side.
 ImagesShouldBeSavedInto=Billeder skal gemmes i biblioteket
 WebsiteRootOfImages=Rodbibliotek for website billeder
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log ud fra din kundekonto
 filteredByVersion=Filtreret efter version
 removeFilter=Fjern filter
 viewMyCart=Se min indkøbskurv
+Shipping=Shipping
 freeShipping=Gratis fragt!
 noProducts=Ingen produkter
 nbrItemsInCart=Der er <span class="ajax_cart_quantity">0</span> varer i din indkøbskurv.
@@ -284,12 +286,13 @@ productNameAToZ=Produktnavn: A til Z
 productNameZToA=Produktnavn: Z til A
 referenceLowestFirst=Reference: Laveste først
 referenceHighestFirst=Reference: Højest først
+productPerPage=products per page
 perPage=per side
 showAll=Vis alt
 showing= Viser
 nbrOfProducts= Der er %s produkter.
 noResultsHaveBeenFound=0 resultater er fundet.
-noResultsWereFound= Der blev ikke fundet nogen resultater.
+noResultsWereFound=Der blev ikke fundet nogen resultater.
 addToCart=Tilføj til kurv
 backHome=Vend tilbage til Hjemmet
 priceDrop=Prisfald
@@ -302,10 +305,11 @@ lastUpdate=Sidste ændring
 contactSupport=Sådan kontakter du support
 noProductToDisplay=Fejl, intet produkt at vise
 yourCompanyInformation=Dine virksomhedsoplysninger
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=Denne email er allerede registreret.
 firstnameContainsLettersOnly=<b>Fornavn</b> må kun indeholde bogstaver og mellemrum
 lastnameContainsLettersOnly=<b>Efternavn</b> må kun indeholde bogstaver og mellemrum
-passwordCriteria=<b>Adgangskode</b> skal opfylde følgende kriterier:<br>- 12 tegn<br> - 1 stort bogstav<br>- 1 ciffer<br>- Ingen specialtegn <br>- Undgå at gentage tegn mere end 3 gange<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=Der opstod en fejl.
 accountCreation=Opret en konto
 errorsOccurred=Der er %s fejl%s
@@ -357,3 +361,7 @@ subtract=Trække fra
 LoginCheckout=Log ind og fortsæt til kassen
 paymentSuccessProcessed=Din betaling er blevet behandlet.
 youWillBeRedirectedToOrderPage=Du vil snart blive omdirigeret til siden med ordredetaljer.
+WebPortalSetupNotComplete=Webportalopsætningen er ikke fuldført
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/de_AT/mails.lang b/htdocs/langs/de_AT/mails.lang
index 01bcd1123ca..20a58eb9335 100644
--- a/htdocs/langs/de_AT/mails.lang
+++ b/htdocs/langs/de_AT/mails.lang
@@ -1,9 +1,6 @@
 # Dolibarr language file - Source file is en_US - mails
 MailText=Nachricht
-ResetMailing=E-Mail-Kampagne erneut senden
 MailingStatusValidated=Bestätigt
 CloneContent=Nachricht duplizieren
-MailingArea=E-Mail-Kampagnenübersicht
 MailNoChangePossible=Die Empfängerliste einer freigegebenen E-Mail-Kampagne kann nicht mehr geändert werden
-LimitSendingEmailing=Aus Sicherheits- und Zeitüberschreitungsgründen ist der Online-Versadn von E-Mails auf <b>%s</b> Empfänger je Sitzung beschränkt.
 IdRecord=Eintrags ID
diff --git a/htdocs/langs/de_AT/website.lang b/htdocs/langs/de_AT/website.lang
index 1dd6e52a046..e32ad7c81d5 100644
--- a/htdocs/langs/de_AT/website.lang
+++ b/htdocs/langs/de_AT/website.lang
@@ -1,4 +1,2 @@
 # Dolibarr language file - Source file is en_US - website
-WebPortalInvoiceListMenu=Rechnungen
-WebPortalInvoiceListTitle=Rechnungen
 unitPrice=Bruttopreis (Stk.)
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index 386444bffcc..5632b93bc50 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -8,8 +8,6 @@ FileIntegrityIsStrictlyConformedWithReference=Datei-Integrität entspricht genau
 FileIntegrityIsOkButFilesWereAdded=Die Dateiüberprüfung ist abgschlossen. Dabei hab ich ein paar neue Dateien hizugefügt.
 FileIntegritySomeFilesWereRemovedOrModified=Datei-Integrität konnte NICHT bestätigt werden. Dateien wurden modifiziert, entfernt oder zugefügt.
 MakeIntegrityAnalysisFrom=Mache Integrität Analyse von Anwendungsdateien aus
-LocalSignature=Eingebettete lokale Signatur (weniger zuverlässig)
-RemoteSignature=Remote entfernte Unterschrift (mehr zuverlässig)
 FilesMissing=Fehlende Dateien
 FilesUpdated=Dateien ersetzt
 FilesModified=Geänderte Dateien
@@ -128,7 +126,6 @@ BoxesAvailable=Verfügbare Boxen
 BoxesActivated=Aktivierte Boxen
 ActiveOn=Aktiviert am
 ActivatableOn=Aktivierbar ab
-MainDbPasswordFileConfEncrypted=Verschlüssle die Passwörter in der Dolibarr - Konfigurationsdatei (conf.php) - das ist sehr empfohlen, sonst werden Sie in Klartext abgelegt.
 ProtectAndEncryptPdfFiles=Schütze von Dolibarr generierte PDFs - der Haken: Wenn das aktiv ist, kann ich keine Massen - PDFs mehr herstellen.
 ProtectAndEncryptPdfFilesDesc=Die Aktivierung des PDF-Dokumentschutzes erhält die Lesbarkeit und Druckfähigkeit des Dokuments, Bearbeitung und Kopien sind jedoch nicht mehr möglich. Bitte beachten Sie, dass nach Aktivierung dieser Funktion auch die Stapelverarbeitung von PDF-Dokumenten (z.B. alle offenen Rechnungen zusammenführen) nicht mehr funktioniert.
 Developpers=Entwickler/Mitwirkende
@@ -253,7 +250,6 @@ ModuleCompanyCodeSupplierAquarium=%sgefolgt von der Lieferantennummer für den K
 ModuleCompanyCodePanicum=Leeren Kontierungscode zurückgeben.
 Use3StepsApproval=Standardmässig, Einkaufsaufträge müssen durch zwei unterschiedlichen Benutzer erstellt und freigegeben werden (ein Schritt/Benutzer zum Erstellen und ein Schritt/Benutzer für die Freigabe). Beachten Sie, wenn ein Benutzer beide Rechte hat - zum Erstellen und Freigeben, dann reicht ein Benutzer für diesen Vorgang. Optional können Sie einen zusätzlichen Schritt/User für die Freigabe einrichten, wenn der Betrag einen bestimmten dedizierten Wert übersteigt (wenn der Betrag höher wird, werden 3 Stufen notwendig: 1=Validierung, 2=erste Freigabe und 3=Gegenfreigabe.<br>Lassen Sie das Feld leer, wenn eine Freigabe (2 Schritte) ausreicht; tragen Sie einen sehr niedrigen Wert (0.1) ein, wenn eine zweite Freigabe notwendig ist.
 UseDoubleApproval=3-fach Verarbeitungsschritte verwenden, wenn der Betrag (ohne Steuer) höher ist als ...
-WarningPHPMail2=Falls dein Anbieter Mailclients auf einen IP-Adressbereich einschränkt, hier die IP deines E-Mail Benutzerprogramms hier in Dolibarr: <strong>%s</strong>.
 ClickToShowDescription=Klicken um die Beschreibung zu sehen
 DependsOn=Dieses Modul benötigt die folgenden Module
 RequiredBy=Diese Modul wird durch folgende Module verwendet
@@ -274,7 +270,6 @@ Module1Desc=Geschäftspartner- und Kontakteverwaltung (Kunden, Leads, ...)
 Module10Name=Buchhaltung einfach
 Module10Desc=Einfache Buchhaltungsberichte (Journale, Umsätze) auf Basis von Datenbankinhalten. Es wird keine Hauptbuch-Tabelle verwendet.
 Module20Desc=Angeboteverwaltung
-Module22Desc=E-Mail-Kampagnenverwaltung
 Module25Desc=Kunden - Auftragsverwaltung
 Module30Desc=Verwaltung von Rechnungen und Gutschriften für Kunden. Verwaltung von Rechnungen und Gutschriften für Lieferanten
 Module40Name=Lieferanten
@@ -376,7 +371,6 @@ Permission304=Barcodes erzeugen und ändern.
 Permission331=Lesezeichen einsehen
 Permission431=PHP Debug Bar verwenden
 Permission519=Löhne exportieren
-Permission521=Darlehen einsehen
 Permission525=Darlehens-rechner
 Permission527=Exportiere Darlehen
 Permission651=Rechnungen für Rohmaterialien einsehen.
@@ -452,6 +446,7 @@ TestLoginToAPI=Testen Sie sich anmelden, um API
 ExtraFieldsLines=Ergänzende Attribute (Zeilen)
 ExtraFieldsSupplierOrdersLines=Ergänzende Attribute (in Bestellungszeile)
 ExtraFieldsSupplierInvoicesLines=Ergänzende Attribute (in Rechnungszeile)
+ExtraFieldsMemberType=Ergänzende Attribute (Mitglied)
 SendmailOptionNotComplete=Achtung, auf einigen Linux-Systemen, E-Mails von Ihrem E-Mail zu senden, sendmail Ausführung Setup muss conatins Option-ba (Parameter mail.force_extra_parameters in Ihre php.ini-Datei). Wenn einige Empfänger niemals E-Mails erhalten, versuchen, diese Parameter mit PHP mail.force_extra_parameters =-ba) zu bearbeiten.
 TranslationOverwriteDesc=Sie können Zeichenketten durch Füllen der folgenden Tabelle überschreiben. Wählen Sie Ihre Sprache aus dem "%s" Drop-Down und tragen Sie den Schlüssel in "%s" und Ihre neue Übersetzung in "%s" ein.
 NewTranslationStringToShow=Neue Übersetzungen anzeigen
@@ -571,7 +566,6 @@ ModelModulesProduct=Vorlage für Produktdokumente
 SeeSubstitutionVars=Siehe * für eine Liste der Verfügbaren Variablen
 AddRemoveTabs=Tab hinzufügen oder entfernen
 AddBoxes=Box hinzufügen
-AddSheduledJobs=Geplante Jobs hinzufügen
 AddHooks=Hook hinzufügen
 AddTriggers=Trigger hinzufügen
 AddMenus=Menü hinzufügen
diff --git a/htdocs/langs/de_CH/banks.lang b/htdocs/langs/de_CH/banks.lang
index 3c493eb5c9b..8caa6897dda 100644
--- a/htdocs/langs/de_CH/banks.lang
+++ b/htdocs/langs/de_CH/banks.lang
@@ -9,6 +9,8 @@ CashAccounts=Kassen
 ErrorBankLabelAlreadyExists=Kontenbezeichnung existiert bereits
 BankBalanceBefore=Bilanz vor
 BankBalanceAfter=Bilanz nach
+IBAN=IBAN Nummer
+BIC=BIC / SWIFT Code
 SwiftValid=BIC/SWIFT gültig
 SwiftNotValid=BIC/SWIFT ungültig
 IbanValid=BAN gültig
diff --git a/htdocs/langs/de_CH/bills.lang b/htdocs/langs/de_CH/bills.lang
index 436cf2afaec..f5048c53332 100644
--- a/htdocs/langs/de_CH/bills.lang
+++ b/htdocs/langs/de_CH/bills.lang
@@ -68,7 +68,6 @@ BillStatusCanceled=Aufgegeben
 BillStatusNotRefunded=Nicht zurückerstattet
 BillStatusClosedPaidPartially=Bezahlt (teilweise)
 BillShortStatusConverted=Verarbeitet
-BillShortStatusNotRefunded=Nicht zurückerstattet
 BillShortStatusClosedPaidPartially=Bezahlt (teilweise)
 PaymentStatusToValidShort=Freizugeben
 ErrorVATIntraNotConfigured=Die innergemeinschaftliche MWST - Nummer ist noch nicht definiert.
@@ -212,7 +211,6 @@ CreateNextSituationInvoice=Erstelle nächsten Position
 DisabledBecauseNotLastInCycle=Der folgende Situation ist bereits vorhanden.
 DisabledBecauseFinal=Dieser Status ist endgültig.
 CantBeLessThanMinPercent=Der Fortschritt kann nicht kleiner als sein bisheriger Wert werden.
-SituationInvoiceProgressColTitle=Fortschritt
 PDFOctopusSituationInvoiceTitle=Situation Rechnung
 invoiceLineProgressError=Rechnungszeile Fortschritt kann nicht grösser oder gleich der nächsten Rechnungszeile sein
 ToCreateARecurringInvoice=Um eine wiederkehrende Rechnung für diesen Vertrag zu erstellen, zuerst einen Rechnungsentwurf erstellen und diesen dann in eine Vorlage umwandeln und zuletzt den Rechnungsintervall erfassen.
diff --git a/htdocs/langs/de_CH/categories.lang b/htdocs/langs/de_CH/categories.lang
index 88990490756..77f39eb8105 100644
--- a/htdocs/langs/de_CH/categories.lang
+++ b/htdocs/langs/de_CH/categories.lang
@@ -69,13 +69,12 @@ CatProdLinks=Verbindung zwischen Produkten/Leistungen und Schlagwörtern / Kateg
 CatMembersLinks=Verbindung zwischen Mitgliedern und Kategorien
 CatProjectsLinks=Verknüpfungen zwischen Projekten und Schlagwörtern / Kategorien
 CatUsersLinks=Verknüpfungen zwischen Benutzern und Schlagworten/Kategorien
+DeleteFromCat=Aus Schlagwort / Kategorie entfernen
 ExtraFieldsCategories=Ergänzende Eigenschaften
 CategoriesSetup=Suchwörter/Kategorien Einrichten
 CategorieRecursiv=Automatisch mit übergeordnetem Schlagwort / Kategorie verbinden
-AddCustomerIntoCategory=Kategorie zu Kunden zuordnen
-AddSupplierIntoCategory=Kategorie zu Lieferanten zuordnen
-AssignCategoryTo=Kategorie zuordnen zu
 ShowCategory=Zeige Schlagwort / Kategorie
+ByDefaultInList=Standartmässig in der Liste
 ChooseCategory=Wähle die Kategorie.
 StocksCategoriesArea=Lager Kategorien
 UseOrOperatorForCategories=Verwende den Operator 'ODER' für Kategorien
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index b332ccbd4a3..19ef755a3c2 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -28,13 +28,13 @@ CountryCode=Ländercode
 PhoneShort=Telefon
 PhonePerso=Telefon privat
 PhoneMobile=Mobiltelefon
-No_Email=E-Mail kampagnen ablehnen
 VATIsUsed=MWST - pflichtig
 VATIsNotUsed=Nicht MWST - pflichtig
 CopyAddressFromSoc=Übernehme die Adresse vom Geschäftspartner
 ThirdpartyNotCustomerNotSupplierSoNoRef=Hoppla, der Partner ist weder Kunde noch Lieferant, keine Objekte zum Verknüpfen verfügbar.
 ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Hoppla, der Partner ist weder Kunde noch Lieferant, keine Rabatte verfügbar.
 PaymentBankAccount=Bankkonto für Zahlung
+OverAllOrders=Bestellungen
 OverAllInvoices=Rechnungen
 OverAllSupplierProposals=Generelle Preisanfragen
 LocalTax1IsUsed=Zweite Steuer verwenden
@@ -143,11 +143,9 @@ NoParentCompany=Keine Mutterfirma
 ContactNotLinkedToCompany=Kontakt keinem Geschäftspartner zugeordnet
 DolibarrLogin=Dolibarr Benutzername
 NoDolibarrAccess=Kein Zugang
-ExportDataset_company_1=Geschäftspartner und ihre Eigenschaften
-ExportDataset_company_2=Kontakte und deren Eigenschaften
+ExportDataset_company_2=Zusätzliche Kontakte / Adressen und Attribute von Geschäftspatnern
 ImportDataset_company_1=Geschäftspartner und deren Eigenschaften
 ImportDataset_company_2=Zusätzliche Kontakte / Adressen und Attribute von Geschäftspatnern
-ImportDataset_company_3=Geschäftspartner - Bankverbindungen
 ImportDataset_company_4=Geschäftspartner - Vertriebsmitarbeiter (Zuordnung von Vertriebsmitarbeitern/Benutzern zu Geschäftspartnern)
 PriceLevel=Preisniveau
 PriceLevelLabels=Preisniveau - Labels
diff --git a/htdocs/langs/de_CH/mails.lang b/htdocs/langs/de_CH/mails.lang
index d3f3f39d2d0..638dc78248e 100644
--- a/htdocs/langs/de_CH/mails.lang
+++ b/htdocs/langs/de_CH/mails.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Mailversand
-EMailings=E-Mail-Kampagne
 MailCard=E-Mail-Kampagnenkarte
 MailErrorsTo=Fehler an
 MailText=E-Mail-Text
@@ -17,15 +16,10 @@ DateLastSend=Datum des letzten Versand
 SentTo=Versandt an <b>%s</b>
 MailingStatusRead=Lesen
 RecipientSelectionModules=Definiert Empfängerauswahlen
-MailingArea=E-Mail Kampagnenübersicht
 NbOfCompaniesContacts=Einzigartige Geschäftspartner-Kontakte
 MailNoChangePossible=Die Empfängerliste einer freigegebenen E-Mail Kampagne kann nicht mehr geändert werden
-SearchAMailing=Suche E-Mail Kampagne
-SendMailing=E-Mail Kampagne versenden
 MailingNeedCommand2=Sie können den Versand jedoch auch online starten, indem Sie den Parameter MAILING_LIMIT_SENDBYWEB auf den Wert der pro Sitzung gleichzeitig zu versendenden Mails setzen. Die entsprechenden Einstellungen finden Sie unter Übersicht-Einstellungen-Andere.
-LimitSendingEmailing=Hinweis: Aus Sicherheits- und Zeitüberschreitungsgründen ist der Online-Versand von E-Mails auf <b>%s</b> Empfänger je Sitzung beschränkt.
 ToAddRecipientsChooseHere=Fügen Sie Empfänger über die Listenauswahl hinzu
-NbOfEMailingsSend=E-Mail-Kampagne versandt
 TagCheckMail=Öffnen der Mail verfolgen
 TagUnsubscribe=Abmelde Link
 NoEmailSentBadSenderOrRecipientEmail=Kein E-Mail gesendet. Ungültige Absender oder Empfänger Adresse. Benutzerprofil kontrollieren.
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index 8817527f2cd..2d4f894d662 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -101,6 +101,7 @@ DateOfLine=Datum
 DurationOfLine=Dauer
 Model=Dokumentenvorlage
 DefaultModel=Standardvorlage
+NoLogoutProcessWithAuthMode=Keine Anwendung Trennungsfunktion mit Authentifizierungsmodus <b>% s </ b>
 Connection=Anmeldung
 Alert=Warnung
 Card=Karte
@@ -173,7 +174,6 @@ RefPayment=Zahlungs-Nr.
 ActionsToDo=Aktionen zur Erledigung
 ActionRunningNotStarted=Nicht begonnen
 ActionUncomplete=Unvollständig
-LatestLinkedEvents=Die neuesten %s verknüpften Vorgänge
 CompanyFoundation=Firma / Organisation
 ContactsAddressesForCompany=Ansprechpartner / Adressen zu diesem Geschäftspartner
 AddressesForCompany=Adressen für den Geschäftspartner
@@ -189,6 +189,7 @@ NoOpenedElementToProcess=Keine offenen Aktionen
 Categories=Suchwörter/Kategorien
 Category=Stichwort / Kategorie
 FromLocation=Von
+to=An
 ToDate=An
 OtherInformations=Weitere Informationen
 ApprovedBy=genehmigt von
@@ -244,7 +245,6 @@ CurrentTheme=Aktuelle Oberfläche
 Screen=Bildschirm
 Signature=E-Mail-Signatur
 Notes=Hinweise
-FreeLineOfType=Freitext vom Typ
 ReGeneratePDF=PDF erneut erzeugen
 Merge=Verbinden
 DocumentModelStandardPDF=Standardvorlage (PDF)
@@ -305,7 +305,6 @@ Calendar=Kalender
 GroupBy=Sortieren nach
 ViewFlatList=Einfache Liste anzeigen
 RemoveString=Entferne die Zeichenfolge '%s'
-ActualizeCurrency=Aktualisiere Währung
 ModuleBuilder=Modul und Applikationsentwicklungsumgebung
 SetMultiCurrencyCode=Setze Währung
 BulkActions=Stapelverarbeitungen
@@ -383,3 +382,4 @@ LinkedFiles=Verknüpfte Dateien und Dokumente
 LinkComplete=Die Datei wurde erfolgreich verlinkt
 ErrorFileNotLinked=Die Datei konnte nicht verlinkt werden
 URLToLink=URL zum Verlinken
+AllTime=Vom start
diff --git a/htdocs/langs/de_CH/products.lang b/htdocs/langs/de_CH/products.lang
index 083fc604b7f..4266618366e 100644
--- a/htdocs/langs/de_CH/products.lang
+++ b/htdocs/langs/de_CH/products.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=Produkt-Nr.
+ProductServiceCard=Produkte/Leistungen Karte
+ProductId=Produkt/Leistungs ID
 Create=Erstelle
 ProductVatMassChange=Globale MWST - Änderung
 ProductVatMassChangeDesc=Dieses Werkzeug ändert den MWST Satz <b><u>aller</u></b> Produkte und Dienstleistungen im ganzen System!
@@ -9,6 +11,7 @@ ProductAccountancyBuyExportCode=Buchhaltungskonto (Importkauf)
 ProductAccountancySellCode=Buchhaltungskonto (Verkauf)
 ProductAccountancySellIntraCode=Buchhaltungskonto (innergemeinschaftlich EU)
 ProductAccountancySellExportCode=Buchhaltungskonto (Verkauf Export)
+ProductsPipeServices=Produkte | Dienstleistungen
 ProductsOnSale=Produkte für den Verkauf
 ProductsOnPurchase=Produkte für den Einkauf
 ProductsOnSaleOnly=Produkte nur für den Verkauf
@@ -20,23 +23,39 @@ ServicesOnPurchase=Dienstleistungen für den Einkauf
 ServicesOnSaleOnly=Dienstleistungen nur für den Verkauf
 ServicesOnPurchaseOnly=Dienstleistungen nur für den Einkauf
 ServicesNotOnSell=Dienstleistungen weder für den Ein-, noch Verkauf
+ServicesOnSellAndOnBuy=Leistungen für Ein- und Verkauf
 LastModifiedProductsAndServices=Die %s zuletzt geänderten Produkte / Dienstleistungen
 LastRecordedProducts=%s zuletzt erfasste Produkte
 LastRecordedServices=%s zuletzt erfasste Leistungen
+Stock=Warenbestand
 MenuStocks=Warenbestände
+Stocks=Lagerbestände und Lagerorte (Warenlager)
+OnSell=Zu verkaufen
+OnBuy=zum Einkaufen
+NotOnSell=Nicht zu verkaufen
+ProductStatusOnSell=verkäuflich
+ProductStatusNotOnSell=unverkäuflich
+ProductStatusOnSellShort=verkäuflich
+ProductStatusNotOnSellShort=unverkäuflich
+ProductStatusOnBuy=Für den Einkauf
+ProductStatusNotOnBuy=Nicht für den Einkauf
+ProductStatusOnBuyShort=beziehbar
+ProductStatusNotOnBuyShort=unbeziehbar
 AppliedPricesFrom=Angelegt von
 SellingPriceHT=Verkaufspreis (exkl. MWST)
 SellingPriceTTC=Verkaufspreis (inkl. MwSt.)
 SellingMinPriceTTC=Mindestverkaufspreis (inkl. MWST)
 CostPriceDescription=In dieses Feld kannst du deinen freien Durchschnittspreis dieses Produktes eintragen.\nZum Beispiel den durchschnittlichen EP plus deine Verarbeitungs und Vertriebskosten.
 CostPriceUsage=Dieser Wert hilft bei der Margenbestimmung
+MinPriceTTC=Mindest-Verkaufspreis (inkl. MwSt.)
 EditSellingPriceLabel=Preisschild anpassen
-CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne MwSt.) nicht unterschreiten. Diese Meldung kann auch angezeigt werden, wenn Sie einen zu hohen Rabatt geben.
 SupplierRef=Verkäufer SKU (Artikelnummer)
 ServicesArea=Leistungs-Übersicht
 SupplierCard=Anbieterkarte
 SetDefaultBarcodeType=Wählen Sie den standardmässigen Barcode-Typ
+ServiceLimitedDuration=Ist die Erbringung einer Dienstleistung zeitlich beschränkt:
 MultiPricesAbility=Preisstufen pro Produkt / Dienstleistung\n(Kunden werden einem Segment zugewiesen)
+MultiPricesNumPrices=Anzahl Preise
 DefaultPriceType=Standardpreis für neue Verkaufspreise (inkl. / exxkl. MWST)
 AssociatedProductsAbility=Aktiviere Produktpakete (Kits - mehrere Produkte in einem Satz)
 VariantsAbility=Aktiviere Produktvarianten (gemäss selbst definierten Kriterien, wie: Farbe, Grösse usf.)
@@ -50,13 +69,14 @@ ProductAssociationList=Produkte und Diensleistungen in diesem Paket
 ProductParentList=Produktsätze mit diesem Produkt darin
 QtyMin=Mindestmenge
 PriceQtyMin=Mindestmengenpreis
-PriceQtyMinCurrency=Mengenpreis (gem. Währung) Brutto
-VATRateForSupplierProduct=MWST - Satz (Anbieter / Produkt)
 DiscountQtyMin=Mengenrabatt
 NoPriceDefinedForThisSupplier=Ich habe weder Preis- noch Mengenangaben für diesen Anbiter und seine Produkte.
 NoSupplierPriceDefinedForThisProduct=Ich habe weder Preis- noch Mengenangaben für diesen Anbiter und seine Produkte.
 PredefinedItem=Vordefinierter Artikel
+PredefinedProducts=Vordefiniertes Verkaufsprodukt
+PredefinedServices=Vordefinierte Dienstleistung zum Verkauf
 Finished=Fertigprodukt
+RowMaterial=Rohmaterial
 ConfirmCloneProduct=Bist du sicher, dass du diese Position <b>%s</b> duplizieren willst?
 CloneContentProduct=Dupliziere alle Hauptinformationen dieser Position
 ClonePricesProduct=Übernehme alle Preise
@@ -69,7 +89,6 @@ BuyingPrices=Einkaufspreise
 CustomerPrices=Kunden Preise
 SuppliersPrices=Lieferantenpreise
 SuppliersPricesOfProductsOrServices=Anbieterpreise
-CustomCode=Zolltarifnummer (z.B. HSN)
 RegionStateOrigin=Region
 StateOrigin=Herkunftsland / Provinz / Kanton
 Nature=Produktart (Rohmaterial / Fertigprodukt
@@ -105,15 +124,22 @@ ResetBarcodeForAllRecords=Neuen Strichcode für alle Einträge setzten (alle ber
 PriceByCustomer=Unterschiedliche Preise je nach Kunde
 PriceCatalogue=Ein einziger Verkaufspreis pro Produkt/Leistung
 PricingRule=Regeln für Verkaufspreise
+AddCustomerPrice=Preis je Kunde hinzufügen
 ForceUpdateChildPriceSoc=Übertrage diesen Preis auf die Subpartner dieses Kunden
 MinimumRecommendedPrice=Der hinterlegte Mindestpreis ist: %s
+PriceExpressionEditor=Preis Ausdrucks Editor
+PriceExpressionSelected=Ausgewählter Preis Ausdruck
+PriceExpressionEditorHelp1="Preis = 2 + 2" oder "2 + 2" für die Einstellung der Preis. \nVerwende ; um Ausdrücke zu trennen
 PriceExpressionEditorHelp2=Sie können auf die ExtraFields mit Variablen wie <b>#extrafield_myextrafieldkey# </b> und globale Variablen mit <b>#global_mycode#</b> zugreifen
 PriceExpressionEditorHelp3=Für alle Preise (Produkte / Dienstleistungen / Anbieter) stehen diese Variablen zur Verfügung<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>.
 PriceExpressionEditorHelp4=Für Produkt- / Dienstleistungspreise gibt es zusätzlich <b>#supplier_min_price#</b><br> Für Anbieterpreise gibt es zusätzlich <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=verfügbare globale Werte:
 PriceMode=Preisfindungs-Methode
+PriceNumeric=Nummer
 DefaultPriceLog=Verlauf der Standardpreise
 ComposedProductIncDecStock=Erhöhen/verringern Lagerbestand  bei verknüpften Produkten
 ComposedProduct=Unterprodukt
+MinSupplierPrice=Minimaler Kaufpreis
 MinCustomerPrice=Mindestverkaufspreis
 NoDynamicPrice=Kein variabler Preis
 AddUpdater=Aktualisierung hinzufügen
diff --git a/htdocs/langs/de_CH/website.lang b/htdocs/langs/de_CH/website.lang
index a802af8fc94..ca9323c9139 100644
--- a/htdocs/langs/de_CH/website.lang
+++ b/htdocs/langs/de_CH/website.lang
@@ -8,6 +8,5 @@ WEBSITE_CSS_URL=URL zu externer CSS Datei
 ViewSiteInNewTab=Webauftritt in neuem Tab anzeigen
 SetAsHomePage=Als Startseite definieren
 WebsiteAccounts=Webseitenkonten
-WebPortalInvoiceListMenu=Rechnungen
 WebPortalMemberCardTitle=Mitgliederkarte
 WebPortalMemberCardDesc=Mitgliederkarte
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index ac752e11316..ef33a268abd 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -56,6 +56,8 @@ ExportAccountancy=Buchhaltung exportieren
 WarningDataDisappearsWhenDataIsExported=Achtung, dieser Liste enthält nur die Buchhaltungseinträge, die noch nicht exportiert wurden (Export Datum  ist leer). Wenn Sie die bereits exportierten Buchhaltungseinträge einbeziehen möchten, klicken Sie auf die Schaltfläche oben.
 VueByAccountAccounting=Ansicht nach Buchungskonto
 VueBySubAccountAccounting=Ansicht nach Buchhaltungsunterkonto
+AccountingAccountByDefault=Standard-Buchungskonto
+AccountingAccountByDefaultShort=Standardkonto
 
 MainAccountForCustomersNotDefined=Hauptkonto (aus dem Kontenplan) für Kunden, die nicht im Setup definiert sind
 MainAccountForSuppliersNotDefined=Hauptkonto (aus dem Kontenplan) für Kreditoren, die nicht im Setup definiert sind
@@ -166,6 +168,7 @@ ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Entwurfexport für Journal aktivieren
 ACCOUNTANCY_COMBO_FOR_AUX=Combo-Liste für Nebenkonto aktivieren (kann langsam sein, wenn Sie viele Geschäftspartner haben; verhindert die Suche nach Teilwerten)
 ACCOUNTING_DATE_START_BINDING=Deaktivieren Sie die Kontierung & das Übertragen in der Buchhaltung, wenn das Datum vor diesen Datum liegt  (Transaktionen vor diesem Datum werden standardmäßig ausgeschlossen)
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Welcher Zeitraum soll auf der Seite zur Übertragung der Daten in die Buchhaltung standardmäßig ausgewählt werden?
+ACCOUNTING_LABEL_OPERATION_ON_TRANSFER=Buchungsbezeichnung, wenn die Buchung erzeugt wird
 ACCOUNTING_SELL_JOURNAL=Verkaufsjournal - Verkäufe und Retouren
 ACCOUNTING_PURCHASE_JOURNAL=Einkaufsjournal - Käufe und Retouren
 ACCOUNTING_BANK_JOURNAL=Kassenbuch - Einnahmen und Ausgaben
@@ -177,8 +180,10 @@ ACCOUNTING_SOCIAL_JOURNAL=Sozialabgabenjournal
 ACCOUNTING_RESULT_PROFIT=Ergebnisabrechnungskonto (Gewinn)
 ACCOUNTING_RESULT_LOSS=Ergebnisabrechnungskonto (Verlust)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal für Abschlussbuchungen
-ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Buchhaltungsgruppen, die für das Bilanzkonto verwendet werden (durch Komma getrennt)
-ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Buchhaltungsgruppen, die für die Gewinn- und Verlustrechnung verwendet werden (durch Komma getrennt)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Kontengruppen, die zur Berechnung der Bilanz verwendet werden
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNTHelp=Legen Sie hier die Liste der Kontengruppen (definiert im Kontenplan) fest, die verwendet werden müssen, um alle Konten zur Berechnung der Bilanz zu finden. Trennen Sie die einzelnen Werte durch Kommas.<br>Beispiel: CAPIT,IMMOSTOCK,FINAN,THIRDPARTY
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Kontenruppen, die zur Berechnung der Gewinn- und Verlustrechnung verwendet werden
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENTHelp=Legen Sie hier die Liste der Kontengruppen (definiert im Kontenplan) fest, die verwendet werden müssen, um alle Konten zu finden um die Gewinn- und Verlustrechnung zu berechnen. Trennen Sie die einzelnen Werte durch Kommas.<br>Beispiel: ERLÖSE,AUFWENDUNGEN
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Konto (aus dem Kontenplan), das als Verrechnungskonto/Transferkonto für Banküberweisungen verwendet werden soll
 TransitionalAccount=Überweisungskonto
 ACCOUNTING_ACCOUNT_SUSPENSE=Konto (aus dem Kontenplan), das als Verrechnungskonto/Zwischenkonto für noch nicht gebuchte Gelder verwendet werden soll, die entweder erhalten oder gezahlt wurden, d. h. erwartete Gelder (Geldtransit)
@@ -214,14 +219,18 @@ Codejournal=Journal
 JournalLabel=Journal-Bezeichnung
 NumPiece=Teilenummer
 TransactionNumShort=Buchungsnr.
+AccountingReport=Benutzerdefinierte Berichte
 AccountingCategory=Benutzerdefinierte Gruppen
 AccountingCategories=Benutzerdefinierte Gruppen
 GroupByAccountAccounting=Gruppieren nach Hauptbuchkonto
 GroupBySubAccountAccounting=Gruppieren nach Nebenbuchkonto
+AccountingAccountReportsDesc=Sie können hier Berichte zu Buchungskonten definieren. Sie werden für personalisierte Buchhaltungsberichte verwendet.
 AccountingAccountGroupsDesc=Hier können Kontengruppen definiert werden. Diese werden für personaliserte Buchhaltungsreports verwendet.
 ByAccounts=Pro Konto
 ByPredefinedAccountGroups=Vordefinierte Gruppierung
 ByPersonalizedAccountGroups=Benutzerdefinierte Gruppierung
+Personalized=Personalisiert
+NoReportDefined=Keine personalisierten Berichte definiert
 NotMatch=undefiniert
 DeleteMvt=Zeilen aus der Buchhaltung löschen
 DelMonth=Monat zum Löschen
@@ -253,6 +262,7 @@ UnknownAccountForThirdparty=Unbekanntes Geschäftspartner-Konto. Wir werden %s v
 UnknownAccountForThirdpartyBlocking=unbekanntes Geschäftspartner-Konto, fortfahren nicht möglich
 ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Nebenbuchkonto nicht definiert oder Geschäftspartner oder Benutzer unbekannt. Wir verwenden %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Geschäftspartner unbekannt und Nebenbuch nicht in der Zahlung definiert. Wir werden den Nebenbuchkontowert leer lassen.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored2=Subledger account not defined or third party or user unknown. We will keep the subledger account value empty.
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Nebenbuchkonto nicht definiert oder Geschäftspartner oder Benutzer unbekannt. Nicht behebbarer Fehler.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unbekanntes Geschäftspartner-Konto und wartendes Konto nicht definiert. Fehler beim Blockieren
 PaymentsNotLinkedToProduct=Zahlung ist keinem Produkt / keiner Leistung zugeordnet
@@ -280,7 +290,7 @@ DescVentilExpenseReportMore=Wenn Sie im Modul Buchhaltung Konten für die Spesen
 DescVentilDoneExpenseReport=Liste der Aufwendungen aus Spesenabrechnungen und ihre zugeordneten Buchungskonten
 Closure=Festschreibung
 AccountancyClosureStep1Desc=Informieren Sie sich hier über die Anzahl der Buchungen pro Monat, die noch nicht freigegeben und festgeschrieben sind.
-OverviewOfMovementsNotValidated=Übersicht der noch nicht festgeschriebenen Buchungen
+OverviewOfMovementsNotValidated=Übersicht der noch nicht freigegebenen und festgeschriebenen Buchungen
 AllMovementsWereRecordedAsValidated=Alle Buchungen wurden als freigegeben und festgeschrieben registriert
 NotAllMovementsCouldBeRecordedAsValidated=Nicht alle Buchungen konnten als freigegeben und festgeschrieben registriert werden
 ValidateMovements=Buchungen freigeben und festschreiben
@@ -304,6 +314,7 @@ ClickOnUseTutorialForHelp=Willkommen im Bereich zur Erstellung Ihrer Buchhaltung
 NotReconciled=Nicht abgeglichen
 WarningRecordWithoutSubledgerAreExcluded=Achtung: diese Ansicht zeigt nur Buchungszeilen mit definiertem Nebenbuchkonto
 AccountRemovedFromCurrentChartOfAccount=Im aktuellen Kontenplan nicht vorhandenes Buchungskonto
+WarningThisPageContainsOnlyEntriesTransferredInAccounting=Warning, this page only contains entries transferred to the accounting system.
 ## Admin
 BindingOptions=Optionen für die Übertragen in die Buchhaltung
 ApplyMassCategories=Massenaktualisierung der Kategorien
@@ -338,6 +349,8 @@ ACCOUNTING_LETTERING_NBLETTERS_DESC=Manche Buchhaltungssoftware akzeptiert nur e
 OptionsAdvanced=Erweiterte Optionen
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Aktivieren Sie die Verwaltung des Reverse Charge-Verfahrens (Umkehr der Steuerschuldnerschaft) bei Lieferantenkäufen
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Wenn diese Option aktiviert ist, können Sie festlegen, dass eine Lieferant oder eine bestimmte Kreditorenrechnung anders in die Buchhaltung übertragen werden muss: Eine zusätzliche Soll- und Habenbuchung wird in der Buchhaltung auf 2 gegebenen Konten aus dem Kontenplan generiert, die in der "%s" Setup-Seite festgelegt werden.
+ACCOUNTING_ENABLE_TABONTHIRDPARTY=Activate a tab on third-party cards to view the subsidiary ledger
+ACCOUNTING_ENABLE_TABONTHIRDPARTY_DESC=When this option is enabled, a new tab is showing in third-party cards to view and manage accounting for the third-party as to reconcile, print & more
 ## Export
 NotExportLettering=Beim Generieren der Datei die Abstimmungsinformationen nicht exportieren
 NotifiedExportDate=Noch nicht exportierte Zeilen als exportiert kennzeichnen <span class="warning">(um eine als exportiert gekennzeichnete Zeile zu ändern, müssen Sie die gesamte Transaktion löschen und erneut in die Buchhaltung übertragen) </span>
@@ -402,6 +415,7 @@ SaleEECWithoutVATNumber=Verkauf in der EWG ohne Umsatzsteuer, aber die Umsatzste
 ForbiddenTransactionAlreadyExported=Unzulässig: Die Transaktion wurde bereits freigegeben und/oder exportiert.
 ForbiddenTransactionAlreadyValidated=Unzulässig: Die Transaktion wurde bereits freigegeben.
 DataMustHaveBeenTransferredInAccounting=Die Übertragung der Daten in die Buchhaltung muss durchgeführt worden sein
+IfTransactionHasDueDate=Für Transaktionen zu Dokumenten, für die eine Zahlung erforderlich ist
 ## Dictionary
 Range=Bereich von Sachkonten
 Calculated=berechnet
@@ -420,9 +434,9 @@ AccountancyNoUnletteringModified=Kein Abgleich geändert
 AccountancyOneUnletteringModifiedSuccessfully=Ein Abgleich wurde erfolgreich geändert
 AccountancyUnletteringModifiedSuccessfully=%s aufgehobene Abgleiche erfolgreich modifiziert
 ## Closure
-AccountancyClosureStep1=Schritt 1: Buchungen freigeben und festschreiben
-AccountancyClosureStep2=Schritt 2: Geschäftsjahr schließen
-AccountancyClosureStep3=Schritt 3: Einträge extrahieren (optional)
+AccountancyClosureStep1=Freigeben und festschreiben der Buchungen
+AccountancyClosureStep2=Geschäftsjahr schließen
+AccountancyClosureStep3=Einträge extrahieren (optional)
 AccountancyClosureClose=Geschäftsjahr schließen
 AccountancyClosureAccountingReversal=Extrahieren und erfassen von Einträgen zu Eröffnungsbuchungen
 AccountancyClosureStep3NewFiscalPeriod=Nächstes Geschäftsjahr
@@ -455,7 +469,7 @@ AccountancyErrorMismatchBalanceAmount=Der Saldo (%s) ist ungleich 0
 AccountancyErrorLetteringBookkeeping=Bei den Transaktionen sind Fehler aufgetreten: %s
 ErrorAccountNumberAlreadyExists=Das Buchungskonto %s existiert bereits
 ErrorArchiveAddFile=Die Datei „%s“ kann nicht im Archiv abgelegt werden
-ErrorNoFiscalPeriodActiveFound=Kein aktives Geschäftsjahr gefunden. Sie können eins im Menü %s - %s - %s erstellen.
+ErrorNoFiscalPeriodActiveFound=Kein aktives Geschäftsjahr (mit definiertem Start- und End-Datum) gefunden. Sie können eines im Menü %s - %s - %s erstellen.
 ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=Das Datum des Buchhaltungsdokuments befindet sich nicht im aktiven Geschäftsjahr
 ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=Das Datum des Buchhaltungsdokuments befindet sich in einem geschlossenen Geschäftsjahr
 ## Import
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index d66ca00f1a2..27e22b62cee 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Die Dateiintegritätsprüfung wurde bestanden
 FileIntegritySomeFilesWereRemovedOrModified=Datei-Integrität konnte NICHT bestätigt werden. Dateien wurden modifiziert, entfernt oder hinzugefügt.
 GlobalChecksum=globale Prüfsumme
 MakeIntegrityAnalysisFrom=Quelle der Signaturdatei für die Prüfung auswählen
-LocalSignature=Eingebettete lokale Signatur-Datei (weniger zuverlässig)
-RemoteSignature=Signatur-Datei von Dolibarr-Server (zuverlässiger)
+LocalSignature=Eingebettete lokale Signatur
+RemoteSignature=Signatur-Datei vom Dolibarr-Server
 FilesMissing=fehlende Dateien
 FilesUpdated=erneuerte Dateien
 FilesModified=geänderte Dateien
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=verwendet nur von einigen Agenda-Optionen
 Security=Sicherheit
 Passwords=Passwörter
 DoNotStoreClearPassword=In der Datenbank gespeicherte Passwörter verschlüsseln.
-MainDbPasswordFileConfEncrypted=Datenbankpasswort in der Konfigurationsdatei conf.php verschlüsselt speichern (empfohlene Einstellung)
+MainDbPasswordFileConfEncrypted=Verschleiert das in conf.php gespeicherte Datenbank-Passwort. Es wird empfohlen, diese Option zu aktivieren.
 InstrucToEncodePass=Um das Kennwort in der Konfigurationsdatei <b>conf.php</b> verschlüsselt zu speichern, ersetzen Sie die Zeile <br><b>$dolibarr_main_db_pass="...";</b><br>durch<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Um das Kennwort unverschlüsselt (im Klartext) in der Konfigurationsdatei <b>conf.php</b> zu speichern, ersetzen Sie die Zeile<br><b>$dolibarr_main_db_pass="crypted:...";</b><br>durch<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=PDF-Dokumentenschutz aktivieren (Die Aktivierung wird nicht empfohlen, weil dadurch die Stapelerzeugung von PDFs nicht mehr funktioniert)
@@ -366,7 +366,7 @@ WithCounter=Zähler verwenden
 GenericMaskCodes=Sie können ein beliebiges Nummerierungsschema eingeben. Folgende Tags können verwendet werden:<br><b>{000000}</b> steht für eine 6-stellige Nummer, die sich bei jedem neuen %s automatisch erhöht. Wählen Sie die Anzahl der Nullen je nach gewünschter Nummernlänge. Der Zähler füllt sich automatisch bis zum linken Ende mit Nullen, um das gewünschte Format abzubilden. <br><b>{000000+000}</b> führt zu einem ähnlichen Ergebnis, allerdings mit einem Wertsprung in Höhe des Werts rechts des Pluszeichens, der bei dem/der ersten %s angewandt wird. <br><b>{000000@x}</b> wie zuvor, jedoch stellt sich der Zähler bei Erreichen des Monats x (zwischen 1 und 12) automatisch auf 0 zurück, bei setzen von 0 wird der Anfangsmonat des Fiskaljahrs für das Rücksetzen verwendet, mit dem Wert 99 erfolgt jeden Monat ein Rücksetzen auf 0. Ist die Rücksetzoption gewählt und x hat den Wert 2 oder höher, ist die Folge {mm}{yy} or {mm}{yyyy} ebenfalls erforderlich. <br><b>{dd}</b> Tag (01 bis 31).<br><b>{mm}</b> Monat (01 bis 12).<br><b>{y}</b>, <b>{yy}</b> or <b>{yyyy}</b> Jahreszahl 1-, 2- oder 4-stellig. <br>
 GenericMaskCodes2= <b> {cccc} </b> Kundennummer mit n Zeichen <br> <b> {cccc000} </b> Kundennummer gefolgt von einer dem Kunden zugeordneten Partner ID. Dieser Zähler wird gleichzeitig mit dem globalen Zähler zurückgesetzt. <br> <b> {tttt} </b> Der Code für die Partnerart, abgeschnitten nach n Zeichen (siehe Menü Start - Einstellungen - Stammdaten - Arten von Partnern). Wenn diese Option aktiv ist, wird für jede Partnerart ein separater Zähler geführt. <br>
 GenericMaskCodes2b=<b>{uuuu}</b> die n ersten Zeichen des Nachnamen des Benutzers, der das Objekt erstellt (n ist Anzahl von „u“).
-GenericMaskCodes3=Alle anderen Zeichen in der Maske bleiben erhalten. <br> \nLeerzeichen sind nicht zulässig. <br>
+GenericMaskCodes3=Alle anderen Zeichen in der Maske bleiben erhalten. <br> Leerzeichen sind nicht zulässig. <br>
 GenericMaskCodes3EAN=Alle anderen Zeichen der Maske bleiben unberührt (außer * oder ? an 13. Stelle in EAN13). <br>Leerzeichen sind nicht erlaubt.<br>Für EAN13 sollte das letzte Zeichen nach der letzten } an 13. Stelle ein * oder ? sein. Dies wird durch den berechneten Wert ersetzt.<br>
 GenericMaskCodes4a= <u> Beispiel auf der 99. %s des Geschäftspartners TheCompany, mit Datum 2023-01-31: </u>  <br>
 GenericMaskCodes4b= <u> Beispiel für einen Geschäftspartner, erstellt am 31.01.2023: </u>  <br>
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometrischer Punkt
 ExtrafieldMultiPointGeo=Geometrischer Mehrfachpunkt
 ExtrafieldLinestringGeo=Geometrischer Linienzug
 ExtrafieldPolygonGeo=Geometrisches Polygon
+ExtrafieldStars=Sterne
 ComputedFormula=Berechnetes Feld
-ComputedFormulaDesc=Sie können hier eine Formel eingeben, die andere Eigenschaften des Objekts oder beliebigen PHP-Code verwendet, um einen dynamisch berechneten Wert zu erhalten. Sie können alle PHP-kompatiblen Formeln verwenden, einschließlich des "?" Bedingungsoperators und folgende globalen Objekte: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>. <br><strong>WARNUNG</strong> : Wenn Sie Eigenschaften eines nicht geladenen Objekts benötigen, holen Sie sich das Objekt einfach selbst in Ihre Formel wie im zweiten Beispiel. <br>Die Verwendung eines berechneten Felds bedeutet, dass Sie selbst keinen Wert über die Schnittstelle eingeben können. Auch wenn ein Syntaxfehler vorliegt, gibt die Formel möglicherweise nichts zurück.<br><br> Formelbeispiel: <br>$objectoffield->id < 10 ? round($objectoffield-> id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2 ) <br> <br> Beispiel zum erneuten Laden des Objekts <br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? ->capital / 5: '-1') <br> <br> Anderes Beispiel für eine Formel, um das Laden des Objekts und seines übergeordneten Objekts zu erzwingen: <br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield ->id) > 0) && ($secondloadedobj = neues Projekt($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Übergeordnetes Projekt nicht gefunden'
+ComputedFormulaDesc=Sie können hier eine Formel eingeben, die andere Properties vom Objekt oder beliebigen PHP-Code verwendet, um einen dynamisch berechneten Wert zu erhalten. Sie können beliebige PHP-kompatible Formeln verwenden, einschließlich des "?" Bedingungsoperator und folgende globale Objekte: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>WARNUNG</strong>: Wenn Sie Properties eines nicht geladenen Objekts benötigen, holen Sie sich das Objekt in die Formel wie im zweiten Beispiel.<br>Die Verwendung eines berechneten Felds bedeutet, dass Sie selbst keinen Wert über die GUI eingeben können. Außerdem kann es sein, dass die Formel bei einem Syntaxfehler nichts zurückgibt.<br><br>Beispiel einer Formel:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Beispiel zum Neuladen eines Objekts<br>((($reloadedobj = new Societe($db)) && $reloadedobj->fetchNoCompute($objectoffield->id) > 0) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')Weiteres Beispiel für eine Formel, um das Laden des Objekts und seines übergeordneten Objekts zu erzwingen:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Übergeordnetes Projekt nicht gefunden'
 Computedpersistent=Berechnetes Feld speichern
 ComputedpersistentDesc=Berechnete Extrafelder werden in der Datenbank gespeichert, dennoch wird ihr Wert nur dann neu berechnet wenn sich das Objekt zu diesem Feld ändert. Falls das berechnete Feld von anderen Objekten oder globalen Daten abhängt, kann sein Wert falsch sein!
 ExtrafieldParamHelpPassword=Wenn Sie dieses Feld leer lassen, wird dieser Wert OHNE Verschlüsselung gespeichert (das Feld ist nur mit Sternen auf dem Bildschirm ausgeblendet).<br><br>Eingabe Wert „dolcrypt“, um den Wert mit einem umkehrbaren Verschlüsselungsalgorithmus zu kodieren. Klare Daten können weiterhin erkannt und bearbeitet werden, werden aber in der Datenbank verschlüsselt.<br><br>Geben Sie „auto“ (oder „md5“, „sha256“, „password_hash“, ...) ein, um den Standard-Passwortverschlüsselungsalgorithmus (oder md5, sha256, passwort_hash ...) zu verwenden, um das nicht umkehrbar gehashte Passwort in der Datenbank zu speichern (es gibt keine Möglichkeit, den Originalwert abzurufen)
@@ -519,7 +520,7 @@ WarningPHPMailB=- Wenn die Domain Ihrer E-Mail-Adresse (der Teil mymaildomain.co
 WarningPHPMailC=- Interessant ist auch die Verwendung des SMTP-Servers Ihres eigenen E-Mail-Dienstanbieters zum Senden von E-Mails, sodass alle von der Anwendung gesendeten E-Mails auch in dem Verzeichnis "Gesendet" Ihrer Mailbox gespeichert werden.
 WarningPHPMailD=Es wird daher empfohlen, die Versandart von E-Mails auf den Wert „SMTP“ zu ändern.
 WarningPHPMailDbis=Wenn Sie wirklich die standardmäßige "PHP"-Methode zum Senden von E-Mails beibehalten möchten, ignorieren Sie einfach diese Warnung oder entfernen Sie sie, indem Sie %shier klicken%s.
-WarningPHPMail2=Wenn Ihr E-Mail-SMTP-Anbieter den E-Mail-Client auf einige IP-Adressen beschränken muss (sehr selten), dann ist dies die IP-Adresse des Mail User Agent (MUA) für ihr Dolibarr-System: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=Wenn der Domänenname in Ihrer E-Mail-Absenderadresse durch einen SPF-Eintrag geschützt ist (fragen Sie Ihren Domain-Registrar), müssen Sie die folgende IP-Adressen oder Einträge im SPF-Eintrag des DNS Ihrer Domain hinzufügen: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=Wenn der Domain-Name in Ihrer  E-Mail-Absenderadresse durch einen anderen DMARC-Eintrag als p=none geschützt ist (fragen Sie Ihren Domain-Registrar), müssen Sie Ihren DMARC-Eintrag entfernen oder ihn auf p=none setzen (z. B. @gmail.com) oder eine andere Sendemethode verwenden.
 SPFAndDMARCInformation=SPF und DMARC DNS-Eintrag für E-Mail-Hauptadresse
@@ -567,8 +568,8 @@ Module10Name=Buchhaltung (vereinfacht)
 Module10Desc=Berichte für die einfache Buchhaltung (Journal, Umsatz) auf Basis der Datenbank. Es werde keine Haupt- oder Nebenbücher verwendet.
 Module20Name=Angebote
 Module20Desc=Angebotsverwaltung
-Module22Name=E-Mail-Kampagnen
-Module22Desc=E-Mail-Kampagnen-Verwaltung
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energie
 Module23Desc=Überwachung des Energieverbrauchs
 Module25Name=Kundenaufträge
@@ -664,8 +665,8 @@ Module2000Name=WYSIWYG-Editor
 Module2000Desc=Erweiterter Editor für Textfelder (basierend auf dem CKEditor)
 Module2200Name=Dynamische Preise
 Module2200Desc=Verwenden Sie mathematische Ausdrücke für die automatische Generierung von Preisen.
-Module2300Name=Geplante Aufgaben
-Module2300Desc=Verwaltung geplanter Aufgaben (Cron oder chrono Tabelle)
+Module2300Name=Geplante Jobs
+Module2300Desc=Verwaltung geplanter Jobs (Cron oder chrono Tabelle)
 Module2400Name=Agenda (Ereignisse/Termine)
 Module2400Desc=Manuell und automatisch erstellte Ereignisse verwalten. Verwenden Sie den Kalender, um Ereignisse manuell aufzuzeichnen. Protokollieren Sie Ereignisse auch automatisch zu Nachverfolgungszwecken oder erfassen Sie manuell Ereignisse oder Besprechungen auf. Dies ist die wichtigste Modul für ein gutes Kunden- und/oder Lieferanten-Beziehungsmanagement.
 Module2430Name=Online-Terminvereinbarung
@@ -847,10 +848,10 @@ Permission212=Auftragszeilen
 Permission213=Leitung aktivieren
 Permission214=Telefonie einrichten
 Permission215=Anbieter einrichten
-Permission221=E-Mail-Kampagnen einsehen
-Permission222=E-Mail-Kampagnen erstellen/bearbeiten (Thema, Empfänger, ...)
-Permission223=E-Mail-Kampagnen freigeben (erlaubt das Senden)
-Permission229=E-Mail-Kampagnen löschen
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Zeige Empfänger und Info
 Permission238=Mails manuell senden
 Permission239=Postausgang löschen nachdem die Gültigkeit ausgelaufen ist oder die Nachricht gesendet wurde.
@@ -907,7 +908,7 @@ Permission512=Gehälter und Zahlungen erstellen/bearbeiten
 Permission514=Gehälter und Zahlungen löschen
 Permission517=Leseberechtigung für alle Gehälter und Zahlungen
 Permission519=Gehälter exportieren
-Permission521=Darlehen anzeigen
+Permission521=Darlehen einsehen
 Permission522=Darlehen erstellen/bearbeiten
 Permission524=Lösche Darlehen
 Permission525=Zugriff auf Darlehensrechner
@@ -1029,10 +1030,10 @@ Permission20004=Alle Urlaubsanträge einsehen (auch die von nicht unterstellten
 Permission20005=Urlaubsanträge für alle erstellen/bearbeiten (auch die von nicht unterstellten Mitarbeitern)
 Permission20006=Urlaubsanträge verwalten (Saldo einrichten und aktualisieren)
 Permission20007=Urlaubsanträge genehmigen
-Permission23001=Geplante Aufgaben einsehen
-Permission23002=Geplante Aufgaben erstellen/bearbeiten
-Permission23003=Geplante Aufgabe(n) löschen
-Permission23004=Geplante Aufgaben ausführen
+Permission23001=Geplante Jobs einsehen
+Permission23002=Geplante Jobs erstellen/bearbeiten
+Permission23003=Geplante Jobs löschen
+Permission23004=GeplanteJobs ausführen
 Permission40001=Währungen und ihre Kurse einsehen
 Permission40002=Erstellen/Aktualisieren von Währungen und ihren Kursen
 Permission40003=Löschen von Währungen und ihre Kursen
@@ -1105,6 +1106,7 @@ DictionaryStaff=Anzahl der Beschäftigten
 DictionaryAvailability=Lieferdauer
 DictionaryOrderMethods=Bestellmethoden
 DictionarySource=Quelle der Angebote/Aufträge
+DictionaryAccountancyReport=Personalisierte Berichte zur Buchhaltung
 DictionaryAccountancyCategory=Benutzerdefinierte Gruppen für Berichte
 DictionaryAccountancysystem=Kontenplan-Vorlagen
 DictionaryAccountancyJournal=Buchhaltungsjournale
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Zurück zur Stammdaten-Übersicht
 TypeOfRevenueStamp=Art der Steuermarke
 VATManagement=MwSt-Verwaltung
 VATIsUsedStandard=Beim Erstellen von Dokumenten (Angebote, Rechnungen, Bestellungen...) wird die MwSt. gemäß den Standardregeln festgelegt (abhängig vom Land des Verkäufers und des Käufers).
-VATIsUsedDesc=Beim Erstellen von Angebote, Rechnungen, Bestellungen usw. folgt die Festsetzung der USt. der aktiven Standardregel:<br>Wenn der Verkäufer nicht der Umsatzsteuer unterliegt, dann wird die USt. standardmäßig auf 0 gesetzt. Ende der Regel.<br>Wenn das Land des Verkäufers gleich dem Land des Käufers ist, dann entspricht die USt. standardmäßig der Umsatzsteuer von Produkten im Land des Verkäufers. Ende der Regel. <br>Wenn sich sowohl der Verkäufer und als auch der Käufer in der Europäischen Gemeinschaft befinden und handelt es sich um Transport-verwandte Produkte (Spedition, Versand, Fluglinie), ist der Standardwert der USt. 0. Diese Regel ist abhängig vom Land des Verkäufers – bitte wenden Sie sich an Ihren Buchhalter. Die USt. sollte vom Käufer an das Zollamt in seinem Land und gezahlt werden, nicht an den Verkäufer. Ende der Regel.<br>Wenn der Verkäufer und Käufer sich beide in der Europäischen Gemeinschaft befinden und der Käufer ist kein Unternehmen (mit einem registrierten innergemeinschaftlichen USt.-ID), dann ist die USt. standardmäßig der USt.-Wert des Landes des Verkäufers. Ende der Regel. <br>Wenn sich der Verkäufer und und der Käufer beide in der Europäischen Gemeinschaft befinden und und der Käufer ein Unternehmen (mit einem registrierten innergemeinschaftlichen USt.-ID) ist, dann ist die USt. standardmäßig 0. Ende der Regel. <br>In allen anderen Fällen ist der vorgeschlagene Standardwert für die USt.=0. Ende der Regel.
+VATIsUsedDesc=Beim Erstellen von Angebote, Rechnungen, Bestellungen usw. folgt der Steuersatz der USt. den aktiven Standardregels: <br>Wenn der Verkäufer nicht dem Umsatzsteuer unterliegt, dann ist die Umsatzsteuer standardmäßig auf 0 gesetzt. Ende der Regel. <br>Wenn der Käufer eine zugewiesene USt.-Definition aus den Stammdaten hat, dann ist dies der USt.-Satz. Ende der Regel. <br>Wenn (Land des Verkäufers = Land des Käufers), dann entspricht die USt. standardmäßig der USt. des Produkts im Land des Verkäufers. Ende der Regel. <br>Wenn sich sowohl der Verkäufer und als auch der Käufer in der Europäischen Gemeinschaft befinden, und handelt es sich um Transport-verwandte Produkte (Spedition, Versand, Fluglinie), ist der Standardwert der USt. 0. Diese Regel ist vom Land des Verkäufers abhängig – wenden Sie sich bitte an Ihren Buchhalter. Die USt. sollte vom Käufer an das Zollamt in seinem Land gezahlt werden, nicht an den Verkäufer. Ende der Regel.<br>Wenn der Verkäufer und Käufer beide in der Europäischen Gemeinschaft sind und der Käufer ist kein Unternehmen (mit einem registrierten innergemeinschaftlichen USt.-ID), dann ist der USt.-Satz standardmäßig der USt.-Satz des Landes des Verkäufers. Ende der Regel. <br>Wenn sich der Verkäufer und und der Käufer beide in der Europäischen Gemeinschaft befinden und und der Käufer ist ein Unternehmen (mit einer registrierten innergemeinschaftlichen USt.-ID), dann ist der USt. standardmäßig 0. Ende der Regel. <br>In allen anderen Fällen ist der vorgeschlagene Standardwert für den USt.-Satz=0. Ende der Regel.
 VATIsNotUsedDesc=Die vorgeschlagene USt. ist standardmäßig 0 für alle Fälle wie Stiftungen, Einzelpersonen oder Kleinunternehmen.
 VATIsUsedExampleFR=In Frankreich sind damit Unternehmen oder Organisationen gemeint, die ein echtes Steuersystem haben (vereinfacht oder normal). Ein System, in dem die Mehrwertsteuer deklariert wird.
 VATIsNotUsedExampleFR=In Frankreich bedeutet es, dass keine Umsatzsteuer ausgewiesen wird oder Unternehmen, Organisationen oder Freiberufler, die als Kleinunternehmer tätig sind (Privilegiensteuer), Umsatzsteuern zahlen ohne selbst Umsatzsteuer auszuweisen.  Diese Auswahl zeigt den Hinweis "Umsatzsteuer nicht anwendbar - Artikel-293B des CGI" auf Rechnungen an.
-VATType=Steuer Typ
+VATType=Steuer Verwendung
 ##### Local Taxes #####
 TypeOfSaleTaxes=Art der Umsatzsteuer
 LTRate=Rate
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Gemäß der Einrichtung der Steuern (siehe %s - %s - %
 LabelUsedByDefault=Bezeichnung wird verwendet falls keine Übersetzung für den Code vorhanden ist.
 LabelOnDocuments=Bezeichnung auf Dokumenten
 LabelOrTranslationKey=Bezeichung oder Übersetzungsschlüssel
+LabelTranslatedInCurrentLanguage=Bezeichnung übersetzt in aktuell Sprache
 TranslationFound=Übersetzung gefunden
 TheTranslationIsSearchedFromKey=Die Übersetzung wird aus der Übersetzung Schlüssel gesucht: <b>%s</b>
 TranslationKey=Übersetzungsschlüssel
@@ -1378,7 +1381,7 @@ ExtraFieldsSupplierInvoicesLines=Ergänzende Attribute (in Rechnungspositionen)
 ExtraFieldsThirdParties=Ergänzende Attribute (Geschäftspartner)
 ExtraFieldsContacts=Ergänzende Attribute (Kontakte/Adressen)
 ExtraFieldsMember=Ergänzende Attribute (Mitglied)
-ExtraFieldsMemberType=Ergänzende Attribute (Mitglied)
+ExtraFieldsMemberType=Ergänzende Attribute (Mitgliedstyp)
 ExtraFieldsCustomerInvoices=Ergänzende Attribute (Rechnungen)
 ExtraFieldsCustomerInvoicesRec=Ergänzende Attribute (Rechnungsvorlagen)
 ExtraFieldsSupplierOrders=Ergänzende Attribute (Bestellungen)
@@ -1431,7 +1434,7 @@ AddVatInList=Umsatzsteuer-ID des Kunden/Lieferanten in Auswahllisten anzeigen.
 AddAdressInList=Kunden-/Lieferantenadresse in Auswahllisten anzeigen. <br> Geschäftspartner werden mit dem Namensformat "The Big Company corp. - 21 jump street 123456 Big town - USA" anstelle von "The Big Company corp" angezeigt.
 AddEmailPhoneTownInContactList=Kontakt-E-Mail (oder Telefonnummern, falls nicht definiert) und Stadt anzeigen (Auswahlliste /Combo List)<br>Kontakte werden mit dem Namensformat „Dupond Durand – dupond.durand@example.com“ angezeigt - Paris“ oder „Dupond Durand – 06 07 59 65 66 – Paris“ anstelle von „Dupond Durand“.
 AskForPreferredShippingMethod=Nach der bevorzugten Versandart für Drittanbieter fragen.
-FieldEdition=Bearbeitung von Feld %s
+FieldEdition=Änderung von Feld %s
 FillThisOnlyIfRequired=Beispiel: +2 (nur ausfüllen, wenn Sie Probleme mit der Zeitzone haben)
 GetBarCode=Übernehmen
 NumberingModules=Nummerierungsmodelle
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Rechnungsdatum ist zwingend Freigabedatum
 SuggestedPaymentModesIfNotDefinedInInvoice=Vorgeschlagener, standardmäßiger Zahlungsmodus auf der Rechnung, falls nicht auf der Rechnung definiert
 SuggestPaymentByRIBOnAccount=Bankkonto für Bezahlung per Überweisung
 SuggestPaymentByChequeToAddress=Adresse für Zahlung per Scheck
+InvoicePaymentManageStructuredCommunication=Strukturierte Informationen für Rechnungszahlung erzeugen
+InvoicePaymentManageStructuredCommunicationHelp=In einigen Ländern ist es notwendig, strukturierte Informationen bereitzustellen, um Zahlungen und ihren Abgleich zu erleichtern
 FreeLegalTextOnInvoices=Freier Standardtext auf Rechnungen
 WatermarkOnDraftInvoices=Wasserzeichen auf Rechnungsentwurf (leerlassen wenn keines benötigt wird)
 PaymentsNumberingModule=Zahlungen Nummerierungs Module
@@ -1718,6 +1723,7 @@ CompressionOfResources=Komprimierung von HTTP Antworten
 CompressionOfResourcesDesc=Zum Beispiel mit der Apache Anweisung "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Automatische Erkennung mit den aktuellen Browsern nicht möglich
 DefaultValuesDesc=Hier können Sie den Standardwert definieren, den Sie beim Erstellen eines neuen Datensatzes verwenden möchten, und/oder Standardfilter oder die Sortierreihenfolge beim Auflisten von Datensätzen.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Vorgabewerte für die Verwendung in Formularen
 DefaultSearchFilters=Standardsuchfilter
 DefaultSortOrder=Standardsortierreihenfolge
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Numerierungsmodul für Lieferungen
 SendingsAbility=Unterstützung von Versand-Dokumenten für Kundenlieferungen
 NoNeedForDeliveryReceipts=In den meisten Fällen werden Lieferscheine sowohl als Versanddokument (für die Zusammenstellung der Lieferung), als auch als Zustellscheine, die vom Kunden zu unterschreiben sind, verwendet. Entsprechend sind Zustellbestätigungen (Empfangsbelege) meist eine doppelte und daher nicht verwendete Option.
 FreeLegalTextOnShippings=Freier Standardtext auf Lieferscheinen
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Numerierungsschema für Zustellbestätigungen
 DeliveryOrderModel=Vorlagen Zustellbestätigung (Empfangsbeleg)
@@ -1808,14 +1815,14 @@ FreeLegalTextOnDeliveryReceipts=Freier Standardtext auf Empfangsbelegen
 ##### FCKeditor #####
 AdvancedEditor=Erweiterter Editor
 ActivateFCKeditor=FCKEditor aktivieren für:
-FCKeditorForNotePublic=WYSIWYG-Erstellung/Bearbeitung des Feldes „öffentliche Notizen“ von Elementen
-FCKeditorForNotePrivate=WYSIWYG-Erstellung/Bearbeitung des Feldes „Private Notizen“ von Elementen
-FCKeditorForCompany=WYSIWYG Erstellung/Bearbeitung der Feldbeschreibung von Elementen (ausgenommen Produkte/Leistungen)
-FCKeditorForProductDetails=WYSIWIG Erstellung/Bearbeitung von Produktbeschreibungen oder Zeilen für Objekte (Angebotszeilen, Bestellungen, Rechnungen usw.).
+FCKeditorForNotePublic=WYSIWYG-Erstellung/Bearbeitung des Feldes „öffentliche Anmerkungen“ von Elementen
+FCKeditorForNotePrivate=WYSIWYG-Erstellung/Bearbeitung des Feldes „Private Anmerkungen“ von Elementen
+FCKeditorForCompany=WYSIWYG-Erstellung/Bearbeitung des Element-Feldes Beschreibung (außer Produkte/Leistungen)
+FCKeditorForProductDetails=WYSIWIG-Erstellung/Bearbeitung von Produktbeschreibungen oder Zeilen von Objekten (Angebotspositionen, Bestellpositionen, Rechnungspositionen usw.).
 FCKeditorForProductDetails2=Warnung: Von der Verwendung dieser Option für diese Anwendung wird dringend abgeraten, da es beim Erstellen von PDF-Dateien zu Problemen mit Sonderzeichen und der Seitenformatierung kommen kann.
-FCKeditorForMailing= WYSIWYG-Erstellung/-Bearbeitung für Massen-E-Mails (Tools->E-Mailing)
-FCKeditorForUserSignature=WYSIWYG Erstellung/Bearbeitung von Benutzer-Signaturen
-FCKeditorForMail=WYSIWYG-Erstellung/Bearbeitung für alle E-Mails (außer Tools->eMailing)
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG-Erstellung/Bearbeitung von Benutzer-Signaturen
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
 FCKeditorForTicket=WYSIWYG-Erstellung/Bearbeitung von Tickets
 ##### Stock #####
 StockSetup=Einstellungen Modul Lagerverwaltung
@@ -1867,7 +1874,6 @@ Buy=Kaufen
 Sell=Verkaufen
 InvoiceDateUsed=Rechnungsdatum verwendet
 YourCompanyDoesNotUseVAT=Ihr Unternehmen wurde so definiert, dass keine Mehrwertsteuer (Home - Setup - Unternehmen / Organisation) verwendet wird. Daher gibt es keine Mehrwertsteueroptionen zum Einrichten.
-AccountancyCode=Buchungskonto
 AccountancyCodeSell=Verkaufskonto-Code
 AccountancyCodeBuy=Einkaufskonto-Code
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Lassen Sie das Kontrollkästchen "Zahlung automatisch erstellen" beim Erstellen einer neuen Steuer standardmäßig leer
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Welche Standardansicht soll geöffnet werden, wenn das Men
 AGENDA_EVENT_PAST_COLOR = Farbe für Ereignisse in der Vergangenheit
 AGENDA_EVENT_CURRENT_COLOR = Farbe für aktuelle Ereignisse
 AGENDA_EVENT_FUTURE_COLOR = Farbe für Ereignisse in der Zukunft
-AGENDA_REMINDER_BROWSER = Aktiviere die Ereigniserinnerung <b> im Browser des Benutzers. </b> (Wenn das Erinnerungsdatum erreicht ist, wird vom Browser ein Popup angezeigt. Jeder Benutzer kann solche Benachrichtigungen in seinem Browser-Benachrichtigungs-Setup deaktivieren.)
+AGENDA_REMINDER_BROWSER = Erlaube Termin-/Ereignis-Erinnerungen <b>im Browser des Benutzers</b>
+AGENDA_REMINDER_BROWSERHelp = Wenn das Erinnerungsdatum erreicht ist, zeigt der Browser ein Pop-Up an. Die Erinnerungsoption und der Vorlauf werden durch den Benutzer bei der Erstellung eines Termins/Ereignisses festgelegt.
 AGENDA_REMINDER_BROWSER_SOUND = Aktiviere Tonbenachrichtigung
-AGENDA_REMINDER_EMAIL = Aktiviere die Ereigniserinnerung <b> per E-Mail </b> (Erinnerungsoption / Verzögerung kann für jedes Ereignis definiert werden).
+AGENDA_REMINDER_EMAIL = Erlaube Termin-/Ereignis-Erinnerungen <b>per E-Mail</b>
 AGENDA_REMINDER_EMAIL_NOTE = Hinweis: Die Häufigkeit des geplanten Jobs %s muss ausreichend sein, um sicherzustellen, dass die Erinnerung zum richtigen Zeitpunkt gesendet wird.
 AGENDA_SHOW_LINKED_OBJECT = Verknüpfte Objekte in Agenda anzeigen
 AGENDA_USE_EVENT_TYPE = Verwenden der Ereignissarten \nEinstellen unter (Start -> Einstellungen -> Stammdaten-> Ereignissarten)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Diesen Standardwert automatisch als Ereignistyp im  Ereignis Erstell-Formular verwenden.
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Standarderinnerung für diese Ereignisse verwenden
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = Die Maske für die automatische Erinnerung wird standardmäßig bei der Erstellung eines Ereignisses ausgefüllt
+AGENDA_DEFAULT_REMINDER_OFFSET = Vorlauf vor dem Ereignis für Standarderinnerungen
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = E-Mail-Vorlage zur Verwendung als Standarderinnerung
 PasswordTogetVCalExport = Passwort für den VCal-Export
 PastDelayVCalExport=Keine Termine exportieren die älter sind als
 SecurityKey = Sicherheitsschlüssel
@@ -2006,7 +2017,7 @@ BackupZipWizard=Assistent zum Erstellen eines Archivs des Dokumentenverzeichniss
 SomethingMakeInstallFromWebNotPossible=Die Installation von dem externen Modul ist aus folgenden Gründen vom Web-Interface nicht möglich:
 SomethingMakeInstallFromWebNotPossible2=Aus diesem Grund ist der hier beschriebene Aktualisierungsvorgang ein manueller Vorgang, den nur ein privilegierter Benutzer ausführen kann.
 InstallModuleFromWebHasBeenDisabledContactUs=Die Installation oder Entwicklung externer Module und dynamischer Websites ist derzeit aus Sicherheitsgründen in dieser Applikation gesperrt. Bitte kontaktieren Sie den technischen Administrator Ihrer Dolibarr-Instanz, wenn Sie diese Funktion benötigen.
-InstallModuleFromWebHasBeenDisabledByFile=Installieren von externen Modul aus der Anwendung wurde von Ihrem Administrator deaktiviert. \nSie müssen ihn bitten, die Datei<strong>%s</strong> zu entfernen, um diese Funktion zu ermöglichen.
+InstallModuleFromWebHasBeenDisabledByFile=Das Installieren von externen Modulen durch die Anwendung und die Verwendung von Funktionen, die das Ausführen von Code auf Server ermöglichen, wurden von Ihrem Administrator deaktiviert. Sie müssen ihn bitten, die Datei <strong>%s</strong> zu entfernen, um diese Funktionen zu ermöglichen.
 ConfFileMustContainCustom=Um ein externes Modul zu erstellen oder installieren, müssen die Modul Dateien im Verzeichnis <strong>%s</strong> gespeichert werden. Damit dieses Verzeichnis durch Dolibarr verwendet wird, muss in den Einstellungen <strong>conf/conf.php</strong> die folgenden 2 Zeilen hinzugefügt werden:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Zeilen hervorheben bei Mouseover
 HighlightLinesColor=Farbe zum Hervorheben der Zeile, wenn die Maus darüberfahrt (verwenden Sie 'ffffff' für keine Hervorhebung)
@@ -2036,6 +2047,7 @@ Enter0or1=Gib 0 oder 1 ein
 EnterYesOrNo=Ja oder Nein eingeben
 UnicodeCurrency=Geben Sie hier zwischen geschweiften Klammern die Liste der Bytes ein, die das Währungssymbol darstellen. Zum Beispiel: Geben Sie für $ [36] ein - für brasilianische Real-R $ [82,36] - geben Sie für € [8364] ein
 ColorFormat=Die RGB Farben sind im Hexformat, zB. FF0000
+NumberFormatForATotalPrice=Zahlenformat für den Gesamtpreis %s
 PictoHelp=Name für Icon im Format: <br>- image.png für eine Bilddatei im aktuellen Theme-Verzeichnis <br>- image.png@module wenn die Datei im Verzeichnis /img/ eines Moduls liegt <br>- fa-xxx für ein FontAwesome fa-xxx Symbol <br>- fontawesome_xxx_fa_color_size für ein FontAwesome fa-xxx Symbol (mit festgelegtem Präfix, Farbe und Größe)
 PositionIntoComboList=Zeilenposition in der Combo-Listen
 SellTaxRate=Umsatzsteuersatz
@@ -2090,7 +2102,7 @@ AddDataTables=Objekttabelle hinzufügen
 AddDictionaries=Stammdatentabellen hinzufügen
 AddData=Objekte oder Wörterbucheinträge hinzufügen
 AddBoxes=Widgets hinzufügen
-AddSheduledJobs=Geplante Aufgaben hinzufügen
+AddSheduledJobs=Geplante Jobs hinzufügen
 AddHooks=Hook anfügen
 AddTriggers=Triggers hinzufügen
 AddMenus=Menüs hinzufügen
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Spalte „Gesamtprei
 MAIN_PDF_NO_SENDER_FRAME=Rahmen des Absenderadressbereichs ausblenden
 MAIN_PDF_NO_RECIPENT_FRAME=Rahmen des Empfängeradressbereichs ausblenden
 MAIN_PDF_HIDE_CUSTOMER_CODE=Kunden-Nr. ausblenden
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Debitorenkontonummer ausblenden
 MAIN_PDF_HIDE_SENDER_NAME=Absender-/Firmenname im Adressblock ausblenden
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Zahlungsbedingungen ausblenden
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Zahlungsmodus ausblenden
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Dem Signaturbereich eine versteckte Markierung hinzufügen, damit ein elektronisches Signaturtool dies wiederverwenden kann. Kann von externen Werkzeuge oder in Zukunft von der Online-Signatur Funktion verwendet werden.
@@ -2323,7 +2340,9 @@ Recommended=Empfohlen
 NotRecommended=Nicht empfohlen
 ARestrictedPath=Eingeschränkter Pfad für Datendateien
 CheckForModuleUpdate=Suchen Sie nach Updates für externe Module
-CheckForModuleUpdateHelp=Diese Aktion stellt eine Verbindung zu Editoren externer Module her, um zu überprüfen, ob eine neue Version verfügbar ist.
+CheckForModuleUpdateHelp=Diese Aktion stellt eine Verbindung zu Anbietern externer Module her, um zu überprüfen, ob eine neue Version verfügbar ist.
+CheckForModuleUpdateHelp2=Es wird auch eine Verbindung zu %s aufgebaut, um zu prüfen, ob eingesetzte externe Module von der Community als Malware gemeldet wurden.
+YourIPWillBeRevealedToThisExternalProviders=Ihre IP-Adresse wird allen diesen externen Anbietern offengelegt.
 ModuleUpdateAvailable=Eine Aktualisierung ist verfügbar
 NoExternalModuleWithUpdate=Keine Updates für externe Module gefunden
 SwaggerDescriptionFile=Swagger API-Beschreibungsdatei (zum Beispiel zur Verwendung mit Redoc)
@@ -2375,7 +2394,7 @@ ModuleWebhookDesc = Schnittstelle zum Abfangen von Dolibarr-Triggern und Senden
 WebhookSetup = Webhook-Einrichtung
 WebhookSetupPage = Webhook-Einrichtungsseite. Um einen Webhook zu aktivieren, gehen Sie auf die Registerkarte %s und und erstellen Sie Ziele
 ShowQuickAddLink=Eine Schaltfläche zum schnellen Hinzufügen eines Elements im oberen rechten Menü anzeigen
-ShowSearchAreaInTopMenu=Suchbereich im oberen Menü anzeigen
+ShowSearchAreaInTopMenu=Suchbereich im oberen Menü ausblenden
 HashForPing=Für den Ping verwendeter Hash
 ReadOnlyMode=Ist eine Instanz im "Read Only"-Modus
 DEBUGBAR_USE_LOG_FILE=Die Datei <b>dolibarr.log</b> verwenden, um Protokolldaten zu erfassen
@@ -2391,12 +2410,14 @@ INVOICE_ADD_ZATCA_QR_CODE=Den ZATCA-QR-Code auf Rechnungen anzeigen
 INVOICE_ADD_ZATCA_QR_CODEMore=Einige arabische Länder benötigen diesen QR-Code auf ihren Rechnungen
 INVOICE_ADD_SWISS_QR_CODE=Schweizer QR-Rechnungscode auf Rechnungen anzeigen (mit einem festgelegten Bankkonto für Überweisungen)
 INVOICE_ADD_SWISS_QR_CODEMore=Schweizer Standard für Rechnungen; Stellen Sie sicher, dass PLZ und Ort ausgefüllt sind und dass die Konten über gültige Schweizer/Liechtenstein-IBANs verfügen.
-INVOICE_ADD_EPC_QR_CODE=EPC-QR-Code auf Rechnungen anzeigen (mit einem festgelegten Bankkonto für Überweisungen)
-INVOICE_ADD_EPC_QR_CODEMore=Mit diesem Funktion können Sie einen EPC-QR-Code auf Ihrem Rechnungen hinzufügen oder diesen entfernen, der automatische SEPA-Überweisungen erleichtert. Durch Aktivieren dieser Option können Ihre Kunden Zahlungen ganz einfach durch Scannen des QR-Codes durchführen, wodurch manuelle Eingabefehler reduziert werden. Verwenden Sie dieses Funktion, wenn Sie Kunden in Ländern wie Österreich, Belgien, Finnland, Deutschland oder den Niederlanden haben, in denen dieses System unterstützt wird. Deaktivieren Sie es, wenn es für Ihren Geschäftsbetrieb oder Ihren Kundenstamm nicht erforderlich ist.
+INVOICE_ADD_EPC_QR_CODE=EPC-QR-Code (GiroCode) auf Rechnungen anzeigen (mit einem für die Überweisung definierten Bankkonto)
+INVOICE_ADD_EPC_QR_CODEMore=Mit dieser Funktion können Sie einen EPC-QR-Code (GiroCode), der automatische SEPA-Überweisungen erleichtert, auf Ihren Rechnungen hinzufügen oder diesen entfernen. Durch Aktivieren dieser Option können Ihre Kunden Zahlungen ganz einfach durch Scannen des QR-Codes durchführen, wodurch manuelle Eingabefehler reduziert werden. Verwenden Sie diese Funktion, wenn Sie Kunden in Ländern wie Österreich, Belgien, Finnland, Deutschland oder den Niederlanden haben, in denen dieses System unterstützt wird. Deaktivieren Sie es, wenn es für Ihren Geschäftsbetrieb oder Ihren Kundenstamm nicht erforderlich ist.
 INVOICE_SHOW_SHIPPING_ADDRESS=Lieferadresse anzeigen
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Obligatorische Angabe für manche Länder (Frankreich, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Rechnungskontakt auf Angebot anzeigen
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=Standardmäßig erscheint der Kontakt nur bei der Abrechnung
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=URL-Link des sozialen Netzwerks. Verwenden Sie {socialid} für den variablen Teil, der die ID des sozialen Netzwerks enthält.
 IfThisCategoryIsChildOfAnother=Wenn diese Kategorie unterhalb einer anderen ist
 DarkThemeMode=Dark Theme-Modus
@@ -2450,7 +2471,7 @@ 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)
+MAIN_CHECKBOX_LEFT_COLUMN=Spalte für Feld- und Zeilenauswahl links anzeigen (rechts ist deaktiviert)
 NotAvailableByDefaultEnabledOnModuleActivation=Nicht standardmäßig erstellt. Nur bei Modulaktivierung erstellt.
 CSSPage=CSS-Style
 Defaultfortype=Standard
@@ -2489,7 +2510,7 @@ AiDescription=KI-Funktionen (Künstliche Intelligenz).
 AiDescriptionLong=KI (Künstliche Intelligenz) Funktionen in verschiedenen Teilen der Anwendung. Externe KI-API erforderlich.
 AI_API_KEY=Schlüssel für KI-API
 AI_API_URL=Endpunkt-URL für KI-API
-AI_API_SERVICE=Zu verwendender Service für KI-Funktionen
+AI_API_SERVICE=AI service to use
 AiSetup=Konfiguration AI Modul
 AiCustomPrompt=Benutzerdefiniertes KI-Prompt
 AI_CONFIGURATIONS_PROMPT=Benutzerdefiniertes Prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=Benitzerdefinierte KI-Prompts für Funktionen
 EnterAnIP=IP-Adresse eingeben
 ConvertInto=Konvertieren in
 YouAreHere=Sie sind hier
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Barcode im Versand-PDF Dokument zeigen
 BARCODE_ON_RECEPTION_PDF=Barcode im Wareneingangs-PDF Dokument zeigen
 BARCODE_ON_STOCKTRANSFER_PDF=Barcode im PDF-Dokument zur Lagerbestandsumbuchung zeigen
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr-Logout-URL zur Autorisierun
 MainAuthenticationOidcLoginClaimName=Login Claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect-Claim, der mit dem Dolibarr-Login Benutzer übereinstimmt. Wenn nicht festgelegt oder leer, wird standardmäßig die E-Mail-Adresse verwendet.
 BlackListWords=Blacklist von Wörtern
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Zu Blacklist hinzufügen
 FediverseSetup=Konfigurationsbereich zu Fediverse
 ConfigImportSocialNetwork=Konfiguration von mit Fediverse-kompatiblen sozialen Netzwerken
@@ -2555,6 +2581,29 @@ ParamName=Name des Parameters
 ParamValue=Wert des Parameters
 ConfirmDeleteParamOfSocialNetwork=Sind Sie sicher, dass Sie diesen Parameter löschen wollen?
 HelpMariaDBToGetPossibleValues=Sie können eine Liste aller möglicher Werte abrufen, indem Sie den folgenden SQL-Befehl ausführen: %s
+HelpMariaDBToGetValue=Dieser Wert wurde mit folgendem Befehl abgerufen: %s
+PDFBoxFrameRoundedCorners=Rahmen mit abgerundeten Ecken
+MAIN_PDF_FRAME_CORNER_RADIUS=Der Standardwert für den Eckenradius ist 0, d.h. keine runden Ecken. Wählen Sie Werte zwischen 1 und 3, um den Eckenradius zu erhöhen und den Rahmen abgerundete Ecken hinzuzufügen.
 Captcha=Captcha
 CaptchaDesc=Wenn Sie Ihre Anmeldeseite mit einem Captcha schützen möchten, können Sie hier auswählen, welches Sie verwenden möchten
 DolibarrStandardCaptcha=Ein natives Captcha, generiert von Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Lieferadresse anzeigen
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Obligatorische Angabe für manche Länder (Frankreich, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=MwSt.-Summen je Steuersatz anzeigen
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=Sie haben die Standardgröße für Listen auf <b>%s</b> Zeilen eingestellt. Das ist ein großer Wert, bei dem gescrollt werden muss, um alle Zeilen anzuzeigen. Ein niedrigerer Wert als <b>%s</b> ist besser. Verwenden Sie die Paginierung, um weitere Zeilen anzuzeigen Zahl. Ändern Sie dies in Menü Start - Einstellungen - Benutzeroberfläche.
+RoundBorders=Abgerundete Ecken
+CheckIfModuleIsNotBlackListed=Installation von Modulen blockieren, die sich auf der <b>Remote-Blacklist</b> befinden
+CheckIfModuleIsNotBlackListedHelp=Einige Module werden möglicherweise von Unternehmen bereitgestellt, die die Vorgaben im Dolibarr-Projekt nicht einhalten (Nichteinhaltung der DSGVO, Verstoß gegen die Regeln zur Verwendung des Markennamens Dolibarr usw.). Wenn Sie dieses Kontrollkästchen aktivieren, wird eine Abfrage an den Dolibarr Projekt-Server gesendet, um zu prüfen, ob ein Bericht über das betreffende Modul vorliegt. Ihre Installation wird geschützt, indem die Bereitstellung von gekennzeichneten Module blockiert wird.
+DatabaseEncryption=Verschlüsselung in Datenbank
+AlgorithmFor=Algorithmus für: %s
+SensitiveData=Sensible Daten
+ToolToDecryptAString=Tool zum Entschlüsseln einer Zeichenfolge
+Decrypt=Entschlüsseln
+FilesIntegrityDesc=Wenn Sie die Integrität der Dateien prüfen möchten anstelle der Datenbank, können Sie das mit <a href="%s">diesem Tool</a> tun.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=Es gibt mehr als %s Ergebnisse mit Ihrem Filter. Bitte fügen Sie weitere Filter hinzu ...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index 268a7d73698..54d77ed002b 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Endbestand
 CurrentBalance=Aktueller Kontostand
 FutureBalance=Zukünftiger Kontostand
 ShowAllTimeBalance=Zeige Kontostand seit Eröffnung
-AllTime=Beginn ab
 Reconciliation=Zahlungsabgleich
 RIB=Kontonummer
 IBAN=IBAN
@@ -40,7 +39,7 @@ StandingOrders=Lastschriften
 StandingOrder=Lastschrift
 PaymentByDirectDebit=Zahlung per Lastschrift
 PaymentByBankTransfers=Zahlung per Überweisung
-PaymentByBankTransfer=Bezahlung per Überweisung
+PaymentByBankTransfer=Überweisungsaufträge
 AccountStatement=Kontoauszug
 AccountStatementShort=Auszug
 AccountStatements=Kontoauszüge
@@ -108,7 +107,7 @@ BankLineNotReconciled=Nicht abgeglichen
 CustomerInvoicePayment=Kundenzahlung
 SupplierInvoicePayment=Lieferanten Zahlung
 SubscriptionPayment=Beitragszahlung
-WithdrawalPayment=Zahlung per Lastschrift
+WithdrawalPayment=Lastschrifteinzüge
 BankTransferPayment=Zahlung per Überweisung
 SocialContributionPayment=Zahlung von Steuern/Sozialabgaben
 BankTransfer=Überweisung
@@ -151,7 +150,7 @@ FutureTransaction=Zukünftige Transaktion. Abgleich nicht möglich.
 SelectChequeTransactionAndGenerate=Wählen/filtern Sie die Schecks, die in den Scheckeinzahlungsbeleg aufgenommen werden sollen. Klicken Sie anschließend auf „Erstellen“.
 SelectPaymentTransactionAndGenerate=Wählen/filtern Sie die Dokumente, die in den %s Einzahlungsbeleg aufgenommen werden sollen. Klicken Sie dann auf „Erstellen“.
 InputReceiptNumber=Wählen Sie den Kontoauszug, auf dem die Zahlung erfasst ist. Verwenden Sie einen sortierbaren numerischen Wert
-InputReceiptNumberBis=JJJJMM oder JJJJMMTT
+InputReceiptNumberBis=JJJJMM
 EventualyAddCategory=Optional eine Kategorie, mit der die Operationen klassifiziert werden
 ToConciliate=Abzugleichen?
 ThenCheckLinesAndConciliate=Dann die Zeilen im Bankauszug prüfen und Klicken
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Wenn diese Funktion aktiviert ist, können Sie eine bes
 BankColorizeMovementName1=Hintergrundfarbe für Sollbuchungen
 BankColorizeMovementName2=Hintergrundfarbe für Habenbuchungen
 IfYouDontReconcileDisableProperty=Wenn Sie auf einigen Bankkonten keine Bankkontenabgleiche vornehmen, deaktivieren Sie die Eigenschaft "%s", um diese Warnung zu entfernen.
-NoBankAccountDefined=Kein Bankkonto definiert
+NoBankAccountDefined=Kein Bankkonto gefunden
 NoRecordFoundIBankcAccount=Kein Datensatz im Bankkonto gefunden. Dies ist in der Regel der Fall, wenn ein Datensatz manuell aus der Transaktionsliste des Bankkontos gelöscht wurde (z. B. bei einer Abstimmung des Bankkontos). Ein weiterer Grund ist, dass die Zahlung aufgezeichnet wurde, als das Modul "%s" deaktiviert war.
 AlreadyOneBankAccount=Es wurde bereits ein Bankkonto definiert
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA-Datei Variante
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index b7ed963f319..3e552440d52 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -106,7 +106,7 @@ HelpPaymentHigherThanReminderToPaySupplier=Achtung, der Zahlungsbetrag einer ode
 ClassifyPaid=Als 'bezahlt' markieren
 ClassifyUnPaid=Als 'unbezahlt' markieren
 ClassifyPaidPartially=Auf 'Bezahlt (mit Abzug)' setzen
-ClassifyCanceled=Rechnung stornieren
+ClassifyCanceled=Rechnung uneinbringlich
 ClassifyClosed=Als 'geschlossen' markieren
 ClassifyUnBilled=Als 'nicht fakturiert' markieren
 CreateBill=Rechnung erstellen
@@ -131,7 +131,7 @@ BillStatus=Rechnungsstatus
 StatusOfAutoGeneratedInvoices=Status der automatisch generierten Rechnungen
 BillStatusDraft=Entwurf (freizugeben)
 BillStatusPaid=Bezahlt
-BillStatusPaidBackOrConverted=Rückerstatten oder als Guthaben vermerken
+BillStatusPaidBackOrConverted=Rückerstattung/Guthaben erstellt
 BillStatusConverted=Bezahlt (in der Schlussrechnung zu verarbeiten)
 BillStatusCanceled=storniert
 BillStatusValidated=Freigegeben (zu bezahlen)
@@ -142,14 +142,14 @@ BillStatusClosedUnpaid=Geschlossen (unbezahlt)
 BillStatusClosedPaidPartially=Bezahlt (mit Abzug)
 BillShortStatusDraft=Entwurf
 BillShortStatusPaid=Bezahlt
-BillShortStatusPaidBackOrConverted=Rückerstattet oder umgewandelt
+BillShortStatusPaidBackOrConverted=Erstattung
 Refunded=Rückerstattet
 BillShortStatusConverted=Bezahlt
 BillShortStatusCanceled=Storniert
 BillShortStatusValidated=Freigegeben
 BillShortStatusStarted=Begonnen
 BillShortStatusNotPaid=Offen
-BillShortStatusNotRefunded=nicht zurückerstattet
+BillShortStatusNotRefunded=Nicht zurückerstattet
 BillShortStatusClosedUnpaid=Geschlossen
 BillShortStatusClosedPaidPartially=Bezahlt (Abzug)
 PaymentStatusToValidShort=zu bestätigen
@@ -169,6 +169,7 @@ BillTo=An
 ShippingTo=Lieferadresse
 ActionsOnBill=Ereignisse zu dieser Rechnung
 ActionsOnBillRec=Aktionen für wiederkehrende Rechnungen
+InvoicesGeneratedFromRec=Erzeugte Rechnungen
 RecurringInvoiceTemplate=Vorlage/Wiederkehrende Rechnung
 NoQualifiedRecurringInvoiceTemplateFound=Keine Vorlagen zur Erstellung von wiederkehrenden Rechnungen gefunden.
 FoundXQualifiedRecurringInvoiceTemplate=%s Vorlage(n) für wiederkehrende Rechnungen für die Rechnungserstellung qualifiziert.
@@ -182,6 +183,7 @@ LastCustomersBills=Neueste %s Kundenrechnungen
 LastSuppliersBills=Neueste %s Lieferantenrechnungen
 AllBills=Alle Rechnungen
 AllCustomerTemplateInvoices=Alle Rechnungsvorlagen
+AllSupplierTemplateInvoices=Alle Rechnungsvorlagen
 OtherBills=Weitere Rechnungen
 DraftBills=Rechnungsentwürfe
 CustomersDraftInvoices=Kundenrechnungen Entwürfe
@@ -233,7 +235,7 @@ RetainedWarranty=Zurückbehaltene Garantie
 RetainedWarrantyShort=Gewährleistungseinbehalt
 AllowedInvoiceForRetainedWarranty=Zurückbehaltene Garantie, die auf die folgenden Arten von Rechnungen angewendet werden kann
 RetainedWarrantyDefaultPercent=Zurückbehaltene Garantie in Prozent
-RetainedWarrantyOnlyForSituation=Stellen Sie "einbehaltene Garantie" nur für Situationsrechnungen zur Verfügung
+RetainedWarrantyOnlyForSituation="Gewährleistungeinbehalt" nur für Abschlagsrechnungen anbieten
 RetainedWarrantyOnlyForSituationFinal=Auf Abschlagsrechnungen wird der globale Abzug der "einbehaltenen Garantie" nur auf die Schlussrechnung angewendet
 ToPayOn=Zu zahlen am %s
 toPayOn=zu zahlen am %s
@@ -395,9 +397,9 @@ PaymentOnDifferentThirdBills=Erlaube gemeinsame Zahlungen für Rechnungen unters
 PaymentNote=Zahlungshinweis
 ListOfPreviousSituationInvoices=Liste der vorherigen Fortschrittsrechnungen
 ListOfNextSituationInvoices=Liste der nächsten Fortschrittsrechnungen
-ListOfSituationInvoices=Liste der Rechnungssituationen
-CurrentSituationTotal=gesamte Rechnungssituation
-DisabledBecauseNotEnouthCreditNote=Um eine Rechnungssituation von diesem Zyklus auszuschliessen, muss das Guthaben den Rechnungsbetrag abdecken
+ListOfSituationInvoices=Liste der Abschlagsrechnungen
+CurrentSituationTotal=Summe der Abschlagsrechnungen
+DisabledBecauseNotEnouthCreditNote=Um eine Abschlagsrechnung von diesem Zyklus auszuschließen, muss das Guthaben den Rechnungsbetrag abdecken
 RemoveSituationFromCycle=Diese Rechnung aus diesem Rechnungslauf ausschliessen
 ConfirmRemoveSituationFromCycle=Diese Rechnung %s aus diesem Rechnungslauf ausschliessen?
 ConfirmOuting=Auslassen bestätigen
@@ -410,8 +412,8 @@ NextDateToExecution=Datum der nächsten Rechnungserstellung
 NextDateToExecutionShort=Datum nächste Generierung
 DateLastGeneration=Datum der letzten Generierung
 DateLastGenerationShort=Datum letzte Generierung
-MaxPeriodNumber=Max. Nummer der Rechnungserstellung
-NbOfGenerationDone=Rechnungslauf für diese Nummer schon durchgeführt
+MaxPeriodNumber=Max. Anzahl an Rechnungserstellungen
+NbOfGenerationDone=Anzahl bereits durchgeführter Rechnungsläufe
 NbOfGenerationOfRecordDone=Anzahl der bereits durchgeführten Datensatzgenerierungen
 NbOfGenerationDoneShort=Anzahl der Erstellungen
 MaxGenerationReached=Max. Anzahl Generierungen erreicht
@@ -419,6 +421,7 @@ InvoiceAutoValidate=Rechnungen automatisch freigeben
 GeneratedFromRecurringInvoice=Erstelle wiederkehrende Rechnung %s aus Vorlage
 DateIsNotEnough=Datum noch nicht erreicht
 InvoiceGeneratedFromTemplate=Rechnung %s erstellt aus Vorlage für wiederkehrende Rechnung %s
+InvoiceGeneratedFromTemplateError=Error Invoice %s generated from recurring template invoice %s : %s
 GeneratedFromTemplate=Erzeugt von der Rechnungsvorlage %s
 WarningInvoiceDateInFuture=Achtung, das Rechnungsdatum liegt nach dem aktuellen Datum
 WarningInvoiceDateTooFarInFuture=Achtung, das Rechnungsdatum ist zu weit entfernt vom aktuellen Datum
@@ -495,6 +498,8 @@ IBANNumber=IBAN
 IBAN=IBAN
 CustomerIBAN=IBAN des Kunden
 SupplierIBAN=IBAN des Lieferanten
+DebitBankAccount = Bankkonto für Lastschrifteinzug
+SetDebitBankAccount = Bankkonto für Lastschrifteinzug festlegen
 BIC=BIC/SWIFT
 BICNumber=BIC / SWIFT-Code
 ExtraInfos=Weitere Informationen
@@ -513,10 +518,12 @@ PrettyLittleSentence=Akzeptiere die Höhe der Zahlungen,  der fälligen Beträge
 IntracommunityVATNumber=innergemeinschaftliche Umsatzsteuer-ID
 PaymentByChequeOrderedTo=Scheckzahlungen (einschließlich Steuern) sind zahlbar an %s, senden an
 PaymentByChequeOrderedToShort=Scheckzahlungen (inkl. Steuern) sind zu leisten an
+StructuredCommunication=Strukturierte Informationen
 SendTo=an
 PaymentByTransferOnThisBankAccount=Zahlung per Überweisung bitte auf folgendes Konto
 VATIsNotUsedForInvoice=* Nicht für USt-art-CGI-293B
 VATIsNotUsedForInvoiceAsso=* USt. befreit nach Art. 261-7 CGI
+VATIsNotUsedReverseChargeProcedure=* Non applicable VAT art-259-1 of CGI
 LawApplicationPart1=Durch die Anwendung des Gesetzes 80,335 von 12/05/80
 LawApplicationPart2=Die Ware bleibt Eigentum
 LawApplicationPart3=Verkäufer bis zur vollständigen Zahlung
@@ -526,7 +533,7 @@ UseLine=Übernehmen
 UseDiscount=Rabatt verwenden
 UseCredit=Verwenden Sie dieses Guthaben
 UseCreditNoteInInvoicePayment=Zahlung um Guthaben reduzieren
-MenuChequeDeposits=Belege Scheckeinlösung
+MenuChequeDeposits=Scheckeinlösungen
 MenuCheques=Schecks
 MenuChequesReceipts=Belege Scheckeinlösung
 NewChequeDeposit=Neuer Beleg zur Scheckeinlösung
@@ -577,11 +584,11 @@ CactusNumRefModelDesc1=Erstellt Nummern im Format %syymm-nnnn für Standard Rech
 EarlyClosingReason=Grund für die vorzeitige Schließung
 EarlyClosingComment=Notiz zur vorzeitigen Schließung
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=Mitarbeiter für Nachverfolgung der Kundenrechnung
+TypeContact_facture_internal_SALESREPFOLL=Mitarbeiter für Nachbetreuung der Kundenrechnung
 TypeContact_facture_external_BILLING=Kontakt für Kundenrechnungen
-TypeContact_facture_external_SHIPPING=Kundenversand Kontakt
+TypeContact_facture_external_SHIPPING=Lieferadresse Kunde
 TypeContact_facture_external_SERVICE=Kundenservice Kontakt
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Mitarbeiter für Nachverfolgung der Lieferantenrechnung
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Mitarbeiter für Nachbetreuung der Lieferantenrechnung
 TypeContact_invoice_supplier_external_BILLING=Kontakt für Lieferantenrechnungen
 TypeContact_invoice_supplier_external_SHIPPING=Kontakt für Lieferantenversand
 TypeContact_invoice_supplier_external_SERVICE=Händler-Servicekontakt
@@ -602,14 +609,14 @@ ErrorOutingSituationInvoiceOnUpdate=Kann diese Abschlagsrechnung nicht ausschlie
 ErrorOutingSituationInvoiceCreditNote=Kann dies verknüpfte Stornorechnung nicht ausschliessen.
 NotLastInCycle=Diese Rechnung ist nicht die letzte im Zyklus und darf nicht geändert werden.
 DisabledBecauseNotLastInCycle=Eine nachfolgende Abschlagsrechnung existiert bereits.
-DisabledBecauseFinal=Diese Abschlagsrechnung ist endgültig.
+DisabledBecauseFinal=Dies ist die letzte Abschlagsrechnung, die Leistung ist vollständig abgerechnet.
 situationInvoiceShortcode_AS=AS
 situationInvoiceShortcode_S=So
 CantBeLessThanMinPercent=Der Fortschritt kann nicht kleiner als in der vorhergehenden Abschlagsrechnung sein.
 NoSituations=Keine offenen Positionen
 InvoiceSituationLast=Allgemeine Endrechnung
 SituationInvoiceAmountColTitle=Betrag (netto)
-SituationInvoiceProgressColTitle=Entwicklung
+SituationInvoiceProgressColTitle=Fortschritt
 SituationInvoiceDate=Datum Abschlagsrechnung
 SituationInvoiceTotalProposal=Angebot der Abschlagsrechnung
 SituationInvoiceOldCumulation=Alte Kumulierung
@@ -645,7 +652,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Lieferantenrechnung gelöscht
 UnitPriceXQtyLessDiscount=Stückpreis x Anzahl - Rabatt
 CustomersInvoicesArea=Abrechnungsbereich Kunden
 SupplierInvoicesArea=Abrechnungsbereich Lieferanten
-SituationTotalRayToRest=Remainder to pay without tax
+SituationTotalRayToRest=Restbetrag zu zahlen ohne Steuer
 PDFSituationTitle=Abschlag Nr. %d
 SituationTotalProgress=Gesamtfortschritt %d %%
 SearchUnpaidInvoicesWithDueDate=Suche unbezahlte Rechnungen mit Fälligkeitsdatum = %s
@@ -661,6 +668,7 @@ MentionCategoryOfOperations0=Lieferung von Waren
 MentionCategoryOfOperations1=Erbringung von Dienstleistungen
 MentionCategoryOfOperations2=Gemischt - Lieferung von Waren und Erbringung von Dienstleistungen
 Salaries=Gehälter
+InvoiceSubtype=Rechnung Untertyp
 SalaryInvoice=Gehalt
 BillsAndSalaries=Rechnungen & Gehälter
 CreateCreditNoteWhenClientInvoiceExists=Diese Option ist nur aktiviert, wenn freigegebene Rechnungen für einen Kunden vorhanden sind oder wenn die Konstante INVOICE_CREDIT_NOTE_STANDALONE verwendet wird (nützlich für einige Länder).
diff --git a/htdocs/langs/de_DE/blockedlog.lang b/htdocs/langs/de_DE/blockedlog.lang
index 062f21687db..626bc4a53ca 100644
--- a/htdocs/langs/de_DE/blockedlog.lang
+++ b/htdocs/langs/de_DE/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Unveränderbare Logs
 ShowAllFingerPrintsMightBeTooLong=Unveränderbare Logs anzeigen (kann lange dauern...)
 ShowAllFingerPrintsErrorsMightBeTooLong=Non valid Logs anzeigen (kann lange dauern)
 DownloadBlockChain=Fingerprints herunterladen
-KoCheckFingerprintValidity=Der archivierte Protokolleintrag ist ungültig. Das bedeutet, dass Daten dieses Datensatzes geändert wurden, nachdem er protokolliert wurde, und/oder dass der vorherige protokollierte Datensatz gelöscht wurde (prüfen Sie, dass die Zeile mit der vorhergehenden Zeilennummer existiert) und/oder dass die Prüfsumme des vorherigen Datensatzes nachträglich geändert wurde.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Der archivierte Protokolleintrag ist gültig. Die Daten in dieser Zeile wurden nicht geändert und der Eintrag folgt dem Vorherigen.
 OkCheckFingerprintValidityButChainIsKo=Der archivierte Logeintrag scheint im Vergleich zum vorherigen gültig zu sein, aber die vorangehende Eintragskette wurde beschädigt.
 AddedByAuthority=In der Remote-Instanz gespeichert
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Details zum Log
 ListOfTrackedEvents=Liste nachverfolgter Ereignisse
 Fingerprint=Fingerprint
 DownloadLogCSV=Eingetragene Logs exportieren (CSV)
-DataOfArchivedEvent=Vollständige Daten des archivierten Ereignisses
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Ursprüngliches Objekt (Typ %s, ID %s) nicht verknüpft (siehe Spalte 'Vollständige Daten' für die revisionssicher gespeicherten Daten)
 BlockedLogAreRequiredByYourCountryLegislation=Das Modul "Revisionssicheres Protokoll" kann von der Gesetzgebung Ihres Landes verlangt werden. Durch Deaktivieren dieses Moduls können zukünftige Transaktionen mit Bezug auf Gesetze und rechtssichere Software ungültig werden, da sie nicht durch eine Steuerprüfung validiert werden können.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Das Modul "Revisionssicheres Protokoll" wurde aktiviert aufgrund der Gesetzgebung Ihres Landes. Durch Deaktivieren dieses Moduls können zukünftige Transaktionen mit Bezug auf Gesetze und rechtssichere Software ungültig werden, da sie nicht durch eine Steuerprüfung validiert werden können.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Das System zum Protokollieren von Ereignissen in unveränderba
 BlockedLogDisabled=Das System zum Protokollieren von Ereignissen in unveränderbaren Logs wurde deaktiviert, nachdem schon einige Aufzeichnungen durchgeführt wurden. Es wurde ein spezieller Fingerabdruck gespeichert, um die Kette als gebrochen zu markieren
 BlockedLogDisabledBis=Das System zum Protokollieren von Ereignissen in unveränderbaren Logs wurde deaktiviert. Dies ist möglich, da noch keine Aufzeichnungen vorgenommen wurden.
 LinkHasBeenDisabledForPerformancePurpose=For performance purpose, direct link to the document is not shown after the 100th line.
+SavedOnLine=Gespeichert in Zeile
 
 ## logTypes
 logBILL_DELETE=Kundenrechnung automatisch gelöscht
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Kundenzahlung automatisch löschen
 logPAYMENT_VARIOUS_CREATE=Zahlung (keiner Rechnung zugeordnet) erstellt
 logPAYMENT_VARIOUS_DELETE=Zahlung (nicht mit einer Rechnung verknüpft) automatisch löschen
 logPAYMENT_VARIOUS_MODIFY=Zahlung (keiner Rechnung zugeordnet) geändert
+logBLOCKEDLOG_EXPORT=Das unveränderliche Archiv in eine Datei exportieren
diff --git a/htdocs/langs/de_DE/cashdesk.lang b/htdocs/langs/de_DE/cashdesk.lang
index 0d36c35e1a2..bd8b0c7a0b7 100644
--- a/htdocs/langs/de_DE/cashdesk.lang
+++ b/htdocs/langs/de_DE/cashdesk.lang
@@ -60,7 +60,7 @@ Numberspad=Nummernblock
 BillsCoinsPad=Münzen- und Banknoten-Pad
 DolistorePosCategory=TakePOS-Module und andere POS-Lösungen für Dolibarr
 TakeposNeedsCategories=TakePOS benötigt mindestens eine Produktkategorie, um zu funktionieren
-TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS benötigt mindestens 1 Produktkategorie unter der Kategorie <b> %s </b>, um zu funktionieren
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS benötigt mindestens eine Unterkategorie unter der Produktkategorie <b>%s</b> um zu funktionieren
 OrderNotes=Jedem bestellten Artikel können Notizen hinzufügt werden
 CashDeskBankAccountFor=Standardkonto für Zahlungen per
 NoPaimementModesDefined=In der TakePOS-Konfiguration ist kein Zahlungsmodus definiert
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index 773fe571f31..0fad6d8c44c 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Festlegung von Kategorien für Kontakte
 AccountsCategoriesArea=Bereich für Bankkonto-Schlagwörter/Kategorien
 ProjectsCategoriesArea=Bereich Projekt-Schlagwörter/Kategorien
 UsersCategoriesArea=Bereich Benutzer-Schlagwörter/Kategorien
+Bank_linesCategoriesArea==Bereich für Schlagwörter/Kategorien von Bank-Zeilen
 SubCats=Unterkategorie(n)
 CatList=Liste der Kategorien
 CatListAll=Liste der Schlagwörter/Kategorien (alle Typen)
@@ -90,9 +91,10 @@ CategoriesSetup=Kategorie-Einstellungen
 CategorieRecursiv=Automatisch mit übergeordneter Kategorie verbinden
 CategorieRecursivHelp=Wenn die Option aktiviert ist und Sie ein Objekt zu einer Unterkategorie hinzufügen, wird das Objekt auch zu den übergeordneten Kategorien hinzugefügt.
 AddProductServiceIntoCategory=Einem Produkt/einer Leistung eine Kategorie zuweisen
-AddCustomerIntoCategory=Ordnen Sie dem Kunden eine Kategorie zu
-AddSupplierIntoCategory=Ordnen Sie dem Lieferanten eine Kategorie zu
-AssignCategoryTo=Kategorie zuweisen zu
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Zeige Kategorie
 ByDefaultInList=Standardwert in Liste
 ChooseCategory=Kategorie auswählen
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Seiteninhalte-Kategorien
 KnowledgemanagementsCategoriesArea=KM Artikelkategorien
 UseOrOperatorForCategories=Kategoriesuche mit "ODER"-Verknüpfung ausführen
 AddObjectIntoCategory=Kategorie zuweisen
+FichintersCategoriesArea=Kategorien Serviceauftrag
diff --git a/htdocs/langs/de_DE/commercial.lang b/htdocs/langs/de_DE/commercial.lang
index 139d685b101..ae641dee3f5 100644
--- a/htdocs/langs/de_DE/commercial.lang
+++ b/htdocs/langs/de_DE/commercial.lang
@@ -75,15 +75,15 @@ DraftPropals=Entworfene Angebote
 NoLimit=ohne Begrenzung
 ToOfferALinkForOnlineSignature=Link zur Onlinesignatur
 WelcomeOnOnlineSignaturePageProposal=%s begrüßt Sie zum Online-Service für Angebotsfreigaben
-WelcomeOnOnlineSignaturePageContract=Willkommen auf der %s Vertrags-PDF-Unterzeichnungsseite
-WelcomeOnOnlineSignaturePageFichinter=Willkommen auf der PDF-Signaturseite von Serviceauftrag %s
-WelcomeOnOnlineSignaturePageSociete_rib=Willkommen auf der %s Webseite zum Unterzeichnen von SEPA-Mandaten im PDF-Format
-WelcomeOnOnlineSignaturePageExpedition=Seite zur Unterzeichnung des Lieferscheins %s
+WelcomeOnOnlineSignaturePageContract=Willkommen auf der %s Signaturseite für Verträge
+WelcomeOnOnlineSignaturePageFichinter=Willkommen auf der %s Signaturseite für Serviceaufträge
+WelcomeOnOnlineSignaturePageSociete_rib=Willkommen auf der %s Signaturseite für SEPA-Mandate
+WelcomeOnOnlineSignaturePageExpedition=Willkommen auf der %s Signaturseite für Lieferscheine
 ThisScreenAllowsYouToSignDocFromProposal=Auf dieser Seite können Angebote angenommen und unterschrieben oder abgelehnt werden.
-ThisScreenAllowsYouToSignDocFromContract=Auf dieser Seite können Sie den Vertrag im PDF-Format online unterzeichnen.
-ThisScreenAllowsYouToSignDocFromFichinter=Auf dieser Seite können Sie Serviceaufträge im PDF-Format online unterzeichnen.
-ThisScreenAllowsYouToSignDocFromSociete_rib=Hier können Sie ein SEPA-Mandat im PDF-Format online unterzeichnen.
-ThisScreenAllowsYouToSignDocFromExpedition=Auf dieser Seite können Sie den Lieferschein  im PDF-Format online unterzeichnen.
+ThisScreenAllowsYouToSignDocFromContract=Auf dieser Seite können Sie online ein Vertrag unterzeichnen.
+ThisScreenAllowsYouToSignDocFromFichinter=Auf dieser Seite können Sie online ein Serviceauftrag unterzeichnen.
+ThisScreenAllowsYouToSignDocFromSociete_rib=Auf dieser Seite können Sie online ein SEPA-Mandat unterzeichnen.
+ThisScreenAllowsYouToSignDocFromExpedition=Auf dieser Seite können Sie online einen Lieferschein unterzeichnen.
 ThisIsInformationOnDocumentToSignProposal=Information zum Dokument
 ThisIsInformationOnDocumentToSignContract=Diese Vertragsinformationen sind zu unterzeichnen
 ThisIsInformationOnDocumentToSignFichinter=Dies ist eine Information über den zu unterzeichnenden Serviceauftrag
@@ -95,8 +95,10 @@ SignatureFichinterRef=Unterzeichnung des Serviceauftrags %s
 SignatureSociete_ribRef=Unterschrift des SEPA-Mandats %s
 FeatureOnlineSignDisabled=Onlineunterschrift ist deaktiviert oder das Dokument wurde erstellt, bevor diese Funktion aktiviert wurde
 NoSignature=Abgelehnt
+UnsignedInDolibarr=Dokument nicht unterzeichnet
 SignedSender=Intern signiert
 SignedReceiver=Signiert vom Geschäftspartner
 SignedReceiverOnline=Online signiert vom Geschäftspartner
 SignedAll=Von allen Parteien signiert
 SignStatus=Unterschriftenstatus
+DocumentSigned=Dokument unterzeichnet
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index aff3301bdf4..8b4314338a0 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -33,7 +33,7 @@ CountryIsInEEC=Land ist EU-Mitglied
 PriceFormatInCurrentLanguage=Preisanzeigeformat in der aktuellen Sprache und Währung
 ThirdPartyName=Name des Geschäftspartners
 ThirdPartyEmail=Geschäftspartner E-Mail
-ThirdParty=Geschäftspartner
+ThirdParty=Kunde
 ThirdParties=Geschäftspartner
 ThirdPartyProspects=Interessenten
 ThirdPartyProspectsStats=Interessenten
@@ -65,6 +65,7 @@ State=Bundesland
 StateId=Staats-ID
 StateCode=Länder-/Regioncode
 StateShort=Staat
+DepartmentBuyer=Staat/Provinz des Käufers
 Region=Region
 Region-State=Bundesland
 Country=Land
@@ -78,7 +79,7 @@ Chat=Chat
 PhonePro=Telefon (geschäftl.)
 PhonePerso=Telefon (privat)
 PhoneMobile=Telefon (mobil)
-No_Email=Von E-Mail-Kampagnen ausschließen
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=PLZ
 Town=Stadt
@@ -96,8 +97,8 @@ ThirdpartyNotCustomerNotSupplierSoNoRef=Geschäftspartner ist weder Kunde noch L
 ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Geschäftspartner ist weder Kunde noch Lieferant, Rabatte sind nicht verfügbar
 PaymentBankAccount=Bankkonto für Zahlungen
 OverAllProposals=Angebote
-OverAllOrders=Bestellungen
-OverAllInvoices=(Kunden-)Rechnungen
+OverAllOrders=Kundenaufträge
+OverAllInvoices=Kundenrechnungen
 OverAllSupplierProposals=Preisanfragen
 ##### Local Taxes #####
 LocalTax1IsUsed=Zweiten Steuersatz verwenden
@@ -382,12 +383,12 @@ ExportCardToFormat=Karte in Format exportieren
 ContactNotLinkedToCompany=Kontakt ist keinem Geschäftspartner zugeordnet
 DolibarrLogin=Dolibarr-Benutzername
 NoDolibarrAccess=Kein Dolibarr-Zugang
-ExportDataset_company_1=Geschäftspartner (Firmen/Stiftungen/Natürliche Personen) und ihre Eigenschaften
-ExportDataset_company_2=Kontakte und ihre Eigenschaften
-ExportDataset_company_3=Bankkonten der Geschäftspartner
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Kontakte/Adressen und Attribute
+ExportDataset_company_3=Zahlungsmittel von Geschäftspartnern (Bankkonten)
 ImportDataset_company_1=Geschäftspartner und ihre Eigenschaften
 ImportDataset_company_2=Kontakte/Adressen und Attribute
-ImportDataset_company_3=Bankkonten der Geschäftspartner
+ImportDataset_company_3=Zahlungsmittel von Geschäftspartnern (Bankkonten)
 ImportDataset_company_4=Geschäftspartnern zugeordnete Vertriebsmitarbeiter (Vertriebsmitarbeiter/Benutzer zu Unternehmen zuordnen)
 PriceLevel=Preissegment
 PriceLevelLabels=Preisniveau Etiketten
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Freier Code ohne Verifizierung.
 ManagingDirectors=Name(n) des/der Manager (CEO, Direktor, Geschäftsführer, ...)
 MergeOriginThirdparty=Doppelter Geschäftspartner (der Geschäftspartner, den Sie löschen möchten)
 MergeThirdparties=Geschäftspartner zusammenführen
-ConfirmMergeThirdparties=Sind Sie sicher, dass Sie den ausgewählten Geschäftspartner mit dem aktuellen zusammenführen möchten? \nAlle verknüpften Objekte (Rechnungen, Bestellungen, ...) werden zum aktuellen Geschäftspartner verschoben, danach wird der ausgewählte Geschäftspartner gelöscht.
+ConfirmMergeThirdparties=Sind Sie sicher, dass Sie den ausgewählten Geschäftspartner mit dem aktuellen zusammenführen möchten? Alle verknüpften Objekte (Rechnungen, Bestellungen, ...) werden zum aktuellen Geschäftspartner verschoben, danach wird der ausgewählte Geschäftspartner gelöscht.
 ThirdpartiesMergeSuccess=Geschäftspartner wurden zusammenführt
 SaleRepresentativeLogin=Login des Vertriebsmitarbeiters
 SaleRepresentativeFirstname=Vorname des Vertreter
@@ -461,3 +462,6 @@ ExternalSystemID=ID im externen System
 IDOfPaymentInAnExternalSystem=ID des Zahlungsmittels in einem externen System (Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE-Webservice-Anmeldeinformationen
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Der Geschäftspartner muss ein Kunde sein, um die Erstellung seiner Bank-Info auf der Stripe-Seite zu ermöglichen
+NewSocNameForClone=Neuer Unternehmensname
+ConfirmCloneThirdparties=Sind Sie sicher, dass Sie das Unternehmen  <b>%s</b> Unternehmen duplizieren möchten?
+SocialNetworksBusiness=Soziale Netzwerke für Unternehmen
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index 89bbd3c5a74..03162362a71 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Zahlung Kundenrechnung
 PaymentSupplierInvoice=Zahlung Lieferantenrechnung
 PaymentSocialContribution=Zahlung von Steuern/Sozialabgaben
 PaymentVat=USt.-Zahlung
-AutomaticCreationPayment=Zahlung automatisch erstellen
+AutomaticCreationPayment=Also record the payment
 ListPayment=Liste der Zahlungen
 ListOfCustomerPayments=Liste der Kundenzahlungen
 ListOfSupplierPayments=Liste der Lieferantenzahlungen
@@ -118,10 +118,14 @@ SocialContributionsPayments=Zahlungen von Steuern/Sozialabgaben
 ShowVatPayment=Zeige USt. Zahlung
 TotalToPay=Zu zahlender Gesamtbetrag
 BalanceVisibilityDependsOnSortAndFilters=Der Kontostand ist in dieser Liste nur sichtbar, wenn die Tabelle nach %s sortiert und nach 1 Bankkonto gefiltert ist (ohne andere Filter).
+CustomerAccountancyCodeGeneral=Allgemeines Buchungskonto
 CustomerAccountancyCode=Buchungskonto Kunde
+SupplierAccountancyCodeGeneral=Allgemeines Buchungskonto
 SupplierAccountancyCode=Buchungskonto Lieferanten
+UserAccountancyCodeGeneral=Allgemeines Buchungskonto
 CustomerAccountancyCodeShort=Buchh. Kundenkonto
 SupplierAccountancyCodeShort=Buchh.-Lieferantenkonto
+UserAccountancyCodeShort=Buchungskonto Benutzer
 AccountNumber=Kontonummer
 NewAccountingAccount=Neues Konto
 Turnover=In Rechnung gestellter Umsatz
@@ -129,7 +133,9 @@ TurnoverCollected=Realisierter Umsatz
 SalesTurnoverMinimum=Mindestumsatz
 ByExpenseIncome=Ausgaben & Einnahmen
 ByThirdParties=Nach Geschäftspartnern
+ByProjects=Nach Projekten
 ByUserAuthorOfInvoice=Nach Rechnungsersteller
+DetailedListLowercase=ausführlich Liste
 CheckReceipt=Einzahlungsbeleg
 CheckReceiptShort=Einzahlungsbeleg
 LastCheckReceiptShort=Neueste %s Einreichungsbelege für Checks
@@ -190,7 +196,7 @@ RulesAmountOnInOutBookkeepingRecord=Beinhaltet Datensätze aus dem Hauptbuch mit
 RulesResultBookkeepingPredefined=Beinhaltet Datensätze aus dem Hauptbuch mit den Gruppen "Aufwand" oder "Ertrag"
 RulesResultBookkeepingPersonalized=Zeigt die Buchungen im Hauptbuch mit Konten <b>gruppiert nach Kontengruppen</b>
 SeePageForSetup=Siehe Menü <a href="%s"> %s </a> für die Einrichtung
-DepositsAreNotIncluded=- Anzahlungsrechnungen sind nicht enthalten 
+DepositsAreNotIncluded=- Anzahlungsrechnungen sind nicht enthalten
 DepositsAreIncluded=- Inklusive Anzahlungsrechnungen
 LT1ReportByMonth=Steuer 2 Bericht pro Monat
 LT2ReportByMonth=Steuer 3 Bericht pro Monat
@@ -204,7 +210,7 @@ VATReportByMonth=Umsatzsteuerauswertung nach Monaten
 VATReportByRates=Umsatzsteuerauswertung nach Steuersatz
 VATReportByThirdParties=Umsatzsteuerauswertung nach Geschäftspartner
 VATReportByCustomers=Umsatzsteuerauswertung nach Kunde
-VATReportByCustomersInInputOutputMode=Bericht zur vereinnahmten und bezahlten USt. nach Kunden 
+VATReportByCustomersInInputOutputMode=Bericht zur vereinnahmten und bezahlten USt. nach Kunden
 VATReportByQuartersInInputOutputMode=Auswertung nach Umsatzsteuersatz für vereinnahmten und gezahlten Steuer
 VATReportShowByRateDetails=Details zu diesem Steuersatz anzeigen
 LT1ReportByQuarters=Steuer 2 Auswertung pro Steuersatz
@@ -213,7 +219,7 @@ LT1ReportByQuartersES=Bericht von RE Ratex
 LT2ReportByQuartersES=Quartal-Bericht EKSt. Rate
 SeeVATReportInInputOutputMode=Siehe Bericht <b> %svereinnahmte USt.%s </b> für eine Standardberechnung
 SeeVATReportInDueDebtMode=Siehe Bericht <b> %sgeschuldete USt.%s </b> für eine Berechnung mit Option auf die Rechnungsstellung
-RulesVATInServices=- Für Leistungen/Services beinhaltet der Bericht die vereinnahmte oder gezahlte USt. nach Zahlungsdatum (Ist-Versteuerung). 
+RulesVATInServices=- Für Leistungen/Services beinhaltet der Bericht die vereinnahmte oder gezahlte USt. nach Zahlungsdatum (Ist-Versteuerung).
 RulesVATInProducts=- Für Waren (physische Produkte) beinhaltet der Bericht die erhaltene oder gezahlte USt. auf Basis des Zahlungsdatums (Ist-Versteuerung).
 RulesVATDueServices=- Für Leistungen/Services beinhaltet der Bericht die USt. aller fälligen Rechnungen, bezahlt oder nicht, bezogen auf das Rechnungsdatum (Soll-Versteuerung).
 RulesVATDueProducts=- Für Waren (physische Produkte) beinhaltet der Bericht die USt. aller fälligen Rechnungen auf Basis des Rechnungsdatums (Soll-Versteuerung).
@@ -237,7 +243,7 @@ WarningDepositsNotIncluded=Anzahlungsrechnungen werden in dieser Version des Rec
 DatePaymentTermCantBeLowerThanObjectDate=Die Zahlungsfrist darf nicht kleiner als das Objektdatum sein
 Pcg_version=Kontenplan-Vorlagen
 Pcg_type=Klasse des Kontos
-Pcg_subtype=Klasse des Kontos 
+Pcg_subtype=Klasse des Kontos
 InvoiceLinesToDispatch=Versandbereite Rechnungspositionen
 ByProductsAndServices=Nach Produkten und Leistungen
 RefExt=Externe Referenz
@@ -246,7 +252,7 @@ LinkedOrder=Link zur Bestellung
 Mode1=Methode 1
 Mode2=Methode 2
 CalculationRuleDesc=Zur Berechnung der Gesamt-USt. gibt es zwei Methoden: <br>Methode 1 rundet die Steuer in jeder Zeile und addiert zum Schluss. <br>Methode 2 summiert alle Steuer-Zeilen und rundet am Ende. <br>Das endgültige Ergebnis kann sich in wenigen Cent unterscheiden. Standardmodus ist <b>Modus %s.</b>
-CalculationRuleDescSupplier=Wählen Sie je nach Anbieter die geeignete Methode aus, um dieselbe Berechnungsregel anzuwenden und dasselbe Ergebnis zu erzielen, das Ihr Anbieter erwartet.
+CalculationRuleDescSupplier=Wählen Sie je nach Lieferant die geeignete Methode aus, um dieselbe Berechnungsregel anzuwenden und dasselbe Ergebnis zu erzielen, wie Ihr Lieferant in seiner Rechnung.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Der Umsatzbericht pro Produkt ist nicht verfügbar. Dieser Bericht ist nur für verrechneten Umsatz verfügbar.
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Der Umsatzbericht pro Ust.-Satz ist nicht verfügbar. Dieser Bericht ist nur für den verrechneten Umsatz verfügbar.
 CalculationMode=Berechnungsmodus
diff --git a/htdocs/langs/de_DE/datapolicy.lang b/htdocs/langs/de_DE/datapolicy.lang
index 5324f48c77f..4c87b594f17 100644
--- a/htdocs/langs/de_DE/datapolicy.lang
+++ b/htdocs/langs/de_DE/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Datenschutzrichtlinien
 Module4100Desc = Modul zur Verwaltung der Datenschutzeinstellungen (DSGVO-Konform)
 # Administration page
 datapolicySetup = Modul Datenschutzrichtlinien einrichten
-Deletion = Löschung von Daten
-datapolicySetupPage = Abhängig von den Gesetzen Ihres Landes (Beispiel <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Artikel 5</a> der DSGVO) dürfen personenbezogene Daten nur für einen Zeitraum aufbewahrt werden, der den für die Zwecke erforderlichen Zeitraum, für die sie erhoben wurden, nicht überschreitet, mit Ausnahme von Archivierungszwecken.<br>Die Löschung erfolgt automatisch nach einer bestimmten Dauer ohne Ereignisse (die Dauer, die Sie unten angegeben haben).
+DataDeletion=Löschung von Daten
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s Monate
 ONE_YEAR = 1 Jahr
 NB_YEARS = %s Jahre
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Interessent/Kunde
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Weder Interessent noch Kunde
 DATAPOLICY_CONTACT_FOURNISSEUR = Lieferant
 DATAPOLICY_ADHERENT = Mitglied
-DATAPOLICY_Tooltip_SETUP=Zeit ohne Interaktion festlegen, nach deren Ablauf der Datensatz automatisch gelöscht werden soll.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Sie können eine DSGVO-E-Mail an alle Ihre relevanten Kontakte senden (die noch keine E-Mail erhalten haben und für die Sie nichts über ihre DSGVO-Vereinbarung registriert haben). Verwenden Sie dazu die folgende Schaltfläche.
 SendAgreement = E-Mails senden
 AllAgreementSend = Alle E-Mails wurden versendet
 TXTLINKDATAPOLICYACCEPT = Text für den Link "Zustimmung"
 TXTLINKDATAPOLICYREFUSE = Text für den Link "Ablehnung"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = DSGVO: Verarbeitung personenbezogener Daten
 DATAPOLICY_consentement = Einwilligung zur Verarbeitung personenbezogener Daten eingeholt
diff --git a/htdocs/langs/de_DE/deliveries.lang b/htdocs/langs/de_DE/deliveries.lang
index 87f5c113714..5fc069c115b 100644
--- a/htdocs/langs/de_DE/deliveries.lang
+++ b/htdocs/langs/de_DE/deliveries.lang
@@ -6,7 +6,8 @@ DeliveryOrder=Lieferschein
 DeliveryDate=Liefertermin
 CreateDeliveryOrder=Lieferschein erstellen
 DeliveryStateSaved=Lieferstatus gespeichert.
-SetDeliveryDate=Versanddatum festlegen
+SetDeliveryDate=Geschätztes Lieferdatum festlegen
+SetShippingDate=Versanddatum festlegen
 ValidateDeliveryReceipt=Lieferschein freigeben
 ValidateDeliveryReceiptConfirm=Sind Sie sicher, dass Sie diesen Lieferschein freigeben wollen?
 DeleteDeliveryReceipt=Lieferschein löschen
diff --git a/htdocs/langs/de_DE/ecm.lang b/htdocs/langs/de_DE/ecm.lang
index d6f59c25c52..14199db5a5b 100644
--- a/htdocs/langs/de_DE/ecm.lang
+++ b/htdocs/langs/de_DE/ecm.lang
@@ -54,3 +54,7 @@ SucessConvertImgWebp=Bilder erfolgreich dupliziert
 SucessConvertChosenImgWebp=Ausgewähltes Bild erfolgreich dupliziert
 ECMDirName=Verzeichnisname
 ECMParentDirectory=Übergeordnetes Verzeichnis
+ShowFile=Datei anzeigen
+FullPathOrig=Vollständiger Ursprungspfad
+GenOrUpload=Ursprung Datei
+FileHasAnIndexedTextContent=Datei hat einen indexierten Textinhalt
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 2bbe0a397b8..5eadbd719b4 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Fehler beim Erstellen von Bilddateien (g
 ErrorFailedToCreateDir=Fehler beim Erstellen eines Verzeichnisses. Vergewissern Sie sich, dass der Webserver-Benutzer Schreibberechtigungen für das Dokumentverzeichnis des Systems besitzt. Bei aktiviertem <b>safe_mode</b> sollten die Systemdateien den Webserver-Benutzer oder die -Gruppe als Besitzer haben.
 ErrorNoMailDefinedForThisUser=Für diesen Benutzer ist keine E-Mail-Adresse eingetragen.
 ErrorSetupOfEmailsNotComplete=Das Einrichten von E-Mails ist nicht abgeschlossen
+ErrorAccountingClosureSetupNotComplete=Einrichtung der Abschlusskonten nicht abgeschlossen
 ErrorFeatureNeedJavascript=Diese Funktion erfordert aktiviertes JavaScript. Sie können dies unter Einstellungen-Anzeige ändern.
 ErrorTopMenuMustHaveAParentWithId0=Ein Menü vom Typ 'Top' kann kein Eltern-Menü sein. Setzen Sie 0 als Eltern-Menü oder wählen Sie ein Menü vom Typ 'Links'.
 ErrorLeftMenuMustHaveAParentId=Ein Menü vom Typ 'Links' erfordert einen Eltern-Menü ID.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Der Upload wurde durch ein PHP Apache-Plugin blockiert
 ErrorFileSizeTooLarge=Die Dateigröße ist zu groß oder die Datei wurde nicht bereitgestellt.
 ErrorFieldTooLong=Das Feld %s ist zu lang.
 ErrorSizeTooLongForIntType=Die Größe überschreitet das Maximum für den Typ 'int' (%s Ziffern maximal)
+ErrorSizeForStarsType=Die Anzahl der Sterne muss ein Zahl zwischen 1 und 10 sein
 ErrorSizeTooLongForVarcharType=Die Größe überschreitet das Maximum für den Typ 'string' (%s Zeichen maximal)
 ErrorNoValueForSelectType=Bitte Wert für Auswahlliste eingeben
 ErrorNoValueForCheckBoxType=Bitte Wert für Kontrollkästchen-Liste eingeben
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Sicherheitsschlüssel falsch
 ErrorBothFieldCantBeNegative=Die Felder %s und %s können nicht gleichzeitig negativ sein
 ErrorFieldCantBeNegativeOnInvoice=Das Feld <strong>%s</strong> darf bei diesem Rechnungstyp nicht negativ sein. Wenn Sie eine Rabattzeile hinzufügen müssen, erstellen Sie einfach zuerst den Rabatt (aus dem Feld „%s“ in der Geschäftspartneransicht) und wenden Sie ihn dann auf die Rechnung an.
 ErrorLinesCantBeNegativeForOneVATRate=Die Summe der Zeilen (nach Steuern) kann für einen bestimmten nicht null Mehrwertsteuersatz nicht negativ sein (Es wurde eine negative Summe für den Mehrwertsteuersatz <b> %s </b> %% gefunden).
-ErrorLinesCantBeNegativeOnDeposits=Zeilen in einer Anzahlung können nicht negativ sein. Es entstehen Probleme, wenn die Anzahlung in einer Rechnung verrechnet wird.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Mengen in Kundenrechnungen dürfen nicht negativ sein
+ErrorQtyForSupplierInvoiceCantBeNegative=Die Menge für Positionen in Lieferantenrechnungen darf nicht negativ sein
 ErrorWebServerUserHasNotPermission=Der Benutzerkonto <b>%s</b> wurde verwendet um auf dem Webserver etwas auszuführen, hat aber keine Rechte dafür.
 ErrorNoActivatedBarcode=Kein Barcode aktiviert
 ErrUnzipFails=Fehler beim Entpacken von %s mit ZipArchive
@@ -222,7 +225,7 @@ ErrorUserNotAssignedToTask=Benutzer muss der Aufgabe zugeteilt sein, um Zeiten e
 ErrorTaskAlreadyAssigned=Aufgabe ist dem Benutzer bereits zugeteilt
 ErrorModuleFileSeemsToHaveAWrongFormat=Das Modul-Paket scheint ein falsches Format zu haben.
 ErrorModuleFileSeemsToHaveAWrongFormat2=Mindestens ein obligatorische Verzeichnis muss für das Packen des Moduls vorhanden sein: <strong>%s</strong> oder <strong>%s</strong>
-ErrorFilenameDosNotMatchDolibarrPackageRules=The file name of the module package (<strong>%s</strong>) does not match the expected name syntax: <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=Der Dateiname des Modul-Pakets (<strong>%s</strong>) entspricht nicht der erwarteten Syntax: <strong>%s</strong>
 ErrorDuplicateTrigger=Fehler, doppelter Triggername %s. Schon geladen durch %s.
 ErrorNoWarehouseDefined=Fehler, keine Warenlager definiert.
 ErrorBadLinkSourceSetButBadValueForRef=Der Link ist ungültig. Die Quelle für die Zahlung ist definiert, aber die Referenz ist ungültig.
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=Enddatum kann nicht leer sein
 ErrorStartHourIsNull=Startdatum kann nicht leer sein
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Zu viele Zeilen zum Verarbeiten. Bitte verwenden Sie einen selektiveren Filter.
 ErrorEmptyValueForQty=Die Menge darf nicht Null sein.
+ErrorNoCloneWithoutName=Das neue Benutzer muss einen Namen haben
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = Die Menge im Auftrag nicht kann geringer sein als die gelieferte Menge.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Fehler, das Erstellen einer sonstigen Zahlung auf einem Bankkonto mit einer anderen Währung als der Währung des Unternehmens wird noch nicht unterstützt.
+ErrorStreamMustBeEnabled=Der PHP-Stream %s ist nicht verfügbar. Prüfen Sie Ihre PHP Module und den Dolibarr-Parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ihr PHP Parameter upload_max_filesize (%s) ist größer als Parameter post_max_size (%s). Dies ist eine inkonsistente Einstellung.
 WarningPasswordSetWithNoAccount=Es wurde ein Passwort für dieses Mitglied vergeben, aber kein Benutzer erstellt. Das Passwort wird gespeichert, aber kann nicht für die Anmeldung an Dolibarr verwendet werden. Es kann von einem externen Modul/einer Schnittstelle verwendet werden, aber wenn Sie kein Login oder Passwort für dieses Mitglied definiert müssen, können Sie die Option "Login für jedes Mitglied verwalten" in den Mitgliedseinstellungen deaktivieren. Wenn Sie ein Login aber kein Passwort benötige, lassen Sie dieses Feld leer, um diese Meldung zu deaktivieren. Anmerkung: Die E-Mail-Adresse kann auch zur Anmeldung verwendet werden, wenn das Mitglied mit einem Benutzer verbunden wird.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=Übergeordnetes Element mit dieser ID existie
 WarningReadBankAlsoAllowedIfUserHasPermission=Achtung: Einblick in Bankkonto ist auch mit der Berechtigung zum Verwalten des Kontenplans zulässig.
 WarningNoDataTransferedInAccountancyYet=Bitte beachten: es sind keine Daten in der Buchhaltung vorhanden. Bitte übertragen Sie Ihre in der Anwendung aufgezeichneten Daten in die Buchhaltung oder ändern Sie den Berechnungsmodus, um die außerhalb der Buchhaltung aufgezeichneten Daten zu analysieren.
 WarningChangingThisMayBreakStopTaskScheduler=Achtung, das Ändern dieses Wertes kann den Scheduler deaktivieren
+WarningAmountOfFileDiffersFromSumOfLines=Achtung, der Gesamtbetrag der Datei (%s) entspricht nicht der Betragssumme der Zeilen (%s)
+WarningModuleAffiliatedToAReportedCompany=Achtung, diese Modul wurde der Dolibarr Foundation gemeldet als von einem Unternehmen veröffentlicht, das illegale Praktiken anwendet (Nichteinhaltung der Regeln zur Verwendung der Marke Dolibarr, Erfassung Ihrer Daten ohne Ihre Zustimmung oder Bereitstellung von Malware).
+WarningModuleAffiliatedToAPiratPlatform=Seien Sie vorsichtig, wenn Sie ein Modul (kostenpflichtig oder kostenlos) von einer verdächtigen, nicht offiziellen Plattform wie %s erhalten.
+
 SwissQrOnlyVIR = Eine SwissQR-Rechnung kann nur Rechnungen hinzugefügt werden, die per Überweisung bezahlt werden sollen.
 SwissQrCreditorAddressInvalid = Die Kreditorenadresse ist ungültig (sind PLZ und Stadt festgelegt? (%s)
 SwissQrCreditorInformationInvalid = Die Kreditorendaten sind ungültig für die IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s ist bereits als Kontakt für dies
 ErrorThisGroupIsAlreadyDefinedAsThisType=Die Kontakte dieser Gruppe sind bereits als Kontakt für diesen Typ definiert.
 EmptyMessageNotAllowedError=Nachricht darf nicht leer sein
 ErrorIsNotInError=%s ist nicht fehlerhaft
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/de_DE/exports.lang b/htdocs/langs/de_DE/exports.lang
index 5ccf6cfc2ed..776b6c98458 100644
--- a/htdocs/langs/de_DE/exports.lang
+++ b/htdocs/langs/de_DE/exports.lang
@@ -13,7 +13,7 @@ NotImportedFields=Quelldateifelder nicht importiert
 SaveExportModel=Speichern Sie Ihre Auswahl als Exportprofil / -vorlage (zur Wiederverwendung).
 SaveImportModel=Import-Profil speichern  (für spätere Wiederverwendung)
 ExportModelName=Name des Exportprofils
-ExportModelSaved=Exportprofil gespeichert unter dem Namen <b>%s</b>  
+ExportModelSaved=Exportprofil gespeichert unter dem Namen <b>%s</b>
 ExportableFields=Exportfähige Felder
 ExportedFields=Exportierte Felder
 ImportModelName=Name des Importprofils
@@ -25,15 +25,15 @@ ChooseFieldsOrdersAndTitle=Wählen Sie die Reihenfolge und Bezeichnung der Felde
 FieldsTitle=Feldtitel
 FieldTitle=Feldbezeichnung
 NowClickToGenerateToBuildExportFile=Wählen Sie nun im Kombinationsfeld das Dateiformat aus und klicken Sie auf "Generieren", um die Exportdatei zu erstellen ...
-AvailableFormats=verfügbare Formate 
+AvailableFormats=verfügbare Formate
 LibraryShort=Bibliothek
 ExportCsvSeparator=CSV-Trennzeichen
 ImportCsvSeparator=CSV-Trennzeichen
 Step=Schritt
-FormatedImport=Import-Assistent 
+FormatedImport=Import-Assistent
 FormatedImportDesc1=Dieses Modul ermöglicht den Import personalisierter Daten mithilfe eines Assistenten.\nTechnische Kenntnisse sind hierbei nicht erforderlich.
 FormatedImportDesc2=Zunächst müssen Sie die Art der zu importierenden Daten, dann das Format der Quelldatei und dann die zu importierenden Felder auswählen.
-FormatedExport=Export-Assistent 
+FormatedExport=Export-Assistent
 FormatedExportDesc1=Dieses Modul ermöglicht den Export personalisierter Daten mithilfe eines Assistenten.\nTechnische Kenntnisse sind hierbei nicht erforderlich.
 FormatedExportDesc2=Der erste Schritt besteht darin, einen vordefinierten Datensatz auszuwählen und dann anzugeben, welche Felder in welcher Reihenfolge exportiert werden sollen.
 FormatedExportDesc3=Wenn zu exportierende Daten ausgewählt sind, können Sie das Format der Ausgabedatei auswählen.
@@ -67,7 +67,7 @@ ChooseFormatOfFileToImport=Wählen Sie das Dateiformat aus, das als Importdateif
 ChooseFileToImport=Datei hochladen und dann auf das Symbol %s klicken, um die Datei als Quell-Importdatei auszuwählen ...
 SourceFileFormat=Quelldateiformat
 FieldsInSourceFile=Felder in der Quelldatei
-FieldsInTargetDatabase=Zielfelder in der Systemdatenbank (fett=erforderlich)
+FieldsInTargetDatabase=Zielfelder in Dolibarr-Datenbank
 NoFields=Keine Felder
 MoveField=Bewege Feld Spaltennummer %s
 ExampleOfImportFile=Beispiel_Import_Datei
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Stellen Sie sicher, dass das Dateiformat (Feld- und Zeic
 RunSimulateImportFile=Simulation Datenimport starten
 FieldNeedSource=Dieses Feld benötigt Daten aus der Quelldatei
 SomeMandatoryFieldHaveNoSource=Einige erforderliche Felder haben keine Entsprechung in der Quelldatei
-InformationOnSourceFile=Informationen über die Quelldatei
-InformationOnTargetTables=Informationen über die Zieltabellen
+InformationOnSourceFile=Quelldatei
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Bitte wählen Sie zumindest ein Feld für den Datenbankexport aus der Auswahlliste
 SelectFormat=Wählen Sie das Format der Importdatei
 RunImportFile=Datenimport starten
diff --git a/htdocs/langs/de_DE/hrm.lang b/htdocs/langs/de_DE/hrm.lang
index d9813f7425f..28d77b3aad7 100644
--- a/htdocs/langs/de_DE/hrm.lang
+++ b/htdocs/langs/de_DE/hrm.lang
@@ -46,11 +46,11 @@ NewEval=Neue Kompetenzbeurteilung
 ValidateEvaluation=Kompetenzbewertung freigeben
 ConfirmValidateEvaluation=Sind Sie sicher, dass Sie die Kompetenzbewertung mit der Referenz <b>%s</b> freigeben wollen?
 EvaluationCard=Kompetenzbewertung
-RequiredRank=Erforderliche Qualifikationsstufe für das Stellenprofil
-RequiredRankShort=Erforderliche Stufe
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Positionen mit diesen Stellenprofilen
-EmployeeRank=Qualifikationsstufe des Mitarbeiters für diese Kompetenz
-EmployeeRankShort=Stufe Mitarbeiter
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Mitarbeiterposition
 EmployeePositions=Stellenübersicht
 EmployeesInThisPosition=Mitarbeiter in dieser Position
@@ -98,3 +98,5 @@ NeedBusinessTravels=Geschäftsreisen erforderlich
 NoDescription=Keine Beschreibung
 TheJobProfileHasNoSkillsDefinedFixBefore=Für das ausgewertete Stellenprofil dieses Mitarbeiters ist keine Fähigkeit definiert. Bitte fügen Sie Fähigkeiten hinzu, löschen Sie die Auswertung und starten Sie die diese neu.
 PDFStandardHrmEvaluation=Standardvorlage PDF-Dokument für eine Kompetenzbewertung
+SkillNotRequired=Kompetenz nicht erforderlich
+LinkToUserCreated=Mit einem Mitarbeiter verknüpfen, wenn der Bewerber eingestellt und in einen Benutzer umgewandelt wurde.
diff --git a/htdocs/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang
index 50c3364c027..a83bae6c07a 100644
--- a/htdocs/langs/de_DE/install.lang
+++ b/htdocs/langs/de_DE/install.lang
@@ -59,7 +59,7 @@ CheckToCreateDatabase=Aktivieren Sie das Kontrollkästchen, wenn die Datenbank n
 CheckToCreateUser=Aktivieren Sie das Kontrollkästchen, wenn: <br> das Datenbankbenutzerkonto noch nicht vorhanden ist und daher erstellt werden muss, oder <br>, wenn das Benutzerkonto vorhanden ist, die Datenbank jedoch nicht vorhanden ist und Berechtigungen erteilt werden müssen. <br> In diesem Fall müssen Sie das Benutzerkonto und das Kennwort sowie <b> sowie </b> den Namen und das Kennwort des Superuser-Kontos am Ende dieser Seite eingeben. Wenn dieses Kontrollkästchen deaktiviert ist, müssen Datenbankeigentümer und Kennwort bereits vorhanden sein.
 DatabaseRootLoginDescription=Superuser-Kontoname (zum Erstellen neuer Datenbanken oder neuer Benutzer), obligatorisch, wenn die Datenbank oder ihr Besitzer noch nicht vorhanden ist.
 KeepEmptyIfNoPassword=Leer lassen, wenn der Superuser kein Passwort hat (NICHT empfohlen)
-SaveConfigurationFile=Konfigurationsdaten werden gespeichert 
+SaveConfigurationFile=Konfigurationsdaten werden gespeichert
 ServerConnection=Serververbindung
 DatabaseCreation=Erstellung der Datenbank
 CreateDatabaseObjects=Anlegen der Datenbankobjekte
@@ -71,8 +71,8 @@ OtherKeysCreation=Erstellen der Fremdschlüssel und Indizes
 FunctionsCreation=Erstellen der Funktionen
 AdminAccountCreation=Erstellen des Administrationskontos
 PleaseTypePassword=Bitte geben Sie ein Passwort ein. Leere Passwörter sind nicht erlaubt.
-PleaseTypeALogin=Bitte geben Sie den Benutzernamen ein. 
-PasswordsMismatch=Die eingegebenen Passwörter stimmen nicht überein. \nBitte versuchen Sie es erneut! 
+PleaseTypeALogin=Bitte geben Sie den Benutzernamen ein.
+PasswordsMismatch=Die eingegebenen Passwörter stimmen nicht überein. \nBitte versuchen Sie es erneut!
 SetupEnd=Ende der Erstkonfiguration
 SystemIsInstalled=Die Installation wurde erfolgreich abgeschlossen.
 SystemIsUpgraded=Der Aktualisierungsvorgang wurde erfolgreich abgeschlossen.
@@ -102,14 +102,14 @@ UpgradeDesc=Verwenden Sie diesen Modus zum Ersetzen Ihrer bisherigen Dolibarr-Ve
 Start=Start
 InstallNotAllowed=Die in der Konfigurationsdatei <b>conf.php</b> gesetzten Berechtigungen verhindern eine Ausführung des Installationsvorganges.
 YouMustCreateWithPermission=Für den Installationsvorgang erstellen Sie bitte die Datei %s und machen Sie diese für Ihren Webserver beschreibbar.
-CorrectProblemAndReloadPage=Bitte beheben Sie das Problem und drücken anschließend auf F5 um die Seite neu zu laden. 
+CorrectProblemAndReloadPage=Bitte beheben Sie das Problem und drücken anschließend auf F5 um die Seite neu zu laden.
 AlreadyDone=Migration bereits durchgeführt
 DatabaseVersion=Datenbankversion
 ServerVersion=Version des Datenbankservers
 YouMustCreateItAndAllowServerToWrite=Bitte erstellen Sie dieses Verzeichnis und machen Sie dieses für Ihren Webserver beschreibbar.
 DBSortingCollation=Reihenfolge der Zeichensortierung
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Sie haben die Option Datenbank <b>%s</b> erstellen ausgewählt. Hierfür benötigt Dolibarr eine Verbindung zum Server <b>%s</b> mit den Berechtigungen des Super-Users<b>%s</b>.
-YouAskLoginCreationSoDolibarrNeedToConnect=Sie möchten den Datenbank-Benutzer <b> %s </b> erstellen. Dafür benötigt Dolibarr jedoch eine Serververbindung <b> %s </b> mit super user <b>%s</b> Berechtigungen. 
+YouAskLoginCreationSoDolibarrNeedToConnect=Sie möchten den Datenbank-Benutzer <b> %s </b> erstellen. Dafür benötigt Dolibarr jedoch eine Serververbindung <b> %s </b> mit super user <b>%s</b> Berechtigungen.
 BecauseConnectionFailedParametersMayBeWrong=Die Datenbankverbindung ist fehlgeschlagen: Die Host- oder Superuser-Parameter sind falsch.
 OrphelinsPaymentsDetectedByMethod=Verwaiste Zahlung gefunden durch Methode %s
 RemoveItManuallyAndPressF5ToContinue=Bitte manuell entfernen und F5 drücken um fortzufahren.
@@ -190,7 +190,7 @@ MigrationProjectTaskActors=Datenmigration für Tabelle llx_projet_task_actors
 MigrationProjectUserResp=Datenmigration des Feldes fk_user_resp von llx_projet nach llx_element_contact
 MigrationProjectTaskTime=Aktualisiere aufgewandte Zeit (in Sekunden)
 MigrationActioncommElement=Aktualisiere die Termine/Aufgaben
-MigrationPaymentMode=Migration der Daten für die Zahlungsart 
+MigrationPaymentMode=Migration der Daten für die Zahlungsart
 MigrationCategorieAssociation=Migration von Kategorien
 MigrationEvents=Ereignisse migrieren, um den Ereigniseigentümer in die Zuordnungstabelle aufzunehmen
 MigrationEventsContact=Ereignisse migrieren, um den Ereigniskontakt in die Zuordnungstabelle aufzunehmen
@@ -217,3 +217,4 @@ FunctionTest=Funktionstest
 NodoUpgradeAfterDB=Keine Aktion von externen Modulen nach Upgrade der Datenbank angefordert
 NodoUpgradeAfterFiles=Keine Aktion von externen Modulen nach dem Upgrade von Dateien oder Verzeichnissen angefordert
 MigrationContractLineRank=Vertragszeile migrieren, um Rang zu verwenden (und Neuordnung zu aktivieren)
+MigrationProductLotPath=Den Pfad für Produkt-Batch-Files migrieren
diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang
index 56b46554773..b33cd400206 100644
--- a/htdocs/langs/de_DE/interventions.lang
+++ b/htdocs/langs/de_DE/interventions.lang
@@ -80,8 +80,9 @@ FichinterNoContractLinked=Der Serviceauftrag %s wurde ohne verknüpften Vertrag
 ErrorFicheinterCompanyDoesNotExist=Unternehmen existiert nicht. Serviceauftrag wurde nicht erstellt.
 NextDateToIntervention=Datum für die nächste Erzeugung eines Serviceauftrags
 NoIntervention=Kein Serviceauftrag
-TypeContact_fichinter_internal_INTERREPFOLL=Verantwortlich für die Nachverfolgung des Serviceauftrags
+TypeContact_fichinter_internal_INTERREPFOLL=Mitarbeiter für die Nachbetreuung des Serviceauftrags
 TypeContact_fichinter_internal_INTERVENING=Beteiligter am Serviceauftrag
 TypeContact_fichinter_external_BILLING=Kundenkontakt für die Abrechnung von Serviceaufträgen
-TypeContact_fichinter_external_CUSTOMER=Kundenkontakt für die Nachverfolgung des Serviceauftrags
+TypeContact_fichinter_external_CUSTOMER=Kundenkontakt für die Nachbetreuung des Serviceauftrags
 NotARecurringInterventionalTemplate=Keine Vorlage für wiederkehrende Serviceaufträge
+ShowInterventionModel=Vorlage für Serviceauftrag anzeigen
diff --git a/htdocs/langs/de_DE/languages.lang b/htdocs/langs/de_DE/languages.lang
index 849a0735fe8..d34b6e32d8c 100644
--- a/htdocs/langs/de_DE/languages.lang
+++ b/htdocs/langs/de_DE/languages.lang
@@ -1,10 +1,12 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_am_ET=Äthiopisch
 Language_af_ZA=Afrikaans (Südafrika)
+Language_ar_AE=Arabisch (Arabische Emirate)
 Language_ar_AR=Arabisch
 Language_ar_DZ=Arabisch (Algerien)
 Language_ar_EG=Arabisch (Ägypten)
 Language_ar_JO=Arabisch (Jordanien)
+Language_ar_LB=Arabisch (Libanon)
 Language_ar_MA=Arabisch (Marokko)
 Language_ar_SA=Arabisch (Saudi-Arabien)
 Language_ar_TN=Arabisch (Tunesien)
@@ -70,6 +72,7 @@ Language_fr_FR=Französisch
 Language_fr_GA=Französisch (Gabun)
 Language_fr_NC=Französisch (Neukaledonien)
 Language_fr_SN=Französisch (Senegal)
+Language_fr_TN=Französisch (Tunesien)
 Language_fy_NL=Friesisch
 Language_gl_ES=Galizisch
 Language_he_IL=Hebräisch
@@ -122,6 +125,7 @@ Language_uk_UA=Ukrainisch
 Language_ur_PK=Urdu
 Language_uz_UZ=Usbekisch
 Language_vi_VN=Vietnamesisch
+Language_wo_SN=Wolof
 Language_zh_CN=Chinesisch
 Language_zh_TW=Chinesisch (Taiwan)
 Language_zh_HK=Chinesisch (Hong Kong)
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 011bc21f7d3..59530a956cc 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=E-Mail-Versand
 EMailing=E-Mail-Kampagne
-EMailings=E-Mail-Kampagnen
+EMailings=Mass EMails
 SMSings=SMS-Massensendungen
-AllEMailings=Alle E-Mail-Kampagnen
+AllEMailings=All mass eMails
 MailCard=E-Mail-Kampagne
 MailRecipients=Empfänger
 MailRecipient=Empfänger
@@ -26,19 +26,19 @@ MailFile=Angehängte Dateien
 MailMessage=E-Mail-Text
 SubjectNotIn=Nicht im Betreff
 BodyNotIn=Nicht im Nachrichteninhalt
-ShowEMailing=Zeige E-Mail-Kampagne
-ListOfEMailings=Liste der E-Mail-Kampagnen
-NewMailing=Neue E-Mail-Kampagne
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Neue SMS-Massensendung
-EditMailing=E-Mail-Kampagne bearbeiten
-ResetMailing=E-Mail erneut senden
-ConfirmResetMailingTargetMassaction=Bestätigung der Statuszurücksetzung von Zieladressen
-ResetMailingTargetMassaction=Status von Zieladressen zurücksetzen
-DeleteMailing=E-Mail-Kampagne löschen
-PreviewMailing=E-Mail-Kampagnen-Vorschau
-CreateMailing=E-Mail-Kampagne erstellen
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Fehler-Status zurücksetzen
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=E-Mail-Kampagne freigeben
+ValidMailing=Valid mass Email
 MailingStatusDraft=Entwurf
 MailingStatusValidated=Freigegeben
 MailingStatusSent=gesendet
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Alle Filter müssen übereinstimmen, damit eine E-Mail
 LineInFile=Zeile %s in der Datei
 RecipientSelectionModules=Vordefinierte Empfängerlisten
 MailSelectedRecipients=Ausgewählte Empfänger
-MailingArea=Übersicht E-Mail-Kampagnen
-LastMailings=Neueste E-Mail-Kampagnen (maximal %s)
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Zielstatistiken
 NbOfCompaniesContacts=Unterschiedliche Kontakte/Adressen
 MailNoChangePossible=Die Empfängerliste einer freigegebenen E-Mail-Kampagne kann nicht mehr bearbeitet werden.
-SearchAMailing=Suche E-Mail-Kampagne
-SendMailing=E-Mail-Kampagne versenden
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Gesendet von
 AdvancedAlternative=Erweiterte Alternative
 MailingNeedCommand=Aus Sicherheits- und Zeitüberschreitungsgründen sollten E-Mail-Kampagnen von der Kommandozeile aus versendet werden. Bitten Sie Ihren Server-Administrator um die Ausführung des folgenden Befehls, um den Versand an alle Empfänger zu starten:
 MailingNeedCommand2=Sie können den Versand jedoch auch über die Web-Oberfläche starten, indem Sie den Wert des Parameters MAILING_LIMIT_SENDBYWEB entsprechend Ihrer Anforderung hoch setzen. Die entsprechenden Einstellungen finden Sie unter Start - Einstellungen - Andere Einstellungen.
 ConfirmSendingEmailing=Wenn Sie die E-Mail-Kampange trotzdem über die Web-Oberfläche versenden möchten bestätigen Sie diese Meldung bitte mit [Ja].
-LimitSendingEmailing=Hinweis: Der Versand von E-Mails über die Web-Oberfläche ist auf <b>%s</b> Empfänger je Sitzung beschränkt!
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Liste leeren
 ToClearAllRecipientsClickHere=Klicken Sie hier, um die Empfängerliste zu leeren
 ToAddRecipientsChooseHere=Empfänger hinzufügen
-NbOfEMailingsReceived=Empfangene E-Mail-Kampagnen
-NbOfEMailingsSend=Versendete E-Mail-Kampagnen
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=Eintrag-ID
 DeliveryReceipt=Empfangsbestätigung
 YouCanUseCommaSeparatorForSeveralRecipients=Trennen Sie mehrere Empfänger mit einem <b>Komma</b>
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Für diesen Ereignistyp und dieses Unternehmen sind ke
 ANotificationsWillBeSent=1 automatische Benachrichtigung wird per E-Mail gesendet
 SomeNotificationsWillBeSent=%s automatische Benachrichtigungen werden per E-Mail gesendet
 AddNewNotification=Abonnieren Sie eine neue automatische E-Mail-Benachrichtigung
-ListOfActiveNotifications=Aktive Abonnements (Ziele/Ereignisse) für die automatische E-Mail-Benachrichtigung
+ListOfActiveNotifications=Aktive Abonnements
+ListOfActiveNotificationsHelp=Liste von Paaren %s/%s die für die automatische E-Mail Erinnerung angemeldet sind
 ListOfNotificationsDone=Automatisch versendete E-Mail-Benachrichtigungen
+ListOfNotificationsDoneHelp=Liste der letzten gesendeten E-Mail-Erinnerungen
 MailSendSetupIs=Der E-Mail-Versand wurde auf '%s' konfiguriert. Dieser Modus kann nicht für E-Mail-Kampagnen verwendet werden.
 MailSendSetupIs2=Sie müssen zuerst mit einem Admin-Konto im Menü %sStart - Einstellungen - E-Mails%s den Parameter <strong>'%s'</strong> auf den Modus '%s' ändern. Dann können Sie die Daten des SMTP-Servers von Ihrem Internetdienstanbieter eingeben und die E-Mail-Kampagnen-Funktion nutzen.
 MailSendSetupIs3=Bei Fragen über die Einrichtung Ihres SMTP-Servers, können Sie %s fragen.
@@ -183,7 +185,7 @@ Information=Information
 ContactsWithThirdpartyFilter=Kontakte mit Drittanbieter-Filter
 Unanswered=Unbeantwortet
 Answered=Beantwortet
-IsNotAnAnswer=Ist keine Antwort (Initial-E-Mail)
+IsNotAnAnswer=Ist keine Antwort (ist eine erste E-Mail)
 IsAnAnswer=Ist eine Antwort auf eine Initial-E-Mail
 RecordCreatedByEmailCollector=Datensatz erstellt vom E-Mail-Collector %s
 DefaultBlacklistMailingStatus=Standardwert für Feld '%s' beim Anlegen eines neuen Kontakts
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 79a615bd1af..6bd55b9b54c 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -269,7 +269,7 @@ Numero=Nummer
 Limit=Limit
 Limits=Limits
 Logout=Abmelden
-NoLogoutProcessWithAuthMode=Keine Anwendung Trennungsfunktion mit Authentifizierungsmodus <b>% s </ b>
+NoLogoutProcessWithAuthMode=Keine Anwendung Trennungsfunktion mit Authentifizierungsmodus <b>%s </b>
 Connection=Anmelden
 Setup=Einstellungen
 Alert=Benachrichtigung
@@ -498,7 +498,7 @@ ActionRunningNotStarted=zu beginnen
 ActionRunningShort=In Bearbeitung
 ActionDoneShort=Abgeschlossen
 ActionUncomplete=Offen
-LatestLinkedEvents=Zuletzt verknüpfte Ereignisse (maximal %s)
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Firma oder Institution
 Accountant=Buchhalter
 ContactsForCompany=Ansprechpartner/Adressen dieses Geschäftspartners
@@ -798,7 +798,7 @@ Notes=Anmerkungen
 AddNewLine=Neue Zeile hinzufügen
 AddFile=Datei hinzufügen
 FreeZone=Freitextprodukt
-FreeLineOfType=Freitextelement, Typ:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Objekt mit Haupteigenschaften duplizieren
 ReGeneratePDF=PDF neu erstellen
 PDFMerge=PDFs verbinden
@@ -891,6 +891,7 @@ OriginFileName=original Dateiname
 SetDemandReason=Quelle definieren
 SetBankAccount=Bankkonto angeben
 AccountCurrency=Kontowährung
+AccountancyCode=Buchungskonto
 ViewPrivateNote=Anmerkungen zeigen
 XMoreLines=%s Zeile(n) versteckt
 ShowMoreLines=Mehr/weniger Zeilen anzeigen
@@ -1155,6 +1156,7 @@ ContactDefault_project_task=Aufgabe
 ContactDefault_propal=Angebot
 ContactDefault_supplier_proposal=Lieferantenangebot
 ContactDefault_ticket=Ticket
+ContactDefault_societe=Kunde
 ContactAddedAutomatically=Kontakt aus Rollen von Drittanbieter-Kontakten hinzugefügt
 More=Mehr
 ShowDetails=Zeige Details
@@ -1251,6 +1253,7 @@ CommercialAffected=Zugeordneter Vertriebsmitarbeiter
 CommercialsDisaffected=Zuweisung der Vertriebsmitarbeiter aufgehoben
 CommercialDisaffected=Zuweisung des Vertriebsmitarbeiters aufgehoben
 Message=Inhalt
+Emailing=Emailing
 Progression=Entwicklung
 YourMessage=Ihre Nachricht
 YourMessageHasBeenReceived=Ihre Nachricht wurde erfasst. Wir werden Ihnen so schnell wie möglich antworten.
@@ -1339,3 +1342,10 @@ addToFilter=Hinzufügen
 FilterAssistance=Filter-Editor
 Operator=Operator
 AllFieldsRequired=Alle Felder sind Pflichtfelder.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Beginn ab
+Transferred=Transferred
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index c76a398ec75..43b7fcf744a 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -81,8 +81,8 @@ NewSubscriptionDesc=Hier können Sie Ihre Mitgliedschaft beantragen und den Beit
 Subscription=Mitgliedsbeitrag
 AnyAmountWithAdvisedAmount=Beliebiger Betrag Ihrer Wahl, empfohlen %s
 AnyAmountWithoutAdvisedAmount=Beliebiger Betrag Ihrer Wahl
-CanEditAmountShort=Jeder Betrag
-CanEditAmountShortForValues=empfohlen, jeder Betrag
+CanEditAmountShort=Beliebiger Betrag
+CanEditAmountShortForValues=empfohlen, beliebiger Betrag
 MembershipDuration=Dauer
 GetMembershipButtonLabel=Beitreten
 Subscriptions=Mitgliedsbeiträge
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Wenn eine Registrierung erforderlich ist, muss eine Mit
 DeleteType=Löschen
 VoteAllowed=Stimmrecht
 Physical=Einzelperson
-Moral=Unternehmen
-MorAndPhy=Unternehmen und Einzelperson
+Moral=Rechtsform
+MorAndPhy=Juristische Person und Einzelperson
 Reenable=Wieder aktivieren
 ExcludeMember=Ein Mitglied ausschließen
 Exclude=Ausschließen
@@ -114,7 +114,7 @@ ConfirmDeleteSubscription=Möchten Sie diese Beitragszahlung wirklich löschen?
 Filehtpasswd=htpasswd Datei
 ValidateMember=Mitglied freigeben
 ConfirmValidateMember=Möchten Sie dieses Mitglied wirklich aktivieren?
-FollowingLinksArePublic=Die folgenden Links sind öffentlich zugängliche Seiten und als solche nicht durch die Dolibarr-Zugriffskontrolle geschützt. Es handelt sich dabei zudem um unformatierte Seiten, die beispielsweise eine Liste aller in der Datenbank eingetragenen Mitglieder anzeigen. 
+FollowingLinksArePublic=Die folgenden Links sind öffentlich zugängliche Seiten und als solche nicht durch die Dolibarr-Zugriffskontrolle geschützt. Es handelt sich dabei zudem um unformatierte Seiten, die beispielsweise eine Liste aller in der Datenbank eingetragenen Mitglieder anzeigen.
 PublicMemberList=Liste öffentlicher Mitglieder
 BlankSubscriptionForm=Öffentliches Erfassungsformular
 BlankSubscriptionFormDesc=Dolibarr kann ihnen eine öffentliche URL/Website zur Verfügung stellen, die es externen Besuchern erlaubt, einen Beitrag zu entrichten. Wenn ein Online-Zahlungsmodul aktiviert ist, kann auch automatisch ein Zahlungsformular bereitgestellt werden.
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Mitgliederstatistik nach Regionen
 NbOfMembers=Gesamtzahl der Mitglieder
 NbOfActiveMembers=Gesamtzahl der aktuell aktiven Mitglieder
 NoValidatedMemberYet=Keine freizugebenden Mitglieder gefunden
-MembersByCountryDesc=Dieser Bildschirm zeigt Ihnen die Statistiken der Mitglieder nach Ländern. Grafiken und Diagramme hängen von der Verfügbarkeit des Google Online-Grafikdienstes sowie von der Verfügbarkeit einer funktionierenden Internetverbindung ab.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Dieser Bildschirm zeigt Ihnen Statistiken der Mitglieder nach Bundesland / Provinzen / Kanton.
 MembersByTownDesc=Dieser Bildschirm zeigt Ihnen Statistiken der Mitglieder nach Stadt.
 MembersByNature=Dieser Bildschirm zeigt Ihnen Statistiken der Mitglieder nach Art an.
@@ -208,10 +209,10 @@ NewMemberbyWeb=Neues Mitglied hinzugefügt, wartet auf Genehmigung.
 NewMemberForm=Formular neues Mitglied
 SubscriptionsStatistics=Statistiken zu Mitgliedsbeiträgen
 NbOfSubscriptions=Anzahl der Beitragszahlungen
-AmountOfSubscriptions=Summer der erhaltenen Beitragszahlungen
+AmountOfSubscriptions=Summe der erhaltenen Mitgliedsbeiträge
 TurnoverOrBudget=Umsatz (Firma) oder Budget (Verein/Stiftung)
-DefaultAmount=Standardbetrag des Mitgliedsbeitrags (wird nur verwendet, wenn auf Ebene der Mitgliedschaftstypen kein Betrag definiert ist)
-MinimumAmount=Mindestbetrag (wird nur verwendet, wenn der Beitragsbetrag kostenlos ist)
+DefaultAmount=Standardbetrag für Mitgliedsbeiträge (wird nur verwendet, wenn beim Mitgliedschaftstyp kein Betrag definiert ist)
+MinimumAmount=Mindestbetrag für die Mitgliedschaft (hat Vorrang vor allen Standardbeträgen)
 CanEditAmount=Die Höhe des Mitgliedsbeitrags kann vom Mitglied festgelegt werden
 CanEditAmountDetail=Der Besucher kann die Höhe seines Beitrags unabhängig vom Mitgliedstyp auswählen/bearbeiten
 AmountIsLowerToMinimumNotice=Der Betrag liegt unter dem Mindestbetrag %s
@@ -220,13 +221,13 @@ ByProperties=Mitgliedsart
 MembersStatisticsByProperties=Mitgliederstatistik nach Mitgliedsart
 VATToUseForSubscriptions=USt.-Satz für Mitgliedsbeiträge
 NoVatOnSubscription=Keine USt. für Mitgliedsbeiträge
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt/Leistung für die Rechnungsposition: %s
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt/Leistung für den Mitgliedsbeitrag in der Rechnung: %s
 NameOrCompany=Name oder Firma
 SubscriptionRecorded=Beitragszahlung erfasst
 NoEmailSentToMember=Keine E-Mail an Mitglied gesendet
 EmailSentToMember=E-Mail an Mitglied %s versendet
-SendReminderForExpiredSubscriptionTitle=Erinnerung per E-Mail für fällige Mitgliedsbeiträge senden
-SendReminderForExpiredSubscription=Erinnerungen per E-Mail an Mitglieder senden, wenn deren Beitragszeitraum am ablaufen ist. (Parameter ist die Anzahl der Tage vor dem Ende der Mitgliedschaft, um die Erinnerung zu senden. Dies kann eine Liste von Tagen sein, die durch ein Semikolon getrennt sind, z. B. '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Erinnerung per E-Mail für abgelaufene Mitgliedschaft senden
+SendReminderForExpiredSubscription=Erinnerungs-E-Mail an Mitglieder senden, wenn die Mitgliedschaft bald abläuft (Parameter ist Anzahl an Tagen vor Ablauf der Mitgliedschaft, an denen die Erinnerung gesendet werden soll. Es kann eine Liste mit Anzahlen an Tagen sein, die durch ein Semikolon getrennt sind, z.B. '10;5;0;-5')
 MembershipPaid=Die Mitgliedschaft wurde für den aktuellen Zeitraum bezahlt (bis %s)
 YouMayFindYourInvoiceInThisEmail=Sie finden Ihre Rechnung anhängend an dieser E-Mail.
 XMembersClosed=%s Mitglied(er) geschlossen
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Der Geschäftspartner ist der Rechnungsempfänger,
 MemberFirstname=Vorname des Mitglieds
 MemberLastname=Nachname des Mitglieds
 MemberCodeDesc=Mitgliedsnummer, individuell für alle Mitglieder
-MemberSubscriptionStartFirstDayOf=Das Anfangsdatum einer Mitgliedschaft entspricht dem ersten Tag der/des
-MemberSubscriptionStartAfter=Mindestzeitraum vor dem Inkrafttreten des Anfangsd eines Abonnement mit Ausnahme von Verlängerungen (Beispiel  +3m = +3 Monate, -5d = -5 Tage, +1Y = +1 Jahr) 
+MemberSubscriptionStartFirstDayOf=Erzwingen, dass das vorgeschlagene Datum einer Mitgliedschaft dem ersten Tag entspricht vom
+MemberSubscriptionStartAfter=Mindestlaufzeit vor dem Inkrafttreten des Anfangsdatums einer ersten Mitgliedschaftslaufzeit (ohne Verlängerungen)
+NoCorrection=Keine Korrektur
+MemberSubscriptionStartAfterDesc=Beispiel: +3m = +3 Monate, -5d = -5 Tage, +1Y = +1 Jahr
+MemberSubscriptionStartAfterDesc2=Dies ist das vorgeschlagene Datum beim Erstellen einer ersten Mitgliedschaftslaufzeit im Vergleich zum aktuellen Datum. Bei einer Verlängerung bleibt das standardmäßig vorgeschlagene Datum das Ende der vorherigen Mitgliedschaft.
 SubscriptionLinkedToConciliatedTransaction=Die Mitgliedschaft ist mit einer bereits abgeglichenen Transaktion verknüpft, daher ist diese Änderung nicht zulässig.
 ConfirmMassSubsriptionCreation=Erstellung der Mitgliedschaft bestätigen
 ConfirmMassSubsriptionCreationQuestion=Sind Sie sicher, dass Sie die ausgewählte(n) Mitgliedschaft(en) erstellen wollen?
diff --git a/htdocs/langs/de_DE/modulebuilder.lang b/htdocs/langs/de_DE/modulebuilder.lang
index 093ef3e865a..0b99273b4a8 100644
--- a/htdocs/langs/de_DE/modulebuilder.lang
+++ b/htdocs/langs/de_DE/modulebuilder.lang
@@ -14,7 +14,7 @@ ModuleName=Modulname
 ModuleKey=Modul Schlüssel
 ObjectKey=Objekt Schlüssel
 DicKey=Wörterbuchschlüssel (dictionary key)
-ModuleInitialized=Modul initialisiert
+ModuleInitialized=Modul-Dateien initialisiert im Verzeichnis <b>%s</b>
 FilesForObjectInitialized=Datei für neues Objekt '%s' initialisiert
 FilesForObjectUpdated=Dateien für Objekt '%s' aktualisiert (.sql Dateien and .class.php Datei)
 ModuleBuilderDescdescription=Enter here all general information that describe your module.
@@ -85,7 +85,7 @@ UseAsciiDocFormat=Sie können das Markdown-Format verwenden, empfohlen wird jedo
 IsAMeasure=Ist ein Maß (addierbar)
 DirScanned=Verzeichnis gescannt
 NoTrigger=Kein Trigger
-NoWidget=Kein Widget 
+NoWidget=Kein Widget
 ApiExplorer=API-Explorer
 ListOfMenusEntries=Liste der Menüeinträge
 ListOfDictionariesEntries=Liste der Stammdaten
@@ -94,7 +94,7 @@ SeeExamples=Siehe Beispiele
 EnabledDesc=Bedingung dafür, dass dieses Feld aktiv ist.<br><br>Beispiele:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')= =2
 VisibleDesc=Ist das Feld sichtbar? (Beispiele: 0=Nie sichtbar, 1=Sichtbar auf Liste und in Formularen zum Erstellen/Aktualisieren/Ansehen, 2=Sichtbar nur auf Liste, 3=Sichtbar beim Erstellen/Aktualisieren/Ansehen  (nicht in Listen), 4=Sichtbar bei Liste und beim Aktualisieren/Ansehen (nicht beim Erstellen), 5=Sichtbar in Liste und in der Formularansicht (nicht beim Erstellen, nicht beim Aktualisieren).<br><br>Die Verwendung eines negativen Werts bedeutet, das Feld wird standardmäßig nicht auf Liste angezeigt, kann aber zur Anzeige ausgewählt werden.
 ItCanBeAnExpression=Dies kann ein Ausdruck sein. Beispiel: <br> preg_match('/public/', $_SERVER['PHP_SELF'])?0:1 <br>$user->hasRight('holiday', 'define_holiday')?1:5
-DisplayOnPdfDesc=Zeigt dieses Feld in kompatiblen PDF-Dokumenten an, Sie können die Position mit dem Feld "Position" beeinflussen. <br>  <strong> Für gesamtes Dokument:</strong>  <br>0 = nicht anzeigen <br> 1 = anzeigen<br> 2 = anzeigen, wenn nicht leer<br>  <br>  <strong> Für Einzelpositionen:</strong>  <br> 0 = nicht anzeigen<br> 1 = in einer Spalte anzeigen<br> 3 = in der Beschreibungszeile nach der Beschreibung anzeigen  <br> 4 = nur falls nicht leer: in Beschreibungszeile nach der Beschreibung anzeigen 
+DisplayOnPdfDesc=Zeigt dieses Feld in kompatiblen PDF-Dokumenten an, Sie können die Position mit dem Feld "Position" beeinflussen. <br>  <strong> Für gesamtes Dokument:</strong>  <br>0 = nicht anzeigen <br> 1 = anzeigen<br> 2 = anzeigen, wenn nicht leer<br>  <br>  <strong> Für Einzelpositionen:</strong>  <br> 0 = nicht anzeigen<br> 1 = in einer Spalte anzeigen<br> 3 = in der Beschreibungszeile nach der Beschreibung anzeigen  <br> 4 = nur falls nicht leer: in Beschreibungszeile nach der Beschreibung anzeigen
 DisplayOnPdf=Anzeige im PDF
 IsAMeasureDesc=Kann der Wert des Feldes kumuliert werden, um eine Summe in die Liste aufzunehmen? (Beispiele: 1 oder 0)
 SearchAllDesc=Wird das Feld verwendet, um eine Suche über das Schnellsuchwerkzeug durchzuführen? (Beispiele: 1 oder 0)
@@ -148,7 +148,7 @@ CSSListClass=CSS für Listen
 NotEditable=Nicht bearbeitbar
 ForeignKey=Fremdschlüssel
 ForeignKeyDesc=Wenn der Wert dieses Felds garantiert in einer anderen Tabelle vorhanden sein muss, geben Sie hier eine Syntax zum Abgleich der Werte ein: tablename.parentfieldtocheck
-TypeOfFieldsHelp=Beispiel:<br>varchar(99)<br>email<br>Telefon<br>ip<br>url<br> Passwort<br>double(24,8)<br>real<br>Text<br>html<br>Datum<br>Datum/Uhrzeit<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter ]]<br><br>'1' bedeutet, dass wir nach der Kombination eine +-Schaltfläche hinzufügen, um den Datensatz zu erstellen<br>'filter' ist eine universelle Bedingungs-Syntax, Beispiel: '((Status:=: 1) und (fk_user:=:__USER_ID__) und (entity:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelp=Beispiel:<br>varchar(99)<br>email<br>Telefon<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>stars(NumberOfStars) NumberOfStars muss zwischen 1 und 10 liegen.<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' bedeutet, dass nach der Kombobox eine +-Schaltfläche hinzufügt wird, um den Datensatz zu erstellen <br>'filter' ist eine Filterbedingung in Universal Filter Syntax, Beispiel:  '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=Dies ist der Typ des Felds/Attributs.
 AsciiToHtmlConverter=Ascii zu HTML Konverter
 AsciiToPdfConverter=Ascii zu PDF Konverter
@@ -182,8 +182,11 @@ DictionariesCreated=Wörterbuch <b>%s</b> erfolgreich erstellt
 DictionaryDeleted=Wörterbuch <b>%s</b> erfolgreich entfernt
 PropertyModuleUpdated=Die Eigenschaft <b>%s</b> wurde erfolgreich aktualisiert
 InfoForApiFile=* Wenn Sie die Datei zum ersten mal generieren, werden <strong>für jedes Objekt</strong> alle Methoden erstellt.<br>* Wenn Sie auf <strong>remove</strong> klicken, entfernen Sie alle Methoden für das <strong>ausgewählte Objekt</strong>.
+AboutFile=Seite „Über dieses Modul“
 SetupFile=Seite für die Modulkonfiguration
 EmailingSelectors=E-Mail-Selektoren
 EmailingSelectorDesc=Sie können hier die Klassendateien generieren und bearbeiten, um neue E-Mail-Ziel-Selektoren für das Modul 'E-Mail-Kampagnen' bereitzustellen.
 EmailingSelectorFile=E-Mails Selector-Datei
 NoEmailingSelector=Keine E-Mails-Selektor-Datei
+ModuleTranslatedIntoLangForKeyInto=Übersetzt in einer .lang-Datei für Schlüssel %s als "%s"
+PageLinkedByAMenuEntry=Seite ist mit mindestens einen Menü-Eintrag verknüpft
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index 9d125ee23c0..466edb2c42a 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -6,7 +6,7 @@ OrderCard=Auftrag – Übersicht
 OrderId=Bestell-ID
 Order=Kundenauftrag
 PdfOrderTitle=Auftragsbestätigung
-Orders=Bestellungen
+Orders=Kundenaufträge
 OrderLine=Auftragsposition
 OrderDate=Auftragsdatum
 OrderDateShort=Auftragsdatum
@@ -24,10 +24,10 @@ SuppliersOrdersRunning=Aktuelle Lieferantenbestellungen
 CustomerOrder=Kundenauftrag
 CustomersOrders=Kundenaufträge
 CustomersOrdersRunning=Aktuelle Kundenaufträge
-CustomersOrdersAndOrdersLines=Kundenaufträge und Auftragspositionen 
+CustomersOrdersAndOrdersLines=Kundenaufträge und Auftragspositionen
 OrdersDeliveredToBill=Gelieferte Kundenaufträge zu verrechnen
 OrdersToBill=Gelieferte Kundenaufträge
-OrdersInProcess=Kundenaufträge in Bearbeitung 
+OrdersInProcess=Kundenaufträge in Bearbeitung
 OrdersToProcess=Zu bearbeitende Kundenaufträge
 SuppliersOrdersToProcess=Lieferantenbestellung in Bearbeitung
 SuppliersOrdersAwaitingReception=Auftragsbestätigungen, die auf Empfang warten
@@ -51,7 +51,7 @@ StatusOrderCanceled=Storniert
 StatusOrderDraft=Entwurf (freizugeben)
 StatusOrderValidated=Freigegeben
 StatusOrderOnProcess=Bestellt - wartet auf Eingang
-StatusOrderOnProcessWithValidation=Bestellt - wartet auf Eingang/Bestätigung 
+StatusOrderOnProcessWithValidation=Bestellt - wartet auf Eingang/Bestätigung
 StatusOrderProcessed=Bearbeitet
 StatusOrderToBill=Zu fakturieren (geliefert)
 StatusOrderApproved=Bestellung genehmigt
@@ -137,13 +137,13 @@ SupplierOrderValidatedAndApproved=Die Lieferantenbestellung ist freigegeben und
 SupplierOrderValidated=Lieferantenbestellung ist freigegeben: %s
 OrderShowDetail=Auftragsdetail anzeigen
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Kundenauftrag-Nachbetreuung durch Vertreter
-TypeContact_commande_internal_SHIPPING=Versand-Nachbetreuung durch Vertreter
+TypeContact_commande_internal_SALESREPFOLL=Mitarbeiter für die Nachbetreuung des Kundenauftrags
+TypeContact_commande_internal_SHIPPING=Mitarbeiter für die Nachbetreuung des Versands
 TypeContact_commande_external_BILLING=Rechnungskontakt des Kunden
-TypeContact_commande_external_SHIPPING=Versandkontakt des Kunden
-TypeContact_commande_external_CUSTOMER=Bestellung-Nachbetreuung durch Kundenkontakt
-TypeContact_order_supplier_internal_SALESREPFOLL=Lieferantenbestellung-Nachbetreuung durch Vertreter
-TypeContact_order_supplier_internal_SHIPPING=Versand-Nachbetreuung durch Vertreter
+TypeContact_commande_external_SHIPPING=Lieferadresse Kunde
+TypeContact_commande_external_CUSTOMER=Kundenkontakt für die Nachbetreuung des Kundenauftrags
+TypeContact_order_supplier_internal_SALESREPFOLL=Mitarbeiter für die Nachbetreuung der Lieferantenbestellung
+TypeContact_order_supplier_internal_SHIPPING=Mitarbeiter für die Nachbetreuung des Versands
 TypeContact_order_supplier_external_BILLING=Kontakt für Lieferantenrechnungen
 TypeContact_order_supplier_external_SHIPPING=Kontakt für Lieferantenversand
 TypeContact_order_supplier_external_CUSTOMER=Lieferantenkontakt für Bestellverfolgung
@@ -197,7 +197,7 @@ StatusSupplierOrderCanceled=Storniert
 StatusSupplierOrderDraft=Entwurf (muss noch überprüft werden)
 StatusSupplierOrderValidated=Freigegeben
 StatusSupplierOrderOnProcess=Bestellt - wartet auf Eingang
-StatusSupplierOrderOnProcessWithValidation=Bestellt - wartet auf Eingang/Bestätigung 
+StatusSupplierOrderOnProcessWithValidation=Bestellt - wartet auf Eingang/Bestätigung
 StatusSupplierOrderProcessed=Bearbeitet
 StatusSupplierOrderToBill=Geliefert
 StatusSupplierOrderApproved=Genehmigt
@@ -206,3 +206,7 @@ StatusSupplierOrderReceivedPartially=Teilweise erhalten
 StatusSupplierOrderReceivedAll=Alle Produkte erhalten
 NeedAtLeastOneInvoice = Es muss mindestens eine Rechnung vorhanden sein
 LineAlreadyDispatched = Die Bestellposition ist bereits eingegangen.
+ExistingDipatchLines = Es gibt bereits Bestellpositionen, für die Lagerbestandsbewegungen erstellt wurden
+ConfirmDeleteDispatchedLines = Auch alle vorgenommenen Lagerbestandsbewegungen umkehren?
+SupplierOrderDeletion = Löschung der Lieferantenbestellung %s
+OrderStatusMakeOperationForbidden = Auftragsstatus für diesen Vorgang verboten.
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 6fd12e398ed..70edb2d7708 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -70,7 +70,7 @@ UpdateDefaultPrice=Standardpreis aktualisieren
 UpdateLevelPrices=Preise für Preissegmente ändern
 AppliedPricesFrom=Erstellungszeitpunkt
 SellingPrice=Verkaufspreis
-SellingPriceHT=Verkaufspreis (ohne Steuern) 
+SellingPriceHT=Verkaufspreis (ohne Steuern)
 SellingPriceTTC=Verkaufspreis (inkl. USt.)
 SellingMinPriceTTC=Mindestverkaufspreis (inkl. USt.)
 CostPriceDescription=Dieses Preisfeld (ohne Steuern) kann verwendet werden, um den durchschnittlichen Betrag zu erfassen, den dieses Produkt für Ihr Unternehmen kostet. Dies kann ein beliebiger Preis sein, den Sie selbst berechnen, beispielsweise aus dem durchschnittlichen Kaufpreis zuzüglich der durchschnittlichen Produktions- und Vertriebskosten.
@@ -97,7 +97,6 @@ ShowService=Leistung anzeigen
 ProductsAndServicesArea=Produkt- und Leistungsübersicht
 ProductsArea=Produkt-Übersicht
 ServicesArea=Leistungsübersicht
-ListOfStockMovements=Liste der Lagerbewegungen
 BuyingPrice=Einkaufspreis
 PriceForEachProduct=Produkte mit spezifischen Preisen
 SupplierCard=Lieferant – Übersicht
@@ -145,6 +144,7 @@ WithoutDiscount=Ohne Rabatt
 VATRateForSupplierProduct=Steuersatz (für diesen Lieferanten/dieses Produkt)
 DiscountQtyMin=Rabatt für diese Menge
 NoPriceDefinedForThisSupplier=Für diesen Lieferanten / Produkt wurde kein Preis / Menge definiert
+NoProductPriceDefinedForThisSupplier=Kein Produktpreis/-menge für diesen Lieferanten definiert
 NoSupplierPriceDefinedForThisProduct=Für dieses Produkt ist kein Lieferantenpreis / Menge definiert
 PredefinedItem=Vordefinierte Position
 PredefinedProducts=Vordefiniertes Produkt
@@ -171,7 +171,7 @@ BuyingPrices=Einkaufspreis
 CustomerPrices=Kundenpreise
 SuppliersPrices=Lieferanten Preise
 SuppliersPricesOfProductsOrServices=Lieferantenpreise (von Produkten oder Leistungen)
-CustomCode=Zolltarifnummer
+CustomCode=Zolltarifnummer | Waren- | HS- | TARIC-Code
 CountryOrigin=Herkunftsland
 RegionStateOrigin=Herkunftsregion
 StateOrigin=Ursprungsregion/-provinz
@@ -209,6 +209,7 @@ unitL=Liter
 unitT=Tonne
 unitKG=kg
 unitG=Gramm
+unitGAL=Gallone
 unitMG=mg
 unitLB=Pfund
 unitOZ=Unze
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Das Format für die Anfrage ist {"URL": "http:/
 UpdateInterval=Update-Intervall (Minuten)
 LastUpdated=Zuletzt aktualisiert
 CorrectlyUpdated=erfolgreich aktualisiert
-PropalMergePdfProductActualFile=verwendete Dateien, um in PDF Azur hinzuzufügen sind / ist
+PropalMergePdfProductActualFile=PDF Datei, die in das Angebots-PDF aufgenommen werden soll, wenn das Produkt Teil des Angebots ist...
 PropalMergePdfProductChooseFile=Wähle PDF-Dateien
 IncludingProductWithTag=Produkte/Leistungen mit dem Schlagwort hinzufügen
 DefaultPriceRealPriceMayDependOnCustomer=Standardpreis, echter Preis kann vom Kunden abhängig sein
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=Die Menge der Zeile wurde entsprechend der Lieferan
 
 #Attributes
 Attributes=Attribute
+ProductAttributeExtrafields=Variantenattribute Extrafelder
+ProductAttributeExtrafieldsSetup=Konfiguration von Extrafeldern für Variantenattribute
+ProductAttributeValueExtrafields=Variantenattribut-Werte Extrafelder
+ProductAttributeValueExtrafieldsSetup=Konfiguration der Extrafelder für Werten für Variantenattributen
 VariantAttributes=Variantenattribute
 ProductAttributes=Variantenattribute für Produkte
 ProductAttributeName=Attribut der Variante %s
@@ -391,10 +396,12 @@ NoEditVariants=Gehen Sie zur übergeordneten Produktkarte und bearbeiten Sie die
 ConfirmCloneProductCombinations=Sollen alle Produktvarianten zum anderen Produkt mit der gegebenen Referenz kopiert werden?
 CloneDestinationReference=Ref. des Zielprodukts
 ErrorCopyProductCombinations=Es gab einen Fehler, während Produkt Varianten kopiert wurden
-ErrorDestinationProductNotFound=Zielprodukt nicht gefunden 
+ErrorDestinationProductNotFound=Zielprodukt nicht gefunden
 ErrorProductCombinationNotFound=Produktvariante nicht gefunden
 ActionAvailableOnVariantProductOnly=Aktion nur für die Produktvariante verfügbar
 ProductsPricePerCustomer=Produktpreise pro Kunde
+ProductLevelExtraFields=Zusätzliche Attribute (Preisstufe)
+ProductCustomerExtraFields=Zusätzliche Attribute (Kundenpreis)
 ProductSupplierExtraFields=Ergänzende Attribute (Lieferantenpreise)
 DeleteLinkedProduct=Löschen Sie das mit der Kombination verknüpfte untergeordnete Produkt
 AmountUsedToUpdateWAP=Preis pro Einheit zur Aktualisierung des gewichteten Durchschnittspreises
@@ -403,7 +410,8 @@ PMPValueShort=DSWP
 mandatoryperiod=Pflichtzeiträume
 mandatoryPeriodNeedTobeSet=Hinweis: Zeitraum (Start- und Enddatum) muss definiert sein
 mandatoryPeriodNeedTobeSetMsgValidate=Eine Leistung  erfordert einen Start- und Endzeitraum
-mandatoryHelper=Aktivieren, wenn Sie beim Erstellen/Freigeben einer Rechnung, eines Angebotes oder eines Kundenauftrags eine Meldung anzeigen möchten, wenn Positionen mit dieser Leistung kein Start- und Enddatum enthalten.<br>Beachten Sie, dass es sich bei der Meldung um eine Warnung und nicht um einen blockierenden Fehler handelt.
+mandatoryHelper=Aktivieren, wenn Sie beim Erstellen/Freigeben einer Rechnung, eines Angebotes oder eines Kundenauftrags eine Meldung anzeigen möchten, sofern Positionen mit dieser Leistung kein Start- und Enddatum enthalten.
+mandatoryHelper2=Beachten Sie, dass es sich bei der Nachricht um eine Warnung und und nicht um einen blockierenden Fehler handelt.
 DefaultBOM=Standardstückliste (BOM)
 DefaultBOMDesc=Die zur Herstellung dieses Produkts empfohlene Standardstückliste (BOM). Dieses Feld kann nur gesetzt werden, wenn die Art des Produkts '%s' ist.
 Rank=Rang
@@ -428,10 +436,13 @@ ConfirmEditExtrafield = Wählen Sie das zu ändernde Extrafeld aus
 ConfirmEditExtrafieldQuestion = Möchten Sie dieses Extrafeld wirklich ändern?
 ModifyValueExtrafields = Wert eines Extrafeldes ändern
 OrProductsWithCategories=Oder Produkte mit Tags/Kategorien
-WarningTransferBatchStockMouvToGlobal = Wenn Sie dieses Produkt ohne Seriennummern verwalten möchten, wird der nach Seriennummern erfasste Lagerbestand einen globalen Lagerbestand umgewandelt 
+WarningTransferBatchStockMouvToGlobal = Wenn Sie dieses Produkt ohne Seriennummern verwalten möchten, wird der nach Seriennummern erfasste Lagerbestand einen globalen Lagerbestand umgewandelt
 WarningConvertFromBatchToSerial=Wenn Sie derzeit eine Menge größer oder gleich 2 für das Produkt haben, bedeutet der Wechsel zu dieser Auswahl, dass Sie immer noch über ein Produkt verfügen mit verschiedenen Objekten derselben Charge (während Sie ein eindeutige Seriennummer wünschen). Die Dopplung bleibt bestehen, bis eine Bestandsaufnahme oder eine manuelle Lagerbestandsbewegung zur Behebung dieses Problems erfolgt ist.
 AllowStockMovementVariantParent=Auch Lagerbewegungen der Elternprodukte von Variantenprodukten aufzeichnen.
 AllowStockMovementVariantParentHelp=Standardmäßig ist ein Elternprodukt eines Variantenprodukts ein virtuelles Produkt, daher wird kein Lagerbestand dafür verwaltet. Durch Aktivieren dieser Option wird ein Lagerbestand für Elternprodukte verwaltet und jedes Mal, wenn eine Lagermenge für ein Variantenprodukt geändert wird, wird dieselbe Menge für das Elternprodukt geändert. Sie sollten diese Option nicht benötigen, es sei denn, Sie verwenden Varianten, um dasselbe Produkt wie das Elternprodukt zu verwalten (aber mit unterschiedlichen Beschreibungen, Preisen...)
 ConfirmSetToDraftInventory=Sind Sie sicher, dass Sie zurück zum Status Entwurf wechseln wollen?<br>Die aktuell im Bestand berücksichtigten Mengen werden zurückgesetzt.
 WarningLineProductNotToSell=Produkt oder Leistung "%s" ist nicht verkäuflich und wurde geklont
 PriceLabel=Preisauszeichnung
+GenerateImage=Bild erzeugen
+GenerateWithAI=Mit KI erzeugen
+PriceByCustomeAndMultiPricesAbility=Unterschiedliche Preise für jeden Kunden + Mehrere Preis-Segmente pro Produkt/Leistung (jeder Kunde befindet sich in einem Preis-Segment)
diff --git a/htdocs/langs/de_DE/salaries.lang b/htdocs/langs/de_DE/salaries.lang
index 5c31f0adfa1..99adfef13c0 100644
--- a/htdocs/langs/de_DE/salaries.lang
+++ b/htdocs/langs/de_DE/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Neue Gehaltszahlung
 AddSalary=Gehalt hinzufügen
 NewSalaryPayment=Neue Gehaltskarte
 AddSalaryPayment=Gehaltszahlung hinzufügen
+SalaryID=Gehalts-ID
+SalaryAmount=Betrag Gehalt
 SalaryPayment=Gehaltszahlung
 SalariesPayments=Gehaltszahlungen
 SalariesPaymentsOf=Gehaltszahlungen von %s
@@ -22,12 +24,12 @@ LastSalaries=Letzte %s Gehälter
 AllSalaries=Alle Gehälter
 SalariesStatistics=Statistik Gehälter
 SalariesAndPayments=Gehälter und Gehaltszahlungen
-ConfirmDeleteSalaryPayment=Möchten Sie diese Gehaltszahlung löschen? 
+ConfirmDeleteSalaryPayment=Möchten Sie diese Gehaltszahlung löschen?
 FillFieldFirst=Zuerst das Mitarbeiterfeld ausfüllen
 UpdateAmountWithLastSalary=Als Betrag letztes Gehalt vorbelegen
 MakeTransferRequest=Überweisungsanforderung erstellen
 VirementOrder=Überweisungsauftrag
-BankTransferAmount=Höhe des zu überweisenden Betrags
 WithdrawalReceipt=Überweisungsauftrag
 OrderWaiting=Ausstehender Auftrag
 FillEndOfMonth=Füllen Sie das Monatsende aus
+UserPaySlip=Gehaltsabrechnung
diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang
index b6467fa9b98..50118500d27 100644
--- a/htdocs/langs/de_DE/sendings.lang
+++ b/htdocs/langs/de_DE/sendings.lang
@@ -8,13 +8,12 @@ Shipments=Lieferungen
 ShowSending=Zeige Lieferungen
 Receivings=Zustellbestätigungen
 SendingsArea=Versandübersicht
-ListOfSendings=Versandliste
 SendingMethod=Versandart
 LastSendings=%s neueste Lieferungen
 StatisticsOfSendings=Versandstatistik
 NbOfSendings=Anzahl  Lieferungen
 NumberOfShipmentsByMonth=Anzahl Lieferungen pro Monat
-SendingCard=Lieferung – Übersicht
+SendingCard=Lieferung
 NewSending=Neue Lieferung
 CreateShipment=Lieferung erstellen
 QtyShipped=Liefermenge
@@ -44,6 +43,7 @@ ConfirmCancelSending=Möchten Sie diese Lieferung wirklich stornieren?
 DocumentModelMerou=Merou A5-Modell
 WarningNoQtyLeftToSend=Achtung, keine weiteren Produkte für den Versand.
 StatsOnShipmentsOnlyValidated=Versandstatistik (nur freigegebene). Das Datum ist das der Freigabe (geplantes Lieferdatum ist nicht immer bekannt).
+DateShipping=Lieferdatum
 DateDeliveryPlanned=Geplanter Liefertermin
 RefDeliveryReceipt=Lieferschein-Nr.
 StatusReceipt=Der Status des Lieferschein
@@ -63,7 +63,7 @@ NoProductToShipFoundIntoStock=Im Lager <b>%s</b> sind keine Artikel für den Ver
 WeightVolShort=Gew./Vol.
 ValidateOrderFirstBeforeShipment=Sie müssen den Auftrag erst bestätigen bevor Sie eine Lieferung machen können.
 NoLineGoOnTabToAddSome=Keine Zeile, gehen Sie zum Hinzufügen auf die Registerkarte "%s".
-CreateInvoiceForThisCustomerFromSendings=Create Bills
+CreateInvoiceForThisCustomerFromSendings=Rechnungen erstellen
 IfValidateInvoiceIsNoSendingStayUnbilled=Wenn die Rechnung nicht freigegeben ist, bleibt die Lieferung im Status 'nicht fakturiert', bis die Rechnung freigegeben wird.
 OptionToSetSendingBilledNotEnabled=Option aus dem Modul-Workflow, um eine Lieferung automatisch auf 'fakturiert' zu setzen, wenn die Rechnung freigegeben ist, ist nicht aktiviert. Daher müssen Sie den Status von Lieferungen manuell auf 'fakturiert' setzen, nachdem die Rechnung erstellt wurde.
 
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index e240085cc2b..879ff9bc924 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -27,9 +27,6 @@ LotSerialList=Liste der Chargen-/Seriennummern
 SubjectToLotSerialOnly=Nur Produkte mit Charge/Seriennr.
 Movements=Lagerbewegungen
 ErrorWarehouseRefRequired=Warenlager-Referenz erforderlich
-ListOfWarehouses=Liste der Warenlager
-ListOfStockMovements=Liste der Lagerbewegungen
-ListOfInventories=Liste der Inventuren
 MovementId=Bewegungs ID
 StockMovementForId=Lagerbewegung Nr. %d
 ListMouvementStockProject=Liste der mit dem Projekt verbundenen Lagerbewegungen
@@ -227,7 +224,7 @@ ApplyPMP=Durchschnittspreis übernehmen
 FlushInventory=Bestand leeren
 ConfirmFlushInventory=Bestätigen Sie diese Aktion?
 InventoryFlushed=Bestand geleert
-ExitEditMode=Bearbeiten beenden
+ExitEditMode=Bearbeitungsmodus beenden
 inventoryDeleteLine=Zeile löschen
 RegulateStock=Lager ausgleichen
 ListInventory=Liste
@@ -337,3 +334,15 @@ LatestModifiedWarehouses=Zuletzt bearbeitete Warenlager (maximal %s)
 LatestStockMovements=Letzte Lagerbewegungen (maximal %s)
 QtyCurrentlyKnownInStock=Vom System geschätzter Lagerbestand. Solange die Inventur nicht geschlossen ist, ist dies ein Echtzeitwert. Er kann sich ändern, wenn Sie während der Inventur weiterhin Lagerbestandsbewegungen erfassen (nicht empfohlen).
 QtyInStockWhenInventoryWasValidated=Vom System geschätzter Lagerbestand, als die Inventur freigegeben wurde (vor der Lagerbestandskorrektur).
+InventoryId=Inventur-ID
+DateInventory=Datum der Bestandsaufnahme
+InventoryStatus=Inventurstatus
+InventoryTitle=Bezeichnung der Inventur
+InventoryLine=Inventurzeile/-position
+InventoryLineId=ID Inventurzeile
+InventoryRef=Inventur-Referenz
+QtyViewed=Gezählte Menge
+QtyStock=Menge im Lagerbestand
+QtyRegulated=Menge der Lagerbestandskorrektur
+InventoryEntrepot=Warenlager-Identität
+SelectedWarehouse=Warenlager auswählen
diff --git a/htdocs/langs/de_DE/ticket.lang b/htdocs/langs/de_DE/ticket.lang
index 958ad247c96..40fb9df9cef 100644
--- a/htdocs/langs/de_DE/ticket.lang
+++ b/htdocs/langs/de_DE/ticket.lang
@@ -44,7 +44,7 @@ MenuTicketMyAssignNonClosed=Meine offenen Tickets
 MenuListNonClosed=Offene Tickets
 TypeContact_ticket_internal_CONTRIBUTOR=Mitwirkender
 TypeContact_ticket_internal_SUPPORTTEC=Zugewiesener Benutzer
-TypeContact_ticket_external_SUPPORTCLI=Kundenkontakt / Tracking
+TypeContact_ticket_external_SUPPORTCLI=Kundenkontakt für das Tracking des Tickets
 TypeContact_ticket_external_CONTRIBUTOR=Externer Mitarbeiter
 OriginEmail=Ersteller E-Mail
 EmailReplyto='Reply to' der E-Mail
@@ -72,10 +72,10 @@ TicketPublicAccess=Ein öffentliches Interface (Nutzung ohne Identifizierung) is
 TicketSetupDictionaries=Die Anfragearten, Dringlichkeiten und Analyse-Codes sind in den Stammdaten konfigurierbar
 TicketParamModule=Modul Variableneinstellungen
 TicketParamMail=E-Mail Einrichtung
-TicketEmailNotificationFrom=Absender-E-Mail für Benachrichtigung bei Antworten
-TicketEmailNotificationFromHelp=Absenderadresse zum Senden der Benachrichtigungs-E-Mail, wenn eine Antwort im Backoffice erstellt wird. Zum Beispiel noreply@example.com
+TicketEmailNotificationFrom=Absender e-Mail-Adresse für Ticket-Benachrichtigungen
+TicketEmailNotificationFromHelp=Absender e-Mail-Adresse, die zum Senden der Benachrichtigunges-E-Mails für Ticket-Erstellung oder Nachrichten verwendet werden soll. Zum Beispiel noreply@example.com
 TicketEmailNotificationTo=Benachrichtigung über die Erstellung eines Tickets an diese E-Mail-Adresse
-TicketEmailNotificationToHelp=Falls vorhanden, wird diese E-Mail-Adresse bei einer Ticket-Erstellung benachrichtigt
+TicketEmailNotificationToHelp=Falls vorhanden, wird diese e-Mail-Adresse (zusätzlich zu allen anderen Standardempfängern) über eine Ticket-Erstellung benachrichtigt.
 TicketNewEmailBodyLabel=Text Mitteilung die gesendet wird, wenn ein Ticket erstellt wurde
 TicketNewEmailBodyHelp=Dieser Text wird in die E-Mail eingefügt, welche nach dem erstellen eines Tickets via öffentlichem Interface gesendet wird. Informationen für den Zugriff auf das Ticket werden automatisch hinzugefügt.
 TicketParamPublicInterface=Einstellungen öffentliche Schnitstelle
@@ -96,7 +96,9 @@ TicketPublicInterfaceTextHelpMessageHelpAdmin=Dieser Text erscheint über dem Te
 ExtraFieldsTicket=Ergänzende Attribute
 TicketCkEditorEmailNotActivated=HTML Editor ist nicht aktiviert. Bitte FCKEDITOR_ENABLE_MAIL auf 1 um ihn zu aktivieren.
 TicketsDisableEmail=Keine E-Mails senden wenn Tickets erstellt werden oder Mitteilung erfasst werden.
-TicketsDisableEmailHelp=Standardmäßig werden E-Mails versendet, wenn neue Tickets oder Mitteilungen erstellt werden. Aktivieren Sie diese Option um diese E-Mail Benachrichtigungen zu deaktivieren.
+TicketsDisableEmailHelp=Standardmäßig werden Bencachrichtigungs- E-Mails an Geschäftspartner gesendet, wenn neue Tickets oder Nachrichten erstellt wurden, sowohl über die öffentliche Schnittstelle als auch über das Backoffice. Aktivieren Sie diese Option, um die Checkbox E-Mail-Benachrichtigungen an Geschäftspartner zu deaktivieren, wenn die Erstellung vom Backoffice aus erfolgt.
+TicketsNotifyThirdPartyFromBackOfficeByDefault=Geschäftspartner standardmäßig bei Erstellung von Tickets über das Backoffice benachrichtigen
+TicketsNotifyThirdPartyFromBackOfficeByDefaultHelp=Beim Erstellen eines Ticket aus dem Backoffice ist die Option "Geschäftspartner benachrichtigen" standardmäßig aktiviert
 TicketsLogEnableEmail=Log via E-Mail aktivieren
 TicketsLogEnableEmailHelp=Bei jeder Änderung wird eine E-Mail **an jeden Kontakt** gesendet, der dem Ticket zugeordnet ist.
 TicketParams=Parameter
@@ -113,13 +115,13 @@ TicketsLimitViewAssignedOnlyHelp=Nur dem aktuellen Benutzer zugewiesene Tickets
 TicketsActivatePublicInterface=Öffentliches Interface aktivieren
 TicketsActivatePublicInterfaceHelp=Mit dem öffentlichen Interface können alle Besucher Tickets eröffnen.
 TicketsAutoAssignTicket=Den Ersteller automatisch dem Ticket zuweisen
-TicketsAutoAssignTicketHelp=Wenn ein Ticket erstellt wird, kann der Ersteller automatisch dem Ticket zugewiesen werden.
+TicketsAutoAssignTicketHelp=Beim Erstellen eines Tickets kann der Benutzer dem Ticket automatisch zugewiesen werden (Beispiele: 0=Niemals automatisch dem Ticket zugewiesen, 1=automatisch dem Ticket, wenn niemand zugewiesen ist, 2=automatisch zugewiesen an Ticket, auch wenn jemand definiert wurde).
 TicketAutoChangeStatusOnAnswer=Beim Beantworten einer Ticket-Anfrage automatisch einen Status zuweisen
 TicketAutoChangeStatusOnAnswerHelp=Wenn ein Benutzer auf ein Ticket antwortet, wird der Status dem Ticket automatisch zugewiesen
 TicketNumberingModules=Ticketnummerierungsmodul
 TicketsModelModule=Dokumentvorlagen für Tickets
 TicketNotifyTiersAtCreation=Geschäftspartner über Ticketerstellung informieren
-TicketsDisableCustomerEmail=E-Mails immer deaktivieren, wenn ein Ticket über die öffentliche Oberfläche erstellt wird
+TicketsDisableCustomerEmail=Immer E-Mails an Geschäftspartner deaktivieren, wenn eine Ticket vom Backoffice erstellt wird
 TicketsPublicNotificationNewMessage=Sende E-Mails, wenn neue Nachrichten oder Kommentare zum Ticket hinzugefügt wurden
 TicketsPublicNotificationNewMessageHelp=E-Mail (s) senden, wenn eine neue Nachricht von der öffentlichen Oberfläche hinzugefügt wird (an den zugewiesenen Benutzer oder die Benachrichtigungs-E-Mail an (Update) und / oder die Benachrichtigungs-E-Mail an)
 TicketPublicNotificationNewMessageDefaultEmail=Benachrichtigungen per E-Mail an (Update)
@@ -134,7 +136,7 @@ TicketsAutoNotifyClose=Geschäftspartner automatisch beim Schließen eines Ticke
 TicketsAutoNotifyCloseHelp=Beim Schließen eines Ticket wird Ihnen vorgeschlagen, eine Nachricht an einen der Geschäftspartner-Kontakte zu senden. Beim Massenabschluss wird eine Nachricht an einen Kontakt des Geschäftspartner gesendet, der mit dem Ticket verknüpft ist.
 TicketWrongContact=Der bereitgestellte Kontakt ist nicht Teil der aktuellen Ticket-Kontakte. E-Mail nicht gesendet.
 TicketChooseProductCategory=Produktkategorie für Ticket-Support
-TicketChooseProductCategoryHelp=Wählen Sie die Produktkategorie für Ticket-Support aus. Dies wird verwendet, um einen Vertrag automatisch mit einem Ticket zu verknüpfen.
+TicketChooseProductCategoryHelp=Wählen Sie die Produktkategorie für Ticket-Support aus. Diese Kategorie wird verwendet, um alle Verträge zu finden, die ein entsprechendes Produkt enthalten. Alle gefundenen Verträge werden mit dem erstellten Ticket verknüpft.
 TicketUseCaptchaCode=Verwenden Sie beim Erstellen eines Tickets einen grafischen Code (CAPTCHA).
 TicketUseCaptchaCodeHelp=Fügt eine CAPTCHA-Überprüfung beim Erstellen eines neuen Tickets hinzu.
 TicketsAllowClassificationModificationIfClosed=Änderung der Klassifizierung geschlossener Tickets erlauben
@@ -206,7 +208,7 @@ TicketUpdated=Ticket aktualisiert
 SendMessageByEmail=Mitteilung via E-Mail senden
 TicketNewMessage=Neue Mitteilung
 ErrorMailRecipientIsEmptyForSendTicketMessage=Empfänger ist leer. Keine E-Mail gesendet
-TicketGoIntoContactTab=Gehen Sie in den Tab "Kotakte" und wählen Sie ihn aus
+TicketGoIntoContactTab=Gehen Sie in den Tab "Kontakte" und wählen Sie ihn aus
 TicketMessageMailIntro=Kopfzeile der Nachricht
 TicketMessageMailIntroHelp=Dieser Text wird am Anfang der E-Mail Nachricht hinzugefügt, aber nicht gespeichert.
 TicketMessageMailIntroText=Hallo, <br>eine neue Antwort wurde zu einem Ticket hinzugefügt, dem Sie folgen. Hier ist die Nachricht:<br>
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index 6cb6be2de5e..83cffabe4d8 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -69,6 +69,7 @@ LoginAccountDisableInDolibarr=Benutzerkonto in Dolibarr deaktiviert
 PASSWORDInDolibarr=Passwort in Dolibarr geändert
 UsePersonalValue=Eigenen Wert verwenden
 ExportDataset_user_1=Benutzer und -eigenschaften
+ExportDataset_user_2=Liste von Sicherheitsereignissen
 DomainUser=Domain-Benutzer %s
 Reactivate=wieder aktivieren
 CreateInternalUserDesc=Hier kannst du interne Benutzer erzeugen.\nExterne Benutzer (Kunden, Lieferanten etc.) erzeugst du in dem Geschäftspartner Menü Kontakte/Adressen.
@@ -109,9 +110,10 @@ ExpectedWorkedHours=Erwartete Wochenarbeitszeit
 ColorUser=Benutzerfarbe
 DisabledInMonoUserMode=Deaktiviert im Wartungsmodus
 UserAccountancyCode=Buchhaltungscode Benutzer
-UserLogoff=Benutzer abmelden: %s
-UserLogged=Benutzer angemeldet: %s
-UserLoginFailed=Benutzeranmeldung fehlgeschlagen: %s
+UserLogoff=Benutzer abmelden
+UserLogged=Benutzer angemeldet
+UserLoginFailed=Benutzeranmeldung fehlgeschlagen
+UserPasswordChange=Benutzerpasswort ändern
 DateOfEmployment=Anstellungsdatum
 DateEmployment=Mitarbeiter
 DateEmploymentStart=Beschäftigungsbeginn
@@ -136,3 +138,9 @@ ExcludedByFilter=Durch Filter ausgeschlossen, aber zur Anzeige der Hierarchie an
 UserEnabledDisabled=Benutzerstatus geändert: %s
 AlternativeEmailForOAuth2=Alternative E-Mail-Adresse für die OAuth2-Anmeldung
 ErrorUpdateCanceledDueToDuplicatedUniqueValue=Fehler, Das Update wurde abgebrochen, da eines der Datenelemente, das eindeutig sein sollte, bereits vorhanden ist
+NewNameUserClone=Vollständiger Name des neuen Benutzers
+CloneUserRights=Benutzer-Berechtigungen klonen
+CloneCategoriesUser=Kategorien des Benutzers klonen
+ConfirmUserClone=Sind Sie sicher, dass Sie den Benutzer klonen möchten: <b>%s</b>?
+NewEmailUserClone=E-Mail-Adresse des neuen Benutzers
+SocialNetworksUser=Soziale Netzwerke für Benutzer
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index c6e0d8964dc..7af65e235fe 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Liste mit anderen Namen/Aliasen verwenden, damit diese Seit
 WEBSITE_CSS_URL=URL der externen CSS-Datei
 WEBSITE_CSS_INLINE=CSS-Dateiinhalt (für alle Seiten gleich)
 WEBSITE_JS_INLINE=JavaScript-Dateiinhalt (für alle Seiten gleich)
-WEBSITE_HTML_HEADER=Diesen Code am Schluss des HTML Headers anhängen (für alle Seiten gleich)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Roboterdatei (robots.txt)
 WEBSITE_HTACCESS=Website  .htaccess Datei
 WEBSITE_MANIFEST_JSON=Website manifest.json Datei
@@ -56,16 +56,17 @@ ReadPerm=Lesen
 WritePerm=Schreiben
 TestDeployOnWeb=Test/Bereitstellung im Web
 PreviewSiteServedByWebServer=Die <u>Vorschau %s in einem neuen Tab</u><br><br>%s wird durch einen externen Webserver (Wie Apache, Nginx, IIS) ausgeliefert. Dieser Server muss installiert und eingerichtet sein, bevor Sie den Verzeichnis <br><strong>%s</strong> anzeigen können.<br> URL, die von dem externen Server bereitgestellt wird: <br><strong>%s</strong>
-PreviewSiteServedByDolibarr= <u> Vorschau für %s in einem neuen Tab. </u> <br> <br> %s wird vom Dolibarr-Server bereitgestellt, so dass kein zusätzlicher Webserver (wie Apache, Nginx, IIS) installiert werden muss. <br> Der Nachteil ist, dass die URLs der Seiten nicht benutzerfreundlich sind und mit dem Pfad Ihrer Dolibarr-Installation beginnen. <br> Von Dolibarr bereitgestellte URL: <br> <strong> %s </strong> <br> <br> Um diese Website auf Ihrem eigenen Webserver zu hosten, muss dort ein virtueller Host erstellt werden, der auf das Verzeichnis <br> <strong> %s </strong> <br> verweist. Anschließens den Namen des virtuellen Servers in den Eigenschaften dieser Website eintragen und auf den Link "Im Web testen/bereitstellen" klicken.
+PreviewSiteServedByDolibarr=<u>Vorschau %s in einem neuen Tab.</u><br><br>Die %s wird von Dolibarr Server bereitgestellt, sod ass kein zusätzliches Web Server (wie Apache, Nginx, IIS) installiert werden muss.<br>Der Nachteil besteht darin, dass die URLs der Seiten nicht benutzerfreundlich sind und mit dem Pfad Ihrer Dolibarr-Installation beginnen.<br>Von Dolibarr bereitgestellte URL:<br><strong>%s</strong><br><br>Um die Bereitstellung oder den Test mit Ihrem eigenen externen Web-Server (wie Apache, Nginx, Lighttp) durchzuführen, verwenden Sie den Link "%s".
 VirtualHostUrlNotDefined=Die URL des virtuellen Hosts, der von einem externen Webserver bereit gestellt wird, ist nicht definiert
 NoPageYet=Noch keine Seiten
 YouCanCreatePageOrImportTemplate=Sie können eine neue Seite erstellen oder eine komplette Website-Vorlage importieren
-SyntaxHelp=Hilfe zu bestimmten Syntaxtipps
+SyntaxHelp=Hilfe zu Programmierfragen
 YouCanEditHtmlSourceckeditor=Sie können den HTML-Quellcode über die Schaltfläche "HTML-Code bearbeiten" im Editor bearbeiten.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Um ein <strong>Bild</strong>, das im Verzeichnis <strong>Dokumente</strong> gespeichert ist, einzubinden, verwenden Sie den Wrapper <strong>viewimage.php</strong>.<br>Beispiel: Für ein Bild in Dokumente/Medien (konfigurieren Sie das Verzeichnis für den öffentlichen Zugriff), lautet die Syntax:<br> <strong>&lt;img src="/viewimage.php?modulepart=medias &amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Für Bilder, die über einen Link geteilt werden (öffentlicher Zugriff über den geteilten Hash-Schlüssel der Datei) gilt folgende Syntax:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Sie können PHP-Code in diese Quellcode mit Tags einfügen<strong>&lt;?php ?&gt;</strong>. Die folgenden globalen Variablen sind verfügbar: $conf, $db, $mysoc, $Benutzer, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> Sie können mit folgender Syntax auch Inhalte einer anderen Seite/eines anderen Containers einbinden: <br><strong>&lt;?php includeContainer('Alias_des_zu_einzuschließenden_Containers'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> Sie können eine Weiterleitung zu einer anderen Seite/einem anderen Container mit der folgenden Syntax erstellen (Hinweis: Keinen Inhalt vor der Umleitung ausgeben): <br><strong>&lt;?php redirectToContainer('Alias_des_Containers, zu dem_umgeleitet_werden_soll'); ?&gt;</strong><br>Sie können auch eine Umleitung mit GET-Parametern vornehmen:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> Um einen Link zu einer anderen Seite hinzuzufügen, verwenden Sie die Syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> Sie können den Seitentitel und <strong>SEO-Meta-Tags </strong> (Titel, Schlüsselwörter, Beschreibung) dynamisch festlegen. Definieren Sie einfach die folgenden Variablen: <br> <code>$__PAGE__TITLE__ = "Titelwert …"; </code><br> <code>$__PAGE__KEYWORDS__ = "Schlüsselwort1, Schlüsselwort2, Schlüsselwort3 …"; // Durch Komma getrennt</code><br><code>$__PAGE__DESC__ = "Description …";<br><span class="fa fa-download paddingright"></span> Um einen <strong>Link zum Herunterladen</strong> einers Datei, die im <strong>Dokumenten</strong>-Verzeichnis gespeichert ist, einzufügen, verwenden Sie den <strong>document.php</strong> Wrapper:<br>Beispiel für eine Datei in Dokumente/ECM (muss protokolliert werden), lautet die Syntax:<br><strong>&lt;a href="/Dokument.php?modulepart=ecm&Datei=[relative_dir/]filename.ext"&gt;</strong><br>Für ein Datei in Dokumente/Medien (öffnen Sie Verzeichnis für den öffentlichen Zugriff) lautet die Syntax:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Für ein Datei, die mit einem Share-Link geteilt wird (offener Zugriff unter Verwendung des Freigabe-Hash-Schlüssels der Datei), lautet die Syntax:<br><strong>&lt;a href="/Dokument.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Um ein <strong>Bild</strong> , das im Verzeichnis <strong>medias</strong> gespeichert ist (Verzeichnis für den öffentlichen Zugriff konfiguriert), verwenden Sie den relativen Pfad, beginnend mit <strong>/medias</strong>, Beispiel:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=Für ein Bild, das mit einem freigegebenen Link geteilt wird (offener Zugriff mithilfe des Freigabe-Hashs der Datei), verwenden Sie den Wrapper: <br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=Um die URL des Bildes eines PHP Objektes zu erhalten, verwenden Sie<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($Objekt , 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=Um die URL eines Bildes im HTML-Inhalt eines Artikels abzurufen, verwenden Sie <br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Weitere Beispiele für HTML oder dynamischen Code finden Sie in <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">der Wiki-Dokumentation</a>.<br>
 ClonePage=Seite/Container klonen
 CloneSite=Website klonen
@@ -87,14 +88,14 @@ WebsiteAccount=Website Konto
 WebsiteAccounts=Website Konten
 AddWebsiteAccount=Website-Konto erstellen
 BackToListForThirdParty=Zurück zur Liste der Geschäftspartner
-DisableSiteFirst=Website zuerst deaktivieren
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Titel der Website
 AnotherContainer=So fügen Sie den Inhalt einer anderen Seite/eines anderen Containers ein (Sie könnten hierbei Fehler haben, wenn Sie dynamischen Code aktivieren, weil der eingebettete Subcontainer möglicherweise nicht existiert)
 SorryWebsiteIsCurrentlyOffLine=Diese Website ist derzeit offline. Bitte kommen Sie später wieder...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Benutzertabelle für Website aktivieren
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktiviere die Benutzertabelle, um Webseiten-Konten (Login/Kennwort) für jede Website / jeden Geschäftspartner zu speichern
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Zuerst muss die Startseite definiert sein
-OnlyEditionOfSourceForGrabbedContentFuture=Warnung: Das Erstellen einer Webseite durch Importieren einer externen Webseite ist nur für erfahrene Benutzern empfohlen. Abhängig von der Komplexität der Quellseite kann das Ergebnis des Imports vom Original abweichen. Auch wenn die Quellseite einige CSS-Stile oder problematisches JavaScript verwendet, kann es bei der Arbeit an dieser Seite zu Beeinträchtigungen des Erscheinungsbilds oder der Funktionen des Website-Editors kommen. Mit dieser Methode können Sie eine Seite schneller erstellen. Es wird jedoch empfohlen, Ihre neue Seite von Grund auf oder anhand einer vorgeschlagenen Seitenvorlage zu erstellen.<br>Beachten Sie auch, dass der Inline-Editor möglicherweise nicht korrekt funktioniert bei Verwendung auf einer importierten externen Seite.
+OnlyEditionOfSourceForGrabbedContentFuture=Achtung: Das Erstellen einer Webseite durch Importieren einer externen Webseite ist erfahrenen Benutzern vorbehalten. Je nach Komplexität der Quellseite kann das Ergebnis des Imports vom Original abweichen. Auch wenn die Quellseite gängige CSS-Styles (ohne vorangestellten Präfix) oder allgemeines JavaScript verwendet, kann dies beim Arbeiten an dieser Seite das Erscheinungsbild oder die Funktionen des Website-Editors beeinträchtigen. Diese Methode ist eine schnellere Möglichkeit zum Erstellen einer Seite, es wird jedoch empfohlen, die neue Seite von Grund auf neu oder anhand einer empfohlenen Seitenvorlage zu erstellen. <br>Beachten Sie auch, dass der Inline-Editor möglicherweise nicht richtig funktioniert, wenn er bei einer übernommenen externen Seite verwendet wird.
 OnlyEditionOfSourceForGrabbedContent=Der HTML Code kann nur editiert werden, wenn der Inhalt von einer externen Site geladen wurde
 GrabImagesInto=Auch Bilder aus CSS und Seite übernehmen
 ImagesShouldBeSavedInto=Bilder sollten im Verzeichnis gespeichert werden
@@ -196,8 +197,8 @@ WebPortalOrderListMenu=Kundenaufträge
 WebPortalOrderListTitle=Kundenaufträge
 WebPortalOrderListDesc=Hier finden Sie alle Ihre Aufträge
 WebPortalOrderListNothing=Keine Aufträge gefunden
-WebPortalInvoiceListMenu=(Kunden-)Rechnungen
-WebPortalInvoiceListTitle=(Kunden-)Rechnungen
+WebPortalInvoiceListMenu=Rechnungen
+WebPortalInvoiceListTitle=Rechnungen
 WebPortalInvoiceListDesc=Hier finden Sie alle Ihre Rechnungen
 WebPortalInvoiceListNothing=Keine Rechnungen gefunden
 WebPortalMemberCardMenu=Mitglied
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Aus Kundenkonto ausloggen
 filteredByVersion=Nach Version gefiltert
 removeFilter=Filter entfernen
 viewMyCart=Meinen Warenkorb anzeigen
+Shipping=Shipping
 freeShipping=Kostenloser Versand!
 noProducts=Keine Produkte
 nbrItemsInCart=Der Warenkorb enthält <span class="ajax_cart_quantity">0</span> Artikel.
@@ -284,12 +286,13 @@ productNameAToZ=Produktname: A bis Z
 productNameZToA=Produktname: Z bis A
 referenceLowestFirst=Artikelnr.z: Niedrigste zuerst
 referenceHighestFirst=Artikelnr.: Höchste zuerst
+productPerPage=products per page
 perPage=pro Seite
 showAll=Alles anzeigen
 showing= Anzeigen
 nbrOfProducts= Es gibt %s Produkte.
 noResultsHaveBeenFound=Es wurden 0 Ergebnisse gefunden.
-noResultsWereFound= Es wurden keine Ergebnisse gefunden.
+noResultsWereFound=Es wurden keine Ergebnisse gefunden.
 addToCart=Zum Warenkorb hinzufügen
 backHome=Zur Startseite zurückkehren
 priceDrop=Preis gesenkt
@@ -302,10 +305,11 @@ lastUpdate=Letztes Update
 contactSupport=So kontaktieren Sie den Support
 noProductToDisplay=Fehler, kein Produkt zum anzeigen
 yourCompanyInformation=Ihre Unternehmensinformation
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=Dieser E-Mail ist bereits registriert.
 firstnameContainsLettersOnly=<b>Vorname</b> darf nur Buchstaben und Leerzeichen enthalten
 lastnameContainsLettersOnly=<b>Nachname</b> darf nur Buchstaben und Leerzeichen enthalten
-passwordCriteria=<b>Das Passwort</b> muss die folgenden folgenden Kriterien erfüllen:<br>- 12 Zeichen lang<br>- 1 Großbuchstabe<br>- 1 Ziffer<br>- Keine Sonderzeichen<br>- Keine Zeichen mehr als dreimal wiederholen<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=Ein Fehler ist aufgetreten.
 accountCreation=Konto erstellen
 errorsOccurred=Es gibt %s Fehler %s
@@ -357,3 +361,7 @@ subtract=Abziehen
 LoginCheckout=Einloggen und zur Kasse gehen
 paymentSuccessProcessed=Ihr Zahlung wurde erfolgreich verarbeitet.
 youWillBeRedirectedToOrderPage=Sie werden in Kürze zur Detailseite Ihrer Bestellung weitergeleitet.
+WebPortalSetupNotComplete=Die Webportal-Konfiguration ist nicht vollständig
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index f03db6ac142..fe2a4f38139 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -40,13 +40,13 @@ CreditTransferSetup=Einstellungen Modul Zahlung per Überweisung
 WithdrawStatistics=Statistik Lastschriftzahlungen
 CreditTransferStatistics=Statistiken Überweisungen
 LastWithdrawalReceipt=Letzte 1%s Einnahmen per Lastschrift
-MakeWithdrawRequest=Lastschrift erstellen
+MakeWithdrawRequest=Zahlung per Lastschrifteinzug vorbereiten
 MakeWithdrawRequestStripe=Fordern Sie eine Lastschriftzahlung über Stripe an
-MakeBankTransferOrder=Überweisungsauftrag erstellen
+MakeBankTransferOrder=Zahlung per Überweisungsauftrag vorbereiten
 WithdrawRequestsDone=%s Lastschrift-Zahlungsaufforderungen aufgezeichnet
 BankTransferRequestsDone=%s Überweisungsanforderungen aufgezeichnet
 ThirdPartyBankCode=Geschäftspartner Bankcode
-NoInvoiceCouldBeWithdrawed=Keine Rechnung erfolgreich verarbeitet. Überprüfen Sie, ob die Rechnungen auf Unternehmen mit einer gültigen IBAN Nummer verweisen und die IBAN Nummer eine eindeutige Mandatsreferenz besitzt <strong>%s</strong>.
+NoInvoiceCouldBeWithdrawed=Keine Rechnung erfolgreich verarbeitet. Überprüfen Sie, ob die Rechnungen auf Geschäftspartner mit einer gültigen IBAN Nummer verweisen und die IBAN Nummer eine eindeutige Mandatsreferenz besitzt <strong>%s</strong>.
 NoInvoiceCouldBeWithdrawedSupplier=Kein Rechnung erfolgreich verarbeitet. Prüfen Sie, dass die Rechnungen Unternehmen mit einer gültigen IBAN zugeordnet sind.
 NoSalariesCouldBeWithdrawed=Kein Gehalt erfolgreich verarbeitet. Prüfen Sie, dass sich das Gehalt auf Benutzer mit einer gültigen IBAN bezieht.
 WithdrawalCantBeCreditedTwice=Dieser Widerrufsbeleg ist bereits als gutgeschrieben markiert; Dies kann nicht zweimal durchgeführt werden, da dies möglicherweise zu doppelten Zahlungen und Bankeinträgen führen würde.
@@ -118,8 +118,8 @@ DateRUM=Datum der Unterzeichnung des Mandats
 RUMLong=Eindeutige Mandatsreferenz
 RUMWillBeGenerated=Wenn leer, wird die Mandatsreferenz generiert, sobald die Bankkontodaten gespeichert sind
 WithdrawMode=Lastschriftmodus (FRST oder RCUR)
-WithdrawRequestAmount=Lastschrifteinzug Einzugs Betrag:
-BankTransferAmount=Betrag des Überweisungsauftrags:
+WithdrawRequestAmount=Betrag des Lastschrifteinzugs
+BankTransferAmount=Betrag des Überweisungsauftrags
 WithdrawRequestErrorNilAmount=Es kann keine Lastschriftanforderung für einen leeren Betrag erstellt werden.
 SepaMandate=SEPA-Lastschriftmandat
 SepaMandateShort=SEPA-Mandate
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index a3e1077bf0f..5d6d1c094f2 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Ο έλεγχος ακεραιότητας α
 FileIntegritySomeFilesWereRemovedOrModified=Ο έλεγχος ακεραιότητας αρχείων απέτυχε. Κάποια αρχεία έχουν τροποποιηθεί, απουσιάζουν ή έχουν προστεθεί.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Κάντε ανάλυση ακεραιότητας των αρχείων εφαρμογών από το
-LocalSignature=Ενσωματωμένη τοπική υπογραφή (λιγότερο αξιόπιστη)
-RemoteSignature=Απομακρυσμένη υπογραφή (πιο αξιόπιστη)
+LocalSignature=Ενσωματωμένη τοπική υπογραφή
+RemoteSignature=Απομακρυσμένη υπογραφή
 FilesMissing=Αρχεία που λείπουν
 FilesUpdated=Ενημερωμένα αρχεία
 FilesModified=Τροποποιημένα αρχεία
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Γεωμετρικό Σημείο
 ExtrafieldMultiPointGeo=Γεωμετρικό πολλαπλό σημείο
 ExtrafieldLinestringGeo=Γεωμετρική Γραμμή
 ExtrafieldPolygonGeo=Γεωμετρικό πολύγωνο
+ExtrafieldStars=Stars
 ComputedFormula=Υπολογισμένο πεδίο
-ComputedFormulaDesc=Μπορείτε να εισαγάγετε εδώ έναν τύπο χρησιμοποιώντας άλλες ιδιότητες αντικειμένου ή οποιαδήποτε κωδικοποίηση PHP για να λάβετε μια δυναμικά υπολογισμένη τιμή. Μπορείτε να χρησιμοποιήσετε οποιουσδήποτε τύπους συμβατούς με PHP, συμπεριλαμβανομένου του τελεστή συνθήκης "?"  και το ακόλουθο καθολικό αντικείμενο: <strong> $db, $conf, $langs, $mysoc, $user, $object </strong> . <br> <strong> ΠΡΟΕΙΔΟΠΟΙΗΣΗ </strong> : Εάν χρειάζεστε ιδιότητες που δεν έχουν φορτωθεί, απλώς συμπεριλάβετε το αντικείμενο στον τύπο σας όπως στο δεύτερο παράδειγμα. <br> Η χρήση ενός υπολογισμένου πεδίου σημαίνει ότι δεν μπορείτε να εισαγάγετε καμία τιμή από τη διεπαφή. Επίσης, εάν υπάρχει συντακτικό σφάλμα, ο τύπος ενδέχεται να μην επιστρέψει τίποτα. <br> <br> Παράδειγμα τύπου: <br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br> <br> Παράδειγμα για επαναφόρτωση του αντικειμένου <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')<br> <br> Άλλο παράδειγμα τύπου για την επιβολή φόρτωσης του αντικειμένου και του γονικού του αντικειμένου:<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=Μπορείτε να εισαγάγετε εδώ έναν τύπο χρησιμοποιώντας άλλες ιδιότητες αντικειμένου ή οποιαδήποτε κωδικοποίηση PHP για να λάβετε μια δυναμικά υπολογισμένη τιμή. Μπορείτε να χρησιμοποιήσετε οποιουσδήποτε τύπους συμβατούς με PHP, συμπεριλαμβανομένου του τελεστή συνθήκης "?"  και το ακόλουθο καθολικό αντικείμενο: <strong> $db, $conf, $langs, $mysoc, $user, $objectoffield </strong> . <br> <strong> ΠΡΟΕΙΔΟΠΟΙΗΣΗ </strong> : Εάν χρειάζεστε ιδιότητες που δεν έχουν φορτωθεί, απλώς συμπεριλάβετε το αντικείμενο στον τύπο σας όπως στο δεύτερο παράδειγμα. <br> Η χρήση ενός υπολογισμένου πεδίου σημαίνει ότι δεν μπορείτε να εισαγάγετε καμία τιμή από τη διεπαφή. Επίσης, εάν υπάρχει συντακτικό σφάλμα, ο τύπος ενδέχεται να μην επιστρέψει τίποτα. <br> <br> Παράδειγμα τύπου: <br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br> <br> Παράδειγμα για επαναφόρτωση του αντικειμένου <br>((($reloadedobj = new Societe($db)) && $reloadedobj->fetchNoCompute($objectoffield->id) > 0) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')<br> <br> Άλλο παράδειγμα τύπου για την επιβολή φόρτωσης του αντικειμένου και του γονικού του αντικειμένου:<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=Αποθήκευση υπολογισμένου πεδίου
 ComputedpersistentDesc=Τα υπολογισμένα επιπλέον πεδία θα αποθηκευτούν στη βάση δεδομένων, ωστόσο, η τιμή θα επανυπολογιστεί μόνο όταν αλλάξει το αντικείμενο αυτού του πεδίου. Εάν το υπολογισμένο πεδίο εξαρτάται από άλλα αντικείμενα ή καθολικά δεδομένα, αυτή η τιμή μπορεί να είναι λανθασμένη!!
 ExtrafieldParamHelpPassword=Αν αφήσετε αυτό το πεδίο κενό σημαίνει ότι αυτή η τιμή θα αποθηκευτεί ΧΩΡΙΣ κρυπτογράφηση (το πεδίο είναι απλώς κρυμμένο με αστέρια στην οθόνη).<br><br>Εισάγετε την τιμή 'dolcrypt' για κωδικοποίηση τιμής με έναν αναστρέψιμο αλγόριθμο κρυπτογράφησης. Τα δεδομένα μπορούν ακόμα να είναι γνωστά και να υποστούν επεξεργασία, αλλά είναι κρυπτογραφημένα στη βάση δεδομένων.<br><br>Εισαγάγετε "auto" (ή "md5", 'sha256', 'password_hash', ...) για να χρησιμοποιήσετε τον προεπιλεγμένο αλγόριθμο κρυπτογράφησης κωδικού πρόσβασης (ή md5, sha256, password_hash...) για να αποθηκεύσετε τον μη αναστρέψιμο κατακερματισμένο κωδικό πρόσβασης στη βάση δεδομένων (δεν υπάρχει τρόπος ανάκτησης της αρχικής τιμής)
@@ -519,7 +520,7 @@ WarningPHPMailB=- Εάν το domain του email σας (το τμήμα mymail
 WarningPHPMailC=- Η χρήση του διακομιστή SMTP του δικού σας Παρόχου Υπηρεσιών Email για την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου είναι επίσης χρήσιμη καθώς όλα τα μηνύματα ηλεκτρονικού ταχυδρομείου που αποστέλλονται από την εφαρμογή θα αποθηκεύονται και στον κατάλογο "Απεσταλμένα" του γραμματοκιβωτίου σας.
 WarningPHPMailD=Επομένως, συνιστάται η αλλαγή της μεθόδου αποστολής μηνυμάτων ηλεκτρονικού ταχυδρομείου στην τιμή "SMTP".
 WarningPHPMailDbis=Εάν θέλετε πραγματικά να διατηρήσετε την προεπιλεγμένη μέθοδο "PHP" για την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου, απλώς αγνοήστε αυτήν την προειδοποίηση ή αφαιρέστε την %sκάνοντας κλικ εδώ%s.
-WarningPHPMail2=Εάν ο πάροχος σας SMTP email χρειάζεται να περιορίσει το πρόγραμμα-πελάτη email σε ορισμένες διευθύνσεις IP (σπάνια), αυτή είναι η διεύθυνση IP του mail user agent (MUA) για την εφαρμογή σας ERP CRM: <strong> %s </strong> .
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=Εάν το domain name στη διεύθυνση email σας προστατεύεται από μια εγγραφή SPF (ρωτήστε τον καταχωρητή του domain name σας), πρέπει να προσθέσετε τις ακόλουθες διευθύνσεις IP ή καταχώριση στην εγγραφή SPF του DNS του domain σας:  <strong>%s</strong>.
 WarningPHPMailSPFDMARC=Εάν το domain name στη διεύθυνση email σας προστατεύεται από μια εγγραφή DMARC διαφορετική από το p=none (ρωτήστε τον καταχωρητή του domain name σας), πρέπει να αφαιρέσετε την εγγραφή DMARC ή να την ορίσετε σε p=none όπως το @gmail.com) ή χρησιμοποιήστε άλλη μέθοδο αποστολής.
 SPFAndDMARCInformation=SPF και DMARC DNS εγγραφή για κύριες διευθύνσεις email
@@ -567,8 +568,8 @@ Module10Name=Λογιστική (απλουστευμένη)
 Module10Desc=Απλές λογιστικές αναφορές (ημερολόγια, κύκλος εργασιών) με βάση το περιεχόμενο της βάσης δεδομένων. Δεν χρησιμοποιεί κανένα πίνακα καθολικών.
 Module20Name=Προσφορές
 Module20Desc=Διαχείριση προσφορών
-Module22Name=Μαζική αποστολή e-mail
-Module22Desc=Διαχείριση μαζικής αποστολής email
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Ενέργεια
 Module23Desc=Παρακολούθηση κατανάλωσης ενέργειας
 Module25Name=Εντολές Πωλήσεων
@@ -847,10 +848,10 @@ Permission212=Παραγγελία γραμμών σύνδεσης
 Permission213=Ενεργοποιήση γραμμής
 Permission214=Ρύθμιση τηλεφωνίας
 Permission215=Ρύθμιση παρόχων
-Permission221=Ανάγνωση email
-Permission222=Δημιουργία / τροποποίηση μηνυμάτων ηλεκτρονικού ταχυδρομείου (θέμα, παραλήπτες ...)
-Permission223=Επικύρωση μηνυμάτων ηλεκτρονικού ταχυδρομείου (επιτρέπει την αποστολή)
-Permission229=Διαγραφή μηνυμάτων ηλεκτρονικού ταχυδρομείου
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Προβολή παραληπτών και πληροφοριών
 Permission238=Χειροκίνητη αποστολή αλληλογραφίας
 Permission239=Διαγραφή μηνυμάτων ηλεκτρονκού ταχυδρομείου μετά την επικύρωση ή την αποστολή
@@ -1105,6 +1106,7 @@ DictionaryStaff=Αριθμός εργαζομένων
 DictionaryAvailability=Καθυστέρηση παράδοσης
 DictionaryOrderMethods=Μέθοδοι παραγγελίας
 DictionarySource=Προέλευση των προσφορών/παραγγελιών
+DictionaryAccountancyReport=Εξατομικευμένες αναφορές Λογιστικής
 DictionaryAccountancyCategory=Εξατομικευμένες ομάδες για αναφορές
 DictionaryAccountancysystem=Υποδείγματα λογιστικού σχεδίου
 DictionaryAccountancyJournal=Λογιστικά ημερολόγια
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Επιστροφή στη λίστα λεξικών
 TypeOfRevenueStamp=Είδος φορολογικού χαρτόσημου
 VATManagement=Διαχείριση Φορολογίας Πωλήσεων
 VATIsUsedStandard=Κατά τη δημιουργία εγγράφων (προσφορών, τιμολογίων, παραγγελιών...), ο προεπιλεγμένος συντελεστής φόρου επί των πωλήσεων ορίζεται σύμφωνα με τους τυπικούς κανόνες (ανάλογα με τις χώρες αγοραστή και πωλητή)
-VATIsUsedDesc=Από προεπιλογή κατά τη δημιουργία προσφορών, τιμολογίων, παραγγελιών κ.λπ. ο συντελεστής φόρου επί των πωλήσεων ακολουθεί τον ενεργό τυπικό κανόνα: <br> Εάν ο πωλητής δεν υπόκειται σε φόρο επί των πωλήσεων, τότε ο φόρος επί των πωλήσεων είναι προεπιλεγμένος σε 0. Τέλος κανόνα. <br> Εάν η (χώρα πωλητή = χώρα του αγοραστή), τότε ο φόρος επί των πωλήσεων από προεπιλογή ισούται με τον φόρο επί των πωλήσεων του προϊόντος στη χώρα του πωλητή. Τέλος κανόνα. <br> Εάν ο πωλητής και ο αγοραστής βρίσκονται και οι δύο στην Ευρωπαϊκή Κοινότητα και τα αγαθά είναι προϊόντα που σχετίζονται με τις μεταφορές (μεταφορές, ναυτιλία, αεροπορική εταιρεία), ο προεπιλεγμένος ΦΠΑ είναι 0. Αυτός ο κανόνας εξαρτάται από τη χώρα του πωλητή - συμβουλευτείτε τον λογιστή σας. Ο ΦΠΑ θα πρέπει να καταβληθεί από τον αγοραστή στο τελωνείο της χώρας του και όχι στον πωλητή. Τέλος κανόνα. <br> Εάν ο πωλητής και ο αγοραστής βρίσκονται και οι δύο στην Ευρωπαϊκή Κοινότητα και ο αγοραστής δεν είναι εταιρεία (με εγγεγραμμένο ενδοκοινοτικό αριθμό ΦΠΑ), τότε ο ΦΠΑ είναι ίσος με τον συντελεστή ΦΠΑ της χώρας του πωλητή. Τέλος κανόνα. <br> Εάν ο πωλητής και ο αγοραστής βρίσκονται και οι δύο στην Ευρωπαϊκή Κοινότητα και ο αγοραστής είναι εταιρεία (με εγγεγραμμένο ενδοκοινοτικό ΑΦΜ), τότε ο ΦΠΑ είναι 0 από προεπιλογή. Τέλος κανόνα. <br> Σε κάθε άλλη περίπτωση, η προτεινόμενη προεπιλογή είναι φόρος πωλήσεων=0. Τέλος κανόνα.
+VATIsUsedDesc=Από προεπιλογή κατά τη δημιουργία προσφορών, τιμολογίων, παραγγελιών κ.λπ. ο συντελεστής φόρου επί των πωλήσεων ακολουθεί τον ενεργό τυπικό κανόνα:<br>Εάν ο πωλητής δεν υπόκειται σε φόρο επί των πωλήσεων, τότε ο φόρος επί των πωλήσεων είναι προεπιλεγμένος σε 0. Τέλος κανόνα.<br>Εάν ο αγοραστής έχει κανόνα ΦΠΑ από το λεξικό ποσοστών ΦΠΑ, τότε είναι ο προεπιλεγμένος συντελεστής ΦΠΑ. Τέλος κανόνα.<br>Εάν η (χώρα πωλητή = χώρα αγοραστή), τότε ο φόρος επί των πωλήσεων από προεπιλογή ισούται με τον φόρο επί των πωλήσεων του προϊόντος στη χώρα του πωλητή. Τέλος κανόνα.<br>Εάν ο πωλητής και αγοραστής είναι και οι δύο στην Ευρωπαϊκή Κοινότητα και τα αγαθά είναι προϊόντα που σχετίζονται με τη μεταφορά (μεταφορές, ναυτιλία, αεροπορική εταιρεία), ο προεπιλεγμένος ΦΠΑ είναι 0. Αυτός ο κανόνας εξαρτάται από τη χώρα του πωλητή - συμβουλευτείτε τον λογιστή σας. Ο ΦΠΑ θα πρέπει να καταβληθεί από τον αγοραστή στο τελωνείο της χώρας του και όχι στον πωλητή. Τέλος κανόνα.<br>Εάν ο πωλητής και ο αγοραστής είναι και οι δύο στην Ευρωπαϊκή Κοινότητα και ο αγοραστής δεν είναι Εταιρία (με εγγεγραμμένο ενδοκοινοτικό ΑΦΜ) τότε ο ΦΠΑ ορίζεται ως προεπιλογή στον συντελεστή ΦΠΑ της χώρας του πωλητή. Τέλος κανόνα.<br>Εάν ο πωλητής και ο αγοραστής είναι και οι δύο στην Ευρωπαϊκή Κοινότητα και ο αγοραστής είναι Εταιρία (με εγγεγραμμένο ενδοκοινοτικό ΑΦΜ), τότε ο ΦΠΑ είναι 0 από προεπιλογή. Τέλος κανόνα.<br>Σε κάθε άλλη περίπτωση, η προτεινόμενη προεπιλογή είναι φόρος πωλήσεων=0. Τέλος κανόνα.
 VATIsNotUsedDesc=Από προεπιλογή, ο προτεινόμενος φόρος επί των πωλήσεων είναι 0, ο οποίος μπορεί να χρησιμοποιηθεί για περιπτώσεις όπως ενώσεις, ιδιώτες ή μικρές εταιρείες.
 VATIsUsedExampleFR=Στη Γαλλία, σημαίνει εταιρείες ή οργανισμούς που έχουν πραγματικό δημοσιονομικό σύστημα (Απλοποιημένο πραγματικό ή κανονικό πραγματικό). Ένα σύστημα στο οποίο δηλώνεται ο ΦΠΑ.
 VATIsNotUsedExampleFR=Στη Γαλλία, σημαίνει ενώσεις που δεν έχουν δηλώσει φόρο επί των πωλήσεων ή εταιρείες, οργανώσεις ή ελεύθερα επαγγέλματα που έχουν επιλέξει το φορολογικό σύστημα μικροεπιχειρήσεων (Φόρος επί των πωλήσεων σε franchise) και πλήρωσαν φόρο επί των πωλήσεων franchise χωρίς δήλωση φόρου επί των πωλήσεων. Αυτή η επιλογή θα εμφανίζει την αναφορά "Μη εφαρμοστέος φόρος επί των πωλήσεων - art-293B of CGI" στα τιμολόγια.
-VATType=Τύπος ΦΠΑ
+VATType=Φορολογική χρήση
 ##### Local Taxes #####
 TypeOfSaleTaxes=Είδος φόρου επί των πωλήσεων
 LTRate=Τιμή
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Σύμφωνα με τη ρύθμιση των φόρ
 LabelUsedByDefault=Ετικέτα που χρησιμοποιείται από προεπιλογή εάν δεν υπάρχει μετάφραση για τον κώδικα
 LabelOnDocuments=Ετικέτα στα έγγραφα
 LabelOrTranslationKey=Ετικέτα ή όρος μετάφρασης
+LabelTranslatedInCurrentLanguage=Ετικέτα μεταφρασμένη στην τρέχουσα γλώσσα
 TranslationFound=Βρέθηκε μετάφραση
 TheTranslationIsSearchedFromKey=Η αναζήτηση της μετάφρασης γίνεται από το κλειδί μετάφρασης: <b>%s</b>
 TranslationKey=Κλειδί μετάφρασης
@@ -1431,7 +1434,7 @@ AddVatInList=Εμφάνιση του ΑΦΜ Πελάτη/Προμηθευτή σ
 AddAdressInList=Εμφάνιση διεύθυνσης Πελάτη/Προμηθευτή σε σύνθετες λίστες. <br> Τα τρίτα μέρη θα εμφανίζονται με τη μορφή ονόματος "The Big Company corp. - 21 jump street 123456 Big town - USA" αντί για "The Big Company corp".
 AddEmailPhoneTownInContactList=Εμφάνιση email επαφών (ή τηλέφωνα αν δεν έχουν καθοριστεί) και πόλης σε σύνθετες λίστες <br> Οι επαφές θα εμφανιστούν με μια μορφή ονόματος "Dupond Durand - dupond.durand@example.com - Παρίσι" ή "Dupond Durand - 06 07 59 65 66 - Παρίσι» αντί για «Dupond Durand».
 AskForPreferredShippingMethod=Ζητήστε την προτιμώμενη μέθοδο αποστολής για τρίτα μέρη.
-FieldEdition=Έκδοση στο πεδίο %s
+FieldEdition=Τροποποίηση του πεδίου %s
 FillThisOnlyIfRequired=Παράδειγμα: +2 (συμπλήρωση μόνο εάν παρουσιαστούν προβλήματα μετατόπισης ζώνης ώρας)
 GetBarCode=Πάρτε barcode
 NumberingModules=Μοντέλα αρίθμησης
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Επιβολή ημερομηνίας ισχύος τιμολο
 SuggestedPaymentModesIfNotDefinedInInvoice=Προτεινόμενη μέθοδος πληρωμής στο τιμολόγιο από προεπιλογή, εάν δεν ορίζεται στο τιμολόγιο
 SuggestPaymentByRIBOnAccount=Προτείνετε πληρωμή με ανάληψη από τον λογαριασμό
 SuggestPaymentByChequeToAddress=Προτείνετε πληρωμή με επιταγή προς
+InvoicePaymentManageStructuredCommunication=Δημιουργία δομημένης επικοινωνίας για πληρωμή τιμολογίου
+InvoicePaymentManageStructuredCommunicationHelp=Σε ορισμένες χώρες, είναι απαραίτητο να εμφανιστεί μια δομημένη αναφορά για τη διευκόλυνση των πληρωμών και τη συμφωνία τους
 FreeLegalTextOnInvoices=Ελεύθερο κείμενο στα τιμολόγια
 WatermarkOnDraftInvoices=Υδατογράφημα σε πρόχειρα τιμολόγια (κανένα αν είναι κενό)
 PaymentsNumberingModule=Πρότυπο αρίθμησης πληρωμών
@@ -1718,6 +1723,7 @@ CompressionOfResources=Συμπίεση HTTP απαντήσεων
 CompressionOfResourcesDesc=Για παράδειγμα, χρησιμοποιώντας την οδηγία Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Μια τέτοια αυτόματη ανίχνευση δεν είναι δυνατή με τα τρέχοντα προγράμματα περιήγησης
 DefaultValuesDesc=Εδώ μπορείτε να ορίσετε την προεπιλεγμένη τιμή που θέλετε να χρησιμοποιήσετε κατά τη δημιουργία μιας νέας εγγραφής ή / και τα προεπιλεγμένα φίλτρα ή τη σειρά ταξινόμησης κατά την παρουσίαση λίστας εγγραφών.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Προεπιλεγμένες τιμές (για χρήση σε φόρμες)
 DefaultSearchFilters=Προεπιλεγμένα φίλτρα αναζήτησης
 DefaultSortOrder=Προεπιλεγμένες σειρές ταξινόμησης
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Ενότητες αρίθμησης αποστόλων
 SendingsAbility=Υποστήριξη δελτίων αποστολής για παραδόσεις σε πελάτες
 NoNeedForDeliveryReceipts=Στις περισσότερες περιπτώσεις, τα δελτία αποστολής χρησιμοποιούνται τόσο ως δελτία για παραδόσεις σε πελάτες (κατάλογος προϊόντων προς αποστολή) όσο και ως δελτία που παραλαμβάνονται και υπογράφονται από τον πελάτη. Ως εκ τούτου, η παραλαβή των παραδόσεων προϊόντων είναι διπλότυπο χαρακτηριστικό και σπάνια ενεργοποιείται.
 FreeLegalTextOnShippings=Ελεύθερο κείμενο στις αποστολές
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Ενότητα αρίθμησης αποδείξεων παραδόσεων προϊόντων
 DeliveryOrderModel=Υπόδειγμα απόδειξης παράδοσης προϊόντων
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Ελεύθερο κείμενο στις απο
 ##### FCKeditor #####
 AdvancedEditor=Προηγμένος επεξεργαστής
 ActivateFCKeditor=Ενεργοποιήστε το προηγμένο πρόγραμμα επεξεργασίας για:
-FCKeditorForNotePublic=WYSIWYG δημιουργία/έκδοση του πεδίου «δημόσιες σημειώσεις» στοιχείων
-FCKeditorForNotePrivate=WYSIWYG δημιουργία/έκδοση του πεδίου "ιδιωτικές σημειώσεις" στοιχείων
-FCKeditorForCompany=WYSIWYG δημιουργία/έκδοση της περιγραφής πεδίου στοιχείων (εκτός προϊόντων/υπηρεσιών)
-FCKeditorForProductDetails=WYSIWYG δημιουργία/διόρθωση περιγραφής προϊόντων ή γραμμών για αντικείμενα (γραμμές προσφορών, παραγγελίες, τιμολόγια κ.λπ...).
+FCKeditorForNotePublic=WYSIWYG δημιουργία/τροποποίηση του πεδίου «δημόσιες σημειώσεις» στοιχείων
+FCKeditorForNotePrivate=WYSIWYG δημιουργία/τροποποίηση του πεδίου «ιδιωτικές σημειώσεις» στοιχείων
+FCKeditorForCompany=WYSIWYG δημιουργία/τροποποίηση της περιγραφής πεδίου στοιχείων (εκτός προϊόντων/υπηρεσιών)
+FCKeditorForProductDetails=WYSIWYG δημιουργία/τροποποίηση περιγραφής προϊόντων ή γραμμών για αντικείμενα (γραμμές προσφορών, παραγγελίες, τιμολόγια κ.λπ...).
 FCKeditorForProductDetails2=Προειδοποίηση: Η χρήση αυτής της επιλογής για αυτήν την περίπτωση δεν συνιστάται, καθώς μπορεί να δημιουργήσει προβλήματα με ειδικούς χαρακτήρες και τη μορφοποίηση σελίδας κατά τη δημιουργία αρχείων PDF.
-FCKeditorForMailing= Δημιουργία / έκδοση WYSIWYG για μαζικά eMailings (Εργαλεία-> eMailing)
-FCKeditorForUserSignature=WYSIWYG δημιουργία/έκδοση υπογραφής χρήστη
-FCKeditorForMail=Δημιουργία/έκδοση WYSIWYG για όλη την αλληλογραφία (εκτός από Εργαλεία->EMailing)
-FCKeditorForTicket=Δημιουργία / έκδοση WYSIWYG για tickets
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG δημιουργία/τροποποίηση υπογραφής χρήστη
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG δημιουργία/τροποποίηση για tickets
 ##### Stock #####
 StockSetup=Ρύθμιση ενότητας αποθέματος
 IfYouUsePointOfSaleCheckModule=Εάν χρησιμοποιείτε τη μονάδα Point of Sale (POS) που παρέχεται από προεπιλογή ή μια εξωτερική ενότητα, αυτή η ρύθμιση ενδέχεται να αγνοηθεί από τη ενότητα POS σας. Οι περισσότερες ενότητες POS έχουν σχεδιαστεί από προεπιλογή για να δημιουργούν ένα τιμολόγιο αμέσως και να μειώνουν το απόθεμα ανεξάρτητα από τις επιλογές εδώ. Επομένως, εάν θέλετε ή όχι να έχετε μείωση αποθεμάτων κατά την εγγραφή μιας πώλησης από το POS σας, ελέγξτε επίσης τη ρύθμιση της ενότητας POS.
@@ -1867,7 +1874,6 @@ Buy=Αγορά
 Sell=Πώληση
 InvoiceDateUsed=Ημερομηνία τιμολογίου που χρησιμοποιήθηκε
 YourCompanyDoesNotUseVAT=Η εταιρεία σας έχει οριστεί να μην χρησιμοποιεί ΦΠΑ (Αρχική - Ρυθμίσεις - Εταιρεία / Οργανισμός), επομένως δεν υπάρχουν επιλογές ΦΠΑ για την εγκατάσταση.
-AccountancyCode=Λογιστικός κώδικας
 AccountancyCodeSell=Λογιστικός κώδικας πώλησης
 AccountancyCodeBuy=Λογιστικός κώδικας αγοράς
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Διατηρήστε το πλαίσιο ελέγχου "Αυτόματη δημιουργία πληρωμής" κενό από προεπιλογή κατά τη δημιουργία νέου φόρου
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Ποια προβολή θέλετε να ανοίγετε
 AGENDA_EVENT_PAST_COLOR = Χρώμα παρελθόντος συμβάντος
 AGENDA_EVENT_CURRENT_COLOR = Χρώμα τρέχοντος συμβάντος
 AGENDA_EVENT_FUTURE_COLOR = Χρώμα μελλοντικής εκδήλωσης
-AGENDA_REMINDER_BROWSER = Ενεργοποίηση υπενθύμισης συμβάντος <b> στο πρόγραμμα περιήγησης του χρήστη </b> (Όταν φτάσει η ημερομηνία υπενθύμισης, εμφανίζεται ένα αναδυόμενο παράθυρο από το πρόγραμμα περιήγησης. Κάθε χρήστης μπορεί να απενεργοποιήσει τέτοιες ειδοποιήσεις από τη ρύθμιση ειδοποιήσεων του προγράμματος περιήγησης του).
+AGENDA_REMINDER_BROWSER = Να επιτρέπονται οι υπενθυμίσεις συμβάντων <b>στο πρόγραμμα περιήγησης του χρήστη</b>
+AGENDA_REMINDER_BROWSERHelp = Όταν έρθει η ημερομηνία υπενθύμισης, εμφανίζεται ένα αναδυόμενο παράθυρο από το πρόγραμμα περιήγησης). Η επιλογή/καθυστέρηση υπενθύμισης ορίζεται από τον χρήστη κατά τη δημιουργία συμβάντος.
 AGENDA_REMINDER_BROWSER_SOUND = Ενεργοποίηση ειδοποίησης ήχου
-AGENDA_REMINDER_EMAIL = Ενεργοποίηση υπενθύμισης συμβάντος <b> μέσω email </b> (η επιλογή/καθυστέρηση υπενθύμισης μπορεί να οριστεί σε κάθε συμβάν).
+AGENDA_REMINDER_EMAIL = Να επιτρέπονται υπενθυμίσεις συμβάντων <b>μέσω email</b>
 AGENDA_REMINDER_EMAIL_NOTE = Σημείωση: Η συχνότητα της προγραμματισμένης εργασίας %s πρέπει να είναι αρκετή για να είστε σίγουροι ότι η υπενθύμιση αποστέλλεται τη σωστή στιγμή.
 AGENDA_SHOW_LINKED_OBJECT = Εμφάνιση συνδεδεμένου αντικειμένου στην προβολή ατζέντας
 AGENDA_USE_EVENT_TYPE = Χρήση τύπων συμβάντων (διαχείριση στο μενού Ρυθμίσεις -> Λεξικά -> Τύπος συμβάντων ατζέντας)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Αυτόματη ρύθμιση αυτής της προεπιλεγμένης τιμής για τον τύπο συμβάντος στη φόρμα δημιουργίας συμβάντος
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Χρήση προεπιλεγμένης υπενθύμισης σε αυτά τα συμβάντα
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = Η φόρμα αυτόματης ειδοποίησης υπενθύμισης θα συμπληρωθεί από προεπιλογή κατά τη δημιουργία του συμβάντος
+AGENDA_DEFAULT_REMINDER_OFFSET = Προεπιλεγμένη περίοδος υπενθύμισης πριν από το συμβάν
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Πρότυπο email χρήσης σε προεπιλεγμένη υπενθύμιση
 PasswordTogetVCalExport = Κωδικός για την έγκριση συνδέσμου εξαγωγής
 PastDelayVCalExport=Μην εξάγετε συμβάν παλαιότερο από
 SecurityKey = Κλειδί ασφαλείας
@@ -2006,7 +2017,7 @@ BackupZipWizard=Οδηγός δημιουργίας αρχείου του κατ
 SomethingMakeInstallFromWebNotPossible=Η εγκατάσταση εξωτερικής ενότητας δεν είναι δυνατή από τη διεπαφή ιστού για τον ακόλουθο λόγο:
 SomethingMakeInstallFromWebNotPossible2=Για το λόγο αυτό, η διαδικασία αναβάθμισης που περιγράφεται εδώ είναι μια χειρωνακτική διαδικασία που μπορεί να εκτελέσει μόνο ένας προνομιούχος χρήστης.
 InstallModuleFromWebHasBeenDisabledContactUs=Η εγκατάσταση ή η ανάπτυξη εξωτερικών λειτουργικών μονάδων ή δυναμικών ιστοσελίδων, από την εφαρμογή, είναι προς το παρόν κλειδωμένη για λόγους ασφαλείας. Επικοινωνήστε μαζί μας εάν χρειάζεται να ενεργοποιήσετε αυτήν τη δυνατότητα.
-InstallModuleFromWebHasBeenDisabledByFile=Η εγκατάσταση εξωτερικής ενότητας από την εφαρμογή έχει απενεργοποιηθεί από τον διαχειριστή σας. Πρέπει να του ζητήσετε να αφαιρέσει το αρχείο <strong> %s </strong> για να επιτραπεί αυτή η δυνατότητα.
+InstallModuleFromWebHasBeenDisabledByFile=Η εγκατάσταση εξωτερικής ενότητας από την εφαρμογή και η χρήση λειτουργιών που επιτρέπουν την εκτέλεση κώδικα στον διακομιστή έχει απενεργοποιηθεί από τον διαχειριστή σας. Πρέπει να του ζητήσετε να αφαιρέσει το αρχείο <strong>%s</strong> για να επιτραπεί αυτή η δυνατότητα.
 ConfFileMustContainCustom=Κατά την εγκατάσταση ή τη δημιουργία μιας εξωτερικής ενότητας από την εφαρμογή πρέπει να αποθηκεύσετε τα αρχεία της ενότητας στον κατάλογο <strong> %s </strong>. Για να υποβληθεί σε επεξεργασία αυτού ο κατάλογος από το Dolibarr, πρέπει να ρυθμίσετε το <strong> conf/conf.php </strong> και να προσθέσετε τις 2 γραμμές οδηγιών: <br><strong> $dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Επισήμανση των γραμμών του πίνακα όταν περνάει ο δρομέας του ποντικιού από πάνω
 HighlightLinesColor=Επισήμανση του χρώματος της γραμμής όταν περνάει ο δρομέας του ποντικιού από πάνω (χρησιμοποιήστε 'ffffff' για να μην γίνει επισήμανση)
@@ -2036,6 +2047,7 @@ Enter0or1=Εισαγωγή 0 ή 1
 EnterYesOrNo=Εισάγετε Ναι ή Όχι
 UnicodeCurrency=Εισαγετε εδώ ανάμεσα σε αγκύλες λίστα με αριθμό byte που αντιπροσωπεύει το σύμβολο νομίσματος. Για παράδειγμα: για $, πληκτρολογήστε [36] - για Βραζιλία real R$ [82,36] - για €, πληκτρολογήστε [8364]
 ColorFormat=Το χρώμα RGB είναι σε μορφή HEX, π.χ.: FF0000
+NumberFormatForATotalPrice=Αριθμητική μορφή για τη συνολική τιμή %s
 PictoHelp=Όνομα εικονιδίου σε μορφή: <br> - image.png για ένα αρχείο εικόνας στον τρέχοντα κατάλογο θεμάτων <br> - image.png@module εάν το αρχείο βρίσκεται στον κατάλογο /img/ μιας ενότητας <br> - fa-xxx για ένα FontAwesome fa-xxx εικονίδιο <br> - fontawesome_xxx_fa_color_size για ένα FontAwesome fa-xxx εικονίδιο (με πρόθεμα, χρώμα και μέγεθος)
 PositionIntoComboList=Θέση γραμμής σε σύνθετο πλαίσιο
 SellTaxRate=Συντελεστής φόρου επί των πωλήσεων
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Απόκρυψη τ
 MAIN_PDF_NO_SENDER_FRAME=Απόκρυψη περιγραμμάτων στο πλαίσιο διεύθυνσης αποστολέα
 MAIN_PDF_NO_RECIPENT_FRAME=Απόκρυψη περιγραμμάτων στο πλαίσιο διεύθυνσης παραλήπτη
 MAIN_PDF_HIDE_CUSTOMER_CODE=Απόκρυψη κωδικού πελάτη
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Απόκρυψη κωδικού λογιστικής πελάτη
 MAIN_PDF_HIDE_SENDER_NAME=Απόκρυψη ονόματος αποστολέα/εταιρείας στο πεδίο διευθύνσεων
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Απόκρυψη όρων πληρωμής
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Απόκρυψη τρόπου πληρωμής
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Προσθέστε κρυφής markup στο  πεδίο υπογραφής για να επιτρέψετε στο εργαλείο ηλεκτρονικής υπογραφής να την επαναχρησιμοποιήσει. Μπορεί να χρησιμοποιηθεί από εξωτερικά εργαλεία ή στο μέλλον από τη δυνατότητα ηλεκτρονικής υπογραφής.
@@ -2324,6 +2341,8 @@ NotRecommended=Δεν προτείνεται
 ARestrictedPath=Κάποια περιορισμένη διαδρομή για αρχεία δεδομένων
 CheckForModuleUpdate=Ελέγξτε για ενημερώσεις εξωτερικών ενοτήτων
 CheckForModuleUpdateHelp=Αυτή η ενέργεια θα συνδεθεί με τους επεξεργαστές εξωτερικών ενοτήτων για να ελέγξει εάν είναι διαθέσιμη μια νέα έκδοση.
+CheckForModuleUpdateHelp2=Πραγματοποιείται επίσης σύνδεση με το %s για να ελεγχθεί εάν κάποιες από τις εξωτερικές ενότητες σας έχουν αναφερθεί ως κακόβουλο λογισμικό από την κοινότητα.
+YourIPWillBeRevealedToThisExternalProviders=Η IP σας θα αποκαλυφθεί σε όλους αυτούς τους εξωτερικούς παρόχους.
 ModuleUpdateAvailable=Υπάρχει διαθέσιμη ενημέρωση
 NoExternalModuleWithUpdate=Δεν βρέθηκαν ενημερώσεις για εξωτερικές ενότητες
 SwaggerDescriptionFile=Αρχείο περιγραφής Swagger API (για χρήση με redoc για παράδειγμα)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Εμφάνιση διεύθυνσης αποστο
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Υποχρεωτική αναφορά για κάποιες χώρες (Γαλλία, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Εμφάνιση επαφή χρέωσης στην προσφορά
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=Από προεπιλογή η επαφή εμφανίζεται μόνο για χρέωση
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Σύνδεσμος URL του κοινωνικού δικτύου. Χρησιμοποιήστε το {socialid} για το τμήμα της μεταβλητής που περιέχει το αναγνωριστικό του κοινωνικού δικτύου.
 IfThisCategoryIsChildOfAnother=Αν αυτή η κατηγορία είναι θυγατρική μιας άλλης
 DarkThemeMode=Λειτουργία σκούρου θέματος(Dark theme)
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Προειδοποίηση: η
 WarningModuleHasChangedSecurityCsrfParameter=Προειδοποίηση: η ενότητα %s έχει απενεργοποιήσει την ασφάλεια CSRF της εγκατάστασης σας. Αυτή η ενέργεια είναι ύποπτη και η εγκατάστασή σας ενδέχεται να μην είναι πλέον ασφαλής. Επικοινωνήστε με τον δημιουργό της ενότητας για εξηγήσεις.
 EMailsInGoingDesc=Η διαχείριση των εισερχόμενων email γίνεται από τη ενότητα %s. Πρέπει να την ενεργοποιήσετε και να την διαμορφώσετε εάν χρειάζεται να υποστηρίζετε εισερχόμενα email.
 MAIN_IMAP_USE_PHPIMAP=Χρησιμοποιήστε τη βιβλιοθήκη PHP-IMAP για IMAP αντί για εγγενή PHP IMAP. Αυτό επιτρέπει επίσης τη χρήση μιας σύνδεσης OAuth2 για IMAP (η μονάδα OAuth πρέπει επίσης να είναι ενεργοποιημένη).
-MAIN_CHECKBOX_LEFT_COLUMN=Εμφάνιση της στήλης για την επιλογή πεδίου και γραμμής στα αριστερά (στα δεξιά από προεπιλογή)
+MAIN_CHECKBOX_LEFT_COLUMN=Εμφάνιση της στήλης για την επιλογή πεδίου και γραμμής στα αριστερά (στα δεξιά είναι απενεργοποιημένη)
 NotAvailableByDefaultEnabledOnModuleActivation=Δεν δημιουργήθηκε από προεπιλογή. Δημιουργήθηκε μόνο με την ενεργοποίηση της μονάδας.
 CSSPage=CSS Style
 Defaultfortype=Προκαθορισμένο
@@ -2489,7 +2510,7 @@ AiDescription=Χαρακτηριστικά AI (Τεχνητής Νοημοσύν
 AiDescriptionLong=Παρέχει χαρακτηριστικά AI (Τεχνητής Νοημοσύνης) σε διάφορα μέρη της εφαρμογής. Χρειάζεται εξωτερική AI API.
 AI_API_KEY=Κλειδί AI api
 AI_API_URL=Endpoint  για τo AI api
-AI_API_SERVICE=Υπηρεσία χρήσης λειτουργιών AI
+AI_API_SERVICE=AI service to use
 AiSetup=Ρύθμιση ενότητας ΑΙ
 AiCustomPrompt=Προσαρμοσμένη εντολή AI
 AI_CONFIGURATIONS_PROMPT=Προσαρμοσμένη εντολή
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=Προσαρμοσμένες εντολές ΑΙ για λε
 EnterAnIP=Εισάγετε μια διεύθυνση IP
 ConvertInto=Μετατροπή σε
 YouAreHere=Είστε εδώ
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Εμφάνιση barcode στο PDF αποστολής
 BARCODE_ON_RECEPTION_PDF=Εμφάνιση barcode στο PDF παραλαβής
 BARCODE_ON_STOCKTRANSFER_PDF=Εμφάνιση barcode στο PDF μεταφοράς αποθέματος
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=URL αποσύνδεσης Dolibarr
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim αντιστοιχεί στα στοιχεία σύνδεσης χρήστη Dolibarr. Εάν δεν έχει οριστεί ή είναι κενό, η προεπιλογή είναι email
 BlackListWords=Μαύρη λίστα λέξεων
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Προσθήκη στη μαύρη λίστα
 FediverseSetup=Διαμόρφωση τμήματος fediverse
 ConfigImportSocialNetwork=Διαμόρφωση κοινωνικών δικτύων συμβατών με το Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Όνομα παραμέτρου
 ParamValue=Τιμή παραμέτρου
 ConfirmDeleteParamOfSocialNetwork=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή τη παραμέτρο ;
 HelpMariaDBToGetPossibleValues=Μπορείτε να λάβετε μια λίστα με πιθανές τιμές εκτελώντας την ακόλουθη εντολή SQL: %s
+HelpMariaDBToGetValue=Αυτή η τιμή ανακτήθηκε με την εντολή: %s
+PDFBoxFrameRoundedCorners=Πλαίσια με στρογγυλεμένες γωνίες
+MAIN_PDF_FRAME_CORNER_RADIUS=Η προεπιλεγμένη τιμή για την ακτίνα γωνίας είναι 0, επομένως δεν υπάρχουν στρογγυλεμένες γωνίες. Επιλέξτε τιμές μεταξύ 1-3 για να αυξήσετε την ακτίνα γωνίας και να προσθέσετε στρογγυλεμένες γωνίες στα πλαίσια
 Captcha=Captcha
 CaptchaDesc=Εάν θέλετε να προστατεύσετε τη σελίδα σύνδεσής με ένα Captcha, μπορείτε να επιλέξετε ποιo να χρησιμοποιήσετε εδώ
 DolibarrStandardCaptcha=Ένα captcha που δημιουργήθηκε από τον Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Εμφάνιση διεύθυνσης αποστολής
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Υποχρεωτική αναφορά για κάποιες χώρες (Γαλλία, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Εμφάνιση ανάλυσης ΦΠΑ ανά ποσοστό
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=Έχετε ένα προεπιλεγμένο μέγιστο μέγεθος για λίστες που έχει οριστεί σε <b>%s</b>γραμμές. Αυτή είναι μια μεγάλη τιμή που χρειάζεται κύλιση για να δείτε όλες τις απαντήσεις. Είναι καλύτερα να έχετε μια τιμή χαμηλότερη από <b>%s</b>και να χρησιμοποιείτε σελιδοποίηση για να δείτε την εγγραφή σε αυτόν τον αριθμό. Αλλάξτε αυτό στο μενού Αρχική - Ρυθμίσεις - Εμφάνιση.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Αποκλεισμός εγκατάστασης για ενότητες που είναι στην <b>Απομακρυσμένη μαύρη λίστα</b>
+CheckIfModuleIsNotBlackListedHelp=Ορισμένες ενότητες ενδέχεται να παρέχονται από ορισμένες εταιρείες που δεν σέβονται τους κανόνες καλής θέλησης του έργου (μη συμμόρφωση με τον GDPR, παραβίαση των κανόνων για τη χρήση της επωνυμίας Dolibarr, κ.λπ.) . Επιλέγοντας αυτό το πλαίσιο, θα υποβληθεί ένα αίτημα στον διακομιστή του έργου για να διαπιστωθεί εάν ελήφθη μια αναφορά σχετικά με αυτή την ενότητα, και θα σας προστατεύσει αποκλείοντας την ανάπτυξη των επισημασμένων ενοτήτων
+DatabaseEncryption=Κρυπτογράφηση στη βάση δεδομένων
+AlgorithmFor=Αλγόριθμος για: %s
+SensitiveData=Ευαίσθητα δεδομένα
+ToolToDecryptAString=Εργαλείο για την αποκρυπτογράφηση μιας συμβολοσειράς
+Decrypt=Αποκρυπτογράφηση
+FilesIntegrityDesc=Εάν θέλετε να ελέγξετε την ακεραιότητα των αρχείων αντί της βάσης δεδομένων, μπορείτε να το κάνετε χρησιμοποιώντας <a href="%s">αυτό το εργαλείο</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=Υπάρχουν περισσότερες από %s απαντήσεις με το φίλτρο σας. Προσθέστε περισσότερα φίλτρα...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index 32d1a8edacd..3d18fbb7f1b 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Τελικό Υπόλοιπο
 CurrentBalance=Τρέχον Υπόλοιπο
 FutureBalance=Μελλοντικό Υπόλοιπο
 ShowAllTimeBalance=Εμφάνιση Υπολοίπου από την αρχή
-AllTime=Από την αρχή
 Reconciliation=Συμφωνία
 RIB=Αριθμός Τραπ. Λογαριασμού
 IBAN=IBAN
@@ -151,7 +150,7 @@ FutureTransaction=Μελλοντική συναλλαγή. Δεν μπορεί 
 SelectChequeTransactionAndGenerate=Επιλέξτε/φιλτράρετε τις επιταγές που θα συμπεριληφθούν στην απόδειξη κατάθεσης επιταγών. Στη συνέχεια, κάντε κλικ στο "Δημιουργία".
 SelectPaymentTransactionAndGenerate=Επιλέξτε/φιλτράρετε τα έγγραφα που πρόκειται να συμπεριληφθούν στην απόδειξη κατάθεσης %s. Στη συνέχεια, κάντε κλικ στο "Δημιουργία".
 InputReceiptNumber=Επιλέξτε το αντίγραφο κίνησης τραπεζικού λογαριασμού που σχετίζεται με τη συνδιαλλαγή. Χρησιμοποιήστε μια αριθμητική τιμή με δυνατότητα ταξινόμησης
-InputReceiptNumberBis=YYYYMM or YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Προαιρετικά, μια κατηγορία στην οποία θα ταξινομηθούν οι εγγραφές
 ToConciliate=Για συμφωνία;
 ThenCheckLinesAndConciliate=Στη συνέχεια, ελέγξτε τις γραμμές που υπάρχουν στο αντίγραφο κίνησης του τραπεζικού λογαριασμού και κάντε κλικ
@@ -188,8 +187,8 @@ BankColorizeMovementDesc=Εάν αυτή η λειτουργία είναι εν
 BankColorizeMovementName1=Χρώμα φόντου για την κίνηση χρέωσης
 BankColorizeMovementName2=Χρώμα φόντου για την πιστωτική κίνηση
 IfYouDontReconcileDisableProperty=Εάν δεν πραγματοποιήσετε τις τραπεζικές συμφωνίες σε ορισμένους τραπεζικούς λογαριασμούς, απενεργοποιήστε την ιδιότητα "%s" σε αυτούς για να καταργήσετε αυτήν την προειδοποίηση.
-NoBankAccountDefined=Δεν έχει οριστεί τραπεζικός λογαριασμός
-NoRecordFoundIBankcAccount=Δεν βρέθηκε κάποιο αρχείο στον τραπεζικό λογαριασμό. Συνήθως, αυτό συμβαίνει όταν μια εγγραφή έχει διαγραφεί με μη αυτόματο τρόπο από τη λίστα συναλλαγών στον τραπεζικό λογαριασμό (για παράδειγμα κατά τη διάρκεια συμφωνίας του τραπεζικού λογαριασμού). Ένας άλλος λόγος είναι ότι η πληρωμή καταγράφηκε όταν η ενότητα "%s" ήταν απενεργοποιημένη.
+NoBankAccountDefined=Δεν βρέθηκε τραπεζικός λογαριασμός
+NoRecordFoundIBankcAccount=Δεν βρέθηκε κάποια εγγραφή στον τραπεζικό λογαριασμό. Συνήθως, αυτό συμβαίνει όταν μια εγγραφή έχει διαγραφεί με μη αυτόματο τρόπο από τη λίστα συναλλαγών στον τραπεζικό λογαριασμό (για παράδειγμα κατά τη διάρκεια συμφωνίας του τραπεζικού λογαριασμού). Ένας άλλος λόγος είναι ότι η πληρωμή καταγράφηκε όταν η ενότητα "%s" ήταν απενεργοποιημένη.
 AlreadyOneBankAccount=Έχει ήδη οριστεί ένας τραπεζικός λογαριασμός
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Παραλλαγή αρχείου SEPA
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Ναι = Αποθηκεύστε τον 'Τύπο Πληρωμής' στην ενότητα 'Μεταφορά Πίστωσης' του αρχείου SEPA<br><br>Όταν δημιουργείτε ένα αρχείο SEPA XML για μεταφορές πίστωσης, η ενότητα "PaymentTypeInformation" μπορεί τώρα να τοποθετηθεί μέσα στην ενότητα "CreditTransferTransactionInformation" (αντί για την ενότητα "Payment"). Σας συνιστούμε ανεπιφύλακτα να μην επιλέξετε αυτήν την επιλογή για να τοποθετήσετε το PaymentTypeInformation στο επίπεδο της πληρωμής, καθώς όλες οι τράπεζες δεν θα το αποδεχθούν απαραιτήτως στο επίπεδο CreditTransferTransactionInformation. Επικοινωνήστε με την τράπεζά σας πριν τοποθετήσετε το PaymentTypeInformation στο επίπεδο CreditTransferTransactionInformation.
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index 86dd5411c24..a9f90ca08c0 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -169,6 +169,7 @@ BillTo=Στοιχεία Πελάτη
 ShippingTo=Αποστολή σε
 ActionsOnBill=Ενέργειες στο τιμολόγιο
 ActionsOnBillRec=Ενέργειες σε επαναλαμβανόμενο τιμολόγιο
+InvoicesGeneratedFromRec=Δημιουργημένα τιμολόγια
 RecurringInvoiceTemplate=Πρότυπο / Επαναλαμβανόμενο τιμολόγιο
 NoQualifiedRecurringInvoiceTemplateFound=Κανένα πρότυπο επαναλαμβανόμενου τιμολογίου δεν είναι κατάλληλο για δημιουργία.
 FoundXQualifiedRecurringInvoiceTemplate=%s πρότυπα επαναλαμβανόμενων τιμολογίων κατάλληλα για δημιουργία.
@@ -182,6 +183,7 @@ LastCustomersBills=Τελευταία %s τιμολόγια πελατών
 LastSuppliersBills=Τελευταία %s τιμολόγια προμηθευτών
 AllBills=Όλα τα τιμολόγια
 AllCustomerTemplateInvoices=Όλα τα πρότυπα τιμολογίων
+AllSupplierTemplateInvoices=Όλα τα πρότυπα τιμολογίων
 OtherBills=Άλλα τιμολόγια
 DraftBills=Προσχέδια τιμολογίων
 CustomersDraftInvoices=Προσχέδια τιμολογίων πελατών
@@ -419,6 +421,7 @@ InvoiceAutoValidate=Αυτόματη επικύρωση τιμολογίων
 GeneratedFromRecurringInvoice=Δημιουργήθηκε από το πρότυπο επαναλαμβανόμενο τιμολόγιο %s
 DateIsNotEnough=Η ημερομηνία δεν έχει φτάσει ακόμα
 InvoiceGeneratedFromTemplate=Τιμολόγιο %s που δημιουργήθηκε από το επαναλαμβανόμενο πρότυπο τιμολόγιο %s
+InvoiceGeneratedFromTemplateError=Error Invoice %s generated from recurring template invoice %s : %s
 GeneratedFromTemplate=Δημιουργήθηκε από το πρότυπο τιμολόγιο %s
 WarningInvoiceDateInFuture=Προειδοποίηση, η ημερομηνία τιμολογίου είναι μεγαλύτερη από την τρέχουσα ημερομηνία
 WarningInvoiceDateTooFarInFuture=Προειδοποίηση, η ημερομηνία τιμολογίου είναι αρκετά μεταγενέστερη από την τρέχουσα ημερομηνία
@@ -495,6 +498,8 @@ IBANNumber=IBAN Αριθμού λογαριασμού
 IBAN=IBAN
 CustomerIBAN=IBAN πελάτη
 SupplierIBAN=IBAN προμηθευτή
+DebitBankAccount = Τραπεζικός λογαριασμός άμεσης χρέωσης
+SetDebitBankAccount = Ορισμός τραπεζικού λογαριασμού άμεσης χρέωσης
 BIC=BIC/SWIFT
 BICNumber=Κωδικός BIC / SWIFT
 ExtraInfos=Επιπρόσθετες Πληροφορίες
@@ -513,10 +518,12 @@ PrettyLittleSentence=Αποδεχτείτε το ποσό των πληρωμώ
 IntracommunityVATNumber=Ενδοκοινοτικό ΑΦΜ
 PaymentByChequeOrderedTo=Οι πληρωμές με επιταγή (συμπεριλαμβανομένου του φόρου) είναι πληρωτέες σε %s, αποστολή στο
 PaymentByChequeOrderedToShort=Οι πληρωμές με επιταγή (συμπεριλαμβανομένου του φόρου) ειναι καταβλητέες προς
+StructuredCommunication=Δομημένη επικοινωνία
 SendTo=Αποστολή σε
 PaymentByTransferOnThisBankAccount=Πληρωμή με μεταφορά στον ακόλουθο τραπεζικό λογαριασμό
 VATIsNotUsedForInvoice=* Μη εφαρμοστέο ΦΠΑ άρθρο-293B του CGI
 VATIsNotUsedForInvoiceAsso=* Μη εφαρμοστέο ΦΠΑ άρθρο-261-7 του CGI
+VATIsNotUsedReverseChargeProcedure=* Non applicable VAT art-259-1 of CGI
 LawApplicationPart1=Με εφαρμογή του νόμου 80.335 της 12/05/80
 LawApplicationPart2=τα εμπορεύματα παραμένουν στην κυριότητα του
 LawApplicationPart3=πωλητή μέχρι την πλήρη πληρωμή του
@@ -661,6 +668,7 @@ MentionCategoryOfOperations0=Διανομή αγαθών
 MentionCategoryOfOperations1=Παροχή υπηρεσιών
 MentionCategoryOfOperations2=Μικτή - Παράδοση αγαθών & παροχή υπηρεσιών
 Salaries=Μισθοί
+InvoiceSubtype=Τύπος παραστατικού
 SalaryInvoice=Μισθός
 BillsAndSalaries=Λογαριασμοί & Μισθοί
 CreateCreditNoteWhenClientInvoiceExists=Αυτή η επιλογή ενεργοποιείται μόνο όταν υπάρχουν επικυρωμένα τιμολόγια για ένα πελάτη ή όταν χρησιμοποιείται η σταθερά INVOICE_CREDIT_NOTE_STANDALONE (χρήσιμο για ορισμένες χώρες)
diff --git a/htdocs/langs/el_GR/blockedlog.lang b/htdocs/langs/el_GR/blockedlog.lang
index 50c26e57096..7c3e345b416 100644
--- a/htdocs/langs/el_GR/blockedlog.lang
+++ b/htdocs/langs/el_GR/blockedlog.lang
@@ -6,8 +6,8 @@ CompanyInitialKey=Αρχικό κλειδί εταιρείας (hash of genesis
 BrowseBlockedLog=Αμετάβλητα αρχεία καταγραφής
 ShowAllFingerPrintsMightBeTooLong=Εμφάνιση όλων των αρχειοθετημένων αρχείων καταγραφής (μπορεί να είναι μεγάλα)
 ShowAllFingerPrintsErrorsMightBeTooLong=Εμφάνιση όλων των μη έγκυρων αρχείων καταγραφής (μπορεί να είναι μεγάλα)
-DownloadBlockChain=Λήψη Block Chain 
-KoCheckFingerprintValidity=Η αρχειοθετημένη καταχώριση αρχείου καταγραφής δεν είναι έγκυρη. Σημαίνει ότι κάποιος (ένας χάκερ;) έχει τροποποιήσει ορισμένα δεδομένα αυτής της εγγραφής μετά την καταγραφή της, ή έχει διαγράψει την προηγούμενη αρχειοθετημένη εγγραφή (ελέγξτε ότι η γραμμή με το προηγούμενο # υπάρχει) ή έχει τροποποιήσει το  άθροισμα ελέγχου(checksum) της προηγούμενης εγγραφής.
+DownloadBlockChain=Λήψη Block Chain
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Η αρχειοθετημένη εγγραφή αρχείου καταγραφής είναι έγκυρη. Τα δεδομένα σε αυτή τη γραμμή δεν τροποποιήθηκαν και η καταχώρηση ακολουθεί την προηγούμενη.
 OkCheckFingerprintValidityButChainIsKo=Το αρχειοθετημένο αρχείο καταγραφής φαίνεται έγκυρο σε σύγκριση με το προηγούμενο, αλλά η αλυσίδα είχε αλλοιωθεί στο παρελθόν.
 AddedByAuthority=Αποθηκευμένο σε απομακρυσμένη αρχή
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Στοιχεία αρχείου καταγραφής
 ListOfTrackedEvents=Λίστα συμβάντων υπό ελεγχο
 Fingerprint=Fingerprint
 DownloadLogCSV=Εξαγωγή αρχειοθετημένων αρχείων καταγραφής (CSV)
-DataOfArchivedEvent=Πλήρη δεδομένα αρχειοθετημένου γεγονότος
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Το αρχικό αντικείμενο (τύπος %s, id %s) δεν είναι συνδεδεμένο (δείτε τη στήλη "Πλήρη δεδομένα" για να λάβετε αμετάβλητα αποθηκευμένα δεδομένα)
 BlockedLogAreRequiredByYourCountryLegislation=Η ενότητα Αμετάβλητα αρχεία καταγραφής ενδέχεται να απαιτείται από τη νομοθεσία της χώρας σας. Η απενεργοποίηση αυτής της ενότητας μπορεί να καταστήσει άκυρες τυχόν μελλοντικές συναλλαγές σε σχέση με τη νομοθεσία και τη χρήση νομικού λογισμικού, καθώς δεν μπορούν να επικυρωθούν από φορολογικό έλεγχο.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Η ενότητα Αμετάβλητα αρχεία καταγραφής ενεργοποιήθηκε λόγω της νομοθεσίας της χώρας σας. Η απενεργοποίηση αυτής της ενότητας μπορεί να καταστήσει άκυρες τυχόν μελλοντικές συναλλαγές σε σχέση με τη νομοθεσία και τη χρήση νομικού λογισμικού, καθώς δεν μπορούν να επικυρωθούν από φορολογικό έλεγχο.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Έχει ενεργοποιηθεί το σύστημα για
 BlockedLogDisabled=Έχει απενεργοποιηθεί το σύστημα για την παρακολούθηση συμβάντων σε μη τροποποιήσημα αρχεία καταγραφής αφού έχει γίνει ήδη καταγραφή. Αποθηκεύσαμε ένα ειδικό Fingerprint για να παρακολουθούμε την αλυσίδα ως σπασμένη.
 BlockedLogDisabledBis=Έχει απενεργοποιηθεί το σύστημα για την παρακολούθηση συμβάντων σε μη τροποποιήσημα αρχεία καταγραφής. Αυτό είναι δυνατόν γιατί καμιά εγγραφή δεν έχει γίνει ακόμα.
 LinkHasBeenDisabledForPerformancePurpose=Για λόγους απόδοσης, ο απευθείας σύνδεσμος στο έγγραφο δεν εμφανίζεται μετά την 100η γραμμή.
+SavedOnLine=Αποθηκεύτηκε στη γραμμή
 
 ## logTypes
 logBILL_DELETE=Το τιμολόγιο πελάτη διαγράφηκε λογικά 
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Λογική διαγραφή πληρωμής πελ
 logPAYMENT_VARIOUS_CREATE=Δημιουργήθηκε η πληρωμή (δεν εκχωρείται σε τιμολόγιο).
 logPAYMENT_VARIOUS_DELETE=Λογική διαγραφή πληρωμής (δεν εκχωρείται σε τιμολόγιο).
 logPAYMENT_VARIOUS_MODIFY=Τροποποιήθηκε η πληρωμή (δεν έχει αντιστοιχιστεί σε τιμολόγιο).
+logBLOCKEDLOG_EXPORT=Εξαγωγή αμετάβλητων αρχείων καταγραφής σε αρχείο
diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang
index 7c6e0bbc771..fe835b013c9 100644
--- a/htdocs/langs/el_GR/categories.lang
+++ b/htdocs/langs/el_GR/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Τομέας ετικετών/κατηγοριών επα
 AccountsCategoriesArea=Τομέας ετικετών/κατηγοριών τραπεζικού λογαριασμού
 ProjectsCategoriesArea=Τομέας ετικετών/κατηγοριών έργου
 UsersCategoriesArea=Τομέας ετικετών/κατηγοριών χρήστη
+Bank_linesCategoriesArea==Τομέας ετικετών/κατηγορίων τραπεζικών γραμμών
 SubCats=Υποκατηγορίες
 CatList=Λίστα Ετικετών/Κατηγοριών
 CatListAll=Λίστα ετικετών/κατηγοριών (όλοι οι τύποι)
@@ -90,9 +91,10 @@ CategoriesSetup=Ρύθμιση ετικετών/κατηγοριών
 CategorieRecursiv=Αυτόματη σύνδεση με γονική ετικέτα/κατηγορία
 CategorieRecursivHelp=Εάν η επιλογή είναι ενεργοποιημένη, όταν προσθέτετε ένα αντικείμενο σε μια υποκατηγορία, αυτό θα προστίθεται επίσης και στις γονικές κατηγορίες.
 AddProductServiceIntoCategory=Ορισμός κατηγορίας στο προϊόν/υπηρεσία
-AddCustomerIntoCategory=Εκχώρηση κατηγορίας στον πελάτη
-AddSupplierIntoCategory=Εκχώρηση κατηγορίας στον προμηθευτή
-AssignCategoryTo=Εκχώρηση κατηγορίας σε
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Εμφάνιση ετικέτας/κατηγορίας
 ByDefaultInList=Από προεπιλογή στη λίστα
 ChooseCategory=Επιλέξτε κατηγορία
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Κατηγορίες Σελίδας-Κοντέινε
 KnowledgemanagementsCategoriesArea=Κατηγορίες άρθρων Διαχείρισης Γνώσης (KM)
 UseOrOperatorForCategories=Χρησιμοποιήστε τον τελεστή 'OR' για κατηγορίες
 AddObjectIntoCategory=Προσθήκη αντικειμένου στην κατηγορία
+FichintersCategoriesArea=Κατηγορίες Παρέμβασης
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 9de065effa9..02a97523afa 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Η χώρα βρίσκεται εντός της Ευρωπαϊκ
 PriceFormatInCurrentLanguage=Μορφή εμφάνισης τιμής στην τρέχουσα γλώσσα και νόμισμα
 ThirdPartyName=Όνομα τρίτου μέρους
 ThirdPartyEmail=Email τρίτου μέρους
-ThirdParty=Τρίτο μέρος
-ThirdParties=Πελάτες/Προμηθευτές
+ThirdParty=Πελ./Προμ.
+ThirdParties=Τρίτα μέρη
 ThirdPartyProspects=Προοπτικές
 ThirdPartyProspectsStats=Προοπτικές
 ThirdPartyCustomers=Πελάτες
@@ -65,6 +65,7 @@ State=Νομός/Δήμος
 StateId=Αναγνωριστικό Νομού
 StateCode=Κωδικός Νομού / Δήμου
 StateShort=Νομός
+DepartmentBuyer=Νομός/Δήμος του αγοραστή
 Region=Περιφέρεια
 Region-State=Περιφέρεια - Π.Ε.
 Country=Χώρα
@@ -78,7 +79,7 @@ Chat=Συνομιλία
 PhonePro=Επαγγ. τηλέφωνο
 PhonePerso=Προσωπ. τηλέφωνο
 PhoneMobile=Κιν. τηλέφωνο
-No_Email=Απόρριψη μαζικών Email
+No_Email=Refuse mass emails
 Fax=Φαξ
 Zip=Ταχ. Κώδικας
 Town=Πόλη
@@ -382,12 +383,12 @@ ExportCardToFormat=Εξαγωγή κάρτας σε μορφή
 ContactNotLinkedToCompany=Η επαφή δεν συνδέεται με κανένα τρίτο μέρος
 DolibarrLogin=Είσοδος Dolibarr
 NoDolibarrAccess=Χωρίς πρόσβαση στο Dolibarr
-ExportDataset_company_1=Πελάτες/Προμηθευτές (εταιρείες / ιδρύματα / φυσικά πρόσωπα) και οι ιδιότητές τους
-ExportDataset_company_2=Επαφές και οι ιδιότητες τους
-ExportDataset_company_3=Τραπεζικοί λογαριασμοί Πελατών/Προμηθευτών
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Πρόσθετες επαφές/διευθύνσεις και χαρακτηριστικά Πελατών/Προμηθευτών
+ExportDataset_company_3=Τρόποι πληρωμής τρίτων μερών (τραπεζικοί λογαριασμοί)
 ImportDataset_company_1=Πελάτες/Προμηθευτές και οι ιδιότητές τους
 ImportDataset_company_2=Πρόσθετες επαφές/διευθύνσεις και χαρακτηριστικά Πελατών/Προμηθευτών
-ImportDataset_company_3=Τραπεζικοί λογαριασμοί Πελατών/Προμηθευτών
+ImportDataset_company_3=Τρόποι πληρωμής τρίτων μερών (τραπεζικοί λογαριασμοί)
 ImportDataset_company_4=Αντιπρόσωποι πωλήσεων τρίτων μερών (εκχώρηση εκπροσώπων πωλήσεων / χρηστών σε εταιρείες)
 PriceLevel=Επίπεδο τιμών
 PriceLevelLabels=Ετικέτες επιπέδου τιμής
@@ -461,3 +462,6 @@ ExternalSystemID=Αναγνωριστικό εξωτερικού συστήμα
 IDOfPaymentInAnExternalSystem=Αναγνωριστικό του τρόπου πληρωμής σε ένα εξωτερικό σύστημα (όπως Stripe, Paypal, ...)
 AADEWebserviceCredentials=Στοιχεία πρόσβασης υπηρεσιών ΑΑΔΕ
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Το τρίτο μέρος πρέπει να είναι πελάτης για να επιτρέπεται η καταχώρηση των τραπεζικών του στοιχείων από το Stripe
+NewSocNameForClone=Νέο όνομα εταιρίας
+ConfirmCloneThirdparties=Είστε σίγουροι ότι θέλετε να δημιουργήσετε αντίγραφο της εταιρίας <b>%s</b></s ='notranslate'>;
+SocialNetworksBusiness=Κοινωνικά δίκτυα εταιρίας
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index 62ed86a1eba..a0842e5513e 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -81,14 +81,14 @@ MenuNewSocialContribution=Νέα κοινωνική/φορολογική εισ
 NewSocialContribution=Νέα Κοινωνική/Φορολογική εισφορά
 AddSocialContribution=Προσθήκη κοινωνικής/φορολογικής εισφοράς
 ContributionsToPay=Κοινωνικές/Φορολογικές εισφορές προς πληρωμή
-AccountancyTreasuryArea=Τομέας Λογιστικής 
+AccountancyTreasuryArea=Τομέας Λογιστικής
 InvoicesArea=Τομέας χρεώσεων και πληρωμών
 NewPayment=Νέα Πληρωμή
 PaymentCustomerInvoice=Πληρωμή τιμολογίου πελάτη
 PaymentSupplierInvoice=πληρωμή τιμολογίου προμηθευτή
 PaymentSocialContribution=Πληρωμή Κοινωνικής/Φορολογικής εισφοράς
 PaymentVat=Πληρωμή Φ.Π.Α.
-AutomaticCreationPayment=Αυτόματη καταγραφή πληρωμής
+AutomaticCreationPayment=Also record the payment
 ListPayment=Λίστα πληρωμών
 ListOfCustomerPayments=Λίστα πληρωμών πελατών
 ListOfSupplierPayments=Λίστα πληρωμών προμηθευτών
@@ -118,10 +118,14 @@ SocialContributionsPayments=Πληρωμές Κοινωνικών/Φορολογ
 ShowVatPayment=Εμφάνιση πληρωμής ΦΠΑ
 TotalToPay=Σύνολο πληρωμής
 BalanceVisibilityDependsOnSortAndFilters=Το υπόλοιπο είναι ορατό σε αυτήν τη λίστα μόνο εάν ο πίνακας είναι ταξινομημένος σε %s και φιλτράρεται σε 1 τραπεζικό λογαριασμό (χωρίς άλλα φίλτρα)
+CustomerAccountancyCodeGeneral=Κωδικός γενικής  λογιστικής
 CustomerAccountancyCode=Λογιστικός κωδικός πελάτη
+SupplierAccountancyCodeGeneral=Γενικός κωδικός λογιστικής
 SupplierAccountancyCode=Λογιστικός κωδικός προμηθευτή
+UserAccountancyCodeGeneral=Γενικός κωδικός λογιστικής
 CustomerAccountancyCodeShort=Λογιστικός κωδικός πελάτη
 SupplierAccountancyCodeShort=Λογιστικός κωδικός προμηθευτή
+UserAccountancyCodeShort=Κωδικός λογιστικής χρήστη
 AccountNumber=Αριθμός Λογαριασμού
 NewAccountingAccount=Νέος Λογαριασμός
 Turnover=Τιμολογημένος κύκλος εργασιών(τζίρος)
@@ -129,11 +133,13 @@ TurnoverCollected=Κύκλος εργασιών(τζίρος) που εισπρ
 SalesTurnoverMinimum=Ελάχιστος κύκλος εργασιών(τζίρος)
 ByExpenseIncome=Ανα έξοδα και έσοδα
 ByThirdParties=Ανά τρίτα μέρη
+ByProjects=Ανα έργα
 ByUserAuthorOfInvoice=Ανά συντάκτη τιμολογίου
+DetailedListLowercase=αναλυτική λίστα
 CheckReceipt=Απόδειξη κατάθεσης
 CheckReceiptShort=Απόδειξη κατάθεσης
-LastCheckReceiptShort=Τελευταίες %s αποδείξεις κατάθεσης 
-LastPaymentForDepositShort=Τελευταίες %s %s αποδείξεις κατάθεσης  
+LastCheckReceiptShort=Τελευταίες %s αποδείξεις κατάθεσης
+LastPaymentForDepositShort=Τελευταίες %s %s αποδείξεις κατάθεσης
 NewCheckReceipt=Νέα έκπτωση
 NewCheckDeposit=Νέα απόδειξη κατάθεσης
 NewCheckDepositOn=Δημιουργία απόδειξης για κατάθεση στο λογαριασμό: %s
@@ -260,7 +266,7 @@ ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Λογαριασμός (από το Λ
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Λογαριασμός (από το Λογιστικό σχέδιο) που θα χρησιμοποιηθεί ως προεπιλεγμένος λογαριασμός ΦΠΑ σε αγορές για αντιστροφές χρεώσεων (Χρέωση)
 ACCOUNTING_ACCOUNT_CUSTOMER=Λογαριασμός (από το Λογιστικό Σχέδιο) που χρησιμοποιείται για τρίτους "πελάτες".
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Ο αποκλειστικός λογιστικός λογαριασμός που ορίζεται στην κάρτα τρίτων θα χρησιμοποιηθεί μόνο για τη λογιστική Βοηθητικού καθολικού. Αυτό θα χρησιμοποιηθεί για το Γενικό Καθολικό και ως προεπιλεγμένη τιμή της λογιστικής Βοηθητικού καθολικού εάν δεν έχει καθοριστεί αποκλειστικός λογιστικός λογαριασμός πελάτη σε τρίτο μέρος.
-ACCOUNTING_ACCOUNT_SUPPLIER=Λογαριασμός (από το Λογιστικό Σχέδιο) που χρησιμοποιείται για τους τρίτους "προμηθευτές" 
+ACCOUNTING_ACCOUNT_SUPPLIER=Λογαριασμός (από το Λογιστικό Σχέδιο) που χρησιμοποιείται για τους τρίτους "προμηθευτές"
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Ο αποκλειστικός λογιστικός λογαριασμός που ορίζεται στην στην καρτέλα τρίτου μέρους θα χρησιμοποιηθεί μόνο για τη λογιστική του Βοηθητικού καθολικού. Αυτό θα χρησιμοποιηθεί για το Γενικό Καθολικό και ως προεπιλεγμένη τιμή της λογιστικής του Βοηθητικού καθολικού εάν δεν έχει καθοριστεί αποκλειστικός λογιστικός λογαριασμός προμηθευτή στο τρίτο μέρος.
 ConfirmCloneTax=Επιβεβαιώστε την αντιγραφή ενός κοινωνικού / φορολογικού φόρου
 ConfirmCloneVAT=Επιβεβαιώστε την αντιγραφή μιας δήλωσης ΦΠΑ
diff --git a/htdocs/langs/el_GR/datapolicy.lang b/htdocs/langs/el_GR/datapolicy.lang
index 212cc1f7c0c..04b9b814732 100644
--- a/htdocs/langs/el_GR/datapolicy.lang
+++ b/htdocs/langs/el_GR/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Πολιτική Προστασίας Δεδομένων
 Module4100Desc = Ενότητα διαχείρισης προστασίας δεδομένων (Συμμόρφωση με τον GDPR)
 # Administration page
 datapolicySetup = Ρύθμιση Ενότητας Πολιτικής Προστασίας Δεδομένων
-Deletion = Διαγραφή δεδομένων
-datapolicySetupPage = Σύμφωνα και με τη νομοθεσία της χώρας μας (Παράδειγμα <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external"> Άρθρο 5 </a> του GDPR), τα προσωπικά δεδομένα πρέπει να διατηρούνται για περίοδο που δεν υπερβαίνει την απαραίτητη για τους σκοπούς για τους οποίους συλλέχθηκαν, εκτός από αρχειακούς σκοπούς. <br> Η διαγραφή θα γίνει αυτόματα μετά από μια ορισμένη περίοδο χωρίς συμβάν (το χρονικό διάστημα που θα έχετε υποδείξει παρακάτω).
+DataDeletion=Διαγραφή δεδομένων
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s μήνες
 ONE_YEAR = 1 χρόνος
 NB_YEARS = %s χρόνια
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Προοπτική/Πελάτης
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Ούτε προοπτική/Ούτε πελάτης
 DATAPOLICY_CONTACT_FOURNISSEUR = Προμηθευτής
 DATAPOLICY_ADHERENT = Μέλος
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Μπορείτε να στείλετε ένα μήνυμα ηλεκτρονικού ταχυδρομείου GDPR σε όλες τις σχετικές επαφές σας (που δεν έχουν λάβει ακόμη email και για τις οποίες δεν έχετε καταχωρίσει τίποτα σχετικά με τη συμφωνία GDPR τους). Για να το κάνετε αυτό, χρησιμοποιήστε το παρακάτω κουμπί.
 SendAgreement = Αποστολή email
 AllAgreementSend = Όλα τα email έχουν σταλεί
 TXTLINKDATAPOLICYACCEPT = Κείμενο για τον σύνδεσμο "συγκατάθεση"
 TXTLINKDATAPOLICYREFUSE = Κείμενο για τον σύνδεσμο "άρνηση συγκατάθεσης"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR : Επεξεργασία προσωπικών δεδομένων
 DATAPOLICY_consentement = Ελήφθη συγκατάθεση για την επεξεργασία προσωπικών δεδομένων
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 1f406f6c849..d6172feeebe 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Σφάλμα κατά τη δημιου
 ErrorFailedToCreateDir=Αποτυχία δημιουργίας καταλόγου. Ελέγξτε ότι ο χρήστης του διακομιστή Web έχει δικαιώματα εγγραφής στον κατάλογο εγγράφων Dolibarr. Εάν η παράμετρος <b> safe_mode </b> είναι ενεργοποιημένη σε αυτήν την PHP, ελέγξτε ότι τα αρχεία php Dolibarr ανήκουν σε χρήστη (ή ομάδα) διακομιστή web.
 ErrorNoMailDefinedForThisUser=Δεν έχει οριστεί mail για αυτόν το χρήστη
 ErrorSetupOfEmailsNotComplete=Η ρύθμιση των email δεν έχει ολοκληρωθεί
+ErrorAccountingClosureSetupNotComplete=Η ρύθμιση των λογαριασμών κλεισίματος δεν ολοκληρώθηκε
 ErrorFeatureNeedJavascript=Αυτό το χαρακτηριστικό απαιτεί ενεργοποίηση της javascript. Αλλάξτε την ρύθμιση στο Ρυθμίσεις - Εμφάνιση.
 ErrorTopMenuMustHaveAParentWithId0=Ένα μενού τύπου "Top" δεν μπορεί να έχει γονικό μενού. Βάλτε 0 στο γονικό μενού ή επιλέξτε ένα μενού τύπου «Left».
 ErrorLeftMenuMustHaveAParentId=Ένα μενού τύπου "Left" πρέπει να έχει αναγνωριστικό γονέα.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Η μεταφόρτωση απετράπει από έ
 ErrorFileSizeTooLarge=Το μέγεθος του αρχείου είναι πολύ μεγάλο ή το αρχείο δεν παρέχεται.
 ErrorFieldTooLong=Το πεδίο %s είναι πολύ μεγάλο.
 ErrorSizeTooLongForIntType=Το μέγεθος είναι υπερβολικά μεγάλο για τιμή τύπου int (ακεραίου) (%s ψηφία το περισσότερο
+ErrorSizeForStarsType=Το μέγεθος του αστεριού πρέπει να είναι ένας αριθμός μεταξύ 1 και 10
 ErrorSizeTooLongForVarcharType=Το μέγεθος είναι υπερβολικά μεγάλο για τιμή τύπου string (%s ψηφία το περισσότερο)
 ErrorNoValueForSelectType=Παρακαλώ συμπληρώστε την τιμή για τη λίστα επιλογής
 ErrorNoValueForCheckBoxType=Παρακαλώ συμπληρώστε την τιμή για τη λίστα πλαισίου ελέγχου
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Λάθος τιμή για τον κωδικό ασφαλε
 ErrorBothFieldCantBeNegative=Τα πεδία %s και %s δεν μπορούν να είναι και τα δύο αρνητικά
 ErrorFieldCantBeNegativeOnInvoice=Το πεδίο <strong>%s</strong> δεν μπορεί να είναι αρνητικό σε αυτόν τον τύπο τιμολογίου. Εάν χρειάζεται να προσθέσετε μια γραμμή έκπτωσης, απλώς δημιουργήστε πρώτα την έκπτωση (από το πεδίο '%s' στην κάρτα τρίτου μέρους) και εφαρμόστε την στο τιμολόγιο.
 ErrorLinesCantBeNegativeForOneVATRate=Το σύνολο των γραμμών (καθαρό από φόρους) δεν μπορεί να είναι αρνητικό για έναν δεδομένο μη μηδενικό συντελεστή ΦΠΑ (Βρέθηκε αρνητικό σύνολο για τον συντελεστή ΦΠΑ <b> %s </b> %%).
-ErrorLinesCantBeNegativeOnDeposits=Οι γραμμές δεν μπορούν να είναι αρνητικές σε μια κατάθεση. Θα αντιμετωπίσετε προβλήματα όταν θα χρειαστεί να καταναλώσετε την προκαταβολή στο τελικό τιμολόγιο εάν το κάνετε.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Η ποσότητα στην γραμμή των τιμολογίων  πελατών δεν μπορεί να είναι αρνητική
+ErrorQtyForSupplierInvoiceCantBeNegative=Η ποσότητα της γραμμής στα τιμολόγια προμηθευτών δεν μπορεί να είναι αρνητική
 ErrorWebServerUserHasNotPermission=Ο λογαριασμός χρήστη <b> %s </b> που χρησιμοποιείται για την εκτέλεση του διακομιστή web δεν έχει άδεια για αυτό
 ErrorNoActivatedBarcode=Δεν έχει ενεργοποιηθεί κάποιος τύπος γραμμικού κώδικα
 ErrUnzipFails=Αποτυχία αποσυμπίεσης του %s με το ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=Το πεδίο ημερομηνία λήξης δεν μπο
 ErrorStartHourIsNull=Το πεδίο ημερομηνία έναρξης δεν μπορεί να είναι κενό
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Πάρα πολλές γραμμές για επεξεργασία. Χρησιμοποιήστε ένα πιο επιλεκτικό φίλτρο.
 ErrorEmptyValueForQty=Η ποσότητα δεν μπορεί να είναι μηδενική.
+ErrorNoCloneWithoutName=Ο νέος χρήστης πρέπει να έχει όνομα
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = Η παραγγελθείσα ποσότητα δεν μπορεί να είναι μικρότερη από την ποσότητα προς αποστολή.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Σφάλμα, η δημιουργία μιας γενικής πληρωμής σε τραπεζικό λογαριασμό με νόμισμα διαφορετικό από το νόμισμα της Εταιρίας δεν υποστηρίζεται ακόμη.
+ErrorStreamMustBeEnabled=Το PHP stream %s δεν είναι διαθέσιμο. Ελέγξτε τις PHP ενότητες σας και την παράμετρο Dolibarr $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Η παράμετρος PHP upload_max_filesize (%s) είναι υψηλότερη από την παράμετρο PHP post_max_size (%s). Αυτή δεν είναι μια συνεπής ρύθμιση.
 WarningPasswordSetWithNoAccount=Ορίστηκε κωδικός πρόσβασης για αυτό το μέλος. Ωστόσο, δεν δημιουργήθηκε λογαριασμός χρήστη. Επομένως, αυτός ο κωδικός πρόσβασης είναι αποθηκευμένος, αλλά δεν μπορεί να χρησιμοποιηθεί για τη σύνδεση στο Dolibarr. Μπορεί να χρησιμοποιηθεί από μια εξωτερική ενότητα/διεπαφή, αλλά αν δεν χρειάζεται να ορίσετε κανένα στοιχείο σύνδεσης ή κωδικό πρόσβασης για ένα μέλος, μπορείτε να απενεργοποιήσετε την επιλογή "Διαχείριση σύνδεσης για κάθε μέλος" από τη ρύθμιση της ενότητας μέλους. Εάν θέλετε να διαχειριστείτε μια σύνδεση, αλλά δεν χρειάζεστε κωδικό πρόσβασης, μπορείτε να διατηρήσετε αυτό το πεδίο κενό για να αποφύγετε αυτήν την προειδοποίηση. Σημείωση: Το email μπορεί επίσης να χρησιμοποιηθεί ως σύνδεση εάν το μέλος είναι συνδεδεμένο με έναν χρήστη.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=Αυτό το αναγνωριστικό γο
 WarningReadBankAlsoAllowedIfUserHasPermission=Προειδοποίηση, η ανάγνωση τραπεζικού λογαριασμού επιτρέπεται επίσης με την άδεια Διαχείρισης του λογιστικού σχεδίου
 WarningNoDataTransferedInAccountancyYet=Λάβετε υπόψη ότι δεν υπάρχουν δεδομένα στον πίνακα Λογιστικής. Μεταφέρετε τα δεδομένα σας που έχουν καταγραφεί στην εφαρμογή στην ενότητα Λογιστική ή αλλάξτε τη λειτουργία υπολογισμού για να αναλύσετε τα δεδομένα που έχουν καταγραφεί εκτός της λογιστικής.
 WarningChangingThisMayBreakStopTaskScheduler=Προειδοποίηση, η αλλαγή αυτής της τιμής μπορεί να απενεργοποιήσει τον προγραμματιστή
+WarningAmountOfFileDiffersFromSumOfLines=Προειδοποίηση, η ποσότητα του αρχείου (%s) διαφέρει από το άθροισμα των γραμμών (%s)
+WarningModuleAffiliatedToAReportedCompany=Προειδοποίηση, αυτή η ενότητα έχει αναφερθεί στο ίδρυμα Dolibarr ότι δημοσιεύτηκε από κάποια εταιρία χρησιμοποιώντας παράνομες πρακτικές (μη συμμόρφωση με τους κανόνες για τη χρήση της επωνυμίας Dolibarr, τη συλλογή των δεδομένων σας χωρίς τη συγκατάθεσή σας ή την ανάπτυξη κακόβουλου λογισμικού).
+WarningModuleAffiliatedToAPiratPlatform=Να είστε προσεκτικοί όταν λαμβάνετε μια ενότητα (με πληρωμή ή δωρεάν) από μια ύποπτη μη επίσημη πλατφόρμα όπως η %s
+
 SwissQrOnlyVIR = Το SwissQR μπορεί να προστεθεί μόνο σε τιμολόγια που έχουν οριστεί για πληρωμή με πληρωμές μεταφοράς πίστωσης.
 SwissQrCreditorAddressInvalid = Η διεύθυνση του πιστωτή δεν είναι έγκυρη (Έχουν οριστεί ο ταχυδρομικός κώδικας και η πόλη; (%s)
 SwissQrCreditorInformationInvalid = Τα στοιχεία του πιστωτή δεν είναι έγκυρα για το IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=Η επαφή %s έχει ήδη ο
 ErrorThisGroupIsAlreadyDefinedAsThisType=Οι επαφές με αυτήν την ομάδα έχουν ήδη οριστεί ως επαφή για αυτόν τον τύπο.
 EmptyMessageNotAllowedError=Δεν επιτρέπεται το κενό μήνυμα
 ErrorIsNotInError=Το %s δεν είναι λάθος
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/el_GR/exports.lang b/htdocs/langs/el_GR/exports.lang
index b2480f7d100..1a6a1876566 100644
--- a/htdocs/langs/el_GR/exports.lang
+++ b/htdocs/langs/el_GR/exports.lang
@@ -67,7 +67,7 @@ ChooseFormatOfFileToImport=Επιλέξτε τη μορφή αρχείου πο
 ChooseFileToImport=Μεταφορτώστε το αρχείο και κάντε κλικ στο εικονίδιο %s για να επιλέξετε αρχείο ως αρχείο εισαγωγής προέλευσης ...
 SourceFileFormat=Μορφή αρχείου προέλευσης
 FieldsInSourceFile=Πεδία αρχείου προέλευσης
-FieldsInTargetDatabase=Πεδία στόχευσης στη βάση δεδομένων Dolibarr (έντονα=υποχρεωτικά)
+FieldsInTargetDatabase=Πεδία στόχευσης στη βάση δεδομένων Dolibarr
 NoFields=Χωρίς πεδία
 MoveField=Μετακίνηση πεδίου αριθμού στήλης %s
 ExampleOfImportFile=Παράδειγμα_αρχείου_εισαγωγής
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Ελέγξτε ότι η μορφή αρχείου (ορ
 RunSimulateImportFile=Εκτέλεση προσομοίωσης εισαγωγής
 FieldNeedSource=Το πεδίο απαιτεί δεδομένα από το αρχείο προέλευσης
 SomeMandatoryFieldHaveNoSource=Ορισμένα υποχρεωτικά πεδία δεν έχουν αντιστοιχιστεί με το αρχείο δεδομένων προέλευσης
-InformationOnSourceFile=Πληροφορίες για το αρχείο προέλευσης
-InformationOnTargetTables=Πληροφορίες για τα πεδία προορισμού
+InformationOnSourceFile=Πηγαίο αρχείο
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Επιλέξτε τουλάχιστον ένα πεδίο στη στήλη των πεδίων για εξαγωγή
 SelectFormat=Επιλέξτε αυτήν τη μορφή αρχείου εισαγωγής
 RunImportFile=Εισαγωγή δεδομένων
@@ -137,7 +137,7 @@ FilteredFields=Φιλτραρισμένα πεδία
 FilteredFieldsValues=Τιμή για φίλτρο
 FormatControlRule=Κανόνας ελέγχου μορφοποίησης
 ## imports updates
-KeysToUseForUpdates=Κλειδί (στήλη) για χρήση <b>ενημέρωσης</b> υφιστάμενων δεδομένων 
+KeysToUseForUpdates=Κλειδί (στήλη) για χρήση <b>ενημέρωσης</b> υφιστάμενων δεδομένων
 NbInsert=Αριθμός εισαγόμενων γραμμών: %s
 NbInsertSim=Αριθμός γραμμών που θα εισαχθούν: %s
 NbUpdate=Αριθμός ενημερωμένων γραμμών: %s
diff --git a/htdocs/langs/el_GR/hrm.lang b/htdocs/langs/el_GR/hrm.lang
index ae87f72ca6f..bdd3080d35f 100644
--- a/htdocs/langs/el_GR/hrm.lang
+++ b/htdocs/langs/el_GR/hrm.lang
@@ -46,11 +46,11 @@ NewEval=Νέα αξιολόγηση ικανοτήτων
 ValidateEvaluation=Επικύρωση αξιολόγησης ικανοτήτων
 ConfirmValidateEvaluation=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτή την αξιολόγηση ικανοτήτων με αναφορά <b>%s</b>;
 EvaluationCard=Αξιολόγηση ικανοτήτων
-RequiredRank=Απαιτούμενη κατάταξη για αυτή τη θέση εργασίας
-RequiredRankShort=Απαιτούμενη κατάταξη
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Θέσεις με αυτό το προφίλ εργασίας
-EmployeeRank=Κατάταξη υπαλλήλου για αυτήν την δεξιότητα
-EmployeeRankShort=Κατάταξη υπαλλήλου
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Θέση υπαλλήλου
 EmployeePositions=Θέσεις υπαλλήλων
 EmployeesInThisPosition=Υπάλληλοι σε αυτή τη θέση
@@ -98,3 +98,5 @@ NeedBusinessTravels=Ανάγκη επαγγελματικών ταξιδιών
 NoDescription=Χωρίς περιγραφή
 TheJobProfileHasNoSkillsDefinedFixBefore=Το αξιολογημένο προφίλ εργασίας αυτού του υπαλλήλου δεν δεξιότητες ορισμένες σε αυτό. Προσθέστε δεξιότητες, διαγράψτε και επανεκκινήστε την αξιολόγηση.
 PDFStandardHrmEvaluation=Τυπικό πρότυπο για τη δημιουργία ενός εγγράφου PDF για μια αξιολόγηση ικανοτήτων
+SkillNotRequired=Μη απαιτούμενη δεξιότητα
+LinkToUserCreated=Σύνδεσμος με έναν υπάλληλο εάν ο αιτών έχει προσληφθεί και μετατράπηκε σε χρήστη.
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index 371369a8efe..d24c66c72a6 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=EMailing
 EMailing=EMailing
-EMailings=EMailings
+EMailings=Mass EMails
 SMSings=SMS
-AllEMailings=Όλα τα email
+AllEMailings=All mass eMails
 MailCard=Κάρτελα email
 MailRecipients=Παραλήπτες
 MailRecipient=Παραλήπτης
@@ -26,19 +26,19 @@ MailFile=Επισυναπτόμενα Αρχεία
 MailMessage=Σώμα email
 SubjectNotIn=Όχι στο θέμα
 BodyNotIn=Όχι στο Σώμα
-ShowEMailing=Εμφάνιση email
-ListOfEMailings=Λίστα email
-NewMailing=Νέα αποστολή email
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Νέο sms
-EditMailing=Επεξεργασία email
-ResetMailing=Εκ νέου αποστολή email
-ConfirmResetMailingTargetMassaction=Επιβεβαίωση της επαναφοράς της κατάστασης των στόχων
-ResetMailingTargetMassaction=Επαναφορά της κατάστασης στόχων
-DeleteMailing=Διαγραφή email
-PreviewMailing=Προεπισκόπηση email
-CreateMailing=Δημιουργία email
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Επαναφορά κατάστασης σε σφάλμα
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=Επικύρωση email
+ValidMailing=Valid mass Email
 MailingStatusDraft=Προσχέδιο
 MailingStatusValidated=Επικυρωμένο
 MailingStatusSent=Απεσταλμένο
@@ -55,7 +55,7 @@ ErrorMailRecipientIsEmpty=Το πεδίο παραλήπτη του email είν
 WarningNoEMailsAdded=Δεν υπάρχει νέο email για προσθήκη στη λίστα παραληπτών.
 ConfirmValidMailing=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτό το email;
 ConfirmResetMailing=Προειδοποίηση, ενεργοποιώντας εκ νέου την αποστολή e-mail <b>%s</b> , θα επιτρέψετε την εκ νέου αποστολή αυτού του μηνύματος ηλεκτρονικού ταχυδρομείου σε μια μαζική αποστολή αλληλογραφίας. Είστε σίγουροι ότι αυτό θέλετε;
-ConfirmResetMailingTargetMassactionQuestion=Are you sure you want to reset the status of the selected recipients (this may means that email will be resent if you use the Send email feature of the emailing) ?
+ConfirmResetMailingTargetMassactionQuestion=Είστε σίγουροι ότι θέλετε να επαναφέρετε την κατάσταση των επιλεγμένων παραληπτών (αυτό μπορεί να σημαίνει ότι το email θα σταλεί εκ νέου εάν χρησιμοποιήσετε τη λειτουργία Αποστολή email) ;
 ConfirmDeleteMailing=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το email;
 NbOfUniqueEMails=Αριθμός μοναδικών email
 NbOfUniquePhones=Νούμερο μοναδικών τηλεφωνικών αριθμών
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Όλα τα φίλτρα πρέπει να ταιριά
 LineInFile=Γραμμή %s στο αρχείο
 RecipientSelectionModules=Ορίζονται αιτήματα για την επιλογή του παραλήπτη
 MailSelectedRecipients=Επιλεγμένοι αποδέκτες
-MailingArea=Τομεας Emailings
-LastMailings=Τελευταία %s email
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Στατιστικά στόχων
 NbOfCompaniesContacts=Μοναδικές επαφές/διευθύνσεις
 MailNoChangePossible=Παραλήπτες με επικυρωμένες ηλεκτρονικές διευθύνσεις δεν μπορούν να αλλάξουν
-SearchAMailing=Αναζήτηση αλληλογραφίας
-SendMailing=Αποστολή email
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Στάλθηκε από
 AdvancedAlternative=Προχωρημένη εναλλακτική
 MailingNeedCommand=Η αποστολή ενός email μπορεί να πραγματοποιηθεί από τη γραμμή εντολών. Ζητήστε από τον διαχειριστή του διακομιστή σας να εκκινήσει την ακόλουθη εντολή για να στείλετε το email σε όλους τους παραλήπτες:
 MailingNeedCommand2=Μπορείτε, ωστόσο, να τους στείλετε σε απευθείας σύνδεση με την προσθήκη της παραμέτρου MAILING_LIMIT_SENDBYWEB με την αξία του μέγιστου αριθμού των μηνυμάτων ηλεκτρονικού ταχυδρομείου που θέλετε να στείλετε από τη συνεδρία. Για το σκοπό αυτό, πηγαίνετε στο Αρχική - Ρυθμίσεις - Άλλες Ρυθμίσεις.
 ConfirmSendingEmailing=Εάν θέλετε να στείλετε email απευθείας από αυτήν την οθόνη, παρακαλώ επιβεβαιώστε
-LimitSendingEmailing=Σημείωση: Η αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου από διαδικτυακή διεπαφή γίνεται αρκετές φορές για λόγους ασφαλείας και τη λήξη χρόνου, <b>%s</b> παραλήπτες ταυτόχρονα για κάθε συνεδρία αποστολής.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Εκκαθάριση λίστας
 ToClearAllRecipientsClickHere=Κάντε κλικ εδώ για να διαγράψετε τη λίστα παραληπτών για αυτό το email
 ToAddRecipientsChooseHere=Προσθέστε παραλήπτες επιλέγοντας από τις λίστες
-NbOfEMailingsReceived=Μαζικές αποστολές έλαβαν
-NbOfEMailingsSend=Μαζική αλληλογραφία αποστέλλεται
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID εγγραφής
 DeliveryReceipt=Αναφορά παράδοσης
 YouCanUseCommaSeparatorForSeveralRecipients=Μπορείτε να χρησιμοποιήσετε το <b>κόμμα</b> σαν διαχωριστή για να καθορίσετε πολλούς παραλήπτες.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Δεν έχουν προγραμματιστεί αυ
 ANotificationsWillBeSent=1 αυτόματη ειδοποίηση θα σταλεί μέσω email
 SomeNotificationsWillBeSent=%sαυτόματες ειδοποιήσεις θα αποσταλούν μέσω email
 AddNewNotification=Εγγραφείτε σε μια νέα αυτόματη ειδοποίηση μέσω email (στόχος/συμβάν)
-ListOfActiveNotifications=Ενεργές συνδρομές (στόχοι/συμβάντα) για αυτόματη ειδοποίηση μέσω email
+ListOfActiveNotifications=Ενεργές συνδρομές
+ListOfActiveNotificationsHelp=Λίστα ζευγαριού %s/%s που έχουν εγγραφεί για αυτόματη ειδοποίηση μέσω email
 ListOfNotificationsDone=Απεσταλμένες αυτόματες ειδοποιήσεις email
+ListOfNotificationsDoneHelp=Λίστα προηγούμενων απεσταλμένων ειδοποιήσεων email
 MailSendSetupIs=Διαμόρφωση αποστολή email έχει ρυθμιστεί σε '%s'. Αυτή η λειτουργία δεν μπορεί να χρησιμοποιηθεί για να σταλθούν μαζικά μηνύματα ηλεκτρονικού ταχυδρομείου.
 MailSendSetupIs2=Θα πρέπει πρώτα να πάτε, με έναν λογαριασμό διαχειριστή, στο μενού %s Αρχική - Ρύθμιση - Emails %s για να αλλάξετε την παράμετρο <strong>'%s'</strong> για να χρησιμοποιήσετε τη λειτουργία '%s'. Με αυτόν τον τρόπο, μπορείτε να μεταβείτε στις ρυθμίσεις του διακομιστή SMTP παρέχεται από τον Internet Service Provider και να χρησιμοποιήσετε τη Μαζική αποστολή ηλεκτρονικού ταχυδρομείου.
 MailSendSetupIs3=Αν έχετε οποιαδήποτε απορία σχετικά με το πώς να ρυθμίσετε το διακομιστή SMTP σας, μπορείτε να ζητήσετε στο %s.
@@ -183,7 +185,7 @@ Information=Πληροφορίες
 ContactsWithThirdpartyFilter=Επαφές με φίλτρο τρίτου μέρους
 Unanswered=Αναπάντητα
 Answered=Απαντημένα
-IsNotAnAnswer=Δεν ειναι απάντηση (αρχικού email)
+IsNotAnAnswer=Δεν είναι απάντηση (είναι αρχικό email)
 IsAnAnswer=Είναι μια απάντηση ενός αρχικού email
 RecordCreatedByEmailCollector=Εγγραφή που δημιουργήθηκε από τον Συλλέκτη email %s
 DefaultBlacklistMailingStatus=Προεπιλεγμένη τιμή για το πεδίο '%s' κατά τη δημιουργία μιας νέας επαφής
@@ -199,6 +201,6 @@ ModelTemplate=Πρότυπο email
 YouCanChooseAModelForYouMailContent= Μπορείτε να επιλέξετε ένα από τα πρότυπα ή να δημιουργήσετε ένα με χρήση AI
 TitleOfMailHolder=Επικεφαλίδα e-mail
 ContentOfMailHolder=Περιεχόμενο του email...
-LastNews=Last News
+LastNews=Τελευταία Νέα
 ListProducts= Κατάλογος προϊόντων
 PasswordReset=Επαναφορά κωδικού πρόσβασης
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index aa29743448d..af14320e290 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -498,7 +498,7 @@ ActionRunningNotStarted=Δεν έχουν ξεκινήσει
 ActionRunningShort=Σε εξέλιξη
 ActionDoneShort=Ολοκληρωμένες
 ActionUncomplete=Ατελής
-LatestLinkedEvents=Τελευταία %s συνδεδεμένα συμβάντα
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Εταιρεία / Οργανισμός
 Accountant=Λογιστής
 ContactsForCompany=Επαφές για αυτό το τρίτο μέρος
@@ -798,7 +798,7 @@ Notes=Σημειώσεις
 AddNewLine=Προσθήκη νέας γραμμής
 AddFile=Προσθήκη Αρχείου
 FreeZone=Προϊόν ελεύθερου κειμένου
-FreeLineOfType=Στοιχείο ελεύθερου κειμένου, πληκτρολογήστε:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Αντιγραφή αντικειμένου με τα βασικά του χαρακτηριστικά
 ReGeneratePDF=Επαναπαραγωγή PDF
 PDFMerge=Συγχώνευση PDF
@@ -891,6 +891,7 @@ OriginFileName=Αρχική Ονομασία
 SetDemandReason=Ρυθμίστε την πηγή
 SetBankAccount=Προσδιορίστε Τραπεζικό λογαριασμό
 AccountCurrency=Νόμισμα Λογαριασμού
+AccountancyCode=Λογιστικός κώδικας
 ViewPrivateNote=Προβολή σημειώσεων
 XMoreLines=%s γραμμή (ές) κρυμμένη
 ShowMoreLines=Εμφάνιση περισσότερων / λιγότερων γραμμών
@@ -1155,6 +1156,7 @@ ContactDefault_project_task=Εργασία
 ContactDefault_propal=Προσφορά
 ContactDefault_supplier_proposal=Προσφορά Προμηθευτή
 ContactDefault_ticket=Ticket
+ContactDefault_societe=Πελ./Προμ.
 ContactAddedAutomatically=Προστέθηκε επαφή από ρόλους τρίτων επαφών
 More=Περισσότερα
 ShowDetails=Εμφάνιση λεπτομερειών
@@ -1251,6 +1253,7 @@ CommercialAffected=Ορίστηκε αντιπρόσωπος πωλήσεων
 CommercialsDisaffected=Οι αντιπρόσωποι πωλήσεων αποσυνδέθηκαν
 CommercialDisaffected=Ο αντιπρόσωπος πωλήσεων αποσυνδέθηκε
 Message=Μήνυμα
+Emailing=Emailing
 Progression=Πρόοδος
 YourMessage=Το μήνυμά σας
 YourMessageHasBeenReceived=Το μήνυμά σας έχει ληφθεί. Θα απαντήσουμε ή θα επικοινωνήσουμε μαζί σας το συντομότερο δυνατό.
@@ -1339,3 +1342,10 @@ addToFilter=Προσθήκη
 FilterAssistance=Επεξεργαστής φίλτρου
 Operator=Operator
 AllFieldsRequired=Όλα τα πεδία είναι υποχρεωτικά.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Από την αρχή
+Transferred=Transferred
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index ebd2ce3ca8e..d40537dd0fd 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -55,7 +55,7 @@ MemberStatusActive=Επικυρώθηκε (αναμονή συνδρομής)
 MemberStatusActiveShort=Επικυρωμένο
 MemberStatusActiveLate=Η συνδρομή έληξε
 MemberStatusActiveLateShort=Ληγμένη
-MemberStatusPaid=Πληρωμένη συνδρομή 
+MemberStatusPaid=Πληρωμένη συνδρομή
 MemberStatusPaidShort=Ενημερωμένη
 MemberStatusExcluded=Αποκλεισμένο Μέλος 
 MemberStatusExcludedShort=Αποκλεισμένο
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Εάν απαιτείται συνδρομή, πρέπ
 DeleteType=Διαγραφή
 VoteAllowed=Δικαίωμα ψήφου
 Physical=Ιδιώτης
-Moral=Εταιρεία
-MorAndPhy=Εταιρία και ιδιώτης
+Moral=Νομικό πρόσωπο
+MorAndPhy=Νομικό πρόσωπο και Φυσικό πρόσωπο
 Reenable=Ενεργοποιήστε ξανά
 ExcludeMember=Αποκλείστε ένα μέλος
 Exclude=Αποκλείστε
@@ -123,7 +123,7 @@ ForceMemberType=Επιβολή του τύπου μέλους
 ExportDataset_member_1=Μέλη και συνδρομές
 ImportDataset_member_1=Μέλη
 LastMembersModified=Τελευταία %s μέλη που τροποποιήθηκαν
-LastSubscriptionsModified=Τελευταίες%sτροποποιημένες συνεισφορές 
+LastSubscriptionsModified=Τελευταίες%sτροποποιημένες συνεισφορές
 PublicMemberCard=Δημόσια κάρτα μέλους
 SubscriptionNotRecorded=Η συνδρομή δεν καταγράφηκε
 AddSubscription=Δημιουργία συνδρομής
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Στατιστικά στοιχεία μελών αν
 NbOfMembers=Συνολικός αριθμός μελών
 NbOfActiveMembers=Συνολικός αριθμός ενεργών μελών
 NoValidatedMemberYet=Δεν βρέθηκαν επικυρωμένα μέλη
-MembersByCountryDesc=Αυτή η οθόνη εμφανίζει τα στατιστικά στοιχεία των μελών ανά χώρα. Τα γραφήματα και διαγράμματα εξαρτώνται από τη διαθεσιμότητα της διαδικτυακής υπηρεσίας γραφημάτων της Google καθώς και από τη διαθεσιμότητα μιας λειτουργικής σύνδεσης στο διαδίκτυο.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Αυτή η οθόνη εμφανίζει στατιστικά στοιχεία μελών ανά Νομό/Δήμο/Κοινότητα.
 MembersByTownDesc=Αυτή η οθόνη εμφανίζει στατιστικά των μελών ανά πόλη.
 MembersByNature=Αυτή η οθόνη εμφανίζει στατιστικά στοιχεία μελών ανά φύση.
@@ -202,30 +203,30 @@ LastMemberDate=Ημερομηνία εγγραφής τελευταίου μέλ
 LatestSubscriptionDate=Ημερομηνία τελευταίας συνδρομής
 MemberNature=Φύση του μέλους
 MembersNature=Φύση των μελών
-Public=%s μπορώ να δημοσιεύσω τη συνδρομή μου στο <a target="_blank" href="%s"> δημόσιο μητρώο </a> 
+Public=%s μπορώ να δημοσιεύσω τη συνδρομή μου στο <a target="_blank" href="%s"> δημόσιο μητρώο </a>
 MembershipPublic=Δημόσια συνδρομή
 NewMemberbyWeb=Προστέθηκε νέο μέλος. Εν αναμονή έγκρισης
 NewMemberForm=Φόρμα νέου μέλους
 SubscriptionsStatistics=Στατιστικά στοιχεία συνδρομών
 NbOfSubscriptions=Αριθμός συνδρομών
-AmountOfSubscriptions=Ποσό που εισπράχθηκε από συνδρομές
+AmountOfSubscriptions=Ποσό που εισπράχθηκε από συνδρομές μελών
 TurnoverOrBudget=Κύκλος εργασιών (για εταιρεία) ή προϋπολογισμός (για ίδρυμα)
-DefaultAmount=Προεπιλεγμένο ποσό συνδρομής (χρησιμοποιείται μόνο εάν δεν έχει καθοριστεί ποσό σε επίπεδο τύπου μέλους)
-MinimumAmount=Ελάχιστο ποσό (χρησιμοποιείται μόνο όταν το ποσό συνδρομής είναι ελεύθερο)
+DefaultAmount=Προεπιλεγμένο ποσό συνδρομής μέλους (χρησιμοποιείται μόνο εάν δεν έχει καθοριστεί ποσό σε επίπεδο τύπου μέλους)
+MinimumAmount=Ελάχιστο ποσό πληρωμής συνδρομής (έχει προτεραιότητα σε τυχόν προεπιλεγμένα ποσά)
 CanEditAmount=Το ποσό συνδρομής μπορεί να οριστεί από το μέλος
 CanEditAmountDetail=Ο επισκέπτης μπορεί να επιλέξει/επεξεργαστεί το ποσό της συνεισφοράς του ανεξάρτητα από τον τύπο μέλους
 AmountIsLowerToMinimumNotice=Το ποσό είναι χαμηλότερο από το ελάχιστο %s
 MEMBER_NEWFORM_PAYONLINE=Μετά την online εγγραφή, μεταβείτε αυτόματα στη σελίδα online πληρωμής
 ByProperties=Ανά φύση
 MembersStatisticsByProperties=Στατιστικά στοιχεία μελών κατά φύση
-VATToUseForSubscriptions=Ποσοστό ΦΠΑ για τις εισφορές
-NoVatOnSubscription=Χωρίς ΦΠΑ για εισφορές
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Προϊόν που χρησιμοποιείται για τη γραμμή συνδρομής στο τιμολόγιο: %s
+VATToUseForSubscriptions=Συντελεστής ΦΠΑ  πληρωμής συνδρομής μέλους
+NoVatOnSubscription=Χωρίς ΦΠΑ για τη πληρωμή συνδρομής
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Προϊόν που χρησιμοποιείται για τη γραμμή ιδιότητας μέλους στο τιμολόγιο: %s
 NameOrCompany=Όνομα ή Εταιρία
 SubscriptionRecorded=Η συνδρομή καταγράφηκε
 NoEmailSentToMember=Δεν εστάλη email στο μέλος
 EmailSentToMember=Το email στάλθηκε στο μέλος την %s
-SendReminderForExpiredSubscriptionTitle=Αποστολή υπενθύμισης μέσω email για συνδρομές που έχουν λήξει
+SendReminderForExpiredSubscriptionTitle=Αποστολή υπενθύμισης μέσω email για ληγμένη συνδρομή
 SendReminderForExpiredSubscription=Αποστολή υπενθύμισης μέσω email στα μέλη όταν η συνδρομή πρόκειται να λήξει (η παράμετρος είναι ο αριθμός ημερών πριν από το τέλος της ιδιότητας μέλους για την αποστολή της υπενθύμισης. Μπορεί να είναι μια λίστα ημερών που χωρίζονται με ερωτηματικό, για παράδειγμα '10;5;0;-5 ')
 MembershipPaid=Η συνδρομή καταβλήθηκε για την τρέχουσα περίοδο (έως %s)
 YouMayFindYourInvoiceInThisEmail=Σε αυτό το email θα βρείτε συνημμένο το τιμολόγιο σας
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Ένα τρίτο μέρος είναι η νομι
 MemberFirstname=Όνομα μέλους
 MemberLastname=Επώνυμο μέλους
 MemberCodeDesc=Κωδικός μέλους, μοναδικός για όλα τα μέλη
-MemberSubscriptionStartFirstDayOf=Η ημερομηνία έναρξης μιας συνδρομής αντιστοιχεί στην πρώτη ημέρα μιας
-MemberSubscriptionStartAfter=Ελάχιστη περίοδος πριν από την είσοδο σε ισχύ της ημερομηνίας έναρξης μιας συνδρομής εκτός ανανεώσεων (παράδειγμα +3m = +3 μήνες, -5d = -5 ημέρες, +1Y = +1 έτος)
+MemberSubscriptionStartFirstDayOf=Επιβάλετε η προτεινόμενη ημερομηνία μιας συνδρομής να αντιστοιχεί στην πρώτη ημέρα μιας
+MemberSubscriptionStartAfter=Ελάχιστη περίοδος πριν από την είσοδο σε ισχύ της ημερομηνίας έναρξης μιας συνδρομής(εξαιρουμένων των ανανεώσεων)
+NoCorrection=Καμία διόρθωση
+MemberSubscriptionStartAfterDesc=Παράδειγμα: +3m = +3 μήνες, -5d = -5 ημέρες, +1Y = +1 έτος
+MemberSubscriptionStartAfterDesc2=Αυτή είναι η προτεινόμενη ημερομηνία κατά τη δημιουργία μιας πρώτης συνδρομής μέλους σε σύγκριση με την τρέχουσα ημερομηνία. Για ανανέωση, η ημερομηνία που προτείνεται από προεπιλογή θα παραμείνει το τέλος της προηγούμενης συνδρομής.
 SubscriptionLinkedToConciliatedTransaction=Η συνδρομή συνδέεται με μια συμβιβασμένη συναλλαγή, οπότε αυτή η τροποποίηση δεν επιτρέπεται.
 ConfirmMassSubsriptionCreation=Επιβεβαίωση δημιουργίας συνδρομής(ων)
 ConfirmMassSubsriptionCreationQuestion=Είστε σίγουροι ότι θέλετε για να δημιουργήσετε τις %s επιλεγμένες συνδρομές;
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index dfc0770a0b3..d32bda7d2a2 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -97,7 +97,6 @@ ShowService=Εμφάνιση Υπηρεσίας
 ProductsAndServicesArea=Περιοχή Προϊόντων και Υπηρεσιών 
 ProductsArea=Περιοχή Προϊόντων
 ServicesArea=Περιοχή Υπηρεσιών
-ListOfStockMovements=Λίστα κινήσεων αποθέματος
 BuyingPrice=Τιμή Αγοράς
 PriceForEachProduct=Προϊόντα με συγκεκριμένες τιμές
 SupplierCard=Καρτέλα προμηθευτή
@@ -172,7 +171,7 @@ BuyingPrices=Τιμές Αγοράς
 CustomerPrices=Τιμές Πελατών
 SuppliersPrices=Τιμές προμηθευτών
 SuppliersPricesOfProductsOrServices=Τιμές προμηθευτών (προϊόντων ή υπηρεσιών)
-CustomCode=Τελωνείο|Εμπόρευμα|Κωδικός HS
+CustomCode=Τελωνείο|Εμπόρευμα|Κωδικός HS|Κωδικός TARIC
 CountryOrigin=Χώρα προέλευσης
 RegionStateOrigin=Περιοχή προέλευσης
 StateOrigin=Πολιτεία|Επαρχία προέλευσης
@@ -210,6 +209,7 @@ unitL=Λίτρο
 unitT=τόνος
 unitKG=kg
 unitG=Γραμμάριο
+unitGAL=γαλόνι
 unitMG=mg
 unitLB=Λίβρες
 unitOZ=ουγκιά
@@ -312,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Η μορφή αιτήματος είναι {"U
 UpdateInterval=Διάρκεια ενημέρωσης (λεπτά)
 LastUpdated=Τελευταία ενημέρωση
 CorrectlyUpdated=Ενημερώθηκε σωστά
-PropalMergePdfProductActualFile=Αρχείο/α που θα προστεθούν στο AZUR pdf
+PropalMergePdfProductActualFile=Αρχείο PDF για συμπερίληψη στα PDF προσφορών εάν το προϊόν είναι μέρος της προσφοράς...
 PropalMergePdfProductChooseFile=Επιλογή αρχείων pdf
 IncludingProductWithTag=Συμπεριλαμβανομένων προϊόντων/υπηρεσιών με την ετικέτα
 DefaultPriceRealPriceMayDependOnCustomer=Προεπιλεγμένη τιμή, η πραγματική τιμή μπορεί να εξαρτάται από τον πελάτη
@@ -349,6 +349,10 @@ QtyRecalculatedWithPackaging=Η ποσότητα της γραμμής υπολ
 
 #Attributes
 Attributes=Ιδιότητες
+ProductAttributeExtrafields=Επιπλέον πεδία χαρακτηριστικών παραλλαγής
+ProductAttributeExtrafieldsSetup=Ρύθμιση επιπλέον πεδίων χαρακτηριστικών παραλλαγής
+ProductAttributeValueExtrafields=Επιπλέον πεδία τιμών χαρακτηριστικών παραλλαγής
+ProductAttributeValueExtrafieldsSetup=Ρύθμιση επιπλέον πεδίων τιμών χαρακτηριστικών παραλλαγής
 VariantAttributes=Χαρακτηριστικά παραλλαγής
 ProductAttributes=Χαρακτηριστικά παραλλαγών για προϊόντα
 ProductAttributeName=Χαρακτηριστικό παραλλαγής %s
@@ -396,6 +400,8 @@ ErrorDestinationProductNotFound=Το προϊόν προορισμού δεν β
 ErrorProductCombinationNotFound=Η παραλλαγή προϊόντος δεν βρέθηκε
 ActionAvailableOnVariantProductOnly=Η ενέργεια είναι διαθέσιμη μόνο για την παραλλαγή του προϊόντος
 ProductsPricePerCustomer=Τιμές προϊόντων ανά πελάτη
+ProductLevelExtraFields=Πρόσθετα χαρακτηριστικά (Επίπεδο τιμής)
+ProductCustomerExtraFields=Πρόσθετα χαρακτηριστικά (Τιμή πελάτη )
 ProductSupplierExtraFields=Πρόσθετα χαρακτηριστικά (τιμές προμηθευτή)
 DeleteLinkedProduct=Διαγράψτε το υποπροϊόν που συνδέεται με τον συνδυασμό
 AmountUsedToUpdateWAP=Ποσό μονάδας που θα χρησιμοποιηθεί για την ενημέρωση της σταθμισμένης μέσης τιμής
@@ -437,3 +443,6 @@ AllowStockMovementVariantParentHelp=Από προεπιλογή, ένα μητρ
 ConfirmSetToDraftInventory=Είστε σίγουροι ότι θέλετε να επιστρέψετε στην κατάσταση Προσχεδίου;<br>Οι ποσότητες που είναι ήδη ορισμένες στο απόθεμα θα επαναφερθούν.
 WarningLineProductNotToSell=Το προϊόν ή η υπηρεσία "%s" που αντιγράψατε δεν είναι για πώληση
 PriceLabel=Ετικέτα τιμής
+GenerateImage=Δημιουργία εικόνας
+GenerateWithAI=Δημιουργία με AI
+PriceByCustomeAndMultiPricesAbility=Διαφορετικές τιμές για κάθε πελάτη + Πολλαπλά τμήματα τιμών ανά προϊόν/υπηρεσία (κάθε πελάτης βρίσκεται σε ένα τμήμα τιμών)
diff --git a/htdocs/langs/el_GR/salaries.lang b/htdocs/langs/el_GR/salaries.lang
index 263f1d02317..02525c4d129 100644
--- a/htdocs/langs/el_GR/salaries.lang
+++ b/htdocs/langs/el_GR/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Νέος μισθός
 AddSalary=Προσθήκη μισθού
 NewSalaryPayment=Καρτέλα νέου μισθού
 AddSalaryPayment=Προσθήκη πληρωμής μισθοδοσίας
+SalaryID=ID μισθού
+SalaryAmount=Ποσό μισθού
 SalaryPayment=Μισθός
 SalariesPayments=Πληρωμές μισθών
 SalariesPaymentsOf=Πληρωμές μισθών του %s
@@ -27,7 +29,7 @@ FillFieldFirst=Συμπληρώστε το πεδίο υπαλλήλου πρώ
 UpdateAmountWithLastSalary=Καθορίστε το ποσό βάσει του τελευταίου μισθού
 MakeTransferRequest=Αίτημα μεταφοράς
 VirementOrder=Αίτημα μεταφοράς πίστωσης
-BankTransferAmount=Ποσό μεταφοράς πίστωσης
 WithdrawalReceipt=Εντολή μεταφοράς πίστωσης
 OrderWaiting=Εκκρεμής εντολή
 FillEndOfMonth=Συμπληρώστε με το τέλος του μήνα
+UserPaySlip=Απόδειξη πληρωμής
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index 536c7fc6c27..57a4c9b22dd 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Χρησιμοποιήστε εδώ μια λίστα με
 WEBSITE_CSS_URL=URL εξωτερικού αρχείου CSS
 WEBSITE_CSS_INLINE=Περιεχόμενο αρχείου CSS (κοινό σε όλες τις σελίδες)
 WEBSITE_JS_INLINE=Περιεχόμενο αρχείου Javascript (κοινό σε όλες τις σελίδες)
-WEBSITE_HTML_HEADER=Προσθήκη στο κάτω μέρος της κεφαλίδας HTML (κοινό σε όλες τις σελίδες)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Αρχείο ρομπότ (robots.txt)
 WEBSITE_HTACCESS=Αρχείο .htaccess ιστότοπου
 WEBSITE_MANIFEST_JSON=Αρχείο manifest.json ιστότοπου
@@ -56,16 +56,17 @@ ReadPerm=Ανάγνωση
 WritePerm=Εγγραφή
 TestDeployOnWeb=Δοκιμή / ανάπτυξη στο διαδίκτυο
 PreviewSiteServedByWebServer= <u> Προεπισκόπηση  σε μια νέα καρτέλα. </u> <br> <br> Ο %s θα εξυπηρετείται από έναν εξωτερικό διακομιστή ιστού (όπως Apache, Nginx, IIS). Πρέπει να εγκαταστήσετε και να εγκαταστήσετε αυτόν τον εξυπηρετητή πριν ανακατευθύνετε σε αυτόν τον κατάλογο: <br>  <strong> %s </strong>  <br> URL που εξυπηρετείται από εξωτερικό διακομιστή: <br>  <strong> %s </strong>
-PreviewSiteServedByDolibarr= <u> Προεπισκόπηση %s σε νέα καρτέλα. </u> <br> <br> Ο %s θα εξυπηρετείται από τον διακομιστή Dolibarr, επομένως δεν χρειάζεται επιπλέον διακομιστή ιστού (όπως Apache, Nginx, IIS) για να εγκατασταθεί. <br> Το άβολο είναι ότι οι διευθύνσεις URL των σελίδων δεν είναι φιλικές προς το χρήστη και ξεκινούν με τη διαδρομή του Dolibarr σας. <br> URL που εξυπηρετούνται από Dolibarr: <br> <strong> %s </strong> <br> <br> Για να χρησιμοποιήσετε το δικό σας web server για την εξυπηρέτηση αυτής της ιστοσελίδας, δημιουργήστε ενα virtual host που ανακατευθύνει στον κατάλογο <br> <strong> %s </strong> <br> στη συνέχεια, πληκτρολογήστε το όνομα του εικονικού διακομιστή στις ιδιότητες αυτού του ιστότοπου και κάντε κλικ στον σύνδεσμο "Δοκιμή/Ανάπτυξη στον Ιστό".
+PreviewSiteServedByDolibarr= <u> Προεπισκόπηση %s σε νέα καρτέλα. </u> <br> <br> Ο %s θα εξυπηρετείται από τον διακομιστή Dolibarr, επομένως δεν χρειάζεται επιπλέον διακομιστή ιστού (όπως Apache, Nginx, IIS) για να εγκατασταθεί. <br> Το άβολο είναι ότι οι διευθύνσεις URL των σελίδων δεν είναι φιλικές προς το χρήστη και ξεκινούν με τη διαδρομή του Dolibarr σας. <br> URL που εξυπηρετούνται από Dolibarr: <br> <strong> %s </strong> <br> <br> Για να χρησιμοποιήσετε ή δοκιμασετε το δικό σας web server (όπως Apache, Nginx, Lighttp) χρησιμοποιήστε τον σύνδεσμο "%s".
 VirtualHostUrlNotDefined=Η διεύθυνση URL του εικονικού κεντρικού υπολογιστή που εξυπηρετείται από εξωτερικό διακομιστή ιστού δεν έχει οριστεί
 NoPageYet=Δεν υπάρχουν ακόμη σελίδες
 YouCanCreatePageOrImportTemplate=Μπορείτε να δημιουργήσετε μια νέα σελίδα ή να εισάγετε ένα πλήρες πρότυπο ιστότοπου
 SyntaxHelp=Βοήθεια για συγκεκριμένες συμβουλές σύνταξης
 YouCanEditHtmlSourceckeditor=Μπορείτε να επεξεργαστείτε τον πηγαίο κώδικα HTML χρησιμοποιώντας το κουμπί "Πηγή" στο πρόγραμμα επεξεργασίας.
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span>Για να συμπεριλάβετε <strong>μια εικόνα</strong> που είναι αποθηκευμένη στον κατάλογο <strong>documents</strong>, χρησιμοποιήστε τον wrapper <strong>viewimage.php</strong>. <br>Παράδειγμα, για μια εικόνα στον κατάλογο "documents/medias" (ανοιχτός κατάλογος για δημόσια πρόσβαση), η σύνταξη είναι: <br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Για τον διαμοιρασμό εικόνας με ένα σύνδεσμο (δώσε πρόσβαση χρησιμοποιώντας το sharing hash key του αρχείου), η σύνταξη είναι: <br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Για να συμπεριληφθεί μια <strong>εικόνα</strong> αποθηκευμένη στον ανοιχτής πρόσβασης κατάλογο  <strong>medias</strong> χρησιμοποιήστε το relative path που αρχίζει με<strong>/medias</strong>,παράδειγμα:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=Για μια εικόνα κοινής χρήσης με έναν κοινόχρηστο σύνδεσμο (ανοιχτή πρόσβαση χρησιμοποιώντας το sharing hash key του αρχείου), χρησιμοποιήστε το wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=Για να λάβετε το URL της εικόνας ενός αντικειμένου PHP, χρησιμοποιήστε<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=Για να λάβετε τη διεύθυνση URL μιας εικόνας μέσα σε ένα περιεχόμενο html ενός άρθρου, χρησιμοποιήστε<br><strong> &lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore= <br> Περισσότερα παραδείγματα HTML ή δυναμικού κώδικα είναι διαθέσιμα στο <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible"> wiki </a>.<br>
 ClonePage=Κλωνοποίηση σελίδας/κοντέινερ
 CloneSite=Κλωνοποίηση ιστοσελίδας
@@ -87,15 +88,15 @@ WebsiteAccount=Λογαριασμός ιστότοπου
 WebsiteAccounts=Λογαριασμοί ιστοτόπων
 AddWebsiteAccount=Δημιουργία λογαριασμού ιστότοπου
 BackToListForThirdParty=Επιστροφή στη λίστα για τρίτα μέρη
-DisableSiteFirst=Απενεργοποιήστε τον ιστότοπο πρώτα
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Ο τίτλος του ιστότοπου μου
 AnotherContainer=Αυτός είναι ο τρόπος για να συμπεριλάβετε περιεχόμενο μιας άλλης σελίδας/contenair (ενδεχομένως να έχετε ένα σφάλμα αν ενεργοποιήσετε τον δυναμικό κώδικα επειδή το ενσωματωμένο subcontainer μπορεί να μην υπάρχει)
 SorryWebsiteIsCurrentlyOffLine=Λυπούμαστε, αυτός ο ιστότοπος είναι προς το παρόν εκτός σύνδεσης. Παρακαλώ επιστρέψτε αργότερα...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Ενεργοποιήστε τον πίνακα λογαριασμού web site
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ενεργοποιήστε τον πίνακα για να αποθηκεύετε λογαριασμούς ιστότοπων (login / pass) για κάθε ιστότοπο / τρίτο μέρος
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Πρέπει πρώτα να ορίσετε την Αρχική σελίδα
 OnlyEditionOfSourceForGrabbedContentFuture=Προειδοποίηση: Η δημιουργία ιστοσελίδας με εισαγωγή εξωτερικής ιστοσελίδας αφορά έμπειρους χρήστες. Ανάλογα με την πολυπλοκότητα της σελίδας προέλευσης, το αποτέλεσμα της εισαγωγής ενδέχεται να διαφέρει από το πρωτότυπο. Επίσης, εάν η σελίδα προέλευσης χρησιμοποιεί κοινά στυλ CSS ή javascript σε διένεξη, ενδέχεται να σπάσει την εμφάνιση ή τις δυνατότητες του προγράμματος επεξεργασίας ιστότοπου όταν εργάζεστε σε αυτήν τη σελίδα. Αυτή η μέθοδος είναι ένας πιο γρήγορος τρόπος για να δημιουργήσετε μια σελίδα, αλλά συνιστάται να δημιουργήσετε τη νέα σας σελίδα από το μηδέν ή από ένα προτεινόμενο πρότυπο σελίδας. <br> Σημειώστε επίσης ότι ο ενσωματωμένος επεξεργαστής ενδέχεται να μην λειτουργεί σωστά όταν χρησιμοποιείται με κώδικα μιας εξωτερικής σελίδας.
-OnlyEditionOfSourceForGrabbedContent=Μόνο έκδοση πηγής HTML είναι δυνατή όταν το περιεχόμενο έχει ληφθεί από έναν εξωτερικό ιστότοπο
+OnlyEditionOfSourceForGrabbedContent=Μόνο η τροποποίηση της πηγής HTML είναι δυνατή όταν το περιεχόμενο προέρχεται από έναν εξωτερικό ιστότοπο
 GrabImagesInto=Λήψη και των εικόνων που βρέθηκαν στο css και τη σελίδα.
 ImagesShouldBeSavedInto=Οι εικόνες πρέπει να αποθηκεύονται στον κατάλογο
 WebsiteRootOfImages=Κατάλογος εικόνων του ιστότοπου
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Αποσυνδεθείτε από τον λογα
 filteredByVersion=Φιλτράρισμα κατά έκδοση
 removeFilter=Αφαίρεση φίλτρου
 viewMyCart=Το καλάθι μου
+Shipping=Shipping
 freeShipping=Δωρεάν μεταφορικά!
 noProducts=Δεν υπάρχουν προϊόντα
 nbrItemsInCart=Υπάρχουν <span class="ajax_cart_quantity">0</span> αντικείμενα στο καλάθι σας.
@@ -284,12 +286,13 @@ productNameAToZ=Όνομα προϊόντος: Α έως Ω
 productNameZToA=Όνομα προϊόντος: Ω έως Α
 referenceLowestFirst=Αναφορά φθίνουσα
 referenceHighestFirst=Αναφορά αύξουσα
+productPerPage=products per page
 perPage=ανά σελίδα
 showAll=Εμφάνιση όλων
 showing= Εμφάνιση
 nbrOfProducts= Υπάρχουν %s προϊόντα .
 noResultsHaveBeenFound=Βρέθηκαν 0 αποτελέσματα.
-noResultsWereFound= Δεν βρέθηκαν αποτελέσματα.
+noResultsWereFound=Δεν βρέθηκαν αποτελέσματα.
 addToCart=Προσθήκη στο καλάθι
 backHome=Επιστροφή στην αρχή
 priceDrop=Πτώση τιμής
@@ -302,10 +305,11 @@ lastUpdate=Τελευταία ενημέρωση
 contactSupport=Πώς να επικοινωνήσετε με την υποστήριξη
 noProductToDisplay=Σφάλμα, Δεν υπάρχει προϊόν για εμφάνιση
 yourCompanyInformation=Τα στοιχεία της εταιρείας σας
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=Αυτό το email είναι ήδη καταχωρημένο.
 firstnameContainsLettersOnly=<b>Όνομα</b> πρέπει να περιέχει μόνο γράμματα και κενά
 lastnameContainsLettersOnly=<b>Το επώνυμο</b> πρέπει να περιέχει μόνο γράμματα και κενά
-passwordCriteria=<b>Ο κωδικός πρόσβασης</b> πρέπει να πληροί τα ακόλουθα κριτήρια:<br>- 12 χαρακτήρες<br>- 1 κεφαλαίο γράμμα<br><br>-  Χωρίς ειδικούς χαρακτήρες<br>- Αποφύγετε την επανάληψη χαρακτήρων περισσότερες από 3 φορές<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=Παρουσιάστηκε σφάλμα.
 accountCreation=Δημιουργία Λογαριασμού
 errorsOccurred=Υπάρχει %s σφάλμα%s
@@ -319,7 +323,7 @@ forgotPassword=Ξεχάσατε τον κωδικό σας;
 recoverPass=Ανακτήστε τον κωδικό πρόσβασης που ξεχάσατε
 signIn=Σύνδεση
 myAccount=Ο λογαριασμός μου
-welcomeToYourAccount=Καλώς ορίσατε στον λογαριασμό σας. Εδώ μπορείτε να διαχειριστείτε τα προσωπικά σας στοιχεία και τις παραγγελίες σας
+welcomeToYourAccount=Καλώς ήρθατε στον λογαριασμό σας. Εδώ μπορείτε να διαχειριστείτε τα προσωπικά σας στοιχεία και τις παραγγελίες σας
 orderHistoryDetails=Ιστορικό παραγγελιών και λεπτομέρειες
 orderHistory=Ιστορικό παραγγελιών
 orderDetails=Λεπτομέρειες παραγγελίας
@@ -357,3 +361,7 @@ subtract=Αφαίρεση
 LoginCheckout=Συνδεθείτε & Προχωρήστε στο ταμείο
 paymentSuccessProcessed=Η πληρωμή σας ολοκληρώθηκε με επιτυχία.
 youWillBeRedirectedToOrderPage=Σύντομα θα ανακατευθυνθείτε στη σελίδα λεπτομερειών της παραγγελίας.
+WebPortalSetupNotComplete=Η ρύθμιση του web portal δεν έχει ολοκληρωθεί
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/en_GB/exports.lang b/htdocs/langs/en_GB/exports.lang
deleted file mode 100644
index 061d20450dd..00000000000
--- a/htdocs/langs/en_GB/exports.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - exports
-ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
-DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
-DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
diff --git a/htdocs/langs/en_IE/admin.lang b/htdocs/langs/en_IE/admin.lang
new file mode 100644
index 00000000000..3ea4f74c65d
--- /dev/null
+++ b/htdocs/langs/en_IE/admin.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - admin
+activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
diff --git a/htdocs/langs/en_IE/main.lang b/htdocs/langs/en_IE/main.lang
new file mode 100644
index 00000000000..2e691473326
--- /dev/null
+++ b/htdocs/langs/en_IE/main.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
diff --git a/htdocs/langs/en_IE/products.lang b/htdocs/langs/en_IE/products.lang
new file mode 100644
index 00000000000..918fade9a32
--- /dev/null
+++ b/htdocs/langs/en_IE/products.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - products
+unitG=Gram
+unitM=Meter
+unitM2=Square meter
+unitM3=Cubic meter
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index d1cb8efc86c..b87d3e0c148 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1348,3 +1348,4 @@ SpecialLine=Special Line
 EcoTax=Eco-Tax
 GroupingLine=Grouping line
 AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index ededc52cbfc..f256752d97a 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -208,25 +208,25 @@ unitD=Day
 unitL=Liter
 unitT=ton
 unitKG=kg
-unitG=Gram
+unitG=g
 unitGAL=gallon
 unitMG=mg
 unitLB=pound
 unitOZ=ounce
-unitM=Meter
+unitM=m
 unitLM=Linear meter
 unitDM=dm
 unitCM=cm
 unitMM=mm
 unitFT=ft
 unitIN=in
-unitM2=Square meter
+unitM2=m2
 unitDM2=dm²
 unitCM2=cm²
 unitMM2=mm²
 unitFT2=ft²
 unitIN2=in²
-unitM3=Cubic meter
+unitM3=m3
 unitDM3=dm³
 unitCM3=cm³
 unitMM3=mm³
diff --git a/htdocs/langs/es_AR/banks.lang b/htdocs/langs/es_AR/banks.lang
index 3970c400ee6..d12df98fdd2 100644
--- a/htdocs/langs/es_AR/banks.lang
+++ b/htdocs/langs/es_AR/banks.lang
@@ -16,6 +16,7 @@ FutureBalance=Saldo futuro
 ShowAllTimeBalance=Mostrar saldo desde el inicio
 Reconciliation=Reconciliación
 RIB=Número de cuenta bancaria
+IBAN=Número de IBAN
 SwiftValid=BIC/swift válido
 StandingOrders=Ordenes por débito automático
 StandingOrder=Orden de Débito Automático
@@ -64,7 +65,6 @@ BankChecks=Cheques bancarios
 BankChecksToReceipt=Cheques que esperan a depositarse
 BankChecksToReceiptShort=Cheques que esperan a depositarse
 NumberOfCheques=Número de cheque
-PlannedTransactions=Registros planeados
 ExportDataset_banque_1=Registros bancarios y estado de la cuenta
 AllAccounts=Todas las cuentas bancarias y cajas
 ShowAllAccounts=Mostrar todas las cuentas
diff --git a/htdocs/langs/es_AR/companies.lang b/htdocs/langs/es_AR/companies.lang
index dccbff27713..4b36aed18f7 100644
--- a/htdocs/langs/es_AR/companies.lang
+++ b/htdocs/langs/es_AR/companies.lang
@@ -44,7 +44,6 @@ CountryCode=Código de País
 Chat=Chate
 PhonePerso=Teléfono Persona
 PhoneMobile=Celular
-No_Email=Rechazar correos masivos
 Town=Ciudad
 Poste=Posición
 VATIsUsed=Aplica IVA
@@ -138,6 +137,7 @@ VATIntra=ID IVA
 VATIntraShort=ID IVA
 VATIntraSyntaxIsValid=La sintaxis es correcta
 ProspectCustomer=Cliente Potencial / Cliente
+Prospect=Cliente Potencial
 CustomerCard=Ficha de Cliente
 CustomerRelativeDiscount=Descuento por cliente
 SupplierRelativeDiscount=Descuento por proveedor
@@ -209,7 +209,7 @@ ChangeContactDone=Marcar como 'Contacto realizado'
 ContactNotLinkedToCompany=Contacto no vinculado a ningún tercero
 DolibarrLogin=Usuario Dlibarr
 NoDolibarrAccess=Sin acceso a Dolibarr
-ExportDataset_company_1=Terceros (empresas/fundaciones/personas físicas) y sus propiedades.
+ExportDataset_company_2=Contactos/direcciones adicionales de terceros y atributos
 ImportDataset_company_1=Terceros y sus propiedades
 ImportDataset_company_2=Contactos/direcciones adicionales de terceros y atributos
 ImportDataset_company_4=Vendedores de terceros (asignar vendedores/usuarios a empresas)
diff --git a/htdocs/langs/es_AR/exports.lang b/htdocs/langs/es_AR/exports.lang
new file mode 100644
index 00000000000..fb5b653fb5b
--- /dev/null
+++ b/htdocs/langs/es_AR/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+InformationOnSourceFile=Archivo fuente
diff --git a/htdocs/langs/es_AR/mails.lang b/htdocs/langs/es_AR/mails.lang
index 36573ef159f..ca23ac53c28 100644
--- a/htdocs/langs/es_AR/mails.lang
+++ b/htdocs/langs/es_AR/mails.lang
@@ -1,8 +1,6 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Correo
 EMailing=Correo
-EMailings=Correos
-AllEMailings=Todos los correos
 MailCard=Ficha del correo
 MailTo=A
 MailToUsers=Para usuario(s)
@@ -13,15 +11,6 @@ MailFile=Archivos adjuntos
 MailMessage=Cuerpo del correo
 SubjectNotIn=Fuera del asunto
 BodyNotIn=Fuera del cuerpo
-ShowEMailing=Mostrar correo
-ListOfEMailings=Lista de correos
-NewMailing=Nuevo correo
-EditMailing=Editar correo
-ResetMailing=Reenviar correo
-DeleteMailing=Eliminar correo
-PreviewMailing=Previsualizar correo
-CreateMailing=Crear correo
-ValidMailing=Validar correo
 MailSuccessfulySent=Correo (de %s a %s) aceptado correctamente para entregar
 MailingSuccessfullyValidated=Correo validado correctamente
 MailUnsubcribe=Desuscribir
@@ -70,22 +59,15 @@ MailingModuleDescDolibarrUsers=Usuarios con correos
 SendingFromWebInterfaceIsNotAllowed=No está permitido el envío desde interfaz web.
 LineInFile=Línea %s del archivo
 RecipientSelectionModules=Solicitudes definidas para la selección del destinatario
-MailingArea=Area de correos
-LastMailings=Ultimos %s correos
 TargetsStatistics=Estadísticas de objetivo
 NbOfCompaniesContacts=Contactos/direcciones únicas
 MailNoChangePossible=Los destinatarios no pueden cambiarse para  un correo validado
-SearchAMailing=Buscar correo
-SendMailing=Enviar correo
 MailingNeedCommand=El envío de correos puede realizarse desde la consola. Consulta al administrador del servidor para ejecutar el siguiente comando para enviar el correo a todos los destinatarios:
 MailingNeedCommand2=De todas formas puedes enviarlos en línea agregando el parámetro MAILING_LIMIT_SENDBYWEB con el valor máximo de correos que quieres enviar por cada sesión. Para esto, ve a Inicio - Configuración - Otros.
 ConfirmSendingEmailing=Si quieres enviar el correo directamente de esta pantalla, ¿estás seguro que quieres enviar el correo ahora desde tu navegador?
-LimitSendingEmailing=Nota: El envío de correos desde la interfaz web se realiza en etapas por motivos de seguridad y timeout, <b>%s</b> destinatarios a la vez por cada sesión de envío.
 TargetsReset=Limpiar lista
 ToClearAllRecipientsClickHere=Haga click aquí para limpiar la lista de destinatarios de este correo
 ToAddRecipientsChooseHere=Agregar destinatarios eligiéndolos de las listas
-NbOfEMailingsReceived=Correos masivos recibidos
-NbOfEMailingsSend=Correos masivos enviados
 IdRecord=ID de registro
 DeliveryReceipt=Confirmación de entrega
 YouCanUseCommaSeparatorForSeveralRecipients=Puedes usar la <b>coma</b> para separar varios destinatarios.
diff --git a/htdocs/langs/es_AR/main.lang b/htdocs/langs/es_AR/main.lang
index 426552a99ea..1d8a05822fa 100644
--- a/htdocs/langs/es_AR/main.lang
+++ b/htdocs/langs/es_AR/main.lang
@@ -124,6 +124,7 @@ Save=Guardar
 SaveAs=Guarda Como
 TestConnection=Probar conexión
 ToClone=Clonar
+ConfirmCloneAsk=¿Estás seguro que quieres clonar el objeto <b>%s</b>?
 NoCloneOptionsSpecified=Datos para clonar sin definir
 Run=Correr
 Show=Mostrar
@@ -256,7 +257,6 @@ ActionsToDoShort=Para hacer
 ActionsDoneShort=Hecho
 ActionNotApplicable=No aplicables
 ActionRunningNotStarted=Para comenzar
-LatestLinkedEvents=Últimos eventos %s enlazados
 CompanyFoundation=Empresa / Organización
 Accountant=Contador
 ContactsForCompany=Contactos para esta tercera parte
@@ -291,6 +291,7 @@ ChangedBy=Cambiado por
 ResultKo=Falla
 Reporting=Informando
 Reportings=Informando
+StatusInterInvoiced=Facturado
 Done=Hecho
 Opened=Abierto
 ClosedAll=Cerrado (todo)
@@ -413,7 +414,6 @@ HidePassword=Mostrar comándos con contraseña escondida
 UnHidePassword=Mostrar comando real con contraseña visible
 AddNewLine=Agregar nueva línea
 AddFile=Agregar archivo
-FreeLineOfType=Item libre del tipo:
 CloneMainAttributes=Clonar objeto con principales atributos
 PDFMerge=Unir PDF
 Merge=Unir
@@ -501,7 +501,6 @@ Miscellaneous=Miscelanias
 GroupBy=Agrupar por...
 RemoveString=Quitar cadena '%s'
 DownloadDocument=Descargar documento
-ActualizeCurrency=Actualizar tipo de cambio
 ModuleBuilder=Constructor de Módulos y Aplicaciones
 SetMultiCurrencyCode=Fijar moneda
 BulkActions=Acciones a granel
@@ -587,3 +586,5 @@ ErrorFailedToDeleteLink=Error al eliminar el enlace '<b>%s</b>'
 ErrorFailedToUpdateLink=Error al actualizar enlace '<b>%s</b>'
 URLToLink=URL del enlace
 Settings=Ajustes
+addToFilter=Agregar
+AllTime=Desde el inicio
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index c81a42ead4d..bb1750dd162 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -11,8 +11,6 @@ FileIntegrityIsStrictlyConformedWithReference=La integridad de los archivos est
 FileIntegrityIsOkButFilesWereAdded=La verificación de integridad de los archivos ha pasado, sin embargo, se han agregado algunos archivos nuevos.
 FileIntegritySomeFilesWereRemovedOrModified=La verificación de la integridad de los archivos ha fallado. Algunos archivos fueron modificados, eliminados o agregados.
 MakeIntegrityAnalysisFrom=Haga un análisis de integridad de los archivos de la aplicación desde
-LocalSignature=Firma local incorporada (menos confiable)
-RemoteSignature=Firma distante remota (más confiable)
 FilesMissing=Archivos perdidos
 FilesAdded=Archivos agregados
 FileCheckDolibarr=Verificar la integridad de los archivos de la aplicación
@@ -174,7 +172,6 @@ SourceFile=Archivo fuente
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible solo si JavaScript no está deshabilitado
 Required=Necesario
 UsedOnlyWithTypeOption=Usado solo por alguna opción de agenda
-MainDbPasswordFileConfEncrypted=Cifra la contraseña de la base de datos almacenada en conf.php. Se recomienda encarecidamente activar esta opción.
 InstrucToEncodePass=Para codificar la contraseña en el archivo <b>conf.php</b>, reemplace la línea <br><b>$dolibarr_main_db_pass="..."; </b><br>por<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Para decodificar la contraseña (elimina) en el archivo <b>conf.php</b>, reemplace la línea <br><b>$dolibarr_main_db_pass="crypted: ...";</b><br>por<br><b>$dolibarr_main_db_pass="%s"; </b>
 ProtectAndEncryptPdfFiles=Proteger los archivos PDF generados. Esto NO se recomienda ya que rompe la generación de PDF a granel.
@@ -331,7 +328,6 @@ ModuleCompanyCodeCustomerDigitaria=%s seguido del nombre del cliente truncado po
 ModuleCompanyCodeSupplierDigitaria=%s seguido del nombre del proveedor truncado por el número de caracteres: %s para el código de contabilidad del proveedor.
 Use3StepsApproval=De forma predeterminada, los pedidos de compra deben ser creados y aprobados por 2 usuarios diferentes (un paso / usuario para crear y un paso / usuario para aprobar. Tenga en cuenta que si el usuario tiene ambos permisos para crear y aprobar, un paso / usuario será suficiente) . Puede solicitar con esta opción que presente un tercer paso / aprobación del usuario, si el monto es mayor que un valor dedicado (por lo que se necesitarán 3 pasos: 1 = validación, 2 = primera aprobación y 3 = segunda aprobación si el monto es suficiente). <br> Configure esto como vacío si una aprobación (2 pasos) es suficiente, configúrelo a un valor muy bajo (0.1) si siempre se requiere una segunda aprobación (3 pasos).
 UseDoubleApproval=Utilice una aprobación de 3 pasos cuando la cantidad (sin impuestos) sea más alta que ...
-WarningPHPMail2=Si su proveedor SMTP de correo electrónico necesita restringir el cliente de correo electrónico a algunas direcciones IP (muy raras), esta es la dirección IP del agente de usuario de correo (MUA) para su aplicación ERP CRM: <strong> %s </ strong>.
 ClickToShowDescription=Haga clic para mostrar la descripción
 DependsOn=Este módulo necesita el módulo (s)
 RequiredBy=Este módulo es requerido por el módulo (s)
@@ -357,7 +353,6 @@ Module10Name=Contabilidad (simplificada)
 Module10Desc=Informes contables simples (revistas, facturación) basados en el contenido de la base de datos. No utiliza ninguna tabla de contabilidad.
 Module20Name=Cotizaciones
 Module20Desc=Gestión de cotizaciones/propuestas comerciales
-Module22Name=Correos masivos
 Module23Desc=Monitoreo del consumo de energías
 Module25Name=Ordenes de venta
 Module25Desc=Gestión de órdenes de venta
@@ -515,10 +510,6 @@ Permission211=Leer telefonía
 Permission212=Líneas de pedido
 Permission213=Activar línea
 Permission215=Instalar proveedores
-Permission221=Leer correos electrónicos
-Permission222=Crear/modificar correos electrónicos (tema, destinatarios ...)
-Permission223=Validar correos electrónicos (permite el envío)
-Permission229=Eliminar correos electrónicos
 Permission237=Ver destinatarios e información
 Permission238=Enviar correos manualmente
 Permission239=Eliminar correos después de la validación o enviado
@@ -1112,6 +1103,7 @@ AGENDA_USE_EVENT_TYPE_DEFAULT =Establecer automáticamente este valor predetermi
 PasswordTogetVCalExport =Clave para autorizar el enlace de exportación
 PastDelayVCalExport=No exportar evento más antiguo que
 ClickToDialUseTelLink=Use solo un enlace "tel:" en los números de teléfono
+CashDesk=Punto de venta
 CashDeskSetup=Configuración del módulo de punto de venta
 CashDeskThirdPartyForSell=Tercero genérico predeterminado para usar en ventas
 CashDeskBankAccountForSell=Cuenta predeterminada para usar para recibir pagos en efectivo
@@ -1178,7 +1170,6 @@ GoOntoUserCardToAddMore=Vaya a la pestaña &quot;Notificaciones&quot; de un usua
 Threshold=Límite
 SomethingMakeInstallFromWebNotPossible=La instalación del módulo externo no es posible desde la interfaz web por el siguiente motivo:
 SomethingMakeInstallFromWebNotPossible2=Por esta razón, el proceso de actualización descrito aquí es un proceso manual que solo puede realizar un usuario privilegiado.
-InstallModuleFromWebHasBeenDisabledByFile=La instalación del módulo externo de la aplicación ha sido desactivada por su administrador. Debes pedirle que elimine el archivo <strong>%s</strong> para permitir esta función.
 ConfFileMustContainCustom=La instalación o creación de un módulo externo desde la aplicación necesita guardar los archivos del módulo en el directorio <strong>%s</strong>. Para que Dolibarr procese este directorio, debe configurar su <strong>conf/conf.php</strong> para agregar las 2 líneas de directiva: <br><strong>$dolibarr_main_url_root_alt ='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Resalta las líneas de la mesa cuando el movimiento del mouse pasa por encima
 HighlightLinesColor=Resalte el color de la línea cuando pase el mouse (use &#39;ffffff&#39; para no resaltar)
diff --git a/htdocs/langs/es_CL/banks.lang b/htdocs/langs/es_CL/banks.lang
index 0676494a057..403f9b70959 100644
--- a/htdocs/langs/es_CL/banks.lang
+++ b/htdocs/langs/es_CL/banks.lang
@@ -20,6 +20,8 @@ FutureBalance=Balance futuro
 ShowAllTimeBalance=Mostrar saldo desde el inicio
 Reconciliation=Reconciliación
 RIB=Número de cuenta bancaria
+IBAN=Número IBAN
+BIC=Código BIC / SWIFT
 SwiftValid=BIC / SWIFT válido
 IbanValid=BAN válida
 StandingOrders=Órdenes de débito directo
@@ -83,7 +85,6 @@ NumberOfCheques=No. de cheque
 DeleteTransaction=Eliminar la entrada
 ConfirmDeleteTransaction=¿Seguro que quieres eliminar esta entrada?
 ThisWillAlsoDeleteBankRecord=Esto también eliminará la entrada bancaria generada
-PlannedTransactions=Entradas planificadas
 ExportDataset_banque_1=Entradas bancarias y estado de cuenta
 ExportDataset_banque_2=Recibo de depósito
 TransactionOnTheOtherAccount=Transacción en la otra cuenta
diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang
index babfc4d2f3d..cb847ba5eeb 100644
--- a/htdocs/langs/es_CL/companies.lang
+++ b/htdocs/langs/es_CL/companies.lang
@@ -42,7 +42,6 @@ State=Estado / Provincia
 CountryCode=Código de país
 Call=Llamada
 PhonePerso=Pers. teléfono
-No_Email=Rechazar correos electrónicos a granel
 Town=Ciudad
 Poste=Posición
 VATIsUsed=Impuesto a las ventas utilizado
@@ -86,6 +85,7 @@ VATIntra=ID de IVA
 VATIntraShort=ID de IVA
 VATIntraSyntaxIsValid=La sintaxis es valida
 ProspectCustomer=Prospecto/Cliente
+Prospect=Prospectar
 CustomerCard=Tarjeta Cliente
 CustomerRelativeDiscount=Descuento relativo del cliente
 SupplierRelativeDiscount=Descuento relativo del vendedor
@@ -166,7 +166,6 @@ ExportCardToFormat=Exportar la tarjeta al formato
 ContactNotLinkedToCompany=Contacto no vinculado a ningún tercero
 DolibarrLogin=Ingreso Dolibbarr
 NoDolibarrAccess=Sin acceso a Dolibarr
-ExportDataset_company_1=Terceros (empresas / fundaciones / personas físicas) y sus propiedades.
 ImportDataset_company_2=Contactos / direcciones y atributos adicionales de terceros
 ImportDataset_company_4=Representantes de ventas de terceros (asignar representantes de ventas / usuarios a empresas)
 DeliveryAddress=Dirección de entrega
diff --git a/htdocs/langs/es_CL/compta.lang b/htdocs/langs/es_CL/compta.lang
index 1e9c28d1f67..74160e612ae 100644
--- a/htdocs/langs/es_CL/compta.lang
+++ b/htdocs/langs/es_CL/compta.lang
@@ -172,7 +172,6 @@ BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=En funció
 SameCountryCustomersWithVAT=Informe nacional de clientes
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Según las dos primeras letras del número de IVA, es el mismo que el código de país de su empresa
 LinkedFichinter=Enlace a una intervención
-ImportDataset_tax_vat=Pagos de IVA
 ErrorBankAccountNotFound=Error: cuenta bancaria no encontrada
 FiscalPeriod=Período contable
 ListSocialContributionAssociatedProject=Lista de contribuciones sociales asociadas con el proyecto
diff --git a/htdocs/langs/es_CL/exports.lang b/htdocs/langs/es_CL/exports.lang
index 006a78c3a3b..c7be0a20353 100644
--- a/htdocs/langs/es_CL/exports.lang
+++ b/htdocs/langs/es_CL/exports.lang
@@ -39,7 +39,6 @@ FileMustHaveOneOfFollowingFormat=El archivo a importar debe tener uno de los sig
 ChooseFormatOfFileToImport=Elija el formato de archivo que se usará como formato de archivo de importación haciendo clic en el icono %s para seleccionarlo ...
 SourceFileFormat=Formato de archivo fuente
 FieldsInSourceFile=Campos en el archivo fuente
-FieldsInTargetDatabase=Campos de destino en la base de datos Dolibarr (negrita = obligatorio)
 NoFields=Sin campos
 MoveField=Mover el número de columna de campo %s
 SaveImportProfile=Guarde este perfil de importación
@@ -53,8 +52,6 @@ NowClickToTestTheImport=Verifique que el formato del archivo (delimitadores de c
 RunSimulateImportFile=Ejecutar simulación de importación
 FieldNeedSource=Este campo requiere datos del archivo fuente
 SomeMandatoryFieldHaveNoSource=Algunos campos obligatorios no tienen origen desde el archivo de datos
-InformationOnSourceFile=Información sobre el archivo fuente
-InformationOnTargetTables=Información sobre los campos objetivo
 SelectAtLeastOneField=Cambie al menos un campo fuente en la columna de campos para exportar
 SelectFormat=Elija este formato de archivo de importación
 RunImportFile=Datos de importacion
diff --git a/htdocs/langs/es_CL/mails.lang b/htdocs/langs/es_CL/mails.lang
index aa500dc1ebe..94c41c91ab9 100644
--- a/htdocs/langs/es_CL/mails.lang
+++ b/htdocs/langs/es_CL/mails.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - mails
-EMailings=Emailings
-AllEMailings=Todos los eMailings
 MailCard=Tarjeta de correo electrónico
 MailRecipient=Recipiente
 MailTo=A
@@ -12,15 +10,6 @@ MailFile=Archivos adjuntos
 MailMessage=Cuerpo del correo electronico
 SubjectNotIn=No en asunto
 BodyNotIn=No en cuerpo
-ShowEMailing=Mostrar correo electrónico
-ListOfEMailings=Lista de correos electrónicos
-NewMailing=Nuevo correo electrónico
-EditMailing=Edite el correo electrónico
-ResetMailing=Reenviar correos electrónicos
-DeleteMailing=Eliminar correo electrónico
-PreviewMailing=Enviar un correo electrónico
-CreateMailing=Crear correos electrónicos
-ValidMailing=Correo electrónico válido
 MailingStatusSent=Expedido
 MailingStatusSentCompletely=Enviado por completo
 MailSuccessfulySent=Correo electrónico (de %s a %s) aceptado con éxito para la entrega
@@ -71,21 +60,14 @@ MailingModuleDescEmailsFromFile=Correos electrónicos del archivo
 MailingModuleDescEmailsFromUser=Mensajes de correo electrónico ingresados ​​por el usuario
 MailingModuleDescDolibarrUsers=Usuarios con correos electrónicos
 RecipientSelectionModules=Solicitudes definidas para la selección del destinatario
-MailingArea=Área de correos
-LastMailings=Últimos %s correos electrónicos
 TargetsStatistics=Estadísticas de objetivos
 MailNoChangePossible=Los destinatarios de correos electrónicos validados no se pueden cambiar
-SearchAMailing=Correo de búsqueda
-SendMailing=Enviar correo electrónico
 MailingNeedCommand=El envío de un correo electrónico se puede realizar desde la línea de comandos. Pídale a su administrador del servidor que ejecute el siguiente comando para enviar el correo electrónico a todos los destinatarios:
 MailingNeedCommand2=Sin embargo, puede enviarlos en línea agregando el parámetro MAILING_LIMIT_SENDBYWEB con el valor del número máximo de correos electrónicos que desea enviar por sesión. Para esto, vaya a Inicio - Configuración - Otro.
 ConfirmSendingEmailing=Si desea enviar un correo electrónico directamente desde esta pantalla, confirme que está seguro de que desea enviar un correo electrónico ahora desde su navegador.
-LimitSendingEmailing=Nota: El envío de correos electrónicos desde la interfaz web se realiza varias veces por razones de seguridad y tiempo de espera, <b>%s</b> destinatarios a la vez para cada sesión de envío.
 TargetsReset=Limpiar lista
 ToClearAllRecipientsClickHere=Haga clic aquí para borrar la lista de destinatarios para este correo electrónico
 ToAddRecipientsChooseHere=Agregue destinatarios eligiendo de las listas
-NbOfEMailingsReceived=Correos electrónicos masivos recibidos
-NbOfEMailingsSend=Correos electrónicos masivos enviados
 IdRecord=Registro de ID
 DeliveryReceipt=Entrega Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Puede usar el separador <b> coma </ b> para especificar varios destinatarios.
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index a4a5a1f7a0b..e82074a4228 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -369,7 +369,6 @@ ForCustomer=Para el cliente
 UnHidePassword=Mostrar comando real con contraseña clara
 AddNewLine=Agregar nueva línea
 AddFile=Agregar archivo
-FreeLineOfType=Artículo de texto libre, escriba:
 CloneMainAttributes=Clonar objeto con sus atributos principales
 ReGeneratePDF=Volver a generar PDF
 Merge=Unir
@@ -453,7 +452,6 @@ Miscellaneous=Diverso
 GroupBy=Agrupar por...
 RemoveString=Eliminar la cadena '%s'
 DownloadDocument=Descargar documento
-ActualizeCurrency=Actualizar la tasa de cambio
 ModuleBuilder=Módulo y generador de aplicaciones
 ClickToShowHelp=Haga clic para mostrar la ayuda de información sobre herramientas
 ExpenseReport=Informe de gastos
diff --git a/htdocs/langs/es_CL/website.lang b/htdocs/langs/es_CL/website.lang
index 5c55882165c..0334bdf2ac9 100644
--- a/htdocs/langs/es_CL/website.lang
+++ b/htdocs/langs/es_CL/website.lang
@@ -40,13 +40,10 @@ CreateByFetchingExternalPage=Crear página / contenedor obteniendo página de UR
 OrEnterPageInfoManually=O crea una página desde cero o desde una plantilla de página ...
 ExportSite=Sitio web de exportación
 Banner=Bandera
-DisableSiteFirst=Deshabilitar sitio web primero
 MyContainerTitle=El título de mi sitio web
 AnotherContainer=Así es como se incluye el contenido de otra página / contenedor (puede tener un error aquí si habilita el código dinámico porque el subcontenedor incrustado puede no existir)
 SorryWebsiteIsCurrentlyOffLine=Lo sentimos, este sitio web está actualmente fuera de línea. Vuelve más tarde ...
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Habilite la tabla para almacenar las cuentas del sitio web (inicio de sesión / pase) para cada sitio web / tercero
 YouMustDefineTheHomePage=Primero debe definir la página de inicio predeterminada
-OnlyEditionOfSourceForGrabbedContent=Solo es posible la edición de código fuente HTML cuando el contenido fue capturado de un sitio externo
 GrabImagesInto=Agarra también imágenes encontradas en css y página.
 WebsiteRootOfImages=Directorio raíz para imágenes de sitios web
 AliasPageAlreadyExists=La página de alias <strong> %s </ strong> ya existe
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index cd708fbcaa9..e729877077e 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -10,8 +10,6 @@ FileIntegrityIsOkButFilesWereAdded=La verificación de integridad de los archivo
 FileIntegritySomeFilesWereRemovedOrModified=La verificación de integridad de archivos ha fallado. Algunos archivos fueron modificados, eliminados o agregados.
 GlobalChecksum=Suma de control global
 MakeIntegrityAnalysisFrom=Hacer análisis de integridad de los archivos de aplicación de
-LocalSignature=Firma local incrustada (menos confiable)
-RemoteSignature=Firma remota remota (más confiable)
 FilesMissing=Archivos perdidos
 FilesAdded=Archivos Agregados
 FileCheckDolibarr=Comprobar la integridad de los archivos de la aplicación.
@@ -183,7 +181,6 @@ SourceFile=Archivo fuente
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible solo si JavaScript no está deshabilitado
 Required=Necesario
 UsedOnlyWithTypeOption=Usado solo por alguna opción de agenda
-MainDbPasswordFileConfEncrypted=Encripte la contraseña de la base de datos almacenada en conf.php. Es obligatorio, por su seguridad, activar esta opción.
 InstrucToEncodePass=Para tener la contraseña codificada en el archivo <b> conf.php </b>, reemplace la línea <br> <b> $ dolibarr_main_db_pass = "..."; </b> <br> por <br> <b> $ dolibarr_main_db_pass = "crypted: %s"; </b>
 InstrucToClearPass=Para descodificar (borrar) la contraseña en el archivo <b> conf.php </b>, reemplace la línea <br> <b> $ dolibarr_main_db_pass = "crypted: ..."; </b> <br> by <br><b> $ dolibarr_main_db_pass = "%s"; </b>
 ProtectAndEncryptPdfFiles=Proteja los archivos PDF generados. NO se recomienda ya que interrumpe la generación masiva de PDF.
@@ -355,7 +352,6 @@ Use3StepsApproval=De forma predeterminada, los pedidos de compra deben ser cread
 UseDoubleApproval=Utilice una aprobación de 3 pasos cuando la cantidad (sin impuestos) sea superior a ...
 WarningPHPMailD=Por lo tanto, se recomienda cambiar el método de envío de E-mail al valor "SMTP".
 WarningPHPMailDbis=Si realmente desea mantener el método "PHP" predeterminado para enviar E-mails, simplemente ignore esta advertencia o elimínela haciendo clic aquí %s%s.
-WarningPHPMail2=Si su proveedor de correo electrónico SMTP necesita restringir el cliente de correo electrónico a algunas direcciones IP (muy raro), esta es la dirección IP del agente de usuario de correo (MUA) para su aplicación ERP CRM: <strong> %s </strong>.
 ClickToShowDescription=Haga clic para mostrar la descripción
 DependsOn=Este módulo necesita el módulo (s)
 RequiredBy=Este módulo es requerido por el módulo (s)
@@ -384,8 +380,6 @@ Module10Name=Contabilidad (simplificada)
 Module10Desc=Informes contables simples (revistas, facturación) basados ​​en el contenido de la base de datos. No utiliza ninguna tabla de contabilidad.
 Module20Name=Propuestas
 Module20Desc=Gestión comercial de propuestas.
-Module22Name=Correos electrónicos masivos
-Module22Desc=Administrar correos electrónicos masivos
 Module23Desc=Seguimiento del consumo de energías.
 Module25Name=Órdenes de venta
 Module25Desc=Gestión de Ordenes de venta
@@ -568,10 +562,6 @@ Permission212=Líneas de orden
 Permission213=Activar linea
 Permission214=Configurar Telefonía
 Permission215=Proveedores de instalación
-Permission221=Leer correos electrónicos
-Permission222=Crear / modificar correos electrónicos (tema, destinatarios ...)
-Permission223=Validar correos electrónicos (permite enviar)
-Permission229=Eliminar correos electrónicos
 Permission237=Ver destinatarios e información
 Permission238=Manualmente enviar correos
 Permission239=Eliminar correos después de la validación o enviados
@@ -1278,9 +1268,7 @@ AgendaSetup =Configuración del módulo de eventos y agenda.
 AGENDA_DEFAULT_FILTER_TYPE =Configure automáticamente este tipo de evento en el filtro de búsqueda de la vista de agenda
 AGENDA_DEFAULT_FILTER_STATUS =Establecer automáticamente este estado para eventos en el filtro de búsqueda de la vista de agenda
 AGENDA_DEFAULT_VIEW =¿Qué vista desea abrir de forma predeterminada al seleccionar el menú Agenda?
-AGENDA_REMINDER_BROWSER =Habilite el recordatorio de eventos <b> en el navegador del usuario </b> (Cuando se alcanza la fecha de recordatorio, el navegador muestra una ventana emergente. Cada usuario puede deshabilitar dichas notificaciones desde la configuración de notificaciones del navegador).
 AGENDA_REMINDER_BROWSER_SOUND =Habilitar notificación de sonido
-AGENDA_REMINDER_EMAIL =Habilite el recordatorio de evento <b> por correo electrónico </b> (la opción de recordatorio / retraso se puede definir en cada evento).
 AGENDA_SHOW_LINKED_OBJECT =Mostrar objeto vinculado en vista de agenda
 AGENDA_USE_EVENT_TYPE =Usar tipos de eventos (administrados en el menú Configuración -> Diccionarios -> Tipo de eventos de agenda)
 AGENDA_USE_EVENT_TYPE_DEFAULT =Establecer automáticamente este valor predeterminado para el tipo de evento en el formulario de creación de evento
@@ -1290,6 +1278,7 @@ ClickToDialSetup=Haga clic para configurar el módulo de marcado.
 ClickToDialDesc=Este módulo cambia los números de teléfono, cuando se usa una computadora de escritorio, en enlaces en los que se puede hacer clic. Un clic llamará al número. Esto se puede usar para iniciar la llamada telefónica cuando usa un softphone en su escritorio o cuando usa un sistema CTI basado en el protocolo SIP, por ejemplo. Nota: cuando se usa un teléfono inteligente, siempre se puede hacer clic en los números de teléfono.
 ClickToDialUseTelLink=Use solo un enlace "tel:" en los números de teléfono
 ClickToDialUseTelLinkDesc=Utilice este método si sus usuarios tienen un softphone o una interfaz de software, instalados en la misma computadora que el navegador, y se les llama cuando hace clic en un enlace que comienza con "tel:" en su navegador. Si necesita un enlace que comience con "sip:" o una solución de servidor completa (no es necesario instalar el software local), debe establecerlo en "No" y completar el siguiente campo.
+CashDesk=Punto de venta
 CashDeskSetup=Configuración del módulo de punto de venta
 CashDeskThirdPartyForSell=Tercero genérico predeterminado para usar en ventas
 CashDeskBankAccountForSell=Cuenta predeterminada para usar para recibir pagos en efectivo
@@ -1368,7 +1357,6 @@ BackupDumpWizard=Asistente para crear el archivo de volcado de la base de datos
 BackupZipWizard=Asistente para construir el directorio de archivos de documentos
 SomethingMakeInstallFromWebNotPossible=La instalación de un módulo externo no es posible desde la interfaz web por el siguiente motivo:
 SomethingMakeInstallFromWebNotPossible2=Por esta razón, el proceso de actualización que se describe aquí es un proceso manual que solo puede realizar un usuario con privilegios.
-InstallModuleFromWebHasBeenDisabledByFile=Su administrador ha deshabilitado la instalación del módulo externo desde la aplicación. Debe pedirle que elimine el archivo <strong> %s </strong> para permitir esta función.
 ConfFileMustContainCustom=La instalación o creación de un módulo externo desde la aplicación debe guardar los archivos del módulo en el directorio <strong> %s </strong>. Para que Dolibarr procese este directorio, debe configurar su <strong> conf/conf.php </strong> para agregar las 2 líneas directivas: <br> <strong> $dolibarr_main_url_root_alt='/custom'; </strong> <br> <strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Resalta las líneas de la tabla cuando el movimiento del mouse pasa sobre
 HighlightLinesColor=Resalte el color de la línea cuando pase el mouse (use 'ffffff' para no resaltar)
diff --git a/htdocs/langs/es_CO/banks.lang b/htdocs/langs/es_CO/banks.lang
index be31a7a84c1..7d4a7379f46 100644
--- a/htdocs/langs/es_CO/banks.lang
+++ b/htdocs/langs/es_CO/banks.lang
@@ -18,6 +18,8 @@ CurrentBalance=Balance Actual
 FutureBalance=Balance futuro
 ShowAllTimeBalance=Mostrar balance desde el inicio
 RIB=Numero de cuenta
+IBAN=Número IBAN
+BIC=Código BIC / SWIFT
 SwiftValid=BIC / SWIFT válido
 SwiftNotValid=BIC / SWIFT no válido
 StandingOrders=Órdenes de débito automático
@@ -88,7 +90,6 @@ NumberOfCheques=No. de cheque
 DeleteTransaction=Eliminar entrada
 ConfirmDeleteTransaction=¿Está seguro de que desea eliminar esta entrada?
 ThisWillAlsoDeleteBankRecord=Esto también eliminará la entrada bancaria generada
-PlannedTransactions=Entradas planificadas
 ExportDataset_banque_1=Entradas bancarias y estado de cuenta
 ExportDataset_banque_2=Comprobante de depósito
 TransactionOnTheOtherAccount=Transacción en la otra cuenta
diff --git a/htdocs/langs/es_CO/blockedlog.lang b/htdocs/langs/es_CO/blockedlog.lang
index fd37ed66fe6..3be45db061e 100644
--- a/htdocs/langs/es_CO/blockedlog.lang
+++ b/htdocs/langs/es_CO/blockedlog.lang
@@ -2,7 +2,6 @@
 Fingerprints=Huellas digitales y eventos archivados
 FingerprintsDesc=Esta es la herramienta para buscar o extraer los registros inalterables. Los registros inalterables se generan y archivan localmente en una tabla dedicada, en tiempo real cuando registra un evento empresarial. Puedes utilizar esta herramienta para exportar este archivo y guardarlo en un soporte externo (algunos países, como Francia, te piden que lo hagas todos los años). Tenga en cuenta que no existe una función para depurar este registro y cada cambio que se intente realizar directamente en este registro (por ejemplo, por un pirata informático) se informará con una huella dactilar no válida. Si realmente necesita purgar esta tabla porque usó su aplicación con un propósito de demostración / prueba y desea limpiar sus datos para comenzar su producción, puede pedirle a su revendedor o integrador que restablezca su base de datos (se eliminarán todos sus datos).
 CompanyInitialKey=Clave inicial de la empresa (hash del bloque génesis)
-KoCheckFingerprintValidity=La entrada de registro archivada no es válida. Significa que alguien (¿un pirata informático?) Ha modificado algunos datos de este registro después de que se registró, o ha borrado el registro archivado anterior (verifique que existe la línea con el # anterior) o ha modificado la suma de comprobación del registro anterior.
 OkCheckFingerprintValidity=El registro de registro archivado es válido. Los datos de esta línea no se modificaron y la entrada sigue a la anterior.
 OkCheckFingerprintValidityButChainIsKo=El registro archivado parece válido en comparación con el anterior, pero la cadena estaba dañada anteriormente.
 AddedByAuthority=Almacenado en una autoridad remota
diff --git a/htdocs/langs/es_CO/categories.lang b/htdocs/langs/es_CO/categories.lang
index ac122fba83b..75c7fbe6a48 100644
--- a/htdocs/langs/es_CO/categories.lang
+++ b/htdocs/langs/es_CO/categories.lang
@@ -77,9 +77,11 @@ CatProdLinks=Vínculos entre productos / servicios y etiquetas / categorías
 CatMembersLinks=Vínculos entre miembros y etiquetas / categorías
 CatProjectsLinks=Vínculos entre proyectos y etiquetas / categorías
 CatUsersLinks=Vínculos entre usuarios y etiquetas / categorías
+DeleteFromCat=Eliminar de etiquetas / categoría
 ExtraFieldsCategories=Atributos complementarios
 CategoriesSetup=Configuración de etiquetas / categorías
 CategorieRecursiv=Vincular con etiqueta / categoría principal automáticamente
 ShowCategory=Mostrar etiqueta / categoría
+ByDefaultInList=Por defecto en la lista
 ChooseCategory=Elegir la categoría
 TicketsCategoriesArea=Categorías de entradas
diff --git a/htdocs/langs/es_CO/companies.lang b/htdocs/langs/es_CO/companies.lang
index 96c917b7cfc..c663eac09a7 100644
--- a/htdocs/langs/es_CO/companies.lang
+++ b/htdocs/langs/es_CO/companies.lang
@@ -28,7 +28,6 @@ Region-State=Región
 CountryId=ID del país
 PhonePro=Autobús. teléfono
 PhonePerso=Teléf. personal
-No_Email=Rechazar correos electrónicos masivos
 VATIsUsed=Impuesto sobre las ventas utilizado
 VATIsUsedWhenSelling=Define si este tercero incluye un impuesto sobre las ventas o no cuando realiza una factura a sus propios clientes.
 VATIsNotUsed=No sujeto a IVA
@@ -87,7 +86,7 @@ VATIntraManualCheck=También puede consultar manualmente en el sitio web de la C
 NorProspectNorCustomer=No prospecto, ni cliente
 StatusProspect1=Para ser contactado
 ChangeToContact=Cambiar el estado a 'Para ser contactado'
-ExportDataset_company_1=Terceros (empresas / fundaciones / personas físicas) y sus propiedades
+ExportDataset_company_2=Contactos/direcciones y atributos adicionales de terceros
 ImportDataset_company_1=Terceros y sus propiedades
 ImportDataset_company_2=Contactos/direcciones y atributos adicionales de terceros
 ImportDataset_company_4=Representantes de ventas de terceros (asignar representantes de ventas / usuarios a las empresas)
@@ -105,7 +104,6 @@ ThirdPartyIsClosed=Tercero está cerrado
 OutstandingBillReached=Max. alcanzado por factura pendiente
 OrderMinAmount=Importe mínimo por pedido
 ManagingDirectors=Administrador(es) (CEO, gerente, director, presidente, etc.)
-ConfirmMergeThirdparties=¿Está seguro de que desea fusionar el tercero elegido con el actual? Todos los objetos vinculados (facturas, ordenes, ...) se moverán al tercero actual, después de lo cual se eliminará el tercero elegido.
 ThirdpartiesMergeSuccess=Los terceros se han fusionado
 SaleRepresentativeLogin=Inicio de sesión del representante de ventas
 SaleRepresentativeFirstname=Nombre del representante de ventas
diff --git a/htdocs/langs/es_CO/errors.lang b/htdocs/langs/es_CO/errors.lang
index a0f17ef3e79..6aee1859d3c 100644
--- a/htdocs/langs/es_CO/errors.lang
+++ b/htdocs/langs/es_CO/errors.lang
@@ -94,7 +94,6 @@ ErrorLoginHasNoEmail=Este usuario no tiene dirección de correo electrónico. Pr
 ErrorBadValueForCode=Mal valor para el código de seguridad. Inténtelo de nuevo con un nuevo valor ...
 ErrorBothFieldCantBeNegative=Los campos %s y %s no pueden ser ambos negativos
 ErrorLinesCantBeNegativeForOneVATRate=El total de líneas (neto de impuestos) no puede ser negativo para una tasa de IVA no nula determinada (se encontró un total negativo para la tasa de IVA <b> %s </b> %%).
-ErrorLinesCantBeNegativeOnDeposits=Las líneas no pueden ser negativas en un depósito. Tendrá problemas cuando necesite consumir el depósito en la factura final si lo hace.
 ErrorQtyForCustomerInvoiceCantBeNegative=La cantidad de la línea en las facturas de los clientes no puede ser negativa
 ErrorWebServerUserHasNotPermission=La cuenta de usuario <b> %s </b> utilizada para ejecutar el servidor web no tiene permiso para eso
 ErrorNoActivatedBarcode=Ningún tipo de código de barras activado
diff --git a/htdocs/langs/es_CO/exports.lang b/htdocs/langs/es_CO/exports.lang
index 6cd0c9e711d..5013fc52b7f 100644
--- a/htdocs/langs/es_CO/exports.lang
+++ b/htdocs/langs/es_CO/exports.lang
@@ -41,7 +41,6 @@ FileMustHaveOneOfFollowingFormat=El archivo para importar debe tener uno de los
 ChooseFormatOfFileToImport=Elija el formato de archivo para usar como formato de archivo de importación haciendo clic en el icono %s para seleccionarlo ...
 SourceFileFormat=Formato de archivo de origen
 FieldsInSourceFile=Campos en el archivo fuente
-FieldsInTargetDatabase=Campos de destino en la base de datos Dolibarr (negrita = obligatorio)
 NoFields=Sin campos
 MoveField=Mover el número de columna de campo %s
 ErrorImportDuplicateProfil=No se pudo guardar este perfil de importación con este nombre. Ya existe un perfil existente con este nombre.
@@ -53,8 +52,6 @@ NowClickToTestTheImport=Verifique que el formato de archivo (delimitadores de ca
 RunSimulateImportFile=Ejecutar simulación de importación
 FieldNeedSource=Este campo requiere datos del archivo de origen
 SomeMandatoryFieldHaveNoSource=Algunos campos obligatorios no tienen origen en el archivo de datos
-InformationOnSourceFile=Información en archivo fuente
-InformationOnTargetTables=Información sobre campos de destino
 SelectAtLeastOneField=Cambie al menos un campo de origen en la columna de campos para exportar
 SelectFormat=Elija este formato de archivo de importación
 RunImportFile=Datos de importacion
diff --git a/htdocs/langs/es_CO/mails.lang b/htdocs/langs/es_CO/mails.lang
index 50cd0d8c970..2615db1c5dc 100644
--- a/htdocs/langs/es_CO/mails.lang
+++ b/htdocs/langs/es_CO/mails.lang
@@ -1,8 +1,6 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=e-mailing
 EMailing=e-mailing
-EMailings=e-mailing
-AllEMailings=Todos los e-mailings
 MailCard=Tarjeta de e-mailing
 MailRecipient=Recipiente
 MailTo=A
@@ -13,15 +11,6 @@ MailCCC=Copia en caché en
 MailDate=Fecha de E-mail
 MailFile=Archivos adjuntos
 SubjectNotIn=No en el tema
-ShowEMailing=Mostrar e-mailing
-ListOfEMailings=Lista de e-mailings
-NewMailing=Nuevo e-mailing
-EditMailing=Editar e-mailing
-ResetMailing=Reenviar e-mailing
-DeleteMailing=Eliminar e-mailing
-PreviewMailing=Vista previa del envío de e-mailing
-CreateMailing=Crear e-mailing
-ValidMailing=Envío de e-mailing válido
 MailSuccessfulySent=Correo electrónico (de %s a %s) aceptado correctamente para la entrega
 MailingSuccessfullyValidated=e-mailing validado con éxito
 MailUnsubcribe=Darse de baja
@@ -71,22 +60,15 @@ MailingModuleDescEmailsFromUser=Entrada de correos electrónicos por parte del u
 MailingModuleDescDolibarrUsers=Usuarios con correos electrónicos
 SendingFromWebInterfaceIsNotAllowed=No se permite el envío desde la interfaz web.
 RecipientSelectionModules=Solicitudes definidas para la selección de destinatarios
-MailingArea=Área de e-mailings
-LastMailings=Últimos e-mailings %s
 TargetsStatistics=Estadísticas de objetivos
 NbOfCompaniesContacts=Contactos / direcciones únicos
 MailNoChangePossible=Los destinatarios de los e-mailings validados no se pueden cambiar
-SearchAMailing=Búsqueda de correo
-SendMailing=Enviar e-mailing
 MailingNeedCommand=El envío de un e-mailing se puede realizar desde la línea de comandos. Pídale al administrador del servidor que ejecute el siguiente comando para enviar el e-mailing a todos los destinatarios:
 MailingNeedCommand2=Sin embargo, puede enviarlos en línea agregando el parámetro MAILING_LIMIT_SENDBYWEB con el valor del número máximo de correos electrónicos que desea enviar por sesión. Para ello, vaya a Inicio - Configuración - Otro.
 ConfirmSendingEmailing=Si desea enviar e-mailings directamente desde esta pantalla, confirme que está seguro de que desea enviar e-mailings ahora desde su navegador.
-LimitSendingEmailing=Nota: El envío de e-mailings desde la interfaz web se realiza varias veces por motivos de seguridad y tiempo de espera, <b> %s </b> destinatarios a la vez para cada sesión de envío.
 TargetsReset=Limpiar lista
 ToClearAllRecipientsClickHere=Haga clic aquí para borrar la lista de destinatarios de este e-mailing
 ToAddRecipientsChooseHere=Agregue destinatarios eligiendo de las listas
-NbOfEMailingsReceived=Envíos masivos de e-mailings recibidos
-NbOfEMailingsSend=Envíos masivos de e-mailings
 IdRecord=Registro de identificación
 DeliveryReceipt=Entrega Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Puede utilizar el separador <b> coma </b> para especificar varios destinatarios.
@@ -124,5 +106,4 @@ OutGoingEmailSetup=Correos electrónicos salientes
 InGoingEmailSetup=Correos electrónicos entrantes
 DefaultOutgoingEmailSetup=Misma configuración que la configuración global de correo electrónico saliente
 ContactsWithThirdpartyFilter=Contactos con filtro de terceros
-IsNotAnAnswer=No responde (correo electrónico inicial)
 IsAnAnswer=Es una respuesta de un correo electrónico inicial.
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index deea33b610e..73ffd0dc6e5 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -142,7 +142,6 @@ Modules=Módulos / Aplicaciones
 ExternalRef=Ref. externo
 RefSupplier=Ref. vendedor
 CommercialProposalsShort=Cotizaciones
-LatestLinkedEvents=Los últimos eventos vinculados %s
 CompanyFoundation=Empresa / Organización
 Accountant=Contador
 ActionsOnCompany=Eventos para este tercero
@@ -191,7 +190,6 @@ YouCanChangeValuesForThisListFromDictionarySetup=Puede cambiar los valores para
 YouCanChangeValuesForThisListFrom=Puede cambiar los valores para esta lista desde el menú %s
 YouCanSetDefaultValueInModuleSetup=Puede configurar el valor predeterminado utilizado al crear un nuevo registro en la configuración del módulo
 Layout=Diseño
-FreeLineOfType=Elemento de texto libre, escriba:
 DocumentModelStandardPDF=Plantilla PDF estándar
 WarningYouAreInMaintenanceMode=Advertencia, está en modo de mantenimiento: solo el usuario <b> %s </b> puede utilizar la aplicación en este modo.
 CoreErrorMessage=Disculpe, ocurrió un error. Póngase en contacto con el administrador del sistema para consultar los registros o deshabilite $ dolibarr_main_prod = 1 para obtener más información.
@@ -253,7 +251,6 @@ NotAllExportedMovementsCouldBeRecordedAsExported=No todos los movimientos export
 Miscellaneous=Diverso
 GroupBy=Agrupar por...
 DownloadDocument=Descargar documento
-ActualizeCurrency=Tasa de cambio de moneda
 ModuleBuilder=Generador de módulos y aplicaciones
 ClickToShowHelp=Haga clic para mostrar la ayuda de ayuda.
 ExpenseReport=Informe de gastos
@@ -362,3 +359,4 @@ Terminated=Terminado
 Position=Puesto
 ConfirmAllocateCommercialQuestion=¿Está seguro de que desea asignar los %s registros seleccionados?
 CommercialAffected=representante de ventas asignado
+AllTime=Desde el principio
diff --git a/htdocs/langs/es_CO/members.lang b/htdocs/langs/es_CO/members.lang
index d3bd9a469b4..a0a3d23151c 100644
--- a/htdocs/langs/es_CO/members.lang
+++ b/htdocs/langs/es_CO/members.lang
@@ -109,6 +109,7 @@ DescADHERENT_CARD_HEADER_TEXT=Texto impreso en la parte superior de las tarjetas
 DescADHERENT_CARD_TEXT=Texto impreso en tarjetas de miembro (alinear a la izquierda)
 DescADHERENT_CARD_TEXT_RIGHT=Texto impreso en tarjetas de miembro (alinear a la derecha)
 DescADHERENT_CARD_FOOTER_TEXT=Texto impreso en la parte inferior de las tarjetas de miembro
+ShowTypeCard=Mostrar tipo '%s'
 HTPasswordExport=generación de archivo htpassword
 NoThirdPartyAssociatedToMember=Ningún tercero asociado con este miembro
 MembersAndSubscriptions=Miembros y contribuciones
@@ -120,6 +121,7 @@ LinkToGeneratedPagesDesc=Esta pantalla le permite generar archivos PDF con tarje
 DocForAllMembersCards=Genere tarjetas de presentación para todos los miembros
 DocForOneMemberCards=Genere tarjetas de presentación para un miembro en particular
 DocForLabels=Generar hojas de direcciones
+SubscriptionPayment=Pago de contribución
 LastSubscriptionDate=Fecha del último pago de contribución
 LastSubscriptionAmount=Importe de la última contribución
 MembersStatisticsByState=Estadísticas de miembros por estado / provincia
@@ -131,16 +133,12 @@ NewMemberbyWeb=Nuevo miembro agregado. Esperando aprobacion
 NewMemberForm=Formulario de nuevo miembro
 SubscriptionsStatistics=Estadísticas de contribuciones
 NbOfSubscriptions=Numero de contribuciones
-AmountOfSubscriptions=Monto recaudado de las contribuciones
 TurnoverOrBudget=Facturación (para una empresa) o Presupuesto (para una fundación)
 CanEditAmountDetail=El visitante puede elegir/editar el monto de su contribución independientemente del tipo de miembro
 MembersStatisticsByProperties=Estadísticas de miembros por naturaleza
-NoVatOnSubscription=Sin IVA por contribuciones
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producto utilizado para la línea de contribución en la factura: %s
 SubscriptionRecorded=Contribución registrada
 NoEmailSentToMember=No se envió ningún correo electrónico al miembro
 EmailSentToMember=Correo electrónico enviado al miembro %s
-SendReminderForExpiredSubscriptionTitle=Envíe un recordatorio por correo electrónico para las contribuciones caducadas
 YouMayFindYourInvoiceInThisEmail=Puede encontrar su factura adjunta a este correo electrónico
 XMembersClosed=%s miembro (s) cerrado
 XExternalUserCreated=%s usuario(s) externos creados
diff --git a/htdocs/langs/es_CO/website.lang b/htdocs/langs/es_CO/website.lang
index 66d9863937e..d844745373a 100644
--- a/htdocs/langs/es_CO/website.lang
+++ b/htdocs/langs/es_CO/website.lang
@@ -36,12 +36,10 @@ CheckVirtualHostPerms=Compruebe también que el usuario del host virtual (por ej
 ReadPerm=Leer
 TestDeployOnWeb=Probar / implementar en la web
 PreviewSiteServedByWebServer=<u>Obtenga una vista previa de %s en una nueva pestaña. </u><br><br> El %s será servido por un servidor web externo (como Apache, Nginx, IIS). Debe instalar y configurar este servidor antes de apuntar al directorio:<br><strong>%s</strong><br> URL servida por un servidor externo: <br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u> Obtenga una vista previa de %s en una nueva pestaña. </u> <br> <br> El %s será servido por el servidor Dolibarr por lo que no necesita ningún servidor web adicional (como Apache, Nginx, IIS) para ser instalado. <br> El inconveniente es que las URL de las páginas no son fáciles de usar y comienzan con la ruta de su Dolibarr. <br> URL servida por Dolibarr: <br> <strong> %s </strong> <br> <br> Para utilizar su propio servidor web exterior al servicio de este sitio web, crear una máquina virtual en su servidor Web que señala en el directorio <br> <strong> %s </strong> <br> a continuación, introduzca el nombre de este servidor virtual en las propiedades de este sitio web y haga clic en el enlace "Probar / Implementar en la web".
 VirtualHostUrlNotDefined=URL del host virtual servido por un servidor web externo no definido
 NoPageYet=Aún no hay páginas
 SyntaxHelp=Ayuda sobre sugerencias de sintaxis específicas
 YouCanEditHtmlSourceckeditor=Puede editar el código fuente HTML usando el botón "Fuente" en el editor.
-YouCanEditHtmlSource2=Para una imagen compartida con un enlace para compartir (acceso abierto usando la clave hash para compartir del archivo), la sintaxis es: <br> <strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 ClonePage=Clonar página / contenedor
 ConfirmClonePage=Ingrese el código / alias de la nueva página y si es una traducción de la página clonada.
 LanguageMustNotBeSameThanClonedPage=Clonas una página como traducción. El idioma de la nueva página debe ser diferente al idioma de la página de origen.
@@ -52,13 +50,10 @@ OrEnterPageInfoManually=O crea una página desde cero o desde una plantilla de p
 FetchAndCreate=Obtener y crear
 Banner=Bandera
 WebsiteAccounts=Cuentas de sitios web
-DisableSiteFirst=Deshabilitar el sitio web primero
 MyContainerTitle=El título de mi sitio web
 AnotherContainer=Así es como se incluye el contenido de otra página / contenedor (puede tener un error aquí si habilita el código dinámico porque es posible que el subcontenedor incrustado no exista)
 SorryWebsiteIsCurrentlyOffLine=Lo sentimos, este sitio web está actualmente fuera de línea. Vuelve más tarde ...
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Habilite la tabla para almacenar cuentas de sitios web (inicio de sesión / contraseña) para cada sitio web / tercero
 YouMustDefineTheHomePage=Primero debe definir la página de inicio predeterminada
-OnlyEditionOfSourceForGrabbedContent=Solo es posible la edición de la fuente HTML cuando el contenido se obtuvo de un sitio externo
 GrabImagesInto=Coge también las imágenes encontradas en css y page.
 WebsiteRootOfImages=Directorio raíz para imágenes de sitios web
 SubdirOfPage=Subdirectorio dedicado a la página
diff --git a/htdocs/langs/es_CR/admin.lang b/htdocs/langs/es_CR/admin.lang
index 247f30a17e8..0dac84199fc 100644
--- a/htdocs/langs/es_CR/admin.lang
+++ b/htdocs/langs/es_CR/admin.lang
@@ -10,8 +10,6 @@ FileIntegrityIsStrictlyConformedWithReference=La integridad de los archivos est
 FileIntegrityIsOkButFilesWereAdded=La verificación de integridad de los archivos ha pasado, sin embargo, se han agregado algunos archivos nuevos.
 FileIntegritySomeFilesWereRemovedOrModified=La verificación de integridad de los archivos ha fallado. Algunos archivos fueron modificados, eliminados o agregados.
 MakeIntegrityAnalysisFrom=Realice un análisis de integridad de los archivos de la aplicación desde
-LocalSignature=Firma local incrustada (menos confiable)
-RemoteSignature=Firma remota (más confiable)
 FilesMissing=Archivos perdidos
 FilesAdded=Archivos agregados
 FileCheckDolibarr=Comprobar la integridad de los archivos de la aplicación
@@ -179,7 +177,6 @@ SourceFile=Archivo fuente
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible solo si JavaScript no está deshabilitado
 UsedOnlyWithTypeOption=Usado solo por alguna opción de agenda
 Passwords=contraseñas
-MainDbPasswordFileConfEncrypted=Cifre la contraseña de la base de datos almacenada en conf.php. Se recomienda encarecidamente activar esta opción.
 InstrucToEncodePass=Para codificar la contraseña en el archivo <b> conf.php </b>, reemplace la línea <br> <b> $dolibarr_main_db_pass="..."; </b> <br> por <br> <b> $dolibarr_main_db_pass="crypted:%s"; </b>
 InstrucToClearPass=Para decodificar la contraseña (clara) en el archivo <b> conf.php </b>, reemplace la línea <br> <b> $dolibarr_main_db_pass="crypted:..."; </b> <br> por <br> <b> $dolibarr_main_db_pass="%s"; </b>
 ProtectAndEncryptPdfFiles=Proteja los archivos PDF generados. Esto NO se recomienda ya que interrumpe la generación masiva de PDF.
@@ -363,7 +360,6 @@ Use3StepsApproval=De forma predeterminada, las órdenes de compra deben ser crea
 UseDoubleApproval=Utilice una aprobación de 3 pasos cuando el monto (sin impuestos) sea superior a...
 WarningPHPMailC=- También es interesante usar el servidor SMTP de su propio proveedor de servicios de correo electrónico para enviar correos electrónicos, por lo que todos los correos electrónicos enviados desde la aplicación también se guardarán en el directorio "Enviados" de su buzón.
 WarningPHPMailDbis=Si realmente desea mantener el método "PHP" predeterminado para enviar correos electrónicos, simplemente ignore esta advertencia o elimínela haciendo clic aquí %s%s.
-WarningPHPMail2=Si su proveedor SMTP de correo electrónico necesita restringir el cliente de correo electrónico a algunas direcciones IP (muy raro), esta es la dirección IP del agente de usuario de correo (MUA) para su aplicación ERP CRM: <strong> %s </strong>.
 ClickToShowDescription=Haga clic para mostrar la descripción
 DependsOn=Este módulo necesita los módulo(s)
 RequiredBy=Este módulo es requerido por módulo(s)
@@ -392,8 +388,6 @@ Module10Name=Contabilidad (simplificada)
 Module10Desc=Informes contables simples (diarios, facturación) basados en el contenido de la base de datos. No utiliza ninguna tabla de contabilidad.
 Module20Name=Propuestas
 Module20Desc=Gestión de propuestas comerciales
-Module22Name=Envíos masivos de correo electrónico
-Module22Desc=Administrar correos electrónicos masivos
 Module23Desc=Monitorización del consumo de energías
 Module25Name=Ordenes de venta
 Module25Desc=Gestión de pedidos de venta
@@ -585,10 +579,6 @@ Permission212=Líneas de pedido
 Permission213=Activar línea
 Permission214=Configurar Telefonía
 Permission215=Proveedores de configuración
-Permission221=Leer correos electrónicos
-Permission222=Crear/modificar emailings (tema, destinatarios...)
-Permission223=Validar emailings (permite enviar)
-Permission229=Eliminar correos electrónicos
 Permission237=Ver destinatarios e información
 Permission238=Enviar correos manualmente
 Permission239=Eliminar envíos después de validarlos o enviarlos
@@ -1242,14 +1232,6 @@ DeliveriesOrderAbility=Recibos de entrega de productos de soporte
 FreeLegalTextOnDeliveryReceipts=Texto libre en los recibos de entrega
 AdvancedEditor=editor avanzado
 ActivateFCKeditor=Activar editor avanzado para:
-FCKeditorForNotePublic=WYSIWYG creación /edición del campo "Notas publica" de elementos
-FCKeditorForNotePrivate=WYSIWYG creación /edición del campo "notas privadas" de elementos
-FCKeditorForCompany=WYSIWYG creación /edición de la descripción del campo de elementos (excepto producto/ servicios)
-FCKeditorForProductDetails=WYSIWYG creación /edición descripción de productos o líneas para objetos (líneas de presupuesto, ordenes, facturas, etc.)
-FCKeditorForMailing=WYSIWYG creación /edición del campo para correos electrónicos masivos (Herramientas->eMailing)
-FCKeditorForUserSignature=WYSIWYG creación /edición de la firma del usuario
-FCKeditorForMail=WYSIWYG creación /edición para todo correo (excepto herramientas >eMailing)
-FCKeditorForTicket=WYSIWYG creación /edición para tickets
 StockSetup=Configuración del módulo de existencias
 IfYouUsePointOfSaleCheckModule=Si utiliza el módulo de punto de venta (POS) proporcionado de forma predeterminada o un módulo externo, su módulo POS puede ignorar esta configuración. La mayoría de los módulos POS están diseñados de forma predeterminada para crear una factura de inmediato y reducir el stock independientemente de las opciones aquí. Entonces, si necesita o no tener una disminución de stock al registrar una venta desde su POS, verifique también la configuración de su módulo POS.
 NotTopTreeMenuPersonalized=Menús personalizados no vinculados a una entrada de menú superior
@@ -1291,9 +1273,7 @@ AgendaSetup =Configuración del módulo de eventos y agenda
 AGENDA_DEFAULT_FILTER_TYPE =Establecer automáticamente este tipo de evento en el filtro de búsqueda de la vista de agenda
 AGENDA_DEFAULT_FILTER_STATUS =Establecer automáticamente este estado para eventos en el filtro de búsqueda de la vista de agenda
 AGENDA_DEFAULT_VIEW =¿Qué vista quieres abrir por defecto al seleccionar el menú Agenda?
-AGENDA_REMINDER_BROWSER =Habilite el recordatorio de eventos <b> en el navegador del usuario </b> (cuando se alcanza la fecha de recordatorio, el navegador muestra una ventana emergente. Cada usuario puede deshabilitar dichas notificaciones desde la configuración de notificaciones de su navegador).
 AGENDA_REMINDER_BROWSER_SOUND =Habilitar notificación de sonido
-AGENDA_REMINDER_EMAIL =Habilite el recordatorio de eventos <b> por correo electrónico </b> (la opción de recordatorio/retraso se puede definir en cada evento).
 AGENDA_REMINDER_EMAIL_NOTE =Nota: La frecuencia del trabajo programado %s debe ser suficiente para garantizar que los recordatorios se envíen en el momento correcto.
 AGENDA_SHOW_LINKED_OBJECT =Mostrar objeto vinculado en la vista de agenda
 AGENDA_USE_EVENT_TYPE =Usar tipos de eventos (administrados en el menú Configuración -> Diccionarios -> Tipo de agenda de eventos)
@@ -1304,6 +1284,7 @@ ClickToDialUrlDesc=URL llamada cuando se hace clic en el icono de teléfono. En
 ClickToDialDesc=Este módulo cambia los números de teléfono, cuando se usa una computadora de escritorio, en enlaces en los que se puede hacer clic. Un clic llamará al número. Esto se puede usar para iniciar la llamada telefónica cuando usa un teléfono virtual en su escritorio o cuando usa un sistema CTI basado en el protocolo SIP, por ejemplo. Nota: cuando se utiliza un teléfono inteligente, siempre se puede hacer clic en los números de teléfono.
 ClickToDialUseTelLink=Use solo un enlace "tel:" en los números de teléfono
 ClickToDialUseTelLinkDesc=Use este método si sus usuarios tienen un softphone o una interfaz de software, instalado en la misma computadora que el navegador, y se les llama cuando hacen clic en un enlace que comienza con "tel:" en su navegador. Si necesita un enlace que comience con "sip:" o una solución de servidor completa (sin necesidad de instalación de software local), debe establecer esto en "No" y completar el siguiente campo.
+CashDesk=Punto de venta
 CashDeskSetup=Configuración del módulo de punto de venta
 CashDeskThirdPartyForSell=Tercero genérico predeterminado para usar en ventas
 CashDeskBankAccountForSell=Cuenta predeterminada para usar para recibir pagos en efectivo
@@ -1381,7 +1362,6 @@ BackupDumpWizard=Asistente para construir el archivo de volcado de la base de da
 BackupZipWizard=Asistente para construir el archivo de directorio de documentos
 SomethingMakeInstallFromWebNotPossible=La instalación del módulo externo no es posible desde la interfaz web por el siguiente motivo:
 SomethingMakeInstallFromWebNotPossible2=Por esta razón, el proceso de actualización que se describe aquí es un proceso manual que solo puede realizar un usuario privilegiado.
-InstallModuleFromWebHasBeenDisabledByFile=Su administrador ha deshabilitado la instalación de un módulo externo desde la aplicación. Debe pedirle que elimine el archivo <strong> %s </strong> para permitir esta función.
 ConfFileMustContainCustom=Instalar o construir un módulo externo desde la aplicación necesita guardar los archivos del módulo en el directorio <strong> %s </strong>. Para que Dolibarr procese este directorio, debe configurar su <strong> conf/conf.php </strong> para agregar las 2 líneas directivas: <br> <strong> $dolibarr_main_url_root_alt='/custom'; </strong> <br> <strong> $dolibarr_main_document_root_alt='%s/personalizado'; </strong>
 HighlightLinesOnMouseHover=Resalte las líneas de la tabla cuando el movimiento del mouse pasa por encima
 HighlightLinesColor=Resalte el color de la línea cuando el mouse pasa por encima (utilice 'ffffff' para no resaltar)
@@ -1624,3 +1604,4 @@ ReEncryptDesc=Vuelva a cifrar los datos si aún no está cifrado
 PasswordFieldEncrypted=%snuevo registro, se ha encriptado este campo?
 ExtrafieldsDeleted=Extracampos %sse han eliminado
 LargeModern=Grande-moderno
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Indicaciones obligatorias en algunos países (Francia,..)
diff --git a/htdocs/langs/es_CR/banks.lang b/htdocs/langs/es_CR/banks.lang
index 7abbfa3533d..d1ffc4283bc 100644
--- a/htdocs/langs/es_CR/banks.lang
+++ b/htdocs/langs/es_CR/banks.lang
@@ -14,6 +14,8 @@ BalanceMinimalAllowed=Saldo mínimo permitido
 FutureBalance=Saldo futuro
 ShowAllTimeBalance=Mostrar saldo desde el inicio
 RIB=Numero de cuenta
+IBAN=Número IBAN
+BIC=Código BIC / SWIFT
 SwiftValid=BIC / SWIFT válido
 StandingOrders=Órdenes de domiciliación bancaria
 StandingOrder=Pedido de domiciliación bancaria
@@ -84,7 +86,6 @@ NumberOfCheques=No. de cheque
 DeleteTransaction=Eliminar entrada
 ConfirmDeleteTransaction=¿Está seguro de que desea eliminar esta entrada?
 ThisWillAlsoDeleteBankRecord=Esto también eliminará la entrada bancaria generada
-PlannedTransactions=Entradas planificadas
 ExportDataset_banque_1=Entradas bancarias y estado de cuenta
 ExportDataset_banque_2=Comprobante de depósito
 TransactionOnTheOtherAccount=Transacción en la otra cuenta
@@ -95,7 +96,6 @@ AllAccounts=Todas las cuentas bancarias y en efectivo
 FutureTransaction=Transacción futura. Incapaz de conciliarse.
 SelectPaymentTransactionAndGenerate=Seleccione/filtre los documentos que se incluirán en el recibo de depósito del   1%s. luego haz click en crear.
 InputReceiptNumber=Elija el extracto bancario relacionado con la conciliación. Use un valor numérico ordenable
-InputReceiptNumberBis=Año/Mes o Año/Mes/Dia
 ToConciliate=¿Para conciliar?
 ThenCheckLinesAndConciliate=Luego, verifique las líneas presentes en el extracto bancario y haga clic
 DefaultRIB=BAN predeterminado
diff --git a/htdocs/langs/es_CR/bills.lang b/htdocs/langs/es_CR/bills.lang
index 684456d70e3..8eb3a0351de 100644
--- a/htdocs/langs/es_CR/bills.lang
+++ b/htdocs/langs/es_CR/bills.lang
@@ -118,6 +118,7 @@ LatestSupplierTemplateInvoices=Últimas  %s plantillas   de facturas de proveedo
 LastCustomersBills=Últimas %s facturas de clientes
 LastSuppliersBills=Últimas%s facturas de proveedores
 AllCustomerTemplateInvoices=Todas las plantillas de facturas
+AllSupplierTemplateInvoices=Todas las plantillas de facturas
 DraftBills=Facturas en borrador
 CustomersDraftInvoices=Facturas de clientes en borrador
 SuppliersDraftInvoices=Facturas de proveedores en borrador
diff --git a/htdocs/langs/es_CR/categories.lang b/htdocs/langs/es_CR/categories.lang
index 232ceea1659..b96801e62c1 100644
--- a/htdocs/langs/es_CR/categories.lang
+++ b/htdocs/langs/es_CR/categories.lang
@@ -42,5 +42,7 @@ CatProjectsList=Listado de proyectos etiquetas/categorías
 CatUsersList=Lista de usuarios etiquetas/categorías
 CatCusLinks=Enlaces entre clientes/potenciales y etiquetas/categorías
 CatUsersLinks=Enlaces entre miembros y etiquetas/categorías
+DeleteFromCat=Eliminar de etiquetas/categoría
 ExtraFieldsCategories=Atributos complementarios
 CategorieRecursiv=Vincular automáticamente con la etiqueta/categoría principal
+ByDefaultInList=Por defecto en la lista
diff --git a/htdocs/langs/es_CR/companies.lang b/htdocs/langs/es_CR/companies.lang
index c15e165ccd9..5b30d20b983 100644
--- a/htdocs/langs/es_CR/companies.lang
+++ b/htdocs/langs/es_CR/companies.lang
@@ -27,6 +27,7 @@ CountryIsInEEC=El país está dentro de la Comunidad Europea
 PriceFormatInCurrentLanguage=Formato de visualización de precios en el idioma y moneda actuales
 ThirdPartyName=Nombre de un cliente/proveedor
 ThirdPartyEmail=Correo electrónico del tercero
+ThirdParties=Clientes / Proveedores
 ThirdPartyProspects=Clientes Potenciales
 ThirdPartyProspectsStats=Clientes Potenciales
 ThirdPartyCustomersWithIdProf12=Clientes con %s o %s
@@ -47,7 +48,6 @@ CountryCode=Código de País
 CountryId=ID del país
 PhonePerso=Teléfono Personal
 PhoneMobile=Celular
-No_Email=Rechazar correos masivos
 Town=Ciudad
 Poste=Posición
 VATIsNotUsed=No sujeto a IVA
@@ -244,7 +244,7 @@ NoParentCompany=Ninguno
 ContactNotLinkedToCompany=Contacto no vinculado a ningún tercero
 DolibarrLogin=Ingreso Dolibbarr
 NoDolibarrAccess=Sin acceso a Dolibarr
-ExportDataset_company_1=Terceros (empresas/fundaciones/personas físicas) y sus propiedades.
+ExportDataset_company_2=Contactos/direcciones y atributos adicionales de terceros
 ImportDataset_company_1=Terceros y sus propiedades
 ImportDataset_company_2=Contactos/direcciones y atributos adicionales de terceros
 ImportDataset_company_4=Vendedores de terceros (asignar vendedores/usuarios a empresas)
diff --git a/htdocs/langs/es_CR/exports.lang b/htdocs/langs/es_CR/exports.lang
index 180e13b6cd3..b75e58136b6 100644
--- a/htdocs/langs/es_CR/exports.lang
+++ b/htdocs/langs/es_CR/exports.lang
@@ -38,7 +38,6 @@ FileMustHaveOneOfFollowingFormat=El archivo a importar debe tener uno de los sig
 StarAreMandatory=En el archivo de plantilla, todos los campos con un " son campos obligatorios
 ChooseFormatOfFileToImport=Elija el formato de archivo para usar como formato de archivo de importación haciendo clic en el icono %s para seleccionarlo ...
 FieldsInSourceFile=Campos del archivo de origen
-FieldsInTargetDatabase=Campos de destino en la base de datos Dolibarr (negrita=obligatorio)
 NoFields=Sin campos
 MoveField=Mover número de columna de campo%s
 ErrorImportDuplicateProfil=Error al guardar este perfil de importación con este nombre. Ya existe un perfil existente con este nombre.
@@ -51,8 +50,6 @@ NowClickToTestTheImport=Verifique que el formato del archivo (delimitadores de c
 RunSimulateImportFile=Ejecutar simulación de importación
 FieldNeedSource=Este campo requiere datos del archivo de origen
 SomeMandatoryFieldHaveNoSource=Algunos campos obligatorios no tienen fuente de archivo de datos
-InformationOnSourceFile=Información sobre el archivo fuente
-InformationOnTargetTables=Información sobre los campos objetivo
 SelectAtLeastOneField=Cambiar al menos un campo de origen en la columna de campos para exportar
 SelectFormat=Elija este formato de archivo de importación
 RunImportFile=Datos de importacion
diff --git a/htdocs/langs/es_CR/mails.lang b/htdocs/langs/es_CR/mails.lang
index 5fe2b066541..f496eacc129 100644
--- a/htdocs/langs/es_CR/mails.lang
+++ b/htdocs/langs/es_CR/mails.lang
@@ -1,8 +1,6 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Correo electrónico
 EMailing=Correo electrónico
-EMailings=Correos electrónicos
-AllEMailings=Todos los correos
 MailCard=Tarjeta de e-mailing
 MailTo=A
 MailToUsers=Para usuario(s)
@@ -13,15 +11,6 @@ MailFile=Archivos adjuntos
 MailMessage=Cuerpo del email
 SubjectNotIn=Fuera del asunto
 BodyNotIn=Fuera del cuerpo
-ShowEMailing=Mostrar correo
-ListOfEMailings=Lista de correos
-NewMailing=Nuevo correo
-EditMailing=Editar correo
-ResetMailing=Reenviar correo
-DeleteMailing=Eliminar correo electrónico
-PreviewMailing=Previsualizar correo
-CreateMailing=Crear correo
-ValidMailing=Validar correo
 MailingStatusValidated=Validada
 MailSuccessfulySent=Correo (de %s a %s) aceptado correctamente para entregar
 MailingSuccessfullyValidated=Correo validado correctamente
@@ -72,22 +61,15 @@ MailingModuleDescThirdPartiesByCategories=Clientes / Proveedores
 SendingFromWebInterfaceIsNotAllowed=No está permitido el envío desde interfaz web.
 LineInFile=Línea %s del archivo
 RecipientSelectionModules=Solicitudes definidas para la selección del destinatario
-MailingArea=Area de correos
-LastMailings=Ultimos %s correos
 TargetsStatistics=Estadísticas de objetivo
 NbOfCompaniesContacts=Contactos/direcciones únicas
 MailNoChangePossible=Los destinatarios de los e-mailings validados no se pueden cambiar
-SearchAMailing=Buscar correo
-SendMailing=Enviar e-mailing
 MailingNeedCommand=El envío de un e-mailing se puede realizar desde la línea de comandos. Pídale al administrador del servidor que ejecute el siguiente comando para enviar el e-mailing a todos los destinatarios:
 MailingNeedCommand2=De todas formas puedes enviarlos en línea agregando el parámetro MAILING_LIMIT_SENDBYWEB con el valor máximo de correos que quieres enviar por cada sesión. Para esto, ve a Inicio - Configuración - Otros.
 ConfirmSendingEmailing=Si desea enviar e-mailings directamente desde esta pantalla, confirme que está seguro de que desea enviar e-mailings ahora desde su navegador?
-LimitSendingEmailing=Nota: El envío de correos desde la interfaz web se realiza varias veces por motivos de seguridad y tiempo de espera, <b> %s </b> destinatarios a la vez para cada sesión de envío.
 TargetsReset=Limpiar lista
 ToClearAllRecipientsClickHere=Haga clic aquí para borrar la lista de destinatarios de este e-mailing
 ToAddRecipientsChooseHere=Agregar destinatarios eligiéndolos de las listas
-NbOfEMailingsReceived=Correos masivos recibidos
-NbOfEMailingsSend=Correos masivos enviados
 IdRecord=ID de registro
 DeliveryReceipt=Entrega Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Puedes usar la <b>coma</b> para separar varios destinatarios.
diff --git a/htdocs/langs/es_CR/main.lang b/htdocs/langs/es_CR/main.lang
index b6862c03d9b..d06999f02fe 100644
--- a/htdocs/langs/es_CR/main.lang
+++ b/htdocs/langs/es_CR/main.lang
@@ -266,7 +266,6 @@ ActionNotApplicable=No aplica
 ActionRunningNotStarted=Para comenzar
 ActionRunningShort=En curso
 ActionDoneShort=Finalizado
-LatestLinkedEvents=Últimos eventos vinculados %s
 Accountant=Contador
 ActionsOnCompany=Eventos para este tercero
 ActionsOnContact=Eventos para este contacto/dirección
@@ -423,7 +422,6 @@ ForCustomer=Para el cliente
 UnHidePassword=Mostrar comando real con contraseña clara
 Notes=notas
 AddFile=Agregar archivo
-FreeLineOfType=Elemento de texto libre, escriba:
 CloneMainAttributes=Clonar objeto con sus atributos principales
 PDFMerge=Combinar PDF
 Merge=Unir
@@ -517,7 +515,6 @@ SomeTranslationAreUncomplete=Algunos de los idiomas ofrecidos pueden estar tradu
 PublicDownloadLinkDesc=Solo se requiere el enlace para descargar el archivo.
 PrivateDownloadLinkDesc=Debe iniciar sesión y necesita permisos para ver o descargar el archivo.
 DownloadDocument=Descargar documento
-ActualizeCurrency=Actualizar tipo de cambio
 ModuleBuilder=Generador de módulos y aplicaciones
 ClickToShowHelp=Haga clic para mostrar ayuda de información sobre herramientas
 WebSites=sitios web
@@ -648,3 +645,5 @@ UserExpired=Expirado
 LinkANewFile=Enlazar a un nuevo archivo/documento
 NoLinkFound=No hay enlaces registrados
 Settings=Configuración
+addToFilter=Agregar
+AllTime=Desde el inicio
diff --git a/htdocs/langs/es_CR/members.lang b/htdocs/langs/es_CR/members.lang
index 097f344fa9d..261d5e969cb 100644
--- a/htdocs/langs/es_CR/members.lang
+++ b/htdocs/langs/es_CR/members.lang
@@ -78,6 +78,7 @@ DescADHERENT_CARD_HEADER_TEXT=Encabezado impreso en las fichas de los miembros
 DescADHERENT_CARD_TEXT=Laterial impreso en las fichas del miembro (justificado a izquierda)
 DescADHERENT_CARD_TEXT_RIGHT=Lateral impreso en fichas de los miembros (justificado a derecha)
 DescADHERENT_CARD_FOOTER_TEXT=Pié de página impreso en las fichas de los miembros
+ShowTypeCard=Mostrar tipo '%s'
 HTPasswordExport=Generación de archivo htpassword
 MoreActions=Acción complementaria al registrarse
 MoreActionBankDirect=Crear un registro en la cuenta bancaria
diff --git a/htdocs/langs/es_CR/products.lang b/htdocs/langs/es_CR/products.lang
index 4fefefadcc6..1c06f81ff62 100644
--- a/htdocs/langs/es_CR/products.lang
+++ b/htdocs/langs/es_CR/products.lang
@@ -27,13 +27,14 @@ ServicesOnSaleOnly=Servicios que se venden únicamente
 ServicesOnPurchaseOnly=Servicios para la compra solamente
 ServicesNotOnSell=Servicios no a la venta y no a la compra
 ServicesOnSellAndOnBuy=Servicios para venta y compra
+LastModifiedProductsAndServices=Últimos productos / servicios %s que fueron modificados
 MenuStocks=Inventario
+Stocks=Inventarios y ubicaciones (almacenes) de productos
 NotOnSell=No para la venta
 ProductStatusNotOnSell=No para la venta
 ProductStatusNotOnSellShort=No para la venta
 ProductStatusNotOnBuy=No para la compra
 ProductStatusNotOnBuyShort=No para la compra
-UpdateVAT=Actualizar IVA
 UpdateDefaultPrice=Actualizar precio por defecto
 UpdateLevelPrices=Actualizar precio para cada nivel
 SellingPriceHT=Precio de venta (excluyente impuestos)
@@ -74,6 +75,7 @@ ConfirmDeleteProductLine=¿Está seguro que quiere borrar esta línea de product
 QtyMin=Mín. cantidad a comprar
 PriceQtyMin=Precio para cantidad mín.
 PriceQtyMinCurrency=Precio (moneda) para esta cant.
+PredefinedProducts=Producto Predefinido
 NotPredefinedProducts=productos/servicios no predefinidos
 GenerateThumb=Generar pulgar
 ServiceNb=Servicio #%s
@@ -133,7 +135,6 @@ GlobalVariableUpdaterHelpFormat0=Formato de la solicitud {"URL": "http://example
 GlobalVariableUpdaterType1=Datos de WebService
 GlobalVariableUpdaterHelp1=Analiza los datos de WebService desde la URL especificada, NS especifica el espacio de nombres, VALUE especifica la ubicación del valor relevante, DATA debe contener los datos a enviar y METHOD es el método WS llamante
 GlobalVariableUpdaterHelpFormat1=El formato de la solicitud es {"URL": "http://example.com/urlofws", "VALUE": "array, targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod", "DATA": {"tu": "datos", "para": "enviar"}}
-PropalMergePdfProductActualFile=Los archivos se usan para agregar a PDF Azur son/es
 PropalMergePdfProductChooseFile=Seleccionar archivos PDF
 DefaultPriceRealPriceMayDependOnCustomer=Precio predeterminado, el precio real puede depender del cliente
 ClinkOnALinkOfColumn=Haga clic en un enlace de la columna %s para obtener una vista detallada ...
@@ -172,7 +173,6 @@ ErrorCopyProductCombinations=Se produjo un error al copiar las variantes del pro
 ErrorDestinationProductNotFound=Producto de destino no encontrado
 ErrorProductCombinationNotFound=Variante del producto no encontrada
 PMPValue=Precio promedio ponderado
-MergeOriginProduct=Duplicar el tercero (tercero que quieres eliminar)
 ConfirmMergeProducts=¿Está seguro de que desea fusionar el tercero elegido con el actual? Todos los objetos vinculados (facturas, pedidos, ...) se moverán al producto actual, después de lo cual se eliminará el producto elegido.
 ProductsMergeSuccess=Los productos han sido fusionados
 SwitchOnPurchaseStatus=Activar el estado de compra
diff --git a/htdocs/langs/es_CR/website.lang b/htdocs/langs/es_CR/website.lang
index 9eb7f2a56cc..4a180e531e5 100644
--- a/htdocs/langs/es_CR/website.lang
+++ b/htdocs/langs/es_CR/website.lang
@@ -21,7 +21,6 @@ ReadPerm=Leer
 PreviewSiteServedByWebServer=<u>Obtenga una vista previa de %s en una nueva pestaña. </u><br><br> El %s será servido por un servidor web externo (como Apache, Nginx, IIS). Debe instalar y configurar este servidor antes de apuntar al directorio:<br><strong>%s</strong><br> URL servida por un servidor externo: <br><strong>%s</strong>
 VirtualHostUrlNotDefined=URL del host virtual servido por el servidor web externo no definido
 SyntaxHelp=Ayuda sobre consejos de sintaxis específicos
-YouCanEditHtmlSource2=Para una imagen compartida con un enlace para compartir (acceso abierto usando la clave hash para compartir del archivo), la sintaxis es: <br> <strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 SiteAdded=Sitio web añadido
 OrEnterPageInfoManually=O crea una página desde cero o desde una plantilla de página ...
 WebsiteAccounts=Cuentas de sitio web
diff --git a/htdocs/langs/es_CU/admin.lang b/htdocs/langs/es_CU/admin.lang
index 08903bed4c3..6d749fc2835 100644
--- a/htdocs/langs/es_CU/admin.lang
+++ b/htdocs/langs/es_CU/admin.lang
@@ -10,8 +10,6 @@ FileCheckDesc=Esta herramienta te permite comprobar la integridad de los archivo
 FileIntegrityIsOkButFilesWereAdded=La verificación de integridad de los archivos ha pasado, sin embargo, se han agregado algunos archivos nuevos.
 FileIntegritySomeFilesWereRemovedOrModified=La verificación de integridad de los archivos ha fallado. Algunos archivos fueron modificados, eliminados o agregados.
 MakeIntegrityAnalysisFrom=Realice un análisis de integridad de los archivos de la aplicación desde
-LocalSignature=Firma local incrustada (menos confiable)
-RemoteSignature=Firma remota remota (más fiable)
 FilesMissing=Archivos perdidos
 FilesAdded=Archivos agregados
 FileCheckDolibarr=Comprobar la integridad de los archivos de la aplicación
@@ -183,7 +181,6 @@ SourceFile=Archivo fuente
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible solo si JavaScript no está deshabilitado
 UsedOnlyWithTypeOption=Usado solo por alguna opción de agenda
 Passwords=contraseñas
-MainDbPasswordFileConfEncrypted=Cifre la contraseña de la base de datos almacenada en conf.php. Se recomienda encarecidamente activar esta opción.
 InstrucToEncodePass=Para codificar la contraseña en el archivo <b> conf.php </b>, reemplace la línea <br> <b> $dolibarr_main_db_pass="..."; </b> <br> por <br> <b> $dolibarr_main_db_pass="crypted:%s"; </b>
 InstrucToClearPass=Para tener la contraseña decodificada (clara) en el archivo <b> conf.php </b>, reemplace la línea <br> <b> $dolibarr_main_db_pass="crypted:..."; </b> <br> por <br> <b> $dolibarr_main_db_pass="%s"; </b>
 ProtectAndEncryptPdfFiles=Proteja los archivos PDF generados. Esto NO se recomienda ya que interrumpe la generación masiva de PDF.
@@ -325,7 +322,6 @@ ExtrafieldSelectList=Seleccionar de la tabla
 ExtrafieldSeparator=Separador (no un campo)
 ExtrafieldLink=Enlace a un objeto
 ComputedFormula=campo calculado
-ComputedFormulaDesc=Puede ingresar aquí una fórmula usando otras propiedades del objeto o cualquier codificación PHP para obtener un valor calculado dinámico. Puede usar cualquier fórmula compatible con PHP, incluido el "?" operador de condición y el siguiente objeto global: <strong> $db, $conf, $langs, $mysoc, $user, $objectoffield </strong> . <br> <strong> ADVERTENCIA </strong> : si necesita propiedades de un objeto que no está cargado, solo busque el objeto en su fórmula como en el segundo ejemplo. <br> El uso de un campo calculado significa que no puede ingresar ningún valor desde la interfaz. Además, si hay un error de sintaxis, es posible que la fórmula no devuelva nada. <br> <br> Ejemplo de fórmula: <br> $objetodecampo->id < 10 ? round($objectoffield-> id / 2, 2): ($objetodecampo->id + 2 * $usuario->id) * (int) substr($mysoc->zip, 1, 2 ) <br> <br> Ejemplo para recargar objeto <br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloaded objeto ->capital / 5: '-1') <br> <br> Otro ejemplo de fórmula para forzar la carga del objeto y su objeto principal: <br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield ->id) > 0) && ($segundoobjcargado = nuevo Proyecto($db)) && ($segundoobjcargado->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $segundoobjcargado->ref: 'Proyecto padre no encontrado'
 Computedpersistent=Almacenar campo calculado
 ComputedpersistentDesc=Los campos adicionales calculados se almacenarán en la base de datos, sin embargo, el valor solo se recalculará cuando se cambie el objeto de este campo. Si el campo calculado depende de otros objetos o datos globales, ¡este valor podría ser incorrecto!
 ExtrafieldParamHelpselect=La lista de valores debe ser líneas con formato clave,valor (donde la clave no puede ser '0') <br> <br> por ejemplo: <br> 1,valor1 <br> 2,valor2 <br> código3,valor3 b0342fccfda19 bz0 ... <br> <br> Para tener el list dependiendo de otra lista de atributos complementarios: <br> 1,value1|options_ <i> parent_list_code </i> :parent_key <br> 2,value2|options_ <i> parent_list_code b0ae64758ba c33z0 :parent_key <br> <br> Para tener la lista dependiendo de otra lista: <br> 1,value1| <i> parent_list_code </i> :parent_key <br> 2,valor2| <i> parent_list_code </i> :parent_key
@@ -363,7 +359,6 @@ Use3StepsApproval=De forma predeterminada, las órdenes de compra deben ser crea
 UseDoubleApproval=Utilice una aprobación de 3 pasos cuando el monto (sin impuestos) sea superior a...
 WarningPHPMailC=- También es interesante usar el servidor SMTP de su propio proveedor de servicios de correo electrónico para enviar correos electrónicos, por lo que todos los correos electrónicos enviados desde la aplicación también se guardarán en el directorio "Enviados" de su buzón.
 WarningPHPMailDbis=Si realmente desea mantener el método "PHP" predeterminado para enviar correos electrónicos, simplemente ignore esta advertencia o elimínela %shaciendo clic aquí%s.
-WarningPHPMail2=Si su proveedor de correo electrónico SMTP necesita restringir el cliente de correo electrónico a algunas direcciones IP (muy raro), esta es la dirección IP del agente de usuario de correo (MUA) para su aplicación ERP CRM: <strong> %s </strong>.
 ClickToShowDescription=Haga clic para mostrar la descripción
 DependsOn=Este módulo necesita los módulos
 RequiredBy=Este módulo es requerido por módulo(s)
@@ -393,8 +388,6 @@ Module10Name=Contabilidad (simplificada)
 Module10Desc=Informes contables simples (diarios, facturación) basados en el contenido de la base de datos. No utiliza ninguna tabla de contabilidad.
 Module20Name=Propuestas
 Module20Desc=Gestión de propuestas comerciales
-Module22Name=Envíos masivos de correo electrónico
-Module22Desc=Administrar correos electrónicos masivos
 Module23Desc=Monitorización del consumo de energías
 Module25Name=Ordenes de venta
 Module25Desc=Gestión de pedidos de venta
@@ -580,10 +573,6 @@ Permission212=Líneas de pedido
 Permission213=Activar línea
 Permission214=Configurar Telefonía
 Permission215=Proveedores de configuración
-Permission221=Leer correos electrónicos
-Permission222=Crear/modificar emailings (tema, destinatarios...)
-Permission223=Validar emailings (permite enviar)
-Permission229=Eliminar correos electrónicos
 Permission237=Ver destinatarios e información
 Permission238=Enviar correos manualmente
 Permission239=Eliminar envíos después de validarlos o enviarlos
@@ -1275,9 +1264,7 @@ AgendaSetup =Configuración del módulo de eventos y agenda
 AGENDA_DEFAULT_FILTER_TYPE =Establecer automáticamente este tipo de evento en el filtro de búsqueda de la vista de agenda
 AGENDA_DEFAULT_FILTER_STATUS =Establecer automáticamente este estado para eventos en el filtro de búsqueda de la vista de agenda
 AGENDA_DEFAULT_VIEW =¿Qué vista quieres abrir por defecto al seleccionar el menú Agenda?
-AGENDA_REMINDER_BROWSER =Habilite el recordatorio de eventos <b> en el navegador del usuario </b> (cuando se alcanza la fecha de recordatorio, el navegador muestra una ventana emergente. Cada usuario puede desactivar dichas notificaciones desde la configuración de notificaciones de su navegador).
 AGENDA_REMINDER_BROWSER_SOUND =Habilitar notificación de sonido
-AGENDA_REMINDER_EMAIL =Habilite el recordatorio de eventos <b> por correo electrónico </b> (la opción de recordatorio/retraso se puede definir en cada evento).
 AGENDA_REMINDER_EMAIL_NOTE =Nota: La frecuencia del trabajo programado %s debe ser suficiente para garantizar que los recordatorios se envíen en el momento correcto.
 AGENDA_SHOW_LINKED_OBJECT =Mostrar objeto vinculado en la vista de agenda
 AGENDA_USE_EVENT_TYPE =Usar tipos de eventos (administrados en el menú Configuración -> Diccionarios -> Tipo de agenda de eventos)
@@ -1287,6 +1274,7 @@ PastDelayVCalExport=No exportar eventos anteriores a
 ClickToDialDesc=Este módulo cambia los números de teléfono, cuando se usa una computadora de escritorio, en enlaces en los que se puede hacer clic. Un clic llamará al número. Esto se puede usar para iniciar la llamada telefónica cuando usa un teléfono virtual en su escritorio o cuando usa un sistema CTI basado en el protocolo SIP, por ejemplo. Nota: cuando se utiliza un teléfono inteligente, siempre se puede hacer clic en los números de teléfono.
 ClickToDialUseTelLink=Use solo un enlace "tel:" en los números de teléfono
 ClickToDialUseTelLinkDesc=Utilice este método si sus usuarios tienen un softphone o una interfaz de software, instalados en la misma computadora que el navegador, y se les llama cuando hacen clic en un enlace que comienza con "tel:" en su navegador. Si necesita un enlace que comience con "sip:" o una solución de servidor completa (sin necesidad de instalación de software local), debe establecer esto en "No" y completar el siguiente campo.
+CashDesk=Punto de venta
 CashDeskSetup=Configuración del módulo de punto de venta
 CashDeskThirdPartyForSell=Tercero genérico predeterminado para usar en ventas
 CashDeskBankAccountForSell=Cuenta predeterminada para usar para recibir pagos en efectivo
@@ -1364,7 +1352,6 @@ BackupDumpWizard=Asistente para construir el archivo de volcado de la base de da
 BackupZipWizard=Asistente para construir el archivo de directorio de documentos
 SomethingMakeInstallFromWebNotPossible=La instalación del módulo externo no es posible desde la interfaz web por el siguiente motivo:
 SomethingMakeInstallFromWebNotPossible2=Por esta razón, el proceso de actualización que se describe aquí es un proceso manual que solo puede realizar un usuario privilegiado.
-InstallModuleFromWebHasBeenDisabledByFile=Su administrador ha deshabilitado la instalación de un módulo externo desde la aplicación. Debe pedirle que elimine el archivo <strong> %s </strong> para permitir esta función.
 ConfFileMustContainCustom=Instalar o construir un módulo externo desde la aplicación necesita guardar los archivos del módulo en el directorio <strong> %s </strong>. Para que Dolibarr procese este directorio, debe configurar su <strong> conf/conf.php </strong> para agregar las 2 líneas directivas: <br> <strong> $dolibarr_main_url_root_alt='/custom'; </strong> <br> <strong> $dolibarr_main_document_root_alt='%s/personalizado'; </strong>
 HighlightLinesOnMouseHover=Resalte las líneas de la tabla cuando el movimiento del mouse pasa por encima
 HighlightLinesColor=Resalte el color de la línea cuando el mouse pasa por encima (utilice 'ffffff' para no resaltar)
diff --git a/htdocs/langs/es_CU/banks.lang b/htdocs/langs/es_CU/banks.lang
index 605c2ea5b55..051ef09d4e7 100644
--- a/htdocs/langs/es_CU/banks.lang
+++ b/htdocs/langs/es_CU/banks.lang
@@ -17,6 +17,7 @@ FutureBalance=Saldo futuro
 ShowAllTimeBalance=Mostrar saldo desde el inicio
 Reconciliation=Reconciliación
 RIB=Número de cuenta bancaria
+IBAN=Número IBAN
 IbanValid=PROHIBICIÓN válida
 IbanNotValid=PROHIBICIÓN no válida
 StandingOrders=Pedidos domiciliados
@@ -97,7 +98,6 @@ NumberOfCheques=Nº de cheque
 DeleteTransaction=Eliminar la entrada
 ConfirmDeleteTransaction=¿Está seguro de que desea eliminar esta entrada?
 ThisWillAlsoDeleteBankRecord=Esto también eliminará la entrada bancaria generada
-PlannedTransactions=Entradas planificadas
 Graph=gráficos
 ExportDataset_banque_1=Asientos bancarios y estado de cuenta
 ExportDataset_banque_2=comprobante de depósito
@@ -110,7 +110,6 @@ BankTransactionLine=entrada bancaria
 AllAccounts=Todas las cuentas bancarias y de efectivo
 BackToAccount=volver a la cuenta
 FutureTransaction=Transacción futura. Incapaz de conciliar.
-InputReceiptNumberBis=AAAAMM o AAAAMMDD
 ToConciliate=¿Para reconciliar?
 ThenCheckLinesAndConciliate=Luego, verifique las líneas presentes en el extracto bancario y haga clic en
 DefaultRIB=PROHIBICIÓN predeterminada
diff --git a/htdocs/langs/es_CU/blockedlog.lang b/htdocs/langs/es_CU/blockedlog.lang
index 58b1189c110..b8fa36d805f 100644
--- a/htdocs/langs/es_CU/blockedlog.lang
+++ b/htdocs/langs/es_CU/blockedlog.lang
@@ -5,7 +5,6 @@ FingerprintsDesc=Esta es la herramienta para navegar o extraer los registros ina
 CompanyInitialKey=Clave inicial de la empresa (hash del bloque de génesis)
 ShowAllFingerPrintsMightBeTooLong=Mostrar todos los registros archivados (pueden ser largos)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostrar todos los registros de archivo no válidos (pueden ser largos)
-KoCheckFingerprintValidity=La entrada de registro archivada no es válida. Significa que alguien (¿un pirata informático?) ha modificado algunos datos de este registro después de haberlo grabado, o ha borrado el registro archivado anterior (verifique que la línea con el número anterior existe) o ha modificado la suma de verificación del registro anterior.
 OkCheckFingerprintValidity=El registro de registro archivado es válido. Los datos de esta línea no fueron modificados y la entrada sigue a la anterior.
 OkCheckFingerprintValidityButChainIsKo=El registro archivado parece válido en comparación con el anterior, pero la cadena estaba dañada anteriormente.
 NotAddedByAuthorityYet=Aún no almacenado en la autoridad remota
diff --git a/htdocs/langs/es_CU/categories.lang b/htdocs/langs/es_CU/categories.lang
index 864fa45e630..9bcbb0bc5a6 100644
--- a/htdocs/langs/es_CU/categories.lang
+++ b/htdocs/langs/es_CU/categories.lang
@@ -58,8 +58,10 @@ CatUsersList=Lista de etiquetas/categorías de usuarios
 CatSupLinks=Enlaces entre proveedores y etiquetas/categorías
 CatMembersLinks=Enlaces entre miembros y etiquetas/categorías
 CatUsersLinks=Enlaces entre usuarios y etiquetas/categorías
+DeleteFromCat=Quitar de etiquetas/categoría
 ExtraFieldsCategories=Atributos complementarios
 CategorieRecursiv=Enlace con la etiqueta/categoría principal automáticamente
+ByDefaultInList=Por defecto en la lista
 ChooseCategory=Elegir la categoría
 TicketsCategoriesArea=Categorías de entradas
 WebsitePagesCategoriesArea=Categorías de contenedores de página
diff --git a/htdocs/langs/es_CU/companies.lang b/htdocs/langs/es_CU/companies.lang
index b8ee2505b85..93b913dd9c6 100644
--- a/htdocs/langs/es_CU/companies.lang
+++ b/htdocs/langs/es_CU/companies.lang
@@ -44,7 +44,6 @@ Skype=skype
 Chat=Charlar
 PhonePro=Autobús. teléfono
 PhonePerso=pers. teléfono
-No_Email=Rechazar correos masivos
 Town=Ciudad
 Poste=Posición
 VATIsUsed=Impuesto sobre las ventas utilizado
@@ -157,6 +156,7 @@ VATIntra=ID de IVA
 VATIntraShort=ID de IVA
 VATIntraSyntaxIsValid=La sintaxis es válida
 ProspectCustomer=Prospecto / Cliente
+Prospect=Prospecto
 CustomerCard=Tarjeta de cliente
 CustomerRelativeDiscount=Descuento relativo al cliente
 SupplierRelativeDiscount=Descuento de proveedor relativo
@@ -237,7 +237,6 @@ ExportCardToFormat=Exportar tarjeta a formato
 ContactNotLinkedToCompany=Contacto no vinculado a ningún tercero
 DolibarrLogin=Inicio de sesión en Dolibarr
 NoDolibarrAccess=Sin acceso a Dolibarr
-ExportDataset_company_1=Terceros (empresas/fundaciones/personas físicas) y sus propiedades
 ImportDataset_company_1=Terceros y sus propiedades
 ImportDataset_company_2=Contactos/direcciones y atributos adicionales de terceros
 ImportDataset_company_4=Representantes de ventas de terceros (asignar representantes de ventas/usuarios a empresas)
diff --git a/htdocs/langs/es_CU/compta.lang b/htdocs/langs/es_CU/compta.lang
index 047e24297eb..bfceea0c44d 100644
--- a/htdocs/langs/es_CU/compta.lang
+++ b/htdocs/langs/es_CU/compta.lang
@@ -26,6 +26,7 @@ BalanceBefore=Saldo (antes)
 Debit=Débito
 Credit=Crédito
 AccountingDebit=Débito
+AccountingCredit=Crédito
 Piece=doc contable
 AmountHTVATRealReceived=Neto recogido
 AmountHTVATRealPaid=Neto pagado
@@ -59,7 +60,6 @@ LT2SupplierES=compras IRPF
 LT2SupplierIN=compras SGST
 VATCollected=IVA recaudado
 SpecialExpensesArea=Área para todos los pagos especiales
-VATExpensesArea=Área para todos los pagos de TVA
 SocialContribution=Impuesto social o fiscal
 LabelContrib=Contribución de la etiqueta
 TypeContrib=Tipo de contribución
@@ -75,7 +75,6 @@ PaymentCustomerInvoice=pago de la factura del cliente
 PaymentSupplierInvoice=pago de factura de proveedor
 PaymentSocialContribution=Pago de impuestos sociales/fiscales
 PaymentVat=pago del IVA
-AutomaticCreationPayment=Registrar automáticamente el pago
 ListPayment=Lista de pagos
 ListOfCustomerPayments=Lista de pagos de clientes
 ListOfSupplierPayments=Lista de pagos de proveedores
@@ -142,7 +141,6 @@ AnnualByCompaniesDueDebtMode=Saldo de ingresos y gastos, detalle por grupos pred
 AnnualByCompaniesInputOutputMode=Balance de ingresos y gastos, detalle por grupos predefinidos, modalidad <b> %sIngresos-Egresos%s </b> dijo <b> contabilidad de caja </b> .
 SeeReportInInputOutputMode=Consulte <b> %sanálisis de pagos%s </b> para obtener un cálculo basado en <b> pagos registrados </b> realizados incluso si aún no están contabilizados en Ledger
 SeeReportInDueDebtMode=Consulte <b> %sanálisis de documentos registrados%s </b> para obtener un cálculo basado en <b> documentos registrados conocidos </b>, incluso si aún no están contabilizados en Ledger
-SeeReportInBookkeepingMode=Consulte <b> %sanalysis of bookeeping ledger table%s </b> para obtener un informe basado en <b> Bookkeeping Ledger table </b>
 RulesAmountWithTaxIncluded=- Las cantidades mostradas son con todos los impuestos incluidos
 RulesResultDue=- Incluye todas las facturas, gastos, IVA, donaciones, salarios, estén o no pagados. <br> - Se basa en la fecha de facturación de las facturas y en la fecha de vencimiento de los gastos o pagos de impuestos. Para los salarios se utiliza la fecha de fin de período.
 RulesResultInOut=- Incluye los pagos reales realizados de facturas, gastos, IVA y salarios. <br> - Se basa en las fechas de pago de las facturas, gastos, IVA, donaciones y salarios.
@@ -221,7 +219,6 @@ AddExtraReport=Informes adicionales (agregar informe de clientes extranjeros y n
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basado en que las dos primeras letras del número de IVA son diferentes del código de país de su propia empresa
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Basado en que las dos primeras letras del número de IVA son las mismas que el código de país de su propia empresa
 LinkedFichinter=Enlace a una intervención
-ImportDataset_tax_vat=pagos del iva
 ErrorBankAccountNotFound=Error: Cuenta bancaria no encontrada
 FiscalPeriod=Período contable
 ListSocialContributionAssociatedProject=Relación de contribuciones sociales asociadas al proyecto
diff --git a/htdocs/langs/es_CU/errors.lang b/htdocs/langs/es_CU/errors.lang
index 68746cecd59..7d663eee65a 100644
--- a/htdocs/langs/es_CU/errors.lang
+++ b/htdocs/langs/es_CU/errors.lang
@@ -95,7 +95,6 @@ ErrorLoginDoesNotExists=No se pudo encontrar el usuario con inicio de sesión <b
 ErrorLoginHasNoEmail=Este usuario no tiene dirección de correo electrónico. Proceso abortado.
 ErrorBadValueForCode=Mal valor para el código de seguridad. Inténtalo de nuevo con un valor nuevo...
 ErrorLinesCantBeNegativeForOneVATRate=El total de líneas (sin impuestos) no puede ser negativo para una tasa de IVA no nula determinada (se encontró un total negativo para la tasa de IVA <b> %s </b> %%).
-ErrorLinesCantBeNegativeOnDeposits=Las líneas no pueden ser negativas en un depósito. Tendrá problemas cuando necesite consumir el depósito en la factura final si lo hace.
 ErrorQtyForCustomerInvoiceCantBeNegative=La cantidad de la línea en las facturas de los clientes no puede ser negativa
 ErrorWebServerUserHasNotPermission=La cuenta de usuario <b> %s </b> utilizada para ejecutar el servidor web no tiene permiso para eso
 ErrorNoActivatedBarcode=Ningún tipo de código de barras activado
diff --git a/htdocs/langs/es_CU/exports.lang b/htdocs/langs/es_CU/exports.lang
index bfec65b1105..a3a18958f99 100644
--- a/htdocs/langs/es_CU/exports.lang
+++ b/htdocs/langs/es_CU/exports.lang
@@ -36,7 +36,6 @@ FileMustHaveOneOfFollowingFormat=El archivo a importar debe tener uno de los sig
 ChooseFormatOfFileToImport=Elija el formato de archivo para usar como formato de archivo de importación haciendo clic en el icono %s para seleccionarlo...
 SourceFileFormat=formato de archivo de origen
 FieldsInSourceFile=Campos en el archivo fuente
-FieldsInTargetDatabase=Campos de destino en la base de datos de Dolibarr (negrita=obligatorio)
 NoFields=Sin campos
 ExampleOfImportFile=Ejemplo_de_archivo_de_importación
 ErrorImportDuplicateProfil=No se pudo guardar este perfil de importación con este nombre. Ya existe un perfil existente con este nombre.
@@ -49,7 +48,6 @@ NowClickToTestTheImport=Verifique que el formato de archivo (delimitadores de ca
 RunSimulateImportFile=Ejecutar simulación de importación
 FieldNeedSource=Este campo requiere datos del archivo fuente
 SomeMandatoryFieldHaveNoSource=Algunos campos obligatorios no tienen fuente de archivo de datos
-InformationOnSourceFile=Información sobre el archivo fuente
 SelectAtLeastOneField=Cambie al menos un campo de origen en la columna de campos para exportar
 SelectFormat=Elija este formato de archivo de importación
 RunImportFile=Datos de importacion
diff --git a/htdocs/langs/es_CU/mails.lang b/htdocs/langs/es_CU/mails.lang
index f777ca08f8c..3e7db01aa5c 100644
--- a/htdocs/langs/es_CU/mails.lang
+++ b/htdocs/langs/es_CU/mails.lang
@@ -1,8 +1,6 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Correo electrónico
 EMailing=Correo electrónico
-EMailings=Correos electrónicos
-AllEMailings=Todos los correos electrónicos
 MailCard=Tarjeta de correo electrónico
 MailRecipient=Recipiente
 MailTo=A
@@ -14,15 +12,6 @@ MailFile=Archivos adjuntos
 MailMessage=Cuerpo del correo electronico
 SubjectNotIn=No en Asunto
 BodyNotIn=no en el cuerpo
-ShowEMailing=Mostrar correo electrónico
-ListOfEMailings=Lista de correos electrónicos
-NewMailing=Nuevo correo electrónico
-EditMailing=Editar correo electrónico
-ResetMailing=reenviar correo electrónico
-DeleteMailing=Eliminar correo electrónico
-PreviewMailing=Vista previa de correo electrónico
-CreateMailing=Crear correo electrónico
-ValidMailing=Correo electrónico válido
 MailSuccessfulySent=Correo electrónico (de %s a %s) aceptado correctamente para la entrega
 MailingSuccessfullyValidated=Correo electrónico validado con éxito
 MailUnsubcribe=Darse de baja
@@ -70,21 +59,14 @@ MailingModuleDescEmailsFromUser=Correos electrónicos ingresados por el usuario
 MailingModuleDescDolibarrUsers=Usuarios con correos electrónicos
 SendingFromWebInterfaceIsNotAllowed=No se permite el envío desde la interfaz web.
 RecipientSelectionModules=Solicitudes definidas para la selección de destinatarios
-MailingArea=Área de correos electrónicos
-LastMailings=Últimos correos electrónicos de %s
 TargetsStatistics=Estadísticas de objetivos
 MailNoChangePossible=Los destinatarios de los correos electrónicos validados no se pueden cambiar
-SearchAMailing=Buscar correo
-SendMailing=enviar correo electrónico
 MailingNeedCommand=El envío de un correo electrónico se puede realizar desde la línea de comandos. Pida al administrador de su servidor que inicie el siguiente comando para enviar el correo electrónico a todos los destinatarios:
 MailingNeedCommand2=Sin embargo, puede enviarlos en línea agregando el parámetro MAILING_LIMIT_SENDBYWEB con el valor de la cantidad máxima de correos electrónicos que desea enviar por sesión. Para ello, vaya a Inicio - Configuración - Otro.
 ConfirmSendingEmailing=Si desea enviar correos electrónicos directamente desde esta pantalla, confirme que está seguro de que desea enviar correos electrónicos ahora desde su navegador.
-LimitSendingEmailing=Nota: El envío de correos electrónicos desde la interfaz web se realiza varias veces por motivos de seguridad y tiempo de espera, <b> %s </b> destinatarios a la vez para cada sesión de envío.
 TargetsReset=Limpiar lista
 ToClearAllRecipientsClickHere=Haga clic aquí para borrar la lista de destinatarios de este correo electrónico
 ToAddRecipientsChooseHere=Agregue destinatarios eligiendo de las listas
-NbOfEMailingsReceived=Correos electrónicos masivos recibidos
-NbOfEMailingsSend=Correos masivos enviados
 IdRecord=registro de identificación
 DeliveryReceipt=Confirmación de entrega
 YouCanUseCommaSeparatorForSeveralRecipients=Puede utilizar el separador <b> coma </b> para especificar varios destinatarios.
@@ -121,6 +103,5 @@ InGoingEmailSetup=correos electrónicos entrantes
 DefaultOutgoingEmailSetup=Misma configuración que la configuración de correo electrónico saliente global
 ContactsWithThirdpartyFilter=Contactos con filtro de terceros
 Answered=Contestada
-IsNotAnAnswer=No es respuesta (email inicial)
 IsAnAnswer=Es una respuesta de un correo electrónico inicial.
 WarningLimitSendByDay=ADVERTENCIA: La configuración o 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.
diff --git a/htdocs/langs/es_CU/main.lang b/htdocs/langs/es_CU/main.lang
index f292743644d..cb0e3977110 100644
--- a/htdocs/langs/es_CU/main.lang
+++ b/htdocs/langs/es_CU/main.lang
@@ -121,6 +121,7 @@ SaveAs=Guardar como
 SaveAndStay=Salvar y quedarse
 TestConnection=Conexión de prueba
 ToClone=Clon
+ConfirmCloneAsk=¿Está seguro de que desea clonar el objeto <b> %s </b>?
 NoCloneOptionsSpecified=No hay datos para clonar definidos.
 Run=Correr
 Show=Espectáculo
@@ -200,6 +201,7 @@ AmountTTC=Importe (impuestos incluidos)
 AmountVAT=Importe impuesto
 MulticurrencyAlreadyPaid=Ya pagado, moneda original
 MulticurrencyRemainderToPay=Queda por pagar, moneda original
+MulticurrencyPaymentAmount=Importe del pago, moneda original
 MulticurrencyAmountHT=Importe (sin impuestos), moneda original
 MulticurrencyAmountTTC=Importe (impuestos incluidos), moneda original
 MulticurrencyAmountVAT=Importe impuesto, moneda original
@@ -242,6 +244,7 @@ VATCode=Código de tasa de impuestos
 VATNPR=Tasa de impuesto NPR
 DefaultTaxRate=Tasa impositiva predeterminada
 Average=Promedio
+StatusToPay=Pagar
 Module=Módulo/Aplicación
 Modules=Módulos/Aplicaciones
 Filters=filtros
@@ -261,7 +264,6 @@ ActionNotApplicable=No aplica
 ActionRunningNotStarted=Para comenzar
 ActionRunningShort=En curso
 ActionDoneShort=Finalizado
-LatestLinkedEvents=Últimos eventos vinculados %s
 Accountant=Contador
 ActionsOnCompany=Eventos para este tercero
 ActionsOnContact=Eventos para este contacto/dirección
@@ -287,6 +289,7 @@ Qty=Cantidad
 ChangedBy=Cambiado por
 ResultKo=Falla
 Reporting=Informes
+StatusInterInvoiced=Facturado
 ValidatedToProduce=Validado (Para producir)
 Opened=Abierto
 OpenAll=Abrir todo)
@@ -295,6 +298,7 @@ Received=Recibió
 Topic=Sujeto
 ByCompanies=por terceros
 ByUsers=por usuario
+Rejects=Rechazos
 Preview=Avance
 NextStep=Próximo paso
 None=Ninguno
@@ -425,7 +429,6 @@ ForCustomer=Para el cliente
 UnHidePassword=Mostrar comando real con contraseña clara
 Notes=notas
 AddFile=Agregar archivo
-FreeLineOfType=Elemento de texto libre, escriba:
 CloneMainAttributes=Clonar objeto con sus atributos principales
 PDFMerge=Combinar PDF
 Merge=Unir
@@ -519,7 +522,6 @@ SomeTranslationAreUncomplete=Algunos de los idiomas ofrecidos pueden estar tradu
 PublicDownloadLinkDesc=Solo se requiere el enlace para descargar el archivo.
 PrivateDownloadLinkDesc=Debe iniciar sesión y necesita permisos para ver o descargar el archivo.
 DownloadDocument=Descargar documento
-ActualizeCurrency=Actualizar tipo de cambio
 ModuleBuilder=Generador de módulos y aplicaciones
 ClickToShowHelp=Haga clic para mostrar ayuda de información sobre herramientas
 WebSites=sitios web
@@ -615,7 +617,6 @@ ASAP=Lo antes posible
 DefaultMailModel=Modelo de correo predeterminado
 SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=El token de seguridad ha caducado, por lo que se ha cancelado la acción. Inténtalo de nuevo.
 EventReminder=Recordatorio de evento
-Civility=Civilidad
 ConfirmSetSupervisor=Conjunto de supervisor a granel
 ConfirmSetSupervisorQuestion=¿Está seguro de que desea configurar el supervisor para los registros seleccionados %s?
 ConfirmUpdatePriceQuestion=¿Está seguro de que desea actualizar el precio de los registros seleccionados %s?
diff --git a/htdocs/langs/es_CU/members.lang b/htdocs/langs/es_CU/members.lang
index 1f7d6ebe57b..9dfad42bd42 100644
--- a/htdocs/langs/es_CU/members.lang
+++ b/htdocs/langs/es_CU/members.lang
@@ -63,6 +63,7 @@ SendCardByMail=Enviar tarjeta por correo electrónico
 NoTypeDefinedGoToSetup=No se han definido tipos de miembros. Ir al menú "Tipos de miembros"
 WelcomeEMail=Correo electrónico de bienvenida
 SubscriptionRequired=Contribución requerida
+DeleteType=Borrar
 VoteAllowed=Voto permitido
 ResiliateMember=dar de baja a un miembro
 ConfirmResiliateMember=¿Está seguro de que desea dar de baja a este miembro?
@@ -112,6 +113,7 @@ DescADHERENT_CARD_HEADER_TEXT=Texto impreso en la parte superior de las tarjetas
 DescADHERENT_CARD_TEXT=Texto impreso en las tarjetas de miembro (alinear a la izquierda)
 DescADHERENT_CARD_TEXT_RIGHT=Texto impreso en las tarjetas de miembro (alinear a la derecha)
 DescADHERENT_CARD_FOOTER_TEXT=Texto impreso en la parte inferior de las tarjetas de miembro
+ShowTypeCard=Mostrar tipo '%s'
 HTPasswordExport=generación de archivos htpassword
 NoThirdPartyAssociatedToMember=Ningún tercero asociado con este miembro
 MembersAndSubscriptions=Miembros y Contribuciones
@@ -123,12 +125,12 @@ LinkToGeneratedPagesDesc=Esta pantalla le permite generar archivos PDF con tarje
 DocForAllMembersCards=Generar tarjetas de presentación para todos los miembros
 DocForOneMemberCards=Generar tarjetas de presentación para un miembro en particular
 DocForLabels=Generar hojas de direcciones
+SubscriptionPayment=Pago de cotización
 LastSubscriptionDate=Fecha del último pago de cotización
 LastSubscriptionAmount=Monto de la última contribución
 MembersStatisticsByState=Estadísticas de miembros por estado/provincia
 MembersStatisticsByTown=Estadísticas de miembros por ciudad
 NoValidatedMemberYet=No se encontraron miembros validados
-MembersByCountryDesc=Esta pantalla te muestra las estadísticas de miembros por países. Los gráficos y las tablas dependen de la disponibilidad del servicio de gráficos en línea de Google, así como de la disponibilidad de una conexión a Internet que funcione.
 MembersByStateDesc=Esta pantalla le muestra las estadísticas de los miembros por estado/provincia/cantón.
 MembersByTownDesc=Esta pantalla le muestra las estadísticas de los miembros por ciudad.
 MembersByNature=Esta pantalla le muestra estadísticas de los miembros por naturaleza.
@@ -140,16 +142,12 @@ NewMemberbyWeb=Nuevo miembro agregado. Esperando aprobacion
 NewMemberForm=formulario de nuevo miembro
 SubscriptionsStatistics=Estadísticas de contribuciones
 NbOfSubscriptions=Número de contribuciones
-AmountOfSubscriptions=Monto recaudado de las contribuciones
 TurnoverOrBudget=Facturación (para una empresa) o Presupuesto (para una fundación)
 CanEditAmountDetail=El visitante puede elegir/editar el monto de su contribución independientemente del tipo de miembro
 MembersStatisticsByProperties=Estadísticas de miembros por naturaleza
-NoVatOnSubscription=Sin IVA para las contribuciones
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producto utilizado para la línea de contribución en la factura: %s
 SubscriptionRecorded=Contribución registrada
 NoEmailSentToMember=Ningún correo electrónico enviado al miembro
 EmailSentToMember=Correo electrónico enviado al miembro en %s
-SendReminderForExpiredSubscriptionTitle=Enviar recordatorio por correo electrónico para contribuciones vencidas
 YouMayFindYourInvoiceInThisEmail=Es posible que encuentre su factura adjunta a este correo electrónico.
 ForceMemberNature=Naturaleza del miembro de la Fuerza (Persona Física o Sociedad Anónima)
 CreateDolibarrLoginDesc=La creación de un inicio de sesión de usuario para los miembros les permite conectarse a la aplicación. En función de las autorizaciones otorgadas, podrán, por ejemplo, consultar o modificar ellos mismos su expediente.
diff --git a/htdocs/langs/es_CU/website.lang b/htdocs/langs/es_CU/website.lang
index 758e024a980..d05d1bd08f4 100644
--- a/htdocs/langs/es_CU/website.lang
+++ b/htdocs/langs/es_CU/website.lang
@@ -33,12 +33,10 @@ CheckVirtualHostPerms=Compruebe también que el usuario del host virtual (por ej
 ReadPerm=Leer
 TestDeployOnWeb=Probar/implementar en la web
 PreviewSiteServedByWebServer=<u> Vista previa de %s en una nueva pestaña. </u> <br> <br> El %s será atendido por un servidor web externo (como Apache, Nginx, IIS). Debe instalar y configurar este servidor antes de apuntar al directorio: <br> <strong> %s </strong> <br> URL servida por un servidor externo: <br> b0e7843947c06bz 0 %s </strong>
-PreviewSiteServedByDolibarr=<u> Vista previa de %s en una nueva pestaña. </u> <br> <br> El %s será atendido por el servidor Dolibarr, por lo que no necesita ningún servidor web adicional (como Apache, Nginx, IIS) para instalarse. <br> El inconveniente es que las URL de las páginas no son fáciles de usar y comienzan con la ruta de su Dolibarr. <br> URL servida por Dolibarr: <br> <strong> %s </strong> <br> <br> Para usar su propio servidor web externo para servir este sitio web , cree un host virtual en su servidor web que apunte al directorio <br> <strong> %s </strong> <br> luego ingrese el nombre de este servidor virtual en las propiedades de este sitio web y haga clic en el enlace "Probar/Desplegar en la web".
 VirtualHostUrlNotDefined=URL del host virtual atendido por un servidor web externo no definido
 NoPageYet=Aún no hay páginas
 SyntaxHelp=Ayuda sobre consejos de sintaxis específicos
 YouCanEditHtmlSourceckeditor=Puede editar el código fuente HTML usando el botón "Fuente" en el editor.
-YouCanEditHtmlSource2=Para una imagen compartida con un enlace compartido (acceso abierto usando la clave hash compartida del archivo), la sintaxis es: <br> <strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt; b0a65d071f 6fc9z0 <br>
 ConfirmClonePage=Ingrese el código/alias de la nueva página y si es una traducción de la página clonada.
 LanguageMustNotBeSameThanClonedPage=Clonas una página como una traducción. El idioma de la nueva página debe ser diferente al idioma de la página de origen.
 WebsiteId=Identificación del sitio web
@@ -49,13 +47,10 @@ IDOfPage=identificación de la página
 Banner=Bandera
 WebsiteAccount=cuenta del sitio web
 WebsiteAccounts=cuentas del sitio web
-DisableSiteFirst=Deshabilitar sitio web primero
 MyContainerTitle=El título de mi sitio web
 AnotherContainer=Así es como se incluye el contenido de otra página/contenedor (es posible que tenga un error aquí si habilita el código dinámico porque es posible que el subcontenedor incrustado no exista)
 SorryWebsiteIsCurrentlyOffLine=Lo sentimos, este sitio web está actualmente fuera de línea. Por favor, vuelve más tarde...
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Habilite la tabla para almacenar cuentas de sitios web (inicio de sesión/contraseña) para cada sitio web/tercero
 YouMustDefineTheHomePage=Primero debe definir la página de inicio predeterminada
-OnlyEditionOfSourceForGrabbedContent=Solo es posible la edición de la fuente HTML cuando el contenido se tomó de un sitio externo
 GrabImagesInto=Agarra también las imágenes encontradas en css y page.
 ImagesShouldBeSavedInto=Las imágenes deben guardarse en el directorio.
 WebsiteRootOfImages=Directorio raíz para imágenes de sitios web
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index 58b785a3ca2..55e5438e977 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -10,8 +10,6 @@ FileIntegrityIsOkButFilesWereAdded=La verificación de la integridad de los arch
 FileIntegritySomeFilesWereRemovedOrModified=La comprobación de la integridad de los archivos ha fallado. Algunos archivos fueron modificados, eliminados o añadidos.
 GlobalChecksum=Verificación global
 MakeIntegrityAnalysisFrom=Hacer análisis de la integridad de los archivos de la aplicación de
-LocalSignature=Firma local incrustada (menos confiable)
-RemoteSignature=Firma remota (más confiable)
 FilesMissing=Archivos perdidos
 FilesAdded=Archivos agregados
 FileCheckDolibarr=Comprobar la integridad de los archivos de la aplicación
@@ -171,7 +169,6 @@ SourceFile=Archivo fuente
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible solamente si Javascript no está desactivado
 Required=Necesario
 UsedOnlyWithTypeOption=Utilizado solo por alguna opción de agenda
-MainDbPasswordFileConfEncrypted=Cifra la contraseña de la base de datos almacenada en conf.php. Se recomienda encarecidamente activar esta opción.
 InstrucToEncodePass=Para que la contraseña se codifique en el archivo <b>conf.php</b>, reemplazar la línea <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Para que la contraseña se descodifique (borrar) en el archivo <b>conf.php</b>, reemplazar la línea <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Proteger los archivos PDF generados. Esto NO se recomienda ya que rompe la generación masiva de PDF.
@@ -333,7 +330,6 @@ ModuleCompanyCodeCustomerDigitaria=%s seguido del nombre del cliente truncado po
 ModuleCompanyCodeSupplierDigitaria=%s seguido del nombre del proveedor truncado por el número de caracteres: %s para el código de contabilidad del proveedor.
 Use3StepsApproval=De forma predeterminada, las órdenes de compra deben ser creadas y aprobadas por dos usuarios diferentes (un paso / usuario para crear y un paso / usuario para aprobar.) Nota: si el usuario tiene permiso para crear y aprobar, un paso / usuario será suficiente). Puede dar con esta opción. 3 pasos: 1 = validación, 2 = primera aprobación y 3 = segunda aprobación si la cantidad es suficiente. ). <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br>.
 UseDoubleApproval=3 pasos cuando la cantidad es mayor que ...
-WarningPHPMail2=Si su proveedor SMTP de correo electrónico necesita restringir el cliente de correo electrónico a algunas direcciones IP (muy raras), esta es la dirección IP del usuario de correo (MUA) para su aplicación ERP CRM: <strong> %s </strong> .
 ClickToShowDescription=Haga clic para mostrar la descripción
 DependsOn=Este módulo necesita el módulo (s)
 RequiredBy=Este módulo es necesario para el módulo (s)
@@ -358,7 +354,6 @@ Module10Name=Contabilidad (simplificada)
 Module10Desc=Informes contables simples (revistas, facturación) basados ​​en el contenido de la base de datos. No utiliza ninguna tabla de contabilidad.
 Module20Name=Propuestas
 Module20Desc=Gestión de propuestas comerciales
-Module22Name=Correos masivos
 Module23Name=Energia
 Module23Desc=Monitoreo del consumo de energías
 Module25Name=Ordenes de venta
@@ -529,10 +524,6 @@ Permission211=Leer Telefonía
 Permission212=Líneas de pedidos
 Permission213=Activar línea
 Permission214=Configurar telefonía
-Permission221=Leer correos electrónicos
-Permission222=Crear / modificar correos electrónicos (tema, los destinatarios ...)
-Permission223=Validar correos electrónicos (permite el envío)
-Permission229=Eliminar correos electrónicos
 Permission237=Ver destinatarios e información
 Permission238=Enviar manualmente correos
 Permission239=Eliminar correos después de la validación o enviado
@@ -1163,6 +1154,7 @@ PasswordTogetVCalExport =Clave para autorizar enlace de exportación
 PastDelayVCalExport=No exportar eventos más antiguos de
 ClickToDialSetup=Configuración del módulo - Haga clic para marcar
 ClickToDialUseTelLink=Utilizar sólo un enlace "tel:" en los números de teléfono
+CashDesk=Punto de venta
 CashDeskSetup=Configuración del módulo de punto de venta
 CashDeskThirdPartyForSell=Tercero genérico predeterminado para usar en ventas
 CashDeskBankAccountForSell=Cuenta predeterminada para recibir pagos en efectivo
@@ -1238,7 +1230,6 @@ Threshold=Límite
 BackupDumpWizard=Asistente para construir el archivo de volcado de la base de datos
 SomethingMakeInstallFromWebNotPossible=La instalación del módulo externo no es posible desde la interfaz web por el siguiente motivo:
 SomethingMakeInstallFromWebNotPossible2=Por esta razón, el proceso de actualización que se describe aquí es un proceso manual que solo puede realizar un usuario privilegiado.
-InstallModuleFromWebHasBeenDisabledByFile=La instalación del módulo externo de la aplicación ha sido deshabilitada por su administrador. Debe solicitarle que elimine el archivo <strong> %s </strong> para permitir esta característica.
 ConfFileMustContainCustom=Instalar o construir un módulo externo desde la aplicación necesita guardar los archivos del módulo en el directorio <strong>%s</strong>. Para que este directorio sea procesado por Dolibarr, debes configurar tu <strong>conf/conf.php</strong> para añadir las 2 líneas de directiva:<strong>$dolibarr_main_url_root_alt='/custom';</strong><Br><strong>$dolibarr_main_document_root_alt ='%s/custom';</strong>
 HighlightLinesOnMouseHover=Resalte las líneas de la tabla cuando pase el mouse
 HighlightLinesColor=Resalte el color de la línea cuando el mouse pase (use 'ffffff' para no resaltar)
diff --git a/htdocs/langs/es_EC/banks.lang b/htdocs/langs/es_EC/banks.lang
index fbd1bfb17d0..dc713fe1431 100644
--- a/htdocs/langs/es_EC/banks.lang
+++ b/htdocs/langs/es_EC/banks.lang
@@ -15,6 +15,8 @@ BalanceMinimalAllowed=Saldo mínimo permitido
 FutureBalance=Saldo futuro
 ShowAllTimeBalance=Mostrar saldo desde el inicio
 RIB=Número de cuenta bancaria
+IBAN=Número IBAN
+BIC=Código BIC / SWIFT
 StandingOrders=Pedidos de domiciliación bancaria
 StandingOrder=Orden de dèbito directo
 AccountStatement=Estado de cuenta
@@ -80,7 +82,6 @@ NumberOfCheques=No. de cheque
 DeleteTransaction=Eliminar la entrada
 ConfirmDeleteTransaction=¿Estás seguro de que quieres borrar esta entrada?
 ThisWillAlsoDeleteBankRecord=Esto también eliminará la entrada de banco generada
-PlannedTransactions=Entradas planificadas
 ExportDataset_banque_1=Entradas bancarias y estado de cuenta
 ExportDataset_banque_2=Depósito
 TransactionOnTheOtherAccount=Transacción en la otra cuenta
diff --git a/htdocs/langs/es_EC/companies.lang b/htdocs/langs/es_EC/companies.lang
index c0f6ab1eb84..c1888eecc65 100644
--- a/htdocs/langs/es_EC/companies.lang
+++ b/htdocs/langs/es_EC/companies.lang
@@ -24,7 +24,7 @@ PriceFormatInCurrentLanguage=Formato de visualización de precios en el idioma y
 ThirdPartyName=Nombre de un cliente/proveedor
 ThirdPartyEmail=Correo electrónico de cliente/proveedor
 ThirdParty=Cliente/Proveedor
-ThirdParties=Clientes/Proveedors
+ThirdParties=Clientes / Proveedores
 ThirdPartyProspects=Prospecto
 ThirdPartyProspectsStats=Prospecto
 ThirdPartyCustomersWithIdProf12=Clientes con %s o %s
@@ -47,7 +47,6 @@ CountryCode=Código de país
 Call=Llamada
 PhonePerso=Teléfono Personal
 PhoneMobile=Celular
-No_Email=Rechazar correos masivos
 Town=Ciudad
 Poste=Posición
 VATIsUsed=Impuesto a las ventas utilizado
@@ -136,6 +135,7 @@ VATIntra=ID de IVA
 VATIntraShort=ID de IVA
 VATIntraSyntaxIsValid=La sintaxis es válida
 ProspectCustomer=Prospecto / Cliente
+Prospect=Prospecto
 CustomerCard=Tarjeta de cliente
 CustomerRelativeDiscount=Descuento relativo del cliente
 SupplierRelativeDiscount=Descuento relativo del vendedor
@@ -172,6 +172,7 @@ CompanyDeleted=Empresa "%s" eliminada de la base de datos.
 ListOfContacts=Lista de contactos / direcciones
 ListOfContactsAddresses=Lista de contactos / direcciones
 ListOfThirdParties=Lista de cliente/proveedor
+ShowCompany=Cliente/Proveedor
 ShowContact=Dirección de contacto
 ContactsAllShort=Todos (Sin filtro)
 ContactForOrders=Contacto del pedido
@@ -216,8 +217,6 @@ ExportCardToFormat=Exportar la tarjeta al formato
 ContactNotLinkedToCompany=Contacto no vinculado a cliente/proveedor
 DolibarrLogin=Dolibarr inicio de sesión
 NoDolibarrAccess=No hay acceso a Dolibarr
-ExportDataset_company_1=Terceros (empresas / fundaciones / personas físicas) y sus propiedades.
-ExportDataset_company_2=Contactos y sus propiedades.
 ImportDataset_company_2=Contactos / direcciones adicionales de terceros y atributos
 ImportDataset_company_4=Representantes de ventas de terceros (asignar representantes de ventas / usuarios a empresas)
 PriceLevelLabels=Etiquetas de nivel de precio
diff --git a/htdocs/langs/es_EC/exports.lang b/htdocs/langs/es_EC/exports.lang
index 56b534f53cb..66a21cdc8b1 100644
--- a/htdocs/langs/es_EC/exports.lang
+++ b/htdocs/langs/es_EC/exports.lang
@@ -39,7 +39,6 @@ FileMustHaveOneOfFollowingFormat=El archivo a importar debe tener uno de los sig
 ChooseFormatOfFileToImport=Elija el formato de archivo para usar como formato de archivo de importación haciendo clic en el icono %s para seleccionarlo ...
 SourceFileFormat=Formato del archivo fuente
 FieldsInSourceFile=Campos del archivo de origen
-FieldsInTargetDatabase=Campos de destino en la base de datos Dolibarr (negrita
 NoFields=Sin campos
 MoveField=Mover número de columna de campo%s
 ExampleOfImportFile=Ejemplo_de_archivo_import
@@ -53,8 +52,7 @@ NowClickToTestTheImport=Verifique que el formato del archivo (delimitadores de c
 RunSimulateImportFile=Ejecutar simulación de importación
 FieldNeedSource=Este campo requiere datos del archivo de origen
 SomeMandatoryFieldHaveNoSource=Algunos campos obligatorios no tienen fuente de archivo de datos
-InformationOnSourceFile=Información sobre el archivo fuente
-InformationOnTargetTables=Información sobre los campos objetivo
+InformationOnSourceFile=Archivo fuente
 SelectAtLeastOneField=Cambiar al menos un campo de origen en la columna de campos para exportar
 SelectFormat=Elija este formato de archivo de importación
 RunImportFile=Datos de importacion
diff --git a/htdocs/langs/es_EC/mails.lang b/htdocs/langs/es_EC/mails.lang
index f3104bd4a3e..8a00f7ea805 100644
--- a/htdocs/langs/es_EC/mails.lang
+++ b/htdocs/langs/es_EC/mails.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - mails
-AllEMailings=Todos los eMailings
 MailCard=Tarjeta EMailing
 MailTo=A
 MailToUsers=Para el usuario(s)
@@ -9,15 +8,6 @@ MailCCC=Copia en caché a
 MailFile=Archivos adjuntos
 MailMessage=Cuerpo del correo electronico
 SubjectNotIn=No en el tema
-ShowEMailing=Mostrar correos electrónicos
-ListOfEMailings=Lista de correos electrónicos
-NewMailing=Nuevo correo electrónico
-EditMailing=Editar correos electrónicos
-ResetMailing=Reenviar correo electrónico
-DeleteMailing=Eliminar correo electrónico
-PreviewMailing=Previsualizar correo electrónico
-CreateMailing=Crear correo electrónico
-ValidMailing=Correo electrónico válido
 MailingStatusValidated=validado
 MailSuccessfulySent=Correo electrónico (de %s a %s) aceptado correctamente para entrega
 MailingSuccessfullyValidated=EMailing validado con éxito
@@ -67,22 +57,15 @@ MailingModuleDescDolibarrUsers=Usuarios con mensajes de correo electrónico
 MailingModuleDescThirdPartiesByCategories=Clientes / Proveedores
 LineInFile=Línea %s en el archivo
 RecipientSelectionModules=Solicitudes definidas para la selección del destinatario
-MailingArea=Zona EMailings
-LastMailings=Últimos %s emails
 TargetsStatistics=Estadísticas de objetivos
 NbOfCompaniesContacts=Contactos / direcciones únicos
 MailNoChangePossible=Los destinatarios de correo electrónico validado no se pueden cambiar
-SearchAMailing=Búsqueda por correo
-SendMailing=Enviar correo electrónico
 MailingNeedCommand=El envío de un correo electrónico se puede realizar desde la línea de comandos. Pida al administrador del servidor que inicie el siguiente comando para enviar el correo electrónico a todos los destinatarios:
 MailingNeedCommand2=Sin embargo, puede enviarlos en línea agregando el parámetro MAILING_LIMIT_SENDBYWEB con el valor del número máximo de correos electrónicos que desea enviar por sesión. Para ello, vaya a Inicio - Configuración - Otros.
 ConfirmSendingEmailing=Si desea enviar mensajes de correo electrónico directamente desde esta pantalla, confirme que está seguro de que desea enviar correo electrónico ahora desde su navegador.
-LimitSendingEmailing=Nota: El envío de correos electrónicos desde la interfaz web se realiza en varias ocasiones por razones de seguridad y de tiempo de espera, <b>%s</b> destinatarios a la vez para cada sesión de envío.
 TargetsReset=Limpiar lista
 ToClearAllRecipientsClickHere=Haga clic aquí para borrar la lista de destinatarios de este correo electrónico
 ToAddRecipientsChooseHere=Agregar destinatarios eligiendo de las listas
-NbOfEMailingsReceived=Envíos masivos recibidos
-NbOfEMailingsSend=Envíos masivos enviados
 IdRecord=Registro de identificación
 DeliveryReceipt=Entrega Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Puede utilizar el separador <b> coma </b> para especificar varios destinatarios.
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index 6921be6aedc..0b7343e6e86 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -247,7 +247,6 @@ ActionsToDoShort=Que hacer
 ActionsDoneShort=Hecho
 ActionNotApplicable=No aplica
 ActionRunningNotStarted=Para comenzar
-LatestLinkedEvents=Últimos eventos vinculados %s
 Accountant=Contador
 ContactsForCompany=Contactos de clientes
 ContactsAddressesForCompany=Contactos/direcciones de clientes
@@ -369,6 +368,8 @@ TextUsedInTheMessageBody=Cuerpo del correo electronico
 SendAcknowledgementByMail=Enviar correo electrónico de confirmación
 SendMail=Enviar correo electrónico
 Email=Correo electrónico
+EMail= Email
+EMails=Correos electrónicos
 NoEMail=Sin correo electrónico
 NoMobilePhone=No hay teléfono móvil
 FollowingConstantsWillBeSubstituted=Las siguientes constantes serán reemplazados con el valor correspondiente.
@@ -404,7 +405,6 @@ ForCustomer=Para el cliente
 HidePassword=Mostrar comando con la contraseña oculta
 UnHidePassword=Mostrar comando real con contraseña clara
 AddFile=Agregar archivo
-FreeLineOfType=Elemento de texto libre, escriba:
 CloneMainAttributes=Clonar objeto con sus atributos principales
 PDFMerge=Combinar PDF
 Merge=Combinar
@@ -483,7 +483,6 @@ NotAllExportedMovementsCouldBeRecordedAsExported=No todos los movimientos export
 Miscellaneous=Varios
 GroupBy=Agrupar por...
 DownloadDocument=Descargar documento
-ActualizeCurrency=Actualizar tipo de cambio
 ModuleBuilder=Módulo y generador de aplicaciones
 ClickToShowHelp=Haga clic para mostrar ayuda sobre herramientas
 WebSites=Sitios Web
@@ -552,6 +551,7 @@ ContactDefault_invoice_supplier=Factura del proveedor
 ContactDefault_order_supplier=Orden de compra
 ContactDefault_propal=Propuesta
 ContactDefault_supplier_proposal=Propuesta de proveedor
+ContactDefault_societe=Cliente/Proveedor
 ClientTZ=Zona horaria del cliente
 Terminate=Terminar
 Terminated=Terminado
@@ -563,3 +563,4 @@ ErrorFileNotLinked=No se pudo vincular el archivo.
 LinkRemoved=Se ha eliminado el enlace %s
 ErrorFailedToDeleteLink=No se pudo eliminar el vínculo '<b>%s</b>'
 URLToLink=URL para vincular
+AllTime=Desde el principio
diff --git a/htdocs/langs/es_EC/products.lang b/htdocs/langs/es_EC/products.lang
index 95abc5975cb..fdf84e7ae7a 100644
--- a/htdocs/langs/es_EC/products.lang
+++ b/htdocs/langs/es_EC/products.lang
@@ -25,6 +25,7 @@ ServicesNotOnSell=Servicios no a la venta y no a la compra
 ServicesOnSellAndOnBuy=Servicios para la venta y para la compra
 LastRecordedServices=Últimos %s servicios grabados
 MenuStocks=Dispuesto
+Stocks=Stocks y ubicación (almacén) de productos
 OnBuy=Para comprar
 NotOnSell=No para la venta
 ProductStatusNotOnSell=No para la venta
@@ -33,7 +34,6 @@ ProductStatusOnBuy=Para comprar
 ProductStatusNotOnBuy=No para la compra
 ProductStatusOnBuyShort=Para comprar
 ProductStatusNotOnBuyShort=No para la compra
-UpdateVAT=Actualizar IVA
 UpdateDefaultPrice=Actualizar precio predeterminado
 UpdateLevelPrices=Actualizar precios para cada nivel
 SellingPriceHT=Precio de venta (sin impuestos)
@@ -71,7 +71,6 @@ DeleteProductLine=Eliminar línea de productos
 ConfirmDeleteProductLine=¿Está seguro de que desea eliminar esta línea de productos?
 QtyMin=Min. Cantidad de compra
 PriceQtyMin=Precio cantidad min.
-VATRateForSupplierProduct=Tasa de IVA (para este vendedor / producto)
 DiscountQtyMin=Descuento por esta cantidad.
 NoPriceDefinedForThisSupplier=No hay precio / cantidad definida para este vendedor / producto
 NoSupplierPriceDefinedForThisProduct=No hay precio / cantidad de proveedor definido para este producto
@@ -147,7 +146,6 @@ GlobalVariableUpdaterHelpFormat0=Formato de la solicitud {"URL": "http://example
 GlobalVariableUpdaterType1=Datos de WebService
 GlobalVariableUpdaterHelp1=Analiza los datos de WebService desde la URL especificada, NS especifica el espacio de nombres, VALUE especifica la ubicación del valor relevante, DATA debe contener los datos a enviar y METHOD es el método WS llamante
 GlobalVariableUpdaterHelpFormat1=El formato de la solicitud es {"URL": "http://example.com/urlofws", "VALUE": "array, targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod", "DATA": {"tu": "datos", "para": "enviar"}}
-PropalMergePdfProductActualFile=Los archivos se utilizan para agregar en PDF Azur son/es
 PropalMergePdfProductChooseFile=Seleccionar archivos PDF
 DefaultPriceRealPriceMayDependOnCustomer=Precio predeterminado, el precio real puede depender del cliente
 NbOfQtyInProposals=Cantidad en las propuestas
diff --git a/htdocs/langs/es_EC/website.lang b/htdocs/langs/es_EC/website.lang
index b4f03dc3d16..747fb732a06 100644
--- a/htdocs/langs/es_EC/website.lang
+++ b/htdocs/langs/es_EC/website.lang
@@ -5,7 +5,6 @@ WEBSITE_PAGENAME=Nombre de página/alias
 WEBSITE_ALIASALT=Nombres de página alternativos/alias
 WEBSITE_ALIASALTDesc=Utilice aquí la lista de otros nombres/alias para que también se pueda acceder a la página usando estos otros nombres/alias (por ejemplo, el nombre anterior después de cambiar el nombre del alias para mantener el enlace posterior en funcionamiento). La sintaxis es:<br> alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL del archivo CSS externo
-WEBSITE_HTML_HEADER=Adición en la parte inferior del encabezado HTML (común en todas las páginas)
 WEBSITE_HTACCESS=Sitio web .htaccess archivo
 PageNameAliasHelp=Nombre o alias de la página. <br> Este alias también se utiliza para forjar una URL SEO cuando el sitio web se ejecuta desde un host virtual de un servidor Web (como Apacke, Nginx, ...). Utilice el botón "<strong>%s</ strong>" para editar este alias.
 MediaFiles=Mediateca
@@ -32,13 +31,9 @@ SiteAdded=Sitio web añadido
 LanguageMustNotBeSameThanClonedPage=Clonar una página como traducción. El idioma de la nueva página debe ser diferente al idioma de la página de origen.
 OrEnterPageInfoManually=O crea una página desde cero o desde una plantilla de página ...
 IDOfPage=Id de página
-DisableSiteFirst=Deshabilitar sitio web primero
 AnotherContainer=Así es como se incluye el contenido de otra página / contenedor (puede tener un error aquí si habilita el código dinámico porque el subcontenedor incrustado puede no existir)
 SorryWebsiteIsCurrentlyOffLine=Lo sentimos, este sitio web está actualmente fuera de línea. Vuelve más tarde ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Habilitar la tabla de cuenta del sitio web
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Habilite la tabla para almacenar las cuentas del sitio web (inicio de sesión / pase) para cada sitio web / tercero
 YouMustDefineTheHomePage=Primero debe definir la página de inicio predeterminada
-OnlyEditionOfSourceForGrabbedContent=Solo es posible la edición de código fuente HTML cuando el contenido fue capturado de un sitio externo
 WebsiteRootOfImages=Directorio raíz para imágenes de sitios web
 AliasPageAlreadyExists=La página Alias <strong>%s</strong> ya existe
 ThisPageIsTranslationOf=Esta página / contenedor es una traducción de
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index a7feec20234..7558e01cd93 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=La comprobación de la integridad de los arch
 FileIntegritySomeFilesWereRemovedOrModified=La comprobación de integridad de archivos ha fallado. Algunos archivos fueron modificados, eliminados o agregados.
 GlobalChecksum=Suma de comprobación global
 MakeIntegrityAnalysisFrom=Realizar el análisis de la integridad de los archivos de la aplicación desde
-LocalSignature=Firma local incrustada (menos segura)
-RemoteSignature=Firma remota (más segura)
+LocalSignature=Firma local incorporada
+RemoteSignature=Firma remota y distante
 FilesMissing=Archivos no encontrados
 FilesUpdated=Archivos actualizados
 FilesModified=Archivos modificados
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Usado solamente por alguna opción de la agenda
 Security=Seguridad
 Passwords=Contraseñas
 DoNotStoreClearPassword=Cifrar las contraseñas almacenadas en la base de datos.
-MainDbPasswordFileConfEncrypted=Cifrar la contraseña de la base de datos almacenada en conf.php. Se recomienda encarecidamente activar esta opción.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=Para tener la contraseña codificada en el archivo <b>conf.php</b>, reemplace la línea <br><b>$dolibarr_main_db_pass = "...";</b><br>por<br> <b>$dolibarr_main_db_pass = "crypted:%s";</b>
 InstrucToClearPass=Para tener la contraseña decodificada (visible) en el archivo <b>conf.php</b>, reemplace la línea <br><b>$dolibarr_main_db_pass = "crypted:...";</b><br>por<br><b>$dolibarr_main_db_pass = "%s";</b>
 ProtectAndEncryptPdfFiles=Protección y encriptación de los ficheros PDF. NO se recomienda ya que puede fallar la generación de PDF en masa
@@ -371,11 +371,11 @@ GenericMaskCodes3EAN=Todos los demás caracteres de la máscara permanecerán in
 GenericMaskCodes4a= <u> Ejemplo en el 99 %s del tercero TheCompany, con fecha 2023-01-31: </u>  <br>
 GenericMaskCodes4b= <u> Ejemplo de un tercero creado el 31-01-2023: </u>  <br>
 GenericMaskCodes4c= <u> Ejemplo de producto creado el 31-01-2023: </u>  <br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericMaskCodes5b=<b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> dará <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> dará <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes5b=<b>IN{yy}{mm}-{0000}-{t}</b> dará <b>IN2301-0099-A</b> si el tipo de empresa es 'Inscripto Responsable' con código para el tipo que es 'A_RI'
 GenericNumRefModelDesc=Devuelve un número creado acorde a una máscara definida.
 DateStartThatModel=Deshabilite el uso de esta regla de numeración para todos los terceros creados con anterioridad
-DateStartThatModelHelp=You can disable elephant numbering rule for thirdparties created before a date (for example, because they were imported by a migration, from another software using a different rule). Let that field empty to have the rule applied on all thirdparties.
+DateStartThatModelHelp=Puede desactivar la regla de numeración de masiva para terceros creados antes de una fecha (por ejemplo, porque se importaron mediante una migración desde otro software que utiliza una regla diferente). Deje ese campo vacío para que la regla se aplique a todos los terceros.
 ServerAvailableOnIPOrPort=Servidor disponible en la dirección <b>%s</b> en el puerto <b>%s</b>
 ServerNotAvailableOnIPOrPort=Servidor no disponible en la dirección <b>%s</b> en el puerto <b>%s</b>
 DoTestServerAvailability=Probar conectividad con el servidor
@@ -458,23 +458,24 @@ ExtrafieldSelect=Lista de selección
 ExtrafieldSelectList=Lista desde una tabla
 ExtrafieldSeparator=Separador (No es un campo)
 ExtrafieldPassword=Contraseña
-ExtrafieldRadio=Radio buttons (1 choice only)
-ExtrafieldCheckBox=Select list (n choices)
-ExtrafieldCheckBoxFromList=Select from table (n choices)
+ExtrafieldRadio=Botones de opción (solo 1 opción)
+ExtrafieldCheckBox=Seleccionar lista (n opciones)
+ExtrafieldCheckBoxFromList=Seleccionar de la tabla (n opciones)
 ExtrafieldLink=Objeto adjuntado
 ExtrafieldPointGeo=Punto Geométrico
 ExtrafieldMultiPointGeo=Punto múltiple geométrico
 ExtrafieldLinestringGeo=Cadena de líneas geométrica
 ExtrafieldPolygonGeo=Polígono Geométrico
+ExtrafieldStars=Estrellas
 ComputedFormula=Campo combinado
-ComputedFormulaDesc=Puede ingresar aquí una fórmula utilizando otras propiedades del objeto o cualquier codificación PHP para obtener un valor calculado dinámico. Puede usar cualquier fórmula compatible con PHP, incluido el "?" operador de condición y siguiente objeto global: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>. <br><strong>ADVERTENCIA</strong>: Solo algunas propiedades de $object pueden estar disponibles. Si necesita propiedades no cargadas, simplemente busque el objeto en su fórmula como en el segundo ejemplo. <br>El uso de un campo calculado significa que no puede ingresar ningún valor desde la interfaz. Además, si hay un error de sintaxis, la fórmula puede no devolver nada. <br><br>Ejemplo de fórmula:<br>$object-> id < 10 ? round($object-> id / 2, 2):($object-> id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2 )<br><br>Ejemplo para recargar el objeto<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br> Otro ejemplo de fórmula para forzar la carga del objeto y su objeto principal: <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Proyecto principal no encontrado'
+ComputedFormulaDesc=Puede introducir aquí una fórmula que utilice otras propiedades del objeto o cualquier código PHP para obtener un valor calculado dinámico. Puede utilizar cualquier fórmula compatible con PHP, incluido el operador de condición "?", y el siguiente objeto global: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>ADVERTENCIA</strong>: Si necesita propiedades de un objeto que no está cargado, simplemente busque el objeto en su fórmula como en el segundo ejemplo.<br>Si utiliza un campo calculado, no podrá ingresar ningún valor desde la interfaz. Además, si hay un error de sintaxis, la fórmula puede no devolver nada.<br><br>Ejemplo 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>Ejemplo para recargar objeto<br>(($reloadedobj = new Societe($db)) && $reloadedobj->fetchNoCompute($objectoffield->id) > 0) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')<br><br>Otro ejemplo de fórmula para forzar la carga de un objeto y su objeto padre:<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=Almacenar campo combinado
 ComputedpersistentDesc=Los campos adicionales calculados se almacenarán en la base de datos, sin embargo, el valor solo se volverá a calcular cuando se cambie el objeto de este campo. ¡Si el campo calculado depende de otros objetos o datos globales, este valor podría ser incorrecto!
 ExtrafieldParamHelpPassword=Dejar este campo en blanco significa que este valor se almacenará SIN cifrado (el campo simplemente está oculto con estrellas en la pantalla).<br><br>Intro value 'dolcrypt' para codificar el valor con un algoritmo de cifrado reversible. Los datos claros aún se pueden conocer y editar, pero se cifran en la base de datos.<br><br>Ingrese 'auto' (o 'md5', 'sha256', 'password_hash', ...) para usar el algoritmo de cifrado de contraseña predeterminado (o md5, sha256, contraseña_hash...) para guardar la contraseña hash no reversible en la base de datos (no hay forma de recuperar el valor original)
 ExtrafieldParamHelpselect=El listado de valores tiene que ser líneas key,valor<br><br> por ejemplo: <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>Para tener una lista en funcion de campos adicionales de lista:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>Para tener la lista en función de otra:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=El listado de valores tiene que ser líneas con el formato key,valor<br><br> por ejemplo: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=El listado de valores tiene que ser líneas con el formato key,valor (donde key no puede ser 0)<br><br> por ejemplo: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarily a primary int key<br>- filtersql is a condition. It must use the USF syntax. Example: (active:=:1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>If you want to filter on extrafields use syntax  extra.fieldcode=... (where fieldcode is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=La lista de valores proviene de una tabla<br>Sintaxis: table_name:label_field:id_field::filtersql<br>Ejemplo: c_typent:libelle:id::filtersql<br><br>- id_field es necesariamente una clave int primaria<br>- filtersql es una condición. Debe utilizar la sintaxis USF. Ejemplo: (active:=:1) para mostrar solo el valor activo<br>También puede usar $ID$ en el filtro, que es el id actual del objeto actual<br>Si desea filtrar por campos adicionales, use la sintaxis extra.fieldcode=... (donde fieldcode es el código del campo adicional)<br><br>Para que la lista dependa de otra lista de atributos complementarios:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>Para que la lista dependa de otra lista:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Los parámetros deben ser NombreObjeto:RutaClase <br>Sintaxis: NombreObjeto:RutaClase
 ExtrafieldParamHelpSeparator=Mantener vacío para un separador simple <br> Establezca a 1 para un separador de colapso (abierto de forma predeterminada para una nueva sesión, luego el estado se mantiene para cada sesión de usuario) <br> Establezca a 2 para un separador de colapso (colapsado por defecto para una nueva sesión, luego el estado se mantiene para cada sesión de usuario)
 LibraryToBuildPDF=Libreria usada en la generación de los PDF
@@ -513,17 +514,17 @@ ModuleCompanyCodeCustomerDigitaria=%s seguido del nombre del cliente truncado po
 ModuleCompanyCodeSupplierDigitaria=%s seguido del nombre del proveedor truncado por el número de caracteres: %s para el código contable del proveedor.
 Use3StepsApproval=De forma predeterminada, los pedidos a proveedor deben ser creados y aprobados por 2 usuarios diferentes (un paso/usuario para crear y un paso/usuario para aprobar. Tenga en cuenta que si el usuario tiene tanto el permiso para crear y aprobar, un paso usuario será suficiente) . Puede pedir con esta opción introducir una tercera etapa de aprobación/usuario, si la cantidad es superior a un valor específico (por lo que serán necesarios 3 pasos: 1 validación, 2=primera aprobación y 3=segunda aprobación si la cantidad es suficiente).<br>Deje vacío si una aprobación (2 pasos) es suficiente, si se establece en un valor muy bajo (0,1) se requiere siempre una segunda aprobación (3 pasos).
 UseDoubleApproval=Usar 3 pasos de aprobación si el importe (sin IVA) es mayor que...
-WarningPHPMail=NOTICE: The setup to send emails from the application is using the default generic setup (called "%s"). This choice needs no technical knowledge and no particular setup.<br>However, it is often better to setup outgoing emails to use the other method (called "%s") to use the email server of your Email Service Provider, instead of the default setup for several reasons:
-WarningPHPMailA=- Using the server of the Email Service Provider increases the trustworthiness of your email, so it increases the deliverability without being flagged as SPAM
-WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into myname@mymaildomain.com) is protected by a SPF + a DMARC record, your email may be flagged as SPAM because your DMARC rule defined into DNS zone of the domain of the sender (mymaildomain.com) does not allow the sending as a generic sender. In such a case, you must disable the DMARC for the domain (or set it to p=none like done by @gmail.com) or, better, if you have the technical knowledge, use the other method to send emails using the SMTP server of your own email provider.
+WarningPHPMail=AVISO: La configuración para enviar correos electrónicos desde la aplicación utiliza la configuración genérica predeterminada (denominada "%s"). Esta opción no requiere conocimientos técnicos ni una configuración particular. <br>Sin embargo, a menudo es mejor configurar los correos electrónicos salientes para utilizar el otro método (denominado "%s") para utilizar el servidor de correo electrónico de su proveedor de servicios de correo electrónico, en lugar de la configuración predeterminada por varias razones:
+WarningPHPMailA=- El uso del servidor del proveedor de servicios de correo electrónico aumenta la confiabilidad de su correo electrónico, por lo que aumenta la capacidad de entrega sin ser marcado como SPAM
+WarningPHPMailB=- Si el dominio de tu correo electrónico (la parte mymaildomain.com dentro de myname@mymaildomain.com) está protegido por un SPF + un registro DMARC, tu correo electrónico puede ser marcado como SPAM porque tu regla DMARC definida en la zona DNS del dominio del remitente (mymaildomain.com) no permite el envío como remitente genérico. En tal caso, debes desactivar el DMARC para el dominio (o configurarlo a p=none como lo hace @gmail.com) o, mejor, si tienes los conocimientos técnicos, utilizar el otro método para enviar correos electrónicos utilizando el servidor SMTP de tu propio proveedor de correo electrónico.
 WarningPHPMailC=- El uso del servidor SMTP de su propio proveedor de servicios de correo electrónico para enviar correos electrónicos también es interesante, por lo que todos los correos electrónicos enviados desde la aplicación también se guardarán en el directorio "Enviados" de su buzón.
 WarningPHPMailD=Por lo tanto, se recomienda cambiar el método de envío de correos electrónicos al valor "SMTP".
 WarningPHPMailDbis=Si realmente desea mantener el método "PHP" predeterminado para enviar correos electrónicos, simplemente ignore esta advertencia o elimínela haciendo %sclic aquí%s.
-WarningPHPMail2=Si su proveedor SMTP de correo electrónico necesita restringir el cliente de correo electrónico a algunas direcciones IP (muy raro), esta es la dirección IP de su aplicación ERP CRM: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
-WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
-SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
-ActualMailDNSRecordFound=Actual %s record found (for email %s) : %s
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
+WarningPHPMailSPF=Si el nombre de dominio en su dirección de correo electrónico de remitente está protegido por un registro SPF (pregunte a su registrador de nombres de dominio), debe agregar las siguientes IP o entrada en el registro SPF del DNS de su dominio: <strong>%s</strong>.
+WarningPHPMailSPFDMARC=Si el nombre de dominio en su dirección de correo electrónico de remitente está protegido por un registro DMARC diferente a p=none (pregunte a su registrador de nombre de dominio), debe eliminar su registro DMARC o configurarlo a p=none como lo hace @gmail.com) o usar otro método de envío.
+SPFAndDMARCInformation=Registro DNS SPF y DMARC para direcciones de correo electrónico principales
+ActualMailDNSRecordFound=Se encontró el registro %s actual (para el correo electrónico %s): %s
 ClickToShowDescription=Clic para ver la descripción
 DependsOn=Este módulo necesita el módulo(s)
 RequiredBy=Este módulo es requerido por los módulos
@@ -567,8 +568,8 @@ Module10Name=Contabilidad (simple)
 Module10Desc=Activación de informes simples de contabilidad (diarios, ventas) basados en el contenido de la base de datos. No utiliza ninguna tabla de contabilidad.
 Module20Name=Presupuestos
 Module20Desc=Gestión de presupuestos/propuestas comerciales
-Module22Name=E-Mailings
-Module22Desc=Gestionar el envío de correo masivo
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energía
 Module23Desc=Realiza el seguimiento del consumo de energías
 Module25Name=Pedidos
@@ -667,7 +668,7 @@ Module2200Desc=Activa el uso de expresiones matemáticas para precios
 Module2300Name=Tareas programadas
 Module2300Desc=Gestión del Trabajo programado (alias cron)
 Module2400Name=Eventos/Agenda
-Module2400Desc=Manage manual and automatic events. Use the calendar to record events manually. Log also events automatically for tracking purposes or record manual events or meetings. This is the principal module for good Customer and/or Vendor Relationship Management.
+Module2400Desc=Gestione eventos manuales y automáticos. Utilice el calendario para registrar eventos manualmente. Registre también eventos automáticamente para fines de seguimiento o registre eventos o reuniones manuales. Este es el módulo principal para una buena gestión de las relaciones con clientes y/o proveedores.
 Module2430Name=Programación de citas en línea
 Module2430Desc=Proporciona un sistema de reserva de citas en línea. Esto permite que cualquiera pueda reservar citas, según rangos o disponibilidades predefinidos.
 Module2500Name=GED / SGD
@@ -847,10 +848,10 @@ Permission212=Pedir líneas
 Permission213=Activar una línea
 Permission214=Configurar la telefonía
 Permission215=Configurar proveedores
-Permission221=Consultar E-Mails
-Permission222=Crear/modificar E-Mails (asunto, destinatarios, etc.)
-Permission223=Validar E-Mails (permite el envío)
-Permission229=Eliminar E-Mails
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Ver los destinatarios y la información
 Permission238=Enviar los e-mails manualmente
 Permission239=Eliminar los e-mails después de su validación o su envío
@@ -868,7 +869,7 @@ Permission255=Modificar la contraseña de otros usuarios
 Permission256=Eliminar o desactivar otros usuarios
 Permission262=Ampliar el acceso a todos los terceros Y a sus objetos (no sólo a los terceros a los que el usuario está vinculado como representante de ventas).
 Permission262b=No efectivo para usuarios externos (siempre limitados a ellos mismos para propuestas, pedidos, facturas, contratos, etc.).
-Permission262c=Not effective for projects (only rules on project permissions, visibility and users assignment matter).
+Permission262c=No es efectivo para proyectos (solo importan las reglas sobre permisos de proyecto, visibilidad y asignación de usuarios).
 Permission263=Ampliar el acceso a todos los terceros SIN sus objetos (no solo a los terceros para los que el usuario es comercial). <br> No efectivo para usuarios externos (siempre limitado a ellos mismos para presupuestos, pedidos, facturas, contratos, etc.). <br> No es efectivo para proyectos (solo reglas sobre permisos de proyectos, visibilidad y asuntos de asignación).
 Permission271=Consultar el CA
 Permission272=Consultar las facturas
@@ -945,7 +946,7 @@ Permission776=Pagar informe de gastos
 Permission777=Lea todos los informes de gastos (incluso los de usuarios que no sean subordinados)
 Permission778=Crear/modificar informes de gastos de todos
 Permission779=Exportar informe de gastos
-Permission1001=Read warehouses and stocks
+Permission1001=Leer almacenes y stocks
 Permission1002=Crear/modificar almacenes
 Permission1003=Eliminar almacenes
 Permission1004=Consultar movimientos de stock
@@ -1105,6 +1106,7 @@ DictionaryStaff=Número de Empleados
 DictionaryAvailability=Tiempos de entrega
 DictionaryOrderMethods=Métodos de pedido
 DictionarySource=Orígenes de presupuestos/pedidos
+DictionaryAccountancyReport=Informes contables personalizados
 DictionaryAccountancyCategory=Grupos personalizados para imformes
 DictionaryAccountancysystem=Modelos de planes contables
 DictionaryAccountancyJournal=Diarios contables
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Volver al listado de diccionarios
 TypeOfRevenueStamp=Tipos de sellos fiscales
 VATManagement=Gestión de IVA
 VATIsUsedStandard=Al crear documentos (propuestas, facturas, pedidos...), la tasa de impuesto sobre las ventas predeterminada se establece de acuerdo con las reglas estándar (según los países del vendedor y del comprador).
-VATIsUsedDesc=De forma predeterminada, al crear propuestas, facturas, pedidos, etc., la tasa del impuesto sobre las ventas sigue la regla estándar activa:<br>Si el vendedor no está sujeto al impuesto sobre las ventas, el impuesto sobre las ventas por defecto es 0. Fin de la regla.<br>Si (país del vendedor = país del comprador), entonces el impuesto sobre las ventas de forma predeterminada es igual al impuesto sobre las ventas del producto en el país del vendedor. Fin de la regla.<br>Si el vendedor y el comprador se encuentran en la Comunidad Europea y los bienes son productos relacionados con el transporte (transporte, envío, línea aérea), el IVA predeterminado es 0. Este La regla depende del país del vendedor; consulte con su contable. El IVA lo debe pagar el comprador a la aduana de su país y no al vendedor. Fin de la regla.<br>Si el vendedor y el comprador se encuentran en la Comunidad Europea y el comprador no es una empresa (con un número de IVA intracomunitario registrado), entonces el IVA por defecto es el tipo de IVA del país del vendedor. Fin de la regla.<br>Si el vendedor y el comprador se encuentran en la Comunidad Europea y el comprador es una empresa (con un número de IVA intracomunitario registrado), entonces el IVA es 0 por defecto. Fin de la regla.<br>En cualquier otro caso, el valor predeterminado propuesto es Impuesto sobre las ventas=0. Fin de la regla.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=El tipo de IVA propuesto por defecto es 0. Este es el caso de asociaciones, particulares o algunas pequeñas sociedades.
 VATIsUsedExampleFR=En Francia, se trata de las sociedades u organismos que eligen un régimen fiscal general (General simplificado o General normal), régimen en el cual se declara el IVA.
 VATIsNotUsedExampleFR=En Francia, se trata de asociaciones exentas de IVA o sociedades, organismos o profesiones liberales que han elegido el régimen fiscal de módulos (IVA en franquicia), pagando un IVA en franquicia sin hacer declaración de IVA. Esta elección hace aparecer la anotación  "IVA no aplicable - art-293B del CGI" en las facturas.
-VATType=Tipo de impuesto
+VATType=Uso de impuestos
 ##### Local Taxes #####
 TypeOfSaleTaxes=Tipo de impuesto de venta
 LTRate=Tasa
@@ -1174,8 +1176,9 @@ NoLocalTaxXForThisCountry=Según la configuración de impuestos (Ver %s - %s - %
 LabelUsedByDefault=Etiqueta que se utilizará si no se encuentra traducción para este código
 LabelOnDocuments=Etiqueta sobre documentos
 LabelOrTranslationKey=Clave de traducción o cadena
-TranslationFound=Translation found
-TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
+LabelTranslatedInCurrentLanguage=Etiqueta traducida al idioma actual
+TranslationFound=Traducción encontrada
+TheTranslationIsSearchedFromKey=La traducción se busca a partir de la clave de traducción: <b>%s</b>
 TranslationKey=Clave de traducción
 ValueOfConstantKey=Valor de una constante de configuración
 ConstantIsOn=La opción %s está activada
@@ -1431,7 +1434,7 @@ AddVatInList=Muestra el número de IVA de cliente/proveedor en listas desplegabl
 AddAdressInList=Mostrar la dirección del cliente/proveedor en listas combinadas.<br>Los terceros aparecerán con el formato de nombre "The Big Company corp. - 21 jump street 123456 Big town - USA" en lugar de " La corporación de la gran empresa ".
 AddEmailPhoneTownInContactList=Muestra el correo electrónico del contacto (o los teléfonos si no están definidos) y la ciudad en listas combinadas.<br>Los contactos aparecerán con un formato de nombre de "Dupond Durand - dupond.durand@example.com - París " o "Dupond Durand - 06 07 59 65 66 - París" en lugar de "Dupond Durand".
 AskForPreferredShippingMethod=Consultar por el método preferido de envío a terceros.
-FieldEdition=Edición del campo %s
+FieldEdition=Modificación del campo %s
 FillThisOnlyIfRequired=Ejemplo: +2 (Complete sólo si se registra una desviación del tiempo en la exportación)
 GetBarCode=Obtener código de barras
 NumberingModules=Módulos de numeración
@@ -1458,7 +1461,7 @@ HRMSetup=Setup del módulo RRHH
 CompanySetup=Configuración del módulo terceros
 CompanyCodeChecker=Opciones para la generación automática de códigos de clientes/proveedores
 AccountCodeManager=Opciones para la generación automática de cuentas contables de clientes/proveedores.
-NotificationsDesc=Email notifications can be sent automatically on certain events.<br>Recipients of notifications can be defined:
+NotificationsDesc=Las notificaciones por correo electrónico se pueden enviar automáticamente en determinados eventos.<br>Los destinatarios de las notificaciones se pueden definir:
 NotificationsDescUser=* por usuario (en la pestaña "Notificaciones" de un usuario)
 NotificationsDescContact=* por contactos de terceros (en la pestaña "Notificaciones" de un tercero)
 NotificationsDescGlobal=* o configurando direcciones de correo electrónico globales (en la página de configuración del módulo).
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Forzar la fecha de factura a la fecha de validación
 SuggestedPaymentModesIfNotDefinedInInvoice=Forma de pago sugerida en la factura por defecto si no está definida en la factura
 SuggestPaymentByRIBOnAccount=Sugerir el pago por domiciliación en la cuenta
 SuggestPaymentByChequeToAddress=Sugerir el pago por cheque a
+InvoicePaymentManageStructuredCommunication=Generar comunicación estructurada para el pago de facturas
+InvoicePaymentManageStructuredCommunicationHelp=En algunos países, es necesario mostrar una referencia estructurada para facilitar los pagos y su conciliación.
 FreeLegalTextOnInvoices=Texto libre en facturas
 WatermarkOnDraftInvoices=Marca de agua en las facturas borrador (en caso de estar vacío)
 PaymentsNumberingModule=Numeración de modelos de pagos
@@ -1497,16 +1502,16 @@ InvoiceOptionCategoryOfOperations=Mostrar la mención "categoría de operaciones
 InvoiceOptionCategoryOfOperationsHelp=Dependiendo de la situación, la mención aparecerá en la forma: <br> - Categoría de operaciones: Entrega de bienes <br> - Categoría de operaciones: Prestación de servicios <br> - Categoría de operaciones: Mixtas - Entrega de bienes y prestación de servicios
 InvoiceOptionCategoryOfOperationsYes1=Sí, debajo del bloque de direcciones
 InvoiceOptionCategoryOfOperationsYes2=Sí, en la esquina inferior izquierda
-InvoiceClassifyBilledSupplierOrderWithoutInvoice=Disallow the classification of an order as billed without invoice.
-InvoiceClassifyBilledSupplierOrderWithoutInvoiceHelp=An order can be classified as billed by default. If this conf is set to true, it will be not.
+InvoiceClassifyBilledSupplierOrderWithoutInvoice=No permitir la clasificación de un pedido como facturado sin factura.
+InvoiceClassifyBilledSupplierOrderWithoutInvoiceHelp=Un pedido se puede clasificar como facturado de forma predeterminada. Si esta configuración se establece en verdadero, no lo será.
 ##### Supplier Orders #####
-SupplierOrderClassifyBilledWithoutInvoice=Disallow the classification of a purchase order as billed without invoice.
-SupplierOrderClassifyBilledWithoutInvoiceHelp=A supplier order can be classified as billed by default. If this conf is set to true, it will be not.
+SupplierOrderClassifyBilledWithoutInvoice=No permitir la clasificación de una orden de compra como facturada sin factura.
+SupplierOrderClassifyBilledWithoutInvoiceHelp=Un pedido de proveedor se puede clasificar como facturado de forma predeterminada. Si esta configuración se establece en verdadero, no lo será.
 ##### Proposals #####
 PropalSetup=Configuración del módulo Presupuestos
 ProposalsNumberingModules=Módulos de numeración de presupuestos
 ProposalsPDFModules=Modelos de documentos de presupuestos
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payment mode by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Modo de pago sugerido por defecto si no está definido en la propuesta
 FreeLegalTextOnProposal=Texto libre en presupuestos
 WatermarkOnDraftProposal=Marca de agua en presupuestos borrador (en caso de estar vacío)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto
@@ -1548,8 +1553,8 @@ MemberCodeChecker=Opciones para la generación automática de códigos de miembr
 AdherentLoginRequired=Administre un nombre de usuario/contraseña para cada miembro
 AdherentLoginRequiredDesc=Agregue un valor para un inicio de sesión y una contraseña en el archivo de miembros. Si el miembro está vinculado a un usuario, actualizar el inicio de sesión y la contraseña del miembro también actualizará el inicio de sesión y la contraseña del usuario.
 AdherentMailRequired=E-Mail obligatorio para crear un miembro nuevo
-MemberSendInformationByMailByDefault=The checkbox to send an email confirmation to members (validation or new subscription) is on by default
-MemberCreateAnExternalUserForSubscriptionValidated=Create automatically an external user (with a login to connect to the application) after an online payment of a membership subscription
+MemberSendInformationByMailByDefault=La casilla de verificación para enviar un correo electrónico de confirmación a los miembros (validación o nueva suscripción) está activada de forma predeterminada
+MemberCreateAnExternalUserForSubscriptionValidated=Crear automáticamente un usuario externo (con un login para conectarse a la aplicación) después de un pago en línea de una suscripción de membresía
 VisitorCanChooseItsPaymentMode=El visitante puede elegir entre cualquier modo de pago disponible
 MEMBER_REMINDER_EMAIL=Habilitar recordatorio de eventos <b>por e-mail</b> de suscripciones expiradas. Nota: El módulo <strong>%s</strong> debe estar habilitado y configurado correctamente para que el recordatorio se envíe.
 MembersDocModules=Plantillas de documentos para documentos generados a partir de registros de miembros
@@ -1718,6 +1723,7 @@ CompressionOfResources=Compresión de las respuestas HTTP
 CompressionOfResourcesDesc=Por ejemplo, utilizando la directiva Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=La detección automática no es posible con el navegador actual
 DefaultValuesDesc=Puede definir/forzar aquí el valor predeterminado que desea obtener cuando cree un nuevo registro y/o defina filtros u ordenaciones en sus registros de listados.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Valores por defecto (para usar en formularios)
 DefaultSearchFilters=Filtros de búsqueda por defecto
 DefaultSortOrder=Ordenaciones por defecto
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Módulos de numeración de notas de entrega
 SendingsAbility=Soporte de hojas de envío para entregas a clientes
 NoNeedForDeliveryReceipts=En la mayoría de los casos, las notas de entrega (lista de productos enviados) también actúan como notas de recepción y son firmadas por el cliente. La gestión de las notas de recepción es por lo tanto redundante y rara vez se activará.
 FreeLegalTextOnShippings=Texto libre en envíos
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Módulos de numeración de las notas de recepción
 DeliveryOrderModel=Modelo de notas de recepción
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Texto libre en las notas de recepción
 ##### FCKeditor #####
 AdvancedEditor=Editor avanzado
 ActivateFCKeditor=Activar editor avanzado para :
-FCKeditorForNotePublic=Creación/edición WYSIWYG del campo "notas públicas" de elementos
-FCKeditorForNotePrivate=Creación/edición WYSIWYG del campo "notas privadas" de elementos
-FCKeditorForCompany=Creación/edición WYSIWYG del campo descripción de elementos (excepto productos/servicios)
-FCKeditorForProductDetails=Creación/edición WYSIWYG de descripción de productos o líneas para objetos (líneas de propuestas, pedidos, facturas, etc...).
+FCKeditorForNotePublic=Creación/modificación WYSIWYG del campo “notas públicas” de elementos
+FCKeditorForNotePrivate=Creación/modificación WYSIWYG del campo “notas privadas” de elementos
+FCKeditorForCompany=Creación/modificación WYSIWYG de la descripción de campos de elementos (excepto productos/servicios)
+FCKeditorForProductDetails=Creación/modificación WYSIWYG de descripciones de productos o líneas de objetos (líneas de propuestas, pedidos, facturas, etc...).
 FCKeditorForProductDetails2=Advertencia: No se recomienda seriamente utilizar esta opción para este caso, ya que puede crear problemas con los caracteres especiales y el formato de página al crear archivos PDF.
-FCKeditorForMailing= Creación/edición WYSIWYG para correos electrónicos masivos (Herramientas->eMailing)
-FCKeditorForUserSignature=Creación/edición WYSIWYG de firma de usuario
-FCKeditorForMail=Creación/edición WYSIWYG para todo el correo (excepto Herramientas->eMailing)
-FCKeditorForTicket=Creación/edición WYSIWYG para entradas
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=Creación/modificación WYSIWYG de la firma del usuario
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=Creación/modificación WYSIWYG de tickets
 ##### Stock #####
 StockSetup=Configuración del módulo Almacenes
 IfYouUsePointOfSaleCheckModule=Si utiliza un módulo de Punto de Venta (módulo TPV por defecto u otro módulo externo), esta configuración puede ser ignorada por su módulo de Punto de Venta. La mayor parte de módulos TPV están diseñados para crear inmediatamente una factura y decrementar stocks cualquiera que sean estas opciones. Por lo tanto, si usted necesita o no decrementar stocks  en el registro de una venta de su punto de venta, controle también la configuración de su módulo TPV.
@@ -1867,7 +1874,6 @@ Buy=Compra
 Sell=Venta
 InvoiceDateUsed=Fecha usada de factura
 YourCompanyDoesNotUseVAT=Su empresa está configurada como no sujeta al IVA (Inicio - Configuración - Empresa/Institución), por lo que no hay opción para la paremetrización del IVA.
-AccountancyCode=Código contable
 AccountancyCodeSell=Código contable ventas
 AccountancyCodeBuy=Código contable compras
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mantenga la casilla de verificación "Crear el pago automáticamente" vacía de forma predeterminada al crear un nuevo impuesto.
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Establecer la vista por defecto al seleccionar el menú Ag
 AGENDA_EVENT_PAST_COLOR = Color de eventos pasados
 AGENDA_EVENT_CURRENT_COLOR = Color del evento actual
 AGENDA_EVENT_FUTURE_COLOR = Color de evento futuro
-AGENDA_REMINDER_BROWSER = Habilitar el recordatorio de eventos <b> en el navegador del usuario </b> (Cuando se alcanza la fecha de recordatorio, el navegador muestra una ventana emergente. Cada usuario puede deshabilitar dichas notificaciones desde la configuración de notificaciones del navegador).
+AGENDA_REMINDER_BROWSER = Permitir recordatorios de eventos <b>en el navegador del usuario</b>
+AGENDA_REMINDER_BROWSERHelp = Cuando se alcanza la fecha de recordatorio, el navegador muestra una ventana emergente. La opción/retraso del recordatorio lo define el usuario al crear el evento.
 AGENDA_REMINDER_BROWSER_SOUND = Activar sonido de notificación
-AGENDA_REMINDER_EMAIL = Habilitar el recordatorio de eventos <b> por correo electrónico </b> (la opción de recordatorio/retraso se puede definir en cada evento).
+AGENDA_REMINDER_EMAIL = Permitir recordatorios de eventos <b>por correo electrónico</b>
 AGENDA_REMINDER_EMAIL_NOTE = Nota: La frecuencia del trabajo programado %s debe ser suficiente para asegurarse de que el recordatorio se envíe en el momento correcto.
 AGENDA_SHOW_LINKED_OBJECT = Mostrar el link en la agenda
 AGENDA_USE_EVENT_TYPE = Usar tipos de evento (gestionados en el menú Configuración->Diccionarios->Tipos de eventos de la agenda)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Establecer automáticamente este valor por defecto para el tipo de evento en la creación de un evento
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Utilice el recordatorio predeterminado en estos eventos
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = El formulario de notificación de recordatorio automático se completará de forma predeterminada al crear el evento.
+AGENDA_DEFAULT_REMINDER_OFFSET = Período de recordatorio predeterminado antes del evento
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Plantilla de correo electrónico para usar como recordatorio predeterminado
 PasswordTogetVCalExport = Clave de autorización vcal export link
 PastDelayVCalExport=No exportar los eventos de más de
 SecurityKey = Clave de seguridad
@@ -1974,7 +1985,7 @@ DeleteFiscalYear=Eliminar año fiscal
 ConfirmDeleteFiscalYear=¿Está seguro de querer eliminar este año fiscal?
 ShowFiscalYear=Ver periodo contable
 ##### Assets #####
-AssetNumberingModules=Assets numbering module
+AssetNumberingModules=Módulo de numeración de activos
 AlwaysEditable=Puede editarse siempre
 MAIN_APPLICATION_TITLE=Forzar visibilidad del nombre de aplicación (advertencia: indicar su propio nombre aquí puede romper la característica de relleno automático de inicio de sesión al utilizar la aplicación móvil DoliDroid)
 NbMajMin=Número mínimo de caracteres en mayúsculas
@@ -1994,10 +2005,10 @@ ExpenseReportsRulesSetup=Configuración del módulo Informes de gastos - Reglas
 ExpenseReportNumberingModules=Módulo de numeración de informes de gastos
 NoModueToManageStockIncrease=No hay activado módulo para gestionar automáticamente el incremento de stock. El incremento de stock se realizará solamente con entrada manual
 YouMayFindNotificationsFeaturesIntoModuleNotification=Puede encontrar opciones para notificaciones de e-mail activando y configurando el módulo  "Notificaciones".
-TemplatesForNotifications=Emails templates for notifications
+TemplatesForNotifications=Plantillas de correos electrónicos para notificaciones
 ListOfNotificationsPerUser=Listado de notificaciones automáticas por usuario*
 ListOfNotificationsPerUserOrContact=Listado de posibles notificaciones automáticas (eventos) por usuario* o por contacto**
-ListOfFixedNotifications=Global recipients emails for automatic email notifications
+ListOfFixedNotifications=Correos electrónicos de destinatarios globales para notificaciones automáticas por correo electrónico
 GoOntoUserCardToAddMore=Vaya a la pestaña "Notificaciones" de un usuario para añadir o elliminar notificaciones a usuarios
 GoOntoContactCardToAddMore=Vaya a la pestaña "Notificaciones" de un contacto de tercero para añadir o eliminar notificaciones para contactos/direcciones
 Threshold=Valor mínimo/umbral
@@ -2006,7 +2017,7 @@ BackupZipWizard=Asistente para construir el directorio de archivo de documentos
 SomethingMakeInstallFromWebNotPossible=No es posible la instalación de módulos externos desde la interfaz web por la siguiente razón:
 SomethingMakeInstallFromWebNotPossible2=Por esta razón, explicaremos aquí los pasos del proceso de actualización manual que puede realizar un usuario con privilegios.
 InstallModuleFromWebHasBeenDisabledContactUs=La instalación o desarrollo de módulos externos o sitios web dinámicos, desde la aplicación, está actualmente bloqueada por motivos de seguridad. Póngase en contacto con nosotros si necesita habilitar esta función.
-InstallModuleFromWebHasBeenDisabledByFile=La instalación de módulos externos desde la aplicación se encuentra desactivada por el administrador. Debe requerirle que elimine el archivo <strong>%s</strong> para habilitar esta funcionalidad.
+InstallModuleFromWebHasBeenDisabledByFile=El administrador ha deshabilitado la instalación de módulos externos desde la aplicación y el uso de funciones que permiten ejecutar código en el servidor. Debe solicitarle que elimine el archivo <strong>%s</strong> para permitir esta función.
 ConfFileMustContainCustom=La instalación o construcción de un módulo externo desde la aplicación necesita guardar los archivos del módulo en el directorio <strong>%s</strong>. Para que este directorio sea procesado por Dolibarr, debe configurar su <strong>conf/conf.php</strong> para agregar las 2 líneas de directiva: <br><strong>$dolibarr_main_url_root_alt = '/custom';</strong><br><strong> $dolibarr_main_document_root_alt = '%s/custom';</strong>
 HighlightLinesOnMouseHover=Resaltar líneas de los listados cuando el ratón pasa por encima de ellas
 HighlightLinesColor=Resalta el color de la línea cuando el ratón pasa por encima (usar 'ffffff' para no resaltar)
@@ -2033,9 +2044,10 @@ MinimumNoticePeriod=Período mínimo de notificación (Su solicitud de licencia
 NbAddedAutomatically=Número de días adicionales que se añaden automáticamente a los contadores de usuarios cada mes
 EnterAnyCode=Este campo contiene una referencia para identificar la línea. Ingrese cualquier valor de su elección, pero sin caracteres especiales.
 Enter0or1=Introduzca 0 ó 1
-EnterYesOrNo=Enter Yes or No
+EnterYesOrNo=Ingrese Sí o No
 UnicodeCurrency=Ingrese aquí entre llaves, lista con número de byte que representa el símbolo de moneda. Por ejemplo: para $, introduzca [36] - para Brasil Real R$ [82,36] - para €, introduzca [8364]
 ColorFormat=El color RGB es en formato HEX, ej: FF0000
+NumberFormatForATotalPrice=Formato numérico para el precio total %s
 PictoHelp=Nombre del icono en formato:<br>- image.png para un archivo de imagen en el directorio del tema actual<br>- image.png@module si el archivo está en el directorio /img/ de un módulo<br>- fa-xxx para un picto FontAwesome fa-xxx<br>- fontawesome_xxx_fa_color_size para un picto FontAwesome fa-xxx (con prefijo, color y tamaño configurados)
 PositionIntoComboList=Posición de la línea en listas de combo
 SellTaxRate=Tasa de IVA
@@ -2115,7 +2127,7 @@ BaseCurrency=Moneda de referencia de la empresa (entrar en la configuración de
 WarningNoteModuleInvoiceForFrenchLaw=Este módulo %s cumple con las leyes francesas (Loi Finance 2016).
 WarningNoteModulePOSForFrenchLaw=Este módulo %s cumple con las leyes francesas (Loi Finance 2016) porque el módulo Non Reversible Logs se activa automáticamente.
 WarningInstallationMayBecomeNotCompliantWithLaw=Intenta instalar el módulo %s, que es un módulo externo. Activar un módulo externo significa que confía en el editor del módulo, que está seguro de que este módulo no altera negativamente el comportamiento de su aplicación y que es compatible con las leyes de su país (%s). Si el módulo trae una característica no legal, usted se hace responsable del uso de un software no legal.
-WarningExperimentalFeatureInvoiceSituationNeedToUpgradeToProgressiveMode=If you are using the experimental mode for situation invoices, you will need to update your data to switch from the experimental mode to the official mode. You can contact a partner to help you with this task. A list of preferred partners is available by following <a href="%s" target="_blank">this link</a>
+WarningExperimentalFeatureInvoiceSituationNeedToUpgradeToProgressiveMode=Si utiliza el modo experimental para facturas de situación, deberá actualizar sus datos para cambiar del modo experimental al modo oficial. Puede ponerse en contacto con un socio para que le ayude con esta tarea. Puede consultar una lista de socios preferidos en <a href="%s" target="_blank">este enlace</a>
 MAIN_PDF_MARGIN_LEFT=Margen izquierdo en PDF
 MAIN_PDF_MARGIN_RIGHT=Margen derecho en PDF
 MAIN_PDF_MARGIN_TOP=Margen superior en PDF
@@ -2127,11 +2139,16 @@ MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Ancho de la columna si se añade una imagen en
 MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Ocultar la columna de precio unitario en las solicitudes de cotización
 MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Ocultar la columna de precio total en las solicitudes de cotización
 MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Ocultar la columna de precio unitario en las órdenes de compra
-MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Ocultar la columna de precio total en las órdenes de compra
 MAIN_PDF_NO_SENDER_FRAME=Ocultar bordes en el marco de la dirección del emisor
 MAIN_PDF_NO_RECIPENT_FRAME=Ocultar bordes en el marco de la dirección del destinatario
 MAIN_PDF_HIDE_CUSTOMER_CODE=Ocultar código de cliente
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Ocultar el código de contabilidad del cliente
 MAIN_PDF_HIDE_SENDER_NAME=Ocultar el nombre del emisor/empresa en el bloque de direcciones
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Ocultar condiciones de pago
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Ocultar modo de pago
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Agregue un marcado oculto en el área de firma para permitir que la herramienta de firma electrónica lo reutilice. Puede ser utilizado por herramientas externas o, en el futuro, por la función de firma en línea.
@@ -2146,7 +2163,7 @@ COMPANY_DIGITARIA_CLEAN_REGEX=Filtro de expresiones regulares para limpiar el va
 DuplicateForbidden=Duplicado prohibido
 RemoveSpecialWords=Limpiar ciertas palabras al generar subcuentas para clientes o proveedores
 RemoveSpecialWordsHelp=Especifique las palabras que se limpiarán antes de calcular la cuenta del cliente o proveedor. Utilizar una ";" entre cada palabra
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact, ...)
+GDPRContact=Delegado de Protección de Datos (DPD, contacto Privacidad de Datos o RGPD, ...)
 GDPRContactDesc=Si almacena datos personales en su Sistema de Información, puede nombrar al contacto responsable del Reglamento General de Protección de Datos aquí
 HelpOnTooltip=Texto de ayuda a mostrar en la ventana emergente
 HelpOnTooltipDesc=Coloque aquí un texto o una clave de traducción para mostrar información emergente cuando este campo aparezca en un formulario
@@ -2219,7 +2236,7 @@ CreateCandidature=Crear solicitud de empleo
 FormatZip=Código postal
 MainMenuCode=Código de entrada del menú (menú principal)
 ECMAutoTree=Mostrar arbol automático GED
-OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a string from email header, subject or body into a temporary variable:<br>tmp_var1=EXTRACT:HEADER:My regex ([^\n]*)<br>tmp_var2=EXTRACT:SUBJECT:My refex ([^\n]*)<br>tmp_var3=EXTRACT:BODY:My regex ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a new line to extract or set several properties.
+OperationParamDesc=Define las reglas que se utilizarán para extraer algunos datos o establecer valores que se utilizarán para la operación.<br><br>Ejemplo para extraer una cadena del encabezado, asunto o cuerpo del correo electrónico en una variable temporal:<br>tmp_var1=EXTRACT:HEADER:My regex ([^\n]*)<br>tmp_var2=EXTRACT:SUBJECT:My refex ([^\n]*)<br>tmp_var3=EXTRACT:BODY:My regex ([^\n]*)<br><br>Ejemplos para configurar las propiedades de un objeto a crear:<br>objproperty1=SET:un valor codificado de forma rígida<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:un valor (el valor se configura solo si la propiedad aún no está definida)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Utilice una nueva línea para extraer o establecer varias propiedades.
 OpeningHours=Horario de apertura
 OpeningHoursDesc=Teclea el horario normal de apertura de tu compañía.
 ResourceSetup=Configuración del módulo Recursos
@@ -2249,7 +2266,7 @@ GeneralOptions=Opciones generales
 LogsLinesNumber=Número de líneas a mostrar en la pestaña de registros
 UseDebugBar=Usa la barra de debug
 DEBUGBAR_LOGS_LINES_NUMBER=Número de últimas líneas de registro para mantener en la consola.
-WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatically output
+WarningValueHigherSlowsDramaticalyOutput=Advertencia: los valores más altos reducen drásticamente la producción.
 ModuleActivated=El módulo %s está activado y ralentiza dramáticamente la interfaz
 ModuleActivatedWithTooHighLogLevel=El módulo %s está activado con un nivel de registro demasiado alto (intente utilizar un nivel más bajo para mejorar el rendimiento y la seguridad)
 ModuleSyslogActivatedButLevelNotTooVerbose=El módulo %s está activado y el nivel de registro (%s) es correcto (no demasiado detallado)
@@ -2265,7 +2282,7 @@ LargerThan=Mayor que
 IfTrackingIDFoundEventWillBeLinked=Tenga en cuenta que si se encuentra un ID de seguimiento de un objeto en un correo electrónico, o si el correo electrónico es una respuesta de un correo electrónico ya recopilado y vinculado a un objeto, el evento creado se vinculará automáticamente al objeto relacionado conocido.
 WithGMailYouCanCreateADedicatedPassword=Con una cuenta de GMail, si habilitó la validación de 2 pasos, se recomienda crear una segunda contraseña dedicada para la aplicación en lugar de usar la contraseña de su propia cuenta de https://myaccount.google.com/.
 EmailCollectorTargetDir=Puede ser un comportamiento deseado mover el correo electrónico a otra etiqueta/directorio cuando se procesó exitosamente. Simplemente configure el nombre del directorio aquí para usar esta función (NO use caracteres especiales en el nombre). Tenga en cuenta que también debe utilizar una cuenta de inicio de sesión de lectura/escritura.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing third party in your database (search will be done on the defined property among 'id','name','name_alias','email'). The found (or created) third party will be used for following actions that need it.<br>For example, if you want to create a third party with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=EXTRACT:HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+EmailCollectorLoadThirdPartyHelp=Puede utilizar esta acción para utilizar el contenido del correo electrónico para buscar y cargar un tercero existente en su base de datos (la búsqueda se realizará en la propiedad definida entre 'id', 'name', 'name_alias', 'email'). El tercero encontrado (o creado) se utilizará para las siguientes acciones que lo necesiten.<br>Por ejemplo, si desea crear un tercero con un nombre extraído de una cadena 'Name: name to find' presente en el cuerpo, use el correo electrónico del remitente como correo electrónico, puede configurar el campo de parámetro de esta manera:<br>'email=EXTRACT:HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 FilterSearchImapHelp=Advertencia: muchos servidores de correo electrónico (como Gmail) realizan búsquedas de palabras completas cuando buscan en una cadena y no devolverán un resultado si la cadena solo se encuentra parcialmente en una palabra. También por este motivo, se ignorará el uso de caracteres especiales en un criterio de búsqueda si no forman parte de palabras existentes. <br> Para realizar una búsqueda de exclusión en una palabra (devolver el correo electrónico si no se encuentra la palabra), puede usar el ! carácter antes de la palabra (es posible que no funcione en algunos servidores de correo).
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Eliminar el recolector de e-mail
@@ -2273,14 +2290,14 @@ ConfirmDeleteEmailCollector=¿Está seguro de que querer eliminar este recolecto
 RecipientEmailsWillBeReplacedWithThisValue=Los e-mails del destinatario siempre serán reemplazados por este valor
 AtLeastOneDefaultBankAccountMandatory=Se debe definir al menos una cuenta bancaria predeterminada
 RESTRICT_ON_IP=Permita el acceso a la API solo a ciertas direcciones IP de clientes (comodín no permitido, use espacio entre valores). Vacío significa que todos los clientes pueden acceder.
-StaticIPsOfUsers=If applicable, list of all static IPs of users
+StaticIPsOfUsers=Si corresponde, lista de todas las IP estáticas de los usuarios
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Basado en la versión de la biblioteca SabreDAV
 NotAPublicIp=No es una IP pública
 MakeAnonymousPing=Realice un Ping anónimo '+1' al servidor de la base Dolibarr (realizado 1 vez tras la instalación) para permitir que la base cuente la cantidad de instalación de Dolibarr.
 FeatureNotAvailableWithReceptionModule=Función no disponible cuando el módulo Recepción está activado
 EmailTemplate=Plantilla para e-mail
-EmailTemplateHelp=You can create emails templates from menu %s - %s
+EmailTemplateHelp=Puede crear plantillas de correo electrónico desde el menú %s - %s
 EMailsWillHaveMessageID=Los correos electrónicos tendrán un encabezado 'ID de mensaje' que coincidirá con esta sintaxis
 PDF_SHOW_PROJECT=Mostrar proyecto en documento
 ShowProjectLabel=Etiqueta del proyecto
@@ -2289,7 +2306,7 @@ THIRDPARTY_ALIAS=Nombre de terceros: alias de terceros
 ALIAS_THIRDPARTY=Alias de terceros: nombre de terceros
 PDFIn2Languages=Mostrar etiquetas en el PDF en 2 idiomas diferentes (es posible que esta función no funcione para algunos idiomas)
 PDF_USE_ALSO_LANGUAGE_CODE=Si desea duplicar algunos textos en su PDF en 2 idiomas diferentes en el mismo PDF generado, debe establecer aquí este segundo idioma para que el PDF generado contenga 2 idiomas diferentes en la misma página, el elegido al generar el PDF y este ( solo unas pocas plantillas PDF lo admiten). Mantener vacío para 1 idioma por PDF.
-PDF_USE_A=PDF documents format
+PDF_USE_A=Formato de documentos PDF
 FafaIconSocialNetworksDesc=Ingrese aquí el código de un ícono FontAwesome. Si no sabe qué es FontAwesome, puede usar el valor genérico fa-address-book.
 RssNote=Nota: Cada definición de fuente RSS proporciona un widget que debe habilitar para que esté disponible en el tablero
 JumpToBoxes=Vaya a Configuración -> Módulos
@@ -2324,6 +2341,8 @@ NotRecommended=No recomendado
 ARestrictedPath=Algunas rutas restringidas para archivos de datos
 CheckForModuleUpdate=Compruebe si hay actualizaciones de módulos externos
 CheckForModuleUpdateHelp=Esta acción se conectará a los editores de módulos externos para comprobar si hay una nueva versión disponible.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Hay una actualización disponible
 NoExternalModuleWithUpdate=No se encontraron actualizaciones para módulos externos
 SwaggerDescriptionFile=Archivo de descripción de la API de Swagger (para usar con redoc, por ejemplo)
@@ -2395,8 +2414,10 @@ INVOICE_ADD_EPC_QR_CODE=Mostrar el código QR EPC en las facturas (con una cuent
 INVOICE_ADD_EPC_QR_CODEMore=Esta función le permite agregar o eliminar un código QR EPC en sus facturas, lo que facilita las transferencias de crédito SEPA automáticas. Habilitar esta opción ayuda a sus clientes a realizar pagos fácilmente escaneando el código QR, lo que reduce los errores de entrada manual. Utilice esta función si tiene clientes en países como Austria, Bélgica, Finlandia, Alemania y los Países Bajos donde se admite este sistema. Deshabilítelo si no es necesario para sus operaciones comerciales o su base de clientes.
 INVOICE_SHOW_SHIPPING_ADDRESS=Mostrar dirección de envío
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Indicación obligatoria en algunos países (Francia, ...)
-SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
-SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Mostrar contacto de facturación en la propuesta
+SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=Por defecto el contacto solo aparece para facturación
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Enlace URL de la red social. Use {socialid} para la parte variable que contiene la identificación de la red social.
 IfThisCategoryIsChildOfAnother=Si esta categoría es hija de otra
 DarkThemeMode=Modo de tema oscuro
@@ -2430,7 +2451,7 @@ CssOnEdit=CSS en páginas de edición
 CssOnView=CSS en las páginas de visualización
 CssOnList=CSS en listas
 HelpCssOnEditDesc=El CSS utilizado al editar el campo. <br> Ejemplo: "minwidth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The CSS used when viewing the field.<br>Example: "longmessagecut"
+HelpCssOnViewDesc=El CSS utilizado al visualizar el campo.<br>Ejemplo: "longmessagecut"
 HelpCssOnListDesc=El CSS utilizado cuando el campo está dentro de una tabla de lista. <br> Ejemplo: "tdoverflowmax200"
 RECEPTION_PDF_HIDE_ORDERED=Ocultar la cantidad pedida en los documentos generados para recepciones
 MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Mostrar el precio en los documentos generados para recepciones
@@ -2442,7 +2463,7 @@ DesktopsAndSmartphones=Ordenadores de escritorio y teléfonos inteligentes
 AllowOnlineSign=Permitir la firma en línea
 AllowExternalDownload=Permitir descarga externa (sin inicio de sesión, usando un enlace compartido)
 DeadlineDayVATSubmission=Fecha límite para la presentación de IVA en el próximo mes
-MaxNumberOfAttachementOnForms=Max number of joined files in a form
+MaxNumberOfAttachementOnForms=Número máximo de archivos unidos en un formulario
 IfDefinedUseAValueBeetween=Si está definido, use un valor entre %s y %s
 Reload=Recargar
 ConfirmReload=Confirmar recarga de módulo
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Atención: el módulo %s tiene
 WarningModuleHasChangedSecurityCsrfParameter=Advertencia: el módulo %s ha deshabilitado la seguridad CSRF de su instancia. Esta acción es sospechosa y es posible que su instalación ya no esté protegida. Póngase en contacto con el autor del módulo para obtener una explicación.
 EMailsInGoingDesc=Los correos electrónicos entrantes son administrados por el módulo %s. Debe habilitarlo y configurarlo si necesita admitir correos electrónicos entrantes.
 MAIN_IMAP_USE_PHPIMAP=Utilice la biblioteca PHP-IMAP para IMAP en lugar de PHP IMAP nativo. Esto también permite el uso de una conexión OAuth2 para IMAP (también se debe activar el módulo OAuth).
-MAIN_CHECKBOX_LEFT_COLUMN=Mostrar la columna para la selección de campos y líneas a la izquierda (a la derecha de forma predeterminada)
+MAIN_CHECKBOX_LEFT_COLUMN=Mostrar la columna para la selección de campos y líneas a la izquierda (a la derecha está deshabilitada)
 NotAvailableByDefaultEnabledOnModuleActivation=No creado por defecto. Creado solo en la activación del módulo.
 CSSPage=Estilo CSS
 Defaultfortype=Predeterminado
@@ -2488,19 +2509,20 @@ CustomPrompt=Avisos personalizados
 AiDescription=Funciones de IA (Inteligencia Artificial)
 AiDescriptionLong=Proporciona funciones de IA (Inteligencia Artificial) en diferentes partes de la aplicación. Necesita API de IA externa.
 AI_API_KEY=Clave para la API de IA
-AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Servicio a utilizar para funciones de IA
+AI_API_URL=URL de punto final para la API de IA
+AI_API_SERVICE=AI service to use
 AiSetup=Configuración del módulo de IA
 AiCustomPrompt=Aviso personalizado de IA
 AI_CONFIGURATIONS_PROMPT=Mensaje personalizado
 TextGeneration=Generación de texto
 ImageGeneration=Generación de imágenes
 VideoGeneration=Generación de vídeo
-AudioGeneration=Audio generation
+AudioGeneration=Generación de audio
 AIPromptForFeatures=Avisos personalizados de IA para funciones
 EnterAnIP=Introduzca una dirección IP
 ConvertInto=Convertir en
 YouAreHere=Usted está aquí
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Mostrar el código de barras en el documento PDF de envío
 BARCODE_ON_RECEPTION_PDF=Mostrar el código de barras en el documento PDF de recepción
 BARCODE_ON_STOCKTRANSFER_PDF=Mostrar el código de barras en el documento PDF de transferencia de acciones
@@ -2517,13 +2539,13 @@ SendToUrl=Enviar a URL
 WebsiteTemplateWasCopied=Las plantillas de sitio web "%s" proporcionadas por este módulo se han guardado en el directorio de plantillas de sitios web (/doctemplates/websites) y están listas para importarse como una nuevo sitio web.
 EnabledByDefaultAtInstall=Habilitado de forma predeterminada durante la instalación.
 VulnerableToRCEAttack=Eres vulnerable a ataques RCE al utilizar la función personalizada dol_json_decode
-OpenIDconnectSetup=Configuration of the OpenID Connect module
-MainAuthenticationOidcClientIdName=Client ID
-MainAuthenticationOidcClientIdDesc=OpenID Connect Client ID
-MainAuthenticationOidcClientSecretName=Client secret
-MainAuthenticationOidcClientSecretDesc=OpenID Connect Client Secret
+OpenIDconnectSetup=Configuración del módulo OpenID Connect
+MainAuthenticationOidcClientIdName=Identificación del cliente
+MainAuthenticationOidcClientIdDesc=Identificación del cliente de OpenID Connect
+MainAuthenticationOidcClientSecretName=Secreto del cliente
+MainAuthenticationOidcClientSecretDesc=Secreto del cliente de OpenID Connect
 MainAuthenticationOidcScopesName=Ámbitos
-MainAuthenticationOidcScopesDesc=OpenID scopes to allow access to user information
+MainAuthenticationOidcScopesDesc=Ámbitos OpenID para permitir el acceso a la información del usuario
 MainAuthenticationOidcAuthorizeUrlName=Autorizar URL
 MainAuthenticationOidcAuthorizeUrlDesc=(ejemplo: https://example.com/oauth2/authorize)
 MainAuthenticationOidcTokenUrlName=URL del token
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=URL de cierre de sesión de Dolibarr
 MainAuthenticationOidcLoginClaimName=Reclarmar Inicio sesión
 MainAuthenticationOidcLoginClaimDesc=Reclamo de OpenID Connect que coincide con el inicio de sesión del usuario de Dolibarr. Si no se configura o está vacío, el valor predeterminado es el correo electrónico
 BlackListWords=Lista negra de palabras
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Añadir a la lista negra
 FediverseSetup=Configuración de la sección fediverse
 ConfigImportSocialNetwork=Configuración de redes sociales compatibles con Fediverse
@@ -2550,11 +2576,34 @@ ConfirmDeleteSocialNetwork= ¿Estás seguro que deseas eliminar este registro?
 AnOwnerMustBeSetIfEmailTemplateIsPrivate=Se debe configurar un propietario si la plantilla de correo electrónico se configura como privada
 ContactsDefaultRoles=Para terceros del tipo "particular", se puede crear un contacto de forma simultánea. Defina aquí los roles que se asignarán sistemáticamente a este contacto.
 MenuDict=Diccionario
-AddMoreParams=Add more parameters for connection (cookies, tokens, ...)<br> Example: token : value token
+AddMoreParams=Añadir más parámetros para la conexión (cookies, tokens, ...)<br> Ejemplo: token : valor token
 ParamName=Nombre del parámetro
 ParamValue=Valor del parámetro
-ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
-HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+ConfirmDeleteParamOfSocialNetwork=¿Está seguro de que desea eliminar este parámetro?
+HelpMariaDBToGetPossibleValues=Puede obtener una lista de valores posibles ejecutando el siguiente comando SQL: %s
+HelpMariaDBToGetValue=Este valor se recuperó con el comando: %s
+PDFBoxFrameRoundedCorners=Marcos con esquinas redondeadas
+MAIN_PDF_FRAME_CORNER_RADIUS=El valor predeterminado para el radio de las esquinas es 0, por lo que no se permiten esquinas redondeadas. Elija valores entre 1 y 3 para aumentar el radio de las esquinas y agregar esquinas redondeadas a los marcos.
 Captcha=Captcha
-CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
-DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+CaptchaDesc=Si desea proteger su página de inicio de sesión con un Captcha, puede elegir cuál usar aquí
+DolibarrStandardCaptcha=Un captcha nativo generado por Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Mostrar dirección de envío
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Indicación obligatoria en algunos países (Francia, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=Tienes un tamaño máximo predeterminado para las listas establecido en <b>%s</b> líneas. Este es un valor grande que requiere que te desplaces para ver todas las respuestas. Es mejor tener un valor menor que <b>%s</b> y usar la paginación para ver registros que superen este número. Cambia esto en el menú Inicio - Configuración - Pantalla.
+RoundBorders=Bordes redondos
+CheckIfModuleIsNotBlackListed=Bloquear la instalación de módulos que se encuentran en la <b>lista negra remota</b>
+CheckIfModuleIsNotBlackListedHelp=Algunos módulos pueden ser proporcionados por algunas empresas que no respetan las reglas de buena voluntad del proyecto (incumplimiento del RGPD, violación de las reglas de uso de la marca Dolibarr, etc.). Al marcar esta casilla, se realizará una solicitud al servidor del proyecto para ver si se recibió un informe sobre este módulo y lo protegerá bloqueando la implementación de módulos marcados
+DatabaseEncryption=Cifrado en base de datos
+AlgorithmFor=Algoritmo para: %s
+SensitiveData=Datos sensibles
+ToolToDecryptAString=Herramienta para descifrar una cadena
+Decrypt=Descifrar
+FilesIntegrityDesc=Si desea comprobar la integridad de los archivos en lugar de la base de datos, puede hacerlo utilizando <a href="%s">esta herramienta</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=Hay más de %s respuestas con tu filtro. Agrega más filtros...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index 9c093beb12c..8222eb6ec6d 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Saldo final
 CurrentBalance=Saldo actual
 FutureBalance=Saldo previsto
 ShowAllTimeBalance=Mostar balance desde principio
-AllTime=Mostrar saldo desde el inicio
 Reconciliation=Conciliación
 RIB=Cuenta bancaria
 IBAN=Identificador IBAN
@@ -101,8 +100,8 @@ Conciliated=Reconciliado
 ReConciliedBy=Conciliado por
 DateConciliating=Fecha conciliación
 BankLineConciliated=Registro conciliado con recibo bancario
-TransfertOnlyConciliatedBankLine=Transfer only reconciled lines from bank
-TransfertAllBankLines=Transfer all lines from bank even if they are not reconciled
+TransfertOnlyConciliatedBankLine=Transferir únicamente líneas conciliadas del banco
+TransfertAllBankLines=Transferir todas las líneas del banco incluso si no están conciliadas
 BankLineReconciled=Reconciliado
 BankLineNotReconciled=No reconciliado
 CustomerInvoicePayment=Cobro a cliente
@@ -133,7 +132,7 @@ DeleteTransaction=Eliminar registro
 ConfirmDeleteTransaction=¿Está seguro de querer eliminar este registro?
 ThisWillAlsoDeleteBankRecord=Esto también eliminará el registro bancario
 BankMovements=Movimientos
-PlannedTransactions=Registros previstos
+PlannedTransactions=Upcoming entries
 Graph=Gráficos
 ExportDataset_banque_1=Registros bancarios y extractos
 ExportDataset_banque_2=Justificante bancario
@@ -151,8 +150,8 @@ FutureTransaction=Transacción futura. No es posible conciliar.
 SelectChequeTransactionAndGenerate=Seleccione/filtre los cheques que se incluirán en el recibo de depósito de cheques. Luego, haga clic en "Crear".
 SelectPaymentTransactionAndGenerate=Seleccionar/filtrar los documentos que se van a incluir en el recibo de depósito %s. Luego, haga clic en "Crear".
 InputReceiptNumber=Elija el extracto bancario relacionado con la conciliación. Usar un valor numérico ordenable
-InputReceiptNumberBis=YYYYMM o YYYYMMDD
-EventualyAddCategory=Optionally, a category in which to classify the operations
+InputReceiptNumberBis=YYYYMM
+EventualyAddCategory=Opcionalmente, una categoría en la que clasificar las operaciones.
 ToConciliate=¿A conciliar?
 ThenCheckLinesAndConciliate=A continuación, compruebe las líneas presentes en el extracto bancario y haga clic
 DefaultRIB=Cuenta bancaria por defecto
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Si esta función está activada, puede elegir un color
 BankColorizeMovementName1=Color de fondo para el movimiento de débito
 BankColorizeMovementName2=Color de fondo para el movimiento de crédito
 IfYouDontReconcileDisableProperty=Si no realiza las conciliaciones bancarias en algunas cuentas bancarias, desactive la propiedad "%s" en ellas para eliminar esta advertencia.
-NoBankAccountDefined=Sin cuenta bancaria definida
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=No se encontró ningún registro en la cuenta bancaria. Por lo general, esto ocurre cuando un registro se ha eliminado manualmente de la lista de transacciones en la cuenta bancaria (por ejemplo, durante una conciliación de la cuenta bancaria). Otra razón es que el pago se registró cuando el módulo "%s" estaba deshabilitado.
 AlreadyOneBankAccount=Ya se ha definido una cuenta bancaria
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Variante de archivo SEPA
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 31e94579a7e..42acbfbc0a3 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -169,6 +169,7 @@ BillTo=Enviar a
 ShippingTo=Enviar a:
 ActionsOnBill=Eventos sobre la factura
 ActionsOnBillRec=Acciones en factura recurrente
+InvoicesGeneratedFromRec=Facturas generadas
 RecurringInvoiceTemplate=Plantilla/Factura recurrente
 NoQualifiedRecurringInvoiceTemplateFound=Sin plantilla de factura recurrente apta para la generación
 FoundXQualifiedRecurringInvoiceTemplate=%s facturas de plantilla recurrentes calificadas para su generación.
@@ -182,6 +183,7 @@ LastCustomersBills=Últimas %s facturas a clientes
 LastSuppliersBills=Últimas %s facturas de proveedores
 AllBills=Todas las facturas
 AllCustomerTemplateInvoices=Todas las facturas plantilla
+AllSupplierTemplateInvoices=Todas las facturas plantilla
 OtherBills=Otras facturas
 DraftBills=Facturas borrador
 CustomersDraftInvoices=Facturas a cliente borrador
@@ -419,6 +421,7 @@ InvoiceAutoValidate=Validar facturas automáticamente
 GeneratedFromRecurringInvoice=Generado desde la plantilla de facturas recurrentes %s
 DateIsNotEnough=Aún no se ha alcanzado la fecha
 InvoiceGeneratedFromTemplate=Factura %s generada desde la plantilla de factura recurrente %s
+InvoiceGeneratedFromTemplateError=Error Invoice %s generated from recurring template invoice %s : %s
 GeneratedFromTemplate=Generado desde la plantilla de facturas recurrentes %s
 WarningInvoiceDateInFuture=Atención: la fecha de la factura es mayor que la fecha actual
 WarningInvoiceDateTooFarInFuture=Atención: la fecha de la factura es muy lejana a la fecha actual
@@ -495,6 +498,8 @@ IBANNumber=Número de cuenta IBAN
 IBAN=IBAN
 CustomerIBAN=IBAN del cliente
 SupplierIBAN=IBAN del proveedor
+DebitBankAccount = Direct debit bank account
+SetDebitBankAccount = Define direct debit bank account
 BIC=BIC/SWIFT
 BICNumber=Código BIC/SWIFT
 ExtraInfos=Informaciones complementarias
@@ -513,10 +518,12 @@ PrettyLittleSentence=Acepto el pago mediante cheques a mi nombre de las sumas de
 IntracommunityVATNumber=Número de IVA intracomunitario
 PaymentByChequeOrderedTo=Pago mediante cheque nominativo a %s enviado a
 PaymentByChequeOrderedToShort=Pago mediante cheque nominativo a
+StructuredCommunication=Comunicación estructurada
 SendTo=enviado a
 PaymentByTransferOnThisBankAccount=Pago mediante transferencia a la cuenta bancaria siguiente
 VATIsNotUsedForInvoice=* IVA no aplicable  art-293B del CGI
 VATIsNotUsedForInvoiceAsso=* IVA no aplicable art-261-7 del CGI
+VATIsNotUsedReverseChargeProcedure=* Non applicable VAT art-259-1 of CGI
 LawApplicationPart1=Por aplicación de la ley 80.335 de 12/05/80
 LawApplicationPart2=las mercancías permanecen en propiedad de
 LawApplicationPart3=vendedor hasta el completo cobro de
@@ -645,7 +652,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Factura de proveedor eliminada
 UnitPriceXQtyLessDiscount=Precio unitario x Cantidad - Descuento
 CustomersInvoicesArea=Área de facturación a clientes
 SupplierInvoicesArea=Área de facturación de proveedores
-SituationTotalRayToRest=Remainder to pay without tax
+SituationTotalRayToRest=Resto a pagar sin impuestos
 PDFSituationTitle=Situación n ° %d
 SituationTotalProgress=Progreso total %d %%
 SearchUnpaidInvoicesWithDueDate=Buscar facturas impagas con una fecha de vencimiento = %s
@@ -661,6 +668,7 @@ MentionCategoryOfOperations0=Entrega de bienes
 MentionCategoryOfOperations1=Provisión de servicios
 MentionCategoryOfOperations2=Mixto - Entrega de bienes y prestación de servicios
 Salaries=Salarios
+InvoiceSubtype=Subtipo de factura
 SalaryInvoice=Salario
 BillsAndSalaries=Facturas y salarios
 CreateCreditNoteWhenClientInvoiceExists=Esta opción está habilitada solo cuando existen facturas validadas para un cliente o cuando se usa la constante INVOICE_CREDIT_NOTE_STANDALONE (útil para algunos países).
diff --git a/htdocs/langs/es_ES/blockedlog.lang b/htdocs/langs/es_ES/blockedlog.lang
index 6c09e553123..ead35cdec5d 100644
--- a/htdocs/langs/es_ES/blockedlog.lang
+++ b/htdocs/langs/es_ES/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Registros inalterables
 ShowAllFingerPrintsMightBeTooLong=Mostrar todos los registros archivados (puede ser largo)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostrar todos los registros de archivo no válidos (puede ser largo)
 DownloadBlockChain=Descargar huellas dactilares
-KoCheckFingerprintValidity=La entrada del registro archivado no es válida. Significa que alguien (¿un pirata informático?) Ha modificado algunos datos de este registro después de que se registró, o ha borrado el registro archivado anterior (verifique que existe la línea con el # anterior) o ha modificado la suma de comprobación del registro anterior.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=El registro archivado es válido. Significa que no se modificó ningún dato en esta línea y el registro sigue a la anterior.
 OkCheckFingerprintValidityButChainIsKo=El registro archivado parece válido en comparación con el anterior, pero la cadena se dañó anteriormente.
 AddedByAuthority=Almacenado en autoridad remota
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Detalles del registro
 ListOfTrackedEvents=Lista de eventos seguidos
 Fingerprint=Huella dactilar
 DownloadLogCSV=Exportar registros archivados (CSV)
-DataOfArchivedEvent=Datos completos del evento archivado
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Objeto original (escriba %s, id %s) no vinculado (consulte la columna 'Datos completos' para obtener datos guardados inalterables)
 BlockedLogAreRequiredByYourCountryLegislation=El módulo de Registros inalterables puede ser requerido por la legislación de su país. La desactivación de este módulo puede invalidar cualquier transacción futura con respecto a la ley y el uso de software legal, ya que no pueden ser validados por una auditoría fiscal.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=El módulo de Registros inalterables se activó debido a la legislación de su país. La desactivación de este módulo puede invalidar las transacciones futuras con respecto a la ley y el uso de software legal, ya que no pueden ser validados por una auditoría fiscal.
@@ -30,6 +32,7 @@ BlockedLogEnabled=El sistema para registrar eventos en el registro inalterable h
 BlockedLogDisabled=El sistema para registrar eventos en el registro inalterable ha sido desactivado después de que se hayan realizado algunos registros. Se ha salvado una huella especial para registrar que la cadena se ha roto.
 BlockedLogDisabledBis=El sistema para registrar eventos en el registro inalterable se ha desactivado. Ha sido posible dado que todavía no había registros.
 LinkHasBeenDisabledForPerformancePurpose=Por motivos de rendimiento, el enlace directo al documento no se muestra después de la línea 100.
+SavedOnLine=Guardado en línea
 
 ## logTypes
 logBILL_DELETE=Factura del cliente borrada lógicamente
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Eliminación lógica del pago del cliente
 logPAYMENT_VARIOUS_CREATE=Pago (no asignado a factura) creado
 logPAYMENT_VARIOUS_DELETE=Pago (no asignado a factura) supresión lógica.
 logPAYMENT_VARIOUS_MODIFY=Pago (no asignado a factura) modificado
+logBLOCKEDLOG_EXPORT=Exportación de registros inalterables a un archivo
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index 5b952bb877a..4761b096074 100644
--- a/htdocs/langs/es_ES/categories.lang
+++ b/htdocs/langs/es_ES/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Área de etiquetas/categorías de Contactos
 AccountsCategoriesArea=Área de etiquetas/categorías de Cuentas Bancarias
 ProjectsCategoriesArea=Área de etiquetas/categorías del Proyecto
 UsersCategoriesArea=Área de etiquetas/categorías de Usuario
+Bank_linesCategoriesArea==Área de etiquetas/categorías de líneas bancarias
 SubCats=Subcategorías
 CatList=Listado de etiquetas/categorías
 CatListAll=Lista de etiquetas / categorías (todos los tipos)
@@ -90,9 +91,10 @@ CategoriesSetup=Configuración de etiquetas/categorías
 CategorieRecursiv=Enlazar con la etiqueta/categoría automáticamente
 CategorieRecursivHelp=Si la opción está activada, cuando agrega un objeto a una subcategoría, el objeto también se agregará a las categorías principales.
 AddProductServiceIntoCategory=Asignar categoría al producto/servicio
-AddCustomerIntoCategory=Asignar categoría al cliente
-AddSupplierIntoCategory=Asignar categoría a proveedor
-AssignCategoryTo=Asignar categoría a
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Mostrar etiqueta/categoría
 ByDefaultInList=Por defecto en lista
 ChooseCategory=Elija una categoría
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Categorías de contenedor de página
 KnowledgemanagementsCategoriesArea=Categorías de artículos de KM
 UseOrOperatorForCategories=Utilice el operador 'OR' para las categorías
 AddObjectIntoCategory=Asignar a la categoría
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 26c003a287b..6d7bf2d36f8 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -65,6 +65,7 @@ State=Provincia
 StateId=ID Estado
 StateCode=Código de estado/provincia
 StateShort=Estado
+DepartmentBuyer=Buyer's state/province
 Region=Región
 Region-State=Región - Estado
 Country=País
@@ -78,7 +79,7 @@ Chat=Chat
 PhonePro=Teléf. trabajo
 PhonePerso=Teléf. particular
 PhoneMobile=Móvil
-No_Email=Rechazar e-mails masivos
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=Código postal
 Town=Población
@@ -155,13 +156,13 @@ ProfId4CH=Num registro de comercio
 ProfId5CH=Número EORI
 ProfId1CL=R.U.T.
 ProfId1CM=Identificación. profe. 1 (Registro Mercantil)
-ProfId2CM=Id. prof. 2 (Unique Tax Identification Number)
+ProfId2CM=Id. prof. 2 (Número Único de Identificación Fiscal)
 ProfId3CM=Identificación. profe. 3 (No. de Decreto de Creación)
 ProfId4CM=Identificación. profe. 4 (No. de Certificado de Depósito)
 ProfId5CM=Identificación. profe. 5 (Otros)
 ProfId1CN=USCI
 ProfId1ShortCM=Registro Mercantil
-ProfId2ShortCM=UIN
+ProfId2ShortCM=Número de identificación único
 ProfId3ShortCM=No. de decreto de creación
 ProfId4ShortCM=No. de certificado de depósito
 ProfId5ShortCM=Otros
@@ -382,12 +383,12 @@ ExportCardToFormat=Exportar ficha a formato
 ContactNotLinkedToCompany=Contacto no vinculado a un tercero
 DolibarrLogin=Login usuario
 NoDolibarrAccess=Sin acceso de usuario
-ExportDataset_company_1=Terceros (Empresas / asociaciones / particulares) y propiedades
-ExportDataset_company_2=Contactos y sus propiedades
-ExportDataset_company_3=Cuentas bancarias de terceros
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Contactos/Direcciones adicionales de Terceros y campos adicionales
+ExportDataset_company_3=Modos de pago de terceros (cuentas bancarias)
 ImportDataset_company_1=Terceros y sus propiedades.
 ImportDataset_company_2=Contactos/Direcciones adicionales de Terceros y campos adicionales
-ImportDataset_company_3=Cuentas bancarias de terceros
+ImportDataset_company_3=Modos de pago de terceros (cuentas bancarias)
 ImportDataset_company_4=Comerciales de terceros (asigna comerciales/usuarios a terceros)
 PriceLevel=Nivel de precios
 PriceLevelLabels=Etiquetas de Nivel de Precio
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Código gratuito sin verificación.
 ManagingDirectors=Administrador(es) (CEO, director, presidente, etc.)
 MergeOriginThirdparty=Tercero duplicado (el tercero que desea eliminar)
 MergeThirdparties=Fusionar terceros
-ConfirmMergeThirdparties=¿Está seguro de que desea fusionar el tercero elegido con el actual? Todos los objetos vinculados (facturas, pedidos, ...) se moverán al tercero actual, después de lo cual se eliminará el tercero elegido.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Los terceros han sido fusionados
 SaleRepresentativeLogin=Inicio de sesión del comercial
 SaleRepresentativeFirstname=Nombre del comercial
@@ -461,3 +462,6 @@ ExternalSystemID=ID del sistema externo
 IDOfPaymentInAnExternalSystem=ID del modo de pago en un sistema externo (como Stripe, Paypal, ...)
 AADEWebserviceCredentials=Credenciales del servicio web AADE
 ThirdPartyMustBeACustomerToCreateBANOnStripe=El tercero debe ser cliente para permitir la creación de su información bancaria en Stripe.
+NewSocNameForClone=Nuevo nombre de la empresa
+ConfirmCloneThirdparties=¿Está seguro de que desea clonar la empresa <b>%s</b>?
+SocialNetworksBusiness=Redes sociales para empresas
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index a8966d337a3..f1b52afdb7c 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -66,7 +66,7 @@ LT2CustomerIN=Ventas SGST
 LT2SupplierIN=Compras SGST
 VATCollected=IVA recuperado
 SpecialExpensesArea=Área de pagos especiales
-VATExpensesArea=Area for all VAT payments
+VATExpensesArea=Área para todos los pagos del IVA
 SocialContribution=Impuestos sociales o fiscales
 SocialContributions=Impuestos sociales o fiscales
 SocialContributionsDeductibles=Impuestos sociales o fiscales deducibles
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Cobro factura a cliente
 PaymentSupplierInvoice=Pago factura de proveedor
 PaymentSocialContribution=Pagos tasas sociales/fiscales
 PaymentVat=Pago IVA
-AutomaticCreationPayment=Registra automáticamente el pago
+AutomaticCreationPayment=Also record the payment
 ListPayment=Listado de pagos
 ListOfCustomerPayments=Listado de pagos de clientes
 ListOfSupplierPayments=Listado de pagos a proveedores
@@ -118,10 +118,14 @@ SocialContributionsPayments=Pagos tasas sociales/fiscales
 ShowVatPayment=Ver pagos IVA
 TotalToPay=Total a pagar
 BalanceVisibilityDependsOnSortAndFilters=El saldo es visible en esta lista solo si la tabla se ordena en %s y se filtra en 1 cuenta bancaria (sin otros filtros)
+CustomerAccountancyCodeGeneral=Código de contabilidad general
 CustomerAccountancyCode=Código contable cliente
+SupplierAccountancyCodeGeneral=Código de contabilidad general
 SupplierAccountancyCode=Código contable proveedor
+UserAccountancyCodeGeneral=Código de contabilidad general
 CustomerAccountancyCodeShort=Cód. cuenta cliente
 SupplierAccountancyCodeShort=Cód. cuenta proveedor
+UserAccountancyCodeShort=Cuenta de usuario. código
 AccountNumber=Número de cuenta
 NewAccountingAccount=Nueva cuenta
 Turnover=Volumen de ventas emitidas
@@ -129,7 +133,9 @@ TurnoverCollected=Volumen de ventas cobradas
 SalesTurnoverMinimum=Volumen de ventas mínimo
 ByExpenseIncome=Por gastos e ingresos
 ByThirdParties=Por tercero
+ByProjects=Por proyectos
 ByUserAuthorOfInvoice=Por autor de la factura
+DetailedListLowercase=lista detallada
 CheckReceipt=Justificante bancario
 CheckReceiptShort=Justificante bancario
 LastCheckReceiptShort=Últimos  %s recibos de depósito
@@ -274,7 +280,7 @@ SameCountryCustomersWithVAT=Informe de clientes nacionales
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Basado en que las dos primeras letras del IVA intracomunitario sean las mismas que el código de país de su empresa
 LinkedFichinter=Enlazar a una intervención
 ImportDataset_tax_contrib=Impuestos sociales/fiscales
-ImportDataset_tax_vat=VAT payments
+ImportDataset_tax_vat=Pagos de IVA
 ErrorBankAccountNotFound=Error: No se encuentra la cuenta bancaria
 FiscalPeriod=Periodo contable
 ListSocialContributionAssociatedProject=Listado de contribuciones sociales asociadas al proyecto
diff --git a/htdocs/langs/es_ES/datapolicy.lang b/htdocs/langs/es_ES/datapolicy.lang
index 86ffbeee5c6..4d09b5d5157 100644
--- a/htdocs/langs/es_ES/datapolicy.lang
+++ b/htdocs/langs/es_ES/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Política de privacidad de datos
 Module4100Desc = Módulo para gestionar la Privacidad de los Datos (Conformidad con el RGPD)
 # Administration page
 datapolicySetup = Configuración del módulo de Política de Privacidad de Datos
-Deletion = Eliminación de datos
-datapolicySetupPage = Dependiendo de las leyes de sus países (Ejemplo <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Artículo 5</a> del RGPD), los datos personales deben conservarse durante un período sin exceder el tiempo que los datos son necesarios para el propósito para el cual fueron recopilados, excepto para fines de archivo.<br>La eliminación se realizará automáticamente después de una cierta duración sin eventos (la duración que habrás indicado a continuación).
+DataDeletion=Eliminación de datos
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s meses
 ONE_YEAR = 1 año
 NB_YEARS = %s años
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Cliente potencial/Cliente
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = No es cliente potencial/cliente
 DATAPOLICY_CONTACT_FOURNISSEUR = Proveedor
 DATAPOLICY_ADHERENT = Miembro
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Puede enviar un correo electrónico de GDPR a todos sus contactos relevantes (que aún no han recibido un correo electrónico y para los cuales no ha registrado nada sobre su acuerdo de GDPR). Para ello, utilice el siguiente botón.
 SendAgreement = Enviar correos electrónicos
 AllAgreementSend = Todos los correos electrónicos han sido enviados.
 TXTLINKDATAPOLICYACCEPT = Texto para el enlace "acuerdo"
 TXTLINKDATAPOLICYREFUSE = Texto para el enlace "desacuerdo"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = RGPD: Tratamiento de datos personales
 DATAPOLICY_consentement = Consentimiento obtenido para el tratamiento de datos personales
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index ebc29449b73..d82842ca805 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error al crear archivos de imagen (encon
 ErrorFailedToCreateDir=Error en la creación de un directorio. Compruebe que el usuario del servidor Web tiene derechos de escritura en los directorios de documentos de Dolibarr. Si el  parámetro <b>safe_mode</b> está activo en este PHP, Compruebe que los archivos php Dolibarr pertenecen al usuario del servidor Web.
 ErrorNoMailDefinedForThisUser=E-Mail no definido para este usuario
 ErrorSetupOfEmailsNotComplete=La configuración de los e-mailss no está completa
+ErrorAccountingClosureSetupNotComplete=La configuración de las cuentas de cierre no está completa
 ErrorFeatureNeedJavascript=Esta característica necesita que JavaScript esté activado para funcionar. Cambie esto en configuración - pantalla.
 ErrorTopMenuMustHaveAParentWithId0=Un menú del tipo 'Superior' no puede tener un menú padre. Ponga 0 en el ID padre o busque un menú del tipo 'Izquierdo'
 ErrorLeftMenuMustHaveAParentId=Un menú del tipo 'Izquierdo' debe de tener un ID de padre
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Subida bloqueada por un plugin PHP/Apache.
 ErrorFileSizeTooLarge=El tamaño del archivo es demasiado grande o no se ha proporcionado el archivo.
 ErrorFieldTooLong=El campo %s es demasiado largo.
 ErrorSizeTooLongForIntType=Longitud del campo demasiado largo para el tipo int (máximo %s cifras)
+ErrorSizeForStarsType=El tamaño de la estrella debe ser un número entre 1 y 10
 ErrorSizeTooLongForVarcharType=Longitud del campo demasiado largo para el tipo cadena (máximo %s cifras)
 ErrorNoValueForSelectType=Los valores de la lista deben ser indicados
 ErrorNoValueForCheckBoxType=Los valores de la lista deben ser indicados
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Valor incorrecto para el código. Vuelva a intentar con un
 ErrorBothFieldCantBeNegative=Los campos %s y %s no pueden ser negativos
 ErrorFieldCantBeNegativeOnInvoice=El campo <strong>%s</strong> no puede ser negativo en este tipo de factura. Si necesita agregar una línea de descuento, simplemente cree el descuento primero (desde el campo '%s' en la tarjeta de terceros) y aplíquelo a la factura.
 ErrorLinesCantBeNegativeForOneVATRate=El total de líneas (neto de impuestos) no puede ser negativo para un IVA no nulo (se encontró un total negativo para el IVA <b> %s </b> %%).
-ErrorLinesCantBeNegativeOnDeposits=Las líneas no pueden ser negativas en un depósito. Si lo hace, tendrá problemas para consumir el depósito en la factura final.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Las cantidades en las líneas de facturas a clientes no pueden ser negativas
+ErrorQtyForSupplierInvoiceCantBeNegative=La cantidad por línea en las facturas de proveedores no puede ser negativa
 ErrorWebServerUserHasNotPermission=La cuenta de ejecución del servidor web <b>%s</b> no dispone de los permisos para esto
 ErrorNoActivatedBarcode=No hay activado ningún tipo de código de barras
 ErrUnzipFails=No se ha podido descomprimir el archivo %s con ZipArchive
@@ -222,7 +225,7 @@ ErrorUserNotAssignedToTask=El usuario debe ser asignado a la tarea para que pued
 ErrorTaskAlreadyAssigned=Tarea ya asignada al usuario
 ErrorModuleFileSeemsToHaveAWrongFormat=Parece que el módulo tiene un formato incorrecto.
 ErrorModuleFileSeemsToHaveAWrongFormat2=Debe existir al menos un directorio obligatorio en el zip del módulo: <strong>%s</strong> o <strong>%s</strong>
-ErrorFilenameDosNotMatchDolibarrPackageRules=The file name of the module package (<strong>%s</strong>) does not match the expected name syntax: <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=El nombre del archivo del paquete del módulo (<strong>%s</strong>) no coincide con la sintaxis de nombre esperada: <strong>%s</strong>
 ErrorDuplicateTrigger=Error, nombre de trigger %s duplicado. Ya se encuentra cargado desde %s
 ErrorNoWarehouseDefined=Error, no hay definidos almacenes.
 ErrorBadLinkSourceSetButBadValueForRef=El enlace que utiliza no es válido. Hay definido un 'origen para el pago, pero el valor de 'ref' no es válido.
@@ -303,8 +306,8 @@ ErrorThirpdartyOrMemberidIsMandatory=Tercero o Miembro de la sociedad es obligat
 ErrorFailedToWriteInTempDirectory=Error al escribir en el directorio temporal
 ErrorQuantityIsLimitedTo=La cantidad está limitada a %s
 ErrorFailedToLoadThirdParty=No se pudo encontrar/cargar un tercero desde id=%s, email=%s, name= %s
-ErrorThisPaymentModeIsNotDirectDebit=The payment mode is not direct debit
-ErrorThisPaymentModeIsNotCreditTransfer=The payment mode is not credit transfer
+ErrorThisPaymentModeIsNotDirectDebit=La forma de pago no es domiciliación bancaria
+ErrorThisPaymentModeIsNotCreditTransfer=La forma de pago no es transferencia bancaria
 ErrorStripeCustomerNotFoundCreateFirst=El cliente de Stripe no está configurado para este tercero (o está configurado con un valor eliminado en el lado de Stripe). Créelo (o vuelva a adjuntarlo) primero.
 ErrorCharPlusNotSupportedByImapForSearch=La búsqueda IMAP no puede buscar en el remitente o el destinatario una cadena que contenga el carácter +
 ErrorTableNotFound=Tabla <b> %s </b> no encontrada
@@ -325,8 +328,8 @@ ErrorFixThisHere= <a href="%s"> Arregla esto aquí </a>
 ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Error: la URL de su instancia actual (%s) no coincide con la URL definida en su configuración de inicio de sesión de OAuth2 (%s). No se permite iniciar sesión en OAuth2 en dicha configuración.
 ErrorMenuExistValue=Ya existe un menú con este título o URL
 ErrorSVGFilesNotAllowedAsLinksWithout=Los archivos SVG no están permitidos como enlaces externos sin la opción %s
-ErrorTypeMenu=Impossible to add another menu for the same module on the navbar, not handled yet
-ErrorGeneratingBarcode=Error while generating the barcode (probably invalid code shape)
+ErrorTypeMenu=Es imposible agregar otro menú para el mismo módulo en la barra de navegación; aún no se ha solucionado
+ErrorGeneratingBarcode=Error al generar el código de barras (probablemente forma de código no válida)
 ErrorObjectNotFound = El objeto <b>%s</b> no se encuentra, verifique su URL
 ErrorCountryCodeMustBe2Char=El código de país debe ser una cadena de 2 caracteres.
 ErrorABatchShouldNotContainsSpaces=Un lote o número de serie no debe contener espacios.
@@ -335,11 +338,18 @@ ErrorDictionaryNotFound=Diccionario <b> %s </b> no encontrado
 ErrorFailedToCreateSymLinkToMedias=No se pudo crear el enlace simbólico %s para apuntar a %s
 ErrorCheckTheCommandInsideTheAdvancedOptions=Verifique el comando utilizado para la exportación en las opciones avanzadas de la exportación
 ErrorEndTimeMustBeGreaterThanStartTime=La hora de finalización debe ser mayor que la hora de inicio.
-ErrorIncoherentDates=Start date must be earlier than end date
-ErrorEndHourIsNull=End date field cannot be empty
-ErrorStartHourIsNull=Start date field cannot be empty
-ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
-ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorIncoherentDates=La fecha de inicio debe ser anterior a la fecha de finalización.
+ErrorEndHourIsNull=El campo de fecha de finalización no puede estar vacío
+ErrorStartHourIsNull=El campo de fecha de inicio no puede estar vacío
+ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Demasiadas líneas para procesar. Utilice un filtro más selectivo.
+ErrorEmptyValueForQty=La cantidad no puede ser cero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = La cantidad solicitada no puede ser menor que la cantidad enviada.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, aún no se admite la creación de un pago distinto a la cuenta bancaria con una moneda diferente a la moneda de la empresa.
+ErrorStreamMustBeEnabled=El flujo PHP %s no está disponible. Verifique sus módulos PHP y el parámetro $dolibarr_main_stream_to_disable de Dolibarr.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El parámetro PHP upload_max_filesize (%s) es más alto que el parámetro PHP post_max_size (%s). Esta no es una configuración consistente.
 WarningPasswordSetWithNoAccount=Se fijó una contraseña para este miembro. Sin embargo, no se ha creado ninguna cuenta de usuario. Así que esta contraseña no se puede utilizar para acceder a Dolibarr. Puede ser utilizada por un módulo/interfaz externo, pero si no necesitar definir accesos de un miembro, puede desactivar la opción "Administrar un inicio de sesión para cada miembro" en la configuración del módulo miembros. Si necesita administrar un inicio de sesión, pero no necesita ninguna contraseña, puede dejar este campo vacío para evitar esta advertencia. Nota: También puede usarse el correo electrónico como inicio de sesión si el miembro está vinculada a un usuario.
@@ -384,10 +394,14 @@ WarningGoOnAccountancySetupToAddAccounts=Si esta lista está vacía, vaya al men
 WarningCorrectedInvoiceNotFound=Factura corregida no encontrada
 WarningCommentNotFound=Advertencia: No puedo encontrar los comentarios de inicio y/o fin de la sección <b>%s </b> en el archivo <b>%s</b>
 WarningAlreadyReverse=El movimiento bursátil ya se revirtió
-WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
-WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
-WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
-WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningParentIDDoesNotExistAnymore=Este ID de padre ya no existe
+WarningReadBankAlsoAllowedIfUserHasPermission=Advertencia, la lectura de la cuenta bancaria también está permitida con el permiso para Administrar el plan de cuentas.
+WarningNoDataTransferedInAccountancyYet=Tenga en cuenta que no hay datos en la tabla de contabilidad. Transfiera los datos registrados en la aplicación a la sección de contabilidad o cambie el modo de cálculo para analizar los datos registrados fuera de la contabilidad.
+WarningChangingThisMayBreakStopTaskScheduler=Advertencia: cambiar este valor puede deshabilitar el programador
+WarningAmountOfFileDiffersFromSumOfLines=Advertencia, la cantidad de archivo (%s) difiere de la suma de líneas (%s)
+WarningModuleAffiliatedToAReportedCompany=Advertencia, este módulo ha sido reportado a la fundación Dolibarr por ser publicado por una empresa que utiliza prácticas ilegales (incumplimiento de las reglas de uso de la marca Dolibarr, recopilación de sus datos sin su consentimiento o implementación de malware).
+WarningModuleAffiliatedToAPiratPlatform=Tenga cuidado al obtener un módulo (pago o gratuito) de una plataforma no oficial sospechosa como %s
+
 SwissQrOnlyVIR = La factura SwissQR solo se puede agregar en facturas configuradas para pagarse con pagos de transferencia de crédito.
 SwissQrCreditorAddressInvalid = La dirección del acreedor no es válida (¿están configurados el código postal y la ciudad? (%s)
 SwissQrCreditorInformationInvalid = La información del acreedor no es válida para IBAN (%s): %s
@@ -422,4 +436,5 @@ OperNotDefined=Método de pago no definido
 ErrorThisContactXIsAlreadyDefinedAsThisType=%s ya está definido como contacto para este tipo.
 ErrorThisGroupIsAlreadyDefinedAsThisType=Los contactos con este grupo ya están definidos como contacto para este tipo.
 EmptyMessageNotAllowedError=No se permiten mensajes vacíos
-ErrorIsNotInError=%s is not in error
+ErrorIsNotInError=%s no es un error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/es_ES/exports.lang b/htdocs/langs/es_ES/exports.lang
index b1ad36d7d40..308fefa9923 100644
--- a/htdocs/langs/es_ES/exports.lang
+++ b/htdocs/langs/es_ES/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Etiqueta de línea
 LineDescription=Descripción de línea
 LineUnitPrice=Precio unitario de la línea
 LineVATRate=Tipo de IVA de la línea
+LineLT1Rate=Tasa 2 para línea
+LineLT2Rate=Tasa 3 para línea
+LineLT1Type=Tasa tipo 2 para línea
+LineLT2Type=Tasa tipo 3 para linea
 LineQty=Cantidad de la línea
 LineTotalHT=Base imponible de la línea
 LineTotalTTC=Importe total de la línea
 LineTotalVAT=Importe IVA de la línea
+LineTotalLT1=Importe del impuesto 2 por línea
+LineTotalLT2=Importe del impuesto 3 por línea
 TypeOfLineServiceOrProduct=Tipo de línea (0=producto, 1=servicio)
 FileWithDataToImport=Archivo que contiene los datos a importar
 FileToImport=Archivo origen a importar
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=Elija el formato de archivo que desea importar hacien
 ChooseFileToImport=Cargue el archivo y luego haga clic en el icono %s para seleccionar el archivo como archivo de importación de origen ...
 SourceFileFormat=Formato del archivo origen
 FieldsInSourceFile=Campos en el archivo origen
-FieldsInTargetDatabase=Campos destino en la base de datos Dolibarr (*=obligatorio)
+FieldsInTargetDatabase=Campos de destino en la base de datos de Dolibarr
 NoFields=Ningún campo
 MoveField=Mover campo columna número %s
 ExampleOfImportFile=Ejemplo_de_archivo_importación
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Verifique la configuración de importación que definió
 RunSimulateImportFile=Ejecutar la simulación de importación
 FieldNeedSource=Este campo requiere datos desde el archivo origen
 SomeMandatoryFieldHaveNoSource=Algunos campos obligatorios no tienen campo fuente en el archivo de origen
-InformationOnSourceFile=Información del archivo origen
-InformationOnTargetTables=Información sobre los campos de destino
+InformationOnSourceFile=Archivo origen
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Bascular al menos un campo origen en la columna de campos a exportar
 SelectFormat=Seleccione este formato de archivo de importación
 RunImportFile=Importación de datos
diff --git a/htdocs/langs/es_ES/hrm.lang b/htdocs/langs/es_ES/hrm.lang
index 349455ad6c5..132f95b35be 100644
--- a/htdocs/langs/es_ES/hrm.lang
+++ b/htdocs/langs/es_ES/hrm.lang
@@ -46,11 +46,11 @@ NewEval=Nueva evaluación de competencias
 ValidateEvaluation=Validar la evaluación de competencias
 ConfirmValidateEvaluation=¿Está seguro de que desea validar esta evaluación de competencias con la referencia <b>%s</b>?
 EvaluationCard=Evaluación de competencias
-RequiredRank=Rango requerido para el perfil de trabajo
-RequiredRankShort=rango requerido
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Puestos con este perfil laboral
-EmployeeRank=Rango de empleado para esta habilidad
-EmployeeRankShort=Rango de empleado
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Puesto de empleado
 EmployeePositions=Puestos de empleados
 EmployeesInThisPosition=Empleados en este puesto
@@ -72,6 +72,9 @@ AddSkill=Agregar habilidades al perfil laboral
 RequiredSkills=Habilidades requeridas para este perfil laboral
 UserRank=Rango de usuario
 SkillList=Lista de habilidades
+SkillCreated=%s habilidades creadas
+SkillRank=Rango de habilidad
+ShowSkillRank=Mostrar rango de habilidad
 SaveRank=Guardar rango
 TypeKnowHow=Saber cómo
 TypeHowToBe=Cómo ser
@@ -95,3 +98,5 @@ NeedBusinessTravels=Necesita viajes de negocios
 NoDescription=Sin descripción
 TheJobProfileHasNoSkillsDefinedFixBefore=El perfil laboral evaluado de este empleado no tiene ninguna habilidad definida. Agregue habilidades, luego elimine y reinicie la evaluación.
 PDFStandardHrmEvaluation=Plantilla estándar para generar un documento PDF para una evaluación de competencias
+SkillNotRequired=No se requiere habilidad
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index 7cdc25bef8e..e722c9989ea 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=E-Mailing
 EMailing=E-Mailing
-EMailings=E-Mailings
+EMailings=Mass EMails
 SMSings=SMS
-AllEMailings=Todos los  E-Mailings
+AllEMailings=All mass eMails
 MailCard=Ficha E-Mailing
 MailRecipients=Destinatarios
 MailRecipient=Destinatario
@@ -20,25 +20,25 @@ MailToCCUsers=Copia a usuario(s)
 MailCCC=Adjuntar copia a
 MailTopic=Asunto del email
 MailDate=Fecha de correo electrónico
-MailReferences=Message IDs in References
+MailReferences=Identificadores de mensajes en referencias
 MailText=Mensaje
 MailFile=Archivo
 MailMessage=Texto utilizado en el cuerpo del mensaje
 SubjectNotIn=No en el asunto
 BodyNotIn=No en el cuerpo
-ShowEMailing=Mostrar E-Mailing
-ListOfEMailings=Listado de E-Mailings
-NewMailing=Nuevo E-Mailing
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Nuevos SMS
-EditMailing=Editar E-Mailing
-ResetMailing=Nuevo envío
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Eliminar E-Mailing
-PreviewMailing=Previsualizar un E-Mailing
-CreateMailing=Crear E-Mailing
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Restablecer estado en caso de error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Prueba
-ValidMailing=Validar E-Mailing
+ValidMailing=Valid mass Email
 MailingStatusDraft=Borrador
 MailingStatusValidated=Validado
 MailingStatusSent=Enviado
@@ -55,7 +55,7 @@ ErrorMailRecipientIsEmpty=La dirección del destinatario está vacía
 WarningNoEMailsAdded=Ningún nuevo E-Mailing a añadir a la lista destinatarios.
 ConfirmValidMailing=¿Confirma la validación del E-Mailing?
 ConfirmResetMailing=Atención, en el reinicio del E-Mailing <b>%s</b>, autoriza de nuevo su emisión en masa. ¿Es esto lo que quiere hacer?
-ConfirmResetMailingTargetMassactionQuestion=Are you sure you want to reset the status of the selected recipients (this may means that email will be resent if you use the Send email feature of the emailing) ?
+ConfirmResetMailingTargetMassactionQuestion=¿Está seguro de que desea restablecer el estado de los destinatarios seleccionados (esto puede significar que el correo electrónico se volverá a enviar si utiliza la función Enviar correo electrónico del envío de correo electrónico)?
 ConfirmDeleteMailing=¿Confirma la eliminación del E-Mailing?
 NbOfUniqueEMails=Nº de e-mails únicos
 NbOfUniquePhones=Nº. de teléfonos únicos
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Todos los filtros deben coincidir para que se recopile
 LineInFile=Línea %s en archivo
 RecipientSelectionModules=Módulos de selección de los destinatarios
 MailSelectedRecipients=Destinatarios seleccionados
-MailingArea=Área E-Mailings
-LastMailings=Últimos %s e-mailings
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Estadísticas destinatarios
 NbOfCompaniesContacts=Contactos/direcciones únicos
 MailNoChangePossible=Destinatarios de un E-Mailing validado no modificables
-SearchAMailing=Buscar un E-Mailing
-SendMailing=Enviar E-Mailing
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Enviado por
-AdvancedAlternative=Advanced alternative
+AdvancedAlternative=Alternativa avanzada
 MailingNeedCommand=El envío de un e-mailing puede realizarse desde la línea de comandos. Solicite al administrador del servidor que ejecute el siguiente comando para enviar el e-mailling a todos los destinatarios:
 MailingNeedCommand2=Puede enviar en línea añadiendo el parámetro MAILING_LIMIT_SENDBYWEB con un valor numérico que indica el máximo nº de e-mails a enviar por sesión. Para ello vaya a Inicio - Configuración - Varios.
 ConfirmSendingEmailing=Si desea enviar e-mailing directamente desde esta pantalla, confirme que está seguro de que desea enviar e-mailing ahora desde su navegador.
-LimitSendingEmailing=Nota: El envío de e-mailings desde la interfaz web se realiza en tandas por razones de seguridad y timeouts, se enviarán a <b>%s</b> destinatarios por tanda.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Vaciar lista
 ToClearAllRecipientsClickHere=Para vaciar la lista de los destinatarios de este E-Mailing, haga click en el botón
 ToAddRecipientsChooseHere=Para añadir destinatarios, escoja los que figuran en las listas a continuación
-NbOfEMailingsReceived=E-Mailings en masa recibidos
-NbOfEMailingsSend=Emailings masivos enviados
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID registro
 DeliveryReceipt=Acuse de recibo
 YouCanUseCommaSeparatorForSeveralRecipients=Puede usar el carácter de separación <b>coma </b> para especificar múltiples destinatarios.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=No se planean notificaciones automáticas por e-mail p
 ANotificationsWillBeSent=Se enviará 1 notificación automática por e-mail
 SomeNotificationsWillBeSent=%s se enviarán notificaciones automáticas por e-mail
 AddNewNotification=Suscríbase a una nueva notificación automática por e-mail (destinatario/evento)
-ListOfActiveNotifications=Suscripciones activas (objetivos/eventos) para notificación automática por correo electrónico
+ListOfActiveNotifications=Suscripciones activas
+ListOfActiveNotificationsHelp=Lista de parejas %s/%s suscritas para recibir notificaciones automáticas por correo electrónico
 ListOfNotificationsDone=Notificaciones automáticas por correo electrónico enviadas
+ListOfNotificationsDoneHelp=Lista de notificaciones por correo electrónico enviadas anteriormente
 MailSendSetupIs=La configuración de e-mailings está a '%s'. Este modo no puede ser usado para enviar e-mails masivos.
 MailSendSetupIs2=Antes debe, con una cuenta de administrador, en el menú %sInicio - Configuración - E-Mails%s, cambiar el parámetro <strong>'%s'</strong> para usar el modo '%s'. Con este modo puede configurar un servidor SMTP de su proveedor de servicios de internet.
 MailSendSetupIs3=Si tiene preguntas de como configurar su servidor SMTP, puede contactar con %s.
@@ -177,15 +179,15 @@ NoContactWithCategoryFound=No se encontró ninguna categoría vinculada a alguno
 NoContactLinkedToThirdpartieWithCategoryFound=No se encontró ninguna categoría vinculada a algunos terceros
 OutGoingEmailSetup=E-mails salientes
 InGoingEmailSetup=E-mails entrantes
-OutGoingEmailSetupForEmailing=Outgoing emails (%s)
+OutGoingEmailSetupForEmailing=Correos electrónicos salientes (%s)
 DefaultOutgoingEmailSetup=Misma configuración que la configuración global de e-mail saliente
 Information=Información
 ContactsWithThirdpartyFilter=Contactos con filtro de terceros.
 Unanswered=Sin respuesta
 Answered=Contestado
-IsNotAnAnswer=No responde (e-mail inicial)
+IsNotAnAnswer=No es respuesta (Es un correo electrónico inicial)
 IsAnAnswer=Es una respuesta de un e-mail inicial.
-RecordCreatedByEmailCollector=Record created by the Email Collector %s
+RecordCreatedByEmailCollector=Registro creado por el recopilador de correo electrónico %s
 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.
@@ -193,12 +195,12 @@ NoMoreRecipientToSendTo=No hay más destinatarios a los que enviar el correo ele
 EmailOptedOut=El propietario del correo electrónico ha solicitado no contactarlo más con este correo electrónico.
 EvenUnsubscribe=Incluir correos electrónicos de exclusión
 EvenUnsubscribeDesc=Incluya correos electrónicos de exclusión voluntaria cuando seleccione correos electrónicos como objetivos. Útil para correos electrónicos de servicio obligatorios, por ejemplo.
-XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s operations done)
+XEmailsDoneYActionsDone=Correos electrónicos de %s precalificados, correos electrónicos de %s procesados exitosamente (para operaciones de %s realizadas)
 YouCanMakeSomeInstructionForEmail=Puede realizar algunas instrucciones para su correo electrónico (Ejemplo: generar una imagen en una plantilla de correo electrónico...)
 ModelTemplate=Plantilla de correo electrónico
 YouCanChooseAModelForYouMailContent= Puedes elegir uno de los modelos de plantilla o generar uno con IA
 TitleOfMailHolder=El título del correo electrónico va aquí.
 ContentOfMailHolder=El contenido del correo electrónico va aquí...
-LastNews=Last News
-ListProducts= List of products
-PasswordReset=Password reset
+LastNews=Últimas noticias
+ListProducts= Lista de productos
+PasswordReset=Restablecimiento de contraseña
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 8b6e4fdfa84..26169d11126 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -37,6 +37,7 @@ Translation=Traducción
 Translations=Traducciones
 CurrentTimeZone=Zona horaria PHP (Servidor)
 EmptySearchString=Introduzca criterios de búsqueda que no estén vacíos
+EnterNonEmptyLinesFirst=Introduzca primero líneas que no estén vacías
 EnterADateCriteria=Ingrese un criterio de fecha
 NoRecordFound=No se han encontrado registros
 NoRecordDeleted=No se ha eliminado el registro
@@ -45,6 +46,7 @@ NoError=Ningún error
 Error=Error
 Errors=Errores
 ErrorFieldRequired=El campo '%s' es obligatorio
+CustomMandatoryFieldRule=Regla personalizada de "Campo obligatorio"
 ErrorFieldFormat=El campo '%s' tiene un valor incorrecto
 ErrorFileDoesNotExists=El archivo %s no existe
 ErrorFailedToOpenFile=Imposible abrir el archivo %s
@@ -308,6 +310,7 @@ DateBuild=Fecha generación del informe
 DatePayment=Fecha pago
 DateApprove=Fecha de aprobación
 DateApprove2=Fecha de aprobación (segunda aprobación)
+PendingSince=Pendiente desde
 RegistrationDate=Fecha de Registro
 UserCreation=Usuario creador
 UserModification=Usuario modificador
@@ -495,7 +498,7 @@ ActionRunningNotStarted=No empezado
 ActionRunningShort=En progreso
 ActionDoneShort=Terminado
 ActionUncomplete=Incompleto
-LatestLinkedEvents=Últimos %s eventos vinculados
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Empresa/Organización
 Accountant=Contable
 ContactsForCompany=Contactos de este tercero
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=Texto utilizado en el cuerpo del mensaje
 SendAcknowledgementByMail=Enviar email de confirmación
 SendMail=Enviar e-mail
 Email=Correo
+EMail=Correo
+EMails=E-Mails
 NoEMail=Sin e-mail
 AlreadyRead=Ya leído
 NotRead=No leído
@@ -793,7 +798,7 @@ Notes=Notas
 AddNewLine=Añadir nueva línea
 AddFile=Añadir archivo
 FreeZone=Producto de texto libre
-FreeLineOfType=Entrada libre del tipo
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Clonar el objeto con estos atributos principales
 ReGeneratePDF=Regenerar PDF
 PDFMerge=Fusión PDF
@@ -879,12 +884,14 @@ toward=hacia
 Access=Acceso
 SelectAction=Seleccione acción
 SelectTargetUser=Seleccionar usuario/empleado de destino
+ClickToCopyToClipboard=Haga clic para copiar al portapapeles
 HelpCopyToClipboard=Use Ctrl+C para copiar al portapapeles
 SaveUploadedFileWithMask=Guardar el archivo con el nombre "<strong>%s</strong>" (sino "%s")
 OriginFileName=Nombre del archivo origen
 SetDemandReason=Definir origen
 SetBankAccount=Definir cuenta bancaria
 AccountCurrency=Divisa de la cuenta
+AccountancyCode=Código contable
 ViewPrivateNote=Ver notas
 XMoreLines=%s línea(s) ocultas
 ShowMoreLines=Mostrar más/menos líneas
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=¿Estás seguro que quieres eliminar los %s registro
 ConfirmMassClone=Confirmación de clonación masiva
 ConfirmMassCloneQuestion=Seleccionar proyecto para clonar
 ConfirmMassCloneToOneProject=Clonar al proyecto %s
+ObjectClonedSuccessfuly=Objeto clonado exitosamente
 RelatedObjects=Objetos relacionados
 ClassifyBilled=Clasificar Facturado
 ClassifyUnbilled=Clasificar no facturado
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Debe iniciar sesión y necesita permisos para ver o desc
 Download=Descargar
 DownloadDocument=Descargar el documento
 DownloadSignedDocument=Descargar documento firmado
-ActualizeCurrency=Actualizar el tipo de cambio
+ActualizeCurrency=Utilice el último tipo de cambio conocido de la moneda.
 Fiscalyear=Año fiscal
 ModuleBuilder=Módulo Builder
 SetMultiCurrencyCode=Establecer moneda
+SetMultiCurrencyRate=Establecer el tipo de cambio
 BulkActions=Acciones masivas
 ClickToShowHelp=Haga clic para mostrar la ayuda sobre herramientas
 WebSite=Sitio web
@@ -1104,6 +1113,7 @@ PayedBy=Pagado por
 PayedTo=Pagado a
 Monthly=Mensual
 Quarterly=Trimestral
+Quarter=Cuarto
 Annual=Anual
 Local=Local
 Remote=Remoto
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Tarea
 ContactDefault_propal=Presupuesto
 ContactDefault_supplier_proposal=Presupuesto de proveedor
 ContactDefault_ticket=Ticket
+ContactDefault_societe=Tercero
 ContactAddedAutomatically=Contacto agregado desde roles de contacto de terceros
 More=Más
 ShowDetails=Mostrar detalles
@@ -1242,6 +1253,7 @@ CommercialAffected=Representante de ventas asignado
 CommercialsDisaffected=Representantes de ventas desvinculados
 CommercialDisaffected=Representante de ventas desvinculado
 Message=Mensaje
+Emailing=Emailing
 Progression=Progreso
 YourMessage=Tu mensaje
 YourMessageHasBeenReceived=Tu mensaje ha sido recibido. Le responderemos o contactaremos con usted lo antes posible.
@@ -1285,7 +1297,7 @@ AmountSalary=Monto del salario
 InvoiceSubtype=Subtipo de factura
 ConfirmMassReverse=Confirmación inversa masiva
 ConfirmMassReverseQuestion=¿Está seguro de que desea revertir los %s registros seleccionados?
-ConfirmActionXxx=Confirm action %s
+ConfirmActionXxx=Confirmar acción %s
 ElementType=Tipo de elemento
 ElementId=Identificación del elemento
 Encrypted=Encriptado
@@ -1306,3 +1318,34 @@ TranslationOfKey=Traducción de la clave AnyTranslationKey
 SignedStatus=Estado firmado
 NbRecordQualified=Número de registros calificados
 auto=auto
+UploadFile=Importación directa de documento
+OrClickToSelectAFile=o haga clic para seleccionar un archivo en el disco
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Descuento total
+TotalHTBeforeDiscount=Total neto antes del descuento
+Contains=Contiene
+DoesNotContain=No contiene
+Is=Es
+IsNot=No es
+StartsWith=Comienza con
+EndsWith=Termina con
+IsBefore=Esta antes
+IsAfter=Es despues
+IsOnOrBefore=Es anterior o igual
+IsOnOrAfter=Es posterior o igual
+IsHigherThan=Es más alto que
+IsHigherThanOrEqual=Es mayor o igual que
+IsLowerThan=Es inferior a
+IsLowerThanOrEqual=Es menor o igual que
+addToFilter=Añadir
+FilterAssistance=Editor de filtros
+Operator=Operador
+AllFieldsRequired=Todos los campos son obligatorios.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Mostrar saldo desde el inicio
+Transferred=Transferred
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index eab4281ab91..47213149ab5 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Si se requiere suscripción, se debe registrar una susc
 DeleteType=Eliminar
 VoteAllowed=Voto autorizado
 Physical=Individual
-Moral=Corporación
-MorAndPhy=Corporación e Individuo
+Moral=Entidad legal
+MorAndPhy=Persona jurídica y persona física
 Reenable=Volver a habilitar
 ExcludeMember=Excluir a un miembro
 Exclude=Excluir
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Estadísticas de miembros por región
 NbOfMembers=Número total de miembros
 NbOfActiveMembers=Número total de miembros activos actuales
 NoValidatedMemberYet=Ningún miembro validado encontrado
-MembersByCountryDesc=Esta pantalla le muestra las estadísticas de miembros por países. Los gráficos y los cuadros dependen de la disponibilidad del servicio de gráficos en línea de Google, así como de la disponibilidad de una conexión a Internet que funcione.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Esta pantalla muestra estadísticas de miembros por estado / provincias / cantón.
 MembersByTownDesc=Esta pantalla muestra estadísticas de miembros por ciudad.
 MembersByNature=Esta pantalla le muestra estadísticas de miembros por naturaleza.
@@ -208,25 +209,25 @@ NewMemberbyWeb=Nuevo miembro añadido. En espera de validación
 NewMemberForm=Formulario de inscripción
 SubscriptionsStatistics=Estadísticas de suscripciones
 NbOfSubscriptions=Número de cotizaciones
-AmountOfSubscriptions=Cantidad recaudada de las suscripciones
+AmountOfSubscriptions=Importe recaudado por pagos de membresía
 TurnoverOrBudget=Volumen de ventas (empresa) o Presupuesto (asociación o colectivo)
-DefaultAmount=Importe predeterminado de la contribución (se utiliza solo si no se define ningún importe a nivel de tipo de miembro)
-MinimumAmount=Monto mínimo (utilizado solo cuando el monto de la contribución es gratuito)
-CanEditAmount=El monto de la suscripción puede ser definido por el miembro
+DefaultAmount=Monto predeterminado del pago de membresía (se usa solo si no se define ningún monto a nivel de tipo de miembro)
+MinimumAmount=Monto mínimo de pago de membresía (tiene prioridad sobre cualquier monto predeterminado)
+CanEditAmount=El monto de la membresía puede ser definido por el miembro.
 CanEditAmountDetail=El visitante puede elegir/editar el importe de su contribución independientemente del tipo de miembro
 AmountIsLowerToMinimumNotice=El importe es inferior al mínimo %s
 MEMBER_NEWFORM_PAYONLINE=Después del registro en línea, cambie automáticamente a la página de pago en línea
 ByProperties=Por naturaleza
 MembersStatisticsByProperties=Estadísticas de los miembros por naturaleza
-VATToUseForSubscriptions=Tasa de IVA a utilizar para las contribuciones
-NoVatOnSubscription=Sin IVA para en las afiliaciones
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producto usado para las suscripciones en línea en facturas: %s
+VATToUseForSubscriptions=Tasa de IVA a utilizar para el pago de la membresía
+NoVatOnSubscription=Sin IVA para el pago de membresía
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producto utilizado para la línea de membresía en la factura: %s
 NameOrCompany=Nombre o Empresa
 SubscriptionRecorded=Suscripción guardada
 NoEmailSentToMember=No se envió ningún e-mail al miembro
 EmailSentToMember=E-Mail enviado al miembro a %s
-SendReminderForExpiredSubscriptionTitle=Enviar un recordatorio por E-Mail para la suscripción expirada
-SendReminderForExpiredSubscription=Enviar un recordatorio por correo electrónico a los miembros cuando la contribución esté a punto de caducar (el parámetro es el número de días antes del final de la membresía para enviar el recordatorio. Puede ser una lista de días separados por un punto y coma, por ejemplo '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Enviar recordatorio por correo electrónico para membresía vencida
+SendReminderForExpiredSubscription=Enviar recordatorio por correo electrónico a los miembros cuando la membresía esté por vencer (el parámetro es el número de días antes del final de la membresía para enviar el recordatorio. Puede ser una lista de días separados por punto y coma, por ejemplo '10;5;0;-5')
 MembershipPaid=Membresía pagada por el período actual (hasta %s)
 YouMayFindYourInvoiceInThisEmail=Puede encontrar su factura adjunta a este e-mai
 XMembersClosed=%s miembro(s) cerrado(s)
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Un tercero es la entidad jurídica que se utilizar
 MemberFirstname=Nombre del miembro
 MemberLastname=Apellido del miembro
 MemberCodeDesc=Código de miembro, único para todos los miembros
-MemberSubscriptionStartFirstDayOf=La fecha de inicio de una membresía corresponde al primer día de una
-MemberSubscriptionStartAfter=Período mínimo antes de la entrada en vigor de la fecha de inicio de una suscripción excepto renovaciones (ejemplo +3m = +3 meses, -5d = -5 días, +1Y = +1 año)
+MemberSubscriptionStartFirstDayOf=Forzar la fecha sugerida de una membresía para que corresponda al primer día de una
+MemberSubscriptionStartAfter=Período mínimo antes de la entrada en vigor de la fecha de inicio de una primera suscripción de membresía (excluidas las renovaciones)
+NoCorrection=Sin corrección
+MemberSubscriptionStartAfterDesc=Ejemplo: +3m = +3 meses, -5d = -5 días, +1Y = +1 año
+MemberSubscriptionStartAfterDesc2=Esta es la fecha sugerida al crear una primera suscripción de membresía en comparación con la fecha actual. Para la renovación, la fecha sugerida por defecto seguirá siendo la fecha de finalización de la suscripción anterior.
 SubscriptionLinkedToConciliatedTransaction=La membresía está vinculada a una transacción conciliada por lo que no se permite esta modificación.
 ConfirmMassSubsriptionCreation=Confirmar la creación de la suscripción
 ConfirmMassSubsriptionCreationQuestion=¿Está seguro de que desea crear las %s suscripciones seleccionadas?
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index df39cfaed4e..414c97280f2 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -65,7 +65,7 @@ ProductStatusOnBuy=En compra
 ProductStatusNotOnBuy=Fuera de compra
 ProductStatusOnBuyShort=En compra
 ProductStatusNotOnBuyShort=Fuera de compra
-UpdateVAT=Update VAT
+UpdateVAT=Actualizar el IVA
 UpdateDefaultPrice=Cambiar precio por defecto
 UpdateLevelPrices=Cambiar precios para cada nivel
 AppliedPricesFrom=Aplicado desde
@@ -97,7 +97,6 @@ ShowService=Mostrar servicio
 ProductsAndServicesArea=Área productos y servicios
 ProductsArea=Área Productos
 ServicesArea=Área Servicios
-ListOfStockMovements=Listado de movimientos de stock
 BuyingPrice=Precio de compra
 PriceForEachProduct=Productos con precios específicos
 SupplierCard=Ficha proveedor
@@ -142,14 +141,15 @@ QtyMin=Cantidad mínima
 PriceQtyMin=Precio cantidad mínima
 PriceQtyMinCurrency=Precio (moneda) para esta cantidad
 WithoutDiscount=Sin descuento
-VATRateForSupplierProduct=Tax Rate (for this vendor/product)
+VATRateForSupplierProduct=Tasa de impuesto (para este proveedor/producto)
 DiscountQtyMin=Descuento para esta cantidad
 NoPriceDefinedForThisSupplier=Ningún precio/cant. definido para este proveedor/producto
+NoProductPriceDefinedForThisSupplier=No hay precio/cantidad de producto definido para este proveedor
 NoSupplierPriceDefinedForThisProduct=Ningún precio/cant. proveedor definida para este producto
 PredefinedItem=Elemento predefinido
 PredefinedProducts=Producto predefinido
 PredefinedServices=Servicio predefinido
-PredefinedProductsAndServices=Predefined products/services
+PredefinedProductsAndServices=Productos/servicios predefinidos
 NotPredefinedProducts=Sin productos/servicios predefinidos
 GenerateThumb=Generar la etiqueta
 ServiceNb=Servicio no %s
@@ -171,7 +171,7 @@ BuyingPrices=Precios de compra
 CustomerPrices=Precios a clientes
 SuppliersPrices=Precios de proveedores
 SuppliersPricesOfProductsOrServices=Precios de proveedores (productos o servicios)
-CustomCode=Aduanas|Producto|Código HS
+CustomCode=Código de Aduana|Mercancía|SA|TARIC
 CountryOrigin=País de origen
 RegionStateOrigin=Región de origen
 StateOrigin=Estado | Provincia de origen
@@ -209,6 +209,7 @@ unitL=Litro
 unitT=tonelada
 unitKG=kg
 unitG=Gramo
+unitGAL=galón
 unitMG=mg
 unitLB=libra
 unitOZ=onza
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Formato de la petición es {"URL": "http://exam
 UpdateInterval=Intervalo de actualización (minutos)
 LastUpdated=Última actualización
 CorrectlyUpdated=Actualizado correctamente
-PropalMergePdfProductActualFile=Archivos que se usan para añadir en el PDF Azur son
+PropalMergePdfProductActualFile=Archivo PDF para incluir en las propuestas PDF si el producto es parte de la propuesta...
 PropalMergePdfProductChooseFile=Seleccione los archivos PDF
 IncludingProductWithTag=Incluir productos/servicios con etiqueta
 DefaultPriceRealPriceMayDependOnCustomer=Precio por defecto, el precio real puede depender del cliente
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=La cantidad de la línea se recalculó de acuerdo c
 
 #Attributes
 Attributes=Atributos
+ProductAttributeExtrafields=Atributos de variantes extrafields
+ProductAttributeExtrafieldsSetup=Configuración de campos adicionales de atributos de variante
+ProductAttributeValueExtrafields=Valores de atributos de variantes extrafields
+ProductAttributeValueExtrafieldsSetup=Configuración de valores de atributos de variantes en campos adicionales
 VariantAttributes=Atributos de variantes
 ProductAttributes=Atributos de variantes para productos
 ProductAttributeName=Atributo %s
@@ -395,6 +400,8 @@ ErrorDestinationProductNotFound=Producto destino no encontrado
 ErrorProductCombinationNotFound=Variante de producto no encontrada
 ActionAvailableOnVariantProductOnly=Acción solo disponible en la variante del producto
 ProductsPricePerCustomer=Precios de producto por cliente
+ProductLevelExtraFields=Atributos adicionales (Precio de nivel)
+ProductCustomerExtraFields=Atributos adicionales (precio de cliente)
 ProductSupplierExtraFields=Campos adicionales (precios de proveedor)
 DeleteLinkedProduct=Eliminar el producto hijo vinculado a la combinación
 AmountUsedToUpdateWAP=Monto unitario a utilizar para actualizar el Precio Promedio Ponderado
@@ -403,11 +410,12 @@ PMPValueShort=PMP
 mandatoryperiod=Periodos obligatorios
 mandatoryPeriodNeedTobeSet=Nota: Se debe definir el período (fecha de inicio y finalización)
 mandatoryPeriodNeedTobeSetMsgValidate=Un servicio requiere un período de inicio y finalización
-mandatoryHelper=Marque esto si desea un mensaje para el usuario al crear/validar una factura, propuesta comercial, orden de venta sin ingresar una fecha de inicio y finalización en las líneas con este servicio. <br> Tenga en cuenta que el mensaje es una advertencia y no un error de bloqueo.
+mandatoryHelper=Marque esta opción si desea recibir un mensaje al usuario al crear/validar una factura, propuesta comercial, orden de venta sin ingresar una fecha de inicio y finalización en las líneas con este servicio.
+mandatoryHelper2=Tenga en cuenta que el mensaje es una advertencia y no un error de bloqueo.
 DefaultBOM=Lista de materiales predeterminada
 DefaultBOMDesc=La lista de materiales predeterminada que se recomienda utilizar para fabricar este producto. Este campo solo se puede establecer si la naturaleza del producto es '%s'.
 Rank=Rango
-MergeOriginProduct=Duplicated product (the product you want to delete)
+MergeOriginProduct=Producto duplicado (el producto que desea eliminar)
 MergeProducts=Fusionar productos
 ConfirmMergeProducts=¿Está seguro de que desea fusionar el producto elegido con el actual? Todos los objetos vinculados (facturas, pedidos, ...) se moverán al producto actual, después de lo cual se eliminará el producto elegido.
 ProductsMergeSuccess=Los productos se han fusionado
@@ -435,3 +443,6 @@ AllowStockMovementVariantParentHelp=De forma predeterminada, el producto princip
 ConfirmSetToDraftInventory=¿Está seguro de querer volver al estado Borrador?<br>Las cantidades actualmente establecidas en el inventario se restablecerán.
 WarningLineProductNotToSell=El producto o servicio "%s" no se vende y fue clonado
 PriceLabel=Etiqueta de precio
+GenerateImage=Generar imagen
+GenerateWithAI=Generar con IA
+PriceByCustomeAndMultiPricesAbility=Precios diferentes para cada cliente + Múltiples segmentos de precios por producto/servicio (cada cliente está en un segmento de precio)
diff --git a/htdocs/langs/es_ES/salaries.lang b/htdocs/langs/es_ES/salaries.lang
index 8167a95501e..40813768d26 100644
--- a/htdocs/langs/es_ES/salaries.lang
+++ b/htdocs/langs/es_ES/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Nuevo salario
 AddSalary=Agregar salario
 NewSalaryPayment=Nueva tarjeta de salario
 AddSalaryPayment=Añadir pago de salario
+SalaryID=Identificación de salario
+SalaryAmount=Monto del salario
 SalaryPayment=Pago de salario
 SalariesPayments=Pagos de salarios
 SalariesPaymentsOf=Pagos de sueldos de %s
@@ -27,7 +29,7 @@ FillFieldFirst=Primero rellene el campo de empleado
 UpdateAmountWithLastSalary=Fijar el monto del último salario
 MakeTransferRequest=Realizar solicitud de transferencia
 VirementOrder=Solicitud de transferencia de crédito
-BankTransferAmount=Monto de la transferencia de crédito
 WithdrawalReceipt=Orden de transferencia bancaria
 OrderWaiting=Orden pendiente
 FillEndOfMonth=Llenar con fin de mes
+UserPaySlip=Recibo de pago
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index 1618b724197..94ca4357384 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Utilice aquí la lista de otros nombres/alias para que tamb
 WEBSITE_CSS_URL=URL del fichero CSS externo
 WEBSITE_CSS_INLINE=Contenido del archivo CSS (común a todas las páginas)
 WEBSITE_JS_INLINE=Contenido del archivo JavaScript (común a todas las páginas)
-WEBSITE_HTML_HEADER=Adición en la parte inferior del encabezado HTML (común a todas las páginas)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Archivo de robots (robots.txt)
 WEBSITE_HTACCESS=Archivo .htaccess del sitio web
 WEBSITE_MANIFEST_JSON=Archivo manifest.json del sitio web
@@ -56,16 +56,17 @@ ReadPerm=Leido
 WritePerm=Escribir
 TestDeployOnWeb=Prueba/despliegue en la web
 PreviewSiteServedByWebServer=<u>Vista previa de %s en una nueva pestaña.</u> <br><br>%s será servido por un servidor web externo (como Apache, Nginx, IIS). Debe instalar y configurar este servidor antes de apuntar al directorio:<br><strong>%s</strong><br> URL servida por el servidor externo: <br><strong>%s</strong>
-PreviewSiteServedByDolibarr= <u> Obtenga una vista previa de %s en una pestaña nueva. </u> <br> <br> El %s será servido por el servidor Dolibarr por lo que no necesita ningún servidor web adicional (como Apache, Nginx, IIS) para ser instalado. <br> El inconveniente es que las URL de las páginas no son fáciles de usar y comienzan con la ruta de tu Dolibarr. <br> URL servida por Dolibarr: <br> <strong> %s </strong> <br> <br> Para utilizar su propio servidor web exterior al servicio de este sitio web, crear una máquina virtual en su servidor Web que señala en el directorio <br> <strong> %s </strong> <br> a continuación, introduzca el nombre de este servidor virtual en las propiedades de este sitio web y haga clic en el enlace "Probar / Implementar en la web".
+PreviewSiteServedByDolibarr=<u>Vista previa de %s en una nueva pestaña.</u><br><br>El servidor Dolibarr servirá al %s, por lo que no necesita instalar ningún servidor web adicional (como Apache, Nginx, IIS).<br>El El inconveniente es que las URL de las páginas no son fáciles de usar y comienzan con la ruta de su Dolibarr.<br>URL servida por Dolibarr:<br><strong>%s</strong><br><br>Para implementar o probar usando su propio servidor web externo (como Apache, Nginx, Lighttp) utilizan el enlace "%s".
 VirtualHostUrlNotDefined=URL del Host Virtual servido por un servidor externo no definido
 NoPageYet=No hay páginas todavía
 YouCanCreatePageOrImportTemplate=Puede crear una nueva página o importar una plantilla de sitio web completa
 SyntaxHelp=Ayuda en la sintaxis del código
 YouCanEditHtmlSourceckeditor=Puede editar código fuente HTML utilizando el botón "Origen" en el editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Para incluir un  <strong>imagen</strong> almacenada en el directorio <strong>documents</strong> , utilice el contenedor <strong>viewimage.php</strong>.<br>Ejemplo, para una imagen en documentos/medios (directorio abierto para acceso público), la sintaxis es:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt; </strong><br>
-YouCanEditHtmlSource2=Para una imagen compartida con un enlace para compartir (acceso abierto usando la clave hash para compartir del archivo), la sintaxis es: <br><strong> &lt;img src="/viewimage.php? Hashp=12345679012 ..."&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Puede incluir código PHP en esta fuente usando las etiquetas <strong>&lt;?php ?&gt;</strong>. Están disponibles las siguientes variables globales: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> También puede incluir contenido de otra página/contenedor con la siguiente sintaxis:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> Puede realizar una redirección a otra página/contenedor con la siguiente sintaxis (Nota: no muestre ningún contenido antes de una redirección):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>También puede realizar una redirección con parámetros GET:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> Para agregar un enlace a otra página, use la sintaxis:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span>Puede establecer dinámicamente el título de la página y las <strong>metaetiquetas SEO</strong> (título, palabras clave, descripción). Simplemente defina las siguientes variables: <br><code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Separados por comas</code> <br><code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> Para incluir un enlace <strong> para descargar</strong> un archivo almacenado en el directorio <strong>documents</strong>, utilice el contenedor <strong>document.php</strong>:<br>Ejemplo, para un archivo en documentos/ecm (que debe registrarse), la sintaxis es:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Para un archivo en documentos/medios (directorio abierto para acceso público), la sintaxis es:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Para un archivo compartido con un enlace compartido (acceso abierto usando la clave hash de uso compartido del archivo), la sintaxis es:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Para incluir una <strong>image</strong> almacenada en el directorio <strong>medias</strong> (directorio abierto para acceso público), use la ruta relativa que comienza con <strong>/medias</strong>, ejemplo:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=Para una imagen compartida con un enlace para compartir (acceso abierto usando la clave hash de uso compartido del archivo), use el contenedor: <br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=Para obtener la URL de la imagen de un objeto PHP, utiliza<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=Para obtener la URL de una imagen dentro de un contenido html de un artículo, utilice <br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=Más ejemplos de código HTML o dinámico disponibles en <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">la documentación de la wiki</a>.
 ClonePage=Clonar página/contenedor
 CloneSite=Clonar sitio
@@ -87,15 +88,15 @@ WebsiteAccount=Cuenta del sitio web
 WebsiteAccounts=Cuentas del sitio web
 AddWebsiteAccount=Crear cuenta de sitio web
 BackToListForThirdParty=Volver a la lista de terceros
-DisableSiteFirst=Deshabilite primero el sitio web
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Título de mi sitio web
 AnotherContainer=Así es como se incluye el contenido de otra página/contenedor (puede tener un error aquí si habilita el código dinámico porque el subcontenedor incrustado puede no existir)
 SorryWebsiteIsCurrentlyOffLine=Lo sentimos, este sitio web está actualmente fuera de línea. Vuelve más tarde...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Habilitar tabla de cuentas del sitio web
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Habilitar tabla para almacenar cuentas del sitio web (inicio de sesión/contraseña) para cada sitio web/tercero
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Antes debe definir la página de inicio por defecto
-OnlyEditionOfSourceForGrabbedContentFuture=Advertencia: la creación de una página web importando una página web externa está reservada para usuarios experimentados. Dependiendo de la complejidad de la página de origen, el resultado de la importación puede diferir del original. Además, si la página de origen utiliza estilos CSS comunes o JavaScript conflictivo, puede alterar el aspecto o las funciones del editor del sitio web al trabajar en esta página. Este método es una forma más rápida de crear una página, pero se recomienda crear su nueva página desde cero o a partir de una plantilla de página sugerida.<br>Tenga en cuenta también que es posible que el editor en línea no funcione corrección cuando se usa en una página externa capturada.
-OnlyEditionOfSourceForGrabbedContent=Nota: solo será posible editar una fuente HTML cuando el contenido de una página se integre utilizando una página externa
+OnlyEditionOfSourceForGrabbedContentFuture=Advertencia: La creación de una página web mediante la importación de una página web externa está reservada para usuarios experimentados. Según la complejidad de la página de origen, el resultado de la importación puede diferir del original. Además, si la página de origen utiliza estilos CSS comunes o JavaScript conflictivo, puede afectar el aspecto o las funciones del editor de sitios web al trabajar en esta página. Este método es una forma más rápida de crear una página, pero se recomienda crear la página nueva desde cero o a partir de una plantilla de página sugerida.<br>Ten en cuenta también que el editor en línea puede no funcionar correctamente cuando se utiliza en una página externa capturada.
+OnlyEditionOfSourceForGrabbedContent=Solo es posible modificar el código fuente HTML cuando el contenido se obtiene de un sitio externo
 GrabImagesInto=Obtener también imágenes encontradas en css y página.
 ImagesShouldBeSavedInto=Las imágenes deben guardarse en el directorio
 WebsiteRootOfImages=Directorio para las imágenes de la web
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Cerrar sesión en su cuenta de cliente
 filteredByVersion=Filtrado por versión
 removeFilter=Eliminar filtro
 viewMyCart=Ver mi carrito de compras
+Shipping=Shipping
 freeShipping=¡Envío gratis!
 noProducts=Sin productos
 nbrItemsInCart=Hay <span class="ajax_cart_quantity">0</span> artículos en su carrito.
@@ -284,12 +286,13 @@ productNameAToZ=Nombre del producto: de la A a la Z
 productNameZToA=Nombre del producto: Z a A
 referenceLowestFirst=Referencia: el más bajo primero
 referenceHighestFirst=Referencia: Más alto primero
+productPerPage=products per page
 perPage=por página
 showAll=Mostrar todo
 showing= Demostración
 nbrOfProducts= Hay productos %s.
 noResultsHaveBeenFound=Se han encontrado 0 resultados.
-noResultsWereFound= No se encontraron resultados.
+noResultsWereFound=No se encontraron resultados.
 addToCart=Añadir a la cesta
 backHome=Volver a Home
 priceDrop=Bajada de precios
@@ -302,10 +305,11 @@ lastUpdate=Última actualización
 contactSupport=Cómo contactar al soporte
 noProductToDisplay=Error, No hay producto para mostrar
 yourCompanyInformation=Información de tu empresa
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=Este correo electrónico ya está registrado.
 firstnameContainsLettersOnly=<b>Nombre</b> debe contener letras y espacios únicamente
 lastnameContainsLettersOnly=<b>Apellido</b> debe contener letras y espacios únicamente
-passwordCriteria=<b>Contraseña</b> debe cumplir con los siguientes criterios:<br>- 12 caracteres<br>- 1 letra mayúscula<br>- 1 dígito<br>- Sin caracteres especiales<br>- Evite repetir caracteres más de 3 veces<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=Se ha producido un error.
 accountCreation=Crea una cuenta
 errorsOccurred=Hay %s error%s
@@ -357,3 +361,7 @@ subtract=Sustraer
 LoginCheckout=Iniciar sesión y proceder al pago
 paymentSuccessProcessed=Su pago ha sido procesado exitosamente.
 youWillBeRedirectedToOrderPage=En breve serás redirigido a la página de detalles del pedido.
+WebPortalSetupNotComplete=La configuración del portal web no está completa
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/es_MX/banks.lang b/htdocs/langs/es_MX/banks.lang
index 1878fb82d17..3f6bdd0c9c3 100644
--- a/htdocs/langs/es_MX/banks.lang
+++ b/htdocs/langs/es_MX/banks.lang
@@ -13,6 +13,8 @@ BalanceMinimalAllowed=Saldo mínimo permitido
 ShowAllTimeBalance=Mostrar saldo desde el principio
 Reconciliation=Reconciliación
 RIB=Número de cuenta bancaria
+IBAN=CLABE Interbancaria
+BIC=Cuentas bancarias | Pasarelas
 SwiftValid=BIC / SWIFT válido
 SwiftNotValid=BIC / SWIFT no válido
 StandingOrders=Órdenes de domiciliación bancaria
diff --git a/htdocs/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang
index 2f57406a6fb..3afd8716783 100644
--- a/htdocs/langs/es_MX/companies.lang
+++ b/htdocs/langs/es_MX/companies.lang
@@ -28,7 +28,6 @@ State=Estado/Provincia
 CountryCode=Código de país
 PhonePerso=Teléfono particular
 PhoneMobile=Celular
-No_Email=Rechazar correos masivos
 Town=Ciudad
 Web=Página de internet
 VATIsUsed=Impuesto a las ventas utilizado
@@ -177,11 +176,9 @@ ChangeContactInProcess=Cambiar estado a 'Contacto en proceso'
 ChangeContactDone=Cambiar estado a 'Contacto realizado'
 NoParentCompany=Ninguno
 DolibarrLogin=Login de usuario
-ExportDataset_company_1=Terceros (Empresas/fundaciones/personas físicas) y sus propiedades
-ExportDataset_company_2=Contactos y propiedades
+ExportDataset_company_2=Contactos/Direcciones adicionales del tercero
 ImportDataset_company_1=Terceros y sus propiedades
 ImportDataset_company_2=Contactos/Direcciones adicionales del tercero
-ImportDataset_company_3=Cuentas de banco del tercero
 ImportDataset_company_4=Representante de ventas del tercero (asigna representantes de ventas/usuarios de companias)
 PriceLevel=Nivel de precio
 PriceLevelLabels=Etiquetas de nivel de precios
diff --git a/htdocs/langs/es_MX/exports.lang b/htdocs/langs/es_MX/exports.lang
index 0cf9c5c4990..205c57e77d7 100644
--- a/htdocs/langs/es_MX/exports.lang
+++ b/htdocs/langs/es_MX/exports.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - exports
 LineDescription=Descripción de la línea
+InformationOnSourceFile=Archivo fuente
 ComputedField=Campo calculado
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index 138f954d774..55457642f44 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -101,6 +101,7 @@ SaveAs=Guardar como
 SaveAndStay=Guardar y quedarse
 TestConnection=Probar conexión
 ToClone=Clonar
+ConfirmCloneAsk=¿Está seguro de que desea clonar el objeto <b> %s </b>?
 NoCloneOptionsSpecified=No se definió información a clonar.
 Run=Ejecutar
 Hide=Ocultar
@@ -181,6 +182,7 @@ Opened=Abierta
 ByCompanies=Por terceros
 Links=Vínculos
 Link=Vínculo
+Rejects=Rechazos
 Preview=Previsualización
 None=Ninguno
 NoneF=Ninguno
@@ -224,6 +226,7 @@ Undo=Deshacer
 UndoExpandAll=Deshacer ampliar
 FeatureNotYetSupported=Característica aún no soportada
 TextUsedInTheMessageBody=Cuerpo del correo electronico
+EMails=Correos electrónicos
 NoEMail=Sin correo electrónico
 FollowingConstantsWillBeSubstituted=Las siguientes constantes serán reemplazadas con el valor correspondiente.
 Refresh=Actualizar
@@ -344,3 +347,4 @@ ErrorFailedToDeleteLink=No se pudo eliminar el vínculo '<b> %s </b>'
 ErrorFailedToUpdateLink=Error al actualizar el vínculo '<b> %s </b>'
 URLToLink=URL para vincular
 Settings=Configuración
+AllTime=Desde el principio
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 820a324313c..bb1d085fe9d 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -7,7 +7,6 @@ UseSearchToSelectCompanyTooltip=También si tiene un gran número de terceros (>
 UseSearchToSelectContactTooltip=También si usted tiene un gran número de terceros (> 100 000), puede aumentar la velocidad mediante el establecimiento CONTACT_DONOTSEARCH_ANYWHERE constante a 1 en Configuración-> Otros. La búsqueda será limitada a la creación de cadena.
 NotConfigured=Módulo / Aplicación no configurada
 GenericMaskCodes3=Cualquier otro carácter en la máscara se quedará sin cambios. <br>No se permiten espacios <br>
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarily a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 Module1780Desc=Crear etiquetas/Categoría (Productos, clientes, proveedores, contactos y miembros)
 Permission254=Modificar la contraseña de otros usuarios
 Permission255=Eliminar o desactivar otros usuarios
@@ -34,4 +33,4 @@ WatermarkOnDraftSupplierProposal=Marca de agua en solicitudes de precios a prove
 LDAPMemberObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPUserObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPContactObjectClassListExample=Lista de objectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
-HelpCssOnViewDesc=The CSS used when viewing the field.
+activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
diff --git a/htdocs/langs/es_VE/products.lang b/htdocs/langs/es_VE/products.lang
index 622a59a3ce7..7c6e619f1dd 100644
--- a/htdocs/langs/es_VE/products.lang
+++ b/htdocs/langs/es_VE/products.lang
@@ -7,6 +7,10 @@ ProductsOnSaleOnly=Productos solo a para venta
 ProductsOnPurchaseOnly=Productos solo para compra
 ProductStatusNotOnBuyShort=Fuera compra
 ExportDataset_produit_1=Productos
+unitG=Gram
+unitM=Meter
+unitM2=Square meter
+unitM3=Cubic meter
 PriceExpressionEditorHelp2=Puede acceder a los atributos adicionales con variables como <b>#extrafield_myextrafieldkey#</b> y variables globales con <b>#global_mycode#</b>
 NbProducts=Numero de productos
 PMPValue=Valor (PMP)
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 4e41d21c780..00b06759410 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however som
 FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Tee rakenduse failide terviklikkuse kontroll
-LocalSignature=Kohalikult manustatud signatuur (vähem usaldusväärne)
-RemoteSignature=Kaugmanustatud signatuur (rohkem usaldusväärne)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Puuduvad failid
 FilesUpdated=Uuendatud failid
 FilesModified=Muudetud failid
@@ -81,7 +81,7 @@ DisableJavascriptNote=Note: For test or debug purpose only. For optimization for
 UseSearchToSelectCompanyTooltip=Suure kolmandate isikute arvu korral (> 100 000) saab kiiruse suurendamiseks seadistada Seadistamine->Muu menüüs konstandi COMPANY_DONOTSEARCH_ANYWHERE väärtuseks 1. Sellisel juhul piirdub otsing sõne algusega.
 UseSearchToSelectContactTooltip=Suure kolmandate isikute arvu korral (> 100 000) saab kiiruse suurendamiseks seadistada Seadistamine->Muu menüüs konstandi CONTACT_DONOTSEARCH_ANYWHERE väärtuseks 1. Sellisel juhul piirdub otsing sõne algusega.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
+DelaiedFullListToSelectContact=Enne kontaktide liitloendi sisu laadimist oodake, kuni klahvi vajutatakse.<br>Kui teil on palju kontakte, võib see jõudlust suurendada, kuid see pole nii mugav.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Otsingutekst
@@ -89,7 +89,7 @@ NotAvailableWhenAjaxDisabled=Ei ole saadaval, kui Ajax on välja lülitatud
 AllowToSelectProjectFromOtherCompany=Kolmanda osapoole dokumendil saab valida teise kolmanda osapoolega seotud projekti
 TimesheetPreventAfterFollowingMonths=Prevent recording time spent after the following number of months
 PROJECT_DISPLAY_LINKED_BY_CONTACT=Display project linked by a common contact
-PROJECT_DISPLAY_LINKED_BY_CONTACT_help=This option adds a new list on Project tab with all projects linked to thirdparty via a contact relationship
+PROJECT_DISPLAY_LINKED_BY_CONTACT_help=See suvand lisab vahekaardile Projekt uue loendi kõigi projektidega, mis on kontaktsuhte kaudu lingitud kolmanda osapoolega
 JavascriptDisabled=JavaScript on välja lülitatud
 UsePreviewTabs=Kasuta eelvaate sakke
 ShowPreview=Kuva eelvaade
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Turvalisus
 Passwords=Paroolid
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
@@ -375,7 +375,7 @@ GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-000099</b><br
 GenericMaskCodes5b=<b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Lisab määratletud maskile vastava kohandatava arvu.
 DateStartThatModel=Disable use of this numbering rule for all thirdparties created before
-DateStartThatModelHelp=You can disable elephant numbering rule for thirdparties created before a date (for example, because they were imported by a migration, from another software using a different rule). Let that field empty to have the rule applied on all thirdparties.
+DateStartThatModelHelp=Saate keelata nummerdamisreegli kolmandate osapoolte jaoks, kes on loodud enne kuupäeva (nt kuna need imporditi migreerimise teel, teisest tarkvarast, mis kasutab teistsugust reeglit). Jätke see väli tühjaks, et reegel rakenduks kõigile kolmandatele osapooltele.
 ServerAvailableOnIPOrPort=Server on saadaval aadressil <b>%s</b> pordil <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server ei ole kättesaadav aadressil <b>%s</b> pordi <b>%s</b>
 DoTestServerAvailability=Test serveri ühendust
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Arvutatud väli
-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=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'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored WITHOUT encryption (field is just hidden with stars on screen).<br><br>Enter value 'dolcrypt' to encode value with a reversible encryption algorithm. Clear data can still be known and edited but is encrypted into database.<br><br>Enter 'auto' (or 'md5', 'sha256', 'password_hash', ...) to use the default password encryption algorithm (or md5, sha256, password_hash...) to save the non reversible hashed password into database (no way to retrieve original value)
@@ -475,7 +476,6 @@ ExtrafieldParamHelpselect=List of values must be lines with format key,value (wh
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarily a primary int key<br>- filtersql is a condition. It must use the USF syntax. Example: (active:=:1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>If you want to filter on extrafields use syntax  extra.fieldcode=... (where fieldcode is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1 to display only active value)<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -520,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
 WarningPHPMailD=It is therefore recommended to change the sending method of e-mails to the value "SMTP".
 WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
-WarningPHPMail2=Kui teie meili SMTP-teenuse pakkuja peab piirama meiliklienti mõne IP-aadressiga (väga harv), on see teie ERP CRM-i rakenduse meilikasutajaagendi (MUA) IP-aadress: <strong> %s </strong> .
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -565,17 +565,17 @@ Module1Desc=Ettevõtete ja kontaktide haldamine (kliendid, huvilised ...)
 Module2Name=Pakkumised
 Module2Desc=Pakkumiste seadistamine
 Module10Name=Raamatupidamine (lihtsustatud)
-Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
+Module10Desc=Lihtsad raamatupidamisaruanded (päevaraamatud, käive) andmebaasi sisu alusel. Ei kasuta ühtegi pearaamatu tabelit.
 Module20Name=Pakkumised
 Module20Desc=Pakkumiste haldamine
-Module22Name=Massilised meilid
-Module22Desc=Halda hulgimeilide saatmist
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energia
 Module23Desc=Energiatarbimise järelevalve
 Module25Name=Müügitellimused
 Module25Desc=Müügitellimuste haldamine
 Module30Name=Arved
-Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
+Module30Desc=Klientide arvete ja kreeditarvete haldamine. Tarnijate arvete ja kreeditarvete haldamine
 Module40Name=Tarnijad
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
@@ -630,7 +630,7 @@ Module320Name=RSS voog
 Module320Desc=Add a RSS feed to Dolibarr pages
 Module330Name=Bookmarks & Shortcuts
 Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
-Module400Name=Projects or Leads
+Module400Name=Projektid või müügivihjed
 Module400Desc=Projektide, juhtumite ja/või ülesannete haldamine. Samuti saate määrata projekti vaatest mis tahes elemendi (arve, tellimus, ettepanek, sekkumine, ...) ja saada projekti vaatest üldine ülevaade.
 Module410Name=Webcalendar
 Module410Desc=WebCalendari integratsioon
@@ -663,8 +663,8 @@ Module1780Name=Sildid/kategooriad
 Module1780Desc=Siltide/kategooriate loomine (tooted, kliendid, hankijad, kontaktid või liikmed)
 Module2000Name=WYSIWYG toimeti
 Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
-Module2200Name=Dynamic Prices
-Module2200Desc=Use maths expressions for auto-generation of prices
+Module2200Name=Dünaamilised hinnad
+Module2200Desc=Kasutage hindade automaatseks genereerimiseks matemaatilisi avaldisi
 Module2300Name=Plaanitud käivitused
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
@@ -705,15 +705,15 @@ Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for product
 Module40000Name=Multicurrency
 Module40000Desc=Use alternative currencies in prices and documents
 Module50000Name=Paybox
-Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50000Desc=Pakkuge klientidele PayBoxi veebipõhist makselehte (krediit-/deebetkaardid). Seda saab kasutada selleks, et võimaldada teie klientidel teha ad hoc makseid või makseid, mis on seotud konkreetse Dolibarri objektiga (arve, tellimus jne)
 Module50100Name=POS SimplePOS
 Module50100Desc=Point of Sale module SimplePOS (simple POS).
 Module50150Name=POS TakePOS
 Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
 Module50200Name=Paypal
-Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50200Desc=Pakkuge klientidele PayPali veebipõhist makselehte (PayPali konto või krediit-/deebetkaardid). Seda saab kasutada selleks, et võimaldada teie klientidel teha ad hoc makseid või makseid, mis on seotud konkreetse Dolibarri objektiga (arve, tellimus jne)
 Module50300Name=Stripe
-Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50300Desc=Pakkuge klientidele Stripe'i veebimaksete lehte (krediit-/deebetkaardid). Seda saab kasutada selleks, et võimaldada teie klientidel teha ad hoc makseid või makseid, mis on seotud konkreetse Dolibarri objektiga (arve, tellimus jne)
 Module50400Name=Accounting (double entry)
 Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
@@ -750,15 +750,15 @@ Permission27=Pakkumiste kustutamine
 Permission28=Pakkumiste ekspor
 Permission31=Toodete vaatamine
 Permission32=Toodete loomine/muutmine
-Permission33=Read prices products
+Permission33=Loe toodete hindu
 Permission34=Toodete kustutamine
 Permission36=Peidetud toodete vaatamine/haldamine
 Permission38=Toodete eksport
 Permission39=Ignore minimum price
 Permission41=Loe projekte ja ülesandeid (jagatud projekte ja projekte, millega olen seotud).
 Permission42=Loo/muuda projekte (jagatud projekte ja projekte, millega olen kontaktis). Saab samuti määrata kasutajaid projektidele ja ülesannetele.
-Permission44=Delete projects (shared projects and projects of which I am a contact)
-Permission45=Export projects
+Permission44=Kustuta projektid (jagatud projektid ja projektid, mille kontakt olen)
+Permission45=Ekspordi projektid
 Permission61=Sekkumiste vaatamine
 Permission62=Sekkumiste loomine/muutmine
 Permission64=Sekkumiste kustutamine
@@ -848,10 +848,10 @@ Permission212=Tellimuse read
 Permission213=Aktiveeri rida
 Permission214=Telefonitehnika seadistamine
 Permission215=Pakkujate seadistamine
-Permission221=E-kirjade lugemine
-Permission222=E-kirjade loomine/muutmine (teema, saajad jne)
-Permission223=E-kirjade kinnitamine (lubab saatmise)
-Permission229=E-kirjade kustutamine
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Saajate ja info vaatamine
 Permission238=Kirjade käsitsi saatmine
 Permission239=Kirjade kustutamine pärast kinnitamist või saatmist
@@ -869,7 +869,7 @@ Permission255=Teiste kasutajate paroolide muutmine
 Permission256=Teiste kasutajate kustutamine või keelamine
 Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is linked as a sale representative).
 Permission262b=Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).
-Permission262c=Not effective for projects (only rules on project permissions, visibility and users assignment matter).
+Permission262c=Projektide puhul ei kehti (olulised on ainult projektilubade, nähtavuse ja kasutajate määramise reeglid).
 Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
 Permission271=CA vaatamine
 Permission272=Arvete vaatamine
@@ -915,7 +915,7 @@ Permission525=Access loan calculator
 Permission527=Export loans
 Permission531=Teenuste vaatamine
 Permission532=Teenuste loomine/muutmine
-Permission533=Read prices services
+Permission533=Lugege teenuste hindu
 Permission534=Teenuste kustutamine
 Permission536=Peidetud teenuste vaatamine/haldamine
 Permission538=Teenuste eksport
@@ -1106,6 +1106,7 @@ DictionaryStaff=Number of Employees
 DictionaryAvailability=Tarneaeg
 DictionaryOrderMethods=Order methods
 DictionarySource=Pakkumiste/tellimuste päritolu
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Personalized groups for reports
 DictionaryAccountancysystem=Kontoplaani mudelid
 DictionaryAccountancyJournal=Accounting journals
@@ -1116,7 +1117,7 @@ DictionarySocialNetworks=Sotsiaalvõrgud
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Leave - Types of leave
-DictionaryOpportunityStatus=Lead status for project/lead
+DictionaryOpportunityStatus=Projekti/müügivihje staatus
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
@@ -1135,11 +1136,11 @@ BackToDictionaryList=Back to Dictionaries list
 TypeOfRevenueStamp=Type of tax stamp
 VATManagement=Sales Tax Management
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
 VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
 VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Type of sales tax
 LTRate=Määr
@@ -1175,6 +1176,7 @@ NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), yo
 LabelUsedByDefault=Vaikimisi kasutatav silt, kui koodile ei leitud tõlke vastet
 LabelOnDocuments=Dokumentide silt
 LabelOrTranslationKey=Label or translation key
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1319,8 +1321,8 @@ MiscellaneousOptions=Miscellaneous options
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Piiride/täpsuse seadistamine
 LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
+MAIN_MAX_DECIMALS_UNIT=Max ühikuhindade kümnendkohad
+MAIN_MAX_DECIMALS_TOT=Max koma koguhindade jaoks
 MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
 MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Toote neto ühikuhind
@@ -1432,7 +1434,7 @@ AddVatInList=Display Customer/Vendor VAT number into combo lists.
 AddAdressInList=Display Customer/Vendor address into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
-FieldEdition=Välja %s muutmine
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Näide: +2 (täida vaid siis, kui koged ajavööndi nihkega probleeme)
 GetBarCode=Hangi triipkood
 NumberingModules=Numbering models
@@ -1487,6 +1489,8 @@ ForceInvoiceDate=Sunni arve kuupäevaks arve kinnitamise kuupäev
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
 SuggestPaymentByChequeToAddress=Suggest payment by check to
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Vaba tekst arvetel
 WatermarkOnDraftInvoices=Vesimärk arvete mustanditel (puudub, kui tühi)
 PaymentsNumberingModule=Payments numbering model
@@ -1719,6 +1723,7 @@ CompressionOfResources=HTTP vastuste kokku pakkimine
 CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Default values (to use on forms)
 DefaultSearchFilters=Default search filters
 DefaultSortOrder=Default sort orders
@@ -1801,6 +1806,7 @@ SendingsNumberingModules=Saatmiste numeratsiooni moodulid
 SendingsAbility=Support shipping sheets for customer deliveries
 NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Saatedokumentide numeratsiooni moodul
 DeliveryOrderModel=Saatedokumentide mudel
@@ -1809,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Vaba tekst saatedokumentidel
 ##### FCKeditor #####
 AdvancedEditor=Keerulisem toimeti
 ActivateFCKeditor=Aktiveeri keerulisem toimeti järgmistel lehtedel:
-FCKeditorForNotePublic=WYSIWYG creation/edition of the field "public notes" of elements
-FCKeditorForNotePrivate=WYSIWYG creation/edition of the field "private notes" of elements
-FCKeditorForCompany=WYSIWYG creation/edition of the field description of elements (except products/services)
-FCKeditorForProductDetails=WYSIWYG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, 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.
-FCKeditorForMailing= WYSIWYG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWYG creation/edition of user signature
-FCKeditorForMail=WYSIWYG creation/edition for all mail (except Tools->eMailing)
-FCKeditorForTicket=WYSIWYG creation/edition for tickets
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=Kui kasutate vaikimisi pakutavat müügikoha moodulit (POS) või välismoodulit, võib see seadistus teie POS-mooduli poolt ignoreerida. Enamik POS-mooduleid on vaikimisi kujundatud arve loomiseks kohe ja varude vähendamiseks sõltumata siinsetest valikutest. Seega, kui teil on vaja või mitte varude vähendamist müügi registreerimisel oma POS-ist, kontrollige ka oma POS-mooduli seadistust.
@@ -1868,7 +1874,6 @@ Buy=Ost
 Sell=Müük
 InvoiceDateUsed=Kasutatakse arve kuupäeva
 YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
-AccountancyCode=Accounting Code
 AccountancyCodeSell=Müügikonto kood
 AccountancyCodeBuy=Ostukonto kood
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
@@ -1880,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Which view do you want to open by default when selecting m
 AGENDA_EVENT_PAST_COLOR = Past event color
 AGENDA_EVENT_CURRENT_COLOR = Current event color
 AGENDA_EVENT_FUTURE_COLOR = Future event color
-AGENDA_REMINDER_BROWSER = Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Enable sound notification
-AGENDA_REMINDER_EMAIL = Luba sündmuse meeldetuletus <b> meili teel </b> (igal sündmusel saab määrata meeldetuletuse valiku/viivituse).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT = Show linked object into agenda view
 AGENDA_USE_EVENT_TYPE = Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Automatically set this default value for type of event in event create form
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Ekspordilingi autoriseerimise võti
 PastDelayVCalExport=Ära ekspordi tegevusi, mis on vanemad kui
 SecurityKey = Security Key
@@ -1986,7 +1996,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Formaat
-TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0: kliendi makse tüüp, 1: tarnija makse tüüp, 2: nii klientide kui tarnijate maksetüüp
 IncludePath=Include path (defined into variable %s)
 ##### Expense reports #####
 ExpenseReportsSetup=Setup of module Expense Reports
@@ -2007,7 +2017,7 @@ BackupZipWizard=Wizard to build the archive of documents directory
 SomethingMakeInstallFromWebNotPossible=Välimise mooduli paigaldamine veebiliidesest ei ole võimalik järgmisel põhjusel:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
 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.
-InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
@@ -2037,6 +2047,7 @@ Enter0or1=Enter 0 or 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Icon name in format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sales tax rate
@@ -2073,7 +2084,7 @@ MailToUser=Kasutajad
 MailToProject=Projektid
 MailToTicket=Tugipiletid
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
+YouUseLastStableVersion=Kasutate uusimat stabiilset versiooni
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
@@ -2132,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
 MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipient address frame
 MAIN_PDF_HIDE_CUSTOMER_CODE=Hide customer code
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Hide sender/company name in address block
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Hide payments conditions
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Hide payment mode
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2145,9 +2161,9 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN
 COMPANY_AQUARIUM_NO_PREFIX=Do not use prefix, only copy customer or supplier code
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
 DuplicateForbidden=Duplicate forbidden
-RemoveSpecialWords=Clean certain words when generating sub-accounts for customers or suppliers
+RemoveSpecialWords=Klientide või tarnijate alamkontode loomisel puhastage teatud sõnad
 RemoveSpecialWordsHelp=Specify the words to be cleaned before calculating the customer or supplier account. Use a ";" between each word
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
+GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact, ...)
 GDPRContactDesc=If you store personal data in your Information System, you can name the contact who is responsible for the General Data Protection Regulation here
 HelpOnTooltip=Help text to show on tooltip
 HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
@@ -2197,7 +2213,7 @@ EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Scan your mai
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Example collecting e-mail answers sent from an external e-mail software
 EmailCollectorExampleToCollectDolibarrAnswersDesc=Collect all emails that are an answer of an email sent from your application. An event (Module Agenda must be enabled) with the email response will be recorded at the good place. For example, if you send a commercial proposal, order, invoice or message for a ticket by email from the application, and the recipient answers your email, the system will automatically catch the answer and add it into your ERP.
 EmailCollectorExampleToCollectDolibarrAnswers=Example collecting all ingoing messages being answers to messages sent from Dolibarr'
-EmailCollectorExampleToCollectLeadsDesc=Collect emails that match some rules and create automatically a lead (Module Project must be enabled) with the email information. You can use this collector if you want to follow your lead using the module Project (1 lead = 1 project), so your leads will be automatically generated. If the collector Collect_Responses is also enabled, when you send an email from your leads, proposals or any other object, you may also see answers of your customers or partners directly on the application.<br>Note: With this initial example, the title of the lead is generated including the email. If the third party can't be found in database (new customer), the lead will be attached to the third party with ID 1.
+EmailCollectorExampleToCollectLeadsDesc=Koguge e-kirjad, mis vastavad mõnele reeglile, ja looge automaatselt müügivihje (moodulprojekt peab olema lubatud) e-posti teabega. Saate seda kogujat kasutada, kui soovite jälgida oma juhtpositsiooni, kasutades moodulit Projekt (1 müügivihje = 1 projekt), nii et teie müügivihjed genereeritakse automaatselt. Kui koguja Collect_Responses on samuti lubatud, võite müügivihjetelt, ettepanekutelt või mõnelt muult objektilt meili saatmisel näha ka otse rakenduses klientide või partnerite vastuseid.<br>Märkus. Selle esialgse näite puhul luuakse müügivihje pealkiri koos meiliga. Kui kolmandat osapoolt andmebaasist ei leita (uus klient), lisatakse müügivihje kolmandale isikule ID 1-ga.
 EmailCollectorExampleToCollectLeads=Example collecting leads
 EmailCollectorExampleToCollectJobCandidaturesDesc=Collect emails applying to job offers (Module Recruitment must be enabled). You can complete this collector if you want to automatically create a candidature for a job request. Note: With this initial example, the title of the candidature is generated including the email.
 EmailCollectorExampleToCollectJobCandidatures=Example collecting job candidatures received by e-mail
@@ -2226,7 +2242,7 @@ OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
 UseSearchToSelectResource=Kasutage ressursi valimiseks otsinguvormi (mitte ripploendit).
 DisabledResourceLinkUser=Disable feature to link a resource to users
-DisabledResourceLinkContact=Disable feature to link a resource to contacts
+DisabledResourceLinkContact=Keela funktsioon ressursi linkimiseks kontaktidega
 EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
@@ -2242,7 +2258,7 @@ ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user fr
 DefaultCustomerType=Default third-party type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
 RootCategoryForProductsToSell=Root category of products to sell
-RootCategoryForProductsToSellDesc=If defined, only products inside this category or children of this category will be available in the Point Of Sale
+RootCategoryForProductsToSellDesc=Kui see on määratletud, on müügikohas saadaval ainult selle kategooria tooted või selle kategooria alamtooted
 DebugBar=Debug Bar
 DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
 DebugBarSetup=DebugBar Setup
@@ -2290,7 +2306,7 @@ THIRDPARTY_ALIAS=Third-party name - Third-party alias
 ALIAS_THIRDPARTY=Third-party alias - Third-party name
 PDFIn2Languages=Show labels in the PDF in 2 different languages (this feature may not work for some couple of languages)
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
-PDF_USE_A=Generate PDF documents with format PDF/A instead of default format PDF
+PDF_USE_A=PDF documents format
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
@@ -2325,6 +2341,8 @@ NotRecommended=Not recommended
 ARestrictedPath=Some restricted path for data files
 CheckForModuleUpdate=Kontrolli kolmandate osapoolte moodulite värskendusi
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=Kolmandate osapoolte mooduleid ei leitud uuendamiseks.
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
@@ -2344,8 +2362,8 @@ DashboardDisableGlobal=Disable globally all the thumbs of open objects
 BoxstatsDisableGlobal=Disable totally box statistics
 DashboardDisableBlocks=Avatud objektide hulk (töötlemiseks või hilinemiseks) peamisel töölaual
 DashboardDisableBlockAgenda=Disable the thumb for agenda
-DashboardDisableBlockProject=Disable the thumb for projects
-DashboardDisableBlockCustomer=Disable the thumb for customers
+DashboardDisableBlockProject=Keela projektide jaoks pisipildid
+DashboardDisableBlockCustomer=Keelake klientide jaoks pisipildid
 DashboardDisableBlockSupplier=Disable the thumb for suppliers
 DashboardDisableBlockContract=Disable the thumb for contracts
 DashboardDisableBlockTicket=Disable the thumb for tickets
@@ -2382,7 +2400,7 @@ ReadOnlyMode=Is instance in "Read Only" mode
 DEBUGBAR_USE_LOG_FILE=Use the <b>dolibarr.log</b> file to trap Logs
 UsingLogFileShowAllRecordOfSubrequestButIsSlower=Use the dolibarr.log file to trap Logs instead of live memory catching. It allows to catch all logs instead of only log of current process (so including the one of ajax subrequests pages) but will make your instance very very slow. Not recommended.
 FixedOrPercent=Fixed (use keyword 'fixed') or percent (use keyword 'percent')
-DefaultOpportunityStatus=Default opportunity status (first status when lead is created)
+DefaultOpportunityStatus=Võimaluse vaikeolek (esimene olek müügivihje loomisel)
 IconAndText=Icon and text
 TextOnly=Text only
 IconOnlyAllTextsOnHover=Icon only - All texts appears under icon on mouse over menu bar
@@ -2391,13 +2409,15 @@ IconOnly=Icon only - Text on tooltip only
 INVOICE_ADD_ZATCA_QR_CODE=Show the ZATCA QR code on invoices
 INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their invoices
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices (with a bank account defined for credit transfer)
-INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
+INVOICE_ADD_SWISS_QR_CODEMore=Šveitsi arvete standard; veenduge, et ZIP ja linn on täidetud ning kontodel on kehtivad Šveitsi/Liechtensteini IBAN-id.
 INVOICE_ADD_EPC_QR_CODE=Show the EPC QR code on invoices (with a bank account defined for credit transfer)
 INVOICE_ADD_EPC_QR_CODEMore=This feature allows you to add or remove an EPC QR Code on your invoices, which facilitates automatic SEPA credit transfers. Enabling this option helps your clients make payments easily by scanning the QR code, reducing manual entry errors. Use this feature if you have clients in countries like Austria, Belgium, Finland, Germany, and the Netherlands where this system is supported. Disable it if it's not required for your business operations or client base.
 INVOICE_SHOW_SHIPPING_ADDRESS=Show shipping address
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
 DarkThemeMode=Dark theme mode
@@ -2451,7 +2471,7 @@ 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)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Not created by default. Created on module activation only.
 CSSPage=CSS Style
 Defaultfortype=Vaikimisi
@@ -2490,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2502,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2540,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2554,3 +2579,31 @@ MenuDict=Dictionary
 AddMoreParams=Add more parameters for connection (cookies, tokens, ...)<br> Example: token : value token
 ParamName=Name of parameter
 ParamValue=Value of parameter
+ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
+HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
+Captcha=Captcha
+CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
+DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
index 4539a206e39..ba92f2df8d5 100644
--- a/htdocs/langs/et_EE/banks.lang
+++ b/htdocs/langs/et_EE/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Lõppsaldo
 CurrentBalance=Hetke saldo
 FutureBalance=Tuleviku saldo
 ShowAllTimeBalance=Kuva saldoajalugu
-AllTime=Alates algusest
 Reconciliation=Vastavusse viimine
 RIB=Arvelduskonto number
 IBAN=IBAN number
@@ -133,7 +132,7 @@ DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Liikumised
-PlannedTransactions=Planned entries
+PlannedTransactions=Upcoming entries
 Graph=Graafikud
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
@@ -151,7 +150,7 @@ FutureTransaction=Tulevane tehing. Ei ole võimalik vastavusse viia.
 SelectChequeTransactionAndGenerate=Vali välja tšekid, mida lisada tšeki deponeerimise kinnitusse ning klõpsa "Loo" nupul.
 SelectPaymentTransactionAndGenerate=Select/filter the documents which are to be included in the %s deposit receipt. Then, click on "Create".
 InputReceiptNumber=Valige lepitusmenetlusega seotud pangaväljavõte. Kasutage sorteeritavat arvväärtust
-InputReceiptNumberBis=YYYYMM or YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=To reconcile?
 ThenCheckLinesAndConciliate=Siis märgista konto väljavõttel asuvad read ja klõpsa
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Kui see funktsioon on lubatud, saate valida konkreetse
 BankColorizeMovementName1=Taustavärv debiteerimise liikumiseks
 BankColorizeMovementName2=Taustavärv krediidi liikumiseks
 IfYouDontReconcileDisableProperty=Kui te ei tee pangavõrdlusi mõne pangakonto kohta, lülitage nende puhul välja omadus "%s", et eemaldada see hoiatus.
-NoBankAccountDefined=Pangakonto ei ole määratud
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Pangakontol ei ole kirjeid leitud. Tavaliselt tekib see, kui kirje on käsitsi kustutatud pangakonto tehingute nimekirjast (näiteks pangakonto kooskõlastamise käigus). Teine põhjus on see, et makse on salvestatud, kui moodul "%s" oli välja lülitatud.
 AlreadyOneBankAccount=Juba üks pangakonto määratletud
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA file variant
diff --git a/htdocs/langs/et_EE/categories.lang b/htdocs/langs/et_EE/categories.lang
index 672a99b4f61..dcf2a0ba60d 100644
--- a/htdocs/langs/et_EE/categories.lang
+++ b/htdocs/langs/et_EE/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Kontaktide siltide/kategooriate ala
 AccountsCategoriesArea=Pangakonto siltide/kategooriate ala
 ProjectsCategoriesArea=Projekti siltide/kategooriate ala
 UsersCategoriesArea=Kasutajate siltide/kategooriate ala
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Alamkategooriad
 CatList=List of tags/categories
 CatListAll=Siltide/kategooriate nimestik (kõik tüübid)
@@ -90,9 +91,10 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Kui see seade on aktiivne, siis objekti lisamisel alamkategooriasse lisatakse objekt ka ülemkategooriatesse.
 AddProductServiceIntoCategory=Assign category to the product/service
-AddCustomerIntoCategory=Lisa kategooria kliendile
-AddSupplierIntoCategory=Lisa kategooria tarnijale
-AssignCategoryTo=Lisa kategooria
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Vali kategooria
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Lehe-konteinerite kategooriad
 KnowledgemanagementsCategoriesArea=KM artikli kategooriad
 UseOrOperatorForCategories=Kategooriates kasuta 'OR' operaatorit
 AddObjectIntoCategory=Assign to the category
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index 03cf6356589..ce252cd43d4 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -34,7 +34,7 @@ PriceFormatInCurrentLanguage=Hinna kuvamise vorming praeguse keele ja valuuta ja
 ThirdPartyName=Kolmanda isiku nimi
 ThirdPartyEmail=Kolmanda isiku e-post
 ThirdParty=Kolmas isik
-ThirdParties=Kolmandad osapooled
+ThirdParties=Kolmandad isikud
 ThirdPartyProspects=Huvilised
 ThirdPartyProspectsStats=Huvilised
 ThirdPartyCustomers=Kliendid
@@ -65,6 +65,7 @@ State=Osariik/provints
 StateId=Riigi ID
 StateCode=Riigi/maakonna kood
 StateShort=Riik
+DepartmentBuyer=Buyer's state/province
 Region=Piirkond
 Region-State=Regioon - Osariik
 Country=Riik
@@ -78,7 +79,7 @@ Chat=Vestle
 PhonePro=Äri telefon
 PhonePerso=Isiklik telefon
 PhoneMobile=Mobiiltelefon
-No_Email=Keela masspostitamine
+No_Email=Refuse mass emails
 Fax=Faks
 Zip=Postiindeks
 Town=Linn
@@ -287,7 +288,7 @@ ContactLinkedFiles=Seotud failid
 ContactEvents=Events/Agenda
 ContactId=Kontakti ID
 ContactsAddresses=Kontaktid/aadressid
-ContactsAddressesExt=Shared Contacts/Addresses
+ContactsAddressesExt=Jagatud kontaktid/aadressid
 FromContactName=Nimi
 NoContactDefinedForThirdParty=Antud kolmanda isikuga pole ühtki kontakti seotud
 NoContactDefined=Kontakti pole määratud
@@ -382,12 +383,12 @@ ExportCardToFormat=Ekspordi kaart formaati
 ContactNotLinkedToCompany=Kontakt ole seotud ühegi kolmanda isikuga
 DolibarrLogin=Dolibarri kasutaja
 NoDolibarrAccess=Dolibarri ligipääs puudub
-ExportDataset_company_1=Kolmandad osapooled (ettevõtted/sihtasutused/füüsilised isikud) ja nende omadused
-ExportDataset_company_2=Kontaktid ja nende omadused
-ExportDataset_company_3=Kolmandate osapoolte panga kontod
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Kolmandate osapoolte lisa kontaktid/aadressid ja atribuudid
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Kolmandad osapooled ja nende omadused
 ImportDataset_company_2=Kolmandate osapoolte lisa kontaktid/aadressid ja atribuudid
-ImportDataset_company_3=Kolmandate osapoolte panga kontod
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Kolmandate osapoolte müügiesindajad (omista ettevõtetele müügiesindajad/kasutajad)
 PriceLevel=Hinnatase
 PriceLevelLabels=Hinnataseme sildid
@@ -397,7 +398,7 @@ SupplierCategory=Tarnija kategooria
 JuridicalStatus200=Sõltumatu
 DeleteFile=Kustuta fail
 ConfirmDeleteFile=Kas tahad kindlasti kustutada faili <b>%s</b>?\n
-AllocateCommercial=Assign to sales representatives
+AllocateCommercial=Määrake müügiesindaja
 UnallocateCommercial=Unassigned sales representatives
 Organization=Organisatsioon
 FiscalYearInformation=Eelarveaasta
@@ -415,8 +416,8 @@ ListSuppliersShort=Tarnijate nimekiri
 ListProspectsShort=Huviliste nimekiri
 ListCustomersShort=Klientide nimekiri
 ThirdPartiesArea=Kolmandad isikud/Kontaktid
-LastModifiedThirdParties=The latest %s modified Third Parties
-LastModifiedContacts=The latest %s modified contacts
+LastModifiedThirdParties=Viimased %s muudetud kolmandat osapoolt
+LastModifiedContacts=Viimased %s muudetud kontaktid
 UniqueThirdParties=Kolmandaid isikuid kokku
 InActivity=Ava
 ActivityCeased=Suletud
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Haldaja(te) nimi (CEO, direktor, president...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Kolmandate osapoolte ühendamine
-ConfirmMergeThirdparties=Kas tahad kindlasti ühendada valitud kolmanda isiku praeguse isikuga? Kõik seotud objektid (arved, tellimused, ...) tuuakse üle praeguse isiku alla, misjärel valitud kolmas isik kustutatakse.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Kolmandate isikute andmed on ühendatud
 SaleRepresentativeLogin=Müügiesindaja sisselogimine
 SaleRepresentativeFirstname=Müügiesindaja eesnimi
@@ -461,3 +462,6 @@ ExternalSystemID=External system ID
 IDOfPaymentInAnExternalSystem=ID of the payment mode into an external system (like Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE Webservice Credentials
 ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/et_EE/exports.lang b/htdocs/langs/et_EE/exports.lang
index 8bae2df615b..b96dd0f9732 100644
--- a/htdocs/langs/et_EE/exports.lang
+++ b/htdocs/langs/et_EE/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Label of line
 LineDescription=Rea kirjeldus
 LineUnitPrice=Rea ühikuhind
 LineVATRate=Rea KM määr
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Rea kogus
 LineTotalHT=Amount excl. tax for line
 LineTotalTTC=Rea summa käibemaksuga
 LineTotalVAT=Rea käibemaks
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Rea liik (0=toode, 1=teenus)
 FileWithDataToImport=Imporditavate andmetega fai
 FileToImport=Imporditav lähtefai
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=Choose the file format to use as import file format b
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Lähtefaili formaat
 FieldsInSourceFile=Lähtefailis olevad väljad
-FieldsInTargetDatabase=Dolibarri andmebaasi sihtväljad (rasvane=kohustuslik)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Väljasid ei ole
 MoveField=Liiguta väli veergu nr %s
 ExampleOfImportFile=Example_of_import_file
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Check that the file format (field and string delimiters)
 RunSimulateImportFile=Run Import Simulation
 FieldNeedSource=This field requires data from the source file
 SomeMandatoryFieldHaveNoSource=Mõnedel kohustuslikel väljadel pole andmefailis allikat
-InformationOnSourceFile=Lähtefaili informatsioone
-InformationOnTargetTables=Sihtväljade informatsioon
+InformationOnSourceFile=Lähtekoodi fai
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Vaheta ringi vähemalt üks lähteväli eksporditavate väljade veerus
 SelectFormat=Vali selle impordi faili formaat
 RunImportFile=Import Data
diff --git a/htdocs/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index 40ae96bdbdc..1644f96cb1b 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=E-postitamine
 EMailing=E-postitamine
-EMailings=E-postitamised
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=Kõik e-postitamised
+AllEMailings=All mass eMails
 MailCard=E-postitamise kaart
 MailRecipients=Saajad
 MailRecipient=Saaja
@@ -26,17 +26,19 @@ MailFile=Manustatud failid
 MailMessage=E-kirja sisu
 SubjectNotIn=Not in Subject
 BodyNotIn=Not in Body
-ShowEMailing=Näita e-postitust
-ListOfEMailings=E-postituste nimekiri
-NewMailing=Uus e-postitus
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=Muuda e-postitust
-ResetMailing=Saada e-postitus uuesti
-DeleteMailing=Kustuta e-postitus
-PreviewMailing=E-postituse eelvaade
-CreateMailing=Loo e-postitus
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=Kinnita e-postitus
+ValidMailing=Valid mass Email
 MailingStatusDraft=Mustand
 MailingStatusValidated=Kinnitatud
 MailingStatusSent=Saadetud
@@ -53,6 +55,7 @@ ErrorMailRecipientIsEmpty=E-kirja saaja lahter on tühi
 WarningNoEMailsAdded=Saajate nimekirja pole ühtki uut e-kirja lisada.
 ConfirmValidMailing=Kas olete kindel, et soovite selle meilisõnumi kinnitada?
 ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
+ConfirmResetMailingTargetMassactionQuestion=Are you sure you want to reset the status of the selected recipients (this may means that email will be resent if you use the Send email feature of the emailing) ?
 ConfirmDeleteMailing=Kas olete kindel, et soovite selle meili kustutada?
 NbOfUniqueEMails=Unikaalsete meilide arv
 NbOfUniquePhones=No. of unique phones
@@ -91,9 +94,9 @@ NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Kas soovite kindlasti e-posti aadressi <b> %s </b> mustandi olekuks muuta ?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
-MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
-MailingModuleDescContactsByCategory=Contacts by categories
-MailingModuleDescContactsByFunction=Contacts by position
+MailingModuleDescContactsByCompanyCategory=Kontaktid kolmanda osapoole kategooria järgi
+MailingModuleDescContactsByCategory=Kontaktid kategooriate kaupa
+MailingModuleDescContactsByFunction=Kontaktid ametikoha järgi
 MailingModuleDescEmailsFromFile=Meilid failist
 MailingModuleDescEmailsFromUser=Kasutaja sisestatud meilid
 MailingModuleDescDolibarrUsers=E-kirjadega kasutajad
@@ -105,24 +108,24 @@ EmailCollectorFilterDesc=All filters must match to have an email being collected
 LineInFile=Rida %s failis
 RecipientSelectionModules=Määratletud päringud saaja valimiseks
 MailSelectedRecipients=Valitud saajad
-MailingArea=E-postituste ala
-LastMailings=Viimased %s meilid
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Sihtmärkide statistika
 NbOfCompaniesContacts=Unikaalseid kontakte/aadresse
 MailNoChangePossible=Kinnitatud e-postituse saajaid ei ole võimalik muuta
-SearchAMailing=Otsi postitust
-SendMailing=Saada e-postitus
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Saatis
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Meilisõnumi saab saata käsurealt. Paluge oma serveri administraatoril käivitada järgmine käsk, et saata e-kiri kõigile adressaatidele:
 MailingNeedCommand2=Siiski saab neid saata online-režiimis, kui lisate parameetri MAILING_LIMIT_SENDBYWEB maksimaalse kirjade arvuga, mida sessiooni kohta saata. Selleks mine menüüsse Kodu->Seadistamine->Muu.
 ConfirmSendingEmailing=Kui soovite meilisõnumeid saata otse sellelt ekraanilt, kinnitage, et olete kindel, et soovite kohe oma brauserist meili saata?
-LimitSendingEmailing=Märkus. Meilisõnumeid saadetakse veebiliidese kaudu turvalisuse ja ajalõpu põhjustel mitu korda, <b> %s </b> adressaadid korraga iga saatmiseansi jaoks.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Tühjenda nimekir
 ToClearAllRecipientsClickHere=Klõpsa siia antud e-postituse saajate nimekirja tühjendamiseks
 ToAddRecipientsChooseHere=Lisa saajaid, valides nad nimekirjadest
-NbOfEMailingsReceived=Masspostitus kätte saadud
-NbOfEMailingsSend=Saadetud massilised meilid
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID kirje
 DeliveryReceipt=Delivery Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Samuti saab kasutada eraldajana <b>koma</b> mitme erineva adressaadi määramiseks.
@@ -139,8 +142,10 @@ NoNotificationsWillBeSent=Selle sündmuse tüübi ja ettevõtte jaoks automaatse
 ANotificationsWillBeSent=Meili teel saadetakse 1 automaatne teatis
 SomeNotificationsWillBeSent=%s automaatsed teatised saadetakse meili teel
 AddNewNotification=Tellige uus automaatne meiliteatis (sihtmärk/sündmus)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Meili saatmise konfiguratsioon on seadistatud väärtusele „%s”. Seda režiimi ei saa kasutada massmeilide saatmiseks.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -177,10 +182,10 @@ InGoingEmailSetup=Sissetulevad meilid
 OutGoingEmailSetupForEmailing=Outgoing emails (%s)
 DefaultOutgoingEmailSetup=Sama konfiguratsioon kui globaalse väljamineva meili seadistusel
 Information=Informatsioon
-ContactsWithThirdpartyFilter=Contacts with third-party filter
+ContactsWithThirdpartyFilter=Kolmanda osapoole filtriga kontaktid
 Unanswered=Unanswered
 Answered=Answered
-IsNotAnAnswer=Is not answer (initial email)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Is an answer of an initial email
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
@@ -190,11 +195,12 @@ NoMoreRecipientToSendTo=No more recipient to send the email to
 EmailOptedOut=Email owner has requested to not contact him with this email anymore
 EvenUnsubscribe=Include opt-out emails
 EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Useful for mandatory service emails for example.
-XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s operations done)
 YouCanMakeSomeInstructionForEmail=You can make some instructions for your Email (Example: generate image in email template...)
 ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
+ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index e7387490276..9e4c28089a6 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -37,6 +37,7 @@ Translation=Tõlge
 Translations=Tõlked
 CurrentTimeZone=PHP ajavöönd (serveri ajavöönd)
 EmptySearchString=Enter non empty search criteria
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Sisesta kuupäeva kriteerium
 NoRecordFound=Ühtegi kirjet ei leitud
 NoRecordDeleted=Ühtegi kirjet ei kustutatud
@@ -45,6 +46,7 @@ NoError=Vigu ei tekkinud
 Error=Viga
 Errors=Vead
 ErrorFieldRequired=Väli &quot;%s&quot; peab olema täidetud
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Väli &quot;%s&quot; on vigaselt täidetud
 ErrorFileDoesNotExists=Faili %s pole olemas
 ErrorFailedToOpenFile=Ei suutnud avada faili %s
@@ -308,6 +310,7 @@ DateBuild=Aruande koostamise kuupäev
 DatePayment=Maksekuupäev
 DateApprove=Heakskiitmise kuupäev
 DateApprove2=Heakskiitmise kuupäev (teine nõuseolek)
+PendingSince=Pending since
 RegistrationDate=Registreerimise kuupäev
 UserCreation=Loonud kasutaja
 UserModification=Muutnud kasutaja
@@ -465,7 +468,7 @@ DefaultTaxRate=Vaikimisi maksumäär
 Average=Keskmine
 Sum=Summa
 StandardDeviationPop=Standard deviation
-Delta=Delta
+Delta=Muutus
 StatusToPay=Maksta
 RemainToPay=Jäänud maksta
 Module=Moodul/Rakendus
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Alustada
 ActionRunningShort=Tegemisel
 ActionDoneShort=Lõpetatud
 ActionUncomplete=Pooleli
-LatestLinkedEvents=Viimased %s seotud sündmused
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Ettevõte/Organisatsioon
 Accountant=Raamatupidaja
 ContactsForCompany=Selle kolmanda isikuga seotud kontaktid
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=E-kirja sisu
 SendAcknowledgementByMail=Saada kinnituskiri
 SendMail=Saada e-kiri
 Email=E-post
+EMail=E-post
+EMails=E-postid
 NoEMail=E-posti aadress puudub
 AlreadyRead=Juba loetud
 NotRead=Lugemata
@@ -793,7 +798,7 @@ Notes=Märkused
 AddNewLine=Lisa uus rida
 AddFile=Lisa fail
 FreeZone=Vabateksti toode
-FreeLineOfType=Vabateksti element, kirjuta:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Klooni objekt selle põhiliste omadustega
 ReGeneratePDF=Taasgenereeri PDF
 PDFMerge=PDFi ühendamine
@@ -879,12 +884,14 @@ toward=kuni
 Access=Ligipääs
 SelectAction=Vali tegevus
 SelectTargetUser=Vali sihtkasutaja/-töötaja
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Lõikelauale kopeerimiseks kasuta Ctrl+C klahvikombinatsiooni
 SaveUploadedFileWithMask=Salvesta fail serverisse nimega "<strong>%s</strong>" (muul juhul "%s")
 OriginFileName=Faili algne nimi
 SetDemandReason=Määratle allikas
 SetBankAccount=Määratle pangakonto
 AccountCurrency=Konto valuuta
+AccountancyCode=Accounting Code
 ViewPrivateNote=Vaata märkmeid
 XMoreLines=%s joon(t) varjatud
 ShowMoreLines=Näita rohkem/vähem ridu
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Kas oled kindel, et soovid kustutada %s valitud rida
 ConfirmMassClone=Hulgikloonimise kinnitus
 ConfirmMassCloneQuestion=Vali projekt, millesse kloonida
 ConfirmMassCloneToOneProject=Klooni projekti %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Seotud objektid
 ClassifyBilled=Classify Billed
 ClassifyUnbilled=Classify Unbilled
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Faili vaatamiseks või allalaadimiseks pead sa olema sel
 Download=Lae alla
 DownloadDocument=Dokumendi allalaadimine
 DownloadSignedDocument=Allkirjastatud dokumendi allalaadimine
-ActualizeCurrency=Uuenda valuuta vahetuskurssi
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Majandusaasta
 ModuleBuilder=Mooduli ja äpi redaktor
 SetMultiCurrencyCode=Määra valuuta
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Hulgitegevused
 ClickToShowHelp=Klõpsa abiteksti hüpikakna avamiseks
 WebSite=Veebileht
@@ -1104,6 +1113,7 @@ PayedBy=Maksis
 PayedTo=Makstud saajale
 Monthly=Igakuine
 Quarterly=Kvartaalne
+Quarter=Quarter
 Annual=Aastane
 Local=Kohalik
 Remote=Eemalolev
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Ülesanne
 ContactDefault_propal=Pakkumine
 ContactDefault_supplier_proposal=Tarnija pakkumine
 ContactDefault_ticket=Tugipilet
+ContactDefault_societe=Kolmas isik
 ContactAddedAutomatically=Contact added from third-party contact roles
 More=Rohkem
 ShowDetails=Näita detaile
@@ -1242,6 +1253,7 @@ CommercialAffected=Müügiesindaja omistatud
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=Sõnum
+Emailing=Emailing
 Progression=Progress
 YourMessage=Sinu sõnum
 YourMessageHasBeenReceived=Sinu sõnum on vastu võetud. Vastame sinule või kontakteerume niipea kui võimalik.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Lisa
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Alates algusest
+Transferred=Transferred
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index c1bbf4383e6..e1476d43559 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -21,12 +21,12 @@ ProductVatMassChange=Global VAT Update
 ProductVatMassChangeDesc=See tööriist värskendab käibemaksumäära, mis on määratud <b><u>KÕIGILE</u></b> toodetele ja teenustele!
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accounting code (purchase)
-ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
-ProductAccountancyBuyExportCode=Accounting code (purchase import)
-ProductAccountancySellCode=Accounting code (sale)
-ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
-ProductAccountancySellExportCode=Accounting code (sale export)
+ProductAccountancyBuyCode=Raamatupidamiskood (ost)
+ProductAccountancyBuyIntraCode=Raamatupidamiskood (ost ühendusesisene)
+ProductAccountancyBuyExportCode=Raamatupidamiskood (ostu import)
+ProductAccountancySellCode=Raamatupidamiskood (müük)
+ProductAccountancySellIntraCode=Raamatupidamiskood (ühendusesisene müük)
+ProductAccountancySellExportCode=Raamatupidamiskood (müügi eksport)
 ProductOrService=Toode või teenus
 ProductsAndServices=Tooted ja teenused
 ProductsOrServices=Tooted või teenused
@@ -66,25 +66,25 @@ ProductStatusNotOnBuy=Ei ole ostmiseks
 ProductStatusOnBuyShort=Ostmiseks
 ProductStatusNotOnBuyShort=Ei ole ostmiseks
 UpdateVAT=Update VAT
-UpdateDefaultPrice=Update default price
+UpdateDefaultPrice=Värskenda vaikehinda
 UpdateLevelPrices=Update prices for each level
-AppliedPricesFrom=Applied from
+AppliedPricesFrom=Rakendatud alates
 SellingPrice=Müügihind
-SellingPriceHT=Selling price (excl. tax)
+SellingPriceHT=Müügihind (ilma käibemaksuta)
 SellingPriceTTC=Müügihinna (km-ga)
-SellingMinPriceTTC=Minimum Selling price (inc. tax)
+SellingMinPriceTTC=Minimaalne müügihind (koos käibemaksuga)
 CostPriceDescription=Seda hinnavälja (ilma käibemaksuta) saab kasutada selleks, et jäädvustada keskmine summa, mille see toode teie ettevõttele maksab. See võib olla mis tahes hind, mille te ise arvutate, näiteks keskmisest ostuhinnast pluss keskmised tootmis- ja turustuskulud.
 CostPriceUsage=This value could be used for margin calculation.
 ManufacturingPrice=Manufacturing price
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Uus hind
-MinPrice=Min. selling price
-MinPriceHT=Min. selling price (excl. tax)
-MinPriceTTC=Min. selling price (inc. tax)
-EditSellingPriceLabel=Edit selling price label
-CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
-CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
+MinPrice=Min. müügihind
+MinPriceHT=Min. müügihind (ilma käibemaksuta)
+MinPriceTTC=Min. müügihind (koos käibemaksuga)
+EditSellingPriceLabel=Muuda müügihinna silti
+CantBeLessThanMinPrice=Müügihind ei tohi olla madalam kui selle toote lubatud miinimum (%s ilma maksudeta). See teade võib ilmuda ka siis, kui sisestate märkimisväärse allahindluse.
+CantBeLessThanMinPriceInclTax=Müügihind ei tohi olla madalam kui selle toote lubatud miinimum (%s koos maksudega). See teade võib ilmuda ka siis, kui sisestate liiga suure allahindluse.
 ContractStatusClosed=Suletud
 ErrorProductAlreadyExists=Toode viitega %s on juba olemas.
 ErrorProductBadRefOrLabel=Vale viite või nime väärtus.
@@ -97,9 +97,8 @@ ShowService=Näita teenust
 ProductsAndServicesArea=Toodete ja teenuste ala
 ProductsArea=Toote ala
 ServicesArea=Teenuste ala
-ListOfStockMovements=Laoliikumiste nimekiri
 BuyingPrice=Ostuhind
-PriceForEachProduct=Products with specific prices
+PriceForEachProduct=Konkreetsete hindadega tooted
 SupplierCard=Vendor card
 PriceRemoved=Hind eemaldatud
 BarCode=Vöötkood
@@ -111,13 +110,13 @@ ServiceLimitedDuration=Kui toode on piiratud kestusega teenus:
 FillWithLastServiceDates=Täida viimaste teenuseliinide kuupäevad
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Hindasid
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Enable Kits (set of several products)
+DefaultPriceType=Uute müügihindade lisamisel vaikehindade alus (koos maksudeta).
+AssociatedProductsAbility=Luba komplektid (mitme toote komplekt)
 VariantsAbility=Enable Variants (variations of products, for example color, size)
-AssociatedProducts=Kits
+AssociatedProducts=Komplektid
 AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
-ParentProducts=Parent products
+ParentProducts=Ülemtooted
 IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
 IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Märksõnade filter
@@ -125,8 +124,8 @@ CategoryFilter=Kategooriate filter
 ProductToAddSearch=Otsi lisamiseks toodet
 NoMatchFound=Ühtki vastet ei leitud
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
+ProductAssociationList=Nimekiri toodetest/teenustest, mis on selle komplekti osa(d).
+ProductParentList=Seda toodet komponendina sisaldavate komplektide loend
 ErrorAssociationIsFatherOfThis=Üks valitud toodetest kasutab antud toodet
 DeleteProduct=Kustuta toode/teenus
 ConfirmDeleteProduct=Kas oled täiesti kindel, et soovid antud toote/teenuse kustutada?
@@ -145,11 +144,12 @@ WithoutDiscount=Without discount
 VATRateForSupplierProduct=Tax Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
+NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
 PredefinedItem=Predefined item
 PredefinedProducts=Predefined Product
 PredefinedServices=Valmis tooted ja teenused
-PredefinedProductsAndServices=Predefined products/services
+PredefinedProductsAndServices=Valmis tooted/teenused
 NotPredefinedProducts=Valmis tooteid ja teenused ei ole
 GenerateThumb=Loo pisipilt
 ServiceNb=Teenus #%s
@@ -160,18 +160,18 @@ Finished=Valmistatud toode
 RowMaterial=Toormaterjal
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone all main information of the product/service
-ClonePricesProduct=Clone prices
+ClonePricesProduct=Klooni hinnad
 CloneCategoriesProduct=Clone linked tags/categories
 CloneCompositionProduct=Clone virtual products/services
 CloneCombinationsProduct=Clone the product variants
 ProductIsUsed=Seda toodet kasutatakse
 NewRefForClone=Uue toote/teenuse viide
-SellingPrices=Selling prices
-BuyingPrices=Buying prices
-CustomerPrices=Customer prices
-SuppliersPrices=Vendor prices
-SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs|Commodity|HS code
+SellingPrices=Müügihinnad
+BuyingPrices=Ostuhinnad
+CustomerPrices=Kliendihinnad
+SuppliersPrices=Müüja hinnad
+SuppliersPricesOfProductsOrServices=Müüjahinnad (toodete või teenuste)
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Country of origin
 RegionStateOrigin=Region of origin
 StateOrigin=State|Province of origin
@@ -209,6 +209,7 @@ unitL=Liter
 unitT=tonn
 unitKG=kg
 unitG=Gram
+unitGAL=gallon
 unitMG=mg
 unitLB=nael
 unitOZ=unts
@@ -238,10 +239,10 @@ ServiceCodeModel=Teenusviite mall
 CurrentProductPrice=Hetkehind
 AlwaysUseNewPrice=Kasuta alati toote/teenuse hetkehinda
 AlwaysUseFixedPrice=Kasuta fikseeritud hinda
-PriceByQuantity=Different prices by quantity
-DisablePriceByQty=Disable prices by quantity
+PriceByQuantity=Erinevad hinnad koguse järgi
+DisablePriceByQty=Keela hinnad koguse järgi
 PriceByQuantityRange=Koguse ulatus
-MultipriceRules=Automatic prices for segment
+MultipriceRules=Segmendi automaatsed hinnad
 UseMultipriceRules=Kasutage hinnasegmendi reegleid (määratletud tootemooduli seadistustes), et arvutada automaatselt kõigi teiste segmentide hinnad vastavalt esimesele segmendile
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
@@ -250,8 +251,8 @@ VariantRefExample=Examples: COL, SIZE
 VariantLabelExample=Examples: Color, Size
 ### composition fabrication
 Build=Tooda
-ProductsMultiPrice=Products and prices for each price segment
-ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
+ProductsMultiPrice=Tooted ja hinnad iga hinnasegmendi kohta
+ProductsOrServiceMultiPrice=Kliendihinnad (toodete või teenuste, mitmehinnalised)
 ProductSellByQuarterHT=Products turnover quarterly before tax
 ServiceSellByQuarterHT=Services turnover quarterly before tax
 Quarter1=1. kvartal
@@ -271,29 +272,29 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barco
 BarCodeDataForProduct=Barcode information of product %s:
 BarCodeDataForThirdparty=Barcode information of third party %s:
 ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different prices for each customer
+PriceByCustomer=Igale kliendile erinevad hinnad
 PriceCatalogue=A single sell price per product/service
-PricingRule=Rules for selling prices
+PricingRule=Müügihindade reeglid
 AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
-PriceByCustomerLog=Log of previous customer prices
+PriceByCustomerLog=Varasemate klientide hindade logi
 MinimumPriceLimit=Minimum price can't be lower then %s
 MinimumRecommendedPrice=Minimum recommended price is: %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
 PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
-PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp3=Nii toote/teenuse kui ka hankija hindades on saadaval järgmised muutujad:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
 PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
 PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Arv
 DefaultPrice=Default price
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=Varasemate vaikehindade logi
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Child products
+ComposedProduct=Alam tooted
 MinSupplierPrice=Minimaalne ostuhind
-MinCustomerPrice=Minimum selling price
+MinCustomerPrice=Minimaalne müügihind
 NoDynamicPrice=No dynamic price
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=Kliendi või hankija hindade arvutamiseks võite määratleda matemaatilised valemid. Sellised valemid võivad kasutada kõiki matemaatilisi operaatoreid, mõningaid konstante ja muutujaid. Siin saate määratleda muutujad, mida soovite kasutada. Kui muutuja vajab automaatset värskendamist, võite määrata välise URL-i, et Dolibarr saaks väärtust automaatselt värskendada.
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.c
 UpdateInterval=Uuendamise intervall (minutities)
 LastUpdated=Viimane värskendus
 CorrectlyUpdated=Õigesti uuendatud
-PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=Select PDF files
 IncludingProductWithTag=Including products/services with the tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=Liini kogus arvutati ümber vastavalt tarnija paken
 
 #Attributes
 Attributes=Atribuudid
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Variant attributes
 ProductAttributes=Variant attributes for products
 ProductAttributeName=Variant attribute %s
@@ -394,8 +399,10 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
-ProductsPricePerCustomer=Product prices per customers
-ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
+ProductsPricePerCustomer=Toodete hinnad klientide kohta
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
+ProductSupplierExtraFields=Täiendavad atribuudid (tarnija hinnad)
 DeleteLinkedProduct=Delete the child product linked to the combination
 AmountUsedToUpdateWAP=Unit amount to use to update the Weighted Average Price
 PMPValue=Kaalutud keskmine hind
@@ -403,7 +410,8 @@ PMPValueShort=KKH
 mandatoryperiod=Mandatory periods
 mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
+mandatoryHelper2=Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
@@ -418,7 +426,7 @@ UpdatePrice=Increase/decrease customer price
 StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Extra Fields (inventory)
 ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
-PuttingPricesUpToDate=Update prices with current known prices
+PuttingPricesUpToDate=Värskendage hindu praeguste teadaolevate hindadega
 PuttingDescUpToDate=Update descriptions with current known descriptions
 PMPExpected=Expected PMP
 ExpectedValuation=Expected Valuation
@@ -430,8 +438,11 @@ ModifyValueExtrafields = Modify value of an extrafield
 OrProductsWithCategories=Or products with tags/categories
 WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
 WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
-AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
-AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
+AllowStockMovementVariantParent=Salvestab ka varianttoodete põhitoodete laoliikumist
+AllowStockMovementVariantParentHelp=Vaikimisi on variandi ülemtoode virtuaalne toode, mistõttu selle jaoks laoseisu ei hallata. Selle valiku lubamisel hallatakse põhitoodete laoseisu ja iga kord, kui muudetakse tootevariantide kogust, muudetakse sama kogust ka põhitoote jaoks. Te ei peaks seda valikut vajama, välja arvatud juhul, kui kasutate sama toote haldamiseks varianti kui ema (kuid erinevate kirjelduste, hindadega...)
 ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
 WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned
-PriceLabel=Price label
+PriceLabel=Hinnasilt
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Iga kliendi jaoks erinevad hinnad + mitu hinnasegmenti toote/teenuse kohta (iga klient on ühes hinnasegmendis)
diff --git a/htdocs/langs/eu_ES/exports.lang b/htdocs/langs/eu_ES/exports.lang
index eca420b6078..7942e93e831 100644
--- a/htdocs/langs/eu_ES/exports.lang
+++ b/htdocs/langs/eu_ES/exports.lang
@@ -18,6 +18,7 @@ ExportableFields=Exportable fields
 ExportedFields=Exported fields
 ImportModelName=Import profile name
 ImportModelSaved=Import profile saved as <b>%s</b>.
+ImportProfile=Import profile
 DatasetToExport=Dataset to export
 DatasetToImport=Import file into dataset
 ChooseFieldsOrdersAndTitle=Choose fields order...
@@ -26,8 +27,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Liburutegia
-ExportCsvSeparator=Csv caracter separator
-ImportCsvSeparator=Csv caracter separator
+ExportCsvSeparator=Csv character separator
+ImportCsvSeparator=Csv character separator
 Step=Step
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -45,22 +46,28 @@ LineLabel=Label of line
 LineDescription=Description of line
 LineUnitPrice=Unit price of line
 LineVATRate=VAT Rate of line
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Quantity for line
 LineTotalHT=Amount excl. tax for line
 LineTotalTTC=Amount with tax for line
 LineTotalVAT=Amount of VAT for line
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
 FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information
-StarAreMandatory=* are mandatory fields
+DownloadEmptyExampleShort=Download a sample file
+DownloadEmptyExample=Download a template file with examples and information on fields you can import
+StarAreMandatory=Into the template file, all fields with a * are mandatory fields
 ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
 FieldsInSourceFile=Fields in source file
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
-Field=Field
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=No fields
 MoveField=Move field column number %s
 ExampleOfImportFile=Example_of_import_file
@@ -75,14 +82,14 @@ NowClickToTestTheImport=Check that the file format (field and string delimiters)
 RunSimulateImportFile=Run Import Simulation
 FieldNeedSource=This field requires data from the source file
 SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
-InformationOnSourceFile=Information on source file
-InformationOnTargetTables=Information on target fields
+InformationOnSourceFile=Iturri-fitxategia
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Switch at least one source field in the column of fields to export
 SelectFormat=Choose this import file format
 RunImportFile=Import Data
 NowClickToRunTheImport=Check the results of the import simulation. Correct any errors and re-test.<br>When the simulation reports no errors you may proceed to import the data into the database.
 DataLoadedWithId=The imported data will have an additional field in each database table with this import id: <b>%s</b>, to allow it to be searchable in the case of investigating a problem related to this import.
-ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file in column <b>%s</b>.
 TooMuchErrors=There are still <b>%s</b> other source lines with errors but output has been limited.
 TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
 EmptyLine=Empty line (will be discarded)
@@ -92,9 +99,9 @@ YouCanUseImportIdToFindRecord=You can find all the imported records in your data
 NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
 NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
 DataComeFromNoWhere=Value to insert comes from nowhere in source file.
-DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
-DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
+DataComeFromFileFieldNb=Value to insert comes from column <b>%s</b> in source file.
+DataComeFromIdFoundFromRef=The value that comes from the source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
+DataComeFromIdFoundFromCodeId=The value of code that comes from source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
 DataIsInsertedInto=Data coming from source file will be inserted into the following field:
 DataIDSourceIsInsertedInto=The id of the parent object, that was found using the data in the source file, will be inserted into the following field:
 DataCodeIDSourceIsInsertedInto=The id of the parent line, that was found from code, will be inserted into the following field:
@@ -132,6 +139,15 @@ FormatControlRule=Format control rule
 ## imports updates
 KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
+NbInsertSim=Number of lines that will be inserted: %s
 NbUpdate=Number of updated lines: %s
+NbUpdateSim=Number of lines that will be updated : %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
 StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
+WarningFirstImportedLine=The first line(s) will not be imported with the current selection
+NotUsedFields=Fields of database not used
+SelectImportFieldsSource = Choose the source file fields you want to import and their target field in database by choosing the fields in each select boxes, or select a predefined import profile:
+MandatoryTargetFieldsNotMapped=Some mandatory target fields are not mapped
+AllTargetMandatoryFieldsAreMapped=All target fields that need a mandatory value are mapped
+ResultOfSimulationNoError=Result of simulation: No error
+NumberOfLinesLimited=Number of lines limited
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index b01305252d0..3cfd91cbcfc 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -1,7 +1,7 @@
 # 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
-Foundation=موسسه
+BoldRefAndPeriodOnPDF=کد پیگیری و بازه محصول را در PDF چاپ کن
+BoldLabelOnPDF=لیبل محصول را بصورت بولد در PDF چاپ کن
+Foundation=بنیاد
 Version=نسخه
 Publisher=ناشر
 VersionProgram=نسخه برنامه
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=بررسی صحت فایل انجام شده
 FileIntegritySomeFilesWereRemovedOrModified=پس از بررسی مشخص شد برخی از فایل ها اصلاح شده، حذف یا اضافه شده اند.
 GlobalChecksum=سرجمع سراسری
 MakeIntegrityAnalysisFrom=بررسی تحلیل یکپارچگی فایل‌های برنامه از
-LocalSignature=امضای محلی درونی (اطمینان کمتر)
-RemoteSignature=امضای خارجی بیرونی (اطمینان بیشتر)
+LocalSignature=امضای محلی درونی
+RemoteSignature=امضای خارجی بیرونی
 FilesMissing=فایل‌های مفقود
 FilesUpdated=فایل‌های روزآمد شده
 FilesModified=فایل‌های تغییر یافته
@@ -39,35 +39,35 @@ UnlockNewSessions=حذف قفل اتصال
 YourSession=نشست شما
 Sessions=نشست‌های کاربران
 WebUserGroup=کاربرِ/گروهِ سرویس‌دهندۀ‌وب
-PermissionsOnFiles=Permissions on files
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFiles=مجوزهای فایل ها
+PermissionsOnFilesInWebRoot=مجوزهای فایل ها در دیرکتوری روت وب
+PermissionsOnFile=مجوزهای فایل %s
 NoSessionFound=به نظر می‌رسد پیکربندی PHP شما امکان فهرست‌کردن نشست‌های فعال را نداشته باشد. ممکن است پوشه‌ای که برای ذخیرۀ نشست‌ها مورد استفاده است (<b>%s</b>)  حفاظت شده باشد (مثلا بواسطۀ مجوزهای سیستم‌عامل یا با تمهیدات   open_basedir در PHP).
 DBStoringCharset=تنظیمات کدبندی Charset بانک داده برای ذخیره داده‌ها
 DBSortingCharset=تنظیمات کدبندی Charset بانک داده برای مرتب‌سازی داده‌ها
-HostCharset=Host charset
+HostCharset=کدبندی نویسه میزبان
 ClientCharset=تنظیمات Charset مشتری
 ClientSortingCharset=تنظیمات collation مشتری
 WarningModuleNotActive=واحد <b>%s</b> باید فعال باشد
 WarningOnlyPermissionOfActivatedModules=تنها مجوزهای مربوط به واحد‌های فعال در اینجا نشان داده شده است. شما می توانید ماژول های دیگر در صفحۀاصلی->برپاسازی->واحد‌ها فعال کنید.
 DolibarrSetup=نصب یا ارتقای Dolibarr
-DolibarrUpgrade=Dolibarr upgrade
-DolibarrAddonInstall=Installation of Addon/External modules (uploaded or generated)
+DolibarrUpgrade=بروزرسانی دولیبار
+DolibarrAddonInstall=نصب افزونه/ماژول های خارجی (بارگزاری شده یا ایجاد شده)
 InternalUsers=کاربران داخلی
 ExternalUsers=کاربران خارجی
-UserInterface=User interface
+UserInterface=رابط کاربری
 GUISetup=نمایش
 SetupArea=برپاسازی
 UploadNewTemplate=بارگذاری قالب‌(های) جدید
 FormToTestFileUploadForm=برگه آزمایش بارگذاری فایل (با توجه به برپاسازی)
-ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
-ModuleIsEnabled=The module/application <b>%s</b> has been enabled
+ModuleMustBeEnabled=ماژول/برنامه <b>%s</b> باید فعال شود
+ModuleIsEnabled=ماژول/برنامه <b>%s</b>فعال شده است
 IfModuleEnabled=توجه: «بله» تنها در صورتی مؤثر است که واحد <b>%s</b> فعال باشد
 RemoveLock=فایل <b>%s</b> را در صورت موجود بودن تغییر دهید تا امکان استفاده از ابزار نصب/روزآمدسازی وجود داشته باشد.
 RestoreLock=فایل <b>%s</b> را با مجوز فقط خواندنی بازیابی کنید تا امکان استفاده از ابزار نصب/روزآمدسازی را غیرفعال کنید.
 SecuritySetup=برپاسازی امنیتی
-PHPSetup=PHP setup
-OSSetup=OS setup
+PHPSetup=تنظیم PHP
+OSSetup=تنظیم سیستم عامل
 SecurityFilesDesc=در این قسمت گزینه‌های مربوط به امنیت بارگذاری فایل را تعریف کنید
 ErrorModuleRequirePHPVersion=خطا! این واحد نیازمند PHP نسخۀ %s یا بالاتر دارد
 ErrorModuleRequireDolibarrVersion=خطا! این واحد نیاز به Dolibarr  نسخۀ %s یا بالاتر را دارد
@@ -93,7 +93,7 @@ PROJECT_DISPLAY_LINKED_BY_CONTACT_help=This option adds a new list on Project ta
 JavascriptDisabled=جاوا اسکریپت غیر فعال شده
 UsePreviewTabs=استفاده‌از زبانه‌های پیش‌نمایش
 ShowPreview=نمایش پیش‌نمایش
-ShowHideDetails=Show-Hide details
+ShowHideDetails=نمایش-مخفی کردن جزئیات
 PreviewNotAvailable=پیش‌نمایش در دسترس نیست
 ThemeCurrentlyActive=محیطی که اکنون فعال است
 MySQLTimeZone=منطقه زمانی MySql (پایگاه داده)
@@ -122,7 +122,7 @@ MultiCurrencySetup=برپاسازی چندگانگی-واحدپولی
 MenuLimits=محدودیت‌ها و دقت
 MenuIdParent=شناسۀ فهرست والد
 DetailMenuIdParent=شناسۀ فهرست والد (اگر فهرست اصلی است، خالی بگذارید)
-ParentID=Parent ID
+ParentID=شناسه والد
 DetailPosition=عدد ترتیب برای تعیین مکان فهرست
 AllMenus=همه
 NotConfigured=واحد/برنامه پیکربندی نشده است
@@ -149,7 +149,7 @@ Box=وسیله
 Boxes=وسایل
 MaxNbOfLinesForBoxes=حداکثر سطور وسایل
 AllWidgetsWereEnabled=همۀ وسیله‌های موجود فعال هستند
-WidgetAvailable=Widget available
+WidgetAvailable=ویجت در دسترس
 PositionByDefault=ترتیب پیش‌فرض
 MenusDesc=اداره‌کننده‌های فهرست‌ها محتوای دو نوار فهرست را تعیین می‌کنند (افقی و عمودی).
 MenusEditorDesc=ویرایش‌گر فهرست به شما امکان تعریف واحد‌های اختیاری فهرستی را می‌دهید. در استفاده آن سعی کنید از گزینه‌ها و فهرست‌های نامطمئن و غیرقابل‌دسترس استفاده ننمائید. <br> برخی واحد‌ها گزینه‌های فهرست خود را اضافه می‌کنند (معمولا در فهرست <b>همه</b>). در صورتی‌که به اشتباه این گزینه‌ها را حذف کنید، می‌توانید با استفاده از غیرفعال‌کردن و دوباره فعال‌کردن واحد مورد نظر، آن گزینه را بازگردانید.
@@ -164,7 +164,7 @@ Purge=پاک‌کردن
 PurgeAreaDesc=این صفحه به شما امکان حذف همۀ فایل‌های تولید شده و ذخیره شده با Dolibarr  را می‌دهد (فایل‌های موقت یا همۀ فایلهای داخل پوشۀ <b>%s</b>). استفاده از این قابلیت در شرایط عادی ضرورتی ندارد. این قابلیت برای کاربرانی ایجاد شده است که میزبانی وبگاه آن‌ها امکان حذف فایل‌هائی که توسط سرویس‌دهندۀ وب ایجاد شده‌اند را نداده است.
 PurgeDeleteLogFile=حذف فایل‌های گزارش‌کار، شامل تعریف <b>%s</b> برای واحد گزارش‌کار سامانه Syslog (خطری برای از دست دادن داده‌ها نیست)
 PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files (no risk of losing data)
+PurgeDeleteTemporaryFilesShort=لاگ و فایل های موقت را پاک کنید (خطر از دست دادن داده ها وجود ندارد)
 PurgeDeleteAllFilesInDocumentsDir=حذف همۀ فایل‌های موجود در پوشۀ: <b>%s</b>. <br> این باعث حذف همۀ مستنداتی که به عناصر مربوطند ( اشخاص سوم، صورت‌حساب و غیره ...)، فایل‌هائی که به واحد ECM ارسال شده‌اند، نسخه‌برداری‌های پشتیبان بانک‌داده و فایل‌های موقت خواهد شد.
 PurgeRunNow=شروع پاک‌سازی
 PurgeNothingToDelete=هیچ فایل یا پوشه‌ای برای حذف وجود ندارد.
@@ -192,8 +192,8 @@ Compression=فشرده‌سازی
 CommandsToDisableForeignKeysForImport=فرمان برای غیرفعال کردن کلید‌های‌خارجی-Foreign keys در هنگام واردات
 CommandsToDisableForeignKeysForImportWarning=در صورتی که بخواهید رونوشت از sql خود را بازیافت کنید این گزینه الزامی است
 ExportCompatibility=سازگاری فایل صادراتی تولیدشده
-ExportUseMySQLQuickParameter=Use the --quick parameter
-ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+ExportUseMySQLQuickParameter=از پارامتر --quick استفاده کنید
+ExportUseMySQLQuickParameterHelp=پارامتر "--quick" به محدودسازی استفاده از رم برای جداول بزرگ کمک می‌کند.
 MySqlExportParameters=مؤلفه‌های صادرات MySQL
 PostgreSqlExportParameters= مؤلفه‌های صادرات MySQL
 UseTransactionnalMode=استفاده از حالت انتقالی-transactional
@@ -226,10 +226,10 @@ CompatibleUpTo=سازگار با نسخۀ %s
 NotCompatible=به نظر نمی‌رسد این واحد با نسخۀ %s Dolibarr  نصب شده سازگار باشد (سازگاری حداقل با %s و حداکثر با %s ).
 CompatibleAfterUpdate=این واحد نیازمند روزآمدسازی Dolibarr نسخۀ %s است (حداقل %s - حداکثر %s)
 SeeInMarkerPlace=نمایش در بازارچه
-SeeSetupOfModule=See setup of module %s
-SeeSetupPage=See setup page at %s
-SeeReportPage=See report page at %s
-SetOptionTo=Set option <b>%s</b> to %s
+SeeSetupOfModule=تنظیم ماژول را ببینید %s
+SeeSetupPage=تنظیم صفحه را ببینید%s
+SeeReportPage=صفحه گزارش را ببینید %s
+SetOptionTo=گزینه <b>%s</b>را روی %sتنظیم کنید
 Updated=روزآمد شده
 AchatTelechargement=خرید / بارگیری
 GoModuleSetupArea=برای به کاربردن یا نصب یک واحد، به محل برپاسازی واحد‌ها بروید: <a href="%s">%s</a>.
@@ -238,20 +238,20 @@ DoliPartnersDesc=List of companies providing custom-developed modules or feature
 WebSiteDesc=سایت‌های دیگر برای واحد‌های افزودنی (غیر هسته‌) دیگر...
 DevelopYourModuleDesc=چند راه برای توسعه دادن و ایجاد واحد دل‌خواه....
 URL=نشانی‌اینترنتی
-RelativeURL=Relative URL
+RelativeURL=آدرس وابسته
 BoxesAvailable=وسایل در دسترس
 BoxesActivated=وسایل فعال شده
 ActivateOn=فعال کردن در
 ActiveOn=فعال شده در
-ActivatableOn=Activatable on
+ActivatableOn=قبال فعالسازی در
 SourceFile=فایل منبع
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=فقط در صورتی که JavaScript غیرفعال نباشد در دسترس است
 Required=ضروری
 UsedOnlyWithTypeOption=تنها استفاده از گزینه‌های دستوری
 Security=امنیت
 Passwords=گذرواژه
-DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=کدگذاری گذرواژه‌های ذخیره شده در فایل conf.php. شدیدا توصیه می‌شود این گزینه را فعال نمائید.
+DoNotStoreClearPassword=رمز عبورهای ذخیره شده در پایگاه داده را رمزگذاری کن
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=برای برخورداری از گذرواژه‌های کدبندی شده در فایل <b>conf.php</b>، سطور <br><b>$dolibarr_main_db_pass="...";</b><br> را با <br><b> $dolibarr_main_db_pass="crypted: %s "; </b> جایگزن نمائید
 InstrucToClearPass=برای برخوردازی از گذرواژه‌های کدگذاری نشده (پاک) در فایل <b> conf.php </b> سطر <br><b> $dolibarr_main_db_pass="crypted:..."; </b><br> را با <br> <b> $dolibarr_main_db_pass=" %s";</b> جایگزین نمائید.
 ProtectAndEncryptPdfFiles=حفاظت از فایل‌های PDF تولید شده. این کار پیشنهاد نمی‌شود چون باعث متوقف شدن تولید دستجمعی PDF می‌شود.
@@ -269,7 +269,7 @@ ReferencedPreferredPartners=هم‌کاران پیش‌نهادی
 OtherResources=سایر منابع
 ExternalResources=منابع بیرونی
 SocialNetworks=شبکه‌های اجتماعی
-SocialNetworkId=Social Network ID
+SocialNetworkId=شناسه شبکه اجتماعی
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 HelpCenterDesc1=در این‌جا منابعی برای دریافت کمک و پشتیبانی در خصوص Dolibarr می‌یابید:
@@ -294,9 +294,9 @@ EmailSenderProfiles=نمایه‌های ارسال‌کنندۀ رایانامه
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=درگاه SMTP/SMTPS (مقدار پیش‌فرض در php.ini : <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=میزبان SMTP/SMTPS (مقدار پیش‌فرض در php.ini : <b>%s</b> )
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=پورت SMTP/SMTPS
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=هاست SMTP/SMTPS
+MAIN_MAIL_EMAIL_FROM=ایمیل فرستنده برای ایمیل‌های خودکار
 EMailHelpMsgSPFDKIM=To prevent Dolibarr emails to be classified as spam, make sure that the server is authorized to send e-mails under this identity (by checking the SPF and DKIM configuration of the domain name)
 MAIN_MAIL_ERRORS_TO=رایانامه‌ای که برای ارسال پاسخ در نظر گرفت می‌شود ( بخش‌های "Errors-To" در پیام فرستاده شده)
 MAIN_MAIL_AUTOCOPY_TO= ارسال یک نسخه (Bcc) از همۀ پیام‌های ارسال شده به
@@ -304,8 +304,8 @@ MAIN_DISABLE_ALL_MAILS=توقف ارسال همۀ رایانامه‌ها (بر
 MAIN_MAIL_FORCE_SENDTO=ارسال همۀ رایانامه‌ها به ( به جای دریافت‌کننده‌های واقعی، برای اهداف آزمایشی)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
 MAIN_MAIL_NO_WITH_TO_SELECTED=Disable the selection of a default recipient when writing an email, even if there is only 1 possible choice
-MAIN_MAIL_SENDMODE=Sending method
-MAIN_MAIL_SMTPS_ID=SMTP username or ID (if sending server requires an authentication)
+MAIN_MAIL_SENDMODE=روش ارسال
+MAIN_MAIL_SMTPS_ID=نام کاربری یا شناسه STMP (اگر سرور ارسال نیازمند اعتبار سنجی است)
 MAIN_MAIL_SMTPS_PW=SMTP password or token (if sending server requires an authentication)
 MAIN_MAIL_EMAIL_TLS=استفاده از رمزبندی TLS از (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=استفاده از رمزبندی TLS از (STARTTLS)
@@ -321,7 +321,7 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email preselected on forms to send ema
 UserEmail=رایانامۀ کاربر
 CompanyEmail=رایانامۀ شرکت
 FeatureNotAvailableOnLinux=این قابلیت در سامانه‌های ردۀ یونیکس وجود ندارد. برنامۀ ارسال رایانامۀ محلی خود را آزمایش کنید.
-FixOnTransifex=Fix the translation on the online translation platform of project
+FixOnTransifex=ترجمه را در پلتفرم ترجمه آنلاین پروژه اصلاح کنید
 SubmitTranslation=در صورتی که ترجمۀ این زبان کامل نیست یا شما خطائی سراغ دارید، شما می‌توانید فایل‌های موجود در پوشۀ <b>langs/%s</b>  را ویرایش کرده و تغییرات مورد نظر خود را به www.transifex.com/dolibarr-association/dolibarr/ بفرستید.
 SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=برپاسازی واحد‌ها
@@ -343,7 +343,7 @@ MenuHandlers=اداره‌کنندۀ فهرست‌ها
 MenuAdmin=ویرایش‌گر فهرست‌ها
 DoNotUseInProduction=در حالت عملیاتی استفاده نشود
 ThisIsProcessToFollow=روند روزآمدسازی:
-ThisIsAlternativeProcessToFollow=This is an alternative deployment process you can run manually:
+ThisIsAlternativeProcessToFollow=این یک پروسه اجرای جایگزین است که می‌توانید بصورت دستی اجرا کنید.
 StepNb=گام %s
 FindPackageFromWebSite=بسته‌ای که متناسب با قابلیت‌های مورد نظر شماست بیابید (برای مثال روی وبگاه رسمی %s).
 DownloadPackageFromWebSite=دریافت بسته ( برای مثال از وبگاه رسمی %s ).
@@ -360,7 +360,7 @@ LastStableVersion=آخرین نسخۀ پایدار
 LastActivationDate=آخرین تاریخ فعال‌سازی
 LastActivationAuthor=آخرین سازندۀ فعال‌کننده
 LastActivationIP=آخرین درگاه‌اینترنتی فعال‌کننده
-LastActivationVersion=Latest activation version
+LastActivationVersion=آخرین نسخه فعالسازی
 UpdateServerOffline=به‌روز‌رسانی برون‌خطی-Offline سرویس‌دهنده
 WithCounter=مدیریت شمارنده
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then the sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=بخش محاسبه شده
-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=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'
 Computedpersistent=بخش محاسبه‌شدۀ فروشگاه
 ComputedpersistentDesc=بخش‌های محاسبه‌شدۀ اضافی در پایگاه داده ذخیره خواهند شد، به‌هرحال مقدار تنها در زمانی دوباره محاسبه خواهد شد که شیء این بخش تغییر کند. در صورتی که بخش محاسبه‌شده به سایر اشیاء یا داده‌های سراسری وابسته باشد، این مقدار ممکن است خطا باشد!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored WITHOUT encryption (field is just hidden with stars on screen).<br><br>Enter value 'dolcrypt' to encode value with a reversible encryption algorithm. Clear data can still be known and edited but is encrypted into database.<br><br>Enter 'auto' (or 'md5', 'sha256', 'password_hash', ...) to use the default password encryption algorithm (or md5, sha256, password_hash...) to save the non reversible hashed password into database (no way to retrieve original value)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
 WarningPHPMailD=It is therefore recommended to change the sending method of e-mails to the value "SMTP".
 WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
-WarningPHPMail2=در صورتی که ارائۀ خدمات رایانامۀ SMTP شما نیازمند محدود کردن مشتری خدمات رایانامه به درگاه‌های اینترنتی خاص است (در موارد معدود)، این نشانی درگاه اینترنتی کاربر رایانامه (MUA) برای برنامۀ ERP CRM شماست: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=حساب‌داری (ساده)
 Module10Desc=گزارش‌های سادۀ حساب‌داری (دفاتر، گردش‌مالی) مبنی بر محتوای بانک داده. از جداول دفترکل استفاده نمی‌کند.
 Module20Name=طرح‌های پیشنهادی
 Module20Desc=مدیریت طرح‌های پیشنهادی تجاری
-Module22Name=ارسال فله‌ای رایانامه
-Module22Desc=مدیریت ارسال‌فله‌ای رایانامه‌
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=انرژی
 Module23Desc=نظارت بر مصرف انرژی
 Module25Name=سفارشات فروش
@@ -847,10 +848,10 @@ Permission212=سفارش خطوط
 Permission213=فعال‌کردن خط
 Permission214=راه‌اندازی تلفن
 Permission215=راه‌اندازی تنظیمات ارائه‌دهندگان
-Permission221=ملاحظۀ وضعیت ارسال رایانامه
-Permission222=ساخت/ویرایش رایانامه‌ها (عنوان، دریافت‌کندگان و غیره)
-Permission223=اعتباردهی به رایانامه‌ها (امکان ارسال دارد)
-Permission229=حذف رایانامه‌ها
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=نمایش دریافت‌کنندگان و اطلاعات مربوطه
 Permission238=ارسال دستی رایانامه
 Permission239=حذف رایانامه‌ها پس از اعتباردهی یا ارسال
@@ -1105,6 +1106,7 @@ DictionaryStaff=تعداد کارمندان
 DictionaryAvailability=تاخیر در تحویل
 DictionaryOrderMethods=Order methods
 DictionarySource=اصل پیشنهادات/سفارشات
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=گروه‌های شخصی‌سازی‌شده برای گزارش‌ها
 DictionaryAccountancysystem=اشکال مختلف نمودار حساب‌ها
 DictionaryAccountancyJournal=دفترهای حساب‌داری
@@ -1134,11 +1136,11 @@ BackToDictionaryList=بازگشت به فهرست واژه‌نامه‌ها
 TypeOfRevenueStamp=انواع تمبر مالیاتی
 VATManagement=مدیریت مالیات بر فروش
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=مالیات بر فروش مطروحه به طور پیش‌‌فرض برابر با 0 است که می‌تواند در مورد موسسات، اشخاص و شرکت‌های کوچک به کار گرفته شود.
 VATIsUsedExampleFR=در فرانسه، به این معناست که شرکت‌ها و موسسات یک سامانۀ سیاست‌مالی حقیقی دارند (حقیقی ساده یا حقیقی عادی).  سامانه‌ای که در آن مالیات بر ارزش افزوده تعریف می‌شود.
 VATIsNotUsedExampleFR=در فرانسه، این بدان معناست که مؤسساتی که برای آن‌ها مالیات بر فروش تعریف نشده یا شرکت‌ها، سازمان‌ها یا مشاغل آزادی که سامانۀ سیاست مالی ریزسازمانی برگزیده‌اند (مالیات بر فروش طی فرانچایز-فرداد-حق‌امتیاز) و بدون تعریف مالیات برفروش مبلغ مالیات فروش فرانچایز را پرداخت کرده‌اند. این انتخاب به صورت مراجع "مالیات بر فروش اختصاص داده نمی‌شود - art-293B of CGI" در صورت‌حساب نمایش داده خواهد شد.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Type of sales tax
 LTRate=نرخ
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), yo
 LabelUsedByDefault=این برچسب در حالتی که هیچ ترجمه‌ای برای کد یافت نشود استفاده خواهد شد
 LabelOnDocuments=برچسب روی مستندات
 LabelOrTranslationKey=برچسب یا کلید ترجمه
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=Display Customer/Vendor VAT number into combo lists.
 AddAdressInList=Display Customer/Vendor address into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=پرسش برای روش ارسال ترجیحی برای اشخاص سوم
-FieldEdition=ویرایش بخش %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=مثال: +2 (تنها در صورتی که با مشکل ناحیۀ زمانی مواجه شوید)
 GetBarCode=دریافت بارکد
 NumberingModules=Numbering models
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=الزام تاریخ صورت‌حساب به تاریخ تا
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=پیشنهاد پرداخت در صرف‌نظر کردن از حساب
 SuggestPaymentByChequeToAddress=پیشنهاد پرداخت با چک به
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=متن دل‌خواه بر روی صورت‌حساب‌ها
 WatermarkOnDraftInvoices=نقش‌پس‌زمینۀ صورت‌حساب‌های پیش‌نویسی (هیچ، در صورت خالی بودن)
 PaymentsNumberingModule=طرز شماره‌دهی پرداخت‌ها
@@ -1718,6 +1723,7 @@ CompressionOfResources=فشرده‌سازی پاسخ‌های HTTP
 CompressionOfResourcesDesc=برای مثال استفاده از رهنمود  "AddOutputFilterByType DEFLATE" در Apache
 TestNotPossibleWithCurrentBrowsers=چنین تشخیص خودکاری توسط مرورگرهای فعلی ممکن نیستند
 DefaultValuesDesc=در اینجا شما می‌توانید مقادیر پیش‌فرض رد در هنگام ساخت یک ردیف جدید و/یا صافی‌های جدید پیش‌فرض یا ترتیب مرتب‌سازی در هنگام فهرست کردن ردیف‌ها را تعریف نمائید.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=مقادیر پیش‌فرض (برای استفاده در برگه‌ها)
 DefaultSearchFilters=صافی‌های پیش‌فرض جستجو
 DefaultSortOrder=ترتیب‌های پیش‌فرض جستجو
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=واحدهای شماره‌گذاری ارسال‌ه
 SendingsAbility=پشتیبانی از ورقه‌های حمل‌ونقل برای تحویل مشتری
 NoNeedForDeliveryReceipts=در بسیاری از موارد، ورقه‌های حمل‌ونقل هم برای تحویل مشتری (فهرست محصولات ارسالی) استفاده می‌شود و هم ورقه‌ای که به دست مشتری رسیده و توسط وی امضا می‌شود. بنابراین رسید تحویل محصول یک قابلیت تکراری است و کم‌تر فعال می‌شود.
 FreeLegalTextOnShippings=متن دلخواه روی بسته‌ها
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=واحد شماره‌گذاری رسیدهای تحویل محصول
 DeliveryOrderModel=شکل رسیدهای تحویل محصول
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=متن دلخواه در رسیدهای تحوی
 ##### FCKeditor #####
 AdvancedEditor=ویرایشگر پیشرفته
 ActivateFCKeditor=فعال کردن ویرایشگر پیشرفته برای:
-FCKeditorForNotePublic=WYSIWYG creation/edition of the field "public notes" of elements
-FCKeditorForNotePrivate=WYSIWYG creation/edition of the field "private notes" of elements
-FCKeditorForCompany=WYSIWYG creation/edition of the field description of elements (except products/services)
-FCKeditorForProductDetails=WYSIWYG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, 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.
-FCKeditorForMailing= WYSIWYG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWYG creation/edition of user signature
-FCKeditorForMail=WYSIWYG creation/edition for all mail (except Tools->eMailing)
-FCKeditorForTicket=WYSIWYG creation/edition for tickets
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=برپاسازی واحد انبار
 IfYouUsePointOfSaleCheckModule=در صورتی که از صندوق (POS) پیش‌فرض ارائه شده یا از یک واحد خارجی استفاده می‌نمائید، این تنظیمات ممکن است توسط واحد صندوق شما نادیده گرفته شود. اکثر واحدهای POS به‌طور پیش‌فرض طوری طراحی شده‌اند که فورا یک صورت‌حساب ایجاد کرده و بدون‌توجه به گزینه‌های ذیل، از آمار انبار را کاهش بدهند. بنابراین در صورتی که لازم باشد/یا نباشد در هنگام ثبت فروش از طریق صندوق، آمار انبار دست‌کاری شود، باید تنظیمات مربوط به واحد صندوق نصب شدۀ خود را نیز بررسی کنید.
@@ -1867,7 +1874,6 @@ Buy=خرید
 Sell=فروش
 InvoiceDateUsed=تاریخ صورت‌حساب مورداستفاده
 YourCompanyDoesNotUseVAT=شرکت شما برای عدم استفاده از مالیات‌بر‌ارزش‌افزوده تنظیم شده است در (خانه - برپاسازی - شرکت/سازمان) تنظیمات مربوطه وجود دارد.
-AccountancyCode=کد حساب‌داری
 AccountancyCodeSell=کد حساب فروش
 AccountancyCodeBuy=کد حساب خرید
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Which view do you want to open by default when selecting m
 AGENDA_EVENT_PAST_COLOR = Past event color
 AGENDA_EVENT_CURRENT_COLOR = Current event color
 AGENDA_EVENT_FUTURE_COLOR = Future event color
-AGENDA_REMINDER_BROWSER = Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = فعال‌کردن آگاهی‌رسانی صوتی
-AGENDA_REMINDER_EMAIL = Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT = نمایش شیء پیوند شده به نمای جلسه
 AGENDA_USE_EVENT_TYPE = استفاده از انواع رخداد (قابل‌مدیریت در برپاسازی-> واژه‌نامه‌ها -> انواع رخدادهای جلسات)
 AGENDA_USE_EVENT_TYPE_DEFAULT = ثبت خودکار این مقدار پیش‌فرض برای نوع رخداد در برگۀ ساخت رخداد
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = کلید برای اعتباردهی به پیوند صادرات
 PastDelayVCalExport=عدم صادرکردن رخداد قدیمی‌تر از
 SecurityKey = Security Key
@@ -2006,7 +2017,7 @@ BackupZipWizard=Wizard to build the archive of documents directory
 SomethingMakeInstallFromWebNotPossible=نصب یک واحد خارجی از طریق رابط وب به دلایل ذیل ممکن نیست:
 SomethingMakeInstallFromWebNotPossible2=به این دلیل، روند به‌هنگام‌سازی توضیح داده شده تنها به صورت دستی ممکن خواهد بود که تنها یک کاربر مجاز امکان انجام آن را دارد.
 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.
-InstallModuleFromWebHasBeenDisabledByFile=نصب یک واحد خارجی از داخل برنامه توسط مدیر شما غیرفعال شده است. می‌توانید از وی بخواهید فایل <strong>%s</strong> را برای ایجاد اجازۀ نصب حذف نماید.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=نصب یا ساخت یک واحد خارجی در برنامه نیازمند ذخیرۀ فایل‌های مربوطه در پوشۀ <strong>%s</strong> است. برای امکان پردازش این پوشه توسط Dolibarr شما باید به فایل <strong>conf/conf.php</strong> این 2 سطر دستوری را اضافه نمائید: <br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=برجسته‌کردن سطور جدول در هنگام عبور نشان‌گر موش
 HighlightLinesColor=برجسته‌کردن رنگ سطر در هنگام عبور موشواره از آن (از 'ffffff' برای عدم رنگ‌دهی)
@@ -2036,6 +2047,7 @@ Enter0or1=Enter 0 or 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=در اینجا بین دو براکت فهرست اعداد بایت‌هائی را که نمایاندۀ نماد واحدپولی است وارد نمائید. برای مثال، برای $ مقدار [36] را وارد نمائید، برای ریال برزیل R$ مقدار [82,36] و برای €، مقدار [8364]
 ColorFormat=رنگ RGB در مبنای HEX، مثال: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Icon name in format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
 PositionIntoComboList=مکان سطر در فهرست‌های ترکیبی
 SellTaxRate=Sales tax rate
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
 MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipient address frame
 MAIN_PDF_HIDE_CUSTOMER_CODE=Hide customer code
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Hide sender/company name in address block
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Hide payments conditions
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Hide payment mode
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=Not recommended
 ARestrictedPath=Some restricted path for data files
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Show shipping address
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
 DarkThemeMode=Dark theme mode
@@ -2450,7 +2471,7 @@ 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)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Not created by default. Created on module activation only.
 CSSPage=CSS Style
 Defaultfortype=پیش‌فرض
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang
index b57fbd7e983..c47a9c01026 100644
--- a/htdocs/langs/fa_IR/banks.lang
+++ b/htdocs/langs/fa_IR/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=موجودی پایان
 CurrentBalance=موجودی کنونی
 FutureBalance=موجودی در آینده
 ShowAllTimeBalance=نمايش موجودی از آغاز
-AllTime=از شروع
 Reconciliation=مصالحه
 RIB=شماره حساب بانکی
 IBAN=شماره IBAN
@@ -133,7 +132,7 @@ DeleteTransaction=حذف ورود
 ConfirmDeleteTransaction=مطمئنید می‌خواهید این ورودی را حذف کنید؟
 ThisWillAlsoDeleteBankRecord=این همچنین باعث حذف ورودی تولید شدۀ بانک خواهد شد
 BankMovements=جابجائی‌ها
-PlannedTransactions=ورودی‌های برنامه‌ریزی شده
+PlannedTransactions=Upcoming entries
 Graph=Graphs
 ExportDataset_banque_1=ورودی‌های بانکی‌ و شرح‌کار حساب
 ExportDataset_banque_2=برگۀ به‌حساب‌گذاشتن
@@ -151,7 +150,7 @@ FutureTransaction=تراکنش در آینده، عدم امکان وفق‌دا
 SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 SelectPaymentTransactionAndGenerate=Select/filter the documents which are to be included in the %s deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value
-InputReceiptNumberBis=YYYYMM or YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=برای وفق‌دادن؟
 ThenCheckLinesAndConciliate=سپس، سطوری را که در شرح‌کار بانک وجود دارند را بررسی کرده و کلیک کنید.
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=If this function is enable, you can choose specific bac
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
-NoBankAccountDefined=No bank account defined
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
 AlreadyOneBankAccount=Already one bank account defined
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA file variant
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index 911996d4901..670f1190ad1 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=کشور مربوطه داخل جامعۀ اقتصادی اروپ
 PriceFormatInCurrentLanguage=چگونگی نمایش قیمت در زبان و واحدپولی فعلی
 ThirdPartyName=نام شخص‌سوم
 ThirdPartyEmail=رایانامۀ شخص‌سوم
-ThirdParty=شخص‌سوم
-ThirdParties=شخص‌های سوم
+ThirdParty=شخص ثالث
+ThirdParties=شخص‌سوم‌ها
 ThirdPartyProspects=مشتری‌احتمالی
 ThirdPartyProspectsStats=مشتریان‌احتمالی
 ThirdPartyCustomers=مشتریان
@@ -65,6 +65,7 @@ State=ایالت / استان
 StateId=State ID
 StateCode=State/Province code
 StateShort=استان
+DepartmentBuyer=Buyer's state/province
 Region=منطقه
 Region-State=منطقه - استان
 Country=کشور
@@ -78,7 +79,7 @@ Chat=گفتگوی اینترنتی
 PhonePro=Bus. phone
 PhonePerso=تلفن شخصی
 PhoneMobile=تلفن همراه
-No_Email=عدم تمایل به دریافت رایانامه‌های جمعی
+No_Email=Refuse mass emails
 Fax=فکس
 Zip=کدپستی
 Town=شهر
@@ -382,12 +383,12 @@ ExportCardToFormat=صادرکردن کارت به حالت
 ContactNotLinkedToCompany=طرف‌تماس به هیچ شخص‌سومی متصل نیست
 DolibarrLogin=ورود Dolibarr
 NoDolibarrAccess=دسترسی Dolibarr مقدور نیست
-ExportDataset_company_1=شخص‌سوم‌ها (شرکت‌ها/سازمان‌ها/مردم فیزیکی) و مشخصات آن‌ها
-ExportDataset_company_2=طرف‌های تماس و مشخصات آن‌ها
-ExportDataset_company_3=حساب‌های بانکی شخص‌سوم‌ها
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=سایر طرف‌های تماس/نشانی‌های شخص‌سوم و ویژگی‌های آن‌ها
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=شخص‌سوم‌ها و مشخصات آن‌ها
 ImportDataset_company_2=سایر طرف‌های تماس/نشانی‌های شخص‌سوم و ویژگی‌های آن‌ها
-ImportDataset_company_3=حساب‌های بانکی شخص‌سوم‌ها
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=نمایندگان فروش طرف‌های تماس (نسبت دادن نمایندۀ فروش/کاربران به شرکت‌ها)
 PriceLevel=سطح قیمتی
 PriceLevelLabels=برچسب‌های سطح قیمتی
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=نام مدیر (مدیرعامل، مدیر، رئیس...)()
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=ادغام شخص‌سوم‌ها
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=شخص‌سوم‌ها با هم ادغام شدند
 SaleRepresentativeLogin=مشخصات‌ورود نماینده فروش
 SaleRepresentativeFirstname=نام نمایندۀ فروش
@@ -461,3 +462,6 @@ ExternalSystemID=External system ID
 IDOfPaymentInAnExternalSystem=ID of the payment mode into an external system (like Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE Webservice Credentials
 ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/fa_IR/exports.lang b/htdocs/langs/fa_IR/exports.lang
index 5af037ed5c7..85fc871e147 100644
--- a/htdocs/langs/fa_IR/exports.lang
+++ b/htdocs/langs/fa_IR/exports.lang
@@ -46,10 +46,16 @@ LineLabel=برچسب سطر
 LineDescription=توضیح سطر
 LineUnitPrice=قیمت واحد سطر
 LineVATRate=نرخ م.ب.ا.ا. سطر
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=تعداد سطر
 LineTotalHT=مبلغ بدون مالیات برای سطر
 LineTotalTTC=مبلغ با مالیات برای سطر
 LineTotalVAT=مبلغ م.ب.ا.ا. مربوط به سطر
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=نوع سطر (0 = محصول، 1 = خدمات)
 FileWithDataToImport=فایل حاوی داده برای وارد کردن
 FileToImport=فایل منبع برای واردکردن
@@ -61,9 +67,9 @@ ChooseFormatOfFileToImport=انتخاب نوع فایل برای استفاده
 ChooseFileToImport=فایل را بالاگذاری کرده و سپس روی نشانک %s کلیک کرده تا به‌عنوان فایل منبع واردات استفاده شود.
 SourceFileFormat=نوع فایل منبع
 FieldsInSourceFile=بخش‌های فایل منبع
-FieldsInTargetDatabase=بخش‌های مقصد در پایگاه‌دادۀ Dolibarr (پررنگ=الزامی)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=بخشی وجود ندارد
-MoveField=جابجائی شماره ستون بخش %s 
+MoveField=جابجائی شماره ستون بخش %s
 ExampleOfImportFile=Example_of_import_file
 SaveImportProfile=ذخیرۀ این نمایۀ واردات
 ErrorImportDuplicateProfil=ذخیرۀ این فایل واردات با این نام ناموفق بود. یک نمایه با همین نام قبلا وجود داشته است.
@@ -76,8 +82,8 @@ NowClickToTestTheImport=بررسی کنید شرایط موجود در شکل‌
 RunSimulateImportFile=اجرای شبیه‌سازی واردات
 FieldNeedSource=این بخش نیازمند داده از فایل منبع است
 SomeMandatoryFieldHaveNoSource=برخی از بخش‌های الزامی در فایل داده، دارای مبدأ و منبع نیستند
-InformationOnSourceFile=اطلاعات فایل منبع
-InformationOnTargetTables=اطلاعات بخش‌های مقصد
+InformationOnSourceFile=فایل منبع
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=حداقل یک بخش مبدأ را به ستون بخش‌های قابل صادرکردن بفرستید
 SelectFormat=این نوع فایل را برای وارد کردن انتخاب کنید
 RunImportFile=واردکردن داده‌ها
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index dec0ef62992..e85b8f6cecf 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=ارسال ایمیل
 EMailing=ارسال ایمیل
-EMailings=ارسال ایمیل ها
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=همه eMailings
+AllEMailings=All mass eMails
 MailCard=ایمیل کارت
 MailRecipients=دریافت کنندگان
 MailRecipient=دریافت کننده
@@ -26,17 +26,19 @@ MailFile=فایل های پیوست شده
 MailMessage=بدن ایمیل
 SubjectNotIn=در موضوع نیست
 BodyNotIn=در بدنه نیست
-ShowEMailing=نمایش ایمیل
-ListOfEMailings=فهرست ارسال ایمیل ها
-NewMailing=ایمیل جدید
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=ویرایش ایمیل
-ResetMailing=ارسال دوباره ایمیل
-DeleteMailing=حذف ایمیل
-PreviewMailing=ایمیل پیش
-CreateMailing=ایجاد ایمیل
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=آزمایش
-ValidMailing=معتبر ایمیل
+ValidMailing=Valid mass Email
 MailingStatusDraft=پیش نویس
 MailingStatusValidated=اعتبار
 MailingStatusSent=فرستاده
@@ -53,6 +55,7 @@ ErrorMailRecipientIsEmpty=نشانی پست الکترونیکی خالی است
 WarningNoEMailsAdded=آدرس ایمیل جدید برای اضافه کردن به لیست گیرنده.
 ConfirmValidMailing=آیا مطمئن هستید می‌خواهید این ارسال را تائید کنید؟
 ConfirmResetMailing=هشدار! با بازسازی ارسال راینامۀ <b>%s</b>، شما اجازۀ بازارسال این رایانامه را به شکل انبوده خواهید داد. آیا مطمئن به انجام این کار هستید؟
+ConfirmResetMailingTargetMassactionQuestion=Are you sure you want to reset the status of the selected recipients (this may means that email will be resent if you use the Send email feature of the emailing) ?
 ConfirmDeleteMailing=آیا مطمئن هستید می‌خواهید این ارسال رایانامه را حذف کنید؟
 NbOfUniqueEMails=تعداد رایانامه‌های منحصر به فرد
 NbOfUniquePhones=No. of unique phones
@@ -105,24 +108,24 @@ EmailCollectorFilterDesc=All filters must match to have an email being collected
 LineInFile=خط٪ در فایل
 RecipientSelectionModules=درخواست تعریف شده برای انتخاب گیرنده
 MailSelectedRecipients=دریافت کنندگان برگزیده
-MailingArea=منطقه ارسال ایمیل ها
-LastMailings=آخرین %s رایانامۀ ارسال شده
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=آمار اهداف
 NbOfCompaniesContacts=تماس با ما منحصر به فرد / آدرس
 MailNoChangePossible=دریافت کنندگان برای ایمیل معتبر نمی تواند تغییر کند
-SearchAMailing=جستجو های پستی
-SendMailing=ارسال ایمیل
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=ارسال شده توسط
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=با این حال شما می توانید آنها را به صورت آنلاین ارسال شده توسط اضافه کردن MAILING_LIMIT_SENDBYWEB پارامتر با مقدار حداکثر تعداد ایمیل های شما می خواهید به جلسه ارسال کنید. برای این کار، در خانه به - راه اندازی - سایر.
 ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=لیست پاک کردن
 ToClearAllRecipientsClickHere=برای پاک کردن لیست دریافت کننده این ایمیل اینجا را کلیک کنید
 ToAddRecipientsChooseHere=اضافه کردن گیرندگان با انتخاب از لیست
-NbOfEMailingsReceived=emailings جرم دریافت
-NbOfEMailingsSend=emailings انبوه ارسال
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ثبت ID
 DeliveryReceipt=Delivery Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=شما می توانید جداکننده <b>کاما از هم</b> را مشخص چندین گیرنده استفاده کنید.
@@ -139,8 +142,10 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -174,15 +179,15 @@ NoContactWithCategoryFound=No category found linked to some contacts/addresses
 NoContactLinkedToThirdpartieWithCategoryFound=No category found linked to some thirdparties
 OutGoingEmailSetup=Outgoing emails
 InGoingEmailSetup=Incoming emails
-OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+OutGoingEmailSetupForEmailing=Outgoing emails (%s)
 DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=اطلاعات
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=پاسخ داده شده
-IsNotAnAnswer=Is not answer (initial email)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Is an answer of an initial email
-RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+RecordCreatedByEmailCollector=Record created by the Email Collector %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.
@@ -190,9 +195,12 @@ NoMoreRecipientToSendTo=No more recipient to send the email to
 EmailOptedOut=Email owner has requested to not contact him with this email anymore
 EvenUnsubscribe=Include opt-out emails
 EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Useful for mandatory service emails for example.
-XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s operations done)
 YouCanMakeSomeInstructionForEmail=You can make some instructions for your Email (Example: generate image in email template...)
 ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
+LastNews=Latest News
+ListProducts= List of products
+PasswordReset=Password reset
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index c49396a193e..a08d6cd4212 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -37,6 +37,7 @@ Translation=ترجمه
 Translations=Translations
 CurrentTimeZone=منطقه زمانی PHP (سرور)
 EmptySearchString=Enter non empty search criteria
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Enter a date criteria
 NoRecordFound=هیچ ردیفی پیدا نشد
 NoRecordDeleted=هیچ ردیفی حذف نشد
@@ -45,6 +46,7 @@ NoError=بدون خطا
 Error=خطا
 Errors=خطاها
 ErrorFieldRequired=بخش '%s' الزامی است
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=بخش '%s' مقدار نامناسبی دارد
 ErrorFileDoesNotExists=بخش %s وجود ندارد
 ErrorFailedToOpenFile=امکان باز کردن فایل %s وجود نداشت
@@ -308,6 +310,7 @@ DateBuild=تاریخ ساخت گزارش
 DatePayment=تاریخ پرداخت
 DateApprove=تاریخ تائید
 DateApprove2=تاریخ تائید (تائید دوم)
+PendingSince=Pending since
 RegistrationDate=تاریخ صبت‌نام
 UserCreation=کاربر سازنده
 UserModification=کاربر تغییردهنده
@@ -495,7 +498,7 @@ ActionRunningNotStarted=برای شروع
 ActionRunningShort=در حال انجام
 ActionDoneShort=پایان‌یافته
 ActionUncomplete=ناقص
-LatestLinkedEvents=%s آخرین رخداد پیوند شده
+LatestLinkedEvents=The last %s events
 CompanyFoundation=شرکت/سازمان
 Accountant=حساب‌دار
 ContactsForCompany=طرف‌های تماس این شخص‌سوم
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=متن رایانامه
 SendAcknowledgementByMail=ارسال رایانامۀ تائید
 SendMail=ارسال رایانامه
 Email=رایانامه
+EMail=رایانامه
+EMails=رایانامه‌ها
 NoEMail=بدون رایانامه
 AlreadyRead=قبلا خوانده شده
 NotRead=خوانده نشده
@@ -793,7 +798,7 @@ Notes=یادداشت‌ها
 AddNewLine=افزودن سطرجدید
 AddFile=افزودن فایل
 FreeZone=Free-text product
-FreeLineOfType=عنوان با متن دلخواه - نوع :
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=نسخه‌برداری از شیء با ویژگی‌های اصلی آن
 ReGeneratePDF=بازتولید PDF
 PDFMerge=ادغام PDF
@@ -879,12 +884,14 @@ toward=به‌سمت
 Access=دسترسی
 SelectAction=انتخاب رفتار
 SelectTargetUser=انتخاب کاربر/کارمند هدف
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=استفاده از کلیدهای Ctrl + C برای نسخه‌برداری در حافظه
 SaveUploadedFileWithMask=ذخیرۀ فایل در سرور با نام "<strong>%s</strong>" (درغیراینطورت "%s")
 OriginFileName=نام‌اصلی فایل
 SetDemandReason=تنظیم منبع
 SetBankAccount=تعریف حساب‌بانکی
 AccountCurrency=واحدپولی حساب
+AccountancyCode=کد حساب‌داری
 ViewPrivateNote=مشاهدۀ یادداشت‌ها
 XMoreLines=(%s) سطر پنهان است
 ShowMoreLines=نمایش سطور بیشتر/کمتر
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=آیا مطمئنید می‌خواهید (%s) رد
 ConfirmMassClone=Bulk clone confirmation
 ConfirmMassCloneQuestion=Select project to clone to
 ConfirmMassCloneToOneProject=Clone to project %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=اشیاء مربوطه
 ClassifyBilled=Classify Billed
 ClassifyUnbilled=Classify Unbilled
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=You need to be logged and you need permissions to view o
 Download=دریافت
 DownloadDocument=دریافت سن
 DownloadSignedDocument=Download signed document
-ActualizeCurrency=به‌روز‌رسانی نرخ واحدپولی
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=سال مالی
 ModuleBuilder=واحدساز و برنامه‌ساز
 SetMultiCurrencyCode=تنظیم واحدپولی
+SetMultiCurrencyRate=Set currency rate
 BulkActions=کنش‌های گروهی
 ClickToShowHelp=برای نمایش راهنما کلیک کنید
 WebSite=وبگاه
@@ -1104,6 +1113,7 @@ PayedBy=پرداخت توسط
 PayedTo=پرداخت به
 Monthly=ماهانه
 Quarterly=سه‌ماهه
+Quarter=Quarter
 Annual=سالانه
 Local=محلی
 Remote=دورادور
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=وظیفه
 ContactDefault_propal=پیشنهاد
 ContactDefault_supplier_proposal=Supplier Proposal
 ContactDefault_ticket=برگۀ پشتیبانی
+ContactDefault_societe=شخص ثالث
 ContactAddedAutomatically=Contact added from third-party contact roles
 More=More
 ShowDetails=Show details
@@ -1242,6 +1253,7 @@ CommercialAffected=Sales representative assigned
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=پیام
+Emailing=Emailing
 Progression=پیش‌روی
 YourMessage=Your message
 YourMessageHasBeenReceived=Your message has been received. We will answer or contact you as soon as possible.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=افزودن
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=از شروع
+Transferred=Transferred
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 8329aa80ad3..10634622a0e 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -97,7 +97,6 @@ ShowService=نمایش خدمات
 ProductsAndServicesArea=بخش محصولات و خدمات
 ProductsArea=بخش محصولات
 ServicesArea=بخش خدمات
-ListOfStockMovements=فهرست جابجائی‌های  انبارها
 BuyingPrice=قیمت خرید
 PriceForEachProduct=محصولات با قیمت خاص
 SupplierCard=کارت فروشنده
@@ -139,12 +138,13 @@ DeleteProductLine=حذف سطر محصول
 ConfirmDeleteProductLine=آیا مطمئن هستید می‌خواهید این سطر محصول را حذف نمائید؟
 ProductSpecial=ویژه
 QtyMin=حداقل تعداد قابل خرید
-PriceQtyMin=حداقل مبلغ 
+PriceQtyMin=حداقل مبلغ
 PriceQtyMinCurrency=Price (currency) for this qty.
 WithoutDiscount=Without discount
 VATRateForSupplierProduct=Tax Rate (for this vendor/product)
 DiscountQtyMin=تخفیف برای این مقدار
 NoPriceDefinedForThisSupplier=قیمت/مقدار برای این فروشنده/محصول تعریف نشده است
+NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
 NoSupplierPriceDefinedForThisProduct=قیمت/مقدار برای این محصول تعریف نشده است
 PredefinedItem=Predefined item
 PredefinedProducts=محصول ازپیش‌تعریف‌شده
@@ -171,7 +171,7 @@ BuyingPrices=قیمت‌های خرید
 CustomerPrices=قیمت‌های مشتری
 SuppliersPrices=قیمت‌های فروشنده
 SuppliersPricesOfProductsOrServices=قیمت‌های فروشنده (مربوط به محصولات و خدمات)
-CustomCode=Customs|Commodity|HS code
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Country of origin
 RegionStateOrigin=Region of origin
 StateOrigin=State|Province of origin
@@ -209,6 +209,7 @@ unitL=لیتر
 unitT=ton
 unitKG=کیلوگرم
 unitG=گرم
+unitGAL=گالن
 unitMG=میلی گرم
 unitLB=پوند
 unitOZ=اونس
@@ -263,7 +264,7 @@ PageToGenerateBarCodeSheets=با این ابزار شما می‌توانید ب
 NumberOfStickers=تعداد برچسب برای چاپ بر روی صفحه
 PrintsheetForOneBarCode=تعداد برچسب‌چاپ‌شده برای یک بارکد
 BuildPageToPrint=تولید صفحه برای چاپ
-FillBarCodeTypeAndValueManually=ورود نوع بارکد و مقدار را به شکل دستی 
+FillBarCodeTypeAndValueManually=ورود نوع بارکد و مقدار را به شکل دستی
 FillBarCodeTypeAndValueFromProduct=ورود نوع‌بارکد و مقدار از طریق بارکد محصول
 FillBarCodeTypeAndValueFromThirdParty=ورود نوع‌بارکد و مقدار از طریق بارکد شخص‌سوم
 DefinitionOfBarCodeForProductNotComplete=تعریف نوع و مقدار بارکد برای محصول %s کامل نیست.
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=روش درخواست به شکل {"URL": "http
 UpdateInterval=فواصل به‌روز‌رسانی (دقیقه)
 LastUpdated=آخرین به‌روزرسانی
 CorrectlyUpdated=به‌درستی به‌روز‌شد
-PropalMergePdfProductActualFile=فایل‌های قابل استفاده برای اضافه کردن به PDF Azur
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=انتخاب فایل‌های PDF
 IncludingProductWithTag=Including products/services with the tag
 DefaultPriceRealPriceMayDependOnCustomer=قیمت پیش‌فرض، قیمت واقعی ممکن است به مشتری وابسته باشد.
@@ -338,7 +339,7 @@ SubProduct=زیرمحصول
 ProductSheet=ورقۀ محصول
 ServiceSheet=ورقۀ خدما
 PossibleValues=مقادیر ممکن
-GoOnMenuToCreateVairants=برای آماده‌کردن ویژگی‌های چندگانه (مثل رنگ، اندازه و غیره) به فهرست %s - %s بروید 
+GoOnMenuToCreateVairants=برای آماده‌کردن ویژگی‌های چندگانه (مثل رنگ، اندازه و غیره) به فهرست %s - %s بروید
 UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
 ProductSupplierDescription=توضیحات فروشنده برای محصول
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=The quantity of the line were recalculated accordin
 
 #Attributes
 Attributes=خواص
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=انواع ویژگی
 ProductAttributes=انواع ویژگی‌های محصولات
 ProductAttributeName=انواع ویژگی %s
@@ -385,7 +390,7 @@ NbOfDifferentValues=تعداد مقادیر مختلف
 NbProducts=Number of products
 ParentProduct=محصول مادر
 ParentProductOfVariant=Parent product of variant
-HideChildProducts=پنهان کردن انواع مختلف محصولات 
+HideChildProducts=پنهان کردن انواع مختلف محصولات
 ShowChildProducts=نمایش انواع مختلف محصولات
 NoEditVariants=به کارت محصول مادر رفته و تاثیر قیمت انواع مختلف را در زبانۀ انواع ویرایش کنید
 ConfirmCloneProductCombinations=آیا مطمئنید می‌خواهید همۀ انواع محصولات را به یک محصول مادر دیگر با ارجاع مورد نظر نسخه‌برداری کنید؟
@@ -395,6 +400,8 @@ ErrorDestinationProductNotFound=محصول مقصد پیدا نشد
 ErrorProductCombinationNotFound=نوع محصول پیدا نشد
 ActionAvailableOnVariantProductOnly=این کنش تنها بر روی یک نوع از انواع محصول قابل اجراست
 ProductsPricePerCustomer=قیمت محصول وابسته به مشتریان
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
 AmountUsedToUpdateWAP=Unit amount to use to update the Weighted Average Price
@@ -403,7 +410,8 @@ PMPValueShort=قیمت میانگین وزنی
 mandatoryperiod=Mandatory periods
 mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
+mandatoryHelper2=Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
@@ -435,3 +443,6 @@ AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtu
 ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
 WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned
 PriceLabel=Price label
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index c4388cab84e..fc68321c777 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Tiedostot ovat yhteneväisiä alkuperäisten
 FileIntegritySomeFilesWereRemovedOrModified=Asennus poikkeaa tavallisesta asennuksesta. Tiedostoja on muutettu/poistettu/lisätty.
 GlobalChecksum=Tarkistussumma
 MakeIntegrityAnalysisFrom=Tee eheysanalyysi sovellustiedostoista
-LocalSignature=Upotettu paikallinen allekirjoitus (vähemmän luotettava)
-RemoteSignature=Etäkauko-allekirjoitus (luotettavampi)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Puuttuvat Tiedostot
 FilesUpdated=Päivitetyt Tiedostot
 FilesModified=Muokatut Tiedostot
@@ -229,7 +229,7 @@ SeeInMarkerPlace=Katso kauppapaikalla
 SeeSetupOfModule=Katso moduulin %s asetukset
 SeeSetupPage=Katso asennussivu osoitteessa %s
 SeeReportPage=Katso raporttisivu osoitteessa %s
-SetOptionTo=Aseta vaihtoehdoksi <b>%s</b> arvoksi  %s
+SetOptionTo=Aseta optio <b>%s</b> arvoksi  %s
 Updated=Päivitetty
 AchatTelechargement=Osta / Lataa
 GoModuleSetupArea=Voit ottaa uuden moduulin käyttöön tai asentaa sen siirtymällä moduulin asennusalueelle: <a href="%s"> %s </a>.
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Käytössä vain jossain Kalenterin asetuksissa
 Security=Turvallisuus
 Passwords=Salasanat
 DoNotStoreClearPassword=Salaa tietokantaan tallennetut salasanat.
-MainDbPasswordFileConfEncrypted=Salaa conf.php-tiedostoon tallennettu tietokannan salasana. On erittäin suositeltavaa aktivoida tämä vaihtoehto.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=Jos haluat salasanan koodatuksi <b> conf.php </b> -tiedostoon, korvaa rivi <br> <b> $ dolibarr_main_db_pass = "..."; </b> <br> seuraavalla: <br> <b> $ dolibarr_main_db_pass = "crypted: %s"; </b>
 InstrucToClearPass=Jos haluat salasanan purettuna (selkeäkielisenä) <b> conf.php </b> -tiedostoon, korvaa rivi <br> <b> $ dolibarr_main_db_pass = "crypted: ..."; </b> <br> seuraavalla: <br> <b> $ dolibarr_main_db_pass = "%s"; </b>
 ProtectAndEncryptPdfFiles=Suojaa luotuja PDF-tiedostoja. Tätä EI suositella, koska se rikkoo PDF-tiedostojen joukkotuotannon.
@@ -376,8 +376,8 @@ GenericMaskCodes5b=<b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> i
 GenericNumRefModelDesc=Paluu mukautettavan numeron mukaan määritelty mask.
 DateStartThatModel=Disable use of this numbering rule for all thirdparties created before
 DateStartThatModelHelp=You can disable elephant numbering rule for thirdparties created before a date (for example, because they were imported by a migration, from another software using a different rule). Let that field empty to have the rule applied on all thirdparties.
-ServerAvailableOnIPOrPort=Server on saatavilla osoitteessa <b></b> portissa<b>%s</b>
-ServerNotAvailableOnIPOrPort=Palvelin ei ole käytettävissä osoitteessa <b>%s</b> portissa <b>%s</b>
+ServerAvailableOnIPOrPort=Palvelin on saatavilla osoitteessa<b>%s</b> portissa <b>%s</b>
+ServerNotAvailableOnIPOrPort=Palvelin ei vastaa osoitteessa <b>%s</b> portista <b>%s</b>
 DoTestServerAvailability=Testaa palvelinyhteys
 DoTestSend=Testaa lähetys
 DoTestSendHTML=Testaa lähetys HTML sisällöllä
@@ -401,7 +401,7 @@ NumberOfModelFilesFound=Löytyneiden ODT/ODS-mallitiedostojen määrä
 ExampleOfDirectoriesForModelGen=Esimerkkejä syntaksista: <br> c:\\myapp\\mydocumentdir\\mysubdir <br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Jos haluat tietää, miten voit luoda odt asiakirjamalleja, ennen kuin laitat ne näistä hakemistoista, lue wiki dokumentaatio:
 FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=Etunimi/Sukunimi - sijainti
+FirstnameNamePosition=Etunimi/Sukunimi - järjestys
 DescWeather=Seuraavat kuvat näytetään kojelaudassa, kun myöhästyneiden toimintojen määrä saavuttaa seuraavat arvot:
 KeyForWebServicesAccess=Avain käyttää Web Services (parametri &quot;dolibarrkey&quot; in WebServices)
 TestSubmitForm=Testi lomake
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometrinen piste
 ExtrafieldMultiPointGeo=Geometrinen monipiste
 ExtrafieldLinestringGeo=Geometrinen viiva
 ExtrafieldPolygonGeo=Geometrinen monikulmio
+ExtrafieldStars=Tähdet
 ComputedFormula=Laskettu kenttä
-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=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'
 Computedpersistent=Tallenna laskettu kenttä
 ComputedpersistentDesc=Lasketut ylimääräiset kentät tallennetaan tietokantaan, mutta arvo lasketaan uudelleen vasta, kun tämän kentän kohdetta muutetaan. Jos laskettu kenttä riippuu muista kohteista tai globaaleista tiedoista, tämä arvo saattaa olla väärä!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored WITHOUT encryption (field is just hidden with stars on screen).<br><br>Enter value 'dolcrypt' to encode value with a reversible encryption algorithm. Clear data can still be known and edited but is encrypted into database.<br><br>Enter 'auto' (or 'md5', 'sha256', 'password_hash', ...) to use the default password encryption algorithm (or md5, sha256, password_hash...) to save the non reversible hashed password into database (no way to retrieve original value)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Oman sähköpostipalveluntarjoajasi SMTP-palvelimen käyttäminen sähköpostien lähettämiseen on myös mielenkiintoista, joten kaikki sovelluksesta lähetetyt sähköpostit tallentuvat myös postilaatikkosi "Lähetetyt"-hakemistoon.
 WarningPHPMailD=Siksi on suositeltavaa vaihtaa sähköpostien lähetystapa arvoon "SMTP".
 WarningPHPMailDbis=Jos todella haluat säilyttää oletus "PHP"-menetelmän sähköpostien lähettämiseen, jätä tämä varoitus huomioimatta tai poista se %s napsauttamalla tätä%s.
-WarningPHPMail2=Jos sähköpostin SMTP-palveluntarjoajasi joutuu rajoittamaan sähköpostiohjelman joihinkin IP-osoitteisiin (erittäin harvinaista), tämä on ERP CRM -sovelluksesi sähköpostin käyttäjäagentin (MUA) IP-osoite: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -539,7 +540,7 @@ WarningSettingSortOrder=Varoitus, oletus -lajittelujärjestyksen asettaminen voi
 Field=Kenttä
 ProductDocumentTemplates=Asiakirjamallit tuotedokumentin luomiseksi
 ProductBatchDocumentTemplates=Asiakirjamallit tuoteerien asiakirjan luomiseksi
-FreeLegalTextOnExpenseReports=Ilmainen lakiteksti kuluraporteissa
+FreeLegalTextOnExpenseReports=Vapaa lakiteksti kuluraporteissa
 WatermarkOnDraftExpenseReports=Vesileima kuluraporttiluonnoksissa
 ProjectIsRequiredOnExpenseReports=Projekti on pakollinen kuluraportti
 PrefillExpenseReportDatesWithCurrentMonth=Pre-fill start and end dates of new expense report with start and end dates of the current month
@@ -567,8 +568,8 @@ Module10Name=Kirjanpito (yksinkertainen)
 Module10Desc=Yksinkertaiset kirjanpitoraportit (päiväkirjat, liikevaihto) tietokannan sisällön perusteella. Ei käytä mitään kirjanpitotaulukkoa.
 Module20Name=Ehdotukset
 Module20Desc=Kaupalliset ehdotuksia hallinto -
-Module22Name=Joukkoviestit
-Module22Desc=Hallitse joukkosähköpostia
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energia
 Module23Desc=Energiakulutuksen seuranta
 Module25Name=Myyntitilaukset
@@ -780,10 +781,10 @@ Permission86=Lähetä asiakkaiden tilauksia
 Permission87=Sulje asiakkaiden tilauksia
 Permission88=Peruuta asiakkaiden tilauksia
 Permission89=Poista asiakkaiden tilauksia
-Permission91=Lue sosiaalinen tai verotus Verot ja alv
+Permission91=Read social or fiscal taxes and vat
 Permission92=Luo/Muokkaa sosiaalimaksu / vero tai alv
-Permission93=Poista sosiaalinen tai verotus Verot ja alv
-Permission94=Vie sosiaalinen tai verotus Verot
+Permission93=Delete social or fiscal taxes and vat
+Permission94=Export social or fiscal taxes
 Permission95=Lue raportit
 Permission101=Lue sendings
 Permission102=Luoda / muuttaa sendings
@@ -847,10 +848,10 @@ Permission212=Tilausrivit
 Permission213=Ota linja
 Permission214=Setup Puhelimet
 Permission215=Setup tarjoajien
-Permission221=Lue emailings
-Permission222=Luoda / muuttaa emailings (aihe, vastaanottajat ...)
-Permission223=Validate emailings (avulla lähetys)
-Permission229=Poista emailings
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Näytä vastaanottajat ja tiedot
 Permission238=Manuaalinen viestien lähetys
 Permission239=Poista sähköpostit vahvistuksen tai lähetyksen jälkeen
@@ -1084,7 +1085,7 @@ DictionaryCompanyJuridicalType=Kolmannen osapuolen oikeushenkilöt
 DictionaryProspectLevel=Potentiaalinen taso yrityksille
 DictionaryProspectContactLevel=Katsele potentiaalista tasoa kontakteille
 DictionaryCanton=Osavaltiot / provinssit
-DictionaryRegion=Alueiden
+DictionaryRegion=Alueet
 DictionaryCountry=Maat
 DictionaryCurrency=Valuutat
 DictionaryCivility=Kunnianimet
@@ -1097,7 +1098,7 @@ DictionaryPaymentModes=Maksutavat
 DictionaryTypeContact=Yhteystiedot tyypit
 DictionaryTypeOfContainer=Verkkosivusto – verkkosivuston sivujen/säilöjen tyyppi
 DictionaryEcotaxe=Ympäristöveron (WEEE)
-DictionaryPaperFormat=Paper tiedostomuodot
+DictionaryPaperFormat=Arkkikoot
 DictionaryFormatCards=Korttimuodot
 DictionaryFees=kuluraportti – kuluraportti rivien tyypit
 DictionarySendingMethods=Sendings menetelmiä
@@ -1105,6 +1106,7 @@ DictionaryStaff=Työntekijöiden lukumäärä
 DictionaryAvailability=Toimituksen viivästyminen
 DictionaryOrderMethods=Tilausmenetelmät
 DictionarySource=Alkuperä ehdotusten / tilaukset
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Räätälöidyt ryhmät raportteja varten
 DictionaryAccountancysystem=Tilikartan mallit
 DictionaryAccountancyJournal=Kirjanpitotilityypit
@@ -1134,7 +1136,7 @@ BackToDictionaryList=Takaisin sanakirjaluetteloon
 TypeOfRevenueStamp=Veroleiman tyyppi
 VATManagement=Myyntiverojen hallinta
 VATIsUsedStandard=Kun luot asiakirjoja (tarjoukset, laskut, tilaukset...), oletusarvoinen arvonlisäverokanta asetetaan vakiosääntöjen mukaan (riippuen myyjän ja ostajan maista)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Oletusarvoisesti ehdotettu myyntivero on 0, jota voidaan käyttää esimerkiksi yhdistyksiin, yksityishenkilöihin tai pieniin yrityksiin.
 VATIsUsedExampleFR=Ranskassa se tarkoittaa yrityksiä tai organisaatioita, joilla on todellinen verojärjestelmä (yksinkertaistettu todellinen tai normaali real). Järjestelmä, jossa arvonlisävero ilmoitetaan.
 VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), yo
 LabelUsedByDefault=Label käyttää oletusarvoisesti, jos ei ole käännös löytyy koodi
 LabelOnDocuments=Label asiakirjoihin
 LabelOrTranslationKey=Tunniste tai käännösavain
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1213,11 +1216,11 @@ MenuCompanySetup=Yritys/Organisaatio
 DefaultMenuManager= Standard valikonhallinta
 DefaultMenuSmartphoneManager=Smartphone valikonhallinta
 Skin=Ulkoasu
-DefaultSkin=Oletus ulkoasu
+DefaultSkin=Oletusteema
 MaxSizeList=Luetteloiden enimmäispituus
-DefaultMaxSizeList=Oletus luettelon maksimipituuteen
+DefaultMaxSizeList=Luetteloiden maksimipituus
 MaxSizeShortList=Lyhyiden luetteloiden enimmäispituus
-DefaultMaxSizeShortList=oletus lyhyiden luetteloiden enimmäispituus (eli asiakaskortissa)
+DefaultMaxSizeShortList=Lyhyiden luetteloiden enimmäispituus (esim. asiakaskortissa)
 DisplayGrandTotalInList=Näytä kaikkien sivujen kokonaismäärä luetteloiden alatunnisteessa
 MessageOfDay=Päivän viesti
 MessageLogin=Kirjoita viesti
@@ -1261,7 +1264,7 @@ Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Aktivoitava palvelu
 Delays_MAIN_DELAY_RUNNING_SERVICES=Vanhentunut palvelu
 Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Avoin ostovelka
 Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Avoin myyntisaaminen
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Odottaa pankin sovittelua
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Odottaa pankin täsmäytystä
 Delays_MAIN_DELAY_MEMBERS=Viivästynyt jäsenmaksu
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Sekkitalletusta ei tehty
 Delays_MAIN_DELAY_EXPENSEREPORTS=Hyväksyttävissä olevat kuluraportit
@@ -1287,7 +1290,7 @@ InfoPerf=Tietoja suorituskyvystä
 InfoSecurity=Tietoja turvallisuudesta
 BrowserName=Selaimen nimi
 BrowserOS=Selaimen OS
-ListOfSecurityEvents=Luettelo Dolibarr turvallisuus tapahtumat
+ListOfSecurityEvents=Turvallisuus tapahtumat
 SecurityEventsPurged=Turvallisuus tapahtumia puhdistettava
 SecurityEvent=Turvallisuustapahtuma
 TrackableSecurityEvents=Seurattavat turvallisuustapahtumat
@@ -1324,7 +1327,7 @@ MAIN_MAX_DECIMALS_SHOWN=Max. desimaalit näytöllä <b>näkyviin hintoihin</b>.
 MAIN_ROUNDING_RULE_TOT=Pyöristysalueen askel (maissa, joissa pyöristys tehdään jollain muulla kuin perusarvolla 10. Kirjoita esimerkiksi 0,05, jos pyöristetään 0,05 askelta)
 UnitPriceOfProduct=Tuotteen nettohinta
 TotalPriceAfterRounding=Kokonaishinta veroineen ilman ALVia
-ParameterActiveForNextInputOnly=Parametri tehokas Seuraavan vain tuloa
+ParameterActiveForNextInputOnly=Parametri on voimassa vain seuraavassa syötteessä
 NoEventOrNoAuditSetup=Turvatapahtumaa ei ole kirjattu. Tämä on normaalia, jos tarkastusta ei ole otettu käyttöön "Asetukset - Suojaus - Tapahtumat" -sivulla.
 NoEventFoundWithCriteria=Tälle hakukriteerille ei löytynyt suojaustapahtumaa.
 SeeLocalSendMailSetup=Katso paikallisen sendmail setup
@@ -1337,14 +1340,14 @@ BackupPHPWarning=Varmuuskopiointia ei voida taata tällä menetelmällä. Edelli
 RestoreDesc=Dolibarr-varmuuskopion palauttaminen edellyttää kahta vaihetta.
 RestoreDesc2=Palauta "documents" -hakemiston varmuuskopio tiedosto (esimerkiksi zip tiedosto) uuteen Dolibarr-asennukseen tai näihin nykyisiin asiakirjoihin hakemisto (<b>%s</b>).
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
-RestoreMySQL=MySQL vienti
-ForcedToByAModule=Tämä sääntö on <b>pakko %s</b> on aktivoitu moduuli
+RestoreMySQL=MySQL palautus
+ForcedToByAModule=Tämä sääntö </b>%s</b> on asetettu kun moduuli aktivoitiin
 ValueIsForcedBySystem=Järjestelmä pakottaa tämän arvon. Et voi muuttaa sitä.
 PreviousDumpFiles=Olemassa olevat varmuuskopiot
 PreviousArchiveFiles=Olemassa olevat arkistotiedostot
 WeekStartOnDay=Ensimmäinen viikonpäivä
 RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
-YouMustRunCommandFromCommandLineAfterLoginToUser=Sinun on suoritettava tämä komento komentoriviltä jälkeen kirjautua kuori käyttäjän <b>%s.</b>
+YouMustRunCommandFromCommandLineAfterLoginToUser=Sinun on suoritettava tämä komento komentoriviltä kirjautuen käyttäjänä <b>%s</b> tai sinun on lisättävä -W optio komennon loppuun antaaksesi <b>%s</b> salasana.
 YourPHPDoesNotHaveSSLSupport=SSL toimintoja ei saatavilla PHP
 DownloadMoreSkins=Lataa lisää ulkoasuja
 SimpleNumRefModelDesc=Palauttaa viitenumeron muodossa %syymm-nnnn, jossa vv on vuosi, mm on kuukausi ja nnnn on peräkkäinen automaattinen lisäys ilman nollausta
@@ -1403,7 +1406,7 @@ CurrentTranslationString=Nykyinen käännösteksti
 WarningAtLeastKeyOrTranslationRequired=Hakuehto vaaditaan ainakin avaimelle tai käännösmerkkijonolle
 NewTranslationStringToShow=Uusi käännösmerkkijono näytettäväksi
 OriginalValueWas=Alkuperäinen käännös korvataan. Alkuperäinen arvo oli:<br><br>%s
-TransKeyWithoutOriginalValue=Pakotit uuden käännöksen käännösavaimelle '<strong>%s</strong>' jota ei ole missään Kieli tiedostossa
+TransKeyWithoutOriginalValue=Pakotit uuden käännöksen käännösavaimelle '<strong>%s</strong>' jota ei ole missään kieli tiedostossa
 TitleNumberOfActivatedModules=Aktivoidut moduulit
 TotalNumberOfActivatedModules=Aktivoidut moduulit: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Sinulla pitää olla ainakin 1 moduuli käytössä
@@ -1431,7 +1434,7 @@ AddVatInList=Näytä asiakkaan/Toimittaja ALV-numero yhdistelmäluetteloissa.
 AddAdressInList=Display Customer/Vendor address into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Kysy ensisijaista lähetystapaa kolmansille osapuolille.
-FieldEdition=Alalla painos %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Esimerkki: +2 (täytä vain, jos aikavyöhykkeen siirtymäongelmia esiintyy)
 GetBarCode=Hanki viivakoodi
 NumberingModules=Numerointimallit
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Force laskun päivämäärästä validointiin päivämäärä
 SuggestedPaymentModesIfNotDefinedInInvoice=Ehdotettu maksutapa laskussa oletuksena, jos sitä ei ole määritelty laskussa
 SuggestPaymentByRIBOnAccount=Ehdota maksua tilisiirtona
 SuggestPaymentByChequeToAddress=Ehdota maksua sekillä
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Laskun viesti
 WatermarkOnDraftInvoices=vesileima Luonnos laskuissa (ei yhtään, jos tyhjä)
 PaymentsNumberingModule=Maksujen numerointimalli
@@ -1507,14 +1512,14 @@ PropalSetup=Kaupalliset ehdotuksia moduulin asetukset
 ProposalsNumberingModules=Kaupalliset ehdotus numerointiin modules
 ProposalsPDFModules=Kaupalliset ehdotus asiakirjojen malleja
 SuggestedPaymentModesIfNotDefinedInProposal=Suggested payment mode by default if not defined on the proposal
-FreeLegalTextOnProposal=Vapaa tekstihaku kaupallisiin ehdotuksia
+FreeLegalTextOnProposal=Vapaateksti tarjoukselle
 WatermarkOnDraftProposal=vesileima Luonnos kaupallisissa ehdotuksissa (ei yhtään, jos tyhjä)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Pyydä pankkitili kohdetta tarjous
 ##### SupplierProposal #####
 SupplierProposalSetup=Hintapyynnöt Toimittajat moduulin asetukset
 SupplierProposalNumberingModules=Hintapyynnöt Toimittajat numerointimallit
 SupplierProposalPDFModules=Hintapyynnöt Toimittajat asiakirjamallit
-FreeLegalTextOnSupplierProposal=Vapaa teksti hintapyyntöihin Toimittajat
+FreeLegalTextOnSupplierProposal=Vapaateksti toimittajan hintapyyntöihin
 WatermarkOnDraftSupplierProposal=Vesileima toimittajan hintapyyntöluonnoksissa (ei mitään, jos tyhjä)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Kysy hintapyynnön pankkitilin kohde
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pyydä lähdevarasto tilaukselle
@@ -1525,13 +1530,13 @@ SuggestedPaymentModesIfNotDefinedInOrder=Ehdotettu maksutapa myyntitilauksessa o
 OrdersSetup=Myyntitilausten hallinnan määritys
 OrdersNumberingModules=Tilaukset numerointiin modules
 OrdersModelModule=Tilaa asiakirjojen malleja
-FreeLegalTextOnOrders=Vapaa tekstihaku tilauksissa
-WatermarkOnDraftOrders=vesileima Luonnos tilauksissa (ei yhtään, jos tyhjä)
+FreeLegalTextOnOrders=Vapaateksti tilaukselle
+WatermarkOnDraftOrders=Vesileima luonnos tilauksissa (ei mitään, jos tyhjä)
 ShippableOrderIconInList=Lisää Tilaukset-luetteloon kuvake, joka ilmoittaa, voidaanko tilaus toimittaa
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Kysy tilauksen pankkitilin kohde
 ##### Interventions #####
 InterventionsSetup=Työmääräimet moduulin asetukset
-FreeLegalTextOnInterventions=Vapaa teksti interventio asiakirjojen
+FreeLegalTextOnInterventions=Vapaateksti työmääräin asiakirjaan
 FicheinterNumberingModules=Väliintulo numerointiin modules
 TemplatePDFInterventions=Väliintulo kortin asiakirjojen malleja
 WatermarkOnDraftInterventionCards=vesileima interventiokorttiasiakirjoissa (ei yhtään, jos se on tyhjä)
@@ -1539,7 +1544,7 @@ WatermarkOnDraftInterventionCards=vesileima interventiokorttiasiakirjoissa (ei y
 ContractsSetup=Sopimukset / Tilaukset-moduulin asetukset
 ContractsNumberingModules=Sopimukset numerointi moduulit
 TemplatePDFContracts=Sopimuspohjat
-FreeLegalTextOnContracts=Vapaa sana sopimuksissa
+FreeLegalTextOnContracts=Vapaateksti sopimukselle
 WatermarkOnDraftContractCards=Vesileima sopimusluonnoksissa (ei käytössä jos jätetään tyhjäksi)
 ##### Members #####
 MembersSetup=Jäsenet moduulin asetukset
@@ -1550,7 +1555,7 @@ AdherentLoginRequiredDesc=Lisää arvo kirjautumiselle ja salasanalle jäsenelle
 AdherentMailRequired=Uuden jäsenen luomiseen vaaditaan sähköpostiosoite
 MemberSendInformationByMailByDefault=The checkbox to send an email confirmation to members (validation or new subscription) is on by default
 MemberCreateAnExternalUserForSubscriptionValidated=Create automatically an external user (with a login to connect to the application) after an online payment of a membership subscription
-VisitorCanChooseItsPaymentMode=Vierailija voi valita kaikista käytettävissä olevista maksu-tiloista
+VisitorCanChooseItsPaymentMode=Vierailija voi valita kaikista käytettävissä olevista maksuvaihtoehdoista
 MEMBER_REMINDER_EMAIL=Ota käyttöön automaattinen muistutus <b>sähköpostitse</b> vanhentuneista tilauksista. Huomautus: moduuli <strong>%s</strong> on otettava käyttöön ja on määritetty oikein lähettämään muistutuksia.
 MembersDocModules=Asiakirjamallit jäsentietueesta luoduille asiakirjoille
 ##### LDAP setup #####
@@ -1610,8 +1615,8 @@ LDAPUserObjectClassList=Luettelo objectClass
 LDAPUserObjectClassListExample=Luettelo objectClass määritellään tallentaa attribuutteja (ex: top, inetOrgPerson tai alkuun, käyttäjän Active Directory)
 LDAPGroupObjectClassList=Luettelo objectClass
 LDAPGroupObjectClassListExample=Luettelo objectClass määritellään tallentaa attribuutteja (ex: top, groupOfUniqueNames)
-LDAPContactObjectClassList=Luettelo objectClass
-LDAPContactObjectClassListExample=Luettelo objectClass määritellään tallentaa attribuutteja (ex: top, inetOrgPerson tai alkuun, käyttäjän Active Directory)
+LDAPContactObjectClassList=List of objectClass
+LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
 LDAPTestConnect=Testaa LDAP-yhteys
 LDAPTestSynchroContact=Testaa yhteystietojen synkronointi
 LDAPTestSynchroUser=Testaa käyttäjien synkronointi
@@ -1622,7 +1627,7 @@ LDAPTestSearch= Testaa LDAP-haku
 LDAPSynchroOK=Synkronointi testi onnistunut
 LDAPSynchroKO=Epäonnistui synkronointi testi
 LDAPSynchroKOMayBePermissions=Synkronointitesti epäonnistui. Tarkista, että yhteys palvelimeen on määritetty oikein ja sallii LDAP-päivitykset
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=TCP yhteyden LDAP-palvelin onnistunut (Server= %s, Port= %s)
+LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
 LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=TCP yhteyden LDAP-palvelimeen ei onnistunut (Server= %s, Port= %s)
 LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
 LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
@@ -1697,7 +1702,7 @@ ForANonAnonymousAccess=Jotta autentikoitu acces (for a kirjoitusoikeuksia esimer
 PerfDolibarr=Suorituskyvyn määritys / optimointiraportti
 YouMayFindPerfAdviceHere=Tällä sivulla on joitain suoritukseen liittyviä tarkastuksia tai neuvoja.
 NotInstalled=Ei asennettu.
-Installed=Installed.
+Installed=asennettu.
 NotSlowedDownByThis=Ei hidasta tätä.
 NotRiskOfLeakWithThis=Ei vuotoriskiä tällä.
 ApplicativeCache=Sovellettava välimuisti
@@ -1718,9 +1723,10 @@ CompressionOfResources=HTTP-vastausten pakkaus
 CompressionOfResourcesDesc=Esimerkiksi käyttämällä Apache-ohjetta "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Tällainen automaattinen tunnistus ei ole mahdollista nykyisillä selaimilla
 DefaultValuesDesc=Täällä voit määrittää oletus-arvon, jota haluat käyttää uutta tietuetta luodessasi, ja/tai oletus suodattimet tai lajittelujärjestys tietueita luetteloitaessa.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Oletusarvot (käytettäväksi lomakkeissa)
 DefaultSearchFilters=Oletus hakusuodattimet
-DefaultSortOrder=oletus lajittelujärjestystä
+DefaultSortOrder=Oletus lajittelujärjestys
 DefaultFocus=oletus kohdistuskenttää
 DefaultMandatory=Pakolliset lomakekentät
 ##### Products #####
@@ -1739,7 +1745,7 @@ UseSearchToSelectProductTooltip=Also if you have a large number of products (> 1
 UseSearchToSelectProduct=Odota, kunnes painat näppäintä, ennen kuin lataat tuoteyhdistelmäluettelon sisällön (Tämä voi parantaa suorituskykyä, jos sinulla on paljon tuotteet, mutta se ei ole niin kätevää)
 SetDefaultBarcodeTypeProducts=Tuotteissa käytetty viivakoodin tyyppi
 SetDefaultBarcodeTypeThirdParties=Kolmansien osapuolien käyttämä viivakoodityyppi (oletus)
-UseUnits=Määritä määrälle mittayksikkö tilauksen, tarjous tai laskurivien painoksen yhteydessä
+UseUnits=Määritä määrän mittayksikkö tilauksen, tarjouksen tai laskurivien muokkauksen yhteydessä.
 ProductCodeChecker= Moduuli tuotekoodin luomiseen ja (tuote tai palvelu)
 ProductOtherConf= Tuotteen / palvelun kokoonpano
 IsNotADir=ei ole hakemisto!
@@ -1799,24 +1805,25 @@ SendingsReceiptModel=Lähettävä vastaanottanut malli
 SendingsNumberingModules=Lähetysten numerointi moduulit
 SendingsAbility=Tue lähetysarkkeja asiakastoimituksiin
 NoNeedForDeliveryReceipts=Useimmissa tapauksissa lähetysarkkeja käytetään sekä asiakastoimitusten arkkeina (lähetettävä tuotteet) ja-arkkeina, jotka vastaanotetaan ja asiakkaan allekirjoittama. Tästä syystä tuotteen toimituskuitti on päällekkäinen ominaisuus ja, jota käytetään harvoin.
-FreeLegalTextOnShippings=Vapaa sana lähetyksissä
+FreeLegalTextOnShippings=Vapaateksti lähetyksissä
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Tuotteiden toimitukset vastaanottamisesta numerointiin moduuli
 DeliveryOrderModel=Tuotteiden toimitukset vastaanottamisesta malli
 DeliveriesOrderAbility=Tuki tuotteiden toimitusten kuitit
-FreeLegalTextOnDeliveryReceipts=Vapaa tekstihaku toimituksen tulot
+FreeLegalTextOnDeliveryReceipts=Vapaateksti toimituksen vastaanotolla
 ##### FCKeditor #####
 AdvancedEditor=Kehittynyt editori
 ActivateFCKeditor=Ota FCKeditor varten:
-FCKeditorForNotePublic=Elementtien Kenttä "julkisten muistiinpanojen" WYSIWYG luominen/painos
-FCKeditorForNotePrivate=WYSIWYG-elementtien Kenttä "yksityisten muistiinpanojen" luominen/painos
-FCKeditorForCompany=Elementtien kuvauksen Kenttä WYSIWYG-luonti/-versio (paitsi tuotteet/services)
-FCKeditorForProductDetails=WYSIWYG-luonti/versio tuotteet kuvauksesta tai riveistä objekteille (ehdotusrivit, tilaukset, laskut jne.).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Varoitus: tämän vaihtoehdon käyttämistä tässä tapauksessa ei todellakaan suositella, koska se voi luo ongelmia erikoismerkkien kanssa ja sivun muotoilussa PDF-tiedostoa laadittaessa tiedostot.
-FCKeditorForMailing= WYSIWYG-luonti/painos joukkosähköpostilähetyksiä varten (Työkalut->sähköposti)
-FCKeditorForUserSignature=WYSIWYG-käyttäjän allekirjoituksen luominen/versio
-FCKeditorForMail=WYSIWYG-luonti/painos kaikille viesteille (paitsi Työkalut->sähköposti)
-FCKeditorForTicket=WYSIWYG-luonti/painos lipuille
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup='Varasto' - moduulin asetukset
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
@@ -1849,7 +1856,7 @@ DeleteMenu=Poista valikosta
 ConfirmDeleteMenu=Haluatko varmasti poistaa valikko merkinnän <b>%s</b>?
 FailedToInitializeMenu=Valikon alustaminen epäonnistui
 ##### Tax #####
-TaxSetup=Verot, sosiaalinen tai verotus Verot ja osingot
+TaxSetup=Verot, sosiaalimaksut ja osingot moduulin asetukset
 OptionVatMode=ALV Erääntyy
 OptionVATDefault=Vakioperuste
 OptionVATDebitOption=Suoriteperusteinen
@@ -1864,10 +1871,9 @@ OnInvoice=Käytössä lasku
 SupposedToBePaymentDate=Maksupäivä käyttää, jos toimituksen päivämäärä ei ole tiedossa
 SupposedToBeInvoiceDate=Laskun päiväys
 Buy=Ostaa
-Sell=Myydä
+Sell=Myynti
 InvoiceDateUsed=Laskun päiväys
 YourCompanyDoesNotUseVAT=Yritys on määritetty niin, että se ei käytä arvonlisäveroa (Etusivu - Asennus - Yritys/Organization), joten arvonlisäverovaihtoehtoja ei ole perustaa.
-AccountancyCode=Kirjanpitotili
 AccountancyCodeSell=Myyntien tili
 AccountancyCodeBuy=Ostojen tili
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Pidä oletus automaattisesti luo maksu -valintaruutu tyhjänä luodessasi. uusi vero
@@ -1879,14 +1885,19 @@ AGENDA_DEFAULT_VIEW = Minkä näkymän haluat avata: oletus, kun valitset valikk
 AGENDA_EVENT_PAST_COLOR = Menneen tapahtuman väri
 AGENDA_EVENT_CURRENT_COLOR = Tämänhetkinen tapahtuman väri
 AGENDA_EVENT_FUTURE_COLOR = Tulevaisuuden tapahtuman väri
-AGENDA_REMINDER_BROWSER = Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Ota käyttöön ilmoitusäänet
-AGENDA_REMINDER_EMAIL = Ota käyttöön sähköpostimuistutus <b></b> (muistutusvaihtoehto/viive voidaan määrittää kullekin tapahtumalle).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Huomaa: ajoitetun työn %s tiheyden on oltava riittävä, jotta varmistetaan, että muistutus lähetetään oikealla hetkellä.
 AGENDA_SHOW_LINKED_OBJECT = Näytä linkitetty objekti esityslistanäkymään
 AGENDA_USE_EVENT_TYPE = Käytä tapahtumatyyppejä (hallitaan kohdassa valikko Asetukset -> Sanakirjat -> Esityslistatapahtumien tyypit)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Aseta tämä oletusarvo automaattisesti tapahtuman tyypille tapahtuman luontilomakkeessa
-PasswordTogetVCalExport = Avain sallia viennin linkki
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
+PasswordTogetVCalExport = Key to authorize export link
 PastDelayVCalExport=Älä viedä tapauksessa vanhempia kuin
 SecurityKey = Turva-avain
 ##### ClickToDial #####
@@ -1907,8 +1918,8 @@ CashDeskBankAccountForSumup=oletus pankkitili käytettäväksi maksujen vastaano
 CashDeskDoNotDecreaseStock=Poista varasto käytöstä vähentää, kun myynti tapahtuu myyntipisteestä
 CashDeskDoNotDecreaseStockHelp=Jos "ei", varasto vähentää tehdään jokaiselle POS-myynnille riippumatta moduulissa Varastossa asetetusta vaihtoehdosta.
 CashDeskIdWareHouse=Pakota ja rajoittamaan varaston käyttöä varastolle vähentää
-StockDecreaseForPointOfSaleDisabled=Varasto vähentää myyntipisteestä poistettu käytöstä
-StockDecreaseForPointOfSaleDisabledbyBatch=Varasto vähentää myyntipisteessä ei ole yhteensopiva sarja-/erähallintamoduulin kanssa (tällä hetkellä aktiivinen), joten varasto vähentää on poistettu käytöstä.
+StockDecreaseForPointOfSaleDisabled=Varaston väheneminen myyntipisteeltä poistettu käytöstä
+StockDecreaseForPointOfSaleDisabledbyBatch=Varaston väheneminen myyntipisteessä ei ole yhteensopivaa sarja-/erätuotehallintamoduulin (käytössä) kanssa, joten varaston väheneminen on poistettu käytöstä.
 CashDeskYouDidNotDisableStockDecease=Et poistanut varastoa vähentää käytöstä tehdessäsi myyntiä myyntipisteestä. Siksi varastoa tarvitaan.
 CashDeskForceDecreaseStockLabel=Varasto vähentää erälle tuotteet pakotettiin.
 CashDeskForceDecreaseStockDesc=vähentää ensin vanhin syöttäjä ja, myyjä päivämäärät.
@@ -1933,7 +1944,7 @@ ApiKey=API-avain
 WarningAPIExplorerDisabled=API-selain on poistettu käytöstä. API-selainta ei tarvita API-palvelujen käyttämiseksi. Se on kehittäjän työkalu etsiä / testata REST API-rajapintaa. Jos tarvitset tätä työkalua, siirry moduulin API REST -asetuksiin aktivoidaksesi sen.
 ##### Bank #####
 BankSetupModule=Pankki-moduulin asetukset
-FreeLegalTextOnChequeReceipts=Vapaa teksti shekkikuitteissa
+FreeLegalTextOnChequeReceipts=Vapaateksti shekkikuitteissa
 BankOrderShow=Näytä järjestyksessä pankkitilit käyttävien maiden &quot;yksityiskohtaista pankin numero&quot;
 BankOrderGlobal=Yleinen
 BankOrderGlobalDesc=Yleinen näyttöjärjestys
@@ -1997,7 +2008,7 @@ YouMayFindNotificationsFeaturesIntoModuleNotification=Saatat löytää vaihtoeht
 TemplatesForNotifications=Emails templates for notifications
 ListOfNotificationsPerUser=Luettelo automaattisista ilmoituksista käyttäjää kohti *
 ListOfNotificationsPerUserOrContact=Luettelo mahdollisista automaattisista Ilmoitukset (yritystapahtumassa) saatavilla per käyttäjä* tai yhteyshenkilö**
-ListOfFixedNotifications=Global recipients emails for automatic email notifications
+ListOfFixedNotifications=Globaalit vastaanottajien sähköpostiosoitteet automaattisia sähköposti-ilmoituksia varten
 GoOntoUserCardToAddMore=Siirry käyttäjän ilmoitukset -välilehteen lisätäksesi tai poistaaksesi ilmoituksia käyttäjille
 GoOntoContactCardToAddMore=Siirry kolmannen osapuolen välilehdelle Ilmoitukset, jos haluat lisätä tai poistaa ilmoituksia kontakteille / osoitteille
 Threshold=Kynnys
@@ -2006,7 +2017,7 @@ BackupZipWizard=Ohjattu toiminto asiakirjojen arkiston rakentamiseen
 SomethingMakeInstallFromWebNotPossible=Ulkoisen moduulin asennus ei ole mahdollista verkkoliitännästä seuraavasta syystä:
 SomethingMakeInstallFromWebNotPossible2=Tästä syystä tässä kuvattu päivitysprosessi on manuaalinen prosessi, jonka vain etuoikeutettu käyttäjä voi suorittaa.
 InstallModuleFromWebHasBeenDisabledContactUs=Ulkoisten moduulien tai dynaamisten verkkosivustojen asentaminen tai kehittäminen sovelluksesta on tällä hetkellä lukittu turvallisuussyistä. Ota yhteyttä, jos haluat ottaa tämän ominaisuuden käyttöön.
-InstallModuleFromWebHasBeenDisabledByFile=Järjestelmänvalvoja on poistanut ulkoisen moduulin asennuksen sovelluksesta. Sinun on pyydettävä häntä poistamaan tiedosto <strong> %s </strong> tämän ominaisuuden sallimiseksi.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Korosta taulukon rivit hiiren liikkuessa niiden päällä
 HighlightLinesColor=Korosta viivan väri, kun hiiri kulkee sen yli (käytä "ffffff", jos et halua korostaa)
@@ -2021,7 +2032,7 @@ PressF5AfterChangingThis=Paina näppäimistön CTRL + F5 tai tyhjennä selaimen
 NotSupportedByAllThemes=Will toimii ydinteemojen kanssa, ulkoiset teemat eivät välttämättä tue sitä
 BackgroundColor=Taustaväri
 TopMenuBackgroundColor=Taustaväri ylävalikolle
-TopMenuDisableImages=Kuvake tai teksti yläosassa valikko
+TopMenuDisableImages=Kuvake tai teksti ylävalikossa
 LeftMenuBackgroundColor=Taustaväri alavalikolle
 LeftmenuId=Left menu ID
 BackgroundTableTitleColor=Taulukon otsikkorivin taustaväri
@@ -2036,12 +2047,13 @@ Enter0or1=Syötä 0 tai 1
 EnterYesOrNo=Valitse Kyllä tai Ei
 UnicodeCurrency=Kirjoita tähän aaltosulkeiden väliin, luettelo tavunumerosta, joka edustaa valuuttasymbolia. Esimerkiksi: kirjoita $: lle [36] - Brasilian real:lle R $ [82,36] - €: lle, kirjoita [8364]
 ColorFormat=RGB-väri on HEX-muodossa, esim .: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Icon name in format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
 PositionIntoComboList=Viivan sijainti yhdistelmäluetteloissa
 SellTaxRate=Myyntiprosentti vero
 RecuperableOnly=Kyllä, jos arvonlisävero "Ei havaittu, mutta palautettavissa" on omistettu jollekin Ranskan osavaltiolle. Pidä arvo "Ei" kaikissa muissa tapauksissa.
 UrlTrackingDesc=Jos palveluntarjoaja tai kuljetuspalvelu tarjoaa sivun tai web-sivuston lähetystesi tilan tarkistamiseksi, voit kirjoittaa sen tähän. Voit käyttää avainta {TRACKID} URL-parametreissa, jolloin järjestelmä korvaa sen avaimella lähetystunnus, jonka käyttäjä on kirjoittanut lähetyskorttiin. .
-OpportunityPercent=Kun luo liidit, määrität arvioidun projektin/liidin määrän. Liidin tilan mukaan tämä summa voidaan kertoa tällä osuudella, jotta voidaan arvioida kokonaissumma, jonka kaikki liidit voivat tuottaa. Arvo on prosenttiosuus (välillä 0 ja 100).
+OpportunityPercent=Kun luot liidin, määrität sille arvioidun summan. Liidin tilan perusteella tätä summaa voidaan kertoa tällä kertoimella, jotta voidaan arvioida kaikkien liidiesi mahdollisesti tuottama kokonaissumma. Arvo on prosentti (väliltä 0–100).
 TemplateForElement=Minkä tyyppiseen objektiin tämä sähköpostimalli liittyy? Sähköpostimalli on käytettävissä vain, kun käytetään "Lähetä sähköposti" -painiketta liittyvästä objektista.
 TypeOfTemplate=Mallin tyyppi
 TemplateIsVisibleByOwnerOnly=Malli näkyy vain omistajalle
@@ -2103,7 +2115,7 @@ AddModels=Lisää asiakirja- tai numerointimallit
 AddSubstitutions=Lisää avainten vaihtoja
 DetectionNotPossible=Tunnistaminen ei ole mahdollista
 UrlToGetKeyToUseAPIs=URL-osoite hakeaksesi tunnuksen käyttämään API-rajapintaa (kun tunnus on vastaanotettu, se tallennetaan tietokannan käyttäjätauluun ja se on annettava jokaisessa API-kutsussa)
-ListOfAvailableAPIs=Luettelo saatavilla olevista API:sta
+ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Moduuli "%s" riippuu moduulista "%s", joka puuttuu, joten moduuli "%1$s" ei välttämättä toimi oikein. Asenna moduuli "%2$s" tai poista moduuli "%1$s" käytöstä, jos haluat olla turvassa yllätyksiltä
 CommandIsNotInsideAllowedCommands=Komentoa, jota yrität suorittaa, ei ole parametrissa <strong> $ dolibarr_main_restrict_os_commands </strong> määritetyssä sallittujen komentojen luettelossa <strong> conf.php </strong>.
 LandingPage=Aloitussivu
@@ -2120,20 +2132,25 @@ MAIN_PDF_MARGIN_LEFT=PDF:n vasen marginaali
 MAIN_PDF_MARGIN_RIGHT=PDF:n oikea marginaali
 MAIN_PDF_MARGIN_TOP=PDF:n ylämarginaali
 MAIN_PDF_MARGIN_BOTTOM=PDF:n alamarginaali
-MAIN_DOCUMENTS_LOGO_HEIGHT=Logon korkeus PDF-muodossa
+MAIN_DOCUMENTS_LOGO_HEIGHT=Logon korkeus PDF-dokumentilla
 DOC_SHOW_FIRST_SALES_REP=Näytä ensimmäinen myyntiedustaja
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Lisää kuvan sarake tarjous-riville
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Sarakkeen leveys, jos riveille on lisätty kuva
 MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Piilota tarjouspyyntöjen yksikköhintasarake
 MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Piilota tarjouspyyntöjen kokonaishintasarake
-MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Piilota yksikköhintasarake Hankinta tilauksissa
-MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on purchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Piilota yksikköhintasarake ostotilauksissa
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Piilota kokonaishinta-sarake ostotilauksissa
 MAIN_PDF_NO_SENDER_FRAME=Piilota reunat lähettäjän osoitekehyksestä
 MAIN_PDF_NO_RECIPENT_FRAME=Piilota reunat vastaanottajan osoitekehyksestä
 MAIN_PDF_HIDE_CUSTOMER_CODE=Piilota asiakaskoodi
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Piilota lähettäjän/Yritys nimi osoitekentässä
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Piilota maksuehdot
-PROPOSAL_PDF_HIDE_PAYMENTMODE=Piilota maksu-tila
+PROPOSAL_PDF_HIDE_PAYMENTMODE=Piilota maksutapa
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
 NothingToSetup=Tämä moduuli ei vaadi erityisiä määrityksiä.
 SetToYesIfGroupIsComputationOfOtherGroups=Aseta arvoksi kyllä, jos tämä ryhmä on muiden ryhmien laskenta
@@ -2293,7 +2310,7 @@ PDF_USE_A=PDF documents format
 FafaIconSocialNetworksDesc=Kirjoita tähän FontAwesome-kuvakkeen koodi. Jos et tiedä mikä on FontAwesome, voit käyttää yleistä arvoa fa-osoitekirjaa.
 RssNote=Huomautus: Jokainen RSS-syötteen määritelmä sisältää widgetin, joka sinun on otettava käyttöön, jotta se on käytettävissä kojelaudassa
 JumpToBoxes=Siirry kohtaan Asetukset -> Widgetit
-MeasuringUnitTypeDesc=Käytä tässä arvoa, kuten "size", "surface", "volume", "Massa", "time"
+MeasuringUnitTypeDesc=Käytä tässä arvoa, kuten "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=Asteikko on niiden paikkojen lukumäärä, joissa desimaaliosa on siirrettävä, jotta se vastaa oletus-viiteyksikköä. "Aika"-yksikkötyypille se on sekuntien lukumäärä. Arvot välillä 80 ja 99 ovat varattuja arvoja.
 TemplateAdded=Malli lisätty
 TemplateUpdated=Malli päivitetty
@@ -2324,6 +2341,8 @@ NotRecommended=Ei suositeltu
 ARestrictedPath=Jokin rajoitettu polku datatiedostoille
 CheckForModuleUpdate=Tarkista ulkoisten moduulien päivitykset
 CheckForModuleUpdateHelp=Tämä toiminto muodostaa yhteyden ulkoisten moduulien toimittajiin tarkistaakseen, onko uusi versio saatavilla.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Päivitys on saatavilla
 NoExternalModuleWithUpdate=Ulkoisille moduuleille ei löytynyt päivityksiä
 SwaggerDescriptionFile=Swagger API -kuvaus tiedosto (käytettäväksi esimerkiksi redocin kanssa)
@@ -2381,7 +2400,7 @@ ReadOnlyMode=On esimerkki "Vain luku" -tilassa
 DEBUGBAR_USE_LOG_FILE=Käytä <b>dolibarr.log</b> tiedosto lokit ansaan.
 UsingLogFileShowAllRecordOfSubrequestButIsSlower=Käytä dolibarr.Loki tiedosto-komentoa lokien ansaan sen sijaan, että se kerää muistia. Sen avulla voidaan kerätä kaikki lokit nykyisen prosessin vain Loki sijaan (eli mukaan lukien ajax-alipyyntösivut), mutta se tekee ilmentymästäsi erittäin hidasta. Ei suositeltu.
 FixedOrPercent=Kiinteä (käytä avainsanaa "korjattu") tai prosenttia (käytä avainsanaa "prosentti")
-DefaultOpportunityStatus=oletus mahdollisuuden tila (ensimmäinen tila, kun liidi luodaan)
+DefaultOpportunityStatus=Oletus mahdollisuuden tila (ensimmäinen tila, kun liidi luodaan)
 IconAndText=Kuvakkeen ja teksti
 TextOnly=Vain tekstiä
 IconOnlyAllTextsOnHover=Vain kuvake – kaikki tekstit näkyvät kuvakkeen alla hiirellä valikko-palkin päällä
@@ -2391,12 +2410,14 @@ INVOICE_ADD_ZATCA_QR_CODE=Näytä ZATCA QR-koodi laskuissa
 INVOICE_ADD_ZATCA_QR_CODEMore=Jotkut arabialaiset maat tarvitsevat tämän QR-koodin laskuissaan
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices (with a bank account defined for credit transfer)
 INVOICE_ADD_SWISS_QR_CODEMore=Sveitsin standardi laskuille; varmista, että postinumero ja kaupunki on täytetty ja, että tileillä on kelvolliset Sveitsin/Liechtensteinin IBAN-tunnukset.
-INVOICE_ADD_EPC_QR_CODE=Show the EPC QR code on invoices (with a bank account defined for credit transfer)
-INVOICE_ADD_EPC_QR_CODEMore=This feature allows you to add or remove an EPC QR Code on your invoices, which facilitates automatic SEPA credit transfers. Enabling this option helps your clients make payments easily by scanning the QR code, reducing manual entry errors. Use this feature if you have clients in countries like Austria, Belgium, Finland, Germany, and the Netherlands where this system is supported. Disable it if it's not required for your business operations or client base.
+INVOICE_ADD_EPC_QR_CODE=Näytä EPC QR -koodi laskuissa (tilisiirtoa varten määritellyllä pankkitilillä).
+INVOICE_ADD_EPC_QR_CODEMore=Tämä ominaisuus mahdollistaa EPC QR -koodin lisäämisen tai poistamisen laskuistasi, mikä helpottaa automaattisia SEPA-tilisiirtoja. Ominaisuuden käyttöönotto auttaa asiakkaitasi maksamaan helposti skannaamalla QR-koodin, mikä vähentää manuaalisten syöttövirheiden riskiä. Käytä tätä ominaisuutta, jos sinulla on asiakkaita maista, kuten Itävalta, Belgia, Suomi, Saksa ja Alankomaat, joissa tämä järjestelmä on tuettu. Poista se käytöstä, jos se ei ole tarpeellinen liiketoiminnallesi tai asiakaskunnallesi.
 INVOICE_SHOW_SHIPPING_ADDRESS=Näytä toimitusosoite
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Pakollinen merkintä joissain maissa (Ranska, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Sosiaalisen verkoston URL-linkki. Käytä {socialid} muuttujaosaan, joka sisältää sosiaalisen verkoston tunnuksen.
 IfThisCategoryIsChildOfAnother=Jos tämä luokka on toisen lapsi
 DarkThemeMode=Tumma teematila
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Varoitus: moduuli %s on asettan
 WarningModuleHasChangedSecurityCsrfParameter=Varoitus: moduuli %s on poistanut instanssisi CSRF-suojauksen käytöstä. Tämä toiminto on epäilyttävä ja asennuksesi ei ehkä ole enää suojattu. Ota yhteyttä moduulin kirjoittajaan saadaksesi lisätietoja.
 EMailsInGoingDesc=Saapuvia sähköposteja hallitsee moduuli %s. Sinun on otettava käyttöön ja ja määritettävä se, jos haluat tukea saapuvia sähköposteja.
 MAIN_IMAP_USE_PHPIMAP=Käytä PHP-IMAP-kirjastoa IMAP:lle alkuperäisen PHP IMAP:n sijaan. Tämä mahdollistaa myös OAuth2-yhteyden käytön IMAP:lle (myös OAuth-moduulin on oltava aktivoituna).
-MAIN_CHECKBOX_LEFT_COLUMN=Näytä rivin Kenttä ja sarake vasemmalla (oikealla oletus)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Ei luotu oletuksena. Luotu vain moduulin aktivoinnin yhteydessä.
 CSSPage=CSS-tyyli
 Defaultfortype=Oletus
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Anna IP-osoite
 ConvertInto=Muunna muotoon
 YouAreHere=Olet tässä
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Näytä viivakoodi toimituksen PDF-asiakirjassa
 BARCODE_ON_RECEPTION_PDF=Näytä viivakoodi vastaanoton PDF-asiakirjassa
 BARCODE_ON_STOCKTRANSFER_PDF=Näytä viivakoodi varastosiirron PDF-asiakirjassa
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Parametri
 ParamValue=Arvo
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Näytä toimitusosoite
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
index 81a2451dbb8..e7504ef3a13 100644
--- a/htdocs/langs/fi_FI/banks.lang
+++ b/htdocs/langs/fi_FI/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Loppusaldo
 CurrentBalance=Nykyinen saldo
 FutureBalance=Tulevat tasapaino
 ShowAllTimeBalance=Näytä saldo alusta asti
-AllTime=Alkaen
 Reconciliation=Yhteensovittaminen
 RIB=Pankkitilin numero
 IBAN=IBAN-numero
@@ -78,9 +77,9 @@ BankTransaction=Pankkimerkintä
 ListTransactions=Luettelo tapahtumista
 ListTransactionsByCategory=Luettelo tapahtumista / luokka
 TransactionsToConciliate=Täsmäytettävät tapahtumat
-TransactionsToConciliateShort=Sovitella
+TransactionsToConciliateShort=Täsmäytettävät
 Conciliable=Täsmäytettävissä
-Conciliate=Sovita
+Conciliate=Täsmäytä
 Conciliation=Yhteensovita
 SaveStatementOnly=Tallenna vain lausunto
 ReconciliationLate=Täsmäytys myöhässä
@@ -88,8 +87,8 @@ IncludeClosedAccount=Sisällytä suljettu tilit
 OnlyOpenedAccount=Vain avoimet tilit
 AccountToCredit=Luottotili
 AccountToDebit=Käteistili
-DisableConciliation=Poista sovittelu ominaisuus tämän tilin
-ConciliationDisabled=Sovittelukomitea ominaisuus pois päältä
+DisableConciliation=Poista täsmäytys ominaisuus tästä tilistä
+ConciliationDisabled=Täsmäytys pois päältä
 LinkedToAConciliatedTransaction=Linkitetty täsmäytettyyn tapahtumaan
 StatusAccountOpened=Avoinna
 StatusAccountClosed=Suljettu
@@ -100,8 +99,8 @@ AddBankRecordLong=Lisää mernkintä manuaalisesti
 Conciliated=Täsmäytetty
 ReConciliedBy=Sovetteli
 DateConciliating=Sovittelupäivä
-BankLineConciliated=Kirjautuminen täsmäytetty pankkikuitin kanssa
-TransfertOnlyConciliatedBankLine=Transfer only reconciled lines from bank
+BankLineConciliated=Tapahtuma täsmäytetty pankkikuitin kanssa
+TransfertOnlyConciliatedBankLine=Siirrä vain täsmäytetyt rivit pankista
 TransfertAllBankLines=Transfer all lines from bank even if they are not reconciled
 BankLineReconciled=Täsmäytetty
 BankLineNotReconciled=Täsmäyttämätön
@@ -116,8 +115,8 @@ BankTransfers=Tilisiirrot
 MenuBankInternalTransfer=Sisäinen siirto
 TransferDesc=Käytä sisäistä siirtoa siirtääksesi tililtä toiselle, sovellus kirjoittaa kaksi tietuetta: veloituksen lähdetilillä ja hyvityksen kohdetilillä. Tässä tapahtumassa käytetään samaa summaa, tunniste ja päiväys.
 TransferFrom=Mistä
-TransferTo=mihin
-TransferFromToDone=A <b>siirtää %s %s %s%</b> s on tallennettu.
+TransferTo=Mihin
+TransferFromToDone=Siirto täältä <b>%s</b> tänne<b>%s</b> liittyen tähän <b>%s</b>%s tallennettu
 CheckTransmitter=Lähettäjä
 ValidateCheckReceipt=Vahvista tämä sekkikuitti?
 ConfirmValidateCheckReceipt=Oletko varma, että haluat lähettää tämän sekkikuitin tarkistettavaksi? Muutokset eivät ole mahdollisia vahvistuksen jälkeen.
@@ -133,7 +132,7 @@ DeleteTransaction=Poista merkintä
 ConfirmDeleteTransaction=Haluatko varmasti poistaa tämän merkinnän?
 ThisWillAlsoDeleteBankRecord=Tämä poistaa myös luodun pankkimerkinnän
 BankMovements=Siirrot
-PlannedTransactions=Suunnitellut merkinnät
+PlannedTransactions=Upcoming entries
 Graph=Kaaviot
 ExportDataset_banque_1=Pankkimerkinnät ja tiliotteet
 ExportDataset_banque_2=Talletuslomake
@@ -150,8 +149,8 @@ ShowAllAccounts=Näytä kaikki tilit
 FutureTransaction=Tuleva kauppa. Ei pysty sovittamaan.
 SelectChequeTransactionAndGenerate=Valitse/suodata shekit, jotka on sisällytettävä shekkitalletuskuittiin. Napsauta sitten luo.
 SelectPaymentTransactionAndGenerate=Valitse/suodata asiakirjat, jotka on sisällytettävä %s talletuskuittiin. Napsauta sitten "luo".
-InputReceiptNumber=Valitse sovitteluun liittyvä tiliote. Käytä lajiteltavaa numeerista arvoa
-InputReceiptNumberBis=VVVVKK tai VVVVKKPP
+InputReceiptNumber=Valitse tämän täsmäytyksen tiliote. Käytä lajiteltavaa numeroarvoa: YYYYMM tai YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Täsmäytä?
 ThenCheckLinesAndConciliate=Seuraavaksi valitse rivit tiliotteelta ja paina
@@ -188,10 +187,10 @@ BankColorizeMovementDesc=Jos tämä toiminto on käytössä, voit valita tietyn
 BankColorizeMovementName1=Taustaväri veloitusliikkeelle
 BankColorizeMovementName2=Luottoliikkeen taustaväri
 IfYouDontReconcileDisableProperty=Jos et tee pankkitäsmäyksiä joillakin pankkitileillä, poista tämä varoitus poistamalla niiden ominaisuus "%s" käytöstä.
-NoBankAccountDefined=Ei pankkitili määritettyä
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Tietueita ei löytynyt kielellä pankkitili. Yleensä näin tapahtuu, kun tietue on poistettu manuaalisesti tapahtumaluettelosta pankkitili (esimerkiksi pankkitili täsmäytyksen aikana. span>). Toinen syy on se, että maksu tallennettiin, kun moduuli "%s" poistettiin käytöstä.
 AlreadyOneBankAccount=Yksi pankkitili on jo määritetty
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA-versio tiedosto
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Yes = Store 'Payment Type' in 'Credit Transfer' section of SEPA file<br><br>When generating a SEPA XML file for Credit transfers, the section "PaymentTypeInformation" can now be placed inside the "CreditTransferTransactionInformation" section (instead of "Payment" section). We strongly recommend to keep this unchecked to place PaymentTypeInformation at Payment level, as all banks will not necessarily accept it at CreditTransferTransactionInformation level. Contact your bank before placing PaymentTypeInformation at CreditTransferTransactionInformation level.
 ToCreateRelatedRecordIntoBank=Vastaanottajalle luo puuttuu liittyvä pankkitietue
-XNewLinesConciliated=%s uusi rivi(ä) sovittu
+XNewLinesConciliated=%s uusi rivi(ä) täsmäytetty
diff --git a/htdocs/langs/fi_FI/blockedlog.lang b/htdocs/langs/fi_FI/blockedlog.lang
index 813de4b58fb..87cef8bee79 100644
--- a/htdocs/langs/fi_FI/blockedlog.lang
+++ b/htdocs/langs/fi_FI/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Muuttamattomia lokeja
 ShowAllFingerPrintsMightBeTooLong=Näytä kaikki arkistoidut lokit (voi olla pitkiä)
 ShowAllFingerPrintsErrorsMightBeTooLong=Näytä kaikki virheelliset arkistolokit (voivat olla pitkiä)
 DownloadBlockChain=Lataa sormenjäljet
-KoCheckFingerprintValidity=Arkistoitu Loki-merkintä ei kelpaa. Se tarkoittaa, että joku (hakkeri?) on muokannut joitakin tämän tietueen tietoja sen tallentamisen jälkeen tai poistanut edellisen arkistoidun tietueen (tarkista, että rivi edellisellä #:llä on olemassa) tai on muuttanut edellisen tietueen tarkistussummaa.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Arkistoitu Loki-tietue on kelvollinen. Tämän rivin tietoja ei muutettu ja, merkintä seuraa edellistä.
 OkCheckFingerprintValidityButChainIsKo=Arkistoitu Loki näyttää kelvolliselta verrattuna edelliseen, mutta ketju oli vioittunut aiemmin.
 AddedByAuthority=Tallennettu etävaltuutukseen
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Loki Tiedot
 ListOfTrackedEvents=Luettelo seuratuista tapahtumista
 Fingerprint=Sormenjälki
 DownloadLogCSV=Vie arkistoidut lokit (CSV)
-DataOfArchivedEvent=Täydelliset tiedot arkistoidusta tapahtumasta
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Alkuperäistä objektia (tyyppi %s, tunnus %s) ei ole linkitetty (katso "Täydelliset tiedot" -sarake saadaksesi muuttumattomia tallennettuja tietoja)
 BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Muuttamattomat lokit -moduuli otettiin käyttöön maasi lainsäädännön vuoksi. Tämän moduulin poistaminen käytöstä voi tehdä tulevista tapahtumista mitättömiä ja laillisten ohjelmistojen käytön kannalta, koska niitä ei voi vahvistaa vero. span> tarkastus.
@@ -30,13 +32,14 @@ BlockedLogEnabled=Järjestelmä, joka seuraa tapahtumia muuttumattomiin lokeihin
 BlockedLogDisabled=Järjestelmä, joka seuraa tapahtumia muuttumattomiin lokeihin, on poistettu käytöstä, kun tallennus on tehty. Tallensimme erityisen sormenjäljen jäljittääksemme ketjun katkenneeksi
 BlockedLogDisabledBis=Järjestelmä, joka seuraa tapahtumia muuttumattomiin lokeihin, on poistettu käytöstä. Tämä on mahdollista, koska tallennusta ei ole vielä tehty.
 LinkHasBeenDisabledForPerformancePurpose=Suorituskyvyn vuoksi suoraa linkkiä asiakirjaan ei näytetä sadannen rivin jälkeen.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Asiakkaan lasku loogisesti poistettu
 logBILL_PAYED=Asiakkaan lasku maksettu
 logBILL_SENTBYMAIL=Asiakkaan lasku postitse
 logBILL_UNPAYED=Asiakaslasku asetettu maksamatta
-logBILL_VALIDATE=Validate bill
+logBILL_VALIDATE=Laskun vahvistus
 logCASHCONTROL_VALIDATE=Käteisvarat työpöydän sulkemisäänitys
 logDOC_DOWNLOAD=Vahvistetun asiakirjan lataaminen tulostamista tai lähettämistä varten
 logDOC_PREVIEW=Vahvistetun asiakirjan esikatselu tulostamista tai lataamista varten
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Asiakkaan maksu looginen poisto
 logPAYMENT_VARIOUS_CREATE=maksu (ei liitetty laskuun) luotu
 logPAYMENT_VARIOUS_DELETE=maksu (ei liitetty laskuun) looginen poisto
 logPAYMENT_VARIOUS_MODIFY=maksu (ei liitetty laskuun) muokattu
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/fi_FI/categories.lang b/htdocs/langs/fi_FI/categories.lang
index 1fff955c4ac..c57f1fba52e 100644
--- a/htdocs/langs/fi_FI/categories.lang
+++ b/htdocs/langs/fi_FI/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Yhteystiedot tagit/kategoriat-alue
 AccountsCategoriesArea=pankkitili tunnisteet/luokat-alue
 ProjectsCategoriesArea=Projektitunnisteet/kategoriat-alue
 UsersCategoriesArea=Käyttäjätunnisteet/luokat-alue
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Alaluokat
 CatList=Luettelo tunnisteista/kategorioista
 CatListAll=Luettelo tunnisteista/luokista (kaikki tyypit)
@@ -90,9 +91,10 @@ CategoriesSetup=Tunnisteiden/luokkien asetukset
 CategorieRecursiv=Linkitä ylätunnisteeseen/luokkaan automaattisesti
 CategorieRecursivHelp=Jos vaihtoehto on päällä, kun lisäät objektin alaluokkaan, objekti lisätään myös pääluokkiin.
 AddProductServiceIntoCategory=Määritä tuotteelle/palvelulle luokka
-AddCustomerIntoCategory=Määritä asiakkaalle luokka
-AddSupplierIntoCategory=Määritä luokka kohteelle toimittaja
-AssignCategoryTo=Määritä luokka
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Näytä tunniste/luokka
 ByDefaultInList=Tekijä oletus luettelossa
 ChooseCategory=Valitse kategoria
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Sivusäilön luokat
 KnowledgemanagementsCategoriesArea=KM-artikkeliluokat
 UseOrOperatorForCategories=Käytä luokkiin OR-operaattoria
 AddObjectIntoCategory=Määritä luokkaan
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index a22792d2299..7f81963f1f9 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -65,6 +65,7 @@ State=Postialue
 StateId=Osavaltiotunnus
 StateCode=Postinumero
 StateShort=Valtio
+DepartmentBuyer=Buyer's state/province
 Region=Alue
 Region-State=Alue - Osavaltio
 Country=Maa
@@ -78,14 +79,14 @@ Chat=Chat
 PhonePro=Yrityspuhelin
 PhonePerso=Henkilökohtainen puhelin
 PhoneMobile=Matkapuhelin
-No_Email=Hylkää massasähköpostit
+No_Email=Refuse mass emails
 Fax=Faksi
 Zip=Postinumero
 Town=Postitoimipaikka
 Web=Kotisivut
 Poste= Asema
 DefaultLang=Oletuskieli
-VATIsUsed=Käytettävä myyntivero
+VATIsUsed=Myyntivero on käytössä
 VATIsUsedWhenSelling=Määrittää sisällyttääkö sidosryhmän myyntiveron omien asiakkaidensa laskuun
 VATIsNotUsed=Myyntivero ei käytössä
 VATReverseCharge=ALV käänteinen
@@ -251,26 +252,26 @@ ProspectCustomer=Mahd. / Asiakas
 Prospect=Mahdollinen asiakas
 CustomerCard=Asiakaskortti
 Customer=Asiakas
-CustomerRelativeDiscount=Suhteellinen asiakasalennus
-SupplierRelativeDiscount=Toimittajan suhteellinen alennus
-CustomerRelativeDiscountShort=Suhteellinen alennus
+CustomerRelativeDiscount=Asiakaskohtainen alennus
+SupplierRelativeDiscount=Toimittajan prosentuaalinen alennus
+CustomerRelativeDiscountShort=Alennus %
 CustomerAbsoluteDiscountShort=Absoluuttinen alennus
 CompanyHasRelativeDiscount=Tällä asiakkaalla on oletusalennus<b> %s%%</b>
-CompanyHasNoRelativeDiscount=Tällä asiakkaalla ei ole suhteellista alennusta oletuksena
+CompanyHasNoRelativeDiscount=Tällä asiakkaalla ei ole oletuksena alennusta
 HasRelativeDiscountFromSupplier=Oletusalennus <b>%s%%</b> toimittajalle
-HasNoRelativeDiscountFromSupplier=Ei suhteellista vakioalennusta toimittajalta
+HasNoRelativeDiscountFromSupplier=Tällä toimittajalla ei ole prosentuaalista alennusta
 CompanyHasAbsoluteDiscount=Asiakkaalle käytettävät olevat alennukset (luotto tai osamaksut) <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b>
-CompanyHasCreditNote=This customer still has credit notes for <b>%s</b>
+CompanyHasCreditNote=Yrityksellä on hyvityslasku <b>%s</b>
 HasNoAbsoluteDiscountFromSupplier=Toimittajalle ei ole saatavilla alennuksia/luottoa
 HasAbsoluteDiscountFromSupplier=Toimittajalle käytettävät olevat alennukset (luotto tai osamaksut) <b>%s</b> %s
 HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> from this vendor
-HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> from this vendor
+HasCreditNoteFromSupplier=Toimittajalla on hyvityslasku <b>%s</b>
 CompanyHasNoAbsoluteDiscount=Asiakkaalla ei ole alennuksia saatavilla
-CustomerAbsoluteDiscountAllUsers=Toimittajan ehdottomat alennukset (kaikkien käyttäjien myöntämä)
-CustomerAbsoluteDiscountMy=Toimittajan ehdottomat alennukset (sinun myöntämä)
-SupplierAbsoluteDiscountAllUsers=Toimittajan ehdottomat alennukset (syötetään kaikilla käyttäjillä)
-SupplierAbsoluteDiscountMy=Toimittajan ehdottomat alennukset (syötetään vain sinulla)
+CustomerAbsoluteDiscountAllUsers=Asiakkaan kiinteät alennukset (kaikkien käyttäjien myöntämät)
+CustomerAbsoluteDiscountMy=Asiakkaan kiinteät alennukset (minun myöntämät)
+SupplierAbsoluteDiscountAllUsers=Toimittajan kiinteät alennukset (syötetään kaikilla käyttäjillä)
+SupplierAbsoluteDiscountMy=Toimittajan kiinteät alennukset (minun myöntämät)
 DiscountNone=Ei mitään
 Vendor=Toimittaja
 Supplier=Toimittaja
@@ -382,12 +383,12 @@ ExportCardToFormat=Vie kortti muodossa
 ContactNotLinkedToCompany=Yhteystiedot eivät liity minkään sidosryhmään
 DolibarrLogin=Dolibarr sisäänkirjautumis sivu
 NoDolibarrAccess=Ei Dolibarr pääsyä
-ExportDataset_company_1=Sidosryhmät (yritykset, yhteisöt, ihmiset) ja niiden ominaisuudet
-ExportDataset_company_2=Yhteystiedot ja ominaisuudet
-ExportDataset_company_3=Sidosryhmien pankkitilit
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Sidosryhmien yhteystiedot/osoitteet ja ominaisuudet
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Sidosryhmät ja ominaisuudet
 ImportDataset_company_2=Sidosryhmien yhteystiedot/osoitteet ja ominaisuudet
-ImportDataset_company_3=Sidosryhmien pankkitilit
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Sidosryhmien myyjät (lisää myyjät/käyttäjät yrityskohtaisesti)
 PriceLevel=Hintataso
 PriceLevelLabels=Hintaryhmät
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Vapaa koodi ilman vahvistusta.
 ManagingDirectors=Johtajien nimet (TJ, johtaja, päällikkö...)
 MergeOriginThirdparty=Kopioitu sidosryhmä (sidosryhmä, jonka haluat poistaa)
 MergeThirdparties=Yhdistä sidosryhmät
-ConfirmMergeThirdparties=Oletko varma että haluat yhdistää valitun sidosryhmän nykyisen kanssa? Kaikki linkitetyt tiedot (laskut, tilaukset, ...) tullaan siirtämään nykyiseen sidosryhmään, jonka jälkeen valittu sidosryhmä tullaan poistamaan.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Osapuolet yhdistetty
 SaleRepresentativeLogin=Myyntiedustajan kirjautuminen
 SaleRepresentativeFirstname=Myyntiedustajan etunimi
@@ -461,3 +462,6 @@ ExternalSystemID=Ulkoinen järjestelmä ID
 IDOfPaymentInAnExternalSystem=ID Ulkoiseen maksujärjestelmään (esim. Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE-verkkopalvelun tunnistetiedot
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Sidosryhmän on oltava asiakas voidakseen luoda pankkitietonsa Stripe-puolella
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index 6a4eac726be..04f4c1fb969 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Laskutus | maksu
+MenuFinancial=Laskutus | Maksut
 TaxModuleSetupToModifyRules=Määritä laskentasäännöt <a href="%s"> Verojen moduulin määrittämiseen </a>
 TaxModuleSetupToModifyRulesLT=Siirry kohtaan <a href="%s">Yritysasetukset</a> ja muokkaa laskentasääntöjä
 OptionMode=Vaihtoehto kirjanpitotietojen
@@ -27,10 +27,10 @@ Profit=Voitto
 AccountingResult=Kirjanpito tulos
 BalanceBefore=saldo (ennen)
 Balance=Saldo
-Debit=Debet +
-Credit=Credit -
-AccountingDebit=Debet +
-AccountingCredit=Credit -
+Debit=Debet -
+Credit=Credit +
+AccountingDebit=Debet -
+AccountingCredit=Credit +
 Piece=Kirjanpito Asiakirja.
 AmountHTVATRealReceived=HT kerätty
 AmountHTVATRealPaid=HT maksetaan
@@ -65,30 +65,30 @@ LT2SupplierES=IRPF ostot
 LT2CustomerIN=SGST myynti
 LT2SupplierIN=SGST-ostokset
 VATCollected=Alv
-SpecialExpensesArea=Alue kaikille erityismaksuille
+SpecialExpensesArea=Erityismaksut
 VATExpensesArea=Alue kaikille ALV-maksuille
-SocialContribution=Sosiaalinen tai verotus vero
-SocialContributions=Sosiaalinen tai verotus Verot
-SocialContributionsDeductibles=Vähennettävä sosiaalinen tai verotus Verot
-SocialContributionsNondeductibles=Vähennyskelvoton sosiaalinen tai verotus Verot
+SocialContribution=Sosiaalimaksu tai vero
+SocialContributions=Sosiaalimaksut tai verot
+SocialContributionsDeductibles=Vähennettävät sosiaalimaksut tai verot
+SocialContributionsNondeductibles=Vähennyskelvottomat sosiaalimaksut tai verot
 DateOfSocialContribution=päiväys sosiaalisista tai verotuksellisista vero
 LabelContrib=Merkin panos
 TypeContrib=Kirjoita panos
 MenuSpecialExpenses=Erityismenot (Verot, sosiaaliturvamaksut ja osingot)
 MenuTaxAndDividends=Veroja ja osinkoja
-MenuSocialContributions=Sosiaalinen / verotus Verot
-MenuNewSocialContribution=Uusi sosiaalinen/fiskaalinen vero
-NewSocialContribution=Uusi sosiaalinen/fiskaalinen vero
-AddSocialContribution=Lisää sosiaalinen/taloudellinen vero
-ContributionsToPay=Sosiaalinen / verotus Verot maksaa
+MenuSocialContributions=Sosiaalimaksut / Verot
+MenuNewSocialContribution=Uusi sosiaalimaksu/vero
+NewSocialContribution=Uusi sosiaalimaksut / vero
+AddSocialContribution=Lisää sosiaalimaksu / vero
+ContributionsToPay=Maksettavat sosiaalimaksut / verot
 AccountancyTreasuryArea=Kirjanpito alue
-InvoicesArea=Laskutusalue ja maksu
+InvoicesArea=Laskut ja maksut
 NewPayment=Uusi maksu
 PaymentCustomerInvoice=Asiakas laskun maksu
 PaymentSupplierInvoice=ostolasku maksu
 PaymentSocialContribution=Social/fiscal veron maksu
 PaymentVat=ALV-maksu
-AutomaticCreationPayment=Tallenna automaattisesti maksu
+AutomaticCreationPayment=Also record the payment
 ListPayment=Luettelo maksut
 ListOfCustomerPayments=Luettelo asiakkaan maksut
 ListOfSupplierPayments=Luettelo Toimittaja maksuista
@@ -118,10 +118,14 @@ SocialContributionsPayments=Verot sosiaaliset/fiskaaliset maksut
 ShowVatPayment=Näytä arvonlisäveron maksaminen
 TotalToPay=Yhteensä maksaa
 BalanceVisibilityDependsOnSortAndFilters=saldo näkyy tässä luettelossa vain, jos taulukko on lajiteltu %s ja suodatettu: 1 pankkitili (ei muita suodattimia)
-CustomerAccountancyCode=Asiakkaan Kirjanpito koodi
-SupplierAccountancyCode=Toimittaja Kirjanpito koodi
+CustomerAccountancyCodeGeneral=Yleinen kirjanpitokoodi
+CustomerAccountancyCode=Asiakkaan Kirjanpitokoodi
+SupplierAccountancyCodeGeneral=Yleinen kirjanpitokoodi
+SupplierAccountancyCode=Toimittajan kirjanpitokoodi
+UserAccountancyCodeGeneral=Yleinen kirjanpitokoodi
 CustomerAccountancyCodeShort=Cust. tili. koodi
 SupplierAccountancyCodeShort=Sup. tili. koodi
+UserAccountancyCodeShort=User account. code
 AccountNumber=Tilinumero
 NewAccountingAccount=Uusi tili
 Turnover=Laskutettu liikevaihto
@@ -129,7 +133,9 @@ TurnoverCollected=Liikevaihto kerätty
 SalesTurnoverMinimum=Minimi liikevaihto
 ByExpenseIncome=Kulujen ja tulojen mukaan
 ByThirdParties=Bu kolmansien osapuolten
-ByUserAuthorOfInvoice=Laskulla tekijä
+ByProjects=By projects
+ByUserAuthorOfInvoice=Laskun tekijän mukaan
+DetailedListLowercase=detailed list
 CheckReceipt=Talletuslomake
 CheckReceiptShort=Talletuslomake
 LastCheckReceiptShort=Viimeisimmät %s talletuskuitit
@@ -148,7 +154,7 @@ PaySalary=Maksa palkkakortti
 ConfirmPaySocialContribution=Haluatko varmasti luokitella tämän sosiaalisen tai verotuksen vero maksulliseksi ?
 ConfirmPayVAT=Haluatko varmasti luokitella tämän ALV-ilmoituksen maksetuksi?
 ConfirmPaySalary=Haluatko varmasti luokitella tämän palkkakortin maksetuksi?
-DeleteSocialContribution=Poista sosiaalinen tai verotus vero maksu
+DeleteSocialContribution=Poista sosiaalimaksu tai vero maksu
 DeleteVAT=Poista arvonlisäveroilmoitus
 DeleteSalary=Poista palkkakortti
 DeleteVariousPayment=Poista eri maksu
@@ -156,7 +162,7 @@ ConfirmDeleteSocialContribution=Haluatko varmasti poistaa tämän sosiaalisen/fi
 ConfirmDeleteVAT=Haluatko varmasti poistaa tämän ALV-ilmoituksen?
 ConfirmDeleteSalary=Haluatko varmasti poistaa tämän palkan?
 ConfirmDeleteVariousPayment=Haluatko varmasti poistaa tämän maksu ?
-ExportDataset_tax_1=Sosiaalinen ja verotus Verot ja
+ExportDataset_tax_1=Sosiaalimaksut ja verot sekä maksut
 CalcModeVATDebt=Tila <b>%sSitoumuskirjanpidon ALV%s</b>.
 CalcModeVATEngagement=Tila <b>%stulojen ja kulujen ALV%s</b>.
 CalcModeDebt=Tunnettujen tallennettujen asiakirjojen analyysi
@@ -228,10 +234,10 @@ Dispatch=Lähetyskeskukset
 Dispatched=Lähetysolosuhteita
 ToDispatch=Lähettämistä
 ThirdPartyMustBeEditAsCustomer=Kolmannen osapuolen on määriteltävä asiakkaan
-SellsJournal=Myynti lehdessä
-PurchasesJournal=Ostot lehdessä
-DescSellsJournal=Myynti lehdessä
-DescPurchasesJournal=Ostot lehdessä
+SellsJournal=Myyntitapahtumat
+PurchasesJournal=Ostotapahtuma
+DescSellsJournal=Myyntitapahtumat
+DescPurchasesJournal=Ostotapahtumat
 CodeNotDef=Ei määritelty
 WarningDepositsNotIncluded=osamaksu laskut eivät sisälly tähän versioon tämän kirjanpitomoduulin kanssa.
 DatePaymentTermCantBeLowerThanObjectDate=maksu termi päiväys ei voi olla pienempi kuin objekti päiväys.
@@ -272,8 +278,8 @@ OtherCountriesCustomersReport=Ulkomainen asiakkaat -raportti
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Perustuu siihen, että ALV-numeron kaksi ensimmäistä kirjainta poikkeavat omasta Yritys maakoodistasi
 SameCountryCustomersWithVAT=Kansallinen asiakkaat -raportti
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Perustuu siihen, että ALV-numeron kaksi ensimmäistä kirjainta ovat samat kuin oma Yritys maakoodisi
-LinkedFichinter=Linkki interventioon
-ImportDataset_tax_contrib=Sosiaalinen / verotus Verot
+LinkedFichinter=Linkki työmääräykseen
+ImportDataset_tax_contrib=Sosiaalimaksut / Verot
 ImportDataset_tax_vat=ALV maksut
 ErrorBankAccountNotFound=Virhe: pankkitili ei löydy
 FiscalPeriod=Tilikausi
@@ -290,14 +296,14 @@ TurnoverbyVatrate=Liikevaihto laskutettu myyntihinnalla vero
 TurnoverCollectedbyVatrate=Liikevaihto kerätty myynnin mukaan vero
 PurchasebyVatrate=Hankinta myyntihinnalla vero
 LabelToShow=Lyhyt etiketti
-PurchaseTurnover=Hankinta liikevaihto
-PurchaseTurnoverCollected=Hankinta liikevaihto kerätty
+PurchaseTurnover=Ostojen liikevaihto
+PurchaseTurnoverCollected=Ostojen kertynyt liikevaihto
 RulesPurchaseTurnoverDue=- Se sisältää toimittaja:n erääntyneet laskut riippumatta siitä, onko ne maksettu vai ei. <br> – Se perustuu näiden laskujen päiväys laskuun.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Se sisältää kaikki veloitusrivit Hankinta päiväkirjasta.
 RulesPurchaseTurnoverOfExpenseAccounts=Se sisältää (veloitus - hyvitys) tuotetilien rivejä ryhmä EXPENSE
-ReportPurchaseTurnover=Hankinta liikevaihto laskutettu
-ReportPurchaseTurnoverCollected=Hankinta liikevaihto kerätty
+ReportPurchaseTurnover=Ostojen liikevaihto laskutettu
+ReportPurchaseTurnoverCollected=Ostojen kertynyt liikevaihto
 IncludeVarpaysInResults = Sisällytä raportteihin erilaisia maksuja
 IncludeLoansInResults = Sisällytälainat raportteihin
 InvoiceLate30Days = Myöhässä (> 30 päivää)
@@ -306,9 +312,9 @@ InvoiceLateMinus15Days = Myöhässä (< 15 päivää)
 InvoiceNotLate = Noudettava (< 15 päivää)
 InvoiceNotLate15Days = Noudettava (15-30 päivää)
 InvoiceNotLate30Days = Noudettava (> 30 päivää)
-InvoiceToPay=Maksaa (< 15 päivää)
-InvoiceToPay15Days=Maksaaksesi (15-30 päivää)
-InvoiceToPay30Days=Maksaminen (> 30 päivää)
+InvoiceToPay=Maksettavat (< 15 päivää)
+InvoiceToPay15Days=Maksettavat (15-30 päivää)
+InvoiceToPay30Days=Maksettavat (> 30 päivää)
 ConfirmPreselectAccount=Valitse kirjanpitokoodi etukäteen
 ConfirmPreselectAccountQuestion=Haluatko varmasti esivalita %s valitut rivit tällä tilikoodilla?
 AmountPaidMustMatchAmountOfDownPayment=Maksetun summan on vastattava summaa osamaksu
diff --git a/htdocs/langs/fi_FI/datapolicy.lang b/htdocs/langs/fi_FI/datapolicy.lang
index 80f1a7903fc..9f2cfa8cc5f 100644
--- a/htdocs/langs/fi_FI/datapolicy.lang
+++ b/htdocs/langs/fi_FI/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Tietosuojakäytäntö
 Module4100Desc = Tietosuojan hallintamoduuli (GDPR:n mukainen)
 # Administration page
 datapolicySetup = Moduulin tietojen tietosuojakäytännön asetukset
-Deletion = Tietojen poistaminen
-datapolicySetupPage = Kohde maan laeista riippuen ( GDPR:n artikla 5) henkilötietoja tulee säilyttää enintään niin kauan kuin tietoja tarvitaan siihen tarkoitukseen, jota varten ne on kerätty, paitsi arkistointitarkoituksiin. Poisto suoritetaan automaattisesti tietyn ajan kuluttua viimeisimmästä tapahtumasta (kesto, jonka olet ilmoittanut alla).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s kuukautta
 ONE_YEAR = 1 vuosi
 NB_YEARS = %s vuotta
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Mahdollisuus/asiakas
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Ei mahdollinen / ei asiakas
 DATAPOLICY_CONTACT_FOURNISSEUR = Toimittaja
 DATAPOLICY_ADHERENT = Jäsen
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Voit lähettää GDPR-sähköpostin kaikille asiaankuuluville yhteyshenkilöillesi (jotka eivät ole vielä saaneet sähköpostia ja, johon et ole rekisteröinyt mitään heidän GDPR-sopimuksestaan). Voit tehdä tämän käyttämällä seuraavaa painiketta.
 SendAgreement = Lähetä sähköposteja
 AllAgreementSend = Kaikki sähköpostit on lähetetty
 TXTLINKDATAPOLICYACCEPT = Teksti linkkiin "sopimus"
 TXTLINKDATAPOLICYREFUSE = Teksti linkkiin "eri mieltä"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: Henkilötietojen käsittely
 DATAPOLICY_consentement = Henkilötietojen käsittelyyn saatu suostumus
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 36296b26194..610ca24770a 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Luominen epäonnistui hakemiston. Tarkista, että Web-palvelin käyttäjällä on oikeudet kirjoittaa Dolibarr asiakirjat hakemistoon. Jos parametri <b>safe_mode</b> on käytössä tämän PHP, tarkista, että Dolibarr php tiedostot omistaa web-palvelimen käyttäjä (tai ryhmä).
 ErrorNoMailDefinedForThisUser=Ei postia määritelty tälle käyttäjälle
 ErrorSetupOfEmailsNotComplete=Sähköpostien määritys ei ole valmis
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Tämä ominaisuus vaatii JavaScriptin aktivoinnin toimiakseen. Muuta tätä asetusnäytössä.
 ErrorTopMenuMustHaveAParentWithId0=A-valikosta tyyppi "Alkuun" ei voi olla emo-valikosta. Laita 0 vanhemman valikosta tai valita valikosta tyyppi "vasemmisto".
 ErrorLeftMenuMustHaveAParentId=A-valikosta tyyppi "vasemmisto" on oltava vanhemman id.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Lähetä estetty PHP / Apache plugin.
 ErrorFileSizeTooLarge=tiedosto koko on liian suuri tai tiedosto ei ole annettu.
 ErrorFieldTooLong=Kenttä %s on liian pitkä.
 ErrorSizeTooLongForIntType=Koko liian pitkä int tyyppi (%s merkkiä maksimi)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Koko liian pitkä jono tyyppi (%s merkkiä maksimi)
 ErrorNoValueForSelectType=Täytä arvo valintalistaa varten
 ErrorNoValueForCheckBoxType=Täytä valintaruutuluettelon arvo
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Bad arvotyypeillä koodin. Yritä uudelleen uuteen arvoon .
 ErrorBothFieldCantBeNegative=Kentät %s ja %s voi olla sekä kielteisiä
 ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in third-party card) and apply it to the invoice.
 ErrorLinesCantBeNegativeForOneVATRate=Rivien kokonaismäärä (ilman vero) ei voi olla negatiivinen annetulle ei nolla-arvonlisäverokannalle (Löytyi negatiivinen kokonaissumma ALV-prosentille <b>%s</b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Rivit eivät voi olla negatiivisia talletuksissa. Kohtaat ongelmia, kun joudut käyttämään talletuksen loppulaskussa, jos teet niin.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Asiakaslaskujen rivin määrä ei voi olla negatiivinen
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Käyttäjätili <b>%s</b> käyttää myös toteuttaa web-palvelimella ei ole lupaa, että
 ErrorNoActivatedBarcode=Ei viivakoodin tyyppi aktivoitu
 ErrUnzipFails=%s purkaminen ZipArchiven avulla epäonnistui
@@ -163,7 +166,7 @@ ErrorWarehouseMustDiffers=Lähteen ja kohde Varastot täytyy poiketa
 ErrorBadFormat=Huono muoto!
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Virhe, tätä jäsentä ei ole vielä linkitetty mihinkään kolmanteen osapuoleen. Linkitä jäsen olemassa olevaan kolmanteen osapuoleen tai luo uuteen kolmanteen osapuoleen ennen tilauksen luomista laskulla.
 ErrorThereIsSomeDeliveries=Virhe, tähän lähetykseen on linkitetty joitain toimituksia. Poistaminen evätty.
-ErrorCantDeletePaymentReconciliated=Ei voida poistaa maksu, joka oli luonut täsmäytetyn pankkimerkinnän
+ErrorCantDeletePaymentReconciliated=Tapahtumaa, joka on luonut täsmäytetyn pankkivientikirjauksen, ei voi poistaa
 ErrorCantDeletePaymentSharedWithPayedInvoice=Ei voida poistaa maksu, jota jakaa vähintään yksi lasku, jonka tila on maksettu
 ErrorPriceExpression1=Ei voida määrittää vakiolle %s
 ErrorPriceExpression2=Sisäistä funktiota %s ei voi määrittää uudelleen
@@ -339,7 +342,14 @@ ErrorIncoherentDates=Start date must be earlier than end date
 ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
-ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorEmptyValueForQty=Määrä ei voi olla 0.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP-parametrisi upload_max_filesize (%s) on suurempi kuin PHP-parametri post_max_size (%s). Tämä ei ole johdonmukainen asetus.
 WarningPasswordSetWithNoAccount=Tälle jäsenelle on asetettu salasana. Käyttäjätiliä ei kuitenkaan luotu. Joten tämä salasana on tallennettu, mutta sitä ei voida käyttää kirjautumiseen Dolibarriin. Ulkoinen moduuli/käyttöliittymä voi käyttää sitä, mutta jos sinun ei tarvitse määrittää jäsenelle kirjautumistunnusta tai salasanaa, voit poistaa vaihtoehdon "Hallinnoi jokaisen jäsenen kirjautumista" Jäsenmoduulin asetuksista. Jos sinun on hallittava kirjautumista, mutta et tarvitse salasanaa, voit välttää tämän varoituksen jättämällä tämän Kenttä tyhjäksi. Huomautus: Sähköpostia voidaan käyttää myös sisäänkirjautumisena, jos jäsen on linkitetty käyttäjään.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR-lasku voidaan lisätä vain tilisiirtomaksuilla maksettaviin laskuihin.
 SwissQrCreditorAddressInvalid = Luotonantajan osoite on virheellinen (onko ZIP ja kaupunki asetettu? (%s)
 SwissQrCreditorInformationInvalid = Luotonantajan tiedot eivät kelpaa IBAN-numerolle (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Tyhjä viesti ei kelpaa
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/fi_FI/exports.lang b/htdocs/langs/fi_FI/exports.lang
index 2f20b92c11d..ecb87dce163 100644
--- a/htdocs/langs/fi_FI/exports.lang
+++ b/htdocs/langs/fi_FI/exports.lang
@@ -30,7 +30,7 @@ LibraryShort=Kirjasto
 ExportCsvSeparator=Csv-merkkien erotin
 ImportCsvSeparator=Csv-merkkien erotin
 Step=Vaihe
-FormatedImport=Import Assistant
+FormatedImport=Tuontiassistentti
 FormatedImportDesc1=Tämän moduulin avulla voit päivittää olemassa olevia tietoja tai lisätä uusia objekteja tietokanta-tiedostoon tiedosto ilman teknistä tietämystä avustajan avulla.
 FormatedImportDesc2=Ensimmäinen vaihe on valita tuotavan tiedon tyyppi, sitten lähteen muoto tiedosto ja sitten tuotavat kentät.
 FormatedExport=Vientiassistentti
@@ -44,12 +44,18 @@ SQLUsedForExport=SQL-pyyntöä käytetään tietojen poimimiseen
 LineId=Id-linjan
 LineLabel=Linjan etiketti
 LineDescription=Kuvaus linja
-LineUnitPrice=Yksikköhinta radan
+LineUnitPrice=Rivin yksikköhinta
 LineVATRate=Alv-linjan
-LineQty=Määrä rivin
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
+LineQty=Määrä rivillä
 LineTotalHT=Määrä ilman vero riville
 LineTotalTTC=Määrä vero rivin
 LineTotalVAT=Arvonlisäveron määrästä linja
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Type of line (0= tuotteen, 1= palvelu)
 FileWithDataToImport=Tiedoston tiedot tuoda
 FileToImport=Lähdetiedostoa tuoda
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=Valitse tiedosto-muoto käytettäväksi tuontimuotona
 ChooseFileToImport=Lataa tiedosto ja napsauta sitten %s-kuvaketta valitaksesi tiedosto lähteen tuomiseksi. tiedosto...
 SourceFileFormat=Lähde tiedostomuoto
 FieldsInSourceFile=Toimialoja lähdetiedostoa
-FieldsInTargetDatabase=Kohdekentät Dolibarrissa tietokanta (bold=pakollinen)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Ei kentät
 MoveField=Siirrä kenttä sarakkeeseen numero %s
 ExampleOfImportFile=Example_of_import_file
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Check that the file format (field and string delimiters)
 RunSimulateImportFile=Suorita tuontisimulaatio
 FieldNeedSource=Tämä Kenttä vaatii tietoja lähteestä tiedosto
 SomeMandatoryFieldHaveNoSource=Jotkut pakolliset kentät eivät lähde tiedosto
-InformationOnSourceFile=Tietoa lähdetiedosto
-InformationOnTargetTables=Tietoa kohde-kentät
+InformationOnSourceFile=Lähdetiedosto
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Vaihda ainakin yksi lähde kenttä-sarakkeen kenttiin viedä
 SelectFormat=Valitse tämä tuonti tiedostomuoto
 RunImportFile=Tuo tiedot
diff --git a/htdocs/langs/fi_FI/hrm.lang b/htdocs/langs/fi_FI/hrm.lang
index 7bcc845f1e0..020da360caa 100644
--- a/htdocs/langs/fi_FI/hrm.lang
+++ b/htdocs/langs/fi_FI/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=Työprofiiliin vaadittava arvosana
-RequiredRankShort=Vaadittu arvosana
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Tehtävät tämän työprofiilin kanssa
-EmployeeRank=Työntekijän arvosana tälle taidolle
-EmployeeRankShort=Työntekijän arvosana
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Työntekijän asema
 EmployeePositions=Työntekijöiden paikat
 EmployeesInThisPosition=Työntekijät tässä tehtävässä
@@ -72,6 +72,9 @@ AddSkill=Lisää taitoja työprofiiliin
 RequiredSkills=Tähän työprofiiliin vaadittavat taidot
 UserRank=Käyttäjän sijoitus
 SkillList=Taitoluettelo
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Tallenna sijoitus
 TypeKnowHow=Tietotaito
 TypeHowToBe=Kuinka olla
@@ -95,3 +98,5 @@ NeedBusinessTravels=Tarvitaan työmatkoja
 NoDescription=Ei kuvausta
 TheJobProfileHasNoSkillsDefinedFixBefore=Tämän työntekijän arvioituun työprofiiliin ei ole määritelty taitoa. Lisää taitoja ja poista sitten ja käynnistä arviointi uudelleen.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index f9cde3c2ebc..a84e827cb01 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Sähköpostituksen
 EMailing=Sähköpostituksen
-EMailings=EMailings
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=Kaikki eMailings
+AllEMailings=All mass eMails
 MailCard=Sähköpostituksen kortti
 MailRecipients=Vastaanottajat
 MailRecipient=Vastaanottaja
@@ -26,19 +26,19 @@ MailFile=Liitetyt tiedostot
 MailMessage=Sähköpostiviesti
 SubjectNotIn=Ei aiheessa
 BodyNotIn=Ei kehossa
-ShowEMailing=Näytä sähköpostia
-ListOfEMailings=Luettelo emailings
-NewMailing=Uusi sähköpostia
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=Muokkaa sähköpostia
-ResetMailing=Uudelleen sähköpostitse
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Poista sähköpostia
-PreviewMailing=Esikatselu sähköpostia
-CreateMailing=Luo sähköpostia
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Testi
-ValidMailing=Voimassa sähköpostia
+ValidMailing=Valid mass Email
 MailingStatusDraft=Vedos
 MailingStatusValidated=Validoidut
 MailingStatusSent=Lähetetty
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Kaikkien suodattimien on täsmättävä, jotta sähköp
 LineInFile=Rivi %s tiedosto
 RecipientSelectionModules=Määritelty pyynnöt vastaanottajien valinta
 MailSelectedRecipients=Valitut vastaanottajat
-MailingArea=EMailings alueella
-LastMailings=Uusimmat %s sähköpostitukset
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Tavoitteet tilastot
 NbOfCompaniesContacts=Ainutlaatuinen yhteyksiä yritysten
 MailNoChangePossible=Vastaanottajat validoitava sähköpostia ei voi muuttaa
-SearchAMailing=Haku mailing
-SendMailing=Lähetä sähköpostia
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Lähettänyt
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Sähköpostin lähettäminen voidaan suorittaa komentoriviltä. Pyydä palvelimen pääkäyttäjää käynnistämään seuraava komento lähettämään sähköpostiviesti kaikille vastaanottajille:
 MailingNeedCommand2=Voit kuitenkin lähettää ne online lisäämällä parametri MAILING_LIMIT_SENDBYWEB kanssa arvo max määrä sähköpostit haluat lähettää istunnossa.
 ConfirmSendingEmailing=Jos haluat lähettää sähköpostiviestin suoraan tästä näytöstä, vahvista, että olet varma, että haluat lähettää sähköpostiviestin nyt selaimestasi.
-LimitSendingEmailing=Huomaa: Sähköpostiviestien lähettäminen web-käyttöliittymästä tehdään useita kertoja turvallisuuden ja aikakatkaisujen takia, <b> %s </ b> vastaanottajat kerrallaan jokaiselle lähetysistuntoon.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Tyhjennä lista
 ToClearAllRecipientsClickHere=Voit tyhjentää vastaanottajien luetteloon tässä sähköpostitse napsauttamalla painiketta
 ToAddRecipientsChooseHere=Jos haluat lisätä vastaanottajia, valitse niissä luetellaan
-NbOfEMailingsReceived=Massa emailings saanut
-NbOfEMailingsSend=Massalähetykset lähetettiin
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID kirjaa
 DeliveryReceipt=Toimitus vahvistus
 YouCanUseCommaSeparatorForSeveralRecipients=Voit käyttää <b>comma</b> separator määritellä usealle vastaanottajalle.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Tälle tapahtumatyypille ja Yritys ei ole suunniteltu
 ANotificationsWillBeSent=1 automaattinen ilmoitus lähetetään sähköpostitse
 SomeNotificationsWillBeSent=%s automaattinen Ilmoitukset lähetetään sähköpostitse
 AddNewNotification=Tilaa uusi automaattinen sähköposti-ilmoitus (kohde/tapahtuma)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automaattinen sähköposti lähetetty
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Sähköpostin lähettämisen määritys on asetettu "%s": ksi. Tätä tilaa ei voi käyttää massapostitusten lähettämiseen.
 MailSendSetupIs2=Sinun on ensin siirryttävä admin-tilillä valikkoon %sHome - Setup - EMails%s parametrin <strong> '%s' </strong> muuttamiseksi käytettäväksi tilassa "%s". Tässä tilassa voit syöttää Internet-palveluntarjoajan antaman SMTP-palvelimen vaatimat asetukset ja käyttää Massa-sähköpostitoimintoa.
 MailSendSetupIs3=Jos sinulla on kysyttävää SMTP-palvelimen määrittämisestä, voit kysyä osoitteesta %s.
@@ -183,7 +185,7 @@ Information=Tiedot
 ContactsWithThirdpartyFilter=Yhteystiedot kolmannen osapuolen suodattimella
 Unanswered=Vastaamaton
 Answered=Vastattu
-IsNotAnAnswer=ei vastaa (ensimmäinen sähköposti)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=On vastaus ensimmäiseen sähköpostiin
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=oletus arvo Kenttä '%s' uutta yhteystietoa luotaessa
@@ -199,6 +201,6 @@ ModelTemplate=Sähköpostimalli
 YouCanChooseAModelForYouMailContent= Voit valita yhden mallimalleista tai luoda sellaisen tekoälyllä
 TitleOfMailHolder=Sähköpostin otsikko menee tähän
 ContentOfMailHolder=Sähköpostin sisältö menee tänne...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 4c440f90d9c..56f341347c4 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -37,6 +37,7 @@ Translation=Käännös
 Translations=Käännökset
 CurrentTimeZone=Aikavyöhyke PHP (palvelin)
 EmptySearchString=Anna ei-tyhjät hakuehdot
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Syötä päivämäärä
 NoRecordFound=Tietueita ei löytynyt
 NoRecordDeleted=Tallennuksia ei poistettu
@@ -45,6 +46,7 @@ NoError=Ei virheitä
 Error=Virhe
 Errors=Virheet
 ErrorFieldRequired=Kenttä '%s' on
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Kenttä '%s' on huono arvo
 ErrorFileDoesNotExists=Tiedosto %s ei ole olemassa
 ErrorFailedToOpenFile=Failed to open file %s
@@ -70,8 +72,8 @@ ErrorDuplicateField=Päällekkäinen arvo ainutlaatuisella alalla
 ErrorSomeErrorWereFoundRollbackIsDone=Virhe havaittu. Muutetut tiedot palautettu alkuperäisiksi
 ErrorConfigParameterNotDefined=Parameteriä <b>%s</b> ei ole määritelty Dolibarrin config-tiedostossa <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Ei onnistunut löytämään <b>käyttäjän %s</b> Dolibarr tietokantaan.
-ErrorNoVATRateDefinedForSellerCountry=Virhe ei alv määritellään maa ' %s'.
-ErrorNoSocialContributionForSellerCountry=Virhe, ei sosiaalisia tai fiskaalisia verotyyppejä, jotka on määritelty maata "%s" varten.
+ErrorNoVATRateDefinedForSellerCountry=Virhe, ALV ei ole määritetty maalle ' %s'.
+ErrorNoSocialContributionForSellerCountry=Virhe, sosiaalisia tai fiskaalisia verotyyppejä ei ole määritetty maata "%s" varten.
 ErrorFailedToSaveFile=Virhe, ei tallenna tiedosto.
 ErrorCannotAddThisParentWarehouse=Yrität lisätä ylävaraston, joka on jo olemassa olevan varaston ali
 ErrorInvalidSubtype=Valittu alatyyppi ei ole sallittu
@@ -131,7 +133,7 @@ TechnicalID=Tekninen tunniste
 LineID=Linjan tunnus
 NotePublic=Huomautus (julkinen)
 NotePrivate=Huomautus (yksityinen)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr oli asetettu raja tarkkuus <b>yksikköhinnat %s</b> desimaalit.
+PrecisionUnitIsLimitedToXDecimals=Dolibarr asetettu raja tarkkuus yksikköhinnat </b>%s</b> desimaalit.
 DoTest=Testi
 ToFilter=Suodata
 NoFilter=Ei suodatinta
@@ -150,7 +152,7 @@ Always=Aina
 Never=Ei koskaan
 Under=alle
 Period=Kausi
-PeriodEndDate=Lopetuspäivä ajaksi
+PeriodEndDate=Loppuaika
 SelectedPeriod=Valittu aikajakso
 PreviousPeriod=Edellinen aikajakso
 Activate=Aktivoi
@@ -161,8 +163,8 @@ NotClosed=Ei suljettu
 Enabled=Enabled
 Enable=Ota käyttöön
 Deprecated=Käytöstä poistettu
-Disable=Poistaa käytöstä
-Disabled=Disabled
+Disable=Poista käytöstä
+Disabled=Poista käytöstä
 Add=Lisää
 AddLink=Lisää linkki
 RemoveLink=Poista linkki
@@ -173,7 +175,7 @@ CloseAs=Aseta tilaksi
 CloseBox=Poista widgetti kojelaudaltasi
 Confirm=Vahvista
 ConfirmSendCardByMail=Haluatko todella lähettää tämän kortin sisällön postitse osoitteeseen <b>%s</b>?
-Delete=Poistaa
+Delete=Poista
 Remove=Poista
 Resiliate=Lopeta
 Cancel=Peruuta
@@ -225,7 +227,7 @@ UserGroups=Käyttäjäryhmät
 NoUserGroupDefined=Käyttäjäryhmää ei ole määritelty
 Password=Salasana
 PasswordRetype=Toista salasanasi
-NoteSomeFeaturesAreDisabled=Huomaa, että monet piirteet / modules on poistettu käytöstä tämän esittelyn.
+NoteSomeFeaturesAreDisabled=Huomaa, että monet piirteet / moduuliton poistettu käytöstä esittelyssä.
 YourUserFile=Sinun käyttäjätiedosto
 Name=Nimi
 NameSlashCompany=Nimi / yritys
@@ -246,8 +248,8 @@ Language=Kieli
 MultiLanguage=Monikielisyys
 Note=Huomautus
 Title=Otsikko
-Label=Etiketti
-RefOrLabel=Viite tai etiketissä
+Label=Otsikko
+RefOrLabel=Viite tai otsikko
 Info=Kirjaudu
 Family=Perhe
 Description=Kuvaus
@@ -308,6 +310,7 @@ DateBuild=Raportti rakentaa päivämäärä
 DatePayment=Maksupäivä
 DateApprove=Hyväksytään päivämäärä
 DateApprove2=Hyväksytään päivämäärä (toinen hyväksyntä)
+PendingSince=Pending since
 RegistrationDate=Rekisteröinti päivämäärä
 UserCreation=Luonut käyttäjä
 UserModification=Muokannut käyttäjä
@@ -424,8 +427,8 @@ TotalHTShort=Yhteensä (netto)
 TotalHT100Short=Yhteensä 100%% (netto)
 TotalHTShortCurrency=Yhteensä (netto valuutassa)
 TotalHTWithDiscount=Summa (ilman veroja) alennuksen kanssa
-TotalTTCShort=Yhteensä (sis. alv)
-TotalHT=Yhteensä (alv. 0)
+TotalTTCShort=Yht. (sis. alv)
+TotalHT=Yht. (alv. 0)
 TotalHTforthispage=Yhteensä (ilman veroja) tällä sivulla
 Totalforthispage=Yhteensä tällä sivulla
 GrandTotal=Kokonais summa
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Aloitetaan
 ActionRunningShort=Käsittelyssä
 ActionDoneShort=Päättetty
 ActionUncomplete=Kesken
-LatestLinkedEvents=Viimeiset %s yhdistävät tapahtumat
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Yritys/Organisaatio
 Accountant=Kirjanpitäjä
 ContactsForCompany=Sidosryhmien yhteystiedot
@@ -538,8 +541,8 @@ FromDate=Laskuttaja
 FromLocation=Laskuttaja
 to=on
 To=on
-ToDate=on
-ToLocation=on
+ToDate=päättyen
+ToLocation=sijaintiin
 at=klo
 and=ja
 or=tai
@@ -549,12 +552,12 @@ Others=Muut
 OtherInformations=Lisätiedot
 Workflow=Työtehtävät
 Quantity=Määrä
-Qty=Kpl
+Qty=Määrä
 ChangedBy=Muuttanut
 ApprovedBy=Hyväksynyt
 ApprovedBy2=Hyväksynyt (toinen hyväksyntä)
 Approved=Hyväksytty
-Refused=Refused
+Refused=Hylätty
 ReCalculate=Laske uudelleen
 ResultKo=Virhe
 Reporting=Raportointi
@@ -564,7 +567,7 @@ Drafts=Vedokset
 StatusInterInvoiced=Laskutettu
 Done=Valmis
 Validated=Vahvistetut
-ValidatedToProduce=Validoitu (tuotettava)
+ValidatedToProduce=Vahvistettu (Tuotantoa varten)
 Opened=Avoinna
 OpenAll=Avoimet (kaikki)
 ClosedAll=Suljetut (kaikki)
@@ -580,7 +583,7 @@ Received=Vastaanotetut
 Paid=Maksetut
 Topic=Aihe
 ByCompanies=Sidosryhmittäin
-ByUsers=Käyttäjältä
+ByUsers=Käyttäjittäin
 Links=Linkit
 Link=Linkki
 Rejects=Hylkäykset
@@ -682,8 +685,8 @@ NbOfObjects=Kohteiden määrä
 NbOfObjectReferers=Yhdistävien kohteiden lukumäärä
 Referers=Liittyvät tuotteet
 TotalQuantity=Kokonaismäärä
-DateFromTo=Kohteesta %s %s
-DateFrom=Kohteesta %s
+DateFromTo=Alkaen %s päättyen %s
+DateFrom=Alkaen %s
 DateUntil=Vasta %s
 Check=Tarkista
 Uncheck=Poista valinta
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=Sähköpostiviesti
 SendAcknowledgementByMail=Lähetä vahvistussähköposti
 SendMail=Lähetä sähköpostia
 Email=Sähköposti
+EMail=Sähköposti
+EMails=Sähköpostit
 NoEMail=Ei sähköpostia
 AlreadyRead=Luettu
 NotRead=Lukematon
@@ -742,7 +747,7 @@ RecordsDeleted=%s tietuetta poistettu
 RecordsGenerated=%s tietuetta luotu
 ValidatedRecordWhereFound = Jotkut valituista tietueista on jo vahvistettu. Tietueita ei ole poistettu.
 AutomaticCode=Automaattinen koodi
-FeatureDisabled=Ominaisuus pois päältä
+FeatureDisabled=Ominaisuus on pois päältä
 MoveBox=Siirrä widget
 Offered=Tarjottu
 NotEnoughPermissions=Sinulla ei ole lupaa tätä toimintaa varten
@@ -764,7 +769,7 @@ Color=Väri
 Documents=Tiedostot
 Documents2=Asiakirjat
 UploadDisabled=Lähetys pois käytöstä
-MenuAccountancy=Accounting
+MenuAccountancy=Kirjanpito
 MenuECM=Asiakirjat
 MenuAWStats=AWStats
 MenuMembers=Jäsenet
@@ -793,11 +798,11 @@ Notes=Huomiot
 AddNewLine=Lisää uusi rivi
 AddFile=Lisää tiedosto
 FreeZone=Vapaateksti tuote
-FreeLineOfType=Vapaateksti tyyppi
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Klooni objekti sen tärkeimmät attribuutit
 ReGeneratePDF=Uudelleen luo PDF
 PDFMerge=PDF Merge
-Merge=Merge
+Merge=YHDISTÄ
 DocumentModelStandardPDF=Standardi PDF pohja
 PrintContentArea=Näytä sivu tulostaa päävalikkoon alue
 MenuManager=Valikkomanageri
@@ -865,26 +870,28 @@ ByDay=Päivän mukaan
 BySalesRepresentative=Myyntiedustajittain
 LinkedToSpecificUsers=Linkitetty käyttäjätietoon
 NoResults=Ei tuloksia
-AdminTools=Järjestelmänvalvojan työkalut
+AdminTools=Admin-työkalut
 SystemTools=Kehitysresurssit
 ModulesSystemTools=Moduuli työkalut
 Test=Testi
 Element=Osa
 NoPhotoYet=Ei kuvaa saatavilla vielä
 Dashboard=Kotisivu
-MyDashboard=Kotisivuni
+MyDashboard=Kotisivu
 Deductible=Omavastuu
 from=mistä
 toward=eteenpäin
 Access=Käyttöoikeus
 SelectAction=Valitse toiminto
 SelectTargetUser=Valitse kohde käyttäjä/työntekijä
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Käytä Ctrl+C kopioisaksesi leikepöydälle
 SaveUploadedFileWithMask=Tallenna tiedosto palvelimelle nimellä "<strong>%s</strong>" (muuten "%s")
 OriginFileName=Alkuperäinen tiedostonimi
 SetDemandReason=Aseta lähde
 SetBankAccount=Määritä pankkitili
 AccountCurrency=Tilin valuutta
+AccountancyCode=Kirjanpitotili
 ViewPrivateNote=Katso huomiot
 XMoreLines=%s rivi(ä) piilossa
 ShowMoreLines=Näytä enemmän/vähemmän rivejä
@@ -910,7 +917,7 @@ ViewKanban=Kanban -näkymä
 Mandatory=Pakollinen
 Hello=Terve
 GoodBye=Näkemiin
-Sincerely=Vilpittömästi
+Sincerely=Ystävällisin terveisin
 ConfirmDeleteObject=Haluatko varmasti poistaa tämän tiedon?
 DeleteLine=Poista rivi
 ConfirmDeleteLine=Halutako varmasti poistaa tämän rivin?
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Haluatko varmasti poistaa %s valitun tietueen?
 ConfirmMassClone=Joukkokloonauksen vahvistus
 ConfirmMassCloneQuestion=Valitse kloonattava projekti
 ConfirmMassCloneToOneProject=Kloonaa projektiin %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Liittyvät Tiedot
 ClassifyBilled=Luokittele laskutettu
 ClassifyUnbilled=Luokittele laskuttamaton
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Sinun on oltava kirjautuneena ja, tarvitset oikeudet tar
 Download=Lataa
 DownloadDocument=Lataa dokumentti
 DownloadSignedDocument=Lataa allekirjoitettu dokumentti
-ActualizeCurrency=Päivitä valuuttakurssi
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Tilivuosi
 ModuleBuilder=Moduuli ja Applikaatio Rakentaja
 SetMultiCurrencyCode=Aseta valuutta
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Massa toiminnot
 ClickToShowHelp=Näytä työkaluvihjeiden ohje napsauttamalla
 WebSite=Nettisivu
@@ -1104,6 +1113,7 @@ PayedBy=Maksettu toimesta
 PayedTo=Maksettu
 Monthly=Kuukausittain
 Quarterly=Neljännesvuosittain
+Quarter=Quarter
 Annual=Vuosittain
 Local=Paikallinen
 Remote=Etä
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Tehtävä
 ContactDefault_propal=Tarjous
 ContactDefault_supplier_proposal=Toimittajan ehdotus
 ContactDefault_ticket=Tiketti
+ContactDefault_societe=Sidosryhmä
 ContactAddedAutomatically=Yhteyshenkilö lisätty kolmannen osapuolen yhteyshenkilörooleista
 More=Lisää
 ShowDetails=Näytä yksityiskohdat
@@ -1242,6 +1253,7 @@ CommercialAffected=Myyntiedustaja määrätty
 CommercialsDisaffected=Myyntiedustajat on poistettu
 CommercialDisaffected=Myyntiedustaja poistettu
 Message=Viesti
+Emailing=Emailing
 Progression=Edistyminen
 YourMessage=Sinun viestisi
 YourMessageHasBeenReceived=Viestisi on vastaanotettu. Vastaamme tai otamme sinuun yhteyttä mahdollisimman pian.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Käännös avaimesta AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Lisää
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Alkaen
+Transferred=Transferred
diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
index 24b2d92b43b..993c51227c9 100644
--- a/htdocs/langs/fi_FI/members.lang
+++ b/htdocs/langs/fi_FI/members.lang
@@ -84,7 +84,7 @@ AnyAmountWithoutAdvisedAmount=Mikä tahansa valitsemasi summa
 CanEditAmountShort=Mikä tahansa määrä
 CanEditAmountShortForValues=suositellaan, mikä tahansa määrä
 MembershipDuration=Kesto
-GetMembershipButtonLabel=Liittyä seuraan
+GetMembershipButtonLabel=Liity
 Subscriptions=Avustukset
 SubscriptionLate=Myöhässä
 SubscriptionNotReceived=Lahjoitusta ei koskaan saatu
@@ -96,11 +96,11 @@ NewMemberType=Uusi jäsen tyyppi
 WelcomeEMail=Tervetuloa sähköposti
 SubscriptionRequired=Osallistuminen vaaditaan
 SubscriptionRequiredDesc=Jos tilaus vaaditaan, tilaus, jonka alku tai loppu on päiväys, on tallennettava, jotta jäsenen enimmäismäärä on päiväys (mikä tahansa tilaussumma, vaikka tilaus olisi ilmainen).
-DeleteType=Poistaa
+DeleteType=Poista
 VoteAllowed=Äänestys sallittua
 Physical=Yksilöllinen
-Moral=Yhtiö
-MorAndPhy=Yritys ja Yksityishenkilö
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Ota uudelleen käyttöön
 ExcludeMember=Sulje jäsen pois
 Exclude=Sulje pois
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Jäsentilastot alueittain
 NbOfMembers=Jäsenten kokonaismäärä
 NbOfActiveMembers=Nykyisten aktiivisten jäsenten kokonaismäärä
 NoValidatedMemberYet=Ei validoitu jäsenet pitivät
-MembersByCountryDesc=Tämä näyttö näyttää jäsentilastot maittain. Kaavioiden ja kaaviot riippuvat Googlen verkkokaaviopalvelun saatavuudesta sekä toimivan internetyhteyden saatavuudesta.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Tämä näyttö näyttää jäsentilastot osavaltion/provinssin/kantonin mukaan.
 MembersByTownDesc=Tämä näyttö näyttää jäsentilastot paikkakunnittain.
 MembersByNature=Tämä näyttö näyttää jäsenten tilastot luonteeltaan.
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 9b95f4d7cb4..ce9bbae2116 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -35,13 +35,13 @@ ProductsOnSale=Myynnissä olevat tuotteet
 ProductsOnPurchase=Ostettavissa olevat tuotteet
 ProductsOnSaleOnly=Vain myytävät tuotteet
 ProductsOnPurchaseOnly=Vain ostettavat tuotteet
-ProductsNotOnSell=Ei myytävissä ja ostettavissa olevat tuotteet
+ProductsNotOnSell=Ei myytävissä ja eikä ostettavissa olevat tuotteet
 ProductsOnSellAndOnBuy=Tuotteet myytävissä ja ostettavissa
 ServicesOnSale=Palvelut myynnissä
 ServicesOnPurchase=Palvelut Ostettavissa
 ServicesOnSaleOnly=Vain myytävät palvelut
 ServicesOnPurchaseOnly=Vain ostettavat palvelut
-ServicesNotOnSell=Ei myytävissä ja ostettavissa olevat palvelut
+ServicesNotOnSell=Ei myytävissä ja eikä ostettavissa olevat palvelut
 ServicesOnSellAndOnBuy=Palvelut myytävissä ja ostettavissa
 LastModifiedProductsAndServices=Uusimmat %s muokatut tuotteet/palvelut
 LastRecordedProducts=Viimeksi %s tallennetut tuotteet
@@ -72,7 +72,7 @@ AppliedPricesFrom=Sovellettu alkaen
 SellingPrice=Myyntihinta
 SellingPriceHT=Myyntihinta (veroton)
 SellingPriceTTC=Myyntihinta (sis. alv)
-SellingMinPriceTTC=Alin myyntihinta (sis. vero)
+SellingMinPriceTTC=Alin myyntihinta (sis. alv)
 CostPriceDescription=Tätä hintakenttää (ilman alv:a) voidaan käyttää kuvaamaan keskimääräinen hinta, jonka tämä tuote maksaa yrityksellesi. Se voi olla mikä tahansa hinta, jonka lasket itse, esimerkiksi keskimääräisestä ostohinnasta plus keskimääräiset tuotanto- ja jakelukustannukset.
 CostPriceUsage=Tätä arvoa voidaan käyttää katteen laskennassa.
 ManufacturingPrice=Valmistushinta
@@ -97,7 +97,6 @@ ShowService=Näytä palvelu
 ProductsAndServicesArea=Tuotteiden ja palvelujen alalla
 ProductsArea=Tuotteiden alalla
 ServicesArea=Palvelut alueella
-ListOfStockMovements=Luettelo varastojen muutokset
 BuyingPrice=Ostohinta
 PriceForEachProduct=tuotteet tietyillä hinnoilla
 SupplierCard=Toimittaja-kortti
@@ -107,7 +106,7 @@ BarcodeType=Viivakoodin tyyppi
 SetDefaultBarcodeType=Aseta viivakoodin tyyppi
 BarcodeValue=Viivakoodin arvo
 NoteNotVisibleOnBill=Huomautus (ei näy laskuissa ehdotuksia ...)
-ServiceLimitedDuration=Jos tuote on palvelu, rajoitettu kesto:
+ServiceLimitedDuration=Palvelun rajoitettu kesto:
 FillWithLastServiceDates=Täytä viimeinen palvelurivi päivämäärät
 MultiPricesAbility=Useita hintasegmenttejä tuotetta/palvelua kohden (jokainen asiakas on yhdessä hintasegmentissä)
 MultiPricesNumPrices=Hintojen lukumäärä
@@ -135,8 +134,8 @@ ExportDataset_produit_1=Tuotteet
 ExportDataset_service_1=Palvelut
 ImportDataset_produit_1=Tuotteet
 ImportDataset_service_1=Palvelut
-DeleteProductLine=Poista tuote rivi
-ConfirmDeleteProductLine=Haluatko varmasti poistaa tämän tuoterivin?
+DeleteProductLine=Poista rivi
+ConfirmDeleteProductLine=Oletko varma, että haluat poistaa tämän rivin?
 ProductSpecial=Erikois
 QtyMin=Min. hankinta määrä
 PriceQtyMin=Hinta määrä min.
@@ -150,14 +149,14 @@ NoSupplierPriceDefinedForThisProduct=Tälle tuotteelle ei ole määritetty toimi
 PredefinedItem=Ennalta määritetty kohde
 PredefinedProducts=Ennalta määritetty tuote
 PredefinedServices=Ennalta määritetty palvelu
-PredefinedProductsAndServices=Ennalta määritetyt tuoteet/palvelut
+PredefinedProductsAndServices=Valitse tuote/palvelu
 NotPredefinedProducts=Ei ennalta määritetyt tuotteet/åalvelut
-GenerateThumb=Luo peukalo
+GenerateThumb=Luo widget
 ServiceNb=Palvelu # %s
 ListProductServiceByPopularity=Luettelo suosion mukaan
 ListProductByPopularity=Tuotteet suosion mukaan
 ListServiceByPopularity=Palvelut suosion mukaan
-Finished=Valmistettua tuotetta
+Finished=Valmistettu tuote
 RowMaterial=Raaka-aine
 ConfirmCloneProduct=Oletko varma että haluat kopioida tuotteen tai palvelun <b>%s</b>?
 CloneContentProduct=Kopio kaikki tuotteen/palvelun tärkeimmät tiedot
@@ -172,7 +171,7 @@ BuyingPrices=Ostohinnat
 CustomerPrices=Asiakas hinnat
 SuppliersPrices=Toimittaja hinnat
 SuppliersPricesOfProductsOrServices=Toimittaja hinnat (tuotteet tai palvelut)
-CustomCode=Tulli|Tavara|HS-koodi
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Alkuperämaa
 RegionStateOrigin=Alkuperäalue
 StateOrigin=Osavaltio|Alkuperämaakunta
@@ -210,6 +209,7 @@ unitL=Litra
 unitT=tonnia
 unitKG=kg
 unitG=Gramma
+unitGAL=gallona
 unitMG=mg
 unitLB=punta
 unitOZ=unssi
@@ -312,13 +312,13 @@ GlobalVariableUpdaterHelpFormat1=Pyynnön muoto on {"URL": "http://example.com/u
 UpdateInterval=Päivitysväli (minuutteja)
 LastUpdated=Viimeisin päivitys
 CorrectlyUpdated=Oikein päivitetty
-PropalMergePdfProductActualFile=Tiedostot, joita käytetään PDF-tiedostoon lisäämiseen Azur ovat/on
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=Valitse PDF tiedostot
 IncludingProductWithTag=Sisältää tunnisteella varustetut tuotteet/palvelut
 DefaultPriceRealPriceMayDependOnCustomer=Oletus hinta, todellinen hinta voi riippua asiakkaasta
 WarningSelectOneDocument=Valitse vähintään yksi asiakirja
 DefaultUnitToShow=Yksikkö
-NbOfQtyInProposals=Kappalemäärä tarjouksessa
+NbOfQtyInProposals=Määrä tarjouksessa
 ClinkOnALinkOfColumn=Napsauta sarakkeen %s linkkiä saadaksesi yksityiskohtaisen näkymän...
 ProductsOrServicesTranslations=Tuotteiden/Palvelujen käännökset
 TranslatedLabel=Käännetty etiketti
@@ -349,6 +349,10 @@ QtyRecalculatedWithPackaging=Rivin määrä laskettiin uudelleen toimittajan pak
 
 #Attributes
 Attributes=Attribuutit
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Variantin attribuutit
 ProductAttributes=Variantti attribuutit tuotteille
 ProductAttributeName=Varianttiattribuutti %s
@@ -396,6 +400,8 @@ ErrorDestinationProductNotFound=Kohdetuotetta ei löydy
 ErrorProductCombinationNotFound=Tuotevarianttia ei löydy
 ActionAvailableOnVariantProductOnly=Toiminto saatavilla vain tuotteen varianteille
 ProductsPricePerCustomer=Tuotteiden asiakaskohtaiset hinnat
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Muut attribuutit (toimittaja hinnat)
 DeleteLinkedProduct=Poista yhdistelmään linkitetty alatuote
 AmountUsedToUpdateWAP=Yksikkömäärä, jota käytetään painotetun keskihinnan päivittämiseen
@@ -437,3 +443,6 @@ AllowStockMovementVariantParentHelp=Muunnelman ylätaso on oletusarvoisesti virt
 ConfirmSetToDraftInventory=Haluatko varmasti palata Luonnos-tilaan?<br>Varastossa tällä hetkellä asetetut määrät nollataan.
 WarningLineProductNotToSell=Tuotetta tai palvelua %s ei myydä ja kloonattiin
 PriceLabel=Hintalappu
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/fi_FI/salaries.lang b/htdocs/langs/fi_FI/salaries.lang
index bead0ca8a33..84972746cc6 100644
--- a/htdocs/langs/fi_FI/salaries.lang
+++ b/htdocs/langs/fi_FI/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Uusi palkka
 AddSalary=Lisää palkka
 NewSalaryPayment=Uusi palkkakortti
 AddSalaryPayment=Lisää palkka maksu
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Palkanmaksu
 SalariesPayments=Palkkojen maksut
 SalariesPaymentsOf=Palkkamaksut %s
@@ -27,7 +29,7 @@ FillFieldFirst=Täytä ensin työntekijä Kenttä
 UpdateAmountWithLastSalary=Aseta viimeisen palkan määrä
 MakeTransferRequest=Tee siirtopyyntö
 VirementOrder=Luotonsiirtopyyntö
-BankTransferAmount=Tilisiirron määrä
 WithdrawalReceipt=Tilisiirtomääräys
 OrderWaiting=Odottava tilaus
 FillEndOfMonth=Täytä kuun lopussa
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
index 8fd509a95a6..16d563a133a 100644
--- a/htdocs/langs/fi_FI/website.lang
+++ b/htdocs/langs/fi_FI/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Käytä tässä luetteloa muista nimistä/aliaksista, jotta
 WEBSITE_CSS_URL=Ulkoisen CSS-tiedoston osoite
 WEBSITE_CSS_INLINE=CSS-sisältö tiedosto (yhteinen kaikille sivuille)
 WEBSITE_JS_INLINE=JavaScript tiedosto sisältö (yhteinen kaikille sivuille)
-WEBSITE_HTML_HEADER=Lisäys HTML-otsikon alareunaan (yhteinen kaikille sivuille)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Robotti tiedosto (robots.txt)
 WEBSITE_HTACCESS=Verkkosivusto .htaccess tiedosto
 WEBSITE_MANIFEST_JSON=Verkkosivuston manifest.json tiedosto
@@ -56,16 +56,17 @@ ReadPerm=Lue
 WritePerm=Kirjoita
 TestDeployOnWeb=Testaa / ota käyttöön verkossa
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=Ulkoisen verkkopalvelimen palveleman virtuaalisen isännän URL-osoitetta ei ole määritetty
 NoPageYet=Ei vielä sivuja
 YouCanCreatePageOrImportTemplate=Voit luo uuden sivun tai tuoda täyden verkkosivustomallin
 SyntaxHelp=Ohje tiettyihin syntaksivinkkeihin
 YouCanEditHtmlSourceckeditor=Voit muokata HTML-lähdekoodia käyttämällä "Lähde"-painiketta editorissa.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Kloonaa sivu/säilö
 CloneSite=Kloonaa sivusto
@@ -87,15 +88,15 @@ WebsiteAccount=Verkkosivuston tili
 WebsiteAccounts=Nettisivun käyttäjä
 AddWebsiteAccount=luo verkkosivustotili
 BackToListForThirdParty=Takaisin kolmansien osapuolten luetteloon
-DisableSiteFirst=Poista verkkosivusto käytöstä ensin
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Verkkosivustoni otsikko
 AnotherContainer=Näin voit sisällyttää toisen sivun/säilön sisällön (tässä saattaa ilmetä virhe, jos otat dynaamisen koodin käyttöön, koska upotettua alisäilöä ei ehkä ole olemassa)
 SorryWebsiteIsCurrentlyOffLine=Valitettavasti tämä sivusto on tällä hetkellä offline-tilassa. Ole hyvä ja palaa myöhemmin...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ota taulukko käyttöön verkkosivustojen tilien (kirjautumistunnus/passi) tallentamiseen jokaiselle verkkosivustolle/kolmannelle osapuolelle
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Sinun on ensin määritettävä oletus Kotisivu
-OnlyEditionOfSourceForGrabbedContentFuture=Varoitus: Web-sivun luominen tuomalla ulkoinen verkkosivu on varattu kokeneille käyttäjille. Lähdesivun monimutkaisuudesta riippuen tuonnin tulos voi poiketa alkuperäisestä. Myös jos lähdesivu käyttää yleisiä CSS-tyylejä tai ristiriitaista JavaScriptiä, se voi rikkoa verkkosivuston muokkausohjelman ulkoasua tai ominaisuuksia tämän sivun parissa työskentelemisen aikana. Tämä menetelmä on nopeampi tapa luo sivu, mutta on suositeltavaa luo uusi sivusi alusta tai ehdotetusta sivusta. malli.<br>Huomaa myös, että upotettu editori ei välttämättä toimi oikein, kun sitä käytetään kaapatulla ulkoisella sivulla.
-OnlyEditionOfSourceForGrabbedContent=Ainoastaan HTML-lähteen editointi on mahdollista, kun sisältö on kaapattu ulkoisesta sivustosta
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Nappaa myös kuvia, jotka löytyvät css:n ja -sivulta.
 ImagesShouldBeSavedInto=Kuvat tulee tallentaa hakemistoon
 WebsiteRootOfImages=Verkkosivuston kuvien juurihakemisto
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Kirjaudu ulos asiakastililtäsi
 filteredByVersion=Suodatettu version mukaan
 removeFilter=Poista suodatin
 viewMyCart=Näytä ostoskori
+Shipping=Shipping
 freeShipping=Ilmainen toimitus!
 noProducts=Ei tuotteita
 nbrItemsInCart=Ostokorissa on <span class="ajax_cart_quantity">0</span> tuotetta
@@ -284,12 +286,13 @@ productNameAToZ=Tuotenimi: A - Ö
 productNameZToA=Tuotenimi: Ö - A
 referenceLowestFirst=Viite: nouseva
 referenceHighestFirst=Viite: laskeva
+productPerPage=products per page
 perPage=sivua kohden
 showAll=Näytä kaikki
 showing= Näytetään
 nbrOfProducts= Näytetään %s tuotetta.
 noResultsHaveBeenFound=Ei yhtään hakutuloksia.
-noResultsWereFound= Ei hakutuloksia
+noResultsWereFound=Ei hakutuloksia
 addToCart=Lisää ostoskoriin
 backHome=Palaa kotisivulle
 priceDrop=Hinnanalennus
@@ -302,10 +305,11 @@ lastUpdate=Päivitetty
 contactSupport=Miten ottaa yhteyttä tukeen
 noProductToDisplay=Virhe, Ei näytettäviä tuotteita
 yourCompanyInformation=Yrityksesi tiedot
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=Tämä sähköposti on jo rekisteröity
 firstnameContainsLettersOnly=<b>Etunimi</b> saa sisältää vain kirjaimia ja välilyöntejä
 lastnameContainsLettersOnly=<b>Sukunimi</b> saa sisältää vain kirjaimia ja välilyöntejä
-passwordCriteria=<b>Salasanan</b> tulee täyttää seuraavat kriteerit:<br> -12 merkkiä <br>-1 iso kirjain <br>-1 numero <br>ei erikoismerkkejä <br>ei samaa merkkiä yli 3 kertaa peräkkäin <br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=Tapahtui virhe.
 accountCreation=Luo tili
 errorsOccurred=%svirhettä, virhe %s
@@ -357,3 +361,7 @@ subtract=Vähennä
 LoginCheckout=Kirjaudu sisään ja jatka maksamiseen
 paymentSuccessProcessed=Maksusi on käsitelty onnistuneesti.
 youWillBeRedirectedToOrderPage=Sinut ohjataan pian tilaustietosivulle.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index 49dfeea216f..4b227187eb7 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -11,8 +11,7 @@ FileIntegrityIsOkButFilesWereAdded=La vérification de l'intégrité des fichier
 FileIntegritySomeFilesWereRemovedOrModified=La vérification de l'intégrité des fichiers a échoué. Certains fichiers ont été modifiés, supprimés ou ajoutés.
 GlobalChecksum=Somme de contrôle globale
 MakeIntegrityAnalysisFrom=Effectuer une analyse d'intégrité des fichiers d'application de
-LocalSignature=Signature locale intégrée (moins fiable)
-RemoteSignature=Signature distante distante (plus fiable)
+RemoteSignature=Signature distante à distance
 FilesUpdated=Mettre à jour les fichiers
 FileCheckDolibarr=Vérifier l'intégrité des fichiers d'application
 AvailableOnlyOnPackagedVersions=Le fichier local de vérification de l'intégrité n'est disponible que lorsque l'application est installée à partir d'un package officiel
@@ -101,7 +100,6 @@ DoliPartnersDesc=Liste des sociétés fournissant des modules ou des fonctionnal
 WebSiteDesc=Sites Web externes pour plus de modules complémentaires (non essentiels)...
 DevelopYourModuleDesc=Quelques solutions pour développer votre propre module ...
 DoNotStoreClearPassword=Cryptez les mots de passe stockés dans la base de données.
-MainDbPasswordFileConfEncrypted=Cryptez le mot de passe de la base de données stocké dans conf.php. Il est fortement recommandé d'activer cette option.
 InstrucToEncodePass=Pour chiffrer le mot de passe de la base dans le fichier de configuration <b>conf.php</b>, remplacer la ligne<br><b>$dolibarr_main_db_pass="...";</b><br>par<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Pour avoir le mot de passe de la base décodé (en clair) dans le fichier de configuration <b>conf.php</b>, remplacer dans ce fichier la ligne<br><b>$dolibarr_main_db_pass="crypted:..."</b><br>par<br><b>$dolibarr_main_db_pass="%s"</b>
 ProtectAndEncryptPdfFiles=Protégez les fichiers PDF générés. Ceci n'est PAS recommandé car cela interrompt la génération de PDF en masse.
@@ -213,7 +211,7 @@ ExtrafieldLink=Lier à un objet
 ExtrafieldPointGeo=Point Géométrique
 ExtrafieldMultiPointGeo=Géométrique Multi Point
 ExtrafieldLinestringGeo=Cordon géométrique
-ComputedFormulaDesc=Vous pouvez saisir ici une formule utilisant d'autres propriétés d'objet ou n'importe quel codage PHP pour obtenir une valeur calculée dynamique. Vous pouvez utiliser n'importe quelle formule compatible PHP, y compris le "?" opérateur de condition et objet global suivant : <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>AVERTISSEMENT</strong> : si vous avez besoin des propriétés d'un objet non chargé, récupérez simplement l'objet dans votre formule comme dans le deuxième exemple.<br>L'utilisation d'un champ calculé signifie que vous ne pouvez saisir vous-même aucune valeur depuis l'interface. De plus, s'il y a une erreur de syntaxe, la formule peut ne rien renvoyer.<br><br>Exemple de formule :<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2) : ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Exemple pour recharger un objet<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj- >capital / 5 : '-1')<br><br>Autre exemple de formule pour forcer le chargement d'un objet et de son objet parent : <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Project( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Projet parent introuvable'
+ComputedFormulaDesc=Vous pouvez saisir ici une formule utilisant d'autres propriétés de l'objet ou n'importe quel code PHP pour obtenir une valeur calculée dynamiquement. Vous pouvez utiliser n'importe quelle formule compatible PHP, y compris le "?" opérateur de condition et objet global suivant : <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>AVERTISSEMENT</strong> : si vous avez besoin des propriétés d'un objet non chargé, récupérez simplement l'objet dans votre formule comme dans le deuxième exemple.<br>L'utilisation d'un champ calculé signifie que vous ne pouvez pas saisir vous-même une valeur de l'interface. De plus, s'il y a une erreur de syntaxe, la formule peut ne rien renvoyer.<br><br>Exemple de formule :<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Exemple à recharger objet<br>((($reloadedobj = new Societe($db)) && $reloadedobj->fetchNoCompute($objectoffield->id) > 0) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')<br><br>Autre exemple de formule pour forcer le chargement de l'objet et de son objet parent :<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Projet parent non trouvé'
 ComputedpersistentDesc=Les champs supplémentaires calculés seront stockés dans la base de données, cependant, la valeur ne sera recalculée que lorsque l'objet de ce champ sera modifié. Si le champ calculé dépend d'autres objets ou de données globales, cette valeur peut être fausse !!
 ExtrafieldParamHelpPassword=Laisser ce champ vide signifie que cette valeur sera stockée SANS cryptage (le champ est simplement masqué par des étoiles à l'écran).<br><br>Entrez valeur 'dolcrypt' pour coder la valeur avec un algorithme de cryptage réversible. Les données claires peuvent toujours être connues et modifiées, mais sont cryptées dans la base de données.<br><br>Entrez « auto » (ou « md5 », 'sha256', 'password_hash', ...) pour utiliser l'algorithme de cryptage de mot de passe par défaut (ou md5, sha256, password_hash...) pour enregistrer le mot de passe haché non réversible dans la base de données (aucun moyen de récupérer la valeur d'origine)
 ExtrafieldParamHelpselect=La liste de valeurs doit être constituée de lignes au format clé, valeur (où la clé ne peut pas être « 0 »)<br><br> par exemple : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>Afin d'avoir la liste en fonction d'une autre liste d'attributs complémentaires :<br>1,value1|options_<i>parent_list_code</i> : parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>Afin d'avoir la liste dépendant d'une autre liste :<br>1, value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
@@ -250,7 +248,6 @@ WarningPHPMailB=- Si le domaine de votre e-mail (la partie mymaildomain.com dans
 WarningPHPMailC=- Utiliser le serveur SMTP de votre propre fournisseur de services de messagerie pour envoyer des emails est également intéressant car tous les emails envoyés depuis l'application seront également enregistrés dans votre répertoire "Envoyés" de votre boîte mail.
 WarningPHPMailD=Il est donc recommandé de changer le mode d'envoi des e-mails vers la valeur « SMTP ».
 WarningPHPMailDbis=Si vous souhaitez vraiment conserver la méthode "PHP" par défaut pour envoyer des e-mails, ignorez simplement cet avertissement ou supprimez-le en %sen cliquant ici%s.
-WarningPHPMail2=Si votre fournisseur de messagerie SMTP doit restreindre le client de messagerie à certaines adresses IP (très rare), voici l'adresse IP de l'agent utilisateur de messagerie (MUA) de votre application ERP CRM : <strong>%s</strong>.
 WarningPHPMailSPF=Si le nom de domaine dans votre adresse e-mail d'expéditeur est protégé par un enregistrement SPF (demandez à votre registrar de nom de domaine), vous devez ajouter les IP ou l'entrée suivantes dans l'enregistrement SPF du DNS de votre domaine : <strong>%s</strong>.
 ActualMailDNSRecordFound=Enregistrement %s réel trouvé (pour l'e-mail %s) : %s
 ClickToShowDescription=Cliquez pour afficher la description
@@ -288,8 +285,6 @@ Module0Desc=Gestion des utilisateurs / employés et des groupes
 Module1Desc=Gestion des entreprises et des contacts (clients, prospects...)
 Module10Name=Comptabilité (simplifiée)
 Module10Desc=Rapports comptables simples (journaux, chiffre d'affaires) basés sur le contenu d'une base de données. N'utilise aucune table de grand livre.
-Module22Name=Envois massifs d'e-mails
-Module22Desc=Gérer les e-mails en masse
 Module30Desc=Gestion des factures et avoirs des clients. Gestion des factures et avoirs des fournisseurs
 Module40Name=Vendeurs
 Module40Desc=Gestion des fournisseurs et des achats (bons de commande et facturation des factures fournisseurs)
@@ -527,6 +522,7 @@ DictionaryFormatCards=Formats de cartes
 DictionaryFees=Note de frais - Types de lignes de note de frais
 DictionaryStaff=nombre d'employés
 DictionaryOrderMethods=Modalités de commande
+DictionaryAccountancyReport=Rapports comptables personnalisés
 DictionaryAccountancyCategory=Groupes personnalisés pour les rapports
 DictionaryAccountancyJournal=Revues comptables
 DictionaryEMailTemplates=Modèles d'e-mails
@@ -545,10 +541,11 @@ BackToModuleList=Retour à la liste des modules
 BackToDictionaryList=Retour à la liste des dictionnaires
 VATManagement=Gestion des taxes de vente
 VATIsUsedStandard=Lors de la création de documents (propositions, factures, commandes...), le taux de taxe sur les ventes par défaut est fixé selon les règles standards (en fonction des pays vendeur et acheteur)
-VATIsUsedDesc=Par défaut lors de la création de propositions, de factures, de commandes, etc., le taux de taxe de vente suit la règle standard active :<br>Si le vendeur n'est pas soumis à la taxe de vente, la taxe de vente est par défaut de 0. . Fin de la règle.<br>Si le (pays du vendeur = pays de l'acheteur), alors la taxe de vente par défaut est égale à la taxe de vente du produit dans le pays du vendeur. Fin de la règle.<br>Si le vendeur et l'acheteur résident tous deux dans la Communauté européenne et que les marchandises sont des produits liés au transport (transport, expédition, compagnie aérienne), la TVA par défaut est de 0. La règle dépend du pays du vendeur – veuillez consulter votre comptable. La TVA doit être payée par l'acheteur au bureau de douane de son pays et non au vendeur. Fin de la règle.<br>Si le vendeur et l'acheteur se trouvent tous deux dans la Communauté européenne et que l'acheteur n'est pas une entreprise (avec un numéro de TVA intracommunautaire enregistré), alors la TVA par défaut est de le taux de TVA du pays du vendeur. Fin de la règle.<br>Si le vendeur et l'acheteur sont tous deux situés dans la Communauté européenne et que l'acheteur est une entreprise (avec un numéro de TVA intracommunautaire enregistré), alors la TVA est de 0. par défaut. Fin de la règle.<br>Dans tous les autres cas, la valeur par défaut proposée est Taxe de vente=0. Fin du règne.
+VATIsUsedDesc=Par défaut, lors de la création de propositions, de factures, de commandes, etc., le taux de taxe de vente suit la règle standard active :<br>Si le vendeur n'est pas soumis à la taxe de vente, la taxe de vente par défaut est de 0. Fin de la règle.<br>Si l'état ou la province de l'acheteur a une règle de TVA issue du dictionnaire des taux de TVA, il s'agit du taux de TVA par défaut. Fin de la règle.<br>Si le (pays du vendeur = pays de l'acheteur), la taxe de vente par défaut est égale à la taxe de vente du produit dans le pays du vendeur. Fin de la règle.<br>Si le vendeur et l'acheteur sont tous deux dans la Communauté européenne et que les marchandises sont des produits liés au transport (transport, expédition, transport aérien), la TVA par défaut est de 0. Cette règle dépend du pays du vendeur. Veuillez consulter votre comptable. La TVA doit être payée par l'acheteur au bureau de douane de son pays et non au vendeur. Fin de la règle.<br>Si le vendeur et l'acheteur sont tous deux dans la Communauté européenne et que l'acheteur n'est pas une entreprise (avec un numéro de TVA intracommunautaire enregistré), la TVA par défaut correspond au taux de TVA du pays du vendeur. Fin de la règle.<br>Si le vendeur et l'acheteur sont tous deux dans la Communauté européenne et que l'acheteur est une entreprise (avec un numéro de TVA intracommunautaire enregistré), alors la TVA est de 0 par défaut. Fin de la règle.<br>Dans tous les autres cas, la valeur par défaut proposée est Sales tax=0. Fin de la règle.
 VATIsNotUsedDesc=Par défaut, la taxe de vente proposée est de 0, ce qui peut être utilisé dans des cas tels que les associations, les particuliers ou les petites entreprises.
 VATIsUsedExampleFR=En France, il s'agit d'entreprises ou d'organismes disposant d'un véritable système fiscal (réel simplifié ou réel normal). Un système dans lequel la TVA est déclarée.
 VATIsNotUsedExampleFR=En France, il s'agit des associations non déclarées ou des entreprises, organismes ou professions libérales ayant choisi le régime fiscal des micro-entreprises (Taxe en franchise) et payant une franchise sans déclaration de TVA.  Ce choix affichera la référence « Taxe de vente non applicable – art-293B du CGI » sur les factures.
+VATType=Utilisation des taxes
 LocalTax1IsNotUsed=Non assujeti
 LocalTax1IsUsedDesc=Utiliser un deuxième type de taxe (autre que le premier)
 LocalTax1IsNotUsedDesc=Ne pas utiliser d'autre type de taxe (autre que la première)
@@ -564,6 +561,7 @@ UseRevenueStamp=Utiliser un timbre fiscal
 UseRevenueStampExample=La valeur du timbre fiscal est définie par défaut dans le paramétrage des dictionnaires (%s - %s - %s)
 NoLocalTaxXForThisCountry=Selon le paramétrage des taxes (Voir %s - %s - %s) , votre pays n'a pas besoin d'utiliser ce type de taxe
 LabelOrTranslationKey=Étiquette ou clé de traduction
+LabelTranslatedInCurrentLanguage=Étiquette traduite dans la langue courante
 ValueOfConstantKey=Valeur d'une constante de configuration
 NbOfDays=Nombre de jours
 CurrentNext=Un jour donné dans le mois
@@ -825,15 +823,10 @@ NotificationDisableConfirmMessageFix=Masquer la liste des destinataires (abonné
 SendingsSetup=Configuration du module d'expédition
 SendingsAbility=Fiches d'expédition de soutien pour les livraisons aux clients
 NoNeedForDeliveryReceipts=Dans la plupart des cas, les bons d'expédition servent à la fois de bons de livraison aux clients (liste des produits à envoyer) et de bons de réception et de signature par le client. Le récépissé de livraison des produits est donc une fonctionnalité dupliquée et est rarement activé.
-FCKeditorForNotePublic=Création/édition WYSIWYG du champ "notes publiques" des éléments
-FCKeditorForNotePrivate=Création/édition WYSIWYG du champ "notes privées" des éléments
-FCKeditorForCompany=Création/édition WYSIWYG du champ description des éléments (hors produits/services)
-FCKeditorForProductDetails=Création/édition WYSIWYG de descriptions de produits ou de lignes d'objets (lignes de propositions, commandes, factures, etc...).
+FCKeditorForCompany=Création/modification WYSIWYG du champ description des éléments (hors produits/services)
+FCKeditorForProductDetails=Création/modification WYSIWYG de description de produits ou de lignes d'objets (lignes de propositions, commandes, factures, etc...).
 FCKeditorForProductDetails2=Avertissement : L'utilisation de cette option dans ce cas n'est sérieusement pas recommandée car elle peut créer des problèmes avec les caractères spéciaux et le formatage des pages lors de la création de fichiers PDF.
-FCKeditorForMailing=Création/édition WYSIWYG pour eMailings de masse (Outils->eMailing)
-FCKeditorForUserSignature=Création/édition WYSIWYG de la signature utilisateur
-FCKeditorForMail=Création/édition WYSIWYG pour tous les mails (sauf Outils->eMailing)
-FCKeditorForTicket=Création/édition WYSIWYG des tickets
+FCKeditorForUserSignature=Création/modification WYSIWYG de la signature de l'utilisateur
 StockSetup=Configuration du module de stock
 IfYouUsePointOfSaleCheckModule=Si vous utilisez le module Point de Vente (POS) fourni par défaut ou un module externe, cette configuration pourra être ignorée par votre module POS. La plupart des modules POS sont conçus par défaut pour créer une facture immédiatement et diminuer le stock quelles que soient les options proposées ici. Donc, si vous avez besoin ou non d'une diminution de stock lors de l'enregistrement d'une vente depuis votre point de vente, vérifiez également la configuration de votre module POS.
 NotTopTreeMenuPersonalized=Menus personnalisés non liés à une entrée de menu supérieure
@@ -860,13 +853,13 @@ AGENDA_DEFAULT_VIEW =Quelle vue souhaitez-vous ouvrir par défaut lorsque vous s
 AGENDA_EVENT_PAST_COLOR =Couleur de l'événement passé
 AGENDA_EVENT_CURRENT_COLOR =Couleur de l'événement actuel
 AGENDA_EVENT_FUTURE_COLOR =Couleur de l'événement futur
-AGENDA_REMINDER_BROWSER =Activer le rappel d'événement <b>sur le navigateur de l'utilisateur</b> (lorsque la date de rappel est atteinte, une fenêtre contextuelle s'affiche par le navigateur. Chaque utilisateur peut désactiver ces notifications à partir de la configuration des notifications de son navigateur).
+AGENDA_REMINDER_BROWSERHelp =Lorsque la date de rappel est atteinte, une fenêtre contextuelle est affichée par le navigateur). L'option/le délai de rappel est défini par l'utilisateur lors de la création de l'événement.
 AGENDA_REMINDER_BROWSER_SOUND =Activer la notification sonore
-AGENDA_REMINDER_EMAIL =Activer le rappel d'événement <b>par e-mails</b> (l'option/le délai de rappel peut être défini pour chaque événement).
 AGENDA_REMINDER_EMAIL_NOTE =Remarque : La fréquence du travail planifié %s doit être suffisante pour être sûr que les rappels sont envoyés au bon moment.
 AGENDA_SHOW_LINKED_OBJECT =Afficher l'objet lié dans la vue d'agenda
 AGENDA_USE_EVENT_TYPE =Utiliser les types d'événements (gérés dans le menu Paramétrage -> Dictionnaires -> Type d'événements de l'agenda)
 AGENDA_USE_EVENT_TYPE_DEFAULT =Définir automatiquement cette valeur par défaut pour le type d'événement dans le formulaire de création d'événement
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL =Modèle d'e-mail à utiliser pour le rappel par défaut
 SecurityKey =Clef de sécurité
 ClickToDialUrlDesc=URL appelée lorsqu'un clic sur la photo du téléphone est effectué.  Dans l'URL, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui seront remplacé par le numéro de téléphone de la personne à appeler<br><b>__PHONEFROM__</b> qui sera remplacé par le numéro de téléphone de la personne qui appelle (le vôtre)<br><b>__LOGIN__</b> qui sera remplacé par une connexion clicktodial (définie sur la carte utilisateur)<br><b>__PASS__ </b> qui sera remplacé par le mot de passe clicktodial (défini sur la carte utilisateur).
 ClickToDialDesc=Ce module transforme les numéros de téléphone, lors de l'utilisation d'un ordinateur de bureau, en liens cliquables. Un clic appellera le numéro. Ceci peut être utilisé pour démarrer l'appel téléphonique lors de l'utilisation d'un soft phone sur votre bureau ou lors de l'utilisation d'un système CTI basé sur le protocole SIP par exemple. Remarque : Lorsque vous utilisez un smartphone, les numéros de téléphone sont toujours cliquables.
@@ -925,7 +918,7 @@ BackupDumpWizard=Assistant pour créer le fichier de dump de la base de données
 BackupZipWizard=Assistant pour construire le répertoire d'archives de documents
 SomethingMakeInstallFromWebNotPossible2=Pour cette raison, le processus de mise à niveau décrit ici est un processus manuel que seul un utilisateur privilégié peut effectuer.
 InstallModuleFromWebHasBeenDisabledContactUs=L'installation ou le développement de modules externes ou de sites Web dynamiques, à partir de l'application, est actuellement verrouillé pour des raisons de sécurité. Veuillez nous contacter si vous devez activer cette fonctionnalité.
-InstallModuleFromWebHasBeenDisabledByFile=L'installation de module externe depuis l'application a été désactivé par l'administrator. Vous devez lui demander de supprimer le fichier <strong>%s</strong> pour permettre cette fonctionnalité.
+InstallModuleFromWebHasBeenDisabledByFile=L'installation d'un module externe depuis l'application et l'utilisation de fonctionnalités permettant d'exécuter du code sur le serveur ont été désactivées par votre administrateur. Vous devez lui demander de supprimer le fichier <strong>%s</strong> pour autoriser cette fonctionnalité.
 ConfFileMustContainCustom=L'installation ou la construction d'un module externe à partir de l'application doit sauvegarder les fichiers du module dans le répertoire <strong>%s</strong>. Pour que ce répertoire soit traité par Dolibarr, vous devez configurer votre <strong> conf / conf.php </strong> pour ajouter les 2 lignes de directive: <br><strong> $ dolibarr_main_url_root_alt = '/ custom'; </strong><br><strong> $ dolibarr_main_document_root_alt = '%s / custom'; </strong>
 HighlightLinesOnMouseHover=Mettez en surbrillance les lignes de table lorsque déplacement de la souris passe au-dessus
 HighlightLinesColor=Couleur de surbrillance de la ligne lorsque la souris passe dessus (utilisez 'ffffff' pour ne pas surligner)
@@ -947,6 +940,7 @@ EnterAnyCode=Ce champ contient une référence pour identifier la ligne. Entrez
 Enter0or1=Entrez 0 ou 1
 UnicodeCurrency=Entrez ici entre accolades, la liste des numéros d'octets qui représentent le symbole monétaire. Par exemple : pour $, saisissez [36] - pour le real brésilien R$ [82,36] - pour €, saisissez [8364]
 ColorFormat=La couleur RVB est en format HEX, par exemple: FF0000
+NumberFormatForATotalPrice=Format numérique pour le prix total %s
 PictoHelp=Nom de l'icône au format :<br>- image.png pour un fichier image dans le répertoire du thème actuel<br>- image.png@module si le fichier est dans le répertoire /img/ d'un module<br>- fa-xxx pour un picto FontAwesome fa-xxx<br>- fontawesome_xxx_fa_color_size pour un picto FontAwesome fa-xxx (avec préfixe, couleur et taille définies)
 PositionIntoComboList=Position de la ligne dans les listes déroulantes
 SellTaxRate=Taux de taxe de vente
@@ -1020,6 +1014,7 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Masquer la colonne d
 MAIN_PDF_NO_SENDER_FRAME=Masquer les bordures du cadre d'adresse de l'expéditeur
 MAIN_PDF_NO_RECIPENT_FRAME=Masquer les bordures du cadre d'adresse du destinataire
 MAIN_PDF_HIDE_CUSTOMER_CODE=Masquer le code client
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Masquer le code de comptabilité client
 MAIN_PDF_HIDE_SENDER_NAME=Masquer le nom de l'expéditeur/de l'entreprise dans le bloc d'adresse
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Ajoutez un balisage masqué dans la zone de signature pour permettre à l'outil de signature électronique de le réutiliser. Peut être utilisé par des outils externes ou à l'avenir par la fonctionnalité de signature en ligne.
 NothingToSetup=Aucune configuration spécifique n’est requise pour ce module.
@@ -1161,6 +1156,8 @@ RecommendedValueIs=Recommandé : %s
 ARestrictedPath=Un chemin restreint pour les fichiers de données
 CheckForModuleUpdate=Rechercher les mises à jour des modules externes
 CheckForModuleUpdateHelp=Cette action permettra de se connecter aux éditeurs de modules externes pour vérifier si une nouvelle version est disponible.
+CheckForModuleUpdateHelp2=Une connexion est également établie avec %s pour vérifier si certains de vos modules externes ont été signalés comme malwares par la communauté.
+YourIPWillBeRevealedToThisExternalProviders=Votre IP sera révélée à tous ces fournisseurs externes.
 SwaggerDescriptionFile=Fichier de description de l'API Swagger (à utiliser avec redoc par exemple)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Vous avez activé l'API WS obsolète. Vous devriez plutôt utiliser l'API REST.
 RandomlySelectedIfSeveral=Sélectionné au hasard si plusieurs images sont disponibles
@@ -1240,7 +1237,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Attention : le module %s a déf
 WarningModuleHasChangedSecurityCsrfParameter=Attention : le module %s a désactivé la sécurité 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=Les emails entrants sont gérés par le module %s. Vous devez l'activer et le configurer si vous devez prendre en charge les e-mails entrants.
 MAIN_IMAP_USE_PHPIMAP=Utilisez la bibliothèque PHP-IMAP pour IMAP au lieu de PHP IMAP natif. Cela permet également d'utiliser une connexion OAuth2 pour IMAP (le module OAuth doit également être activé).
-MAIN_CHECKBOX_LEFT_COLUMN=Afficher la colonne de sélection des champs et des lignes à gauche (à droite par défaut)
+MAIN_CHECKBOX_LEFT_COLUMN=Afficher la colonne pour la sélection des champs et des lignes à gauche (celle de droite est désactivée)
 NotAvailableByDefaultEnabledOnModuleActivation=Non créé par défaut. Créé lors de l'activation du module uniquement.
 DefaultForTypeDesc=Modèle utilisé par défaut lors de la création d'un nouvel email pour le type de modèle
 OptionXIsCorrectlyEnabledInModuleY=L'option "<b>%s</b>" est activée dans le module <b>%s</b>
@@ -1265,7 +1262,6 @@ AiDescription=Fonctionnalités IA (Intelligence Artificielle)
 AiDescriptionLong=Fournit des fonctionnalités d’IA (Intelligence Artificielle) dans différentes parties de l’application. Besoin d'une API IA externe.
 AI_API_KEY=Clé pour l'API IA
 AI_API_URL=URL du point de terminaison pour l'API AI
-AI_API_SERVICE=Service à utiliser pour les fonctionnalités d'IA
 AiSetup=Configuration du module IA
 AiCustomPrompt=Invite personnalisée IA
 AI_CONFIGURATIONS_PROMPT=Invite personnalisée
@@ -1288,3 +1284,9 @@ MainAuthenticationOidcLoginClaimName=Demande de connexion
 MainAuthenticationOidcLoginClaimDesc=Réclamation OpenID Connect correspondant à la connexion de l'utilisateur Dolibarr. Si elle n'est pas définie ou est vide, la valeur par défaut est l'adresse e-mail.
 Fediverse=Fédiverse
 ConfirmDeleteSocialNetwork=Etes-vous sûr de vouloir supprimer cet enregistrement ?
+ConfirmDeleteParamOfSocialNetwork=Etes-vous sûr de vouloir supprimer ce paramètre ?
+HelpMariaDBToGetValue=Cette valeur a été récupérée avec la commande : %s
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Mention obligatoire dans certains pays (France, ...)
+YouHaveALargeAmountOfRecordOnLists=Vous avez une taille maximale par défaut pour les listes définie sur <b>%s</b> lignes. Il s'agit d'une valeur importante qui nécessite de faire défiler l'écran pour voir toutes les réponses. Il est préférable d'avoir une valeur inférieure à <b>%s</b> et d'utiliser la pagination pour voir l'enregistrement au-delà de ce numéro. Modifiez cela dans le menu Accueil - Configuration - Affichage.
+CheckIfModuleIsNotBlackListed=Installation en bloc pour les modules trouvés dans la <b>liste noire distante</b>
+CheckIfModuleIsNotBlackListedHelp=Certains modules peuvent être fournis par certaines sociétés qui ne respectent pas les règles de bonne conduite du projet (non-respect du RGPD, violation des règles d'utilisation de la marque Dolibarr, etc.). En cochant cette case, une requête sera effectuée auprès du serveur du projet pour savoir si un signalement a été reçu à propos de ce module, et vous protégera en bloquant le déploiement des modules signalés
diff --git a/htdocs/langs/fr_CA/banks.lang b/htdocs/langs/fr_CA/banks.lang
index 21499bbff89..866c893216a 100644
--- a/htdocs/langs/fr_CA/banks.lang
+++ b/htdocs/langs/fr_CA/banks.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - banks
 MenuBankCash=Banques | Encaisse
+BankAccountsAndGateways=Comptes bancaires | Passerelles
 SwiftValid=BIC / SWIFT valide
 IbanValid=BAN valide
 IbanNotValid=BAN non valide
@@ -10,6 +11,7 @@ AccountStatement=Relevé de compte
 AccountStatements=Relevés de compte
 BankAccountDomiciliation=Adresse de la banque
 EditFinancialAccount=Modifier compte
+BankType1=Compte courant, chèque ou carte de crédit
 ConfirmDeleteAccount=Êtes-vous sûr de vouloir supprimer ce compte?
 BankTransactionByCategories=Entrées bancaires par catégories
 BankTransactionForCategory=Entrées bancaires pour la catégorie <b>%s</b>
@@ -31,11 +33,17 @@ AddBankRecordLong=Ajouter une entrée manuellement
 Conciliated=Reconcilié
 BankLineConciliated=Entrée reconciliée avec reçu bancaire
 BankLineReconciled=Reconcilié
+BankLineNotReconciled=Pas réconcilié
+WithdrawalPayment=Paiement par prélèvement automatique
+BankTransferPayment=Paiement par virement bancaire
 SocialContributionPayment=Règlement charge sociale
+BankTransfers=Virements de crédit
 MenuBankInternalTransfer=Transfert interne
+TransferDesc=Pour effectuer un virement interne d'un compte à un autre, l'application écrira deux enregistrements : un débit sur le compte source et un crédit sur le compte cible. Le même montant, le même libellé et la même date seront utilisés pour cette transaction.
 TransferTo=À
 CheckTransmitter=Expéditeur
 ValidateCheckReceipt=Validez cette facture?
+ConfirmValidateCheckReceipt=Etes-vous sûr de vouloir soumettre ce reçu de chèque pour validation ? Aucune modification ne sera possible une fois validé.
 DeleteCheckReceipt=Supprimer ce reçu de facturation?
 ConfirmDeleteCheckReceipt=Êtes-vous sûr de vouloir supprimer ce justificatif?
 BankChecksToReceipt=Chèques en attente de dépôt
@@ -43,10 +51,15 @@ NumberOfCheques=Num. de chèque
 DeleteTransaction=Supprimer l'entrée
 ConfirmDeleteTransaction=Êtes-vous sûr de vouloir supprimer cette entrée?
 ThisWillAlsoDeleteBankRecord=Cela supprimera également l'entrée bancaire générée
-PlannedTransactions=Entrées prévues
+PlannedTransactions=Entrées à venir
 ExportDataset_banque_1=Entrées bancaires et relevé de compte
 PaymentNumberUpdateSucceeded=Numéro de paiement mis à jour avec succès
 BankTransactionLine=Entrée de la banque
+AllAccounts=Tous les comptes bancaires et espèces
+FutureTransaction=Transaction future. Impossible de réconcilier.
+SelectChequeTransactionAndGenerate=Sélectionnez/filtrez les chèques qui doivent être inclus dans le reçu de dépôt de chèque. Cliquez ensuite sur « Créer ».
+SelectPaymentTransactionAndGenerate=Sélectionnez/filtrez les documents qui doivent être inclus dans le reçu de dépôt %s. Cliquez ensuite sur « Créer ».
+InputReceiptNumber=Choisissez le relevé bancaire lié à la conciliation. Utilisez une valeur numérique triable
 ToConciliate=Réconcilier?
 DefaultRIB=RIB par défaut
 AllRIB=Tous les RIB
@@ -58,5 +71,24 @@ RejectCheck=Chèque renvoyé
 ConfirmRejectCheck=Êtes-vous sûr de vouloir marquer ce contrôle comme rejeté?
 RejectCheckDate=Date à laquelle le chèque a été retourné
 CheckRejected=Chèque renvoyé
+CheckRejectedAndInvoicesReopened=Chèque retourné et factures réouvertes
+DocumentModelSepaMandate=Modèle de mandat SEPA. Utile uniquement pour les pays européens de la CEE.
 DocumentModelBan=Modèle pour imprimer une page avec des informations BAN.
 VariousPayments=Paiements divers
+VariousPaymentId=ID de paiement divers
+VariousPaymentLabel=Étiquette de paiement divers
+ConfirmCloneVariousPayment=Confirmer le clone d'un paiement divers
+FindYourSEPAMandate=Il s'agit de votre mandat SEPA autorisant notre société à effectuer un ordre de prélèvement auprès de votre banque. Renvoyez-le signé (scan du document signé) ou envoyez-le par courrier à
+AutoReportLastAccountStatement=Remplir automatiquement le champ « numéro de relevé bancaire » avec le dernier numéro de relevé lors du rapprochement
+CashControl=Contrôle de caisse au point de vente
+NewCashFence=Nouveau contrôle de trésorerie (ouverture ou fermeture)
+BankColorizeMovement=Colorier les mouvements
+BankColorizeMovementDesc=Si cette fonction est activée, vous pouvez choisir une couleur d'arrière-plan spécifique pour les mouvements de débit ou de crédit
+BankColorizeMovementName1=Couleur d'arrière-plan pour le mouvement de débit
+BankColorizeMovementName2=Couleur d'arrière-plan pour le mouvement de crédit
+IfYouDontReconcileDisableProperty=Si vous n'effectuez pas de rapprochements bancaires sur certains comptes bancaires, désactivez la propriété « %s » sur ceux-ci pour supprimer cet avertissement.
+NoRecordFoundIBankcAccount=Aucun enregistrement trouvé sur le compte bancaire. Généralement, cela se produit lorsqu'un enregistrement a été supprimé manuellement de la liste des transactions sur le compte bancaire (par exemple lors d'un rapprochement du compte bancaire). Une autre raison est que le paiement a été enregistré lorsque le module « %s » a été désactivé.
+AlreadyOneBankAccount=Déjà un compte bancaire défini
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Variante de fichier SEPA
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Oui = Enregistrer « Type de paiement » dans la section « Virement » du fichier SEPA<br><br>Lors de la génération d'un fichier XML SEPA pour les virements, la section « PaymentTypeInformation » peut désormais être placée à l'intérieur de la section « CreditTransferTransactionInformation » (au lieu de la section « Paiement »). Nous vous recommandons fortement de ne pas cocher cette case pour placer PaymentTypeInformation au niveau Paiement, car toutes les banques ne l'accepteront pas nécessairement au niveau CreditTransferTransactionInformation. Contactez votre banque avant de placer PaymentTypeInformation au niveau CreditTransferTransactionInformation.
+XNewLinesConciliated=%s nouvelle(s) ligne(s) conciliée(s)
diff --git a/htdocs/langs/fr_CA/blockedlog.lang b/htdocs/langs/fr_CA/blockedlog.lang
index ab5333aa867..0ee72f2b748 100644
--- a/htdocs/langs/fr_CA/blockedlog.lang
+++ b/htdocs/langs/fr_CA/blockedlog.lang
@@ -6,7 +6,6 @@ FingerprintsDesc=Il s'agit de l'outil permettant de parcourir ou d'extraire les
 CompanyInitialKey=Clé initiale de l'entreprise (hachage du bloc de genèse)
 BrowseBlockedLog=Des journaux inaltérables
 DownloadBlockChain=Télécharger les empreintes digitales
-KoCheckFingerprintValidity=L'entrée de journal archivée n'est pas valide. Cela signifie que quelqu'un (un pirate informatique ?) a modifié certaines données de cet enregistrement après son enregistrement, ou a effacé l'enregistrement archivé précédent (vérifiez que la ligne avec le numéro précédent existe) ou a modifié la somme de contrôle de l'enregistrement précédent.
 OkCheckFingerprintValidity=L'enregistrement de journal archivé est valide. Les données de cette ligne n'ont pas été modifiées et l'entrée suit la précédente.
 NotAddedByAuthorityYet=Pas encore stocké dans l'autorité distante
 BlockedLogBillDownload=Téléchargement de la facture client
@@ -14,7 +13,6 @@ BlockedLogBillPreview=Aperçu de la facture client
 BlockedlogInfoDialog=Détails du journal
 ListOfTrackedEvents=Liste des événements suivis
 Fingerprint=Empreinte digitale
-DataOfArchivedEvent=Données complètes de l'événement archivé
 ImpossibleToReloadObject=Objet d'origine (type %s, id %s) non lié (voir la colonne « Données complètes » pour obtenir des données enregistrées inaltérables)
 BlockedLogAreRequiredByYourCountryLegislation=Le module Logs inaltérables peut être exigé par la législation de votre pays. La désactivation de ce module peut rendre toutes transactions futures invalides au regard de la loi et de l'utilisation de logiciels légaux car elles ne peuvent pas être validées par un contrôle fiscal.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Le module Logs inaltérables a été activé en raison de la législation de votre pays. La désactivation de ce module peut rendre toutes transactions futures invalides au regard de la loi et de l'utilisation de logiciels légaux car elles ne peuvent pas être validées par un contrôle fiscal.
@@ -25,6 +23,7 @@ BlockedLogEnabled=Un système de suivi des événements dans des journaux inalt
 BlockedLogDisabled=Le système de suivi des événements dans des journaux inaltérables a été désactivé après que certains enregistrements ont été effectués. Nous avons enregistré une empreinte digitale spéciale pour suivre la chaîne comme étant brisée
 BlockedLogDisabledBis=Le système de suivi des événements dans des journaux inaltérables a été désactivé. Cela est possible car aucun enregistrement n'a encore été effectué.
 LinkHasBeenDisabledForPerformancePurpose=Pour des raisons de performance, le lien direct vers le document n'est pas affiché après la 100e ligne.
+SavedOnLine=Enregistré en ligne
 logBILL_DELETE=Facture client logiquement supprimée
 logBILL_SENTBYMAIL=Facture client envoyée par courrier
 logCASHCONTROL_VALIDATE=Enregistrement de la clôture de la caisse
diff --git a/htdocs/langs/fr_CA/categories.lang b/htdocs/langs/fr_CA/categories.lang
index 5409b5e314f..21699a3826d 100644
--- a/htdocs/langs/fr_CA/categories.lang
+++ b/htdocs/langs/fr_CA/categories.lang
@@ -2,24 +2,59 @@
 Rubrique=Tag/Catégorie
 Rubriques=Tags/Catégories
 RubriquesTransactions=Tags / Catégories de transactions
+NoCategoryYet=Aucune balise/catégorie de ce type n'a été créée
+ProductsCategoriesArea=Zone de balises/catégories de produits/services
+SuppliersCategoriesArea=Zone des tags/catégories des fournisseurs
+CustomersCategoriesArea=Zone des tags/catégories clients
+MembersCategoriesArea=Zone des tags/catégories des membres
+ContactsCategoriesArea=Zone de balises/catégories de contact
+AccountsCategoriesArea=Zone des balises/catégories de compte bancaire
+ProjectsCategoriesArea=Zone des tags/catégories du projet
+UsersCategoriesArea=Zone des tags/catégories d'utilisateurs
+Bank_linesCategoriesArea==Zone des balises/catégories des lignes bancaires
+CatListAll=Liste des tags/catégories (tous types)
 CreateThisCat=Créer ce(tte) tag/catégorie
 ImpossibleAddCat=Impossible d'ajouter le tag / catégorie %s
 ProductIsInCategories=Produit/service appartient aux tags/catégories suivant(e)s
 CompanyIsInCustomersCategories=Ce tiers appartient aux tags/catégories de clients/prospects suivant(e)s
+CompanyIsInSuppliersCategories=Ce tiers est lié aux balises/catégories des fournisseurs suivants
 MemberIsInCategories=Ce membre appartient aux tags/catégories suivant(e)s
 ContactIsInCategories=Ce contact appartient aux tags/catégories suivant(e)s
 CompanyHasNoCategory=Ce tiers n'est pas dans les tags / catégories
 ProjectHasNoCategory=Ce projet n'est pas dans les tags / catégories
 ClassifyInCategory=Classer dans le(a) tag/catégorie
 ConfirmDeleteCategory=Êtes-vous sûr de vouloir supprimer cette étiquette / catégorie?
+SuppliersCategoryShort=Étiquette/catégorie des fournisseurs
 CustomersCategoryShort=Tags/catégories de clients
 ProductsCategoryShort=Tags/catégories de produits
 MembersCategoryShort=Tags/catégories de membres
+SuppliersCategoriesShort=Balises/catégories des fournisseurs
 CustomersCategoriesShort=Tags/catégories de clients
 ProspectsCategoriesShort=Prospects tags/catégories
+CustomersProspectsCategoriesShort=Balises/catégories Cust./Prosp.
 MembersCategoriesShort=Tags/catégories de membres
 ContactCategoriesShort=Tags de contacts
 AccountsCategoriesShort=Étiquettes / catégories de comptes
 ProjectsCategoriesShort=Projets Tags / catégories
+UsersCategoriesShort=Balises/catégories des utilisateurs
+StockCategoriesShort=Étiquettes/catégories d'entrepôt
+ParentCategory=Balise/catégorie parente
+ParentCategoryID=ID de la balise/catégorie parent
+ParentCategoryLabel=Étiquette de la balise/catégorie parente
+CatCusList=Liste des tags/catégories de clients/prospects
 CatMemberList=Liste des tags/catégories de membres
+CatContactList=Liste des tags/catégories de contacts
+CatProjectsList=Liste des projets tags/catégories
+CatSupLinks=Liens entre les fournisseurs et les tags/catégories
+CatContactsLinks=Liens entre les contacts/adresses et les tags/catégories
 CatMembersLinks=Liens entre membres et libellés/catégories
+CatProjectsLinks=Liens entre les projets et les tags/catégories
+CatUsersLinks=Liens entre les utilisateurs et les tags/catégories
+CategorieRecursivHelp=Si l'option est activée, lorsque vous ajoutez un objet dans une sous-catégorie, l'objet sera également ajouté aux catégories parentes.
+AddProductServiceIntoCategory=Attribuer une catégorie au produit/service
+StocksCategoriesArea=Catégories d'entrepôt
+TicketsCategoriesArea=Catégories de billets
+ActionCommCategoriesArea=Catégories d'événements
+WebsitePagesCategoriesArea=Catégories de conteneurs de pages
+UseOrOperatorForCategories=Utiliser l'opérateur « OU » pour les catégories
+AddObjectIntoCategory=Affecter à la catégorie
diff --git a/htdocs/langs/fr_CA/companies.lang b/htdocs/langs/fr_CA/companies.lang
index fdfc05c91a7..4c46765e8c9 100644
--- a/htdocs/langs/fr_CA/companies.lang
+++ b/htdocs/langs/fr_CA/companies.lang
@@ -1,33 +1,151 @@
 # Dolibarr language file - Source file is en_US - companies
+newSocieteAdded=Vos coordonnées ont été enregistrées. Nous vous recontacterons prochainement...
+ConfirmDeleteCompany=Êtes-vous sûr de vouloir supprimer cette entreprise et toutes les informations associées ?
+ConfirmDeleteContact=Etes-vous sûr de vouloir supprimer ce contact ?
+MenuNewProspect=Nouvelle perspective
+NewCompany=Nouvelle entreprise (prospect, client, fournisseur)
+CreateDolibarrThirdPartySupplier=Créer un tiers (fournisseur)
 CreateThirdPartyAndContact=Créer un tiers + un contact enfant
+ThirdPartyAddress=Adresse de tiers
 AliasNames=Nom de l'alias (commercial, marque, ... )
+AliasNameShort=Nom d'alias
+CountryIsInEEC=Le pays fait partie de la Communauté économique européenne
+PriceFormatInCurrentLanguage=Format d'affichage des prix dans la langue et la devise actuelles
+ThirdPartyName=Nom de tiers
+ThirdPartyEmail=Courriel tiers
+ThirdPartyType=Type de tiers
+ToCreateContactWithSameName=Créera automatiquement un contact/adresse avec les mêmes informations que le tiers sous le tiers. Dans la plupart des cas, même si votre tiers est une personne physique, la création d'un tiers à elle seule suffit.
+ReportByThirdparties=Rapport par un tiers
+NationalRegistrationNumber=Numéro d'enregistrement national
 PostOrFunction=Poste
+NatureOfThirdParty=Nature du tiers
 State=États/Provinces
+StateId=Carte d'identité d'État
+StateCode=Code d'État/Province
 StateShort=États
+DepartmentBuyer=État/province de l'acheteur
+CountryId=ID du pays
 PhoneShort=Téléphone
+PhonePro=Téléphone de bus
+VATIsUsed=Taxe de vente utilisée
+VATIsUsedWhenSelling=Cela définit si ce tiers inclut une taxe de vente ou non lorsqu'il établit une facture à ses propres clients
+VATIsNotUsed=La taxe de vente n'est pas utilisée
+VATReverseChargeByDefaultDesc=Sur la facture fournisseur, l'autoliquidation de la TVA est utilisée par défaut
+CopyAddressFromSoc=Copier l'adresse à partir des informations de tiers
+ThirdpartyNotCustomerNotSupplierSoNoRef=Tierce partie ni client ni fournisseur, aucun objet référent disponible
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Tierce partie ni client ni fournisseur, les remises ne sont pas disponibles
 PaymentBankAccount=Compte bancaire de paiement
 OverAllOrders=Ordres
 OverAllSupplierProposals=Demande de prix
 LocalTax1IsUsed=Assujeti à la TVQ
 LocalTax2IsUsed=Assujeti à une troisième taxe
+WrongSupplierCode=Code fournisseur invalide
+Gencod=Code à barres
+GencodBuyPrice=Code à barres de la référence de prix
 ProfId6Short=TVQ
 ProfId6=TVQ
+ProfId7=Carte professionnelle 7
+ProfId8=Carte professionnelle 8
+ProfId9=Carte professionnelle 9
+ProfId10=Carte professionnelle 10
+ProfId1CH=Numéro UID
+ProfId1CM=Id. prof. 1 (Registre du Commerce)
+ProfId2CM=Id. prof. 2 (Numéro d'identification fiscale unique)
+ProfId3CM=Id. prof. 3 (N° du décret de création)
+ProfId4CM=Id. prof. 4 (N° du certificat de dépôt)
+ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId6FR=Prof Id 6 (numéro ARN)
+ProfId1ShortFR=SIRÈNE
+ProfId6ShortFR=ARN
 ProfId1MX=Id. Prof. 1 (R.F.C).
 ProfId2MX=ID. Prof. 2 (R..P. IMSS)
+ProfId3MX=Prof Id 3 (Charte Professionnelle)
+ProfId1US=Id Prof (FEIN)
+ProfId2RO=Prof Id 2 (Nr. Înmatriculaire)
+ProfId4UA=Prof Id 4 (Certificat)
+VATIntraShort=Numéro de TVA
+SupplierRelativeDiscount=Remise relative du fournisseur
+HasRelativeDiscountFromSupplier=Vous bénéficiez d'une remise par défaut de <b>%s%%</b> auprès de ce fournisseur
+HasNoRelativeDiscountFromSupplier=Aucune remise relative par défaut avec ce fournisseur
+CompanyHasAbsoluteDiscount=Ce client dispose de remises disponibles (notes de crédit ou acomptes) pour <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Ce client dispose de remises disponibles (commerciales, acomptes) pour <b>%s</b>
+CompanyHasCreditNote=Ce client dispose encore d'avoirs pour <b>%s</b>
+HasNoAbsoluteDiscountFromSupplier=Aucune remise/crédit disponible auprès de ce fournisseur
+HasAbsoluteDiscountFromSupplier=Vous disposez de remises disponibles (notes de crédit ou acomptes) pour <b>%s</b> %s auprès de ce fournisseur
+HasDownPaymentOrCommercialDiscountFromSupplier=Vous disposez de remises disponibles (commerciales, acomptes) pour <b>%s</b> auprès de ce fournisseur
+HasCreditNoteFromSupplier=Vous avez des notes de crédit pour <b>%s</b> de ce fournisseur
 CompanyHasNoAbsoluteDiscount=Ce client n'a pas ou plus de remise fixe disponible
+CustomerAbsoluteDiscountAllUsers=Remises client absolues (accordées par tous les utilisateurs)
+CustomerAbsoluteDiscountMy=Remises client absolues (accordées par vous-même)
+SupplierAbsoluteDiscountAllUsers=Remises absolues des fournisseurs (saisies par tous les utilisateurs)
+SupplierAbsoluteDiscountMy=Remises absolues des fournisseurs (saisies par vous-même)
 ContactRelatedItems=Articles connexes
 ContactId=ID de contact
+ContactByDefaultFor=Contact/adresse par défaut pour
+SupplierCode=Code du fournisseur
+SupplierCodeShort=Code du fournisseur
+CustomerCodeDesc=Code client, unique pour tous les clients
+SupplierCodeDesc=Code fournisseur, unique pour tous les fournisseurs
+RequiredIfSupplier=Obligatoire si le tiers est un fournisseur
+ThisIsModuleRules=Règles pour ce module
 ListOfContactsAddresses=Liste des contacts
+ShowCompany=Tierce personne
+ShowContact=Adresse de contact
+ContactType=Rôle de contact
 ContactForOrdersOrShipments=Contact de commandes ou de livraison
 NoContactForAnyOrderOrShipments=Ce contact n'est contact d'aucune commande ou livraison
+NewContactAddress=Nouveau contact/adresse
+ThisUserIsNot=Cet utilisateur n'est pas un prospect, un client ou un fournisseur
+VATIntraCheckDesc=Le numéro de TVA doit inclure le préfixe du pays. Le lien <b>%s</b> utilise le service de vérification de la TVA européenne (VIES) qui nécessite un accès Internet depuis le serveur Dolibarr.
+VATIntraCheckableOnEUSite=Vérifiez le numéro de TVA intracommunautaire sur le site de la Commission européenne
+VATIntraManualCheck=Vous pouvez également vérifier manuellement sur le site Web de la Commission européenne <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
+NorProspectNorCustomer=Ni prospect, ni client
+JuridicalStatus=Type d'entité commerciale
+Staff=Employés
 StatusProspect1=Pour être contacté
 ChangeToContact=Changer l'état sur 'À contacter'
+ImportDataset_company_1=Les tiers et leurs propriétés
+ImportDataset_company_2=Contacts/adresses et attributs supplémentaires de tiers
+ImportDataset_company_4=Représentants commerciaux tiers (affecter des représentants commerciaux/utilisateurs à des entreprises)
+PriceLevelLabels=Étiquettes de niveau de prix
 AddAddress=Ajoutez l'adresse
+SupplierCategory=Catégorie de fournisseur
+AllocateCommercial=Affecter aux représentants commerciaux
+UnallocateCommercial=Représentants commerciaux non affectés
+YouMustAssignUserMailFirst=Vous devez créer une adresse e-mail pour cet utilisateur avant de pouvoir ajouter une notification par e-mail.
 YouMustCreateContactFirst=Pour pouvoir ajouter des notifications par courrier électronique, vous devez d'abord définir des contacts avec des courriels valides pour le tiers
+ThirdPartiesArea=Tierces parties/Contacts
+LastModifiedThirdParties=Les derniers %s tiers modifiés
+LastModifiedContacts=Les derniers contacts modifiés %s
+UniqueThirdParties=Nombre total de tiers
 InActivity=Ouverte
 ThirdPartyIsClosed=Le tiers est fermé
+ProductsIntoElements=Liste des produits/services mappés sur %s
 OutstandingBillReached=Max. Pour la facture exceptionnelle atteinte
+MonkeyNumRefModelDesc=Renvoie un nombre au format %syymm-nnnn pour le code client et %syymm-nnnn pour le code fournisseur où yy est l'année, mm est le mois et nnnn est un nombre séquentiel à incrémentation automatique sans interruption et sans retour à 0.
+LeopardNumRefModelDesc=Code gratuit sans vérification.
+MergeOriginThirdparty=Tiers dupliqué (le tiers que vous souhaitez supprimer)
 MergeThirdparties=Fusionner des tiers
+ConfirmMergeThirdparties=Etes-vous sûr de vouloir fusionner le tiers choisi avec le tiers actuel ? Tous les objets liés (factures, commandes, ...) seront déplacés vers le tiers actuel, puis le tiers choisi sera supprimé.
+ThirdpartiesMergeSuccess=Des tiers ont fusionné
 SaleRepresentativeLogin=Connexion du représentant des ventes
 SaleRepresentativeFirstname=Prénom du représentant des ventes
 SaleRepresentativeLastname=Nom de représentant commercial
+ErrorThirdpartiesMerge=Une erreur s'est produite lors de la suppression des tiers. Veuillez vérifier le journal. Les modifications ont été annulées.
+NewCustomerSupplierCodeProposed=Code client ou fournisseur déjà utilisé, un nouveau code est proposé
+KeepEmptyIfGenericAddress=Laissez ce champ vide si cette adresse est une adresse générique
+PaymentTypeSupplier=Type de paiement - Fournisseur
+PaymentTermsSupplier=Conditions de paiement - Vendeur
+MulticurrencyUsed=Utiliser le multidevise
+InEEC=Europe (CEE)
+RestOfEurope=Reste de l'Europe (CEE)
+OutOfEurope=Hors Europe (CEE)
+CurrentOutstandingBillLate=Facture impayée en cours en retard
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Attention, en fonction des paramètres de prix de votre produit, vous devez modifier le tiers avant d'ajouter le produit au POS.
+TwoRecordsOfCompanyName=il existe plusieurs enregistrements pour cette entreprise, veuillez nous contacter pour compléter votre demande de partenariat
+CompanySection=Section Entreprise
+AADEWebserviceCredentials=Informations d'identification du service Web AADE
+ThirdPartyMustBeACustomerToCreateBANOnStripe=Le tiers doit être un client pour permettre la création de ses informations bancaires côté Stripe
+NewSocNameForClone=Nouveau nom de l'entreprise
+ConfirmCloneThirdparties=Êtes-vous sûr de vouloir cloner la société <b>%s</b> ?
+SocialNetworksBusiness=Réseaux sociaux pour entreprise
diff --git a/htdocs/langs/fr_CA/compta.lang b/htdocs/langs/fr_CA/compta.lang
index 49fc6305735..9c29aa07d6c 100644
--- a/htdocs/langs/fr_CA/compta.lang
+++ b/htdocs/langs/fr_CA/compta.lang
@@ -1,16 +1,40 @@
 # Dolibarr language file - Source file is en_US - compta
+RemainingAmountPayment=Montant restant à payer :
 Accountparent=Compte Parent
 Accountsparent=Comptes parents
+ReportInOut=Solde des revenus et des dépenses
+ReportTurnoverCollected=Chiffre d'affaires collecté
 AmountHTVATRealReceived=no tax. collectée
 AmountHTVATRealPaid=no tax. payé
+VATToPay=Ventes fiscales
+VATReceived=Impôt perçu
+VATToCollect=Achats fiscaux
+VATSummary=Impôt mensuel
+VATBalance=Solde fiscal
+VATPaid=Impôt payé
+LT1Summary=Résumé de la taxe 2
+LT2Summary=Résumé de la taxe 3
 LT1SummaryES=Balance RE (TVQ)
+LT1SummaryIN=Solde de la CGST
+LT2SummaryIN=Solde de la SGST
 LT1PaidES=RE (TVQ) Payé
+LT1PaidIN=CGST payée
+LT2PaidIN=SGST payée
+LT1Customer=Taxe 2 sur les ventes
+LT1Supplier=Taxe 2 achats
 LT1CustomerES=RE (TVQ) ventes
+LT1CustomerIN=Ventes CGST
+LT1SupplierIN=Achats CGST
+LT2Supplier=Taxe 3 achats
+LT2CustomerIN=Ventes SGST
+LT2SupplierIN=Achats SGST
 VATCollected=TPS/TVH récupérée
+VATExpensesArea=Espace pour tous les paiements de TVA
 SocialContribution=Charge sociale
 SocialContributions=Charges sociales
 SocialContributionsDeductibles=Taxes sociales ou fiscales déductibles
 SocialContributionsNondeductibles=Impôts sociaux ou fiscaux non déductibles
+DateOfSocialContribution=Date de l'impôt social ou fiscal
 LabelContrib=Contribution d'étiquette
 TypeContrib=Type de contribution
 MenuSocialContributions=Charges sociales
@@ -19,8 +43,10 @@ NewSocialContribution=Nouvelle charge sociale
 AddSocialContribution=Ajouter la taxe sociale / fiscale
 ContributionsToPay=Charges à payer
 AccountancyTreasuryArea=Espace comptable
+PaymentSupplierInvoice=paiement de facture fournisseur
 PaymentSocialContribution=Règlement charge sociale
 PaymentVat=Règlement TPS/TVH
+ListOfSupplierPayments=Liste des paiements des fournisseurs
 newLT2Payment=Nouveau paiement d'impôt 3
 LT1Payment=Paiement de l'impôt 2
 LT2Payment=Paiement d'impôt 3
@@ -31,27 +57,109 @@ LT1PaymentsES=Règlements RE (TVQ)
 VATPayment=Paiement d'impôt sur les ventes
 VATPayments=Paiements d'impôt sur les ventes
 VATRefund=Remboursement de la taxe de vente
+NewVATPayment=Nouveau paiement de la taxe de vente
+NewLocalTaxPayment=Nouveau paiement de la taxe %s
 Refund=Rembourser
 SocialContributionsPayments=Règlements charges sociales
 ShowVatPayment=Affiche paiement TPS/TVH
+BalanceVisibilityDependsOnSortAndFilters=Le solde n'est visible dans cette liste que si le tableau est trié sur %s et filtré sur 1 compte bancaire (sans autre filtre)
+CustomerAccountancyCodeGeneral=Code général de la comptabilité
+CustomerAccountancyCode=Code de comptabilité client
+SupplierAccountancyCodeGeneral=Code général de la comptabilité
+SupplierAccountancyCode=Code comptable du fournisseur
+UserAccountancyCodeGeneral=Code général de la comptabilité
 CustomerAccountancyCodeShort=Cust. Compte. code
 SupplierAccountancyCodeShort=Souper. Compte. code
+UserAccountancyCodeShort=Compte utilisateur. code
+TurnoverCollected=Chiffre d'affaires collecté
 ByExpenseIncome=Par dépenses et revenus
 CheckReceipt=Bordereaux de remises de chèques
 CheckReceiptShort=Bordereaux de remises de chèques
+LastCheckReceiptShort=Derniers bordereaux de dépôt %s
+LastPaymentForDepositShort=Derniers bordereaux de dépôt %s %s
+NewCheckDeposit=Nouveau bordereau de dépôt
 NoWaitingChecks=Aucun chèque en attente de dépôt.
+NoWaitingPaymentForDeposit=Aucun paiement %s en attente de dépôt.
+DateChequeReceived=Vérifier la date de réception
+DatePaymentReceived=Date de réception du document
+NbOfCheques=Nombre de chèques
 PaySocialContribution=Payer une charge sociale
+PaySalary=Payer une carte de salaire
+ConfirmPaySocialContribution=Etes-vous sûr de vouloir classer cette taxe sociale ou fiscale comme payée ?
+ConfirmPayVAT=Etes-vous sûr de vouloir classer cette déclaration de TVA comme payée ?
+ConfirmPaySalary=Etes-vous sûr de vouloir classer cette carte de salaire comme payée ?
 DeleteSocialContribution=Effacer charge sociale
+DeleteSalary=Supprimer une carte de salaire
+ConfirmDeleteSocialContribution=Etes-vous sûr de vouloir supprimer ce paiement de taxe sociale/fiscale ?
+ConfirmDeleteVAT=Etes-vous sûr de vouloir supprimer cette déclaration de TVA ?
+ConfirmDeleteSalary=Etes-vous sûr de vouloir supprimer ce salaire ?
+ConfirmDeleteVariousPayment=Etes-vous sûr de vouloir supprimer ce paiement divers ?
 ExportDataset_tax_1=Charges sociales et paiements
 CalcModeVATDebt=Mode <b>%sTPS/TVH sur débit%s</b>.
 CalcModeVATEngagement=Mode <b>%s TPS/TVH sur encaissement%s</b>.
+CalcModeBookkeeping=Analyse des données journalisées dans le tableau du grand livre de comptabilité.
+CalcModeNoBookKeeping=Même s'ils ne sont pas encore comptabilisés dans Ledger
+AnnualByCompanies=Solde des revenus et des dépenses, par groupes de comptes prédéfinis
+AnnualByCompaniesDueDebtMode=Solde des revenus et des dépenses, détail par groupes prédéfinis, mode <b>%sCréances-Dettes%s</b> dit <b>Comptabilité d'engagement</b>.
+AnnualByCompaniesInputOutputMode=Bilan des revenus et des dépenses, détail par groupes prédéfinis, mode <b>%sRevenus-Dépenses%s</b> dit <b>comptabilité de caisse</b>.
+SeeReportInInputOutputMode=Voir <b>%sl'analyse des paiements%s</b> pour un calcul basé sur les <b>paiements enregistrés</b> effectués même s'ils ne sont pas encore comptabilisés dans Ledger
+SeeReportInDueDebtMode=Voir <b>%sl'analyse des documents enregistrés%s</b> pour un calcul basé sur les <b>documents enregistrés</b> connus, même s'ils ne sont pas encore comptabilisés dans Ledger
+SeeReportInBookkeepingMode=Voir <b>%sanalyse du tableau du grand livre comptable%s</b> pour un rapport basé sur <b>le tableau du grand livre comptable</b>
+RulesResultDue=- Il comprend toutes les factures, les dépenses, la TVA, les dons, les salaires, qu'ils soient payés ou non.<br>- Il est basé sur la date de facturation des factures et sur la date d'échéance des dépenses ou des paiements d'impôts. Pour les salaires, c'est la date de fin de période qui est utilisée.
+RulesResultInOut=- Il comprend les paiements réels effectués sur les factures, les dépenses, la TVA et les salaires. <br>- Il est basé sur les dates de paiement des factures, des dépenses, de la TVA, des dons et des salaires.
+RulesCADue=- Il comprend les factures dues au client, qu'elles soient payées ou non. <br>- Il est basé sur la date de facturation de ces factures.<br>
+RulesCAIn=- Il comprend tous les paiements effectifs des factures reçues des clients.<br>- Il est basé sur la date de paiement de ces factures<br>
+RulesCATotalSaleJournal=Il comprend toutes les lignes de crédit du journal des ventes.
+RulesSalesTurnoverOfIncomeAccounts=Il comprend (crédit - débit) des lignes pour les comptes de produits du groupe INCOME
+RulesAmountOnInOutBookkeepingRecord=Il comprend l'enregistrement dans votre grand livre avec les comptes comptables qui ont le groupe « DÉPENSES » ou « REVENUS »
+RulesResultBookkeepingPredefined=Il comprend l'enregistrement dans votre grand livre avec les comptes comptables qui ont le groupe « DÉPENSES » ou « REVENUS »
+RulesResultBookkeepingPersonalized=Il affiche les enregistrements dans votre grand livre avec les comptes comptables <b>regroupés par groupes personnalisés</b>
+SeePageForSetup=Voir le menu <a href="%s">%s</a> pour la configuration
+DepositsAreNotIncluded=- Les factures d'acompte ne sont pas incluses
 DepositsAreIncluded=- Les factures de versement sont incluses
+LT1ReportByMonth=Rapport d'impôt 2 par mois
+LT2ReportByMonth=Rapport d'impôt 3 par mois
+LT1ReportByCustomers=Déclaration de taxe 2 par un tiers
+LT2ReportByCustomers=Déclaration de taxe 3 par un tiers
 LT1ReportByCustomersES=Rapport par tiers des RE (TVA)
+VATReport=Rapport sur la taxe de vente
+VATReportByPeriods=Rapport de taxe de vente par période
+VATReportByMonth=Rapport de taxe de vente par mois
+VATReportByRates=Rapport de taxe de vente par taux
+VATReportByThirdParties=Rapport de taxe de vente par un tiers
+VATReportByCustomers=Rapport de taxe de vente par client
+VATReportByQuartersInInputOutputMode=Rapport par taux de taxe de vente sur la taxe collectée et payée
+VATReportShowByRateDetails=Afficher les détails de ce tarif
+LT1ReportByQuarters=Déclarer la taxe 2 par taux
+LT2ReportByQuarters=Déclarer la taxe 3 par taux
 LT1ReportByQuartersES=Rapport par taux de RE (TVQ)
+SeeVATReportInInputOutputMode=Voir le rapport <b>%sCollecte de TVA%s</b> pour un calcul standard
+SeeVATReportInDueDebtMode=Voir le rapport <b>%sTVA sur débit%s</b> pour un calcul avec une option sur la facturation
+RulesVATInServices=- Pour les services, le rapport inclut la TVA des paiements effectivement perçus ou payés sur la base de la date de paiement.
+RulesVATInProducts=- Pour les biens matériels, le rapport inclut la TVA sur la base de la date de paiement.
+RulesVATDueServices=- Pour les services, le rapport inclut la TVA des factures échues, payées ou non, en fonction de la date de la facture.
+RulesVATDueProducts=- Pour les actifs matériels, le rapport inclut la TVA des factures échues, en fonction de la date de la facture.
+ThisIsAnEstimatedValue=Il s'agit d'un aperçu, basé sur des événements commerciaux et non sur le tableau final du grand livre. Les résultats finaux peuvent donc différer des valeurs de cet aperçu.
 WarningDepositsNotIncluded=Les factures de acompte ne sont pas incluses dans cette version avec ce module de comptabilité.
 DatePaymentTermCantBeLowerThanObjectDate=La date limite de règlement ne peut être inférieure à la date de l'object
 Pcg_version=Modèles de plan comptable
+ToCreateAPredefinedInvoice=Pour créer un modèle de facture, créez une facture standard, puis, sans la valider, cliquez sur le bouton « %s ».
 CalculationRuleDesc=Pour calculer le total de TPS/TVH, il existe 2 modes:<br>Le mode 1 consiste à arrondir la TPS/TVH de chaque ligne et à sommer cet arrondi.<br>Le mode 2 consiste à sommer la TPS/TVH de chaque ligne puis à l'arrondir.<br>Les résultats peuvent différer de quelques centimes. Le mode par défaut est le mode <b>%s</b>.
+CalculationRuleDescSupplier=Selon le fournisseur, choisissez la méthode appropriée pour appliquer la même règle de calcul et obtenir le même résultat attendu par votre fournisseur.
+TurnoverPerProductInCommitmentAccountingNotRelevant=Le rapport sur le chiffre d'affaires collecté par produit n'est pas disponible. Ce rapport n'est disponible que pour le chiffre d'affaires facturé.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Le rapport sur le chiffre d'affaires collecté par taux de taxe de vente n'est pas disponible. Ce rapport n'est disponible que pour le chiffre d'affaires facturé.
+AccountancyJournal=Journal des codes comptables
+ACCOUNTING_VAT_SOLD_ACCOUNT=Compte (issu du plan 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 de TVA)
+ACCOUNTING_VAT_BUY_ACCOUNT=Compte (issu du plan 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 de TVA)
+ACCOUNTING_VAT_PAY_ACCOUNT=Compte (issu du plan comptable) à utiliser comme compte par défaut pour le paiement de la TVA
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Compte (issu du plan comptable) à utiliser comme compte par défaut pour la TVA sur les achats pour les autoliquidations (crédit)
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Compte (issu du plan comptable) à utiliser comme compte par défaut pour la TVA sur les achats pour les frais inversés (débit)
+ACCOUNTING_ACCOUNT_CUSTOMER=Compte (issu du plan comptable) utilisé pour les tiers « clients »
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Le compte comptable dédié défini sur la fiche tierce sera utilisé uniquement pour la comptabilité auxiliaire. Celui-ci sera utilisé pour le grand livre général et comme valeur par défaut de la comptabilité auxiliaire si aucun compte comptable client dédié sur la fiche tierce n'est défini.
+ACCOUNTING_ACCOUNT_SUPPLIER=Compte (issu du plan comptable) utilisé pour les tiers « vendeurs »
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Le compte comptable dédié défini sur la fiche tierce sera utilisé uniquement pour la comptabilité auxiliaire. Celui-ci sera utilisé pour le grand livre général et comme valeur par défaut de la comptabilité auxiliaire si aucun compte comptable fournisseur dédié n'est défini sur une fiche tierce.
+ConfirmCloneTax=Confirmer le clone d'une taxe sociale/fiscale
+ConfirmCloneSalary=Confirmer le clone d'un salaire
 AddExtraReport=Rapports supplémentaires (ajouter un rapport client étranger et national)
 OtherCountriesCustomersReport=Rapport des clients étrangers
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Sur la base des deux premières lettres du numéro de TVA différentes du code de pays de votre entreprise
@@ -62,3 +170,30 @@ ImportDataset_tax_contrib=Charges sociales
 ErrorBankAccountNotFound=Erreur: compte bancaire introuvable
 FiscalPeriod=Période de comptabilité
 ListSocialContributionAssociatedProject=Liste des contributions sociales associées au projet
+AccountingAffectation=Mission de comptabilité
+LastDayTaxIsRelatedTo=Dernier jour de la période à laquelle la taxe est liée
+VATDue=Taxe de vente réclamée
+PaidDuringThisPeriodDesc=Il s'agit de la somme de tous les paiements liés aux déclarations de TVA dont la date de fin de période se situe dans la plage de dates sélectionnée.
+ByVatRate=Par taux de taxe de vente
+TurnoverbyVatrate=Chiffre d'affaires facturé par taux de taxe de vente
+TurnoverCollectedbyVatrate=Chiffre d'affaires collecté par taux de taxe de vente
+PurchasebyVatrate=Taux de taxe sur les achats par vente
+LabelToShow=Étiquette courte
+PurchaseTurnover=Chiffre d'affaires des achats
+PurchaseTurnoverCollected=Chiffre d'affaires achats encaissé
+RulesPurchaseTurnoverDue=- Il comprend les factures dues au fournisseur, qu'elles soient payées ou non. <br>- Il est basé sur la date de facturation de ces factures.<br>
+RulesPurchaseTurnoverIn=- Il comprend tous les paiements effectifs des factures faites aux fournisseurs.<br>- Il est basé sur la date de paiement de ces factures<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=Il comprend toutes les lignes de débit du journal des achats.
+RulesPurchaseTurnoverOfExpenseAccounts=Il comprend (débit - crédit) des lignes pour les comptes de produits du groupe DÉPENSES
+ReportPurchaseTurnover=Chiffre d'affaires achats facturés
+ReportPurchaseTurnoverCollected=Chiffre d'affaires achats encaissé
+IncludeVarpaysInResults =Inclure divers paiements dans les rapports
+InvoiceLate30Days =En retard (> 30 jours)
+InvoiceLate15Days =Tardif (15 à 30 jours)
+InvoiceNotLate =A récupérer (< 15 jours)
+InvoiceNotLate15Days =A récupérer (15 à 30 jours)
+InvoiceNotLate30Days =A récupérer (> 30 jours)
+InvoiceToPay=A payer (< 15 jours)
+InvoiceToPay15Days=A payer (15 à 30 jours)
+InvoiceToPay30Days=A payer (> 30 jours)
+ConfirmPreselectAccountQuestion=Etes-vous sûr de vouloir présélectionner les %s lignes sélectionnées avec ce code comptable ?
diff --git a/htdocs/langs/fr_CA/datapolicy.lang b/htdocs/langs/fr_CA/datapolicy.lang
index 0de226eccb9..657620ec25e 100644
--- a/htdocs/langs/fr_CA/datapolicy.lang
+++ b/htdocs/langs/fr_CA/datapolicy.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - datapolicy
 Module4100Desc =Module de gestion de la confidentialité des données (Conformité au RGPD)
-datapolicySetupPage =Selon les lois de votre pays (Exemple <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> du RGPD), les données personnelles doivent être conservées pendant une durée n'excédant pas la durée pendant laquelle les données sont nécessaires à la finalité pour laquelle elles ont été collectées, sauf à des fins d'archivage.<br>La suppression se fera automatiquement après une certaine durée sans événements (durée que vous aurez indiquée ci-dessous).
 NB_YEARS =%s années
 DATAPOLICY_ADHERENT =Membre
 SendAgreement =Envoyer des e-mails
diff --git a/htdocs/langs/fr_CA/errors.lang b/htdocs/langs/fr_CA/errors.lang
index 896a7ae1402..9d9f121adce 100644
--- a/htdocs/langs/fr_CA/errors.lang
+++ b/htdocs/langs/fr_CA/errors.lang
@@ -1,8 +1,14 @@
 # Dolibarr language file - Source file is en_US - errors
 NoErrorCommitIsDone=Aucune erreur, nous nous engageons
 ErrorButCommitIsDone=Erreurs trouvées, mais nous validons malgré cela
+ErrorBadEMail=L'adresse e-mail %s est incorrecte
+ErrorBadMXDomain=L'e-mail %s semble incorrect (le domaine n'a pas d'enregistrement MX valide)
+ErrorBadUrl=L'URL %s est incorrecte
 ErrorBadValueForParamNotAString=Valeur incorrecte pour votre paramètre. Il ajoute généralement lorsque la traduction est manquante.
+ErrorRefAlreadyExists=La référence <b>%s</b> utilisée pour la création existe déjà.
+ErrorTitleAlreadyExists=Le titre <b>%s</b> existe déjà.
 ErrorRecordNotFound=L'enregistrement n'a pas été trouvé.
+ErrorRecordNotFoundShort=Non trouvé
 ErrorFailToCopyFile=Impossible de copier le fichier '<b>%s</b>' en '<b>%s</b>'.
 ErrorFailToCopyDir=Impossible de copier le répertoire '<b>%s</b>' dans '<b>%s</b>'.
 ErrorFailToRenameFile=Impossible de renommer le fichier '<b>%s</b>' en '<b>%s</b>'.
@@ -16,18 +22,33 @@ ErrorFailToGenerateFile=Impossible de générer le fichier '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Ce contact est déjà défini comme un contact pour ce type.
 ErrorCashAccountAcceptsOnlyCashMoney=Ce compte bancaire est de type comptant, alors, il n'accepte que les paiements de type comptant.
 ErrorFromToAccountsMustDiffers=Le compte bancaire d'origine et celui de la cible doivent être différents.
+ErrorBadThirdPartyName=Mauvaise valeur pour le nom d'un tiers
+ForbiddenBySetupRules=Interdit par les règles d'installation
 ErrorBadCustomerCodeSyntax=Mauvaise syntaxe du code client
+ErrorBadBarCodeSyntax=Mauvaise syntaxe pour le code-barres. Vous avez peut-être défini un type de code-barres incorrect ou défini un masque de code-barres pour la numérotation qui ne correspond pas à la valeur numérisée.
 ErrorCustomerCodeRequired=Code client requis
+ErrorBarCodeRequired=Code à barres requis
+ErrorBarCodeAlreadyUsed=Code à barres déjà utilisé
 ErrorPrefixRequired=Préfixe requis
+ErrorBadSupplierCodeSyntax=Mauvaise syntaxe pour le code du fournisseur
+ErrorSupplierCodeRequired=Code fournisseur requis
 ErrorBadParameters=Mauvais paramètres
+ErrorWrongParameters=Paramètres erronés ou manquants
 ErrorBadValueForParameter=Valeur incorrecte '%s' pour le paramètre '%s'
 ErrorBadImageFormat=Le format de votre fichier image n'est pas supporté (Votre logiciel PHP ne supporte pas les fonctions de conversion d'images de ce format)
 ErrorBadDateFormat=La valeur '%s' a un mauvais format de date
 ErrorWrongDate=La date n'est pas correcte!
 ErrorFailedToWriteInDir=Erreur d'écriture dans le répertoire %s
 ErrorFoundBadEmailInFile=Trouver une syntaxe de courrier électronique incorrecte pour les lignes %s dans le fichier (ligne d'exemple %s avec email = %s)
+ErrorUserCannotBeDelete=L'utilisateur ne peut pas être supprimé. Il est peut-être associé à des entités Dolibarr.
+ErrorFieldsRequired=Certains champs obligatoires ont été laissés vides.
+ErrorSubjectIsRequired=L'objet du courriel est obligatoire
+ErrorInAddAttachmentsImageBaseOnMedia=Erreur lors de la création de fichiers image dans le répertoire multimédia pour la pièce jointe
+ErrorInAddAttachmentsImageBaseIsSrcData=Erreur lors de la création de fichiers image (trouvés en tant que données :) dans le répertoire temporaire pour la pièce jointe
 ErrorFailedToCreateDir=Impossible de créer un répertoire. Vérifiez que l'utilisateur du serveur Web a la permission d'écrire dans le répertoire de documents Dolibarr. Si le paramètre <b> safe_mode </ b> est activé sur ce PHP, vérifiez que les fichiers Dolibarr php appartiennent à l'utilisateur du serveur Web (ou au groupe).
 ErrorNoMailDefinedForThisUser=Aucun courrier défini pour cet utilisateur
+ErrorSetupOfEmailsNotComplete=La configuration des e-mails n'est pas terminée
+ErrorFeatureNeedJavascript=Cette fonctionnalité nécessite l'activation de JavaScript pour fonctionner. Modifiez-la dans la configuration - affichage.
 ErrorTopMenuMustHaveAParentWithId0=Un menu de type 'Top' ne peut pas contenir un menu parent. Mettez 0 dans le menu parent ou choisissez un menu de type 'Gauche'.
 ErrorLeftMenuMustHaveAParentId=Un menu de type 'Gauche' doit avoir un identifiant parent.
 ErrorFileNotFound=Le fichier <b>%s</b> n'a pas été trouvé (mauvais chemin, mauvaises autorisations ou accès refusé par PHP openbasedir ou paramètre safe_mode)
@@ -35,7 +56,9 @@ ErrorDirNotFound=Répertoire <b>%s</b>non trouvé (mauvais chemin, mauvaises aut
 ErrorFunctionNotAvailableInPHP=La fonction <b>%s</b> est requise pour cette fonctionnalité mais n'est pas disponible dans cette version / configuration de PHP.
 ErrorDirAlreadyExists=Un répertoire avec ce nom existe déjà.
 ErrorFileAlreadyExists=Un fichier avec ce nom existe déjà.
+ErrorDestinationAlreadyExists=Un autre fichier avec le nom <b>%s</b> existe déjà.
 ErrorPartialFile=Fichier non reçu complètement par le serveur.
+ErrorNoTmpDir=Le répertoire temporaire %s n'existe pas.
 ErrorUploadBlockedByAddon=Téléchargement bloqué par un plugin PHP / Apache.
 ErrorSizeTooLongForIntType=Taille trop longue pour le type int (%s maximum)
 ErrorSizeTooLongForVarcharType=Taille trop longue pour le type de chaîne (%s chars maximum)
@@ -43,31 +66,57 @@ ErrorNoValueForSelectType=Remplissez la valeur pour sélectionner la liste
 ErrorNoValueForCheckBoxType=Veuillez remplir la valeur pour la liste des cases à cocher
 ErrorNoValueForRadioType=Remplissez la valeur pour la liste radio
 ErrorBadFormatValueList=La valeur de la liste ne peut pas contenir plus d'une virgule: <u>%s</u>, mais nécessite au moins une: clé, valeur
+ErrorFieldCanNotContainSpecialCharacters=Le champ <b>%s</b> ne doit pas contenir de caractères spéciaux.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Le champ <b>%s</b> ne doit pas contenir de caractères spéciaux, ni de caractères majuscules, et doit commencer par un caractère alphabétique (a-z)
+ErrorFieldMustHaveXChar=Le champ <b>%s</b> doit contenir au moins %s caractères.
 ErrorExportDuplicateProfil=Ce nom de profil existe déjà pour ce jeu d'exportation.
 ErrorLDAPSetupNotComplete=La correspondance Dolibarr-LDAP n'est pas complète.
 ErrorLDAPMakeManualTest=Un fichier .ldif a été généré dans le répertoire %s. Essayez de le charger manuellement à partir de la ligne de commande pour avoir plus d'informations sur les erreurs.
+ErrorCantSaveADoneUserWithZeroPercentage=Impossible d'enregistrer une action avec le « statut non démarré » si le champ « effectué par » est également rempli.
+ErrorPleaseTypeBankTransactionReportName=Veuillez saisir le nom du relevé bancaire où l'écriture doit être reportée (format AAAAMM ou AAAAMMJJ)
+ErrorRecordHasChildren=Impossible de supprimer l'enregistrement car il contient des enregistrements enfants.
+ErrorRecordHasAtLeastOneChildOfType=L'objet %s possède au moins un enfant de type %s
+ErrorRecordIsUsedCantDelete=Impossible de supprimer l'enregistrement. Il est déjà utilisé ou inclus dans un autre objet.
+ErrorModuleRequireJavascript=JavaScript ne doit pas être désactivé pour que cette fonctionnalité soit opérationnelle. Pour activer/désactiver JavaScript, allez dans le menu Accueil->Configuration->Affichage.
 ErrorPasswordsMustMatch=Les deux mots de passe dactylographiés doivent correspondre les uns aux autres
+ErrorContactEMail=Une erreur technique s'est produite. Veuillez contacter l'administrateur à l'adresse e-mail suivante <b>%s</b> et fournir le code d'erreur <b>%s</b> dans votre message, ou ajouter une copie d'écran de cette page.
+ErrorWrongValueForField=Champ <b>%s</b>: '<b>%s</b>' ne correspond pas à la règle regex <b>%s</b>
+ErrorHtmlInjectionForField=Champ <b>%s</b> : La valeur « <b>%s</b> » contient des données malveillantes non autorisées
+ErrorFieldValueNotIn=Champ <b>%s</b>: '<b>%s</b>' n'est pas une valeur trouvée dans le champ <b>%s<span de <b>%s</b>
+ErrorFieldRefNotIn=Champ <b>%s</b>: '<b>%s</b>' n'est pas un <b>%s</b> référence existante
+ErrorMultipleRecordFoundFromRef=Plusieurs enregistrements trouvés lors de la recherche à partir de la référence <b>%s</b>. Aucun moyen de savoir quel identifiant utiliser.
+ErrorsOnXLines=%s erreurs trouvées
 ErrorFileIsInfectedWithAVirus=Le programme antivirus n'a pas pu valider le fichier (le fichier peut être infecté par un virus)
+ErrorFileIsAnInfectedPDFWithJSInside=Le fichier est un PDF infecté par du Javascript à l'intérieur
 ErrorNumRefModel=Une référence existe dans la base de données (%s) et n'est pas compatible avec cette règle de numérotation. Supprimez l'enregistrement ou la renommée référence pour activer ce module.
+ErrorQtyTooLowForThisSupplier=Quantité trop faible pour ce vendeur ou aucun prix défini sur ce produit pour ce vendeur
+ErrorModuleSetupNotComplete=L'installation du module %s semble incomplète. Allez sur Accueil - Installation - Modules pour terminer.
 ErrorBadMaskBadRazMonth=Erreur, mauvaise valeur de réinitialisation
 ErrorCounterMustHaveMoreThan3Digits=Le compteur doit avoir plus de 3 chiffres
+ErrorDeleteNotPossibleLineIsConsolidated=Suppression impossible car l'enregistrement est lié à une transaction bancaire qui est conciliée
 ErrorProdIdAlreadyExist=%s est affecté à un autre tiers
 ErrorFailedToLoadRSSFile=Impossible d'obtenir un flux RSS. Essayez d'ajouter constante MAIN_SIMPLEXMLLOAD_DEBUG si les messages d'erreur ne fournissent pas suffisamment d'informations.
 ErrorForbidden=Accès refusé. <br> Vous essayez d'accéder à une page, zone ou fonctionnalité d'un module désactivé ou sans être dans une session authentifiée ou non autorisée pour votre utilisateur.
 ErrorForbidden2=La permission de cette connexion peut être définie par votre administrateur Dolibarr à partir du menu %s-> %s.
 ErrorForbidden3=Il semble que Dolibarr ne soit pas utilisé par une session authentifiée. Consultez la documentation d'installation de Dolibarr pour savoir comment gérer les authentifications (htaccess, mod_auth ou autre ...).
+ErrorForbidden4=Remarque : effacez les cookies de votre navigateur pour détruire les sessions existantes pour cette connexion.
 ErrorNoImagickReadimage=Class Imagick n'est pas trouvé dans cette PHP. Aucun aperçu ne peut être disponible. Les administrateurs peuvent désactiver cet onglet dans le menu Configuration - Affichage.
 ErrorRecordAlreadyExists=L'enregistrement existe déjà
+ErrorLabelAlreadyExists=Cette étiquette existe déjà
 ErrorCantReadFile=Impossible de lire le fichier '%s'
 ErrorCantReadDir=Impossible de lire le répertoire '%s'
 ErrorBadLoginPassword=Mauvaise valeur pour la connexion ou le mot de passe
 ErrorLoginDisabled=Votre compte a été désactivé
+ErrorFailedToRunExternalCommand=Échec de l'exécution de la commande externe. Vérifiez qu'elle est disponible et exécutable par l'utilisateur de votre serveur PHP. Vérifiez également que la commande n'est pas protégée au niveau du shell par une couche de sécurité comme apparmor.
 ErrorFailedToChangePassword=Échec de la modification du mot de passe
 ErrorLoginDoesNotExists=L'utilisateur avec la connexion <b>%s</b> n'a pas été trouvé.
 ErrorLoginHasNoEmail=Cet utilisateur n'a pas d'adresse e-mail. Processus interrompu.
 ErrorBadValueForCode=Valeur incorrecte pour le code de sécurité. Réessayez avec une nouvelle valeur ...
 ErrorBothFieldCantBeNegative=Les champs %s et %s ne peuvent pas être à la fois négatifs
+ErrorFieldCantBeNegativeOnInvoice=Le champ <strong>%s</strong> ne peut pas être négatif sur ce type de facture. Si vous devez ajouter une ligne de remise, créez d'abord la remise (à partir du champ '%s' dans la carte tierce) et appliquez-la à la facture.
+ErrorLinesCantBeNegativeForOneVATRate=Le total des lignes (hors taxes) ne peut pas être négatif pour un taux de TVA non nul donné (total négatif trouvé pour le taux de TVA <b>%s</b>%%).
 ErrorQtyForCustomerInvoiceCantBeNegative=La quantité de ligne dans les factures des clients ne peut pas être négative
+ErrorQtyForSupplierInvoiceCantBeNegative=La quantité pour la ligne dans les factures des fournisseurs ne peut pas être négative
 ErrorWebServerUserHasNotPermission=Le compte d'utilisateur <b>%s</b> utilisé pour exécuter le serveur Web n'a aucune permission pour cela
 ErrorNoActivatedBarcode=Aucun type de code à barres activé
 ErrUnzipFails=Impossible de décompresser %s avec ZipArchive
@@ -79,7 +128,10 @@ ErrorFailedToAddToMailmanList=Impossible d'ajouter l'enregistrement %s à la lis
 ErrorFailedToRemoveToMailmanList=Impossible de supprimer l'enregistrement %s à la liste Mailman %s ou à la base SPIP
 ErrorNewValueCantMatchOldValue=Une nouvelle valeur ne peut pas être égale à l'ancienne
 ErrorFailedToValidatePasswordReset=Impossible de réinitialiser le mot de passe. Peut-être que le reinit était déjà fait (ce lien ne peut être utilisé qu'une seule fois). Sinon, essayez de redémarrer le processus de réinitialisation.
+ErrorToConnectToMysqlCheckInstance=La connexion à la base de données échoue. Vérifiez que le serveur de base de données est en cours d'exécution (par exemple, avec mysql/mariadb, vous pouvez le lancer depuis la ligne de commande avec « sudo service mysql start »).
 ErrorFailedToAddContact=Impossible d'ajouter un contact
+ErrorDateMustBeBeforeToday=La date doit être inférieure à aujourd'hui
+ErrorDateMustBeInFuture=La date doit être supérieure à aujourd'hui
 ErrorPaymentModeDefinedToWithoutSetup=Un mode de paiement a été configuré pour taper %s mais la configuration du module La facture n'a pas été complétée pour définir les informations à afficher pour ce mode de paiement.
 ErrorOpenIDSetupNotComplete=Vous configurez le fichier de configuration Dolibarr pour autoriser l'authentification OpenID, mais l'URL du service OpenID n'est pas définie en constante %s
 ErrorWarehouseMustDiffers=Les entrepôts source et cible doivent être différents
@@ -87,17 +139,21 @@ ErrorBadFormat=Mauvais format!
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erreur, ce membre n'est pas encore lié à un tiers. Associez le membre à un tiers existant ou créez un nouveau tiers avant de créer une souscription avec facture.
 ErrorThereIsSomeDeliveries=Une erreur, des livraisons sont liées à cette expédition. La suppression a été refusée.
 ErrorCantDeletePaymentReconciliated=Impossible de supprimer un paiement qui a généré une entrée bancaire qui a été réconciliée
+ErrorCantDeletePaymentSharedWithPayedInvoice=Impossible de supprimer un paiement partagé par au moins une facture avec le statut Payé
 ErrorPriceExpression1=Impossible d'assigner à la constante '%s'
 ErrorPriceExpression2=Impossible de redéfinir la fonction intégrée '%s'
 ErrorPriceExpression3=Variable non définie '%s' en définition de fonction
 ErrorPriceExpression5=Inattendue '%s'
 ErrorPriceExpression6=Mauvais nombre d'arguments (%s donné, %s prévu)
 ErrorPriceExpression8=Opérateur inattendu '%s'
+ErrorPriceExpression10=L'opérateur '%s' n'a pas d'opérande
 ErrorPriceExpression11=En attendant '%s'
 ErrorPriceExpression17=Variable non définie '%s'
 ErrorPriceExpression19=Expression non trouvée
 ErrorPriceExpression21=Résultat vide '%s'
+ErrorPriceExpression23=Variable inconnue ou non définie '%s' dans %s
 ErrorSrcAndTargetWarehouseMustDiffers=Les entrepôts source et cible doivent être différents
+ErrorTryToMakeMoveOnProductRequiringBatchData=Erreur, tentative de mouvement de stock sans informations de lot/série, sur le produit '%s' nécessitant des informations de lot/série
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Toutes les réceptions enregistrées doivent d'abord être vérifiées (approuvées ou refusées) avant d'être autorisées à effectuer cette action
 ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Toutes les réceptions enregistrées doivent d'abord être vérifiées (approuvées) avant d'être autorisées à effectuer cette action
 ErrorGlobalVariableUpdater0=La demande HTTP a échoué avec l'erreur '%s'
@@ -105,10 +161,15 @@ ErrorGlobalVariableUpdater3=Les données demandées n'ont pas été trouvées en
 ErrorGlobalVariableUpdater5=Aucune variable globale sélectionnée
 ErrorFieldMustBeANumeric=Le champ <b>%s</b> doit être une valeur numérique
 ErrorMandatoryParametersNotProvided=Paramètre (s) obligatoire (s) non fourni
+ErrorOppStatusRequiredIfUsage=Vous choisissez de suivre une opportunité dans ce projet, vous devez donc également renseigner le statut Lead.
+ErrorOppStatusRequiredIfAmount=Vous définissez un montant estimé pour ce lead. Vous devez donc également saisir son statut.
 ErrorFailedToLoadModuleDescriptorForXXX=Impossible de charger la classe descripteur du module pour %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Définition incorrecte de la matrice de menus dans le descripteur de module (mauvaise valeur pour la clé fk_menu)
+ErrorSavingChanges=Une erreur s'est produite lors de l'enregistrement des modifications
 ErrorWarehouseRequiredIntoShipmentLine=Un entrepôt est requis sur la ligne à expédier
 ErrorFileMustHaveFormat=Le fichier doit avoir un format %s
+ErrorFilenameCantStartWithDot=Le nom de fichier ne peut pas commencer par un « . »
+ErrorSupplierCountryIsNotDefined=Le pays de ce fournisseur n'est pas défini. Corrigez d'abord ce point.
 ErrorsThirdpartyMerge=Impossible de fusionner les deux enregistrements. Demande annulée.
 ErrorStockIsNotEnoughToAddProductOnOrder=Le stock n'est pas suffisant pour le produit %s pour l'ajouter à une nouvelle commande.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Le stock n'est pas suffisant pour le produit %s pour l'ajouter à une nouvelle facture.
@@ -124,16 +185,100 @@ ErrorPhpMailDelivery=Vérifiez que vous n'utilisez pas un nombre trop élevé de
 ErrorUserNotAssignedToTask=L'utilisateur doit être affecté à la tâche pour pouvoir saisir le temps consommé.
 ErrorTaskAlreadyAssigned=Tâche déjà attribuée à l'utilisateur
 ErrorModuleFileSeemsToHaveAWrongFormat=Le module module semble avoir un mauvais format.
+ErrorModuleFileSeemsToHaveAWrongFormat2=Au moins un répertoire obligatoire doit exister dans le zip du module : <strong>%s</strong> ou <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=Le nom de fichier du package de modules (<strong>%s</strong>) ne correspond pas à la syntaxe de nom attendue : <strong>%s</strong>
 ErrorDuplicateTrigger=Erreur, nom du trigger en double %s. Déjà chargé à partir de %s.
 ErrorNoWarehouseDefined=Erreur, aucun entrepôt n'a été défini.
 ErrorBadLinkSourceSetButBadValueForRef=Le lien que vous utilisez n'est pas valide. Une «source» de paiement est définie, mais la valeur pour «ref» n'est pas valide.
 ErrorTooManyErrorsProcessStopped=Trop d'erreurs. Le processus a été arrêté.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=La validation en masse n'est pas possible lorsque l'option d'augmentation/diminution du stock est définie sur cette action (vous devez valider un par un afin de pouvoir définir l'entrepôt à augmenter/diminuer)
+ErrorObjectMustHaveStatusDraftToBeValidated=L'objet %s doit avoir le statut « Brouillon » pour être validé.
+ErrorObjectMustHaveLinesToBeValidated=L'objet %s doit contenir des lignes pour être validé.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Seules les factures validées peuvent être envoyées via l'action de masse « Envoyer par email ».
+ErrorDiscountLargerThanRemainToPaySplitItBefore=La remise que vous essayez d'appliquer est supérieure au montant restant à payer. Divisez la remise en 2 remises plus petites au préalable.
+ErrorFileNotFoundWithSharedLink=Le fichier n'a pas été trouvé. Il se peut que la clé de partage ait été modifiée ou que le fichier ait été supprimé récemment.
+ErrorProductBarCodeAlreadyExists=Le code-barres du produit %s existe déjà sur une autre référence de produit.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Notez également que l'utilisation de kits pour augmenter/diminuer automatiquement les sous-produits n'est pas possible lorsqu'au moins un sous-produit (ou sous-produit de sous-produits) nécessite un numéro de série/lot.
+ErrorDescRequiredForFreeProductLines=La description est obligatoire pour les lignes avec produit gratuit
+ErrorAPageWithThisNameOrAliasAlreadyExists=La page/le conteneur <strong>%s</strong> a le même nom ou un alias alternatif que celui que vous essayez d'utiliser
+ErrorDuringChartLoad=Erreur lors du chargement du plan comptable. Si certains comptes n'ont pas été chargés, vous pouvez toujours les saisir manuellement.
+ErrorBadSyntaxForParamKeyForContent=Syntaxe incorrecte pour le paramètre keyforcontent. Doit avoir une valeur commençant par %s ou %s
+ErrorVariableKeyForContentMustBeSet=Erreur, la constante avec le nom %s (avec le contenu texte à afficher) ou %s (avec l'URL externe à afficher) doit être définie.
+ErrorHostMustNotStartWithHttp=Le nom d'hôte %s NE DOIT PAS commencer par http:// ou https://
+ErrorSearchCriteriaTooSmall=Critères de recherche trop courts.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Les objets doivent avoir le statut « Actif » pour être désactivés
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Les objets doivent avoir le statut « Brouillon » ou « Désactivé » pour être activés
+ErrorNoFieldWithAttributeShowoncombobox=Aucun champ n'a la propriété « showoncombobox » dans la définition de l'objet « %s ». Il n'y a aucun moyen d'afficher la liste déroulante.
+ProblemIsInSetupOfTerminal=Le problème réside dans la configuration du terminal %s.
+ErrorAddAtLeastOneLineFirst=Ajoutez au moins une ligne en premier
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Erreur, l'enregistrement est déjà transféré en comptabilité, la suppression n'est pas possible.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Erreur, la langue est obligatoire si vous définissez la page comme traduction d'une autre.
+ErrorBatchNoFoundForProductInWarehouse=Aucun lot/série trouvé pour le produit « %s » dans l'entrepôt « %s ».
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Quantité insuffisante pour ce lot/série pour le produit « %s » dans l'entrepôt « %s ».
+ErrorOnlyOneFieldForGroupByIsPossible=Un seul champ pour « Grouper par » est possible (les autres sont ignorés)
+ErrorTooManyDifferentValueForSelectedGroupBy=Nous avons trouvé trop de valeurs différentes (plus de <b>%s</b>) pour le champ « <b>%s</b> », nous ne pouvons donc pas l'utiliser comme « Grouper par » pour les graphiques. Le champ « Grouper par » a été supprimé. Peut-être vouliez-vous l'utiliser comme axe X ?
+ErrorProductNeedBatchNumber=Erreur, le produit '<b>%s</b>' nécessite un numéro de lot/série
+ErrorProductDoesNotNeedBatchNumber=Erreur, le produit '<b>%s</b>' n'accepte pas de numéro de lot/série
+ErrorFailedToReadObject=Erreur, échec de lecture de l'objet de type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Erreur, le paramètre <b>%s</b> doit être activé dans <b>conf/conf.php</b> pour permettre l'utilisation de l'interface de ligne de commande par le planificateur de tâches interne
+ErrorLoginDateValidity=Erreur, cette connexion est en dehors de la plage de dates de validité
+ErrorValueLength=La longueur du champ « <b>%s</b> » doit être supérieure à « <b>%s</b> »
+ErrorReservedKeyword=Le mot '<b>%s</b>' est un mot clé réservé
+ErrorFilenameReserved=Le nom de fichier <b>%s</b> ne peut pas être utilisé car il s'agit d'une commande réservée et protégée.
+ErrorNotAvailableWithThisDistribution=Non disponible avec cette distribution
+ErrorPublicInterfaceNotEnabled=L'interface publique n'a pas été activée
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=La langue de la nouvelle page doit être définie si elle est définie comme une traduction d'une autre page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=La langue de la nouvelle page ne doit pas être la langue source si elle est définie comme une traduction d'une autre page
+ErrorDateIsInFuture=Erreur, la date ne peut pas être dans le futur
+ErrorAPercentIsRequired=Erreur, veuillez remplir correctement le pourcentage
+ErrorYouMustFirstSetupYourChartOfAccount=Vous devez d'abord configurer votre plan comptable
+ErrorFailedToFindEmailTemplate=Impossible de trouver le modèle avec le nom de code %s
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Durée non définie sur le service. Aucun moyen de calculer le prix horaire.
+CheckVersionFail=Échec de la vérification de la version
+ErrorNotInDictionaryPaymentConditions=Ne figure pas dans le dictionnaire des conditions de paiement, veuillez modifier.
+ErrorIsNotADraft=%s n'est pas un brouillon
+ErrorExecIdFailed=Impossible d'exécuter la commande « id »
+ErrorRequestTooLarge=Erreur, demande trop importante ou session expirée
+ErrorPaymentInBothCurrency=Erreur, tous les montants doivent être saisis dans la même colonne
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Vous essayez de payer des factures dans la devise %s à partir d'un compte avec la devise %s
+ErrorInvoiceLoadThirdParty=Impossible de charger un objet tiers pour la facture « %s »
+ErrorInvoiceLoadThirdPartyKey=Clé tierce « %s » non définie pour la facture « %s »
+ErrorDeleteLineNotAllowedByObjectStatus=La suppression de la ligne n'est pas autorisée par l'état actuel de l'objet
+ErrorAjaxRequestFailed=La demande a échoué
+ErrorThirpdartyOrMemberidIsMandatory=Un tiers ou un membre du partenariat est obligatoire
+ErrorFailedToWriteInTempDirectory=Échec de l'écriture dans le répertoire temporaire
+ErrorFailedToLoadThirdParty=Impossible de trouver/charger un tiers à partir de l'ID = %s, de l'e-mail = %s, du nom = %s
+ErrorStripeCustomerNotFoundCreateFirst=Le client Stripe n'est pas défini pour ce tiers (ou défini sur une valeur supprimée côté Stripe). Créez-le (ou rattachez-le) d'abord.
+ErrorCharPlusNotSupportedByImapForSearch=La recherche IMAP ne peut pas rechercher dans l'expéditeur ou le destinataire une chaîne contenant le caractère +
+ErrorTableNotFound=Tableau <b>%s</b> non trouvé
+ErrorRefNotFound=Réf <b>%s</b> non trouvée
+ErrorValueCantBeNull=La valeur de <b>%s</b> ne peut pas être nulle
+ErrorDateOfMovementLowerThanDateOfFileTransmission=La date de la transaction bancaire ne peut pas être inférieure à la date de transmission du fichier
+ErrorExistingPermission =L'autorisation <b>%s</b> pour l'objet <b>%s</b> existe déjà
+ErrorFieldExist=La valeur de <b>%s</b> existe déjà
+ErrorEqualModule=Module non valide dans <b>%s</b>
+ErrorCoherenceMenu=<b>%s</b> est requis lorsque <b>%s</b> est « gauche »
+ErrorUploadFileDragDropPermissionDenied=Une erreur s'est produite lors du téléchargement du ou des fichiers : autorisation refusée
+ErrorFixThisHere=<a href="%s">Réparez ceci ici</a>
+ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Erreur : l'URL de votre instance actuelle (%s) ne correspond pas à l'URL définie dans votre configuration de connexion OAuth2 (%s). La connexion OAuth2 dans une telle configuration n'est pas autorisée.
+ErrorSVGFilesNotAllowedAsLinksWithout=Les fichiers SVG ne sont pas autorisés comme liens externes sans l'option %s
+ErrorTypeMenu=Impossible d'ajouter un autre menu pour le même module sur la barre de navigation, pas encore géré
+ErrorGeneratingBarcode=Erreur lors de la génération du code-barres (forme de code probablement invalide)
+ErrorObjectNotFound =L'objet <b>%s</b> n'est pas trouvé, veuillez vérifier votre URL
+ErrorCountryCodeMustBe2Char=Le code du pays doit être une chaîne de 2 caractères
+ErrorTableExist=La table <b>%s</b> existe déjà
+ErrorDictionaryNotFound=Dictionnaire <b>%s</b> non trouvé
+ErrorCheckTheCommandInsideTheAdvancedOptions=Vérifiez la commande utilisée pour l'exportation dans les options avancées de l'exportation
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Erreur, la création d'un paiement divers sur un compte bancaire avec une devise différente de la devise de l'entreprise n'est pas encore prise en charge.
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Votre paramètre PHP upload_max_filesize (%s) est supérieur au paramètre PHP post_max_size (%s). Ce n'est pas une configuration cohérente.
 WarningPasswordSetWithNoAccount=Un mot de passe a été défini pour ce membre. Cependant, aucun compte utilisateur n'a été créé. Donc, ce mot de passe est stocké mais ne peut pas être utilisé pour vous connecter à Dolibarr. Il peut être utilisé par un module / interface externe, mais si vous n'avez pas besoin de définir un login ou un mot de passe pour un membre, vous pouvez désactiver l'option "Gérer une connexion pour chaque membre" de la configuration du module Membre. Si vous devez gérer une connexion mais n'avez pas besoin de mot de passe, vous pouvez garder ce champ vide pour éviter cet avertissement. Remarque: Le courrier électronique peut également être utilisé en tant que connexion si le membre est lié à un utilisateur.
 WarningSafeModeOnCheckExecDir=Avertissement, l'option PHP <b> safe_mode </ b> est activée, la commande doit être stockée dans un répertoire déclaré par le paramètre php <b> safe_mode_exec_dir </ b>.
 WarningBookmarkAlreadyExists=Un marque-page avec ce titre ou cette cible (URL) existe déjà.
 WarningPassIsEmpty=Attention, le mot de passe de la base de données est vide. C'est un trou de sécurité. Vous devez ajouter un mot de passe à votre base de données et modifier votre fichier conf.php pour refléter cela.
 WarningConfFileMustBeReadOnly=Avertissement, votre fichier de configuration (<b> htdocs / conf / conf.php </ b>) peut être écrasé par le serveur Web. C'est un trou de sécurité sérieux. Modifiez les autorisations sur le fichier pour être en mode lecture seule pour l'utilisateur du système d'exploitation utilisé par le serveur Web. Si vous utilisez le format Windows et FAT pour votre disque, vous devez savoir que ce système de fichiers ne permet pas d'ajouter des autorisations au fichier, donc ne peut pas être complètement sécurisé.
 WarningsOnXLines=Avertissements sur <b>%s</b> enregistrement source (s)
+WarningNoDocumentModelActivated=Aucun modèle n'a été activé pour la génération de documents. Un modèle sera choisi par défaut jusqu'à ce que vous vérifiiez la configuration de votre module.
+WarningLockFileDoesNotExists=Attention, une fois l'installation terminée, vous devez désactiver les outils d'installation/migration en ajoutant un fichier <b>install.lock</b> dans le répertoire <b>%s</b>. L'omission de la création de ce fichier constitue un risque grave pour la sécurité.
 WarningCloseAlways=Avertissement, la fermeture se fait même si le montant diffère entre les éléments source et cible. Activez cette fonctionnalité avec prudence.
 WarningUsingThisBoxSlowDown=Avertissement, l'utilisation de cette boîte ralentit sérieusement toutes les pages montrant la boîte.
 WarningClickToDialUserSetupNotComplete=L'installation des informations ClickToDial pour votre utilisateur n'est pas complète (voir l'onglet ClickToDial sur votre carte utilisateur).
@@ -143,3 +288,47 @@ WarningTooManyDataPleaseUseMoreFilters=Trop de données (plus de %s lignes). Uti
 WarningSomeLinesWithNullHourlyRate=Quelques fois ont été enregistrés par certains utilisateurs alors que leur taux horaire n'était pas défini. Une valeur de 0 %s par heure a été utilisée, mais cela peut entraîner une mauvaise évaluation du temps passé.
 WarningYourLoginWasModifiedPleaseLogin=Votre connexion a été modifiée. Pour des raisons de sécurité, vous devrez vous connecter avec votre nouvelle connexion avant l'action suivante.
 WarningAnEntryAlreadyExistForTransKey=Une entrée existe déjà pour la clé de traduction pour cette langue
+WarningNumberOfRecipientIsRestrictedInMassAction=Attention, le nombre de destinataires différents est limité à <b>%s</b> lors de l'utilisation des actions de masse sur les listes
+WarningProjectDraft=Le projet est encore en mode brouillon. N'oubliez pas de le valider si vous prévoyez d'utiliser des tâches.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Certaines transactions bancaires ont été supprimées après la génération du reçu les incluant. Le nombre de chèques et le total du reçu peuvent donc différer du nombre et du total figurant dans la liste.
+WarningFailedToAddFileIntoDatabaseIndex=Avertissement, échec de l'ajout d'une entrée de fichier dans la table d'index de la base de données ECM
+WarningTheHiddenOptionIsOn=Attention, l'option cachée <b>%s</b> est activée.
+WarningCreateSubAccounts=Attention, vous ne pouvez pas créer directement un sous compte, vous devez créer un tiers ou un utilisateur et lui attribuer un code comptable pour le retrouver dans cette liste
+WarningAvailableOnlyForHTTPSServers=Disponible uniquement si vous utilisez une connexion sécurisée HTTPS.
+WarningModuleXDisabledSoYouMayMissEventHere=Le module %s n'a pas été activé. Vous risquez donc de manquer de nombreux événements ici.
+WarningPaypalPaymentNotCompatibleWithStrict=La valeur « Strict » empêche les fonctionnalités de paiement en ligne de fonctionner correctement. Utilisez plutôt « Lax ».
+WarningThemeForcedTo=Attention, le thème a été forcé à <b>%s</b> par la constante cachée MAIN_FORCETHEME
+WarningPagesWillBeDeleted=Attention, cela supprimera également toutes les pages/conteneurs existants du site. Vous devez exporter votre site Web au préalable, afin d'avoir une sauvegarde pour le réimporter plus tard.
+WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=La validation automatique est désactivée lorsque l'option de diminution du stock est définie sur « Validation de la facture ».
+WarningModuleNeedRefresh =Le module <b>%s</b> a été désactivé. N'oubliez pas de l'activer
+WarningCorrectedInvoiceNotFound=Facture corrigée non trouvée
+WarningCommentNotFound=Avertissement : impossible de trouver les commentaires de début et/ou de fin de la section <b>%s</b> dans le fichier <b>%s</b>
+WarningAlreadyReverse=Le mouvement des stocks est déjà inversé
+WarningParentIDDoesNotExistAnymore=Cet identifiant parent n'existe plus
+WarningReadBankAlsoAllowedIfUserHasPermission=Attention, la lecture du compte bancaire est également autorisée avec l'autorisation de Gérer le plan comptable
+WarningNoDataTransferedInAccountancyYet=Attention, il n'y a pas de données dans le tableau comptable. Veuillez transférer vos données enregistrées dans l'application vers la section comptabilité ou modifier le mode de calcul pour analyser les données enregistrées en dehors de la comptabilité.
+WarningChangingThisMayBreakStopTaskScheduler=Attention, la modification de cette valeur peut désactiver le planificateur
+WarningAmountOfFileDiffersFromSumOfLines=Attention, la quantité de fichier (%s) diffère de la somme des lignes (%s)
+WarningModuleAffiliatedToAReportedCompany=Attention, ce module a été signalé à la fondation Dolibarr comme étant édité par une société utilisant des pratiques illégales (non-respect des règles d'utilisation de la marque Dolibarr, collecte de vos données sans votre consentement ou déploiement de malware).
+WarningModuleAffiliatedToAPiratPlatform=Soyez prudent lorsque vous obtenez un module (payant ou gratuit) à partir d'une plateforme non officielle suspecte comme %s
+SwissQrOnlyVIR =La facture SwissQR ne peut être ajoutée que sur les factures configurées pour être payées par virement bancaire.
+SwissQrPaymentInformationInvalid =Les informations de paiement n'étaient pas valides pour le total %s : %s
+SwissQrDebitorAddressInvalid =Les informations du débiteur n'étaient pas valides (%s)
+RequireAtLeastXString =Nécessite au moins %s caractère(s)
+RequireXStringMax =Nécessite %s caractère(s) maximum
+RequireAtLeastXDigits =Nécessite au moins %s chiffre(s)
+RequireXDigitsMax =Nécessite %s chiffre(s) max.
+RequireValidEmail =L'adresse e-mail n'est pas valide
+RequireValidUrl =Exiger une URL valide
+RequireValidDate =Exiger une date valide
+RequireValidDuration =Exiger une durée valide
+RequireValidExistingElement =Exiger une valeur existante
+RequireValidBool =Nécessite un booléen valide
+BadSetupOfField =Erreur de mauvaise configuration du champ
+BadSetupOfFieldClassNotFoundForValidation =Erreur de mauvaise configuration du champ : Classe non trouvée pour la validation
+BadSetupOfFieldFileNotFound =Erreur de mauvaise configuration du champ : Fichier non trouvé pour inclusion
+BadSetupOfFieldFetchNotCallable =Erreur de mauvaise configuration du champ : Fetch non appelable sur la classe
+FailedToFoundTheConversionRateForInvoice=Impossible de trouver le taux de conversion pour la facture
+ThisIdNotDefined=Id non défini
+OperNotDefined=Mode de paiement non défini
+EmptyMessageNotAllowedError=Un message vide n'est pas autorisé
diff --git a/htdocs/langs/fr_CA/eventorganization.lang b/htdocs/langs/fr_CA/eventorganization.lang
new file mode 100644
index 00000000000..c813ea6b894
--- /dev/null
+++ b/htdocs/langs/fr_CA/eventorganization.lang
@@ -0,0 +1,72 @@
+# Dolibarr language file - Source file is en_US - eventorganization
+EventOrganizationDescription =Organisation d'événements par le biais de projets modulaires
+EventOrganizationDescriptionLong=Gérer l'organisation d'un événement (salon, conférences, participants ou intervenants, avec des pages publiques de suggestion, de vote ou d'inscription)
+EventFee=Frais d'inscription à l'événement
+EventOrganizationSetup=Mise en place de l'organisation de l'événement
+EventOrganizationSetupPage =Page de configuration de l'organisation de l'événement
+EVENTORGANIZATION_TASK_LABELTooltip =Lorsque vous validez un événement à organiser, certaines tâches peuvent être automatiquement créées dans le projet<br><br>Par exemple : <br>Envoyer un appel pour les conférences<br>Envoyer un appel pour les stands<br>Valider les suggestions de conférences<br>Valider la candidature pour les stands<br>Ouvrir les inscriptions à l'événement pour participants<br>Envoyer un rappel de l'événement aux intervenants<br>Envoyer un rappel de l'événement aux hébergeurs de stands<br>Envoyer un rappel de l'événement aux participants
+EVENTORGANIZATION_TASK_LABELTooltip2=Laissez ce champ vide si vous n'avez pas besoin de créer des tâches automatiquement.
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF =Catégorie à ajouter aux tiers créée automatiquement lorsque quelqu'un suggère une conférence
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH =Catégorie à ajouter aux tiers créée automatiquement lorsqu'ils proposent un stand
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF =Modèle d'email à envoyer après avoir reçu une suggestion de conférence.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH =Modèle d'email à envoyer après avoir reçu une suggestion de stand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH =Modèle d'email à envoyer après le paiement d'une inscription à un stand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT =Modèle d'email à envoyer après le paiement d'une inscription à un événement.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER =Modèle d'e-mail à utiliser lors de l'envoi d'e-mails depuis l'action de masse « Envoyer des e-mails » aux intervenants
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES =Modèle d'e-mail à utiliser lors de l'envoi d'e-mails à partir de l'action de masse « Envoyer des e-mails » sur la liste des participants
+EVENTORGANIZATION_FILTERATTENDEES_CAT =Dans le formulaire de création/ajout d'un participant, limite la liste des tiers aux tiers de la catégorie
+EVENTORGANIZATION_FILTERATTENDEES_TYPE =Dans le formulaire de création/ajout d'un participant, limite la liste des tiers aux tiers de nature
+ManageOrganizeEvent =Gérer l'organisation d'un événement
+ConferenceOrBoothAttendee =Participant à une conférence ou à un stand
+YourOrganizationEventConfRequestWasReceived =Votre demande de conférence a été reçue
+YourOrganizationEventBoothRequestWasReceived =Votre demande de stand a été reçue
+EventOrganizationEmailBoothPayment =Paiement de votre stand
+EventOrganizationMassEmailSpeakers =Communication aux intervenants
+ToSpeakers=Aux intervenants
+AllowUnknownPeopleSuggestConf=Permettre aux gens de suggérer des conférences
+AllowUnknownPeopleSuggestConfHelp=Permettre à des personnes inconnues de suggérer une conférence à laquelle elles souhaitent participer
+AllowUnknownPeopleSuggestBooth=Permettre aux gens de postuler pour un stand
+AllowUnknownPeopleSuggestBoothHelp=Autoriser les personnes inconnues à postuler pour un stand
+PriceOfRegistrationHelp=Prix à payer pour s'inscrire ou participer à l'événement
+PriceOfBooth=Prix de l'abonnement pour tenir un stand
+PriceOfBoothHelp=Prix de l'abonnement pour tenir un stand
+ConferenceOrBoothInformation=Informations sur la conférence ou le stand
+ConferenceOrBoothFormat=Mode conférence ou stand
+ConferenceOrBoothFormatID=ID du mode conférence ou stand
+ConferenceOrBoothFormatCode=Code du mode conférence ou stand
+ConferenceOrBoothFormatLabel=Étiquette du mode conférence ou stand
+ListOfAttendeesOfEvent=Liste des participants aux projets événementiels
+ListOfConfOrBoothOfEvent=Liste des conférences ou stands des projets événementiels
+EVENTORGANIZATION_SECUREKEY =Graine pour sécuriser la clé de la page d'inscription publique pour proposer une conférence
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION =Service utilisé pour la ligne de facture concernant l'inscription d'un participant à un événement
+EvntOrgRegistrationConfHelpMessage =Ici, vous pouvez proposer une nouvelle conférence à animer pendant l'événement.
+EvntOrgRegistrationBoothHelpMessage =Ici, vous pouvez demander à avoir un stand pendant l'événement.
+ListOfSuggestedConferences =Liste des conférences proposées
+ViewAndVote =Consultez et votez pour les événements suggérés
+PublicAttendeeSubscriptionPage =Lien public pour l'inscription à cet événement uniquement
+ConferenceAttendeeFee =Frais de participation à la conférence pour l'événement : '%s' survenant du %s au %s.
+BoothLocationFee =Emplacement du stand pour l'événement : '%s' se déroulant de %s à %s
+LabelOfBooth=Étiquette du stand
+LabelOfconference=Étiquette de conférence
+ConferenceIsNotConfirmed=Inscription non disponible, la conférence n'est pas encore confirmée
+EventRegistrationAreClosed=Les inscriptions à l'événement sont fermées
+OrganizationEventBoothRequestWasReceived=Votre demande de stand a été reçue
+OrganizationEventPaymentOfBoothWasReceived=Votre paiement pour votre stand a bien été enregistré
+OrganizationEventPaymentOfRegistrationWasReceived=Votre paiement pour votre inscription à l'événement a été enregistré
+OrganizationEventBulkMailToAttendees=Ceci est un rappel de votre participation à l'événement en tant que participant
+OrganizationEventBulkMailToSpeakers=Ceci est un rappel sur votre participation à l'événement en tant qu'intervenant
+OrganizationEventLinkToThirdParty=Lien vers un tiers (client, fournisseur ou partenaire)
+NewSuggestionOfBooth=Demande de stand
+NewSuggestionOfConference=Demande d'organisation d'une conférence
+EvntOrgRegistrationConfWelcomeMessage =Bienvenue sur la page de suggestion de conférences.
+SubscriptionOk=Votre inscription a bien été enregistrée
+PaymentConferenceAttendee =Paiement des participants à la conférence
+DeleteConferenceOrBoothAttendee=Supprimer un participant
+RegistrationAndPaymentWereAlreadyRecorder=Une inscription et un paiement ont déjà été enregistrés pour l'email <b>%s</b>
+EmailAttendee=Courriel du participant
+EmailCompany=Courriel de l'entreprise
+EmailCompanyForInvoice=E-mail de l'entreprise (pour la facture, si différent de l'e-mail du participant)
+ErrorSeveralCompaniesWithEmailContactUs=Plusieurs entreprises ont été identifiées avec cet email, nous ne pouvons donc pas valider automatiquement votre inscription. Veuillez nous contacter à %s pour une validation manuelle
+ErrorSeveralCompaniesWithNameContactUs=Plusieurs entreprises portant ce nom ont été trouvées, nous ne pouvons donc pas valider automatiquement votre inscription. Veuillez nous contacter à l'adresse %s pour une validation manuelle
+ConfirmModifyStatusQuestion=Êtes-vous sûr de vouloir modifier les %s enregistrements sélectionnés ?
+RecordsUpdated=%s Enregistrements mis à jour
diff --git a/htdocs/langs/fr_CA/exports.lang b/htdocs/langs/fr_CA/exports.lang
index 20f0ce19258..290fafbac5e 100644
--- a/htdocs/langs/fr_CA/exports.lang
+++ b/htdocs/langs/fr_CA/exports.lang
@@ -1,29 +1,54 @@
 # Dolibarr language file - Source file is en_US - exports
+ImportArea=Importer
+NewExport=Nouvelle exportation
+NewImport=Nouvelle importation
 ImportableDatas=Ensemble de données Importable
 SelectExportDataSet=Choisissez l'ensemble de données que vous souhaitez exporter ...
 SelectImportDataSet=Choisissez l'ensemble de données que vous souhaitez importer ...
+SelectExportFields=Choisissez les champs que vous souhaitez exporter ou sélectionnez un profil d'exportation prédéfini
+SelectImportFields=Choisissez les champs du fichier source que vous souhaitez importer et leur champ cible dans la base de données en les déplaçant de haut en bas avec l'ancre %s, ou sélectionnez un profil d'importation prédéfini :
 NotImportedFields=Les champs du fichier source ne sont pas importés
+SaveExportModel=Enregistrez vos sélections sous forme de profil/modèle d’exportation (pour réutilisation).
+SaveImportModel=Enregistrer ce profil d'importation (pour réutilisation) ...
 ExportModelName=Exporter le nom du profil
+ExportModelSaved=Profil d'exportation enregistré sous <b>%s</b>.
 ExportableFields=Champs d'exportation
 ExportedFields=Champs exportés
 ImportModelName=Nom du profil d'importation
+ImportModelSaved=Profil d'importation enregistré sous <b>%s</b>.
+ImportProfile=Importer un profil
 DatasetToExport=Ensemble de données à exporter
 DatasetToImport=Importer un fichier dans l'ensemble de données
 ChooseFieldsOrdersAndTitle=Choisissez les champs d'ordre ...
 FieldsTitle=Titre des champs
 FieldTitle=Titre du champ
+NowClickToGenerateToBuildExportFile=Maintenant, sélectionnez le format de fichier dans la zone de liste déroulante et cliquez sur « Générer » pour créer le fichier d'exportation...
+FormatedImport=Assistant d'importation
+FormatedImportDesc1=Ce module vous permet de mettre à jour des données existantes ou d'ajouter de nouveaux objets dans la base de données à partir d'un fichier sans connaissances techniques, à l'aide d'un assistant.
+FormatedImportDesc2=La première étape consiste à choisir le type de données que vous souhaitez importer, puis le format du fichier source, puis les champs que vous souhaitez importer.
+FormatedExport=Assistant Export
+FormatedExportDesc1=Ces outils permettent l'exportation de données personnalisées à l'aide d'un assistant, pour vous aider dans la démarche sans nécessiter de connaissances techniques.
+FormatedExportDesc2=La première étape consiste à choisir un ensemble de données prédéfini, puis les champs que vous souhaitez exporter et dans quel ordre.
+FormatedExportDesc3=Lorsque les données à exporter sont sélectionnées, vous pouvez choisir le format du fichier de sortie.
 Sheet=Drap
 NoImportableData=Aucune donnée importable (aucun module avec des définitions permettant d'importer des données)
+SQLUsedForExport=Requête SQL utilisée pour extraire des données
 LineLabel=Étiquette de ligne
 LineDescription=Description de la ligne
 LineUnitPrice=Prix ​​unitaire de la ligne
+LineLT1Rate=Taux de taxe 2 pour la ligne
+LineLT2Rate=Taux de taxe 3 pour la ligne
+LineLT1Type=Taxe 2 type pour la ligne
+LineLT2Type=Taxe 3 type pour ligne
 LineQty=Quantité pour ligne
+LineTotalHT=Montant hors taxes pour la ligne
 LineTotalTTC=Montant avec taxe pour ligne
 LineTotalVAT=Montant de la TVA pour ligne
 TypeOfLineServiceOrProduct=Type de ligne (0 = produit, 1 = service)
 FileWithDataToImport=Fichier avec données à importer
+FileMustHaveOneOfFollowingFormat=Le fichier à importer doit avoir l'un des formats suivants
+ChooseFormatOfFileToImport=Choisissez le format de fichier à utiliser comme format de fichier d'importation en cliquant sur l'icône %s pour le sélectionner...
 SourceFileFormat=Format de fichier source
-FieldsInTargetDatabase=Champs cibles dans la base de données Dolibarr (gras = obligatoire)
 NoFields=Pas de champs
 MoveField=Déplacer le numéro de colonne du champ %s
 SaveImportProfile=Enregistrer ce profil d'importation
@@ -32,28 +57,59 @@ TablesTarget=Tableaux ciblés
 FieldsTarget=Champs ciblés
 FieldTarget=Champ ciblé
 NbOfSourceLines=Nombre de lignes dans le fichier source
+NowClickToTestTheImport=Vérifiez que le format de fichier (délimiteurs de champ et de chaîne) de votre fichier correspond aux options affichées et que vous avez omis la ligne d'en-tête, sinon celles-ci seront signalées comme des erreurs dans la simulation suivante.<br>Cliquez sur le bouton « <b>%s</b> » pour exécuter une vérification de la structure/du contenu du fichier et simuler le processus d'importation.<br><b>Aucune donnée ne sera modifiée dans votre base de données</b>.
+RunSimulateImportFile=Exécuter la simulation d'importation
 FieldNeedSource=Ce champ nécessite des données du fichier source
 SomeMandatoryFieldHaveNoSource=Certains champs obligatoires n'ont aucune source à partir du fichier de données
 SelectAtLeastOneField=Changer au moins un champ source dans la colonne de champs à exporter
 SelectFormat=Choisissez ce format de fichier d'importation
+RunImportFile=Importer des données
+NowClickToRunTheImport=Vérifiez les résultats de la simulation d'importation. Corrigez les erreurs éventuelles et effectuez un nouveau test.<br>Lorsque la simulation ne signale aucune erreur, vous pouvez procéder à l'importation des données dans la base de données.
+DataLoadedWithId=Les données importées auront un champ supplémentaire dans chaque table de base de données avec cet identifiant d'importation : <b>%s</b>, pour permettre leur recherche en cas d'enquête sur un problème lié à cette importation.
+TooMuchErrors=Il existe encore <b>%s</b> d'autres lignes sources avec des erreurs, mais la sortie a été limitée.
+TooMuchWarnings=Il existe encore <b>%s</b> d'autres lignes sources avec des avertissements, mais la sortie a été limitée.
 EmptyLine=Ligne vide (sera rejetée)
+CorrectErrorBeforeRunningImport=Vous <b>devez</b> corriger toutes les erreurs <b>avant</b> d'exécuter l'importation définitive.
 FileWasImported=Le fichier a été importé avec le numéro <b>%s</b>.
+YouCanUseImportIdToFindRecord=Vous pouvez trouver tous les enregistrements importés dans votre base de données en filtrant sur le champ <b>import_key='%s'</b>.
 NbOfLinesOK=Nombre de lignes sans erreur et sans avertissement: <b>%s</b>.
 NbOfLinesImported=Nombre de lignes importées avec succès: <b>%s</b>.
 DataComeFromNoWhere=La valeur à insérer vient de nulle part dans le fichier source.
+DataComeFromIdFoundFromRef=La valeur provenant du fichier source sera utilisée pour trouver l'ID de l'objet parent à utiliser (donc l'objet <b>%s</b> qui a la référence du fichier source doit exister dans la base de données).
+DataComeFromIdFoundFromCodeId=La valeur du code provenant du fichier source sera utilisée pour trouver l'ID de l'objet parent à utiliser (le code du fichier source doit donc exister dans le dictionnaire <b>%s</b>). Notez que si vous connaissez l'ID, vous pouvez également l'utiliser dans le fichier source au lieu du code. L'importation devrait fonctionner dans les deux cas.
 DataIsInsertedInto=Les données provenant du fichier source seront insérées dans le champ suivant:
+DataIDSourceIsInsertedInto=L'identifiant de l'objet parent, qui a été trouvé à l'aide des données du fichier source, sera inséré dans le champ suivant :
+DataCodeIDSourceIsInsertedInto=L'identifiant de la ligne parent, trouvé à partir du code, sera inséré dans le champ suivant :
 SourceRequired=La valeur des données est obligatoire
 SourceExample=Exemple de valeur de données possible
 ExampleAnyRefFoundIntoElement=Toute référence pour l'élément <b>%s</b>
 ExampleAnyCodeOrIdFoundIntoDictionary=Tout code (ou id) trouvé dans le dictionnaire <b>%s</b>
+CSVFormatDesc=<b>Format de fichier </b> séparé par des virgules (.csv).<br>Il s'agit d'un format de fichier texte dans lequel les champs sont séparés par un séparateur [ %s ]. Si un séparateur est trouvé dans le contenu d'un champ, le champ est arrondi par le caractère arrondi [ %s ]. Le caractère d'échappement pour échapper au caractère arrondi est [ %s ].
+Excel95FormatDesc=<b>Format de fichier Excel</b> (.xls)<br>Il s'agit du format natif d'Excel 95 (BIFF5).
+Excel2007FormatDesc=<b>Format de fichier Excel</b> (.xlsx)<br>Il s'agit du format natif d'Excel 2007 (SpreadsheetML).
 TsvFormatDesc=<B> Onglet Valeur séparée </ b> format de fichier (.tsv) <br> Il s'agit d'un format de fichier texte où les champs sont séparés par un tabulateur [onglet].
 ExportFieldAutomaticallyAdded=Le champ <b>%s</b>a été ajouté automatiquement. Cela vous évitera d'avoir des lignes similaires à traiter comme enregistrement en double (avec ce champ ajouté, toutes les lignes seront propriétaires de leur propre identifiant et seront différentes).
+CsvOptions=Options de format CSV
+Separator=Séparateur de champ
+Enclosure=Délimiteur de chaîne
 ExportStringFilter=%% permet de remplacer un ou plusieurs caractères dans le texte
+ExportDateFilter=AAAA, AAAAMM, AAAAMMJJ : filtre par année/mois/jour<br>AAAA+AAAA, AAAAMM+AAAAMM, AAAAMMJJ+AAAAMMJJ : filtre sur une plage d'années/mois/jours<br> > AAAA, > AAAAMM, > AAAAMMJJ : filtre sur toutes les années/mois/jours suivants<br> < AAAA, < AAAAMM, < AAAAMMJJ : filtre sur toutes les années/mois/jours précédents
 ExportNumericFilter=Filtres NNNN par une valeur <br> NNNNN + NNNNN filtre sur une gamme de valeurs <br> <Filtres NNNNN par valeurs inférieures <br >> Filtres NNNNN par des valeurs plus élevées
 ImportFromLine=Importation à partir du numéro de ligne
 EndAtLineNb=Fin au numéro de ligne
+ImportFromToLine=Limiter la plage (De - À). Par exemple, pour omettre une ou plusieurs lignes d'en-tête.
+SetThisValueTo2ToExcludeFirstLine=Par exemple, définissez cette valeur sur 3 pour exclure les 2 premières lignes.<br>Si les lignes d'en-tête ne sont PAS omises, cela entraînera plusieurs erreurs dans la simulation d'importation.
+KeepEmptyToGoToEndOfFile=Laissez ce champ vide pour traiter toutes les lignes jusqu'à la fin du fichier.
+SelectPrimaryColumnsForUpdateAttempt=Sélectionnez la ou les colonnes à utiliser comme clé primaire pour une importation UPDATE
 UpdateNotYetSupportedForThisImport=La mise à jour n'est pas prise en charge pour ce type d'importation (uniquement insertion)
 NoUpdateAttempt=Aucune tentative de mise à jour n'a été effectuée, insérer seulement
 ImportDataset_user_1=Utilisateurs (employés ou non) et propriétés
 SelectFilterFields=Si vous souhaitez filtrer certaines valeurs, il suffit d'entrer les valeurs ici.
 FilteredFieldsValues=Valeur pour le filtre
+KeysToUseForUpdates=Clé (colonne) à utiliser pour <b>mettre à jour</b> les données existantes
+NbInsertSim=Nombre de lignes qui seront insérées : %s
+NbUpdateSim=Nombre de lignes qui seront mises à jour : %s
+StocksWithBatch=Stocks et localisation (entrepôt) des produits avec numéro de lot/série
+SelectImportFieldsSource =Choisissez les champs du fichier source que vous souhaitez importer et leur champ cible dans la base de données en choisissant les champs dans chaque case de sélection, ou sélectionnez un profil d'importation prédéfini :
+MandatoryTargetFieldsNotMapped=Certains champs cibles obligatoires ne sont pas mappés
+AllTargetMandatoryFieldsAreMapped=Tous les champs cibles nécessitant une valeur obligatoire sont mappés
diff --git a/htdocs/langs/fr_CA/hrm.lang b/htdocs/langs/fr_CA/hrm.lang
index 82ec6d751fc..04b063c37aa 100644
--- a/htdocs/langs/fr_CA/hrm.lang
+++ b/htdocs/langs/fr_CA/hrm.lang
@@ -2,9 +2,56 @@
 HRM_EMAIL_EXTERNAL_SERVICE=Email pour empêcher le service externe de GRH
 Establishments=Établissements
 Establishment=Établissement
+ConfirmDeleteEstablishment=Etes-vous sûr de vouloir supprimer cet établissement ?
 OpenEtablishment=Établissement ouvert
 CloseEtablishment=Établissement proche
+DictionaryPublicHolidays=Congés - Jours fériés
+DictionaryDepartment=GRH - Unité organisationnelle
+DictionaryFunction=GRH - Postes à pourvoir
 Employees=Employés
 Employee=Employé
 NewEmployee=Nouvel employé
+ListOfEmployees=Liste des employés
 HrmSetup=Configuration du module de GRH
+HRM_MAXRANK=Nombre maximal de niveaux pour classer une compétence
+deplacement=Changement
+JobCard=Fiche de travail
+NewJobProfile=Nouveau profil d'emploi
+JobProfile=Profil du poste
+JobsProfiles=Profils d'emploi
+Skilldets=Liste des rangs pour cette compétence
+rank=Rang
+ErrNoSkillSelected=Aucune compétence sélectionnée
+SkillHasNoLines=Cette compétence n'a pas de lignes
+SkillCard=Carte de compétence
+EmployeeSkillsUpdated=Les compétences des employés ont été mises à jour (voir l'onglet « Compétences » de la fiche employé)
+ConfirmValidateEvaluation=Êtes-vous sûr de vouloir valider cette évaluation de compétences avec la référence <b>%s</b> ?
+EvaluationCard=Évaluation des compétences
+PositionsWithThisProfile=Postes avec ces profils d'emploi
+EmployeesInThisPosition=Employés à ce poste
+group2ToCompare=Deuxième groupe d'utilisateurs à des fins de comparaison
+CompetenceAcquiredByOneOrMore=Compétence acquise par un ou plusieurs utilisateurs mais non sollicitée par le deuxième comparateur
+MaxlevelGreaterThan=Le niveau des employés est supérieur au niveau attendu
+MaxLevelLowerThan=Le niveau des employés est inférieur au niveau attendu
+SkillNotAcquired=Compétence non acquise par tous les utilisateurs et demandée par le deuxième comparateur
+AddSkill=Ajouter des compétences au profil de poste
+UserRank=Rang d'utilisateur
+SkillList=Liste des compétences
+SaveRank=Enregistrer le rang
+TypeKnowHow=Savoir comment
+TypeHowToBe=Comment être
+TypeKnowledge=Connaissance
+AbandonmentComment=Commentaire d'abandon
+DateLastEval=Date de la dernière évaluation
+NoEval=Aucune évaluation n'a été effectuée pour cet employé
+HowManyUserWithThisMaxNote=Nombre d'utilisateurs avec ce rang
+HighestRank=Rang le plus élevé
+ActionsOnJob=Événements sur ce poste
+VacantPosition=poste vacant
+VacantCheckboxHelper=Cocher cette option affichera les postes non pourvus (poste vacant)
+SaveLevelSkill =Niveau(x) de compétence(s) sauvegardé(s)
+EvaluationsExtraFields=Attributs complémentaires (Évaluations de compétences)
+NeedBusinessTravels=Besoin de voyages d'affaires
+NoDescription=Aucune description
+TheJobProfileHasNoSkillsDefinedFixBefore=Le profil de poste évalué de cet employé ne comporte aucune compétence définie. Veuillez ajouter une ou plusieurs compétences, puis supprimer et relancer l'évaluation.
+SkillNotRequired=Compétence non requise
diff --git a/htdocs/langs/fr_CA/mails.lang b/htdocs/langs/fr_CA/mails.lang
index aa2b8625c32..3d8e722f7e1 100644
--- a/htdocs/langs/fr_CA/mails.lang
+++ b/htdocs/langs/fr_CA/mails.lang
@@ -1,23 +1,22 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Emission
 EMailing=Emission
-AllEMailings=Tous les eMailings
+SMSings=Envoi de SMS
 MailCard=Carte de préhension
 MailRecipients=Récipiendaires
 MailRecipient=Bénéficiaire
+ForceEmailFrom=E-mail par défaut de
 MailReply=Répondre à
 MailTo=À
 MailCC=Copier
+MailToCCUsers=Copier aux utilisateurs
 MailCCC=Copie en cache vers
-ShowEMailing=Afficher le courrier électronique
-ListOfEMailings=Liste des courriers électroniques
-NewMailing=Nouveau courrier électronique
-EditMailing=Modifier le courrier électronique
-ResetMailing=Renvoyer l'envoi par courrier électronique
-DeleteMailing=Supprimer l'envoi par courrier électronique
-PreviewMailing=Aperçu de l'envoi par courrier électronique
-CreateMailing=Créer un email
-ValidMailing=Courrier électronique valide
+MailTopic=Objet du courrier électronique
+MailDate=Date de l'e-mail
+SubjectNotIn=Pas dans le sujet
+BodyNotIn=Pas dans le corps
+NewSMSing=Nouveau SMS
+ResetMailingTargetMassaction=Réinitialiser le statut en cas d'erreur
 MailingStatusValidated=Validée
 MailSuccessfulySent=Courrier électronique (de %s à %s) accepté avec succès pour la livraison
 MailingSuccessfullyValidated=Emission validée avec succès
@@ -26,52 +25,79 @@ MailingStatusReadAndUnsubscribe=Lire et se désabonner
 ErrorMailRecipientIsEmpty=Le destinataire du courrier électronique est vide
 WarningNoEMailsAdded=Pas de nouveau courrier électronique pour ajouter à la liste des destinataires.
 ConfirmValidMailing=Êtes-vous sûr de vouloir valider ce courrier électronique?
+ConfirmResetMailing=Attention, en réinitialisant l'envoi de l'email <b>%s</b>, vous autoriserez le renvoi de cet email dans un mailing de masse. Etes-vous sûr de vouloir faire cela ?
+ConfirmResetMailingTargetMassactionQuestion=Etes-vous sûr de vouloir réinitialiser le statut des destinataires sélectionnés (cela peut signifier que l'e-mail sera renvoyé si vous utilisez la fonction Envoyer un e-mail de l'e-mailing) ?
+ConfirmDeleteMailing=Etes-vous sûr de vouloir supprimer cet e-mail ?
+NbOfUniqueEMails=Nombre d'e-mails uniques
+NbOfUniquePhones=Nombre de téléphones uniques
+NbOfEMails=Nombre de courriers électroniques
 TotalNbOfDistinctRecipients=Nombre de destinataires distincts
 NoTargetYet=Pas encore de destinataires définis (Passez sur l'onglet 'Récipients')
+NoRecipientEmail=Aucune adresse e-mail de destinataire pour %s
 RemoveRecipient=Supprimer le destinataire
 YouCanAddYourOwnPredefindedListHere=Pour créer votre module sélecteur de messagerie, voir htdocs / core / modules / mailings / README.
 EMailTestSubstitutionReplacedByGenericValues=Lors de l'utilisation du mode de test, les variables de substitution sont remplacées par des valeurs génériques
 MailingAddFile=Joignez ce fichier
 NoAttachedFiles=Pas de fichiers joints
+BadEMail=Mauvaise valeur pour le courrier électronique
+EMailNotDefined=Email non défini
 ConfirmCloneEMailing=Êtes-vous sûr de vouloir cloner ce courrier électronique?
 CloneReceivers=Récipiendaires Cloner
 DateLastSend=Date de l'envoi le plus récent
 DateSending=Envoi de la date
 SentTo=Envoyé à <b>%s</b>
 MailingStatusRead=Lis
+YourMailUnsubcribeOK=L'e-mail <b>%s</b> est correctement désabonné de la liste de diffusion
+ActivateCheckReadKey=Clé utilisée pour crypter l'URL utilisée pour les fonctions « Accusé de réception » et « Désabonnement »
+EMailSentToNRecipients=E-mail envoyé aux destinataires %s.
+EMailSentForNElements=E-mail envoyé pour les éléments %s.
 XTargetsAdded=<b>%s</b> les destinataires ajoutés dans la liste cible
+OnlyPDFattachmentSupported=Si les documents PDF ont déjà été générés pour les objets à envoyer, ils seront joints à l'e-mail. Dans le cas contraire, aucun e-mail ne sera envoyé (notez également que seuls les documents PDF sont pris en charge en tant que pièces jointes lors d'un envoi en masse dans cette version).
+AllRecipientSelected=Les destinataires de l'enregistrement %s sélectionné (si leur email est connu).
+GroupEmails=Courriels de groupe
+OneEmailPerRecipient=Un email par destinataire (par défaut, un email par enregistrement sélectionné)
+WarningIfYouCheckOneRecipientPerEmail=Attention, si vous cochez cette case, cela signifie qu'un seul email sera envoyé pour plusieurs enregistrements différents sélectionnés, donc, si votre message contient des variables de substitution qui font référence aux données d'un enregistrement, il devient impossible de les remplacer.
+ResultOfMailSending=Résultat de l'envoi massif d'e-mails
+NbSelected=Numéro sélectionné
+NbIgnored=Numéro ignoré
+NbSent=Numéro envoyé
 ConfirmUnvalidateEmailing=Êtes-vous sûr de vouloir modifier le courrier électronique <b>%s</b> pour rédiger un état?
 MailingModuleDescContactsWithThirdpartyFilter=Contact avec les filtres clients
+MailingModuleDescContactsByCompanyCategory=Contacts par catégorie de tiers
 MailingModuleDescContactsByCategory=Contacts par catégories
 MailingModuleDescContactsByFunction=Contacts par poste
 MailingModuleDescEmailsFromFile=Emails du fichier
 MailingModuleDescEmailsFromUser=E-mail par utilisateur
 MailingModuleDescDolibarrUsers=Utilisateurs avec e-mails
+SendingFromWebInterfaceIsNotAllowed=L'envoi depuis l'interface Web n'est pas autorisé.
+EmailCollectorFilterDesc=Tous les filtres doivent correspondre pour qu'un e-mail soit collecté.<br>Vous pouvez utiliser le caractère « ! » avant la valeur de la chaîne de recherche si vous avez besoin d'un test négatif
 LineInFile=Ligne %s dans le fichier
 RecipientSelectionModules=Demandes définies pour la sélection du destinataire
 MailSelectedRecipients=Récipiendaires sélectionnés
-MailingArea=Zone d'édition
-LastMailings=Derniers %s messages électroniques
 TargetsStatistics=Statistiques des cibles
 NbOfCompaniesContacts=Contacts / adresses uniques
 MailNoChangePossible=Les destinataires pour les courriers électroniques validés ne peuvent pas être modifiés
-SearchAMailing=Chercher l'envoi postal
-SendMailing=Envoyer un courrier électronique
 SentBy=Envoyée par
 MailingNeedCommand=L'envoi d'un courrier électronique peut être effectué à partir de la ligne de commande. Demandez à votre administrateur du serveur de lancer la commande suivante pour envoyer le courrier électronique à tous les destinataires:
 MailingNeedCommand2=Vous pouvez cependant les envoyer en ligne en ajoutant le paramètre MAILING_LIMIT_SENDBYWEB avec la valeur du nombre maximum d'emails que vous souhaitez envoyer par session. Pour cela, passez à la page d'accueil - Configuration - Autre.
 ConfirmSendingEmailing=Si vous souhaitez envoyer des courriels directement à partir de cet écran, veuillez confirmer que vous souhaitez envoyer des courriels maintenant depuis votre navigateur?
-LimitSendingEmailing=Remarque: l'envoi de courriels à partir de l'interface Web se fait plusieurs fois pour des raisons de sécurité et de délai, <b>%s</b> destinataires à la fois pour chaque session d'envoi.
 TargetsReset=Effacer la liste
 ToClearAllRecipientsClickHere=Cliquez ici pour effacer la liste des destinataires pour ce courrier électronique
 ToAddRecipientsChooseHere=Ajouter les destinataires en choisissant parmi les listes
-NbOfEMailingsReceived=Courrier électronique de masse reçu
-NbOfEMailingsSend=Envoi massif envoyé
 IdRecord=Enregistrement d'identité
 YouCanUseCommaSeparatorForSeveralRecipients=Vous pouvez utiliser le séparateur <b> virgule </b> pour spécifier plusieurs destinataires.
 TagCheckMail=Suivre l'ouverture du courrier
 TagUnsubscribe=Désinscription lien
+EMailRecipient=E-mail du destinataire
+TagMailtoEmail=E-mail du destinataire (y compris le lien HTML « mailto : »)
 NoEmailSentBadSenderOrRecipientEmail=Aucun courriel envoyé. Mauvais expéditeur ou courrier électronique du destinataire. Vérifiez le profil de l'utilisateur.
+NotificationsAuto=Notifications automatiques.
+NoNotificationsWillBeSent=Aucune notification automatique par e-mail n'est prévue pour ce type d'événement et cette entreprise
+ANotificationsWillBeSent=1 notification automatique sera envoyée par email
+SomeNotificationsWillBeSent=%s des notifications automatiques seront envoyées par e-mail
+AddNewNotification=S'abonner à une nouvelle notification automatique par e-mail (cible/événement)
+ListOfNotificationsDone=Envoi automatique de notifications par e-mail
+ListOfNotificationsDoneHelp=Liste des notifications par e-mail envoyées dans le passé
 MailSendSetupIs=La configuration de l'envoi de courrier électronique a été configurée sur '%s'. Ce mode ne peut pas être utilisé pour envoyer des messages électroniques de masse.
 MailSendSetupIs2=Vous devez d'abord aller, avec un compte admin, dans le menu %sHome - Configuration - EMails%s pour modifier le paramètre <strong> '%s' </strong>pour utiliser le mode '%s'. Avec ce mode, vous pouvez entrer dans la configuration du serveur SMTP fourni par votre fournisseur de services Internet et utiliser la fonctionnalité de messagerie en masse.
 MailSendSetupIs3=Si vous avez des questions sur la configuration de votre serveur SMTP, vous pouvez demander à %s.
@@ -80,15 +106,35 @@ NbOfTargetedContacts=Nombre actuel d'emails de contact ciblés
 UseFormatFileEmailToTarget=Le fichier importé doit avoir un format <strong> email; nom; prénom; autre </ strong>
 UseFormatInputEmailToTarget=Entrez une chaîne avec le format <strong> email; nom; prénom; autre </ strong>
 MailAdvTargetRecipients=Récipiendaires (sélection avancée)
+AdvTgtTitle=Remplissez les champs de saisie pour présélectionner les tiers ou les contacts/adresses à cibler
+AdvTgtSearchTextHelp=Utilisez %% comme caractères génériques. Par exemple, pour rechercher tous les éléments tels que <b>jean, joe, jim</b>, vous pouvez saisir <b>j%%</b>, vous pouvez également utiliser ; comme séparateur pour la valeur, et utiliser ! pour sauf cette valeur. Par exemple, <b>jean;joe;jim%%;!jimo;!jima%%</b> ciblera tous les jean, joe, commençant par jim mais pas jimo et pas tout ce qui commence par jima
 AdvTgtSearchIntHelp=Intervalle d'utilisation pour sélectionner la valeur int ou flottante
 AdvTgtMinVal=Valeur minimale
 AdvTgtSearchDtHelp=Intervalle d'utilisation pour sélectionner la valeur de la date
 AdvTgtStartDt=Démarrez dt.
 AdvTgtEndDt=Fin dt.
+AdvTgtTypeOfIncudeHelp=Adresse e-mail cible du tiers et adresse e-mail du contact du tiers, ou simplement adresse e-mail du tiers ou simplement adresse e-mail du contact
 AdvTgtTypeOfIncude=Type d'email ciblé
 AdvTgtContactHelp=Utilisez uniquement si vous ciblez le contact dans "Type d'email ciblé"
 RemoveAll=Enlever tout
 ItemsCount=Articles)
+AdvTgtAddContact=Ajouter des e-mails selon des critères
 AdvTgtLoadFilter=Filtre de charge
 AdvTgtDeleteFilter=Supprimer le filtre
 AdvTgtCreateFilter=Créer un filtre
+NoContactWithCategoryFound=Aucune catégorie trouvée liée à certains contacts/adresses
+NoContactLinkedToThirdpartieWithCategoryFound=Aucune catégorie trouvée liée à certains tiers
+OutGoingEmailSetup=Courriels sortants
+OutGoingEmailSetupForEmailing=Courriels sortants (%s)
+DefaultOutgoingEmailSetup=Même configuration que la configuration globale du courrier sortant
+ContactsWithThirdpartyFilter=Contacts avec filtre tiers
+IsNotAnAnswer=Ce n'est pas une réponse (c'est un e-mail initial)
+IsAnAnswer=C'est une réponse à un e-mail initial
+DefaultBlacklistMailingStatus=Valeur par défaut pour le champ '%s' lors de la création d'un nouveau contact
+WarningLimitSendByDay=AVERTISSEMENT : la configuration ou le contrat de votre instance limite votre nombre d'e-mails par jour à <b>%s</b>. Si vous essayez d'en envoyer davantage, votre instance risque d'être ralentie ou suspendue. Veuillez contacter votre support si vous avez besoin d'un quota plus élevé.
+EmailOptedOut=Le propriétaire de l'e-mail a demandé de ne plus le contacter avec cet e-mail
+EvenUnsubscribe=Inclure les e-mails de désinscription
+EvenUnsubscribeDesc=Incluez des e-mails de désabonnement lorsque vous sélectionnez des e-mails comme cibles. Cela peut s'avérer utile pour les e-mails de service obligatoires, par exemple.
+YouCanMakeSomeInstructionForEmail=Vous pouvez créer quelques instructions pour votre e-mail (exemple : générer une image dans un modèle d'e-mail...)
+ModelTemplate=Modèle de courrier électronique
+YouCanChooseAModelForYouMailContent=Vous pouvez choisir l'un des modèles ou en générer un avec l'IA
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
index ad95cc54fa2..111917b248f 100644
--- a/htdocs/langs/fr_CA/main.lang
+++ b/htdocs/langs/fr_CA/main.lang
@@ -20,134 +20,408 @@ FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Connexion à la base de donnée
+NoTemplateDefined=Aucun modèle disponible pour ce type d'e-mail
+EnterADateCriteria=Entrez un critère de date
+CustomMandatoryFieldRule=Règle personnalisée « Champ obligatoire »
 ErrorCanNotCreateDir=Impossible de créer le dir %s
 ErrorCanNotReadDir=Impossible de lire le dir %s
+ErrorGoToGlobalSetup=Accédez à la configuration « Entreprise/Organisation » pour résoudre ce problème
+ErrorYourCountryIsNotDefined=Votre pays n'est pas défini. Allez dans Accueil-Configuration-Entreprise/Fondation et postez à nouveau le formulaire.
+ErrorRecordIsUsedByChild=Impossible de supprimer cet enregistrement. Cet enregistrement est utilisé par au moins un enregistrement enfant.
+ErrorServiceUnavailableTryLater=Service non disponible pour le moment. Réessayez plus tard.
+ErrorSomeErrorWereFoundRollbackIsDone=Des erreurs ont été détectées. Les modifications ont été annulées.
 ErrorNoSocialContributionForSellerCountry=Erreur, aucun type de charges défini pour le pays '%s'.
+ErrorCannotAddThisParentWarehouse=Vous essayez d'ajouter un entrepôt parent qui est déjà un enfant d'un entrepôt existant
+FieldCannotBeNegative=Le champ « %s » ne peut pas être négatif
+MaxNbOfRecordPerPage=Nombre max. d'enregistrements par page
 NotAuthorized=Vous n'êtes pas autorisé à le faire.
 SeeHere=Regardez ici
 ClickHere=Cliquez ici
+FileSaved=Le fichier a été enregistré avec succès
+FileTransferComplete=Fichier(s) téléchargé(s) avec succès
+NbOfEntries=Nombre d'entrées
 GoToWikiHelpPage=Lire l'aide en ligne (accès Internet nécessaire)
 DolibarrInHttpAuthenticationSoPasswordUseless=Le mode d'authentification Dolibarr est défini sur <b>%s</b> dans le fichier de configuration <b>conf.php</b>.<br> Cela signifie que la base de données de mots de passe est externe à Dolibarr, donc changer ce champ peut ne pas avoir d'effet .
+AdministratorDesc=Administrateur système (peut administrer les utilisateurs, les autorisations mais également la configuration du système et des modules)
 PasswordForgotten=Mot de passe oublié?
 AuthenticationMode=Mode d'authentification
 RequestedUrl=URL requise
 RequestLastAccessInError=Erreur de demande d'accès à la base de données la plus récente
 ReturnCodeLastAccessInError=Code de retour pour la dernière erreur de demande d'accès à la base de données
 InformationLastAccessInError=Informations pour la dernière erreur de demande d'accès à la base de données
+YouCanSetOptionDolibarrMainProdToZero=Vous pouvez lire le fichier journal ou définir l'option $dolibarr_main_prod sur « 0 » dans votre fichier de configuration pour obtenir plus d'informations.
+InformationToHelpDiagnose=Ces informations peuvent être utiles à des fins de diagnostic (vous pouvez définir l'option $dolibarr_main_prod sur « 1 » pour masquer les informations sensibles)
+LineID=ID de ligne
+WarningYouHaveAtLeastOneTaskLate=Attention, vous avez au moins un élément qui a dépassé le temps de tolérance.
 MediaBrowser=Navigateur multimédia
 NotClosed=Pas fermé
 RemoveLink=Supprimer lien
 AddToDraft=Ajouter au projet
+CloseAs=Définir le statut sur
 CloseBox=Supprimer le widget de votre tableau de bord
+ConfirmSendCardByMail=Souhaitez-vous vraiment envoyer le contenu de cette carte par courrier à <b>%s</b> ?
 Resiliate=Mettre fin
 NotValidated=Pas validé
+SaveAndStay=Économisez et restez
+ConfirmCloneAsk=Êtes-vous sûr de vouloir cloner l'objet <b>%s</b> ?
+ConfirmClone=Choisissez les données que vous souhaitez cloner :
+QuickAdd=Ajout rapide
 ReOpen=Réouvrir
 OpenVerb=Ouverte
+Upload=Télécharger
+ResizeOrCrop=Redimensionner ou recadrer
+PasswordRetype=Répétez votre mot de passe
 NoteSomeFeaturesAreDisabled=Attention, seules quelques modules/fonctionnalités ont été activés dans cette démo.
+YourUserFile=Votre fichier utilisateur
+DescriptionOfLine=Description de la ligne
+ParentLine=ID de la ligne parentale
 DefaultModel=Modèle de docteur par défaut
+NumberByMonth=Nombre total de rapports par mois
 Connection=Identifiant
+Deadline=Date limite
 DateToday=La date d'aujourd'hui
 DateStart=Date de début
 DateEnd=Date de fin
 DateCreationShort=Création. rendez-vous amoureux
+IPModification=Modification de la propriété intellectuelle
 DateLastModification=Dernière date de modification
 UserCreation=Utilisateur de la création
+UserValidation=Validation utilisateur
 UserCreationShort=Util. création
 UserModificationShort=Util. modification
+UserValidationShort=Utilisateur valide
+UserClosing=Fermeture de l'utilisateur
+UserClosingShort=Fermeture de l'utilisateur
 WeekShort=Semaine
+SecondShort=seconde
 MonthShort=M
+YearShort=et
 CurrencyRate=Taux de conversion monétaire
 UseLocalTax=Inclure taxe
+UserModif=Mis à jour par
+DefaultValues=Valeurs/filtres/tri par défaut
+PriceCurrency=Prix (devise)
+UnitPriceHT=Prix unitaire (HT)
+UnitPriceHTCurrency=Prix unitaire (HT) (devise)
 UnitPriceTTC=Prix unitaire tx incl.
 PriceUHT=Prix
+PriceUHTCurrency=U.P (net) (devise)
 PriceUTTC=P.U. (tx incl.)
+AmountInvoicedHT=Montant facturé (hors taxes)
+AmountHTShort=Montant (excl.)
 AmountTTCShort=Montant (tx incl.)
+AmountHT=Montant (hors taxes)
 AmountTTC=Montant (tx incl.)
 AmountVAT=Montant TPS/TVH
+DiscountHT=Remise (hors taxes)
+DiscountTTC=Rabais (taxes comprises)
 MulticurrencyRemainderToPay=Reste à payer, monnaie d'origine
 MulticurrencyPaymentAmount=Montant du paiement, monnaie d'origine
+MulticurrencyAmountHT=Montant (hors taxes), devise d'origine
 MulticurrencyAmountTTC=Montant (hors taxe), monnaie d'origine
 MulticurrencyAmountVAT=Montant de l'impôt, monnaie d'origine
+MulticurrencySubPrice=Montant sous prix multi devise
 AmountLT1=Montant TVQ
+PriceQtyMinHT=Prix quantité min. (hors taxes)
+PriceQtyMinHTCurrency=Prix quantité min. (hors taxes) (devise)
+TotalHTShortCurrency=Total (hors devise)
+TotalHTWithDiscount=Total (excl.) avec remise
 TotalTTCShort=Total (tx incl.)
+TotalHT=Total (hors taxes)
+TotalHTforthispage=Total (hors taxes) pour cette page
+GrandTotal=total
 TotalTTC=Total
 TotalTTCToYourCredit=Total (tx incl.) à votre crédit
 TotalVAT=Total TPS/TVH
+TotalVATIN=Taxe sur les biens et services totale
 TotalLT1=Total TVQ
+TotalLT1IN=Taxe sur les produits et services (TPS) totale
+TotalLT2IN=Taxe sur les produits et services totale
+HT=Hors taxes
 TTC=tx incl.
+INCT=Toutes taxes comprises
 VAT=TPS/TVH
 VATs=Taxes de vente
+LT1Type=Taxe de vente de type 2
+LT2Type=Taxe de vente de type 3
 VATRate=Taux TPS/TVH
+RateOfTaxN=Taux d'imposition %s
+VATCode=Code de taux d'imposition
+VATNPR=Taux d'imposition NPR
+DefaultTaxRate=Taux d'imposition par défaut
+StandardDeviationPop=Écart type
 Module=Module / Application
 Modules=Modules / Applications
+RefSupplier=Réf. vendeur
+CompanyFoundation=Entreprise/Organisation
+ActionsOnCompany=Événements pour ce tiers
+ActionsOnContact=Evénements pour ce contact/adresse
+ActionsOnContract=Evénements pour ce contrat
+ActionsOnProduct=Événements autour de ce produit
+Completed=Complété
 FilterOnInto=Critères de recherche '<strong>%s</strong>' dans les champs %s
+DolibarrStateBoard=Statistiques de la base de données
+DolibarrWorkBoard=Articles ouverts
+SelectTheTagsToAssign=Sélectionnez les balises/catégories à attribuer
 FromDate=De
 FromLocation=De
+OtherInformations=Autres informations
 Approved=Approuver
 Done=Effectuées
 Opened=Ouverte
+OpenAll=Ouvert (Tous)
+ClosedAll=Fermé (Tous)
+OriginalSize=Taille originale
+RotateImage=Rotation à 90°
+LateDesc=Un élément est défini comme retardé selon la configuration du système dans le menu Accueil - Configuration - Alertes.
+NoItemLate=Aucun article en retard
 DeletePicture=Supprimer image
 ConfirmDeletePicture=Etes-vous sur de vouloir supprimer cette image ?
+LoginEmail=Connexion (email)
+LoginOrEmail=Connectez-vous ou envoyez un e-mail
 EnterLoginDetail=Entrez les détails de connexion
 MonthVeryShort02=V
 MonthVeryShort03=L
+MonthVeryShort04=UN
 MonthVeryShort05=L
+MonthVeryShort08=UN
 MonthVeryShort09=D
 NbOfObjectReferers=Nombre d'articles connexes
 Referers=Articles connexes
+SupplierPreview=Aperçu du fournisseur
+ShowSupplierPreview=Afficher l'aperçu du fournisseur
+InternalRef=Référence interne
+SendByMail=Envoyer par email
+MailSentByTo=Courriel envoyé par %s à %s
 SendAcknowledgementByMail=Envoyer un email de confirmation
+SendMail=Envoyer un e-mail
+BackToTree=Retour à l'arbre
 ValueIsNotValid=La valeur n'est pas valide
+RecordsModified=%s enregistrement(s) modifié(s)
 CompleteOrNoMoreReceptionExpected=Complète ou rien de plus attendu
+ExpectedQty=Quantité prévue
 YouCanChangeValuesForThisListFromDictionarySetup=Vous pouvez modifier les valeurs de cette liste dans le menu Configuration - Dictionnaires
 YouCanChangeValuesForThisListFrom=Vous pouvez modifier les valeurs de cette liste dans le menu %s
 MenuAccountancy=Compte
+MenuTaxesAndSpecialExpenses=Impôts | Dépenses spéciales
+ThisLimitIsDefinedInSetupAt=Limite Dolibarr (Menu %s): %s Ko, limite PHP (Param %s): %s Ko
+NoFileFound=Aucun document téléchargé
 Layout=Disposition
 Screen=Écran
+FreeZone=Produit en texte libre
+ReGeneratePDF=Régénérer le PDF
 Merge=Fusion
+WarningYouAreInMaintenanceMode=Attention, vous êtes en mode maintenance : seul le login <b>%s</b> est autorisé à utiliser l'application dans ce mode.
 CoreErrorMessage=Désolé, une erreur s'est produite. Contactez votre administrateur système pour vérifier les journaux ou désactiver $ dolibarr_main_prod = 1 pour obtenir plus d'informations.
+CreditOrDebitCard=Carte de crédit ou de débit
+FieldsWithIsForPublic=Les champs avec <b>%s</b> sont affichés dans la liste publique des membres. Si vous ne le souhaitez pas, décochez la case « public ».
+AccordingToGeoIPDatabase=(selon la conversion GeoIP)
+ValidateBefore=L'article doit être validé avant d'utiliser cette fonctionnalité
+Totalizable=Totalisable
+TotalizableDesc=Ce champ est totalisable en liste
 LinkToProposal=Lier à une proposition
+LinkToSupplierOrder=Lien vers le bon de commande
+LinkToSupplierProposal=Lien vers la proposition du fournisseur
+LinkToSupplierInvoice=Lien vers la facture du fournisseur
+LinkToTicket=Lien vers le billet
+LinkToMo=Lien vers Mo
+ClickToRefresh=Cliquez pour actualiser
+EditWithEditor=Modifier avec CKEditor
+EditWithTextEditor=Modifier avec l'éditeur de texte
+EditHTML=Modifier le code HTML
+EditHTMLSource=Modifier la source HTML
 SelectAction=Sélectionnez l'action
 SelectTargetUser=Sélectionnez l'utilisateur / employé cible
 ShowTransaction=Afficher l'entrée sur le compte bancaire
+ShowIntervention=Afficher l'intervention
+ShowContract=Afficher le contrat
+GoIntoSetupToChangeLogo=Allez dans Accueil - Configuration - Entreprise pour modifier le logo ou allez dans Accueil - Configuration - Afficher pour le masquer.
+Genderman=Mâle
+Genderwoman=Femelle
+ViewGantt=Vue de Gantt
+ConfirmDeleteObject=Etes-vous sûr de vouloir supprimer cet objet ?
 DeleteLine=Suppression de ligne
 ConfirmDeleteLine=Êtes-vous sûr de vouloir supprimer cette ligne?
+ErrorPDFTkOutputFileNotFound=Erreur : le fichier n'a pas été généré. Veuillez vérifier que la commande 'pdftk' est installée dans un répertoire inclus dans la variable d'environnement $PATH (linux/unix uniquement) ou contactez votre administrateur système.
 NoPDFAvailableForDocGenAmongChecked=Aucun document PDF n'était disponible pour la génération du document parmi les enregistrements vérifiés
+TooManyRecordForMassAction=Trop d'enregistrements sélectionnés pour une action de masse. L'action est limitée à une liste d'enregistrements %s.
 MassFilesArea=Domaine pour les fichiers construits par des actions de masse
 ShowTempMassFilesArea=Afficher la zone des fichiers construits par des actions de masse
+ConfirmMassDeletionQuestion=Êtes-vous sûr de vouloir supprimer les %s enregistrements sélectionnés ?
+ConfirmMassClone=Confirmation du clonage en masse
+ConfirmMassCloneQuestion=Sélectionnez le projet à cloner
 RelatedObjects=Objets associés
+ClassifyBilled=Classer les factures
+ClassifyUnbilled=Classer les non facturés
+ProgressShort=Programme
 FrontOffice=Front Office
 ExportFilteredList=Export liste filtrée
 ExportList=Liste des exportations
 ExportOptions=Options d'exportation
+ExportOfPiecesAlreadyExportedIsDisable=Les documents déjà exportés sont masqués et ne seront pas exportés
 GroupBy=Par groupe...
+GroupByX=Regrouper par %s
 ViewFlatList=Afficher la liste forfaitaire
+ViewSubAccountList=Afficher le grand livre des sous-comptes
 RemoveString=Supprimer la chaîne '%s'
+SomeTranslationAreUncomplete=Certaines des langues proposées peuvent être partiellement traduites ou contenir des erreurs. Aidez-nous à corriger votre langue en vous inscrivant sur <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external">https://transifex.com/projects/p/dolibarr/</a> pour apporter vos améliorations.
+PrivateDownloadLinkDesc=Vous devez être connecté et vous avez besoin d'autorisations pour afficher ou télécharger le fichier
 Download=Télécharger
-ActualizeCurrency=Mettre à jour le taux de change
+ActualizeCurrency=Utilisez le dernier taux connu de la devise
 Fiscalyear=Année fiscale
+ModuleBuilder=Générateur de modules et d'applications
 SetMultiCurrencyCode=Définir la devise
 BulkActions=Actions en vrac
 ClickToShowHelp=Cliquez pour afficher l'aide sur les outils
+WebSites=Sites Web
+WebSiteAccounts=Comptes d'accès Web
+ExpenseReport=Rapport de dépenses
 ExpenseReports=Note de frais
 HR=HEURE
 HRAndBank=RH et Banque
 TitleSetToDraft=Retourner au brouillon
+ConfirmSetToDraft=Êtes-vous sûr de vouloir revenir au statut Brouillon ?
+ImportId=Identifiant d'importation
+EMailTemplates=Modèles d'e-mails
+LeadOrProject=Responsable | Projet
+LeadsOrProjects=Prospects | Projets
+Lead=Plomb
+Leads=Conduit
+ListOpenLeads=Lister les leads ouverts
+NewLeadOrProject=Nouveau prospect ou projet
 Rights=Droits
+LineNb=Numéro de ligne
+TabLetteringSupplier=Lettrage du fournisseur
+seven=Sept
+thirteen=treizième
+sixteen=seize
+ninety=quatre-vingt-dix
+trillion=billion
+SelectMailModel=Sélectionnez un modèle d'e-mail
 SetRef=Ref.
 Select2ResultFoundUseArrows=Certains résultats ont été trouvés. Utilisez les flèches pour sélectionner.
 Select2NotFound=Aucun résultat trouvé
 Select2Enter=Entrer
 Select2MoreCharacter=Ou plus de caractère
 Select2MoreCharacters=Ou plus de personnages
+Select2MoreCharactersMore=<strong>Syntaxe de recherche :</strong><br> <kbd><strong> |</strong></kbd><kbd> OU</kbd> (a|b)<br><kbd> <strong>*</strong></kbd><kbd> N'importe quel caractère</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Commencez par</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> Terminer par</kbd> (ab$)<br>
 Select2LoadingMoreResults=Chargement de plus de résultats ...
 Select2SearchInProgress=Recherche en cours ...
 SearchIntoMembers=Membres
+SearchIntoMO=Commandes de fabrication
 SearchIntoTasks=les tâches
+SearchIntoSupplierInvoices=Factures fournisseurs
+SearchIntoCustomerOrders=Commandes de vente
+SearchIntoSupplierOrders=Bons de commande
 SearchIntoCustomerProposals=Propositions commerciales
+SearchIntoSupplierProposals=Propositions des fournisseurs
 SearchIntoCustomerShipments=Envois clients
+SearchIntoSupplierReceptions=Réceptions des vendeurs
 SearchIntoExpenseReports=Note de frais
+SearchIntoLeaves=Partir
+SearchIntoKM=Base de connaissances
+SearchIntoTickets=Billets
+SearchIntoCustomerPayments=Paiements clients
+SearchIntoVendorPayments=Paiements aux fournisseurs
+CommentPage=Espace commentaires
+EverybodySmall=Tout le monde
+Local=Locale
+Remote=Télécommande
+LocalAndRemote=Local et à distance
 AssignedTo=Affecté à
+Deletedraft=Supprimer le brouillon
+ConfirmMassDraftDeletion=Confirmation de suppression massive du brouillon
+YouAreCurrentlyInSandboxMode=Vous êtes actuellement en mode « sandbox » %s
+ShowCompanyInfos=Afficher les informations sur l'entreprise
+NoFilesUploadedYet=Veuillez d'abord télécharger un document
+PaymentInformation=Informations de paiement
+ValidFrom=Valable à partir du
+ValidUntil=Valable jusqu'au
+ToClose=Pour fermer
 ToProcess=Procéder
+ToApprove=Pour approuver
+ToAcceptRefuse=Accepter | Refuser
+ContactDefault_contrat=Contracter
+ContactDefault_invoice_supplier=Facture du fournisseur
+ContactDefault_order_supplier=Bon de commande
+ContactDefault_supplier_proposal=Proposition du fournisseur
+ContactDefault_ticket=Billet
+ContactAddedAutomatically=Contact ajouté à partir de rôles de contact tiers
+SelectYourGraphOptionsFirst=Sélectionnez vos options graphiques pour créer un graphique
+DeleteFileText=Voulez-vous vraiment supprimer ce fichier ?
+ShowOtherLanguages=Afficher d'autres langues
+SwitchInEditModeToAddTranslation=Passez en mode édition pour ajouter des traductions pour cette langue
+AmountMustBePositive=Le montant doit être positif
+CREATEInDolibarr=Enregistrement %s créé
+DefaultMailModel=Modèle de courrier par défaut
+PublicVendorName=Nom public du vendeur
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Le jeton de sécurité a expiré, l'action a donc été annulée. Veuillez réessayer.
+UpToDate=À jour
+OutOfDate=Obsolète
+UpdateForAllLines=Mise à jour pour toutes les lignes
+Civility=Titre de courtoisie
+AffectTag=Attribuer une balise
+AffectUser=Affecter un utilisateur
+SetSupervisor=Définir le superviseur
+CreateExternalUser=Créer un utilisateur externe
+ConfirmAffectTag=Attribution d'étiquettes en masse
+ContactRole=Rôle de contact
+ProjectRole=Rôle attribué à chaque projet/opportunité
+TasksRole=Rôle attribué à chaque tâche (si utilisé)
+ConfirmUpdatePrice=Choisissez un taux d'augmentation/diminution des prix
+ConfirmAffectTagQuestion=Êtes-vous sûr de vouloir attribuer des balises aux %s enregistrements sélectionnés ?
+ConfirmAffectUserQuestion=Êtes-vous sûr de vouloir affecter des utilisateurs aux %s enregistrements sélectionnés ?
+ConfirmSetSupervisorQuestion=Êtes-vous sûr de vouloir définir le superviseur sur les %s enregistrements sélectionnés ?
+ConfirmUpdatePriceQuestion=Êtes-vous sûr de vouloir mettre à jour le prix du ou des enregistrements sélectionnés %s ?
+CategTypeNotFound=Aucun type de balise trouvé pour le type d'enregistrements
+SupervisorNotFound=Superviseur non trouvé
+CopiedToClipboard=Copié dans le presse-papiers
+InformationOnLinkToContract=Ce montant correspond uniquement au total de toutes les lignes du contrat. Aucune notion de temps n'est prise en compte.
+ConfirmCancel=Etes-vous sûr de vouloir annuler
+EmailMsgID=ID de message électronique
+ConfirmMassEnabling=confirmation permettant la masse
+ConfirmMassEnablingQuestion=Êtes-vous sûr de vouloir activer les %s enregistrements sélectionnés ?
+ConfirmMassDisabling=confirmation de désactivation massive
+ConfirmMassDisablingQuestion=Êtes-vous sûr de vouloir désactiver les %s enregistrements sélectionnés ?
+ConfirmMassLeaveApprovalQuestion=Êtes-vous sûr de vouloir approuver les %s enregistrements sélectionnés ?
+ConfirmMassLeaveApproval=Confirmation de l'approbation du congé en masse
+RecordsApproved=%s Enregistrement(s) approuvé(s)
+Properties=Propriétés
+CanceledHidden=Annulé caché
+Terminate=Mettre fin
+Terminated=Terminé
 Position=Poste
+AddLineOnPosition=Ajouter une ligne sur la position (à la fin si vide)
+ConfirmAllocateCommercial=Confirmation d'affectation d'un représentant commercial
+ConfirmUnallocateCommercial=Êtes-vous sûr de vouloir désaffecter le(s) représentant(s) commercial(aux) de tous les tiers sélectionnés ?
+ConfirmAllocateCommercialQuestion=Êtes-vous sûr de vouloir attribuer les %s enregistrements sélectionnés ?
+ConfirmUnallocateCommercialQuestion=Êtes-vous sûr de vouloir annuler l'attribution des enregistrements %s sélectionnés ?
+CommercialsAffected=Représentants commerciaux affectés
+CommercialAffected=Représentant commercial affecté
+CommercialsDisaffected=Représentants commerciaux non liés
+CommercialDisaffected=Représentant commercial non lié
+YourMessageHasBeenReceived=Votre message a bien été reçu. Nous vous répondrons ou vous contacterons dans les plus brefs délais.
+CreatedByEmailCollector=Créé par Email collector
+UserAgent=Agent utilisateur
+NoSpecificContactAddress=Aucun contact ou adresse spécifique
+NoSpecificContactAddressBis=Cet onglet est dédié à la définition de contacts ou d'adresses spécifiques pour l'objet courant. A utiliser uniquement si vous souhaitez définir un ou plusieurs contacts ou adresses spécifiques pour l'objet lorsque les informations sur le tiers ne sont pas suffisantes ou pas exactes.
+HideOnVCard=Masquer %s
+UploadAnImageToSeeAPhotoHere=Téléchargez une image depuis l'onglet %s pour voir une photo ici
+UploadFileDragDropSuccess=Le(s) fichier(s) ont été téléchargés avec succès
+SearchSyntaxTooltipForStringOrNum=Pour effectuer une recherche dans des champs de texte, vous pouvez utiliser les caractères ^ ou $ pour effectuer une recherche « commencer ou terminer par » ou utiliser le ! pour effectuer un test « ne contient pas ». Vous pouvez utiliser le | entre deux chaînes au lieu d'un espace pour une condition « OU » au lieu de « ET ». Pour les valeurs numériques, vous pouvez utiliser l'opérateur <, >, <=, >= ou != avant la valeur, pour filtrer à l'aide d'une comparaison mathématique
+NoLinkFound=Aucun lien enregistré
+LinkComplete=Le fichier a été lié avec succès
 ErrorFailedToDeleteLink=Impossible d'enlever le lien '<b>%s</b>'
 ErrorFailedToUpdateLink=Impossible de mettre à jour le lien '<b>%s</b>'
+OverwriteIfExists=Écraser si le fichier existe
+ConfirmMassReverse=Confirmation d'inversion en masse
+ConfirmMassReverseQuestion=Êtes-vous sûr de vouloir inverser les %s enregistrements sélectionnés ?
+ElementId=ID de l'élément
+Encrypted=Crypté
+FillMessageWithALayout=Remplir un message avec une mise en page
+FillMessageWithAIContent=Remplir le message avec le contenu de l'IA
+FillPageWithALayout=Remplir la page avec une mise en page
+EnterYourAIPromptHere=Entrez votre invite d'IA ici
+MyUserCard=Mon dossier utilisateur
+PublicFile=Dossier public
+SignedStatus=Statut signé
diff --git a/htdocs/langs/fr_CA/members.lang b/htdocs/langs/fr_CA/members.lang
index 768d12af5ba..c3fb17fa4b3 100644
--- a/htdocs/langs/fr_CA/members.lang
+++ b/htdocs/langs/fr_CA/members.lang
@@ -4,8 +4,11 @@ MemberCard=Carte de membre
 SubscriptionCard=Carte de souscription
 Member=Membre
 Members=Membres
+NoRecordedMembersByType=Aucun membre enregistré
 ShowMember=Afficher la carte membre
 UserNotLinkedToMember=L'utilisateur n'est pas lié à un membre
+ThirdpartyNotLinkedToMember=Tiers non lié à un membre
+MembersTickets=Fiche d'adresse des membres
 FundationMembers=Membres de la Fondation
 ListOfValidatedPublicMembers=Liste des membres publics validés
 ErrorThisMemberIsNotPublic=Ce membre n'est pas public
@@ -16,43 +19,116 @@ SetLinkToThirdParty=Lien vers un tiers Dolibarr
 MembersList=Liste des membres
 MembersListToValid=Liste des membres préliminaires (à valider)
 MembersListValid=Liste des membres valides
+MembersListUpToDate=Liste des membres valides avec cotisation à jour
+MembersListNotUpToDate=Liste des membres valides avec cotisation périmée
+MembersListExcluded=Liste des membres exclus
 MembersListResiliated=Liste des membres licenciés
 MembersListQualified=Liste des membres qualifiés
+MembersShowVotesAllowed=Indiquer si les votes sont autorisés, dans le tableau des types d'adhésion
 MenuMembersToValidate=Ébauche de membres
 MenuMembersValidated=Membres validés
+MenuMembersExcluded=Membres exclus
 MenuMembersResiliated=Membres résiliés
+MembersWithSubscriptionToReceive=Membres avec contribution à recevoir
+MembersWithSubscriptionToReceiveShort=Contributions à recevoir
+DateSubscription=Date d'adhésion
+DateEndSubscription=Date de fin d'adhésion
+EndSubscription=Fin d'adhésion
+SubscriptionId=ID de contribution
 WaitingSubscriptionShort=Créance
+MemberId=ID de membre
+MemberRef=Membre Réf
 NewMember=Nouveau membre
 MemberType=Type de membre
 MemberTypeId=Id. De type membre
 MemberTypeLabel=Étiquette de type membre
 MembersTypes=Types de membres
+MemberStatusActive=Validé (en attente de contribution)
 MemberStatusActiveShort=Validée
+MemberStatusActiveLate=Contribution expirée
 MemberStatusPaid=Abonnement à jour
 MemberStatusPaidShort=À jour
+MemberStatusExcluded=Membre exclu
 MemberStatusResiliated=Membre résilié
 MemberStatusResiliatedShort=Terminé
 MembersStatusToValid=Ébauche de membres
+MembersStatusExcluded=Membres exclus
 MembersStatusResiliated=Membres résiliés
+MemberStatusNoSubscription=Validé (aucune contribution requise)
 MemberStatusNoSubscriptionShort=Validée
+SubscriptionNotNeeded=Aucune contribution requise
 NewCotisation=Nouvelle contribution
 PaymentSubscription=Nouveau paiement de contribution
 SubscriptionEndDate=Date de fin de l'abonnement
 MembersTypeSetup=Configuration des types de membres
+MemberTypeModified=Type de membre modifié
+DeleteAMemberType=Supprimer un type de membre
+ConfirmDeleteMemberType=Etes-vous sûr de vouloir supprimer ce type de membre ?
+MemberTypeDeleted=Type de membre supprimé
+MemberTypeCanNotBeDeleted=Le type de membre ne peut pas être supprimé
 NewSubscriptionDesc=Ce formulaire vous permet d'enregistrer votre abonnement en tant que nouveau membre de la fondation. Si vous souhaitez renouveler votre abonnement (si déjà un membre), veuillez contacter le conseil de fondation par email %s.
+AnyAmountWithoutAdvisedAmount=N'importe quel montant de votre choix
+CanEditAmountShort=N'importe quel montant
+CanEditAmountShortForValues=recommandé, n'importe quelle quantité
 SubscriptionLate=Retard
+SubscriptionNotReceived=Contribution jamais reçue
+ListOfSubscriptions=Liste des contributions
+SendCardByMail=Envoyer la carte par email
 AddMember=Créer un membre
 NoTypeDefinedGoToSetup=Aucun type de membre n'est défini. Aller au menu "Types de membres"
+WelcomeEMail=E-mail de bienvenue
+SubscriptionRequired=Contribution requise
+SubscriptionRequiredDesc=Si un abonnement est requis, un abonnement avec une date de début ou de fin doit être enregistré pour que le membre soit à jour (quel que soit le montant de l'abonnement, même si l'abonnement est gratuit).
+Physical=Individuel
+MorAndPhy=Personne morale et personne physique
+ExcludeMember=Exclure un membre
+ConfirmExcludeMember=Etes-vous sûr de vouloir exclure ce membre ?
 ResiliateMember=Terminer un membre
 ConfirmResiliateMember=Êtes-vous sûr de vouloir mettre fin à ce membre?
 DeleteMember=Supprimer un membre
+ConfirmDeleteMember=Etes-vous sûr de vouloir supprimer ce membre (Supprimer un membre supprimera toutes ses contributions) ?
 DeleteSubscription=Supprimer un abonnement
+ConfirmDeleteSubscription=Etes-vous sûr de vouloir supprimer cette contribution ?
 ValidateMember=Valider un membre
 ConfirmValidateMember=Êtes-vous sûr de vouloir valider ce membre?
+FollowingLinksArePublic=Les liens suivants sont des pages ouvertes non protégées par une quelconque permission Dolibarr. Ce ne sont pas des pages formatées, fournies à titre d'exemple pour montrer comment lister les membres d'une base de données.
+BlankSubscriptionFormDesc=Dolibarr peut vous fournir une URL/site Web public pour permettre aux visiteurs externes de demander à s'inscrire à la fondation. Si un module de paiement en ligne est activé, un formulaire de paiement peut également être fourni automatiquement.
+EnablePublicSubscriptionForm=Activer le site Web public avec un formulaire d'auto-inscription
 ForceMemberType=Forcer le type de membre
+ExportDataset_member_1=Membres et cotisations
 ImportDataset_member_1=Membres
 LastMembersModified=Derniers membres modifiés %s
+LastSubscriptionsModified=Dernières contributions modifiées de %s
+PublicMemberCard=Carte de membre public
+SubscriptionNotRecorded=Contribution non enregistrée
+AddSubscription=Créer une contribution
+ShowSubscription=Afficher la contribution
+SendingAnEMailToMember=Envoi d'un e-mail d'information au membre
+SendingEmailOnAutoSubscription=Envoi d'e-mails lors de l'inscription automatique
+SendingEmailOnMemberValidation=Envoi d'un e-mail lors de la validation d'un nouveau membre
+SendingEmailOnNewSubscription=Envoi d'un e-mail sur une nouvelle contribution
+SendingReminderForExpiredSubscription=Envoi de rappel pour les contributions expirées
+SendingEmailOnCancelation=Envoi d'un e-mail en cas d'annulation
+SendingReminderActionComm=Envoi d'un rappel pour un événement de l'agenda
+YourMembershipRequestWasReceived=Votre adhésion a été reçue.
+YourMembershipWasValidated=Votre adhésion a été validée
+YourSubscriptionWasRecorded=Votre nouvelle contribution a été enregistrée
+SubscriptionReminderEmail=rappel de contribution
 CardContent=Contenu de votre carte membre
+ThisIsContentOfYourMembershipRequestWasReceived=Nous tenons à vous informer que votre demande d'adhésion a été reçue.<br><br>
+ThisIsContentOfYourMembershipWasValidated=Nous tenons à vous informer que votre adhésion a été validée avec les informations suivantes :<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=Nous tenons à vous informer que votre nouvel abonnement a été enregistré. Veuillez trouver ci-joint votre facture.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=Nous tenons à vous informer que votre abonnement est sur le point d'expirer ou a déjà expiré (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Nous espérons que vous le renouvellerez.<br><br>
+ThisIsContentOfYourCard=Ceci est un résumé des informations dont nous disposons à votre sujet. Veuillez nous contacter si quelque chose est incorrect.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Objet de l'email de notification reçu en cas d'auto-inscription d'un invité
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Contenu de l'email de notification reçu en cas d'auto-inscription d'un invité
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Modèle d'e-mail à utiliser pour envoyer un e-mail à un membre lors de l'inscription automatique des membres
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Modèle d'e-mail à utiliser pour envoyer un e-mail à un membre lors de la validation du membre
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Modèle d'e-mail à utiliser pour envoyer un e-mail à un membre lors d'un nouvel enregistrement de contribution
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Modèle d'e-mail à utiliser pour envoyer un rappel par e-mail lorsque la contribution est sur le point d'expirer
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Modèle d'e-mail à utiliser pour envoyer un e-mail à un membre lors de l'annulation de son adhésion
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Modèle d'e-mail à utiliser pour envoyer un e-mail à un membre en cas d'exclusion d'un membre
+DescADHERENT_MAIL_FROM=Email de l'expéditeur pour les emails automatiques
 DescADHERENT_ETIQUETTE_TYPE=Format de la page des étiquettes
 DescADHERENT_ETIQUETTE_TEXT=Texte imprimé sur les feuilles d'adresses des membres
 DescADHERENT_CARD_TYPE=Format de la page des cartes
@@ -60,18 +136,69 @@ DescADHERENT_CARD_HEADER_TEXT=Texte imprimé au dessus des cartes membres
 DescADHERENT_CARD_TEXT=Texte imprimé sur les cartes membres (aligner sur la gauche)
 DescADHERENT_CARD_TEXT_RIGHT=Texte imprimé sur les cartes membres (aligner à droite)
 DescADHERENT_CARD_FOOTER_TEXT=Texte imprimé au bas des cartes membres
+ShowTypeCard=Afficher le type '%s'
 HTPasswordExport=Génération de fichier htpassword
+NoThirdPartyAssociatedToMember=Aucun tiers n'est associé à ce membre
+MembersAndSubscriptions=Membres et cotisations
 MoreActions=Action complémentaire sur l'enregistrement
 MoreActionBankDirect=Créer une entrée directe sur un compte bancaire
 MoreActionBankViaInvoice=Créer une facture et un paiement sur un compte bancaire
 MoreActionInvoiceOnly=Créer une facture sans paiement
+LinkToGeneratedPages=Génération de cartes de visite ou de fiches d'adresses
 LinkToGeneratedPagesDesc=Cet écran vous permet de générer des fichiers PDF avec des cartes de visite pour tous vos membres ou un membre particulier.
 DocForAllMembersCards=Générer des cartes de visite pour tous les membres
 DocForOneMemberCards=Générer des cartes de visite pour un membre particulier
 DocForLabels=Générer des feuilles d'adresses
+SubscriptionPayment=Paiement des cotisations
+LastSubscriptionDate=Date du dernier versement de cotisation
+LastSubscriptionAmount=Montant de la dernière cotisation
+LastMemberType=Dernier type de membre
 MembersStatisticsByState=Statistiques des membres par état / province
+NbOfMembers=Nombre total de membres
+NbOfActiveMembers=Nombre total de membres actifs actuels
 NoValidatedMemberYet=Aucun membre validé n'a été trouvé
+MembersByStateDesc=Cet écran vous montre les statistiques des membres par état/provinces/canton.
+MembersByTownDesc=Cet écran vous montre les statistiques des membres par ville.
+MembersByNature=Cet écran vous montre les statistiques des membres par nature.
+MembersByRegion=Cet écran vous montre les statistiques des membres par région.
 MembersStatisticsDesc=Choisissez les statistiques que vous souhaitez lire ...
+LastMemberDate=Dernière date d'adhésion
+LatestSubscriptionDate=Date de la dernière contribution
+MemberNature=Nature du membre
+MembersNature=Nature des membres
+Public=%s puis publier mon adhésion dans <a target="_blank" href="%s">le registre public</a>
 NewMemberbyWeb=Nouveau membre ajouté. En attente d'approbation
 NewMemberForm=Nouveau formulaire de membre
+SubscriptionsStatistics=Statistiques des contributions
+NbOfSubscriptions=Nombre de contributions
+AmountOfSubscriptions=Montant collecté à partir des cotisations des membres
 TurnoverOrBudget=Chiffre d'affaires (pour une entreprise) ou Budget (pour une fondation)
+DefaultAmount=Montant par défaut du paiement de l'adhésion (utilisé uniquement si aucun montant n'est défini au niveau du type de membre)
+MinimumAmount=Montant minimum du paiement de l'adhésion (priorité sur les éventuels montants par défaut)
+CanEditAmount=Le montant de l'adhésion peut être défini par le membre
+CanEditAmountDetail=Le visiteur peut choisir/modifier le montant de sa contribution quel que soit le type de membre
+AmountIsLowerToMinimumNotice=Le montant est inférieur au minimum %s
+MEMBER_NEWFORM_PAYONLINE=Après l'inscription en ligne, passez automatiquement à la page de paiement en ligne
+MembersStatisticsByProperties=Statistiques des membres par nature
+SubscriptionRecorded=Contribution enregistrée
+NoEmailSentToMember=Aucun email envoyé au membre
+EmailSentToMember=Courriel envoyé au membre à %s
+SendReminderForExpiredSubscriptionTitle=Envoyer un rappel par e-mail pour une adhésion expirée
+SendReminderForExpiredSubscription=Envoyer un rappel par e-mail aux membres lorsque l'adhésion est sur le point d'expirer (le paramètre est le nombre de jours avant la fin de l'adhésion pour envoyer le rappel. Il peut s'agir d'une liste de jours séparés par un point-virgule, par exemple « 10 ; 5 ; 0 ; -5 »)
+YouMayFindYourInvoiceInThisEmail=Vous pouvez trouver votre facture jointe à cet e-mail
+XMembersClosed=%s membre(s) fermé
+ForceMemberNature=Nature du membre de la force (individuel ou société)
+CreateDolibarrLoginDesc=La création d'un identifiant utilisateur pour les membres leur permet de se connecter à l'application. En fonction des autorisations accordées, ils pourront par exemple consulter ou modifier eux-mêmes leur dossier.
+CreateDolibarrThirdPartyDesc=Un tiers est l'entité juridique qui sera utilisée sur la facture si vous décidez de générer une facture pour chaque contribution. Vous pourrez le créer ultérieurement lors du processus d'enregistrement de la contribution.
+MemberLastname=Nom du membre
+MemberSubscriptionStartFirstDayOf=Forcer la date suggérée d'une adhésion à correspondre au premier jour d'une
+MemberSubscriptionStartAfter=Délai minimum avant l'entrée en vigueur de la date de début d'une première souscription d'adhésion (hors renouvellements)
+MemberSubscriptionStartAfterDesc=Exemple : +3m = +3 mois, -5d = -5 jours, +1Y = +1 an
+MemberSubscriptionStartAfterDesc2=Il s'agit de la date suggérée lors de la création d'une première souscription d'adhésion par rapport à la date du jour. Pour le renouvellement, la date suggérée par défaut restera la date de fin de l'adhésion précédente.
+SubscriptionLinkedToConciliatedTransaction=L'adhésion est liée à une transaction conciliée donc cette modification n'est pas autorisée.
+ConfirmMassSubsriptionCreation=Confirmer la création de l'abonnement
+ConfirmMassSubsriptionCreationQuestion=Êtes-vous sûr de vouloir créer le(s) abonnement(s) %s sélectionné(s) ?
+XSubsriptionCreated=%s abonnement(s) créé(s)
+XSubsriptionErrors=%s abonnement(s) où il y a eu une erreur
+CreateSubscription=Créer un abonnement
+WarningNoComplementaryActionDone=Aucune action complémentaire sur l'enregistrement ne sera exécutée avec cette action de masse
diff --git a/htdocs/langs/fr_CA/salaries.lang b/htdocs/langs/fr_CA/salaries.lang
index f7868851069..e1a590d4d05 100644
--- a/htdocs/langs/fr_CA/salaries.lang
+++ b/htdocs/langs/fr_CA/salaries.lang
@@ -1,7 +1,25 @@
 # Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte (issu du plan comptable) utilisé par défaut pour les « utilisateurs » sur les salaires
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Le compte dédié défini sur la fiche utilisateur sera utilisé uniquement pour la comptabilité auxiliaire. Celui-ci sera utilisé pour le Grand Livre, mais également comme valeur par défaut de la comptabilité auxiliaire si aucun compte comptable utilisateur dédié n'est défini sur l'utilisateur.
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Par défaut, laissez vide l'option « Créer automatiquement un paiement total » lors de la création d'un salaire
 Salary=Salaires
+NewSalaryPayment=Nouvelle carte de salaire
+AddSalaryPayment=Ajouter un paiement de salaire
+SalaryID=ID de salaire
 SalaryPayment=Paiement Salaire
 SalariesPayments=Paiements salaires
 ShowSalaryPayment=Afficher paiement de salaires
 THM=Taux horaire moyen
 TJM=Taux journalier moyen
+THMDescription=Cette valeur peut être utilisée pour calculer le coût du temps consommé sur un projet saisi par les utilisateurs si le module projet est utilisé
+TJMDescription=Cette valeur est actuellement à titre informatif uniquement et n'est utilisée pour aucun calcul
+LastSalaries=Derniers salaires de %s
+SalariesStatistics=Statistiques sur les salaires
+ConfirmDeleteSalaryPayment=Voulez-vous supprimer ce versement de salaire ?
+FillFieldFirst=Remplissez d'abord le champ employé
+UpdateAmountWithLastSalary=Montant défini du dernier salaire
+MakeTransferRequest=Faire une demande de transfert
+VirementOrder=Demande de virement bancaire
+WithdrawalReceipt=Ordre de virement bancaire
+OrderWaiting=Commande en attente
+FillEndOfMonth=Remplir avec la fin du mois
diff --git a/htdocs/langs/fr_CA/website.lang b/htdocs/langs/fr_CA/website.lang
index 9ada32620d2..343f62fb804 100644
--- a/htdocs/langs/fr_CA/website.lang
+++ b/htdocs/langs/fr_CA/website.lang
@@ -1,13 +1,219 @@
 # Dolibarr language file - Source file is en_US - website
-DeleteWebsite=Supprimer site internet
-WEBSITE_PAGENAME=Nom / alias de la page
+WebsiteSetupDesc=Créez ici les sites web que vous souhaitez utiliser. Rendez-vous ensuite dans le menu Sites web pour les éditer.
+DeleteWebsite=Supprimer le site Web
+ConfirmDeleteWebsite=Etes-vous sûr de vouloir supprimer ce site web ? Toutes ses pages et son contenu seront également supprimés. Les fichiers téléchargés (comme dans le répertoire medias, le module ECM, ...) resteront.
+WEBSITE_TYPE_CONTAINER=Type de page/conteneur
+WEBSITE_PAGENAME=Nom de la page/alias
+WEBSITE_ALIASALT=Noms/alias de pages alternatifs
+WEBSITE_ALIASALTDesc=Utilisez ici la liste des autres noms/alias afin que la page soit également accessible en utilisant ces autres noms/alias (par exemple l'ancien nom après avoir renommé l'alias pour que le backlink sur l'ancien lien/nom continue de fonctionner). La syntaxe est :<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL du fichier CSS externe
+WEBSITE_CSS_INLINE=Contenu du fichier CSS (commun à toutes les pages)
+WEBSITE_HTACCESS=Fichier .htaccess du site Web
+WEBSITE_MANIFEST_JSON=Fichier manifest.json du site Web
+WEBSITE_KEYWORDSDesc=Utilisez une virgule pour séparer les valeurs
+EnterHereLicenseInformation=Entrez ici la LICENCE du code du site web. Si vous distribuez votre site web en tant que modèle, le fichier sera inclus dans le package temptate.
+HtmlHeaderPage=En-tête HTML (spécifique à cette page uniquement)
+PageNameAliasHelp=Nom ou alias de la page.<br>Cet alias est également utilisé pour falsifier une URL SEO lorsque le site Web est exécuté à partir d'un hôte virtuel d'un serveur Web (comme Apacke, Nginx, ...). Utilisez le bouton "<strong>%s</strong>" pour modifier cet alias.
+EditTheWebSiteForACommonHeader=Remarque : si vous souhaitez définir un en-tête personnalisé pour toutes les pages, modifiez l'en-tête au niveau du site plutôt qu'au niveau de la page/du conteneur.
 MediaFiles=Médiathèque
+EditCss=Modifier les propriétés du site Web
 EditMenu=Menu Edition
+EditMedias=Modifier les médias
+EditPageMeta=Modifier les propriétés de la page/du conteneur
+EditInLine=Modifier en ligne
+AddWebsite=Ajouter un site Web
+WebsitePage=Page du site Web
+Webpage=Page Web/conteneur
+AddPage=Ajouter une page/un conteneur
+PreviewOfSiteNotYetAvailable=L'aperçu de votre site Web <strong>%s</strong> n'est pas encore disponible. Vous devez d'abord '<strong>Importer un modèle de site Web complet</strong>' ou simplement '<strong>Ajouter une page/un conteneur</strong>'.
+RequestedPageHasNoContentYet=La page demandée avec l'identifiant %s n'a pas encore de contenu, ou le fichier cache .tpl.php a été supprimé. Modifiez le contenu de la page pour résoudre ce problème.
+SiteDeleted=Site Web « %s » supprimé
+PageContent=Page/Conteneur
+PageDeleted=Page/Contenair '%s' du site Web %s supprimé
+PageAdded=Page/Contenair '%s' ajoutée
 ViewSiteInNewTab=Afficher le site dans un nouvel onglet
 ViewPageInNewTab=Afficher la page dans un nouvel onglet
 ViewWebsiteInProduction=Afficher le site Web à l'aide d'URL d'accueil
+Virtualhost=Hébergeur virtuel ou nom de domaine
+VirtualhostDesc=Le nom de l'hôte virtuel ou du domaine (par exemple : www.monsiteweb.com, magrandeentreprise.net, ...)
+ToDeployYourWebsiteOnLiveYouHave3Solutions=Pour déployer ce site en ligne, vous avez 3 solutions...
+SetHereVirtualHost=<u>Utiliser avec Apache/NGinx/...</u><br>Créez sur votre serveur Web (Apache, Nginx, ...) un hôte virtuel dédié avec PHP activé et un répertoire racine sur<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Exemple à utiliser dans la configuration d’un hôte virtuel Apache :
+YouCanAlsoTestWithPHPS=<u>Utiliser avec le serveur PHP intégré</u><br>Dans un environnement de développement, vous préférerez peut-être tester le site avec le serveur Web PHP intégré en exécutant
+YouCanAlsoDeployToAnotherWHP=<u>Exécutez votre site Web dans un fournisseur d'hébergement Web Dolibarr</u><br>Si vous n'avez pas de serveur Web comme Apache ou NGinx disponible sur Internet, vous pouvez exporter et importer votre site Web sur une autre instance Dolibarr fournie par un autre fournisseur d'hébergement Dolibarr qui offre une intégration complète avec le module Site Web. Vous pouvez trouver une liste de certains fournisseurs d'hébergement Dolibarr sur <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a>
+CheckVirtualHostPerms=Vérifiez également que l'utilisateur de l'hôte virtuel (par exemple www-data) dispose des autorisations <strong>%s</strong> sur les fichiers dans <br><strong>%s</strong>
+TestDeployOnWeb=Tester/déployer sur le Web
+PreviewSiteServedByWebServer=<u>Aperçu %s dans un nouvel onglet.</u><br><br>Le %s sera servi par un serveur Web externe (comme Apache, Nginx, IIS). Vous devez installer et configurer ce serveur avant de pointer vers le répertoire :<br><strong>%s</strong><br>URL servie par un serveur externe :<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Aperçu %s dans un nouvel onglet.</u><br><br>Le %s sera servi par le serveur Dolibarr, il n'a donc pas besoin d'installer de serveur Web supplémentaire (comme Apache, Nginx, IIS).<br>L'inconvénient est que les URL des pages ne sont pas conviviales et commencez par le chemin de votre Dolibarr.<br>URL servie par Dolibarr :<br><strong>%s</strong><br><br>Pour déployer ou tester en utilisant votre propre serveur Web externe (comme Apache, Nginx, Lighttp), utilisez le lien "<br> class='notranslate'>%s</span>".
+VirtualHostUrlNotDefined=L'URL de l'hôte virtuel servi par le serveur Web externe n'est pas définie
+NoPageYet=Pas encore de pages
+YouCanCreatePageOrImportTemplate=Vous pouvez créer une nouvelle page ou importer un modèle de site Web complet
+SyntaxHelp=Aide sur des astuces de syntaxe spécifiques
+YouCanEditHtmlSourceckeditor=Vous pouvez modifier le code source HTML en utilisant le bouton « Source » dans l'éditeur.
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Vous pouvez inclure du code PHP dans cette source en utilisant les balises <strong>&lt;?php ?&gt;</strong>. Les variables globales suivantes sont disponibles : $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> Vous pouvez également inclure le contenu d'une autre page/conteneur avec la syntaxe suivante :<br><strong>&lt;?php includeContainer('alias_du_conteneur_à_inclure'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> Vous pouvez créer une redirection vers une autre page/conteneur avec la syntaxe suivante (Remarque : n'affichez aucun contenu avant une redirection) :<br><strong>&lt;?php redirectToContainer('alias_du_conteneur_vers_la_rediriger'); ?&gt;</strong><br>Vous pouvez également effectuer une redirection avec des paramètres GET :<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> Pour ajouter un lien vers une autre page, utilisez la syntaxe :<br><strong>&lt;a href="alias_de_la_page_à_lier_à.php"&gt;monlien&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> Vous pouvez définir dynamiquement le titre de la page et les <strong>balises méta SEO</strong> (titre, mots-clés, description). Définissez simplement les variables suivantes :<br> <code>$__PAGE__TITLE__ = "Valeur du titre …";</code><br> <code>$__PAGE__KEYWORDS__ = "mot-clé1, mot-clé2, mot-clé3 …"; // Séparé par des virgules</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> À inclure un <strong>lien pour télécharger</strong> un fichier stocké dans le répertoire <strong>documents</strong>, utilisez le wrapper <strong>document.php</strong> :<br>Exemple, pour un fichier dans documents/ecm (à enregistrer), la syntaxe est :<br> class='notranslate'><br></span><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Pour un fichier dans documents/medias (répertoire ouvert pour accès public), la syntaxe est :<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Pour un fichier partagé avec un lien de partage (accès ouvert à l'aide de la clé de hachage de partage du fichier), la syntaxe est :<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong>b0342f ccfda19bz0
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Pour inclure une <strong>image</strong> stockée dans le répertoire <strong>medias</strong> (répertoire ouvert au public), utilisez le chemin relatif commençant par <strong>/medias</strong>, exemple :<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=Pour une image partagée avec un lien de partage (accès libre à l'aide de la clé de hachage de partage du fichier), utilisez le wrapper :<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource3=Pour obtenir l'URL de l'image d'un objet PHP, utilisez<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=Pour obtenir l'URL d'une image à l'intérieur d'un contenu HTML d'un article, utilisez<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>Plus d'exemples de code HTML ou dynamique disponibles dans <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">la documentation wiki</a>.<br>
+ClonePage=Cloner une page/un conteneur
+CloneSite=Site de clonage
+SiteAdded=Site Web ajouté
+ConfirmClonePage=Veuillez saisir le code/alias de la nouvelle page et s'il s'agit d'une traduction de la page clonée.
+PageIsANewTranslation=La nouvelle page est une traduction de la page actuelle ?
+LanguageMustNotBeSameThanClonedPage=Vous clonez une page en tant que traduction. La langue de la nouvelle page doit être différente de celle de la page source.
+ParentPageId=ID de la page parente
+WebsiteId=ID du site Web
+CreateByFetchingExternalPage=Créez une page/un conteneur en récupérant la page à partir d'une URL externe...
+OrEnterPageInfoManually=Ou créez une page à partir de zéro ou à partir d'un modèle de page...
+FetchAndCreate=Récupérer et créer
+ExportSite=Exporter le site Web
+ImportSite=Importer un modèle de site Web
+IDOfPage=Identifiant de la page
+Banner=Bannière
+BlogPost=Article de blog
+WebsiteAccounts=Comptes de sites Web
+AddWebsiteAccount=Créer un compte sur le site Web
+BackToListForThirdParty=Retour à la liste pour les tiers
+MyContainerTitle=Titre de mon site Web
+AnotherContainer=Voici comment inclure le contenu d'une autre page/conteneur (vous pouvez avoir une erreur ici si vous activez le code dynamique car le sous-conteneur intégré peut ne pas exister)
+SorryWebsiteIsCurrentlyOffLine=Désolé, ce site est actuellement hors ligne. Veuillez revenir plus tard...
+OnlyEditionOfSourceForGrabbedContentFuture=Avertissement : la création d'une page Web en important une page Web externe est réservée aux utilisateurs expérimentés. Selon la complexité de la page source, le résultat de l'importation peut différer de l'original. De plus, si la page source utilise des styles CSS courants ou du JavaScript conflictuel, cela peut perturber l'apparence ou les fonctionnalités de l'éditeur de site Web lorsque vous travaillez sur cette page. Cette méthode est un moyen plus rapide de créer une page, mais il est recommandé de créer votre nouvelle page à partir de zéro ou d'un modèle de page suggéré.<br>Notez également que l'éditeur en ligne peut ne pas fonctionner correctement lorsqu'il est utilisé sur une page externe récupérée.
+GrabImagesInto=Récupérez également les images trouvées dans le CSS et la page.
+ImagesShouldBeSavedInto=Les images doivent être enregistrées dans le répertoire
+WebsiteRootOfImages=Répertoire racine pour les images du site Web
+AliasPageAlreadyExists=La page d'alias <strong>%s</strong> existe déjà
+CorporateHomePage=Page d'accueil de l'entreprise
+ExternalURLMustStartWithHttp=L'URL externe doit commencer par http:// ou https://
+ZipOfWebsitePackageToImport=Téléchargez le fichier Zip du package de modèles de site Web
+ZipOfWebsitePackageToLoad=ou Choisissez un package de modèles de sites Web intégrés disponible
+ShowSubcontainers=Afficher le contenu dynamique
+ThisPageIsTranslationOf=Cette page/conteneur est une traduction de
+ThisPageHasTranslationPages=Cette page/ce conteneur a une traduction
+NoWebSiteCreateOneFirst=Aucun site web n'a encore été créé. Créez-en un d'abord.
+DynamicPHPCodeContainsAForbiddenInstruction=Vous ajoutez du code PHP dynamique qui contient l'instruction PHP '<strong>%s</strong>' qui est interdite par défaut comme contenu dynamique (voir les options cachées WEBSITE_PHP_ALLOW_xxx pour augmenter la liste des commandes autorisées).
+NotAllowedToAddDynamicContent=Vous n'avez pas l'autorisation d'ajouter ou de modifier du contenu dynamique PHP sur des sites Web. Demandez la permission ou conservez simplement le code dans les balises PHP sans modification.
+ReplaceWebsiteContent=Rechercher ou remplacer le contenu du site Web
+DeleteAlsoJs=Supprimer également tous les fichiers JavaScript spécifiques à ce site Web ?
+DeleteAlsoMedias=Supprimer également tous les fichiers multimédias spécifiques à ce site Web ?
+MyWebsitePages=Les pages de mon site Web
+SearchReplaceInto=Rechercher | Remplacer par
+CSSContentTooltipHelp=Entrez ici le contenu CSS. Pour éviter tout conflit avec le CSS de l'application, veillez à préfixer toutes les déclarations avec la classe .bodywebsite. Par exemple :<br><br>#mycssselector, input.myclass:hover { ... }<br>doit être<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Remarque : si vous avez un fichier volumineux sans ce préfixe, vous pouvez utiliser « lessc » pour le convertir afin d'ajouter le préfixe .bodywebsite préfixe partout.
+LinkAndScriptsHereAreNotLoadedInEditor=Attention : ce contenu n'est affiché que lorsque le site est consulté depuis un serveur. Il n'est pas utilisé en mode édition. Si vous devez donc charger des fichiers JavaScript également en mode édition, ajoutez simplement votre balise « script src=... » dans la page.
+Dynamiccontent=Exemple d'une page avec un contenu dynamique
+EditInLineOnOff=Le mode « Modifier en ligne » est %s
+ShowSubContainersOnOff=Le mode d'exécution du « contenu dynamique » est %s
+YouTryToAccessToAFileThatIsNotAWebsitePage=Vous essayez d'accéder à une page qui n'est pas disponible.<br>(ref=%s, type=%s, status=%s)
+UseTextBetween5And70Chars=Pour de bonnes pratiques SEO, utilisez un texte entre 5 et 70 caractères
+MainLanguage=Langue principale
+PublicAuthorAlias=Alias d'auteur public
+ReplacementDoneInXPages=Remplacement effectué dans les pages ou conteneurs %s
+RSSFeedDesc=Vous pouvez obtenir un flux RSS des derniers articles de type « blogpost » en utilisant cette URL
+RegenerateWebsiteContent=Régénérer les fichiers cache du site Web
+AllowedInFrames=Autorisé dans les cadres
+DefineListOfAltLanguagesInWebsiteProperties=Définissez la liste de toutes les langues disponibles dans les propriétés du site Web.
+ConfirmGenerateSitemaps=Si vous confirmez, vous effacerez le fichier de plan de site existant...
+SitemapGenerated=Fichier de plan de site <b>%s</b> généré
+ImportFavicon=Icône de favori
+ErrorFaviconType=Le favicon doit être au format png
+ErrorFaviconSize=Le favicon doit avoir une taille de 16x16, 32x32 ou 64x64
+FaviconTooltip=Téléchargez une image qui doit être au format png (16x16, 32x32 ou 64x64)
+NextContainer=Page/conteneur suivant
+PreviousContainer=Page/conteneur précédent
+WebsiteMustBeDisabled=Le site Web doit avoir le statut « %s »
+WebpageMustBeDisabled=La page Web doit avoir le statut « %s »
+SetWebsiteOnlineBefore=Lorsque le site Web est hors ligne, toutes les pages sont hors ligne. Modifiez d'abord le statut du site Web.
+PagesViewedPreviousMonth=Pages consultées (mois précédent)
+PagesViewedTotal=Pages consultées (total)
+WebsiteTypeLabel=Type de site Web
+WebsiteTypeDolibarrWebsite=Site Web (Module Sites Web CMS)
+WebsiteTypeDolibarrPortal=Portail Web natif et prêt à l'emploi (Module Portail Web)
+NewWebsiteAccount=Nouveaux comptes pour les sites Web
+ModuleWebPortalDesc=Un portail Web natif prêt à l'emploi pour les clients, fournisseurs, partenaires ou membres
+WebPortalDescription=Module de portail Web public pour l'adhésion et le partenariat
+WebPortalSetup=Configuration du portail Web
+WebPortalCSS=Portail Web CSS
+WebPortalSetupPage=Page de configuration du portail Web
+WEBPORTAL_TITLE=Nom de marque sur l'en-tête de la page publique
+UserAccountForWebPortalAreInThirdPartyTabHelp=Les comptes utilisateurs pour WebPortal peuvent être définis sur chaque carte tierce dans l'onglet Comptes de site Web
+WebPortalAccessEdit=Modifiable
+WEBPORTAL_MEMBER_CARD_ACCESS=Activer l'accès au dossier d'adhésion
+WebPortalMemberCardAccessHelp=Activer l'accès au dossier d'adhésion (masqué / visible ou modifiable)
+WEBPORTAL_PARTNERSHIP_CARD_ACCESS=Activer l'accès au dossier de partenariat
+WebPortalPartnerShipCardAccessHelp=Activer l'accès à l'enregistrement du partenariat (masqué / visible ou modifiable)
+WEBPORTAL_PROPAL_LIST_ACCESS=Activer l'accès aux propositions
+WEBPORTAL_ORDER_LIST_ACCESS=Activer l'accès aux commandes
+WEBPORTAL_INVOICE_LIST_ACCESS=Activer l'accès aux factures
+WebPortalUserLoggedHelp=Cet utilisateur est utilisé pour mettre à jour les cartes
+WebPortalHomeTitle=Accueillir
 WebPortalPropalListMenu=Propositions commerciales
 WebPortalPropalListTitle=Propositions commerciales
+WebPortalPropalListDesc=Vous trouverez ici toutes vos propositions
+WebPortalPropalListNothing=Propositions non trouvées
+WebPortalOrderListMenu=Commandes de vente
+WebPortalOrderListTitle=Commandes de vente
+WebPortalOrderListDesc=Vous retrouverez ici toutes vos commandes de vente
+WebPortalInvoiceListDesc=Vous retrouverez ici toutes vos factures
+WebPortalMemberCardMenu=Membre
+WebPortalMemberCardTitle=Carte de membre
+WebPortalMemberCardDesc=Il s'agit d'informations relatives à votre adhésion
+WebPortalPartnershipCardTitle=Carte de partenariat
+WebPortalPartnershipCardDesc=Carte de partenariat
+WEBPORTAL_LOGIN_BACKGROUND=URL de l'image de connexion en arrière-plan
+WEBPORTAL_BANNER_BACKGROUND=Contexte pour la bannière
+WEBPORTAL_BANNER_BACKGROUND_IS_DARK=Utiliser un thème sombre pour la bannière
+WebPortalErrorPageNotExist=Page inexistante
+WebPortalErrorAuthentication=Erreur d'authentification
+WebPortalErrorFetchLoggedThirdParty=Erreur lors du chargement d'un tiers (Id : %s)
+WebPortalErrorFetchLoggedMember=Erreur lors du chargement du membre (Id : %s)
+WebPortalErrorFetchLoggedPartnership=Erreur lors du chargement du partenariat (Identifiant tiers : %s, Identifiant membre : %s)
+DownloadZip=Télécharger le zip
+WebPortalOrder=Bon de commande
 WebPortalPropal=Proposition
+ExportSiteLabel=Cliquez ici pour exporter le site Web en téléchargeant un fichier zip
+ExportSiteGitLabel=Cliquez ici pour exporter le site Web dans un répertoire local du serveur
+ExportPath=Chemin d'accès au fichier d'exportation
+SourceFiles=* Si le chemin est absolu, il doit commencer par un /<br>* Sinon, il sera dans install/doctemplates/websites/ suivi du chemin saisi.
+PortionOfPage=Partie de la page
+ServiceComponent=Services (ajax, api, ...)
+variableNotDefined=Aucun %s n'est défini. Veuillez terminer votre configuration.
+viewMyCustomerAccount=Voir mon compte client
+freeShipping=Livraison gratuite!
+noProducts=Aucun produit
+pricesMayVaryDependingOnYourCountry=Les prix peuvent varier selon votre pays.
+checkOut=Vérifier
+continueShopping=Continuer les achats
+proceedToCheckout=Passer à la caisse
+totalProductsTaxIncl=Total des produits (taxes incl.)
+totalShippingTaxIncl=Frais de port (taxes incluses)
+totalTaxIncl=Total (taxes incl.)
+view=Voir:
+priceLowestFirst=Prix : le plus bas en premier
+referenceHighestFirst=Référence : Le plus élevé en premier
+showAll=Tout afficher
+nbrOfProducts=Il existe des produits %s.
+backHome=Retour à l'accueil
+priceDrop=Baisse de prix
+contactSupport=Comment contacter le support
+yourCompanyInformation=Informations sur votre entreprise
+firstnameContainsLettersOnly=<b>Le prénom</b> doit contenir uniquement des lettres et des espaces
+lastnameContainsLettersOnly=<b>Le nom de famille</b> doit contenir uniquement des lettres et des espaces
+errorOccurred=Une erreur s'est produite.
+errorsOccurred=Il y a des erreurs %s%s
+register=Registre
+noValidAccount=Aucun compte valide trouvé pour cet email.
+invalidPassword=Mot de passe invalide.
+welcomeToYourAccount=Bienvenue sur votre compte. Vous pourrez y gérer toutes vos informations personnelles et vos commandes.
+orderHistoryDetails=Historique et détails des commandes
+newPasswordCriteria=<b>Le nouveau mot de passe</b> doit répondre aux critères suivants :<br>- 12 caractères<br>- 1 lettre majuscule<br>- 1 chiffre<br>- Aucun caractère spécial<br>- Évitez de répéter les caractères plus de 3 fois<br>
+noOrderFounded=Aucune commande fondée.
+orderRef=Référence de commande
+anIssueNoOrderFounded=Il semble qu'il y ait un problème. Aucune commande fondée.
+orderReference=Référence de commande
+placedOn=placé sur
+invoiceAddress=Adresse de facturation
 unitPrice=Prix unitaire tx incl.
+yourShoppingCart=Votre panier
+cartSummary=Résumé du panier d'achat
+LoginCheckout=Connectez-vous et passez à la caisse
+youWillBeRedirectedToOrderPage=Vous serez bientôt redirigé vers la page des détails de la commande.
diff --git a/htdocs/langs/fr_CH/members.lang b/htdocs/langs/fr_CH/members.lang
index 6592685c3aa..61520955329 100644
--- a/htdocs/langs/fr_CH/members.lang
+++ b/htdocs/langs/fr_CH/members.lang
@@ -97,7 +97,6 @@ LastSubscriptionAmount=Montant de la dernière cotisation
 LastMemberType=Dernier type de membre
 NbOfMembers=Nombre total de membres
 NbOfActiveMembers=Nombre total de membres actifs actuellement
-MembersByCountryDesc=Cet écran vous présente une vue statistique du nombre de membres par pays. Le graphique utilise toutefois le service en ligne de graphique de Google et n'est opérationnel uniquement que si une connexion internet est disponible.
 MembersByStateDesc=Cet écran vous présente une vue statistique du nombre de membres par département/province/canton.
 MembersByTownDesc=Cet écran vous présente une vue statistique du nombre de membres par ville.
 MembersByNature=Cet écran vous montre les statistiques sur les membres par nature.
@@ -105,7 +104,6 @@ MembersByRegion=Cet écran vous montre les statistiques sur les membres par rég
 NewMemberbyWeb=Nouveau membre ajouté. En attente d'approbation
 NewMemberForm=Nouveau type de membre
 SubscriptionsStatistics=Statistiques des cotisations
-CanEditAmount=Le montant de la cotisation peut être défini par le membre
 CanEditAmountDetail=Le visiteur peut choisir/modifier le montant de sa cotisation quel que soit le type de membre
 MembersStatisticsByProperties=Statistiques des membres par nature
 SubscriptionRecorded=Cotisation enregistrée
diff --git a/htdocs/langs/fr_CM/companies.lang b/htdocs/langs/fr_CM/companies.lang
index a108c3bf8af..bda989ab23a 100644
--- a/htdocs/langs/fr_CM/companies.lang
+++ b/htdocs/langs/fr_CM/companies.lang
@@ -88,7 +88,7 @@ PL_UNKNOWN=Inconnue
 StatusProspect3=Contacté
 ChangeContactDone=Changer le statut en "Contacté"
 ProspectsByStatus=Prospects par statut
-ExportDataset_company_2=Les contacts et leurs propriétés
+ExportDataset_company_2=Contacts/adresses et attributs supplémentaires de tiers
 ImportDataset_company_1=Les tiers et leurs propriétés
 ImportDataset_company_2=Contacts/adresses et attributs supplémentaires de tiers
 AddAddress=Ajoutez l'adresse
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index b5d380188cb..4f6d2737719 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=La vérification de l'intégrité des fichier
 FileIntegritySomeFilesWereRemovedOrModified=La vérification de l'intégrité des fichiers a échoué. Des fichiers ont été modifiés, déplacés ou ajoutés.
 GlobalChecksum=Checksum global
 MakeIntegrityAnalysisFrom=Faire l'analyse de l'intégrité des fichiers de l'application depuis
-LocalSignature=La signature locale intégrée (moins fiable)
-RemoteSignature=La signature sur le serveur distant (plus fiable)
+LocalSignature=Signature locale intégrée
+RemoteSignature=Signature sur le serveur distant
 FilesMissing=Fichiers manquants
 FilesUpdated=Fichiers modifiés
 FilesModified=Fichiers modifiés
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Utilisé par certaines options de l'agenda uniquement
 Security=Sécurité
 Passwords=Mots de passe
 DoNotStoreClearPassword=Chiffrer les mots de passe stockés dans la base de données.
-MainDbPasswordFileConfEncrypted=Chiffrer le mot de passe de la base dans le fichier conf.php. Il est fortement recommandé d'activer cette option.
+MainDbPasswordFileConfEncrypted=Masquer le mot de passe de la base de données stocké dans conf.php. Il est recommandé d'activer cette option.
 InstrucToEncodePass=Pour avoir le mot de passe de la base encodé dans le fichier de configuration <b>conf.php</b>, remplacer dans ce fichier la ligne<br><b>$dolibarr_main_db_pass="...";</b><br>par<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Pour avoir le mot de passe de la base décodé (en clair) dans le fichier de configuration <b>conf.php</b>, remplacer dans ce fichier la ligne<br><b>$dolibarr_main_db_pass="crypted:...";</b><br>par<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection des PDF générés. Activation NON recommandée (rend inopérante la génération de PDF de masse)
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Point géométrique
 ExtrafieldMultiPointGeo=Multi-point géométrique
 ExtrafieldLinestringGeo=Ligne géométrique
 ExtrafieldPolygonGeo=Polygone géométrique
+ExtrafieldStars=Étoiles
 ComputedFormula=Champ calculé
-ComputedFormulaDesc=Vous pouvez entrer ici une formule en utilisant d’autres propriétés de l'objet ou tout autre code PHP pour obtenir une valeur calculée dynamique. Vous pouvez utiliser toutes les formules compatibles PHP, y compris l'opérateur conditionnel "?", ainsi que les objets globaux suvants : <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>ATTENTION</strong> : Si vous avez besoin des propriétés d’un objet non disponible, il vous suffit de le charger même dans votre formule comme dans le deuxième exemple.<br>L'utilisation d'un champ calculé signifie que vous ne pouvez pas entrer vous-même une valeur depuis l’interface. De même, en cas d'erreur de syntaxe, la formule peut ne rien retourner.<br><br>Exemple de formule :<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2) : ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Exemple pour recharger l’object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1')<br><br>Autre exemple de formule pour forcer le chargement d'un objet et de ses objets parents :<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Projet parent introuvable’
+ComputedFormulaDesc=Vous pouvez entrer ici une formule utilisant les propriétés objet ou tout code PHP pour obtenir des valeurs dynamiques. Vous pouvez utiliser toute formule compatible PHP, incluant l'opérateur conditionnel "?", et les objets globaux suivants : <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>ATTENTION</strong> : Seulement quelques propriétés de l'objet $object pourraient être disponibles. Si vous avez besoin de propriétés non chargées, créez vous-même une instance de l'objet dans votre formule, comme dans le deuxième exemple.<br>Utiliser un champs calculé signifie que vous ne pouvez pas entrer vous-même toute valeur à partir de l'interface. En outre, s'il y a une erreur de syntaxe, la formule pourrait ne rien retourner.<br><br>Exemple de formule:<br> $objectoffield->id < 10 ? round($objectoffield->id / 2, 2) : ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Exemple pour recharger l'objet: <br>((($reloadedobj = new Societe($db)) && $reloadedobj->fetchNoCompute($objectoffield->id) > 0) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')<br><br>Un autre exemple de formule pour forcer le rechargement d'un objet et de son objet parent:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Objet parent projet non trouvé'
 Computedpersistent=Stocker le champ calculé
 ComputedpersistentDesc=Les champs supplémentaires calculés seront stockés dans la base de données. Toutefois, la valeur ne sera recalculée que lorsque l'objet de ce champ sera modifié. Si le champ calculé dépend d'autres objets ou de données globales, cette valeur peut être fausse !!
 ExtrafieldParamHelpPassword=Laisser ce champ vide signifie que cette valeur sera stockée SANS cryptage (le champ est juste caché par des étoiles à l'écran).<br><br>Entrez la valeur 'dolcrypt' pour encoder la valeur avec un algorithme de cryptage réversible. Les données en clair peuvent toujours être connues et modifiées, mais elles sont cryptées dans la base de données.<br><br>Entrez 'auto' (ou 'md5', 'sha256', 'password_hash', ...) pour utiliser l'algorithme de cryptage de mot de passe par défaut (ou md5, sha256, password_hash...) afin d'enregistrer le mot de passe haché non réversible dans la base de données (aucun moyen de récupérer la valeur originale).
@@ -493,13 +494,13 @@ InstalledInto=Installé dans le répertoire %s
 BarcodeInitForThirdparties=Initialisation du code-barre en masse pour les tiers
 BarcodeInitForProductsOrServices=Initialisation ou purge en masse des codes-barre des produits ou services
 CurrentlyNWithoutBarCode=Actuellement, vous avez <strong>%s</strong> enregistrements sur <strong>%s</strong> %s sans code barre défini.
-InitEmptyBarCode=Valeur d'initialisation pour les %s codes à barres vides
+InitEmptyBarCode=Initialiser une valeur pour les %s codes barres vides
 EraseAllCurrentBarCode=Effacer toutes les valeurs de code-barre
 ConfirmEraseAllCurrentBarCode=Etes-vous sur de vouloir effacer toutes les valeurs de code-barre ?
 AllBarcodeReset=Tous les codes-barre ont été supprimés
 NoBarcodeNumberingTemplateDefined=Aucun modèle de numérotation de code-barre n'a été activé dans la configuration du module code-barre.
 EnableFileCache=Utiliser des fichiers caches
-ShowDetailsInPDFPageFoot=Ajout de plus d'informations dans le pied de page de vos documents pdf, comme l'adresse de votre société, ou le nom du directeur (pour compléter les identifiants professionnels, le capital de la société et le numéro de TVA intra communautaire)
+ShowDetailsInPDFPageFoot=Ajouter plus d'informations dans le pied de page de vos documents PDF, comme l'adresse de votre société, ou le nom du directeur (pour compléter les identifiants professionnels, le capital de la société et le numéro de TVA intra communautaire)
 NoDetails=Pas plus de détails dans le pied-de-page
 DisplayCompanyInfo=Afficher l'adresse de la société
 DisplayCompanyManagers=Afficher le nom des responsables
@@ -519,7 +520,7 @@ WarningPHPMailB=- Si le domaine de votre email (la partie mymaildomain.com dans
 WarningPHPMailC=- Utiliser le serveur SMTP de votre propre fournisseur de services de messagerie pour envoyer des e-mails est également intéressant afin que tous les e-mails envoyés depuis l'application soient également enregistrés dans votre répertoire "Envoyés" de votre boîte aux lettres.
 WarningPHPMailD=Il est donc recommandé de changer la méthode d'envoi des e-mails à la valeur "SMTP".
 WarningPHPMailDbis=Si vous voulez vraiment conserver la méthode par défaut "PHP" pour envoyer des e-mails, ignorez simplement cet avertissement ou supprimez-le en %scliquant ici%s.
-WarningPHPMail2=Si votre fournisseur de messagerie SMTP a besoin de restreindre le client de messagerie à certaines adresses IP (très rare), voici l'adresse IP du mail user agent (MUA) de votre application CRM ERP : <strong> %s </strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=Si le nom de domaine de votre adresse e-mail d'expéditeur est protégé par un enregistrement SPF (demandez à votre fournisseur de nom de domaine), vous devez inclure les adresses IP ou entrées suivantes dans l'enregistrement SPF du DNS de votre domaine: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=Si le nom de domaine dans votre adresse e-mail d'expéditeur est protégé par un enregistrement DMARC différent de p=none (demandez à votre registraire de nom de domaine), vous devez supprimer votre enregistrement DMARC ou le définir sur p=none comme le fait @gmail.com) ou utiliser une autre méthode d'envoi.
 SPFAndDMARCInformation=Enregistrement DNS SPF et DMARC pour les principales adresses e-mail
@@ -567,8 +568,8 @@ Module10Name=Comptabilité (simplifié)
 Module10Desc=Activation de rapports simplistes de comptabilité (chiffre d'affaires, journaux) basés sur les données directes en base. Pas de ventilation en Grand Livre comptable.
 Module20Name=Propositions commerciales
 Module20Desc=Gestion des devis/propositions commerciales
-Module22Name=Emailing
-Module22Desc=Administration et envoi d'emails en masse
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Énergie
 Module23Desc=Suivi de la consommation des énergies
 Module25Name=Commandes
@@ -847,10 +848,10 @@ Permission212=Commander les lignes
 Permission213=Activer une ligne
 Permission214=Configurer la téléphonie
 Permission215=Configurer les fournisseurs
-Permission221=Consulter les emailings
-Permission222=Créer/modifier les emailings (sujet, destinataires, etc.)
-Permission223=Valider les emailings (permet leur envoi)
-Permission229=Supprimer les emailings
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Visualiser les destinataires et les infos
 Permission238=Envoyer les emailings manuellement
 Permission239=Supprimer les emailings après leur validation ou leur envoi
@@ -1105,6 +1106,7 @@ DictionaryStaff=Effectifs
 DictionaryAvailability=Délai de livraison
 DictionaryOrderMethods=Méthodes de commande
 DictionarySource=Origines des propales/commandes
+DictionaryAccountancyReport=Rapports personnalisés Comptabilité
 DictionaryAccountancyCategory=Groupes personalisés pour les rapports
 DictionaryAccountancysystem=Modèles de plan comptable
 DictionaryAccountancyJournal=Journaux comptables
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Retour liste des dictionnaires
 TypeOfRevenueStamp=Type de timbre fiscal
 VATManagement=Gestion TVA
 VATIsUsedStandard=Lors de la création de documents (devis, factures, commandes...), le taux de la taxe sur les ventes par défaut est fixé selon les règles standard (en fonction des pays du vendeur et de l'acheteur).
-VATIsUsedDesc=Le taux de TVA proposé par défaut lors de la création de devis, factures, commandes, etc... répond à la règle standard suivante:<br>Si vendeur est non assujetti à TVA, TVA par défaut=0. Fin de règle.<br>Si le (pays vendeur= pays acheteur) alors TVA par défaut=TVA du produit vendu. Fin de règle.<br>Si vendeur et acheteur sont dans la Communauté européenne et que le bien vendu est lié au transport (routier, maritime, aérien), TVA par défaut=0 La TVA doit être payée par l'acheteur au bureau de douane de son pays et non au vendeur. Fin de règle.<br>Si vendeur et acheteur sont dans la Communauté européenne et l'acheteur est un particulier (sans numéro de TVA intracommunautaire enregistré) alors le taux de TVA par défaut est celui du pays du vendeur. Fin de règle.<br>Si vendeur et acheteur sont dans la Communauté européenne et que l'acheteur est une société (avec un numéro de TVA intracommunautaire enregistré) alors TVA par défaut=0. Fin de règle.<br>Sinon la TVA proposée par défaut=0. Fin de règle.
+VATIsUsedDesc=Le taux de TVA proposé par défaut lors de la création de devis, factures, commandes etc., suivent la règle standard suivante :<br> Si le vendeur est non assujetti à TVA, TVA par défaut=0. Fin de règle.<br>Si l'acheteur a un département qui a un taux de TVA spécifique dans le dictionnaire, alors c'est le taux de TVA par défaut. Fin de règle.<br>Si le (pays vendeur=pays acheteur) alors TVA par défaut=TVA du produit vendu. Fin de règle.<br>Si vendeur et acheteur sont dans la Communauté européenne et que le bien vendu est lié au transport (routier, maritime, aérien), TVA par défaut=0 La TVA doit être payée par l'acheteur au bureau de douane de son pays et non au vendeur. Fin de règle.<br>Si vendeur et acheteur sont dans la Communauté européenne et que l'acheteur n'est pas une société (avec un numéro de TVA intracommunautaire enregistré) alors la TVA s'applique par défaut au taux de TVA du pays du vendeur. Fin de règle.<br>Si vendeur et acheteur sont dans la Communauté européenne et que l'acheteur est une société (avec un numéro de TVA intracommunautaire enregistré) alors TVA par défaut=0. Fin de règle.<br>Sinon la TVA proposée par défaut=0. Fin de règle.
 VATIsNotUsedDesc=Le taux de TVA proposé par défaut est 0. C'est le cas d'associations, particuliers ou certaines petites sociétés.
 VATIsUsedExampleFR=En France, cela signifie que les entreprises ou les organisations sont assujetis à la tva (réel ou normal).
 VATIsNotUsedExampleFR=En France, il s'agit des associations ne déclarant pas de TVA ou sociétés, organismes ou professions libérales ayant choisi le régime fiscal micro entreprise (TVA en franchise) et payant une TVA en franchise sans faire de déclaration de TVA. Ce choix fait de plus apparaître la mention "TVA non applicable - art-293B du CGI" sur les factures.
-VATType=Type de taxe
+VATType=Type de TVA
 ##### Local Taxes #####
 TypeOfSaleTaxes=Type de taxe de vente
 LTRate=Taux
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Selon la configuration des taxes (voir %s - %s - %s),
 LabelUsedByDefault=Libellé qui sera utilisé si aucune traduction n'est trouvée pour ce code
 LabelOnDocuments=Libellé sur les documents
 LabelOrTranslationKey=Libellé ou clé de traduction
+LabelTranslatedInCurrentLanguage=Libellé traduit dans la langue courante
 TranslationFound=Traduction trouvée
 TheTranslationIsSearchedFromKey=La traduction est recherchée à partir de la clé de traduction : <b>%s</b>
 TranslationKey=Clé de traduction
@@ -1431,7 +1434,7 @@ AddVatInList=Afficher le numéro de TVA du client/fournisseur dans des listes d
 AddAdressInList=Affiche les informations sur l'adresse du client/fournisseur dans les listes déroulantes. <br> Les tiers apparaîtront sous le format de nom suivant : "Ma Grande Société. - 21 rue du Jump 123456 Grande Ville - FRANCE" au lieu de "Ma Grande Société".
 AddEmailPhoneTownInContactList=Afficher l'adresse e-mail du contact (ou les téléphones si non définis) et la ville dans les listes déroulantes <br> Les contacts apparaîtront avec un nom au format "Dupond Durand - dupond.durand@example.com - Paris" ou "Dupond Durand - 06 07 59 65 66 - Paris" au lieu de "Dupond Durand".
 AskForPreferredShippingMethod=Demander la méthode d'expédition préférée pour les Tiers
-FieldEdition=Édition du champ %s
+FieldEdition=Modification du champ %s
 FillThisOnlyIfRequired=Exemple: +2 (ne remplir que si un décalage d'heure est constaté dans l'export)
 GetBarCode=Récupérer code barre
 NumberingModules=Modèles de numérotation
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Forcer la date de facturation à la date de validation (seuleme
 SuggestedPaymentModesIfNotDefinedInInvoice=Mode de paiement suggéré sur la facture par défaut s'il n'est pas défini sur la facture
 SuggestPaymentByRIBOnAccount=Proposer paiement par virement sur le compte
 SuggestPaymentByChequeToAddress=Proposer paiement par chèque à l'ordre et adresse de
+InvoicePaymentManageStructuredCommunication=Générer une communication structurée pour le paiement des factures
+InvoicePaymentManageStructuredCommunicationHelp=Dans certains pays, il est nécessaire d'afficher une référence structurée pour faciliter les paiements et leur rapprochement
 FreeLegalTextOnInvoices=Mention complémentaire sur les factures
 WatermarkOnDraftInvoices=Filigrane sur les brouillons de factures (aucun si vide)
 PaymentsNumberingModule=Modèle de numérotation des paiements
@@ -1718,6 +1723,7 @@ CompressionOfResources=Compression des réponses HTTP
 CompressionOfResourcesDesc=Par exemple, en utilisant la directive Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Une détection automatique n'est pas possible avec le navigateur courant
 DefaultValuesDesc=Vous pouvez définir/forcer ici la valeur par défaut que vous voulez obtenir lorsque vous créez un nouvel enregistrement, et/ou les filtres par défaut ou ordre de tri des listes.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Valeurs par défaut (sur les formulaires de création)
 DefaultSearchFilters=Filtres de recherche par défaut
 DefaultSortOrder=Ordre de tri par défaut
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Modèles de numérotation des expéditions
 SendingsAbility=Prise en charge des bons d'expédition pour les livraisons clients
 NoNeedForDeliveryReceipts=Dans le plupart des cas, la fiche expédition est utilisée en tant que bon d'expédition (liste des produits expédiés) et bon de livraison (signée par le client). Le bon de réception est un doublon de fonctionnalité et est rarement utilisé.
 FreeLegalTextOnShippings=Mention complémentaire sur les expéditions
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Modèle de numérotation des bons de réception client
 DeliveryOrderModel=Modèle de bon de réception client
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Mention complémentaire sur les bons de récepti
 ##### FCKeditor #####
 AdvancedEditor=Editeur avancé
 ActivateFCKeditor=Activer l'éditeur avancé pour :
-FCKeditorForNotePublic=Création/édition WYSIWYG du champ notes publiques des éléments
-FCKeditorForNotePrivate=Création/édition WYSIWYG du champ notes privées des éléments
-FCKeditorForCompany=Création/édition WYSIWYG de la description des éléments (autre que produits/services)
-FCKeditorForProductDetails=Création/édition WYSIWYG de la description des produits ou des lignes d'un objet (lignes de propositions, commandes, factures, etc).
+FCKeditorForNotePublic=Création/modification WYSIWYG du champ "notes publiques" des éléments
+FCKeditorForNotePrivate=Création/modification WYSIWYG du champ "notes privées" des éléments
+FCKeditorForCompany=Création/modification WYSIWYG de la description des éléments (autre que produits/services)
+FCKeditorForProductDetails=Création/modification WYSIWYG de la description des produits ou des lignes d'un objet (lignes de propositions, commandes, factures, etc).
 FCKeditorForProductDetails2=ATTENTION : L'utilisation de cette option pour ce cas n'est vraiment pas recommandée car elle peut créer des problèmes avec des caractères spéciaux et la mise en forme des pages lors de la création de fichiers PDF.
-FCKeditorForMailing= Création/édition WYSIWYG des emailings (Outils->Emailings)
-FCKeditorForUserSignature=Création/édition WYSIWYG de la signature des utilisateurs
-FCKeditorForMail=Création/édition WYSIWYG tous les emails (sauf Outils->Emailings)
-FCKeditorForTicket=Création/édition WYSIWYG pour les tickets
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=Création/modification WYSIWYG de la signature des utilisateurs
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=Création/modification WYSIWYG pour les tickets
 ##### Stock #####
 StockSetup=Configuration du module Stock / Entrepôt
 IfYouUsePointOfSaleCheckModule=Si vous utilisez un module Point de Vente (module POS fourni par défaut ou un autre module externe), cette configuration peut être ignoré par votre module point de vente. La plupart de modules Point de Vente sont conçus pour créer immédiatement une facture et de réduire les stocks par défaut quelles que soient les options ici. Donc, si vous avez besoin ou non d'avoir une diminution du stock lors de l'enregistrement d'une vente dans votre Point de Vente, vérifiez également la configuration de votre module POS.
@@ -1867,7 +1874,6 @@ Buy=Achat
 Sell=Vente
 InvoiceDateUsed=Date de facture utilisée
 YourCompanyDoesNotUseVAT=Votre société/institution est définie comme non assujettie à la TVA (voir Accueil > Configuration > Société/Institution), aussi il n'y a pas d'option de paramétrage de la TVA.
-AccountancyCode=Code comptable
 AccountancyCodeSell=Code comptable vente
 AccountancyCodeBuy=Code comptable achat
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Laissez la case à cocher "Créer automatiquement le paiement" vide par défaut lors de la création d'une nouvelle taxe
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Quel onglet voulez-vous voir ouvrir par défaut quand on c
 AGENDA_EVENT_PAST_COLOR = Couleur de l'événement précédent
 AGENDA_EVENT_CURRENT_COLOR = Couleur de l'événement courant
 AGENDA_EVENT_FUTURE_COLOR = Couleur du prochain événement
-AGENDA_REMINDER_BROWSER = Autoriser le rappel d'événement <b> sur le navigateur de l'utilisateur </b> (lorsque la date de l'événement est atteinte, une popup est affichée sur la navigateur).<br>L'option de rappel / délai est définie par l'utilisateur à la création de l'événement.
+AGENDA_REMINDER_BROWSER = Autoriser les rappels d'événements <b>sur le navigateur de l'utilisateur</b>
+AGENDA_REMINDER_BROWSERHelp = Lorsque la date de rappel est atteinte, une fenêtre contextuelle s'affiche dans le navigateur). L'option de rappel/le délai est défini par l'utilisateur lors de la création de l'événement.
 AGENDA_REMINDER_BROWSER_SOUND = Activer les notifications sonores.
-AGENDA_REMINDER_EMAIL = Autoriser le rappel d'événement <b> par e-mail </b>
+AGENDA_REMINDER_EMAIL = Autoriser les rappels d'événements <b>par e-mails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Note : la fréquence d'exécution de la tâche %s doit être suffisante pour que le rappel soit envoyé au bon moment.
 AGENDA_SHOW_LINKED_OBJECT = Afficher l'objet lié dans la vue agenda
 AGENDA_USE_EVENT_TYPE = Utiliser les types d'événements (gérés dans le menu Configuration -> Dictionnaires -> Type d'événements de l'agenda)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Configurez automatiquement cette valeur par défaut pour le type d'événement dans le formulaire de création d'événement.
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Utiliser le rappel par défaut pour ces événements
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = Le formulaire de notification de rappel automatique sera rempli par défaut lors de la création de l'événement
+AGENDA_DEFAULT_REMINDER_OFFSET = Période de rappel par défaut avant l'événement
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Modèle d'email à utiliser pour le rappel par défaut
 PasswordTogetVCalExport = Clé pour autoriser le lien d'exportation
 PastDelayVCalExport=Ne pas exporter les événements de plus de
 SecurityKey = Clé de sécurité
@@ -2006,7 +2017,7 @@ BackupZipWizard=Assistant pour générer l'archive du répertoire documents
 SomethingMakeInstallFromWebNotPossible=L'installation de module externe est impossible depuis l'interface web pour la raison suivante :
 SomethingMakeInstallFromWebNotPossible2=Pour cette raison, le processus de mise à jour décrit ici est une processus manuel que seul un utilisateur ayant des droits privilégiés peut réaliser.
 InstallModuleFromWebHasBeenDisabledContactUs=L'installation ou le développement de modules externes ou de sites Web dynamiques, à partir de l'application, est actuellement verrouillé pour des raisons de sécurité. Veuillez nous contacter si vous avez besoin d'activer cette fonctionnalité.
-InstallModuleFromWebHasBeenDisabledByFile=L'installation de module externe ou l'usage de fonction permettant l'execution de code local depuis l'application a été désactivé par l'administrateur. Vous devez lui demander de supprimer le fichier <strong>%s</strong> pour permettre cette fonctionnalité.
+InstallModuleFromWebHasBeenDisabledByFile=L'installation de modules externes à partir de l'application et l'utilisation de fonctions permettant d'exécuter du code sur le serveur ont été désactivées par votre administrateur. Vous devez lui demander de supprimer le fichier <strong>%s</strong> pour autoriser cette fonctionnalité.
 ConfFileMustContainCustom=Installer ou créer un module externe à partir de l'application nécessite de sauvegarder les fichiers du module dans le répertoire <strong>%s</strong>. Pour que ce répertoire soit reconnu par Dolibarr, vous devez paramétrer le fichier de configuration <strong>conf/conf.php</strong> en ajoutant les 2 lignes suivantes :<br><strong>$dolibarr_main_url_root_alt='/custom'</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Mettre en surbrillance les lignes de la table lorsque la souris passe au-dessus
 HighlightLinesColor=Couleur de la ligne de surbrillance lorsque la souris passe au-dessus (mettre 'ffffff' pour ne pas mettre en surbrillance)
@@ -2036,6 +2047,7 @@ Enter0or1=Saisir 0 ou 1 
 EnterYesOrNo=Entrez Oui ou Non
 UnicodeCurrency=Saisissez ici entre accolades, la liste du numéro des octets qui représentent le symbole de la monnaie. Pour exemple: pour $, entrez [36] - pour le Real Brésilien R$ [82,36] - pour l'euro €, entrez [8364]
 ColorFormat=La couleur RVB au format HEX est, par exemple: FF0000
+NumberFormatForATotalPrice=Format des nombres pour le prix total %s
 PictoHelp=Nom de l'icône au format : <br> - image.png pour un fichier image dans le répertoire du thème courant <br> - image.png@module si le fichier est dans le répertoire /img/ d'un module <br> - fa-xxx pour un picto FontAwesome fa-xxx <br> - fonwtawesome_xxx_fa_color_size pour un picto FontAwesome fa-xxx (avec préfixe, couleur et taille forcés)
 PositionIntoComboList=Position de la ligne dans des listes déroulantes
 SellTaxRate=Taux de TVA
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Masquer la colonne d
 MAIN_PDF_NO_SENDER_FRAME=Masquer les bordures dans le cadre de l'adresse de l'expéditeur
 MAIN_PDF_NO_RECIPENT_FRAME=Masquer les bordures dans le cadre de l'adresse du destinataire
 MAIN_PDF_HIDE_CUSTOMER_CODE=Cacher le code client
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Masquer le code comptable client
 MAIN_PDF_HIDE_SENDER_NAME=Masquer l'expéditeur/le nom de l'entreprise dans le bloc d'adresse
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Masquer les conditions de paiement
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Masquer le mode de paiement
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Ajoutez un balisage caché dans l'espace de signature pour permettre à l'outil de signature électronique de le réutiliser. Peut être utilisé par un outils externe ou à l'avenir par la fonction de signature en ligne.
@@ -2324,6 +2341,8 @@ NotRecommended=Non recommandé
 ARestrictedPath=Certains chemins restreints pour les fichiers de données
 CheckForModuleUpdate=Vérifier les mises à jour des modules externes
 CheckForModuleUpdateHelp=Cette action se connecte aux éditeurs des modules externes pour vérifier si une nouvelle version est disponible.
+CheckForModuleUpdateHelp2=Une connexion est également établie avec %s pour vérifier si certains de vos modules externes ont été signalés comme des logiciels malveillants par la communauté.
+YourIPWillBeRevealedToThisExternalProviders=Votre IP sera divulguée à tous ces fournisseurs externes.
 ModuleUpdateAvailable=Une mise à jour est disponible
 NoExternalModuleWithUpdate=Aucune mise à jour trouvée pour les modules externes
 SwaggerDescriptionFile=Fichier de description de l’API Swagger (à utiliser avec redoc par exemple)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Afficher l'adresse de livraison
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Indication obligatoire dans certains pays (France, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Afficher le contact de facturation sur devis
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=Par défaut le contact n'apparaît que pour la facturation
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Lien url du réseau social. Utilisez {socialid} pour la partie variable qui contient l'identifiant du réseau social.
 IfThisCategoryIsChildOfAnother=Si cette catégorie est un enfant d'une autre
 DarkThemeMode=Mode thème sombre
@@ -2450,7 +2471,7 @@ 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 les 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)
+MAIN_CHECKBOX_LEFT_COLUMN=Afficher la colonne de sélection de champ et de ligne à gauche (celle de droite est désactivée)
 NotAvailableByDefaultEnabledOnModuleActivation=Non créé par défaut. Créé à l'activation du module uniquement.
 CSSPage=Style CSS
 Defaultfortype=Défaut
@@ -2489,7 +2510,7 @@ AiDescription=Fonctionnalités d'IA (Intelligence Artificielle)
 AiDescriptionLong=Fournit des fonctionnalités d'IA (Intelligence Artificielle) dans différentes parties de l'application. Besoin d'une API d'IA externe.
 AI_API_KEY=Clé pour l'API IA
 AI_API_URL=URL du point de terminaison pour l'API AI
-AI_API_SERVICE=Service à utiliser l'IA
+AI_API_SERVICE=AI service to use
 AiSetup=Configuration du module d'IA
 AiCustomPrompt=Instructions personnalisées pour l'IA
 AI_CONFIGURATIONS_PROMPT=Instruction personnalisée
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=Instructions personnalisées de l'IA pour les fonctionnalit
 EnterAnIP=Entrez une adresse IP
 ConvertInto=Convertir en
 YouAreHere=Vous êtes ici
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Afficher le code-barre sur le document PDF d'expédition
 BARCODE_ON_RECEPTION_PDF=Afficher le code-barre sur le document PDF de réception
 BARCODE_ON_STOCKTRANSFER_PDF=Afficher le code-barre sur le document PDF de transfert de stock
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=URL de déconnexion Dolibarr à auto
 MainAuthenticationOidcLoginClaimName=Nom revendication Login
 MainAuthenticationOidcLoginClaimDesc=Revendication OpenID Connect correspondant à la connexion Dolibarr utilisateur. S'il n'est pas défini ou vide, la valeur par défaut est l'e-mail
 BlackListWords=Liste noire de mots
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Ajouter à la liste noire
 FediverseSetup=Configuration de la section fediverse
 ConfigImportSocialNetwork=Configuration des réseaux sociaux compatibles avec Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Nom du paramètre
 ParamValue=Valeur du paramètre
 ConfirmDeleteParamOfSocialNetwork=Êtes-vous sûr de vouloir supprimer ce paramètre ?
 HelpMariaDBToGetPossibleValues=Vous pouvez obtenir une liste de valeurs possibles en exécutant la commande SQL suivante : %s
+HelpMariaDBToGetValue=Cette valeur a été récupérée avec la commande : %s
+PDFBoxFrameRoundedCorners=Cadres aux coins arrondis
+MAIN_PDF_FRAME_CORNER_RADIUS=La valeur par défaut du rayon d'angle est 0, donc pas d'angles arrondis. Choisissez des valeurs entre 1 et 3 pour augmenter le rayon d'angle et ajouter des angles arrondis aux cadres
 Captcha=Captcha
 CaptchaDesc=Si vous souhaitez protéger votre page de connexion avec un Captcha, vous pouvez choisir celui à utiliser ici
 DolibarrStandardCaptcha=Un captcha natif généré par Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Afficher l'adresse de livraison
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Indication obligatoire dans certains pays (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Afficher l'analyse de la TVA par taux
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=La taille maximale par défaut des listes est fixée à <b>%s</b> lignes. Il s'agit d'une valeur élevée qui nécessite un défilement pour voir toutes les réponses. Il est préférable d'avoir une valeur inférieure à <b>%s</b> et utilisez la pagination pour voir les enregistrements au-delà de ce nombre. Modifiez cette valeur dans le menu Accueil - Configuration - Affichage.
+RoundBorders=Bordures rondes
+CheckIfModuleIsNotBlackListed=Bloquer l'installation des modules trouvés dans la <b>liste noire des modules distante</b>
+CheckIfModuleIsNotBlackListedHelp=Certains modules peuvent être fournis par des entreprises qui ne respectent pas les règles de bonne conduite du projet (non-respect du RGPD, violation des règles d'utilisation de la marque Dolibarr, etc.). En cochant cette case, une requête sera faite au serveur du projet pour savoir si un signalement a été reçu concernant ce module, et vous protégera en bloquant le déploiement des modules signalés
+DatabaseEncryption=Cryptage dans la base de données
+AlgorithmFor=Algorithme pour : %s
+SensitiveData=Données sensibles
+ToolToDecryptAString=Outil pour décrypter une chaîne
+Decrypt=Décrypter
+FilesIntegrityDesc=Si vous souhaitez vérifier l'intégrité des fichiers au lieu de la base de données, vous pouvez le faire en utilisant <a href="%s">cet outil</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=Il y a plus de %s réponses correspondant à votre filtre. Veuillez ajouter d'autres filtres...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 2b045e646b0..ff6269db9ae 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Solde final
 CurrentBalance=Solde actuel
 FutureBalance=Solde futur
 ShowAllTimeBalance=Afficher solde depuis début
-AllTime=Depuis le début
 Reconciliation=Rapprochement
 RIB=Numéro de compte bancaire
 IBAN=Identifiant IBAN
@@ -133,7 +132,7 @@ DeleteTransaction=Supprimer l'écriture
 ConfirmDeleteTransaction=Êtes-vous sûr de vouloir supprimer cette écriture ?
 ThisWillAlsoDeleteBankRecord=Ceci supprimera aussi les écritures bancaires générées
 BankMovements=Mouvements
-PlannedTransactions=Écritures prévues
+PlannedTransactions=Écritures à venir
 Graph=Graphiques
 ExportDataset_banque_1=Écritures bancaires et relevés
 ExportDataset_banque_2=Bordereaux de remises de chèques
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Si cette fonction est activée, vous pouvez choisir une
 BankColorizeMovementName1=Couleur de fond pour les mouvements de débit
 BankColorizeMovementName2=Couleur de fond pour le mouvement de crédit
 IfYouDontReconcileDisableProperty=Si vous ne réalisez pas le rapprochement bancaire sur certains comptes bancaires, désactivez la fonctionnalité "%s" pour ne plus afficher cette alerte.
-NoBankAccountDefined=Aucun compte bancaire défini
+NoBankAccountDefined=Aucun compte bancaire trouvé
 NoRecordFoundIBankcAccount=Aucun enregistrement trouvé dans le compte bancaire. Généralement, cela se produit lorsqu'un enregistrement a été supprimé manuellement de la liste des transactions dans le compte bancaire (par exemple lors d'un rapprochement du compte bancaire). Une autre raison est que le paiement a été enregistré lorsque le module "%s" était désactivé.
 AlreadyOneBankAccount=un compte bancaire est déjà défini
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Variante du fichier SEPA
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index b9826dd7878..40f180405f1 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -98,7 +98,7 @@ IdPaymentTerm=Condition de paiement (id)
 CodePaymentTerm=Condition de paiement (code)
 LabelPaymentTerm=Condition de paiement (libellé)
 PaymentConditions=Conditions de règlement
-PaymentConditionsShort=Conditions de règlement
+PaymentConditionsShort=Cond. règlement
 PaymentAmount=Montant règlement
 PaymentHigherThanReminderToPay=Règlement supérieur au reste à payer
 HelpPaymentHigherThanReminderToPay=Attention, le montant de paiement pour une ou plusieurs factures est supérieur au reste à payer.<br>Corrigez votre saisie, sinon, confirmez et pensez à créer un avoir du trop perçu lors de la fermeture de chacune des factures surpayées.
@@ -169,6 +169,7 @@ BillTo=Adressé à
 ShippingTo=Expédition à
 ActionsOnBill=Événements sur la facture
 ActionsOnBillRec=Actions sur facture récurrente
+InvoicesGeneratedFromRec=Factures générées
 RecurringInvoiceTemplate=Modèle de facture / Facture récurrente
 NoQualifiedRecurringInvoiceTemplateFound=Pas de facture récurrente qualifiée pour la génération
 FoundXQualifiedRecurringInvoiceTemplate=%s modèles de factures récurrentes qualifiées pour la génération.
@@ -182,7 +183,7 @@ LastCustomersBills=Les %s dernières factures client
 LastSuppliersBills=Les %s dernières factures fournisseur
 AllBills=Toutes les factures
 AllCustomerTemplateInvoices=Tous les modèles
-AllSupplierTemplateInvoices=Tous les modèles
+AllSupplierTemplateInvoices=Tous les modèles de facture
 OtherBills=Autres factures
 DraftBills=Factures brouillons
 CustomersDraftInvoices=Factures clients brouillons
@@ -420,6 +421,7 @@ InvoiceAutoValidate=Valider les factures automatiquement
 GeneratedFromRecurringInvoice=Généré depuis la facture modèle récurrente %s
 DateIsNotEnough=Date pas encore atteinte
 InvoiceGeneratedFromTemplate=Facture %s généré depuis la facture modèle récurrente %s
+InvoiceGeneratedFromTemplateError=Error Invoice %s generated from recurring template invoice %s : %s
 GeneratedFromTemplate=Généré à partir du modèle de facture %s
 WarningInvoiceDateInFuture=Attention, la date de facturation est postérieure à la date actuelle
 WarningInvoiceDateTooFarInFuture=Attention, la date de facturation est trop éloignée de la date actuelle
@@ -496,6 +498,8 @@ IBANNumber=Code IBAN
 IBAN=IBAN
 CustomerIBAN=IBAN du client
 SupplierIBAN=IBAN du vendeur
+DebitBankAccount = Compte bancaire de prélèvement
+SetDebitBankAccount = Définir le compte bancaire de prélèvement
 BIC=BIC/SWIFT
 BICNumber=Code BIC/SWIFT
 ExtraInfos=Informations complémentaires
@@ -514,10 +518,12 @@ PrettyLittleSentence=Accepte le règlement des sommes dues par chèque libellé
 IntracommunityVATNumber=Numéro de TVA intracommunautaire
 PaymentByChequeOrderedTo=Règlement TTC par chèque à l'ordre de %s envoyé à
 PaymentByChequeOrderedToShort=Règlement TTC par chèque à l'ordre de
+StructuredCommunication=Communication structurée
 SendTo=envoyé à
 PaymentByTransferOnThisBankAccount=Règlement par virement sur le compte bancaire suivant
 VATIsNotUsedForInvoice=* TVA non applicable art-293B du CGI
 VATIsNotUsedForInvoiceAsso=* TVA non applicable art-261-7 du CGI
+VATIsNotUsedReverseChargeProcedure=* Non applicable VAT art-259-1 of CGI
 LawApplicationPart1=Par application de la loi 80.335 du 12/05/80
 LawApplicationPart2=les marchandises demeurent la propriété du
 LawApplicationPart3=vendeur jusqu'à complet encaissement de
@@ -662,6 +668,7 @@ MentionCategoryOfOperations0=Livraison de marchandises
 MentionCategoryOfOperations1=Prestation de services
 MentionCategoryOfOperations2=Mixte - Livraison de biens & prestation de services
 Salaries=Salaires
+InvoiceSubtype=Sous-type de facture
 SalaryInvoice=Salaire
 BillsAndSalaries=Factures et salaires
 CreateCreditNoteWhenClientInvoiceExists=Cette option est activée uniquement lorsqu'une ou plusieurs factures validées existent pour un client ou lorsque la constante INVOICE_CREDIT_NOTE_STANDALONE est utilisée (utile pour certains pays)
@@ -670,4 +677,4 @@ SearchValidatedSupplierInvoicesWithDate=Rechercher les factures impayées des fo
 SendEmailsRemindersOnSupplierInvoiceDueDate=Envoyer un rappel par email pour les factures fournisseur validées et impayées
 PaymentMadeForSeveralInvoices=Paiement effectué pour plusieurs factures
 SituationInvoiceProgressCurrent=Progression facture
-INVOICE_ADD_EPC_QR_CODEPay=Scannez ce code QR pour payer avec un smartphone prenant en charge le paiement avec le code QR EPC.
+INVOICE_ADD_EPC_QR_CODEPay=Scannez ce code QR pour payer avec un smartphone prenant en charge le paiement par QR code EPC.
diff --git a/htdocs/langs/fr_FR/blockedlog.lang b/htdocs/langs/fr_FR/blockedlog.lang
index 811c7622222..b67e33b9d03 100644
--- a/htdocs/langs/fr_FR/blockedlog.lang
+++ b/htdocs/langs/fr_FR/blockedlog.lang
@@ -1,13 +1,13 @@
 BlockedLog=Journaux Inaltérables
 BlockedLogDesc=Ce module trace certains événements dans un journal inaltérable (que vous ne pouvez pas modifier une fois enregistré) dans une chaîne de blocs, en temps réel. Ce module assure la compatibilité avec les exigences des lois de certains pays (comme la France avec la loi Finance 2016 - Norme NF525).
 Fingerprints=Événements et empreintes archivés
-FingerprintsDesc=C'est l'outil pour parcourir ou extraire les logs inaltérables. Les journaux inaltérables sont générés et archivés localement dans une table dédiée, en temps réel lorsque vous enregistrez une action dans dolibarr. Vous pouvez utiliser cet outil pour exporter cette archive et l'enregistrer sur un support externe (certains pays, comme la France, vous demandent de le faire chaque année). Notez qu'il n'y a pas de fonction pour purger ce journal et chaque changement effectué directement dans ce journal (par un pirate informatique par exemple) sera reporté avec une empreinte non valide. Si vous avez vraiment besoin de purger cette table parce que vous avez utilisé votre application à des fins de démonstration/test et que vous voulez nettoyer vos données pour démarrer votre production, vous pouvez demander à votre revendeur ou intégrateur de réinitialiser votre base de données (toutes vos données seront supprimées).
+FingerprintsDesc=Ceci est l'outil permettant de parcourir ou d'extraire les logs inaltérables. Les logs inaltérables sont générés et archivés localement dans une table dédiée, en temps réel lorsque vous enregistrez un événement métier. Vous pouvez utiliser cet outil pour exporter cette archive et la sauvegarder sur un support externe (certains pays, comme la France, demandent de le faire tous les ans). A noter qu'il n'existe pas de fonctionnalité permettant de purger ces logs et toute tentative de modification effectuée directement dans ces logs (par un hacker par exemple) sera signalée avec une empreinte non valide. Si vous avez vraiment besoin de purger cette table parce que vous avez utilisé votre application à des fins de démonstration/test et souhaitez nettoyer vos données pour démarrer votre production, vous pouvez demander à votre revendeur ou intégrateur de réinitialiser votre base de données (toutes vos données seront supprimées).
 CompanyInitialKey=Clé initiale de la société (hachage du bloc de genèse)
 BrowseBlockedLog=Logs inaltérables
 ShowAllFingerPrintsMightBeTooLong=Afficher tous les journaux archivés (peut être long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Afficher tous les journaux d'archives non valides (peut être long)
 DownloadBlockChain=Télécharger les empreintes
-KoCheckFingerprintValidity=L'entrée du journal archivé n'est pas valide. Cela signifie que quelqu'un (un hacker ?) a modifié certaines données de cet enregistrement après qu'il ait été enregistré, ou a effacé l'enregistrement archivé précédent (vérifiez que la ligne avec le # précédent existe) ou a modifié la somme de contrôle de l'enregistrement précédent.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Le journal archivé est valide. Les données de cette ligne n'ont pas été modifiées et l'enregistrement suit le précédent.
 OkCheckFingerprintValidityButChainIsKo=Le journal archivé semble valide par rapport au précédent mais la chaîne était corrompue auparavant.
 AddedByAuthority=Stocké dans une autorité distante
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Détail du journal
 ListOfTrackedEvents=Liste des actions suivies
 Fingerprint=Empreinte
 DownloadLogCSV=Exporter les journaux archivés (CSV)
-DataOfArchivedEvent=Données complètes de l'événement archivées
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Objet d'origine (type %s, id %s) non lié (voir la colonne 'Données complètes' pour obtenir les données sauvegardées non modifiables)
 BlockedLogAreRequiredByYourCountryLegislation=Le module Journaux inaltérables peut être requis par la législation de votre pays. La désactivation de ce module peut invalider toute transaction future au regard de la loi et de l'utilisation de logiciels légaux, car elles ne peuvent être validées par un contrôle fiscal.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Le module Journaux inaltérables a été activé en raison de la législation de votre pays. La désactivation de ce module peut invalider toute transaction future au regard de la loi et de l’utilisation de logiciels légaux, car elles ne peuvent pas être validées par un audit fiscal.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Le système de suivi des événements dans des journaux inalt
 BlockedLogDisabled=Le système de suivi des événements dans des journaux inaltérables a été désactivé après certains enregistrements. Nous avons enregistré une empreinte digitale spéciale pour suivre la chaîne comme cassée
 BlockedLogDisabledBis=Le système de suivi des événements dans des journaux inaltérables a été désactivé. Ceci est possible car aucun enregistrement n'a encore été fait.
 LinkHasBeenDisabledForPerformancePurpose=Pour des raisons de performances, le lien direct vers le document n'est pas affiché après la 100e ligne.
+SavedOnLine=Enregistré sur la ligne
 
 ## logTypes
 logBILL_DELETE=Suppression logique de la facture client
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Suppression logique du paiement client
 logPAYMENT_VARIOUS_CREATE=Paiement (non affecté à une facture) créé
 logPAYMENT_VARIOUS_DELETE=Suppression logique du paiement (non affecté à une facture)
 logPAYMENT_VARIOUS_MODIFY=Paiement (non affecté à une facture) modifié
+logBLOCKEDLOG_EXPORT=Exportation de journaux inaltérables dans un fichier
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 9f1f7313bc3..12a73e9ec23 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Espace tags/catégories de contacts
 AccountsCategoriesArea=Espace des tags/categories de comptes bancaires
 ProjectsCategoriesArea=Espace des tags/catégories des projets
 UsersCategoriesArea=Espace des tags/catégories des utilisateurs
+Bank_linesCategoriesArea==Espace tags/catégories/catégories des lignes bancaires
 SubCats=Sous-catégories
 CatList=Liste des tags/catégories
 CatListAll=Liste de toutes les catégories (de tous types)
@@ -90,9 +91,10 @@ CategoriesSetup=Configuration des tags/catégories
 CategorieRecursiv=Lier automatiquement avec le(a) tag/catégorie parent(e)
 CategorieRecursivHelp=Si l'option est activée, lorsque vous ajoutez un objet dans une sous-catégorie, l'objet sera également ajouté dans les catégories parentes.
 AddProductServiceIntoCategory=Attribuer cette catégorie au produit/service
-AddCustomerIntoCategory=Assigner cette catégorie au client
-AddSupplierIntoCategory=Assigner cette catégorie au fournisseur
-AssignCategoryTo=Attribuer une catégorie à
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Afficher tag/catégorie
 ByDefaultInList=Par défaut dans la liste
 ChooseCategory=Choisissez une catégorie
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Catégories des pages-conteneurs
 KnowledgemanagementsCategoriesArea=Catégories d'articles KM
 UseOrOperatorForCategories=Utiliser l'opérateur 'ou' pour les catégories
 AddObjectIntoCategory=Attribuer à la catégorie
+FichintersCategoriesArea=Catégories d'intervention
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index b87b9b8f964..bad882f9669 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -79,7 +79,7 @@ Chat=Tchat
 PhonePro=Tél pro.
 PhonePerso=Tél perso.
 PhoneMobile=Tél portable
-No_Email=Refuse les emailings
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=Code postal
 Town=Ville
@@ -383,8 +383,8 @@ ExportCardToFormat=Exporter fiche au format
 ContactNotLinkedToCompany=Contact non lié à un tiers
 DolibarrLogin=Identifiant utilisateur
 NoDolibarrAccess=Pas d'accès utilisateur
-ExportDataset_company_1=Tiers (sociétés/institutions/particuliers) et attributs
-ExportDataset_company_2=Contacts (de tiers) et attributs
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Contacts/Adresses (de tiers ou libre) et attributs
 ExportDataset_company_3=Modes de paiement tiers (comptes bancaires)
 ImportDataset_company_1=Tiers (sociétés/institutions/particuliers) et attributs
 ImportDataset_company_2=Contacts/Adresses (de tiers ou libre) et attributs
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 441a8d42a6c..cfb2582d189 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Règlement facture client
 PaymentSupplierInvoice=Règlement facture fournisseur
 PaymentSocialContribution=Paiement de charges fiscales/sociales
 PaymentVat=Règlement TVA
-AutomaticCreationPayment=Enregistrez automatiquement le paiement
+AutomaticCreationPayment=Also record the payment
 ListPayment=Liste des règlements
 ListOfCustomerPayments=Liste des règlements clients
 ListOfSupplierPayments=Liste des règlements fournisseurs
@@ -118,10 +118,14 @@ SocialContributionsPayments=Paiements de charges fiscales/sociales
 ShowVatPayment=Affiche paiement TVA
 TotalToPay=Total à payer
 BalanceVisibilityDependsOnSortAndFilters=Le solde est visible dans cette liste que si la table est triée sur %s et filtré sur 1 compte bancaire (sans autres filtres)
+CustomerAccountancyCodeGeneral=Code comptable général
 CustomerAccountancyCode=Code comptable client
+SupplierAccountancyCodeGeneral=Code comptable général
 SupplierAccountancyCode=Code comptable fournisseur
+UserAccountancyCodeGeneral=Code comptable général
 CustomerAccountancyCodeShort=Compte comptable client
 SupplierAccountancyCodeShort=Compte comptable fournisseur
+UserAccountancyCodeShort=Code du compte utilisateur
 AccountNumber=Numéro du compte
 NewAccountingAccount=Nouveau compte
 Turnover=Chiffre d'affaires facturé
@@ -129,7 +133,9 @@ TurnoverCollected=Chiffre d'affaires encaissé
 SalesTurnoverMinimum=Chiffre d'affaires minimum
 ByExpenseIncome=Par recettes et dépenses
 ByThirdParties=Par tiers
+ByProjects=Par projets
 ByUserAuthorOfInvoice=Par auteur de la facture
+DetailedListLowercase=liste détaillée
 CheckReceipt=Bordereau de remise de chèques
 CheckReceiptShort=Bordereau remise de chèques
 LastCheckReceiptShort=Les %s derniers bordereaux de remise de chèque
diff --git a/htdocs/langs/fr_FR/datapolicy.lang b/htdocs/langs/fr_FR/datapolicy.lang
index 6644c9f2cd2..56d1543f3dd 100644
--- a/htdocs/langs/fr_FR/datapolicy.lang
+++ b/htdocs/langs/fr_FR/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Politique de confidentialité des données
 Module4100Desc = Module de gestion de la confidentialité des données (conformité avec le RGPD)
 # Administration page
 datapolicySetup = Configuration de la politique de confidentialité des données du module
-Deletion = Suppression de données
-datapolicySetupPage = En fonction des législations de vos pays (Exemple <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external"> Article 5 </a> du RGPD), les données personnelles doivent être conservées pendant une durée n'excédant pas celle nécessaire aux finalités pour lesquelles elles ont été collectées, sauf à des fins d'archivage. <br> La suppression se fera automatiquement après une certaine durée sans événement (la durée que vous aurez indiquée ci-dessous).
+DataDeletion=Suppression de données
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s mois
 ONE_YEAR = 1 an
 NB_YEARS = %s ans
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Prospect/Client
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Ni prospect/Ni client
 DATAPOLICY_CONTACT_FOURNISSEUR = Fournisseur
 DATAPOLICY_ADHERENT = Adhérent
-DATAPOLICY_Tooltip_SETUP=Définissez le délai sans interaction après lequel vous souhaitez que l'enregistrement soit automatiquement purgé.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Vous pouvez envoyer un e-mail RGPD à tous vos contacts concernés (qui n'ont pas encore reçu d'e-mail et pour lesquels vous n'avez rien enregistré concernant leur accord RGPD). Pour ce faire, utilisez le bouton suivant.
 SendAgreement = Envoyer des emails
 AllAgreementSend = Tous les e-mails ont été envoyés
 TXTLINKDATAPOLICYACCEPT = Texte pour le lien "accord"
 TXTLINKDATAPOLICYREFUSE = Texte pour le lien "désaccord"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = RGPD : Traitement des données personnelles
 DATAPOLICY_consentement = Consentement obtenu pour le traitement des données personnelles
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 00fefd6e635..fb0af3ebb01 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Erreur lors de la création de fichiers
 ErrorFailedToCreateDir=Echec à la création d'un répertoire. Vérifiez que le user du serveur Web ait bien les droits d'écriture dans les répertoires documents de Dolibarr. Si le paramètre <b>safe_mode</b> a été activé sur ce PHP, vérifiez que les fichiers php dolibarr appartiennent à l'utilisateur du serveur Web.
 ErrorNoMailDefinedForThisUser=Email non défini pour cet utilisateur
 ErrorSetupOfEmailsNotComplete=La configuration de l'envoi des e-mails n'est pas terminée
+ErrorAccountingClosureSetupNotComplete=La configuration des comptes de clôture n'est pas terminée
 ErrorFeatureNeedJavascript=Cette fonctionnalité a besoin de JavaScript activé pour fonctionner. Modifiez dans configuration - affichage.
 ErrorTopMenuMustHaveAParentWithId0=Un menu de type 'Top' ne peut avoir de menu père. Mettre 0 dans l'id père ou choisir un menu de type 'Left'.
 ErrorLeftMenuMustHaveAParentId=Un menu de type 'Left' doit avoir un id de père.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Upload bloqué par un plugin PHP/Apache.
 ErrorFileSizeTooLarge=La taille du fichier est trop grande ou le fichier n'est pas fourni.
 ErrorFieldTooLong=Le champ %s est trop long.
 ErrorSizeTooLongForIntType=Longueur de champ trop longue pour le type int (%s chiffres maximum)
+ErrorSizeForStarsType=La taille de l'étoile doit être un nombre compris entre 1 et 10
 ErrorSizeTooLongForVarcharType=Longueur de champ trop longue pour le type chaine (%s caractères maximum)
 ErrorNoValueForSelectType=Les valeurs de la liste de sélection doivent être renseignées
 ErrorNoValueForCheckBoxType=Les valeurs de la liste de case à cochées doivent être renseignées
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Mauvaise valeur saisie pour le code. Réessayez avec une no
 ErrorBothFieldCantBeNegative=Les champs %s et %s ne peuvent être tous deux négatifs
 ErrorFieldCantBeNegativeOnInvoice=Le champ <strong> %s </strong> ne peut pas être négatif sur ce type de facture. Si vous devez ajouter une ligne de remise, créez d'abord la remise (à partir du champ '%s' dans la fiche du tiers) et appliquez-la à la facture.
 ErrorLinesCantBeNegativeForOneVATRate=Le total des lignes (HT) ne peut pas être négatif pour un taux de TVA non null donné (Un total négatif pour le taux de <b>%s</b>%% a été trouvé).
-ErrorLinesCantBeNegativeOnDeposits=Les lignes ne peuvent pas être négatives dans un acompte. Si vous le faites, vous rencontrerez des problèmes lorsque vous devrez consommer l'acompte dans la facture finale.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=La quantité d'une ligne ne peut pas être négative dans les factures clients
+ErrorQtyForSupplierInvoiceCantBeNegative=La quantité pour la ligne dans fournisseur factures ne peut pas être négative
 ErrorWebServerUserHasNotPermission=Le compte d'exécution du serveur web <b>%s</b> n'a pas les permissions pour cela
 ErrorNoActivatedBarcode=Aucun type de code-barres activé
 ErrUnzipFails=Impossible de décompresser le fichier %s avec ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=Le champ de date de fin ne peut pas être vide
 ErrorStartHourIsNull=Le champ de date de début ne peut pas être vide
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Trop de lignes à traiter. Veuillez utiliser un filtre plus sélectif.
 ErrorEmptyValueForQty=La quantité ne peut pas être nulle.
+ErrorNoCloneWithoutName=Le nouvel utilisateur doit avoir un nom
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = La quantité commandée ne peut être inférieure à la quantité expédiée.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Erreur, la création d'un paiement divers sur un compte bancaire avec une devise différente de la devise de la société n'est pas encore prise en charge.
+ErrorStreamMustBeEnabled=Le flux PHP %s n'est pas disponible. Vérifiez vos modules PHP et le paramètre Dolibarr $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # 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.
 WarningPasswordSetWithNoAccount=Un mot de passe a été fixé pour cet adhérent. Cependant, aucun compte d'utilisateur n'a été créé. Donc, ce mot de passe est stocké, mais ne peut être utilisé pour accéder à Dolibarr. Il peut être utilisé par un module/interface externe, mais si vous n'avez pas besoin de définir ni login ni mot de passe pour un adhérent, vous pouvez désactiver l'option «Gérer un login pour chaque adhérent" depuis la configuration du module Adhérents. Si vous avez besoin de gérer un login, mais pas de mot de passe, vous pouvez laisser ce champ vide pour éviter cet avertissement. Remarque: L'email peut également être utilisé comme login si l'adhérent est lié à un utilisateur.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=Cet ID parent n'existe plus
 WarningReadBankAlsoAllowedIfUserHasPermission=Attention, la lecture des comptes bancaires est également permise avec l'autorisation de Gérer le plan comptable
 WarningNoDataTransferedInAccountancyYet=Attention, il n'y a pas de données dans la comptabilité. Veuillez transférer en comptabilité vos données enregistrées depuis le module Comptabilité ou changer le mode de calcul pour analyser les données enregistrées en dehors de la comptabilité.
 WarningChangingThisMayBreakStopTaskScheduler=Attention, changer cette valeur peut désactiver le planificateur des tâches planifiées
+WarningAmountOfFileDiffersFromSumOfLines=Attention, le montant du fichier (%s) diffère de la somme des lignes (%s)
+WarningModuleAffiliatedToAReportedCompany=Attention, ce module a été signalé à la fondation Dolibarr comme étant publié par une société utilisant des pratiques illégales (non-respect des règles d'utilisation de la marque Dolibarr, collecte de vos données sans votre consentement ou déploiement de malware).
+WarningModuleAffiliatedToAPiratPlatform=Soyez prudent lorsque vous téléchargez un module (payant ou gratuit) à partir d'une plateforme non officielle suspecte comme %s
+
 SwissQrOnlyVIR = La facture SwissQR ne peut être ajoutée que sur les factures définies pour être payées avec des paiements par virement.
 SwissQrCreditorAddressInvalid = L'adresse du créancier n'est pas valide (le code postal et la ville sont-ils définis ? (%s)
 SwissQrCreditorInformationInvalid = Les informations sur le créancier ne sont pas valides pour l'IBAN (%s) : %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s est déjà défini comme contact
 ErrorThisGroupIsAlreadyDefinedAsThisType=Les contacts avec ce groupe sont déjà définis comme contact pour ce type.
 EmptyMessageNotAllowedError=Les messages vides ne sont pas autorisés
 ErrorIsNotInError=%s n'est pas en erreur
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang
index 9d82eb1c2ea..f24cede610a 100644
--- a/htdocs/langs/fr_FR/exports.lang
+++ b/htdocs/langs/fr_FR/exports.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - exports
 ExportsArea=Exports
-ImportArea=Espace import
+ImportArea=Imports
 NewExport=Nouvel export
 NewImport=Nouvel import
 ExportableDatas=Lot de données exportables
@@ -83,7 +83,7 @@ RunSimulateImportFile=Lancer la simulation d'import
 FieldNeedSource=Ce champ en base requiert obligatoirement une donnée source
 SomeMandatoryFieldHaveNoSource=Certains champs obligatoires n'ont pas de champ source issus du fichier
 InformationOnSourceFile=Fichier source
-InformationOnTargetTables=Champs destination
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Basculez au moins un champ source dans la colonne des champs à exporter
 SelectFormat=Choisir ce format de fichier import
 RunImportFile=Importer les données
diff --git a/htdocs/langs/fr_FR/hrm.lang b/htdocs/langs/fr_FR/hrm.lang
index 85f041bfef1..2310d6fbd8d 100644
--- a/htdocs/langs/fr_FR/hrm.lang
+++ b/htdocs/langs/fr_FR/hrm.lang
@@ -46,11 +46,11 @@ NewEval=Nouvelle évaluation des compétences
 ValidateEvaluation=Valider l'évaluation des compétences
 ConfirmValidateEvaluation=Êtes-vous sûr de vouloir valider cette évaluation des compétences avec la référence <b>%s</b> ?
 EvaluationCard=Évaluation de compétences
-RequiredRank=Rang requis pour le profil de poste
-RequiredRankShort=Grade requis
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Postes avec ces profils de poste
-EmployeeRank=Niveau de l'employée pour cette compétence
-EmployeeRankShort=Grade de l'employé
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Poste d'employé
 EmployeePositions=Postes d'employés
 EmployeesInThisPosition=Employés occupant ce poste
@@ -98,3 +98,5 @@ NeedBusinessTravels=Besoin de déplacements professionnels
 NoDescription=Pas de description
 TheJobProfileHasNoSkillsDefinedFixBefore=Le profil de poste évalué de cet employé ne comporte aucune compétence définie. Veuillez ajouter des compétences, puis supprimer et relancer l'évaluation.
 PDFStandardHrmEvaluation=Modèle standard pour générer un document PDF pour une évaluation des compétences
+SkillNotRequired=Compétence non nécessaire
+LinkToUserCreated=Lien vers un employé si le candidat a été embauché et converti en utilisateur.
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 999a4985085..e363a5a2c54 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Emailing
 EMailing=Emailing
-EMailings=Emailings
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=Tous les emailings
+AllEMailings=All mass eMails
 MailCard=Fiche emailing
 MailRecipients=Destinataires
 MailRecipient=Destinataire
@@ -26,19 +26,19 @@ MailFile=Fichiers joints
 MailMessage=Corps du message
 SubjectNotIn=Pas dans le Sujet
 BodyNotIn=Pas dans le Message
-ShowEMailing=Afficher emailing
-ListOfEMailings=Liste des emailings
-NewMailing=Nouvel emailing
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Nouveau smsing
-EditMailing=Éditer emailing
-ResetMailing=Ré-envoyer emailing
-ConfirmResetMailingTargetMassaction=Confirmation de la réinitialisation des cibles état
-ResetMailingTargetMassaction=Réinitialiser statut des destinataires
-DeleteMailing=Supprimer emailing
-PreviewMailing=Prévisualiser emailing
-CreateMailing=Créer emailing
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Réinitialiser état en cas d'erreur
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Tester
-ValidMailing=Valider emailing
+ValidMailing=Valid mass Email
 MailingStatusDraft=Brouillon
 MailingStatusValidated=Validé
 MailingStatusSent=Envoyé
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Tous les filtres doivent correspondre pour qu'un e-mail
 LineInFile=Ligne %s du fichier
 RecipientSelectionModules=Modules de sélection des destinataires
 MailSelectedRecipients=Destinataires sélectionnés
-MailingArea=Espace emailings
-LastMailings=Les %s derniers emailings
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Statistiques destinataires
 NbOfCompaniesContacts=Contacts/adresses uniques
 MailNoChangePossible=Destinataires d'un emailing validé non modifiables
-SearchAMailing=Rechercher un emailing
-SendMailing=Envoi emailing
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Envoyé par
 AdvancedAlternative=Alternative avancée
 MailingNeedCommand=L'envoi d'un e-mailing peut être réalisé depuis une ligne de commande. Demandez à l'administrateur de votre serveur de lancer la commande suivante pour envoyer l'e-mailing à tous les destinataires :
 MailingNeedCommand2=Vous pouvez toutefois quand même les envoyer par l'interface écran en ajoutant le paramètre MAILING_LIMIT_SENDBYWEB avec la valeur du nombre maximum d'emails envoyés par session d'envoi. Pour cela, aller dans Accueil - Configuration - Divers.
 ConfirmSendingEmailing=Si vous souhaitez envoyer l'e-mailing depuis cet écran, veuillez confirmer son envoi maintenant, depuis votre navigateur.
-LimitSendingEmailing=Remarque: L'envoi d'Emailings à partir de l'interface web se fait en plusieurs fois pour des raisons de sécurité et de timeout, <b>%s</b> bénéficiaires à la fois pour chaque session d'envoi.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Vider liste
 ToClearAllRecipientsClickHere=Pour vider la liste des destinataires de cet emailing, cliquez sur le bouton
 ToAddRecipientsChooseHere=Pour ajouter des destinataires, choisir dans les listes ci-dessous
-NbOfEMailingsReceived=Emailings de masse reçus
-NbOfEMailingsSend=Emailings de masse envoyés
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID enregistrement
 DeliveryReceipt=Accusé de réception
 YouCanUseCommaSeparatorForSeveralRecipients=Vous pouvez utiliser le caractère de séparation <b>virgule</b> pour spécifier plusieurs destinataires.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Aucune notification automatique prévue pour ce type d
 ANotificationsWillBeSent=1 notification automatique sera envoyée par e-mail
 SomeNotificationsWillBeSent=%s notification(s) automatique(s) sera(seront) envoyée(s) par e-mail
 AddNewNotification=Souscrire à une nouvelle notification automatique (cible/évènement)
-ListOfActiveNotifications=Abonnements actifs (cibles/événements) pour une notification automatique par e-mail
+ListOfActiveNotifications=Abonnements actifs
+ListOfActiveNotificationsHelp=Liste des couples %s/%s abonnés à la notification automatique par e-mail
 ListOfNotificationsDone=Notifications automatiques par e-mail envoyées
+ListOfNotificationsDoneHelp=Liste des notifications e-mail envoyées dans le passé
 MailSendSetupIs=La configuration d'envoi d'emails a été définir sur '%s'. Ce mode ne peut pas être utilisé pour envoyer des e-mailing en masse.
 MailSendSetupIs2=Vous devez d'abord aller, avec un compte d'administrateur, dans le menu %sAccueil - Configuration - EMails%s pour changer le paramètre <strong>'%s'</strong> pour utiliser le mode '%s'. Avec ce mode, vous pouvez entrer le paramétrage du serveur SMTP fourni par votre fournisseur de services Internet et utiliser la fonction d'envoi d'email en masse.
 MailSendSetupIs3=Si vous avez des questions sur la façon de configurer votre serveur SMTP, vous pouvez demander à %s.
@@ -183,7 +185,7 @@ Information=Information
 ContactsWithThirdpartyFilter=Contacts ayant pour tiers
 Unanswered=Sans réponse
 Answered=Répondu
-IsNotAnAnswer=N'est pas une réponse (e-mail initial)
+IsNotAnAnswer=N'est pas une réponse (est un e-mail initial)
 IsAnAnswer=Est une réponse à un e-mail initial
 RecordCreatedByEmailCollector=Enregistrement créé par le collecteur d'e-mails %s
 DefaultBlacklistMailingStatus=Valeur par défaut du champ '%s' lors de la création d'un nouveau contact
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 0e74b7f4f21..bb5c893b77a 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Si une cotisation est nécessaire, une date de début e
 DeleteType=Supprimer
 VoteAllowed=Vote autorisé
 Physical=Physique
-Moral=Morale
-MorAndPhy=Personnes morales et physiques
+Moral=Personne morale
+MorAndPhy=Personne morale et physique
 Reenable=Réactiver
 ExcludeMember=Exclure un adhérent
 Exclude=Exclure
@@ -191,8 +191,8 @@ MembersStatisticsByRegion=Statistiques des membres par région
 NbOfMembers=Nombre total d'adhérents
 NbOfActiveMembers=Nombre total d'adhérents actifs actuellement
 NoValidatedMemberYet=Aucun membre validé trouvé
-MembersByCountryDesc=Cet écran vous présente une vue statistique du nombre d'adhérents par pays.
-MembersByCountryDesc2=Le graphique utilise toutefois le service en ligne de graphique de Google et n'est opérationnel uniquement que si une connexion internet est disponible.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Cet écran vous présente une vue statistique du nombre d'adhérents par département/province/canton.
 MembersByTownDesc=Cet écran vous présente une vue statistique du nombre d'adhérents par ville.
 MembersByNature=Cet écran vous montre les statistiques sur les adhérents par nature.
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 2dd144775d4..b1e95a6ae9c 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -97,7 +97,6 @@ ShowService=Afficher service
 ProductsAndServicesArea=Espace produits et services
 ProductsArea=Espace produits
 ServicesArea=Espace services
-ListOfStockMovements=Liste des mouvements de stock
 BuyingPrice=Prix d'achat
 PriceForEachProduct=Produits avec des prix spécifiques
 SupplierCard=Fiche fournisseur
@@ -172,7 +171,7 @@ BuyingPrices=Prix d'achat
 CustomerPrices=Prix clients
 SuppliersPrices=Prix fournisseurs
 SuppliersPricesOfProductsOrServices=Prix fournisseurs (des produits ou services)
-CustomCode=Nomenclature douanière ou Code SH
+CustomCode=Nomenclature douanière, Code SH, Code TARIC
 CountryOrigin=Pays d'origine
 RegionStateOrigin=Région d'origine
 StateOrigin=Etat/province d'origine
@@ -210,6 +209,7 @@ unitL=Litre
 unitT=tonne
 unitKG=Kg
 unitG=Gramme
+unitGAL=gallon
 unitMG=mg
 unitLB=livre
 unitOZ=once
@@ -312,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Le format est {"URL": "http://example.com/urlof
 UpdateInterval=Intervale de mise à jour (minutes)
 LastUpdated=Dernière mise à jour
 CorrectlyUpdated=Mise à jour avec succès
-PropalMergePdfProductActualFile=Fichiers utilisés pour l'ajout au PDF Azur sont
+PropalMergePdfProductActualFile=PDF fichier à inclure dans le PDF devis si produit fait partie du devis...
 PropalMergePdfProductChooseFile=Sélectionnez les fichiers PDF
 IncludingProductWithTag=Comprenant des produits/services avec le tag/catégorie
 DefaultPriceRealPriceMayDependOnCustomer=Prix ​​par défaut, le prix réel peut dépendre du client
@@ -349,6 +349,10 @@ QtyRecalculatedWithPackaging=La quantité de la ligne a été recalculée en fon
 
 #Attributes
 Attributes=Attributs
+ProductAttributeExtrafields=Champs supplémentaires des variantes
+ProductAttributeExtrafieldsSetup=Configuration des champs supplémentaires des variantes
+ProductAttributeValueExtrafields=Valeurs des champs supplémentaires des variantes
+ProductAttributeValueExtrafieldsSetup=Configuration des champs supplémentaires des valeurs des variantes
 VariantAttributes=Attributs de variante
 ProductAttributes=Attributs de variantes pour les produits
 ProductAttributeName=Attribut de variante %s
@@ -396,8 +400,8 @@ ErrorDestinationProductNotFound=Produit destination non trouvé
 ErrorProductCombinationNotFound=Variante du produit non trouvé
 ActionAvailableOnVariantProductOnly=Action disponible uniquement sur la variante du produit
 ProductsPricePerCustomer=Prix produit par clients
-ProductLevelExtraFields=Attributs supplémentaires (Prix produit par niveau)
-ProductCustomerExtraFields=Attributs supplémentaires (Prix produit par clients)
+ProductLevelExtraFields=Attributs supplémentaires (niveau de prix)
+ProductCustomerExtraFields=Attributs supplémentaires (prix client)
 ProductSupplierExtraFields=Attributs supplémentaires (Prix fournisseur)
 DeleteLinkedProduct=Supprimer le produit enfant lié à la combinaison
 AmountUsedToUpdateWAP=Montant unitaire à utiliser pour mettre à jour le prix moyen pondéré
@@ -439,4 +443,6 @@ AllowStockMovementVariantParentHelp=Par défaut, un parent d'une variante est un
 ConfirmSetToDraftInventory=Êtes-vous sûr de vouloir revenir à l'état de brouillon ?<br>Les quantités actuellement définies dans l'inventaire seront réinitialisées.
 WarningLineProductNotToSell=Le produit ou le service "%s" n'est pas à vendre et a été cloné.
 PriceLabel=Libellé du prix
-PriceByCustomeAndMultiPricesAbility=Prix différents pour chaque client + Plusieurs niveaux de prix par produit/service (chaque client est dans un et un seul niveau)
+GenerateImage=Générer une image
+GenerateWithAI=Générer avec l'IA
+PriceByCustomeAndMultiPricesAbility=Des prix différents pour chaque client + Plusieurs segments de prix par produit/service (chaque client est dans un segment de prix)
diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
index d4dd5f25ee7..5516bb81221 100644
--- a/htdocs/langs/fr_FR/salaries.lang
+++ b/htdocs/langs/fr_FR/salaries.lang
@@ -29,7 +29,6 @@ FillFieldFirst=Remplissez d'abord le champ de l'employé
 UpdateAmountWithLastSalary=Définir sur le montant du dernier salaire
 MakeTransferRequest=Faire une demande de virement
 VirementOrder=Demande de virement
-BankTransferAmount=Montant du virement
 WithdrawalReceipt=Ordres de virement
 OrderWaiting=En attente
 FillEndOfMonth=Remplir avec fin de mois
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index 24e56e6ac0b..423aefb5ee8 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Utilisez ici la liste des autres noms / alias afin que la p
 WEBSITE_CSS_URL=URL du fichier de la feuille de style (CSS) externe
 WEBSITE_CSS_INLINE=Contenu du fichier CSS (commun à toute les pages)
 WEBSITE_JS_INLINE=Contenu du fichier JavaScript (commun à toutes les pages)
-WEBSITE_HTML_HEADER=Ajout en bas de l'en-tête HTML (commun à toutes les pages)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Fichier robot (robots.txt)
 WEBSITE_HTACCESS=Fichier .htaccess du site web
 WEBSITE_MANIFEST_JSON=Fichier manifest.json de site Web
@@ -88,12 +88,12 @@ WebsiteAccount=Compte de site Web
 WebsiteAccounts=Comptes de site web
 AddWebsiteAccount=Créer un compte de site web
 BackToListForThirdParty=Retour à la liste pour le tiers
-DisableSiteFirst=Désactiver le site Web d'abord
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Titre de mon site web
 AnotherContainer=Voici comment inclure le contenu d'une autre page/conteneur (vous pouvez avoir une erreur ici si vous activez le code dynamique car le sous-conteneur incorporé peut ne pas exister)
 SorryWebsiteIsCurrentlyOffLine=Désolé, ce site est actuellement hors ligne. Merci de revenir plus tard ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Activer la table des comptes de site Web
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activer la table pour stocker les comptes de site Web (login / pass) pour chaque site web / tiers
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Vous devez d'abord définir la page d'accueil par défaut
 OnlyEditionOfSourceForGrabbedContentFuture=Avertissement : la création d'une page Web en important une page Web externe est réservée aux utilisateurs expérimentés. Selon la complexité de la page source, le résultat de l'importation peut différer de l'original. De plus, si la page source utilise des styles CSS en conflit ou un code JavaScript non compatible, cela peut altérer l'apparence ou les fonctionnalités de l'éditeur de site Web lorsque vous travaillez sur cette page. Cette méthode est un moyen plus rapide de créer une page, mais il est recommandé de créer votre nouvelle page à partir de zéro ou d'un modèle de page suggéré.<br>Notez également que l'éditeur en ligne peut ne pas fonctionner correctement lorsqu'il est utilisé sur une page externe récupérée.
 OnlyEditionOfSourceForGrabbedContent=Seule la modification de la source HTML est possible lorsque le contenu est récupéré à partir d'un site externe
@@ -257,7 +257,7 @@ logOutFromYourCustomerAccount=Déconnectez-vous de votre compte client
 filteredByVersion=Filtré par version
 removeFilter=Supprimer filtre
 viewMyCart=Voir mon panier
-Shipping=Expédition
+Shipping=Shipping
 freeShipping=Expédition gratuite !
 noProducts=Aucun produits
 nbrItemsInCart=Il y a <span class="ajax_cart_quantity">0</span> articles dans votre panier.
@@ -286,6 +286,7 @@ productNameAToZ=Nom du produit : A à Z
 productNameZToA=Nom du produit : Z à A
 referenceLowestFirst=Référence : Le plus bas en premier
 referenceHighestFirst=Référence : le plus élevé en premier
+productPerPage=products per page
 perPage=par page
 showAll=Afficher tout
 showing= Affichage
@@ -304,10 +305,11 @@ lastUpdate=Dernière mise à jour
 contactSupport=Comment contacter l'assistance
 noProductToDisplay=Erreur, aucun produit à afficher
 yourCompanyInformation=Vos informations société
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=Cet e-mail est déjà enregistré.
 firstnameContainsLettersOnly=<b>Prénom</b> doit contenir des lettres et espaces uniquement
 lastnameContainsLettersOnly=<b>Nom</b> doit contenir des lettres et espaces uniquement
-passwordCriteria=<b>Le mot de passe</b> doit répondre aux critères suivants :<br>- 12 caractères<br>- 1 lettre majuscule<br>- 1 chiffre<br>- Aucun caractère spécial<br>- Évitez de répéter les caractères plus de 3 fois<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=Une erreur est survenue.
 accountCreation=Créer un compte
 errorsOccurred=Il y a %s erreur%s
@@ -360,3 +362,6 @@ LoginCheckout=Connectez-vous et procédez au paiement
 paymentSuccessProcessed=Votre paiement a été traité avec succès.
 youWillBeRedirectedToOrderPage=Vous serez rapidement redirigé vers la page de détails commande.
 WebPortalSetupNotComplete=La configuration du portail Web n'est pas terminée
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang
index 52e1254547e..648575a5fa9 100644
--- a/htdocs/langs/gl_ES/admin.lang
+++ b/htdocs/langs/gl_ES/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=A comprobación da integridade dos ficheiros
 FileIntegritySomeFilesWereRemovedOrModified=A comprobación da integridade de ficheiros fallou. Algunhos ficheiros foron modificados, eliminados ou agregados.
 GlobalChecksum=Suma de comprobación global
 MakeIntegrityAnalysisFrom=Realizar o análise da integridade dos ficheiros da aplicación dende
-LocalSignature=Sinatura local incrustada (menos segura)
-RemoteSignature=Sinatura remota (mais segura)
+LocalSignature=Sinatura local incrustada
+RemoteSignature=Sinatura remota
 FilesMissing=Ficheiros non atopados
 FilesUpdated=Ficheiros actualizados
 FilesModified=Ficheiros modificados
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Punto xeométrico
 ExtrafieldMultiPointGeo=Multipunto xeométrico
 ExtrafieldLinestringGeo=Corda de liña xeométrica
 ExtrafieldPolygonGeo=Polígono xeométrico
+ExtrafieldStars=Estrelas
 ComputedFormula=Campo combinado
-ComputedFormulaDesc=Pode introducir aquí unha fórmula usando outras propiedades do obxecto ou calquera codigo PHP para obter un valor dinámico calculado. Pode usar calquera fórmula compatible con PHP, incluíndo o "?" operador de condición e o seguinte obxecto global: <strong> $db, $conf, $langs, $mysoc, $user, $objectoffield </strong> . <br> <strong> AVISO </strong> : Se precisa propiedades dun obxecto que non está cargado, só ten que buscar o obxecto na súa fórmula como no segundo exemplo. <br> Usar un campo calculado significa que non pode introducir ningún valor desde a interface. Ademais, se hai un erro de sintaxe, a fórmula pode non devolver nada. <br> <br> Exemplo de fórmula: <br> $objectoffield->id < 10 ? round($objectoffield-> id / 2, 2): ($objectoffield->id + 2 * $user->ocid, *$(user->ocid,) ) <br> <br> Exemplo para recargar o obxecto <br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield-->id)options'extraloadedobj0 ? ->capital / 5: '-1') <br> <br> Outro exemplo de fórmula para forzar a carga do obxecto e do seu obxecto pai: <br> (($reloadedobj = new Task($db)) && ($reloadedNoobj) ->id) > 0) && ($secondloadedobj = novo proxecto ($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Non se atopou o proxecto principal'
+ComputedFormulaDesc=Pode introducir aquí unha fórmula usando outras propiedades do obxecto ou calquera códiigo PHP para obter un valor calculado dinámico. Pode usar calquera fórmula compatible con PHP, incluíndo o "?" operador de condición e seguinte obxecto global: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>ADVERTENCIA</strong>: se precisa das propiedades dun obxecto non cargado, só ten que buscar o obxecto na súa fórmula como no segundo exemplo.<br>Usar un campo calculado significa que non pode introducir ningún valor desde a interface. Ademais, se hai un erro de sintaxe, a fórmula pode devolver nada.<br><br>Exemplo 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>Exemplo para recargar o obxecto<br>((($reloadedobj = new Societe($db)) && $reloadedobj->fetchNoCompute($objectoffield->id) > 0) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedob ->capital / 5: '-1')<br><br>Outro exemplo de fórmula para forzar a carga do obxecto e do seu obxecto pai :<br>(($reloadedobj = nova tarefa($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = novo proxecto ($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Non se atopou o proxecto principal'
 Computedpersistent=Almacenar campo combinado
 ComputedpersistentDesc=Os campos adicionais calculados gardaranse na base de datos, con todo, o valor só se recalculará cando se cambie o obxecto deste campo. Se o campo calculado depende doutros obxectos ou datos globais, este valor pode ser incorrecto.
 ExtrafieldParamHelpPassword=Deixando este campo en branco, significa que este valor almacenarase SEN cifrado (o campo estará oculto con estrelas na pantalla).<br><br>Seleccionar valor 'dolcrypt' para codificar o valor cun algoritmo de cifrado reversible. Os datos eliminados aínda poden ser coñecidos e editados, pero están cifrados na base de datos.<br><br>Introduza "auto" (ou 'md5¡, 'sha256', 'pasword_hash'...) para gardar o contrasinal  cun hash non recuperable na base de datos  (sen xeito de recuperar o valor orixinal)
@@ -519,7 +520,7 @@ WarningPHPMailB=- Se o dominio do seu correo electrónico (a parte mymaildomain.
 WarningPHPMailC=- Tamén é interesante usar o servidor SMTP do seu propio fornecedor de servizos de correo electrónico para enviar correos electrónicos, polo que todos os correos electrónicos enviados desde a aplicación tamén se gardarán no directorio "Enviado" da súa caixa de correo.
 WarningPHPMailD=Polo tanto, recoméndase cambiar o método de envío dos correos electrónicos co valor "SMTP".
 WarningPHPMailDbis=Se realmente quere manter o método "PHP" predeterminado para enviar correos electrónicos, só ten que ignorar este aviso ou elimínao premendo %sprema aquí %s
-WarningPHPMail2=Se o seu fornecedorr SMTP de correo electrónico precisa restrinxir o cliente de correo electrónico a algúns enderezos IP (moi raro), este é o seu enderezo IP do seu axente de usuario de correo (MUA) da súa aplicación ERP CRM: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=Se o nome de dominio do enderezo de correo electrónico do seu remitente está protexido por un rexistro SPF (pregúntelle ao rexistrador do seu nome de dominio), debe engadir as seguintes IP ou entrada no rexistro SPF do DNS do seu dominio:  <strong>%s</strong>.
 WarningPHPMailSPFDMARC=Se o nome de dominio do enderezo de correo electrónico do seu remitente está protexido por un rexistro DMARC diferente de p=none (pregúntelle ao rexistrador do seu nome de dominio), debe eliminar o seu rexistro DMARC ou configuralo en p=none como fai @gmail.com) ou use o envío doutro método.
 SPFAndDMARCInformation=Rexistro DNS SPF e DMARC para os enderezos de correo electrónico principais
@@ -567,8 +568,8 @@ Module10Name=Contabilidade (Simplificada)
 Module10Desc=Activación de informes simples de contabilidade (diarios, vendas) baseados no contido da base de datos. Non utiliza ningunha taboa de contabilidade.
 Module20Name=Orzamentos
 Module20Desc=Xestión de orzamentos/propostas comerciais
-Module22Name=Mailings Masivos
-Module22Desc=Administración e envío de E-Mails masivos
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Enerxía
 Module23Desc=Monitoriza o consumo de enerxías
 Module25Name=Pedimentos de clientes
@@ -847,10 +848,10 @@ Permission212=Pedir liñas
 Permission213=Activar una líña
 Permission214=Configurar a telefonía
 Permission215=Configurar provedores
-Permission221=Consultar E-Mails
-Permission222=Crear/modificar E-Mails (asunto, destinatarios, etc.)
-Permission223=Validar E-Mails (permite o envío)
-Permission229=Eliminar E-Mails
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Ver os destinatarios e a información
 Permission238=Enviar os e-mails manualmente
 Permission239=Eliminar os e-mails despois da súa validación ou seu envío
@@ -1105,6 +1106,7 @@ DictionaryStaff=Número de empregados
 DictionaryAvailability=Tempo de entrega
 DictionaryOrderMethods=Métodos de pedimento
 DictionarySource=Oríxes de orzamentos/pedimentos
+DictionaryAccountancyReport=Informes contables personalizados
 DictionaryAccountancyCategory=Grupos persoalizados para informes
 DictionaryAccountancysystem=Modelos de pláns contables
 DictionaryAccountancyJournal=Diarios contables
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Voltar á lista de diccionarios
 TypeOfRevenueStamp=Tipos de selos fiscais
 VATManagement=Xestión IVE
 VATIsUsedStandard=Ao crear documentos (orzamentos, facturas, pedimentos...), o tipo de imposto sobre vendas predeterminado establécese segundo as regras estándar (dependendo dos países vendedores e compradores)
-VATIsUsedDesc=De forma predeterminada, ao crear orzamentos, facturas, pedimentos, etc., a taxa do imposto sobre vendas segue a regra estándar activa:<br>Se o vendedor non está suxeito ao imposto sobre vendas, o imposto sobre vendas será 0 por defecto. . Fin da regra.<br>Se o (país do vendedor = país do comprador), entón o imposto sobre vendas é igual ao imposto sobre vendas do produto no país do vendedor. Fin da regra.<br>Se o vendedor e o comprador están ambos na Comunidade Europea e as mercadorías son produtos relacionados co transporte (transporte, envíos, compañía aérea), o IVE predeterminado é 0. Esta regra depende do país do vendedor; consulte co seu contable. O IVE debe ser pagado polo comprador á aduana do seu país e non ao vendedor. Fin da regra.<br>Se o vendedor e o comprador están ambos na Comunidade Europea e o comprador non é unha empresa (cun número de IVE intracomunitario rexistrado), o IVE será predeterminado. o tipo de IVE do país do vendedor. Fin da regra.<br>Se o vendedor e o comprador están ambos na Comunidade Europea e o comprador é unha empresa (cun número de IVE intracomunitario rexistrado), entón o IVE é 0 por defecto. Fin da regra.<br>En calquera outro caso, o valor predeterminado proposto é Imposto sobre vendas=0. Fin da regra.
+VATIsUsedDesc=Por defecto, ao crear orzamentos, facturas, pedidmentos, etc., a taxa do imposto sobre vendas segue a regra estándar activa:<br>Se o vendedor non está suxeito ao imposto sobre vendas, o imposto sobre vendas será 0 por defecto. . Fin da regra.<br>Se O estado ou a provincia do comprador ten unha regra de IVE do dicionario de tipos de IVE, entón é o tipo de IVE predeterminado. Fin da regra.<br>Se o (país do vendedor = país do comprador), entón o imposto sobre vendas é igual ao imposto sobre vendas do produto no país do vendedor. Fin da regra.<br>Se o vendedor e o comprador están ambos na Comunidade Europea e as mercadorías son produtos relacionados co transporte (transporte, transporte, compañía aérea), o IVE predeterminado é 0. Este a regra depende do país do vendedor; consulte co seu contable. O IVE debe ser pagado polo comprador á aduana do seu país e non ao vendedor. Fin da regra.<br>Se o vendedor e o comprador están ambos na Comunidade Europea e o comprador non é unha empresa (cun número de IVE intracomunitario rexistrado), o IVE será predeterminado. o tipo de IVE do país do vendedor. Fin da regra.<br>Se o vendedor e o comprador están ambos na Comunidade Europea e o comprador é unha empresa (cun número de IVE intracomunitario rexistrado), entón o IVE é 0 por defecto. Fin da regra.<br>En calquera outro caso, o valor predeterminado proposto é Imposto sobre vendas=0. Fin da regra.
 VATIsNotUsedDesc=O tipo de IVE proposto por defecto é 0. Este é o caso de asociacións, particulares ou algunhas pequenas sociedades.
 VATIsUsedExampleFR=En Franza, tratase das sociedades ou organismos que escollen un réxime fiscal xeral (Xeral simplificado ou Xeral normal). Réxime no cal declarase o IVE.
 VATIsNotUsedExampleFR=En Franza, tratase de asociacións exentas de IVE ou sociedades, organismos ou profesións liberais que tñen escollido o réxime fiscal de módulos (IVE en franquicia), pagando un IVE en franquicia sen facer declaración de IVE. Esta escolla fai aparecer a anotación  "IVE non aplicable - art-293B do CGI" nas facturas.
-VATType=Tipo de imposto
+VATType=Uso fiscal
 ##### Local Taxes #####
 TypeOfSaleTaxes=Tipo de impostos de venda
 LTRate=Tipo
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Segundo a configuración dos impostos (ver% s -% s -%
 LabelUsedByDefault=Etiqueta que se utilizará se non se atopa tradución para este código
 LabelOnDocuments=Etiqueta sobre documentos
 LabelOrTranslationKey=Clave de tradución ou cadea
+LabelTranslatedInCurrentLanguage=Etiqueta traducida ao idioma actual
 TranslationFound=Atopouse a tradución
 TheTranslationIsSearchedFromKey=Procúrase a tradución desde a clave de tradución: <b>%s</b>
 TranslationKey=Chave de tradución
@@ -1431,7 +1434,7 @@ AddVatInList=Amosar o número de IVE do cliente/provedor en listaxes combinadas
 AddAdressInList=Amosar o enderezo do cliente/provedor nas listaxes combinadas.<br> Os terceiros aparecerán cun formato de nome "The Big Company corp - 21 jump street 123456 Big town - USA ", no lugar de "The Big Company corp".
 AddEmailPhoneTownInContactList=Amosar o correo electrónico de contacto (ou teléfonos se non está definido) e a cidade nas listas combinadas.<br>Os contactos aparecerán cun formato de nome "Dupond Durand - dupond.durand@example.com - París " ou "Dupond Durand - 06 07 59 65 66 - París" en lugar de "Dupond Durand".
 AskForPreferredShippingMethod=Consultar polo método preferido de envío a terceiros.
-FieldEdition=Edición do campo %s
+FieldEdition=Modificación do campo %s
 FillThisOnlyIfRequired=Exemplo: +2 (Complete só se rexistra unha desviación do tempo na exportación)
 GetBarCode=Obter código de barras
 NumberingModules=Modelos de numeración
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Forzar a data de factura á data de validación
 SuggestedPaymentModesIfNotDefinedInInvoice=Formas de pagamento suxeridas para as facturas se non están definidas explícitamente
 SuggestPaymentByRIBOnAccount=Suxerir o pagamento por abono en conta
 SuggestPaymentByChequeToAddress=Suxerir o pagamento por talón a
+InvoicePaymentManageStructuredCommunication=Xerar comunicación estruturada para o pagamento de facturas
+InvoicePaymentManageStructuredCommunicationHelp=Nalgúns países, é preciso amosar unha referencia estruturada para facilitar os pagamentos e a súa conciliación
 FreeLegalTextOnInvoices=Texto libre en facturas
 WatermarkOnDraftInvoices=Marca de auga nas facturas borrador (no caso de estar baleiro)
 PaymentsNumberingModule=Numeración de modelos de pagamentos
@@ -1718,6 +1723,7 @@ CompressionOfResources=Compresión das respostas HTTP
 CompressionOfResourcesDesc=Por exemplo, usando a directiva Apache  "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Esta detección automática non é posible cos navegadores actuais
 DefaultValuesDesc=Aquí pode definir o valor predeterminado que desexa usar ao crear un novo rexistro e / ou filtros predeterminados ou a orde de clasificación ao listar rexistros.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Valores predeterminados (para usar nos formularios)
 DefaultSearchFilters=Filtros de busca predeterminados
 DefaultSortOrder=Ordes de clasificación predeterminados
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Módulos de numeración de notas de entrega
 SendingsAbility=Soporte de follas de envío para entregas a clientes
 NoNeedForDeliveryReceipts=Na maioría dos casos, as notas de entrega (listaxe de produtos enviados) tamén actúan como notas de recepción e son asinadas polo cliente. A xestión das notas de recepción é polo tanto redundante e rara vez será activada.
 FreeLegalTextOnShippings=Texto libre en envíos
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Módulos de numeración das notas de recepción
 DeliveryOrderModel=Modelo de notas de recepción
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Texto libre nas notas de recepción
 ##### FCKeditor #####
 AdvancedEditor=Editor avanzado
 ActivateFCKeditor=Activar editor avanzado para :
-FCKeditorForNotePublic=WYSIWYG creación/edición do campo "notas públicas" de elementos
-FCKeditorForNotePrivate=WYSIWYG creación/edición do campo "notas privadas" de elementos
-FCKeditorForCompany=Creación/edición WYSIWYG do campo descrición dos elementos (excepto produtos/servizos)
-FCKeditorForProductDetails=Creación/edición WYSIWYG de descrición de produtos ou liñas para obxectos (liñas de orzamentos, pedimentos, facturas, etc...).
+FCKeditorForNotePublic=Creación/modificación WYSIWYG do campo "notas públicas" dos elementos
+FCKeditorForNotePrivate=Creación/modificación WYSIWYG do campo "notas privadas" de elementos
+FCKeditorForCompany=Creación/modificación WYSIWYG do campo descrición de elementos (excepto produtos/servizos)
+FCKeditorForProductDetails=Creación/modificación WYSIWYG de descrición de produtos ou liñas para obxectos (liñas de propostas, pedimentos, facturas, etc...).
 FCKeditorForProductDetails2=Aviso: non se recomenda usar esta opción para este caso porque pode crear problemas con caracteres especiais e formato de páxina ao crear ficheiros PDF.
-FCKeditorForMailing= Creación/edición de WYSIWYG para correos electrónicos masivos (Ferramentas->Correo electrónico)
-FCKeditorForUserSignature=Creación/edición WYSIWYG da sinatura do usuario
-FCKeditorForMail=Creación/edición de WYSIWYG para todo o correo (excepto Ferramentas->Correo electrónico)
-FCKeditorForTicket=Creación/edición de WYSIWYG para tickets
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=Creación/modificación WYSIWYG da sinatura do usuario
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=Creación/modificación de WYSIWYG para entradas
 ##### Stock #####
 StockSetup=Configuración do módulo Almacéns
 IfYouUsePointOfSaleCheckModule=Se utiliza un módulo de Punto de Venda (módulo TPV por defecto ou otro módulo externo), esta configuración pode ser ignorada polo seu módulo de Punto de Venda. A maioría de módulos TPV están deseñados para crear inmediatamente unha factura e decrementar stocks calquera que sexan estas opcións. Por tanto, se vosteda precisa ou non decrementar stocks no rexistro dunha venda do seu punto de venda, controle tamén a configuración do seu módulo TPV.
@@ -1867,7 +1874,6 @@ Buy=Mercar
 Sell=Vendas
 InvoiceDateUsed=Data de utilización da factura
 YourCompanyDoesNotUseVAT=A súa empresa está cofigurada para que non use o IVE (Inicio - Configuración - Empresa / Organización), polo que non hai opcións de IVE para configurar.
-AccountancyCode=Código de contabilidade
 AccountancyCodeSell=Conta de venda. código
 AccountancyCodeBuy=Conta de compras código
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Manteña a caixa de verificación "Crear automáticamente o pagamento" baleira por defecto cando cree unha nova taxa
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Cal vista desexa abrir de xeito predeterminado ao seleccio
 AGENDA_EVENT_PAST_COLOR = Cor do evento pasado
 AGENDA_EVENT_CURRENT_COLOR = Cor do evento actual
 AGENDA_EVENT_FUTURE_COLOR = Cor do evento futuro
-AGENDA_REMINDER_BROWSER = Activar a lembranza de eventos <b> no navegador do usuario </b> (Cando se alcanza a data de lembranza, o navegador amosa unha ventá emerxente. Cada usuario pode desactivar estas notificacións desde a configuración de notificacións do navegador).
+AGENDA_REMINDER_BROWSER = Permitir recordatorios de eventos <b>no navegador do usuario</b>
+AGENDA_REMINDER_BROWSERHelp = Cando se alcanza a data do recordatorio, o navegador mostra unha ventá emerxente). O usuario define a opción/atraso de lembranza na creación do evento.
 AGENDA_REMINDER_BROWSER_SOUND = Activar a notificación de son
-AGENDA_REMINDER_EMAIL = Activar a lembranza de eventos <b> por correo electrónico </b> (a opción de lembranza/atraso pódese definir en cada evento).
+AGENDA_REMINDER_EMAIL = Permitir recordatorios de eventos <b>por correo electrónico</b>
 AGENDA_REMINDER_EMAIL_NOTE = Nota: A frecuencia do traballo programado %s debe ser suficiente para asegurarse de que as lembranzas se envían no momento correcto.
 AGENDA_SHOW_LINKED_OBJECT = Amosar o obxecto ligado á vista de axenda
 AGENDA_USE_EVENT_TYPE = Usar tipos de eventos (xestionados no menú Configuración -> Dicionarios -> Tipo de eventos da axenda)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Definir automaticamente este valor predeterminado para o tipo de evento no formulario de creación de eventos
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use a lembranza predeterminado nestes eventos
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = O formulario de notificación de lembranza automática cubrirase por defecto na creación do evento
+AGENDA_DEFAULT_REMINDER_OFFSET = Período de lembranza predeterminada antes do evento
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Padrón de correo electrónico para usar como lembranza predeterminada
 PasswordTogetVCalExport = Chave para autorizar a ligazón de exportación
 PastDelayVCalExport=Non exportar eventos anteriores a
 SecurityKey = Chave de seguridade
@@ -2006,7 +2017,7 @@ BackupZipWizard=Asistente para crear unha copia de seguridade do directorio de d
 SomethingMakeInstallFromWebNotPossible=A instalación do módulo externo non é posible desde a interface web polo seguinte motivo:
 SomethingMakeInstallFromWebNotPossible2=Por este motivo, o proceso de actualización descrito aquí é un proceso manual que só pode realizar un usuario con permisos
 InstallModuleFromWebHasBeenDisabledContactUs=A instalación ou o desenvolvemento de módulos externos ou sitios web dinámicos, desde a aplicación, está actualmente bloqueada por motivos de seguridade. Póñase en contacto connosco se precisa activar esta función.
-InstallModuleFromWebHasBeenDisabledByFile=O seu administrador desactivou a instalación do módulo externo desde a aplicación. Debe pedirlle que elimine o ficheiro <strong>%s</strong> para permitir esta función.
+InstallModuleFromWebHasBeenDisabledByFile=O seu administrador desactivou a instalación do módulo externo desde a aplicación e o uso de funcións que permiten executar código no servidor. Debe pedirlle que elimine o ficheiro <strong>%s</strong> para permitir esta función
 ConfFileMustContainCustom=A instalación ou construción dun módulo externo desde a aplicación precisa gardar os ficheiros do módulo no directorio <strong>%s</strong>. Para que Dolibarr procese este directorio, debe configurar o seu <strong>conf/conf.php</strong> para engadir as dúas liñas directivas: <br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Resalte as liñas da táboa cando pasa o rato por riba
 HighlightLinesColor=Resaltar a cor da liña cando pasa o rato pasa (use 'ffffff' para non destacar)
@@ -2036,6 +2047,7 @@ Enter0or1=Engada 0 ou 1
 EnterYesOrNo=Introduza Si ou Non
 UnicodeCurrency=Introduza aquí entre chaves, listaxe do número de bytes que representan o símbolo de moeda. Por exemplo: por $, introduza [36] - para Brasil real R$ [82,36] - para €, introduza [8364]
 ColorFormat=A cor RGB está en formato HEX, por exemplo: FF0000
+NumberFormatForATotalPrice=Formato de número para o prezo total %s
 PictoHelp=Nome da icona no formato:<br>- image.png para un ficheiro de imaxe no directorio de temas actual<br>- image.png@module se o ficheiro está no directorio /img/ dun módulo<br>- fa-xxx para un picto FontAwesome fa-xxx<br>- fontawesome_xxx_fa_color_size para un picto FontAwesome fa-xxx (con prefixo, cor e tamaño definidos)
 PositionIntoComboList=Posición da liña nas listas combinadas
 SellTaxRate=Tipo do imposto sobre as vendas
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Ocultar a columna do
 MAIN_PDF_NO_SENDER_FRAME=Ocultar os bordos no marco do enderezo do remitente
 MAIN_PDF_NO_RECIPENT_FRAME=Ocultar os bordos no marco do enderezo do destinatario
 MAIN_PDF_HIDE_CUSTOMER_CODE=Ocultar código de cliente
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Ocultar o código contable do cliente
 MAIN_PDF_HIDE_SENDER_NAME=Ocultar o nome do remitente/empresa no bloque de enderezos
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Ocultar condicións de pagamento
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Ocultar modo de pagamento
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Engade un marcado oculto á área de sinatura para permitir que a ferramenta de sinatura electrónica o reutilice. Pode ser usado por ferramentas externas ou no futuro pola función de sinatura en liña.
@@ -2324,6 +2341,8 @@ NotRecommended=Non recomendado
 ARestrictedPath=Algún camiño restrinxido para ficheiros de datos
 CheckForModuleUpdate=Comprobar actualizacións para os módulos externos
 CheckForModuleUpdateHelp=Esta acción conectara cos editores de módulos externos para comprobar se hai unha nova versión dispoñible.
+CheckForModuleUpdateHelp2=Tamén se conecta a %s para comprobar se algúns dos seus módulos externos foron informados como malware pola comunidade.
+YourIPWillBeRevealedToThisExternalProviders=A súa IP será revelada a todos estes provedores externos.
 ModuleUpdateAvailable=Unha actualización está dispoñible
 NoExternalModuleWithUpdate=Non foron atopadas actualizacións para módulos externos
 SwaggerDescriptionFile=Ficheiro de descrición da API Swagger (para uso con redoc por exemplo)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Mostrar o enderezo de envío
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Indicación obrigatoria nalgúns países (Franza,...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Amosar contacto de facturación por orzamento
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=Por defecto, o contacto só aparece para a facturación
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Ligazón URL da rede social. Use {socialid} para a parte variable que contén o ID da rede social.
 IfThisCategoryIsChildOfAnother=Se esta categoría é filla doutra
 DarkThemeMode=Modo de tema escuro
@@ -2450,7 +2471,7 @@ 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)
+MAIN_CHECKBOX_LEFT_COLUMN=Amosa a columna para a selección de campo e liña á esquerda (á dereita non está activo)
 NotAvailableByDefaultEnabledOnModuleActivation=Non creado por defecto. Creado só coa activación do módulo.
 CSSPage=Estilo CSS
 Defaultfortype=Por defecto
@@ -2489,7 +2510,7 @@ AiDescription=Funcións de IA (Intelixencia Artificial).
 AiDescriptionLong=Ofrece funcións de IA (intelixencia artificial) en diferentes partes da aplicación. Necesita unha API de IA externa.
 AI_API_KEY=Contrasinal para a API IA
 AI_API_URL=URL do punto final para a API IA
-AI_API_SERVICE=Servizo a usar para funcións de IA
+AI_API_SERVICE=AI service to use
 AiSetup=Configuración do módulo IA
 AiCustomPrompt=Indicación personalizada de IA
 AI_CONFIGURATIONS_PROMPT=Indicación personalizada
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=Indicacións personalizadas de IA para as funcións
 EnterAnIP=Introduza un enderezo IP
 ConvertInto=Converter en
 YouAreHere=Está aquí
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Amosa o código de barras no documento PDF de envío
 BARCODE_ON_RECEPTION_PDF=Amosa o código de barras no documento PDF de recepción
 BARCODE_ON_STOCKTRANSFER_PDF=Amosa o código de barras no documento PDF de transferencia de existencias
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=URL de saída de Dolibarr para autor
 MainAuthenticationOidcLoginClaimName=Chamada de inicio de sesión
 MainAuthenticationOidcLoginClaimDesc=Chamada de OpenID Connect que coincide co inicio de sesión do usuario de Dolibarr. Se non está definido ou baleiro, o correo electrónico predeterminado
 BlackListWords=Listaxe negra de palabras
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Engadir á lista negra
 FediverseSetup=Configuración da sección Fediverse
 ConfigImportSocialNetwork=Configuración de redes sociais compatibles con Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Nome do parámetro
 ParamValue=Valor do parámetro
 ConfirmDeleteParamOfSocialNetwork=Está certo de querer eliminar este parámetro?
 HelpMariaDBToGetPossibleValues=Pode obter unha lista de valores posibles executando o seguinte comando SQL: %s
+HelpMariaDBToGetValue=Este valor recuperouse co comando: %s
+PDFBoxFrameRoundedCorners=Marcos con cantos redondeados
+MAIN_PDF_FRAME_CORNER_RADIUS=O valor predeterminado para o radio das esquinas é 0, polo que non hai cantos arredondados. Escolla valores entre 1 e 3 para aumentar o radio das esquinas e engadir cantos redondeados aos marcos
 Captcha=Captcha
 CaptchaDesc=Se quere protexer a súa páxina de inicio de sesión cun Captcha, pode escoller cal usar aquí
 DolibarrStandardCaptcha=Un captcha nativo xerado por Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Mostrar o enderezo de envío
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Indicación obrigatoria nalgúns países (Franza,...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Amosar análise de IVE por taxa
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=Ten un tamaño máximo predeterminado para as listas definidas como <b>%s</b> . Este é un valor grande no que hai que desprazar para ver todas as respostas. É mellor ter un valor inferior a <b>%s</b> e utilizar paxinación para ver o rexistro sobre este número. Cambie isto no menú Inicio - Configuración - Pantalla.
+RoundBorders=Bordes redondos
+CheckIfModuleIsNotBlackListed=Bloquear a instalación dos módulos atopados na <b>Lista negra remota</b>
+CheckIfModuleIsNotBlackListedHelp=Algúns módulos poden ser proporcionados por algunhas empresas que non respectan as regras de boa vontade do proxecto (incumprimento do GDPR, violación das normas de uso da marca Dolibarr, etc.). Ao marcar esta caixa, farase unha solicitude ao servidor do proxecto para ver se se recibiu un informe sobre este módulo, e protexerao bloqueando a implantación dos módulos marcados.
+DatabaseEncryption=Cifrado na base de datos
+AlgorithmFor=Algoritmo para: %s
+SensitiveData=Datos sensibles
+ToolToDecryptAString=Ferramenta para descifrar unha cadea
+Decrypt=Descifrar
+FilesIntegrityDesc=Se quere comprobar a integridade dos ficheiros en lugar da base de datos, pode facelo usando <a href="%s">esta ferramenta</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=Hai máis de %s respostas co seu filtro. Engada máis filtros...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/gl_ES/banks.lang b/htdocs/langs/gl_ES/banks.lang
index 40e7b9b1e89..1061d2f29d6 100644
--- a/htdocs/langs/gl_ES/banks.lang
+++ b/htdocs/langs/gl_ES/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Saldo final
 CurrentBalance=Saldo actual
 FutureBalance=Saldo previsto
 ShowAllTimeBalance=Amosar balance dende o principio
-AllTime=Dende o inicio
 Reconciliation=Conciliación
 RIB=Conta bancaria
 IBAN=Número IBAN
@@ -114,13 +113,13 @@ SocialContributionPayment=Pagamento de imposto social/fiscal
 BankTransfer=Transferencia bancaria
 BankTransfers=Transferencias bancarias
 MenuBankInternalTransfer=Transferencia interna
-TransferDesc=Escolla transferencia interna se transfire dunha conta a outra, a aplicación escribirá dous rexistros: un débito na conta de orixe e un crédito na conta de destino. A mesma cantidade, etiqueta e data utilizaranse para esta transacción. 
+TransferDesc=Escolla transferencia interna se transfire dunha conta a outra, a aplicación escribirá dous rexistros: un débito na conta de orixe e un crédito na conta de destino. A mesma cantidade, etiqueta e data utilizaranse para esta transacción.
 TransferFrom=De
 TransferTo=A
 TransferFromToDone=A transferencia de <b>%s</b> hacia <b>%s</b> de <b>%s</b> %s foi rexistrada.
 CheckTransmitter=Orixe
 ValidateCheckReceipt=¿Validar este talón recibido?
-ConfirmValidateCheckReceipt=Está certo de querer enviar este xustificante de talón para validalo? Non se poderán facer cambios unha vez validado. 
+ConfirmValidateCheckReceipt=Está certo de querer enviar este xustificante de talón para validalo? Non se poderán facer cambios unha vez validado.
 DeleteCheckReceipt=¿Eliminar esta remesa?
 ConfirmDeleteCheckReceipt=¿Está certo de querer eliminar esta remesa?
 DocumentsForDeposit=Documentos para depositar no banco
@@ -133,7 +132,7 @@ DeleteTransaction=Eliminar rexistro
 ConfirmDeleteTransaction=¿Está certo de querer eliminar este rexistro?
 ThisWillAlsoDeleteBankRecord=Isto tamén eliminará o rexistro bancario
 BankMovements=Movementos
-PlannedTransactions=Rexistros previstos
+PlannedTransactions=Próximas entradas
 Graph=Gráficos
 ExportDataset_banque_1=Rexistros bancarios e extractos de conta
 ExportDataset_banque_2=Xustificante bancario
@@ -148,11 +147,11 @@ AllAccounts=Todas as contas bancarias e de caixa
 BackToAccount=Voltar á conta
 ShowAllAccounts=Amosar para todas as contas
 FutureTransaction=Transacción futura. Non é posible a reconciliación.
-SelectChequeTransactionAndGenerate=Seleccione/filtre os talóns que se incluirán no xustificante do depósito de cheques. A continuación, prema en "Crear". 
+SelectChequeTransactionAndGenerate=Seleccione/filtre os talóns que se incluirán no xustificante do depósito de cheques. A continuación, prema en "Crear".
 SelectPaymentTransactionAndGenerate=Seleccione/filtre os documentos que se van incluír no xustificante do depósito %s. A continuación, prema en "Crear".
 InputReceiptNumber=Escolla o extracto bancario relacionado coa conciliación. Use un valor numérico ordenable
-InputReceiptNumberBis=YYYYMM ou YYYYMMDD
-EventualyAddCategory=Eventualmente, especifique a categoría na que quere clasificar os rexistros
+InputReceiptNumberBis=YYYYMM
+EventualyAddCategory=Opcionalmente, unha categoría na que clasificar as operacións
 ToConciliate=A reconciliar?
 ThenCheckLinesAndConciliate=Entón, comprobe as liñas presentes no extracto bancario e faga click
 DefaultRIB=Conta bancaria por defecto
@@ -188,9 +187,9 @@ BankColorizeMovementDesc=Se esta función está activada, pode escoller unha cor
 BankColorizeMovementName1=Cor de fondo para movementos de débito
 BankColorizeMovementName2=Cor de fondo para os movementos de crédito
 IfYouDontReconcileDisableProperty=Se non aplica as reconciliacións bancarias nalgunhas contas bancarias, desactivar as propiedades "%s" nelas apara eliminar este aviso.
-NoBankAccountDefined=Non está definida a conta bancaria
+NoBankAccountDefined=Non se atopou ningunha conta bancaria
 NoRecordFoundIBankcAccount=Non foi atopado ningún rexistro na conta bancaria. Normalmente, isto ocorre cando un rexistro foi eliminado manualmente da listaxe de transaccións da conta bancaria (por exemplo, durante a conciliación da conta bancaria). Outro motivo é que o pagamento foi rexistrado cando o modulo "%s estivo" desactivado.
-AlreadyOneBankAccount=Xa foi definida unha conta bancaria 
+AlreadyOneBankAccount=Xa foi definida unha conta bancaria
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Variante do ficheiro SEPA
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Si = Garda o "Tipo de pagamento" na sección "Transferencia bancaria" do ficheiro SEPA<br><br>Ao xerar un ficheiro XML SEPA para o transferencias bancarias, a sección "PaymentTypeInformation" agora pódese colocar dentro da sección "CreditTransferTransactionInformation" (en lugar da sección "Payment"). Recomendamos encarecidamente que non se marque esta opción para colocar PaymentTypeInformation a nivel de pagamento, xa que todos os bancos non a aceptarán necesariamente a nivel de CreditTransferTransactionInformation. Poñase en contacto co seu banco antes de colocar PaymentTypeInformation no nivel CreditTransferTransactionInformation.
 ToCreateRelatedRecordIntoBank=Para crear un rexistro bancario relacionado que falta
diff --git a/htdocs/langs/gl_ES/bills.lang b/htdocs/langs/gl_ES/bills.lang
index 545789bec47..0b4a6338379 100644
--- a/htdocs/langs/gl_ES/bills.lang
+++ b/htdocs/langs/gl_ES/bills.lang
@@ -109,7 +109,7 @@ ClassifyPaidPartially=Clasificar 'Pagado parcialmente'
 ClassifyCanceled=Clasificar 'Abandonado'
 ClassifyClosed=Clasificar 'Pechado'
 ClassifyUnBilled=Clasificar 'Non facturado'
-CreateBill=Crear factura
+CreateBill=Crear factura a cliente
 CreateCreditNote=Crear abono
 AddBill=Crear factura ou abono
 AddToDraftInvoices=Engadir a factura borrador
@@ -169,6 +169,7 @@ BillTo=Enviar a:
 ShippingTo=Envío a
 ActionsOnBill=Accións sobre a factura
 ActionsOnBillRec=Actuacións sobre factura recorrente
+InvoicesGeneratedFromRec=Facturas xeradas
 RecurringInvoiceTemplate=Modelo / Factura recorrente
 NoQualifiedRecurringInvoiceTemplateFound=Non hai ningunha factura de modelo recorrente cualificada para a xeración.
 FoundXQualifiedRecurringInvoiceTemplate=%s modelo(s) de factura(s) recorrente(s) cualificado(s) para a xeración.
@@ -182,6 +183,7 @@ LastCustomersBills=Últimas %s facturas a clientes
 LastSuppliersBills=Últimas %s facturas de provedores
 AllBills=Todas as facturas
 AllCustomerTemplateInvoices=Todos os padróns de facturas
+AllSupplierTemplateInvoices=Todos os padróns de facturas
 OtherBills=Outras facturas
 DraftBills=Facturas borrador
 CustomersDraftInvoices=Facturas a cliente borrador
@@ -272,8 +274,8 @@ NoDraftBills=Ningunha factura borrador
 NoOtherDraftBills=Ningunha outra factura borrador
 NoDraftInvoices=Sen facturas borrador
 RefBill=Ref. factura
-RefSupplierBill=Factura de provedor ref
-SupplierOrderCreateBill=Crear factura
+RefSupplierBill=Ref. da factura de provedor
+SupplierOrderCreateBill=Crear factura de provedor
 ToBill=A facturar
 RemainderToBill=Queda por facturar
 SendBillByMail=Enviar a factura por E-Mail
@@ -419,6 +421,7 @@ InvoiceAutoValidate=Validar facturas automáticamente
 GeneratedFromRecurringInvoice=Xerado dende a padrón de facturas recorrentes %s
 DateIsNotEnough=Ainda non foi alcanzada a data
 InvoiceGeneratedFromTemplate=Factura %s xerada dende a padrón de factura recorrente %s
+InvoiceGeneratedFromTemplateError=Error Invoice %s generated from recurring template invoice %s : %s
 GeneratedFromTemplate=Xerado dende a padrón de facturas concorrentes %s
 WarningInvoiceDateInFuture=Atención: a data da factura é maior que a data actual
 WarningInvoiceDateTooFarInFuture=Atención: a data da factura é moi lonxana á data actual
@@ -495,6 +498,8 @@ IBANNumber=Número de conta IBAN completo
 IBAN=IBAN
 CustomerIBAN=IBAN do cliente
 SupplierIBAN=IBAN do provedor
+DebitBankAccount = Conta bancaria paradomicilóns
+SetDebitBankAccount = Definir conta bancaria para domiciliacións
 BIC=BIC/SWIFT
 BICNumber=Código BIC/SWIFT
 ExtraInfos=Información complementaria
@@ -513,10 +518,12 @@ PrettyLittleSentence=Acepto o pagamento mediante talóns ao meu nome das sumas d
 IntracommunityVATNumber=Número de IVE intracomunitario
 PaymentByChequeOrderedTo=Pagamento mediante talón nominativo (taxas incluídas) a %s enviado a
 PaymentByChequeOrderedToShort=Pagamento mediante talón nominativo (taxas incluídas) a
+StructuredCommunication=Comunicación estruturada
 SendTo=enviado a
 PaymentByTransferOnThisBankAccount=Pagamento mediante transferencia á conta bancaria seguinte
 VATIsNotUsedForInvoice=* IVE non aplicable  art-293B del CGI
 VATIsNotUsedForInvoiceAsso=* IVE non aplicable art-261-7 do CGI
+VATIsNotUsedReverseChargeProcedure=* Non applicable VAT art-259-1 of CGI
 LawApplicationPart1=Pola aplicación da lei 80.335 de 12/05/80
 LawApplicationPart2=as mercancías permanecen en propiedade de
 LawApplicationPart3=vendedor ata o completo cobro de
@@ -661,6 +668,7 @@ MentionCategoryOfOperations0=Entrega de produtos
 MentionCategoryOfOperations1=Prestación de servizos
 MentionCategoryOfOperations2=Mixto - Entrega de produtos e prestación de servizos
 Salaries=Salarios
+InvoiceSubtype=Subtipo de factura
 SalaryInvoice=Salario
 BillsAndSalaries=Facturas e Salarios
 CreateCreditNoteWhenClientInvoiceExists=Esta opción só está habilitada cando existen facturas validadas para un cliente ou cando se utiliza INVOICE_CREDIT_NOTE_STANDALONE constante (útil para algúns países)
diff --git a/htdocs/langs/gl_ES/blockedlog.lang b/htdocs/langs/gl_ES/blockedlog.lang
index 9b6f8721cdc..d2e07395b9b 100644
--- a/htdocs/langs/gl_ES/blockedlog.lang
+++ b/htdocs/langs/gl_ES/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Rexistros inalterables
 ShowAllFingerPrintsMightBeTooLong=Amosar todos os rexistros arquivados (pode ser longo)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostrar todos os rexistros de ficheiro no válidos (pode ser longo)
 DownloadBlockChain=Descargar pegadas dactilares
-KoCheckFingerprintValidity=A entrada de rexistro arquivada non é válida. Significa que alguén (¿un hacker?) Modificou algúns datos deste rexistro despois de gravalo ou borrou o rexistro anterior arquivado (comprobe que existe a liña co # anterior) ou se modificou a suma de comprobación do rexistro anterior. 
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=O rexistro de rexistro arquivado é válido. Os datos desta liña non se modificaron e a entrada segue a anterior.
 OkCheckFingerprintValidityButChainIsKo=O rexistro arquivado parece válido en comparación co anterior, pero a cadea estaba corrompida anteriormente.
 AddedByAuthority=Almacenado na autoridade remota
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Detalles do rexistro
 ListOfTrackedEvents=Listaxe de eventos seguidos
 Fingerprint=Pegada dactilar
 DownloadLogCSV=Exportar rexistros arquivados (CSV)
-DataOfArchivedEvent=Datos completos do evento arquivado
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=O obxecto orixinal (tipo %s, id %s) non ligado (ver a columna "Datos completos" para obter datos gardados inalterables)
 BlockedLogAreRequiredByYourCountryLegislation=A lexislación do seu país pode requirir o módulo de rexistros inalterables. A desactivación deste módulo pode facer que calquera transacción futura sexa inválida con respecto á lei e ao uso de software legal xa que non poden ser validadas por unha auditoría fiscal.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=O módulo de Rexistros inalterables activouse por mor da lexislación do seu país. A desactivación deste módulo pode facer que as transaccións futuras sexan inválidas con respecto á lei e ao uso de software legal, xa que non poden ser validadas por unha auditoría fiscal.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Activouse o sistema para rastrexar eventos en rexistros inalte
 BlockedLogDisabled=O sistema para rastrexar eventos en rexistros inalterables desactivouse despois de que se fixeran algunhas gravacións. Gardase unha pegada dixital especial para rastrexar a cadea como rota
 BlockedLogDisabledBis=Desactivouse o sistema para rastrexar eventos en rexistros inalterables. Isto é posible porque aínda non se fixo ningún rexistro.
 LinkHasBeenDisabledForPerformancePurpose=Para efectos de rendemento, a ligazón directa ao documento non se mostra despois da liña 100.
+SavedOnLine=Gardado en liña
 
 ## logTypes
 logBILL_DELETE=Factura do cliente borrada lóxicamente
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Eliminación lóxica do pagamento do cliente
 logPAYMENT_VARIOUS_CREATE=Creouse o pagamento (non asignado á factura)
 logPAYMENT_VARIOUS_DELETE=Eliminación lóxico do pagamento (non asignado a factura).
 logPAYMENT_VARIOUS_MODIFY=Modificouse o pagamento (non asignado á factura)
+logBLOCKEDLOG_EXPORT=Exportación de rexistros inalterables a un ficheiro
diff --git a/htdocs/langs/gl_ES/categories.lang b/htdocs/langs/gl_ES/categories.lang
index a1161190871..deb72c09e92 100644
--- a/htdocs/langs/gl_ES/categories.lang
+++ b/htdocs/langs/gl_ES/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Área de etiquetas/categorías de Contactos
 AccountsCategoriesArea=Área de etiquetas/categorías de Contas Bancarias
 ProjectsCategoriesArea=Área de etiquetas/categorías de Proxectos
 UsersCategoriesArea=Área de etiquetas/categorias de Usuarios
+Bank_linesCategoriesArea==Área de etiquetas/categorías de liñas bancarias
 SubCats=Subcategorías
 CatList=Listaxe de etiquetas/categorías
 CatListAll=Listaxe de etiquetas/categorías (todos os tipos)
@@ -90,9 +91,10 @@ CategoriesSetup=Configuración de etiquetas/categorías
 CategorieRecursiv=Ligar co pai etiqueta/categoría automáticamente
 CategorieRecursivHelp=Se a opción está activada, cando engade un obxecto nunha subcategoría, o obxecto tamén se engadirá ás categorías principais.
 AddProductServiceIntoCategory=Asignar categoría ao produto/servizo
-AddCustomerIntoCategory=Asignar categoría ao cliente
-AddSupplierIntoCategory=Asignar categoría ao provedor
-AssignCategoryTo=Asignar categoría a
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Amosar etiqueta/categoría
 ByDefaultInList=Por defecto na listaxe
 ChooseCategory=Escoller categoría
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Categorías de contedores de páxina
 KnowledgemanagementsCategoriesArea=Categorías do artigo KM
 UseOrOperatorForCategories=Use o operador "OR" para as categorías
 AddObjectIntoCategory=Asignar á categoría
+FichintersCategoriesArea=Categorías de intervención
diff --git a/htdocs/langs/gl_ES/companies.lang b/htdocs/langs/gl_ES/companies.lang
index 5ec35f7c555..f4e8da62992 100644
--- a/htdocs/langs/gl_ES/companies.lang
+++ b/htdocs/langs/gl_ES/companies.lang
@@ -65,6 +65,7 @@ State=Provincia/Estado
 StateId=ID do Estado
 StateCode=Código Provincia/Estado
 StateShort=Provincia/Estado
+DepartmentBuyer=Estado/provincia do comprador
 Region=Rexión
 Region-State=Rexión - Estado
 Country=País
@@ -78,7 +79,7 @@ Chat=Chat
 PhonePro=Teléfono empresa
 PhonePerso=Teléf. particular
 PhoneMobile=Móbil
-No_Email=Rexeitar e-mails masivos
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=Código postal
 Town=Poboación
@@ -382,12 +383,12 @@ ExportCardToFormat=Exportar ficha a formato
 ContactNotLinkedToCompany=Contacto non ligado a un terceiro
 DolibarrLogin=Login no Dolibarr
 NoDolibarrAccess=Sen acceso a Dolibarr
-ExportDataset_company_1=Terceiros (Empresas / fundacións / particulares) e as súas propiedades
-ExportDataset_company_2=Contactos e as súas propiedades
-ExportDataset_company_3=Contas bancarias de terceiros
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Contactos/Enderezos e atributos de terceiros
+ExportDataset_company_3=Modos de pagamento de terceiros (contas bancarias)
 ImportDataset_company_1=Terceiros e as súas propiedades
 ImportDataset_company_2=Contactos/Enderezos e atributos de terceiros
-ImportDataset_company_3=Contas bancarias de terceiros
+ImportDataset_company_3=Modos de pagamento de terceiros (contas bancarias)
 ImportDataset_company_4=Comerciais de Terceiros (Asigna comerciais/usuarios a empresas)
 PriceLevel=Nivel de prezos
 PriceLevelLabels=Etiquetas de nivel de prezos
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Código libre sen verificación.
 ManagingDirectors=Administrador(es) (CEO, director, presidente, etc.)
 MergeOriginThirdparty=Terceiro duplicado (o terceiro que quere eliminar)
 MergeThirdparties=Fusionar terceiros
-ConfirmMergeThirdparties=Está certo de querer combinar o terceiro escollido co terceiro actual? Todos os obxectos ligados (facturas, pedimentos, ...) serán movidos ao terceiro actual, despois de eliminar o terceiro escollido.
+ConfirmMergeThirdparties=Está certo de querer fusionar o terceiro escollido co actual? Todos os obxectos ligados (facturas, pedimentos,...) trasladaranse ao terceiro actual e, a continuación, e o terceiro escollido. será eliminado
 ThirdpartiesMergeSuccess=Os terceiros foron fusionados
 SaleRepresentativeLogin=Inicio de sesión do comercial
 SaleRepresentativeFirstname=Nome do comercial
@@ -461,3 +462,6 @@ ExternalSystemID=ID do sistema externo
 IDOfPaymentInAnExternalSystem=ID do modo de pagamento nun sistema externo (como Stripe, Paypal, ...)
 AADEWebserviceCredentials=Credenciais do servizo web da AADE
 ThirdPartyMustBeACustomerToCreateBANOnStripe=O terceiro debe ser un cliente para permitir a creación do seu banco no lado de Stripe
+NewSocNameForClone=Novo nome da empresa
+ConfirmCloneThirdparties=Está certo de querer clonar a empresa <b>%s</b>?
+SocialNetworksBusiness=Redes sociais para a empresa
diff --git a/htdocs/langs/gl_ES/compta.lang b/htdocs/langs/gl_ES/compta.lang
index 1a54029ee49..b391e0e0641 100644
--- a/htdocs/langs/gl_ES/compta.lang
+++ b/htdocs/langs/gl_ES/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Cobro factura ao cliente
 PaymentSupplierInvoice=Pagamento factura de provedor
 PaymentSocialContribution=Pagamentos taxas sociais/fiscais
 PaymentVat=Pagamento IVE
-AutomaticCreationPayment=Rexistra automaticamente o pagamento
+AutomaticCreationPayment=Also record the payment
 ListPayment=Listaxe de pagamentos
 ListOfCustomerPayments=Listaxe de pagamentos de clientes
 ListOfSupplierPayments=Listaxe de pagamentos a provedores
@@ -118,10 +118,14 @@ SocialContributionsPayments=Pagamentos de taxas sociais/fiscais
 ShowVatPayment=Consultar pagamentos de IVE
 TotalToPay=Total a pagar
 BalanceVisibilityDependsOnSortAndFilters=O saldo é visible nesta lista só se a táboa está ordenada en %s e filtrada nunha 1 conta bancaria (sen outros filtros)
+CustomerAccountancyCodeGeneral=Código xeral de contabilidade
 CustomerAccountancyCode=Código contable cliente
+SupplierAccountancyCodeGeneral=Código xeral de contabilidade
 SupplierAccountancyCode=Conta contable provedor
+UserAccountancyCodeGeneral=Código xeral de contabilidade
 CustomerAccountancyCodeShort=Conta cont. cliente
 SupplierAccountancyCodeShort=Conta cont. provedor
+UserAccountancyCodeShort=Código da conta de usuario
 AccountNumber=Número de conta
 NewAccountingAccount=Nova conta
 Turnover=Volume de vendas emitidas
@@ -129,7 +133,9 @@ TurnoverCollected=Volume de vendas cobradas
 SalesTurnoverMinimum=Volume de vendas mínimo
 ByExpenseIncome=Por gastos e ingresos
 ByThirdParties=Por terceiros
+ByProjects=Por proxectos
 ByUserAuthorOfInvoice=Por autor da factura
+DetailedListLowercase=listaxe detallada
 CheckReceipt=Xustificante bancario
 CheckReceiptShort=Xustificante bancario
 LastCheckReceiptShort=Últimos recibos de depósito %s
@@ -202,21 +208,21 @@ VATReport=Informe do imposto sobre as vendas IVE
 VATReportByPeriods=Informe do imposto sobre as vendas IVE por período
 VATReportByMonth=Informe do imposto sobre as vendas IVE por mes
 VATReportByRates=Informe do imposto sobre as vendas IVE por tipo
-VATReportByThirdParties=Informe de impostos sobre vendas IVE por terceiros 
+VATReportByThirdParties=Informe de impostos sobre vendas IVE por terceiros
 VATReportByCustomers=Informe do imposto sobre as vendas IVE por cliente
 VATReportByCustomersInInputOutputMode=Informe por cliente do IVE repercutido e soportado
-VATReportByQuartersInInputOutputMode=Informe polo tipo do imposto sobre as vendas do imposto cobrado e xa pago 
+VATReportByQuartersInInputOutputMode=Informe polo tipo do imposto sobre as vendas do imposto cobrado e xa pago
 VATReportShowByRateDetails=Amosar detalles desta tarifa
 LT1ReportByQuarters=Informe do imposto 2 RE por taxa
 LT2ReportByQuarters=Informe do imposto 3 IRPF por taxa
 LT1ReportByQuartersES=Informe de RE por taxa
 LT2ReportByQuartersES=Informe de IRPF por taxa
-SeeVATReportInInputOutputMode=Vexa o informe <b>%s recadación do IVE %s </b>para un cálculo estándar 
+SeeVATReportInInputOutputMode=Vexa o informe <b>%s recadación do IVE %s </b>para un cálculo estándar
 SeeVATReportInDueDebtMode=Vexa o informe<b> %s débeda de IVE %s </b>para un cálculo cunha opción na facturación 
-RulesVATInServices=- Para os servizos, o informe inclúe o IVE dos pagamentos efectivamente recibidos ou pagados en función da data do pagamento. 
-RulesVATInProducts=- Para os activos materiais, o informe inclúe o IVE en función da data do pagamento. 
-RulesVATDueServices=- Para os servizos, o informe inclúe o IVE das facturas vencidas, pagadas ou non, en función da data da factura. 
-RulesVATDueProducts=- Para os activos materiais, o informe inclúe o IVE das facturas vencidas, en función da data da factura. 
+RulesVATInServices=- Para os servizos, o informe inclúe o IVE dos pagamentos efectivamente recibidos ou pagados en función da data do pagamento.
+RulesVATInProducts=- Para os activos materiais, o informe inclúe o IVE en función da data do pagamento.
+RulesVATDueServices=- Para os servizos, o informe inclúe o IVE das facturas vencidas, pagadas ou non, en función da data da factura.
+RulesVATDueProducts=- Para os activos materiais, o informe inclúe o IVE das facturas vencidas, en función da data da factura.
 OptionVatInfoModuleComptabilite=Nota: para os activos materiais, debe usar a data de entrega para estar máis axustado
 ThisIsAnEstimatedValue=Esta é unha vista previa, basaeda en eventos de negocios e non na taboa de contabilidade final, polo que os resultados finais poden diferir destos valores de vista previa
 PercentOfInvoice=%%/factura
@@ -309,6 +315,6 @@ InvoiceNotLate30Days = A recoller 30 días
 InvoiceToPay=A pagar (<15 días)
 InvoiceToPay15Days=A pagar (15 a 30 días)
 InvoiceToPay30Days=A pagar (>30 días)
-ConfirmPreselectAccount=Preselección da conta contable 
+ConfirmPreselectAccount=Preselección da conta contable
 ConfirmPreselectAccountQuestion=Está certo de querer preseleccionar as %s liñas seleccionadas con esta conta contable?
 AmountPaidMustMatchAmountOfDownPayment=O importe abonado debe coincidir co importe do pago inicial
diff --git a/htdocs/langs/gl_ES/datapolicy.lang b/htdocs/langs/gl_ES/datapolicy.lang
index f4fdafd57dd..82d699894f6 100644
--- a/htdocs/langs/gl_ES/datapolicy.lang
+++ b/htdocs/langs/gl_ES/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Política de privacidade de datos
 Module4100Desc = Módulo para xestionar a privacidade de datos (conformidade co GDPR)
 # Administration page
 datapolicySetup = Configuración da política de privacidade dos datos do módulo
-Deletion = Eliminación de datos
-datapolicySetupPage = Segundo as leis dos seus países (Exemplo <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external"> Artigo 5 </a> do GDPR), os datos persoais deben conservarse durante un período non superior ao necesario para os fins para os que foron recollidos, excepto para fins de arquivo. <br> A eliminación farase automaticamente despois dun tempo determinado sen eventos (a duración que indicará a continuación).
+DataDeletion=Eliminación de datos
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s meses
 ONE_YEAR = 1 ano
 NB_YEARS = %s anos
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Cliente potencial/Cliente
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Nin cliente potencial/Nin cliente
 DATAPOLICY_CONTACT_FOURNISSEUR = Provedor
 DATAPOLICY_ADHERENT = Membro
-DATAPOLICY_Tooltip_SETUP=Define o atraso sen interacción posterior do cal quere que o rexistro se purgue automaticamente.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Pode enviar un correo electrónico GDPR a todos os seus contactos relevantes (que aínda non recibiron un correo electrónico e para os que non rexistrase nada sobre o seu acordo GDPR). Para iso, use o seguinte botón.
 SendAgreement = Enviar correos electrónicos
 AllAgreementSend = Enviáronse todos os correos electrónicos
 TXTLINKDATAPOLICYACCEPT = Texto para a ligazón "acordo"
 TXTLINKDATAPOLICYREFUSE = Texto para a ligazón "desacordo"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: Tratamento de datos persoais
 DATAPOLICY_consentement = Consentimento obtido para o tratamento de datos persoais
diff --git a/htdocs/langs/gl_ES/errors.lang b/htdocs/langs/gl_ES/errors.lang
index 303baa27f63..07fd2b94404 100644
--- a/htdocs/langs/gl_ES/errors.lang
+++ b/htdocs/langs/gl_ES/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Produciuse un errp ao crear ficheiros de
 ErrorFailedToCreateDir=Fallou a creación dun directorio. Comprobe que o usuario do servidor web ten permisos para escribir no directorio de documentos Dolibarr. Se o parámetro <b>safe_mode</b> está activado neste PHP, comprobe que os ficheiros php Dolibarr son propiedade do usuario (ou grupo) do servidor web.
 ErrorNoMailDefinedForThisUser=Non existe enderezo de correo electrónico asignado a este usuario
 ErrorSetupOfEmailsNotComplete=A configuración do correo electrónico non está rematada
+ErrorAccountingClosureSetupNotComplete=Non se completou a configuración das contas de peche
 ErrorFeatureNeedJavascript=Esta característica precisa que javascript estexa activado para funcionar. Cambie isto na configuración-visualización.
 ErrorTopMenuMustHaveAParentWithId0=Un menú do tipo "Arriba" non pode ter un menú principal. Poña 0 no menú principal ou escolla un menú do tipo "Esquerda".
 ErrorLeftMenuMustHaveAParentId=Un menú de tipo "esquerda" debe ter un identificador principal.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Subida bloqueada por un plugin PHP/Apache.
 ErrorFileSizeTooLarge=O tamaño do ficheiro é grande de mais ou non se proporcionou o ficheiro.
 ErrorFieldTooLong=Campo %s e longo de mais.
 ErrorSizeTooLongForIntType=Tamaño demasiado longo para o tipo int (máximo %s caracteres)
+ErrorSizeForStarsType=O tamaño da estrela debe ser un número entre 1 e 10
 ErrorSizeTooLongForVarcharType=Tamaño demasiado longo para o tipo de cadea (máximo %s caracteres)
 ErrorNoValueForSelectType=Pregase complete o valor da listaxe de selección
 ErrorNoValueForCheckBoxType=Pregase complete o valor da listaxe de caixa de verificación
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Valor incorrecto para o código de seguridade. Tenteo novam
 ErrorBothFieldCantBeNegative=Os campos %s e %s non poen ser negativos
 ErrorFieldCantBeNegativeOnInvoice=O campo <strong>%s</strong> non pode ser negativo neste tipo de factura. Se precisa engadir unha liña de desconto, primeiro cree o desconto (desde o campo '%s' na tarxeta de terceiros) e aplíqueo á factura.
 ErrorLinesCantBeNegativeForOneVATRate=O total de liñas (neto de impostos) non pode ser negativo para unha determinada taxa de IVE non nula (Atopouse un total negativo para o tipo de IVE <b>%s</b>%%)
-ErrorLinesCantBeNegativeOnDeposits=As liñas non poden ser negativas nun depósito. Terá problemas cando precise consumir o depósito na factura final se o fai.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=A cantidade da liña para as facturas do cliente non pode ser negativa
+ErrorQtyForSupplierInvoiceCantBeNegative=A cantidade da liña nas facturas dos provedores non pode ser negativa
 ErrorWebServerUserHasNotPermission=A conta de usuario <b>%s </b>usada para executar o servidor web non ten permiso para iso
 ErrorNoActivatedBarcode=Non hai ningún tipo de código de barras activado
 ErrUnzipFails=Fallou ao descomprimir %s con ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=O campo da data de finalización non pode estar baleiro
 ErrorStartHourIsNull=O campo da data de inicio non pode estar baleiro
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Demasiadas liñas para procesar. Utilice un filtro máis selectivo.
 ErrorEmptyValueForQty=A cantidade non pode ser cero.
+ErrorNoCloneWithoutName=O novo usuario debe ter un nome
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = A cantidade solicitada non pode ser inferior á cantidade enviada.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Produciuse un erro ao crear un pagamento diferente nunha conta bancaria cunha moeda diferente á moeda da empresa que aínda non é compatible.
+ErrorStreamMustBeEnabled=O fluxo PHP %s non está dispoñible. Comprobe os seus módulos PHP e o parámetro Dolibarr $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # 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.
 WarningPasswordSetWithNoAccount=Estableceuse un contrasinal para este membro. En calquera caso, non se creou ningunha conta de usuario. Polo tanto, este contrasinal está almacenado pero non se pode usar para iniciar sesión en Dolibarr. Pode ser usado por un módulo/interface externo, pero se non precisa definir ningún login ou contrasinal para un membro, pode desactivar a opción "Xestionar un inicio de sesión para cada membro" desde a configuración do módulo Membros. Se precisa xestionar un inicio de sesión pero non precisa ningún contrasinal, pode manter este campo baleiro para evitar este aviso. Nota: o correo electrónico tamén pode ser usado como inicio de sesión se o membro está ligado a un usuario.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=Pai deste ID xa non existe
 WarningReadBankAlsoAllowedIfUserHasPermission=Aviso, tamén se permite ler a conta bancaria co permiso para Xestionar o plan contable
 WarningNoDataTransferedInAccountancyYet=Teña en conta que non hai datos na táboa contable. Transfira os seus datos rexistrados na aplicación á sección de contabilidade ou cambie o modo de cálculo para analizar os datos rexistrados fóra da contabilidade.
 WarningChangingThisMayBreakStopTaskScheduler=Aviso, cambiar este valor pode desactivar a plnificación
+WarningAmountOfFileDiffersFromSumOfLines=Aviso, a cantidade de ficheiro (%s) difire da suma de liñas (%s)
+WarningModuleAffiliatedToAReportedCompany=Aviso, este módulo foi denunciado á fundación Dolibarr como publicado por unha empresa que utiliza prácticas ilegais (incumprimento das normas de uso da marca Dolibarr, recollida dos seus datos sen o seu consentimento ou implantación de malware).
+WarningModuleAffiliatedToAPiratPlatform=Teña coidado ao adquirir un módulo (de pago ou gratuíto) dunha plataforma non oficial sospeitosa como %s
+
 SwissQrOnlyVIR = A factura SwissQR só se pode engadir ás facturas configuradas para pagar con pagos por transferencia bancaria.
 SwissQrCreditorAddressInvalid = O enderezo do acredor non é válido (están definidos o código postal e a cidade? (%s)
 SwissQrCreditorInformationInvalid = A información do acredor non é válida para o IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s xa está definido como contacto p
 ErrorThisGroupIsAlreadyDefinedAsThisType=Os contactos con este grupo xa están definidos como contactos deste tipo.
 EmptyMessageNotAllowedError=Non se permite a mensaxe baleira
 ErrorIsNotInError=%s non ten erros
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/gl_ES/exports.lang b/htdocs/langs/gl_ES/exports.lang
index 4fe11fa1f77..6d19e254b7e 100644
--- a/htdocs/langs/gl_ES/exports.lang
+++ b/htdocs/langs/gl_ES/exports.lang
@@ -67,7 +67,7 @@ ChooseFormatOfFileToImport=Escolla o formato de ficheiro que desexa importar e p
 ChooseFileToImport=Escolla o ficheiro de importación e faga clic na imaxe %s para seleccionalo como ficheiro orixe de importación...
 SourceFileFormat=Formato do ficheiro orixe
 FieldsInSourceFile=Campos no ficheiro orixe
-FieldsInTargetDatabase=Campos destino na base de datos Dolibarr (*=obrigatorio)
+FieldsInTargetDatabase=Campos de destino na base de datos Dolibarr
 NoFields=Ningún campo
 MoveField=Mover campo columna número %s
 ExampleOfImportFile=Exemplo_de_ficheiro_importación
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Compruebe los parámetros de importación establecidos.
 RunSimulateImportFile=Executar a simulación de importación
 FieldNeedSource=Este campo require datos dende o ficheiro orixe
 SomeMandatoryFieldHaveNoSource=Algúns campos obrigatorios non teñen campo fonte no ficheiro de orixe
-InformationOnSourceFile=Información do ficheiro orixe
-InformationOnTargetTables=Información sobre os campos de destino
+InformationOnSourceFile=Ficheiro orixe
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Bascular alo menos un campo orixe na columna de campos a exportar
 SelectFormat=Seleccione este formato de ficheiro de importación
 RunImportFile=Lanzar a importación
@@ -103,8 +103,8 @@ DataComeFromFileFieldNb=O valor a inserir provén da columna <b> %s </b> no fich
 DataComeFromIdFoundFromRef=O valor que provén do ficheiro de orixe empregarase para atopar o identificador do obxecto pai a usar (polo que o obxecto <b> %s </b> que ten a referencia do ficheiro fonte debe existir na base de datos).
 DataComeFromIdFoundFromCodeId=O valor do código que provén do ficheiro fonte utilizarase para atopar o ID do obxecto principal que se vai utilizar (polo que o código do ficheiro fonte debe existir no dicionario <b> %s </b> ). Teña en conta que se coñece o ID, tamén pode usalo no ficheiro fonte en lugar do código. A importación debería funcionar en ambos casos.
 DataIsInsertedInto=Os datos procedentes do ficheiro fonte engádense no seguinte campo:
-DataIDSourceIsInsertedInto=O id do obxecto pai, que atopouse usando os datos do ficheiro orixe, inserirase no seguinte campo: 
-DataCodeIDSourceIsInsertedInto=O id da liña pai, que atopouse a partir do código, inserirase no seguinte campo: 
+DataIDSourceIsInsertedInto=O id do obxecto pai, que atopouse usando os datos do ficheiro orixe, inserirase no seguinte campo:
+DataCodeIDSourceIsInsertedInto=O id da liña pai, que atopouse a partir do código, inserirase no seguinte campo:
 SourceRequired=Datos de orixe obligatorios
 SourceExample=Ejemplo de datos de orixe posibles
 ExampleAnyRefFoundIntoElement=Todas as referencias atopadas para os elementos <b>%s</b>
diff --git a/htdocs/langs/gl_ES/hrm.lang b/htdocs/langs/gl_ES/hrm.lang
index fc9a2d222c7..4293cc66edf 100644
--- a/htdocs/langs/gl_ES/hrm.lang
+++ b/htdocs/langs/gl_ES/hrm.lang
@@ -46,11 +46,11 @@ NewEval=Nova avaliación de competencias
 ValidateEvaluation=Validar a avaliación de competencias
 ConfirmValidateEvaluation=Está certo de querer validar esta avaliación de competencias coa referencia <b>%s</b>?
 EvaluationCard=Avaliación de competencias
-RequiredRank=Rango preciso para o perfil do posto de traballo
-RequiredRankShort=Rango obrigatorio
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Postos con este perfil de traballo
-EmployeeRank=Rango de empregados para esta competencia
-EmployeeRankShort=Rango do empregado
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Posto de empregado
 EmployeePositions=Postos de empregados
 EmployeesInThisPosition=Empregados nesta posición
@@ -98,3 +98,5 @@ NeedBusinessTravels=Precisa viaxes de negocios
 NoDescription=Sen descrición
 TheJobProfileHasNoSkillsDefinedFixBefore=O perfil laboral avaliado deste empregado non ten ningunha habilidade definida nel. Engada habilidades, despois elimine e reinicie a avaliación.
 PDFStandardHrmEvaluation=Padrón estándar para xerar un documento PDF para unha avaliación de competencias
+SkillNotRequired=Habilidade non requirida
+LinkToUserCreated=Ligazón a un empregado se o solicitante foi contratado e convertido en usuario.
diff --git a/htdocs/langs/gl_ES/mails.lang b/htdocs/langs/gl_ES/mails.lang
index ba1853efaec..96b4e0b80a2 100644
--- a/htdocs/langs/gl_ES/mails.lang
+++ b/htdocs/langs/gl_ES/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Mailing
 EMailing=Mailing
-EMailings=Mailings
+EMailings=Mass EMails
 SMSings=SMS
-AllEMailings=Todos os Mailings
+AllEMailings=All mass eMails
 MailCard=Ficha Mailing
 MailRecipients=Destinatarios
 MailRecipient=Destinatario
@@ -26,19 +26,19 @@ MailFile=Ficheiro
 MailMessage=Texto utilizado no corpo da mensaxe
 SubjectNotIn=Non no asunto
 BodyNotIn=Non no corpo
-ShowEMailing=Amosar Mailing
-ListOfEMailings=Listaxe de Mailings
-NewMailing=Novo Mailing
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Novo sms
-EditMailing=Editar Mailing
-ResetMailing=Novo envío
-ConfirmResetMailingTargetMassaction=Confirmación do restablecemento do estado dos obxectivos
-ResetMailingTargetMassaction=Restablecer o estado dos obxectivos
-DeleteMailing=Eliminar Mailing
-PreviewMailing=Previsualizar un Mailing
-CreateMailing=Crear Mailing
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Restablecer o estado por erro
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Proba
-ValidMailing=Validar Mailing
+ValidMailing=Valid mass Email
 MailingStatusDraft=Borrador
 MailingStatusValidated=Validado
 MailingStatusSent=Enviado
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Todos os filtros deben coincidir para que se recolecte
 LineInFile=Liña %s en ficheiro
 RecipientSelectionModules=Módulos de selección dos destinatarios
 MailSelectedRecipients=Destinatarios seleccionados
-MailingArea=Área Mailings
-LastMailings=Últimos %s mailings
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Estatísticas destinatarios
 NbOfCompaniesContacts=Contactos/enderezos únicos
 MailNoChangePossible=Destinatarios dun mailing validado non modificables
-SearchAMailing=Buscar un Mailing
-SendMailing=Enviar Mailing
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Enviado por
 AdvancedAlternative=Alternativa avanzada
 MailingNeedCommand=O envío dun mailing pode realizarse dende a liña de comandos. Solicite ao administrador do servidor que execute o siguiente comando para enviar o mailling a todos os destinatarios:
 MailingNeedCommand2=Porén, pode envialos en liña engadindo o parámetro MAILING_LIMIT_SENDBYWEB co valor do número máximo de correos electrónicos que desexa enviar por sesión. Para iso, vaia a Inicio-Configuración-Outro.
 ConfirmSendingEmailing=Se desexa enviar correos electrónicos directamente desde esta pantalla, confirme que está certo de querer enviar correos electrónicos agora desde o seu navegador?
-LimitSendingEmailing=Nota: o envío de mensaxes de correo electrónico desde a interface web faise varias veces por motivos de seguridade e tempo de espera, <b>%s</b> destinatarios á vez por cada sesión de envío.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Vaciar listaxe
 ToClearAllRecipientsClickHere=Para vaciar a listaxe dos destinatarios deste mailing, faga click no botón
 ToAddRecipientsChooseHere=Para engadir destinatarios, escolla os que figuran nas listaxes a continuación
-NbOfEMailingsReceived=Mailings masivos recibidos
-NbOfEMailingsSend=Mailings masivos enviados
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID rexistro
 DeliveryReceipt=Acuse de recibo.
 YouCanUseCommaSeparatorForSeveralRecipients=Pode usar o carácter de separación <b>coma </b> para especificar múltiples destinatarios.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Non hai previstas notificacións automáticas por corr
 ANotificationsWillBeSent=Enviarase 1 notificación automática por correo electrónico
 SomeNotificationsWillBeSent=As notificacións automáticas de %s enviaranse por correo electrónico
 AddNewNotification=Subscribirse a unha nova notificación automática por correo electrónico (destino/evento)
-ListOfActiveNotifications=Subscricións activas (obxectivos/eventos) para a notificación automática por correo electrónico
+ListOfActiveNotifications=Subscricións activas
+ListOfActiveNotificationsHelp=Listaxe de parellas %s/%s subscritas para a notificación automática por correo electrónico
 ListOfNotificationsDone=Notificacións automáticas por correo electrónico enviadas
+ListOfNotificationsDoneHelp=Lista de notificacións enviadas anteriormente por correo electrónico
 MailSendSetupIs=A configuración de mailings está a '%s'. Este modo non pode ser usado para enviar mails masivos.
 MailSendSetupIs2=Antes debe, cunha conta de administrador, no menú %sInicio - Configuración - E-Mails%s, cambiar o parámetro <strong>'%s'</strong> para usar o modo '%s'. Con este modo pode configurar un servidor SMTP do seu provedor de servizos de internet.
 MailSendSetupIs3=Se ten algunha dúbida sobre como configurar o seu servidor SMTP, pode preguntar a %s.
@@ -183,7 +185,7 @@ Information=Información
 ContactsWithThirdpartyFilter=Contactos con filtro de terceiros.
 Unanswered=Sen resposta
 Answered=Contestado
-IsNotAnAnswer=É unha resposta (a un coreo electrónico recibido)
+IsNotAnAnswer=Non é unha resposta (é un correo electrónico inicial)
 IsAnAnswer=É unha resposta de un coreo electrónico recibido
 RecordCreatedByEmailCollector=Rexistro creado polo receptor de correo electrónico %s
 DefaultBlacklistMailingStatus=Valor predeterminado para o campo '%s' ao crear un novo contacto
@@ -199,6 +201,6 @@ ModelTemplate=Padrón de correo electrónico
 YouCanChooseAModelForYouMailContent= Pode escoller un dos padróns de modelos ou xerar un con IA
 TitleOfMailHolder=O título do correo electrónico vai aquí
 ContentOfMailHolder=O contido do correo electrónico vai aquí...
-LastNews=Últimas novas
+LastNews=Últimas noticias
 ListProducts= Listaxe de produtos
 PasswordReset=Restablecer o contrasinal
diff --git a/htdocs/langs/gl_ES/main.lang b/htdocs/langs/gl_ES/main.lang
index 3f9b5a0a219..23865b28f7e 100644
--- a/htdocs/langs/gl_ES/main.lang
+++ b/htdocs/langs/gl_ES/main.lang
@@ -37,6 +37,7 @@ Translation=Tradución
 Translations=Traducións
 CurrentTimeZone=Zona horaria PHP (Servidor)
 EmptySearchString=Introduza criterios de busca non baleiros
+EnterNonEmptyLinesFirst=introduza primeiro liñas non baleiras
 EnterADateCriteria=Engadir un criterio de data
 NoRecordFound=Non atopáronse rexistros
 NoRecordDeleted=Non foi eliminado o rexistro
@@ -309,6 +310,7 @@ DateBuild=Data xeración do informe
 DatePayment=Data de pagamento
 DateApprove=Data de aprobación
 DateApprove2=Data de aprobación (segunda aprobación)
+PendingSince=Pendente dende
 RegistrationDate=Data de rexistro
 UserCreation=Usuario creador
 UserModification=Usuario da modificación
@@ -496,7 +498,7 @@ ActionRunningNotStarted=Non comezado
 ActionRunningShort=En progreso
 ActionDoneShort=Terminado
 ActionUncomplete=Incompleto
-LatestLinkedEvents=Últimos %s eventos ligados
+LatestLinkedEvents=Os últimos %s eventos
 CompanyFoundation=Empresa/Organización
 Accountant=Contable
 ContactsForCompany=Contactos deste terceiro
@@ -722,6 +724,8 @@ TextUsedInTheMessageBody=Texto no corpo da mensaxe
 SendAcknowledgementByMail=Enviar correo de confirmación
 SendMail=Enviar correo
 Email=Correo electrónico
+EMail=Correo electrónico
+EMails=E-Mails
 NoEMail=Sen e-mail
 AlreadyRead=Xá lido
 NotRead=Non lido
@@ -794,7 +798,7 @@ Notes=Notas
 AddNewLine=Engadir nova liña
 AddFile=Engadir ficheiro
 FreeZone=Sen produtos/servizos predefinidos
-FreeLineOfType=Entrada libre, tipo:
+FreeLineOfType=Elemento de texto libre, tipo
 CloneMainAttributes=Clonar o obxecto con estes atributos principais
 ReGeneratePDF=Xerar de novo o PDF
 PDFMerge=Fusión PDF
@@ -880,12 +884,14 @@ toward=cara a
 Access=Acceso
 SelectAction=Seleccione acción
 SelectTargetUser=Seleccionar usuario/empregado de destino
+ClickToCopyToClipboard=Prema para copiar no portapapeis
 HelpCopyToClipboard=Use Ctrl+C para copiar ao portapapeis
 SaveUploadedFileWithMask=Gardar o ficheiro no servidor co nome "<strong>%s</strong>" (senón "%s")
 OriginFileName=Nome do ficheiro orixe
 SetDemandReason=Definir orixe
 SetBankAccount=Definir conta bancaria
 AccountCurrency=Moeda da conta
+AccountancyCode=Código de contabilidade
 ViewPrivateNote=Ver notas
 XMoreLines=%s líña(s) ocultas
 ShowMoreLines=Amosar mais/menos liñas
@@ -926,6 +932,7 @@ ConfirmMassDeletionQuestion=¿Estás certo de querer eliminar os %s rexistro(s)
 ConfirmMassClone=Confirmación de clonación masiva
 ConfirmMassCloneQuestion=Seleccione o proxecto para clonar a
 ConfirmMassCloneToOneProject=Clonar o proxecto %s
+ObjectClonedSuccessfuly=Obxecto clonouse correctamente
 RelatedObjects=Obxectos relacionados
 ClassifyBilled=Clasificar facturado
 ClassifyUnbilled=Clasificar non facturado
@@ -962,10 +969,11 @@ PrivateDownloadLinkDesc=Precisa estar logueado e ter permisos para ver ou descar
 Download=Descargar
 DownloadDocument=Descargar o documento
 DownloadSignedDocument=Descargar documento asinado
-ActualizeCurrency=Actualizar o tipo de cambio
+ActualizeCurrency=Utilice a última taxa coñecida da moeda
 Fiscalyear=Ano fiscal
 ModuleBuilder=Módulo e aplicación Builder
 SetMultiCurrencyCode=Establecer moeda
+SetMultiCurrencyRate=Estableza a taxa de moeda
 BulkActions=Accións masivas
 ClickToShowHelp=Prema para amosar a axuda sobre ferramentas
 WebSite=Sitio web
@@ -1105,6 +1113,7 @@ PayedBy=Pagado por
 PayedTo=Pagado a
 Monthly=Mensual
 Quarterly=Trimestral
+Quarter=trimestre
 Annual=Anual
 Local=Local
 Remote=Remoto
@@ -1147,6 +1156,7 @@ ContactDefault_project_task=Tarefa
 ContactDefault_propal=Orzamento
 ContactDefault_supplier_proposal=Orzamento de provedor
 ContactDefault_ticket=Ticket
+ContactDefault_societe=Terceiro
 ContactAddedAutomatically=Engadiuse un contacto a partir de roles de contactos de terceiros
 More=Mais
 ShowDetails=Amosar detalles
@@ -1243,6 +1253,7 @@ CommercialAffected=Representante de vendas asignado
 CommercialsDisaffected=Representantes de vendas desligados
 CommercialDisaffected=Representante de vendas desligado
 Message=Mensaxe
+Emailing=Enviar correo electrónico
 Progression=Progreso
 YourMessage=A súa mensaxe
 YourMessageHasBeenReceived=Recibiuse a súa mensaxe. Atenderemos ou contactaremos con vostede canto antes.
@@ -1307,3 +1318,34 @@ TranslationOfKey=Tradución da chave AnyTranslationKey
 SignedStatus=Estado asinado
 NbRecordQualified=Número de rexistros cualificados
 auto=auto
+UploadFile=Importación directa do documento
+OrClickToSelectAFile=ou prema para seleccionar un ficheiro no disco
+NetTotal=Total neto
+VATAmount=Importe do IVE
+TotalDiscount=Desconto total
+TotalHTBeforeDiscount=Total neto antes do desconto
+Contains=Contén
+DoesNotContain=Non contén
+Is=é
+IsNot=Non é
+StartsWith=Comeza por
+EndsWith=Remata con
+IsBefore=É antes
+IsAfter=É despois
+IsOnOrBefore=É antes ou igual
+IsOnOrAfter=É despois ou igual
+IsHigherThan=É maior que
+IsHigherThanOrEqual=É maior ou igual que
+IsLowerThan=É inferior a
+IsLowerThanOrEqual=É inferior ou igual que
+addToFilter=Engadir
+FilterAssistance=Editor de filtros
+Operator=Operador
+AllFieldsRequired=Todos os campos son obrigatorios.
+IsDefined=Está definido
+IsNotDefined=Non está definido
+SpecialLine=Liña especial
+EcoTax=Eco-Taxa
+GroupingLine=Liña de agrupación
+AllTime=Dende o inicio
+Transferred=Transferido
diff --git a/htdocs/langs/gl_ES/members.lang b/htdocs/langs/gl_ES/members.lang
index 0b6dc912acb..a4486021113 100644
--- a/htdocs/langs/gl_ES/members.lang
+++ b/htdocs/langs/gl_ES/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Se é precisa unha subscrición, debe rexistrarse unha
 DeleteType=Eliminar
 VoteAllowed=Voto autorizado
 Physical=Físico
-Moral=Xurídico
-MorAndPhy=Xurídico e Físico
+Moral=Persoa xurídica
+MorAndPhy=Persoa xurídica e Persoa física
 Reenable=Voltar a habilitar
 ExcludeMember=Excluír un membro
 Exclude=Excluir
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Estatísticas de membros por rexión
 NbOfMembers=Número total de membros
 NbOfActiveMembers=Número total de membros activos
 NoValidatedMemberYet=Ningún membro validado atopado
-MembersByCountryDesc=Esta pantalla amosa as estatísticas dos membros por países. As gráficas e os gráficos dependen da dispoñibilidade do servizo de gráficos en liña de Google, así como da dispoñibilidade dunha conexión a Internet habilitada.
+MembersByCountryDesc=Esta pantalla amosa as estatísticas dos membros por países.
+MembersByCountryDesc2=Os gráficos e as táboas dependen da dispoñibilidade do servizo de gráficos en liña de Google, así como da dispoñibilidade dunha conexión a Internet que funcione.
 MembersByStateDesc=Esta pantalla amosa estatísticas de membros por estado/provincias/comunidades.
 MembersByTownDesc=Esta pantalla amosa as estatísticas dos membros por cidade.
 MembersByNature=Esta pantalla amosa as estatísticas dos membros por natureza.
diff --git a/htdocs/langs/gl_ES/mrp.lang b/htdocs/langs/gl_ES/mrp.lang
index e8d3a6568fa..c0fbbd61487 100644
--- a/htdocs/langs/gl_ES/mrp.lang
+++ b/htdocs/langs/gl_ES/mrp.lang
@@ -1,6 +1,8 @@
 Mrp=Pedimentos de fabricación
 MOs=Pedimentos de fabricación
 ManufacturingOrder=Pedimento de fabricación
+ManufacturingOrderLine=Liña de orde de fabricación (consumo/produción)
+ConsumptionAndProductionInMos=Ordes de fabricación e liñas de Consumo e Produción
 MRPDescription=Módulo para xestionar produción e pedimentos de fabricación (PF).
 MRPArea=Área MRP
 MrpSetupPage=Configuración do módulo MRP
@@ -93,6 +95,9 @@ ProductsToConsume=Produtos para consumir
 ProductsToProduce=Produtos para fabricar
 UnitCost=Custo unitario
 TotalCost=Custo total
+ManufacturingCost=Custo de fabricación
+ManufacturingUnitCost=Custo de fabricación por unidade
+ManufacturingGeneratedValue=Valor de fabricación xerado
 BOMTotalCost=O custo para producir este BOM está en función do custo de cada cantidade e produto a consumir (use o prezo de custo se se define, se non o prezo medio ponderado se se define, se non o mellor prezo de compra)
 BOMTotalCostService=Se o módulo "Estación de traballo" está activado e unha estación de traballo está definida por defecto na liña, entón o cálculo é "cantidade (convertida en horas) x estación de traballo ahr", se non "cantidade x prezo de custo do servizo"
 GoOnTabProductionToProduceFirst=Primeiro debe iniciar a produción para pechar un pedimento de fabricación (ver a lapela '%s'). Pero pode cancelalo.
@@ -140,3 +145,4 @@ QtyCantBeSplit= A cantidade non se pode dividir
 NoRemainQtyToDispatch=Non queda ningunha cantidade por dividir
 THMOperatorEstimatedHelp=Custo estimado do operador por hora. Usarase para estimar o custo dunha lista de materiais usando esta estación de traballo.
 THMMachineEstimatedHelp=Custo estimado da máquina por hora. Usarase para estimar o custo dunha lista de materiais usando esta estación de traballo.
+BadValueForquantityToConsume=A cantidade a consumir dun material non pode ser 0 ou negativa
diff --git a/htdocs/langs/gl_ES/opensurvey.lang b/htdocs/langs/gl_ES/opensurvey.lang
index 41a67715ad0..93f4e24a51e 100644
--- a/htdocs/langs/gl_ES/opensurvey.lang
+++ b/htdocs/langs/gl_ES/opensurvey.lang
@@ -48,8 +48,8 @@ AddEndHour=Engadir hora de finalización
 votes=voto(s)
 NoCommentYet=Aínda non se enviaron comentarios para esta enquisa
 CanComment=Os votantes poden comentar na enquisa
-YourVoteIsPrivate=Esta enquisa é privada, ninguén pode ver o seu voto. 
-YourVoteIsPublic=Esta enquisa é pública, calquera que teña a ligazón pode ver o seu voto. 
+YourVoteIsPrivate=Esta enquisa é privada, ninguén pode ver o seu voto.
+YourVoteIsPublic=Esta enquisa é pública, calquera que teña a ligazón pode ver o seu voto.
 CanSeeOthersVote=Os votantes poden ver o voto doutras persoas
 SelectDayDesc=Para cada día seleccionado, pode escoller ou non o horario de reunión no seguinte formato: <br> - baleiro, <br> - "8h", "8H" ou "8:00" para dar unha hora de comezo da reunión, <br> - "8-11", "8h-11h", "8H-11H" ou "8: 00-11: 00" para dar a hora de inicio e final da reunión, <br> - "8h15-11h15 "," 8H15-11H15 "ou" 8: 15-11: 15 "para o mesmo pero con minutos.
 BackToCurrentMonth=Voltar ao mes actual
@@ -62,3 +62,4 @@ EmailSomeoneVoted=%s encheu unha liña. \nPode atopar a súa enquisa na ligazón
 ShowSurvey=Amosar a enquisa
 UserMustBeSameThanUserUsedToVote=Debe ter votado e usar o mesmo nome de usuario que o usado para votar, para publicar un comentario
 ListOfOpenSurveys=Lista de enquisas abertas
+AddTheVote=Fai clic para engadir o seu voto
diff --git a/htdocs/langs/gl_ES/products.lang b/htdocs/langs/gl_ES/products.lang
index 303beb234ee..42eef5c1a60 100644
--- a/htdocs/langs/gl_ES/products.lang
+++ b/htdocs/langs/gl_ES/products.lang
@@ -73,9 +73,9 @@ SellingPrice=Prezo de venda
 SellingPriceHT=Prezo de venda sen IVE
 SellingPriceTTC=Prezo de venda con IVE
 SellingMinPriceTTC=Prezo mínimo de venda (IVE incluido)
-CostPriceDescription=Este campo de prezo (sen impostos) pode usarse para capturar o importe medio de custo deste produto para a súa empresa. Pode ser calquera prezo que calcule vostede mesmo, por exemplo, a partir do prezo medio de compra máis o custo medio de produción e distribución. 
+CostPriceDescription=Este campo de prezo (sen impostos) pode usarse para capturar o importe medio de custo deste produto para a súa empresa. Pode ser calquera prezo que calcule vostede mesmo, por exemplo, a partir do prezo medio de compra máis o custo medio de produción e distribución.
 CostPriceUsage=Este valor podería usarse para o cálculo de marxes
-ManufacturingPrice=Prezo de fabricación 
+ManufacturingPrice=Prezo de fabricación
 SoldAmount=Importe vendas
 PurchasedAmount=Importe compras
 NewPrice=Novo prezo
@@ -97,7 +97,6 @@ ShowService=Amosar servizo
 ProductsAndServicesArea=Área produtos e servizos
 ProductsArea=Área Produtos
 ServicesArea=Área Servizos
-ListOfStockMovements=Listaxe de movementos de stock
 BuyingPrice=Prezo de compra
 PriceForEachProduct=Produtos con prezos específicos
 SupplierCard=Ficha provedor
@@ -145,6 +144,7 @@ WithoutDiscount=Sen desconto
 VATRateForSupplierProduct=Taxa IVE (para este produto/provedor)
 DiscountQtyMin=Desconto para esta cantidade
 NoPriceDefinedForThisSupplier=Ningún prezo/cant. definido para este provedor/produto
+NoProductPriceDefinedForThisSupplier=Non se definiu o prezo/cantidade do produto para este provedor
 NoSupplierPriceDefinedForThisProduct=Ningún prezo/cant. a provedor definida para este produto
 PredefinedItem=Elemento predefinido
 PredefinedProducts=Produtos predefinidos
@@ -171,7 +171,7 @@ BuyingPrices=Prezos de compra
 CustomerPrices=Prezos a clientes
 SuppliersPrices=Prezos a provedores
 SuppliersPricesOfProductsOrServices=Prezos de provedores (de produtos ou servizos)
-CustomCode=Aduana/Mercadoría/Código HS
+CustomCode=Aduana|Mercadoría|Código HSITARIC
 CountryOrigin=País de orixe
 RegionStateOrigin=Rexión de orixe
 StateOrigin=Estado/Provincia de orixe
@@ -209,6 +209,7 @@ unitL=Litro
 unitT=tonelada
 unitKG=kg
 unitG=Gramo
+unitGAL=galón
 unitMG=mg
 unitLB=libra
 unitOZ=onza
@@ -275,7 +276,7 @@ PriceByCustomer=Diferentes prezos para cada cliente
 PriceCatalogue=Un prezo único de venda por produto/servizo
 PricingRule=Regras para prezos de venda
 AddCustomerPrice=Configurar prezo po cliente
-ForceUpdateChildPriceSoc=Establece o mesmo prezo nas filiais do cliente 
+ForceUpdateChildPriceSoc=Establece o mesmo prezo nas filiais do cliente
 PriceByCustomerLog=Historial de prezos previos a clientes
 MinimumPriceLimit=O prezo mínimo non pode ser menor que %s
 MinimumRecommendedPrice=O prezo mínimo recomendado é: %s
@@ -294,7 +295,7 @@ ComposedProductIncDecStock=Incrementar/Diminuir stock ao mudar o pai
 ComposedProduct=Subproduto
 MinSupplierPrice=Prezo mínimo de compra
 MinCustomerPrice=Prezo mínimo de venda
-NoDynamicPrice=Sen prezo dinámico 
+NoDynamicPrice=Sen prezo dinámico
 DynamicPriceConfiguration=Configuración de prezo dinámico
 DynamicPriceDesc=Pode definir fórmulas matemáticas para calcular os prezos do cliente ou do provedor. Tales fórmulas poden empregar todos os operadores matemáticos, algunhas constantes e variables. Pode definir aquí as variables que desexa empregar. Se a variable precisa unha actualización automática, pode definir a URL externa para permitir a Dolibarr actualizar o valor automaticamente.
 AddVariable=Engadir variable
@@ -311,9 +312,9 @@ GlobalVariableUpdaterHelpFormat1=O formato da solicitude é {"URL": "http://exam
 UpdateInterval=Intervalo de actualización (minutos)
 LastUpdated=Última actualización
 CorrectlyUpdated=Actualizado correctamente
-PropalMergePdfProductActualFile=Ficheiros usados para engadir no PDF Azur son
+PropalMergePdfProductActualFile=Ficheiro PDF para incluír nos PDF dos orzamentos se o produto forma parte do orzamento...
 PropalMergePdfProductChooseFile=Seleccione os ficheiros PDF
-IncludingProductWithTag=incluíndo produtos/servizos coa etiqueta 
+IncludingProductWithTag=incluíndo produtos/servizos coa etiqueta
 DefaultPriceRealPriceMayDependOnCustomer=Prezo por defecto, ou prezo real pode depender do cliente
 WarningSelectOneDocument=Seleccione alo menos un documento
 DefaultUnitToShow=Unidade
@@ -339,7 +340,7 @@ ProductSheet=Folla de produto
 ServiceSheet=Folla de servizo
 PossibleValues=Valores posibles
 GoOnMenuToCreateVairants=Vaia ao menú %s - %s para preparar variables de atributos (como cores, tamaño, ...)
-UseProductFournDesc=Engade unha función para definir a descrición do produto definida polos vendedores (para cada referencia do vendedor) ademais da descrición para os clientes 
+UseProductFournDesc=Engade unha función para definir a descrición do produto definida polos vendedores (para cada referencia do vendedor) ademais da descrición para os clientes
 ProductSupplierDescription=Descrición do produto do provedor
 UseProductSupplierPackaging=Use a función de "embalaxe" para redondear as cantidades a uns múltiplos determinados (ao engadir/actualizar a liña nos documentos dun provedor, recalcular as cantidades e os prezos de compra segundo o conxunto de múltiplos máis altos dos prezos de compra dun produto)
 PackagingForThisProduct=Empaquetado de cantidades
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=A cantidade da liña recalculouse segundo o empaque
 
 #Attributes
 Attributes=Atributos
+ProductAttributeExtrafields=Atributos de variantes en campos adicionais
+ProductAttributeExtrafieldsSetup=Configuración de atributos de variantes en campos adicionais
+ProductAttributeValueExtrafields=Valores de atributos de variantes en campos adicionais
+ProductAttributeValueExtrafieldsSetup=Configuración de valores de atributos de variante en campos adicionais
 VariantAttributes=Atributos variantes
 ProductAttributes=Atributos variantes para produtos
 ProductAttributeName=Atributo variante %s
@@ -395,15 +400,18 @@ ErrorDestinationProductNotFound=Destino do produto non atopado
 ErrorProductCombinationNotFound=Variante do produto non atopada
 ActionAvailableOnVariantProductOnly=Acción só dispoñible na variante do produto
 ProductsPricePerCustomer=Prezos de produto por cliente
+ProductLevelExtraFields=Atributos adicionais (prezo de nivel)
+ProductCustomerExtraFields=Atributos adicionais (prezo do cliente)
 ProductSupplierExtraFields=Atributos adicionais (Prezos Provedor)
 DeleteLinkedProduct=Eliminar o produto fillo ligado á combinación
 AmountUsedToUpdateWAP=Importe unitario a utilizar para actualizar o Prezo Medio Ponderado
 PMPValue=Prezo medio ponderado
 PMPValueShort=PMP
-mandatoryperiod=Períodos obrigatorios 
-mandatoryPeriodNeedTobeSet=Nota: o período (data de inicio e finalización) debe estar definido 
-mandatoryPeriodNeedTobeSetMsgValidate=Un servizo require un período de inicio e fin 
-mandatoryHelper=Marque isto se quere unha mensaxe ao usuario ao crear/validar unha factura, orzamento a cliente, pedimento de cliente sen introducir a data de inicio e finalización nas liñas deste servizo.<br> Teña en conta que a mensaxe é un aviso e non un erro de bloqueo.
+mandatoryperiod=Períodos obrigatorios
+mandatoryPeriodNeedTobeSet=Nota: o período (data de inicio e finalización) debe estar definido
+mandatoryPeriodNeedTobeSetMsgValidate=Un servizo require un período de inicio e fin
+mandatoryHelper=Marque isto se quere unha mensaxe ao usuario ao crear/validar unha factura, orzamento a cliente, pedimento de cliente sen introducir data de inicio e fin nas liñas deste servizo.
+mandatoryHelper2=Teña en conta que a mensaxe é un aviso e non un erro de bloqueo.
 DefaultBOM=BOM por defecto
 DefaultBOMDesc=A listaxe de materiais por defecto recomendada para fabricar este produto-.Este campo só pode configurarse se a natureza do produto é "%s"
 Rank=Rango
@@ -412,7 +420,7 @@ MergeProducts=Combina produtos
 ConfirmMergeProducts=Está certo de querer combinar o produto escollido co actual? Todos os obxectos ligados (facturas, pedimentos,...) moveranse ao produto actual, despois de que o produto escollido sexa eliminado.
 ProductsMergeSuccess=Os produtos fusionáronse
 ErrorsProductsMerge=Erros na combinación de produtos
-SwitchOnSaleStatus=Activa o estado de venda 
+SwitchOnSaleStatus=Activa o estado de venda
 SwitchOnPurchaseStatus=Activa o estado de compra
 UpdatePrice=Aumentar/diminuír o prezo ao cliente
 StockMouvementExtraFields= Campos extra (movemento de stock)
@@ -435,3 +443,6 @@ AllowStockMovementVariantParentHelp=Por defecto, un pai dunha variante é un pro
 ConfirmSetToDraftInventory=Está certo de querer voltar ao estado Borrador?<br>Reiniciaranse as cantidades establecidas actualmente no inventario.
 WarningLineProductNotToSell=O produto ou servizo "%s" non se pode vender e foi clonado
 PriceLabel=Etiqueta prezo
+GenerateImage=Xerar imaxe
+GenerateWithAI=Xerar con IA
+PriceByCustomeAndMultiPricesAbility=Diferentes prezos para cada cliente + Varios segmentos de prezos por produto/servizo (cada cliente está nun segmento de prezos)
diff --git a/htdocs/langs/gl_ES/projects.lang b/htdocs/langs/gl_ES/projects.lang
index d8fa44f7f12..7043e0561ad 100644
--- a/htdocs/langs/gl_ES/projects.lang
+++ b/htdocs/langs/gl_ES/projects.lang
@@ -312,3 +312,7 @@ TaskMergeSuccess=As tarefas fusionáronse
 ErrorTaskIdIsMandatory=Erro: o ID da tarefa é obrigatorio
 ErrorsTaskMerge=Produciuse un erro ao combinar tarefas
 Billable = Facturable
+ConfirmCloseTask=Esta certo de querer pechar esta tarefa?
+ConfirmClosed=Confirmar o peche da tarefa
+TaskStatus=Estado da tarefa
+TaskReopened=Reabriuse a tarefa
diff --git a/htdocs/langs/gl_ES/salaries.lang b/htdocs/langs/gl_ES/salaries.lang
index 816a6cd88a7..02f64ba00f9 100644
--- a/htdocs/langs/gl_ES/salaries.lang
+++ b/htdocs/langs/gl_ES/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Novo salario
 AddSalary=Axuntar salario
 NewSalaryPayment=Nova pagamento de salario
 AddSalaryPayment=Engadir pagamento de salario
+SalaryID=ID do salario
+SalaryAmount=Importe do salario
 SalaryPayment=Pagamento de salario
 SalariesPayments=Pagamentos de salarios
 SalariesPaymentsOf=Pago de salarios de %s
@@ -23,11 +25,11 @@ AllSalaries=Todos os salarios
 SalariesStatistics=Estatísticas salariais
 SalariesAndPayments=Salarios e pagamentos
 ConfirmDeleteSalaryPayment=Quere eliminar este pagamento de salario?
-FillFieldFirst=Cubra primeiro o campo do empregado 
+FillFieldFirst=Cubra primeiro o campo do empregado
 UpdateAmountWithLastSalary=Establecer o importe co último salario
 MakeTransferRequest=Realizar unha solicitude de transferencia bancaria
 VirementOrder=Realizar unha solicitude de transferencia bancaria
-BankTransferAmount=Importe da transferencia bancaria
 WithdrawalReceipt=Orde de transferencia
 OrderWaiting=Pedimento pendente
 FillEndOfMonth=Enche coa fin de mes
+UserPaySlip=Recibo de pagamento
diff --git a/htdocs/langs/gl_ES/stripe.lang b/htdocs/langs/gl_ES/stripe.lang
index d697c0fb2ee..1c0c92890cb 100644
--- a/htdocs/langs/gl_ES/stripe.lang
+++ b/htdocs/langs/gl_ES/stripe.lang
@@ -12,6 +12,7 @@ YourEMail=Correo electrónico para recibir unha confirmación do pagamento
 STRIPE_PAYONLINE_SENDEMAIL=Notificación por correo electrónico despois dun intento de pagamento (éxito ou fracaso)
 Creditor=Acredor
 PaymentCode=Código do pagamento
+StripeAutoRecordPayout=Active a gravación automática do pagamento (cando Stripe fai un pagamento e chama ao webhook IPN payout.create/payout.paid)
 StripeDoPayment=Pagar con Stripe
 YouWillBeRedirectedOnStripe=Será redirixido á páxina segura de Stripe para introducir a información da súa tarxeta de crédito
 Continue=Seguinte
@@ -33,6 +34,7 @@ CSSUrlForPaymentForm=URL da folla de estilo CSS para o formulario de pagamento
 NewStripePaymentReceived=Recibiuse un novo pagamento Stripe
 NewStripePaymentFailed=Intentouse un novo pagamento por Stripe pero fallou
 FailedToChargeCard=Non se puido cargar a tarxeta
+FailedToChargeSEPA=Produciuse un erro ao cargar SEPA
 STRIPE_TEST_SECRET_KEY=Chave de proba secreta
 STRIPE_TEST_PUBLISHABLE_KEY=Chave de proba publicable
 STRIPE_TEST_WEBHOOK_KEY=Chave de proba de Webhook
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index f9153034e29..98e9d5d436f 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=בדיקת תקינות הקבצים עברה
 FileIntegritySomeFilesWereRemovedOrModified=בדיקת תקינות הקבצים נכשלה. חלק מהקבצים שונו, הוסרו או נוספו.
 GlobalChecksum=סכום בדיקה גלובלי
 MakeIntegrityAnalysisFrom=בצע ניתוח שלמות של קבצי יישומים מ
-LocalSignature=חתימה מקומית משובצת (פחות אמינה)
-RemoteSignature=חתימה מרוחקת מרחוק (אמינה יותר)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=קבצים חסרים
 FilesUpdated=קבצים מעודכנים
 FilesModified=קבצים ששונו
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=בשימוש על ידי אפשרות אג'נדה כלש
 Security=בטחון
 Passwords=סיסמאות
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=הצפנת סיסמת מסד הנתונים המאוחסנת ב-conf.php. מומלץ מאוד להפעיל אפשרות זו.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=הגן על קבצי PDF שנוצרו. זה לא מומלץ מכיוון שהוא שובר יצירת PDF בתפזורת.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=שדה מחושב
-ComputedFormulaDesc=אתה יכול להזין כאן נוסחה באמצעות מאפיינים אחרים של אובייקט או כל קידוד PHP כדי לקבל ערך מחושב דינמי. אתה יכול להשתמש בכל נוסחאות תואמות PHP כולל ה-"?" אופרטור תנאי, והאובייקט הגלובלי הבא: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>אזהרה</strong>: אם אתה צריך מאפיינים של אובייקט לא נטען, פשוט אחזר לעצמך את האובייקט לתוך הנוסחה שלך כמו בדוגמה השנייה.<br>שימוש בשדה מחושב אומר שלא תוכל להזין לעצמך שום ערך מהממשק. כמו כן, אם יש שגיאת תחביר, ייתכן שהנוסחה לא תחזיר דבר.<br><br>דוגמה לנוסחה:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>דוגמה לטעינת אובייקט מחדש<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_- $extrafieldedo'] >capital / 5: '-1')<br><br>דוגמה נוספת לנוסחה לאלץ עומס של אובייקט ואובייקט האב שלו: <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Project( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'פרויקט האב לא נמצא'
+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'
 Computedpersistent=אחסן שדה מחושב
 ComputedpersistentDesc=שדות נוספים מחושבים יאוחסנו במסד הנתונים, עם זאת, הערך יחושב מחדש רק כאשר האובייקט של שדה זה ישתנה. אם השדה המחושב תלוי באובייקטים אחרים או בנתונים גלובליים ערך זה עשוי להיות שגוי!!
 ExtrafieldParamHelpPassword=השארת שדה זה ריק פירושה שהערך הזה יאוחסן ללא הצפנה (השדה פשוט מוסתר עם כוכבים על המסך).<br><br>הזן ערך 'dolcrypt' כדי לקודד ערך עם אלגוריתם הצפנה הפיך. עדיין ניתן לדעת ולערוך נתונים ברורים, אך הם מוצפנים במסד הנתונים.<br><br>הזן 'auto' (או 'md5', 'sha256', 'password_hash', ...) כדי להשתמש באלגוריתם ברירת המחדל של הצפנת סיסמה (או md5, sha256, password_hash...) כדי לשמור את הסיסמה ה-hash הבלתי הפיכה במסד הנתונים (אין דרך לאחזר את הערך המקורי)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- השימוש בשרת ה-SMTP של ספק שירותי הדוא"ל שלך לשליחת אימיילים הוא גם מעניין, כך שכל האימיילים שנשלחו מהאפליקציה יישמרו גם בספריית "נשלח" שלך בתיבת הדואר שלך.
 WarningPHPMailD=לכן מומלץ לשנות את שיטת שליחת המיילים לערך "SMTP".
 WarningPHPMailDbis=אם אתה באמת רוצה לשמור על שיטת ברירת המחדל "PHP" לשליחת אימיילים, פשוט התעלם מהאזהרה זו, או הסר אותה על ידי %sלחיצה כאן%s.
-WarningPHPMail2=אם ספק הדוא"ל SMTP שלך צריך להגביל את לקוח הדוא"ל לכמה כתובות IP (נדיר מאוד), זוהי כתובת ה-IP של סוכן משתמש הדואר (MUA) עבור יישום ה-ERP CRM שלך: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=הנהלת חשבונות (פשוטה)
 Module10Desc=דוחות חשבונאיים פשוטים (יומנים, מחזור) המבוססים על תוכן מסד הנתונים. לא משתמש באף טבלת חשבונות.
 Module20Name=הצעות
 Module20Desc=ההצעה המסחרית של ההנהלה
-Module22Name=שליחת מיילים המונית
-Module22Desc=נהל אימייל בכמות גדולה
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=אנרגיה
 Module23Desc=מעקב אחר צריכת האנרגיה
 Module25Name=הזמנות מכירה
@@ -847,10 +848,10 @@ Permission212=סדר השורות
 Permission213=הפעלת קו
 Permission214=הגדרת טלפוניה
 Permission215=הגדרת ספקי
-Permission221=לקרוא emailings
-Permission222=ליצור / לשנות emailings (מקבלי הנושא ...)
-Permission223=אמת emailings (מאפשר לשלוח)
-Permission229=מחק emailings
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=הצג נמענים ומידע
 Permission238=שליחת דיוור ידנית
 Permission239=מחק דיוור לאחר אימות או שליחה
@@ -1105,6 +1106,7 @@ DictionaryStaff=מספר העובדים
 DictionaryAvailability=עיכוב משלוח
 DictionaryOrderMethods=שיטות הזמנה
 DictionarySource=מקור הצעות / הזמנות
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=קבוצות מותאמות אישית לדוחות
 DictionaryAccountancysystem=מודלים לתרשים חשבונות
 DictionaryAccountancyJournal=יומנים חשבונאיים
@@ -1134,11 +1136,11 @@ BackToDictionaryList=חזרה לרשימת המילונים
 TypeOfRevenueStamp=סוג חותמת המס
 VATManagement=ניהול מס מכירה
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=כברירת מחדל, מס המכירה המוצע הוא 0 שניתן להשתמש בו במקרים כמו עמותות, יחידים או חברות קטנות.
 VATIsUsedExampleFR=בצרפת, הכוונה לחברות או ארגונים שיש להם מערכת פיסקלית אמיתית (Simplified real or normal real). מערכת בה מוצהר מע"מ.
 VATIsNotUsedExampleFR=בצרפת, הכוונה היא לעמותות שאינן מוצהרות במס מכירה או חברות, ארגונים או מקצועות חופשיים שבחרו במערכת הפיסקלית של ארגונים מיקרוניים (מס מכירה בזכיינות) ושילמו מס מכירה בזיכיון ללא כל הצהרת מס מכירה. בחירה זו תציג את ההפניה "מס מכירה לא רלוונטי - art-293B of CGI" בחשבוניות.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=סוג מס מכירה
 LTRate=ציון
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=לפי הגדרת המסים (ראה %s - %s - %s) , 
 LabelUsedByDefault=לייבל שימוש כברירת מחדל אם לא התרגום ניתן למצוא את קוד
 LabelOnDocuments=התווית על מסמכים
 LabelOrTranslationKey=מפתח תווית או תרגום
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=הצג מספר מע"מ של לקוח/ספק ברשימות משו
 AddAdressInList=הצג כתובת לקוח/ספק ברשימות משולבות.<br>צדדים שלישיים יופיעו בפורמט שם של "The Big Company corp. - 21 jump street 123456 Big Town - USA" במקום " החברה הגדולה".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=בקש שיטת משלוח מועדפת עבור צדדים שלישיים.
-FieldEdition=מהדורה של השדה %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=דוגמה: 2+ (מלא רק אם נתקלות בבעיות היסט אזור זמן)
 GetBarCode=קבל ברקוד
 NumberingModules=מספור דגמים
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=להכריח את תאריך החשבונית עד כה אימ
 SuggestedPaymentModesIfNotDefinedInInvoice=מצב תשלומים מוצע בחשבונית כברירת מחדל אם לא הוגדר בחשבונית
 SuggestPaymentByRIBOnAccount=הצע תשלום באמצעות משיכה בחשבון
 SuggestPaymentByChequeToAddress=הצע תשלום בהמחאה ל
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=טקסט חופשי על חשבוניות
 WatermarkOnDraftInvoices=סימן מים על חשבוניות טיוטה (כל אם ריק)
 PaymentsNumberingModule=מודל מספור תשלומים
@@ -1718,6 +1723,7 @@ CompressionOfResources=דחיסת תגובות HTTP
 CompressionOfResourcesDesc=לדוגמה שימוש בהנחיית Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=זיהוי אוטומטי כזה אינו אפשרי בדפדפנים הנוכחיים
 DefaultValuesDesc=כאן תוכל להגדיר את ערך ברירת המחדל שבו תרצה להשתמש בעת יצירת רשומה חדשה, ו/או מסנני ברירת מחדל או סדר המיון בעת רשימת רשומות.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=ערכי ברירת מחדל (לשימוש בטפסים)
 DefaultSearchFilters=מסנני חיפוש ברירת מחדל
 DefaultSortOrder=ברירת המחדל של סדרי מיון
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Sendings מספור מודולים
 SendingsAbility=תמיכה בדפי משלוח למשלוחים ללקוחות
 NoNeedForDeliveryReceipts=ברוב המקרים, גיליונות משלוח משמשים הן כגליונות למשלוחים ללקוחות (רשימת מוצרים לשליחה) והן גיליונות המתקבלים וחתומים על ידי הלקוח. מכאן שקבלת משלוחי המוצר היא תכונה משוכפלת והיא מופעלת רק לעתים רחוקות.
 FreeLegalTextOnShippings=טקסט חופשי על משלוחים
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=מוצרים משלוחים מספור מודול קבלת
 DeliveryOrderModel=מוצרים משלוחים קבלת מודל
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=טקסט חופשי על אישורי מסירה
 ##### FCKeditor #####
 AdvancedEditor=עורך מתקדם
 ActivateFCKeditor=הפעל עורך מתקדם עבור:
-FCKeditorForNotePublic=WYSIWYG יצירה/מהדורה של השדה "הערות ציבוריות" של אלמנטים
-FCKeditorForNotePrivate=WYSIWYG יצירה/מהדורה של השדה "הערות פרטיות" של אלמנטים
-FCKeditorForCompany=WYSIWYG יצירה/מהדורה של תיאור השדה של אלמנטים (למעט מוצרים/שירותים)
-FCKeditorForProductDetails=WYSIWYG יצירה/מהדורה של תיאור מוצרים או שורות לאובייקטים (שורות הצעות, הזמנות, חשבוניות וכו'...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=אזהרה: השימוש באפשרות זו עבור מקרה זה אינו מומלץ ברצינות מכיוון שהוא עלול ליצור בעיות עם תווים מיוחדים ועיצוב עמודים בעת בניית קובצי PDF.
-FCKeditorForMailing= יצירה/מהדורה של WYSIWYG עבור הודעות דואר אלקטרוני המוניות (כלים->שליחת דואר אלקטרוני)
-FCKeditorForUserSignature=WYSIWYG יצירה/מהדורה של חתימת משתמש
-FCKeditorForMail=יצירה/מהדורה של WYSIWYG עבור כל הדואר (למעט כלים->שליחת דואר אלקטרוני)
-FCKeditorForTicket=WYSIWYG יצירה/מהדורה לכרטיסים
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=הגדרת מודול מלאי
 IfYouUsePointOfSaleCheckModule=אם אתה משתמש במודול נקודת המכירה (POS) המסופק כברירת מחדל או במודול חיצוני, מודול ה-POS שלך עשוי להתעלם מהגדרה זו. רוב מודולי הקופה מתוכננים כברירת מחדל ליצור חשבונית באופן מיידי ולהקטין מלאי ללא קשר לאפשרויות כאן. אז אם אתה צריך או לא לקבל ירידה במלאי בעת רישום מכירה מהקופה שלך, בדוק גם את הגדרת מודול הקופה שלך.
@@ -1867,7 +1874,6 @@ Buy=לקנות
 Sell=למכור
 InvoiceDateUsed=תאריך חשבונית שימוש
 YourCompanyDoesNotUseVAT=החברה שלך הוגדרה שאינה משתמשת במע"מ (בית - הגדרה - חברה/ארגון), כך שאין אפשרויות מע"מ להגדרה.
-AccountancyCode=קוד הנהלת חשבונות
 AccountancyCodeSell=חשבון מכירה. קוד
 AccountancyCodeBuy=רכישת חשבון. קוד
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=השאר את תיבת הסימון "צור את התשלום באופן אוטומטי" ריקה כברירת מחדל בעת יצירת מס חדש
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = איזו תצוגה ברצונך לפתוח כברירת 
 AGENDA_EVENT_PAST_COLOR = צבע אירוע עבר
 AGENDA_EVENT_CURRENT_COLOR = צבע האירוע הנוכחי
 AGENDA_EVENT_FUTURE_COLOR = צבע אירוע עתידי
-AGENDA_REMINDER_BROWSER = הפעל תזכורת לאירוע <b>בדפדפן של המשתמש</b> (כאשר מגיע תאריך התזכורת, הדפדפן מציג חלון קופץ. כל משתמש יכול השבת התראות כאלה מהגדרת ההתראות בדפדפן שלו).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = הפעל הודעת קול
-AGENDA_REMINDER_EMAIL = אפשר תזכורת לאירוע <b>במיילים</b> (אפשר להגדיר אפשרות/עיכוב תזכורת בכל אירוע).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = הערה: התדירות של העבודה המתוזמנת %s חייבת להיות מספיקה כדי לוודא שהתזכורת נשלחת ברגע הנכון.
 AGENDA_SHOW_LINKED_OBJECT = הצג אובייקט מקושר בתצוגת סדר יום
 AGENDA_USE_EVENT_TYPE = השתמש בסוגי אירועים (מנוהלים בתפריט הגדרות -> מילונים -> סוג אירועי סדר היום)
 AGENDA_USE_EVENT_TYPE_DEFAULT = הגדר אוטומטית ערך ברירת מחדל זה עבור סוג האירוע בטופס יצירת אירוע
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = מפתח לאשר הקישור יצוא
 PastDelayVCalExport=לא יצא אירוע מבוגרת
 SecurityKey = מפתח אבטחה
@@ -2006,7 +2017,7 @@ BackupZipWizard=אשף לבניית ספריית ארכיון המסמכים
 SomethingMakeInstallFromWebNotPossible=התקנה של מודול חיצוני אינה אפשרית מממשק האינטרנט מהסיבה הבאה:
 SomethingMakeInstallFromWebNotPossible2=מסיבה זו, תהליך השדרוג המתואר כאן הוא תהליך ידני שרק משתמש בעל הרשאה רשאי לבצע.
 InstallModuleFromWebHasBeenDisabledContactUs=התקנה או פיתוח של מודולים חיצוניים או אתרים דינמיים, מהאפליקציה, נעולים כעת למטרות אבטחה. אנא צור איתנו קשר אם אתה צריך להפעיל תכונה זו.
-InstallModuleFromWebHasBeenDisabledByFile=התקנת מודול חיצוני מהאפליקציה הושבתה על ידי מנהל המערכת שלך. עליך לבקש ממנו להסיר את הקובץ <strong>%s</strong> כדי לאפשר זאת תכונה.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=הדגש קווי טבלה כאשר תנועת העכבר עוברת
 HighlightLinesColor=הדגש את צבע הקו כאשר העכבר עובר (השתמש ב-'ffffff' כדי לא להדגיש)
@@ -2036,6 +2047,7 @@ Enter0or1=הזן 0 או 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=הזן כאן בין הסוגרים, רשימה של מספר בתים המייצגים את סמל המטבע. לדוגמה: עבור $, הזן [36] - עבור ברזיל R$ אמיתי [82,36] - עבור €, הזן [8364]
 ColorFormat=צבע ה-RGB הוא בפורמט HEX, למשל: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=שם הסמל בפורמט:<br>- image.png עבור קובץ תמונה לתוך ספריית העיצוב הנוכחית<br>- image.png@module אם הקובץ נמצא בספרייה /img/ של מודול<br>- fa-xxx עבור FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size עבור תמונת FontAwesome fa-xxx (עם קידומת, צבע וגודל מוגדר)
 PositionIntoComboList=מיקום הקו ברשימות משולבות
 SellTaxRate=שיעור מס מכירה
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=הסתר גבולות על מסגרת כתובת השולח
 MAIN_PDF_NO_RECIPENT_FRAME=הסתר גבולות על מסגרת כתובת הנמען
 MAIN_PDF_HIDE_CUSTOMER_CODE=הסתר את קוד הלקוח
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=הסתר את שם השולח/חברה בגוש הכתובות
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=הסתר את תנאי התשלומים
 PROPOSAL_PDF_HIDE_PAYMENTMODE=הסתר מצב תשלום
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=לא מומלץ
 ARestrictedPath=נתיב מוגבל לקבצי נתונים
 CheckForModuleUpdate=בדוק אם קיימים עדכוני מודולים חיצוניים
 CheckForModuleUpdateHelp=פעולה זו תתחבר לעורכי מודולים חיצוניים כדי לבדוק אם גרסה חדשה זמינה.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=עדכון זמין
 NoExternalModuleWithUpdate=לא נמצאו עדכונים עבור מודולים חיצוניים
 SwaggerDescriptionFile=קובץ התיאור של Swagger API (לשימוש עם redoc למשל)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=הצג כתובת למשלוח
 INVOICE_SHOW_SHIPPING_ADDRESSMore=ציון חובה במדינות מסוימות (צרפת, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=קישור כתובת אתר של רשת חברתית. השתמש ב-{socialid} עבור החלק המשתנה שמכיל את מזהה הרשת החברתית.
 IfThisCategoryIsChildOfAnother=אם הקטגוריה הזו היא ילדה של אחת אחרת
 DarkThemeMode=מצב ערכת נושא כהה
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=אזהרה: המודול %s ה
 WarningModuleHasChangedSecurityCsrfParameter=אזהרה: המודול %s השבית את אבטחת ה-CSRF של המופע שלך. פעולה זו חשודה וייתכן שההתקנה שלך לא תהיה מאובטחת יותר. אנא צור קשר עם מחבר המודול להסבר.
 EMailsInGoingDesc=הודעות דוא"ל נכנסות מנוהלות על ידי המודול %s. עליך להפעיל ולהגדיר אותו אם אתה צריך לתמוך בהודעות דוא"ל נכנסות.
 MAIN_IMAP_USE_PHPIMAP=השתמש בספריית PHP-IMAP עבור IMAP במקום ב-PHP IMAP מקורי. זה גם מאפשר שימוש בחיבור OAuth2 עבור IMAP (יש להפעיל גם את מודול OAuth).
-MAIN_CHECKBOX_LEFT_COLUMN=הצג את העמודה לבחירת שדה ושורה משמאל (בצד ימין כברירת מחדל)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=לא נוצר כברירת מחדל. נוצר בהפעלת מודול בלבד.
 CSSPage=סגנון CSS
 Defaultfortype=בְּרִירַת מֶחדָל
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang
index eeb45136056..1e95c252f30 100644
--- a/htdocs/langs/he_IL/banks.lang
+++ b/htdocs/langs/he_IL/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=איזון סוף
 CurrentBalance=יתרה נוכחית
 FutureBalance=איזון עתידי
 ShowAllTimeBalance=הצג מאזן מההתחלה
-AllTime=מההתחלה
 Reconciliation=פִּיוּס
 RIB=מספר חשבון בנק
 IBAN=מספר IBAN
@@ -133,7 +132,7 @@ DeleteTransaction=מחק רשומה
 ConfirmDeleteTransaction=האם אתה בטוח שברצונך למחוק את הערך הזה?
 ThisWillAlsoDeleteBankRecord=פעולה זו תמחק גם את ערך הבנק שנוצר
 BankMovements=תנועות
-PlannedTransactions=ערכים מתוכננים
+PlannedTransactions=Upcoming entries
 Graph=גרפים
 ExportDataset_banque_1=רישומי בנק ודפי חשבון
 ExportDataset_banque_2=שובר הפקדה
@@ -151,7 +150,7 @@ FutureTransaction=עסקה עתידית. לא מצליח ליישב.
 SelectChequeTransactionAndGenerate=בחר/סנן את הצ'קים שיש לכלול בקבלה להפקדת הצ'ק. לאחר מכן, לחץ על "צור".
 SelectPaymentTransactionAndGenerate=בחר/סנן את המסמכים שיש לכלול בקבלה של %s. לאחר מכן, לחץ על "צור".
 InputReceiptNumber=בחר בדף חשבון הבנק הקשור לפשרה. השתמש בערך מספרי שניתן למיין
-InputReceiptNumberBis=YYYYMM או YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=ליישב?
 ThenCheckLinesAndConciliate=לאחר מכן, בדוק את השורות הקיימות בדף חשבון הבנק ולחץ
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=אם פונקציה זו מופעלת, תוכל לבח
 BankColorizeMovementName1=צבע רקע לתנועת חיוב
 BankColorizeMovementName2=צבע רקע לתנועת אשראי
 IfYouDontReconcileDisableProperty=אם אינך מבצע את התאמות הבנק בחשבונות בנק מסוימים, השבת את המאפיין "%s" עליהם כדי להסיר את האזהרה הזו.
-NoBankAccountDefined=לא הוגדר חשבון בנק
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=לא נמצא רישום בחשבון הבנק. בדרך כלל, זה קורה כאשר רשומה נמחקה באופן ידני מרשימת העסקאות בחשבון הבנק (למשל במהלך התאמה של חשבון הבנק). סיבה נוספת היא שהתשלום נרשם כאשר המודול "%s" הושבת.
 AlreadyOneBankAccount=כבר הוגדר חשבון בנק אחד
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=גרסה של קובץ SEPA
diff --git a/htdocs/langs/he_IL/blockedlog.lang b/htdocs/langs/he_IL/blockedlog.lang
index 46b5609c632..8b3d99bc302 100644
--- a/htdocs/langs/he_IL/blockedlog.lang
+++ b/htdocs/langs/he_IL/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=יומנים בלתי ניתנים לשינוי
 ShowAllFingerPrintsMightBeTooLong=הצג את כל יומני הארכיון (עשויים להיות ארוכים)
 ShowAllFingerPrintsErrorsMightBeTooLong=הצג את כל יומני הארכיון הלא חוקיים (עשויים להיות ארוכים)
 DownloadBlockChain=הורד טביעות אצבע
-KoCheckFingerprintValidity=ערך יומן בארכיון אינו חוקי. זה אומר שמישהו (האקר?) שינה חלק מהנתונים של הרשומה הזו לאחר שהוקלטה, או מחק את הרשומה הקודמת בארכיון (בדוק שקיימת שורה עם # קודם) או שינה את סכום הבדיקה של הרשומה הקודמת.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=רשומת יומן בארכיון תקפה. הנתונים בשורה זו לא שונו והערך עוקב אחר הקודם.
 OkCheckFingerprintValidityButChainIsKo=נראה כי יומן ארכיון תקף בהשוואה לקודם אך השרשרת פגומה בעבר.
 AddedByAuthority=מאוחסן ברשות מרוחקת
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=פרטי יומן
 ListOfTrackedEvents=רשימת אירועים במעקב
 Fingerprint=טביעת אצבע
 DownloadLogCSV=ייצוא יומני ארכיון (CSV)
-DataOfArchivedEvent=נתונים מלאים של אירוע בארכיון
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=אובייקט מקורי (סוג %s, מזהה %s) לא מקושר (ראה העמודה 'נתונים מלאים' כדי לקבל נתונים שמורים שלא ניתנים לשינוי)
 BlockedLogAreRequiredByYourCountryLegislation=מודול יומנים בלתי ניתנים לשינוי עשוי להידרש על פי החקיקה של המדינה שלך. השבתת מודול זה עלולה להפוך כל עסקאות עתידיות לבלתי חוקיות ביחס לחוק ולשימוש בתוכנה חוקית מכיוון שלא ניתן לאמת אותן על ידי ביקורת מס.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=מודול יומנים בלתי ניתנים לשינוי הופעל בגלל החקיקה של המדינה שלך. השבתת מודול זה עלולה להפוך כל עסקאות עתידיות לבלתי חוקיות ביחס לחוק ולשימוש בתוכנה חוקית מכיוון שלא ניתן לאמת אותן על ידי ביקורת מס.
@@ -30,6 +32,7 @@ BlockedLogEnabled=המערכת למעקב אחר אירועים לתוך יומ
 BlockedLogDisabled=המערכת למעקב אחר אירועים לתוך יומנים בלתי ניתנים לשינוי הושבתה לאחר ביצוע הקלטות מסוימות. שמרנו טביעת אצבע מיוחדת כדי לעקוב אחר השרשרת כשורה
 BlockedLogDisabledBis=המערכת למעקב אחר אירועים לתוך יומנים בלתי ניתנים לשינוי הושבתה. זה אפשרי מכיוון שעדיין לא בוצע רישום.
 LinkHasBeenDisabledForPerformancePurpose=למטרת ביצוע, קישור ישיר למסמך אינו מוצג לאחר השורה ה-100.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=חשבונית הלקוח נמחקה באופן הגיוני
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=מחיקה לוגית של תשלום לקוח
 logPAYMENT_VARIOUS_CREATE=נוצר תשלום (לא מוקצה לחשבונית).
 logPAYMENT_VARIOUS_DELETE=תשלום (לא מוקצה לחשבונית) מחיקה לוגית
 logPAYMENT_VARIOUS_MODIFY=תשלום (לא הוקצה לחשבונית) שונה
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/he_IL/categories.lang b/htdocs/langs/he_IL/categories.lang
index c9538a8a88a..414a941ea8c 100644
--- a/htdocs/langs/he_IL/categories.lang
+++ b/htdocs/langs/he_IL/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=אזור תגיות/קטגוריות יצירת קשר
 AccountsCategoriesArea=אזור תגיות/קטגוריות של חשבון בנק
 ProjectsCategoriesArea=אזור תגיות/קטגוריות פרויקט
 UsersCategoriesArea=אזור תגיות/קטגוריות משתמש
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=קטגוריות משנה
 CatList=רשימת תגים/קטגוריות
 CatListAll=רשימת תגים/קטגוריות (כל הסוגים)
@@ -90,9 +91,10 @@ CategoriesSetup=הגדרת תגים/קטגוריות
 CategorieRecursiv=קישור עם תג אב/קטגוריה באופן אוטומטי
 CategorieRecursivHelp=אם האפשרות מופעלת, כאשר אתה מוסיף אובייקט לקטגוריית משנה, האובייקט יתווסף גם לקטגוריות האב.
 AddProductServiceIntoCategory=הקצה קטגוריה למוצר/שירות
-AddCustomerIntoCategory=הקצה קטגוריה ללקוח
-AddSupplierIntoCategory=הקצה קטגוריה לספק
-AssignCategoryTo=הקצה קטגוריה ל
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=הצג תג/קטגוריה
 ByDefaultInList=כברירת מחדל ברשימה
 ChooseCategory=בחרו קטגוריה
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=קטגוריות מיכל דפים
 KnowledgemanagementsCategoriesArea=מאמר KM קטגוריות
 UseOrOperatorForCategories=השתמש באופרטור 'OR' עבור קטגוריות
 AddObjectIntoCategory=הקצה לקטגוריה
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index d8254e54315..4fc83aa7a3c 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=המדינה נמצאת בתוך הקהילה הכלכלית הא
 PriceFormatInCurrentLanguage=פורמט תצוגת מחיר בשפה ובמטבע הנוכחיים
 ThirdPartyName=שם של צד שלישי
 ThirdPartyEmail=דוא"ל של צד שלישי
-ThirdParty=צד שלישי
-ThirdParties=צד שלישי
+ThirdParty=Third party
+ThirdParties=צדדים שלישיים
 ThirdPartyProspects=לקוחות פוטנציאלים
 ThirdPartyProspectsStats=לקוחות פוטנציאלים
 ThirdPartyCustomers=לקוחות
@@ -65,6 +65,7 @@ State=מדינה/מחוז
 StateId=תעודת זהות מדינה
 StateCode=קוד מדינה/מחוז
 StateShort=מדינה
+DepartmentBuyer=Buyer's state/province
 Region=אזור
 Region-State=אזור - מדינה
 Country=מדינה
@@ -78,7 +79,7 @@ Chat=לְשׂוֹחֵחַ
 PhonePro=אוֹטוֹבּוּס. טלפון
 PhonePerso=פרס. טלפון
 PhoneMobile=נייד
-No_Email=סרב להודעות דואר אלקטרוני בכמות גדולה
+No_Email=Refuse mass emails
 Fax=פַקס
 Zip=מיקוד
 Town=עִיר
@@ -382,11 +383,12 @@ ExportCardToFormat=ייצא כרטיס לפורמט
 ContactNotLinkedToCompany=איש קשר אינו מקושר לצד שלישי כלשהו
 DolibarrLogin=התחברות של Dolibarr
 NoDolibarrAccess=אין גישה ל-Dolibarr
-ExportDataset_company_1=צדדים שלישיים (חברות/קרנות/אנשים פיזיים) ונכסיהם
-ExportDataset_company_2=אנשי קשר ונכסיהם
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=צדדים שלישיים ונכסיהם
 ImportDataset_company_2=אנשי קשר/כתובות ומאפיינים נוספים של צדדים שלישיים
-ImportDataset_company_3=חשבונות בנק של צדדים שלישיים
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=נציגי מכירות של צד שלישי (הקצאת נציגי מכירות/משתמשים לחברות)
 PriceLevel=רמת מחיר
 PriceLevelLabels=תוויות רמת מחירים
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=שם המנהלים (מנכ"ל, דירקטור, נשיא...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=מיזוג צדדים שלישיים
-ConfirmMergeThirdparties=האם אתה בטוח שברצונך למזג את הצד השלישי הנבחר עם הצד הנוכחי? כל האובייקטים המקושרים (חשבוניות, הזמנות,...) יועברו לצד השלישי הנוכחי, ולאחר מכן הצד השלישי הנבחר יימחק.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=צדדים שלישיים מוזגו
 SaleRepresentativeLogin=כניסה של נציג מכירות
 SaleRepresentativeFirstname=שם פרטי של נציג המכירות
@@ -460,3 +462,6 @@ ExternalSystemID=מזהה מערכת חיצונית
 IDOfPaymentInAnExternalSystem=מזהה מצב התשלום למערכת חיצונית (כמו Stripe, Paypal, ...)
 AADEWebserviceCredentials=אישורי AADE Webservice
 ThirdPartyMustBeACustomerToCreateBANOnStripe=הצד השלישי חייב להיות לקוח כדי לאפשר את יצירת פרטי הבנק שלו בצד Stripe
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index 30b9f862e03..55a1ad58e3a 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=תשלום חשבונית לקוח
 PaymentSupplierInvoice=תשלום חשבונית ספק
 PaymentSocialContribution=תשלום מס חברתי/מיסוי
 PaymentVat=תשלום מע"מ
-AutomaticCreationPayment=רשום אוטומטית את התשלום
+AutomaticCreationPayment=Also record the payment
 ListPayment=רשימת תשלומים
 ListOfCustomerPayments=רשימת תשלומי לקוחות
 ListOfSupplierPayments=רשימת תשלומי ספקים
@@ -118,10 +118,14 @@ SocialContributionsPayments=תשלומי מסים חברתיים/פיסקליי
 ShowVatPayment=הצג תשלום מע"מ
 TotalToPay=סך הכל לשלם
 BalanceVisibilityDependsOnSortAndFilters=היתרה גלויה ברשימה זו רק אם הטבלה ממוינת ב-%s ומסוננת בחשבון בנק אחד (ללא מסננים אחרים)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=קוד הנהלת חשבונות ללקוח
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=קוד חשבונאות ספק
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Cust. חֶשְׁבּוֹן. קוד
 SupplierAccountancyCodeShort=מה ניש. חֶשְׁבּוֹן. קוד
+UserAccountancyCodeShort=User account. code
 AccountNumber=מספר חשבון
 NewAccountingAccount=חשבון חדש
 Turnover=מחזור חשבונית
@@ -129,7 +133,9 @@ TurnoverCollected=מחזור שנאסף
 SalesTurnoverMinimum=מינימום מחזור
 ByExpenseIncome=לפי הוצאות והכנסות
 ByThirdParties=על ידי צדדים שלישיים
+ByProjects=By projects
 ByUserAuthorOfInvoice=לפי מחבר החשבונית
+DetailedListLowercase=detailed list
 CheckReceipt=שובר הפקדה
 CheckReceiptShort=שובר הפקדה
 LastCheckReceiptShort=תלושי ההפקדה האחרונים של %s
diff --git a/htdocs/langs/he_IL/datapolicy.lang b/htdocs/langs/he_IL/datapolicy.lang
index 68ec463539f..d7b9b3b0b02 100644
--- a/htdocs/langs/he_IL/datapolicy.lang
+++ b/htdocs/langs/he_IL/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = מדיניות פרטיות נתונים
 Module4100Desc = מודול לניהול פרטיות נתונים (תאימות ל-GDPR)
 # Administration page
 datapolicySetup = הגדרת מדיניות פרטיות של נתוני מודול
-Deletion = מחיקת נתונים
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s חודשים
 ONE_YEAR = 1 שנה
 NB_YEARS = %s שנים
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = פרוספקט/לקוח
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = גם לא לקוח פוטנציאלי/לא לקוח
 DATAPOLICY_CONTACT_FOURNISSEUR = ספק
 DATAPOLICY_ADHERENT = חבר
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = אתה יכול לשלוח דוא"ל GDPR לכל אנשי הקשר הרלוונטיים שלך (שעדיין לא קיבלו דוא"ל ועבורם לא רשמת שום דבר על הסכם ה-GDPR שלהם). לשם כך, השתמש בכפתור הבא.
 SendAgreement = לשלוח מיילים
 AllAgreementSend = כל המיילים נשלחו
 TXTLINKDATAPOLICYACCEPT = טקסט לקישור "הסכם"
 TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: עיבוד נתונים אישיים
 DATAPOLICY_consentement = הסכמה שהתקבלה לעיבוד נתונים אישיים
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 76df0555683..c47ba34d5e9 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=יצירת ספרייה נכשלה. בדוק שלמשתמש שרת האינטרנט יש הרשאות לכתוב לתוך ספריית המסמכים של Dolibarr. אם הפרמטר <b>safe_mode</b> מופעל ב-PHP הזה, בדוק שקובצי php של Dolibarr הם הבעלים של משתמש (או קבוצה) של שרת האינטרנט.
 ErrorNoMailDefinedForThisUser=לא הוגדר דואר עבור משתמש זה
 ErrorSetupOfEmailsNotComplete=הגדרת המיילים לא הושלמה
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=תכונה זו זקוקה ל-JavaScript כדי לפעול. שנה זאת בהגדרות - תצוגה.
 ErrorTopMenuMustHaveAParentWithId0=לתפריט מסוג 'למעלה' לא יכול להיות תפריט אב. שים 0 בתפריט האב או בחר תפריט מסוג 'שמאל'.
 ErrorLeftMenuMustHaveAParentId=תפריט מסוג 'שמאל' חייב להיות בעל מזהה אב.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=העלאה חסומה על ידי תוסף PHP/Apache.
 ErrorFileSizeTooLarge=גודל הקובץ גדול מדי או שהקובץ לא סופק.
 ErrorFieldTooLong=השדה %s ארוך מדי.
 ErrorSizeTooLongForIntType=גודל ארוך מדי עבור סוג int (%s ספרות מקסימום)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=גודל ארוך מדי עבור סוג המחרוזת (%s מקסימום תווים)
 ErrorNoValueForSelectType=נא למלא ערך עבור רשימה נבחרת
 ErrorNoValueForCheckBoxType=אנא מלא ערך עבור רשימת תיבת הסימון
@@ -138,8 +140,9 @@ ErrorBadValueForCode=ערך גרוע לקוד האבטחה. נסה שוב עם 
 ErrorBothFieldCantBeNegative=השדות %s ו-%s אינם יכולים להיות שניהם שליליים
 ErrorFieldCantBeNegativeOnInvoice=שדה <strong>%s</strong> אינו יכול להיות שלילי בסוג זה של חשבונית. אם אתה צריך להוסיף שורת הנחה, פשוט צור תחילה את ההנחה (מהשדה '%s' בכרטיס צד שלישי) והחל אותה על החשבונית.
 ErrorLinesCantBeNegativeForOneVATRate=סך השורות (בניכוי מס) לא יכול להיות שלילי עבור שיעור מע"מ נתון שאינו ריק (נמצא סך שלילי עבור שיעור מע"מ <b>%s </b>%%).
-ErrorLinesCantBeNegativeOnDeposits=שורות לא יכולות להיות שליליות בהפקדה. אתה תתמודד עם בעיות כאשר תצטרך לצרוך את הפיקדון בחשבונית הסופית אם תעשה זאת.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=הכמות עבור שורה לחשבוניות של לקוחות לא יכולה להיות שלילית
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=לחשבון המשתמש <b>%s</b> המשמש להפעלת שרת אינטרנט אין הרשאה עבור זֶה
 ErrorNoActivatedBarcode=לא הופעל סוג ברקוד
 ErrUnzipFails=פתיחת הדפוס של %s עם ZipArchive נכשלה
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=פרמטר PHP שלך upload_max_filesize (%s) גבוה יותר מפרמטר PHP post_max_size (%s). זו לא הגדרה עקבית.
 WarningPasswordSetWithNoAccount=הוגדרה סיסמה לחבר זה. עם זאת, לא נוצר חשבון משתמש. אז הסיסמה הזו מאוחסנת אבל לא ניתן להשתמש בה כדי להיכנס ל-Dolibarr. זה עשוי לשמש על ידי מודול/ממשק חיצוני, אבל אם אינך צריך להגדיר שום כניסה או סיסמה עבור חבר, אתה יכול לבטל את האפשרות "נהל התחברות עבור כל חבר" מהגדרת מודול חבר. אם אתה צריך לנהל התחברות אבל לא צריך שום סיסמה, אתה יכול להשאיר שדה זה ריק כדי להימנע מהאזהרה זו. הערה: דואר אלקטרוני יכול לשמש גם ככניסה אם החבר מקושר למשתמש.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = ניתן להוסיף חשבונית SwissQR רק בחשבוניות המוגדרות לתשלום באמצעות תשלומי העברה אשראי.
 SwissQrCreditorAddressInvalid = כתובת הנושה אינה חוקית (האם מיקוד ועיר מוגדרים? (%s)
 SwissQrCreditorInformationInvalid = פרטי הנושה אינם חוקיים עבור IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/he_IL/exports.lang b/htdocs/langs/he_IL/exports.lang
index a5fb65d7c19..3ef1f188d03 100644
--- a/htdocs/langs/he_IL/exports.lang
+++ b/htdocs/langs/he_IL/exports.lang
@@ -46,10 +46,16 @@ LineLabel=תווית של קו
 LineDescription=תיאור הקו
 LineUnitPrice=מחיר יחידה של הקו
 LineVATRate=מע"מ שיעור השורה
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=כמות לקו
 LineTotalHT=סכום לא כולל מס עבור קו
 LineTotalTTC=סכום עם מס עבור שורה
 LineTotalVAT=סכום מע"מ לקו
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=סוג קו (0=מוצר, 1=שירות)
 FileWithDataToImport=קובץ עם נתונים לייבוא
 FileToImport=קובץ מקור לייבוא
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=בחר את פורמט הקובץ לשימוש כפו
 ChooseFileToImport=העלה קובץ ולאחר מכן לחץ על הסמל %s כדי לבחור קובץ כקובץ ייבוא מקור...
 SourceFileFormat=פורמט קובץ המקור
 FieldsInSourceFile=שדות בקובץ המקור
-FieldsInTargetDatabase=שדות יעד במסד הנתונים של Dolibarr (מודגש=חובה)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=אין שדות
 MoveField=העבר את מספר עמודת השדה %s
 ExampleOfImportFile=דוגמה_ל_ייבוא_קובץ
@@ -76,8 +82,8 @@ NowClickToTestTheImport=בדוק שפורמט הקובץ (מפרידי שדה ו
 RunSimulateImportFile=הפעל סימולציית ייבוא
 FieldNeedSource=שדה זה דורש נתונים מקובץ המקור
 SomeMandatoryFieldHaveNoSource=לחלק מהשדות החובה אין מקור מקובץ הנתונים
-InformationOnSourceFile=מידע על קובץ המקור
-InformationOnTargetTables=מידע על שדות יעד
+InformationOnSourceFile=מקור הקובץ
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=החלף לפחות שדה מקור אחד בעמודת השדות לייצוא
 SelectFormat=בחר בפורמט קובץ הייבוא הזה
 RunImportFile=ייבוא נתונים
diff --git a/htdocs/langs/he_IL/hrm.lang b/htdocs/langs/he_IL/hrm.lang
index 270bf602f43..751cfc72c25 100644
--- a/htdocs/langs/he_IL/hrm.lang
+++ b/htdocs/langs/he_IL/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=דירוג נדרש עבור פרופיל התפקיד
-RequiredRankShort=דרגה נדרשת
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=תפקידים עם פרופילי משרה זו
-EmployeeRank=דירוג עובד עבור מיומנות זו
-EmployeeRankShort=דרגת שכיר
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=תפקיד שכיר
 EmployeePositions=תפקידי עובדים
 EmployeesInThisPosition=עובדים בתפקיד זה
@@ -72,6 +72,9 @@ AddSkill=הוסף כישורים לפרופיל העבודה
 RequiredSkills=הכישורים הנדרשים עבור פרופיל עבודה זה
 UserRank=דירוג משתמש
 SkillList=רשימת מיומנויות
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=שמור דרגה
 TypeKnowHow=לדעת איך
 TypeHowToBe=איך להיות
@@ -95,3 +98,5 @@ NeedBusinessTravels=צריך נסיעות עסקים
 NoDescription=אין תיאור
 TheJobProfileHasNoSkillsDefinedFixBefore=לפרופיל התפקיד המוערך של עובד זה אין מיומנות מוגדרת. אנא הוסף מיומנויות, ולאחר מכן מחק והתחל מחדש את ההערכה.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index 9619332a6d2..d21e34bd4bf 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=שליחת דואר אלקטרוני
 EMailing=שליחת דואר אלקטרוני
-EMailings=הודעות דואר אלקטרוני
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=כל הודעות האימייל
+AllEMailings=All mass eMails
 MailCard=כרטיס דואר אלקטרוני
 MailRecipients=נמענים
 MailRecipient=מקבל
@@ -26,19 +26,19 @@ MailFile=קבצים מצורפים
 MailMessage=גוף האימייל
 SubjectNotIn=לא בנושא
 BodyNotIn=לא בגוף
-ShowEMailing=הצג אימייל
-ListOfEMailings=רשימת הודעות דואר אלקטרוני
-NewMailing=מייל חדש
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=ערוך מיילים
-ResetMailing=שלח שוב מייל
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=מחק אימייל
-PreviewMailing=תצוגה מקדימה של שליחת אימייל
-CreateMailing=צור אימייל
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=אימייל תקף
+ValidMailing=Valid mass Email
 MailingStatusDraft=טְיוּטָה
 MailingStatusValidated=מאומת
 MailingStatusSent=נשלח
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=כל המסננים חייבים להתאים כדי ל
 LineInFile=שורה %s בקובץ
 RecipientSelectionModules=בקשות מוגדרות לבחירת הנמען
 MailSelectedRecipients=נמענים נבחרים
-MailingArea=אזור הודעות דואר אלקטרוני
-LastMailings=הודעות האימייל האחרונות של %s
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=מתמקד בסטטיסטיקה
 NbOfCompaniesContacts=אנשי קשר/כתובות ייחודיים
 MailNoChangePossible=לא ניתן לשנות נמענים עבור שליחת אימייל מאומתת
-SearchAMailing=חפש בדואר
-SendMailing=שלח מייל
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=נשלח על - ידי
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=שליחת אימייל יכולה להתבצע משורת הפקודה. בקש ממנהל השרת שלך להפעיל את הפקודה הבאה כדי לשלוח את המייל לכל הנמענים:
 MailingNeedCommand2=עם זאת, תוכל לשלוח אותם באופן מקוון על ידי הוספת פרמטר MAILING_LIMIT_SENDBYWEB עם ערך של מספר הודעות דוא"ל מקסימלי שברצונך לשלוח לפי הפעלה. לשם כך, עבור אל בית - הגדרה - אחר.
 ConfirmSendingEmailing=אם ברצונך לשלוח דוא"ל ישירות מהמסך הזה, אנא אשר שאתה בטוח שאתה רוצה לשלוח אימייל עכשיו מהדפדפן שלך?
-LimitSendingEmailing=הערה: שליחת הודעות דוא"ל מממשק האינטרנט מתבצעת במספר פעמים מסיבות אבטחה ופסק זמן, <b>%s</b> נמענים בכל פעם עבור כל סשן שליחה.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=נקה רשימה
 ToClearAllRecipientsClickHere=לחץ כאן כדי לנקות את רשימת הנמענים עבור שליחת דוא"ל זו
 ToAddRecipientsChooseHere=הוסף נמענים על ידי בחירה מתוך הרשימות
-NbOfEMailingsReceived=התקבלו הודעות דואר המוניות
-NbOfEMailingsSend=נשלחו מיילים המוניים
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=רשומת תעודת זהות
 DeliveryReceipt=משלוח Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=אתה יכול להשתמש במפריד <b>comma</b> כדי לציין מספר נמענים.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=לא מתוכננות התראות דוא"ל אוטו
 ANotificationsWillBeSent=הודעה אוטומטית אחת תישלח בדוא"ל
 SomeNotificationsWillBeSent=%s הודעות אוטומטיות יישלחו בדוא"ל
 AddNewNotification=הירשם להודעת דוא"ל אוטומטית חדשה (יעד/אירוע)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=התצורה של שליחת דואר אלקטרוני הוגדרה ל'%s'. לא ניתן להשתמש במצב זה לשליחת אימייל המוני.
 MailSendSetupIs2=תחילה עליך להיכנס, עם חשבון אדמין, לתפריט %sבית - הגדרה - אימיילים%s כדי לשנות את הפרמטר <strong>'%s'</strong> כדי להשתמש במצב '<span class='0fec4bec8b0fec49fecz0b </span>'. במצב זה, תוכל להיכנס להגדרות של שרת ה-SMTP שסופק על ידי ספק שירותי האינטרנט שלך ולהשתמש בתכונת אימייל המוני.
 MailSendSetupIs3=אם יש לך שאלות כלשהן כיצד להגדיר את שרת ה-SMTP שלך, אתה יכול לשאול את %s.
@@ -183,7 +185,7 @@ Information=מֵידָע
 ContactsWithThirdpartyFilter=אנשי קשר עם מסנן של צד שלישי
 Unanswered=ללא מענה
 Answered=ענה
-IsNotAnAnswer=אין תשובה (אימייל ראשוני)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=היא תשובה של מייל ראשוני
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=ערך ברירת המחדל עבור השדה '%s' בעת יצירת איש קשר חדש
@@ -199,6 +201,6 @@ ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index c37351f45a0..9fa99060666 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -37,6 +37,7 @@ Translation=תִרגוּם
 Translations=תרגומים
 CurrentTimeZone=אזור PHP (שרת)
 EmptySearchString=הזן קריטריוני חיפוש לא ריקים
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=הזן קריטריון לתאריך
 NoRecordFound=לא נמצא רשומה
 NoRecordDeleted=שום רשומה לא נמחקה
@@ -45,6 +46,7 @@ NoError=אין שגיאה
 Error=שְׁגִיאָה
 Errors=שגיאות
 ErrorFieldRequired=שדה '%s' נדרש
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=לשדה '%s' יש ערך גרוע
 ErrorFileDoesNotExists=הקובץ %s אינו קיים
 ErrorFailedToOpenFile=פתיחת הקובץ %s נכשלה
@@ -308,6 +310,7 @@ DateBuild=דוח תאריך בנייה
 DatePayment=מועד התשלום
 DateApprove=תאריך אישור
 DateApprove2=תאריך אישור (אישור שני)
+PendingSince=Pending since
 RegistrationDate=תאריך רישום
 UserCreation=משתמש יצירה
 UserModification=משתמש שינוי
@@ -495,7 +498,7 @@ ActionRunningNotStarted=להתחיל
 ActionRunningShort=בתהליך
 ActionDoneShort=גָמוּר
 ActionUncomplete=לא שלם
-LatestLinkedEvents=האירועים המקושרים האחרונים של %s
+LatestLinkedEvents=The last %s events
 CompanyFoundation=חברה/ארגון
 Accountant=רואת חשבון
 ContactsForCompany=אנשי קשר עבור צד שלישי זה
@@ -503,6 +506,7 @@ ContactsAddressesForCompany=אנשי קשר/כתובות של צד שלישי ז
 AddressesForCompany=כתובות של צד שלישי זה
 ActionsOnCompany=אירועים עבור צד שלישי זה
 ActionsOnContact=אירועים עבור איש קשר/כתובת זו
+ActionsOnUser=Events for this user
 ActionsOnContract=אירועים לחוזה זה
 ActionsOnMember=אירועים על חבר זה
 ActionsOnProduct=אירועים על מוצר זה
@@ -720,6 +724,8 @@ TextUsedInTheMessageBody=גוף האימייל
 SendAcknowledgementByMail=שלח אימייל אישור
 SendMail=שלח אימייל
 Email=אימייל
+EMail=Email
+EMails=Emails
 NoEMail=אין מייל
 AlreadyRead=כבר קראתי
 NotRead=לא נקרא
@@ -792,7 +798,7 @@ Notes=הערות
 AddNewLine=הוסף שורה חדשה
 AddFile=הוסף קובץ
 FreeZone=מוצר טקסט חופשי
-FreeLineOfType=פריט טקסט חופשי, הקלד:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=שיבוט אובייקט עם התכונות העיקריות שלו
 ReGeneratePDF=צור מחדש PDF
 PDFMerge=מיזוג PDF
@@ -878,12 +884,14 @@ toward=לקראת
 Access=גִישָׁה
 SelectAction=בחר פעולה
 SelectTargetUser=בחר משתמש/עובד יעד
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=השתמש ב-Ctrl+C כדי להעתיק ללוח
 SaveUploadedFileWithMask=שמור קובץ בשרת בשם "<strong>%s</strong>" (אחרת " %s")
 OriginFileName=שם הקובץ המקורי
 SetDemandReason=הגדר מקור
 SetBankAccount=הגדר חשבון בנק
 AccountCurrency=מטבע חשבון
+AccountancyCode=Accounting Code
 ViewPrivateNote=הצג הערות
 XMoreLines=%s שורות מוסתרות
 ShowMoreLines=הצג יותר/פחות שורות
@@ -924,6 +932,7 @@ ConfirmMassDeletionQuestion=האם אתה בטוח שברצונך למחוק א
 ConfirmMassClone=אישור שיבוט בכמות גדולה
 ConfirmMassCloneQuestion=בחר פרויקט לשכפול
 ConfirmMassCloneToOneProject=שכפול לפרויקט %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=אובייקטים קשורים
 ClassifyBilled=סיווג מחויב
 ClassifyUnbilled=סיווג ללא חיוב
@@ -960,10 +969,11 @@ PrivateDownloadLinkDesc=אתה צריך להיות מחובר ואתה צריך
 Download=הורד
 DownloadDocument=הורד מסמך
 DownloadSignedDocument=הורד מסמך חתום
-ActualizeCurrency=עדכן שער מטבע
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=שנת כספים
 ModuleBuilder=בונה מודולים ויישומים
 SetMultiCurrencyCode=הגדר מטבע
+SetMultiCurrencyRate=Set currency rate
 BulkActions=פעולות בכמות גדולה
 ClickToShowHelp=לחץ כדי להציג עזרה של הסבר כלים
 WebSite=אתר אינטרנט
@@ -1103,6 +1113,7 @@ PayedBy=שולם על ידי
 PayedTo=שולם ל
 Monthly=יַרחוֹן
 Quarterly=רִבעוֹן
+Quarter=Quarter
 Annual=שנתי
 Local=מְקוֹמִי
 Remote=מְרוּחָק
@@ -1145,6 +1156,7 @@ ContactDefault_project_task=מְשִׁימָה
 ContactDefault_propal=הצעה
 ContactDefault_supplier_proposal=הצעת ספק
 ContactDefault_ticket=כַּרְטִיס
+ContactDefault_societe=Third party
 ContactAddedAutomatically=איש קשר נוסף מתפקידי איש קשר של צד שלישי
 More=יותר
 ShowDetails=הראה פרטים
@@ -1187,6 +1199,8 @@ SetSupervisor=הגדר את המפקח
 CreateExternalUser=צור משתמש חיצוני
 ConfirmAffectTag=הקצאת תגים בכמות גדולה
 ConfirmAffectUser=הקצאת משתמש בכמות גדולה
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=תפקיד מוקצה בכל פרויקט/הזדמנות
 TasksRole=תפקיד שהוקצה לכל משימה (אם נעשה שימוש)
 ConfirmSetSupervisor=סט מפקח בתפזורת
@@ -1238,6 +1252,9 @@ CommercialsAffected=הוקצו נציגי מכירות
 CommercialAffected=נציג מכירות הוקצה
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=ההודעה שלך
 YourMessageHasBeenReceived=הודעתך התקבלה. אנו נענה או ניצור איתך קשר בהקדם האפשרי.
 UrlToCheck=כתובת אתר לבדיקה
@@ -1280,6 +1297,7 @@ AmountSalary=סכום שכר
 InvoiceSubtype=תת סוג חשבונית
 ConfirmMassReverse=אישור הפוך בכמות גדולה
 ConfirmMassReverseQuestion=האם אתה בטוח שברצונך להפוך את %s הרשומות שנבחרו?
+ConfirmActionXxx=Confirm action %s
 ElementType=Element type
 ElementId=Element Id
 Encrypted=Encrypted
@@ -1299,3 +1317,35 @@ AllEntities=All entities
 TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
+auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/he_IL/members.lang b/htdocs/langs/he_IL/members.lang
index 2c2051c107a..a7422be1d26 100644
--- a/htdocs/langs/he_IL/members.lang
+++ b/htdocs/langs/he_IL/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=אם נדרש מנוי, יש לרשום מנוי עם 
 DeleteType=לִמְחוֹק
 VoteAllowed=מותר להצביע
 Physical=אִישִׁי
-Moral=תַאֲגִיד
-MorAndPhy=תאגיד ויחיד
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=הפעל מחדש
 ExcludeMember=אל תכלול חבר
 Exclude=אל תכלול
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=סטטיסטיקת חברים לפי אזור
 NbOfMembers=סה"כ מספר חברים
 NbOfActiveMembers=המספר הכולל של החברים הפעילים הנוכחיים
 NoValidatedMemberYet=לא נמצאו חברים מאומתים
-MembersByCountryDesc=מסך זה מציג לך את הנתונים הסטטיסטיים של חברים לפי מדינות. גרפים ותרשימים תלויים בזמינות שירות הגרפים המקוון של Google וכן בזמינות של חיבור אינטרנט תקין.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=מסך זה מציג סטטיסטיקות של חברים לפי מדינה/מחוזות/קנטון.
 MembersByTownDesc=מסך זה מציג סטטיסטיקות של חברים לפי עיר.
 MembersByNature=מסך זה מציג לך נתונים סטטיסטיים של חברים מטבעם.
@@ -208,25 +209,25 @@ NewMemberbyWeb=חבר חדש נוסף. מחכה לאישור
 NewMemberForm=טופס חבר חדש
 SubscriptionsStatistics=סטטיסטיקת תרומות
 NbOfSubscriptions=מספר תרומות
-AmountOfSubscriptions=סכום שנגבה מתרומות
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=מחזור (עבור חברה) או תקציב (עבור קרן)
-DefaultAmount=סכום ברירת המחדל של תרומה (משמש רק אם לא הוגדר סכום ברמת סוג חבר)
-MinimumAmount=סכום מינימלי (משמש רק כאשר סכום התרומה בחינם)
-CanEditAmount=סכום המנוי יכול להיות מוגדר על ידי החבר
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=המבקר יכול לבחור/לערוך את סכום התרומה שלו ללא קשר לסוג החבר
 AmountIsLowerToMinimumNotice=הסכום נמוך מהמינימום %s
 MEMBER_NEWFORM_PAYONLINE=לאחר ההרשמה המקוונת, עבור אוטומטית לדף התשלום המקוון
 ByProperties=על ידי הטבע
 MembersStatisticsByProperties=סטטיסטיקת חברים מטבעם
-VATToUseForSubscriptions=שיעור מע"מ לשימוש עבור תרומות
-NoVatOnSubscription=אין מע"מ עבור תרומות
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=מוצר המשמש לשורת תרומה לחשבונית: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=שם או חברה
 SubscriptionRecorded=תרומה נרשמה
 NoEmailSentToMember=לא נשלח אימייל לחבר
 EmailSentToMember=דוא"ל נשלח לחבר בכתובת %s
-SendReminderForExpiredSubscriptionTitle=שלח תזכורת באימייל לתרומות שפג תוקפן
-SendReminderForExpiredSubscription=שלח תזכורת באימייל לחברים כאשר התרומה עומדת לפוג (הפרמטר הוא מספר הימים לפני סיום החברות לשליחת התזכורת. זו יכולה להיות רשימה של ימים מופרדים בנקודה-פסיק, למשל '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=חברות בתשלום עבור התקופה הנוכחית (עד %s)
 YouMayFindYourInvoiceInThisEmail=ייתכן שתמצא את החשבונית שלך מצורפת למייל זה
 XMembersClosed=%s חברים נסגרו
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=צד שלישי הוא הישות המשפטית ש
 MemberFirstname=שם פרטי חבר
 MemberLastname=שם משפחה של חבר
 MemberCodeDesc=קוד חבר, ייחודי לכל החברים
-MemberSubscriptionStartFirstDayOf=תאריך תחילת החברות מתאים ליום הראשון של א
-MemberSubscriptionStartAfter=תקופה מינימלית לפני כניסתו לתוקף של תאריך ההתחלה של מנוי למעט חידושים (לדוגמה +3m = +3 חודשים, -5d = -5 ימים, +1Y = +1 שנה)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/he_IL/salaries.lang b/htdocs/langs/he_IL/salaries.lang
index 17860358f06..0c14a45146f 100644
--- a/htdocs/langs/he_IL/salaries.lang
+++ b/htdocs/langs/he_IL/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=משכורת חדשה
 AddSalary=הוסף משכורת
 NewSalaryPayment=כרטיס שכר חדש
 AddSalaryPayment=הוסף תשלום שכר
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=תשלום משכורת
 SalariesPayments=תשלומי משכורות
 SalariesPaymentsOf=תשלומי משכורות של %s
@@ -27,7 +29,7 @@ FillFieldFirst=מלא תחילה את שדה העובד
 UpdateAmountWithLastSalary=קבע סכום המשכורת האחרונה
 MakeTransferRequest=הגש בקשת העברה
 VirementOrder=בקשה להעברת אשראי
-BankTransferAmount=סכום העברת האשראי
 WithdrawalReceipt=הזמנת העברה באשראי
 OrderWaiting=הזמנה בהמתנה
 FillEndOfMonth=מלא עם סוף חודש
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
index 08a132aee3d..c59645cc446 100644
--- a/htdocs/langs/he_IL/website.lang
+++ b/htdocs/langs/he_IL/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=השתמש כאן ברשימה של שמות/כינויים
 WEBSITE_CSS_URL=כתובת האתר של קובץ CSS חיצוני
 WEBSITE_CSS_INLINE=תוכן קובץ CSS (משותף לכל הדפים)
 WEBSITE_JS_INLINE=תוכן קובץ JavaScript (משותף לכל הדפים)
-WEBSITE_HTML_HEADER=תוספת בתחתית כותרת HTML (משותף לכל הדפים)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=קובץ רובוט (robots.txt)
 WEBSITE_HTACCESS=אתר קובץ .htaccess
 WEBSITE_MANIFEST_JSON=אתר manifest.json קובץ
@@ -56,16 +56,17 @@ ReadPerm=לקרוא
 WritePerm=לִכתוֹב
 TestDeployOnWeb=בדיקה/פריסה באינטרנט
 PreviewSiteServedByWebServer=<u>תצוגה מקדימה של %s בכרטיסייה חדשה.</u><br><br>ה-%s יוגש על ידי שרת אינטרנט חיצוני (כמו Apache, Nginx, IIS ). עליך להתקין ולהגדיר את השרת הזה לפני כדי להצביע על הספרייה:<br><strong>%s span></strong><br>כתובת אתר מוגשת על ידי שרת חיצוני:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=כתובת האתר של המארח הוירטואלי המוגש על ידי שרת אינטרנט חיצוני לא מוגדרת
 NoPageYet=עדיין אין דפים
 YouCanCreatePageOrImportTemplate=אתה יכול ליצור דף חדש או לייבא תבנית אתר מלאה
 SyntaxHelp=עזרה לגבי עצות תחביר ספציפיות
 YouCanEditHtmlSourceckeditor=אתה יכול לערוך קוד מקור HTML באמצעות כפתור "מקור" בעורך.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=עבור תמונה ששותפה עם קישור שיתוף (גישה פתוחה באמצעות מפתח ה-hash השיתוף של הקובץ), התחביר הוא:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;070fcd9b <br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=שיבוט דף/מיכל
 CloneSite=אתר שיבוט
@@ -87,15 +88,15 @@ WebsiteAccount=חשבון אתר
 WebsiteAccounts=חשבונות אתרים
 AddWebsiteAccount=צור חשבון אתר אינטרנט
 BackToListForThirdParty=חזרה לרשימה עבור צדדים שלישיים
-DisableSiteFirst=תחילה השבת את האתר
+DisableSiteFirst=Put website offline first
 MyContainerTitle=כותרת האתר שלי
 AnotherContainer=כך ניתן לכלול תוכן של עמוד/מיכל אחר (ייתכן שיש לך שגיאה כאן אם תפעיל קוד דינמי כי ייתכן שתת-מיכל המוטבע אינו קיים)
 SorryWebsiteIsCurrentlyOffLine=מצטערים, אתר זה אינו מקוון כרגע. בבקשה תחזור מאוחר יותר...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=אפשר לטבלה לאחסן חשבונות אתר אינטרנט (כניסה/מעבר) עבור כל אתר / צד שלישי
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=תחילה עליך להגדיר את דף הבית המוגדר כברירת מחדל
-OnlyEditionOfSourceForGrabbedContentFuture=אזהרה: יצירת דף אינטרנט על ידי ייבוא דף אינטרנט חיצוני שמורה למשתמשים מנוסים. בהתאם למורכבות דף המקור, תוצאת הייבוא עשויה להיות שונה מהמקור. כמו כן, אם דף המקור משתמש בסגנונות CSS נפוצים או ב-JavaScript סותרים, הוא עלול לשבור את המראה או התכונות של עורך האתר בעת העבודה על דף זה. שיטה זו היא דרך מהירה יותר ליצור דף, אך מומלץ ליצור את הדף החדש שלך מאפס או מתבנית עמוד מוצעת.<br>שים לב גם שייתכן שהעורך המוטבע לא יעבוד תקינות כאשר נעשה שימוש בדף חיצוני שנתפס.
-OnlyEditionOfSourceForGrabbedContent=רק מהדורה של מקור HTML אפשרית כאשר תוכן נתפס מאתר חיצוני
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=תפוס גם תמונות שנמצאו ב-CSS ובדף.
 ImagesShouldBeSavedInto=יש לשמור את התמונות בספרייה
 WebsiteRootOfImages=ספריית שורש לתמונות אתרים
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Remove filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=קטגוריות
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 7b719123178..f6f7ad8d4b2 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Provjera integriteta datoteka je prošla, me
 FileIntegritySomeFilesWereRemovedOrModified=Provjera integriteta datoteke nije uspjela. Neke su datoteke modificirane, uklonjene ili dodane.
 GlobalChecksum=Globalni zbroj
 MakeIntegrityAnalysisFrom=Napravite analizu integriteta aplikacijskih datoteka od
-LocalSignature=Ugrađeni lokalni potpis (manje pouzdan)
-RemoteSignature=Daljinski udaljeni potpis (pouzdaniji)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Nedostaju datoteke
 FilesUpdated=Nadograđene datoteke
 FilesModified=Preinačene datoteke
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Koristi se samo kod nekih opcija agende
 Security=Sigurnost
 Passwords=Lozinke
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Šifrirajte lozinku baze podataka pohranjenu u conf.php. Preporučljivo je aktivirati ovu opciju.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=Da biste imali kodiranu lozinku u <b>conf.php</b> datoteci, zamjenite red <br><b>$dolibarr_main_db_pass="...";</b><br>sa<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Da biste imali čitljivu lozinku u <b>conf.php</b> datoteci, zamjenite red <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>sa<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Zaštitite generirane PDF datoteke. Ovo se NE preporuča jer prekida masovno generiranje PDF-a.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Izračunato polje
-ComputedFormulaDesc=Ovdje možete unijeti formulu koristeći druga svojstva objekta ili bilo koje PHP kodiranje da biste dobili dinamičku izračunatu vrijednost. Možete koristiti bilo koju PHP kompatibilnu formulu uključujući "?" operator uvjeta, i sljedeći globalni objekt: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield </strong>.<br><strong>UPOZORENJE</strong> : Ako su vam potrebna svojstva objekta koja nisu učitana, samo dohvatite objekt u formulu kao u drugom primjeru.<br>Korištenje izračunatog polja znači da možete t sami unesite bilo koju vrijednost iz sučelja. Također, ako postoji sintaktička pogreška, formula možda ne vraća ništa.<br><br>Primjer formule:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Primjer za ponovno učitavanje objekta<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj- >veliko / 5: '-1')<br><br>Drugi primjer formule za prisilno učitavanje objekta i njegov roditeljski objekt:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id ) > 0) && ($secondloadedobj = novi projekt($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Nadređeni projekt nije pronađen'
+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'
 Computedpersistent=Pohrani izračunato polje
 ComputedpersistentDesc=Izračunata dodatna polja bit će pohranjena u bazi podataka, međutim, vrijednost će se ponovno izračunati samo kada se promijeni objekt ovog polja. Ako izračunato polje ovisi o drugim objektima ili globalnim podacima, ova vrijednost može biti pogrešna!!
 ExtrafieldParamHelpPassword=Ostavljanje ovog polja praznim znači da će ova vrijednost biti pohranjena BEZ enkripcije (polje je samo skriveno sa zvjezdicama na ekranu).<br><br>Unesite vrijednost 'dolcrypt' za kodiranje vrijednosti reverzibilnim algoritmom šifriranja. Jasni podaci i dalje se mogu znati i uređivati, ali su šifrirani u bazi podataka.<br><br> span>Unesite 'auto' (ili 'md5', 'sha256', 'password_hash', ...) za korištenje zadanog algoritma šifriranja zaporke (ili md5, sha256, password_hash...) za spremanje nepovratne hashirane zaporke u baza podataka (nema načina za dohvaćanje izvorne vrijednosti)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Korištenje SMTP poslužitelja vašeg vlastitog davatelja usluga e-pošte za slanje e-pošte također je zanimljivo tako da će sve e-poruke poslane iz aplikacije također biti spremljene u vaš direktorij "Poslano" vašeg poštanskog sandučića.
 WarningPHPMailD=Stoga se preporuča promijeniti način slanja e-pošte na vrijednost "SMTP".
 WarningPHPMailDbis=Ako stvarno želite zadržati zadanu "PHP" metodu za slanje e-pošte, samo zanemarite ovo upozorenje ili je uklonite %sklikom ovdje%s.
-WarningPHPMail2=Ako vaš SMTP davatelj usluge e-pošte treba ograničiti klijenta e-pošte na neke IP adrese (vrlo rijetko), ovo je IP adresa korisničkog agenta e-pošte (MUA) za vašu ERP CRM aplikaciju: <strong> %s </strong> .
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Računovodstvo (pojednostavljeno)
 Module10Desc=Jednostavna računovodstvena izvješća temeljena na sadržaju baze podataka. Ne koristi tablicu glavne knjige.
 Module20Name=Ponude kupcima
 Module20Desc=Upravljanje ponudama
-Module22Name=Masovne e-poruke
-Module22Desc=Upravljajte masovnim slanjem e-pošte
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energija
 Module23Desc=Praćenje potrošnje energije
 Module25Name=Narudžbe kupaca
@@ -847,10 +848,10 @@ Permission212=Narudžbe linija
 Permission213=Aktiviraj liniju
 Permission214=Postavke telefonije
 Permission215=Postavke pružatelja
-Permission221=Čitaj korespodenciju
-Permission222=Izradi/izmjeni korespodenciju (teme, primatelji...)
-Permission223=Ovjeri korespodenciju (omogućuje slanje)
-Permission229=Obriši korespodenciju
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Pregled primatelja i informacije
 Permission238=Ručno slanje korespodencije
 Permission239=Obriši korespodenciju nakon ovjere ili slanja
@@ -1105,6 +1106,7 @@ DictionaryStaff=Broj zaposlenih
 DictionaryAvailability=Rok isporuke
 DictionaryOrderMethods=Načini naručivanja
 DictionarySource=Porjeklo ponuda/narudžbi
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Personalizirane grupe za izvješća
 DictionaryAccountancysystem=Modeli za grafikone računa
 DictionaryAccountancyJournal=Računovodstveni dnevnici
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Povratak na popis definicija
 TypeOfRevenueStamp=Vrsta porezne marke
 VATManagement=Upravljanje porezom na promet
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Prema zadanim postavkama predloženi porez na promet je 0 koji se može koristiti za slučajeve kao što su udruge, pojedinci ili male tvrtke.
 VATIsUsedExampleFR=U Francuskoj to znači tvrtke ili organizacije koje imaju stvarni fiskalni sustav (pojednostavljeno realno ili normalno realno). Sustav u kojem se deklarira PDV.
 VATIsNotUsedExampleFR=U Francuskoj to znači udruge koje nisu prijavljene za porez na promet ili tvrtke, organizacije ili slobodne profesije koje su odabrale fiskalni sustav mikro poduzeća (porez na promet u franšizi) i platile franšizni porez na promet bez ikakve prijave poreza na promet. Ovaj izbor će prikazati referencu "Neprimjenjiv porez na promet - art-293B CGI" na fakturama.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Vrsta poreza na promet
 LTRate=Stopa
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Prema postavci poreza (vidi %s - %s - %s), vaša zemlj
 LabelUsedByDefault=Oznake korištene kao zadane ako ne postoji prijevoda za kod
 LabelOnDocuments=Oznake na dokumentima
 LabelOrTranslationKey=Oznaka ili prijevodni ključ
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=Prikažite PDV broj kupca/dobavljača u kombiniranim popisima.
 AddAdressInList=Prikažite adresu kupca/dobavljača u kombiniranim popisima.<br>Treće strane pojavit će se s formatom imena "The Big tvrtka corp. - 21 jump street 123456 Big town - SAD" umjesto "The Big tvrtka corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Zatraži za preferiranu metodu slanja za komitente.
-FieldEdition=Izdanje polja %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
 GetBarCode=Uzmi barkod
 NumberingModules=Modeli numeriranja
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Forsiraj datum računa kao datum ovjere
 SuggestedPaymentModesIfNotDefinedInInvoice=Predloženi način plaćanja na fakturi prema zadanim postavkama ako nije definiran na fakturi
 SuggestPaymentByRIBOnAccount=Predložite plaćanje isplatom na račun
 SuggestPaymentByChequeToAddress=Predložite plaćanje čekom na
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Slobodan unos teksta na računu
 WatermarkOnDraftInvoices=Vodeni žig na skici računa (ništa ako se ostavi prazno)
 PaymentsNumberingModule=Način označavanja plaćanja
@@ -1718,6 +1723,7 @@ CompressionOfResources=Compression of HTTP responses
 CompressionOfResourcesDesc=Na primjer korištenjem Apache direktive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Takvo automatsko otkrivanje nije moguće s trenutnim preglednicima
 DefaultValuesDesc=Ovdje možete definirati zadanu vrijednost koju želite koristiti pri stvaranju novog zapisa i/ili zadane filtre ili redoslijed sortiranja kada navodite zapise.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Zadane vrijednosti (za korištenje na obrascima)
 DefaultSearchFilters=Zadani filteri pretraživanja
 DefaultSortOrder=Zadani redoslijed sortiranja
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Način označavanja slanja
 SendingsAbility=Podrži liste isporuke za dostave kupcima
 NoNeedForDeliveryReceipts=U većini slučajeva, otpremni listovi se koriste i kao listovi za dostavu kupaca (popis proizvoda za slanje) i listovi koje prima i potpisuje kupac. Stoga je potvrda o isporuci proizvoda duplicirana značajka i rijetko se aktivira.
 FreeLegalTextOnShippings=Slobodan unos teksta kod isporuka
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Način označavanja primke proizvoda
 DeliveryOrderModel=Model primke proizvoda
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Slobodan unos teksta na primkama
 ##### FCKeditor #####
 AdvancedEditor=Napredni uređivač
 ActivateFCKeditor=Aktiviraj napredni uređivač za:
-FCKeditorForNotePublic=WYSIWYG kreiranje/izdanje polja "javne bilješke" elemenata
-FCKeditorForNotePrivate=WYSIWYG kreiranje/izdanje polja "privatne bilješke" elemenata
-FCKeditorForCompany=WYSIWYG izrada/izdanje polja opisa elemenata (osim proizvoda/usluga)
-FCKeditorForProductDetails=WYSIWYG kreiranje/izdanje opisa proizvoda ili redaka za objekte (redovi ponuda, narudžbi, faktura, itd...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Upozorenje: korištenje ove opcije za ovaj slučaj se ozbiljno ne preporučuje jer može izradi probleme s posebnim znakovima i formatirati stranicu prilikom izrade PDF-a datoteke.
-FCKeditorForMailing= WYSIWYG izrada/izdanje za masovnu e-poštu (Alati->e-pošta)
-FCKeditorForUserSignature=WYSIWYG stvaranje/izdanje korisničkog potpisa
-FCKeditorForMail=WYSIWYG stvaranje/izdanje za svu poštu (osim Tools->eMailing)
-FCKeditorForTicket=WYSIWYG izrada/izdanje za ulaznice
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Podešavanje modula skladišta
 IfYouUsePointOfSaleCheckModule=Ako koristite modul prodajnog mjesta (POS) koji je osiguran prema zadanim postavkama ili vanjski modul, vaš POS modul može zanemariti ovu postavku. Većina POS modula dizajnirana je prema zadanim postavkama za izradi fakturu odmah i smanjenje zaliha bez obzira na opcije ovdje. Dakle, ako trebate ili ne trebate imati smanjenje zaliha prilikom registracije prodaje s vašeg POS-a, Provjeri također postavite svoj POS modul.
@@ -1867,7 +1874,6 @@ Buy=Kupi
 Sell=Prodaj
 InvoiceDateUsed=Korišten datum računa
 YourCompanyDoesNotUseVAT=Vaša tvrtka je definirana da ne koristi PDV (Početna - Postavke - Tvrtka/Organizacija), tako da nema opcija PDV-a za postavljanje.
-AccountancyCode=Računovodstveni kod
 AccountancyCodeSell=Konto prodaje
 AccountancyCodeBuy=Konto nabave
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Ostavite potvrdni okvir "Automatski kreiraj plaćanje" prazan prema zadanim postavkama kada kreirate novi porez
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Koji prikaz želite otvoriti prema zadanim postavkama odab
 AGENDA_EVENT_PAST_COLOR = Boja prošlih događaja
 AGENDA_EVENT_CURRENT_COLOR = Boja trenutnog događaja
 AGENDA_EVENT_FUTURE_COLOR = Boja budućeg događaja
-AGENDA_REMINDER_BROWSER = Omogući podsjetnik na događaj <b>u pregledniku korisnika</b> (Kada se dosegne datum podsjetnika, preglednik prikazuje skočni prozor. Svaki korisnik može onemogućite takve obavijesti u postavkama obavijesti preglednika).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Omogući zvučnu obavijest
-AGENDA_REMINDER_EMAIL = Omogući podsjetnik na događaj <b>putem e-pošte</b> (opcija podsjetnika/kašnjenje može se definirati za svaki događaj).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Napomena: Učestalost zakazanog posla %s mora biti dovoljna da se osigura da se podsjetnik šalje u točnom trenutku.
 AGENDA_SHOW_LINKED_OBJECT = Prikaži povezani objekt u prikazu dnevnog reda
 AGENDA_USE_EVENT_TYPE = Koristite vrste događaja (upravlja se u izborniku Postavljanje -> Rječnici -> Vrsta događaja dnevnog reda)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Automatski postavite ovu zadanu vrijednost za vrstu događaja u obrascu za kreiranje događaja
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Ključ za autorizaciju veze za izvoz
 PastDelayVCalExport=Ne izvoziti događaj stariji od
 SecurityKey = Sigurnosni ključ
@@ -2006,7 +2017,7 @@ BackupZipWizard=Čarobnjak za izgradnju arhive dokumenata direktorija
 SomethingMakeInstallFromWebNotPossible=Instalacija vanjskog modula nije moguća s web sučelja iz sljedećeg razloga:
 SomethingMakeInstallFromWebNotPossible2=Iz tog razloga, proces nadogradnje koji je ovdje opisan je ručni proces koji može izvesti samo privilegirani korisnik.
 InstallModuleFromWebHasBeenDisabledContactUs=Instalacija ili razvoj vanjskih modula ili dinamičkih web stranica iz aplikacije trenutno je zaključana iz sigurnosnih razloga. Kontaktirajte nas ako trebate omogućiti ovu značajku.
-InstallModuleFromWebHasBeenDisabledByFile=Vaš administrator onemogućio je instalaciju vanjskog modula iz aplikacije. Morate ga zamoliti da ukloni datoteku <strong>%s</strong> kako biste to omogućili značajka.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Instaliranje ili izgradnja vanjskog modula iz aplikacije potrebno je spremiti datoteke modula u direktorij <strong>%s </strong>. Da bi Dolibarr obradio ovaj direktorij, morate postaviti svoj <strong>conf/conf.php</strong> za dodavanje 2 retka direktive: <br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Označite linije tablice kada miš prijeđe
 HighlightLinesColor=Označite boju linije kada miš prijeđe preko (upotrijebite 'ffffff' da ne bude isticanja)
@@ -2036,6 +2047,7 @@ Enter0or1=Unesite 0 ili 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Unesite ovdje između zagrada, popis brojeva bajtova koji predstavljaju simbol valute. Na primjer: za $ unesite [36] - za brazilski realni R$ [82,36] - za € unesite [8364]
 ColorFormat=RGB boja je u HEX formatu, npr.: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Naziv ikone u formatu:<br>- image.png za slikovnu datoteku u trenutni direktorij teme<br>- image.png@module ako je datoteka u direktoriju /img/ modula<br>- fa-xxx za FontAwesome fa-xxx sliku<br>- fontawesome_xxx_fa_color_size za FontAwesome fa-xxx sliku (s prefiksom, set veličine i boje)
 PositionIntoComboList=Položaj reda u kombiniranim popisima
 SellTaxRate=Stopa poreza na promet
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Sakrij obrube na okviru adrese pošiljatelja
 MAIN_PDF_NO_RECIPENT_FRAME=Sakrij obrube na okviru adrese primatelja
 MAIN_PDF_HIDE_CUSTOMER_CODE=Sakrij šifru korisnika
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Sakrij pošiljatelja/naziv tvrtke u bloku adrese
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Sakrij uvjete plaćanja
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Sakrij način plaćanja
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=Nije preporučeno
 ARestrictedPath=Neki ograničeni put za podatkovne datoteke
 CheckForModuleUpdate=Provjerite ima li ažuriranja vanjskih modula
 CheckForModuleUpdateHelp=Ova će se radnja povezati s urednicima vanjskih modula kako bi provjerili je li dostupna nova verzija.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Dostupno je ažuriranje
 NoExternalModuleWithUpdate=Nisu pronađena ažuriranja za vanjske module
 SwaggerDescriptionFile=Datoteka opisa Swagger API-ja (za korištenje s redoc, na primjer)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Prikaži adresu za dostavu
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Obavezna indikacija u nekim zemljama (Francuska, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Url poveznica društvene mreže. Koristite {socialid} za varijabilni dio koji sadrži ID društvene mreže.
 IfThisCategoryIsChildOfAnother=Ako je ova kategorija dijete druge
 DarkThemeMode=Način tamne teme
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Upozorenje: modul %s postavio j
 WarningModuleHasChangedSecurityCsrfParameter=Upozorenje: modul %s onemogućio je CSRF sigurnost vaše instance. Ova radnja je sumnja da i vaša instalacija možda više nije sigurna. Za objašnjenje se obratite autoru modula.
 EMailsInGoingDesc=Dolaznom e-poštom upravlja modul %s. Morate omogućiti i konfigurirati ako trebate podršku za dolazne e-poruke.
 MAIN_IMAP_USE_PHPIMAP=Koristite PHP-IMAP biblioteku za IMAP umjesto izvornog PHP IMAP-a. Ovo također dopušta korištenje OAuth2 veze za IMAP (modul OAuth također mora biti aktiviran).
-MAIN_CHECKBOX_LEFT_COLUMN=Prikaži stupac za odabir reda i polja s lijeve strane (prema zadanim postavkama s desne strane)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Nije izrađeno prema zadanim postavkama. Kreirano samo pri aktivaciji modula.
 CSSPage=CSS stil
 Defaultfortype=Zadano
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang
index 3a3c2c02e2b..1c0933d6cb0 100644
--- a/htdocs/langs/hr_HR/banks.lang
+++ b/htdocs/langs/hr_HR/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Završno stanje
 CurrentBalance=Trenutno stanje
 FutureBalance=Buduće stanje
 ShowAllTimeBalance=Prikaži stanje od početka
-AllTime=Od početka
 Reconciliation=Usklađivanje
 RIB=Broj bankovnog računa
 IBAN=IBAN broj
@@ -133,7 +132,7 @@ DeleteTransaction=Obriši transakciju
 ConfirmDeleteTransaction=Jeste li sigurni da želite obrisati ovu transakciju ?
 ThisWillAlsoDeleteBankRecord=Ovo će isto obrisati generirane bankovne transakcije
 BankMovements=Promjene
-PlannedTransactions=Planirane transakcije
+PlannedTransactions=Upcoming entries
 Graph=Grafovi
 ExportDataset_banque_1=Bankovne transakcije i izvodi
 ExportDataset_banque_2=Potvrda pologa
@@ -151,7 +150,7 @@ FutureTransaction=Transakcija je u budućnosti. Ne može se uskladiti.
 SelectChequeTransactionAndGenerate=Odaberite/filtrirajte čekove koje želite uključiti, odaberite potvrdu depozita i kliknite "Kreiraj"
 SelectPaymentTransactionAndGenerate=Odaberite/filtrirajte dokumente koji će biti uključeni u %s potvrdu o pologu. Zatim kliknite na "izradi".
 InputReceiptNumber=Odaberite bankovni izvod vezan uz mirenje. Koristite numeričku vrijednost koja se može sortirati
-InputReceiptNumberBis=GGGGMM ili GGGGMMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Uskladiti ?
 ThenCheckLinesAndConciliate=Tada, označite stavke na izvodu i kliknite
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Ako je ova funkcija omogućena, možete odabrati određ
 BankColorizeMovementName1=Boja pozadine za kretanje duga
 BankColorizeMovementName2=Boja pozadine za kretanje kredita
 IfYouDontReconcileDisableProperty=Ako ne izvršite bankovno usklađivanje na nekim bankovnim računima, onemogućite svojstvo "%s" na njima kako biste uklonili ovo upozorenje.
-NoBankAccountDefined=Nije definiran bankovni račun
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Nema zapisa na bankovnom računu. Obično se to događa kada je zapis ručno izbrisan s popisa transakcija na bankovnom računu (na primjer tijekom usklađivanja bankovnog računa). Drugi razlog je taj što je plaćanje zabilježeno kada je modul "%s" bio onemogućen.
 AlreadyOneBankAccount=Već definiran jedan bankovni račun
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA varijanta datoteke
diff --git a/htdocs/langs/hr_HR/blockedlog.lang b/htdocs/langs/hr_HR/blockedlog.lang
index c702f27421e..462bdac44d1 100644
--- a/htdocs/langs/hr_HR/blockedlog.lang
+++ b/htdocs/langs/hr_HR/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Nepromjenjivi dnevnici
 ShowAllFingerPrintsMightBeTooLong=Prikaži sve arhivirane zapisnike (mogu biti dugački)
 ShowAllFingerPrintsErrorsMightBeTooLong=Prikaži sve nevažeće zapisnike arhive (mogu biti dugački)
 DownloadBlockChain=Preuzmite otiske prstiju
-KoCheckFingerprintValidity=Arhivirani unos dnevnika nije valjan. To znači da je netko (haker?) modificirao neke podatke ovog zapisa nakon što je snimljen, ili je izbrisao prethodni arhivirani zapis (Provjeri taj redak s prethodnim # postoji) ili je modificirani kontrolni zbroj prethodnog zapisa.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Arhivirani zapis dnevnika je valjan. Podaci u ovom retku nisu izmijenjeni i unos slijedi nakon prethodnog.
 OkCheckFingerprintValidityButChainIsKo=Arhivirani dnevnik čini se važećim u usporedbi s prethodnim, ali lanac je prethodno bio oštećen.
 AddedByAuthority=Pohranjeno u udaljeni autoritet
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Detalji dnevnika
 ListOfTrackedEvents=Popis praćenih događaja
 Fingerprint=Otisak prsta
 DownloadLogCSV=Izvoz arhiviranih zapisa (CSV)
-DataOfArchivedEvent=Potpuni podaci arhiviranog događaja
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Izvorni objekt (tip %s, id %s) nije povezan (pogledajte stupac 'Puni podaci' da biste dobili nepromjenjive spremljene podatke)
 BlockedLogAreRequiredByYourCountryLegislation=Modul nepromjenjivih dnevnika može biti potreban prema zakonodavstvu vaše zemlje. Onemogućavanje ovog modula može učiniti sve buduće transakcije nevažećima u odnosu na zakon i korištenje legalnog softvera jer se ne mogu potvrditi poreznom revizijom.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Modul Nepromjenjivi zapisnici aktiviran je zbog zakonodavstva vaše zemlje. Onemogućavanje ovog modula može učiniti sve buduće transakcije nevažećima u odnosu na zakon i korištenje legalnog softvera jer se ne mogu potvrditi poreznom revizijom.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Omogućen je sustav za praćenje događaja u nepromjenjive zap
 BlockedLogDisabled=Sustav za praćenje događaja u nepromjenjive zapisnike onemogućen je nakon nekog snimanja. Sačuvali smo poseban otisak prsta da pratimo lanac kao pokvaren
 BlockedLogDisabledBis=Sustav za praćenje događaja u nepromjenjive zapisnike je onemogućen. To je moguće jer još nije napravljena evidencija.
 LinkHasBeenDisabledForPerformancePurpose=Radi izvedbe, izravna poveznica na dokument ne prikazuje se nakon 100. retka.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Faktura kupca je logično izbrisana
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Logičko brisanje plaćanja kupca
 logPAYMENT_VARIOUS_CREATE=Plaćanje (nije dodijeljeno fakturi) stvoreno
 logPAYMENT_VARIOUS_DELETE=Plaćanje (nije dodijeljeno fakturi) logično brisanje
 logPAYMENT_VARIOUS_MODIFY=Plaćanje (nije dodijeljeno fakturi) izmijenjeno
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/hr_HR/categories.lang b/htdocs/langs/hr_HR/categories.lang
index 38bd74c02a6..44c69615acb 100644
--- a/htdocs/langs/hr_HR/categories.lang
+++ b/htdocs/langs/hr_HR/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Kontaktirajte oznake/Kategorije područje
 AccountsCategoriesArea=Područje bankovnog računa oznake/Kategorije
 ProjectsCategoriesArea=Područje projekta oznake/Kategorije
 UsersCategoriesArea=Korisničko područje oznake/Kategorije
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Sub-Kategorije
 CatList=Popis kategorija
 CatListAll=Popis oznake/Kategorije (sve vrste)
@@ -90,9 +91,10 @@ CategoriesSetup=Podešavanje kategorija
 CategorieRecursiv=Poveži automatski sa matičnom kategorijom
 CategorieRecursivHelp=Ako je opcija uključena, kada dodate objekt u potkategoriju, objekt će također biti dodan u nadređenu Kategorije.
 AddProductServiceIntoCategory=Dodijelite kategoriju proizvodu/usluzi
-AddCustomerIntoCategory=Dodijelite kategoriju kupcu
-AddSupplierIntoCategory=Dodijelite kategoriju dobavljaču
-AssignCategoryTo=Dodijeli kategoriju
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Prikaži kategoriju
 ByDefaultInList=Po predefiniranom na listi
 ChooseCategory=Odaberite kategoriju
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Spremnik stranice Kategorije
 KnowledgemanagementsCategoriesArea=KM članak Kategorije
 UseOrOperatorForCategories=Koristite operator 'OR' za Kategorije
 AddObjectIntoCategory=Dodijelite kategoriji
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index 3d74bedf85c..5848e41f188 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -65,6 +65,7 @@ State=Država/provincija
 StateId=Državna iskaznica
 StateCode=Šifra države/pokrajine
 StateShort=Država
+DepartmentBuyer=Buyer's state/province
 Region=Regija
 Region-State=Regija - Država
 Country=Država
@@ -78,7 +79,7 @@ Chat=Chat
 PhonePro=Prof. telefon
 PhonePerso=Osob. telefon
 PhoneMobile=Mobitel
-No_Email=Odbija masovno slanje e-pošte
+No_Email=Refuse mass emails
 Fax=Faks
 Zip=Poštanski broj
 Town=Grad
@@ -382,12 +383,12 @@ ExportCardToFormat=Izvezi karticu u formatu
 ContactNotLinkedToCompany=Kontakt nije povezan ni sa jednim komitentom
 DolibarrLogin=Dolibarr korisničko ime
 NoDolibarrAccess=Nema pristup Dolibarr-u
-ExportDataset_company_1=Treće osobe\n(tvrtke/zaklade/fizičke osobe) i njihove osobine
-ExportDataset_company_2=Kontakti i njihova svojstva
-ExportDataset_company_3=Bankovni računi trećih osoba
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Dodatni kontakti/adrese i atributi trećih strana
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Treće osobe i njihove osobine
 ImportDataset_company_2=Dodatni kontakti/adrese i atributi trećih strana
-ImportDataset_company_3=Bankovni računi trećih osoba
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Prodajni predstavnici za treće osobe (dodjela predstavnika/korisnika za tvrtke)
 PriceLevel=Cjenovni razred
 PriceLevelLabels=Oznake razine cijena
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Ime vlasnika(ce) ( CEO, direktor, predsjednik uprave...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Združi treće osobe
-ConfirmMergeThirdparties=Jeste li sigurni da želite spojiti odabranu treću stranu s trenutnom? Svi povezani objekti (fakture, narudžbe,...) bit će premješteni na trenutnu treću stranu, nakon čega će odabrana treća strana biti izbrisana.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Treće osobe združene
 SaleRepresentativeLogin=Korisničko ime predstavnika
 SaleRepresentativeFirstname=Ime prodajnog predstavnika
@@ -461,3 +462,6 @@ ExternalSystemID=ID vanjskog sustava
 IDOfPaymentInAnExternalSystem=ID načina plaćanja u vanjski sustav (poput Stripe, Paypal, ...)
 AADEWebserviceCredentials=Vjerodajnice AADE Webservice
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Treća strana mora biti korisnik kako bi dopustila stvaranje svojih bankovnih podataka na strani Stripe
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index cf0046213b2..e87aca060a5 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -7,7 +7,7 @@ OptionModeTrue=Opcija Prihodi-Troškovi
 OptionModeVirtual=Opcija Potraživanja-Dugovanja
 OptionModeTrueDesc=U ovom kontekstu, promet je izračunat kroz plaćanja ( datum plaćanja ). Valjanost brojki je osigurano samo ako je pomno vođenje knjiga po računu kroz ulazne/izlazne račune.
 OptionModeVirtualDesc=U ovom kontekstu, promet je izračunat putem računa (datum ovjere). Kada su ti računi u dospijeću, bez obzira da li su plaćeni ili ne, oni su prikazani na prikazu prometa.
-FeatureIsSupportedInInOutModeOnly=Mogučnost je dostupna samo u KREDITIRANJA-DUGOVANJA načinu računovodstva ( Pogledajte podešavanje Računovodstvenog modula ) 
+FeatureIsSupportedInInOutModeOnly=Mogučnost je dostupna samo u KREDITIRANJA-DUGOVANJA načinu računovodstva ( Pogledajte podešavanje Računovodstvenog modula )
 VATReportBuildWithOptionDefinedInModule=Prikazani iznosi su izračunati korištenjem pravila definiranih u postavkama Poreznog modula
 LTReportBuildWithOptionDefinedInModule=Prikazani iznosi su izračunati korištenjem pravila definiranih u postavkama tvrtke.
 Param=Podešavanje
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Uplata računa kupca
 PaymentSupplierInvoice=plaćanje računa dobavljača
 PaymentSocialContribution=Plaćanje društveni/fiskalni porez
 PaymentVat=PDV plaćanje
-AutomaticCreationPayment=Automatski zabilježite uplatu
+AutomaticCreationPayment=Also record the payment
 ListPayment=Popis plaćanja
 ListOfCustomerPayments=Popis uplata kupaca
 ListOfSupplierPayments=Popis plaćanja dobavljača
@@ -118,10 +118,14 @@ SocialContributionsPayments=Plaćanja društveni/fiskalni porez
 ShowVatPayment=Prikaži PDV plaćanja
 TotalToPay=Ukupno za platiti
 BalanceVisibilityDependsOnSortAndFilters=Saldo je vidljiv na ovom popisu samo ako je tablica sortirana prema %s i filtriranoj prema 1 bankovnom računu (bez drugih filtara)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Računovodstvena šifra kupaca
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Računovodstveni kod dobavljača
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Konto kupca
 SupplierAccountancyCodeShort=Konto dobavljača
+UserAccountancyCodeShort=User account. code
 AccountNumber=Broj računa
 NewAccountingAccount=Novi račun
 Turnover=Promet fakturiran
@@ -129,7 +133,9 @@ TurnoverCollected=Naplaćeni promet
 SalesTurnoverMinimum=Minimalni promet
 ByExpenseIncome=Po troškovima i prihodima
 ByThirdParties=Po trećim osobama
+ByProjects=By projects
 ByUserAuthorOfInvoice=Po autoru računa
+DetailedListLowercase=detailed list
 CheckReceipt=Potvrda pologa
 CheckReceiptShort=Potvrda pologa
 LastCheckReceiptShort=Najnovije %s potvrde o uplati
diff --git a/htdocs/langs/hr_HR/datapolicy.lang b/htdocs/langs/hr_HR/datapolicy.lang
index f310ecf442f..e7a7048852b 100644
--- a/htdocs/langs/hr_HR/datapolicy.lang
+++ b/htdocs/langs/hr_HR/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Politika privatnosti podataka
 Module4100Desc = Modul za upravljanje privatnošću podataka (sukladnost s GDPR-om)
 # Administration page
 datapolicySetup = Podešavanje pravila o privatnosti podataka modula
-Deletion = Brisanje podataka
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s mjeseci
 ONE_YEAR = 1 godina
 NB_YEARS = %s godina
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Potencijalni/Kupac
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Ni potencijalni/ni kupac
 DATAPOLICY_CONTACT_FOURNISSEUR = Dobavljač
 DATAPOLICY_ADHERENT = Član
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Možete poslati GDPR e-pošta svim svojim relevantnim kontaktima (koji još nisu primili e-pošta i za koje niste registrirali ništa o njihovom GDPR ugovoru). Da biste to učinili, koristite sljedeći gumb.
 SendAgreement = Pošaljite e-poštu
 AllAgreementSend = Svi e-mailovi su poslani
 TXTLINKDATAPOLICYACCEPT = Tekst za link "ugovor"
 TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR : Obrada osobnih podataka
 DATAPOLICY_consentement = Dobivena suglasnost za obradu osobnih podataka
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 794f0303da4..380235e0e23 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Izrada mape nije uspjela. Provjerite ima li korisnik web poslužitelja dopuštenje za pisanje u mapu dokumenata Dolibarr. Ako je parametar <b> safe_mode </b> omogućen na ovom PHP-u, provjerite posjeduju li Dolibarr php datoteke korisniku (ili grupi) web poslužitelja.
 ErrorNoMailDefinedForThisUser=Za ovog korisnika nije definirana pošta
 ErrorSetupOfEmailsNotComplete=Postavljanje e-pošte nije dovršeno
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Ova značajka treba aktivirati JavaScript da bi radila. Promijenite ovo u postavkama - zaslon.
 ErrorTopMenuMustHaveAParentWithId0=Izbornik tipa 'Vrh' ne može imati roditeljski izbornik. Stavite 0 u roditeljski izbornik ili odaberite izbornik tipa 'Lijevo'.
 ErrorLeftMenuMustHaveAParentId=Izbornik tipa 'Lijevo' mora imati roditeljski ID.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Učitavanje blokira PHP/Apache dodatak.
 ErrorFileSizeTooLarge=Veličina datoteke je prevelika ili datoteka nije navedena.
 ErrorFieldTooLong=Polje %s je predugo.
 ErrorSizeTooLongForIntType=Veličina predugačka za tip int (maksimalno %s znamenki)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Veličina predugačka za vrstu niza (maksimalno %s znakova)
 ErrorNoValueForSelectType=Unesite vrijednost za odabrani popis
 ErrorNoValueForCheckBoxType=Ispunite vrijednost za popis potvrdnih okvira
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Loša vrijednost za sigurnosni kod. Pokušajte ponovno s no
 ErrorBothFieldCantBeNegative=Polja %s i %s ne mogu biti oba negativna
 ErrorFieldCantBeNegativeOnInvoice=Polje <strong>%s</strong> ne može biti negativno na ovoj vrsti fakture. Ako trebate dodati liniju s popustom, prvo samo izradi popust (iz polja '%s' na kartici treće strane) i primijenite to na fakturu.
 ErrorLinesCantBeNegativeForOneVATRate=Ukupni broj redaka (bez poreza) ne može biti negativan za zadanu nenultu stopu PDV-a (Pronađen je negativan ukupni iznos za stopu PDV-a <b>%s </b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Linije ne mogu biti negativne u depozitu. Suočit ćete se s problemima kada budete trebali potrošiti depozit u završnoj fakturi ako to učinite.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Količina za redak u fakturama kupaca ne može biti negativna
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Korisnički račun <b>%s</b> koji pokreće web server nema dozvolu za pokretanje
 ErrorNoActivatedBarcode=Nema aktivirane vrste crtičnog koda
 ErrUnzipFails=Nije uspjelo raspakiranje %s pomoću ZipArchivea
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Vaš PHP parametar upload_max_filesize (%s) veći je od PHP parametra post_max_size (%s). Ovo nije dosljedna postavka.
 WarningPasswordSetWithNoAccount=Lozinka je postavljena za ovaj član. Međutim, nijedan korisnički račun nije stvoren. Dakle, ova lozinka je pohranjena, ali se ne može koristiti za prijavu na Dolibarr. Može ga koristiti vanjski modul/sučelje, ali ako ne trebate definirati nikakvu prijavu niti lozinku za član, možete onemogućiti opciju "Upravljanje prijavom za svaki član" iz postavljanja modula član. Ako trebate upravljati prijavom, ali vam nije potrebna lozinka, ovo polje možete ostaviti praznim kako biste izbjegli ovo upozorenje. Napomena: e-pošta također se može koristiti kao prijava ako je član povezan s korisnikom.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR faktura može se dodati samo na fakture postavljene za plaćanje kreditnim prijenosom.
 SwissQrCreditorAddressInvalid = Adresa vjerovnika nije važeća (je li ZIP i grad postavljen? (%s)
 SwissQrCreditorInformationInvalid = Podaci o vjerovniku nisu važeći za IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/hr_HR/exports.lang b/htdocs/langs/hr_HR/exports.lang
index 67a7e06ac26..00fbc6939d4 100644
--- a/htdocs/langs/hr_HR/exports.lang
+++ b/htdocs/langs/hr_HR/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Oznaka linije
 LineDescription=Opis redka
 LineUnitPrice=Jedinična cijena linije
 LineVATRate=Stopa PDV-a na liniji
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Količina za liniju
 LineTotalHT=Iznos bez PDV-a za redak
 LineTotalTTC=Iznos s porezom za liniju
 LineTotalVAT=Iznos PDV-a za liniju
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Vrsta linije (0=proizvod, 1=usluga)
 FileWithDataToImport=Datoteka s podacima za uvoz
 FileToImport=Izvorna datoteka za uvoz
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=Odaberite format datoteke za korištenje kao format d
 ChooseFileToImport=Prenesite datoteku, a zatim kliknite na ikonu %s da odaberete datoteku kao izvornu datoteku za uvoz...
 SourceFileFormat=Format izvorne datoteke
 FieldsInSourceFile=Polja u izvornoj datoteci
-FieldsInTargetDatabase=Ciljna polja u bazi podataka Dolibarr (podebljano=obavezno)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Nema polja
 MoveField=Premjestite polje broj stupca %s
 ExampleOfImportFile=Primjer_uvozne_datoteke
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Provjeri da format datoteke (razdjelnici nizova polja i)
 RunSimulateImportFile=Pokrenite simulaciju uvoza
 FieldNeedSource=Ovo polje zahtijeva podatke iz izvorne datoteke
 SomeMandatoryFieldHaveNoSource=Neka obvezna polja nemaju izvor iz podatkovne datoteke
-InformationOnSourceFile=Informacije o izvornoj datoteci
-InformationOnTargetTables=Informacije o ciljnim poljima
+InformationOnSourceFile=Izvorna datoteka
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Promijenite barem jedno izvorno polje u stupcu polja za izvoz
 SelectFormat=Odaberite ovaj format datoteke za uvoz
 RunImportFile=Uvoz podataka
diff --git a/htdocs/langs/hr_HR/hrm.lang b/htdocs/langs/hr_HR/hrm.lang
index 98230043f64..95ad7c6f634 100644
--- a/htdocs/langs/hr_HR/hrm.lang
+++ b/htdocs/langs/hr_HR/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=Potreban čin za profil posla
-RequiredRankShort=Potreban rang
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Pozicije s ovim profilima poslova
-EmployeeRank=Rang zaposlenika za ovu vještinu
-EmployeeRankShort=Čin zaposlenika
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Položaj zaposlenika
 EmployeePositions=Pozicije zaposlenika
 EmployeesInThisPosition=Zaposlenici na ovoj poziciji
@@ -72,6 +72,9 @@ AddSkill=Dodajte vještine profilu posla
 RequiredSkills=Potrebne vještine za ovaj profil posla
 UserRank=Rang korisnika
 SkillList=Popis vještina
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Spremi rang
 TypeKnowHow=Znati kako
 TypeHowToBe=Kako biti
@@ -95,3 +98,5 @@ NeedBusinessTravels=Potrebna poslovna putovanja
 NoDescription=bez opisa
 TheJobProfileHasNoSkillsDefinedFixBefore=Procijenjeni profil posla ovog zaposlenika nema definiranu vještinu. Dodajte vještinu(e), zatim izbrišite i ponovno pokrenite evaluaciju.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index a59e2beed10..059db556b0b 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=elektronička pošta
 EMailing=elektronička pošta
-EMailings=elektronička pošta
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=Sva elektronička pošta
+AllEMailings=All mass eMails
 MailCard=Kartica elektroničke pošte
 MailRecipients=Primatelji
 MailRecipient=Primatelj
@@ -26,19 +26,19 @@ MailFile=Priložene datoteke
 MailMessage=Tijelo e-pošte
 SubjectNotIn=Nije u predmetu
 BodyNotIn=Nije u sadržaju poruke
-ShowEMailing=Prikaži slanje e-pošte
-ListOfEMailings=Popis e-mailova
-NewMailing=Novo slanje e-pošte
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=Uredite e-poštu
-ResetMailing=Ponovno pošalji e-poštu
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Izbriši slanje e-pošte
-PreviewMailing=Pregled slanja e-poštom
-CreateMailing=izradi slanje e-pošte
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=Valjano slanje e-pošte
+ValidMailing=Valid mass Email
 MailingStatusDraft=Skica
 MailingStatusValidated=Ovjereno
 MailingStatusSent=Poslano
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Svi se filtri moraju podudarati da bi se prikupio e-po
 LineInFile=Redak %s u datoteci
 RecipientSelectionModules=Definirani zahtjevi za odabir primatelja
 MailSelectedRecipients=Odabrani primatelji
-MailingArea=Područje za slanje e-pošte
-LastMailings=Najnovije %s e-poruke
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Statistika ciljeva
 NbOfCompaniesContacts=Jedinstveni kontakti/adrese
 MailNoChangePossible=Primatelji potvrđene e-pošte ne mogu se mijenjati
-SearchAMailing=Pretraživanje pošte
-SendMailing=Pošalji email
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Poslano od
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Slanje e-pošte može se izvesti iz naredbenog retka. Zamolite svog administratora poslužitelja da pokrene sljedeću naredbu za slanje e-pošte svim primateljima:
 MailingNeedCommand2=Međutim, možete ih poslati online dodavanjem parametra MAILING_LIMIT_SENDBYWEB s vrijednošću maksimalnog broja e-poruka koje želite poslati po sesiji. Za ovo idite na Početna - Postavljanje - Ostalo.
 ConfirmSendingEmailing=Ako želite poslati e-poštu izravno s ovog zaslona, potvrdite da li ste sigurni da želite poslati e-poštu sada iz svog preglednika?
-LimitSendingEmailing=Napomena: Slanje e-pošte s web sučelja obavlja se nekoliko puta zbog sigurnosnih i razloga isteka vremena, <b>%s</b> primatelja odjednom za svaku sesiju slanja.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Očisti listu
 ToClearAllRecipientsClickHere=Kliknite ovdje za brisanje popisa primatelja za ovu e-poruku
 ToAddRecipientsChooseHere=Dodajte primatelje odabirom s popisa
-NbOfEMailingsReceived=Primljene masovne e-poruke
-NbOfEMailingsSend=Poslane su masovne e-poruke
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID zapis
 DeliveryReceipt=Potvrda isporuke.
 YouCanUseCommaSeparatorForSeveralRecipients=Možete upotrijebiti razdjelnik <b>zarez</b> za navođenje nekoliko primatelja.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Za ovu vrstu događaja i tvrtku nisu planirane automat
 ANotificationsWillBeSent=1 automatsku obavijest poslat će e-pošta
 SomeNotificationsWillBeSent=%s automatske obavijesti slat će e-pošta
 AddNewNotification=Pretplatite se na novu automatsku e-pošta obavijest (cilj/događaj)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Konfiguracija slanja e-pošta postavljena je na '%s'. Ovaj način rada ne može se koristiti za slanje masovne e-pošte.
 MailSendSetupIs2=Prvo morate otići, s administratorskim računom, u izbornik %sPočetna - Postavljanje - E-pošta%s da biste promijenili parametar <strong>'%s'</strong> za korištenje načina '%s '. S ovim načinom rada možete ući u postavku SMTP poslužitelja koju pruža vaš davatelj internetskih usluga i koristiti značajku masovnog slanja e-pošte.
 MailSendSetupIs3=Ako imate pitanja o tome kako postaviti svoj SMTP poslužitelj, možete ih pitati %s.
@@ -183,7 +185,7 @@ Information=Podatak
 ContactsWithThirdpartyFilter=Kontakti s filtrom treće strane
 Unanswered=Nije odgovoreno
 Answered=Odgovoreno
-IsNotAnAnswer=Nije odgovor (početni email)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Odgovor je na početni email
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Zadana vrijednost za polje '%s' prilikom stvaranja novog kontakta
@@ -199,6 +201,6 @@ ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 58520f2a381..6c251013fdb 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -37,6 +37,7 @@ Translation=Prijevod
 Translations=Prijevodi
 CurrentTimeZone=Vremenska zona PHP (server)
 EmptySearchString=Unesite kriterije pretraživanja koji nisu prazni
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Unesite kriterij datuma
 NoRecordFound=Spis nije pronađen
 NoRecordDeleted=Spis nije izbrisan
@@ -45,6 +46,7 @@ NoError=Bez greške
 Error=Greška
 Errors=Greške
 ErrorFieldRequired=Potrebno je polje '%s'
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Neispravna vrijednost u polju '%s'
 ErrorFileDoesNotExists=Datoteka %s ne postoji
 ErrorFailedToOpenFile=Otvaranje datoteke %s nije uspjelo
@@ -308,6 +310,7 @@ DateBuild=Datum izrade izvještaja
 DatePayment=Datum plaćanja
 DateApprove=Datum odobrenja
 DateApprove2=Datum odobrenja (drugo odobrenje)
+PendingSince=Pending since
 RegistrationDate=Datum prijave
 UserCreation=Izrada korisnika
 UserModification=Izmjena korisnika
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Za početi
 ActionRunningShort=U postupku
 ActionDoneShort=Završeno
 ActionUncomplete=Nepotpuno
-LatestLinkedEvents=Zadnje %s povezane radnje
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Tvrtka/Organizacija
 Accountant=Računovođa
 ContactsForCompany=Kontakti ove treće osobe
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=Tijelo e-pošte
 SendAcknowledgementByMail=Pošalji e-poštu s potvrdom primitka
 SendMail=Pošalji e-poštu
 Email=E-pošta
+EMail=E-pošta
+EMails=e-pošta
 NoEMail=Nema e-pošte
 AlreadyRead=Već pročitano
 NotRead=Nepročitano
@@ -793,7 +798,7 @@ Notes=Bilješke
 AddNewLine=Dodaj novu stavku
 AddFile=Dodaj datoteku
 FreeZone=Proizvod slobodnog teksta
-FreeLineOfType=Slobodan upis, vrsta:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Kloniraj predmet sa svim glavnim svojstvima
 ReGeneratePDF=Ponovo izradi PDF
 PDFMerge=Spoji PDF
@@ -879,12 +884,14 @@ toward=prema
 Access=Pristup
 SelectAction=Odaberi radnju
 SelectTargetUser=Izaberi ciljanog korisnika/zaposlenika
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Koristi Ctrl+C za kopiranje u međuspremnik
 SaveUploadedFileWithMask=Spremite datoteku na server pod imenom  "<strong>%s</strong>" (u protivnom "%s")
 OriginFileName=Ime izvorne datoteke
 SetDemandReason=Odredi izvor
 SetBankAccount=Postavi bankovni račun
 AccountCurrency=Valuta računa
+AccountancyCode=Računovodstveni kod
 ViewPrivateNote=Vidi bilješke
 XMoreLines=%s stavaka(e) skriveno
 ShowMoreLines=Prikaži više/manje redaka
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Jeste li sigurni da želite izbrisati %s odabrane za
 ConfirmMassClone=Potvrda masovnog kloniranja
 ConfirmMassCloneQuestion=Odaberite projekt u koji želite klonirati
 ConfirmMassCloneToOneProject=Kloniraj u projekt %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Povezani dokumenti
 ClassifyBilled=Razvrstaj naplaćeno
 ClassifyUnbilled=Klasificiraj nenaplaćeno
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Morate biti prijavljeni i potrebna su vam dopuštenja za
 Download=Preuzimanje
 DownloadDocument=Preuzimanje dokumenta
 DownloadSignedDocument=Preuzmite potpisani dokument
-ActualizeCurrency=Upiši novi tečaj
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Fiskalna godina
 ModuleBuilder=Graditelj modula i aplikacija
 SetMultiCurrencyCode=Odredi valutu
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Opsežne radnje
 ClickToShowHelp=Klikni za prikaz pomoći
 WebSite=Mrežna stranica
@@ -1104,6 +1113,7 @@ PayedBy=Platio
 PayedTo=Plaćeno
 Monthly=Mjesečno
 Quarterly=Četvrtgodišnje
+Quarter=Quarter
 Annual=Godišnje
 Local=Lokalno
 Remote=Vanjsko
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Zadatak
 ContactDefault_propal=Ponuda
 ContactDefault_supplier_proposal=Ponuda dobavljača
 ContactDefault_ticket=Tiket
+ContactDefault_societe=Treća osoba
 ContactAddedAutomatically=Kontakt dodan iz uloga kontakta treće strane
 More=Više
 ShowDetails=Prikaži detalje
@@ -1242,6 +1253,7 @@ CommercialAffected=Dodijeljen prodajni predstavnik
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=Poruka
+Emailing=Emailing
 Progression=Napredak
 YourMessage=Tvoja poruka
 YourMessageHasBeenReceived=Vaša poruka je primljena. Odgovorit ćemo Vam ili Vas kontaktirati u najkraćem mogućem roku.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Dodaj
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Od početka
+Transferred=Transferred
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index 2e9e7566d10..5b427b75bf7 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Ako je potrebna pretplata, mora se zabilježiti pretpla
 DeleteType=Obriši
 VoteAllowed=Glasanje dozvoljeno
 Physical=Pojedinac
-Moral=Korporacija
-MorAndPhy=Korporacija i pojedinac
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Ponovno uključi
 ExcludeMember=Isključite člana
 Exclude=Isključiti
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Statistika članova po regiji
 NbOfMembers=Ukupan broj članova
 NbOfActiveMembers=Ukupan broj trenutno aktivnih članova
 NoValidatedMemberYet=Nisu pronađeni valjani članovi
-MembersByCountryDesc=Ovaj zaslon prikazuje statistiku članovi po zemljama. Grafikoni i ovise o dostupnosti Googleove mrežne usluge grafikona kao i o dostupnosti internetske veze koja radi.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Ovaj zaslon prikazuje statistiku članovi po državi/provinciji/kantonu.
 MembersByTownDesc=Ovaj zaslon prikazuje statistiku članovi po gradu.
 MembersByNature=Ovaj zaslon prikazuje statistiku članovi po prirodi.
@@ -208,25 +209,25 @@ NewMemberbyWeb=Novi član je dodan. Čeka odobrenje
 NewMemberForm=Obrazac novog člana
 SubscriptionsStatistics=Statistika doprinosa
 NbOfSubscriptions=Broj doprinosa
-AmountOfSubscriptions=Iznos prikupljen od doprinosa
-TurnoverOrBudget=Promet (za tvrtke) ili proračun (za zaklade) 
-DefaultAmount=Zadani iznos doprinosa (koristi se samo ako na razini vrste član nije definiran iznos)
-MinimumAmount=Minimalni iznos (koristi se samo kada je iznos doprinosa besplatan)
-CanEditAmount=Iznos pretplate može se definirati pomoću član
+AmountOfSubscriptions=Amount collected from membership payments
+TurnoverOrBudget=Promet (za tvrtke) ili proračun (za zaklade)
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=Posjetitelj može odabrati/urediti iznos svog doprinosa bez obzira na vrstu član
 AmountIsLowerToMinimumNotice=Iznos je manji od minimalnog %s
 MEMBER_NEWFORM_PAYONLINE=Nakon online registracije automatski prelazite na stranicu za online plaćanje
 ByProperties=Po karakteristikama
 MembersStatisticsByProperties=Statistika članova po karakteristikama
-VATToUseForSubscriptions=Stopa PDV-a koja se koristi za doprinose
-NoVatOnSubscription=Bez PDV-a za doprinose
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Proizvod koji se koristi za redak doprinosa na fakturi: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=Ime ili tvrtka
 SubscriptionRecorded=Pretplata zabilježena
 NoEmailSentToMember=Članu nije poslana e-pošta
 EmailSentToMember=E-mail poslan članu na %s
-SendReminderForExpiredSubscriptionTitle=Pošalji podsjetnik putem e-pošta za doprinose koji su istekli
-SendReminderForExpiredSubscription=Pošalji podsjetnik do e-pošta na članovi kada doprinos uskoro istekne (parametar je broj dana prije kraja članstva za slanje podsjetnika . To može biti popis dana odvojenih točkom i zarezom, na primjer '10;5;0;-5')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Plaćeno članstvo za tekuće razdoblje (do %s)
 YouMayFindYourInvoiceInThisEmail=Vašu fakturu možete pronaći u prilogu ove e-pošte
 XMembersClosed=%s član(ovi) zatvoreno
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Treća strana je pravna osoba koja će se koristiti
 MemberFirstname=član ime
 MemberLastname=član prezime
 MemberCodeDesc=član Kod, jedinstven za sve članovi
-MemberSubscriptionStartFirstDayOf=Datum početka članstva odgovara prvom danu a
-MemberSubscriptionStartAfter=Minimalno razdoblje prije stupanja na snagu datuma početka pretplate osim obnova (primjer +3m = +3 mjeseca, -5d = -5 dana, +1Y = +1 godina)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 4b55aea0479..a4f58f839ca 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -97,7 +97,6 @@ ShowService=Prikaži uslugu
 ProductsAndServicesArea=Proizvodi i usluge
 ProductsArea=Proizvodi
 ServicesArea=Usluge
-ListOfStockMovements=Popis kretanja zaliha
 BuyingPrice=Nabavna cijena
 PriceForEachProduct=Proizvodi s specifičnom cijenom
 SupplierCard=Kartica dobavljača
@@ -145,6 +144,7 @@ WithoutDiscount=Bez popusta
 VATRateForSupplierProduct=Tax Rate (for this vendor/product)
 DiscountQtyMin=Popust za ovu kolicinu.
 NoPriceDefinedForThisSupplier=Cijena/količina nije određena za ovog dobavljača/proizvod
+NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
 NoSupplierPriceDefinedForThisProduct=Za ovaj proizvod nije određena cijena/količina dobavljača
 PredefinedItem=Unaprijed definirana stavka
 PredefinedProducts=Unaprijed definirani proizvod
@@ -171,7 +171,7 @@ BuyingPrices=Nabavne cijene
 CustomerPrices=Cijene kupaca
 SuppliersPrices=Cijene dobavljača
 SuppliersPricesOfProductsOrServices=Cijene dobavljača (proizvoda ili usluga)
-CustomCode=Carina|Roba|HS šifra
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Zemlja porijekla
 RegionStateOrigin=Regija podrijetla
 StateOrigin=Država|Pokrajina podrijetla
@@ -209,6 +209,7 @@ unitL=Litra
 unitT=tona
 unitKG=kg
 unitG=Gram
+unitGAL=galon
 unitMG=mg
 unitLB=funta
 unitOZ=unca
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Format zahtjeva je {"URL": "http://example.com/
 UpdateInterval=Interval promjene (minute)
 LastUpdated=Zadnje ažuriranje
 CorrectlyUpdated=Ispravno promjenjeno
-PropalMergePdfProductActualFile=Datoteke za dodati u PDF Azur su/je
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=Odaberite PDF datoteke
 IncludingProductWithTag=Uključujući proizvode/usluge s oznaka
 DefaultPriceRealPriceMayDependOnCustomer=Predefinirana cijena, stvarna cijena može ovisiti o kupcu
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=Količina linije preračunata je prema pakiranju do
 
 #Attributes
 Attributes=Atributi
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Atributi varijante
 ProductAttributes=Varijanta atributa za proizvode
 ProductAttributeName=Atribut varijante %s
@@ -395,6 +400,8 @@ ErrorDestinationProductNotFound=Odredišni proizvod nije pronađen
 ErrorProductCombinationNotFound=Varijanta proizvoda nije pronađena
 ActionAvailableOnVariantProductOnly=Akcija dostupna samo na varijanti proizvoda
 ProductsPricePerCustomer=Cijene proizvoda po kupcu
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Dodatni atributi (cijene dobavljača)
 DeleteLinkedProduct=Izbrišite podređeni proizvod povezan s kombinacijom
 AmountUsedToUpdateWAP=Jedinični iznos koji se koristi za ažuriranje ponderirane prosječne cijene
@@ -403,7 +410,8 @@ PMPValueShort=PPC
 mandatoryperiod=Obvezna razdoblja
 mandatoryPeriodNeedTobeSet=Napomena: Razdoblje (datum početka i završetka) mora biti definirano
 mandatoryPeriodNeedTobeSetMsgValidate=Usluga zahtijeva razdoblje početka i završetka
-mandatoryHelper=Provjeri ovo ako želite poruku korisniku prilikom izrade/potvrde fakture, komercijalnog prijedloga, prodajnog naloga bez unosa početka i datum završetka na linijama ove usluge.<br>Imajte na umu da je poruka upozorenje i a ne pogreška blokiranja.
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
+mandatoryHelper2=Note that the message is a warning and not a blocking error.
 DefaultBOM=Zadana BOM
 DefaultBOMDesc=Zadana sastavnica koja se preporučuje za proizvodnju ovog proizvoda. Ovo polje može se postaviti samo ako je priroda proizvoda '%s'.
 Rank=Rang
@@ -435,3 +443,6 @@ AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtu
 ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
 WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned
 PriceLabel=Price label
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/hr_HR/salaries.lang b/htdocs/langs/hr_HR/salaries.lang
index a992480ddaf..3cf3704ec55 100644
--- a/htdocs/langs/hr_HR/salaries.lang
+++ b/htdocs/langs/hr_HR/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Nova plaća
 AddSalary=Dodajte plaću
 NewSalaryPayment=Nova platna kartica
 AddSalaryPayment=Dodajte isplatu plaće
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Isplata plaće
 SalariesPayments=Isplate plaća
 SalariesPaymentsOf=Isplate plaća od %s
@@ -27,7 +29,7 @@ FillFieldFirst=Prvo ispunite polje zaposlenika
 UpdateAmountWithLastSalary=Postavite iznos zadnje plaće
 MakeTransferRequest=Podnesite zahtjev za prijenos
 VirementOrder=Zahtjev za prijenos kredita
-BankTransferAmount=Iznos kreditnog prijenosa
 WithdrawalReceipt=Nalog za prijenos kredita
 OrderWaiting=Narudžba na čekanju
 FillEndOfMonth=Ispunite do kraja mjeseca
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index 685832d0639..85b55dfc854 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Ovdje upotrijebite popis drugih imena/pseudonima kako bi se
 WEBSITE_CSS_URL=URL vanjske CSS datoteke
 WEBSITE_CSS_INLINE=Sadržaj CSS datoteke (zajednički za sve stranice)
 WEBSITE_JS_INLINE=Sadržaj JavaScript datoteke (zajednički za sve stranice)
-WEBSITE_HTML_HEADER=Dodatak na dnu HTML zaglavlja (zajednički za sve stranice)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Datoteka za botove (robots.txt)
 WEBSITE_HTACCESS=.htaccess datoteka za web stranicu
 WEBSITE_MANIFEST_JSON=manifest.json datoteka za web stranicu
@@ -56,16 +56,17 @@ ReadPerm=Čitaj
 WritePerm=Piši
 TestDeployOnWeb=Testirajte / implementirajte na web
 PreviewSiteServedByWebServer=<u>Pregledajte %s u novoj kartici.</u><br><br>%s posluživat će vanjski web poslužitelj (kao što je Apache, Nginx, IIS ). Morate instalirati i postavku ovog poslužitelja prije nego što usmjerite na direktorij:<br><strong>%s</strong><br>URL koji poslužuje vanjski poslužitelj:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL virtualnog hosta kojeg poslužuje vanjski web poslužitelj nije definiran
 NoPageYet=Još nema stranica
 YouCanCreatePageOrImportTemplate=Možete stvoriti novu stranicu ili uvesti cijeli predložak web stranice
 SyntaxHelp=Pomoć za određene savjete za sintaksu
 YouCanEditHtmlSourceckeditor=Izvorni HTML kod možete urediti pomoću gumba "Izvor" u uređivaču.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Za sliku podijeljenu s vezom za dijeljenje (otvoreni pristup pomoću hash ključa za dijeljenje datoteke), sintaksa je:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong> <br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Kloniraj stranicu/spremnik
 CloneSite=Klonirajte mjesto
@@ -87,15 +88,15 @@ WebsiteAccount=Račun web stranice
 WebsiteAccounts=Računi web stranice
 AddWebsiteAccount=izradi račun web stranice
 BackToListForThirdParty=Povratak na popis za treće strane
-DisableSiteFirst=Prvo onemogućite web stranicu
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Naslov moje web stranice
 AnotherContainer=Ovako možete uključiti sadržaj druge stranice/spremnika (ovdje možete imati pogrešku ako omogućite dinamički kod jer ugrađeni potspremnik možda ne postoji)
 SorryWebsiteIsCurrentlyOffLine=Nažalost, ova web stranica trenutno nije na mreži. Molim vas, vratite se kasnije...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Omogućite tablicu za pohranu računa web stranice (login/pass) za svaku web stranicu / treću stranu
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Najprije morate definirati zadanu početnu stranicu
-OnlyEditionOfSourceForGrabbedContentFuture=Upozorenje: Izrada web stranice uvozom vanjske web stranice rezervirana je za iskusne korisnike. Ovisno o složenosti izvorne stranice, rezultat uvoza može se razlikovati od izvornika. Također, ako izvorna stranica koristi uobičajene CSS stilove ili sukobljeni JavaScript, to može pokvariti izgled ili značajke uređivača web-mjesta prilikom rada na ovoj stranici. Ova je metoda brži način za izradi stranicu, ali preporučuje se izradi svoju novu stranicu ispočetka ili s predložene stranice predložak.<br>Također imajte na umu da ugrađeni uređivač možda neće raditi ispravno kada se koristi na preuzetoj vanjskoj stranici.
-OnlyEditionOfSourceForGrabbedContent=Moguće je samo izdanje HTML izvora kada je sadržaj preuzet s vanjske stranice
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Uzmite i slike pronađene u css-u i stranici.
 ImagesShouldBeSavedInto=Slike bi trebale biti spremljene u imenik
 WebsiteRootOfImages=Korijenski direktorij za slike web stranice
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Ukloni filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Categories
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index d6a4b147c97..8563c462ce7 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=A fájlok integritásának ellenőrzése sike
 FileIntegritySomeFilesWereRemovedOrModified=A fájlok integritásának ellenőrzése sikertelen. Néhány fájl módosítottak, eltávolítottak, vagy hozzáadtak.
 GlobalChecksum=Globális ellenőrző összeg
 MakeIntegrityAnalysisFrom=Alkalmazásfájlok integritásának elemzése
-LocalSignature=Beágyazott helyi aláírás (kevésbé megbízható)
-RemoteSignature=Távoli aláírás (megbízhatóbb)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Hiányzó fájlok
 FilesUpdated=Frissített fájlok
 FilesModified=Módosított fájlok
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Csak bizonyos napirend-lehetőségek használják
 Security=Biztonság
 Passwords=Jelszavak
 DoNotStoreClearPassword=Az adatbázisban tárolt jelszavak titkosítása.
-MainDbPasswordFileConfEncrypted=A conf.php fájlban tárolt adatbázis jelszavak titkosítása. Erősen ajánlott ezt a lehetőséget aktiválni.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=A jelszavak titkosításához a <b>conf.php</b>-ben cserélje ki a <br><b>$dolibarr_main_db_pass="...";</b><br>sort erre:<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=A jelszó dekódolása (törlése) az <b> conf.php </b> fájlban: cserélje ki az <br> <b> $dolibarr_main_db_pass = "crypted: ..."; </b> sort <b> $ dolibarr_main_db_pass = "%s"; </b> <br> sorra <br>
 ProtectAndEncryptPdfFiles=A generált PDF fájlok jelszavas védelme. Ez NEM ajánlott, mivel megszakítja a tömeges PDF generálást.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometriai Pont
 ExtrafieldMultiPointGeo=Geometrikus többpontos
 ExtrafieldLinestringGeo=Geometrikus vonalvezetés
 ExtrafieldPolygonGeo=Geometriai sokszög
+ExtrafieldStars=Stars
 ComputedFormula=Számított mező
-ComputedFormulaDesc=Itt megadhat egy képletet az objektum más tulajdonságait vagy bármilyen PHP kódot használva, hogy dinamikus számított értéket kapjon. Bármilyen PHP-kompatibilis képletet használhat, beleértve a "?" feltétel operátor és a következő globális objektum: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>FIGYELEM</strong>: Ha egy objektum tulajdonságaira van szüksége nincs betöltve, csak töltse be az objektumot a képletbe, mint a második példában.<br>A számított mező használata azt jelenti, hogy nem adhat meg magának semmilyen értéket a felületről. Szintaktikai hiba esetén előfordulhat, hogy a képlet nem ad vissza semmit.<br><br>Példa a képletre:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Példa az objektum újratöltésére<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey']j *- $reloadedobj >capital / 5: '-1')<br><br>Egy másik példa az objektum és a szülőobjektum terhelésének kényszerítésére szolgáló képletre: <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = új projekt( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: "A szülőprojekt nem található"
+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'
 Computedpersistent=Számított mező mentése
 ComputedpersistentDesc=A kiszámított extra mezőket az adatbázis tárolja, azonban az érték csak akkor kerül újraszámításra, ha a mező objektuma megváltozik. Ha a kiszámított mező más objektumoktól vagy globális adatoktól függ, akkor ez az érték rossz lehet!
 ExtrafieldParamHelpPassword=Ha ezt a mezőt üresen hagyja, akkor ez az érték titkosítás NÉLKÜL tárolódik (a mező csak csillagokkal van elrejtve a képernyőn).<br><br>Enter érték 'dolcrypt' az érték visszafordítható titkosítási algoritmussal történő kódolásához. A törölt adatok továbbra is ismertek és szerkeszthetők, de titkosítva vannak az adatbázisba.<br><br>Írja be az „auto” (vagy „md5”, 'sha256', 'password_hash', ...) az alapértelmezett jelszótitkosítási algoritmus (vagy md5, sha256, password_hash...) használatához a nem visszafordítható kivonatolt jelszó adatbázisba mentéséhez (nincs mód az eredeti érték visszakeresésére)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- A saját e-mail szolgáltatója SMTP szerverének használata e-mailek küldésére is megfelelő, így az alkalmazásból küldött összes e-mailt a postafiók "Elküldött" könyvtárába is elmentjük.
 WarningPHPMailD=Ezért javasolt az e-mailek küldési módját "SMTP" értékre módosítani.
 WarningPHPMailDbis=Ha valóban meg szeretné tartani az alapértelmezett „PHP” módszert az e-mailek küldésére, hagyja figyelmen kívül ezt a figyelmeztetést, vagy távolítsa el %side kattintva%s.
-WarningPHPMail2=Ha az e-mail SMTP-szolgáltatójának bizonyos IP-címekre kell korlátoznia az e-mail klienst (nagyon ritka), akkor ez az ERP CRM-alkalmazás mail felhasználói ügynökének (MUA) IP-címe: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Számvitel (egyszerűsített)
 Module10Desc=Egyszerű számviteli jelentések (napló, forgalom) adatbázis-tartalom alapján. Nem használ főkönyvi táblát.
 Module20Name=Javaslatok
 Module20Desc=Üzleti ajánlat vezetése
-Module22Name=Tömeges e-mailek
-Module22Desc=Tömeges e-mailek kezelése
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energia
 Module23Desc=Ellenőrzése fogyasztása energiák
 Module25Name=Értékesítési megrendelések
@@ -847,10 +848,10 @@ Permission212=Rendelés vonalak
 Permission213=Aktiválja sorban
 Permission214=Telefon beállítása
 Permission215=Beállítás szolgáltatók
-Permission221=Olvassa emailings
-Permission222=Létrehozza / módosítja emailings (téma, címzettek ...)
-Permission223=Érvényesítése emailings (lehetővé teszi a küldő)
-Permission229=Törlés emailings
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Címzettek és információk megtekintése
 Permission238=Levelek kézi küldése
 Permission239=Levelezés törlése az érvényesítés vagy elküldés után
@@ -1105,6 +1106,7 @@ DictionaryStaff=Alkalmazottak száma
 DictionaryAvailability=Szállítási késedelem
 DictionaryOrderMethods=Rendelési módok
 DictionarySource=Származási javaslatok / megrendelések
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Személyre szabott csoportok jelentésekhez
 DictionaryAccountancysystem=Számlatükör modellek
 DictionaryAccountancyJournal=Számviteli naplók
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Vissza a szótárak listájához
 TypeOfRevenueStamp=Adóbélyegző típusa
 VATManagement=Forgalmi adó menedzsment
 VATIsUsedStandard=A dokumentumok (ajánlatok, számlák, megrendelések...) létrehozásakor az alapértelmezett forgalmi adó mértéke az általános szabályok szerint kerül beállításra (eladó és vevő országtól függően)
-VATIsUsedDesc=Alapértelmezés szerint az ajánlatok, számlák, rendelések stb. létrehozásakor a forgalmi adó kulcsa az aktív általános szabályt követi:<br>Ha az eladó nem tartozik az forgalmi adó hatálya alá, akkor a forgalmi adó alapértelmezés szerint 0 A szabály vége.<br>Ha az (eladó országa = a vevő országa), akkor a forgalmi adó alapértelmezés szerint megegyezik a termék forgalmi adójával az eladó országában. A szabály vége.<br>Ha az eladó és a vevő is az Európai Közösségben tartózkodik, és az áruk szállítással kapcsolatos termékek (fuvarozás, szállítás, légitársaság), az alapértelmezett áfa 0. szabály az eladó országától függ – kérjük, konzultáljon könyvelőjével. Az áfát a vevőnek kell megfizetnie országa vámhivatalának, nem pedig az eladónak. A szabály vége.<br>Ha az eladó és a vevő is az Európai Közösségben tartózkodik, és a vevő nem cég (bejegyzett Közösségen belüli adószámmal), akkor az áfa alapértelmezés szerint az eladó országának áfakulcsa. A szabály vége.<br>Ha az eladó és a vevő is az Európai Közösségben található, és a vevő egy cég (bejegyzett Közösségen belüli adószámmal), akkor az áfa 0 alapértelmezés szerint. A szabály vége.<br>Minden más esetben a javasolt alapértelmezett forgalmi adó=0. A szabály vége.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Alapértelmezés szerint a javasolt forgalmi adó 0, amely olyan esetekben használható, mint egyesületek, magánszemélyek vagy kisvállalatok.
 VATIsUsedExampleFR=Franciaországban olyan vállalatokat vagy szervezeteket jelent, amelyek valódi adórendszerrel (egyszerűsített valós vagy normál reál) rendelkeznek. Olyan rendszer, amelyben az áfát bevallják.
 VATIsNotUsedExampleFR=Franciaországban olyan egyesületeket jelent, amelyek nem forgalmi adót jelentenek be, vagy olyan vállalatokat, szervezeteket vagy szabadfoglalkozásúakat, amelyek a mikrovállalkozási adórendszert (franchise forgalmi adót) választották és franchise forgalmi adót fizettek forgalmi adóbevallás nélkül. Ez a választás a „Nem alkalmazandó forgalmi adó – CGI art-293B” hivatkozást jeleníti meg a számlákon.
-VATType=Adótípus
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=A forgalmi adó típusa
 LTRate=Arány
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Az adóbeállítások szerint (lásd %s - %s - %s) az
 LabelUsedByDefault=Label az alap, ha nincs fordítás megtalálható a kód
 LabelOnDocuments=Címke dokumentumok
 LabelOrTranslationKey=Címke vagy fordítási kulcs
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Fordítás található
 TheTranslationIsSearchedFromKey=A fordítás a következő fordítási kulcsból történik: <b>%s</b>
 TranslationKey=Fordítási kulcs
@@ -1431,7 +1434,7 @@ AddVatInList=Vevő/szállító adószám megjelenítése kombinált listákban.
 AddAdressInList=Jelenítse meg a vevő/szállító címét kombinált listákban.<br>A harmadik felek a következő névformátumban jelennek meg: "The Big Company corp. - 21 jump street 123456 Big town - USA" a "The Big Company corp" helyett.
 AddEmailPhoneTownInContactList=A kapcsolattartó e-mail-címe (vagy telefonszáma, ha nincs megadva) és a város megjelenítése kombinált listákban.<br>A névjegyek a következő névformátumban jelennek meg: "Dupond Durand - dupond.durand@example.com - Paris " vagy "Dupond Durand - 06 07 59 65 66 - Párizs" a "Dupond Durand" helyett.
 AskForPreferredShippingMethod=Kérjen harmadik felek számára preferált szállítási módot.
-FieldEdition=%s mező szerkesztése
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Példa: +2 (csak akkor töltse ki, ha időzóna-eltolási problémákat tapasztal)
 GetBarCode=Szerezzen vonalkódot
 NumberingModules=Számozási modellek
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Kényszer számla keltétől annak érvényességét
 SuggestedPaymentModesIfNotDefinedInInvoice=Alapértelmezés szerint javasolt fizetési mód a számlán, ha nincs megadva a számlán
 SuggestPaymentByRIBOnAccount=Javasoljon számlafelvétellel történő fizetést
 SuggestPaymentByChequeToAddress=Fizetési javaslat csekkel a címre
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Szabad szöveg a számlán
 WatermarkOnDraftInvoices=Vízjel a számlavázlatokon (nincs, ha üres)
 PaymentsNumberingModule=Kifizetések számozási modellje
@@ -1718,6 +1723,7 @@ CompressionOfResources=HTTP válaszok tömörítése
 CompressionOfResourcesDesc=Például az "AddOutputFilterByType DEFLATE" Apache direktíva használatával
 TestNotPossibleWithCurrentBrowsers=Ez az automatikus felismerés a jelenlegi böngészőkkel nem lehetséges
 DefaultValuesDesc=Itt megadhatja az új rekord létrehozásakor használni kívánt alapértelmezett értéket és/vagy az alapértelmezett szűrőket vagy a rendezési sorrendet a rekordok listázásakor.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Alapértelmezett értékek (az űrlapokon használandó)
 DefaultSearchFilters=Alapértelmezett keresési szűrők
 DefaultSortOrder=Alapértelmezett rendezési sorrend
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Küldések számozási modulok
 SendingsAbility=Szállítási lapok támogatása az ügyfelek szállításához
 NoNeedForDeliveryReceipts=A legtöbb esetben a szállítási lapokat a vevői kézbesítéshez (a küldendő termékek listája), valamint a vevő által átvett és aláírt lapként is használják. Ezért a termékszállítási nyugta egy megkettőzött funkció, és ritkán aktiválódik.
 FreeLegalTextOnShippings=Szabad szöveg a szállítmányokon
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Termékek szállítások kézhezvételét számozás modul
 DeliveryOrderModel=Termékek szállítások modell átvételét
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Szabad szöveg szállítási bevételek
 ##### FCKeditor #####
 AdvancedEditor=Speciális szerkesztő
 ActivateFCKeditor=Aktiválja a fejlett szerkesztő:
-FCKeditorForNotePublic=Az elemek "nyilvános megjegyzései" mező WYSIWYG létrehozása/kiadása
-FCKeditorForNotePrivate=WYSIWYG az elemek "privát megjegyzései" mező létrehozása/kiadása
-FCKeditorForCompany=Az elemek mező leírásának WYSIWYG létrehozása/kiadása (kivéve a termékek/szolgáltatások)
-FCKeditorForProductDetails=WYSIWYG termékleírások vagy sorok létrehozása/kiadása objektumokhoz (ajánlatsorok, megrendelések, számlák stb.).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Figyelmeztetés: Ebben az esetben ennek a lehetőségnek a használata komolyan nem ajánlott, mivel problémákat okozhat a speciális karakterekkel és az oldalformázással a PDF-fájlok készítése során.
-FCKeditorForMailing= WYSIWYG létrehozása/kiadása tömeges e-mailekhez (Eszközök->e-mailezés)
-FCKeditorForUserSignature=WYSIWYG felhasználói aláírás létrehozása/kiadása
-FCKeditorForMail=WYSIWYG létrehozása/kiadása minden levélhez (kivéve az Eszközök->e-mailezés)
-FCKeditorForTicket=WYSIWYG létrehozása/kiadása jegyekhez
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Raktári modul beállítása
 IfYouUsePointOfSaleCheckModule=Ha az alapértelmezésben biztosított értékesítési pont modult (POS) vagy egy külső modult használja, előfordulhat, hogy ezt a beállítást figyelmen kívül hagyja a POS-modul. A legtöbb POS-modult alapértelmezés szerint úgy tervezték, hogy azonnal számlát készítsen, és csökkentse a készletet, függetlenül az itt található lehetőségektől. Tehát, ha szüksége van vagy sem készletcsökkenésre, amikor értékesítést regisztrál a POS-ból, ellenőrizze a POS-modul beállításait is.
@@ -1867,7 +1874,6 @@ Buy=Megvesz
 Sell=Eladás
 InvoiceDateUsed=Számla dátuma használt
 YourCompanyDoesNotUseVAT=Az Ön cége úgy lett meghatározva, hogy nem használ áfát (Beállítás - Vállalat/Szervezet), ezért nincs áfa-beállítási lehetőség.
-AccountancyCode=Számviteli kód
 AccountancyCodeSell=Eladás számviteli kódja
 AccountancyCodeBuy=Vétel számviteli kódja
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=A „Befizetés automatikus létrehozása” jelölőnégyzet alapértelmezés szerint maradjon üresen új adó létrehozásakor
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Melyik nézetet szeretné alapértelmezés szerint megnyit
 AGENDA_EVENT_PAST_COLOR = Múltbeli esemény színe
 AGENDA_EVENT_CURRENT_COLOR = Aktuális esemény színe
 AGENDA_EVENT_FUTURE_COLOR = Jövőbeli esemény színe
-AGENDA_REMINDER_BROWSER = Eseményemlékeztető engedélyezése <b>a felhasználó böngészőjében</b> (Az emlékeztető dátumának elérésekor a böngésző felugró ablakot jelenít meg. Minden felhasználó letilthatja az ilyen értesítéseket a böngésző értesítési beállításaiból).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Hangjelzés engedélyezése
-AGENDA_REMINDER_EMAIL = Eseményemlékeztető engedélyezése <b>e-mailben</b> (emlékeztető opció/késleltetés minden eseménynél megadható).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Megjegyzés: Az ütemezett feladat %s gyakoriságának elegendőnek kell lennie ahhoz, hogy az emlékeztető a megfelelő pillanatban kerüljön elküldésre.
 AGENDA_SHOW_LINKED_OBJECT = A csatolt objektum megjelenítése a napirend nézetben
 AGENDA_USE_EVENT_TYPE = Eseménytípusok használata (a Beállítás menüben -> Szótárak -> A napirendi események típusai)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Automatikusan állítsa be ezt az alapértelmezett értéket az eseménytípushoz az esemény létrehozási űrlapon
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Kulcs az exportálási link engedélyezéséhez
 PastDelayVCalExport=Ne exportáljon régebbi eseményt mint
 SecurityKey = Biztonsági kulcs
@@ -2006,7 +2017,7 @@ BackupZipWizard=Varázsló a dokumentumok könyvtárának archívumának létreh
 SomethingMakeInstallFromWebNotPossible=A külső modul telepítése nem lehetséges a webes felületről a következő ok miatt:
 SomethingMakeInstallFromWebNotPossible2=Ebből az okból kifolyólag az itt leírt frissítési folyamat egy manuális folyamat, amelyet csak kiváltságos felhasználók hajthatnak végre.
 InstallModuleFromWebHasBeenDisabledContactUs=Külső modulok vagy dinamikus webhelyek telepítése vagy fejlesztése az alkalmazásból jelenleg biztonsági okokból zárolva van. Kérjük, lépjen kapcsolatba velünk, ha engedélyeznie kell ezt a funkciót.
-InstallModuleFromWebHasBeenDisabledByFile=A rendszergazda letiltotta a külső modul alkalmazásból történő telepítését. A funkció engedélyezéséhez meg kell kérnie őt, hogy távolítsa el a(z) <strong>%s</strong> fájlt.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Külső modul alkalmazásból történő telepítéséhez vagy létrehozásához a modul fájljait a <strong>%s</strong> könyvtárba kell menteni. Ahhoz, hogy ezt a könyvtárat a Dolibarr feldolgozza, be kell állítania a <strong>conf/conf.php</strong> fájlt a 2 direktívasor hozzáadásához:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong>< br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=A táblázat vonalainak kiemelése, amikor az egérmozdulat áthalad
 HighlightLinesColor=A vonal színének kiemelése, amikor az egér áthalad (ha nem kiemeli, használja az 'ffffff'-t)
@@ -2036,6 +2047,7 @@ Enter0or1=Írjon be 0 vagy 1 értéket
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Írja be ide a kapcsos zárójelek közé, a pénznem szimbólumát jelentő bájtszámok listáját. Például: $ esetén írja be: [36] - brazil real R$ [82,36] - € esetén írja be a [8364]
 ColorFormat=Az RGB szín HEX formátumú, pl.: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Az ikon neve formátumban:<br> - image.png egy képfájlhoz az aktuális témakönyvtárba<br> - image.png@module ha a fájl egy modul /img/ könyvtárában van<br>- fa-xxx egy FontAwesome fa-xxx képhez<br>- fontawesome_xxx_fa_color_size egy FontAwesome fa-xxx képhez (előtaggal, szín- és méretkészlettel)
 PositionIntoComboList=A sor pozíciója a kombinált listákban
 SellTaxRate=Forgalmi adó mértéke
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Szegélyek elrejtése a küldő címkeretén
 MAIN_PDF_NO_RECIPENT_FRAME=Szegélyek elrejtése a címzett címkeretén
 MAIN_PDF_HIDE_CUSTOMER_CODE=Ügyfélkód elrejtése
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=A feladó/cégnév elrejtése a címblokkban
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Fizetési feltételek elrejtése
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Fizetési mód elrejtése
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Adjon hozzá egy rejtett jelölést az aláírási területhez, hogy az elektronikus aláírási eszköz újra felhasználhassa azt. Külső eszközökkel vagy a jövőben az online aláírás funkcióval is használható.
@@ -2324,6 +2341,8 @@ NotRecommended=Nem ajánlott
 ARestrictedPath=Néhány korlátozott elérési út az adatfájlokhoz
 CheckForModuleUpdate=Külső modulok frissítéseinek ellenőrzése
 CheckForModuleUpdateHelp=Ez a művelet csatlakozik a külső modulok szerkesztőihez, hogy ellenőrizze, elérhető-e új verzió.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Frissítés elérhető
 NoExternalModuleWithUpdate=Nem találhatók frissítések a külső modulokhoz
 SwaggerDescriptionFile=Swagger API leíró fájl (például redoc-hoz)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Szállítási cím megjelenítése
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Egyes országokban kötelező feltüntetni (Franciaország, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=A közösségi hálózat URL-címe. Használja az {socialid} változót a közösségi hálózat azonosítóját tartalmazó változó részhez.
 IfThisCategoryIsChildOfAnother=Ha ez a kategória egy másik gyermeke
 DarkThemeMode=Sötét téma mód
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Figyelmeztetés: a %s modul oly
 WarningModuleHasChangedSecurityCsrfParameter=Figyelmeztetés: a %s modul letiltotta a példány CSRF-biztonságát. Ez a művelet gyanús, és előfordulhat, hogy a telepítés már nem lesz biztonságos. Magyarázatért forduljon a modul szerzőjéhez.
 EMailsInGoingDesc=A bejövő e-maileket a %s modul kezeli. Engedélyeznie és konfigurálnia kell, ha támogatnia kell a bejövő e-maileket.
 MAIN_IMAP_USE_PHPIMAP=Használja a PHP-IMAP könyvtárat az IMAP-hez a natív PHP IMAP helyett. Ez lehetővé teszi az OAuth2 kapcsolat használatát is az IMAP-hoz (az OAuth modult is aktiválni kell).
-MAIN_CHECKBOX_LEFT_COLUMN=A mező- és sorkiválasztás oszlopának megjelenítése a bal oldalon (alapértelmezés szerint a jobb oldalon)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Alapértelmezés szerint nincs létrehozva. Csak a modul aktiválásakor jött létre.
 CSSPage=CSS stílus
 Defaultfortype=Alaptértelmezett
@@ -2489,7 +2510,7 @@ AiDescription=MI (Mesterséges Intelligencia) funkciók
 AiDescriptionLong=AI (mesterséges intelligencia) funkciókat biztosít az alkalmazás különböző részein. Külső AI API szükséges.
 AI_API_KEY=Kulcs az AI API-hoz
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Az AI-funkciókhoz használható szolgáltatás
+AI_API_SERVICE=AI service to use
 AiSetup=AI modul beállítása
 AiCustomPrompt=AI egyéni prompt
 AI_CONFIGURATIONS_PROMPT=Egyéni felszólítás
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI egyéni kérések a funkciókhoz
 EnterAnIP=Adjon meg egy IP-címet
 ConvertInto=Átalakításra
 YouAreHere=Ön itt van
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Mutassa meg a vonalkódot a szállítási PDF dokumentumon
 BARCODE_ON_RECEPTION_PDF=Mutassa meg a vonalkódot a fogadás PDF-dokumentumán
 BARCODE_ON_STOCKTRANSFER_PDF=Mutassa meg a vonalkódot az állománytranszfer PDF dokumentumon
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang
index e59e786d4af..c57974266db 100644
--- a/htdocs/langs/hu_HU/banks.lang
+++ b/htdocs/langs/hu_HU/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Végső egyeleg
 CurrentBalance=Aktuális egyenleg
 FutureBalance=Jövőbeni egyenleg
 ShowAllTimeBalance=Mutasd az egyenleget a legelejétől
-AllTime=Elejétől
 Reconciliation=Egyeztetés
 RIB=Bankszámla száma
 IBAN=IBAN szám
@@ -133,7 +132,7 @@ DeleteTransaction=Bejegyzés törlése
 ConfirmDeleteTransaction=Biztosan törölni szeretné ezt a bejegyzést?
 ThisWillAlsoDeleteBankRecord=Ez a generált banki bejegyzést is törli
 BankMovements=Pénzmozgások
-PlannedTransactions=Tervezett bejegyzések
+PlannedTransactions=Upcoming entries
 Graph=Grafikonok
 ExportDataset_banque_1=Banki bejegyzések és számlakivonat
 ExportDataset_banque_2=Letéti irat
@@ -151,7 +150,7 @@ FutureTransaction=Jövőbeli tranzakció. Képtelen megbékíteni.
 SelectChequeTransactionAndGenerate=Válassza ki/szűrje ki azokat a csekkeket, amelyeket a csekkbefizetési bizonylatnak tartalmaznia kell. Ezután kattintson a "Létrehozás" gombra.
 SelectPaymentTransactionAndGenerate=Válassza ki/szűrje ki a %s letéti bizonylaton feltüntetendő dokumentumokat. Ezután kattintson a "Létrehozás" gombra.
 InputReceiptNumber=Válassza ki az egyeztetéshez kapcsolódó bankszámlakivonatot. Használjon rendezhető számértéket
-InputReceiptNumberBis=ÉÉÉÉHH vagy ÉÉÉÉHHNN
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Békíteni?
 ThenCheckLinesAndConciliate=Ezután, ellenőrizze a bank kivinathoz tartozó tételsorokat és kattintson
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Ha ez a funkció engedélyezve van, kiválaszthat egy a
 BankColorizeMovementName1=A terhelési mozgás háttérszíne
 BankColorizeMovementName2=Háttérszín a hitelmozgáshoz
 IfYouDontReconcileDisableProperty=Ha egyes bankszámlákon nem hajt végre banki egyeztetést, tiltsa le azokon a "%s" tulajdonságot a figyelmeztetés eltávolításához.
-NoBankAccountDefined=Nincs bankszámla megadva
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Nem található rekord a bankszámlán. Ez általában akkor fordul elő, ha egy rekordot manuálisan töröltek a bankszámlán lévő tranzakciók listájáról (például a bankszámla egyeztetése során). Egy másik ok, hogy a fizetést a „%s” modul letiltásakor rögzítették.
 AlreadyOneBankAccount=Már egy bankszámla meghatározva
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA fájlváltozat
diff --git a/htdocs/langs/hu_HU/blockedlog.lang b/htdocs/langs/hu_HU/blockedlog.lang
index 8789a7ae3fd..371b1caec95 100644
--- a/htdocs/langs/hu_HU/blockedlog.lang
+++ b/htdocs/langs/hu_HU/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Nem módosítható naplók
 ShowAllFingerPrintsMightBeTooLong=Az összes archivált napló megjelenítése (lehet, hogy hosszú)
 ShowAllFingerPrintsErrorsMightBeTooLong=Az összes nem érvényes archívumnapló megjelenítése (lehet, hogy hosszú)
 DownloadBlockChain=Ujjlenyomatok letöltése
-KoCheckFingerprintValidity=Az archivált naplóbejegyzés érvénytelen. Ez azt jelenti, hogy valaki (hacker?) módosította ennek a rekordnak néhány adatát a rögzítés után, vagy törölte az előző archivált rekordot (ellenőrizze, hogy létezik-e a korábbi # sor), vagy módosította az előző rekord ellenőrző összegét.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Az archivált naplóbejegyzés érvényes. Ezen a sorban az adatok nem módosultak, a bejegyzés az előzőt követi.
 OkCheckFingerprintValidityButChainIsKo=Az archivált napló érvényesnek tűnik az előzőhöz képest, de a lánc korábban megsérült.
 AddedByAuthority=Távoli jogosultságban tárolva
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Napló részletei
 ListOfTrackedEvents=A nyomon követett események listája
 Fingerprint=Ujjlenyomat
 DownloadLogCSV=Archivált naplók exportálása (CSV)
-DataOfArchivedEvent=Az archivált esemény teljes adata
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Az eredeti objektum (típus: %s, azonosító: %s) nincs összekapcsolva (lásd a 'Teljes adat' oszlopot a megváltoztathatatlan mentett adatok megtekintéséhez)
 BlockedLogAreRequiredByYourCountryLegislation=Módosíthatatlan naplók modult az Ön országának jogszabályai írhatnak elő. Ennek a modulnak a letiltása a jövőbeni tranzakciókat érvénytelenné teheti a jogszabályok és a legális szoftverek használata szempontjából, mivel azokat adóellenőrzéssel nem lehet érvényesíteni.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=A megváltoztathatatlan naplók modult az Ön országának jogszabályai miatt aktiváltuk. Ennek a modulnak a letiltása a jövőbeni tranzakciókat érvénytelenné teheti a jogszabályok és a legális szoftverek használata szempontjából, mivel azokat adóellenőrzéssel nem lehet érvényesíteni.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Az események megváltoztathatatlan naplókba történő nyomo
 BlockedLogDisabled=Az események megváltoztathatatlan naplókba történő nyomon követésére szolgáló rendszer le van tiltva néhány rögzítés után. Elmentettünk egy speciális ujjlenyomatot, amellyel nyomon követhetjük, hogy a lánc megszakadt-e
 BlockedLogDisabledBis=Az események megváltoztathatatlan naplókba történő nyomon követésére szolgáló rendszer le van tiltva. Ez azért lehetséges, mert még nem készült felvétel.
 LinkHasBeenDisabledForPerformancePurpose=A teljesítmény érdekében a dokumentumra mutató közvetlen hivatkozás nem jelenik meg a 100. sor után.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Az ügyfél számla logikailag törölve
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Ügyfél fizetési logikai törlése
 logPAYMENT_VARIOUS_CREATE=Fizetés (nem számlához rendelve) létrehozva
 logPAYMENT_VARIOUS_DELETE=Fizetés (nem számlához rendelve) logikai törlése
 logPAYMENT_VARIOUS_MODIFY=Fizetés (nem számlához rendelve) módosítva
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/hu_HU/categories.lang b/htdocs/langs/hu_HU/categories.lang
index 942a3d00709..5fff5e1fd47 100644
--- a/htdocs/langs/hu_HU/categories.lang
+++ b/htdocs/langs/hu_HU/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Kapcsolati címkék/kategóriák terület
 AccountsCategoriesArea=Bankszámla címkék/kategóriák terület
 ProjectsCategoriesArea=Projekt címkék/kategóriák terület
 UsersCategoriesArea=Felhasználói címkék/kategóriák terület
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Alkategóriák
 CatList=Címkék/kategóriák listája
 CatListAll=Címkék/kategóriák listája (minden típus)
@@ -90,9 +91,10 @@ CategoriesSetup=Címkék/kategóriák beállítása
 CategorieRecursiv=Automatikus kapcsolat a szülő címkével/kategóriával
 CategorieRecursivHelp=Ha az opció be van kapcsolva, amikor objektumot ad hozzá egy alkategóriához, az objektum a szülőkategóriákba is bekerül.
 AddProductServiceIntoCategory=Rendeljen kategóriát a termékhez/szolgáltatáshoz
-AddCustomerIntoCategory=Kategória hozzárendelése az ügyfélhez
-AddSupplierIntoCategory=Kategória hozzárendelése a szállítóhoz
-AssignCategoryTo=Kategória hozzárendelése ehhez
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Címke/kategória megjelenítése
 ByDefaultInList=Alapértelmezés szerint a listában
 ChooseCategory=Válasszon kategóriát
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Oldal-tároló kategóriák
 KnowledgemanagementsCategoriesArea=KM cikk kategóriák
 UseOrOperatorForCategories=Használja az „OR” operátort a kategóriákhoz
 AddObjectIntoCategory=Hozzárendelés a kategóriához
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index 23b7f9db5d6..bed2b403c8b 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -65,6 +65,7 @@ State=Állam / Tartomány / Vármegye
 StateId=Állami azonosító
 StateCode=Állam/Tartomány/Vármegye kódja
 StateShort=Állam/Megye
+DepartmentBuyer=Buyer's state/province
 Region=Régió
 Region-State=Vármegye - Állam
 Country=Ország
@@ -78,7 +79,7 @@ Chat=Chat
 PhonePro=Üzleti telefon
 PhonePerso=Szem. telefon
 PhoneMobile=Mobil
-No_Email=Tömeges e-mailek visszautasítása
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=Irányítószám
 Town=Város
@@ -382,12 +383,12 @@ ExportCardToFormat=Kártya exportálása formázással
 ContactNotLinkedToCompany=Kapcsolat nincs partnerhez csatolva
 DolibarrLogin=Dolibarr bejelentkezés
 NoDolibarrAccess=Nem Dolibarr hozzáférés
-ExportDataset_company_1=Harmadik felek (cégek/alapítványok/fizikai személyek) és tulajdonságaik
-ExportDataset_company_2=Kapcsolattartók és tulajdonságaik
-ExportDataset_company_3=Harmadik fél bankszámlái
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Harmadik féltől származó további kapcsolatok/címek és attribútumok
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Harmadik felek és tulajdonságaik
 ImportDataset_company_2=Harmadik féltől származó további kapcsolatok/címek és attribútumok
-ImportDataset_company_3=Harmadik fél bankszámlái
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Harmadik felek értékesítési képviselői (értékesítési képviselők/felhasználók hozzárendelése a vállalatokhoz)
 PriceLevel=Árszint
 PriceLevelLabels=Árszint címkék
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Ingyenes kód ellenőrzés nélkül.
 ManagingDirectors=Vezető(k) neve (ügyvezető, elnök, igazgató)
 MergeOriginThirdparty=Megkettőzött partner (a partner, amelyet törölni szeretne)
 MergeThirdparties=Partnerek egyesítése
-ConfirmMergeThirdparties=Biztosan egyesíteni szeretné a kiválasztott harmadik felet a jelenlegivel? Minden kapcsolt objektum (számlák, rendelések, ...) átkerül az aktuális harmadik félhez, majd a kiválasztott harmadik fél törlődik.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Harmadik felek egyesítése megtörtént
 SaleRepresentativeLogin=Kereskedelmi képviselő bejelentkezés
 SaleRepresentativeFirstname=Az értékesítési képviselő keresztneve
@@ -461,3 +462,6 @@ ExternalSystemID=Külső rendszerazonosító
 IDOfPaymentInAnExternalSystem=A fizetési mód azonosítója külső rendszerbe (pl. Stripe, Paypal stb.)
 AADEWebserviceCredentials=AADE Webszolgáltatás hitelesítő adatok
 ThirdPartyMustBeACustomerToCreateBANOnStripe=A harmadik félnek vevő-nak kell lennie, hogy lehetővé tegye banki információinak létrehozását a Stripe oldalon
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index e7be90787cb..f7e4cc5e199 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Vásárlói számla kifizetése
 PaymentSupplierInvoice=szállítói számla kifizetése
 PaymentSocialContribution=Szociális/fiskális adófizetés
 PaymentVat=ÁFA fizetés
-AutomaticCreationPayment=A fizetés automatikus rögzítése
+AutomaticCreationPayment=Also record the payment
 ListPayment=Kifizetések listája
 ListOfCustomerPayments=Az ügyfél fizetéseinek listája
 ListOfSupplierPayments=Szállítói fizetések listája
@@ -118,10 +118,14 @@ SocialContributionsPayments=Szociális/fiskális adók befizetései
 ShowVatPayment=ÁFA befizetés megjelenítése
 TotalToPay=Összesen fizetendő
 BalanceVisibilityDependsOnSortAndFilters=Az egyenleg csak akkor látható ebben a listában, ha a táblázat %s szerint van rendezve, és 1 bankszámlára van szűrve (más szűrő nélkül)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Ügyfél könyvelési kódja
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Szállító könyvelési kódja
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Ügyfélszámla kód
 SupplierAccountancyCodeShort=Szállítói számlakód
+UserAccountancyCodeShort=User account. code
 AccountNumber=Számlaszám
 NewAccountingAccount=Új fiók
 Turnover=Kiszámlázott forgalom
@@ -129,7 +133,9 @@ TurnoverCollected=Beszedett forgalom
 SalesTurnoverMinimum=Minimális forgalom
 ByExpenseIncome=Kiadások és bevételek szerint
 ByThirdParties=Harmadik féltől
+ByProjects=By projects
 ByUserAuthorOfInvoice=Számla szerzője szerint
+DetailedListLowercase=detailed list
 CheckReceipt=Letéti irat
 CheckReceiptShort=Letéti irat
 LastCheckReceiptShort=Legutóbbi %s befizetési szelvény
diff --git a/htdocs/langs/hu_HU/datapolicy.lang b/htdocs/langs/hu_HU/datapolicy.lang
index be7ee7f47cb..643a621af74 100644
--- a/htdocs/langs/hu_HU/datapolicy.lang
+++ b/htdocs/langs/hu_HU/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Adatvédelmi szabályzat
 Module4100Desc = Adatvédelmi modul (a GDPR-nak megfelelő)
 # Administration page
 datapolicySetup = A modul adatvédelmi szabályzatának beállítása
-Deletion = Adatok törlése
-datapolicySetupPage = Az Ön országának jogszabályaitól függően (példa: <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">, a GDPR 5. cikke</a>) a személyes adatokat meghatározott ideig meg kell őrizni. nem haladja meg azt az időtartamot, ameddig az adatokra szükség van arra a célra, amelyre azokat gyűjtötték, kivéve archiválási célokat.<br>A törlés egy bizonyos időtartam után automatikusan megtörténik, események nélkül (az időtartam amelyet alább jelezni fog).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s hónap
 ONE_YEAR = 1 év
 NB_YEARS = %s év
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = jelentkező/vevő
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Sem jelentkező/Sem vevő
 DATAPOLICY_CONTACT_FOURNISSEUR = Beszállító
 DATAPOLICY_ADHERENT = Tag
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Küldhet GDPR e-mailt minden érintett kapcsolattartójának (akik még nem kaptak e-mailt, és akikhez még nem regisztrált semmit a GDPR-megállapodásukkal kapcsolatban). Ehhez használja a következő gombot.
 SendAgreement = Emaileket küld
 AllAgreementSend = Minden e-mailt elküldtünk
 TXTLINKDATAPOLICYACCEPT = Szöveg a linkhez "megállapodás"
 TXTLINKDATAPOLICYREFUSE = Szöveg a "nézeteltérés" linkhez
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: Személyes adatok feldolgozása
 DATAPOLICY_consentement = A személyes adatok feldolgozásához kapott hozzájárulás
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 7f7dfb045a3..663401d93ae 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Hiba történt a képfájlok (adatként
 ErrorFailedToCreateDir=Nem sikerült létrehozni egy könyvtárat. Ellenőrizze, hogy a webszerver-felhasználó jogosult-e írni a Dolibarr dokumentumok könyvtárába. Ha a <b>safe_mode</b> paraméter engedélyezve van ezen a PHP-n, ellenőrizze, hogy a Dolibarr php fájlok a webszerver felhasználójához (vagy csoportjához) tartoznak-e.
 ErrorNoMailDefinedForThisUser=Nincs levél definiálva ehhez a felhasználóhoz
 ErrorSetupOfEmailsNotComplete=Az e-mailek beállítása nem fejeződött be
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Ennek a funkciónak a működéséhez aktiválni kell a JavaScriptet. Módosítsa ezt a beállítás - kijelzőben.
 ErrorTopMenuMustHaveAParentWithId0=A „Felső” típusú menünek nem lehet szülőmenüje. Írjon 0-t a szülőmenübe, vagy válasszon egy „Bal” típusú menüt.
 ErrorLeftMenuMustHaveAParentId=A 'Bal' típusú menünek szülőazonosítóval kell rendelkeznie.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=A feltöltést egy PHP/Apache bővítmény blokkolta.
 ErrorFileSizeTooLarge=A fájl mérete túl nagy.
 ErrorFieldTooLong=A %s mező túl hosszú.
 ErrorSizeTooLongForIntType=A méret túl hosszú az int típushoz (maximum %s számjegy)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=A méret túl hosszú a karakterlánc típusához (maximum %s karakter)
 ErrorNoValueForSelectType=Kérjük, töltse ki a kiválasztási lista értékét
 ErrorNoValueForCheckBoxType=Kérjük, töltse ki a jelölőnégyzetek listáját
@@ -138,8 +140,9 @@ ErrorBadValueForCode=A biztonsági kód hibás értéke. Próbálja újra új é
 ErrorBothFieldCantBeNegative=A %s és a %s mező nem lehet negatív
 ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in third-party card) and apply it to the invoice.
 ErrorLinesCantBeNegativeForOneVATRate=A sorok összessége (adó nélkül) nem lehet negatív egy adott nem null áfakulcs esetén (Negatív összeget találtunk a(z) <b>%s</b>%% áfakulcshoz.
-ErrorLinesCantBeNegativeOnDeposits=A sorok nem lehetnek negatívak a betétben. Problémákkal kell szembenéznie, amikor a végszámlán szereplő letétet fel kell használnia.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=A vevői számlák sorának mennyisége nem lehet negatív
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=A webszerver végrehajtásához használt <b>%s</b> felhasználói fióknak nincs engedélye ehhez
 ErrorNoActivatedBarcode=Nincs aktivált vonalkód típus
 ErrUnzipFails=Nem sikerült kicsomagolni %s a ZipArchive segítségével
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Túl sok sort kell feldolgozni. Kérjük, használjon szelektívebb szűrőt.
 ErrorEmptyValueForQty=A mennyiség nem lehet nulla.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=A PHP paraméter upload_max_filesize (%s) magasabb, mint a PHP post_max_size (%s) paramétere. Ez nem következetes beállítás.
 WarningPasswordSetWithNoAccount=Jelszó lett beállítva ehhez a taghoz. Felhasználói fiók azonban nem jött létre. Tehát ez a jelszó tárolva van, de nem használható a Dolibarr-ba való bejelentkezéshez. Külső modul/interfész használhatja, de ha nem kell bejelentkezési nevet vagy jelszót megadnia egy taghoz, akkor letilthatja a "Bejelentkezés kezelése minden taghoz" opciót a Tagmodul beállításainál. Ha kezelnie kell a bejelentkezést, de nincs szüksége jelszóra, a figyelmeztetés elkerülése érdekében hagyja üresen ezt a mezőt. Megjegyzés: Az e-mail bejelentkezésként is használható, ha a tag egy felhasználóhoz kapcsolódik.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=Ez a szülőazonosító már nem létezik
 WarningReadBankAlsoAllowedIfUserHasPermission=Figyelem, a bankszámla leolvasása is megengedett a számlatükör kezelésének engedéllyel
 WarningNoDataTransferedInAccountancyYet=Felhívjuk figyelmét, hogy a számviteli táblában nincsenek adatok. Kérjük, hogy az alkalmazásban rögzített adatait helyezze át a számviteli részlegbe, vagy változtassa meg a számítási módot a könyvelésen kívül rögzített adatok elemzéséhez.
 WarningChangingThisMayBreakStopTaskScheduler=Figyelem, ennek az értéknek a megváltoztatása letilthatja az ütemezőt
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = A SwissQR számla csak átutalással fizetendő számlákhoz adható hozzá.
 SwissQrCreditorAddressInvalid = A hitelező címe érvénytelen (be van állítva a ZIP és a város? (%s)
 SwissQrCreditorInformationInvalid = A hitelezői adatok érvénytelenek az IBAN-ban (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=A %s már meg van határozva kapcsol
 ErrorThisGroupIsAlreadyDefinedAsThisType=Az ehhez a csoporthoz tartozó kapcsolatok már meg vannak határozva ehhez a típushoz.
 EmptyMessageNotAllowedError=Üres üzenet nem megengedett
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/hu_HU/exports.lang b/htdocs/langs/hu_HU/exports.lang
index 50724b231a6..769647ff2d8 100644
--- a/htdocs/langs/hu_HU/exports.lang
+++ b/htdocs/langs/hu_HU/exports.lang
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Ellenőrizze, hogy a fájl fájlformátuma (mező- és k
 RunSimulateImportFile=Importálási szimuláció futtatása
 FieldNeedSource=Ebbe a mezőbe adatok szükségesek a forrásfájlból
 SomeMandatoryFieldHaveNoSource=Néhány kötelező mezőnek nincs adatfájlból származó forrása
-InformationOnSourceFile=Információ a forrásfájlról
-InformationOnTargetTables=A célmezőkre vonatkozó információk
+InformationOnSourceFile=Forrás fájl
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Váltson legalább egy forrásmezőt az exportálandó mezők oszlopában
 SelectFormat=Válassza ki ezt az import fájlformátumot
 RunImportFile=Adatok importálása
diff --git a/htdocs/langs/hu_HU/hrm.lang b/htdocs/langs/hu_HU/hrm.lang
index d96b74c5bb6..dba47a8e450 100644
--- a/htdocs/langs/hu_HU/hrm.lang
+++ b/htdocs/langs/hu_HU/hrm.lang
@@ -46,11 +46,11 @@ NewEval=Új kompetencia felmérés
 ValidateEvaluation=A kompetenciamérés érvényesítése
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Kompetencia felmérés
-RequiredRank=Az állásprofilhoz szükséges rang
-RequiredRankShort=Kötelező rang
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Pozíciók ezzel a munkaprofillal
-EmployeeRank=Alkalmazotti rang ehhez a képességhez
-EmployeeRankShort=Alkalmazotti rang
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Alkalmazotti pozíció
 EmployeePositions=Alkalmazotti pozíciók
 EmployeesInThisPosition=Alkalmazottak ebben a pozícióban
@@ -72,6 +72,9 @@ AddSkill=Adjon hozzá készségeket az állásprofilhoz
 RequiredSkills=Ehhez a munkakörhöz szükséges készségek
 UserRank=Felhasználói rang
 SkillList=Képességlista
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Rang mentése
 TypeKnowHow=Tudják, hogyan
 TypeHowToBe=Hogyan legyünk
@@ -95,3 +98,5 @@ NeedBusinessTravels=Üzleti utakra van szükség
 NoDescription=Nincs leírás
 TheJobProfileHasNoSkillsDefinedFixBefore=Ennek a munkavállalónak a kiértékelt munkaköri profilja nem tartalmaz készségeket. Adjon hozzá készsége(ke)t, majd törölje és indítsa újra a kiértékelést.
 PDFStandardHrmEvaluation=Szabványsablon PDF-dokumentum létrehozásához kompetenciaméréshez
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
index 74c6e16c6ea..12536a2afcc 100644
--- a/htdocs/langs/hu_HU/mails.lang
+++ b/htdocs/langs/hu_HU/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Levelezés
 EMailing=E-mailezés
-EMailings=E-mailek
+EMailings=Mass EMails
 SMSings=SMS-ek
-AllEMailings=Minden e-mail
+AllEMailings=All mass eMails
 MailCard=E-mail kártya
 MailRecipients=Címzettek
 MailRecipient=Címzett
@@ -26,19 +26,19 @@ MailFile=Csatolt fájlok
 MailMessage=E-mail törzse
 SubjectNotIn=Nincs a tárgyban
 BodyNotIn=Nincs a testben
-ShowEMailing=E-mailek megjelenítése
-ListOfEMailings=E-mailek listája
-NewMailing=Új e-mail
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Új sms
-EditMailing=E-mail szerkesztése
-ResetMailing=E-mail újraküldése
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=E-mailezés törlése
-PreviewMailing=E-mailezés előnézete
-CreateMailing=E-mail létrehozása
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Teszt
-ValidMailing=Érvényes e-mail
+ValidMailing=Valid mass Email
 MailingStatusDraft=Piszkozat
 MailingStatusValidated=Érvényesített
 MailingStatusSent=Elküldve
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Minden szűrőnek egyeznie kell ahhoz, hogy e-mailt gy
 LineInFile=%s sor a fájlban
 RecipientSelectionModules=Meghatározott kérések a címzett kiválasztásához
 MailSelectedRecipients=Kiválasztott címzettek
-MailingArea=Levelezési terület
-LastMailings=A legújabb %s e-mail
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Cél statisztikák
 NbOfCompaniesContacts=Egyedi névjegyek/címek
 MailNoChangePossible=Az ellenőrzött e-mail címzettjei nem módosíthatók
-SearchAMailing=Levelezés keresése
-SendMailing=E-mail küldése
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Küldő
 AdvancedAlternative=Speciális alternatíva
 MailingNeedCommand=E-mail küldése parancssorból is végrehajtható. Kérje meg a kiszolgáló rendszergazdáját, hogy indítsa el a következő parancsot, hogy az e-mailt minden címzettnek elküldje:
 MailingNeedCommand2=Elküldheti azonban online, ha hozzáadja a MAILING_LIMIT_SENDBYWEB paramétert a munkamenetenként elküldeni kívánt e-mailek maximális számával. Ehhez lépjen a Kezdőlap - Beállítás - Egyéb menüpontra.
 ConfirmSendingEmailing=Ha közvetlenül erről a képernyőről szeretne e-mailt küldeni, kérjük, erősítse meg, hogy biztosan szeretne e-mailt küldeni most a böngészőből?
-LimitSendingEmailing=Megjegyzés: Az e-mailek webes felületről történő küldése biztonsági és időtúllépési okokból több alkalommal történik, <b>%s</b> címzett egyszerre minden küldési munkamenethez.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Lista törlése
 ToClearAllRecipientsClickHere=Kattintson ide az e-mail címzettlistájának törléséhez
 ToAddRecipientsChooseHere=Címzettek hozzáadása a listák közül való kiválasztásával
-NbOfEMailingsReceived=Tömeges e-mailek érkeztek
-NbOfEMailingsSend=Tömeges e-mailek elküldve
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=Azonosító rekord
 DeliveryReceipt=Szállítási visszaigazolás.
 YouCanUseCommaSeparatorForSeveralRecipients=A <b>vessző</b> elválasztó használatával több címzett is megadható.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Nem tervezünk automatikus e-mail értesítést ehhez
 ANotificationsWillBeSent=1 automatikus értesítést küldünk e-mailben
 SomeNotificationsWillBeSent=%s automatikus értesítést küld e-mailben
 AddNewNotification=Feliratkozás egy új automatikus e-mail értesítésre (cél/esemény)
-ListOfActiveNotifications=Aktív előfizetések (célok/események) az automatikus e-mail értesítéshez
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatikus e-mail értesítések elküldve
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Az e-mail küldés beállítása '%s'. Ez a mód nem használható tömeges e-mailek küldésére.
 MailSendSetupIs2=Először adminisztrátori fiókkal be kell lépnie a %sHome - Beállítás - E-mailek%s menübe, hogy módosítsa a <strong>'%s'</strong> paramétert a '%s' mód használatához. Ezzel a móddal beléphet az internetszolgáltató által biztosított SMTP-kiszolgáló beállításába, és használhatja a tömeges e-mail funkciót.
 MailSendSetupIs3=Ha bármilyen kérdése van az SMTP-szerver beállításával kapcsolatban, felteheti %s-nak.
@@ -183,7 +185,7 @@ Information=Információ
 ContactsWithThirdpartyFilter=Névjegyek harmadik féltől származó szűrővel
 Unanswered=Nem válaszolt
 Answered=Válaszolt
-IsNotAnAnswer=Nem válaszol (kezdeti e-mail)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Válasz egy kezdeti e-mailre
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=A '%s' mező alapértelmezett értéke új névjegy létrehozásakor
@@ -199,6 +201,6 @@ ModelTemplate=E-mail sablon
 YouCanChooseAModelForYouMailContent= Kiválaszthat egyet a sablonmodellek közül, vagy létrehozhat egyet mesterséges intelligencia segítségével
 TitleOfMailHolder=Az e-mail címe ide kerül
 ContentOfMailHolder=Az e-mail tartalma ide kerül...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 9a1d44cbf6b..4589dbfaaf7 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -37,6 +37,7 @@ Translation=Fordítás
 Translations=Fordítások
 CurrentTimeZone=TimeZone PHP (szerver)
 EmptySearchString=Adjon meg nem üres keresési feltételeket
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Adja meg a dátum kritériumát
 NoRecordFound=Rekord nem található
 NoRecordDeleted=Nincs rekord törölve
@@ -45,6 +46,7 @@ NoError=Nincs hiba
 Error=Hiba
 Errors=Hibák
 ErrorFieldRequired='%s' mező szükséges
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat='%s' mezőnek rossz az értéke
 ErrorFileDoesNotExists=%s fájl nem létezik
 ErrorFailedToOpenFile=Nem sikerült a %s fájlt megnyitni
@@ -308,6 +310,7 @@ DateBuild=Jelentés készítés dátuma
 DatePayment=Fizetés időpontja
 DateApprove=Jóváhagyás dátuma
 DateApprove2=Jóváhagyás dátuma (megerősítés)
+PendingSince=Pending since
 RegistrationDate=Regisztráció dátuma
 UserCreation=Felhasználó létrehozása
 UserModification=Felhasználó módosítása
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Nincs elkezdve
 ActionRunningShort=Folyamatban
 ActionDoneShort=Befejezett
 ActionUncomplete=Befejezetlen
-LatestLinkedEvents=A legutóbbi %s kapcsolt események
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Vállalat/Szervezet
 Accountant=Könyvelő
 ContactsForCompany=Kapcsolat/cím ehhez a harmadik félhez
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=Email tartalma
 SendAcknowledgementByMail=Megerősítő email küldése
 SendMail=E-mail küldése
 Email=E-mail
+EMail=E-mail
+EMails=e-mailek
 NoEMail=Nincs email
 AlreadyRead=Már olvastam
 NotRead=Olvasatlan
@@ -793,7 +798,7 @@ Notes=Megjegyzés
 AddNewLine=Új sor hozzáadása
 AddFile=Fájl hozzáadása
 FreeZone=Szabad szövegű termék
-FreeLineOfType=Szabad szövegű elem, típus:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Objektum klónozása a főbb jellemzőivel
 ReGeneratePDF=PDF újragenerálása
 PDFMerge=PDF összeolvasztás
@@ -879,12 +884,14 @@ toward=felé
 Access=Hozzáférés
 SelectAction=Válasszon tevékenységet
 SelectTargetUser=Cél felhasználó/alkalmazott kiválasztása
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Használja a Ctrl+C kombinációt a vágólapra másoláshoz
 SaveUploadedFileWithMask=Fájl mentése a szerveren "<strong>%s</strong>" néven (egyébként "%s")
 OriginFileName=Eredeti fájlnév
 SetDemandReason=Forrás beállítása
 SetBankAccount=Bankszámla megadása
 AccountCurrency=Számla pénzneme
+AccountancyCode=Számviteli kód
 ViewPrivateNote=Megjegyzések
 XMoreLines=%s sor rejtve maradt
 ShowMoreLines=Több/kevesebb sor megjelenítése
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Biztosan törölni szeretné a %s kiválasztott reko
 ConfirmMassClone=Tömeges klónozás megerősítése
 ConfirmMassCloneQuestion=Válassza ki a klónozni kívánt projektet
 ConfirmMassCloneToOneProject=Klónozás a %s projekthez
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Kapcsolódó objektumok
 ClassifyBilled=Számlázott osztályozás
 ClassifyUnbilled=Számlázatlan besorolás
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Be kell jelentkeznie, és engedélyekre van szüksége a
 Download=Letöltés
 DownloadDocument=Dokumentum letöltése
 DownloadSignedDocument=Töltse le az aláírt dokumentumot
-ActualizeCurrency=Árfolyam frissítése
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Pénzügyi év
 ModuleBuilder=Modul- és alkalmazáskészítő
 SetMultiCurrencyCode=Pénznem beállítása
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Tömeges műveletek
 ClickToShowHelp=Kattintson az eszköztipp súgójának megjelenítéséhez
 WebSite=Webhely
@@ -1104,6 +1113,7 @@ PayedBy=Fizetett
 PayedTo=Kifizetett
 Monthly=Havi
 Quarterly=Negyedévente
+Quarter=Quarter
 Annual=Éves
 Local=Helyi
 Remote=Távoli
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Feladat
 ContactDefault_propal=Ajánlat
 ContactDefault_supplier_proposal=Szállítói ajánlat
 ContactDefault_ticket=Jegy
+ContactDefault_societe=Harmadik fél
 ContactAddedAutomatically=Partner hozzáadva harmadik fél kapcsolattartói szerepköreiből
 More=Több
 ShowDetails=Részletek megjelenítése
@@ -1242,6 +1253,7 @@ CommercialAffected=Értékesítési képviselő kijelölve
 CommercialsDisaffected=Az értékesítési képviselők nem kapcsolódnak
 CommercialDisaffected=Az értékesítési képviselő leválasztva
 Message=Üzenet
+Emailing=Emailing
 Progression=Előrehaladás
 YourMessage=Az üzeneted
 YourMessageHasBeenReceived=Üzenete megérkezett. A lehető leghamarabb válaszolunk vagy felvesszük Önnel a kapcsolatot.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Az AnyTranslationKey kulcs fordítása
 SignedStatus=Aláírt állapot
 NbRecordQualified=A minősített rekordok száma
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Hozzáadás
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Elejétől
+Transferred=Transferred
diff --git a/htdocs/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang
index 818be908138..eb79ec77f01 100644
--- a/htdocs/langs/hu_HU/members.lang
+++ b/htdocs/langs/hu_HU/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Ha a feliratkozás megadása kötelező, akkor a felira
 DeleteType=Törlés
 VoteAllowed=Szavazás engedélyezett
 Physical=Egyéni
-Moral=Vállalat
-MorAndPhy=Vállalati és magánszemély
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Engedélyezze újra
 ExcludeMember=Tag kizárása
 Exclude=Kizárás
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Tagstatisztikák régiónként
 NbOfMembers=A tagok teljes száma
 NbOfActiveMembers=A jelenlegi aktív tagok teljes száma
 NoValidatedMemberYet=Nem található érvényesített tag
-MembersByCountryDesc=Ez a képernyő a tagok statisztikáit mutatja országok szerint. A grafikonok és diagramok a Google online grafikonszolgáltatásának elérhetőségétől, valamint a működő internetkapcsolat elérhetőségétől függenek.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Ez a képernyő a tagok statisztikáit mutatja állam/tartomány/kanton szerint.
 MembersByTownDesc=Ez a képernyő a tagok statisztikáit mutatja városonként.
 MembersByNature=Ez a képernyő a tagok természet szerinti statisztikáit jeleníti meg.
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index 62ae07c2d39..07f2283d969 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -97,7 +97,6 @@ ShowService=Szolgáltatás megjelenítése
 ProductsAndServicesArea=Termékek és szolgáltatások területe
 ProductsArea=Termék területe
 ServicesArea=Szolgáltatások területe
-ListOfStockMovements=Készletmozgások listája
 BuyingPrice=Beszerzési ár
 PriceForEachProduct=Termékek egyedi áron
 SupplierCard=Beszállítói kártya
@@ -172,7 +171,7 @@ BuyingPrices=Vételi árak
 CustomerPrices=Ügyfél árak
 SuppliersPrices=Beszállítói árak
 SuppliersPricesOfProductsOrServices=Beszállítói árak (termékek vagy szolgáltatások)
-CustomCode=Vám | Áru | HS kód
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Származási ország
 RegionStateOrigin=Származási régió
 StateOrigin=Állam | Származási tartomány
@@ -210,6 +209,7 @@ unitL=Liter
 unitT=tonna
 unitKG=kg
 unitG=gramm
+unitGAL=gallon
 unitMG=mg
 unitLB=font
 unitOZ=uncia
@@ -312,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=A kérelem formátuma: {"URL": "http://example.
 UpdateInterval=Frissítési időköz (perc)
 LastUpdated=Utolsó frissítés
 CorrectlyUpdated=Helyesen frissítve
-PropalMergePdfProductActualFile=A PDF Azur fájlokat a következő fájlokkal lehet hozzáadni a PDF Azurhoz
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=PDF-fájlok kiválasztása
 IncludingProductWithTag=Beleértve a címkével ellátott termékeket/szolgáltatásokat
 DefaultPriceRealPriceMayDependOnCustomer=Alapértelmezett ár, a tényleges ár az ügyféltől függhet
@@ -349,6 +349,10 @@ QtyRecalculatedWithPackaging=A sor mennyiségét a szállítói csomagolásnak m
 
 #Attributes
 Attributes=Attribútumok
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Változat attribútumai
 ProductAttributes=Termékváltozatok attribútumai
 ProductAttributeName=Változat attribútum %s
@@ -396,6 +400,8 @@ ErrorDestinationProductNotFound=A céltermék nem található
 ErrorProductCombinationNotFound=A termékváltozat nem található
 ActionAvailableOnVariantProductOnly=A művelet csak a termék változatnál érhető el
 ProductsPricePerCustomer=Termékárak vásárlónként
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=További attribútumok (szállítói árak)
 DeleteLinkedProduct=A kombinációhoz kapcsolódó gyermektermék törlése
 AmountUsedToUpdateWAP=A súlyozott átlagár frissítéséhez használandó egységösszeg
@@ -437,3 +443,6 @@ AllowStockMovementVariantParentHelp=Alapértelmezés szerint egy változat szül
 ConfirmSetToDraftInventory=Biztosan vissza akar térni a Piszkozat állapothoz?<br>A készletben jelenleg beállított mennyiségek visszaállnak.
 WarningLineProductNotToSell=A "%s" termék vagy szolgáltatás nem értékesíthető, és klónozták
 PriceLabel=Ár címke
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/hu_HU/salaries.lang b/htdocs/langs/hu_HU/salaries.lang
index ef6f2daf99a..9d62e5451d9 100644
--- a/htdocs/langs/hu_HU/salaries.lang
+++ b/htdocs/langs/hu_HU/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Új fizetés
 AddSalary=Bér hozzáadása
 NewSalaryPayment=Új bérkártya
 AddSalaryPayment=Bérfizetés hozzáadása
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Bérfizetés
 SalariesPayments=Bérek kifizetése
 SalariesPaymentsOf=%s fizetések
@@ -27,7 +29,7 @@ FillFieldFirst=Először töltse ki az alkalmazott mezőt
 UpdateAmountWithLastSalary=Állítsa be az utolsó fizetés összegét
 MakeTransferRequest=Indítsa el az átviteli kérelmet
 VirementOrder=Hitelátutalási kérelem
-BankTransferAmount=Az átutalás összege
 WithdrawalReceipt=Átutalási megbízás
 OrderWaiting=Függőben megrendelés
 FillEndOfMonth=Töltse ki a hónap végével
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index 83f4dc5cb55..5879791437c 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Használja itt a többi név/álnevek listáját, hogy az o
 WEBSITE_CSS_URL=A külső CSS-fájl URL-je
 WEBSITE_CSS_INLINE=CSS-fájltartalom (minden oldalon közös)
 WEBSITE_JS_INLINE=JavaScript fájl tartalma (minden oldalon közös)
-WEBSITE_HTML_HEADER=Kiegészítés a HTML-fejléc alján (minden oldalon közös)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot fájl (robots.txt)
 WEBSITE_HTACCESS=Webhely .htaccess fájl
 WEBSITE_MANIFEST_JSON=Webhely manifest.json fájl
@@ -56,16 +56,17 @@ ReadPerm=Olvasás
 WritePerm=Írás
 TestDeployOnWeb=Tesztelés/telepítés a weben
 PreviewSiteServedByWebServer=<u>A %s előnézete egy új lapon.</u><br><br>A %s egy külső webszerver (például Apache, Nginx, IIS) fogja kiszolgálni. Telepítenie és be kell állítania ezt a szervert, mielőtt a következő könyvtárra mutatna:<br><strong>%s</strong><br>A külső szerver által kiszolgált URL:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>A %s előnézete egy új lapon.</u><br><br>A %s-t a Dolibarr szerver fogja kiszolgálni, így nincs szüksége további webszerverre (például Apache, Nginx, IIS) telepíteni kell.<br>Az a kellemetlen, hogy az oldalak URL-címei nem felhasználóbarátok, és a Dolibarr elérési útjával kezdődnek.<br>A Dolibarr által kiszolgált URL:<br><strong>%s</strong><br> <br>Ha saját külső webszerverét szeretné használni a webhely kiszolgálására, hozzon létre egy virtuális gazdagépet a webszerverén, amely a<br><strong>%s</strong><br> könyvtárra mutat, majd adja meg a virtuális nevét, szervert a webhely tulajdonságaiban, és kattintson a „Tesztelés/telepítés a weben” hivatkozásra.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=A külső webszerver által kiszolgált virtuális gazdagép URL-je nincs megadva
 NoPageYet=Még nincsenek oldalak
 YouCanCreatePageOrImportTemplate=Létrehozhat egy új oldalt vagy importálhat egy teljes webhelysablont
 SyntaxHelp=Súgó adott szintaktikai tippekhez
 YouCanEditHtmlSourceckeditor=A HTML forráskódot a szerkesztő "Forrás" gombjával szerkesztheti.
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Megosztási hivatkozással megosztott kép esetén (nyílt hozzáférés a fájl megosztási hash kulcsával) a szintaxis:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt ;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Oldal/tároló klónozása
 CloneSite=Webhely klónozása
@@ -87,15 +88,15 @@ WebsiteAccount=Webhelyfiók
 WebsiteAccounts=Webhelyfiókok
 AddWebsiteAccount=Webhelyfiók létrehozása
 BackToListForThirdParty=Vissza a listához a harmadik felek számára
-DisableSiteFirst=Először tiltsa le a webhelyet
+DisableSiteFirst=Put website offline first
 MyContainerTitle=A webhelyem címe
 AnotherContainer=Így lehet belefoglalni egy másik oldal/tároló tartalmát (itt hiba léphet fel, ha engedélyezi a dinamikus kódot, mert előfordulhat, hogy a beágyazott altároló nem létezik)
 SorryWebsiteIsCurrentlyOffLine=Sajnos ez a webhely jelenleg nem elérhető. Kérjük, gyere vissza később...
-WEBSITE_USE_WEBSITE_ACCOUNTS=A webhely fióktáblázatának engedélyezése
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Engedélyezze a táblázatban a webhelyfiókok (bejelentkezési/belépési) tárolását minden egyes webhelyhez/harmadik félhez
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Először meg kell határoznia az alapértelmezett kezdőlapot
-OnlyEditionOfSourceForGrabbedContentFuture=Figyelmeztetés: Weboldal létrehozása külső weboldal importálásával csak tapasztalt felhasználók számára van fenntartva. A forrásoldal összetettségétől függően az importálás eredménye eltérhet az eredetitől. Ha a forrásoldal gyakori CSS-stílusokat vagy ütköző JavaScript-kódot használ, az megzavarhatja a Webhely-szerkesztő megjelenését vagy szolgáltatásait, amikor ezen az oldalon dolgozik. Ezzel a módszerrel gyorsabban hozhat létre oldalt, de ajánlatos az új oldalt a semmiből vagy egy javasolt oldalsablonból létrehozni.<br>Ne feledje, hogy előfordulhat, hogy a szövegközi szerkesztő nem működik helyes, ha egy megragadott külső oldalon használják.
-OnlyEditionOfSourceForGrabbedContent=Csak a HTML-forrás kiadása lehetséges, ha a tartalmat egy külső webhelyről szerezték be
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=A css-ben és az oldalon talált képeket is megragadja.
 ImagesShouldBeSavedInto=A képeket a könyvtárba kell menteni
 WebsiteRootOfImages=A webhely képeinek gyökérkönyvtára
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Jelentkezzen ki vevő fiókjából
 filteredByVersion=Verzió szerint szűrve
 removeFilter=Szűrő eltávolítása
 viewMyCart=Tekintse meg bevásárlókosaram
+Shipping=Shipping
 freeShipping=Ingyenes szállítás!
 noProducts=Nincsenek termékek
 nbrItemsInCart=<span class="ajax_cart_quantity">0</span> termék található a kosarában.
@@ -284,12 +286,13 @@ productNameAToZ=Termék neve: A-tól Z-ig
 productNameZToA=Termék neve: Z-től A-ig
 referenceLowestFirst=Hivatkozás: A legalacsonyabb először
 referenceHighestFirst=Hivatkozás: A legmagasabb először
+productPerPage=products per page
 perPage=oldalanként
 showAll=Mutasd az összeset
 showing= Megjelenítés
 nbrOfProducts= Vannak %s termékek.
 noResultsHaveBeenFound=0 eredményt találtunk.
-noResultsWereFound= Nincs találat.
+noResultsWereFound=Nincs találat.
 addToCart=Kosárba
 backHome=Hazatérni
 priceDrop=Árcsökkenés
@@ -302,10 +305,11 @@ lastUpdate=Utolsó frissítés
 contactSupport=Hogyan lehet kapcsolatba lépni az ügyfélszolgálattal
 noProductToDisplay=Hiba, nincs megjeleníthető termék
 yourCompanyInformation=A céged adatai
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=Ez az e-mail cím már regisztrálva van.
 firstnameContainsLettersOnly=<b>Keresztnév</b> csak betűket és szóközöket tartalmazhat
 lastnameContainsLettersOnly=<b>Vezetéknév</b> csak betűket és szóközöket tartalmazhat
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=Hiba történt.
 accountCreation=Hozzon létre egy fiókot
 errorsOccurred=%s hiba%s
@@ -357,3 +361,7 @@ subtract=Kivonás
 LoginCheckout=Bejelentkezés és továbblépés a fizetéshez
 paymentSuccessProcessed=Befizetését sikeresen feldolgoztuk.
 youWillBeRedirectedToOrderPage=Hamarosan átirányítjuk a megrendelés részletes oldalra.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 2149edf88e9..028322386e4 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Pemeriksaan integritas berkas telah lolos per
 FileIntegritySomeFilesWereRemovedOrModified=Pemeriksaan integritas berkas gagal. Beberapa file dimodifikasi, dihapus atau ditambahkan.
 GlobalChecksum=Pemeriksaan menyeluruh
 MakeIntegrityAnalysisFrom=Buat analisa integritas berkas aplikasi dari
-LocalSignature=Tanda lokal yang ditanamkan (kurang dapat begitu diandalkan)
-RemoteSignature=Tanda dengan jarak jauh secara remote (lebih dapat diandalkan)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Berkas Hilang
 FilesUpdated=Berkas yang telah Diperbarui
 FilesModified=Berkas yang telah Dimodifikasi
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Digunakan oleh beberapa opsi agenda saja
 Security=Keamanan
 Passwords=Kata Sandi
 DoNotStoreClearPassword=Enkripsi kata sandi yang disimpan dalam database.
-MainDbPasswordFileConfEncrypted=Enkripsi kata sandi basis data yang tersimpan di conf.php. Sangat disarankan untuk mengaktifkan opsi ini.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=Agar kata sandi disandikan ke file<b>conf.php </b>, ganti baris <br><b>$ dolibarr_main_db_pass = "...";</b><br> oleh <br><b>$ dolibarr_main_db_pass = "crypted: %s"; </b>
 InstrucToClearPass=Untuk mendapatkan kata sandi yang diterjemahkan (jelas) ke file<b>conf.php </b>, ganti baris <br><b>$ dolibarr_main_db_pass = "crypted: ...";</b><br> oleh <br><b>$ dolibarr_main_db_pass = "%s"; </b>
 ProtectAndEncryptPdfFiles=Lindungi file PDF yang dihasilkan. Ini TIDAK dianjurkan karena merusak generasi PDF massal.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Titik Geometris
 ExtrafieldMultiPointGeo=Multi Titik Geometris
 ExtrafieldLinestringGeo=Tali Garis Geometris
 ExtrafieldPolygonGeo=Poligon Geometris
+ExtrafieldStars=Stars
 ComputedFormula=Baris yang dihitung
-ComputedFormulaDesc=Anda dapat memasukkan rumus di sini menggunakan properti objek lain atau pengkodean PHP apa pun untuk mendapatkan nilai komputasi dinamis. Anda dapat menggunakan rumus apa pun yang kompatibel dengan PHP termasuk "?" operator kondisi, dan objek global berikut: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>PERINGATAN</strong>: Jika Anda memerlukan properti suatu objek tidak dimuat, cukup ambil sendiri objek tersebut ke dalam rumus seperti pada contoh kedua.<br>Menggunakan kolom terhitung berarti Anda tidak dapat memasukkan sendiri nilai apa pun dari antarmuka. Selain itu, jika ada kesalahan sintaksis, rumusnya mungkin tidak menghasilkan apa pun.<br><br>Contoh rumus:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Contoh untuk memuat ulang objek<br>(($reloadedobj = Masyarakat baru($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj- >capital / 5: '-1')<br><br>Contoh rumus lain untuk memaksa beban suatu benda dan benda induknya: <br>(($reloadedobj = Tugas baru($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = Proyek baru( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Proyek induk tidak ditemukan'
+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'
 Computedpersistent=Simpan baris yang dihitung
 ComputedpersistentDesc=Baris ekstra yang dikomputasi akan disimpan dalam basisdata, namun nilainya hanya akan dikalkulasi ulang ketika objek baris ini diubah. Jika baris yang dihitung bergantung pada objek lain atau data global, nilai ini mungkin salah!!
 ExtrafieldParamHelpPassword=Membiarkan bidang ini kosong berarti nilai ini akan disimpan TANPA enkripsi (bidang hanya disembunyikan dengan bintang di layar).<br><br>Enter nilai 'dolcrypt' untuk mengkodekan nilai dengan algoritma enkripsi yang dapat dibalik. Data yang jelas masih dapat diketahui dan diedit tetapi dienkripsi ke dalam database.<br><br>Masukkan 'auto' (atau 'md5', 'sha256', 'password_hash', ...) untuk menggunakan algoritma enkripsi kata sandi default (atau md5, sha256, password_hash...) untuk menyimpan kata sandi hash yang tidak dapat dibalik ke dalam database (tidak ada cara untuk mengambil nilai asli)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Menggunakan server SMTP milik Penyedia Layanan Email Anda sendiri untuk mengirim email juga menarik sehingga semua email yang dikirim dari aplikasi juga akan disimpan ke direktori "Terkirim" di kotak surat Anda.
 WarningPHPMailD=Oleh karena itu disarankan untuk mengubah metode pengiriman email ke nilai "SMTP".
 WarningPHPMailDbis=Jika Anda benar-benar ingin tetap menggunakan metode "PHP" default untuk mengirim email, abaikan saja peringatan ini, atau hapus dengan %smengklik di sini%s.
-WarningPHPMail2=Jika penyedia SMTP email Anda perlu membatasi klien email ke beberapa alamat IP (sangat jarang), ini adalah alamat IP dari agen pengguna email (MUA) untuk aplikasi ERP CRM Anda:<strong>%s </strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Akuntansi (disederhanakan)
 Module10Desc=Laporan akuntansi sederhana (jurnal, omset) berdasarkan konten basis data. Tidak menggunakan tabel buku besar.
 Module20Name=Proposal
 Module20Desc=Manajemen proposal komersial
-Module22Name=Email Massal
-Module22Desc=Kelola email massal
+Module22Name=Email Masal
+Module22Desc=Kelola email masal/sekaligus
 Module23Name=Energi
 Module23Desc=Memantau konsumsi energi
 Module25Name=Pesanan Penjualan
@@ -847,10 +848,10 @@ Permission212=Memesan garis
 Permission213=Aktifkan jalur
 Permission214=Atur Telephony
 Permission215=Penyedia pengaturan
-Permission221=Baca email
-Permission222=Buat / ubah email (topik, penerima ...)
-Permission223=Validasi email (memungkinkan pengiriman)
-Permission229=Hapus email
+Permission221=Baca email masal
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Hapus email masal
 Permission237=Lihat penerima dan info
 Permission238=Kirim surat secara manual
 Permission239=Hapus surat setelah validasi atau dikirim
@@ -1105,6 +1106,7 @@ DictionaryStaff=Jumlah Karyawan
 DictionaryAvailability=Keterlambatan pengiriman
 DictionaryOrderMethods=Metode pemesanan
 DictionarySource=Asal usul / pesanan
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Grup yang dipersonalisasi untuk laporan
 DictionaryAccountancysystem=Model bagan akun
 DictionaryAccountancyJournal=Jurnal akuntansi
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Kembali ke daftar Kamus
 TypeOfRevenueStamp=Jenis cap pajak
 VATManagement=Manajemen Pajak Penjualan
 VATIsUsedStandard=Saat membuat dokumen (proposal, faktur, pesanan...), tarif Pajak Penjualan default diatur sesuai dengan aturan standar (tergantung pada negara penjual dan pembeli)
-VATIsUsedDesc=Secara default, saat membuat proposal, faktur, pesanan, dll. tarif Pajak Penjualan mengikuti aturan standar yang aktif:<br>Jika penjual tidak dikenakan pajak Penjualan, maka pajak Penjualan ditetapkan secara default ke 0 . Akhir aturan.<br>Jika (negara penjual = negara pembeli), maka Pajak penjualan secara default sama dengan pajak Penjualan produk di negara penjual. Akhir dari aturan.<br>Jika penjual dan pembeli keduanya berada di Komunitas Eropa dan barangnya merupakan produk terkait transportasi (pengangkutan, pengiriman, maskapai penerbangan), PPN defaultnya adalah 0. Ini aturannya bergantung pada negara penjual - silakan berkonsultasi dengan akuntan Anda. PPN harus dibayar oleh pembeli ke kantor bea cukai di negaranya dan bukan kepada penjual. Akhir aturan.<br>Jika penjual dan pembeli keduanya berada di Komunitas Eropa dan pembeli bukan perusahaan (dengan nomor PPN intra-Komunitas yang terdaftar), maka PPN ditetapkan secara default menjadi tarif PPN negara penjual. Akhir aturan.<br>Jika penjual dan pembeli keduanya berada di Komunitas Eropa dan pembelinya adalah perusahaan (dengan nomor PPN intra-Komunitas yang terdaftar), maka PPNnya adalah 0 secara default. Akhir aturan.<br>Dalam kasus lain, default yang diusulkan adalah Pajak penjualan=0. Akhir pemerintahan.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Secara default pajak Penjualan yang diusulkan adalah 0 yang dapat digunakan untuk kasus-kasus seperti asosiasi, perorangan atau perusahaan kecil.
 VATIsUsedExampleFR=Di Perancis, itu berarti perusahaan atau organisasi yang memiliki sistem fiskal nyata (real nyata atau normal nyata). Sebuah sistem di mana PPN diumumkan.
 VATIsNotUsedExampleFR=Di Prancis, ini berarti asosiasi yang tidak menyatakan pajak Penjualan atau perusahaan, organisasi atau profesi liberal yang telah memilih sistem fiskal perusahaan mikro (Pajak penjualan dalam waralaba) dan membayar pajak Penjualan waralaba tanpa deklarasi pajak Penjualan. Pilihan ini akan menampilkan referensi "Pajak Penjualan tidak berlaku - art-293B dari CGI" pada faktur.
-VATType=Jenis pajak
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Jenis pajak penjualan
 LTRate=Menilai
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Menurut pengaturan pajak (Lihat %s - %s - %s), negara
 LabelUsedByDefault=Label digunakan secara default jika tidak ada terjemahan yang ditemukan untuk kode
 LabelOnDocuments=Beri label pada dokumen
 LabelOrTranslationKey=Label atau kunci terjemahan
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Terjemahan ditemukan
 TheTranslationIsSearchedFromKey=Terjemahan dicari dari kunci terjemahan: <b>%s</b>
 TranslationKey=Kunci terjemahan
@@ -1431,7 +1434,7 @@ AddVatInList=Tampilkan nomor PPN Pelanggan/Vendor ke dalam daftar kombo.
 AddAdressInList=Tampilkan alamat Pelanggan/Vendor ke dalam daftar kombo.<br>Pihak ketiga akan muncul dengan format nama "The Big Company corp. - 21 jump street 123456 Big town - USA" dan bukan " Perusahaan Perusahaan Besar".
 AddEmailPhoneTownInContactList=Tampilkan email Kontak (atau telepon jika tidak ditentukan) dan masukkan ke dalam daftar kombo.<br>Kontak akan muncul dengan format nama "Dupond Durand - dupond.durand@example.com - Paris " atau "Dupond Durand - 06 07 59 65 66 - Paris" bukannya "Dupond Durand".
 AskForPreferredShippingMethod=Mintalah metode pengiriman pilihan untuk Pihak Ketiga.
-FieldEdition=Edisi baris %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Contoh: +2 (isi hanya jika masalah offset zona waktu dialami)
 GetBarCode=Dapatkan barcode
 NumberingModules=Model penomoran
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Paksa tanggal faktur ke tanggal validasi
 SuggestedPaymentModesIfNotDefinedInInvoice=Mode pembayaran yang disarankan pada faktur secara default jika tidak ditentukan pada faktur
 SuggestPaymentByRIBOnAccount=Sarankan pembayaran dengan penarikan di akun
 SuggestPaymentByChequeToAddress=Sarankan pembayaran dengan cek ke
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Teks gratis di faktur
 WatermarkOnDraftInvoices=Tanda air pada faktur konsep (tidak ada jika kosong)
 PaymentsNumberingModule=Model penomoran pembayaran
@@ -1718,6 +1723,7 @@ CompressionOfResources=Kompresi tanggapan HTTP
 CompressionOfResourcesDesc=Misalnya menggunakan direktif Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Deteksi otomatis semacam itu tidak dimungkinkan dengan peramban saat ini
 DefaultValuesDesc=Di sini Anda dapat menentukan nilai default yang ingin Anda gunakan saat membuat catatan baru, dan / atau filter default atau urutan pengurutan saat Anda daftar catatan.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Nilai default (untuk digunakan pada formulir)
 DefaultSearchFilters=Filter pencarian default
 DefaultSortOrder=Sortir pesanan default
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Modul penomoran pengiriman
 SendingsAbility=Mendukung lembar pengiriman untuk pengiriman pelanggan
 NoNeedForDeliveryReceipts=Dalam kebanyakan kasus, lembar pengiriman digunakan baik sebagai lembar untuk pengiriman pelanggan (daftar produk untuk dikirim) dan lembar yang diterima dan ditandatangani oleh pelanggan. Karenanya tanda terima pengiriman produk adalah fitur duplikat dan jarang diaktifkan.
 FreeLegalTextOnShippings=Teks gratis tentang pengiriman
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Modul penomoran tanda terima pengiriman produk
 DeliveryOrderModel=Model penerimaan pengiriman produk
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Teks bebas pada tanda terima pengiriman
 ##### FCKeditor #####
 AdvancedEditor=Editor tingkat lanjut
 ActivateFCKeditor=Aktifkan editor lanjutan untuk:
-FCKeditorForNotePublic=Pembuatan/edisi WYSIWYG dari bidang "catatan publik" elemen
-FCKeditorForNotePrivate=Pembuatan/edisi WYSIWYG bidang "catatan pribadi" elemen
-FCKeditorForCompany=Pembuatan/edisi WYSIWYG dari deskripsi bidang elemen (kecuali produk/layanan)
-FCKeditorForProductDetails=WYSIWYG pembuatan/edisi deskripsi produk atau baris untuk objek (baris proposal, pesanan, faktur, dll...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Peringatan: Menggunakan opsi ini untuk kasus ini sangat tidak disarankan karena dapat menimbulkan masalah dengan karakter khusus dan pemformatan halaman saat membuat file PDF.
-FCKeditorForMailing= Pembuatan/edisi WYSIWYG untuk email massal (Alat->eMailing)
-FCKeditorForUserSignature=Pembuatan/edisi tanda tangan pengguna WYSIWYG
-FCKeditorForMail=Pembuatan/edisi WYSIWYG untuk semua email (kecuali Tools->eMailing)
-FCKeditorForTicket=Pembuatan/edisi WYSIWYG untuk tiket
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Pengaturan modul stok
 IfYouUsePointOfSaleCheckModule=Jika Anda menggunakan modul Point of Sale (POS) yang disediakan secara default atau modul eksternal, pengaturan ini mungkin diabaikan oleh modul POS Anda. Sebagian besar modul POS dirancang secara default untuk membuat faktur segera dan mengurangi stok terlepas dari opsi di sini. Jadi jika Anda perlu atau tidak memiliki penurunan stok saat mendaftarkan penjualan dari POS Anda, periksa juga pengaturan modul POS Anda.
@@ -1867,7 +1874,6 @@ Buy=Membeli
 Sell=Menjual
 InvoiceDateUsed=Tanggal faktur digunakan
 YourCompanyDoesNotUseVAT=Perusahaan Anda telah ditetapkan untuk tidak menggunakan PPN (Beranda - Pengaturan - Perusahaan / Organisasi), sehingga tidak ada opsi PPN untuk pengaturan.
-AccountancyCode=Kode Akuntansi
 AccountancyCodeSell=Akun penjualan. kode
 AccountancyCodeBuy=Beli akun. kode
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Kosongkan kotak centang "Buat pembayaran secara otomatis" secara default saat membuat pajak baru
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Tampilan mana yang ingin Anda buka secara default saat mem
 AGENDA_EVENT_PAST_COLOR = Warna peristiwa masa lalu
 AGENDA_EVENT_CURRENT_COLOR = Warna acara saat ini
 AGENDA_EVENT_FUTURE_COLOR = Warna acara di masa depan
-AGENDA_REMINDER_BROWSER = Aktifkan pengingat acara <b> pada browser pengguna </b> (Ketika tanggal pengingat tercapai, popup ditampilkan oleh browser. Setiap pengguna dapat menonaktifkan pemberitahuan tersebut dari pengaturan pemberitahuan browser).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Aktifkan pemberitahuan suara
-AGENDA_REMINDER_EMAIL = Aktifkan pengingat acara <b> melalui email </b> (opsi pengingat / penundaan dapat ditentukan pada setiap acara).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Catatan: Frekuensi jadwal pekerjaan %s harus cukup untuk memastikan sisanya dikirim pada waktu yang tepat.
 AGENDA_SHOW_LINKED_OBJECT = Tampilkan objek yang ditautkan ke tampilan agenda
 AGENDA_USE_EVENT_TYPE = Gunakan jenis agenda (dikelola dalam Pengaturan menu -> Kamus -> Jenis agenda agenda)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Secara otomatis mengatur nilai default ini untuk jenis agenda di agenda buat formulir
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Kunci untuk mengotorisasi tautan ekspor
 PastDelayVCalExport=Jangan ekspor agenda yang lebih lama dari
 SecurityKey = Kunci Keamanan
@@ -2006,7 +2017,7 @@ BackupZipWizard=Wizard untuk membangun arsip direktori dokumen
 SomethingMakeInstallFromWebNotPossible=Pemasangan modul eksternal tidak dimungkinkan dari antarmuka web karena alasan berikut:
 SomethingMakeInstallFromWebNotPossible2=Karena alasan ini, proses untuk meningkatkan yang dijelaskan di sini adalah proses manual yang hanya dapat dilakukan oleh pengguna yang memiliki hak istimewa.
 InstallModuleFromWebHasBeenDisabledContactUs=Pemasangan atau pengembangan modul eksternal atau situs web dinamis, dari aplikasi, saat ini dikunci untuk tujuan keamanan. Silakan hubungi kami jika Anda perlu mengaktifkan fitur ini.
-InstallModuleFromWebHasBeenDisabledByFile=Pemasangan modul eksternal dari aplikasi telah dinonaktifkan oleh administrator Anda. Anda harus memintanya untuk menghapus file<strong>%s </strong> untuk memungkinkan fitur ini.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Menginstal atau membuat modul eksternal dari aplikasi perlu menyimpan file modul ke direktori<strong>%s </strong>. Untuk membuat direktori ini diproses oleh Dolibarr, Anda harus menyiapkan<strong>conf / conf.php </strong> untuk menambahkan 2 baris arahan: <br><strong>$ dolibarr_main_url_rol 'custom_url'; </strong> <br><strong>$ dolibarr_main_document_root_alt = '%s / custom'; </strong>
 HighlightLinesOnMouseHover=Sorot garis-garis tabel ketika mouse bergerak
 HighlightLinesColor=Sorot warna garis ketika mouse dilewati (gunakan 'ffffff' tanpa highlight)
@@ -2036,6 +2047,7 @@ Enter0or1=Masukkan 0 atau 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Masukkan di sini di antara kurung kurawal, daftar nomor byte yang mewakili simbol mata uang. Misalnya: untuk $, masukkan [36] - untuk brazil real R $ [82,36] - untuk €, masukkan [8364]
 ColorFormat=Warna RGB dalam format HEX, mis .: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Nama ikon dalam format:<br>- image.png untuk file gambar ke dalam direktori tema saat ini<br>- image.png@module jika file ada di direktori /img/ modul<br>- fa-xxx untuk picto fa-xxx FontAwesome<br>- fontawesome_xxx_fa_color_size untuk gambar fa-xxx FontAwesome (dengan set awalan, warna dan ukuran)
 PositionIntoComboList=Posisi baris ke dalam daftar kombo
 SellTaxRate=Tarif pajak penjualan
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Sembunyikan batas pada bingkai alamat pengirim
 MAIN_PDF_NO_RECIPENT_FRAME=Sembunyikan batas pada bingkai alamat penerima
 MAIN_PDF_HIDE_CUSTOMER_CODE=Sembunyikan kode pelanggan
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Sembunyikan pengirim/nama perusahaan di blok alamat
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Sembunyikan kondisi pembayaran
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Sembunyikan mode pembayaran
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Tambahkan markup tersembunyi ke dalam area tanda tangan agar alat tanda tangan elektronik dapat menggunakannya kembali. Dapat digunakan oleh alat eksternal atau di masa depan dengan fitur tanda tangan online.
@@ -2324,6 +2341,8 @@ NotRecommended=Tidak direkomendasikan
 ARestrictedPath=Beberapa jalur terbatas untuk file data
 CheckForModuleUpdate=Periksa pembaruan modul eksternal
 CheckForModuleUpdateHelp=Tindakan ini akan terhubung ke editor modul eksternal untuk memeriksa apakah versi baru tersedia.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Pembaruan tersedia
 NoExternalModuleWithUpdate=Tidak ada pembaruan yang ditemukan untuk modul eksternal
 SwaggerDescriptionFile=File deskripsi API Swagger (untuk digunakan dengan redoc misalnya)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Tampilkan alamat pengiriman
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Indikasi wajib di beberapa negara (Prancis, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Tautan url jejaring sosial. Gunakan {socialid} untuk bagian variabel yang berisi ID jaringan sosial.
 IfThisCategoryIsChildOfAnother=Jika kategori ini adalah anak dari kategori lain
 DarkThemeMode=Mode tema gelap
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Peringatan: modul %s telah mene
 WarningModuleHasChangedSecurityCsrfParameter=Peringatan: modul %s telah menonaktifkan keamanan CSRF instance Anda. Tindakan ini mencurigakan dan instalasi Anda mungkin tidak lagi diamankan. Silakan hubungi penulis modul untuk penjelasan.
 EMailsInGoingDesc=Email masuk dikelola oleh modul %s. Anda harus mengaktifkan dan mengkonfigurasinya jika Anda perlu mendukung email masuk.
 MAIN_IMAP_USE_PHPIMAP=Gunakan pustaka PHP-IMAP untuk IMAP, bukan IMAP PHP asli. Ini juga memungkinkan penggunaan koneksi OAuth2 untuk IMAP (modul OAuth juga harus diaktifkan).
-MAIN_CHECKBOX_LEFT_COLUMN=Menampilkan kolom untuk pemilihan bidang dan garis di sebelah kiri (di sebelah kanan secara default)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Tidak dibuat secara default. Dibuat hanya pada aktivasi modul.
 CSSPage=Gaya CSS
 Defaultfortype=Bawaan
@@ -2489,7 +2510,7 @@ AiDescription=Fitur AI (Kecerdasan Buatan).
 AiDescriptionLong=Menyediakan fitur AI (Artificial Intelligence) di berbagai bagian aplikasi. Membutuhkan API AI eksternal.
 AI_API_KEY=Kunci untuk api AI
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Layanan yang digunakan untuk fitur AI
+AI_API_SERVICE=AI service to use
 AiSetup=Pengaturan modul AI
 AiCustomPrompt=Perintah khusus AI
 AI_CONFIGURATIONS_PROMPT=Perintah khusus
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=Permintaan khusus AI untuk fitur
 EnterAnIP=Masukkan alamat IP
 ConvertInto=Ubah menjadi
 YouAreHere=Kamu di sini
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Tunjukkan kode batang pada dokumen PDF pengiriman
 BARCODE_ON_RECEPTION_PDF=Tunjukkan barcode pada dokumen PDF penerimaan
 BARCODE_ON_STOCKTRANSFER_PDF=Tunjukkan barcode pada dokumen PDF transfer stok
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
index 4021a24ee24..40398fa825a 100644
--- a/htdocs/langs/id_ID/banks.lang
+++ b/htdocs/langs/id_ID/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Saldo akhir
 CurrentBalance=Saldo saat ini
 FutureBalance=Keseimbangan masa depan
 ShowAllTimeBalance=Tampilkan saldo dari awal
-AllTime=Dari awal
 Reconciliation=Rekonsiliasi
 RIB=Nomor rekening bank
 IBAN=Nomor IBAN
@@ -133,7 +132,7 @@ DeleteTransaction=Hapus entri
 ConfirmDeleteTransaction=Apakah Anda yakin ingin menghapus entri ini?
 ThisWillAlsoDeleteBankRecord=Ini juga akan menghapus entri bank yang dihasilkan
 BankMovements=Pergerakan
-PlannedTransactions=Entri yang direncanakan
+PlannedTransactions=Upcoming entries
 Graph=Grafik
 ExportDataset_banque_1=Entri bank dan laporan rekening
 ExportDataset_banque_2=Slip penyetoran
@@ -151,7 +150,7 @@ FutureTransaction=Transaksi di masa depan. Tidak dapat melakukan rekonsiliasi.
 SelectChequeTransactionAndGenerate=Pilih/filter cek yang akan dimasukkan dalam tanda terima setoran cek. Kemudian, klik "Buat".
 SelectPaymentTransactionAndGenerate=Pilih/filter dokumen yang akan disertakan dalam tanda terima setoran %s. Kemudian, klik "Buat".
 InputReceiptNumber=Pilih laporan bank yang terkait dengan konsiliasi. Gunakan nilai numerik yang dapat diurutkan
-InputReceiptNumberBis=YYYYMM atau YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Untuk berdamai?
 ThenCheckLinesAndConciliate=Kemudian, periksa baris yang ada dalam laporan bank dan klik
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Jika fungsi ini diaktifkan, Anda dapat memilih warna la
 BankColorizeMovementName1=Warna latar belakang untuk pergerakan debit
 BankColorizeMovementName2=Warna latar belakang untuk pergerakan kredit
 IfYouDontReconcileDisableProperty=Jika Anda tidak membuat rekonsiliasi bank pada beberapa rekening bank, nonaktifkan properti "%s" pada rekening tersebut untuk menghapus peringatan ini.
-NoBankAccountDefined=Tidak ada rekening bank yang ditentukan
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Tidak ada catatan yang ditemukan di rekening bank. Biasanya, ini terjadi ketika catatan telah dihapus secara manual dari daftar transaksi di rekening bank (misalnya selama rekonsiliasi rekening bank). Alasan lainnya adalah pembayaran dicatat ketika modul "%s" dinonaktifkan.
 AlreadyOneBankAccount=Sudah satu rekening bank ditentukan
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Varian berkas SEPA
diff --git a/htdocs/langs/id_ID/blockedlog.lang b/htdocs/langs/id_ID/blockedlog.lang
index 7bb3bb5f65e..20fa65d0abf 100644
--- a/htdocs/langs/id_ID/blockedlog.lang
+++ b/htdocs/langs/id_ID/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Log yang tidak dapat diubah
 ShowAllFingerPrintsMightBeTooLong=Tampilkan semua log yang diarsipkan (mungkin panjang)
 ShowAllFingerPrintsErrorsMightBeTooLong=Tampilkan semua log arsip yang tidak valid (mungkin panjang)
 DownloadBlockChain=Unduh sidik jari
-KoCheckFingerprintValidity=Entri log yang diarsipkan tidak valid. Ini berarti seseorang (peretas?) telah memodifikasi beberapa data dari catatan ini setelah direkam, atau telah menghapus catatan yang diarsipkan sebelumnya (periksa baris itu dengan # sebelumnya) atau telah memodifikasi checksum dari catatan sebelumnya.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Catatan log yang diarsipkan valid. Data pada baris ini tidak dimodifikasi dan entri mengikuti yang sebelumnya.
 OkCheckFingerprintValidityButChainIsKo=Log yang diarsipkan tampaknya valid dibandingkan dengan yang sebelumnya tetapi rantai rusak sebelumnya.
 AddedByAuthority=Disimpan ke otoritas jauh
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Detail Log
 ListOfTrackedEvents=Daftar acara yang dilacak
 Fingerprint=Sidik jari
 DownloadLogCSV=Ekspor arsip log (CSV)
-DataOfArchivedEvent=Data lengkap acara yang diarsipkan
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Objek asli (ketik %s, id %s) tidak ditautkan (lihat kolom 'Data lengkap' untuk mendapatkan data tersimpan yang tidak dapat diubah)
 BlockedLogAreRequiredByYourCountryLegislation=Modul Log yang tidak dapat diubah mungkin diperlukan oleh undang-undang negara Anda. Menonaktifkan modul ini dapat membuat transaksi di masa depan menjadi tidak valid sehubungan dengan hukum dan penggunaan perangkat lunak legal karena tidak dapat divalidasi oleh audit pajak.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Modul Unalterable Logs diaktifkan karena undang-undang negara Anda. Menonaktifkan modul ini dapat membuat transaksi di masa depan menjadi tidak valid sehubungan dengan hukum dan penggunaan perangkat lunak legal karena tidak dapat divalidasi oleh audit pajak.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Sistem untuk melacak peristiwa ke dalam log yang tidak dapat d
 BlockedLogDisabled=Sistem untuk melacak peristiwa ke dalam log yang tidak dapat diubah telah dinonaktifkan setelah beberapa perekaman selesai. Kami menyimpan Sidik Jari khusus untuk melacak rantai yang rusak
 BlockedLogDisabledBis=Sistem untuk melacak peristiwa ke dalam log yang tidak dapat diubah telah dinonaktifkan. Hal ini dimungkinkan karena belum ada pencatatan yang dilakukan.
 LinkHasBeenDisabledForPerformancePurpose=Untuk tujuan kinerja, tautan langsung ke dokumen tidak ditampilkan setelah baris ke-100.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Faktur pelanggan dihapus secara logis
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Penghapusan logis pembayaran pelanggan
 logPAYMENT_VARIOUS_CREATE=Pembayaran (tidak ditugaskan pada faktur) dibuat
 logPAYMENT_VARIOUS_DELETE=Penghapusan logis pembayaran (tidak ditugaskan ke faktur)
 logPAYMENT_VARIOUS_MODIFY=Pembayaran (tidak ditugaskan pada faktur) diubah
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/id_ID/categories.lang b/htdocs/langs/id_ID/categories.lang
index 2cb45a343b5..b5de845f00c 100644
--- a/htdocs/langs/id_ID/categories.lang
+++ b/htdocs/langs/id_ID/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Area tag/kategori kontak
 AccountsCategoriesArea=Area tag/kategori rekening bank
 ProjectsCategoriesArea=Area tag/kategori proyek
 UsersCategoriesArea=Area tag/kategori pengguna
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Sub-kategori
 CatList=Daftar label/kategori
 CatListAll=Daftar tag/kategori (semua jenis)
@@ -90,9 +91,10 @@ CategoriesSetup=Pengaturan label/kategori
 CategorieRecursiv=Tautkan dengan label/kategori induk secara otomatis
 CategorieRecursivHelp=Jika opsi aktif, saat Anda menambahkan objek ke dalam subkategori, objek tersebut juga akan ditambahkan ke dalam kategori induk.
 AddProductServiceIntoCategory=Tetapkan kategori untuk produk/layanan
-AddCustomerIntoCategory=Tetapkan kategori untuk pelanggan
-AddSupplierIntoCategory=Tetapkan kategori ke pemasok
-AssignCategoryTo=Tetapkan kategori ke
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Tampilkan label/kategori
 ByDefaultInList=Secara default dalam daftar
 ChooseCategory=Pilih Kategori
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Kategori Penampung Halaman
 KnowledgemanagementsCategoriesArea=Kategori artikel KM
 UseOrOperatorForCategories=Gunakan operator 'OR' untuk kategori
 AddObjectIntoCategory=Tetapkan ke kategori
+FichintersCategoriesArea=Ketegori Intervensi
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index 3279ef7fc3c..5e4a78a77d1 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Negara ada di dalam Masyarakat Ekonomi Eropa
 PriceFormatInCurrentLanguage=Format tampilan harga dalam bahasa dan mata uang saat ini
 ThirdPartyName=Nama pihak ketiga
 ThirdPartyEmail=Email pihak ketiga
-ThirdParty=Pihak ketiga
-ThirdParties=Pihak ketiga
+ThirdParty=Third party
+ThirdParties=Pihak Ketiga
 ThirdPartyProspects=Prospek
 ThirdPartyProspectsStats=Prospek
 ThirdPartyCustomers=Pelanggan
@@ -65,6 +65,7 @@ State=Negara bagian/Provinsi
 StateId=tanda pengenal negara bagian
 StateCode=Kode Negara Bagian/Provinsi
 StateShort=Negara
+DepartmentBuyer=Buyer's state/province
 Region=Wilayah
 Region-State=Wilayah - Negara Bagian
 Country=Negara
@@ -78,7 +79,7 @@ Chat=Obrolan
 PhonePro=Bis. telepon
 PhonePerso=Pers. telepon
 PhoneMobile=Mobile
-No_Email=Tolak email massal
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=Kode Pos
 Town=Kota
@@ -382,11 +383,12 @@ ExportCardToFormat=Ekspor kartu ke format
 ContactNotLinkedToCompany=Kontak tidak tertaut ke pihak ketiga mana pun
 DolibarrLogin=Login Dolibarr
 NoDolibarrAccess=Tidak ada akses Dolibarr
-ExportDataset_company_1=Pihak ketiga (perusahaan/yayasan/orang fisik) dan propertinya
-ExportDataset_company_2=Kontak dan propertinya
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Kontak/alamat dan atribut tambahan pihak ketiga
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Pihak ketiga dan propertinya
 ImportDataset_company_2=Kontak/alamat dan atribut tambahan pihak ketiga
-ImportDataset_company_3=Rekening Bank pihak ketiga
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Perwakilan penjualan pihak ketiga (menugaskan perwakilan penjualan/pengguna ke perusahaan)
 PriceLevel=Tingkat harga
 PriceLevelLabels=Label Level Harga
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Kode gratis tanpa verifikasi.
 ManagingDirectors=Nama manajer (CEO, direktur, presiden ...)
 MergeOriginThirdparty=Pihak ketiga yang digandakan (pihak ketiga yang ingin Anda hapus)
 MergeThirdparties=Gabungkan pihak ketiga
-ConfirmMergeThirdparties=Apakah Anda yakin ingin menggabungkan pihak ketiga yang dipilih dengan yang sekarang? Semua objek yang ditautkan (faktur, pesanan, ...) akan dipindahkan ke pihak ketiga saat ini, setelah itu pihak ketiga yang dipilih akan dihapus.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Pihak ketiga telah bergabung
 SaleRepresentativeLogin=Login perwakilan penjualan
 SaleRepresentativeFirstname=Nama depan perwakilan penjualan
@@ -460,3 +462,6 @@ ExternalSystemID=ID sistem eksternal
 IDOfPaymentInAnExternalSystem=ID mode pembayaran ke sistem eksternal (seperti Stripe, Paypal, ...)
 AADEWebserviceCredentials=Kredensial Layanan Web AADE
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Pihak ketiga harus merupakan pelanggan untuk mengizinkan pembuatan informasi banknya di sisi Stripe
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 1217bc7d705..b72c3119afd 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Pembayaran faktur pelanggan
 PaymentSupplierInvoice=pembayaran faktur vendor
 PaymentSocialContribution=Pembayaran pajak sosial / fiskal
 PaymentVat=Pembayaran PPN
-AutomaticCreationPayment=Catat pembayaran secara otomatis
+AutomaticCreationPayment=Also record the payment
 ListPayment=Daftar pembayaran
 ListOfCustomerPayments=Daftar pembayaran pelanggan
 ListOfSupplierPayments=Daftar pembayaran vendor
@@ -118,10 +118,14 @@ SocialContributionsPayments=Pembayaran pajak sosial / fiskal
 ShowVatPayment=Tampilkan pembayaran PPN
 TotalToPay=Total yang harus dibayar
 BalanceVisibilityDependsOnSortAndFilters=Saldo terlihat dalam daftar ini hanya jika tabel diurutkan pada %s dan disaring pada 1 rekening bank (tanpa filter lain)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Kode akuntansi pelanggan
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Kode akuntansi vendor
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Cust. Akun. kode
 SupplierAccountancyCodeShort=Sup. Akun. kode
+UserAccountancyCodeShort=User account. code
 AccountNumber=Nomor akun
 NewAccountingAccount=Akun baru
 Turnover=Pergantian ditagih
@@ -129,7 +133,9 @@ TurnoverCollected=Pergantian dikumpulkan
 SalesTurnoverMinimum=Omset minimum
 ByExpenseIncome=Berdasarkan biaya & pendapatan
 ByThirdParties=Oleh pihak ketiga
+ByProjects=By projects
 ByUserAuthorOfInvoice=Oleh penulis faktur
+DetailedListLowercase=detailed list
 CheckReceipt=Slip penyetoran
 CheckReceiptShort=Slip penyetoran
 LastCheckReceiptShort=Slip setoran %s terbaru
diff --git a/htdocs/langs/id_ID/datapolicy.lang b/htdocs/langs/id_ID/datapolicy.lang
index 2c45e855334..5ce0ef79f50 100644
--- a/htdocs/langs/id_ID/datapolicy.lang
+++ b/htdocs/langs/id_ID/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Kebijakan Privasi Data
 Module4100Desc = Modul untuk mengelola Privasi Data (Kesesuaian dengan GDPR)
 # Administration page
 datapolicySetup = Pengaturan Kebijakan Privasi Data Modul
-Deletion = Penghapusan data
-datapolicySetupPage = Bergantung pada hukum negara Anda (Contoh <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Pasal 5</a> GDPR), data pribadi harus disimpan selama jangka waktu tertentu tidak melebihi durasi data yang diperlukan untuk tujuan pengumpulannya, kecuali untuk keperluan pengarsipan.<br>Penghapusan akan dilakukan secara otomatis setelah jangka waktu tertentu tanpa kejadian (durasi yang akan Anda tunjukkan di bawah).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s bulan
 ONE_YEAR = 1 tahun
 NB_YEARS = %s tahun
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Prospek/Pelanggan
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Maupun calon pelanggan/Mau pelanggan
 DATAPOLICY_CONTACT_FOURNISSEUR = Suplier
 DATAPOLICY_ADHERENT = Anggota
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Anda dapat mengirim email GDPR ke semua kontak Anda yang relevan (yang belum menerima email dan Anda belum mendaftarkan apa pun tentang perjanjian GDPR mereka). Untuk melakukan ini, gunakan tombol berikut.
 SendAgreement = Mengirim email
 AllAgreementSend = Semua email telah terkirim
 TXTLINKDATAPOLICYACCEPT = Teks untuk tautan "perjanjian"
 TXTLINKDATAPOLICYREFUSE = Teks untuk tautan "ketidaksepakatan"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR : Pemrosesan data pribadi
 DATAPOLICY_consentement = Persetujuan diperoleh untuk pemrosesan data pribadi
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index feabc17d684..4437df9e90e 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Kesalahan dalam membuat file gambar (dit
 ErrorFailedToCreateDir=Gagal membuat direktori. Periksa apakah pengguna server Web memiliki izin untuk menulis ke direktori dokumen Dolibarr. Jika parameter<b>safe_mode</b>diaktifkan pada PHP ini, periksa apakah file-file Dolibarr php milik pengguna web server (atau grup).
 ErrorNoMailDefinedForThisUser=Tidak ada surat yang ditentukan untuk pengguna ini
 ErrorSetupOfEmailsNotComplete=Penyiapan email belum selesai
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Fitur ini memerlukan JavaScript untuk diaktifkan agar berfungsi. Ubah ini di pengaturan - tampilan.
 ErrorTopMenuMustHaveAParentWithId0=Menu bertipe 'Top' tidak dapat memiliki menu induk. Masukkan 0 di menu induk atau pilih menu dengan tipe 'Kiri'.
 ErrorLeftMenuMustHaveAParentId=Menu bertipe 'Kiri' harus memiliki id induk.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Unggah diblokir oleh plugin PHP / Apache.
 ErrorFileSizeTooLarge=Ukuran file terlalu besar atau file tidak disediakan.
 ErrorFieldTooLong=Bidang %s terlalu panjang.
 ErrorSizeTooLongForIntType=Ukuran terlalu panjang untuk tipe int (maksimum digit %s)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Ukuran terlalu panjang untuk tipe string (maksimum karakter %s)
 ErrorNoValueForSelectType=Silakan isi nilai untuk daftar pilih
 ErrorNoValueForCheckBoxType=Silakan isi nilai untuk daftar kotak centang
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Nilai buruk untuk kode keamanan. Coba lagi dengan nilai bar
 ErrorBothFieldCantBeNegative=Bidang %s dan %s tidak boleh negatif
 ErrorFieldCantBeNegativeOnInvoice=Bidang <strong>%s</strong> tidak boleh negatif pada jenis faktur ini. Jika Anda perlu menambahkan baris diskon, cukup buat diskon terlebih dahulu (dari kolom '%s' di kartu pihak ketiga) dan terapkan ke faktur.
 ErrorLinesCantBeNegativeForOneVATRate=Total baris (setelah dikurangi pajak) tidak boleh negatif untuk laju PPN yang diberikan bukan nol (Ditemukan total negatif untuk tarif PPN<b>%s</b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Garis tidak boleh negatif dalam setoran. Anda akan menghadapi masalah ketika Anda perlu mengkonsumsi deposit dalam faktur akhir jika Anda melakukannya.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Kuantitas untuk baris ke faktur pelanggan tidak boleh negatif
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Akun pengguna<b>%s</b>yang digunakan untuk menjalankan server web tidak memiliki izin untuk itu
 ErrorNoActivatedBarcode=Tidak ada tipe barcode yang diaktifkan
 ErrUnzipFails=Gagal unzip %s dengan ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Terlalu banyak baris untuk diproses. Silakan gunakan filter yang lebih selektif.
 ErrorEmptyValueForQty=Kuantitas tidak boleh nol.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Parameter PHP Anda upload_max_filesize (%s) lebih tinggi dari parameter PHP post_max_size (%s). Ini bukan pengaturan yang konsisten.
 WarningPasswordSetWithNoAccount=Kata sandi ditetapkan untuk anggota ini. Namun, tidak ada akun pengguna yang dibuat. Jadi kata sandi ini disimpan tetapi tidak dapat digunakan untuk masuk ke Dolibarr. Ini dapat digunakan oleh modul / antarmuka eksternal tetapi jika Anda tidak perlu mendefinisikan login atau kata sandi untuk anggota, Anda dapat menonaktifkan opsi "Kelola login untuk setiap anggota" dari pengaturan modul Anggota. Jika Anda perlu mengelola login tetapi tidak memerlukan kata sandi, Anda dapat mengosongkan isian ini untuk menghindari peringatan ini. Catatan: Email juga dapat digunakan sebagai login jika anggota tersebut tertaut ke pengguna.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=ID orang tua ini sudah tidak ada lagi
 WarningReadBankAlsoAllowedIfUserHasPermission=Peringatan, membaca rekening bank juga diperbolehkan dengan izin Kelola bagan akun
 WarningNoDataTransferedInAccountancyYet=Perlu diketahui, tidak ada data di tabel akuntansi. Silakan transfer data Anda yang tercatat di aplikasi ke bagian akuntansi atau ubah mode perhitungan untuk menganalisis data yang dicatat di luar akuntansi.
 WarningChangingThisMayBreakStopTaskScheduler=Peringatan, mengubah nilai ini dapat menonaktifkan penjadwal
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = Faktur SwissQR hanya dapat ditambahkan pada faktur yang ditetapkan untuk dibayar dengan pembayaran transfer kredit.
 SwissQrCreditorAddressInvalid = Alamat kreditor tidak valid (apakah ZIP dan kota sudah diatur? (%s)
 SwissQrCreditorInformationInvalid = Informasi kreditur tidak valid untuk IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s sudah ditetapkan sebagai kontak u
 ErrorThisGroupIsAlreadyDefinedAsThisType=Kontak dengan grup ini sudah ditetapkan sebagai kontak untuk jenis ini.
 EmptyMessageNotAllowedError=Pesan kosong tidak diperbolehkan
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/id_ID/exports.lang b/htdocs/langs/id_ID/exports.lang
index c17e4184d55..b457ae537c3 100644
--- a/htdocs/langs/id_ID/exports.lang
+++ b/htdocs/langs/id_ID/exports.lang
@@ -67,7 +67,7 @@ ChooseFormatOfFileToImport=Pilih format file untuk digunakan sebagai format file
 ChooseFileToImport=Unggah file kemudian klik ikon %s untuk memilih file sebagai file impor sumber ...
 SourceFileFormat=Format file sumber
 FieldsInSourceFile=Bidang dalam file sumber
-FieldsInTargetDatabase=Bidang target dalam basis data Dolibarr (bold = wajib)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Tanpa bidang
 MoveField=Pindahkan nomor kolom bidang %s
 ExampleOfImportFile=Example_of_import_file
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Periksa bahwa format file (bidang dan pembatas string) f
 RunSimulateImportFile=Jalankan Simulasi Impor
 FieldNeedSource=Bidang ini memerlukan data dari file sumber
 SomeMandatoryFieldHaveNoSource=Beberapa bidang wajib tidak memiliki sumber dari file data
-InformationOnSourceFile=Informasi tentang file sumber
-InformationOnTargetTables=Informasi tentang bidang target
+InformationOnSourceFile=Berkas sumber
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Alihkan setidaknya satu bidang sumber di kolom bidang untuk diekspor
 SelectFormat=Pilih format file impor ini
 RunImportFile=Impor Data
diff --git a/htdocs/langs/id_ID/hrm.lang b/htdocs/langs/id_ID/hrm.lang
index 4e38817042e..e1930b26152 100644
--- a/htdocs/langs/id_ID/hrm.lang
+++ b/htdocs/langs/id_ID/hrm.lang
@@ -46,11 +46,11 @@ NewEval=Penilaian kompetensi baru
 ValidateEvaluation=Validasi penilaian kompetensi
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Penilaian kompetensi
-RequiredRank=Peringkat yang diperlukan untuk profil pekerjaan
-RequiredRankShort=Peringkat yang diperlukan
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Posisi dengan profil pekerjaan ini
-EmployeeRank=Peringkat karyawan untuk keterampilan ini
-EmployeeRankShort=Pangkat karyawan
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Jabatan karyawan
 EmployeePositions=Jabatan karyawan
 EmployeesInThisPosition=Karyawan di posisi ini
@@ -72,6 +72,9 @@ AddSkill=Tambahkan keterampilan ke profil pekerjaan
 RequiredSkills=Keterampilan yang diperlukan untuk profil pekerjaan ini
 UserRank=Peringkat Pengguna
 SkillList=Daftar keterampilan
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Simpan peringkat
 TypeKnowHow=Pengetahuan
 TypeHowToBe=Bagaimana menjadi
@@ -95,3 +98,5 @@ NeedBusinessTravels=Butuh perjalanan bisnis
 NoDescription=tidak ada deskripsi
 TheJobProfileHasNoSkillsDefinedFixBefore=Profil pekerjaan yang dievaluasi dari karyawan ini tidak memiliki keahlian yang ditentukan di dalamnya. Silakan tambahkan keahlian, lalu hapus dan mulai ulang evaluasi.
 PDFStandardHrmEvaluation=Templat standar untuk menghasilkan dokumen PDF untuk penilaian kompetensi
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index f1c89fb140b..a06c9b8b3fe 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=EMailing
 EMailing=EMailing
-EMailings=EMailings
+EMailings=Mass EMails
 SMSings=SMS
-AllEMailings=Semua eMailings
+AllEMailings=All mass eMails
 MailCard=Kartu EMailing
 MailRecipients=Penerima
 MailRecipient=Penerima
@@ -26,19 +26,19 @@ MailFile=File-file terlampir
 MailMessage=Badan email
 SubjectNotIn=Tidak dalam Subjek
 BodyNotIn=Tidak di dalam Tubuh
-ShowEMailing=Tampilkan email
-ListOfEMailings=Daftar email
-NewMailing=Email baru
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=SMS baru
-EditMailing=Edit email
-ResetMailing=Kirim ulang email
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Hapus email
-PreviewMailing=Pratinjau email
-CreateMailing=Buat kiriman email
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Tes
-ValidMailing=Email yang valid
+ValidMailing=Valid mass Email
 MailingStatusDraft=Konsep
 MailingStatusValidated=Divalidasi
 MailingStatusSent=Terkirim
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Semua filter harus cocok agar email dapat dikumpulkan.<
 LineInFile=Baris %s dalam berkas
 RecipientSelectionModules=Permintaan yang ditentukan untuk pemilihan penerima
 MailSelectedRecipients=Penerima yang dipilih
-MailingArea=Daerah EMailings
-LastMailings=Email %s terbaru
+MailingArea=Email Masal
+LastMailings=Latest %s mass emails
 TargetsStatistics=Statistik target
 NbOfCompaniesContacts=Kontak / alamat unik
 MailNoChangePossible=Penerima untuk email yang divalidasi tidak dapat diubah
-SearchAMailing=Cari surat
-SendMailing=Kirim email
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Dikirim oleh
 AdvancedAlternative=Alternatif tingkat lanjut
 MailingNeedCommand=Mengirim email dapat dilakukan dari baris perintah. Tanya administrator server Anda untuk meluncurkan perintah berikut untuk mengirim email ke semua penerima:
 MailingNeedCommand2=Namun Anda dapat mengirimnya secara online dengan menambahkan parameter MAILING_LIMIT_SENDBYWEB dengan nilai jumlah maksimum email yang ingin Anda kirim berdasarkan sesi. Untuk ini, buka Home - Setup - Lainnya.
 ConfirmSendingEmailing=Jika Anda ingin mengirim email langsung dari layar ini, harap konfirmasikan bahwa Anda yakin ingin mengirim email sekarang dari browser Anda?
-LimitSendingEmailing=Catatan: Mengirim email dari antarmuka web dilakukan beberapa kali untuk alasan keamanan dan alasan batas waktu, penerima <b>%s</b> pada waktu untuk setiap sesi pengiriman.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Bersihkan daftar
 ToClearAllRecipientsClickHere=Klik di sini untuk menghapus daftar penerima untuk email ini
 ToAddRecipientsChooseHere=Tambahkan penerima dengan memilih dari daftar
-NbOfEMailingsReceived=Email masal diterima
-NbOfEMailingsSend=Email masal dikirim
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=Catatan ID
 DeliveryReceipt=Tanda pengiriman
 YouCanUseCommaSeparatorForSeveralRecipients=Anda dapat menggunakan pemisah <b>comma</b> untuk menentukan beberapa penerima.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Tidak ada pemberitahuan email otomatis yang direncanak
 ANotificationsWillBeSent=1 notifikasi otomatis akan dikirim melalui email
 SomeNotificationsWillBeSent=%s notifikasi otomatis akan dikirim melalui email
 AddNewNotification=Berlangganan pemberitahuan email otomatis baru (target / acara)
-ListOfActiveNotifications=Langganan aktif (target/acara) untuk pemberitahuan email otomatis
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Notifikasi email otomatis terkirim
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Konfigurasi pengiriman email telah diatur ke '%s'. Mode ini tidak dapat digunakan untuk mengirim email masal.
 MailSendSetupIs2=Anda pertama-tama harus pergi, dengan akun admin, ke dalam menu %sHome - Setup - EMails%s untuk mengubah parameter<strong>'%s' </strong> untuk menggunakan mode ' %s'. Dengan mode ini, Anda dapat masuk ke pengaturan server SMTP yang disediakan oleh Penyedia Layanan Internet Anda dan menggunakan fitur kirim email dengan skala besar.
 MailSendSetupIs3=Jika Anda memiliki pertanyaan tentang cara mengatur server SMTP Anda, Anda dapat bertanya ke %s.
@@ -183,7 +185,7 @@ Information=Informasi
 ContactsWithThirdpartyFilter=Kontak dengan filter pihak ketiga
 Unanswered=Tidak terjawab
 Answered=Terjawab
-IsNotAnAnswer=Tidak dijawab (email awal)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Adalah jawaban dari email awal
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Nilai default untuk bidang '%s' saat membuat kontak baru
@@ -199,6 +201,6 @@ ModelTemplate=Templat email
 YouCanChooseAModelForYouMailContent= Anda dapat memilih salah satu model template atau membuatnya dengan AI
 TitleOfMailHolder=Judul email ada di sini
 ContentOfMailHolder=Isi email ada di sini...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index da2e15439be..6e8b2cbee1f 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -28,7 +28,7 @@ FormatDateText=%B %d, %Y
 FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
-FormatDateHourText=%B %d, %Y, % I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Koneksi Database
 NoTemplateDefined=Tidak ada templat yang tersedia untuk jenis email ini
 AvailableVariables=Variabel substitusi yang tersedia
@@ -37,6 +37,7 @@ Translation=Terjemahan
 Translations=Terjemahan
 CurrentTimeZone=TimeZone PHP (Server)
 EmptySearchString=Masukkan kriteria pencarian yang tidak kosong
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Masukkan kriteria tanggal
 NoRecordFound=Tidak ada catatan yang ditemukan
 NoRecordDeleted=Tidak ada catatan yang dihapus
@@ -45,6 +46,7 @@ NoError=Tidak ada kesalahan
 Error=Kesalahan
 Errors=Kesalahan
 ErrorFieldRequired=Bidang '%s' diperlukan
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Bidang '%s' memiliki nilai buruk
 ErrorFileDoesNotExists=File %s tidak ada
 ErrorFailedToOpenFile=Gagal membuka file %s
@@ -308,6 +310,7 @@ DateBuild=Laporkan tanggal pembuatan
 DatePayment=Tanggal pembayaran
 DateApprove=Tanggal menyetujui
 DateApprove2=Tanggal persetujuan (persetujuan kedua)
+PendingSince=Pending since
 RegistrationDate=Tanggal registrasi
 UserCreation=Pengguna pembuatan
 UserModification=Pengguna modifikasi
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Untuk memulai
 ActionRunningShort=Sedang berlangsung
 ActionDoneShort=Jadi
 ActionUncomplete=Tidak lengkap
-LatestLinkedEvents=Peristiwa terkait %s terbaru
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Perusahaan/Organisasi
 Accountant=Akuntan
 ContactsForCompany=Kontak untuk pihak ketiga ini
@@ -503,6 +506,7 @@ ContactsAddressesForCompany=Kontak/alamat untuk pihak ketiga ini
 AddressesForCompany=Alamat untuk pihak ketiga ini
 ActionsOnCompany=Perihal untuk pihak ketiga ini
 ActionsOnContact=Perihal untuk kontak / alamat ini
+ActionsOnUser=Events for this user
 ActionsOnContract=Perihal untuk kontrak ini
 ActionsOnMember=Perihal tentang anggota ini
 ActionsOnProduct=Perihal tentang produk ini
@@ -720,6 +724,8 @@ TextUsedInTheMessageBody=Badan email
 SendAcknowledgementByMail=Kirim email konfirmasi
 SendMail=Mengirim email
 Email=Email
+EMail=Email
+EMails=Emails
 NoEMail=Tidak ada email
 AlreadyRead=Sudah baca
 NotRead=Belum dibaca
@@ -792,7 +798,7 @@ Notes=Catatan
 AddNewLine=Tambahkan baris baru
 AddFile=Tambah berkas
 FreeZone=Produk teks-bebas
-FreeLineOfType=Item teks bebas, ketik:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Mengkloning objek dengan atribut utamanya
 ReGeneratePDF=Menghasilkan kembali PDF
 PDFMerge=Penggabungan PDF
@@ -878,12 +884,14 @@ toward=terhadap
 Access=Mengakses
 SelectAction=Pilih tindakan
 SelectTargetUser=Pilih target pengguna / karyawan
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Gunakan Ctrl + C untuk menyalin ke clipboard
 SaveUploadedFileWithMask=Simpan file di server dengan nama "<strong> %s </strong>" (jika tidak "%s")
 OriginFileName=Nama file asli
 SetDemandReason=Tetapkan sumber
 SetBankAccount=Tentukan Rekening Bank
 AccountCurrency=Mata uang akun
+AccountancyCode=Accounting Code
 ViewPrivateNote=Lihat catatan
 XMoreLines=%s baris tersembunyi
 ShowMoreLines=Tampilkan lebih banyak / lebih sedikit garis
@@ -924,6 +932,7 @@ ConfirmMassDeletionQuestion=Anda yakin ingin menghapus catatan terpilih %s?
 ConfirmMassClone=Konfirmasi kloning massal
 ConfirmMassCloneQuestion=Pilih proyek yang akan dikloning
 ConfirmMassCloneToOneProject=Klon ke proyek %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Objek Terkait
 ClassifyBilled=Klasifikasikan Tagihan
 ClassifyUnbilled=Klasifikasikan Belum Ditagih
@@ -960,10 +969,11 @@ PrivateDownloadLinkDesc=Anda harus masuk dan Anda memerlukan izin untuk melihat
 Download=Unduh
 DownloadDocument=Unduh dokumen
 DownloadSignedDocument=Unduh dokumen yang ditandatangani
-ActualizeCurrency=Perbarui kurs mata uang
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Tahun fiskal
 ModuleBuilder=Modul dan Pembuat Aplikasi
 SetMultiCurrencyCode=Tetapkan mata uang
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Aksi besar
 ClickToShowHelp=Klik untuk menampilkan bantuan tooltip
 WebSite=Situs web
@@ -1103,6 +1113,7 @@ PayedBy=Dibayar oleh
 PayedTo=Dibayarkan kepada
 Monthly=Bulanan
 Quarterly=Triwulanan
+Quarter=Quarter
 Annual=Tahunan
 Local=Lokal
 Remote=Terpencil
@@ -1145,6 +1156,7 @@ ContactDefault_project_task=Tugas
 ContactDefault_propal=Usul
 ContactDefault_supplier_proposal=Proposal Pemasok
 ContactDefault_ticket=Tiket
+ContactDefault_societe=Third party
 ContactAddedAutomatically=Kontak ditambahkan dari peran kontak pihak ketiga
 More=Lebih
 ShowDetails=Tampilkan detail
@@ -1187,6 +1199,8 @@ SetSupervisor=Tetapkan pengawas
 CreateExternalUser=Buat pengguna eksternal
 ConfirmAffectTag=Penugasan Tag Massal
 ConfirmAffectUser=Penugasan Pengguna Massal
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=Peran yang ditetapkan pada setiap proyek/peluang
 TasksRole=Peran yang ditetapkan pada setiap tugas (jika digunakan)
 ConfirmSetSupervisor=Set Pengawas Massal
@@ -1238,6 +1252,9 @@ CommercialsAffected=Perwakilan penjualan ditugaskan
 CommercialAffected=Perwakilan penjualan ditugaskan
 CommercialsDisaffected=Perwakilan penjualan memutuskan tautannya
 CommercialDisaffected=Perwakilan penjualan tidak tertaut
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=Pesan Anda
 YourMessageHasBeenReceived=Pesan Anda telah diterima. Kami akan menjawab atau menghubungi Anda sesegera mungkin.
 UrlToCheck=Url untuk diperiksa
@@ -1280,6 +1297,7 @@ AmountSalary=Jumlah gaji
 InvoiceSubtype=Subtipe faktur
 ConfirmMassReverse=Konfirmasi Pembalikan Massal
 ConfirmMassReverseQuestion=Apakah Anda yakin ingin membalikkan %s data yang dipilih?
+ConfirmActionXxx=Confirm action %s
 ElementType=Jenis elemen
 ElementId=Id Elemen
 Encrypted=Terenkripsi
@@ -1299,3 +1317,35 @@ AllEntities=Semua entitas
 TranslationOfKey=Terjemahan kunci AnyTranslationKey
 SignedStatus=Status yang ditandatangani
 NbRecordQualified=Jumlah catatan yang memenuhi syarat
+auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang
index 62fadf3d823..633b74fe12f 100644
--- a/htdocs/langs/id_ID/members.lang
+++ b/htdocs/langs/id_ID/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Jika langganan diperlukan, langganan dengan tanggal mul
 DeleteType=Hapus
 VoteAllowed=Vote diizinkan
 Physical=Perseorangan
-Moral=Perusahaan
-MorAndPhy=Korporasi dan Perorangan
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Aktifkan kembali
 ExcludeMember=Kecualikan anggota
 Exclude=Mengecualikan
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Statistik anggota berdasarkan wilayah
 NbOfMembers=Jumlah anggota
 NbOfActiveMembers=Jumlah total anggota aktif saat ini
 NoValidatedMemberYet=Tidak ada anggota yang divalidasi yang ditemukan
-MembersByCountryDesc=Layar ini menunjukkan statistik anggota menurut negara. Grafik dan grafik bergantung pada ketersediaan layanan grafik online Google serta ketersediaan koneksi internet yang berfungsi.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Layar ini menunjukkan statistik anggota menurut negara bagian/provinsi/kanton.
 MembersByTownDesc=Layar ini menunjukkan statistik anggota menurut kota.
 MembersByNature=Layar ini menunjukkan statistik anggota secara alami.
diff --git a/htdocs/langs/id_ID/salaries.lang b/htdocs/langs/id_ID/salaries.lang
index 97882ce500c..ae472f1d54e 100644
--- a/htdocs/langs/id_ID/salaries.lang
+++ b/htdocs/langs/id_ID/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Gaji baru
 AddSalary=Tambahkan gaji
 NewSalaryPayment=Kartu gaji baru
 AddSalaryPayment=Tambahkan pembayaran gaji
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Pembayaran Gaji
 SalariesPayments=Pembayaran Gaji
 SalariesPaymentsOf=Pembayaran gaji %s
@@ -27,7 +29,7 @@ FillFieldFirst=Isi kolom karyawan terlebih dahulu
 UpdateAmountWithLastSalary=Tetapkan jumlah gaji terakhir
 MakeTransferRequest=Buat permintaan transfer
 VirementOrder=Permintaan transfer kredit
-BankTransferAmount=Jumlah transfer kredit
 WithdrawalReceipt=Perintah transfer kredit
 OrderWaiting=Pesanan tertunda
 FillEndOfMonth=Isi dengan akhir bulan
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang
index bb09b773550..49f009d4851 100644
--- a/htdocs/langs/id_ID/website.lang
+++ b/htdocs/langs/id_ID/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Gunakan di sini daftar nama / alias lain sehingga halaman t
 WEBSITE_CSS_URL=URL file CSS eksternal
 WEBSITE_CSS_INLINE=Konten file CSS (umum untuk semua halaman)
 WEBSITE_JS_INLINE=Konten file JavaScript (umum untuk semua halaman)
-WEBSITE_HTML_HEADER=Tambahan di bagian bawah Header HTML (umum untuk semua halaman)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=File robot (robots.txt)
 WEBSITE_HTACCESS=File .htaccess situs web
 WEBSITE_MANIFEST_JSON=File manifest.json situs web
@@ -56,16 +56,17 @@ ReadPerm=Baca
 WritePerm=Menulis
 TestDeployOnWeb=Uji / gunakan di web
 PreviewSiteServedByWebServer= <u>Pratinjau %s di tab baru.</u><br><br>%s akan dilayani oleh server web eksternal (seperti Apache, Nginx, IIS). Anda harus menginstal dan mengatur server ini sebelum merujuk pada direktori:<br><strong>%s</strong><br>URL dilayani oleh server eksternal: <br><strong>%s</strong>
-PreviewSiteServedByDolibarr= <u> Pratinjau %s di tab baru. </u> <br> <br> %s akan dilayani oleh server Dolibarr sehingga tidak memerlukan server web tambahan (seperti Apache, Nginx, IIS) untuk diinstal. <br> Yang merepotkan adalah URL halaman tidak ramah pengguna dan mulai dengan jalur Dolibarr Anda. <br> URL dilayani oleh Dolibarr: <br> <strong> %s </strong> <br> <br> Untuk menggunakan web eksternal server Anda sendiri untuk melayani situs web ini, membuat virtual host pada server web Anda yang poin pada direktori <br> <strong> %s </strong> <br> kemudian masukkan nama server virtual ini di properti situs web ini dan klik tautan "Uji/Sebarkan di web".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL dari host virtual yang dilayani oleh server web eksternal tidak ditentukan
 NoPageYet=Belum ada halaman
 YouCanCreatePageOrImportTemplate=Anda dapat membuat halaman baru atau mengimpor template situs web lengkap
 SyntaxHelp=Bantuan tentang kiat sintaksis khusus
 YouCanEditHtmlSourceckeditor=Anda dapat mengedit kode sumber HTML menggunakan tombol "Sumber" di editor.
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Untuk menyertakan  <strong>gambar</strong> disimpan ke dalam direktori <strong>dokumen</strong> , gunakan wrapper <strong>viewimage.php</strong>.<br>Contoh, untuk gambar ke dalam dokumen/media (direktori terbuka untuk akses publik), sintaksnya adalah:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]nama file.ext"&gt; </strong><br>
-YouCanEditHtmlSource2=Untuk gambar yang dibagikan dengan tautan berbagi (akses terbuka menggunakan kunci hash berbagi file), sintaksnya adalah: <br><strong>&lt;img src = "/ viewimage.php?
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=Untuk mendapatkan URL gambar objek PHP, gunakan<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Contoh HTML atau kode dinamis lainnya tersedia di <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">dokumentasi wiki</a>.<br>
 ClonePage=Halaman / wadah klon
 CloneSite=Situs klon
@@ -87,15 +88,15 @@ WebsiteAccount=Akun situs web
 WebsiteAccounts=Akun situs web
 AddWebsiteAccount=Buat akun situs web
 BackToListForThirdParty=Kembali ke daftar untuk pihak ketiga
-DisableSiteFirst=Nonaktifkan situs web terlebih dahulu
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Judul situs web saya
 AnotherContainer=Ini adalah cara memasukkan konten dari halaman / wadah lain (Anda mungkin memiliki kesalahan di sini jika Anda mengaktifkan kode dinamis karena subkontainer tertanam mungkin tidak ada)
 SorryWebsiteIsCurrentlyOffLine=Maaf, situs web ini saat ini offline. Silakan kembali lagi nanti ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Aktifkan tabel akun situs web
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktifkan tabel untuk menyimpan akun situs web (login / pass) untuk setiap situs web / pihak ketiga
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Anda harus terlebih dahulu menentukan halaman Beranda default
-OnlyEditionOfSourceForGrabbedContentFuture=Peringatan: Membuat halaman web dengan mengimpor halaman web eksternal diperuntukkan bagi pengguna berpengalaman. Bergantung pada kompleksitas halaman sumber, hasil impor mungkin berbeda dari aslinya. Selain itu, jika halaman sumber menggunakan gaya CSS umum atau JavaScript yang bertentangan, hal ini dapat merusak tampilan atau fitur editor Situs Web saat mengerjakan halaman ini. Metode ini adalah cara yang lebih cepat untuk membuat halaman, namun disarankan untuk membuat halaman baru dari awal atau dari template halaman yang disarankan.<br>Perhatikan juga bahwa editor sebaris mungkin tidak berfungsi kebenaran saat digunakan pada halaman eksternal yang diambil.
-OnlyEditionOfSourceForGrabbedContent=Hanya edisi sumber HTML yang dimungkinkan ketika konten diambil dari situs eksternal
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Ambil juga gambar yang ditemukan di css dan halaman.
 ImagesShouldBeSavedInto=Gambar harus disimpan ke dalam direktori
 WebsiteRootOfImages=Direktori root untuk gambar situs web
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Keluar dari akun pelanggan Anda
 filteredByVersion=Difilter berdasarkan versi
 removeFilter=Hapus penyaring
 viewMyCart=Lihat keranjang belanja saya
+Shipping=Shipping
 freeShipping=Bebas biaya kirim!
 noProducts=Tidak ada produk
 nbrItemsInCart=Ada <span class="ajax_cart_quantity">0</span> item di keranjang Anda.
@@ -284,12 +286,13 @@ productNameAToZ=Nama Produk: A sampai Z
 productNameZToA=Nama Produk: Z hingga A
 referenceLowestFirst=Referensi: Terendah dulu
 referenceHighestFirst=Referensi: Yang tertinggi terlebih dahulu
+productPerPage=products per page
 perPage=per halaman
 showAll=Tunjukkan semua
 showing= Menampilkan
 nbrOfProducts= Ada produk %s.
 noResultsHaveBeenFound=0 hasil telah ditemukan.
-noResultsWereFound= Tidak ada hasil yang ditemukan.
+noResultsWereFound=Tidak ada hasil yang ditemukan.
 addToCart=Masukkan ke keranjang
 backHome=Kembali ke Rumah
 priceDrop=Turun harga
@@ -302,10 +305,11 @@ lastUpdate=Pembaharuan Terakhir
 contactSupport=Cara menghubungi dukungan
 noProductToDisplay=Kesalahan, Tidak ada produk untuk ditampilkan
 yourCompanyInformation=Informasi perusahaan Anda
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=Email ini sudah terdaftar.
 firstnameContainsLettersOnly=<b>Nama depan</b> hanya boleh berisi huruf dan spasi
 lastnameContainsLettersOnly=<b>Nama belakang</b> hanya boleh berisi huruf dan spasi
-passwordCriteria=<b>Sandi</b> harus memenuhi kriteria berikut:<br>- 12 karakter<br>- 1 huruf besar<br>- 1 digit<br>- Tanpa karakter khusus<br>- Hindari pengulangan karakter lebih dari 3 kali<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=Sebuah kesalahan telah terjadi.
 accountCreation=Buat sebuah akun
 errorsOccurred=Ada %s kesalahan%s
@@ -357,3 +361,7 @@ subtract=Mengurangi
 LoginCheckout=Masuk & Lanjutkan ke checkout
 paymentSuccessProcessed=Pembayaran Anda telah berhasil diproses.
 youWillBeRedirectedToOrderPage=Anda akan segera diarahkan ke halaman detail pesanan.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index e1a31604da8..5ab082ba58b 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however som
 FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
 FilesModified=Modified Files
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Öryggi
 Passwords=Lykilorð
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Computed field
-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=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'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored WITHOUT encryption (field is just hidden with stars on screen).<br><br>Enter value 'dolcrypt' to encode value with a reversible encryption algorithm. Clear data can still be known and edited but is encrypted into database.<br><br>Enter 'auto' (or 'md5', 'sha256', 'password_hash', ...) to use the default password encryption algorithm (or md5, sha256, password_hash...) to save the non reversible hashed password into database (no way to retrieve original value)
@@ -475,7 +476,6 @@ ExtrafieldParamHelpselect=List of values must be lines with format key,value (wh
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarily a primary int key<br>- filtersql is a condition. It must use the USF syntax. Example: (active:=:1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>If you want to filter on extrafields use syntax  extra.fieldcode=... (where fieldcode is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1 to display only active value)<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -520,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
 WarningPHPMailD=It is therefore recommended to change the sending method of e-mails to the value "SMTP".
 WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
-WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -568,8 +568,8 @@ Module10Name=Accounting (simplified)
 Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
 Module20Name=Tillögur
 Module20Desc=Auglýsing tillögunnar stjórnun
-Module22Name=Mass Emailings
-Module22Desc=Manage bulk emailing
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Orka
 Module23Desc=Eftirlit með notkun orku
 Module25Name=Sales Orders
@@ -848,10 +848,10 @@ Permission212=Pantanalínur
 Permission213=Virkja línu
 Permission214=Skipulag símafjarskipti
 Permission215=Skipulag þjónustuveitenda
-Permission221=Lesa emailings
-Permission222=Búa til / breyta emailings (atriði, viðtakendur ...)
-Permission223=Staðfesta emailings (leyfa senda)
-Permission229=Eyða emailings
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=View recipients and info
 Permission238=Manually send mailings
 Permission239=Delete mailings after validation or sent
@@ -1106,6 +1106,7 @@ DictionaryStaff=Number of Employees
 DictionaryAvailability=Afhending töf
 DictionaryOrderMethods=Order methods
 DictionarySource=Uppruni tillögur / pantanir
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Personalized groups for reports
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryAccountancyJournal=Accounting journals
@@ -1135,11 +1136,11 @@ BackToDictionaryList=Back to Dictionaries list
 TypeOfRevenueStamp=Type of tax stamp
 VATManagement=Sales Tax Management
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
 VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
 VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Type of sales tax
 LTRate=Verð
@@ -1175,6 +1176,7 @@ NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), yo
 LabelUsedByDefault=Merki notaður við vanræksla, ef ekki þýðingu er að finna í kóða
 LabelOnDocuments=Merki um skjöl
 LabelOrTranslationKey=Label or translation key
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1432,7 +1434,7 @@ AddVatInList=Display Customer/Vendor VAT number into combo lists.
 AddAdressInList=Display Customer/Vendor address into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
-FieldEdition=%s viði útgáfa
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
 GetBarCode=Get barcode
 NumberingModules=Numbering models
@@ -1487,6 +1489,8 @@ ForceInvoiceDate=Force dagsetningu reiknings staðfestingu dagsetningu
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
 SuggestPaymentByChequeToAddress=Suggest payment by check to
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Frjáls texti á reikningum
 WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
 PaymentsNumberingModule=Payments numbering model
@@ -1719,6 +1723,7 @@ CompressionOfResources=Compression of HTTP responses
 CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Default values (to use on forms)
 DefaultSearchFilters=Default search filters
 DefaultSortOrder=Default sort orders
@@ -1801,6 +1806,7 @@ SendingsNumberingModules=Sendings númera einingar
 SendingsAbility=Support shipping sheets for customer deliveries
 NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Vörur afgreiðsla barst tala mát
 DeliveryOrderModel=Vörur fæðingar viðtöku líkaninu
@@ -1809,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Frjáls texti á afhendingu kvittunum
 ##### FCKeditor #####
 AdvancedEditor=Ítarlegri ritstjóri
 ActivateFCKeditor=Virkja FCKeditor fyrir:
-FCKeditorForNotePublic=WYSIWYG creation/edition of the field "public notes" of elements
-FCKeditorForNotePrivate=WYSIWYG creation/edition of the field "private notes" of elements
-FCKeditorForCompany=WYSIWYG creation/edition of the field description of elements (except products/services)
-FCKeditorForProductDetails=WYSIWYG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, 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.
-FCKeditorForMailing= WYSIWYG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWYG creation/edition of user signature
-FCKeditorForMail=WYSIWYG creation/edition for all mail (except Tools->eMailing)
-FCKeditorForTicket=WYSIWYG creation/edition for tickets
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
@@ -1868,7 +1874,6 @@ Buy=Kaupa
 Sell=Selja
 InvoiceDateUsed=Dagsetning reiknings notað
 YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
-AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
@@ -1880,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Which view do you want to open by default when selecting m
 AGENDA_EVENT_PAST_COLOR = Past event color
 AGENDA_EVENT_CURRENT_COLOR = Current event color
 AGENDA_EVENT_FUTURE_COLOR = Future event color
-AGENDA_REMINDER_BROWSER = Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Enable sound notification
-AGENDA_REMINDER_EMAIL = Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT = Show linked object into agenda view
 AGENDA_USE_EVENT_TYPE = Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Automatically set this default value for type of event in event create form
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Lykill að heimila útflutning hlekkur
 PastDelayVCalExport=Ekki flytja atburður eldri en
 SecurityKey = Security Key
@@ -2007,7 +2017,7 @@ BackupZipWizard=Wizard to build the archive of documents directory
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
 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.
-InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
@@ -2037,6 +2047,7 @@ Enter0or1=Enter 0 or 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Icon name in format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sales tax rate
@@ -2132,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
 MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipient address frame
 MAIN_PDF_HIDE_CUSTOMER_CODE=Hide customer code
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Hide sender/company name in address block
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Hide payments conditions
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Hide payment mode
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2147,7 +2163,7 @@ COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLE
 DuplicateForbidden=Duplicate forbidden
 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
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
+GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact, ...)
 GDPRContactDesc=If you store personal data in your Information System, you can name the contact who is responsible for the General Data Protection Regulation here
 HelpOnTooltip=Help text to show on tooltip
 HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
@@ -2290,7 +2306,7 @@ THIRDPARTY_ALIAS=Third-party name - Third-party alias
 ALIAS_THIRDPARTY=Third-party alias - Third-party name
 PDFIn2Languages=Show labels in the PDF in 2 different languages (this feature may not work for some couple of languages)
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
-PDF_USE_A=Generate PDF documents with format PDF/A instead of default format PDF
+PDF_USE_A=PDF documents format
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
@@ -2325,6 +2341,8 @@ NotRecommended=Not recommended
 ARestrictedPath=Some restricted path for data files
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
@@ -2398,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Show shipping address
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
 DarkThemeMode=Dark theme mode
@@ -2451,7 +2471,7 @@ 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)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Not created by default. Created on module activation only.
 CSSPage=CSS Style
 Defaultfortype=Default
@@ -2490,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2502,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2540,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2554,3 +2579,31 @@ MenuDict=Dictionary
 AddMoreParams=Add more parameters for connection (cookies, tokens, ...)<br> Example: token : value token
 ParamName=Name of parameter
 ParamValue=Value of parameter
+ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
+HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
+Captcha=Captcha
+CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
+DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index 4274d4feb38..ec774848d67 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Country is inside the European Economic Community
 PriceFormatInCurrentLanguage=Price display format in the current language and currency
 ThirdPartyName=Third-party name
 ThirdPartyEmail=Third-party email
-ThirdParty=Third-party
-ThirdParties=Third-parties
+ThirdParty=Þriðja aðila
+ThirdParties=Í þriðja aðila
 ThirdPartyProspects=Horfur
 ThirdPartyProspectsStats=Horfur
 ThirdPartyCustomers=Viðskiptavinir
@@ -65,6 +65,7 @@ State=Ríki / Hérað
 StateId=State ID
 StateCode=State/Province code
 StateShort=State
+DepartmentBuyer=Buyer's state/province
 Region=Svæði
 Region-State=Region - State
 Country=Land
@@ -78,7 +79,7 @@ Chat=Chat
 PhonePro=Bus. phone
 PhonePerso=Pers. Síminn
 PhoneMobile=Mobile
-No_Email=Refuse bulk emailings
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=Zip Code
 Town=City
@@ -382,11 +383,12 @@ ExportCardToFormat=Útflutningur kort til snið
 ContactNotLinkedToCompany=Hafðu tengist ekki til þriðja aðila
 DolibarrLogin=Dolibarr Innskráning
 NoDolibarrAccess=Nei Dolibarr aðgang
-ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
-ExportDataset_company_2=Contacts and their properties
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Third-parties and their properties
 ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
-ImportDataset_company_3=Third-parties Bank accounts
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
 PriceLevel=Price Level
 PriceLevelLabels=Price Level Labels
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
@@ -460,3 +462,6 @@ ExternalSystemID=External system ID
 IDOfPaymentInAnExternalSystem=ID of the payment mode into an external system (like Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE Webservice Credentials
 ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/is_IS/exports.lang b/htdocs/langs/is_IS/exports.lang
index 6b1194121ea..c91993a49f0 100644
--- a/htdocs/langs/is_IS/exports.lang
+++ b/htdocs/langs/is_IS/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Label of line
 LineDescription=Lýsing lína
 LineUnitPrice=Unit verð á línu
 LineVATRate=VSK af línu
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Magn fyrir línu
 LineTotalHT=Amount excl. tax for line
 LineTotalTTC=Upphæð sem skattur fyrir línu
 LineTotalVAT=Upphæð VSK fyrir línu
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Tegund línu (0 = vara, 1 = þjónustu)
 FileWithDataToImport=Skrá með upplýsingum til að flytja inn
 FileToImport=Frumskrár að flytja inn
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=Choose the file format to use as import file format b
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Heimild skráarsnið
 FieldsInSourceFile=Reitir í frumskrár
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Engin svæði
 MoveField=Færa sviði dálki númer %s
 ExampleOfImportFile=Example_of_import_file
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Check that the file format (field and string delimiters)
 RunSimulateImportFile=Run Import Simulation
 FieldNeedSource=This field requires data from the source file
 SomeMandatoryFieldHaveNoSource=Sumir nauðsynlega reiti hafa ekki fengið frá gögnum skrá
-InformationOnSourceFile=Upplýsingar um frumskrár
-InformationOnTargetTables=Upplýsingar um miða á sviði
+InformationOnSourceFile=Frumskrár
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Kveikt á amk einn fengið reitinn í dálknum sviðum til útflutnings
 SelectFormat=Veldu skrána inn snið
 RunImportFile=Import Data
diff --git a/htdocs/langs/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
index 6f9170db1c9..dfc32085803 100644
--- a/htdocs/langs/is_IS/mails.lang
+++ b/htdocs/langs/is_IS/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Emailing
 EMailing=Emailing
-EMailings=EMailings
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=Allar eMailings
+AllEMailings=All mass eMails
 MailCard=Emailing kort
 MailRecipients=Viðtakendur
 MailRecipient=Viðtakandi
@@ -26,17 +26,19 @@ MailFile=Meðfylgjandi skrá
 MailMessage=Email líkami
 SubjectNotIn=Not in Subject
 BodyNotIn=Not in Body
-ShowEMailing=Sýna póst
-ListOfEMailings=Listi yfir emailings
-NewMailing=New póst
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=Breyta póst
-ResetMailing=Endursenda póst
-DeleteMailing=Eyða póst
-PreviewMailing=Forskoða póst
-CreateMailing=Búa til póst
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Próf
-ValidMailing=Valid póst
+ValidMailing=Valid mass Email
 MailingStatusDraft=Víxill
 MailingStatusValidated=Staðfestar
 MailingStatusSent=Sendir
@@ -53,6 +55,7 @@ ErrorMailRecipientIsEmpty=Netfang móttakanda er tóm
 WarningNoEMailsAdded=Engin ný Email að bæta við listann viðtakanda.
 ConfirmValidMailing=Are you sure you want to validate this emailing?
 ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
+ConfirmResetMailingTargetMassactionQuestion=Are you sure you want to reset the status of the selected recipients (this may means that email will be resent if you use the Send email feature of the emailing) ?
 ConfirmDeleteMailing=Are you sure you want to delete this emailing?
 NbOfUniqueEMails=No. of unique emails
 NbOfUniquePhones=No. of unique phones
@@ -105,24 +108,24 @@ EmailCollectorFilterDesc=All filters must match to have an email being collected
 LineInFile=Lína %s  í skrá
 RecipientSelectionModules=Skilgreint beiðnir um val viðtakanda
 MailSelectedRecipients=Valdar viðtakendur
-MailingArea=EMailings area
-LastMailings=Latest %s emailings
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Markmið tölfræði
 NbOfCompaniesContacts=Einstök tengiliðum fyrirtækja
 MailNoChangePossible=Viðtakendur fyrir staðfestar póst getur ekki breytt
-SearchAMailing=Leita póstlista
-SendMailing=Senda póst
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Sendur
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Þú getur hins vegar sent þær á netinu með því að bæta breytu MAILING_LIMIT_SENDBYWEB við gildi frá fjölda max tölvupóst þú vilt senda við setu.
 ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Hreinsa lista
 ToClearAllRecipientsClickHere=Smelltu hér til að hreinsa viðtakanda lista fyrir þennan póst
 ToAddRecipientsChooseHere=Bæta við viðtakendur með því að velja úr listanum
-NbOfEMailingsReceived=Mass emailings móttekin
-NbOfEMailingsSend=Mass emailings sent
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=Auðkenni færslu
 DeliveryReceipt=Delivery Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Þú getur notað <b>kommu</b> skiltákn að tilgreina nokkra viðtakendur.
@@ -139,8 +142,10 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -174,15 +179,15 @@ NoContactWithCategoryFound=No category found linked to some contacts/addresses
 NoContactLinkedToThirdpartieWithCategoryFound=No category found linked to some thirdparties
 OutGoingEmailSetup=Outgoing emails
 InGoingEmailSetup=Incoming emails
-OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+OutGoingEmailSetupForEmailing=Outgoing emails (%s)
 DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
-IsNotAnAnswer=Is not answer (initial email)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Is an answer of an initial email
-RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+RecordCreatedByEmailCollector=Record created by the Email Collector %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.
@@ -190,9 +195,12 @@ NoMoreRecipientToSendTo=No more recipient to send the email to
 EmailOptedOut=Email owner has requested to not contact him with this email anymore
 EvenUnsubscribe=Include opt-out emails
 EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Useful for mandatory service emails for example.
-XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s operations done)
 YouCanMakeSomeInstructionForEmail=You can make some instructions for your Email (Example: generate image in email template...)
 ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
+LastNews=Latest News
+ListProducts= List of products
+PasswordReset=Password reset
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index e516b404617..1673be10dea 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -37,6 +37,7 @@ Translation=Þýðing
 Translations=Translations
 CurrentTimeZone=PHP-miðlara Tímasvæði
 EmptySearchString=Enter non empty search criteria
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
@@ -45,6 +46,7 @@ NoError=Engin villa
 Error=Villa
 Errors=Villur
 ErrorFieldRequired=Field ' %s ' er krafist
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=%s  Field 'hefur slæm gildi
 ErrorFileDoesNotExists=Skrá %s er ekki til
 ErrorFailedToOpenFile=Tókst ekki að opna skrána %s
@@ -308,6 +310,7 @@ DateBuild=Skýrsla byggja dagsetningu
 DatePayment=Dagsetning greiðslu
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+PendingSince=Pending since
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Ekki byrjað
 ActionRunningShort=In progress
 ActionDoneShort=Lokið
 ActionUncomplete=Incomplete
-LatestLinkedEvents=Latest %s linked events
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Company/Organization
 Accountant=Accountant
 ContactsForCompany=Tengiliðir / adresses fyrir þessa þriðja aðila
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=Email líkami
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Senda tölvupóst
 Email=Email
+EMail=Email
+EMails=Emails
 NoEMail=No email
 AlreadyRead=Already read
 NotRead=Unread
@@ -793,7 +798,7 @@ Notes=Skýringar
 AddNewLine=Bæta við nýjum línu
 AddFile=Bæta við skrá
 FreeZone=Free-text product
-FreeLineOfType=Free-text item, type:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Klóna mótmæla við helstu eiginleika hennar
 ReGeneratePDF=Re-generate PDF
 PDFMerge=PDF Sameina
@@ -879,12 +884,14 @@ toward=toward
 Access=Access
 SelectAction=Select action
 SelectTargetUser=Select target user/employee
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
 SetDemandReason=Set source
 SetBankAccount=Define Bank Account
 AccountCurrency=Account currency
+AccountancyCode=Accounting Code
 ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected reco
 ConfirmMassClone=Bulk clone confirmation
 ConfirmMassCloneQuestion=Select project to clone to
 ConfirmMassCloneToOneProject=Clone to project %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Related Objects
 ClassifyBilled=Classify Billed
 ClassifyUnbilled=Classify Unbilled
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=You need to be logged and you need permissions to view o
 Download=Download
 DownloadDocument=Download document
 DownloadSignedDocument=Download signed document
-ActualizeCurrency=Update currency rate
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Fiscal year
 ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
 WebSite=Website
@@ -1104,6 +1113,7 @@ PayedBy=Paid by
 PayedTo=Paid to
 Monthly=Monthly
 Quarterly=Quarterly
+Quarter=Quarter
 Annual=Annual
 Local=Local
 Remote=Remote
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Verkefni
 ContactDefault_propal=Tillaga
 ContactDefault_supplier_proposal=Supplier Proposal
 ContactDefault_ticket=Ticket
+ContactDefault_societe=Þriðja aðila
 ContactAddedAutomatically=Contact added from third-party contact roles
 More=More
 ShowDetails=Show details
@@ -1242,6 +1253,7 @@ CommercialAffected=Sales representative assigned
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=Skilaboð
+Emailing=Emailing
 Progression=Framfarir
 YourMessage=Your message
 YourMessageHasBeenReceived=Your message has been received. We will answer or contact you as soon as possible.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Bæta við
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 65cbfc8d55f..37b0c07dc8d 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -65,7 +65,7 @@ ProductStatusOnBuy=Laus
 ProductStatusNotOnBuy=Úrelt
 ProductStatusOnBuyShort=Laus
 ProductStatusNotOnBuyShort=Úrelt
-UpdateVAT=Update vat
+UpdateVAT=Update VAT
 UpdateDefaultPrice=Update default price
 UpdateLevelPrices=Update prices for each level
 AppliedPricesFrom=Applied from
@@ -80,8 +80,11 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Ný verð
 MinPrice=Min. selling price
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=Edit selling price label
-CantBeLessThanMinPrice=Söluverð er ekki vera lægra en lágmarks leyfð fyrir þessa vöru ( %s  án skatta)
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Loka
 ErrorProductAlreadyExists=Vara með% tilvísun s er þegar til.
 ErrorProductBadRefOrLabel=Wrong gildi fyrir tilvísun eða merki.
@@ -94,7 +97,6 @@ ShowService=Sýna þjónusta
 ProductsAndServicesArea=Vara og Þjónusta area
 ProductsArea=Product area
 ServicesArea=Þjónusta area
-ListOfStockMovements=Listi yfir hreyfingar lager
 BuyingPrice=Kaupverð
 PriceForEachProduct=Products with specific prices
 SupplierCard=Vendor card
@@ -137,18 +139,17 @@ ConfirmDeleteProductLine=Ertu viss um að þú viljir eyða þessari vöru línu
 ProductSpecial=Special
 QtyMin=Min. purchase quantity
 PriceQtyMin=Price quantity min.
-PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
-VATRateForSupplierProduct=VAT Rate (for this vendor/product)
+PriceQtyMinCurrency=Price (currency) for this qty.
+WithoutDiscount=Without discount
+VATRateForSupplierProduct=Tax Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
+NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
 PredefinedItem=Predefined item
-PredefinedProductsToSell=Predefined Product
-PredefinedServicesToSell=Predefined Service
-PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
+PredefinedProducts=Predefined Product
+PredefinedServices=Predefined Service
+PredefinedProductsAndServices=Predefined products/services
 NotPredefinedProducts=Not predefined products/services
 GenerateThumb=Mynda þumalfingur
 ServiceNb=Þjónusta # %s
@@ -170,7 +171,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs|Commodity|HS code
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Country of origin
 RegionStateOrigin=Region of origin
 StateOrigin=State|Province of origin
@@ -204,19 +205,16 @@ unitSET=Set
 unitS=Second
 unitH=Klukkustund
 unitD=Dagur
-unitG=Gram
-unitM=Meter
-unitLM=Linear meter
-unitM2=Square meter
-unitM3=Cubic meter
 unitL=Liter
 unitT=ton
 unitKG=kg
 unitG=Gram
+unitGAL=gálgi
 unitMG=mg
 unitLB=pund
 unitOZ=eyri
 unitM=Meter
+unitLM=Linear meter
 unitDM=dm
 unitCM=cm
 unitMM=mm
@@ -261,7 +259,7 @@ Quarter1=1st. Quarter
 Quarter2=2nd. Quarter
 Quarter3=3rd. Quarter
 Quarter4=4th. Quarter
-BarCodePrintsheet=Print barcode
+BarCodePrintsheet=Print barcodes
 PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
 NumberOfStickers=Number of stickers to print on page
 PrintsheetForOneBarCode=Print several stickers for one barcode
@@ -314,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.c
 UpdateInterval=Update interval (minutes)
 LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
-PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=Select PDF files
 IncludingProductWithTag=Including products/services with the tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
@@ -344,18 +342,23 @@ PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
 UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
 ProductSupplierDescription=Vendor description for the product
-UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
-PackagingForThisProduct=Packaging
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
+UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
+PackagingForThisProduct=Packaging of quantities
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
+Attributes=Eiginleiki
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Variant attributes
 ProductAttributes=Variant attributes for products
 ProductAttributeName=Variant attribute %s
 ProductAttribute=Variant attribute
 ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
 ProductCombinations=Variants
@@ -386,6 +389,7 @@ ErrorDeletingGeneratedProducts=There was an error while trying to delete existin
 NbOfDifferentValues=No. of different values
 NbProducts=Number of products
 ParentProduct=Parent product
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Hide variant products
 ShowChildProducts=Show variant products
 NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
@@ -396,18 +400,49 @@ ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
 ProductsPricePerCustomer=Product prices per customers
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
-AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
+AmountUsedToUpdateWAP=Unit amount to use to update the Weighted Average Price
 PMPValue=Vegið meðalverð
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
 mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
+mandatoryHelper2=Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+MergeOriginProduct=Duplicated product (the product you want to delete)
+MergeProducts=Merge products
+ConfirmMergeProducts=Are you sure you want to merge the chosen product with the current one? All linked objects (invoices, orders, ...) will be moved to the current product, after which the chosen product will be deleted.
+ProductsMergeSuccess=Products have been merged
+ErrorsProductsMerge=Errors in products merge
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+UpdatePrice=Increase/decrease customer price
+StockMouvementExtraFields= Extra Fields (stock movement)
+InventoryExtraFields= Extra Fields (inventory)
+ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
+PuttingPricesUpToDate=Update prices with current known prices
+PuttingDescUpToDate=Update descriptions with current known descriptions
+PMPExpected=Expected PMP
+ExpectedValuation=Expected Valuation
+PMPReal=Real PMP
+RealValuation=Real Valuation
+ConfirmEditExtrafield = Select the extrafield you want modify
+ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
+ModifyValueExtrafields = Modify value of an extrafield
+OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
+ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
+WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned
+PriceLabel=Price label
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 72cc47c30a2..b4cdb5386c9 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=La verifica di integrità dei file è stata s
 FileIntegritySomeFilesWereRemovedOrModified=Il controllo dell'integrità dei file è fallito. Alcuni file sono stati modificati, rimossi o aggiunti.
 GlobalChecksum=Controllo di integrità globale
 MakeIntegrityAnalysisFrom=Analizza integrità dei files dell'applicazione da
-LocalSignature=Firma locale incorporata (meno affidabile)
-RemoteSignature=Firma remota (più affidabile)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=File mancanti
 FilesUpdated=File aggiornati
 FilesModified=File modificati
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Sicurezza
 Passwords=Password
 DoNotStoreClearPassword=Crittografa le password archiviate in database.
-MainDbPasswordFileConfEncrypted=Password del database crittata in conf.php (raccomandato)
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=Per avere la password codificata sostituisci nel file <b>conf.php</b> , la linea <br><b>$dolibarr_main_db_pass="...";</b><br>con<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Per avere la password decodificata (in chiaro) sostituisci nel file<b>conf.php</b> la linea <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>con<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Punto geometrico
 ExtrafieldMultiPointGeo=Multipunto geometrico
 ExtrafieldLinestringGeo=Linea geometrica
 ExtrafieldPolygonGeo=Poligono geometrico
+ExtrafieldStars=Stars
 ComputedFormula=Campo calcolato
-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=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'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Lasciare vuoto questo campo significa che questo valore verrà archiviato SENZA crittografia (campo è semplicemente nascosto con stelle sullo schermo).<br><br>Immetti il valore 'dolcrypt' per codificare il valore con un algoritmo di crittografia reversibile. I dati cancellati possono ancora essere conosciuti e modificati ma sono crittografati in database.<br><br>Inserisci 'auto' (o 'md5', 'sha256', 'password_hash', ...) per utilizzare default algoritmo di crittografia della password (o md5, sha256, password_hash...) per salvare la password con hash non reversibile in database (nessun modo di recuperare il valore originale)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Anche l'utilizzo del server SMTP del tuo provider di servizi di posta elettronica per inviare e-mail è interessante, quindi tutte le e-mail inviate dall'applicazione verranno salvate anche nella directory "Inviati" della tua casella di posta.
 WarningPHPMailD=Si consiglia pertanto di modificare il metodo di invio delle email al valore "SMTP".
 WarningPHPMailDbis=Se vuoi davvero mantenere il metodo "PHP" predefinito per inviare e-mail, ignora questo avviso o rimuovilo con %s cliccando qui %s.
-WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Contabilità (semplificata)
 Module10Desc=Resoconti contabili semplici (spese, ricavi) basati sul contenuto del database. Non usa tabelle di contabilità generale.
 Module20Name=Proposte
 Module20Desc=Gestione proposte commerciali
-Module22Name=Mass Emailings
-Module22Desc=Gestione invii di posta massiva
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energia
 Module23Desc=Monitoraggio del consumo energetico
 Module25Name=Ordini Cliente
@@ -813,7 +814,7 @@ Permission147=Vedere statistiche
 Permission151=Vedere ordini permanenti
 Permission152=Creare/modificare richieste di ordini permanenti
 Permission153=Trasmettere fatture ordini permanenti
-Permission154=Record Credits/Rejections of direct debit payment orders
+Permission154=Registra accredito/respinta dell'ordine di addebito diretto
 Permission161=Leggi contratti / abbonamenti
 Permission162=Crea/modifica contratti/abbonamenti
 Permission163=Attiva un servizio/sottoscrizione di un contratto
@@ -847,10 +848,10 @@ Permission212=Ordinare linee
 Permission213=Attivare linee
 Permission214=Configurare telefonia
 Permission215=Impostare provider
-Permission221=Vedere invii email
-Permission222=Creare/modificare email (titolo, destinatari ...)
-Permission223=Convalidare email (consente l'invio)
-Permission229=Eliminare email
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Vedi destinatari e info
 Permission238=Spedisci mail manualmente
 Permission239=Cancella le mail dopo la validazione o dopo l'invio
@@ -1105,6 +1106,7 @@ DictionaryStaff=Numero di dipendenti
 DictionaryAvailability=Tempi di consegna
 DictionaryOrderMethods=Metodi di ordine
 DictionarySource=Origine delle proposte/ordini
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Gruppi personalizzati per reportistica avanzata
 DictionaryAccountancysystem=Modelli per piano dei conti
 DictionaryAccountancyJournal=Giornali (causali)
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Torna all'elenco dei dizionari
 TypeOfRevenueStamp=Type of tax stamp
 VATManagement=Gestione imposte sulle vendite
 VATIsUsedStandard=Durante la creazione di documenti (Proposte, fatture, ordini...), default La tariffa di vendita imposte è impostata in base alle regole standard (a seconda dei paesi dell'acquirente e del venditore)
-VATIsUsedDesc=Da default durante la creazione di Proposte, fatture, ordini ecc. Vendite imposte la tariffa segue la regola standard attiva:<br>Se il venditore non è soggetto a Vendite imposte, quindi Vendite imposte assume il valore predefinito 0. Fine della regola.<br>Se (paese del venditore = paese dell'acquirente), le vendite imposte di default equivalgono alle vendite imposte del prodotto nel paese del venditore. Fine della regola.<br>Se il venditore e l'acquirente si trova entrambi nella Comunità Europea e le merci sono prodotti legati al trasporto (trasporto, spedizione, compagnia aerea), l'default IVA è 0. Questa regola è dipende dal paese del venditore: consulta il tuo commercialista. L'IVA deve essere Pagato dall'acquirente all'ufficio doganale del proprio paese e e non al venditore. Fine della regola.<br>Se il venditore e l'acquirente si trova entrambi nella Comunità Europea e l'acquirente non è un azienda (con partita IVA intracomunitaria registrata numero), quindi l'IVA viene impostata automaticamente sull'IVA tasso del paese del venditore. Fine della regola.<br>Se il venditore e l'acquirente si trova entrambi nella Comunità Europea e l'acquirente è un azienda (con partita IVA intracomunitaria registrata numero), quindi l'IVA è 0 per default. Fine della regola.<br>In ogni altro caso il default proposto è Sales imposte=0. Fine della regola.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Per impostazione predefinita, l'imposta sulle vendite proposta è 0 che può essere utilizzata per casi come associazioni, privati o piccole aziende.
 VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
 VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
-VATType=imposte tipo
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Tipo di imposta sulle vendite
 LTRate=Tariffa
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Secondo la configurazione delle imposte (Vedi %s - %s
 LabelUsedByDefault=Descrizione (utilizzata in tutti i documenti per cui non esiste la traduzione)
 LabelOnDocuments=Descrizione sul documento
 LabelOrTranslationKey=Etichetta o chiave di traduzione
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Traduzione trovata
 TheTranslationIsSearchedFromKey=La traduzione viene cercata dalla chiave di traduzione: <b>%s</b>
 TranslationKey=Chiave di traduzione
@@ -1431,7 +1434,7 @@ AddVatInList=Visualizza il numero di partita IVA cliente/fornitore negli elenchi
 AddAdressInList=Visualizza l'indirizzo cliente/Fornitore in elenchi combinati.<br>Verranno visualizzate le terze parti con il formato del nome "The Big azienda corp. - 21 jump street 123456 Big town - USA" invece di "The Big azienda corporativo".
 AddEmailPhoneTownInContactList=Visualizza il contatto email (o telefoni se non definiti) e città in elenchi combinati.<br>I contatti verranno visualizzati con il formato del nome "Dupond Durand - dupond.durand@Esempio.com - Parigi" o "Dupond Durand - 06 07 59 65 66 - Parigi" invece di "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
-FieldEdition=Modifica del campo %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Per esempio: +2 (compilare solo se ci sono problemi di scostamento del fuso orario)
 GetBarCode=Ottieni codice a barre
 NumberingModules=Modelli di numerazione
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Forza la data della fattura alla data di convalida
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggerire le modalità predefinite di pagamento delle fatture, se non definite già nella fattura
 SuggestPaymentByRIBOnAccount=Suggerire il pagamento tramite bonifico bancario
 SuggestPaymentByChequeToAddress=Suggerisci pagamento con assegno a
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Testo libero sulle fatture
 WatermarkOnDraftInvoices=Bozze delle fatture filigranate (nessuna filigrana se vuoto)
 PaymentsNumberingModule=Modello per la numerazione dei documenti
@@ -1718,6 +1723,7 @@ CompressionOfResources=Compressione delle risposte HTTP
 CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Con i browser attuali l'individuazione automatica non è possibile
 DefaultValuesDesc=Qui è possibile definire il valore predefinito che si desidera utilizzare durante la creazione di un nuovo record e / o i filtri predefiniti o l'ordinamento quando si elencano i record.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Valori predefiniti (da utilizzare nei form)
 DefaultSearchFilters=Filtri di ricerca predefiniti
 DefaultSortOrder=Ordinamento predefinito
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Moduli per la numerazione delle spedizioni
 SendingsAbility=Support shipping sheets for customer deliveries
 NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Testo libero per le spedizioni
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Numerazione dei moduli di consegna prodotti
 DeliveryOrderModel=Modello ricevuta di consegna prodotti
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Testo libero sulle ricevute di consegna
 ##### FCKeditor #####
 AdvancedEditor=Editor avanzato
 ActivateFCKeditor=Attiva editor avanzato per:
-FCKeditorForNotePublic=Creazione/edizione WYSIWYG delle campo "note pubbliche" degli elementi
-FCKeditorForNotePrivate=Creazione/edizione WYSIWYG delle campo "note private" degli elementi
-FCKeditorForCompany=Creazione/modifica WYSIWYG degli campo Descrizione di elementi (esclusi prodotti/servizi)
-FCKeditorForProductDetails=Creazione/edizione WYSIWYG di prodotti Descrizione o linee per oggetti (linee di Proposte, ordini, fatture, ecc...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Attenzione: l'utilizzo di questa opzione per questo caso è seriamente sconsigliato in quanto può creare problemi con i caratteri speciali e la formattazione della pagina durante la creazione di file PDF.
-FCKeditorForMailing= Creazione/edizione WYSIWYG per eMailing di massa (Strumenti->eMailing)
-FCKeditorForUserSignature=Creazione/modifica WYSIWYG della firma utente
-FCKeditorForMail=Creazione/modifica WYSIWYG per tutta la posta (eccetto Strumenti->eMailing)
-FCKeditorForTicket=Creazione/modifica WYSIWYG per ticket
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Impostazioni modulo magazzino
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
@@ -1867,7 +1874,6 @@ Buy=Acquista
 Sell=Vendi
 InvoiceDateUsed=Data utilizzata per la fatturazione
 YourCompanyDoesNotUseVAT=La tua azienda è stata definita per non utilizzare l'IVA (Home - Installazione - Azienda / Organizzazione), quindi non ci sono opzioni IVA da impostare.
-AccountancyCode=Conto di contabilità
 AccountancyCodeSell=Codice contabilità vendite
 AccountancyCodeBuy=Codice contabilità acquisti
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mantieni la casella di controllo "Crea automaticamente il pagamento" vuota per impostazione predefinita quando crei una nuova tassa
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Quale vista si desidera aprire per impostazione predefinit
 AGENDA_EVENT_PAST_COLOR = Colore dell'evento passato
 AGENDA_EVENT_CURRENT_COLOR = Colore dell'evento corrente
 AGENDA_EVENT_FUTURE_COLOR = Colore dell'evento futuro
-AGENDA_REMINDER_BROWSER = Abilita promemoria eventi <b> sul browser dell'utente </b> (Quando viene raggiunta la data del promemoria, il browser mostra un popup. Ogni utente può disabilitare tali notifiche dalla configurazione delle notifiche del browser).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Attiva i suoni per le notifiche
-AGENDA_REMINDER_EMAIL = Abilita promemoria evento <b> tramite e-mail </b> (l'opzione di promemoria/ritardo può essere definita su ciascun evento).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Nota: la frequenza del lavoro pianificato %s deve essere sufficiente per essere sicuri che il promemoria venga inviato al momento corretto.
 AGENDA_SHOW_LINKED_OBJECT = Show linked object into agenda view
 AGENDA_USE_EVENT_TYPE = Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Automatically set this default value for type of event in event create form
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Chiave per autorizzare l'esportazione di link
 PastDelayVCalExport=Non esportare evento più vecchio di
 SecurityKey = Chiave di sicurezza
@@ -2006,7 +2017,7 @@ BackupZipWizard=Procedura guidata per creare l'archivio della directory dei docu
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
 InstallModuleFromWebHasBeenDisabledContactUs=L'installazione o lo sviluppo di moduli esterni o siti Web dinamici, dall'applicazione, è attualmente bloccato per motivi di sicurezza. Contattaci se hai bisogno di abilitare questa funzione.
-InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Evidenzia il colore della linea quando passa il mouse (usa 'ffffff' per nessuna evidenziazione)
@@ -2036,6 +2047,7 @@ Enter0or1=Inserire 0 o 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=Il colore RGB è nel formato HEX, es:FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Nome dell'icona nel formato:<br>- image.png per un'immagine file nella directory del tema corrente<br>- image.png@modulo if file è nel directory /img/ di un modulo<br>- fa-xxx per un'immagine FontAwesome fa-xxx<br>- fontawesome_xxx_fa_color_size per un'immagine FontAwesome fa-xxx (con prefisso, Colore e dimensione impostata )
 PositionIntoComboList=Posizione di questo modello nella menu a tendina
 SellTaxRate=Aliquota dell'imposta sulle vendite
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Nascondi i bordi sulla cornice dell'indirizzo del mittente
 MAIN_PDF_NO_RECIPENT_FRAME=Nascondi i bordi nel riquadro dell'indirizzo del destinatario
 MAIN_PDF_HIDE_CUSTOMER_CODE=Nascondi codice cliente
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Nascondi il nome del mittente/della società nel blocco degli indirizzi
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Nascondi condizioni di pagamento
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Nascondi modalità di pagamento
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Aggiungi un markup nascosto nella firma area per consentire allo strumento di firma elettronica di riutilizzarlo. Potrebbe essere utilizzato da strumenti esterni o in futuro dalla firma online funzionalità.
@@ -2324,6 +2341,8 @@ NotRecommended=Non consigliato
 ARestrictedPath=Un percorso limitato per i file di dati
 CheckForModuleUpdate=Controlla gli aggiornamenti dei moduli esterni
 CheckForModuleUpdateHelp=Questa azione si collegherà agli editor di moduli esterni per verificare se è disponibile una nuova versione.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Un aggiornamento è disponibile
 NoExternalModuleWithUpdate=Nessun aggiornamento trovato per i moduli esterni
 SwaggerDescriptionFile=File di descrizione dell'API Swagger (per l'uso con redoc, ad esempio)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Mostra l'indirizzo di spedizione
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Indicazione obbligatoria in alcuni paesi (Francia, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Link URL del social network. Utilizza {socialid} per la parte variabile che contiene l'ID del social network.
 IfThisCategoryIsChildOfAnother=Se questa categoria è figlia di un'altra
 DarkThemeMode=Modalità tema scuro
@@ -2450,14 +2471,14 @@ WarningModuleHasChangedLastVersionCheckParameter=Attenzione: modulo %s ha impost
 WarningModuleHasChangedSecurityCsrfParameter=Avviso: modulo %s ha Disabilitato la sicurezza CSRF della tua istanza. Questa azione è sospetta e che la tua installazione potrebbe non essere più protetta. Contatta l'autore di modulo per spiegazioni.
 EMailsInGoingDesc=Le e-mail in arrivo sono gestite da modulo %s. Devi abilitare e configurarlo se hai bisogno di supportare le email in entrata.
 MAIN_IMAP_USE_PHPIMAP=Utilizza la libreria PHP-IMAP per IMAP invece dell'IMAP PHP nativo. Ciò consente anche l'uso di un OAuth2 connessione per IMAP (modulo anche OAuth deve essere attivato).
-MAIN_CHECKBOX_LEFT_COLUMN=Mostra la colonna per la selezione del campo e della riga a sinistra (a destra per impostazione predefinita)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Non creato per impostazione predefinita. Creato solo all'attivazione del modulo.
 CSSPage=Stile CSS
 Defaultfortype=Predefinito
 DefaultForTypeDesc=Modello utilizzato per impostazione predefinita durante la creazione di una nuova e-mail per il tipo di modello
 OptionXShouldBeEnabledInModuleY=L'opzione " <b> %s </b> " dovrebbe essere abilitata nel modulo <b> %s </b>
 OptionXIsCorrectlyEnabledInModuleY=L'opzione " <b> %s </b> " è abilitata nel modulo <b> %s </b>
-AllowOnLineSign=Consenti sulla firma linea
+AllowOnLineSign=Consenti firma online
 AllowOnLineSignDesc=Un collegamento per consentire la firma online di una banca documento (mandato per Domiciliazione for Esempio) è disponibile nelle modalità Elenco di pagamento di terze parti per conto in banca
 AtBottomOfPage=A fondo pagina
 FailedAuth=autenticazioni fallite
@@ -2489,7 +2510,7 @@ AiDescription=Funzionalità dell'intelligenza artificiale (intelligenza artifici
 AiDescriptionLong=Fornisce funzionalità AI (intelligenza artificiale) in diverse parti di Applicazione. È necessaria un'API AI esterna.
 AI_API_KEY=Chiave per API AI
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Servizio da utilizzare per le funzionalità AI
+AI_API_SERVICE=AI service to use
 AiSetup=Configurazione dell'AI modulo
 AiCustomPrompt=Prompt personalizzato dell'IA
 AI_CONFIGURATIONS_PROMPT=Richiesta personalizzata
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=Richieste personalizzate dell'intelligenza artificiale per l
 EnterAnIP=inserirci un indirizzo IP
 ConvertInto=Convertire in
 YouAreHere=Tu sei qui
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Mostra il codice a barre nel spedizione PDF documento
 BARCODE_ON_RECEPTION_PDF=Mostra il codice a barre nel ricezione PDF documento
 BARCODE_ON_STOCKTRANSFER_PDF=Mostra codice a barre sul PDF di trasferimento titoli documento
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Mostra l'indirizzo di spedizione
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index 14fc86f59ed..dd304ddb3ea 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Saldo finale
 CurrentBalance=Saldo attuale
 FutureBalance=Saldo futuro
 ShowAllTimeBalance=Visualizza situazione del conto dall'inizio
-AllTime=Dall'inizio
 Reconciliation=Riconciliazione
 RIB=Coordinate bancarie
 IBAN=Codice IBAN
@@ -38,7 +37,7 @@ IbanValid=Il codice IBAN è valido
 IbanNotValid=Il codice IBAN non è valido
 StandingOrders=Ordini di addebito diretto
 StandingOrder=Ordine di addebito diretto
-PaymentByDirectDebit=Pagamento con addebito diretto
+PaymentByDirectDebit=Incassi con addebito diretto
 PaymentByBankTransfers=Pagamenti tramite bonifico bancario
 PaymentByBankTransfer=Pagamento con bonifico bancario
 AccountStatement=Estratto conto
@@ -133,7 +132,7 @@ DeleteTransaction=Elimina transazione
 ConfirmDeleteTransaction=Vuoi davvero eliminare questa transazione?
 ThisWillAlsoDeleteBankRecord=Questa operazione elimina anche le transazioni bancarie generate
 BankMovements=Movimenti
-PlannedTransactions=Transazioni pianificate
+PlannedTransactions=Upcoming entries
 Graph=Grafici
 ExportDataset_banque_1=Movimenti bancari e di cassa e loro rilevazioni
 ExportDataset_banque_2=Modulo di versamento
@@ -151,7 +150,7 @@ FutureTransaction=Transazioni futura. Impossibile riconciliare
 SelectChequeTransactionAndGenerate=Selezionare/filtrare gli assegni che devono essere inclusi nella ricevuta di deposito dell'assegno. Quindi, fai clic su "Crea".
 SelectPaymentTransactionAndGenerate=Seleziona/filtra i documenti da inserire nella ricevuta di versamento %s. Quindi, fai clic su "Crea".
 InputReceiptNumber=Scegli l'estratto conto relativo alla conciliazione. Utilizzare un valore numerico ordinabile
-InputReceiptNumberBis=AAAAMM o AAAAMMGG
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Da conciliare?
 ThenCheckLinesAndConciliate=Controlla tutte le informazioni prima di cliccare
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Se questa funzione è abilitata, è possibile scegliere
 BankColorizeMovementName1=Colore di sfondo per il movimento di debito
 BankColorizeMovementName2=Colore di sfondo per il movimento del credito
 IfYouDontReconcileDisableProperty=Se non esegui le riconciliazioni bancarie su alcuni conti bancari, disabilita la proprietà "%s" su di essi per rimuovere questo avviso.
-NoBankAccountDefined=Nessun conto bancario definito
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Nessun record trovato nel conto bancario. Comunemente, ciò si verifica quando un record è stato eliminato manualmente dall'elenco delle transazioni nel conto bancario (ad esempio durante una riconciliazione del conto bancario). Un altro motivo è che il pagamento è stato registrato quando il modulo "%s" è stato disabilitato.
 AlreadyOneBankAccount=È già stato definito un conto bancario
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Variante file SEPA
diff --git a/htdocs/langs/it_IT/blockedlog.lang b/htdocs/langs/it_IT/blockedlog.lang
index 353bed0aeda..0579c1df74c 100644
--- a/htdocs/langs/it_IT/blockedlog.lang
+++ b/htdocs/langs/it_IT/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=La voce di registro archiviata non è valida. Significa che qualcuno (un hacker?) ha modificato alcuni dati di questo record dopo che è stato registrato, o ha cancellato il precedente record archiviato (verifica che la riga con il precedente # esista) o ha modificato il checksum del record precedente.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Log Details
 ListOfTrackedEvents=List of tracked events
 Fingerprint=Fingerprint
 DownloadLogCSV=Export archived logs (CSV)
-DataOfArchivedEvent=Dati completi dell'evento archiviato
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
 BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
@@ -30,6 +32,7 @@ BlockedLogEnabled=È stato abilitato il sistema per tenere traccia degli eventi
 BlockedLogDisabled=Il sistema per tenere traccia degli eventi in registri inalterabili è stato disabilitato dopo l'esecuzione di alcune registrazioni. Abbiamo salvato un'impronta digitale speciale per tracciare la catena come rotta
 BlockedLogDisabledBis=Il sistema per tenere traccia degli eventi in log inalterabili è stato disabilitato. Ciò è possibile perché non è stata ancora eseguita alcuna registrazione.
 LinkHasBeenDisabledForPerformancePurpose=A scopo di performance, collegamento diretto a documento non viene visualizzato dopo il centesimo linea.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Customer invoice logically deleted
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
 logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
 logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
 logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang
index e79ca67e577..0c549376e48 100644
--- a/htdocs/langs/it_IT/categories.lang
+++ b/htdocs/langs/it_IT/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Area tag/categorie contatti
 AccountsCategoriesArea=Area tag/categorie conti
 ProjectsCategoriesArea=Area tag/categorie progetti
 UsersCategoriesArea=Area tag/categorie utenti
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Sub-categorie
 CatList=Elenco tag/categorie
 CatListAll=Elenco tag / categorie (tutti i tipi)
@@ -90,9 +91,10 @@ CategoriesSetup=Impostazioni Tag/categorie
 CategorieRecursiv=Collega automaticamente alla tag/categoria padre
 CategorieRecursivHelp=Se l'opzione è attiva, quando aggiungi un oggetto in una sottocategoria, oggetto verrà aggiunto anche nella categorie.
 AddProductServiceIntoCategory=Assegna categoria al prodotto/servizio
-AddCustomerIntoCategory=Assegna la categoria al cliente
-AddSupplierIntoCategory=Assegna la categoria al fornitore
-AssignCategoryTo=Assegna categoria a
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Mostra tag/categoria
 ByDefaultInList=Default nella lista
 ChooseCategory=Choose category
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Pagina-Contenitore delle Categorie
 KnowledgemanagementsCategoriesArea=Categorie di articoli KM
 UseOrOperatorForCategories=Usa l'operatore 'OR' per le categorie
 AddObjectIntoCategory=Assegna a categorie
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index 771f9ae90e0..10bd3e31375 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -34,7 +34,7 @@ PriceFormatInCurrentLanguage=Price display format in the current language and cu
 ThirdPartyName=Nome Soggetto terzo
 ThirdPartyEmail=e-mail Soggetto terzo
 ThirdParty=Soggetto terzo
-ThirdParties=Soggetti Terzi
+ThirdParties=Third parties
 ThirdPartyProspects=Clienti potenziali
 ThirdPartyProspectsStats=Clienti potenziali
 ThirdPartyCustomers=Clienti
@@ -65,6 +65,7 @@ State=Provincia/Cantone/Stato
 StateId=ID di stato
 StateCode=Stato / Provincia
 StateShort=Stato
+DepartmentBuyer=Buyer's state/province
 Region=Regione
 Region-State=Regione - Stato
 Country=Paese
@@ -78,7 +79,7 @@ Chat=Chat
 PhonePro=Telefono uff.
 PhonePerso=Telefono pers.
 PhoneMobile=Cellulare
-No_Email=Rifiuta email di massa
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=CAP
 Town=Città
@@ -382,12 +383,12 @@ ExportCardToFormat=Esportazione scheda nel formato
 ContactNotLinkedToCompany=Contatto non collegato ad alcuna società
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=Senza accesso a Dolibarr
-ExportDataset_company_1=Soggetti terzi (aziende, fondazioni, persone fisiche) e dettagli
-ExportDataset_company_2=Contatti e loro attributi
-ExportDataset_company_3=Third-parties Bank accounts
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Third-parties and their properties
 ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
-ImportDataset_company_3=Third-parties Bank accounts
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
 PriceLevel=Livello dei prezzi
 PriceLevelLabels=Etichette livello dei prezzi
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=codice gratuito senza verifica.
 ManagingDirectors=Nome Manager(s) (CEO, direttore, presidente...)
 MergeOriginThirdparty=Terza parte duplicata (la terza parte che desideri cancella)
 MergeThirdparties=Unisci soggetti terzi
-ConfirmMergeThirdparties=Sei sicuro di voler unire la terza parte scelta con quella attuale? Tutti gli oggetti collegati (fatture, ordini, ...) verranno spostati nella terza parte corrente, dopodiché la terza parte scelta verrà eliminata.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Terze parti sono state unite
 SaleRepresentativeLogin=Login del rappresentante commerciale
 SaleRepresentativeFirstname=Nome del commerciale
@@ -461,3 +462,6 @@ ExternalSystemID=ID del sistema esterno
 IDOfPaymentInAnExternalSystem=ID della modalità pagamento in un sistema esterno (come Stripe, Paypal, ...)
 AADEWebserviceCredentials=Credenziali del servizio Web AADE
 ThirdPartyMustBeACustomerToCreateBANOnStripe=La terza parte deve essere una cliente per consentire la creazione della propria banca informazione sul lato Stripe
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index 1c4de5a5360..6bb3cbb7aee 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Pagamento fattura attiva
 PaymentSupplierInvoice=pagamento fattura fornitore
 PaymentSocialContribution=Pagamento delle imposte sociali/fiscali
 PaymentVat=Pagamento IVA
-AutomaticCreationPayment=Crea automaticamente il pagamento
+AutomaticCreationPayment=Also record the payment
 ListPayment=Elenco dei pagamenti
 ListOfCustomerPayments=Elenco dei pagamenti dei clienti
 ListOfSupplierPayments=Elenco dei pagamenti fornitore
@@ -118,10 +118,14 @@ SocialContributionsPayments=Pagamenti tasse/contributi
 ShowVatPayment=Visualizza pagamento IVA
 TotalToPay=Totale da pagare
 BalanceVisibilityDependsOnSortAndFilters=Il saldo è visibile in questo elenco solo se la tabella è ordinata su %s e filtrata su 1 conto bancario (senza altri filtri)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Codice contabile cliente
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Codice contabile fornitore
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Cod. cont. cliente
 SupplierAccountancyCodeShort=Cod. cont. fornitore
+UserAccountancyCodeShort=User account. code
 AccountNumber=Numero di conto
 NewAccountingAccount=Nuovo conto
 Turnover=Turnover invoiced
@@ -129,7 +133,9 @@ TurnoverCollected=Fatturato
 SalesTurnoverMinimum=Fatturato minimo di vendita
 ByExpenseIncome=By expenses & incomes
 ByThirdParties=Per soggetti terzi
+ByProjects=By projects
 ByUserAuthorOfInvoice=Per autore fattura
+DetailedListLowercase=detailed list
 CheckReceipt=Distinta di deposito
 CheckReceiptShort=Distinta di deposito
 LastCheckReceiptShort=Ultimo %s distinte di versamento
diff --git a/htdocs/langs/it_IT/datapolicy.lang b/htdocs/langs/it_IT/datapolicy.lang
index e3d2af1c829..e68487f7ae8 100644
--- a/htdocs/langs/it_IT/datapolicy.lang
+++ b/htdocs/langs/it_IT/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Informativa sulla privacy dei dati
 Module4100Desc = modulo per gestire la Privacy dei Dati (Conformità al GDPR)
 # Administration page
 datapolicySetup = modulo Configurazione della politica sulla privacy dei dati
-Deletion = Cancellazione dei dati
-datapolicySetupPage = A seconda delle leggi dei vostri paesi (Esempio <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Articolo 5</a> del GDPR), i dati personali devono essere conservati per un periodo non superiore a quello necessario allo scopo per il quale sono stati raccolti, fatte salve le finalità di archiviazione.<br>La cancellazione sarà essere fatto automaticamente dopo una certa durata senza eventi (la durata che avrai indicato di seguito).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s mesi
 ONE_YEAR = 1 anno
 NB_YEARS = %s anni
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = cliente potenziale/cliente
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Né cliente potenziale/Né cliente
 DATAPOLICY_CONTACT_FOURNISSEUR = Fornitore
 DATAPOLICY_ADHERENT = Membro
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Puoi inviare un GDPR email a tutti i tuoi contatti rilevanti (che non hanno ancora ricevuto un email e per il quale non hai registrato nulla relativo al loro accordo GDPR). Per fare ciò, utilizza il pulsante seguire.
 SendAgreement = Inviare emails
 AllAgreementSend = Tutte le email sono state inviate
 TXTLINKDATAPOLICYACCEPT = Testo per l'collegamento "accordo"
 TXTLINKDATAPOLICYREFUSE = Testo per il collegamento "disaccordo"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: Trattamento dei dati personali
 DATAPOLICY_consentement = Consenso ottenuto per il trattamento dei dati personali
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index 8d1f36cb945..224ceeb73ec 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Errore durante la creazione dei file imm
 ErrorFailedToCreateDir=Impossibile creare la directory. Verifica che l'utente del server Web abbia i permessi per scrivere nella directory Dolibarr. Se il parametro <b>safe_mode</b> è abilitato in PHP, verifica che i file php di Dolibarr appartengano all'utente o al gruppo del server web (per esempio www-data).
 ErrorNoMailDefinedForThisUser=Nessun indirizzo memorizzato per questo utente
 ErrorSetupOfEmailsNotComplete=L'impostazione delle e-mail non è completa
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Questo funzionalità necessita che JavaScript sia attivato per funzionare. Modificarlo in configurazione - display.
 ErrorTopMenuMustHaveAParentWithId0=Un menu di tipo "Top" non può appartenere ad un menu superiore. Seleziona 0 menu genitori o scegli un menu di tipo "Left".
 ErrorLeftMenuMustHaveAParentId=Un menu di tipo 'Left' deve avere un id genitore
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Upload bloccato da un plugin di Apache/PHP
 ErrorFileSizeTooLarge=La dimensione del file è troppo grande o il file non è fornito.
 ErrorFieldTooLong=Il campo %s è troppo lungo.
 ErrorSizeTooLongForIntType=Numero troppo lungo (massimo %s cifre)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Stringa troppo lunga (limite di %s caratteri)
 ErrorNoValueForSelectType=Per favore immetti un valore per la lista di selezione
 ErrorNoValueForCheckBoxType=Per favore immetti un valore per la lista di controllo
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Valore del codice errato. Riprova con un nuovo valore...
 ErrorBothFieldCantBeNegative=I campi %s e %s non possono essere entrambi negativi
 ErrorFieldCantBeNegativeOnInvoice=campo <strong>%s</strong> Non può essere negativo su questo tipo di fattura. Se devi aggiungere uno sconto linea, basta creare prima lo sconto (da campo '%s' nella scheda di terze parti) e applicalo a fattura .
 ErrorLinesCantBeNegativeForOneVATRate=Il totale delle righe (al netto delle imposte) non può essere negativo per un'aliquota IVA non nulla (Trovato un totale negativo per l'aliquota IVA <b> %s </b> %%).
-ErrorLinesCantBeNegativeOnDeposits=Le linee non possono essere negative in un deposito. Dovrai affrontare problemi quando dovrai consumare il deposito nella fattura finale se lo fai.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=La quantità di ciascuna riga della fattura cliente non può essere negativa
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=L'account utente <b>%s</b> utilizzato per eseguire il server web non ha i permessi necessari
 ErrorNoActivatedBarcode=Nessun tipo di codice a barre attivato
 ErrUnzipFails=Estrazione dell'archivio %s con ZipArchive fallita
@@ -303,8 +306,8 @@ ErrorThirpdartyOrMemberidIsMandatory=Terza parte o Membro di partnership è obbl
 ErrorFailedToWriteInTempDirectory=Impossibile scrivere nella directory temporanea
 ErrorQuantityIsLimitedTo=La quantità è limitata a %s
 ErrorFailedToLoadThirdParty=Impossibile trovare/caricare terze parti da id=%s, email=%s, nome=%s
-ErrorThisPaymentModeIsNotDirectDebit=The payment mode is not direct debit
-ErrorThisPaymentModeIsNotCreditTransfer=The payment mode is not credit transfer
+ErrorThisPaymentModeIsNotDirectDebit=La modalità di pagamento non è addebito diretto
+ErrorThisPaymentModeIsNotCreditTransfer=Il metodo di pagamento non è domiciliazione bancaria.
 ErrorStripeCustomerNotFoundCreateFirst=Stripe cliente non è impostato per questa terza parte (o impostato su un valore eliminato sul lato Stripe). creare (o ricollegalo) prima.
 ErrorCharPlusNotSupportedByImapForSearch=La ricerca IMAP non è in grado di cercare nel mittente o nel destinatario una stringa contenente il carattere +
 ErrorTableNotFound=Tabella <b> %s </b> non trovata
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Troppi linee da elaborare. Si prega di utilizzare un filtro più selettivo.
 ErrorEmptyValueForQty=La quantità Non può deve essere zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=Questo ID genitore non esiste più
 WarningReadBankAlsoAllowedIfUserHasPermission=Attenzione, la lettura di Conto bancario è consentita anche con l'autorizzazione a Gestire il grafico di conto
 WarningNoDataTransferedInAccountancyYet=Per favore Nota, non ci sono dati nella tabella Contabilità. Trasferisci i tuoi dati registrati nella sezione Applicazione alla sezione Contabilità o modifica la modalità di calcolo per analizzare i dati registrati all'esterno di Contabilità.
 WarningChangingThisMayBreakStopTaskScheduler=Attenzione, la modifica di questo valore potrebbe disabilitare lo scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR fattura può essere aggiunto solo su fatture impostato su Pagato con credito trasferire pagamenti.
 SwissQrCreditorAddressInvalid = L'indirizzo Creditore non è valido (la città ZIP e è impostata? (%s)
 SwissQrCreditorInformationInvalid = Creditore le informazioni non sono valide per l'IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s è già definito come contatto pe
 ErrorThisGroupIsAlreadyDefinedAsThisType=I contatti con questo gruppo sono già definiti come contatto per questo tipo.
 EmptyMessageNotAllowedError=Non è consentito un messaggio vuoto
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/it_IT/exports.lang b/htdocs/langs/it_IT/exports.lang
index ab412a7aa9e..367b8800c13 100644
--- a/htdocs/langs/it_IT/exports.lang
+++ b/htdocs/langs/it_IT/exports.lang
@@ -67,7 +67,7 @@ ChooseFormatOfFileToImport=Scegliete il formato di file da utilizzare per l'impo
 ChooseFileToImport=Scegli il file da importare e poi clicca sull'icona %s
 SourceFileFormat=Fonte formato di file
 FieldsInSourceFile=Campi nel file sorgente
-FieldsInTargetDatabase=Campi di destinazione nel database di Dolibarr (grassetto=obbligatorio)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Nessun campo
 MoveField=Spostare campo %s numero di colonna
 ExampleOfImportFile=Example_of_import_file
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Verificare i parametri di importazione che avete definit
 RunSimulateImportFile=Lanciare la simulazione di importazione
 FieldNeedSource=Questo campo richiede dati dal file sorgente
 SomeMandatoryFieldHaveNoSource=Alcuni campi obbligatori non hanno origine dai dati del file
-InformationOnSourceFile=Informazioni sui file di origine
-InformationOnTargetTables=Informazioni sui campi di destinazione
+InformationOnSourceFile=File sorgente
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Switch campo almeno una fonte, nella colonna dei campi da esportare
 SelectFormat=Scegliere questo formato di file di importazione
 RunImportFile=Lancio l'importazione di file
diff --git a/htdocs/langs/it_IT/hrm.lang b/htdocs/langs/it_IT/hrm.lang
index d6fd2cf34a7..ecaf0a0dd85 100644
--- a/htdocs/langs/it_IT/hrm.lang
+++ b/htdocs/langs/it_IT/hrm.lang
@@ -46,11 +46,11 @@ NewEval=Nuova valutazione delle competenze
 ValidateEvaluation=Convalidare la valutazione delle competenze
 ConfirmValidateEvaluation=Sei sicuro che vuoi per convalidare questa valutazione delle competenze con il riferimento <b>%s</b>?
 EvaluationCard=Valutazione delle competenze
-RequiredRank=Grado richiesto per il profilo lavorativo
-RequiredRankShort=Grado richiesto
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Posizioni con questi profili professionali
-EmployeeRank=Grado di dipendente per questa abilità
-EmployeeRankShort=dipendente rango
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Posizione dei dipendenti
 EmployeePositions=Posizioni dei dipendenti
 EmployeesInThisPosition=Dipendenti in questa posizione
@@ -72,6 +72,9 @@ AddSkill=Aggiungi competenze al profilo lavorativo
 RequiredSkills=Competenze richieste per questo profilo lavorativo
 UserRank=Classifica utente
 SkillList=Elenco delle abilità
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Salva classifica
 TypeKnowHow=Competenza
 TypeHowToBe=Come essere
@@ -95,3 +98,5 @@ NeedBusinessTravels=Hai bisogno di viaggi di lavoro
 NoDescription=No Descrizione
 TheJobProfileHasNoSkillsDefinedFixBefore=Il profilo lavorativo valutato di questo dipendente non ha alcuna competenza definita. Aggiungi le competenze, quindi cancella e riavvia la valutazione.
 PDFStandardHrmEvaluation=Modello standard per generare un PDF documento per una valutazione delle competenze
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index 35525065c38..8493b3628b5 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Mailing, invio massivo
 EMailing=Invio email
-EMailings=Invii email
+EMailings=Mass EMails
 SMSings=SMS
-AllEMailings=Tutti i Mailings
+AllEMailings=All mass eMails
 MailCard=Scheda email
 MailRecipients=Destinatari
 MailRecipient=Destinatario
@@ -26,19 +26,19 @@ MailFile=Allegati
 MailMessage=Testo dell'email
 SubjectNotIn=Not in Subject
 BodyNotIn=Not in Body
-ShowEMailing=Mostra invii massivi
-ListOfEMailings=Elenco degli invii
-NewMailing=Nuovo invio di massa
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Nuovo sms
-EditMailing=Modifica invio
-ResetMailing=Reset mailing
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Elimina invio
-PreviewMailing=Anteprima invio di massa
-CreateMailing=Crea invio
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=Convalida invio
+ValidMailing=Valid mass Email
 MailingStatusDraft=Bozza
 MailingStatusValidated=Convalidato
 MailingStatusSent=Inviato
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Tutti i filtri devono corrispondere per poter raccoglie
 LineInFile=Riga %s nel file
 RecipientSelectionModules=Modulo di selezione destinatari
 MailSelectedRecipients=Destinatari selezionati
-MailingArea=Sezione Invii di massa
-LastMailings=Ultimi %s invii email
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Statische obiettivi
 NbOfCompaniesContacts=Numero contatti di società
 MailNoChangePossible=I destinatari convalidati non possono essere modificati
-SearchAMailing=Cerca invio
-SendMailing=Invia email massiva
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Inviato da
 AdvancedAlternative=Alternativa avanzata
 MailingNeedCommand=L'invio di un mailing si può fare da linea di comando. Chiedi all'amministratore del server di eseguire il seguente comando per inviare il mailing a tutti i destinatari:
 MailingNeedCommand2=Puoi inviare comunque online aggiungendo il parametro MAILING_LIMIT_SENDBYWEB impostato al valore massimo corrispondente al numero di email che si desidera inviare durante una sessione.
 ConfirmSendingEmailing=Se vuoi eseguire l'invio direttamente da questa schermata sei pregato di confermare. Intendi veramente eseguire l'invio adesso da questo browser?
-LimitSendingEmailing=Nota: L'invio di email è soggetto a limitazioni per ragioni di sicurezza e di timeout a <b>%s</b> destinatari per ogni sessione di invio
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Cancella elenco
 ToClearAllRecipientsClickHere=Per cancellare l'elenco destinatari per questa email, cliccare sul pulsante
 ToAddRecipientsChooseHere=Per aggiungere i destinatari, scegliere da questi elenchi
-NbOfEMailingsReceived=Numero di invii ricevuti
-NbOfEMailingsSend=Emailing di massa inviato
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID record
 DeliveryReceipt=Ricevuta di consegna.
 YouCanUseCommaSeparatorForSeveralRecipients=Utilizzare il separatore <b>virgola</b>(,) per specificare più destinatari.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Non sono previste notifiche e-mail automatiche per que
 ANotificationsWillBeSent=Verrà inviata una notifica tramite email
 SomeNotificationsWillBeSent=le %s notifiche automatiche verranno inviate tramite e-mail
 AddNewNotification=Iscriviti a una nuova notifica e-mail automatica (target / evento)
-ListOfActiveNotifications=Abbonamenti attivi (target/eventi) per email Notifica automatici
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=email Notifiche inviato automaticamente
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=La configurazione della posta elettronica di invio è stata impostata alla modalità '%s'. Questa modalità non può essere utilizzata per inviare mail di massa.
 MailSendSetupIs2=Con un account da amministratore è necessario cliccare su %sHome -> Setup -> EMails%s e modificare il parametro <strong>'%s'</strong> per usare la modalità '%s'. Con questa modalità è possibile inserire i dati del server SMTP di elezione e usare Il "Mass Emailing"
 MailSendSetupIs3=Se hai domande su come configurare il tuo server SMTP chiedi a %s.
@@ -183,7 +185,7 @@ Information=Informazioni
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Senza risposta
 Answered=Answered
-IsNotAnAnswer=Non è risposta (email iniziale)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=È la risposta di una prima email
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Valore predefinito per il campo '%s' durante la creazione di un nuovo contatto
@@ -199,6 +201,6 @@ ModelTemplate=Modello email
 YouCanChooseAModelForYouMailContent= Puoi scegliere uno dei modelli modello o generarne uno con l'intelligenza artificiale
 TitleOfMailHolder=Il titolo di posta elettronica va qui
 ContentOfMailHolder=Il contenuto di email va qui...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 5a0f40cb0b0..5ca06f327cc 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -37,6 +37,7 @@ Translation=Traduzioni
 Translations=Traduzioni
 CurrentTimeZone=Fuso orario attuale
 EmptySearchString=inserirci criteri di ricerca non vuoti
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Immettere un criterio di data
 NoRecordFound=Nessun risultato trovato
 NoRecordDeleted=Nessun record eliminato
@@ -45,6 +46,7 @@ NoError=Nessun errore
 Error=Errore
 Errors=Errori
 ErrorFieldRequired=Il campo <b>%s</b> è obbligatorio
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Il campo <b>%s</b> ha un valore errato
 ErrorFileDoesNotExists=Il file <b>%s</b> non esiste
 ErrorFailedToOpenFile=Impossibile aprire il file <b>%s</b>
@@ -206,7 +208,7 @@ Valid=Convalida
 Approve=Approva
 Disapprove=Riporta in Bozza
 ReOpen=Riapri
-OpenVerb=Open
+OpenVerb=Apri
 Upload=Upload
 ToLink=Link
 Select=Seleziona
@@ -302,12 +304,13 @@ DateValueShort=Data valuta
 DateOperation=Data operazione
 DateOperationShort=Data op.
 DateLimit=Data limite
-DateRequest=Richiedi la data
+DateRequest=Data di richiesta
 DateProcess=Processa la data
 DateBuild=Data di creazione del report
 DatePayment=Data pagamento
 DateApprove=Approvato in data
 DateApprove2=Data di approvazione (seconda approvazione)
+PendingSince=Pending since
 RegistrationDate=Data registrazione
 UserCreation=Creazione utente
 UserModification=Modifica utente
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Non avviato
 ActionRunningShort=Avviato
 ActionDoneShort=Fatto
 ActionUncomplete=Incompleto
-LatestLinkedEvents=Ultimi %s eventi collegati
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Azienda/Organizzazione
 Accountant=Contabile
 ContactsForCompany=Contatti per il soggetto terzo
@@ -566,7 +569,7 @@ Done=Fatte
 Validated=Convalidato
 ValidatedToProduce=Convalidato (da produrre)
 Opened=Aperto
-OpenAll=Open (All)
+OpenAll=Apri (tutti)
 ClosedAll=Closed (All)
 New=Nuovo
 Discount=Sconto
@@ -583,7 +586,7 @@ ByCompanies=Per impresa
 ByUsers=Per utente
 Links=Link
 Link=Link
-Rejects=Respinge
+Rejects=Respinte
 Preview=Anteprima
 NextStep=Passo successivo
 Datas=Dati
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=Testo dell'email
 SendAcknowledgementByMail=Invia email di conferma
 SendMail=Invia una email
 Email=Email
+EMail=Email
+EMails=Emails
 NoEMail=Nessuna email
 AlreadyRead=Già letto
 NotRead=Unread
@@ -793,7 +798,7 @@ Notes=Note
 AddNewLine=Aggiungi una nuova riga
 AddFile=Aggiungi file
 FreeZone=Prodotto a testo libero
-FreeLineOfType=Testo libero, tipologia:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Clona oggetto con i suoi principali attributi
 ReGeneratePDF=Rigenera PDF
 PDFMerge=Unisci PDF
@@ -879,12 +884,14 @@ toward=verso
 Access=Accesso
 SelectAction=Seleziona azione
 SelectTargetUser=Seleziona utente/dipendente
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Usa Ctrl+C per copiare negli appunti
 SaveUploadedFileWithMask=Salva il file sul server con il nome "<strong>%s</strong>" (oppure "%s")
 OriginFileName=Nome originale del file
 SetDemandReason=Imposta sorgente
 SetBankAccount=Definisci un numero di Conto Corrente Bancario
 AccountCurrency=Valuta del conto
+AccountancyCode=Conto di contabilità
 ViewPrivateNote=Vedi note
 XMoreLines=%s linea(e) nascoste
 ShowMoreLines=Mostra più/meno righe
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Vuoi davvero eliminare %s record selezionati?
 ConfirmMassClone=Conferma della clonazione in blocco
 ConfirmMassCloneQuestion=Seleziona progetto su cui clonare
 ConfirmMassCloneToOneProject=Clona in progetto %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Oggetti correlati
 ClassifyBilled=Classifica come "Fatturato"
 ClassifyUnbilled=Classifica come "Non Fatturato"
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Devi essere registrato e hai bisogno delle autorizzazion
 Download=Download
 DownloadDocument=Scarica documento
 DownloadSignedDocument=Scarica documento firmato
-ActualizeCurrency=Aggiorna tasso di cambio
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Anno fiscale
 ModuleBuilder=Generatore di moduli/applicazioni
 SetMultiCurrencyCode=Imposta valuta
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Azioni in blocco
 ClickToShowHelp=Clicca per mostrare l'aiuto contestuale
 WebSite=Sito web
@@ -1085,7 +1094,7 @@ SearchIntoSupplierProposals=Proposte fornitore
 SearchIntoInterventions=Interventi
 SearchIntoContracts=Contratti
 SearchIntoCustomerShipments=Spedizioni cliente
-SearchIntoSupplierReceptions=Fornitore ricevimenti
+SearchIntoSupplierReceptions=Ricezioni fornitore
 SearchIntoExpenseReports=Nota spese
 SearchIntoLeaves=Ferie / Permessi
 SearchIntoKM=Base di conoscenza
@@ -1104,6 +1113,7 @@ PayedBy=Pagata da
 PayedTo=Paid to
 Monthly=Mensilmente
 Quarterly=Trimestralmente
+Quarter=Quarter
 Annual=Annuale
 Local=Locale
 Remote=Remoto
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Compito
 ContactDefault_propal=Preventivo
 ContactDefault_supplier_proposal=Proposta del fornitore
 ContactDefault_ticket=Ticket
+ContactDefault_societe=Soggetto terzo
 ContactAddedAutomatically=Contatto aggiunto da ruoli di contatto di terze parti
 More=Di Più
 ShowDetails=Mostra dettagli
@@ -1242,6 +1253,7 @@ CommercialAffected=Rappresentante di vendita assegnato
 CommercialsDisaffected=Rappresentanti di vendita scollegati
 CommercialDisaffected=Rappresentante di vendita scollegato
 Message=Message
+Emailing=Emailing
 Progression=Progress
 YourMessage=Il tuo messaggio
 YourMessageHasBeenReceived=Il tuo messaggio è stato ricevuto. Ti risponderemo o ti contatteremo al più presto.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Traduzione della chiave AnyTranslationKey
 SignedStatus=Stato firmato
 NbRecordQualified=numero di record qualificati
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index 8e38ec1d4f6..0166aaa4526 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Se è richiesto un abbonamento, è necessario registrar
 DeleteType=Elimina
 VoteAllowed=E' permesso il voto
 Physical=Individuale
-Moral=Società
-MorAndPhy=Società e individuo
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Riabilitare
 ExcludeMember=Escludi un membro
 Exclude=Escludere
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Statistiche membri per regioni
 NbOfMembers=Numero totale di membri
 NbOfActiveMembers=Numero totale degli attuali membri attivi
 NoValidatedMemberYet=Nessun membro convalidato trovato
-MembersByCountryDesc=Questa schermata mostra le statistiche dei membri per paese. Grafici e grafici dipendono dalla disponibilità del servizio di grafici online di Google e dalla disponibilità di una connessione Internet funzionante.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Questa schermata mostra le statistiche dei membri per stato/provincia/cantone.
 MembersByTownDesc=Questa schermata mostra le statistiche dei membri per città.
 MembersByNature=Questa schermata mostra le statistiche dei membri per natura.
diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang
index 52dab91685a..21c71cdb725 100644
--- a/htdocs/langs/it_IT/orders.lang
+++ b/htdocs/langs/it_IT/orders.lang
@@ -115,7 +115,7 @@ DraftOrders=Bozze di ordini
 DraftSuppliersOrders=Ordini di acquisto in bozza
 OnProcessOrders=Ordini in lavorazione
 RefOrder=Rif. ordine
-RefCustomerOrder=Rif. fornitore
+RefCustomerOrder=Rif. ordine cliente
 RefOrderSupplier=Ref. order for vendor
 RefOrderSupplierShort=Rif. ordine forn.
 SendOrderByMail=Invia ordine via email
@@ -163,7 +163,7 @@ PDFEdisonDescription=Un modello semplice per gli ordini
 PDFProformaDescription=Un modello completo PDF di fattura Proforma
 CreateInvoiceForThisCustomer=Ordini da fatturare
 CreateInvoiceForThisSupplier=Ordini da fatturare
-CreateInvoiceForThisReceptions=Ricevimenti di fatture
+CreateInvoiceForThisReceptions=Fatture ricezioni
 NoOrdersToInvoice=Nessun ordine fatturabile
 CloseProcessedOrdersAutomatically=Classifica come "Lavorati" tutti gli ordini selezionati
 OrderCreation=Creazione di ordine
@@ -206,3 +206,7 @@ StatusSupplierOrderReceivedPartially=Parzialmente ricevuto
 StatusSupplierOrderReceivedAll=Tutti i prodotti ricevuti
 NeedAtLeastOneInvoice = Ci deve essere almeno una fattura
 LineAlreadyDispatched = La riga dell'ordine è già stata ricevuta.
+ExistingDipatchLines = There are already lines that has generated stock movement for this order.
+ConfirmDeleteDispatchedLines = Revert also all stock movements already done ?
+SupplierOrderDeletion = Supplier order %s Deletion
+OrderStatusMakeOperationForbidden = Order status forbidden for this operation.
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index f94df85ddac..645ed886b57 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -97,7 +97,6 @@ ShowService=Visualizza servizio
 ProductsAndServicesArea=Area prodotti e servizi
 ProductsArea=Area prodotti
 ServicesArea=Area servizi
-ListOfStockMovements=Elenco movimenti di magazzino
 BuyingPrice=Prezzo di acquisto
 PriceForEachProduct=Prodotti con prezzi specifici
 SupplierCard=Vendor card
@@ -172,7 +171,7 @@ BuyingPrices=Prezzi di acquisto
 CustomerPrices=Prezzi di vendita
 SuppliersPrices=Prezzi fornitore
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Codice doganale | commodity | HS
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Paese d'origine
 RegionStateOrigin=Regione di origine
 StateOrigin=Stato|Provincia di origine
@@ -210,6 +209,7 @@ unitL=Litro
 unitT=ton
 unitKG=Kilogrammo
 unitG=Grammo
+unitGAL=gallone
 unitMG=mg
 unitLB=pound
 unitOZ=oncia
@@ -312,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Il formato richiesto è {"URL": "http://example
 UpdateInterval=Frequenza di aggiornamento (in minuti)
 LastUpdated=Ultimo aggiornamento
 CorrectlyUpdated=Aggiornato correttamente
-PropalMergePdfProductActualFile=I file utilizzano per aggiungere in PDF Azzurra sono / è
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=Selezionare i file PDF
 IncludingProductWithTag=Compresi prodotti/servizi con il tag
 DefaultPriceRealPriceMayDependOnCustomer=Prezzo predefinito, prezzo reale può dipendere cliente
@@ -349,6 +349,10 @@ QtyRecalculatedWithPackaging=La quantità della linea è stata ricalcolata in ba
 
 #Attributes
 Attributes=Attributi
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Variante attributi
 ProductAttributes=Variante attributi per i prodotti
 ProductAttributeName=Variante attributo %s
@@ -396,6 +400,8 @@ ErrorDestinationProductNotFound=Prodotto di destinazione non trovato
 ErrorProductCombinationNotFound=Variante di prodotto non trovata
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
 ProductsPricePerCustomer=Product prices per customers
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Attributi aggiuntivi (prezzi dei fornitori)
 DeleteLinkedProduct=Elimina il prodotto figlio collegato alla combinazione
 AmountUsedToUpdateWAP=Importo unitario da utilizzare per aggiornare la media ponderata prezzo
@@ -437,3 +443,6 @@ AllowStockMovementVariantParentHelp=Per default, un genitore di una variante è
 ConfirmSetToDraftInventory=Sei sicuro che vuoi per tornare allo stato Bozza?<br>Le quantità attualmente impostate in l'inventario verrà azzerato.
 WarningLineProductNotToSell=prodotto o il servizio "%s" non deve vendere e è stato clonato
 PriceLabel=prezzo etichetta
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/it_IT/salaries.lang b/htdocs/langs/it_IT/salaries.lang
index 99de808f012..12c2ff6d7b3 100644
--- a/htdocs/langs/it_IT/salaries.lang
+++ b/htdocs/langs/it_IT/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Nuovo stipendio
 AddSalary=Aggiungi stipendio
 NewSalaryPayment=Nuovo stipendio
 AddSalaryPayment=Aggiungi pagamento stipendio
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Pagamento stipendio
 SalariesPayments=Pagamento stipendi
 SalariesPaymentsOf=Pagamenti degli stipendi di %s
@@ -27,7 +29,7 @@ FillFieldFirst=Compila prima il campo dipendente
 UpdateAmountWithLastSalary=Imposta l'importo dell'ultimo stipendio
 MakeTransferRequest=Effettua il trasferimento Richiesta
 VirementOrder=Bonifico Richiesta
-BankTransferAmount=Importo del bonifico
 WithdrawalReceipt=Ordine di trasferimento del credito
 OrderWaiting=In attesa ordine
 FillEndOfMonth=Compila con la fine del mese
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index 278e3507c41..ad3b10b404b 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be
 WEBSITE_CSS_URL=Indirizzo URL del file CSS esterno
 WEBSITE_CSS_INLINE=contenuto file CSS (comune a tutte le pagine)
 WEBSITE_JS_INLINE=Contenuto JavaScript file (comune a tutte le pagine)
-WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=File Robot (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
 WEBSITE_MANIFEST_JSON=Website manifest.json file
@@ -56,16 +56,17 @@ ReadPerm=Da leggere
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr= <u> Anteprima %s in una nuova scheda. </u> <br> <br> %s sarà servito dal server Dolibarr pertanto non è necessario alcun server web aggiuntivo (come Apache, Nginx, IIS) per essere installato. <br> L'inconveniente è che gli URL delle pagine non sono facili da usare e iniziano con il percorso del tuo Dolibarr. <br> URL servito da Dolibarr: <br> <strong> %s </strong> <br> <br> Per utilizzare il proprio server web esterno per servire questo sito, creare un host virtuale sul server Web che punta sulla directory <br> <strong> %s </strong> <br> quindi immettere il nome di questo server virtuale nelle proprietà di questo sito Web e fare clic sul collegamento "Test / Distribuisci sul Web".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
 NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Per includere un  <strong>immagine</strong> archiviata nei <strong>documenti</strong> directory, utilizza il wrapper <strong>viewimage.php</strong>.<br>Esempio, per un'immagine in documenti/media (aperto directory per accesso pubblico), la sintassi è:<br><strong>&lt; img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Per un'immagine condivisa con un link di condivisione (accesso aperto utilizzando la chiave hash di condivisione del file), la sintassi è: <br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=Per ottenere l'URL dell'immagine di un PHP oggetto, utilizza<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($oggetto , 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Altri esempi di HTML o codice dinamici disponibili sulla <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">documentazione wiki </a>.<br>
 ClonePage=Clone page/container
 CloneSite=Clone site
@@ -87,15 +88,15 @@ WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
 BackToListForThirdParty=Torna a Elenco per le terze parti
-DisableSiteFirst=Disable website first
+DisableSiteFirst=Put website offline first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
 SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Attenzione: la creazione di una pagina web importando una pagina web esterna è riservata agli utenti esperti. A seconda della complessità della pagina di origine, il risultato dell'importazione potrebbe differire dall'originale. Inoltre, se la pagina di origine utilizza stili CSS comuni o JavaScript in conflitto, potrebbe interrompere l'aspetto o le funzionalità dell'editor del sito Web quando si lavora su questa pagina. Questo metodo è un modo più rapido per creare una pagina, ma è consigliabile creare la tua nuova pagina da zero o da una pagina suggerita template.<br>Nota inoltre che l'editor in linea potrebbe non funzionare correttamente se utilizzato su una pagina esterna acquisita.
-OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Le immagini devono essere salvate in una cartella
 WebsiteRootOfImages=Cartella principale per le immagini del sito
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Esci dal tuo cliente conto
 filteredByVersion=Filtrato per versione
 removeFilter=Rimuovi filtro
 viewMyCart=Visualizza il mio carrello
+Shipping=Shipping
 freeShipping=spedizione gratuito!
 noProducts=Nessun prodotto
 nbrItemsInCart=Ci sono <span class="ajax_cart_quantity">0</span> articoli nel tuo carrello.
@@ -284,12 +286,13 @@ productNameAToZ=prodotto Nome: dalla A alla Z
 productNameZToA=prodotto Nome: dalla Z alla A
 referenceLowestFirst=Riferimento: prima il più basso
 referenceHighestFirst=Riferimento: prima il più alto
+productPerPage=products per page
 perPage=per pagina
 showAll=Mostra tutto
 showing= Mostrando
 nbrOfProducts= Esistono prodotti %s.
 noResultsHaveBeenFound=Sono stati trovati 0 risultati.
-noResultsWereFound= Nessun risultato trovato.
+noResultsWereFound=Nessun risultato trovato.
 addToCart=Aggiungi al carrello
 backHome=Ritorna a Home
 priceDrop=prezzo rilasciare
@@ -302,10 +305,11 @@ lastUpdate=Ultimo aggiornamento
 contactSupport=Come contattare l'assistenza
 noProductToDisplay=Errore, nessun prodotto da visualizzare
 yourCompanyInformation=Le tue azienda informazioni
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=Questo email è già registrato.
 firstnameContainsLettersOnly=<b>Nome</b> deve contenere lettere e solo spazi
 lastnameContainsLettersOnly=<b>Cognome</b> deve contenere lettere e solo spazi
-passwordCriteria=<b>La password</b> deve soddisfare i criteri seguire criteri:<br>- 12 caratteri<br>- 1 lettera maiuscola<br>- 1 cifra<br>- Nessun carattere speciale<br>- Evita di ripetere i caratteri più di 3 volte<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=C'è stato un errore.
 accountCreation=creare e conto
 errorsOccurred=Sono presenti %s errori%s
@@ -357,3 +361,7 @@ subtract=Sottrarre
 LoginCheckout=Accedi e procedi al pagamento
 paymentSuccessProcessed=Il tuo pagamento è stato elaborato con successo.
 youWillBeRedirectedToOrderPage=A breve verrai reindirizzato alla pagina dei dettagli ordine.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 976f677ea1c..4128c17b50e 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=ファイル整合性に合格しているが
 FileIntegritySomeFilesWereRemovedOrModified=ファイル整合性に不合格。いくつかのファイルが改変、削除、追加されている。
 GlobalChecksum=グローバルチェックサム
 MakeIntegrityAnalysisFrom=アプリファイルの整合性分析をする材料：
-LocalSignature=埋め込みローカル署名(信頼性が一層低い)
-RemoteSignature=リモート遠隔署名(信頼性が一層強い)
+LocalSignature=埋め込まれたローカル署名
+RemoteSignature=遠隔遠隔署名
 FilesMissing=消失ファイル
 FilesUpdated=更新ファイル
 FilesModified=変更ファイル
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=一部の議題オプションでのみ使用
 Security=セキュリティー
 Passwords=パスワード
 DoNotStoreClearPassword=データベースに保存されているパスワードを暗号化する。
-MainDbPasswordFileConfEncrypted=conf.phpに保存されているデータベースパスワードを暗号化する。このオプションを活性化することを強くお勧めする。
+MainDbPasswordFileConfEncrypted=conf.php に保存されているデータベース パスワードを難読化する。このオプションを有効にすることをお勧めする。
 InstrucToEncodePass=パスワードを<b>conf.php </b>ファイルにエンコードするには、行<br> <b> $ dolibarr_main_db_pass = "..."を置き換える。 </b> <br> by <br> <b> $ dolibarr_main_db_pass = "crypted：%s"; </b>
 InstrucToClearPass=パスワードを<b>conf.php </b>ファイルにデコード ( クリア ) するには、行<br> <b> $ dolibarr_main_db_pass = "crypted：...";を置き換える。 </b> <br> by <br> <b> $ dolibarr_main_db_pass = "%s"; </b>
 ProtectAndEncryptPdfFiles=生成されたPDFファイルを保護する。大量のPDF生成が中断されるため、これはお勧めしない。
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=幾何学的ポイント
 ExtrafieldMultiPointGeo=幾何学的マルチポイント
 ExtrafieldLinestringGeo=幾何学的線分
 ExtrafieldPolygonGeo=幾何学的多角形
+ExtrafieldStars=星
 ComputedFormula=計算フィールド
-ComputedFormulaDesc=ここで、オブジェクトの他のプロパティまたは任意の PHP コーディングを使用して式を入力し、動的に計算された値を取得できる。 「?」を含む任意の PHP 互換式を使用できる。条件演算子、および次のグローバル オブジェクト: <strong> $db、$conf、$langs、$mysoc、$user、$objectoffield </strong> 。 <br> <strong> 警告 </strong> : ロードされていないオブジェクトのプロパティが必要な場合は、2 番目の例のように、オブジェクトを式にフェッチすること。 <br> 計算フィールドを使用すると、インターフェイスから値を入力できなくなる。また、構文エラーがある場合、式は何も返さない場合がある。 <br> <br> 式の例: <br> $objectoffield->id < 10 ? round($objectoffield-> id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2->capital / 5: '-1') <br> <br> オブジェクトをリロードする例: <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')<br><br>オブジェクトとその親オブジェクトを強制ロードする式の他の例:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: '親プロジェクトが見当たらない'
+ComputedFormulaDesc=ここで、オブジェクトの他のプロパティまたは任意の PHP コードを使用して数式を入力し、動的な計算値を取得できる。「?」を含む任意の PHP 互換数式を使用できる。条件演算子、および次のグローバル オブジェクト: <strong>$db、$conf、$langs、$mysoc、$ユーザ、$objectoffield</strong>。<br><strong>警告</strong>: 読み込まれていないオブジェクトのプロパティが必要な場合は、2 番目の例のように、オブジェクトを数式にフェッチするだけ。<br>計算フィールドを使用すると、インターフェイスから自分で値を入力できなくなる。また、構文エラーがある場合、数式は何も返さない可能性がある。<br><br>数式の例:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $ユーザ->id) * (int) substr($mysoc->zip, 1, 2)<br><br>オブジェクトを再ロードする例<br>((($reloadedobj = new Societe($db)) && $reloadedobj->fetchNoCompute($objectoffield->id) > 0) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')<br><br>オブジェクトとその親オブジェクトを強制的にロードする数式のその他の例:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new プロジェクト($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: '親 プロジェクト が見つからない'
 Computedpersistent=計算フィールドを保存する
 ComputedpersistentDesc=計算された追加フィールドはデータベースに保存されるが、値はこのフィールドのオブジェクトが変更された場合にのみ再計算される。計算フィールドが他のオブジェクトまたはグローバルデータに依存している場合、この値は間違っている可能性がある!!
 ExtrafieldParamHelpPassword=このフィールドを空白のままにすると、この値は暗号化されずに保存される（フィールドは画面上で星だけで非表示に）。<br><br>値 「dolcrypt」 を入力して、可逆暗号化アルゴリズムで値をエンコードする。平文データも引き続き確認および編集できるが、データベースでは暗号化される。<br><br>「auto」（または「md5」、 「sha256」、「password_hash」、...) で、デフォルトのパスワード暗号化アルゴリズム (または md5、sha256、password_hash...) を使用して、元に戻せないハッシュ化されたパスワードをデータベースに保存する (元の値を取得する方法はない)。
@@ -519,7 +520,7 @@ WarningPHPMailB=- メールのドメイン (mymaildomain.com から myname@mymai
 WarningPHPMailC=-独自の電子メールサービスプロバイダーのSMTPサーバーを使用して電子メールを送信することも興味深いので、アプリケーションから送信される全電子メールもメールボックスの「送信済」ディレクトリに保存される。
 WarningPHPMailD=したがって、電子メールの送信方法を値「SMTP」に変更することをお勧めする。
 WarningPHPMailDbis=メールを送信するデフォルトの「PHP」メソッドを本当に維持したい場合は、この警告を無視するか、%sここをクリック%sして削除すること。
-WarningPHPMail2=電子メールSMTPプロバイダーが電子メールクライアントをいくつかのIPアドレスに制限する必要がある場合 ( 非常にまれ  ) 、これはERP CRMアプリケーションのメールユーザエージェント ( MUA ) のIPアドレス ：<strong> %s</strong>。
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=送信者のメール アドレスのドメイン名が SPF レコードで保護されている場合 (ドメイン名登録者に問い合わせること)、ドメインの DNS の SPF レコードに次の IP またはエントリを追加する必要がある: <strong>%s</strong>。
 WarningPHPMailSPFDMARC=送信者のメール アドレスのドメイン名が p=none 以外の DMARC レコードで保護されている場合 (ドメイン名登録業者に問合せ)、DMARC レコードを削除するか、@gmail.com のように p=none に設定)するか、別の送信方法を使用する必要がある。
 SPFAndDMARCInformation=メインメールアドレスの SPF および DMARC DNS レコード
@@ -567,8 +568,8 @@ Module10Name=会計 ( 簡略化 )
 Module10Desc=データベースの内容に基づく単純な会計報告書s ( ジャーナル、売上高 ) 。元帳テーブルを使用しない。
 Module20Name=提案
 Module20Desc=商取引提案の管理
-Module22Name=大量の電子メール
-Module22Desc=一括メールを管理する
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=エネルギー
 Module23Desc=エネルギーの消費量を監視する
 Module25Name=受注
@@ -847,10 +848,10 @@ Permission212=注文明細行
 Permission213=ラインを活性化する
 Permission214=設定テレフォニー
 Permission215=設定·プロバイダー
-Permission221=emailingsを読込む
-Permission222=作成/変更emailings ( トピック、受信... )
-Permission223=電子メールを検証 ( 送信許可)
-Permission229=emailingsを削除する。
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=受信者と情報を表示する
 Permission238=手動でメールを送信する
 Permission239=検証後または送信後に郵送物を削除する
@@ -1105,6 +1106,7 @@ DictionaryStaff=就業者数
 DictionaryAvailability=配達遅延
 DictionaryOrderMethods=注文方法
 DictionarySource=提案/受注の出処
+DictionaryAccountancyReport=パーソナライズされた会計レポート
 DictionaryAccountancyCategory=報告書s用にパーソナライズされたグループ
 DictionaryAccountancysystem=勘定科目表のモデル
 DictionaryAccountancyJournal=会計仕訳帳
@@ -1134,11 +1136,11 @@ BackToDictionaryList=辞書リストに戻る
 TypeOfRevenueStamp=税印紙の種類
 VATManagement=消費税管理
 VATIsUsedStandard=文書（提案書、請求書、注文書など）を作成する場合、デフォルトの売上税率は標準ルールに従って設定される（販売者と購入者の国によって異なる）。
-VATIsUsedDesc=デフォルトでは、提案、請求書、注文などを作成する場合、消費税率はアクティブな標準ルール:<br>に従う。販売者が消費税の対象でない場合、消費税はデフォルトで 0 に設定される。ルールの終了。<br>(販売者の国 = 購入者の国) の場合、消費税はデフォルトで販売者の国の 製品 の消費税に等しくなる。ルールの終了。<br>売り手と買い手が両方とも欧州共同体に属し、商品が輸送関連 製品 (運送、船積み、航空会社) である場合、デフォルトの VAT は 0 だ。このルールは売り手の国によって異なる。会計士に相談すること。VAT は、売り手ではなく、買い手が自国の税関に支払う必要がある。ルールの終了。<br>売り手と買い手が両方とも欧州共同体に属し、買い手が 法人 (登録済みの共同体内 VAT 番号を持つ) でない場合、VAT は売り手の国の VAT レートにデフォルト設定される。ルールの終了。<br>売り手と買い手が両方とも欧州共同体に属し、買い手が 法人 (共同体内 VAT 番号が登録されている) である場合、VAT はデフォルトで 0 になる。ルールの終了。<br>それ以外の場合、提案されるデフォルトは売上税 = 0 だ。ルールの終了。
+VATIsUsedDesc=デフォルトでは、提案、請求書、注文などを作成する場合、売上税率はアクティブな標準ルールに従います:<br>販売者が売上税の対象でない場合、売上税はデフォルトで 0 になる。ルールの終了。<br>購入者の州または県に、VAT レート辞書からの VAT ルールがある場合、それがデフォルトの VAT レートになる。ルールの終了。<br>（販売者の国 = 購入者の国）の場合、デフォルトの消費税は販売者の国の 製品 の消費税と等しくなる。ルールの終了。<br>販売者と購入者の両方が欧州共同体に属し、商品が輸送関連 製品（運送、船積み、航空会社）である場合、デフォルトの VAT は 0 。このルールは販売者の国によって異なる。会計士にご相談ください。VAT は、販売者ではなく、購入者が自国の税関に支払う必要がある。ルールの終了。<br>売り手と買い手が両方とも欧州共同体に属し、買い手が 法人 (共同体内 VAT 番号を登録済み) でない場合、VAT はデフォルトで売り手の国の VAT 率になる。ルールの終了。<br>売り手と買い手が両方とも欧州共同体に属し、買い手が 法人 (共同体内 VAT 番号を登録済み) である場合、VAT はデフォルトで 0 になる。ルールの終了。<br>その他の場合、提案されるデフォルトは売上税=0 。ルールの終了。
 VATIsNotUsedDesc=デフォルトでは、提案された消費税は0であり、協会、個人、または中小企業などの場合に使用できる。
 VATIsUsedExampleFR=フランスでは、実際の財政システム ( 簡略化された実際または通常の実際 ) を持っている企業または組織を意味する。 VATが申告されるシステム。
 VATIsNotUsedExampleFR=フランスでは、消費税が申告されていない団体、または零細企業の財政システム ( フランチャイズの消費税 ) を選択し、消費税の申告なしでフランチャイズの消費税を支払った企業、組織、または自由業を意味する。この選択により、請求書に「該当しない消費税-CGIのart-293B」という参照が表示される。
-VATType=税金の種類
+VATType=税金の使用
 ##### Local Taxes #####
 TypeOfSaleTaxes=消費税の種類
 LTRate=率
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=税金の設定 ( %s --%s --%sを参照 ) によると
 LabelUsedByDefault=ない翻訳がコードに見つからない場合、デフォルトで使用されるラベル
 LabelOnDocuments=ドキュメントのラベル
 LabelOrTranslationKey=ラベルまたは翻訳キー
+LabelTranslatedInCurrentLanguage=現在の 言語 で翻訳されたラベル
 TranslationFound=翻訳が見つかった
 TheTranslationIsSearchedFromKey=翻訳は翻訳キーから検索される: <b>%s</b>
 TranslationKey=翻訳キー
@@ -1431,7 +1434,7 @@ AddVatInList=顧客/仕入先のVAT番号をコンボリストに表示する。
 AddAdressInList=顧客/仕入先 のアドレスをコンボ リストに表示する。<br>取引先表示は名前形式 「The Big 法人 corp. - 21 Jump street 123456 Big town - USA」に、「The Big 法人 corp.」から変わる。
 AddEmailPhoneTownInContactList=連絡先の電子メール (定義されていない場合は電話番号) と市区町村をコンボ リストに表示する。<br>連絡先は、「Dupond Durand」ではなく、「Dupond Durand - dupond.durand@example.com - Paris」または「Dupond Durand - 06 07 59 65 66 - Paris」という名前形式で表示される。
 AskForPreferredShippingMethod=取引先の優先配送方法を尋ねる。
-FieldEdition=フィールド%sのエディション
+FieldEdition=フィールド %s の変更
 FillThisOnlyIfRequired=例：+2 ( タイムゾーンオフセットの問題が発生した場合にのみ入力 )
 GetBarCode=バーコードを取得する
 NumberingModules=ナンバリングモデル
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=請求書の日付を検証日に強制する
 SuggestedPaymentModesIfNotDefinedInInvoice=請求書に定義されていない場合、デフォルトで請求書の推奨支払モード
 SuggestPaymentByRIBOnAccount=口座からの引出しによる支払を提案
 SuggestPaymentByChequeToAddress=小切手による支払を提案する
+InvoicePaymentManageStructuredCommunication=請求書の支払いに関する構造化されたコミュニケーションを生成する
+InvoicePaymentManageStructuredCommunicationHelp=一部の国では、支払いとその調整を容易にするために構造化された参照を表示する必要がある。
 FreeLegalTextOnInvoices=請求書のフリーテキスト
 WatermarkOnDraftInvoices=下書き請求書の透かし ( 空ならなし )
 PaymentsNumberingModule=支払採番モデル
@@ -1718,6 +1723,7 @@ CompressionOfResources=HTTP応答の圧縮
 CompressionOfResourcesDesc=たとえば、Apacheディレクティブ「AddOutputFilterByTypeDEFLATE」を使用する
 TestNotPossibleWithCurrentBrowsers=このような自動検出は、現在のブラウザでは不可能。
 DefaultValuesDesc=ここでは、新規レコードを作成するときに使用するデフォルト値や、レコードを一覧表示するときのデフォルトのフィルタまたは並べ替え順序を定義できる。
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=デフォルト値 ( フォームで使用 )
 DefaultSearchFilters=デフォルトの検索フィルタ
 DefaultSortOrder=デフォルトのソート順
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=発信採番モジュール
 SendingsAbility=顧客への配送用の出荷シートをサポートする
 NoNeedForDeliveryReceipts=ほとんどの場合、出荷用シートは、顧客への配送用のシート ( 送信する製品のリスト ) と、顧客が受け取って署名するシートの両方として使用される。したがって、製品入庫受領書は重複した機能であり、活性化されることはめったにない。
 FreeLegalTextOnShippings=出荷に関するフリーテキスト
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=製品発送受領採番モジュール
 DeliveryOrderModel=製品の納入領収書モデル
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=配達のレシートにフリーテキスト
 ##### FCKeditor #####
 AdvancedEditor=高度なエディタ
 ActivateFCKeditor=高度なエディタを活性化:
-FCKeditorForNotePublic=要素の「公開メモ」フィールドのWYSIWYG作成/編集
-FCKeditorForNotePrivate=要素の「非公開メモ」フィールドのWYSIWYG作成/編集
-FCKeditorForCompany=要素（製品/サービスを除く）のフィールド記述のWYSIWYG作成/編集
-FCKeditorForProductDetails=製品説明またはオブジェクトの行 (提案書、注文書、請求書など) の WYSIWYG 作成/編集。
+FCKeditorForNotePublic=WYSIWYG要素の「公開メモ」フィールドの作成/変更
+FCKeditorForNotePrivate=WYSIWYG要素の「プライベートノート」フィールドの作成/変更
+FCKeditorForCompany=WYSIWYG要素のフィールド記述の作成/変更（製品/services を除く）
+FCKeditorForProductDetails=WYSIWYGオブジェクトの説明または明細 (提案、注文、請求書などの明細) の作成/変更。
 FCKeditorForProductDetails2=警告: この場合にこのオプションを使用することは、PDF ファイルを作成する際に特殊文字やページの書式設定で問題が発生する可能性があるため、強くお勧めしません。
-FCKeditorForMailing= 大量の電子メールの WYSIWYG 作成/編集 (ツール->メール)
-FCKeditorForUserSignature=ユーザー署名のWYSIWYG作成/編集
-FCKeditorForMail=すべてのメールの WYSIWYG 作成/編集 (ツール->メール を除く)
-FCKeditorForTicket=チケットのWYSIWYG作成/編集
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG ユーザ 署名の作成/変更
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYGチケットの作成/変更
 ##### Stock #####
 StockSetup=在庫モジュール設定
 IfYouUsePointOfSaleCheckModule=デフォルトで提供されている販売時点モジュール(POS)または外部モジュールを使用する場合、この設定はPOSモジュールによって無視される可能性がある。ほとんどのPOSモジュールは、デフォルトで、ここでのオプションに関係なく、請求書をすぐに作成し、在庫を減らすように設計されている。したがって、POSから販売を登録するときに在庫を減らす必要があるかどうかにかかわらず、POSモジュールの設定も確認すること。
@@ -1867,7 +1874,6 @@ Buy=購入する
 Sell=販売
 InvoiceDateUsed=使用される請求書の日付
 YourCompanyDoesNotUseVAT=あなたの法人はVATを使用しないように定義されているため (【ホーム】-【設定】-【法人/組織】) 、設定するVATオプションはない。
-AccountancyCode=会計コード
 AccountancyCodeSell=販売会計コード
 AccountancyCodeBuy=購入会計コード
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=新しい税金を作成するときは、デフォルトで「支払を自動的に作成する」チェックボックスを空のままにする
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = メニューの議題を選択するときに、デフォ
 AGENDA_EVENT_PAST_COLOR = 過去のイベントカラー
 AGENDA_EVENT_CURRENT_COLOR = 現在のイベントの色
 AGENDA_EVENT_FUTURE_COLOR = 今後のイベントカラー
-AGENDA_REMINDER_BROWSER = ユーザのブラウザ</b>でイベントリマインダー<b>を有効化(リマインダーの日付に達すると、ブラウザにポップアップが表示される。各ユーザは、ブラウザの通知設定からそのような通知を無効にできる)。
+AGENDA_REMINDER_BROWSER = <b> のブラウザ ユーザ でイベントのリマインダーを許可する </b>
+AGENDA_REMINDER_BROWSERHelp = リマインダーの日付に達すると、ブラウザにポップアップが表示される)。リマインダーのオプション/遅延は、イベント作成時に ユーザ によって定義される。
 AGENDA_REMINDER_BROWSER_SOUND = 音声通知を有効化
-AGENDA_REMINDER_EMAIL = 電子メール</b>でイベントリマインダー<b>を有効化(リマインダーオプション/遅延は各イベントで定義できる)。
+AGENDA_REMINDER_EMAIL = イベントリマインダーを許可<b> メールで </b>
 AGENDA_REMINDER_EMAIL_NOTE = 注：スケジュールされたジョブ%sの頻度は、リマインダーが正しいタイミングで送信されることを確認するのに十分であること。
 AGENDA_SHOW_LINKED_OBJECT = リンクされたオブジェクトを議題ビューに表示する
 AGENDA_USE_EVENT_TYPE = イベント種別を使用する ( メニューの【設定】-> 【辞書】-> 【アジェンダイベントの種別】で管理 )
 AGENDA_USE_EVENT_TYPE_DEFAULT = イベント作成フォームでイベントの種別にこのデフォルト値を自動的に設定する
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = これらのイベントにデフォルトのリマインダーを使用する
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = 自動リマインダー通知フォームは、イベント作成時にデフォルトで入力される。
+AGENDA_DEFAULT_REMINDER_OFFSET = イベント前のデフォルトのリマインダー期間
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = デフォルトのリマインダーに使用するメールテンプレート
 PasswordTogetVCalExport = エクスポートのリンクを許可するキー
 PastDelayVCalExport=より古いイベントはエクスポートしない
 SecurityKey = セキュリティキー
@@ -2006,7 +2017,7 @@ BackupZipWizard=ドキュメントディレクトリのアーカイブを構築
 SomethingMakeInstallFromWebNotPossible=次の理由により、Webインターフェイスから外部モジュールをインストールすることはできない。
 SomethingMakeInstallFromWebNotPossible2=このため、ここで説明するアップグレードプロセスは、特権ユーザのみが実行できる手動プロセス。
 InstallModuleFromWebHasBeenDisabledContactUs=アプリケーションからの外部モジュールまたは動的 Web サイトのインストールまたは開発は、現在、セキュリティ上の目的でロックされています。この機能を有効化する必要がある場合は、お問い合わせください。
-InstallModuleFromWebHasBeenDisabledByFile=アプリケーションからの外部モジュールのインストールが管理者によって無効にされている。この機能を許可するには、ファイル<strong> %s</strong>を削除するように彼に依頼する必要がある。
+InstallModuleFromWebHasBeenDisabledByFile=アプリケーションからの外部モジュールのインストールと、サーバ 上で コード を実行できるようにする機能の使用は、管理者によって無効にされている。この機能を許可するには、ファイル <strong>%s</strong> を削除するように管理者に依頼する必要がある。
 ConfFileMustContainCustom=アプリケーションから外部モジュールをインストールまたはビルドするには、モジュールファイルをディレクトリ<strong> %s</strong>に保存する必要がある。このディレクトリをDolibarrで処理するには、<strong> conf / conf.php </strong>を設定して、2つのディレクティブ行を追加する必要がある。<br><strong>$ dolibarr_main_url_root_alt = '/ custom'; </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s / custom'; </strong>
 HighlightLinesOnMouseHover=マウスの動きが通過したときにテーブルの行を強調表示する
 HighlightLinesColor=マウスが通過したときの線のハイライト色 ( ハイライトなしの場合は「ffffff」を使用 )
@@ -2036,6 +2047,7 @@ Enter0or1=0または1を入力すること
 EnterYesOrNo=はい または いいえを入力
 UnicodeCurrency=中括弧、通貨記号を表すバイト番号のリストの間にここに入力する。例：$の場合は【36】と入力する-ブラジルレアルの場合はR $ 【82,36】-€の場合は【8364】と入力する
 ColorFormat=RGBカラーはHEX形式  例: FF0000
+NumberFormatForATotalPrice=合計金額の数値形式 %s
 PictoHelp=アイコン名の形式:<br>- 現在のテーマ ディレクトリにある画像ファイルの場合は image.png<br>- image.png@moduleファイルがモジュールのディレクトリ /img/ にある場合<br>- FontAwesome fa-xxx picto の fa-xxx<br>- FontAwesome fa-xxx ピクトの fontawesome_xxx_fa_color_size (プレフィックス、色、サイズが設定されたもの)
 PositionIntoComboList=コンボリストへの行の位置
 SellTaxRate=消費税率
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=注文書の合計
 MAIN_PDF_NO_SENDER_FRAME=送信者アドレスフレームの境界線を非表示にする
 MAIN_PDF_NO_RECIPENT_FRAME=受信者のアドレス枠の枠線を非表示にする
 MAIN_PDF_HIDE_CUSTOMER_CODE=顧客コードを非表示にする
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=顧客アカウントを非表示にする コード
 MAIN_PDF_HIDE_SENDER_NAME=アドレスブロックで送信者/法人名を非表示にする
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=支払条件を非表示にする
 PROPOSAL_PDF_HIDE_PAYMENTMODE=支払モードを非表示にする
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=電子署名ツールで再利用できるように、署名領域に非表示のマークアップを追加しる。外部の ツール によって使用されるか、将来的にはオンライン署名機能によって使用される可能性がある。
@@ -2146,7 +2163,7 @@ COMPANY_DIGITARIA_CLEAN_REGEX=値をクリーンアップするための正規
 DuplicateForbidden=重複禁止
 RemoveSpecialWords=顧客またはサプライヤーのサブアカウントを生成するときに特定の単語を削除する
 RemoveSpecialWordsHelp=顧客または仕入先の勘定科目を計算する前に、クリーニングする単語を指定する。 ";" で単語を区切る
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact, ...)
+GDPRContact=データ保護責任者 (DPO、データ プライバシーまたは GDPR 連絡先など)
 GDPRContactDesc=個人データを情報システムに保存する場合は、ここで一般データ保護規則の責任者を指名できる
 HelpOnTooltip=ツールチップに表示するヘルプテキスト
 HelpOnTooltipDesc=このフィールドがフォームに表示されたときにツールチップに表示されるテキストのテキストまたは翻訳キーをここに入力する
@@ -2289,7 +2306,7 @@ THIRDPARTY_ALIAS=取引先名 - 取引先エイリアス
 ALIAS_THIRDPARTY=取引先エイリアス - 取引先名
 PDFIn2Languages=PDF 内のラベルを 2 つの異なる言語で表示する (この機能はいくつかの言語では機能しない場合がある)
 PDF_USE_ALSO_LANGUAGE_CODE=PDF内の一部のテキストを同じ生成PDFで2つの異なる言語で複製する場合は、ここでこの2番目の言語を設定して、生成されたPDFに同じページに2つの異なる言語が含まれるようにする必要がある。1つはPDFの生成時に選択され、もう1つは ( これをサポートしているPDFテンプレートはごくわずか  ) 。 PDFごとに1つの言語を空のままにする。
-PDF_USE_A=PDF documents format
+PDF_USE_A=PDF文書形式
 FafaIconSocialNetworksDesc=FontAwesomeアイコンのコードをここに入力する。 FontAwesomeとは何かわからない場合は、一般的な値fa-address-bookを使用できる。
 RssNote=注：各RSSフィード定義は、ダッシュボードで使用できるようにするために有効化の必要があるウィジェットを提供する
 JumpToBoxes=【設定】-> 【ウィジェット】にジャンプする
@@ -2324,6 +2341,8 @@ NotRecommended=推奨されない
 ARestrictedPath=データ ファイルの一部の制限付きパス
 CheckForModuleUpdate=外部モジュールの更新を確認する
 CheckForModuleUpdateHelp=このアクションは、外部モジュールのエディターに接続して、新しいバージョンが利用可能かどうかを確認する。
+CheckForModuleUpdateHelp2=%s への接続も行われ、外部モジュールの一部がコミュニティによってマルウェアとして報告されているかどうかが確認される。
+YourIPWillBeRevealedToThisExternalProviders=あなたの IP はすべての外部プロバイダーに公開される。
 ModuleUpdateAvailable=アップデートが利用可能
 NoExternalModuleWithUpdate=外部モジュールの更新が見つからない
 SwaggerDescriptionFile=Swagger API記述ファイル（たとえば、redocで使用するため）
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=配送先住所を表示
 INVOICE_SHOW_SHIPPING_ADDRESSMore=一部の国では表示が義務付けられていマスる (フランス, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=提案書に請求先連絡先を表示する
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=デフォルトでは、連絡先は請求に関してのみ表示される
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=ソーシャルネットワークのURLリンク。ソーシャルネットワークIDを含む可変部分には{socialid}を使用する。
 IfThisCategoryIsChildOfAnother=このカテゴリが別カテゴリの子である場合
 DarkThemeMode=ダークテーマモード
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=警告: モジュール %s は
 WarningModuleHasChangedSecurityCsrfParameter=警告: モジュール %s はインスタンスの CSRF セキュリティを無効にしました。このアクションは疑わしいものであり、インストールが保護されていない可能性がある。説明については、モジュールの作成者に連絡すること。
 EMailsInGoingDesc=受信メールはモジュール %s によって管理される。受信メールをサポートする必要がある場合は、有効にして構成する必要がある。
 MAIN_IMAP_USE_PHPIMAP=ネイティブ PHP IMAP の代わりに、IMAP 用の PHP-IMAP ライブラリを使用する。これにより、IMAP に OAuth2 接続を使用することもできる (モジュール OAuth も有効にする必要がある)。
-MAIN_CHECKBOX_LEFT_COLUMN=フィールドと行を選択するための列を左側に表示します (デフォルトでは右側)。
+MAIN_CHECKBOX_LEFT_COLUMN=左側にフィールドと行の選択用の列を表示する（右側は無効だ）
 NotAvailableByDefaultEnabledOnModuleActivation=デフォルトでは作成されない。モジュールのアクティベーション時にのみ作成される。
 CSSPage=CSS スタイル
 Defaultfortype=デフォルト
@@ -2489,7 +2510,7 @@ AiDescription=AI（人工知能）機能
 AiDescriptionLong=アプリケーションのさまざまな部分に AI (人工知能) 機能を提供する。外部AI APIが必要。
 AI_API_KEY=AI APIのキー
 AI_API_URL=AI API のエンドポイント URL
-AI_API_SERVICE=AI機能に使用するサービス
+AI_API_SERVICE=AI service to use
 AiSetup=AIモジュールセットアップ
 AiCustomPrompt=AIカスタムプロンプト
 AI_CONFIGURATIONS_PROMPT=カスタムプロンプト
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI による機能のカスタム プロンプト
 EnterAnIP=IPアドレスを入力すること
 ConvertInto=変換する
 YouAreHere=自分はここ
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=配送 PDF に バーコード を表示する ドキュメント
 BARCODE_ON_RECEPTION_PDF=受付 PDF に バーコード を表示する ドキュメント
 BARCODE_ON_STOCKTRANSFER_PDF=在庫 転送 PDF ドキュメント に バーコード を表示する
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=OpenID プロバイダー側で認
 MainAuthenticationOidcLoginClaimName=ログインクレーム
 MainAuthenticationOidcLoginClaimDesc=Dolibarr ユーザ ログインに一致する OpenID Connect クレーム。設定されていないか空の場合、デフォルトでメール アドレスが使用される。
 BlackListWords=ブラックリストの単語
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=ブラックリストに追加
 FediverseSetup=フェディバースセクションの構成
 ConfigImportSocialNetwork=Fediverseと互換性のあるソーシャルネットワークの構成
@@ -2553,8 +2579,31 @@ MenuDict=辞書
 AddMoreParams=接続のパラメータを追加する (Cookie、トークンなど)<br> 例: token : value token
 ParamName=パラメータ名
 ParamValue=パラメータの値
-ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
-HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
-Captcha=Captcha
-CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
-DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+ConfirmDeleteParamOfSocialNetwork=このパラメータを 削除 してもよいか?
+HelpMariaDBToGetPossibleValues=次の SQL コマンドを実行すると、可能な値のリストを取得できる: %s
+HelpMariaDBToGetValue=この値はコマンド %s で取得された
+PDFBoxFrameRoundedCorners=角が丸いフレーム
+MAIN_PDF_FRAME_CORNER_RADIUS=角の半径のデフォルト値は 0 なので、角は丸くなりません。1～3 の値を選択して角の半径を大きくし、フレームに丸い角を追加する。
+Captcha=キャプチャ
+CaptchaDesc=ログインページをキャプチャで保護したい場合は、ここで使用するキャプチャを選択できる。
+DolibarrStandardCaptcha=Dolibarr によって生成されたネイティブ キャプチャ
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=配送先住所を表示
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=一部の国では表示が義務付けられていマスる (フランス, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=税率ごとのVAT分析を表示
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=リストのデフォルトの最大サイズは <b>%s</b> 行に設定されている。これは大きな値であるため、すべての回答を表示するにはスクロールする必要がある。<b>%s</b> より低い値に設定し、この数を超えるレコードを表示するにはページネーションを使用することをお勧めする。これを メニュー ホーム - セットアップ - ディスプレイ で変更する。
+RoundBorders=丸い境界線
+CheckIfModuleIsNotBlackListed=<b>リモート ブラックリスト</b> に見つかったモジュールのインストールをブロックする
+CheckIfModuleIsNotBlackListedHelp=一部のモジュールは、プロジェクト の善意のルール（GDPR への非準拠、Dolibarr ブランド名の使用ルール違反など）を尊重しない企業によって提供される場合がある。このボックスをチェックすると、プロジェクト サーバ に、このモジュールに関するレポートが受信されたかどうかを確認するリクエストが送信され、フラグが付けられたモジュールの展開をブロックすることで保護される。
+DatabaseEncryption=データベースの暗号化
+AlgorithmFor=アルゴリズム: %s
+SensitiveData=機密データ
+ToolToDecryptAString=文字列を復号化するツール
+Decrypt=解読
+FilesIntegrityDesc=データベースではなくファイルの整合性をチェックしたい場合は、<a href="%s">このツール</a> を使用できる。
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=フィルターに該当する回答は %s 件を超えています。フィルターを追加すること...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index 7c6f1cc4f8e..fb99a3071f2 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=期末残高
 CurrentBalance=経常収支
 FutureBalance=将来の残高
 ShowAllTimeBalance=最初から残高を示す
-AllTime=最初から
 Reconciliation=照合
 RIB=銀行口座番号
 IBAN=IBAN番号
@@ -133,7 +132,7 @@ DeleteTransaction=入力を削除
 ConfirmDeleteTransaction=この入力を削除してもよいか？
 ThisWillAlsoDeleteBankRecord=これにより、生成された銀行入力も削除される
 BankMovements=動作
-PlannedTransactions=予定入力
+PlannedTransactions=今後のエントリー
 Graph=グラフ
 ExportDataset_banque_1=銀行入力と口座明細書
 ExportDataset_banque_2=入金伝票
@@ -151,7 +150,7 @@ FutureTransaction=先物取引。照合できない。
 SelectChequeTransactionAndGenerate=小切手入金の領収書に含める小切手を選択/フィルタリングする。次に、「作成」をクリックする。
 SelectPaymentTransactionAndGenerate=%s デポジット領収書に含めるドキュメントを選択/フィルターする。次に、「作成」をクリックする。
 InputReceiptNumber=調停に関連する銀行取引明細書を選択する。並べ替え可能な数値を使用する
-InputReceiptNumberBis=YYYYMM または YYYYMMDD
+InputReceiptNumberBis=年月日
 EventualyAddCategory=オプションで、操作を分類するカテゴリ
 ToConciliate=照合するには？
 ThenCheckLinesAndConciliate=次に、銀行の明細書に記載されている行を確認して、
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=この機能が有効になっている場合は、借
 BankColorizeMovementName1=借方移動の背景色
 BankColorizeMovementName2=クレジット移動の背景色
 IfYouDontReconcileDisableProperty=一部の銀行口座で銀行照合を行わない場合は、それらのプロパティ "%s"を無効にして、この警告を削除すること。
-NoBankAccountDefined=銀行口座が定義されていない
+NoBankAccountDefined=銀行口座 が見つかりません
 NoRecordFoundIBankcAccount=銀行口座にレコードが見つかならい。通常、これは、銀行口座のトランザクションのリストからレコードが手動で削除された場合に発生する（たとえば、銀行口座の照合中）。もう1つ別の理由としては、モジュール「%s」が無効化されたまま支払が記録されたこと。
 AlreadyOneBankAccount=既に1つの銀行口座が定義されている
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA ファイル バリアント
diff --git a/htdocs/langs/ja_JP/blockedlog.lang b/htdocs/langs/ja_JP/blockedlog.lang
index 8e9ca136d44..cf71ba40457 100644
--- a/htdocs/langs/ja_JP/blockedlog.lang
+++ b/htdocs/langs/ja_JP/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=変更できないログ
 ShowAllFingerPrintsMightBeTooLong=アーカイブ済全ログを表示する(長い場合あり)
 ShowAllFingerPrintsErrorsMightBeTooLong=無効なアーカイブログをすべて表示する(長くなる可能性あり)
 DownloadBlockChain=指紋をダウンロードする
-KoCheckFingerprintValidity=アーカイブされたログエントリは無効。これは、誰か（ハッカー？）が記録後にこのレコードの一部のデータを変更したか、前のアーカイブレコードを消去したか（以前の番号が付いた行の存在を確認する）、前のレコードのチェックサムを変更したことを意味する。
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=アーカイブ済ログレコードは有効。この行のデータは変更されておらず、エントリは前のエントリに従う。
 OkCheckFingerprintValidityButChainIsKo=アーカイブ済ログは以前のものと比較して有効のようだが、チェーンは以前に破損している。
 AddedByAuthority=リモート認証機関に保存
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=ログの詳細
 ListOfTrackedEvents=追跡済イベントのリスト
 Fingerprint=指紋
 DownloadLogCSV=アーカイブログのエクスポート(CSV)
-DataOfArchivedEvent=アーカイブされたイベントの完全なデータ
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=元のオブジェクト(タイプ%s、id %s)がリンクされていない(変更できない保存データを取得するには、「完全なデータ」列を参照して)
 BlockedLogAreRequiredByYourCountryLegislation=変更不可能なログモジュールは、居住国の法律によって要求される場合あり。このモジュールを無効にすると、税務監査で検証済にできないため、法律および法律ソフトウェアの使用に関して将来の取引が無効になる可能性あり。
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=あなたの国の法律により、変更不可能なログモジュールが活性化済。このモジュールを無効にすると、税務監査で検証済にできないため、法律および法律ソフトウェアの使用に関して将来の取引が無効になる可能性あり。
@@ -30,6 +32,7 @@ BlockedLogEnabled=イベントを追跡して変更不可ログに追加する
 BlockedLogDisabled=一部の記録が行われた後、イベントを変更不可能なログに追跡するシステムが無効になった。チェーンが壊れていることを追跡するために特別な指紋を保存した
 BlockedLogDisabledBis=イベントを追跡して変更不可ログに追加するシステムが無効化された。おそらく、まだ記録が行われていないため。
 LinkHasBeenDisabledForPerformancePurpose=パフォーマンス上の理由で、ドキュメント への直接リンクは 100 行目以降は非表示。
+SavedOnLine=オンラインで保存
 
 ## logTypes
 logBILL_DELETE=顧客請求書は論理削除済
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=顧客支払は論理削除済
 logPAYMENT_VARIOUS_CREATE=支払(請求書に割り当てられていない)は作成済
 logPAYMENT_VARIOUS_DELETE=支払(請求書に割り当てられていない)論理削除済
 logPAYMENT_VARIOUS_MODIFY=支払(請求書に割り当てられていない)は変更済
+logBLOCKEDLOG_EXPORT=変更不可能なログを ファイル にエクスポートする
diff --git a/htdocs/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang
index 93b4a6ca24d..d2604ae3021 100644
--- a/htdocs/langs/ja_JP/categories.lang
+++ b/htdocs/langs/ja_JP/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=連絡先タグ/カテゴリ領域
 AccountsCategoriesArea=銀行口座のタグ/カテゴリ領域
 ProjectsCategoriesArea=プロジェクトタグ/カテゴリ領域
 UsersCategoriesArea=ユーザタグ/カテゴリ領域
+Bank_linesCategoriesArea==銀行のライン タグ/カテゴリ エリア
 SubCats=サブカテゴリ
 CatList=タグ/カテゴリのリスト
 CatListAll=タグ/カテゴリのリスト(全種別)
@@ -90,9 +91,10 @@ CategoriesSetup=タグ/カテゴリの設定
 CategorieRecursiv=親タグ/カテゴリと自動的にリンクする
 CategorieRecursivHelp=オプションがオンの場合、サブカテゴリにオブジェクトを追加すると、そのオブジェクトは親カテゴリにも追加される。
 AddProductServiceIntoCategory=製品/サービスにカテゴリを割り当てる
-AddCustomerIntoCategory=顧客にカテゴリを割り当てる
-AddSupplierIntoCategory=カテゴリをサプライヤに割り当てる
-AssignCategoryTo=カテゴリをに割り当てる
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=タグ/カテゴリを表示
 ByDefaultInList=デフォルトでリストに
 ChooseCategory=カテゴリを選択
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=ページ-コンテナカテゴリ
 KnowledgemanagementsCategoriesArea=KM項目カテゴリー
 UseOrOperatorForCategories=カテゴリには「OR」演算子を使用する
 AddObjectIntoCategory=カテゴリに割当る
+FichintersCategoriesArea=介入 カテゴリ
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index eb7e10cc812..f420d3bde25 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -33,7 +33,7 @@ CountryIsInEEC=当該国は欧州経済共同体内に存する
 PriceFormatInCurrentLanguage=現在の言語と通貨での価格表示形式
 ThirdPartyName=取引先名
 ThirdPartyEmail=取引先メール
-ThirdParty=取引先
+ThirdParty=第三者
 ThirdParties=取引先
 ThirdPartyProspects=見込客
 ThirdPartyProspectsStats=見込客
@@ -65,6 +65,7 @@ State=州/地方
 StateId=州ID
 StateCode=州/地方コード
 StateShort=州
+DepartmentBuyer=購入者の州/県
 Region=地域
 Region-State=地域 - 州
 Country=国
@@ -78,7 +79,7 @@ Chat=チャット
 PhonePro=ビジネス用電話
 PhonePerso=個人電話
 PhoneMobile=携帯電話
-No_Email=大量メールを拒否
+No_Email=Refuse mass emails
 Fax=ファックス
 Zip=郵便番号
 Town=市区町村
@@ -382,12 +383,12 @@ ExportCardToFormat=形式にカードをエクスポートする
 ContactNotLinkedToCompany=どの取引先にも該当しない連絡先
 DolibarrLogin=Dolibarrログイン
 NoDolibarrAccess=Dolibarrへのアクセスなし
-ExportDataset_company_1=取引先（法人・財団・個人）とそのプロパティ
-ExportDataset_company_2=連絡先とそのプロパティ
-ExportDataset_company_3=取引先銀行口座
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=取引先sの追加的な連絡先s/住所sと諸属性
+ExportDataset_company_3=サードパーティの支払い方法（銀行口座）
 ImportDataset_company_1=取引先とそのプロパティ
 ImportDataset_company_2=取引先sの追加的な連絡先s/住所sと諸属性
-ImportDataset_company_3=取引先銀行口座
+ImportDataset_company_3=サードパーティの支払い方法（銀行口座）
 ImportDataset_company_4=取引先の営業担当者 (営業担当者またはユーザを法人に割当)
 PriceLevel=価格レベル
 PriceLevelLabels=価格レベルラベル
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=検証なしで コード を無料で入手できる。
 ManagingDirectors=管理職名称 (CEO, 部長, 社長...)
 MergeOriginThirdparty=重複した 取引先 (削除 したい 取引先)
 MergeThirdparties=取引先を統合
-ConfirmMergeThirdparties=選択した取引先を現在の取引先とマージしてもよいか？リンクされた全オブジェクト (請求書、注文など) は現在の取引先に移動され、その後、選択された取引先が削除される。
+ConfirmMergeThirdparties=選択した 取引先 を現在のものと結合してもよいか? リンクされたすべてのオブジェクト (請求書、注文など) は現在の 取引先 に移動され、選択した 取引先 は削除される。
 ThirdpartiesMergeSuccess=取引先は統合された
 SaleRepresentativeLogin=販売担当者のログイン
 SaleRepresentativeFirstname=販売担当者の姓名の名
@@ -461,3 +462,6 @@ ExternalSystemID=外部システムID
 IDOfPaymentInAnExternalSystem=外部システムへの支払いモードの ID (Stripe、Paypal など)
 AADEWebserviceCredentials=AADE Webサービスの資格情報
 ThirdPartyMustBeACustomerToCreateBANOnStripe=取引先 は、Stripe 側で銀行 情報 の作成を許可する顧客である必要がある
+NewSocNameForClone=新規 法人 の名前
+ConfirmCloneThirdparties=<b>%s</b> 法人 をクローンしてもよいか?
+SocialNetworksBusiness=法人 のソーシャル ネットワーク
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 2bafac0c9de..f4823ca05af 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -66,7 +66,7 @@ LT2CustomerIN=SGST販売
 LT2SupplierIN=SGSTの購入
 VATCollected=付加価値税回収した
 SpecialExpensesArea=全特別支払のエリア
-VATExpensesArea=Area for all VAT payments
+VATExpensesArea=すべてのVAT支払いのエリア
 SocialContribution=社会税または財政税
 SocialContributions=社会税または財政税
 SocialContributionsDeductibles=控除可能な社会税または財政税
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=顧客の請求書支払
 PaymentSupplierInvoice=ベンダーの請求書支払
 PaymentSocialContribution=社会/財政税支払
 PaymentVat=付加価値税支払
-AutomaticCreationPayment=支払を自動的に記録する
+AutomaticCreationPayment=Also record the payment
 ListPayment=支払のリスト
 ListOfCustomerPayments=顧客支払のリスト
 ListOfSupplierPayments=ベンダー支払のリスト
@@ -118,10 +118,14 @@ SocialContributionsPayments=社会/財政税支払
 ShowVatPayment=付加価値税支払を表示する
 TotalToPay=支払に合計
 BalanceVisibilityDependsOnSortAndFilters=残高は、テーブルが%sで並べ替えられ、1つの銀行口座でフィルタリングされている場合にのみこのリストに表示される(他のフィルタはない)
+CustomerAccountancyCodeGeneral=一般会計 コード
 CustomerAccountancyCode=顧客会計コード
+SupplierAccountancyCodeGeneral=一般会計 コード
 SupplierAccountancyCode=ベンダー会計コード
+UserAccountancyCodeGeneral=一般会計 コード
 CustomerAccountancyCodeShort=カスト。アカウント。コード
 SupplierAccountancyCodeShort=Sup。アカウント。コード
+UserAccountancyCodeShort=ユーザ アカウント。 コード
 AccountNumber=口座番号
 NewAccountingAccount=新規科目
 Turnover=請求済売上高
@@ -129,7 +133,9 @@ TurnoverCollected=回収済売上高
 SalesTurnoverMinimum=最小売上高
 ByExpenseIncome=費用と収入別
 ByThirdParties=富栄第三者
+ByProjects=プロジェクト より
 ByUserAuthorOfInvoice=請求書著者
+DetailedListLowercase=詳細リスト
 CheckReceipt=入金伝票
 CheckReceiptShort=入金伝票
 LastCheckReceiptShort=最新の %s 入金伝票
@@ -274,7 +280,7 @@ SameCountryCustomersWithVAT=全国の顧客報告書
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=VAT番号の最初の2文字が、自法人の国コードと同じであることに基づく
 LinkedFichinter=介入へのリンク
 ImportDataset_tax_contrib=社会/財政税
-ImportDataset_tax_vat=VAT payments
+ImportDataset_tax_vat=VATの支払い
 ErrorBankAccountNotFound=エラー：銀行口座が見つからない
 FiscalPeriod=会計期間
 ListSocialContributionAssociatedProject=プロジェクトに関連する社会貢献のリスト
diff --git a/htdocs/langs/ja_JP/datapolicy.lang b/htdocs/langs/ja_JP/datapolicy.lang
index 9d863eb97ce..09ff6e0c53f 100644
--- a/htdocs/langs/ja_JP/datapolicy.lang
+++ b/htdocs/langs/ja_JP/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = データプライバシーポリシー
 Module4100Desc = データのプライバシーを管理するモジュール (GDPR に準拠)
 # Administration page
 datapolicySetup = モジュール データのプライバシー ポリシーの設定
-Deletion = データの削除
-datapolicySetupPage = お住まいの国の法律 (GDPR の<a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">第 5 条</a> など) に応じて、個人データは一定期間保管する必要がある。アーカイブ目的を除き、データが収集された目的に必要な期間を超えないこと。<br>削除は自動的に 一定期間後にイベントを伴わず 実施される（期間は以下に指定）。
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s か月
 ONE_YEAR = 1年
 NB_YEARS = %s年
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = 見込客/顧客
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = 見込客でも顧客でもない
 DATAPOLICY_CONTACT_FOURNISSEUR = サプライヤー
 DATAPOLICY_ADHERENT = 構成員
-DATAPOLICY_Tooltip_SETUP=操作が行われない遅延を定義し、その後レコードを 自動的に 消去する。
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = 関連するすべての連絡先 (まだメールを受信しておらず、GDPR 契約について何も登録していない連絡先) に GDPR メールを送信できる。これを行うには、次のボタンを使用する。
 SendAgreement = メールを送る
 AllAgreementSend = すべてのメールが送信された
 TXTLINKDATAPOLICYACCEPT = リンク「同意書」のテキスト
 TXTLINKDATAPOLICYREFUSE = リンクのテキスト「意見の相違」
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR : 個人データの処理
 DATAPOLICY_consentement = 個人データの処理について得られた同意
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index dc56ccb429a..53418dfb6cc 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=添付ファイル用一時ディレク
 ErrorFailedToCreateDir=ディレクトリの作成に失敗した。そのWebサーバのユーザがDolibarrのドキュメントディレクトリに書き込む権限を持って確認すること。パラメータ の<b>safe_modeが</b>このPHPが有効になっている場合、Dolibarr PHPファイルは、Webサーバーのユーザ(またはグループ)に所有していることを確認すること。
 ErrorNoMailDefinedForThisUser=このユーザに定義されたメールはない
 ErrorSetupOfEmailsNotComplete=メールの設定が完了していない
+ErrorAccountingClosureSetupNotComplete=閉鎖アカウントの設定が完了していない
 ErrorFeatureNeedJavascript=この機能を動作させるには JavaScript を有効にする必要がある。これを設定 - 表示で変更する。
 ErrorTopMenuMustHaveAParentWithId0=タイプは 'top'のメニューが親メニューを持つことはできない。親メニューに0を置くか、または型 &quot;左&quot;のメニューを選択する。
 ErrorLeftMenuMustHaveAParentId=タイプ &quot;左&quot;のメニューは、親IDを持つ必要がある。
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=PHP / Apacheプラグインによってブロックさ
 ErrorFileSizeTooLarge=ファイルサイズが大きすぎるか、ファイルが提供されていない。
 ErrorFieldTooLong=フィールド%sが長すぎる。
 ErrorSizeTooLongForIntType=(%s桁の最大値)int型に対して長すぎるサイズ
+ErrorSizeForStarsType=星のサイズは1から10までの数字が必須
 ErrorSizeTooLongForVarcharType=文字列型(%s文字最大)長すぎるサイズ
 ErrorNoValueForSelectType=選択リストの値を入力すること
 ErrorNoValueForCheckBoxType=チェックボックスリストの値を入力すること
@@ -138,8 +140,9 @@ ErrorBadValueForCode=セキュリティコードの値が正しくない。新
 ErrorBothFieldCantBeNegative=フィールド%s %sとは負の両方にすることはできない
 ErrorFieldCantBeNegativeOnInvoice=このタイプの請求書では、フィールド <strong>%s</strong> をマイナスにすることはできない。割引明細を追加する必要がある場合は、まず (取引先 カードのフィールド '%s' から) 割引を作成し、それを請求書に適用する。
 ErrorLinesCantBeNegativeForOneVATRate=行の合計(税控除後)は、特定のnull以外のVAT率に対して負になることはできない(VAT率<b> %s </b> %%の負の合計が見つかった)。
-ErrorLinesCantBeNegativeOnDeposits=入金でラインがマイナスになることはない。あなたがそうするならば、あなたが最終的な請求書で入金を消費する必要があるとき、あなたは問題に直面するだろう。
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=顧客の請求書への明細の数量をマイナスにすることはできない
+ErrorQtyForSupplierInvoiceCantBeNegative=仕入先請求書の明細の数量は負の値にできない
 ErrorWebServerUserHasNotPermission=Webサーバを実行するユーザアカウントを使用<b>%s</b>そのための権限を持っていない
 ErrorNoActivatedBarcode=活性化済バーコード·タイプなし
 ErrUnzipFails=ZipArchiveで%sを解凍できなかった
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=終了日フィールドは空欄にできない
 ErrorStartHourIsNull=開始日フィールドは空欄にできない
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=処理する行が多すぎる。より選択的なフィルターを使用すること。
 ErrorEmptyValueForQty=数量はゼロにできない。
+ErrorNoCloneWithoutName=新しい ユーザ には名前を付ける必要がある
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = 注文数量は出荷数量より少なくすることはできない。
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=エラー: 法人 の通貨とは異なる通貨を使用して 銀行口座 でさまざまな支払いを作成することはまだサポートされていない。
+ErrorStreamMustBeEnabled=PHP ストリーム %s は使用できない。PHP モジュールと Dolibarr パラメータ $dolibarr_main_stream_to_disable を確認すること。
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHPパラメータ upload_max_filesize(%s)は、PHPパラメータ post_max_size(%s)よりも大きくなっている。これは一貫した設定ではない。
 WarningPasswordSetWithNoAccount=この構成員にパスワードが設定された。ただし、ユーザアカウントは作成されなかった。したがって、このパスワードは保存されるが、Dolibarrへのログインには使用できない。外部モジュール/インターフェースで使用できるが、構成員のログインやパスワードを定義する必要がない場合は、構成員モジュールの設定から "各構成員のログインを管理する" オプションを無効にすることができる。ログインを管理する必要があるがパスワードは必要ない場合は、このフィールドを空のままにして、この警告を回避できる。注：構成員がユーザにリンクされている場合は、電子メールをログインとして使用することもできる。
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=この親IDはもう存在しない
 WarningReadBankAlsoAllowedIfUserHasPermission=警告: 銀行口座 の読み取りも、勘定科目の管理権限で許可される
 WarningNoDataTransferedInAccountancyYet=会計表にはデータがないのでご注意ください。アプリケーションに記録されたデータを会計セクションに転送するか、計算モードを変更して、会計外で記録されたデータを分析すること。
 WarningChangingThisMayBreakStopTaskScheduler=警告: この値を変更するとスケジューラが無効になる可能性がある
+WarningAmountOfFileDiffersFromSumOfLines=警告: ファイル (%s) の量が行の合計 (%s) と異なる
+WarningModuleAffiliatedToAReportedCompany=警告: このモジュールは、違法な方法 (Dolibarr ブランドの使用規則の不遵守、ユーザーの同意なしのデータ収集、マルウェアの展開) を使用する 法人 によって公開されたとして Dolibarr 財団に報告されている。
+WarningModuleAffiliatedToAPiratPlatform=%s のような疑わしい非公式プラットフォームからモジュール (有料または無料) を入手するときは注意してください。
+
 SwissQrOnlyVIR = SwissQR 請求書は、クレジット振替で支払うように設定された請求書にのみ追加できる。
 SwissQrCreditorAddressInvalid = 債権者の住所が無効  (郵便番号と都市は設定されているか? (%s)
 SwissQrCreditorInformationInvalid = 債権者情報が IBAN (%s) に対して無効 : %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s は、このタイプの連絡先
 ErrorThisGroupIsAlreadyDefinedAsThisType=このグループの連絡先は、このタイプの連絡先としてすでに定義されている。
 EmptyMessageNotAllowedError=空のメッセージは許可されない
 ErrorIsNotInError=%s はエラーではあらず
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/ja_JP/exports.lang b/htdocs/langs/ja_JP/exports.lang
index d907c705cc7..cdd19722006 100644
--- a/htdocs/langs/ja_JP/exports.lang
+++ b/htdocs/langs/ja_JP/exports.lang
@@ -67,7 +67,7 @@ ChooseFormatOfFileToImport=%sアイコンをクリックして選択し、イン
 ChooseFileToImport=ファイルをアップロードし、%sアイコンをクリックして、ソースインポートファイルとしてファイルを選択する。
 SourceFileFormat=ソースファイルの形式
 FieldsInSourceFile=ソースファイル内のフィールド
-FieldsInTargetDatabase=Dolibarrデータベースのターゲットフィールド(太字=必須)
+FieldsInTargetDatabase=Dolibarr データベースのターゲット フィールド
 NoFields=Noフィールド
 MoveField=フィールドの列番号%sを移動
 ExampleOfImportFile=Example_of_import_file
@@ -80,10 +80,10 @@ FieldSource=ソースフィールド
 NbOfSourceLines=ソースファイルの行数
 NowClickToTestTheImport=ファイルのファイル形式(フィールドと文字列の区切り文字)が表示されているオプションと一致していること、およびヘッダー行を省略していることを確認すること。一致していない場合、次のシミュレーションでエラーとしてフラグが付けられる。 <br>「<b>%s</b>」ボタンをクリックして、ファイル構造/コンテンツのチェックを実行し、インポートプロセスをシミュレートする。 <br><b>データベース</b>のデータは変更されない。
 RunSimulateImportFile=インポートシミュレーションを実行する
-FieldNeedSource=このフィールドには、ソースファイルのデータが必要 
+FieldNeedSource=このフィールドには、ソースファイルのデータが必要
 SomeMandatoryFieldHaveNoSource=いくつかの必須フィールドは、データファイルからのソースがない
-InformationOnSourceFile=ソースファイルに関する情報
-InformationOnTargetTables=ターゲットフィールドに関する情報
+InformationOnSourceFile=ソースファイル
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=エクスポートするフィールドの列に少なくとも1つのソースフィールドを切り替える
 SelectFormat=このインポートファイル形式を選択する。
 RunImportFile=データのインポート
diff --git a/htdocs/langs/ja_JP/hrm.lang b/htdocs/langs/ja_JP/hrm.lang
index 3fbcd8dc5d6..c0db7498156 100644
--- a/htdocs/langs/ja_JP/hrm.lang
+++ b/htdocs/langs/ja_JP/hrm.lang
@@ -46,11 +46,11 @@ NewEval=新しい能力評価
 ValidateEvaluation=能力評価を検証する
 ConfirmValidateEvaluation=この能力評価を参照 <b>%s</b> で検証してもよろしい か?
 EvaluationCard=能力評価
-RequiredRank=ジョブ プロファイルの必須ランク
-RequiredRankShort=必要ランク
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=この求人プロフィールを持つポジション
-EmployeeRank=このスキルの従業員ランク
-EmployeeRankShort=従業員 ランク
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=従業員の役職
 EmployeePositions=従業員の役職s
 EmployeesInThisPosition=この役職の従業員
@@ -98,3 +98,5 @@ NeedBusinessTravels=出張が必要
 NoDescription=説明なし
 TheJobProfileHasNoSkillsDefinedFixBefore=この従業員の評価された職務プロファイルにはスキル(s)が定義されていない。スキルを追加し、削除して評価を再開すること。
 PDFStandardHrmEvaluation=能力評価用の PDF ドキュメント を生成するための標準テンプレート
+SkillNotRequired=スキルは不要
+LinkToUserCreated=応募者が採用され、ユーザ に変換された場合は、従業員 にリンクする。
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index b9be1f493da..d08fa4f7d66 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=メールで送信
 EMailing=メールで送信
-EMailings=EMailings
+EMailings=Mass EMails
 SMSings=SMS送信
-AllEMailings=すべてeMailings
+AllEMailings=All mass eMails
 MailCard=カードをメールで送信
 MailRecipients=受取人
 MailRecipient=受信者
@@ -26,19 +26,19 @@ MailFile=添付ファイル
 MailMessage=電子メールの本文
 SubjectNotIn=件名にない
 BodyNotIn=体にない
-ShowEMailing=電子メールで表示
-ListOfEMailings=emailingsのリスト
-NewMailing=新規メール送信
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=新しいSMS送信
-EditMailing=電子メールで編集
-ResetMailing=電子メールで送信する再送
-ConfirmResetMailingTargetMassaction=ターゲットステータスのリセットの確認
-ResetMailingTargetMassaction=ターゲットのステータスをリセット
-DeleteMailing=電子メールで送信する削除
-PreviewMailing=電子メールで送信プレビュー
-CreateMailing=メール送信作成
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=ステータスを誤ってリセットした
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=テスト
-ValidMailing=有効なメール送信
+ValidMailing=Valid mass Email
 MailingStatusDraft=下書き
 MailingStatusValidated=検証済
 MailingStatusSent=送信
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=電子メールを収集するには、すべてのフ
 LineInFile=ファイル内の行%s
 RecipientSelectionModules=受信者の選択のために定義された要求
 MailSelectedRecipients=選択した受信者
-MailingArea=EMailingsエリア
-LastMailings=最新の%sメール
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=ターゲットの統計情報
 NbOfCompaniesContacts=企業のユニークなコンタクト
 MailNoChangePossible=検証済メール送信の受信者を変更することはできない
-SearchAMailing=Searchメーリング
-SendMailing=メール送信送信
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=によって送信され、
 AdvancedAlternative=高度な代替案
 MailingNeedCommand=メールの送信はコマンドラインから実行できる。サーバー管理者に次のコマンドを起動して、全受信者に電子メールを送信するように依頼すること。
 MailingNeedCommand2=ただし、セッションで送信するメールの最大数の値を持つパラメータのMAILING_LIMIT_SENDBYWEBを追加することによってそれらをオンラインで送信することができる。このため、ホーム - 設定 - その他 に行くこと。
 ConfirmSendingEmailing=この画面から直接メールを送信したい場合は、ブラウザから今すぐメールを送信することを確定すること。
-LimitSendingEmailing=注：Webインターフェースからの電子メールの送信は、セキュリティとタイムアウトの理由から数回行われる。各送信セッションで一度に<b> %s</b>受信者が実行される。
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=一覧をクリアする
 ToClearAllRecipientsClickHere=このメール送信の受信者リストをクリアするにはここをクリック
 ToAddRecipientsChooseHere=リストから選択して受信者を追加する
-NbOfEMailingsReceived=マスemailingsは、受信した
-NbOfEMailingsSend=大量のメールが送信された
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=IDレコード
 DeliveryReceipt=配達確認。
 YouCanUseCommaSeparatorForSeveralRecipients=あなたは、いくつかの受信者を指定するには、 <b>カンマ区切り</b>を使用することができる。
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=このイベントタイプと法人では、自動電
 ANotificationsWillBeSent=1つの自動通知が電子メールで送信される
 SomeNotificationsWillBeSent=%s自動通知は電子メールで送信される
 AddNewNotification=新規自動電子メール通知を購読する(ターゲット/イベント)
-ListOfActiveNotifications=自動電子メール通知のアクティブなサブスクリプション (ターゲット/イベント)
+ListOfActiveNotifications=アクティブなサブスクリプション
+ListOfActiveNotificationsHelp=自動メール通知を登録したカップル %s/%s のリスト
 ListOfNotificationsDone=自動メール通知が送信された
+ListOfNotificationsDoneHelp=過去に送信されたメール通知のリスト
 MailSendSetupIs=電子メール送信の構成は「%s」に設定されている。このモードは、大量の電子メールを送信するために使用することはできない。
 MailSendSetupIs2=モード'%s'を使うには、まず、管理者アカウントを使用して、メニュー%sホーム - 設定 - メール %sに移動し、パラメーター<strong>'%s '</strong>を変更する。このモードでは、インターネットサービスプロバイダーが提供するSMTPサーバーの設定に入り、大量電子メールの機能を使用できる。
 MailSendSetupIs3=SMTPサーバーの設定方法について質問がある場合は、%sに問い合わせることができる。
@@ -183,7 +185,7 @@ Information=情報
 ContactsWithThirdpartyFilter=取引先のフィルタを使用した連絡先
 Unanswered=未回答
 Answered=答えた
-IsNotAnAnswer=回答でない(最初のメール)
+IsNotAnAnswer=回答でない（初出メール）
 IsAnAnswer=最初のメールの回答
 RecordCreatedByEmailCollector=メールコレクターによって作成されたレコード %s
 DefaultBlacklistMailingStatus=新しい連絡先を作成するときのフィールド「%s」のデフォルト値
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 2124dbf3f10..67e462a39e5 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -37,6 +37,7 @@ Translation=翻訳
 Translations=翻訳
 CurrentTimeZone=PHP(サーバー)のタイムゾーン
 EmptySearchString=空でない検索条件を入力すること
+EnterNonEmptyLinesFirst=最初に空でない行を入力すること
 EnterADateCriteria=日付基準を入力する
 NoRecordFound=レコードが見つからない
 NoRecordDeleted=削除されたレコードはない
@@ -309,6 +310,7 @@ DateBuild=ビルド日を報告
 DatePayment=支払日
 DateApprove=承認日
 DateApprove2=承認日(2回目の承認)
+PendingSince=保留中
 RegistrationDate=登録日
 UserCreation=作成ユーザ
 UserModification=変更ユーザ
@@ -496,7 +498,7 @@ ActionRunningNotStarted=開始するには
 ActionRunningShort=進行中
 ActionDoneShort=終了
 ActionUncomplete=不完全
-LatestLinkedEvents=最新の%sリンクイベント
+LatestLinkedEvents=The last %s events
 CompanyFoundation=法人/組織
 Accountant=会計士
 ContactsForCompany=この取引先の連絡先s
@@ -722,6 +724,8 @@ TextUsedInTheMessageBody=電子メールの本文
 SendAcknowledgementByMail=確定メールを送信する
 SendMail=メールを送る
 Email=Eメール
+EMail=メール
+EMails=メール
 NoEMail=まだメールしない
 AlreadyRead=既に読んだ
 NotRead=未読
@@ -794,7 +798,7 @@ Notes=メモ
 AddNewLine=新規行を追加する。
 AddFile=ファイルを追加する。
 FreeZone=フリーテキスト製品
-FreeLineOfType=フリーテキストアイテム、タイプ：
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=その主な属性を持つオブジェクトのクローンを作成する
 ReGeneratePDF=PDFを再生成
 PDFMerge=PDFのマージ
@@ -880,12 +884,14 @@ toward=に向かって
 Access=アクセス
 SelectAction=アクションを選択
 SelectTargetUser=ターゲットユーザ/従業員を選択する
+ClickToCopyToClipboard=クリックしてクリップボードにコピー
 HelpCopyToClipboard=Ctrl + Cを使用してクリップボードにコピーする
 SaveUploadedFileWithMask=「<strong>%s</strong>」(それ以外の場合は「%s」)という名前でファイルをサーバーに保存する
 OriginFileName=元のファイル名
 SetDemandReason=ソースを設定
 SetBankAccount=銀行口座を定義する
 AccountCurrency=口座通貨
+AccountancyCode=Accounting Code
 ViewPrivateNote=メモを見る
 XMoreLines=%s行が非表示
 ShowMoreLines=より多くの/より少ない行を表示する
@@ -926,6 +932,7 @@ ConfirmMassDeletionQuestion=選択した%sレコード(s)を削除してもよ
 ConfirmMassClone=バルククローンの確定
 ConfirmMassCloneQuestion=クローン先のプロジェクトを選択
 ConfirmMassCloneToOneProject=プロジェクト %s へのクローン
+ObjectClonedSuccessfuly=オブジェクトのクローンが正常に作成された
 RelatedObjects=関連オブジェクト
 ClassifyBilled=請求済の分類
 ClassifyUnbilled=未請求の分類
@@ -962,10 +969,11 @@ PrivateDownloadLinkDesc=ログに記録する必要があり、ファイルを
 Download=ダウンロード
 DownloadDocument=ドキュメントをダウンロード
 DownloadSignedDocument=署名済みドキュメントをダウンロード
-ActualizeCurrency=為替レートを更新する
+ActualizeCurrency=通貨の最新のレートを使用する
 Fiscalyear=会計年度
 ModuleBuilder=モジュールとアプリケーションビルダー
 SetMultiCurrencyCode=通貨を設定する
+SetMultiCurrencyRate=通貨レートを設定する
 BulkActions=一括動作s
 ClickToShowHelp=クリックしてツールチップのヘルプを表示
 WebSite=ウェブサイト
@@ -1105,6 +1113,7 @@ PayedBy=によって支払われました
 PayedTo=に支払われる
 Monthly=毎月
 Quarterly=四半期ごと
+Quarter=四半期
 Annual=毎年恒例
 Local=地元
 Remote=リモート
@@ -1147,6 +1156,7 @@ ContactDefault_project_task=タスク
 ContactDefault_propal=提案
 ContactDefault_supplier_proposal=サプライヤー提案
 ContactDefault_ticket=チケット
+ContactDefault_societe=第三者
 ContactAddedAutomatically=取引先 連絡先の役割から連絡先が追加された
 More=もっと
 ShowDetails=詳細を表示
@@ -1243,6 +1253,7 @@ CommercialAffected=営業担当者の割り当て
 CommercialsDisaffected=営業担当者のリンクが解除された
 CommercialDisaffected=営業担当者のリンクが解除された
 Message=メッセージ
+Emailing=Emailing
 Progression=進捗
 YourMessage=あなたのメッセージ
 YourMessageHasBeenReceived=貴方のメッセージは受理済。できるだけ早く回答または連絡する予定。
@@ -1307,3 +1318,34 @@ TranslationOfKey=キーAnyTranslationKeyの翻訳
 SignedStatus=署名済みステータス
 NbRecordQualified=適格レコード数
 auto=自動車
+UploadFile=ドキュメント の直接インポート
+OrClickToSelectAFile=またはディスク上の ファイル をクリックして選択する
+NetTotal=純合計
+VATAmount=付加価値税額
+TotalDiscount=合計割引
+TotalHTBeforeDiscount=割引前合計
+Contains=含まれるもの
+DoesNotContain=含まれていない
+Is=は
+IsNot=ない
+StartsWith=始まりは
+EndsWith=終了
+IsBefore=以前
+IsAfter=後
+IsOnOrBefore=以前または等しい
+IsOnOrAfter=以降または等しい
+IsHigherThan=より高い
+IsHigherThanOrEqual=それ以上か等しい
+IsLowerThan=以下より低い
+IsLowerThanOrEqual=以下か等しい
+addToFilter=加える
+FilterAssistance=フィルターエディター
+Operator=オペレーター
+AllFieldsRequired=すべてのフィールドは必須。
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index f3af9dc09be..90291616d96 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -99,7 +99,7 @@ SubscriptionRequiredDesc=サブスクリプションが必要な場合は、メ
 DeleteType=削除する
 VoteAllowed=許可される投票
 Physical=個人
-Moral=株式会社
+Moral=法人
 MorAndPhy=法人および個人
 Reenable=再度有効にする
 ExcludeMember=構成員を除外する
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=地域別構成員統計
 NbOfMembers=構成員総数
 NbOfActiveMembers=現在アクティブな構成員の総数
 NoValidatedMemberYet=承認済みの構成員が見つからない
-MembersByCountryDesc=この画面には、国別の構成員の統計が表示される。グラフとチャートは、Googleオンライングラフサービスの可用性と、機能しているインターネット接続の可用性に依存する。
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=この画面には、州/県/地区ごとの構成員の統計が表示される。
 MembersByTownDesc=この画面には、町ごとの構成員の統計が表示される。
 MembersByNature=この画面には、構成員の統計が表示される。
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index 773373defea..0897c905d8d 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -97,7 +97,6 @@ ShowService=サービスを表示
 ProductsAndServicesArea=製品とサービス部門
 ProductsArea=製品部門
 ServicesArea=サービス部門
-ListOfStockMovements=在庫推移のリスト
 BuyingPrice=買価
 PriceForEachProduct=特定の価格の製品
 SupplierCard=仕入先カード
@@ -172,7 +171,7 @@ BuyingPrices=購入価格
 CustomerPrices=顧客価格
 SuppliersPrices=仕入先価格
 SuppliersPricesOfProductsOrServices=(製品またはサービスの)仕入先価格
-CustomCode=税関|商品| HSコード
+CustomCode=税関|商品|HS|TARIC コード
 CountryOrigin=原産国
 RegionStateOrigin=原産地
 StateOrigin=州|原産地
@@ -210,6 +209,7 @@ unitL=リットル
 unitT=トン
 unitKG=kg
 unitG=グラム
+unitGAL=ガロン
 unitMG=mg
 unitLB=ポンド
 unitOZ=オンス
@@ -312,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=要求の形式は {"URL": "http://example.com/
 UpdateInterval=更新間隔(分)
 LastUpdated=最新のアップデート
 CorrectlyUpdated=正しく更新された
-PropalMergePdfProductActualFile=PDF Azur に追加するために使用するファイルは
+PropalMergePdfProductActualFile=製品 が提案の一部である場合、PDF 提案に含める PDF ファイル...
 PropalMergePdfProductChooseFile=PDFファイルを選択
 IncludingProductWithTag=タグ付きの製品/サービスを含む
 DefaultPriceRealPriceMayDependOnCustomer=デフォルト価格、実際の価格は顧客によって異なる場合がある
@@ -349,6 +349,10 @@ QtyRecalculatedWithPackaging=ラインの数量は、サプライヤーのパッ
 
 #Attributes
 Attributes=属性
+ProductAttributeExtrafields=バリアント属性の追加フィールド
+ProductAttributeExtrafieldsSetup=バリアント属性の追加フィールドの設定
+ProductAttributeValueExtrafields=バリアント属性値の追加フィールド
+ProductAttributeValueExtrafieldsSetup=バリアント属性値の追加フィールドの設定
 VariantAttributes=バリアント属性
 ProductAttributes=製品のバリアント属性
 ProductAttributeName=バリアント属性%s
@@ -396,6 +400,8 @@ ErrorDestinationProductNotFound=宛先製品が見つからない
 ErrorProductCombinationNotFound=製品バリアントが見つからない
 ActionAvailableOnVariantProductOnly=製品のバリアントでのみ使用可能なアクション
 ProductsPricePerCustomer=顧客あたりの製品価格
+ProductLevelExtraFields=追加属性（レベル価格）
+ProductCustomerExtraFields=追加属性（顧客価格）
 ProductSupplierExtraFields=追加属性(サプライヤー価格)
 DeleteLinkedProduct=組み合わせにリンクされている子製品を削除
 AmountUsedToUpdateWAP=加重平均価格の更新に使用する単価
@@ -437,3 +443,6 @@ AllowStockMovementVariantParentHelp=デフォルトでは、バリアントの
 ConfirmSetToDraftInventory=下書きステータスに戻したいか?<br>現在在庫に設定されている数量はリセットされる。
 WarningLineProductNotToSell=製品 または サービス 「%s」は販売されず、複製された。
 PriceLabel=価格ラベル
+GenerateImage=画像を生成する
+GenerateWithAI=AIで生成
+PriceByCustomeAndMultiPricesAbility=顧客ごとに異なる価格 + 製品/サービス ごとに複数の価格セグメント (各顧客は 1 つの価格セグメントに属する)
diff --git a/htdocs/langs/ja_JP/salaries.lang b/htdocs/langs/ja_JP/salaries.lang
index 92a1708d20a..ad6d1d84837 100644
--- a/htdocs/langs/ja_JP/salaries.lang
+++ b/htdocs/langs/ja_JP/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=新規給与
 AddSalary=給与を追加
 NewSalaryPayment=新規給与カード
 AddSalaryPayment=給与支払を追加する
+SalaryID=給与ID
+SalaryAmount=給与額
 SalaryPayment=給与の支払
 SalariesPayments=給与の支払
 SalariesPaymentsOf=%sの給与支払
@@ -27,7 +29,7 @@ FillFieldFirst=最初に従業員フィールドに入力する
 UpdateAmountWithLastSalary=最終給与額の設定
 MakeTransferRequest=転送リクエストを行う
 VirementOrder=単位振替リクエスト
-BankTransferAmount=振込金額
 WithdrawalReceipt=債権譲渡注文
 OrderWaiting=未決注文
 FillEndOfMonth=月末を記入
+UserPaySlip=給与明細書
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index 8077f97e027..f1bcf26a47e 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=他の名前/エイリアスのリストをここで使用
 WEBSITE_CSS_URL=外部CSSファイルのURL
 WEBSITE_CSS_INLINE=CSSファイルの内容(全ページに共通)
 WEBSITE_JS_INLINE=JavaScript ファイル コンテンツ (すべてのページに共通)
-WEBSITE_HTML_HEADER=HTMLヘッダーの下部に追加(全ページに共通)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=ロボットファイル(robots.txt)
 WEBSITE_HTACCESS=ウェブサイトの.htaccessファイル
 WEBSITE_MANIFEST_JSON=ウェブサイトmanifest.jsonファイル
@@ -56,16 +56,17 @@ ReadPerm=読む
 WritePerm=書く
 TestDeployOnWeb=Webでのテスト/デプロイ
 PreviewSiteServedByWebServer=<u>新規タブで %s をプレビュー。</u><br><br>  %s は、外部Webサーバ (Apache, Nginx, IIS など) から提供される。 以下のディレクトリを指定するには、当該サーバをインストールして設定する必要あり:<br><strong>%s</strong><br>URL は外部サーバ:<br><strong>%s</strong> による
-PreviewSiteServedByDolibarr= <u>新しいタブで%sをプレビューする。 </u> <br> <br> %sはDolibarrサーバーによって提供されるため、追加のWebサーバー（Apache、Nginx、IISなど）をインストールする必要はない。 <br>不便なのは、ページのURLがユーザフレンドリーではなく、Dolibarrのパスで始まること。 URL <br> Dolibarrによって提供：<br> <strong> %s </strong> <br> <br>ディレクトリ<br> <strong> %s </strong> <br>上のポイントは、この仮想サーバーの名前を入力するWebサーバー上の仮想ホストを作成し、このウェブサイトを提供するために、独自の外部Webサーバーを使用するにはこのWebサイトのプロパティで、「Webでのテスト/展開」リンクをクリックする。
+PreviewSiteServedByDolibarr=<u>新規タブで %s をプレビューする。</u><br><br> %s は Dolibarr サーバ によって提供されるため、追加の Web サーバ (Apache など) は必要ありない。 Nginx、IIS などの他のアプリケーションをインストールする必要がある。<br>不便なのは、ページの URL が ユーザ フレンドリーではなく、Dolibarr のパスで始まることだ。<br>Dolibarr によって提供される URL:<br><strong>%s</strong><br><br>独自の外部 Web サーバ (Apache、Nginx、Lighttp など) を使用してデプロイまたはテストするには、リンク "%s" を使用する。
 VirtualHostUrlNotDefined=外部Webサーバーによって提供される仮想ホストのURLが定義されていない
 NoPageYet=まだページはない
 YouCanCreatePageOrImportTemplate=新規ページを作成するか、完全なWebサイトテンプレートをインポートできる
 SyntaxHelp=特定の構文のヒントに関するヘルプ
 YouCanEditHtmlSourceckeditor=エディタの "ソース" ボタンを使用して、HTMLソースコードを編集できる。
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> このソースに PHP コード を含めるには、タグ <strong>&lt;?php ?&gt;</strong>。以下のグローバル変数が利用可能: $conf,$db,$mysoc,$User,$Website,$websitepage,$weblangs,$pagelangs。<br><br><span class="fa fa-bug paddingright"></span> また、次の構文を使用して、別のページ/コンテナーのコンテンツを含めることもできる。:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> 次の構文を使用して、別のページ/コンテナにリダイレクトできる (注意: リダイレクト前にコンテンツを出力しないこと):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>GET パラメータを使用してリダイレクトすることもできる:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> 別のページへのリンクを追加するには、構文:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br> <p><span class="fa fa-bug paddingright"></span> ページタイトルと <strong>SEO メタタグ </strong> (タイトル、キーワード、説明) を動的に設定できる。次の変数を定義するだけです:<br> <code>$__PAGE__TITLE__ = "タイトル値…";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1、keyword2、keyword3 …"; // カンマ区切り</code><br> <code>$__PAGE__DESC__ = "説明…";</code></p><br><span class="fa fa-download paddingright"></span> 含めるには<strong>ダウンロードリンク</strong> ファイル が <strong>documents</strong> ディレクトリに保存されている場合は、<strong>document.php</strong> ラッパーを使用する:<br>たとえば、ファイル を documents/ecm にエクスポートする場合 (ログに記録する必要がある)、構文は次のようになりる。:<br><strong>&lt;a href="/document.php?modulepart=ecm&ファイル=[relative_dir/]filename.ext"&gt;</strong><br>document/media（パブリックアクセス用のオープンディレクトリ）への ファイル の場合、構文は:<br><strong>&lt;a href="/document.php?mod ulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>共有リンクで共有された ファイル (共有ハッシュ キー ファイル を使用してアクセスを開く)、構文は :<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span>  含める<strong>画像</strong>を<strong>ドキュメント</strong> ディレクトリに保存し、<strong>viewimage.php</strong> ラッパーを使用する。<br>例:画像を documents/media  (公開アクセス用のオープン ディレクトリ) に挿入, 構文は:<br>  <strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]ファイル名.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=画像を共有リンク (ファイルの共有ハッシュキーを使用したオープンアクセス) で共有するなら、構文は:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span><strong>medias</strong>ディレクトリ（パブリックアクセスに公開されているディレクトリ）に保存されている <strong>image</strong> を含めるには、<strong>/medias</strong>、例:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=共有リンクで共有された画像（共有ハッシュキー ファイル を使用してオープンアクセス）の場合は、ラッパー :<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=PHP オブジェクトの画像の URL を取得する時に使用するのは<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=記事の HTML コンテンツ内の画像の URL を取得する、用法は<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>HTML または動的コードの例は<a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible"> the wiki documentation</a>で利用可能.<br>
 ClonePage=クローンページ/コンテナ
 CloneSite=クローンサイト
@@ -87,15 +88,15 @@ WebsiteAccount=ウェブサイトアカウント
 WebsiteAccounts=ウェブサイトアカウント
 AddWebsiteAccount=Webサイトアカウントを作成する
 BackToListForThirdParty=取引先向けリストに戻る
-DisableSiteFirst=最初にウェブサイトを無効にする
+DisableSiteFirst=Put website offline first
 MyContainerTitle=私のウェブサイトのタイトル
 AnotherContainer=これは、別のページ/コンテナのコンテンツを含める方法(埋め込まれたサブコンテナが存在しない可能性があるため、動的コードを有効化と、ここでエラーが発生する可能性がある)
 SorryWebsiteIsCurrentlyOffLine=申し訳ありませんが、このウェブサイトは現在オフラインです。後ほどお戻りください...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Webサイトのアカウントテーブルを有効化
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=テーブルを有効にして、各Webサイト/取引先のWebサイトアカウント(ログイン/パス)を保存する
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=最初にデフォルトのホームページを定義する必要がある
-OnlyEditionOfSourceForGrabbedContentFuture=警告: 外部 Web ページをインポートして Web ページを作成するのは、経験豊富なユーザー向け 。ソースページの複雑さによっては、インポートの結果が元のページと異なる場合がある。また、ソース ページで一般的な CSS スタイルや競合する JavaScript が使用されている場合、このページで作業するときに ウェブサイト エディタの外観や機能が損なわれる可能性がある。この方法はページをより迅速に作成する方法 が、新しいページを最初から作成するか、提案されたページ テンプレートから作成することを勧める。<br>インライン エディタは機能しない場合があることにも注意すること。取得した外部ページで使用した場合とか。
-OnlyEditionOfSourceForGrabbedContent=コンテンツが外部サイトから取得された場合は、HTMLソースのエディションのみが可能。
+OnlyEditionOfSourceForGrabbedContentFuture=警告: 外部 Web ページをインポートして Web ページを作成するのは、経験豊富なユーザー向けだ。ソース ページの複雑さによっては、インポートの結果が元のものと異なる場合がある。また、ソース ページで一般的な CSS スタイルや競合する JavaScript が使用されている場合、このページで作業しているときに ウェブサイト エディターの外観や機能が損なわれる可能性がある。この方法はページを作成するためのより迅速な方法だが、新規ページを最初から作成するか、提案されたページ テンプレートから作成することをお勧めする。<br>また、取得した外部ページで使用すると、インライン エディターが正しく機能しない可能性があることにも注意すること。
+OnlyEditionOfSourceForGrabbedContent=外部サイトからコンテンツを取得する場合は、HTML ソースの変更のみが可能だ。
 GrabImagesInto=cssとページにある画像も取得する。
 ImagesShouldBeSavedInto=画像はディレクトリに保存する必要がある
 WebsiteRootOfImages=ウェブサイト画像のルートディレクトリ
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=顧客アカウントからログアウトする
 filteredByVersion=バージョンでフィルタリング
 removeFilter=フィルタを削除
 viewMyCart=ショッピングカートを見る
+Shipping=Shipping
 freeShipping=送料無料！
 noProducts=いいえ 製品
 nbrItemsInCart=カートには <span class="ajax_cart_quantity">0</span> 個のアイテムがある。
@@ -284,12 +286,13 @@ productNameAToZ=製品 名前: A から Z
 productNameZToA=製品 名前: Z から A
 referenceLowestFirst=参照: 最低順
 referenceHighestFirst=参照: 最高値順
+productPerPage=products per page
 perPage=1ページあたり
 showAll=すべて表示する
 showing= 表示中
 nbrOfProducts= %s 製品 がある。
 noResultsHaveBeenFound=0 件の結果が見つかった。
-noResultsWereFound= 結果が見つからず。
+noResultsWereFound=結果が見つからず。
 addToCart=カートに追加
 backHome=ホームに戻る
 priceDrop=価格下落
@@ -302,10 +305,11 @@ lastUpdate=最後の更新
 contactSupport=サポートへのお問い合わせ方法
 noProductToDisplay=エラー、表示する 製品 がない
 yourCompanyInformation=あなたの 法人 情報
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=このEメールはすでに登録されている。
 firstnameContainsLettersOnly=<b>名</b>には文字とスペースのみ使用できる
 lastnameContainsLettersOnly=<b>姓</b>には文字とスペースのみを含めることができる
-passwordCriteria=<b>パスワード</b>は次の条件を満たす必要がある:<br>- 12 文字<br>- 大文字 1 文字<br>- 数字 1 文字<br>- 特殊文字なし<br>- 文字を 3 回以上繰り返さないこと<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=エラーが発生した。
 accountCreation=アカウントを作成する
 errorsOccurred=%s エラーがある%s
@@ -357,3 +361,7 @@ subtract=減算
 LoginCheckout=ログインしてチェックアウトに進む
 paymentSuccessProcessed=お支払いが正常に処理された。
 youWillBeRedirectedToOrderPage=すぐに注文の詳細ページにリダイレクトされる。
+WebPortalSetupNotComplete=Webポータルの設定が完了していない
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/kk_KZ/admin.lang b/htdocs/langs/kk_KZ/admin.lang
index ee36298a5a6..11044cd69f5 100644
--- a/htdocs/langs/kk_KZ/admin.lang
+++ b/htdocs/langs/kk_KZ/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Файлдардың тұтастығын т
 FileIntegritySomeFilesWereRemovedOrModified=Файлдардың тұтастығын тексеру сәтсіз аяқталды. Кейбір файлдар өзгертілді, жойылды немесе қосылды.
 GlobalChecksum=Жаһандық бақылау сомасы
 MakeIntegrityAnalysisFrom=Бағдарлама файлдарына тұтастық талдау жасаңыз
-LocalSignature=Ендірілген жергілікті қолтаңба (сенімділігі төмен)
-RemoteSignature=Қашықтағы қолтаңба (неғұрлым сенімді)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Файлдар жоқ
 FilesUpdated=Жаңартылған файлдар
 FilesModified=Өзгертілген файлдар
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Күн тәртібінің кейбір нұсқалар
 Security=Қауіпсіздік
 Passwords=Құпия сөздер
 DoNotStoreClearPassword=Деректер базасында сақталған құпия сөздерді шифрлау.
-MainDbPasswordFileConfEncrypted=Conf.php -де сақталған дерекқордың құпия сөзін шифрлау. Бұл опцияны белсендіру ұсынылады.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=<b> conf.php </b> файлына құпия сөзді кодтау үшін <br> <b> $ dolibarr_main_db_pass = «...» жолын ауыстырыңыз; </b> <br> by <br> <b> $ dolibarr_main_db_pass = «crypted: %s»; </b>
 InstrucToClearPass=<b> conf.php </b> файлында құпия сөздің шифры (түсінікті) болуы үшін <br> <b> $ dolibarr_main_db_pass = «crypted: ...» жолын ауыстырыңыз; </b> <br> by <br> <b> $ dolibarr_main_db_pass = «%s»; </b>
 ProtectAndEncryptPdfFiles=Жасалған PDF файлдарын қорғаңыз. Бұл ұсынылмайды, себебі ол PDF -тің көп бөлігін бұзады.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Геометриялық нүкте
 ExtrafieldMultiPointGeo=Геометриялық көп нүкте
 ExtrafieldLinestringGeo=Геометриялық сызық
 ExtrafieldPolygonGeo=Геометриялық көпбұрыш
+ExtrafieldStars=Stars
 ComputedFormula=Есептелген өріс
-ComputedFormulaDesc=Мұнда динамикалық есептелген мәнді алу үшін нысанның басқа қасиеттерін немесе кез келген PHP кодтауын пайдаланып формуланы енгізуге болады. Сіз кез келген PHP үйлесімді формулаларды пайдалана аласыз, соның ішінде "?" шарт операторы және келесі жаһандық нысан: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>ЕСКЕРТУ</strong> объектінің сипаттары: қажет болса жүктелмеген, жай ғана екінші мысалдағыдай нысанды формулаңызға алыңыз.<br>Есептелетін өрісті пайдалану интерфейстен өзіңізге ешқандай мән енгізе алмайтыныңызды білдіреді. Сондай-ақ, синтаксистік қате болса, формула ештеңені қайтармауы мүмкін.<br><br>Формуланың мысалы:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Нысанды қайта жүктеу мысалы<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] $j- >капитал / 5: '-1')<br><br>Нысан мен оның негізгі нысанын мәжбүрлеуге арналған формуланың басқа мысалы: <br>(($reloadedobj = жаңа тапсырма($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = жаңа жоба( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Ата-аналық жоба табылмады'
+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'
 Computedpersistent=Есептелген өрісті сақтау
 ComputedpersistentDesc=Есептелген қосымша өрістер дерекқорда сақталады, алайда бұл өрістің объектісі өзгерген кезде ғана мән қайта есептеледі. Егер есептелетін өріс басқа объектілерге немесе жаһандық деректерге тәуелді болса, бұл мән қате болуы мүмкін !!
 ExtrafieldParamHelpPassword=Бұл өрісті бос қалдырсаңыз, бұл мән шифрлаусыз сақталады дегенді білдіреді (өріс экранда жұлдызшалармен жасырылған).<br><br>Енгізіңіз қайтарылатын шифрлау алгоритмімен мәнді кодтау үшін 'dolcrypt' мәні. Таза деректерді әлі де білуге және өңдеуге болады, бірақ дерекқорға шифрланады.<br><br>'auto' (немесе 'md5') енгізіңіз. 'sha256', 'password_hash', ...) әдепкі құпия сөзді шифрлау алгоритмін (немесе md5, sha256, password_hash...) пайдалану үшін қайтарылмайтын хэштелген құпия сөзді дерекқорға сақтау үшін (бастапқы мәнді шығарып алудың жолы жоқ)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Электрондық поштаны жіберу үшін өзіңіздің электрондық пошта қызмет провайдерінің SMTP серверін пайдалану да қызықты, сондықтан қосымшадан жіберілген барлық хаттар сіздің пошта жәшігіңіздің «Жіберілген» каталогына сақталады.
 WarningPHPMailD=Сондықтан электрондық хаттарды жіберу әдісін «SMTP» мәніне өзгерту ұсынылады.
 WarningPHPMailDbis=Электрондық хаттарды жіберудің әдепкі "PHP" әдісін шынымен сақтағыңыз келсе, жай ғана бұл ескертуді елемеңіз немесе %sосы жерді басу арқылы жойыңыз%s.
-WarningPHPMail2=Егер сіздің электрондық пошта SMTP провайдеріңізге электрондық пошта клиентін кейбір IP мекенжайларымен шектеу қажет болса (өте сирек), бұл сіздің ERP CRM қосымшасына арналған пошта пайдаланушы агентінің (MUA) IP мекенжайы: <strong> %s </strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Бухгалтерлік есеп (жеңілдетілген)
 Module10Desc=Мәліметтер қорының мазмұнына негізделген қарапайым бухгалтерлік есептер (журналдар, айналымдар). Ешқандай бухгалтерлік кестені пайдаланбайды.
 Module20Name=Ұсыныстар
 Module20Desc=Коммерциялық ұсыныстарды басқару
-Module22Name=Жаппай электрондық хабарлар
-Module22Desc=Жаппай электрондық поштаны басқару
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Энергия
 Module23Desc=Энергия шығынын бақылау
 Module25Name=Сатуға тапсырыстар
@@ -847,10 +848,10 @@ Permission212=Тапсырыс жолдары
 Permission213=Желіні іске қосыңыз
 Permission214=Телефонияны орнату
 Permission215=Провайдерлерді орнату
-Permission221=Электрондық хаттарды оқыңыз
-Permission222=Электрондық поштаны құру/өзгерту (тақырып, алушылар ...)
-Permission223=Электрондық поштаны растау (жіберуге мүмкіндік береді)
-Permission229=Электрондық хабарларды жою
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Алушылар мен ақпаратты қарау
 Permission238=Хабарламаларды қолмен жіберіңіз
 Permission239=Тексеруден кейін немесе жіберілгеннен кейін хабарламаларды жойыңыз
@@ -1105,6 +1106,7 @@ DictionaryStaff=Жұмысшылар саны
 DictionaryAvailability=Жеткізудің кешігуі
 DictionaryOrderMethods=Тапсырыс беру әдістері
 DictionarySource=Ұсыныстардың/тапсырыстардың шығу тегі
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Есептер үшін жеке топтар
 DictionaryAccountancysystem=Бухгалтерлік жоспардың модельдері
 DictionaryAccountancyJournal=Бухгалтерлік журналдар
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Сөздіктер тізіміне қайта келу
 TypeOfRevenueStamp=Салық белгісінің түрі
 VATManagement=Сатудан алынатын салықты басқару
 VATIsUsedStandard=Құжаттарды (ұсыныстар, шот-фактуралар, тапсырыстар...) жасау кезінде стандартты ережелерге сәйкес (сатушы мен сатып алушы елдерге байланысты) Сату салығының әдепкі мөлшерлемесі белгіленеді.
-VATIsUsedDesc=Әдепкі бойынша ұсыныстарды, шот-фактураларды, тапсырыстарды және т.б. жасау кезінде Сату салығының мөлшерлемесі белсенді стандартты ережеге сәйкес келеді:<br>Егер сатушы сату салығына жатпайтын болса, онда Сату салығы әдепкі мәні 0 болады. Ереженің соңы.<br>Егер (сатушы елі = сатып алушының елі), әдепкі бойынша Сату салығы сатушы еліндегі өнімнің Сату салығына тең болады. Ереженің соңы.<br>Егер сатушы да, сатып алушы да Еуропалық қауымдастықта болса және тауарлар көлікке қатысты өнімдер (тасымалдау, тасымалдау, авиакомпания) болса, әдепкі ҚҚС 0 болады. Бұл ереже сатушының еліне байланысты - бухгалтеріңізбен кеңесіңіз. ҚҚС-ты сатып алушы сатушыға емес, өз еліндегі кеден органына төлеуі керек. Ереженің соңы.<br>Егер сатушы мен сатып алушы Еуропалық қауымдастықта болса және сатып алушы компания болмаса (қауымдастық ішінде тіркелген ҚҚС нөмірі бар), ҚҚС әдепкі бойынша сатушы елінің ҚҚС мөлшерлемесі. Ереженің соңы.<br>Егер сатушы мен сатып алушы Еуропалық қауымдастықта болса және сатып алушы компания болса (қауымдастық ішінде тіркелген ҚҚС нөмірі бар), онда ҚҚС 0 болады. әдепкі бойынша. Ереженің соңы.<br>Кез келген басқа жағдайда ұсынылған әдепкі Сату салығы=0 болады. Ереженің соңы.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Әдепкі бойынша, ұсынылған сатудан алынатын салық 0, оны ассоциациялар, жеке тұлғалар немесе шағын компаниялар сияқты жағдайларда қолдануға болады.
 VATIsUsedExampleFR=Францияда бұл нақты фискалдық жүйесі бар компанияларды немесе ұйымдарды білдіреді (жеңілдетілген нақты немесе қалыпты нақты). ҚҚС декларацияланатын жүйе.
 VATIsNotUsedExampleFR=Францияда бұл сатылым салығы бойынша декларацияланбаған бірлестіктерді немесе шағын кәсіпкерлік фискальдық жүйені (франшизадағы сату салығы) таңдаған және сатуға салық декларациясынсыз франшиза сату салығын төлеген компанияларды, ұйымдарды немесе либералды кәсіптерді білдіреді. Бұл таңдау шот -фактураларда «Қолданылмайтын сатылым салығы - CGI -293В» сілтемесін көрсетеді.
-VATType=Салық түрі
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Сатудан алынатын салық түрі
 LTRate=Бағалау
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Салықтардың реттелуіне сәйке
 LabelUsedByDefault=Егер код үшін аударма табылмаса, әдепкі бойынша қолданылатын белгі
 LabelOnDocuments=Құжаттарға белгі қою
 LabelOrTranslationKey=Белгі немесе аударма кілті
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Аударма табылды
 TheTranslationIsSearchedFromKey=Аударма аударма кілтінен ізделеді: <b>%s</b>
 TranslationKey=Аударма кілті
@@ -1431,7 +1434,7 @@ AddVatInList=Тұтынушы/Жеткізуші ҚҚС нөмірін құра
 AddAdressInList=Тұтынушы/Жеткізуші мекенжайын құрама тізімдерде көрсетіңіз.<br>Үшінші тараптар "" орнына "The Big Company corp. - 21 jump street 123456 Big town - USA" атау пішімімен шығады. Үлкен компания корпорациясы».
 AddEmailPhoneTownInContactList=Байланыс электрондық поштасын (немесе анықталмаған болса телефондарды) және қаланы құрама тізімдерге көрсетіңіз.<br>Контактілер "Dupond Durand - dupond.durand@example.com - Париж" атауы пішімінде пайда болады. » немесе «Дюпон Дюранд» орнына «Дюпон Дюранд – 06 07 59 65 66 – Париж» деп жазылады.
 AskForPreferredShippingMethod=Үшінші тараптар үшін жөнелтудің қолайлы әдісін сұраңыз.
-FieldEdition=%s өрісінің басылымы
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Мысал: +2 (уақыт белдеуінің ығысу проблемалары туындаған жағдайда ғана толтырыңыз)
 GetBarCode=Штрих -код алыңыз
 NumberingModules=Нөмірлеу модельдері
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Шот -фактура күнін растау күніне м
 SuggestedPaymentModesIfNotDefinedInInvoice=Шот -фактурада ұсынылмаған төлем режимі, егер шот -фактурада анықталмаса
 SuggestPaymentByRIBOnAccount=Шот бойынша ақша алу арқылы төлем жасауды ұсыныңыз
 SuggestPaymentByChequeToAddress=Чек арқылы төлеуді ұсыныңыз
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Шот -фактуралардағы ақысыз мәтін
 WatermarkOnDraftInvoices=Шот -фактуралардағы су белгісі (бос емес)
 PaymentsNumberingModule=Төлем нөмірлеу моделі
@@ -1718,6 +1723,7 @@ CompressionOfResources=HTTP жауаптарының қысылуы
 CompressionOfResourcesDesc=Мысалы, Apache директивасын қолдану арқылы «AddOutputFilterByType DEFLATE»
 TestNotPossibleWithCurrentBrowsers=Мұндай автоматты анықтау қазіргі браузерлерде мүмкін емес
 DefaultValuesDesc=Мұнда сіз жаңа жазбаны жасау кезінде пайдаланғыңыз келетін әдепкі мәнді және/немесе әдепкі сүзгілерді немесе жазбаларды тізімдеу кезінде сұрыптау тәртібін анықтай аласыз.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Әдепкі мәндер (формаларда қолдану үшін)
 DefaultSearchFilters=Әдепкі іздеу сүзгілері
 DefaultSortOrder=Әдепкі сұрыптау тапсырыстары
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Жіберу нөмірлеу модульдері
 SendingsAbility=Клиенттерді жеткізуге арналған жеткізу парақтарын қолдау
 NoNeedForDeliveryReceipts=Көп жағдайда жеткізу парақтары тұтынушыларға жеткізілім парағы ретінде де (жіберілетін өнімдердің тізімі) де, тұтынушы қабылдаған және қол қойған парақтар ретінде де қолданылады. Сондықтан өнім жеткізілімінің түбіртегі қайталанатын функция болып табылады және сирек қосылады.
 FreeLegalTextOnShippings=Жеткізу туралы ақысыз мәтін
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Өнімдерді жеткізудің түбіртек нөмірлеу модулі
 DeliveryOrderModel=Өнімдерді жеткізудің түбіртек моделі
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Жеткізу түбіртектері тура
 ##### FCKeditor #####
 AdvancedEditor=Жетілдірілген редактор
 ActivateFCKeditor=Қосымша редакторды іске қосыңыз:
-FCKeditorForNotePublic=WYSIWYG элементтердің «қоғамдық жазбалары» өрісін құру/шығару
-FCKeditorForNotePrivate=WYSIWYG элементтердің «жеке жазбалары» өрісін құру/шығару
-FCKeditorForCompany=WYSIWYG элементтердің өріс сипаттамасын жасау/шығарылымы (өнімдерден/қызметтерден басқа)
-FCKeditorForProductDetails=WYSIWYG өнім сипаттамасын немесе объектілерге арналған жолдарды (ұсыныстар жолдары, тапсырыстар, шот-фактуралар және т.б.) жасау/шығарылымы.
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Ескерту: Бұл жағдайда бұл опцияны пайдалану ұсынылмайды, себебі PDF файлдарын жасау кезінде арнайы таңбалар мен бет пішімдеуіне қатысты мәселелер туындауы мүмкін.
-FCKeditorForMailing= Жаппай электрондық пошта жіберу үшін WYSIWYG жасау/шығарылымы (Құралдар->Электрондық пошта)
-FCKeditorForUserSignature=WYSIWYG пайдаланушы қолтаңбасын жасау/шығару
-FCKeditorForMail=Барлық пошта үшін WYSIWYG жасау/шығарылымы (Құралдар->Электрондық поштадан басқа)
-FCKeditorForTicket=Билеттер үшін WYSIWYG құру/шығарылымы
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Қор модулін баптау
 IfYouUsePointOfSaleCheckModule=Егер сіз әдепкі бойынша сатылатын Point of Sale модулін (POS) немесе сыртқы модульді қолдансаңыз, POS модулі бұл орнатуды елемеуі мүмкін. Көптеген POS модульдері әдепкі бойынша шот -фактураны дереу құруға және осы жердегі опцияларға қарамастан қорды азайтуға арналған. Егер сізге POS сатылымын тіркеу кезінде акцияның төмендеуі қажет болса немесе қажет болмаса, POS модулінің орнатылуын тексеріңіз.
@@ -1867,7 +1874,6 @@ Buy=Сатып алу
 Sell=Сату
 InvoiceDateUsed=Қолданылған шот -фактура күні
 YourCompanyDoesNotUseVAT=Сіздің компанияңыз ҚҚС қолданбайтыны анықталды (Home - Setup - Company/Organization), сондықтан ҚҚС параметрлері жоқ.
-AccountancyCode=Бухгалтерлік код
 AccountancyCodeSell=Сату шоты. код
 AccountancyCodeBuy=Шот сатып алу. код
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Жаңа салықты жасау кезінде әдепкі бойынша «Төлемді автоматты түрде жасау» құсбелгісін бос ұстаңыз
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Күн тәртібі мәзірін таңдағанда
 AGENDA_EVENT_PAST_COLOR = Өткен оқиғаның түсі
 AGENDA_EVENT_CURRENT_COLOR = Ағымдағы оқиғаның түсі
 AGENDA_EVENT_FUTURE_COLOR = Болашақ оқиғаның түсі
-AGENDA_REMINDER_BROWSER = </b> браузерінде <b> оқиғасы туралы еске салуды қосу (Еске түсіру күніне жеткенде, шолғыш қалқымалы терезені көрсетеді. Әр қолданушы браузердің хабарландыру қондырғысынан осындай хабарландыруларды өшіре алады).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Дыбыстық хабарландыруды қосу
-AGENDA_REMINDER_EMAIL = </b> электрондық поштасы арқылы <b> оқиғаны еске салуды қосу (еске салу опциясын/кідірісті әр оқиға бойынша анықтауға болады).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Ескертпе: %s жоспарланған тапсырманың жиілігі еске салудың дәл уақытта жіберілгеніне сенімді болу үшін жеткілікті болуы керек.
 AGENDA_SHOW_LINKED_OBJECT = Байланысты нысанды күн тәртібінде көрсету
 AGENDA_USE_EVENT_TYPE = Оқиға түрлерін қолданыңыз (Setup мәзірінде басқарылады -> Сөздіктер -> Күн тәртібіндегі оқиғалар түрі)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Оқиғаны құру формасындағы оқиға түрі үшін осы әдепкі мәнді автоматты түрде орнатыңыз
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Экспорт сілтемесін авторизациялау кілті
 PastDelayVCalExport=Ескі оқиғаны экспорттамаңыз
 SecurityKey = Қауіпсіздік кілті
@@ -2006,7 +2017,7 @@ BackupZipWizard=Құжаттар каталогының архивін құру
 SomethingMakeInstallFromWebNotPossible=Келесі себептерге байланысты веб -интерфейстен сыртқы модульді орнату мүмкін емес:
 SomethingMakeInstallFromWebNotPossible2=Осы себепті, мұнда сипатталған жаңарту процесі тек артықшылықты пайдаланушы орындай алатын қолмен жасалатын процесс.
 InstallModuleFromWebHasBeenDisabledContactUs=Қолданбадан сыртқы модульдерді немесе динамикалық веб-сайттарды орнату немесе әзірлеу қазіргі уақытта қауіпсіздік мақсатында құлыпталған. Бұл мүмкіндікті қосу қажет болса, бізге хабарласыңыз.
-InstallModuleFromWebHasBeenDisabledByFile=Әкімші сыртқы модульді қолданбадан орнатуды өшірді. Сіз бұл мүмкіндікті қамтамасыз ету үшін <strong> %s </strong> файлын жоюды сұрауыңыз керек.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Қолданбадан сыртқы модульді орнату немесе құру үшін модуль файлдарын <strong> %s </strong> каталогына сақтау қажет. Бұл каталогты Dolibarr өңдеуі үшін 2 директивалық жолды қосу үшін <strong> conf/conf.php </strong> конфигурациясын орнату қажет: <br> <strong> $ dolbarr_main_; </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s/custom'; </strong>
 HighlightLinesOnMouseHover=Тышқанды жылжыту кезінде кесте сызықтарын бөлектеңіз
 HighlightLinesColor=Тінтуір өткен кезде сызықтың түсін бөлектеңіз (ерекшелеу үшін 'ffffff' пайдаланыңыз)
@@ -2036,6 +2047,7 @@ Enter0or1=0 немесе 1 енгізіңіз
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Бұл жерге жақша арасына енгізіңіз, валюта белгісін білдіретін байт нөмірінің тізімі. Мысалы: $ үшін [36] енгізіңіз - бразилиялық нақты R үшін [82,36] - € үшін енгізіңіз [8364]
 ColorFormat=RGB түсі HEX форматында, мысалы: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Пішімдегі белгіше атауы:<br>- ағымдағы тақырып каталогындағы кескін файлы үшін image.png<br>- image.png@module егер файл модульдің /img/ каталогында болса<br>- FontAwesome fa-xxx picto үшін fa-xxx<br>- FontAwesome fa-xxx picto үшін fontawesome_xxx_fa_color_size (префикс, түс және өлшем жиынтығы бар)
 PositionIntoComboList=Біріктірілген тізімдердегі жолдың орналасуы
 SellTaxRate=Сату салығының мөлшерлемесі
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Жіберушінің мекенжай жақтауындағы шекараларды жасыру
 MAIN_PDF_NO_RECIPENT_FRAME=Алушының мекенжай жақтауындағы шекараларды жасыру
 MAIN_PDF_HIDE_CUSTOMER_CODE=Тұтынушы кодын жасыру
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Мекенжай блогында жіберушінің/компанияның атын жасыру
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Төлем шарттарын жасыру
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Төлем режимін жасыру
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Электрондық қолтаңба құралына оны қайта пайдалануға мүмкіндік беру үшін қолтаңба аймағына жасырын белгіні қосыңыз. Сыртқы құралдар немесе болашақта онлайн қолтаңба мүмкіндігі арқылы пайдаланылуы мүмкін.
@@ -2324,6 +2341,8 @@ NotRecommended=Ұсынылмайды
 ARestrictedPath=Деректер файлдары үшін кейбір шектеулі жол
 CheckForModuleUpdate=Модульдердің сыртқы жаңартуларын тексеріңіз
 CheckForModuleUpdateHelp=Бұл әрекет жаңа модульдің бар -жоғын тексеру үшін сыртқы модульдердің редакторларына қосылады.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Жаңарту қол жетімді
 NoExternalModuleWithUpdate=Сыртқы модульдер үшін жаңартулар табылмады
 SwaggerDescriptionFile=Swagger API сипаттамасы файлы (мысалы, redoc көмегімен пайдалану үшін)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Жеткізу мекенжайын көрсеті
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Кейбір елдерде міндетті түрде көрсету (Франция, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Әлеуметтік желінің URL сілтемесі. Әлеуметтік желі идентификаторы бар айнымалы бөлік үшін {socialid} пайдаланыңыз.
 IfThisCategoryIsChildOfAnother=Бұл категория басқа біреудің баласы болса
 DarkThemeMode=Қараңғы тақырып режимі
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Ескерту: %s модулі
 WarningModuleHasChangedSecurityCsrfParameter=Ескерту: %s модулі дананың CSRF қауіпсіздігін өшірді. Бұл әрекет күдікті және орнатуыңыз енді қорғалмауы мүмкін. Түсіндіру үшін модуль авторына хабарласыңыз.
 EMailsInGoingDesc=Кіріс электрондық хаттарды %s модулі басқарады. Кіріс электрондық хаттарды қолдау қажет болса, оны қосу және конфигурациялау қажет.
 MAIN_IMAP_USE_PHPIMAP=Жергілікті PHP IMAP орнына IMAP үшін PHP-IMAP кітапханасын пайдаланыңыз. Бұл сонымен қатар IMAP үшін OAuth2 қосылымын пайдалануға мүмкіндік береді (OAuth модулі де іске қосылуы керек).
-MAIN_CHECKBOX_LEFT_COLUMN=Өріс пен жолды таңдау үшін бағанды сол жақта көрсету (әдепкі бойынша оң жақта)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Әдепкі бойынша жасалмаған. Тек модульді белсендіру кезінде жасалған.
 CSSPage=CSS стилі
 Defaultfortype=Әдепкі
@@ -2489,7 +2510,7 @@ AiDescription=AI (жасанды интеллект) мүмкіндіктері
 AiDescriptionLong=Қолданбаның әртүрлі бөліктерінде AI (жасанды интеллект) мүмкіндіктерін қамтамасыз етеді. Сыртқы AI API қажет.
 AI_API_KEY=AI API кілті
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=AI мүмкіндіктеріне арналған қызмет
+AI_API_SERVICE=AI service to use
 AiSetup=AI модулін орнату
 AiCustomPrompt=AI реттелетін сұрау
 AI_CONFIGURATIONS_PROMPT=Арнаулы сұрау
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=Мүмкіндіктерге арналған AI ретте
 EnterAnIP=IP мекенжайын енгізіңіз
 ConvertInto=түрлендіру
 YouAreHere=Сен мындасың
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Жеткізу PDF құжатында штрих-кодты көрсетіңіз
 BARCODE_ON_RECEPTION_PDF=Қабылдау PDF құжатында штрих-кодты көрсетіңіз
 BARCODE_ON_STOCKTRANSFER_PDF=Штрих-кодты қор аудару PDF құжатында көрсетіңіз
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/kk_KZ/banks.lang b/htdocs/langs/kk_KZ/banks.lang
index c6231629e80..50d380129a5 100644
--- a/htdocs/langs/kk_KZ/banks.lang
+++ b/htdocs/langs/kk_KZ/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Балансты аяқтау
 CurrentBalance=Ағымдағы теңгерім
 FutureBalance=Болашақ баланс
 ShowAllTimeBalance=Балансты басынан көрсетіңіз
-AllTime=Басынан
 Reconciliation=Татуласу
 RIB=Банктік шот нөмірі
 IBAN=IBAN нөмірі
@@ -133,7 +132,7 @@ DeleteTransaction=Жазбаны жою
 ConfirmDeleteTransaction=Бұл жазбаны шынымен жойғыңыз келе ме?
 ThisWillAlsoDeleteBankRecord=Бұл сонымен қатар банктік жазбаны жояды
 BankMovements=Қозғалыстар
-PlannedTransactions=Жоспарланған жазбалар
+PlannedTransactions=Upcoming entries
 Graph=Графиктер
 ExportDataset_banque_1=Банктік жазбалар мен шот бойынша үзінді көшірме
 ExportDataset_banque_2=Депозиттік слип
@@ -151,7 +150,7 @@ FutureTransaction=Болашақ мәміле. Келісу мүмкін еме
 SelectChequeTransactionAndGenerate=Чек салымы түбіртегіне енгізілетін чектерді таңдаңыз/сүзіңіз. Содан кейін «Жасау» түймесін басыңыз.
 SelectPaymentTransactionAndGenerate=%s депозит түбіртегіне қосылатын құжаттарды таңдаңыз/сүзіңіз. Содан кейін «Жасау» түймесін басыңыз.
 InputReceiptNumber=Келісімге қатысты банк үзіндісін таңдаңыз. Сұрыпталатын сандық мәнді пайдаланыңыз
-InputReceiptNumberBis=ЖЖЖЖАА немесе ЖЖЖЖАА
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Татуласу үшін?
 ThenCheckLinesAndConciliate=Содан кейін банктік үзіндіде көрсетілген жолдарды тексеріп, шертіңіз
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Егер бұл функция қосылған бол
 BankColorizeMovementName1=Дебеттік қозғалыстың фондық түсі
 BankColorizeMovementName2=Несие қозғалысының фондық түсі
 IfYouDontReconcileDisableProperty=Егер сіз кейбір банктік шоттар бойынша банктік салыстыруларды жасамасаңыз, бұл ескертуді алып тастау үшін олардағы «%s» қасиетін өшіріңіз.
-NoBankAccountDefined=Банктік шот анықталмаған
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Банктік шотта жазба табылмады. Әдетте бұл банктік шоттағы операциялар тізімінен жазбаны қолмен жою кезінде пайда болады (мысалы, банктік шотты салыстыру кезінде). Тағы бір себеп - төлем «%s» модулі өшірілген кезде жазылған.
 AlreadyOneBankAccount=Бір банк шоты анықталған
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA файл нұсқасы
diff --git a/htdocs/langs/kk_KZ/blockedlog.lang b/htdocs/langs/kk_KZ/blockedlog.lang
index dcec9f519f7..9c72665d614 100644
--- a/htdocs/langs/kk_KZ/blockedlog.lang
+++ b/htdocs/langs/kk_KZ/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Өзгермейтін журналдар
 ShowAllFingerPrintsMightBeTooLong=Барлық мұрағатталған журналдарды көрсету (ұзақ болуы мүмкін)
 ShowAllFingerPrintsErrorsMightBeTooLong=Барлық жарамсыз мұрағат журналдарын көрсету (ұзақ болуы мүмкін)
 DownloadBlockChain=Саусақ іздерін жүктеу
-KoCheckFingerprintValidity=Мұрағатталған журнал жазбасы жарамсыз. Бұл біреу (хакер?) Бұл жазбаның кейбір деректерін жазғаннан кейін өзгерткенін немесе алдыңғы мұрағатталған жазбаны өшіргенін (алдыңғы # бар екенін тексеріңіз) немесе алдыңғы жазбаның бақылау сомасын өзгерткенін білдіреді.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Мұрағатталған журнал жазбасы жарамды. Бұл жолдағы деректер өзгертілмеген және жазба алдыңғыға сәйкес келеді.
 OkCheckFingerprintValidityButChainIsKo=Мұрағатталған журнал алдыңғы журналмен салыстырғанда жарамды болып көрінеді, бірақ тізбек бұрын бүлінген.
 AddedByAuthority=Қашықтан басқару органында сақталған
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Журнал мәліметтері
 ListOfTrackedEvents=Бақыланатын оқиғалар тізімі
 Fingerprint=Саусақ ізі
 DownloadLogCSV=Мұрағатталған журналдарды экспорттау (CSV)
-DataOfArchivedEvent=Мұрағатталған оқиғаның толық деректері
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Түпнұсқа нысан (%s түрі, id %s) байланыстырылмаған (өзгермейтін сақталған деректерді алу үшін «Толық деректер» бағанын қараңыз)
 BlockedLogAreRequiredByYourCountryLegislation=Өзгермейтін журналдар модулі сіздің елдің заңнамасына сәйкес қажет болуы мүмкін. Бұл модульді өшіру болашақта заңға және заңдық бағдарламалық қамтамасыз етуді қолдануға қатысты кез келген транзакцияларды жарамсыз етуі мүмкін, себебі оларды салықтық тексеру тексере алмайды.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Өзгертілмейтін журналдар модулі сіздің елдің заңнамасына байланысты іске қосылды. Бұл модульді өшіру болашақта заңға және заңдық бағдарламалық қамтамасыз етуді қолдануға қатысты кез келген транзакцияларды жарамсыз етуі мүмкін, себебі оларды салықтық тексеру тексере алмайды.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Оқиғаларды өзгертілмейтін журнал
 BlockedLogDisabled=Оқиғаларды өзгертуге болмайтын журналдарға бақылау жүйесі кейбір жазулар аяқталғаннан кейін өшірілді. Біз тізбектің үзілгенін бақылау үшін арнайы саусақ ізін сақтадық
 BlockedLogDisabledBis=Оқиғаларды өзгертілмейтін журналдарға бақылау жүйесі өшірілген. Бұл мүмкін, себебі әлі ешқандай жазба жасалмаған.
 LinkHasBeenDisabledForPerformancePurpose=Орындау мақсатында құжатқа тікелей сілтеме 100-жолдан кейін көрсетілмейді.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Тұтынушының шот -фактурасы логикалық түрде жойылады
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Клиенттердің төлемдерінің л
 logPAYMENT_VARIOUS_CREATE=Төлем жасалды (шот -фактураға тағайындалмады)
 logPAYMENT_VARIOUS_DELETE=Төлем (шот -фактураға тағайындалмаған) логикалық жою
 logPAYMENT_VARIOUS_MODIFY=Төлем (шот -фактураға тағайындалмаған) өзгертілді
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/kk_KZ/categories.lang b/htdocs/langs/kk_KZ/categories.lang
index d9fbd3d9425..250e8155f68 100644
--- a/htdocs/langs/kk_KZ/categories.lang
+++ b/htdocs/langs/kk_KZ/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Байланыс тегтері/санаттары айм
 AccountsCategoriesArea=Банк шотының тегтері/санаттары аймағы
 ProjectsCategoriesArea=Жоба тегтері/санаттары аймағы
 UsersCategoriesArea=Пайдаланушы тегтері/санаттары аймағы
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Ішкі санаттар
 CatList=Тегтер/санаттар тізімі
 CatListAll=Тегтер/санаттар тізімі (барлық түрлері)
@@ -90,9 +91,10 @@ CategoriesSetup=Тегтер/категорияларды орнату
 CategorieRecursiv=Ата -аналық тегпен/категориямен автоматты түрде байланыстырыңыз
 CategorieRecursivHelp=Опция қосулы болса, нысанды ішкі санатқа қосқанда, нысан негізгі санаттарға да қосылады.
 AddProductServiceIntoCategory=Өнімге/қызметке санат тағайындаңыз
-AddCustomerIntoCategory=Клиентке категорияны тағайындаңыз
-AddSupplierIntoCategory=Жеткізушіге категория беріңіз
-AssignCategoryTo=Санат тағайындаңыз
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Тегті/санатты көрсету
 ByDefaultInList=Тізімде әдепкі бойынша
 ChooseCategory=Санатты таңдаңыз
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Контейнерлік беттер санатта
 KnowledgemanagementsCategoriesArea=KM мақаласының санаттары
 UseOrOperatorForCategories=Санаттар үшін 'НЕ' операторын қолданыңыз
 AddObjectIntoCategory=Санатқа тағайындау
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/kk_KZ/companies.lang b/htdocs/langs/kk_KZ/companies.lang
index 51e9c7dfa35..0f617a88260 100644
--- a/htdocs/langs/kk_KZ/companies.lang
+++ b/htdocs/langs/kk_KZ/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Ел Еуропалық экономикалық қоғамдас
 PriceFormatInCurrentLanguage=Бағаны ағымдағы тілде және валютада көрсету форматы
 ThirdPartyName=Үшінші тараптың атауы
 ThirdPartyEmail=Үшінші тараптың электрондық поштасы
-ThirdParty=Үшінші жақ
-ThirdParties=Үшінші тараптар
+ThirdParty=Third party
+ThirdParties=Third parties
 ThirdPartyProspects=Болашағы
 ThirdPartyProspectsStats=Болашағы
 ThirdPartyCustomers=Клиенттер
@@ -65,6 +65,7 @@ State=Штат/провинция
 StateId=Штат идентификаторы
 StateCode=Мемлекет/провинция коды
 StateShort=Мемлекет
+DepartmentBuyer=Buyer's state/province
 Region=Аймақ
 Region-State=Аймақ - Мемлекет
 Country=Ел
@@ -78,7 +79,7 @@ Chat=Чат
 PhonePro=Автобус. телефон
 PhonePerso=Pers. телефон
 PhoneMobile=Ұялы телефон
-No_Email=Жаппай электрондық поштаны жіберуден бас тартыңыз
+No_Email=Refuse mass emails
 Fax=Факс
 Zip=Пошталық индекс
 Town=Қала
@@ -382,11 +383,12 @@ ExportCardToFormat=Пішімдеу үшін картаны экспорттаң
 ContactNotLinkedToCompany=Байланыс үшінші тараппен байланысты емес
 DolibarrLogin=Dolibarr логині
 NoDolibarrAccess=Dolibarr қатынасы жоқ
-ExportDataset_company_1=Үшінші тұлғалар (компаниялар/қорлар/жеке адамдар) және олардың қасиеттері
-ExportDataset_company_2=Байланыс және олардың қасиеттері
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Үшінші тұлғалар және олардың қасиеттері
 ImportDataset_company_2=Үшінші тараптардың қосымша байланыстары/мекен-жайлары мен атрибуттары
-ImportDataset_company_3=Үшінші тұлғалардың банктік шоттары
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Үшінші тараптардың сату өкілдері (компанияларға сату өкілдерін/пайдаланушыларды тағайындаңыз)
 PriceLevel=Баға деңгейі
 PriceLevelLabels=Баға деңгейінің белгілері
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Тексерусіз тегін код.
 ManagingDirectors=Менеджердің аты -жөні (бас директор, директор, президент ...)
 MergeOriginThirdparty=Қайталанатын үшінші тарап (жойғыңыз келетін үшінші тарап)
 MergeThirdparties=Үшінші тараптарды біріктіру
-ConfirmMergeThirdparties=Сіз таңдалған үшінші тарапты қазіргімен біріктіргіңіз келетініне сенімдісіз бе? Барлық байланысқан объектілер (шот -фактуралар, тапсырыстар, ...) ағымдағы үшінші тарапқа көшіріледі, содан кейін таңдалған үшінші тарап жойылады.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Үшінші тараптар біріктірілді
 SaleRepresentativeLogin=Сату өкілінің кіруі
 SaleRepresentativeFirstname=Сату өкілінің аты -жөні
@@ -460,3 +462,6 @@ ExternalSystemID=Сыртқы жүйе идентификаторы
 IDOfPaymentInAnExternalSystem=Сыртқы жүйеге төлем режимінің идентификаторы (мысалы, Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE веб-қызметінің тіркелгі деректері
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Stripe жағында банк ақпаратын жасауға рұқсат беру үшін үшінші тарап тұтынушы болуы керек
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/kk_KZ/compta.lang b/htdocs/langs/kk_KZ/compta.lang
index 505f4efb728..2438c4f7bf3 100644
--- a/htdocs/langs/kk_KZ/compta.lang
+++ b/htdocs/langs/kk_KZ/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Клиенттердің шот -фактурасын т
 PaymentSupplierInvoice=сатушының шот -фактурасын төлеу
 PaymentSocialContribution=Әлеуметтік/салықтық төлем
 PaymentVat=ҚҚС төлеу
-AutomaticCreationPayment=Төлемді автоматты түрде тіркеу
+AutomaticCreationPayment=Also record the payment
 ListPayment=Төлемдердің тізімі
 ListOfCustomerPayments=Тұтынушылардың төлемдерінің тізімі
 ListOfSupplierPayments=Сатушы төлемдерінің тізімі
@@ -118,10 +118,14 @@ SocialContributionsPayments=Әлеуметтік/фискалдық салық 
 ShowVatPayment=ҚҚС төлемін көрсету
 TotalToPay=Толық төлеуге
 BalanceVisibilityDependsOnSortAndFilters=Бұл кестеде қалдықтар кесте %s бойынша сұрыпталған және 1 банктік шотта сүзілген жағдайда ғана көрінеді (басқа сүзгілерсіз)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Клиенттерді есепке алу коды
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Сатушының есеп коды
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Каст. шот. код
 SupplierAccountancyCodeShort=Суп. шот. код
+UserAccountancyCodeShort=User account. code
 AccountNumber=Шот нөмірі
 NewAccountingAccount=Жаңа есептік жазба
 Turnover=Айналым шот -фактурамен
@@ -129,7 +133,9 @@ TurnoverCollected=Айналым жиналды
 SalesTurnoverMinimum=Минималды айналым
 ByExpenseIncome=Кірістер мен шығыстар бойынша
 ByThirdParties=Үшінші тұлғалар арқылы
+ByProjects=By projects
 ByUserAuthorOfInvoice=Шот -фактураның авторы бойынша
+DetailedListLowercase=detailed list
 CheckReceipt=Депозиттік слип
 CheckReceiptShort=Депозиттік слип
 LastCheckReceiptShort=Соңғы %s депозиттік слиптер
diff --git a/htdocs/langs/kk_KZ/datapolicy.lang b/htdocs/langs/kk_KZ/datapolicy.lang
index eb71d9667b2..7c2f644a21a 100644
--- a/htdocs/langs/kk_KZ/datapolicy.lang
+++ b/htdocs/langs/kk_KZ/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Деректер құпиялылығы саясаты
 Module4100Desc = Деректер құпиялығын басқару модулі (GDPR сәйкестік)
 # Administration page
 datapolicySetup = Модуль деректерінің құпиялылық саясатын орнату
-Deletion = Деректерді жою
-datapolicySetupPage = Елдеріңіздің заңдарына байланысты (мысал <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">GDPR 5-бабы</a>), жеке деректер белгілі бір мерзімге сақталуы керек мұрағаттық мақсаттарды қоспағанда, деректер жинау мақсаты үшін қажет ұзақтықтан аспайды.<br>Жою белгілі бір уақыттан кейін оқиғаларсыз автоматты түрде орындалады (ұзақтық). төменде көрсетілген болады).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s ай
 ONE_YEAR = 1 жыл
 NB_YEARS = %s жыл
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Болашақ/Тұтынушы
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Не перспективалы/Не тұтынушы
 DATAPOLICY_CONTACT_FOURNISSEUR = Жеткізуші
 DATAPOLICY_ADHERENT = мүше
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Сіз GDPR электрондық поштасын барлық сәйкес контактілеріңізге (әлі электрондық поштаны алмаған және GDPR келісімі туралы ештеңе тіркемеген) жібере аласыз. Мұны істеу үшін келесі түймені пайдаланыңыз.
 SendAgreement = Электрондық хаттарды жіберу
 AllAgreementSend = Барлық электрондық хаттар жіберілді
 TXTLINKDATAPOLICYACCEPT = «Келісім» сілтемесі үшін мәтін
 TXTLINKDATAPOLICYREFUSE = «Келіспеушілік» сілтемесі үшін мәтін
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: жеке деректерді өңдеу
 DATAPOLICY_consentement = Жеке деректерді өңдеуге алынған келісім
diff --git a/htdocs/langs/kk_KZ/errors.lang b/htdocs/langs/kk_KZ/errors.lang
index 9411f377815..8530377dbae 100644
--- a/htdocs/langs/kk_KZ/errors.lang
+++ b/htdocs/langs/kk_KZ/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Тіркеме үшін уақытша 
 ErrorFailedToCreateDir=Каталог жасалмады. Веб -сервер пайдаланушысының Dolibarr құжаттар каталогына жазуға рұқсаты бар екенін тексеріңіз. Егер <b> safe_mode </b> параметрі осы PHP -де қосылған болса, Dolibarr php файлдары веб -сервер пайдаланушысына (немесе топқа) тиесілі екенін тексеріңіз.
 ErrorNoMailDefinedForThisUser=Бұл пайдаланушы үшін пошта анықталмаған
 ErrorSetupOfEmailsNotComplete=Электрондық поштаны реттеу аяқталмаған
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Бұл мүмкіндік жұмыс істеуі үшін JavaScript белсендірілуі керек. Мұны орнату - дисплейде өзгертіңіз.
 ErrorTopMenuMustHaveAParentWithId0=«Жоғарғы» түріндегі мәзірде ата -аналық мәзір болмайды. Ата -аналық мәзірге 0 қойыңыз немесе «Солға» түріндегі мәзірді таңдаңыз.
 ErrorLeftMenuMustHaveAParentId=«Солға» түріндегі мәзірде ата -аналық идентификатор болуы керек.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=PHP/Apache плагині жүктеуді бұғат
 ErrorFileSizeTooLarge=Файл өлшемі тым үлкен немесе файл қамтамасыз етілмеген.
 ErrorFieldTooLong=%s өрісі тым ұзын.
 ErrorSizeTooLongForIntType=Int түріне арналған өлшем тым ұзын (%s сандар максимум)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Жол түрі үшін өлшем тым ұзын (%s таңбасының максимумы)
 ErrorNoValueForSelectType=Таңдалған тізім үшін мәнді енгізіңіз
 ErrorNoValueForCheckBoxType=Құсбелгі тізімінің мәнін толтырыңыз
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Қауіпсіздік коды үшін нашар мән.
 ErrorBothFieldCantBeNegative=%s және %s өрістері теріс бола алмайды
 ErrorFieldCantBeNegativeOnInvoice=<strong>%s</strong> өрісі инвоның бұл түрінде теріс болуы мүмкін емес. Жеңілдік жолын қосу қажет болса, алдымен жеңілдікті жасаңыз (үшінші тарап картасындағы '%s' өрісінен) және оны шот-фактураға қолданыңыз.
 ErrorLinesCantBeNegativeForOneVATRate=Жолдардың жиынтығы (салықты есептемегенде) ҚҚС ставкасы үшін теріс болмауы мүмкін (ҚҚС ставкасы үшін <b> %s </b> %% үшін теріс жиынтық табылды).
-ErrorLinesCantBeNegativeOnDeposits=Депозит бойынша жолдар теріс болуы мүмкін емес. Егер сіз салымды соңғы шот -фактураға енгізуіңіз қажет болса, сіз қиындықтарға тап боласыз.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Клиенттердің шот -фактураларының саны теріс болуы мүмкін емес
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Веб -серверді іске қосу үшін пайдаланылатын <b> %s </b> пайдаланушы тіркелгісі бұған рұқсаты жоқ.
 ErrorNoActivatedBarcode=Штрих -код түрі белсендірілмеген
 ErrUnzipFails=%s ZipArchive көмегімен ашылмады
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Өңдеу үшін жолдар тым көп. Неғұрлым таңдаулы сүзгіні пайдаланыңыз.
 ErrorEmptyValueForQty=Саны нөлге тең болуы мүмкін емес.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Сіздің PHP параметрі upload_max_filesize (%s) PHP параметрі post_max_size (%s) қарағанда жоғары. Бұл дәйекті орнату емес.
 WarningPasswordSetWithNoAccount=Бұл мүшеге құпия сөз орнатылды. Дегенмен, пайдаланушы тіркелгісі жасалмады. Сондықтан бұл құпия сөз сақталады, бірақ оны Dolibarr жүйесіне кіру үшін қолдануға болмайды. Оны сыртқы модуль/интерфейс қолдануы мүмкін, бірақ егер сіз мүшеге логин мен парольді анықтаудың қажеті болмаса, мүше модулін орнатудан «Әр мүшеге кіруді басқару» опциясын өшіруге болады. Егер сізге логинді басқару қажет болса, бірақ пароль қажет болмаса, бұл ескертуді болдырмау үшін бұл өрісті бос қалдыруға болады. Ескерту: егер мүше пайдаланушыға сілтеме жасаса, электрондық поштаны логин ретінде пайдалануға болады.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=Бұл ата-ана идентификато
 WarningReadBankAlsoAllowedIfUserHasPermission=Ескерту, банк шотын оқуға Шот жоспарын басқару рұқсатымен де рұқсат етіледі
 WarningNoDataTransferedInAccountancyYet=Есептік кестеде деректер жоқ екенін ескеріңіз. Өтініште жазылған деректеріңізді бухгалтерлік есеп бөліміне жіберіңіз немесе бухгалтерлік есептен тыс жазылған деректерді талдау үшін есептеу режимін өзгертіңіз.
 WarningChangingThisMayBreakStopTaskScheduler=Ескерту, бұл мәнді өзгерту жоспарлаушыны өшіруі мүмкін
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR шот-фактурасын тек несиелік аударым төлемдерімен төленетін шот-фактураларға қосуға болады.
 SwissQrCreditorAddressInvalid = Кредитор мекенжайы жарамсыз ( ZIP және қала орнатылған ба? (%s)
 SwissQrCreditorInformationInvalid = Кредитор ақпараты IBAN үшін жарамсыз (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s осы түр үшін конта
 ErrorThisGroupIsAlreadyDefinedAsThisType=Бұл топтағы контактілер осы түрге арналған контакт ретінде әлдеқашан анықталған.
 EmptyMessageNotAllowedError=Бос хабарға рұқсат етілмейді
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/kk_KZ/exports.lang b/htdocs/langs/kk_KZ/exports.lang
index adf81fc60b0..df728ad8cac 100644
--- a/htdocs/langs/kk_KZ/exports.lang
+++ b/htdocs/langs/kk_KZ/exports.lang
@@ -67,7 +67,7 @@ ChooseFormatOfFileToImport=%s белгішесін басу арқылы имп
 ChooseFileToImport=Файлды жүктеңіз, содан кейін %s белгішесін нұқыңыз, файлды бастапқы импорттық файл ретінде таңдаңыз ...
 SourceFileFormat=Бастапқы файл пішімі
 FieldsInSourceFile=Бастапқы файлдағы өрістер
-FieldsInTargetDatabase=Dolibarr дерекқорындағы мақсатты өрістер (қалың = міндетті)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Өрістер жоқ
 MoveField=%s өрісінің баған нөмірін жылжытыңыз
 ExampleOfImportFile=Импорт_файлының мысалы
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Файлдың файл пішімі (өріс пен ж
 RunSimulateImportFile=Импорттық имитацияны іске қосыңыз
 FieldNeedSource=Бұл өріс бастапқы файлдан деректерді қажет етеді
 SomeMandatoryFieldHaveNoSource=Кейбір міндетті өрістерде деректер файлының көзі жоқ
-InformationOnSourceFile=Бастапқы файл туралы ақпарат
-InformationOnTargetTables=Мақсатты өрістер туралы ақпарат
+InformationOnSourceFile=Source file
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Экспорттау үшін өрістер бағанында кем дегенде бір бастапқы өрісті ауыстырыңыз
 SelectFormat=Бұл импорттау файл пішімін таңдаңыз
 RunImportFile=Деректерді импорттау
diff --git a/htdocs/langs/kk_KZ/hrm.lang b/htdocs/langs/kk_KZ/hrm.lang
index 42449cc49d6..8a67ed5ce34 100644
--- a/htdocs/langs/kk_KZ/hrm.lang
+++ b/htdocs/langs/kk_KZ/hrm.lang
@@ -46,11 +46,11 @@ NewEval=Жаңа құзыреттілік бағалау
 ValidateEvaluation=Біліктілікті бағалауды растау
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Біліктілікті бағалау
-RequiredRank=Жұмыс профилі үшін қажетті дәреже
-RequiredRankShort=Міндетті дәреже
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Осы жұмыс профилі бар лауазымдар
-EmployeeRank=Бұл дағды үшін қызметкердің дәрежесі
-EmployeeRankShort=Қызметкер дәрежесі
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Қызметкер лауазымы
 EmployeePositions=Қызметкерлердің лауазымдары
 EmployeesInThisPosition=Осы лауазымдағы қызметкерлер
@@ -72,6 +72,9 @@ AddSkill=Жұмыс профиліне дағдыларды қосыңыз
 RequiredSkills=Осы жұмыс профилі үшін қажетті дағдылар
 UserRank=Пайдаланушы дәрежесі
 SkillList=Дағдылар тізімі
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Дәрежені сақтау
 TypeKnowHow=Қалай екенін білу
 TypeHowToBe=Қалай болу керек
@@ -95,3 +98,5 @@ NeedBusinessTravels=Іссапарлар қажет
 NoDescription=Сипаттама жоқ
 TheJobProfileHasNoSkillsDefinedFixBefore=Бұл қызметкердің бағаланатын жұмыс профилінде онда анықталған дағдылар жоқ. Дағдыларды қосыңыз, содан кейін бағалауды жойып, қайта бастаңыз.
 PDFStandardHrmEvaluation=Құзіреттілікті бағалау үшін PDF құжатын жасауға арналған стандартты үлгі
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/kk_KZ/mails.lang b/htdocs/langs/kk_KZ/mails.lang
index 346003136b3..1059c100d6f 100644
--- a/htdocs/langs/kk_KZ/mails.lang
+++ b/htdocs/langs/kk_KZ/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Электрондық пошта
 EMailing=Электрондық пошта
-EMailings=Электрондық пошталар
+EMailings=Mass EMails
 SMSings=SMS хабарламалары
-AllEMailings=Барлық электрондық пошталар
+AllEMailings=All mass eMails
 MailCard=Электрондық пошта картасы
 MailRecipients=Алушылар
 MailRecipient=Алушы
@@ -26,19 +26,19 @@ MailFile=Қосылған файлдар
 MailMessage=Электрондық поштаның негізгі мәтіні
 SubjectNotIn=Пән бойынша емес
 BodyNotIn=Денеде жоқ
-ShowEMailing=Электрондық поштаны көрсету
-ListOfEMailings=Электрондық хабарлардың тізімі
-NewMailing=Жаңа электрондық пошта
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Жаңа смс
-EditMailing=Электрондық поштаны өңдеу
-ResetMailing=Электрондық поштаны қайта жіберу
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Электрондық поштаны жою
-PreviewMailing=Электрондық поштаны алдын ала қарау
-CreateMailing=Электрондық поштаны құру
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Сынақ
-ValidMailing=Жарамды электрондық пошта
+ValidMailing=Valid mass Email
 MailingStatusDraft=Жоба
 MailingStatusValidated=Тексерілді
 MailingStatusSent=Жіберілді
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Электрондық пошта жиналуы үші
 LineInFile=Файлдағы %s жолы
 RecipientSelectionModules=Алушыны таңдау бойынша анықталған сұраныстар
 MailSelectedRecipients=Таңдалған алушылар
-MailingArea=Электрондық пошта аймағы
-LastMailings=Соңғы %s электрондық хабарлары
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Мақсатты статистика
 NbOfCompaniesContacts=Бірегей контактілер/мекенжайлар
 MailNoChangePossible=Расталған электрондық поштаны алушыларды өзгерту мүмкін емес
-SearchAMailing=Поштаны іздеу
-SendMailing=Электрондық поштаны жіберу
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Жіберген
 AdvancedAlternative=Жетілдірілген балама
 MailingNeedCommand=Электрондық поштаны пәрмен жолынан жіберуге болады. Сервер әкімшісінен электрондық поштаны барлық алушыларға жіберу үшін келесі пәрменді іске қосуды сұраңыз:
 MailingNeedCommand2=Сіз оларды MAILING_LIMIT_SENDBYWEB параметрін қосу арқылы онлайн режимінде жібере аласыз, олар сеанс бойынша жіберілетін электрондық хаттардың максималды саны. Ол үшін Home - Setup - Other бөліміне өтіңіз.
 ConfirmSendingEmailing=Егер сіз электрондық поштаны тікелей осы экраннан жібергіңіз келсе, электрондық поштаны қазір шолғыштан жібергіңіз келетініне сенімді екеніңізді растаңыз.
-LimitSendingEmailing=Ескерту: Веб -интерфейстен электрондық поштаны жіберу қауіпсіздік пен күту уақыты үшін бірнеше рет орындалады, <b> %s </b> алушылар әр жіберу сеансы үшін.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Тізімді тазалау
 ToClearAllRecipientsClickHere=Осы электрондық хабарды алушылардың тізімін тазарту үшін мына жерді басыңыз
 ToAddRecipientsChooseHere=Алушыларды тізімнен таңдау арқылы қосыңыз
-NbOfEMailingsReceived=Жаппай электрондық хаттар алынды
-NbOfEMailingsSend=Жаппай электрондық хаттар жіберілді
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=Жеке куәлік жазбасы
 DeliveryReceipt=Жеткізу.
 YouCanUseCommaSeparatorForSeveralRecipients=<b> үтір </b> бөлгішті бірнеше алушыларды көрсету үшін пайдалануға болады.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Бұл оқиға түрі мен компания ү
 ANotificationsWillBeSent=Электрондық поштаға 1 автоматты хабарлама жіберіледі
 SomeNotificationsWillBeSent=%s автоматты хабарламалары электрондық пошта арқылы жіберіледі
 AddNewNotification=Жаңа автоматты электрондық хабарландыруға жазылу (мақсат/оқиға)
-ListOfActiveNotifications=Автоматты электрондық пошта хабарландыруы үшін белсенді жазылымдар (мақсаттар/оқиғалар).
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Автоматты электрондық пошта хабарландырулары жіберілді
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Электрондық поштаны жіберу конфигурациясы '%s' күйіне орнатылды. Бұл режим жаппай электрондық поштаны жіберу үшін қолданылмайды.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=Егер SMTP серверін орнату туралы сұрақтарыңыз болса, %s сұрай аласыз.
@@ -183,7 +185,7 @@ Information=ақпарат
 ContactsWithThirdpartyFilter=Үшінші тарап сүзгісімен байланыстар
 Unanswered=Жауапсыз
 Answered=Жауап берді
-IsNotAnAnswer=Жауап жоқ (бастапқы электрондық пошта)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Бұл бастапқы электрондық поштаға жауап
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Жаңа контакт жасау кезінде '%s' өрісінің әдепкі мәні
@@ -199,6 +201,6 @@ ModelTemplate=Электрондық пошта үлгісі
 YouCanChooseAModelForYouMailContent= Үлгі үлгілерінің бірін таңдауға немесе AI көмегімен біреуін жасауға болады
 TitleOfMailHolder=Электрондық поштаның тақырыбы осында
 ContentOfMailHolder=Электрондық поштаның мазмұны осында...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/kk_KZ/main.lang b/htdocs/langs/kk_KZ/main.lang
index ce593dcf183..f6d15217c0f 100644
--- a/htdocs/langs/kk_KZ/main.lang
+++ b/htdocs/langs/kk_KZ/main.lang
@@ -37,6 +37,7 @@ Translation=Аударма
 Translations=Аудармалар
 CurrentTimeZone=PHP TimeZone (сервер)
 EmptySearchString=Бос емес іздеу шарттарын енгізіңіз
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Күн критерийін енгізіңіз
 NoRecordFound=Жазба табылмады
 NoRecordDeleted=Ешқандай жазба жойылған жоқ
@@ -45,6 +46,7 @@ NoError=Қате жоқ
 Error=Қате
 Errors=Қателер
 ErrorFieldRequired='%s' өрісі қажет
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat='%s' өрісінің мәні нашар
 ErrorFileDoesNotExists=%s файлы жоқ
 ErrorFailedToOpenFile=%s файлын ашу сәтсіз аяқталды
@@ -308,6 +310,7 @@ DateBuild=Есеп құрастыру күні
 DatePayment=Төлеу күні
 DateApprove=Бекітілген күн
 DateApprove2=Бекіту күні (екінші бекіту)
+PendingSince=Pending since
 RegistrationDate=Тіркеу күні
 UserCreation=Қолданушы
 UserModification=Өзгерту қолданушысы
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Бастау
 ActionRunningShort=Орындалуда
 ActionDoneShort=Аяқталды
 ActionUncomplete=Толық емес
-LatestLinkedEvents=%s байланыстырылған соңғы оқиғалар
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Компания/Ұйым
 Accountant=Бухгалтер
 ContactsForCompany=Осы үшінші тарапқа арналған контактілер
@@ -503,6 +506,7 @@ ContactsAddressesForCompany=Осы үшінші тараптың контакт
 AddressesForCompany=Бұл үшінші тараптың мекенжайлары
 ActionsOnCompany=Бұл үшінші тарапқа арналған оқиғалар
 ActionsOnContact=Бұл байланыс/мекен -жай бойынша оқиғалар
+ActionsOnUser=Events for this user
 ActionsOnContract=Бұл келісімшарт бойынша оқиғалар
 ActionsOnMember=Бұл мүше туралы оқиғалар
 ActionsOnProduct=Бұл өнім туралы оқиғалар
@@ -720,6 +724,8 @@ TextUsedInTheMessageBody=Электрондық поштаның негізгі
 SendAcknowledgementByMail=Растау электрондық поштасын жіберіңіз
 SendMail=Электрондық пошта жіберу
 Email=Электрондық пошта
+EMail=Email
+EMails=Emails
 NoEMail=Электрондық пошта жоқ
 AlreadyRead=Қазірдің өзінде оқылды
 NotRead=Оқылмаған
@@ -792,7 +798,7 @@ Notes=Ескертулер
 AddNewLine=Жаңа жолды қосыңыз
 AddFile=Файл қосу
 FreeZone=Еркін мәтінді өнім
-FreeLineOfType=Еркін мәтінді элемент, теріңіз:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Негізгі атрибуттары бар объектіні клондау
 ReGeneratePDF=PDF қайта жасаңыз
 PDFMerge=PDF біріктіру
@@ -878,12 +884,14 @@ toward=қарай
 Access=Қол жеткізу
 SelectAction=Әрекетті таңдаңыз
 SelectTargetUser=Мақсатты пайдаланушыны/қызметкерді таңдаңыз
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Алмасу буферіне көшіру үшін Ctrl+C пернелер тіркесімін пайдаланыңыз
 SaveUploadedFileWithMask=Файлды «<strong> %s </strong>» атауымен серверде сақтаңыз (әйтпесе «%s»)
 OriginFileName=Түпнұсқа файл атауы
 SetDemandReason=Көзді орнату
 SetBankAccount=Банктік шотты анықтаңыз
 AccountCurrency=Шот валютасы
+AccountancyCode=Accounting Code
 ViewPrivateNote=Жазбаларды қарау
 XMoreLines=%s жолдары жасырылған
 ShowMoreLines=Көбірек/аз жолдарды көрсету
@@ -924,6 +932,7 @@ ConfirmMassDeletionQuestion=%s таңдалған жазбаларды жойғ
 ConfirmMassClone=Жаппай клонды растау
 ConfirmMassCloneQuestion=Клондау үшін жобаны таңдаңыз
 ConfirmMassCloneToOneProject=%s жобасына клондау
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Қатысты объектілер
 ClassifyBilled=Төлемді жіктеу
 ClassifyUnbilled=Есептелмеген
@@ -960,10 +969,11 @@ PrivateDownloadLinkDesc=Сіз тіркелуіңіз керек және фай
 Download=Жүктеу
 DownloadDocument=Құжатты жүктеу
 DownloadSignedDocument=Қол қойылған құжатты жүктеп алыңыз
-ActualizeCurrency=Валюта бағамын жаңарту
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Қаржы жылы
 ModuleBuilder=Модуль және қосымшалар құрастырушысы
 SetMultiCurrencyCode=Валюта орнатыңыз
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Жаппай әрекеттер
 ClickToShowHelp=Анықтамалық көмек көрсету үшін басыңыз
 WebSite=Веб -сайт
@@ -1103,6 +1113,7 @@ PayedBy=Төлеген
 PayedTo=Төленді
 Monthly=Ай сайын
 Quarterly=Тоқсан сайын
+Quarter=Quarter
 Annual=Жылдық
 Local=Жергілікті
 Remote=Қашықтан басқару
@@ -1145,6 +1156,7 @@ ContactDefault_project_task=Тапсырма
 ContactDefault_propal=Ұсыныс
 ContactDefault_supplier_proposal=Жеткізуші ұсынысы
 ContactDefault_ticket=Билет
+ContactDefault_societe=Third party
 ContactAddedAutomatically=Контакт үшінші тарап контакт рөлдерінен қосылды
 More=Көбірек
 ShowDetails=Мәліметтерді көрсету
@@ -1187,6 +1199,8 @@ SetSupervisor=Супервайзерді орнатыңыз
 CreateExternalUser=Сыртқы пайдаланушыны құру
 ConfirmAffectTag=Жаппай тегті тағайындау
 ConfirmAffectUser=Жаппай пайдаланушы тағайындау
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=Әрбір жобаға/мүмкіндікке тағайындалған рөл
 TasksRole=Әрбір тапсырма бойынша тағайындалған рөл (қолданылған жағдайда)
 ConfirmSetSupervisor=Жаппай бақылаушы жинағы
@@ -1238,6 +1252,9 @@ CommercialsAffected=Сату өкілдері тағайындалды
 CommercialAffected=Сату өкілі тағайындалды
 CommercialsDisaffected=Сату өкілдерінің байланысы жойылды
 CommercialDisaffected=Сату өкілі байланысы жойылды
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=Сенің хатың
 YourMessageHasBeenReceived=Сіздің хабарламаңыз алынды. Біз сізге жауап береміз немесе мүмкіндігінше тезірек хабарласамыз.
 UrlToCheck=Тексеру үшін URL
@@ -1280,6 +1297,7 @@ AmountSalary=Жалақы мөлшері
 InvoiceSubtype=Шот-фактураның ішкі түрі
 ConfirmMassReverse=Жаппай кері растау
 ConfirmMassReverseQuestion=Таңдалған жазбаларды %s кері қайтарғыңыз келетініне сенімдісіз бе?
+ConfirmActionXxx=Confirm action %s
 ElementType=Элемент түрі
 ElementId=Элемент идентификаторы
 Encrypted=Шифрланған
@@ -1299,3 +1317,35 @@ AllEntities=Барлық нысандар
 TranslationOfKey=AnyTranslationKey кілтінің аудармасы
 SignedStatus=Қол қойылған күй
 NbRecordQualified=Білікті жазбалар саны
+auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/kk_KZ/members.lang b/htdocs/langs/kk_KZ/members.lang
index 990735dbf8a..0f7e7bdd290 100644
--- a/htdocs/langs/kk_KZ/members.lang
+++ b/htdocs/langs/kk_KZ/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Жазылым қажет болса, мүшені жа
 DeleteType=Жою
 VoteAllowed=Дауыс беруге рұқсат етілді
 Physical=Жеке
-Moral=Корпорация
-MorAndPhy=Корпорация және жеке тұлға
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Қайта қосыңыз
 ExcludeMember=Мүшені алып тастаңыз
 Exclude=Алып тастау
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Аймақтар бойынша мүшелердің 
 NbOfMembers=Қатысушылардың жалпы саны
 NbOfActiveMembers=Қазіргі белсенді мүшелердің жалпы саны
 NoValidatedMemberYet=Тексерілген мүшелер табылмады
-MembersByCountryDesc=Бұл экран сізге елдер бойынша мүшелердің статистикасын көрсетеді. Графиктер мен диаграммалар Google онлайн -графикалық қызметінің қолжетімділігіне, сондай -ақ жұмыс істейтін интернет байланысының болуына байланысты.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Бұл экран штат/провинциялар/кантон бойынша мүшелердің статистикасын көрсетеді.
 MembersByTownDesc=Бұл экран сізге қала бойынша мүшелердің статистикасын көрсетеді.
 MembersByNature=Бұл экранда мүшелердің табиғаты бойынша статистикасы көрсетіледі.
diff --git a/htdocs/langs/kk_KZ/salaries.lang b/htdocs/langs/kk_KZ/salaries.lang
index f8c56043b3b..3f6ba3e5c39 100644
--- a/htdocs/langs/kk_KZ/salaries.lang
+++ b/htdocs/langs/kk_KZ/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Жаңа жалақы
 AddSalary=Жалақыны қосыңыз
 NewSalaryPayment=Жаңа жалақы картасы
 AddSalaryPayment=Жалақы төлеуді қосыңыз
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Жалақы төлеу
 SalariesPayments=Жалақы төлемдері
 SalariesPaymentsOf=%s жалақы төлемдері
@@ -27,7 +29,7 @@ FillFieldFirst=Алдымен қызметкер өрісін толтырыңы
 UpdateAmountWithLastSalary=Соңғы жалақы мөлшерін белгілеңіз
 MakeTransferRequest=Тасымалдау сұрауын жасаңыз
 VirementOrder=Несиені аудару туралы өтініш
-BankTransferAmount=Кредиттік аударым сомасы
 WithdrawalReceipt=Несиені аудару тәртібі
 OrderWaiting=Күтудегі тапсырыс
 FillEndOfMonth=Айдың соңын толтырыңыз
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/kk_KZ/website.lang b/htdocs/langs/kk_KZ/website.lang
index 45802d84baa..84b73435f45 100644
--- a/htdocs/langs/kk_KZ/website.lang
+++ b/htdocs/langs/kk_KZ/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Басқа атаудың/бүркеншік аттарды
 WEBSITE_CSS_URL=Сыртқы CSS файлының URL мекенжайы
 WEBSITE_CSS_INLINE=CSS файлының мазмұны (барлық беттерге ортақ)
 WEBSITE_JS_INLINE=JavaScript файлының мазмұны (барлық беттерге ортақ)
-WEBSITE_HTML_HEADER=HTML тақырыбының төменгі жағындағы қосымша (барлық беттерге ортақ)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Роботтық файл (robots.txt)
 WEBSITE_HTACCESS=Веб -сайт .htaccess файлы
 WEBSITE_MANIFEST_JSON=Manifest.json веб -сайты
@@ -56,16 +56,17 @@ ReadPerm=Оқыңыз
 WritePerm=Жазу
 TestDeployOnWeb=Вебте тестілеу/орналастыру
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr= <u> %s жаңа қойындыда алдын ала қарау. </u> <br> <br> %s Dolibarr серверінде қызмет етеді, сондықтан оған қосымша веб -сервер қажет емес (Apache, Nginx, IIS). <br> Қолайсыз нәрсе - беттердің URL мекенжайлары қолданушыларға ыңғайлы емес және сіздің Dolibarr жолынан басталады. URL мекенжайына <br> Dolibarr қызмет: <br> <strong> %s </strong> <br> <br> каталогына <br> <strong> %s </strong> <br> бойынша балл, содан кейін осы виртуалды сервер атауын енгізіңіз, бұл сіздің веб-серверде виртуалды хост жасау, осы веб-сайтты қызмет үшін өз сыртқы веб-серверін пайдалану үшін осы веб -сайттың қасиеттерінде «Сынақ/Интернетте орналастыру» сілтемесін нұқыңыз.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=Сыртқы веб -сервер қызмет ететін виртуалды хосттың URL мекенжайы анықталмаған
 NoPageYet=Әлі беттер жоқ
 YouCanCreatePageOrImportTemplate=Сіз жаңа бетті жасай аласыз немесе веб -сайттың толық үлгісін импорттай аласыз
 SyntaxHelp=Нақты синтаксистік кеңестер бойынша көмек
 YouCanEditHtmlSourceckeditor=Редактордағы «Дереккөз» батырмасы арқылы HTML бастапқы кодын өңдеуге болады.
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Бөлісу сілтемесімен бөлісілген кескін үшін (файлдың ортақ хэш кілтін қолдана отырып, ашық қатынас), синтаксис: <br> <strong> &lt;img src = «/viewimage.php? Hashp = 12345679012z00f01f01f0f1f0f4f0f0f0f0f0f09f0f0f0f09b029»
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Бетті/контейнерді клондау
 CloneSite=Сайтты клондау
@@ -87,15 +88,15 @@ WebsiteAccount=Веб -сайттың есептік жазбасы
 WebsiteAccounts=Веб -сайттағы есептік жазбалар
 AddWebsiteAccount=Веб -сайт тіркелгісін жасаңыз
 BackToListForThirdParty=Үшінші тараптар тізіміне оралу
-DisableSiteFirst=Алдымен веб -сайтты өшіріңіз
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Менің веб -сайтымның атауы
 AnotherContainer=Басқа беттің/контейнердің мазмұнын осылай қосу керек (егер сізде динамикалық кодты қоссаңыз, қате болуы мүмкін, себебі ендірілген ішкі контейнер болмауы мүмкін)
 SorryWebsiteIsCurrentlyOffLine=Кешіріңіз, бұл веб -сайт қазіргі уақытта желіден тыс. Өтінемін, кейінірек оралыңыз ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Веб-сайттың тіркелгі кестесін қосыңыз
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Кестені әрбір веб -сайт / үшінші тарап үшін веб -сайттардың есептік жазбаларын (кіру / рұқсат) сақтау үшін қосыңыз
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Сіз алдымен әдепкі Басты анықтауыңыз керек
-OnlyEditionOfSourceForGrabbedContentFuture=Ескерту: Сыртқы веб-бетті импорттау арқылы веб-бетті жасау тәжірибелі пайдаланушыларға арналған. Бастапқы беттің күрделілігіне байланысты импорттау нәтижесі түпнұсқадан өзгеше болуы мүмкін. Сондай-ақ, бастапқы бет жалпы CSS мәнерлерін немесе қайшы келетін JavaScript-ті пайдаланса, ол осы бетте жұмыс істеген кезде веб-сайт өңдегішінің көрінісін немесе мүмкіндіктерін бұзуы мүмкін. Бұл әдіс бет жасаудың жылдам жолы, бірақ жаңа бетті нөлден немесе ұсынылған бет үлгісінен жасау ұсынылады.<br>Сонымен қатар кірістірілген өңдегіш жұмыс істемеуі мүмкін екенін ескеріңіз. ұсталған сыртқы бетте пайдаланылғанда дұрыс.
-OnlyEditionOfSourceForGrabbedContent=Сыртқы сайттан мазмұн алынған кезде тек HTML көзінің нұсқасы мүмкін
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Сонымен қатар CSS пен бетке табылған суреттерді алыңыз.
 ImagesShouldBeSavedInto=Суреттер каталогта сақталуы керек
 WebsiteRootOfImages=Веб -сайт суреттері үшін түбірлік каталог
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Тұтынушы тіркелгіңізден шы
 filteredByVersion=Нұсқа бойынша сүзілген
 removeFilter=Сүзгіні алып тастаңыз
 viewMyCart=Менің сатып алу қоржынымды қараңыз
+Shipping=Shipping
 freeShipping=Тегін жеткізу!
 noProducts=Өнімдер жоқ
 nbrItemsInCart=Себетіңізде <span class="ajax_cart_quantity">0</span> элемент бар.
@@ -284,12 +286,13 @@ productNameAToZ=Өнім атауы: А-дан Я-ға дейін
 productNameZToA=Өнім атауы: Z-ден А
 referenceLowestFirst=Анықтама: Ең алдымен
 referenceHighestFirst=Анықтама: Ең жоғары бірінші
+productPerPage=products per page
 perPage=бетте
 showAll=Барлығын көрсету
 showing= Көрсетілуде
 nbrOfProducts= %s өнімдері бар.
 noResultsHaveBeenFound=0 нәтиже табылды.
-noResultsWereFound= Нәтиже табылмады.
+noResultsWereFound=Нәтиже табылмады.
 addToCart=Себетке қосу
 backHome=Үйге оралу
 priceDrop=Бағаның төмендеуі
@@ -302,10 +305,11 @@ lastUpdate=Соңғы жаңарту
 contactSupport=Қолдау қызметіне қалай хабарласуға болады
 noProductToDisplay=Қате, көрсетілетін өнім жоқ
 yourCompanyInformation=Сіздің компанияңыз туралы ақпарат
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=Бұл электронды пошта бұрын тіркелген.
 firstnameContainsLettersOnly=<b>Аты-жөні</b> тек әріптер мен бос орындардан тұруы керек
 lastnameContainsLettersOnly=<b>Тегі</b> тек әріптер мен бос орындардан тұруы керек
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=Қате орын алды.
 accountCreation=Аккаунты құру
 errorsOccurred=%s қате бар%s
@@ -357,3 +361,7 @@ subtract=Алып тастау
 LoginCheckout=Жүйеге кіріңіз және төлемді жалғастырыңыз
 paymentSuccessProcessed=Төлеміңіз сәтті өңделді.
 youWillBeRedirectedToOrderPage=Жақын арада тапсырыс мәліметтері бетіне қайта бағытталасыз.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/km_KH/admin.lang b/htdocs/langs/km_KH/admin.lang
index 032f87f59ae..c5e89dccbac 100644
--- a/htdocs/langs/km_KH/admin.lang
+++ b/htdocs/langs/km_KH/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=ការត្រួតពិនិត្យ
 FileIntegritySomeFilesWereRemovedOrModified=ការត្រួតពិនិត្យភាពត្រឹមត្រូវនៃឯកសារបានបរាជ័យ។ ឯកសារមួយចំនួនត្រូវបានកែប្រែ ដកចេញ ឬបន្ថែម។
 GlobalChecksum=មូលប្បទានប័ត្រសកល
 MakeIntegrityAnalysisFrom=ធ្វើឱ្យការវិភាគសុចរិតភាពនៃឯកសារកម្មវិធីពី
-LocalSignature=ហត្ថលេខាមូលដ្ឋានដែលបានបង្កប់ (មិនគួរឱ្យទុកចិត្ត)
-RemoteSignature=ហត្ថលេខាពីចម្ងាយពីចម្ងាយ (អាចទុកចិត្តបានជាង)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=បាត់ឯកសារ
 FilesUpdated=ឯកសារដែលបានធ្វើបច្ចុប្បន្នភាព
 FilesModified=ឯកសារដែលបានកែប្រែ
@@ -232,7 +232,7 @@ SeeReportPage=មើលទំព័ររបាយការណ៍នៅ %s
 SetOptionTo=កំណត់ជម្រើស <b>%s</b> ទៅ  %s
 Updated=បានធ្វើបច្ចុប្បន្នភាព
 AchatTelechargement=ទិញ / ទាញយក
-GoModuleSetupArea=ដើម្បីដាក់ពង្រាយ/ដំឡើងម៉ូឌុលថ្មី សូមចូលទៅកាន់តំបន់ដំឡើងម៉ូឌុល៖ <a href="%s">%s</a>
+GoModuleSetupArea=ដើម្បីដាក់ពង្រាយ/ដំឡើងម៉ូឌុលថ្មី សូមចូលទៅកាន់តំបន់ដំឡើងម៉ូឌុល៖ <a href="%s">%sb0e40dc6587d8c
 DoliStoreDesc=DoliStore ដែលជាកន្លែងទីផ្សារផ្លូវការសម្រាប់ម៉ូឌុលខាងក្រៅ Dolibarr ERP/CRM
 DoliPartnersDesc=បញ្ជីក្រុមហ៊ុនដែលផ្តល់ម៉ូឌុល ឬលក្ខណៈពិសេសដែលបានអភិវឌ្ឍផ្ទាល់ខ្លួន។<br>ចំណាំ៖ ដោយសារ Dolibarr គឺជាកម្មវិធីប្រភពបើកចំហ <i>នរណាម្នាក់</i> ដែលមានបទពិសោធន៍ក្នុងការសរសេរកម្មវិធី PHP គួរតែអាចបង្កើតម៉ូឌុលមួយ។
 WebSiteDesc=គេហទំព័រខាងក្រៅសម្រាប់ម៉ូឌុលបន្ថែមបន្ថែម (មិនមែនស្នូល)...
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=ប្រើដោយជម្រើសរបៀបវា
 Security=សន្តិសុខ
 Passwords=ពាក្យសម្ងាត់
 DoNotStoreClearPassword=អ៊ិនគ្រីបពាក្យសម្ងាត់ដែលរក្សាទុកក្នុងមូលដ្ឋានទិន្នន័យ។
-MainDbPasswordFileConfEncrypted=អ៊ិនគ្រីបពាក្យសម្ងាត់មូលដ្ឋានទិន្នន័យដែលរក្សាទុកក្នុង conf.php ។ វាត្រូវបានណែនាំយ៉ាងខ្លាំងឱ្យដំណើរការជម្រើសនេះ។
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=ដើម្បី​ឱ្យ​មាន​ការ​ឌិកូដ​លេខ​សម្ងាត់ (ជម្រះ) ទៅក្នុង​ឯកសារ <b>conf.php</b> ជំនួស​បន្ទាត់ <br><b>$dolibarr_main_db_pass="crypted:...";</b><span' class=' ><br></span>ដោយ<br><b>$dolibarr_main_db_pass="<span class='nospanfda19bz0'> ";</b>
 ProtectAndEncryptPdfFiles=ការពារឯកសារ PDF ដែលបានបង្កើត។ វាមិនត្រូវបានណែនាំទេព្រោះវាបំបែកការបង្កើត PDF យ៉ាងច្រើន។
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=ចំណុចធរណីមាត្រ
 ExtrafieldMultiPointGeo=ធរណីមាត្រពហុចំណុច
 ExtrafieldLinestringGeo=ខ្សែបន្ទាត់ធរណីមាត្រ
 ExtrafieldPolygonGeo=ពហុកោណធរណីមាត្រ
+ExtrafieldStars=Stars
 ComputedFormula=វាលដែលបានគណនា
-ComputedFormulaDesc=អ្នកអាចបញ្ចូលរូបមន្តនៅទីនេះដោយប្រើលក្ខណៈសម្បត្តិផ្សេងទៀតនៃវត្ថុ ឬកូដ PHP ណាមួយដើម្បីទទួលបានតម្លៃគណនាថាមវន្ត។ អ្នកអាចប្រើរូបមន្តដែលឆបគ្នាជាមួយ PHP រួមទាំង "?" ប្រតិបត្តិករលក្ខខណ្ឌ និងដូចខាងក្រោមវត្ថុសកល៖ <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>ព្រមាន</strong>៖ ប្រសិនបើអ្នកត្រូវការលក្ខណៈសម្បត្តិរបស់វត្ថុ មិន​បាន​ផ្ទុក​ទេ គ្រាន់តែ​យក​វត្ថុ​នោះ​ទៅ​ក្នុង​រូបមន្ត​របស់​អ្នក​ដូច​ក្នុង​ឧទាហរណ៍​ទីពីរ។<br>ការ​ប្រើ​វាល​ដែល​បាន​គណនា​មាន​ន័យ​ថា​អ្នក​មិន​អាច​បញ្ចូល​តម្លៃ​ដោយ​ខ្លួន​ឯង​ពី​ចំណុច​ប្រទាក់​ទេ។ ដូចគ្នានេះផងដែរ ប្រសិនបើមានកំហុសវាក្យសម្ព័ន្ធ រូបមន្តអាចនឹងមិនត្រឡប់អ្វីទាំងអស់។<br><br>ឧទាហរណ៍នៃរូបមន្ត៖<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>ឧទាហរណ៍ដើម្បីផ្ទុកវត្ថុឡើងវិញ<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_$extrafield' * >capital / 5: '-1')<br><br>ឧទាហរណ៍ផ្សេងទៀតនៃរូបមន្តដើម្បីបង្ខំការផ្ទុកវត្ថុ និងវត្ថុមេរបស់វា៖ <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = គម្រោងថ្មី( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project)> 0))? $secondloadedobj->ref: 'រកមិនឃើញគម្រោងមេ'
+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'
 Computedpersistent=ទុកវាលដែលបានគណនា
 ComputedpersistentDesc=វាលបន្ថែមដែលបានគណនានឹងត្រូវបានរក្សាទុកក្នុងមូលដ្ឋានទិន្នន័យ ទោះយ៉ាងណាក៏ដោយ តម្លៃនឹងត្រូវបានគណនាឡើងវិញនៅពេលដែលវត្ថុនៃវាលនេះត្រូវបានផ្លាស់ប្តូរ។ ប្រសិនបើវាលដែលបានគណនាអាស្រ័យលើវត្ថុផ្សេងទៀត ឬទិន្នន័យសកល តម្លៃនេះអាចខុស!!
 ExtrafieldParamHelpPassword=ការទុកវាលនេះឱ្យនៅទទេមានន័យថាតម្លៃនេះនឹងត្រូវបានរក្សាទុកដោយគ្មានការអ៊ិនគ្រីប (វាលត្រូវបានលាក់ដោយផ្កាយនៅលើអេក្រង់)។<br><br>Enter តម្លៃ 'dolcrypt' ដើម្បីអ៊ិនកូដតម្លៃជាមួយនឹងក្បួនដោះស្រាយការអ៊ិនគ្រីបបញ្ច្រាស។ ទិន្នន័យច្បាស់លាស់នៅតែអាចស្គាល់ និងកែសម្រួល ប៉ុន្តែត្រូវបានអ៊ិនគ្រីបទៅក្នុងមូលដ្ឋានទិន្នន័យ។<br><br>បញ្ចូល 'auto' (ឬ 'md5', 'sha256', 'password_hash', ...) ដើម្បីប្រើក្បួនដោះស្រាយការអ៊ិនគ្រីបពាក្យសម្ងាត់លំនាំដើម (ឬ md5, sha256, password_hash...) ដើម្បីរក្សាទុកពាក្យសម្ងាត់ hashed ដែលមិនអាចត្រឡប់វិញបានទៅក្នុងមូលដ្ឋានទិន្នន័យ (គ្មានវិធីដើម្បីទាញយកតម្លៃដើម)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- ការប្រើប្រាស់ម៉ាស៊ីនមេ SMTP របស់អ្នកផ្តល់សេវាអ៊ីមែលផ្ទាល់ខ្លួនរបស់អ្នកដើម្បីផ្ញើអ៊ីមែលក៏គួរឱ្យចាប់អារម្មណ៍ផងដែរ ដូច្នេះអ៊ីមែលទាំងអស់ដែលបានផ្ញើពីកម្មវិធីក៏នឹងត្រូវបានរក្សាទុកទៅក្នុងថត "ផ្ញើ" នៃប្រអប់សំបុត្ររបស់អ្នក។
 WarningPHPMailD=ដូច្នេះវាត្រូវបានផ្ដល់អនុសាសន៍ឱ្យផ្លាស់ប្តូរវិធីសាស្រ្តនៃការផ្ញើអ៊ីមែលទៅតម្លៃ "SMTP" ។
 WarningPHPMailDbis=ប្រសិនបើអ្នកពិតជាចង់រក្សាវិធីសាស្ត្រ "PHP" លំនាំដើមដើម្បីផ្ញើអ៊ីមែល គ្រាន់តែមិនអើពើនឹងការព្រមាននេះ ឬលុបវាចេញដោយ %sចុចទីនេះ%s ។
-WarningPHPMail2=ប្រសិនបើអ្នកផ្តល់សេវា SMTP អ៊ីមែលរបស់អ្នកត្រូវដាក់កម្រិតកម្មវិធីអ៊ីមែលទៅអាសយដ្ឋាន IP មួយចំនួន (កម្រណាស់) នេះគឺជាអាសយដ្ឋាន IP របស់ភ្នាក់ងារអ្នកប្រើប្រាស់សំបុត្រ (MUA) សម្រាប់កម្មវិធី ERP CRM របស់អ្នក៖ <strong>%s</strong>។
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=គណនេយ្យ (សាមញ្ញ)
 Module10Desc=របាយការណ៍គណនេយ្យសាមញ្ញ (ទិនានុប្បវត្តិ ចំណូល) ផ្អែកលើមាតិកាមូលដ្ឋានទិន្នន័យ។ មិនប្រើតារាងលេខណាមួយទេ។
 Module20Name=សំណើ
 Module20Desc=ការគ្រប់គ្រងសំណើពាណិជ្ជកម្ម
-Module22Name=ការផ្ញើអ៊ីមែលដ៏ធំ
-Module22Desc=គ្រប់គ្រងការផ្ញើអ៊ីមែលច្រើន។
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=ថាមពល
 Module23Desc=តាមដានការប្រើប្រាស់ថាមពល
 Module25Name=ការបញ្ជាទិញលក់
@@ -847,10 +848,10 @@ Permission212=បញ្ជាទិញបន្ទាត់
 Permission213=ធ្វើឱ្យបន្ទាត់សកម្ម
 Permission214=ដំឡើងទូរស័ព្ទ
 Permission215=ដំឡើងអ្នកផ្តល់សេវា
-Permission221=អានអ៊ីមែល
-Permission222=បង្កើត/កែប្រែអ៊ីមែល (ប្រធានបទ អ្នកទទួល...)
-Permission223=ធ្វើ​ឱ្យ​មាន​សុពលភាព​អ៊ីមែល (អនុញ្ញាត​ឱ្យ​ផ្ញើ)
-Permission229=លុបអ៊ីមែល
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=មើលអ្នកទទួល និងព័ត៌មាន
 Permission238=ផ្ញើសំបុត្រដោយដៃ
 Permission239=លុបសំបុត្របន្ទាប់ពីការផ្ទៀងផ្ទាត់ ឬផ្ញើ
@@ -1105,6 +1106,7 @@ DictionaryStaff=ចំនួន​និយោជិក
 DictionaryAvailability=ការពន្យាពេលដឹកជញ្ជូន
 DictionaryOrderMethods=វិធីសាស្រ្តបញ្ជា
 DictionarySource=ប្រភពដើមនៃសំណើ / ការបញ្ជាទិញ
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=ក្រុមផ្ទាល់ខ្លួនសម្រាប់របាយការណ៍
 DictionaryAccountancysystem=គំរូសម្រាប់តារាងគណនី
 DictionaryAccountancyJournal=ទិនានុប្បវត្តិគណនេយ្យ
@@ -1134,11 +1136,11 @@ BackToDictionaryList=ត្រលប់ទៅបញ្ជីវចនានុ
 TypeOfRevenueStamp=ប្រភេទនៃត្រាពន្ធ
 VATManagement=ការគ្រប់គ្រងពន្ធលើការលក់
 VATIsUsedStandard=នៅពេលបង្កើតឯកសារ (សំណើ វិក្កយបត្រ ការបញ្ជាទិញ...) អត្រាពន្ធលើការលក់លំនាំដើមត្រូវបានកំណត់យោងទៅតាមច្បាប់ស្តង់ដារ (អាស្រ័យលើប្រទេសរបស់អ្នកលក់ និងអ្នកទិញ)
-VATIsUsedDesc=តាមលំនាំដើមនៅពេលបង្កើតសំណើ វិក្កយបត្រ ការបញ្ជាទិញជាដើម។ អត្រាពន្ធលើការលក់អនុវត្តតាមច្បាប់ស្ដង់ដារសកម្ម៖<br>ប្រសិនបើអ្នកលក់មិនជាប់ពន្ធលើការលក់ទេ នោះពន្ធលើការលក់នឹងកំណត់ជា 0 ចុងបញ្ចប់នៃច្បាប់។<br>ប្រសិនបើ (ប្រទេសរបស់អ្នកលក់ = ប្រទេសរបស់អ្នកទិញ) នោះពន្ធលើការលក់តាមលំនាំដើមស្មើនឹងពន្ធលក់នៃផលិតផលនៅក្នុងប្រទេសរបស់អ្នកលក់។ ចុងបញ្ចប់នៃច្បាប់។<br>ប្រសិនបើអ្នកលក់ និងអ្នកទិញស្ថិតនៅក្នុងសហគមន៍អ៊ឺរ៉ុប ហើយទំនិញគឺជាផលិតផលដែលទាក់ទងនឹងការដឹកជញ្ជូន (ការដឹកជញ្ជូន ការដឹកជញ្ជូន ក្រុមហ៊ុនអាកាសចរណ៍) អាករលើតម្លៃលំនាំដើមគឺ 0។ ច្បាប់គឺអាស្រ័យលើប្រទេសរបស់អ្នកលក់ - សូមពិគ្រោះជាមួយគណនេយ្យកររបស់អ្នក។ ពន្ធលើតម្លៃបន្ថែមគួរតែត្រូវបានបង់ដោយអ្នកទិញទៅការិយាល័យគយនៅក្នុងប្រទេសរបស់ពួកគេ ហើយមិនមែនទៅឱ្យអ្នកលក់នោះទេ។ ចុងបញ្ចប់នៃច្បាប់។<br>ប្រសិនបើអ្នកលក់ និងអ្នកទិញស្ថិតនៅក្នុងសហគមន៍អ៊ឺរ៉ុប ហើយអ្នកទិញមិនមែនជាក្រុមហ៊ុន (ជាមួយលេខអាករក្នុងសហគមន៍ដែលបានចុះឈ្មោះ) នោះអាករលើតម្លៃកំណត់លំនាំដើមទៅ អត្រាពន្ធលើតម្លៃបន្ថែមនៃប្រទេសរបស់អ្នកលក់។ ចុងបញ្ចប់នៃច្បាប់។<br>ប្រសិនបើអ្នកលក់ និងអ្នកទិញស្ថិតនៅក្នុងសហគមន៍អ៊ឺរ៉ុប ហើយអ្នកទិញគឺជាក្រុមហ៊ុនមួយ (ដែលមានលេខពន្ធលើតម្លៃបន្ថែមក្នុងសហគមន៍) នោះ VAT គឺ 0 តាម​លំនាំដើម។ ចុងបញ្ចប់នៃច្បាប់។<br>ក្នុងករណីផ្សេងទៀត លំនាំដើមដែលបានស្នើឡើងគឺ Sales tax=0។ ចុងបញ្ចប់នៃការគ្រប់គ្រង។
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=តាមលំនាំដើម ពន្ធលើការលក់ដែលបានស្នើឡើងគឺ 0 ដែលអាចត្រូវបានប្រើសម្រាប់ករណីដូចជាសមាគម បុគ្គល ឬក្រុមហ៊ុនតូចៗ។
 VATIsUsedExampleFR=នៅប្រទេសបារាំង វាមានន័យថាក្រុមហ៊ុន ឬអង្គការដែលមានប្រព័ន្ធសារពើពន្ធពិតប្រាកដ (Simplified real or normal real)។ ប្រព័ន្ធដែលអាករលើតម្លៃបន្ថែមត្រូវបានប្រកាស។
 VATIsNotUsedExampleFR=នៅប្រទេសបារាំង វាមានន័យថាសមាគមដែលមិនត្រូវបានប្រកាសពន្ធលើការលក់ ឬក្រុមហ៊ុន អង្គការ ឬវិជ្ជាជីវៈសេរីដែលបានជ្រើសរើសប្រព័ន្ធសារពើពន្ធសហគ្រាសខ្នាតតូច (ពន្ធលក់ក្នុងសិទ្ធិផ្តាច់មុខ) និងបានបង់ពន្ធលើសិទ្ធិលក់ដោយគ្មានការប្រកាសពន្ធលើការលក់។  ជម្រើសនេះនឹងបង្ហាញឯកសារយោង "Non applicable Sales tax - art-293B of CGI" នៅលើវិក្កយបត្រ។
-VATType=ប្រភេទពន្ធ
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=ប្រភេទនៃពន្ធលើការលក់
 LTRate=អត្រា
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=យោងតាមការដំឡើងពន្ធ
 LabelUsedByDefault=ស្លាកដែលប្រើតាមលំនាំដើម ប្រសិនបើគ្មានការបកប្រែអាចត្រូវបានរកឃើញសម្រាប់លេខកូដ
 LabelOnDocuments=ស្លាកនៅលើឯកសារ
 LabelOrTranslationKey=ស្លាក ឬគន្លឹះបកប្រែ
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=ការបកប្រែត្រូវបានរកឃើញ
 TheTranslationIsSearchedFromKey=ការបកប្រែត្រូវបានស្វែងរកពីគន្លឹះបកប្រែ៖ <b>%s</b>
 TranslationKey=គន្លឹះបកប្រែ
@@ -1431,7 +1434,7 @@ AddVatInList=បង្ហាញលេខ VAT របស់អតិថិជន/
 AddAdressInList=បង្ហាញអាសយដ្ឋានអតិថិជន/អ្នកលក់ទៅក្នុងបញ្ជីបន្សំ។<br>ភាគីទីបីនឹងបង្ហាញជាមួយទម្រង់ឈ្មោះនៃ "The Big Company corp. - 21 jump street 123456 Big town - USA" ជំនួសឱ្យ " សាជីវកម្មក្រុមហ៊ុនធំ" ។
 AddEmailPhoneTownInContactList=បង្ហាញអ៊ីមែលទំនាក់ទំនង (ឬទូរសព្ទប្រសិនបើមិនបានកំណត់) និងទីក្រុងទៅក្នុងបញ្ជីបន្សំ។<br>ទំនាក់ទំនងនឹងបង្ហាញជាមួយទម្រង់ឈ្មោះ "Dupond Durand - dupond.durand@example.com - Paris " ឬ "Dupond Durand - 06 07 59 65 66 - Paris" ជំនួសឱ្យ "Dupond Durand" ។
 AskForPreferredShippingMethod=សួររកវិធីដឹកជញ្ជូនដែលពេញចិត្តសម្រាប់ភាគីទីបី។
-FieldEdition=ការបោះពុម្ពវាល %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=ឧទាហរណ៍៖ +2 (បំពេញតែក្នុងករណីមានបញ្ហាអុហ្វសិតតំបន់ពេលវេលាប៉ុណ្ណោះ)
 GetBarCode=ទទួលបាកូដ
 NumberingModules=ម៉ូដែលលេខ
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=បង្ខំកាលបរិច្ឆេទវិក្ក
 SuggestedPaymentModesIfNotDefinedInInvoice=របៀបបង់ប្រាក់ដែលបានណែនាំនៅលើវិក្កយបត្រតាមលំនាំដើម ប្រសិនបើមិនបានកំណត់នៅលើវិក្កយបត្រ
 SuggestPaymentByRIBOnAccount=ណែនាំការទូទាត់ដោយការដកប្រាក់នៅលើគណនី
 SuggestPaymentByChequeToAddress=ណែនាំការទូទាត់ដោយមូលប្បទានប័ត្រទៅ
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=អត្ថបទឥតគិតថ្លៃនៅលើវិក្កយបត្រ
 WatermarkOnDraftInvoices=Watermark នៅលើវិក្កយបត្រព្រាង (គ្មានប្រសិនបើទទេ)
 PaymentsNumberingModule=គំរូនៃការបង់ប្រាក់
@@ -1718,6 +1723,7 @@ CompressionOfResources=ការបង្ហាប់នៃការឆ្លើ
 CompressionOfResourcesDesc=ឧទាហរណ៍ដោយប្រើការណែនាំ Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=ការរកឃើញដោយស្វ័យប្រវត្តិបែបនេះមិនអាចធ្វើទៅបានជាមួយកម្មវិធីរុករកបច្ចុប្បន្នទេ។
 DefaultValuesDesc=នៅទីនេះអ្នកអាចកំណត់តម្លៃលំនាំដើមដែលអ្នកចង់ប្រើនៅពេលបង្កើតកំណត់ត្រាថ្មី និង/ឬតម្រងលំនាំដើម ឬលំដាប់តម្រៀបនៅពេលអ្នករាយបញ្ជីកំណត់ត្រា។
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=តម្លៃលំនាំដើម (ដើម្បីប្រើលើទម្រង់)
 DefaultSearchFilters=តម្រងស្វែងរកលំនាំដើម
 DefaultSortOrder=លំដាប់​តម្រៀប​លំនាំដើម
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=ការបញ្ជូនម៉ូឌុលលេខ
 SendingsAbility=គាំទ្រសន្លឹកដឹកជញ្ជូនសម្រាប់ការចែកចាយរបស់អតិថិជន
 NoNeedForDeliveryReceipts=ក្នុងករណីភាគច្រើន សន្លឹកដឹកជញ្ជូនត្រូវបានប្រើទាំងជាសន្លឹកសម្រាប់ការចែកចាយរបស់អតិថិជន (បញ្ជីផលិតផលដែលត្រូវផ្ញើ) និងសន្លឹកដែលត្រូវបានទទួល និងចុះហត្ថលេខាដោយអតិថិជន។ ដូច្នេះ បង្កាន់ដៃចែកចាយផលិតផលគឺជាមុខងារស្ទួន ហើយកម្រត្រូវបានធ្វើឱ្យសកម្មណាស់។
 FreeLegalTextOnShippings=អត្ថបទឥតគិតថ្លៃលើការដឹកជញ្ជូន
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=ម៉ូឌុលលេខបង្កាន់ដៃចែកចាយផលិតផល
 DeliveryOrderModel=គំរូបង្កាន់ដៃចែកចាយផលិតផល
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=អត្ថបទឥតគិតថ្លៃន
 ##### FCKeditor #####
 AdvancedEditor=កម្មវិធីនិពន្ធកម្រិតខ្ពស់
 ActivateFCKeditor=បើកដំណើរការកម្មវិធីនិពន្ធកម្រិតខ្ពស់សម្រាប់៖
-FCKeditorForNotePublic=ការបង្កើត / ការបោះពុម្ព WYSIWYG នៃវាល "កំណត់ចំណាំសាធារណៈ" នៃធាតុ
-FCKeditorForNotePrivate=ការបង្កើត / ការបោះពុម្ព WYSIWYG នៃវាល "កំណត់ចំណាំឯកជន" នៃធាតុ
-FCKeditorForCompany=ការបង្កើត/ការបោះពុម្ព WYSIWYG ការពិពណ៌នាវាលនៃធាតុ (លើកលែងតែផលិតផល/សេវាកម្ម)
-FCKeditorForProductDetails=ការបង្កើត/បោះពុម្ព WYSIWYG នៃការពិពណ៌នាផលិតផល ឬបន្ទាត់សម្រាប់វត្ថុ (បន្ទាត់នៃសំណើ ការបញ្ជាទិញ វិក្កយបត្រ។ល។)។
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=ការព្រមាន៖ ការប្រើជម្រើសនេះសម្រាប់ករណីនេះគឺមិនត្រូវបានណែនាំជាដាច់ខាតព្រោះវាអាចបង្កើតបញ្ហាជាមួយតួអក្សរពិសេស និងទម្រង់ទំព័រនៅពេលបង្កើតឯកសារ PDF ។
-FCKeditorForMailing= ការបង្កើត/បោះពុម្ព WYSIWYG សម្រាប់ការផ្ញើអ៊ីមែលដ៏ធំ (ឧបករណ៍->អ៊ីមែល)
-FCKeditorForUserSignature=ការបង្កើត/បោះពុម្ព WYSIWYG នៃហត្ថលេខាអ្នកប្រើប្រាស់
-FCKeditorForMail=ការបង្កើត/បោះពុម្ព WYSIWYG សម្រាប់សំបុត្រទាំងអស់ (លើកលែងតែឧបករណ៍->អ៊ីមែល)
-FCKeditorForTicket=ការបង្កើត/បោះពុម្ព WYSIWYG សម្រាប់សំបុត្រ
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=ការដំឡើងម៉ូឌុលភាគហ៊ុន
 IfYouUsePointOfSaleCheckModule=ប្រសិនបើអ្នកប្រើចំណុចនៃការលក់ម៉ូឌុល (POS) ដែលផ្តល់តាមលំនាំដើម ឬម៉ូឌុលខាងក្រៅ ការដំឡើងនេះអាចនឹងត្រូវបានមិនអើពើដោយម៉ូឌុល POS របស់អ្នក។ ម៉ូឌុលម៉ាស៊ីនឆូតកាតភាគច្រើនត្រូវបានរចនាឡើងតាមលំនាំដើមដើម្បីបង្កើតវិក្កយបត្រភ្លាមៗ និងកាត់បន្ថយភាគហ៊ុនដោយមិនគិតពីជម្រើសនៅទីនេះ។ ដូច្នេះប្រសិនបើអ្នកត្រូវការ ឬមិនចង់មានការថយចុះភាគហ៊ុននៅពេលចុះឈ្មោះលក់ពីម៉ាស៊ីនឆូតកាតរបស់អ្នក សូមពិនិត្យមើលការដំឡើងម៉ូឌុល POS របស់អ្នកផងដែរ។
@@ -1867,7 +1874,6 @@ Buy=ទិញ
 Sell=លក់
 InvoiceDateUsed=កាលបរិច្ឆេទវិក្កយបត្រត្រូវបានប្រើប្រាស់
 YourCompanyDoesNotUseVAT=ក្រុមហ៊ុនរបស់អ្នកត្រូវបានកំណត់ថាមិនប្រើអាករលើតម្លៃបន្ថែម (ផ្ទះ - ការដំឡើង - ក្រុមហ៊ុន/អង្គការ) ដូច្នេះមិនមានជម្រើសអាករលើតម្លៃបន្ថែមក្នុងការដំឡើងទេ។
-AccountancyCode=លេខកូដគណនេយ្យ
 AccountancyCodeSell=គណនីលក់។ កូដ
 AccountancyCodeBuy=គណនីទិញ។ កូដ
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=រក្សាប្រអប់ធីក “បង្កើតការទូទាត់ដោយស្វ័យប្រវត្តិ” ទទេតាមលំនាំដើម នៅពេលបង្កើតពន្ធថ្មី។
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = តើទិដ្ឋភាពមួយណាដែលអ
 AGENDA_EVENT_PAST_COLOR = ពណ៌ព្រឹត្តិការណ៍អតីតកាល
 AGENDA_EVENT_CURRENT_COLOR = ពណ៌ព្រឹត្តិការណ៍បច្ចុប្បន្ន
 AGENDA_EVENT_FUTURE_COLOR = ពណ៌នៃព្រឹត្តិការណ៍នាពេលអនាគត
-AGENDA_REMINDER_BROWSER = បើកដំណើរការកម្មវិធីរំលឹកព្រឹត្តិការណ៍ <b>នៅលើកម្មវិធីរុករកតាមអ៊ីនធឺណិតរបស់អ្នកប្រើ</b> (នៅពេលដល់កាលបរិច្ឆេទរំលឹក បង្អួចលេចឡើងត្រូវបានបង្ហាញដោយកម្មវិធីរុករក។ អ្នកប្រើប្រាស់ម្នាក់ៗអាច បិទការជូនដំណឹងបែបនេះពីការដំឡើងការជូនដំណឹងកម្មវិធីរុករករបស់វា)។
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = បើកការជូនដំណឹងសំឡេង
-AGENDA_REMINDER_EMAIL = បើកការរំលឹកព្រឹត្តិការណ៍ <b>តាមអ៊ីមែល</b> (ជម្រើសរំលឹក/ការពន្យារពេលអាចត្រូវបានកំណត់នៅលើព្រឹត្តិការណ៍នីមួយៗ)។
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = ចំណាំ៖ ភាពញឹកញាប់នៃការងារដែលបានកំណត់ពេល %s ត្រូវតែគ្រប់គ្រាន់ដើម្បីប្រាកដថាការរំលឹកត្រូវបានផ្ញើនៅពេលត្រឹមត្រូវ។
 AGENDA_SHOW_LINKED_OBJECT = បង្ហាញវត្ថុដែលបានភ្ជាប់ទៅក្នុងទិដ្ឋភាពរបៀបវារៈ
 AGENDA_USE_EVENT_TYPE = ប្រើប្រភេទព្រឹត្តិការណ៍ (គ្រប់គ្រងក្នុងម៉ឺនុយដំឡើង -> វចនានុក្រម -> ប្រភេទព្រឹត្តិការណ៍របៀបវារៈ)
 AGENDA_USE_EVENT_TYPE_DEFAULT = កំណត់តម្លៃលំនាំដើមនេះដោយស្វ័យប្រវត្តិសម្រាប់ប្រភេទនៃព្រឹត្តិការណ៍នៅក្នុងទម្រង់បង្កើតព្រឹត្តិការណ៍
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = គន្លឹះដើម្បីអនុញ្ញាតតំណនាំចេញ
 PastDelayVCalExport=កុំនាំចេញព្រឹត្តិការណ៍ចាស់ជាង
 SecurityKey = សោសុវត្ថិភាព
@@ -2006,7 +2017,7 @@ BackupZipWizard=អ្នកជំនួយក្នុងការបង្ក
 SomethingMakeInstallFromWebNotPossible=ការ​ដំឡើង​ម៉ូឌុល​ខាង​ក្រៅ​មិន​អាច​ធ្វើ​ទៅ​បាន​ពី​ចំណុច​ប្រទាក់​បណ្ដាញ​ដោយ​ហេតុផល​ដូច​ខាង​ក្រោម៖
 SomethingMakeInstallFromWebNotPossible2=សម្រាប់ហេតុផលនេះ ដំណើរការដំឡើងកំណែដែលបានពិពណ៌នានៅទីនេះគឺជាដំណើរការដោយដៃតែអ្នកប្រើប្រាស់ដែលមានសិទ្ធិអាចអនុវត្តបាន។
 InstallModuleFromWebHasBeenDisabledContactUs=ដំឡើង ឬអភិវឌ្ឍម៉ូឌុលខាងក្រៅ ឬគេហទំព័រថាមវន្ត ពីកម្មវិធីបច្ចុប្បន្នត្រូវបានចាក់សោសម្រាប់គោលបំណងសុវត្ថិភាព។ សូមទាក់ទងមកយើងខ្ញុំ ប្រសិនបើអ្នកត្រូវការបើកមុខងារនេះ។
-InstallModuleFromWebHasBeenDisabledByFile=ការដំឡើងម៉ូឌុលខាងក្រៅពីកម្មវិធីត្រូវបានបិទដោយអ្នកគ្រប់គ្រងរបស់អ្នក។ អ្នកត្រូវតែសុំឱ្យគាត់លុបឯកសារ <strong>%s</strong> ដើម្បីអនុញ្ញាតវា លក្ខណៈ។
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=រំលេច​បន្ទាត់​តារាង នៅពេល​ផ្លាស់ទី​កណ្ដុរ​ឆ្លងកាត់
 HighlightLinesColor=បន្លិចពណ៌នៃបន្ទាត់ នៅពេលកណ្តុរឆ្លងកាត់ (ប្រើ 'ffffff' សម្រាប់គ្មានការបន្លិច)
@@ -2036,6 +2047,7 @@ Enter0or1=បញ្ចូល 0 ឬ 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=បញ្ចូលនៅទីនេះរវាងសញ្ញាតង្កៀប បញ្ជីនៃចំនួនបៃដែលតំណាងឱ្យនិមិត្តសញ្ញារូបិយប័ណ្ណ។ ឧទាហរណ៍៖ សម្រាប់ $ បញ្ចូល [36] - សម្រាប់ប្រេស៊ីលពិត R$ [82,36] - សម្រាប់ € បញ្ចូល [8364]
 ColorFormat=ពណ៌ RGB មានទម្រង់ HEX ឧទាហរណ៍៖ FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=ឈ្មោះរូបតំណាងក្នុងទម្រង់៖<br>- image.png សម្រាប់ឯកសាររូបភាពទៅក្នុងថតប្រធានបទបច្ចុប្បន្ន<br>- image.png@module ប្រសិនបើឯកសារចូលទៅក្នុងថត /img/ នៃម៉ូឌុល<br>- fa-xxx សម្រាប់ FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size សម្រាប់ FontAwesome fa-xxx picto (មានបុព្វបទ ពណ៌ និងទំហំកំណត់)
 PositionIntoComboList=ទីតាំងនៃបន្ទាត់ទៅក្នុងបញ្ជីបន្សំ
 SellTaxRate=អត្រាពន្ធលើការលក់
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=លាក់ស៊ុមនៅលើស៊ុមអាសយដ្ឋានអ្នកផ្ញើ
 MAIN_PDF_NO_RECIPENT_FRAME=លាក់ស៊ុមនៅលើស៊ុមអាសយដ្ឋានអ្នកទទួល
 MAIN_PDF_HIDE_CUSTOMER_CODE=លាក់លេខកូដអតិថិជន
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=លាក់ឈ្មោះអ្នកផ្ញើ/ក្រុមហ៊ុននៅក្នុងប្លុកអាសយដ្ឋាន
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=លាក់លក្ខខណ្ឌបង់ប្រាក់
 PROPOSAL_PDF_HIDE_PAYMENTMODE=លាក់របៀបបង់ប្រាក់
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=បន្ថែមការសម្គាល់ដែលលាក់ចូលទៅក្នុងតំបន់ហត្ថលេខា ដើម្បីអនុញ្ញាតឱ្យឧបករណ៍ហត្ថលេខាអេឡិចត្រូនិកប្រើវាឡើងវិញ។ អាចត្រូវបានប្រើប្រាស់ដោយឧបករណ៍ខាងក្រៅ ឬនៅពេលអនាគតដោយមុខងារហត្ថលេខាលើអ៊ីនធឺណិត។
@@ -2324,6 +2341,8 @@ NotRecommended=មិនត្រូវបានណែនាំទេ។
 ARestrictedPath=ផ្លូវដាក់កម្រិតមួយចំនួនសម្រាប់ឯកសារទិន្នន័យ
 CheckForModuleUpdate=ពិនិត្យមើលបច្ចុប្បន្នភាពនៃម៉ូឌុលខាងក្រៅ
 CheckForModuleUpdateHelp=សកម្មភាពនេះនឹងភ្ជាប់ទៅអ្នកកែសម្រួលម៉ូឌុលខាងក្រៅ ដើម្បីពិនិត្យមើលថាតើមានកំណែថ្មីដែរឬទេ។
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=ការអាប់ដេតមាន
 NoExternalModuleWithUpdate=រកមិនឃើញបច្ចុប្បន្នភាពសម្រាប់ម៉ូឌុលខាងក្រៅទេ។
 SwaggerDescriptionFile=ឯកសារពិពណ៌នា Swagger API (សម្រាប់ប្រើជាមួយ redoc ឧទាហរណ៍)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=បង្ហាញអាសយដ្ឋានដ
 INVOICE_SHOW_SHIPPING_ADDRESSMore=ការចង្អុលបង្ហាញជាកាតព្វកិច្ចនៅក្នុងប្រទេសមួយចំនួន (បារាំង ... )
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=តំណភ្ជាប់ Url នៃបណ្តាញសង្គម។ ប្រើ {socialid} សម្រាប់ផ្នែកអថេរដែលមានលេខសម្គាល់បណ្តាញសង្គម។
 IfThisCategoryIsChildOfAnother=ប្រសិនបើប្រភេទនេះគឺជាកូនរបស់មួយផ្សេងទៀត
 DarkThemeMode=របៀបស្បែកងងឹត
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=ការព្រមាន៖
 WarningModuleHasChangedSecurityCsrfParameter=ការព្រមាន៖ ម៉ូឌុល %s បានបិទសុវត្ថិភាព CSRF នៃឧទាហរណ៍របស់អ្នក។ សកម្មភាពនេះត្រូវបានគេសង្ស័យ ហើយការដំឡើងរបស់អ្នកប្រហែលជាមិនមានសុវត្ថិភាពទៀតទេ។ សូមទាក់ទងអ្នកនិពន្ធនៃម៉ូឌុលសម្រាប់ការពន្យល់។
 EMailsInGoingDesc=អ៊ីមែលចូលត្រូវបានគ្រប់គ្រងដោយម៉ូឌុល %s។ អ្នកត្រូវតែបើក និងកំណត់រចនាសម្ព័ន្ធវា ប្រសិនបើអ្នកត្រូវការគាំទ្រអ៊ីមែលដែលកំពុងដំណើរការ។
 MAIN_IMAP_USE_PHPIMAP=ប្រើបណ្ណាល័យ PHP-IMAP សម្រាប់ IMAP ជំនួសឱ្យ PHP IMAP ដើម។ នេះក៏អនុញ្ញាតឱ្យប្រើការតភ្ជាប់ OAuth2 សម្រាប់ IMAP (ម៉ូឌុល OAuth ត្រូវតែត្រូវបានធ្វើឱ្យសកម្មផងដែរ) ។
-MAIN_CHECKBOX_LEFT_COLUMN=បង្ហាញ​ជួរ​ឈរ​សម្រាប់​ការ​ជ្រើសរើស​វាល និង​បន្ទាត់​នៅ​ខាង​ឆ្វេង (នៅ​ខាង​ស្ដាំ​តាម​លំនាំដើម)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=មិនត្រូវបានបង្កើតតាមលំនាំដើមទេ។ បង្កើតនៅលើការធ្វើឱ្យសកម្មម៉ូឌុលតែប៉ុណ្ណោះ។
 CSSPage=រចនាប័ទ្ម CSS
 Defaultfortype=លំនាំដើម
@@ -2489,7 +2510,7 @@ AiDescription=លក្ខណៈពិសេស AI (Artificial Intelligence)
 AiDescriptionLong=ផ្តល់នូវមុខងារ AI (Artificial Intelligence) នៅក្នុងផ្នែកផ្សេងៗនៃកម្មវិធី។ ត្រូវការ AI API ខាងក្រៅ។
 AI_API_KEY=គន្លឹះសម្រាប់ AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=សេវាកម្មដែលត្រូវប្រើសម្រាប់មុខងារ AI
+AI_API_SERVICE=AI service to use
 AiSetup=ការដំឡើងម៉ូឌុល AI
 AiCustomPrompt=ប្រអប់បញ្ចូល AI ផ្ទាល់ខ្លួន
 AI_CONFIGURATIONS_PROMPT=ប្រអប់បញ្ចូលផ្ទាល់ខ្លួន
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI ផ្ទាល់​នឹង​ជំរុញ​ឱ្
 EnterAnIP=បញ្ចូលអាសយដ្ឋាន IP
 ConvertInto=បម្លែងទៅជា
 YouAreHere=អ្នកនៅទីនេះ
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=បង្ហាញបាកូដនៅលើឯកសារ PDF ដឹកជញ្ជូន
 BARCODE_ON_RECEPTION_PDF=បង្ហាញបាកូដនៅលើឯកសារ PDF ទទួលភ្ញៀវ
 BARCODE_ON_STOCKTRANSFER_PDF=បង្ហាញលេខកូដនៅលើឯកសារ PDF ផ្ទេរភាគហ៊ុន
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/km_KH/banks.lang b/htdocs/langs/km_KH/banks.lang
index 72886af0787..6539cf16253 100644
--- a/htdocs/langs/km_KH/banks.lang
+++ b/htdocs/langs/km_KH/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=បញ្ចប់តុល្យភាព
 CurrentBalance=តុល្យភាព​បច្ចុប្បន្ន
 FutureBalance=សមតុល្យអនាគត
 ShowAllTimeBalance=បង្ហាញសមតុល្យពីការចាប់ផ្តើម
-AllTime=ពីការចាប់ផ្តើម
 Reconciliation=ការផ្សះផ្សា
 RIB=លេខ​គណនី​ធនាគារ
 IBAN=លេខ IBAN
@@ -133,7 +132,7 @@ DeleteTransaction=លុបធាតុ
 ConfirmDeleteTransaction=តើអ្នកប្រាកដថាចង់លុបធាតុនេះទេ?
 ThisWillAlsoDeleteBankRecord=វានឹងលុបធាតុធនាគារដែលបានបង្កើតផងដែរ។
 BankMovements=ចលនា
-PlannedTransactions=ធាតុដែលបានគ្រោងទុក
+PlannedTransactions=Upcoming entries
 Graph=ក្រាហ្វ
 ExportDataset_banque_1=ការបញ្ចូលធនាគារ និងរបាយការណ៍គណនី
 ExportDataset_banque_2=ប័ណ្ណដាក់ប្រាក់
@@ -151,7 +150,7 @@ FutureTransaction=ប្រតិបត្តិការនាពេលអន
 SelectChequeTransactionAndGenerate=ជ្រើសរើស/ត្រងមូលប្បទានប័ត្រដែលត្រូវបញ្ចូលក្នុងបង្កាន់ដៃដាក់ប្រាក់មូលប្បទានប័ត្រ។ បន្ទាប់មកចុចលើ "បង្កើត" ។
 SelectPaymentTransactionAndGenerate=ជ្រើសរើស/ត្រងឯកសារដែលត្រូវបញ្ចូលក្នុង %s បង្កាន់ដៃប្រាក់បញ្ញើ។ បន្ទាប់មកចុចលើ "បង្កើត" ។
 InputReceiptNumber=ជ្រើសរើសរបាយការណ៍ធនាគារដែលទាក់ទងនឹងការផ្សះផ្សា។ ប្រើតម្លៃលេខដែលអាចតម្រៀបបាន។
-InputReceiptNumberBis=YYYYMM ឬ YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=ដើម្បីផ្សះផ្សា?
 ThenCheckLinesAndConciliate=បន្ទាប់មកពិនិត្យបន្ទាត់ដែលមាននៅក្នុងរបាយការណ៍ធនាគារ ហើយចុច
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=ប្រសិនបើមុខងារនេះត
 BankColorizeMovementName1=ពណ៌ផ្ទៃខាងក្រោយសម្រាប់ចលនាឥណពន្ធ
 BankColorizeMovementName2=ពណ៌ផ្ទៃខាងក្រោយសម្រាប់ចលនាឥណទាន
 IfYouDontReconcileDisableProperty=ប្រសិនបើអ្នកមិនធ្វើការផ្សះផ្សាធនាគារនៅលើគណនីធនាគារមួយចំនួនទេ សូមបិទទ្រព្យសម្បត្តិ "%s" នៅលើពួកវាដើម្បីលុបការព្រមាននេះ។
-NoBankAccountDefined=គ្មានគណនីធនាគារដែលបានកំណត់
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=រកមិនឃើញកំណត់ត្រានៅក្នុងគណនីធនាគារទេ។ ជាទូទៅ វាកើតឡើងនៅពេលដែលកំណត់ត្រាមួយត្រូវបានលុបដោយដៃពីបញ្ជីនៃប្រតិបត្តិការនៅក្នុងគណនីធនាគារ (ឧទាហរណ៍ក្នុងអំឡុងពេលនៃការផ្សះផ្សាគណនីធនាគារ)។ ហេតុផលមួយទៀតគឺថាការទូទាត់ត្រូវបានកត់ត្រានៅពេលដែលម៉ូឌុល "%s" ត្រូវបានបិទ។
 AlreadyOneBankAccount=បានកំណត់គណនីធនាគារមួយរួចហើយ
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=វ៉ារ្យ៉ង់ឯកសារ SEPA
diff --git a/htdocs/langs/km_KH/blockedlog.lang b/htdocs/langs/km_KH/blockedlog.lang
index a6818114c67..4d5d182d608 100644
--- a/htdocs/langs/km_KH/blockedlog.lang
+++ b/htdocs/langs/km_KH/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=កំណត់ហេតុដែលមិនអាចផ្ល
 ShowAllFingerPrintsMightBeTooLong=បង្ហាញកំណត់ហេតុដែលបានរក្សាទុកទាំងអស់ (អាចវែង)
 ShowAllFingerPrintsErrorsMightBeTooLong=បង្ហាញ​កំណត់ហេតុ​បណ្ណសារ​ដែល​មិន​ត្រឹមត្រូវ​ទាំងអស់ (អាច​វែង)
 DownloadBlockChain=ទាញយកស្នាមម្រាមដៃ
-KoCheckFingerprintValidity=ធាតុ​ចូល​ក្នុង​ប័ណ្ណសារ​មិន​ត្រឹមត្រូវ​ទេ។ វាមានន័យថានរណាម្នាក់ (ហេកឃ័រ?) បានកែប្រែទិន្នន័យមួយចំនួននៃកំណត់ត្រានេះ បន្ទាប់ពីវាត្រូវបានកត់ត្រា ឬបានលុបកំណត់ត្រាដែលបានរក្សាទុកពីមុន (ពិនិត្យមើលបន្ទាត់នោះជាមួយនឹង # មានពីមុន) ឬបានកែប្រែការត្រួតពិនិត្យនៃកំណត់ត្រាមុន។
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=កំណត់ហេតុដែលបានទុកក្នុងប័ណ្ណសារមានសុពលភាព។ ទិន្នន័យ​នៅ​លើ​បន្ទាត់​នេះ​មិន​ត្រូវ​បាន​កែ​សម្រួល​ទេ ហើយ​ធាតុ​នេះ​ធ្វើ​តាម​លេខ​មុន។
 OkCheckFingerprintValidityButChainIsKo=កំណត់ហេតុដែលបានទុកក្នុងប័ណ្ណសារហាក់ដូចជាមានសុពលភាពបើប្រៀបធៀបទៅនឹងឯកសារមុន ប៉ុន្តែខ្សែសង្វាក់ត្រូវបានខូចពីមុន។
 AddedByAuthority=រក្សាទុកក្នុងអាជ្ញាធរពីចម្ងាយ
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=ព័ត៌មានលម្អិតអំពីកំ
 ListOfTrackedEvents=បញ្ជីនៃព្រឹត្តិការណ៍ដែលបានតាមដាន
 Fingerprint=ស្នាមម្រាមដៃ
 DownloadLogCSV=នាំចេញកំណត់ហេតុដែលបានរក្សាទុក (CSV)
-DataOfArchivedEvent=ទិន្នន័យពេញលេញនៃព្រឹត្តិការណ៍ដែលបានរក្សាទុក
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=វត្ថុដើម (ប្រភេទ %s, id %s) មិនត្រូវបានភ្ជាប់ទេ (សូមមើលជួរឈរ 'ទិន្នន័យពេញ' ដើម្បីទទួលបានទិន្នន័យដែលបានរក្សាទុកដែលមិនអាចផ្លាស់ប្តូរបាន)
 BlockedLogAreRequiredByYourCountryLegislation=ម៉ូឌុលកំណត់ហេតុដែលមិនអាចផ្លាស់ប្តូរបានអាចត្រូវបានទាមទារដោយច្បាប់នៃប្រទេសរបស់អ្នក។ ការបិទម៉ូឌុលនេះអាចធ្វើឲ្យប្រតិបត្តិការនាពេលអនាគតមិនត្រឹមត្រូវទាក់ទងនឹងច្បាប់ និងការប្រើប្រាស់កម្មវិធីផ្លូវច្បាប់ ដោយសារពួកវាមិនអាចមានសុពលភាពដោយសវនកម្មពន្ធ។
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=ម៉ូឌុលកំណត់ហេតុដែលមិនអាចផ្លាស់ប្តូរបានត្រូវបានធ្វើឱ្យសកម្មដោយសារតែច្បាប់នៃប្រទេសរបស់អ្នក។ ការបិទម៉ូឌុលនេះអាចនឹងធ្វើឱ្យប្រតិបត្តិការនាពេលអនាគតមិនត្រឹមត្រូវទាក់ទងនឹងច្បាប់ និងការប្រើប្រាស់កម្មវិធីផ្លូវច្បាប់ ដោយសារពួកវាមិនអាចមានសុពលភាពដោយសវនកម្មពន្ធ។
@@ -30,6 +32,7 @@ BlockedLogEnabled=ប្រព័ន្ធតាមដានព្រឹត្
 BlockedLogDisabled=ប្រព័ន្ធតាមដានព្រឹត្តិការណ៍ចូលទៅក្នុងកំណត់ហេតុដែលមិនអាចផ្លាស់ប្តូរបានត្រូវបានបិទបន្ទាប់ពីការថតមួយចំនួនរួចរាល់។ យើងបានរក្សាទុកស្នាមម្រាមដៃពិសេស ដើម្បីតាមដានខ្សែសង្វាក់ដែលខូច
 BlockedLogDisabledBis=ប្រព័ន្ធតាមដានព្រឹត្តិការណ៍ចូលទៅក្នុងកំណត់ហេតុដែលមិនអាចផ្លាស់ប្តូរបានត្រូវបានបិទ។ នេះ​គឺ​អាច​ទៅ​រួច​ព្រោះ​មិន​ទាន់​មាន​កំណត់​ត្រា​ត្រូវ​បាន​ធ្វើ​នៅ​ឡើយ​ទេ។
 LinkHasBeenDisabledForPerformancePurpose=សម្រាប់គោលបំណងអនុវត្ត តំណផ្ទាល់ទៅកាន់ឯកសារមិនត្រូវបានបង្ហាញបន្ទាប់ពីបន្ទាត់ទី 100 ទេ។
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=វិក្កយបត្ររបស់អតិថិជនត្រូវបានលុបដោយឡូជីខល
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=ការលុបឡូជីខលនៃការ
 logPAYMENT_VARIOUS_CREATE=ការទូទាត់ (មិនត្រូវបានកំណត់ទៅវិក្កយបត្រ) ត្រូវបានបង្កើតឡើង
 logPAYMENT_VARIOUS_DELETE=ការទូទាត់ (មិនត្រូវបានកំណត់ទៅវិក្កយបត្រ) ការលុបឡូជីខល
 logPAYMENT_VARIOUS_MODIFY=ការទូទាត់ (មិនត្រូវបានកំណត់ទៅវិក្កយបត្រ) បានកែប្រែ
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/km_KH/categories.lang b/htdocs/langs/km_KH/categories.lang
index c1072ec3b40..a80af8721bb 100644
--- a/htdocs/langs/km_KH/categories.lang
+++ b/htdocs/langs/km_KH/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=តំបន់ទំនាក់ទំនង/ស្ល
 AccountsCategoriesArea=តំបន់ស្លាក/ប្រភេទគណនីធនាគារ
 ProjectsCategoriesArea=តំបន់/ប្រភេទស្លាកគម្រោង
 UsersCategoriesArea=តំបន់ស្លាក/ប្រភេទអ្នកប្រើប្រាស់
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=ប្រភេទរង
 CatList=បញ្ជីស្លាក/ប្រភេទ
 CatListAll=បញ្ជីស្លាក/ប្រភេទ (គ្រប់ប្រភេទ)
@@ -90,9 +91,10 @@ CategoriesSetup=ការកំណត់ស្លាក/ប្រភេទ
 CategorieRecursiv=ភ្ជាប់ជាមួយស្លាកមេ / ប្រភេទដោយស្វ័យប្រវត្តិ
 CategorieRecursivHelp=ប្រសិនបើជម្រើសត្រូវបានបើក នៅពេលអ្នកបន្ថែមវត្ថុទៅក្នុងប្រភេទរង វត្ថុក៏នឹងត្រូវបានបន្ថែមទៅក្នុងប្រភេទមេផងដែរ។
 AddProductServiceIntoCategory=កំណត់ប្រភេទទៅផលិតផល/សេវាកម្ម
-AddCustomerIntoCategory=កំណត់ប្រភេទដល់អតិថិជន
-AddSupplierIntoCategory=ចាត់ថ្នាក់ទៅអ្នកផ្គត់ផ្គង់
-AssignCategoryTo=កំណត់ប្រភេទទៅ
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=បង្ហាញស្លាក/ប្រភេទ
 ByDefaultInList=តាមលំនាំដើមក្នុងបញ្ជី
 ChooseCategory=ជ្រើសរើសប្រភេទ
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=ប្រភេទទំព័រ-កុងតឺន
 KnowledgemanagementsCategoriesArea=ប្រភេទអត្ថបទ KM
 UseOrOperatorForCategories=ប្រើ 'OR' ប្រតិបត្តិករសម្រាប់ប្រភេទ
 AddObjectIntoCategory=ចាត់តាំងទៅប្រភេទ
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/km_KH/companies.lang b/htdocs/langs/km_KH/companies.lang
index 4bd4328a2db..2f99300ac82 100644
--- a/htdocs/langs/km_KH/companies.lang
+++ b/htdocs/langs/km_KH/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=ប្រទេសស្ថិតនៅក្នុងសហគ
 PriceFormatInCurrentLanguage=ទម្រង់បង្ហាញតម្លៃជាភាសា និងរូបិយប័ណ្ណបច្ចុប្បន្ន
 ThirdPartyName=ឈ្មោះភាគីទីបី
 ThirdPartyEmail=អ៊ីមែលភាគីទីបី
-ThirdParty=ភាគី​ទីបី
-ThirdParties=ភាគី​ទីបី
+ThirdParty=Third party
+ThirdParties=Third parties
 ThirdPartyProspects=ការរំពឹងទុក
 ThirdPartyProspectsStats=ការរំពឹងទុក
 ThirdPartyCustomers=អតិថិជន
@@ -65,6 +65,7 @@ State=រដ្ឋ/ខេត្ត
 StateId=លេខសម្គាល់រដ្ឋ
 StateCode=លេខកូដរដ្ឋ/ខេត្ត
 StateShort=រដ្ឋ
+DepartmentBuyer=Buyer's state/province
 Region=តំបន់
 Region-State=តំបន់ - រដ្ឋ
 Country=ប្រទេស
@@ -78,7 +79,7 @@ Chat=ជជែក
 PhonePro=ឡានក្រុង។ ទូរស័ព្ទ
 PhonePerso=Pers ។ ទូរស័ព្ទ
 PhoneMobile=ទូរស័ព្ទចល័ត
-No_Email=បដិសេធការផ្ញើអ៊ីមែលយ៉ាងច្រើន
+No_Email=Refuse mass emails
 Fax=ទូរសារ
 Zip=លេខ​កូដ​តំបន់
 Town=ទីក្រុង
@@ -382,11 +383,12 @@ ExportCardToFormat=នាំចេញកាតទៅជាទម្រង់
 ContactNotLinkedToCompany=ទំនាក់ទំនងមិនត្រូវបានភ្ជាប់ទៅភាគីទីបីណាមួយឡើយ។
 DolibarrLogin=ចូល Dolibarr
 NoDolibarrAccess=គ្មានការចូលប្រើ Dolibarr ទេ។
-ExportDataset_company_1=ភាគីទីបី (ក្រុមហ៊ុន / មូលនិធិ / មនុស្សរូបវន្ត) និងទ្រព្យសម្បត្តិរបស់ពួកគេ។
-ExportDataset_company_2=ទំនាក់ទំនងនិងលក្ខណៈសម្បត្តិរបស់ពួកគេ។
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=ភាគីទីបីនិងទ្រព្យសម្បត្តិរបស់ពួកគេ។
 ImportDataset_company_2=ទំនាក់ទំនង/អាសយដ្ឋាន និងគុណលក្ខណៈបន្ថែមរបស់ភាគីទីបី
-ImportDataset_company_3=គណនីធនាគារភាគីទីបី
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=អ្នកតំណាងផ្នែកលក់ភាគីទីបី (ចាត់តាំងតំណាងលក់/អ្នកប្រើប្រាស់ទៅក្រុមហ៊ុន)
 PriceLevel=កម្រិតតម្លៃ
 PriceLevelLabels=ស្លាកកម្រិតតម្លៃ
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=លេខកូដឥតគិតថ្លៃដោយគ
 ManagingDirectors=ឈ្មោះអ្នកគ្រប់គ្រង (CEO, នាយក, ប្រធាន...)
 MergeOriginThirdparty=ភាគីទីបីស្ទួន (ភាគីទីបីដែលអ្នកចង់លុប)
 MergeThirdparties=បញ្ចូលភាគីទីបី
-ConfirmMergeThirdparties=តើអ្នកប្រាកដថាចង់បញ្ចូលភាគីទីបីដែលបានជ្រើសរើសជាមួយភាគីបច្ចុប្បន្នទេ? វត្ថុដែលបានភ្ជាប់ទាំងអស់ (វិក្កយបត្រ ការបញ្ជាទិញ ...) នឹងត្រូវបានផ្លាស់ទីទៅភាគីទីបីបច្ចុប្បន្ន បន្ទាប់ពីនោះភាគីទីបីដែលបានជ្រើសរើសនឹងត្រូវបានលុប។
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=ភាគីទីបីត្រូវបានបញ្ចូលគ្នា
 SaleRepresentativeLogin=ការចូលរបស់អ្នកតំណាងផ្នែកលក់
 SaleRepresentativeFirstname=ឈ្មោះដំបូងរបស់អ្នកតំណាងផ្នែកលក់
@@ -460,3 +462,6 @@ ExternalSystemID=លេខសម្គាល់ប្រព័ន្ធខាង
 IDOfPaymentInAnExternalSystem=លេខសម្គាល់របៀបបង់ប្រាក់ចូលទៅក្នុងប្រព័ន្ធខាងក្រៅ (ដូចជា Stripe, Paypal, ... )
 AADEWebserviceCredentials=អត្តសញ្ញាណប័ណ្ណសេវាកម្មគេហទំព័រ AADE
 ThirdPartyMustBeACustomerToCreateBANOnStripe=ភាគីទីបីត្រូវតែជាអតិថិជនដើម្បីអនុញ្ញាតឱ្យបង្កើតព័ត៌មានធនាគាររបស់ខ្លួននៅផ្នែក Stripe
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/km_KH/compta.lang b/htdocs/langs/km_KH/compta.lang
index 1addde363af..9816f5f7b7f 100644
--- a/htdocs/langs/km_KH/compta.lang
+++ b/htdocs/langs/km_KH/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=ការទូទាត់វិក្កយបត្រ
 PaymentSupplierInvoice=ការទូទាត់វិក្កយបត្ររបស់អ្នកលក់
 PaymentSocialContribution=ការបង់ពន្ធសង្គម/សារពើពន្ធ
 PaymentVat=ការទូទាត់ VAT
-AutomaticCreationPayment=កត់ត្រាការទូទាត់ដោយស្វ័យប្រវត្តិ
+AutomaticCreationPayment=Also record the payment
 ListPayment=បញ្ជីនៃការទូទាត់
 ListOfCustomerPayments=បញ្ជីនៃការទូទាត់របស់អតិថិជន
 ListOfSupplierPayments=បញ្ជីនៃការទូទាត់របស់អ្នកលក់
@@ -118,10 +118,14 @@ SocialContributionsPayments=ការបង់ពន្ធសង្គម/សា
 ShowVatPayment=បង្ហាញការទូទាត់ VAT
 TotalToPay=សរុបដែលត្រូវបង់
 BalanceVisibilityDependsOnSortAndFilters=សមតុល្យអាចមើលឃើញនៅក្នុងបញ្ជីនេះលុះត្រាតែតារាងត្រូវបានតម្រៀបនៅលើ %s ហើយត្រងនៅលើគណនីធនាគារ 1 (ដោយគ្មានតម្រងផ្សេងទៀត)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=លេខកូដគណនីអតិថិជន
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=លេខកូដគណនេយ្យអ្នកលក់
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=កាត់។ គណនី។ កូដ
 SupplierAccountancyCodeShort=ស៊ូ គណនី។ កូដ
+UserAccountancyCodeShort=User account. code
 AccountNumber=លេខ​គណនី
 NewAccountingAccount=គណនី​ថ្មី
 Turnover=វិក្កយបត្រចំណូល
@@ -129,7 +133,9 @@ TurnoverCollected=ចំណូលត្រូវបានប្រមូល
 SalesTurnoverMinimum=ចំណូលអប្បបរមា
 ByExpenseIncome=ដោយចំណាយ និងចំណូល
 ByThirdParties=ដោយភាគីទីបី
+ByProjects=By projects
 ByUserAuthorOfInvoice=ដោយអ្នកនិពន្ធវិក័យប័ត្រ
+DetailedListLowercase=detailed list
 CheckReceipt=ប័ណ្ណដាក់ប្រាក់
 CheckReceiptShort=ប័ណ្ណដាក់ប្រាក់
 LastCheckReceiptShort=%s សន្លឹកដាក់ប្រាក់ចុងក្រោយបំផុត
diff --git a/htdocs/langs/km_KH/errors.lang b/htdocs/langs/km_KH/errors.lang
index f46e835491e..27ea169634b 100644
--- a/htdocs/langs/km_KH/errors.lang
+++ b/htdocs/langs/km_KH/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=កំហុសក្នុងការ
 ErrorFailedToCreateDir=បរាជ័យក្នុងការបង្កើតថត។ ពិនិត្យ​មើល​ថា​អ្នក​ប្រើ​ម៉ាស៊ីន​បម្រើ​បណ្ដាញ​មាន​ការ​អនុញ្ញាត​ក្នុង​ការ​សរសេរ​ទៅ​ក្នុង​ថតឯកសារ Dolibarr ។ ប្រសិនបើប៉ារ៉ាម៉ែត្រ <b>safe_mode</b> ត្រូវបានបើកនៅលើ PHP នេះ សូមពិនិត្យមើលថាឯកសារ Dolibarr php ជាកម្មសិទ្ធិរបស់អ្នកប្រើម៉ាស៊ីនមេគេហទំព័រ (ឬក្រុម)។
 ErrorNoMailDefinedForThisUser=គ្មានសំបុត្រដែលបានកំណត់សម្រាប់អ្នកប្រើប្រាស់នេះទេ។
 ErrorSetupOfEmailsNotComplete=ការដំឡើងអ៊ីមែលមិនបានបញ្ចប់ទេ។
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=មុខងារនេះត្រូវការ JavaScript ដើម្បីដំណើរការដើម្បីដំណើរការ។ ផ្លាស់ប្តូរវានៅក្នុងការរៀបចំ - ការបង្ហាញ។
 ErrorTopMenuMustHaveAParentWithId0=ម៉ឺនុយប្រភេទ 'កំពូល' មិនអាចមានម៉ឺនុយមេបានទេ។ ដាក់លេខ 0 ក្នុងម៉ឺនុយមេ ឬជ្រើសរើសម៉ឺនុយប្រភេទ 'ឆ្វេង'។
 ErrorLeftMenuMustHaveAParentId=ម៉ឺនុយនៃប្រភេទ 'ឆ្វេង' ត្រូវតែមានលេខសម្គាល់មេ។
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=ការបង្ហោះត្រូវបានរ
 ErrorFileSizeTooLarge=ទំហំឯកសារធំពេក ឬឯកសារមិនត្រូវបានផ្តល់ឱ្យ។
 ErrorFieldTooLong=វាល %s វែងពេក។
 ErrorSizeTooLongForIntType=ទំហំវែងពេកសម្រាប់ប្រភេទ int (%s ខ្ទង់អតិបរមា)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=ទំហំវែងពេកសម្រាប់ប្រភេទខ្សែអក្សរ (%s តួអក្សរអតិបរមា)
 ErrorNoValueForSelectType=សូមបំពេញតម្លៃសម្រាប់បញ្ជីជ្រើសរើស
 ErrorNoValueForCheckBoxType=សូមបំពេញតម្លៃសម្រាប់បញ្ជីប្រអប់ធីក
@@ -138,8 +140,9 @@ ErrorBadValueForCode=តម្លៃមិនល្អសម្រាប់ល
 ErrorBothFieldCantBeNegative=វាល %s និង %s មិនអាចជាអវិជ្ជមានទាំងពីរទេ
 ErrorFieldCantBeNegativeOnInvoice=វាល <strong>%s</strong> មិនអាចអវិជ្ជមានលើវិក្កយបត្រប្រភេទនេះទេ។ ប្រសិនបើអ្នកត្រូវការបន្ថែមបន្ទាត់បញ្ចុះតម្លៃ គ្រាន់តែបង្កើតការបញ្ចុះតម្លៃជាមុនសិន (ពីវាល '%s' នៅក្នុងកាតភាគីទីបី) ហើយអនុវត្តវាទៅវិក្កយបត្រ។
 ErrorLinesCantBeNegativeForOneVATRate=សរុបនៃបន្ទាត់ (សុទ្ធនៃពន្ធ) មិនអាចជាអវិជ្ជមានសម្រាប់អត្រាពន្ធលើតម្លៃបន្ថែមដែលមិនត្រូវបានផ្តល់ឱ្យជាមោឃៈទេ (បានរកឃើញសរុបអវិជ្ជមានសម្រាប់អត្រាពន្ធលើតម្លៃបន្ថែម <b>%s </b>%%)។
-ErrorLinesCantBeNegativeOnDeposits=បន្ទាត់មិនអាចមានអវិជ្ជមាននៅក្នុងការដាក់ប្រាក់ទេ។ អ្នកនឹងប្រឈមមុខនឹងបញ្ហានៅពេលដែលអ្នកនឹងត្រូវប្រើប្រាស់ប្រាក់បញ្ញើក្នុងវិក្កយបត្រចុងក្រោយ ប្រសិនបើអ្នកធ្វើដូច្នេះ។
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=បរិមាណសម្រាប់បន្ទាត់ទៅក្នុងវិក្កយបត្ររបស់អតិថិជនមិនអាចអវិជ្ជមានបានទេ។
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=គណនីអ្នកប្រើប្រាស់ <b>%s</b> ប្រើដើម្បីប្រតិបត្តិបណ្តាញម៉ាស៊ីនមេ មិនមានការអនុញ្ញាតសម្រាប់ នោះ។
 ErrorNoActivatedBarcode=គ្មានប្រភេទបាកូដត្រូវបានធ្វើឱ្យសកម្ម
 ErrUnzipFails=បានបរាជ័យក្នុងការពន្លា %s ជាមួយ ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=បន្ទាត់ច្រើនពេកដើម្បីដំណើរការ។ សូមប្រើតម្រងជ្រើសរើសបន្ថែមទៀត។
 ErrorEmptyValueForQty=បរិមាណមិនអាចជាសូន្យទេ។
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=ប៉ារ៉ាម៉ែត្រ PHP របស់អ្នក upload_max_filesize (%s) គឺខ្ពស់ជាងប៉ារ៉ាម៉ែត្រ PHP post_max_size (%s)។ នេះមិនមែនជាការដំឡើងជាប់លាប់ទេ។
 WarningPasswordSetWithNoAccount=ពាក្យសម្ងាត់ត្រូវបានកំណត់សម្រាប់សមាជិកនេះ។ ទោះយ៉ាងណាក៏ដោយ គ្មានគណនីអ្នកប្រើប្រាស់ត្រូវបានបង្កើតទេ។ ដូច្នេះពាក្យសម្ងាត់នេះត្រូវបានរក្សាទុក ប៉ុន្តែមិនអាចប្រើដើម្បីចូល Dolibarr បានទេ។ វាអាចត្រូវបានប្រើដោយម៉ូឌុល/ចំណុចប្រទាក់ខាងក្រៅ ប៉ុន្តែប្រសិនបើអ្នកមិនចាំបាច់កំណត់ការចូល ឬពាក្យសម្ងាត់ណាមួយសម្រាប់សមាជិកទេ អ្នកអាចបិទជម្រើស "គ្រប់គ្រងការចូលសម្រាប់សមាជិកនីមួយៗ" ពីការដំឡើងម៉ូឌុលសមាជិក។ ប្រសិនបើអ្នកត្រូវគ្រប់គ្រងការចូល ប៉ុន្តែមិនត្រូវការពាក្យសម្ងាត់ទេ អ្នកអាចទុកវាលនេះឱ្យនៅទទេ ដើម្បីជៀសវាងការព្រមាននេះ។ ចំណាំ៖ អ៊ីមែលក៏អាចប្រើជាការចូលបានដែរ ប្រសិនបើសមាជិកត្រូវបានភ្ជាប់ទៅអ្នកប្រើប្រាស់។
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=លេខសម្គាល់មាតាប
 WarningReadBankAlsoAllowedIfUserHasPermission=ការព្រមាន ការអានគណនីធនាគារក៏ត្រូវបានអនុញ្ញាតដោយមានការអនុញ្ញាតក្នុងការគ្រប់គ្រងតារាងគណនីផងដែរ។
 WarningNoDataTransferedInAccountancyYet=សូមចំណាំថាមិនមានទិន្នន័យនៅក្នុងតារាងគណនេយ្យទេ។ សូមផ្ទេរទិន្នន័យរបស់អ្នកដែលបានកត់ត្រានៅក្នុងកម្មវិធីទៅផ្នែកគណនេយ្យ ឬផ្លាស់ប្តូររបៀបគណនា ដើម្បីវិភាគទិន្នន័យដែលបានកត់ត្រានៅខាងក្រៅគណនេយ្យ។
 WarningChangingThisMayBreakStopTaskScheduler=ការព្រមាន ការផ្លាស់ប្តូរតម្លៃនេះអាចបិទកម្មវិធីកំណត់ពេល
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = វិក្កយបត្រ SwissQR អាចត្រូវបានបន្ថែមតែលើវិក្កយបត្រដែលបានកំណត់ដែលត្រូវបង់ជាមួយនឹងការទូទាត់ផ្ទេរឥណទានប៉ុណ្ណោះ។
 SwissQrCreditorAddressInvalid = អាសយដ្ឋានម្ចាស់បំណុលមិនត្រឹមត្រូវទេ (តើ ZIP និងទីក្រុងបានកំណត់ទេ? (%s)
 SwissQrCreditorInformationInvalid = ព័ត៌មានម្ចាស់បំណុលមិនត្រឹមត្រូវសម្រាប់ IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s ត្រូវបានកំណ
 ErrorThisGroupIsAlreadyDefinedAsThisType=ទំនាក់ទំនងជាមួយក្រុមនេះត្រូវបានកំណត់រួចហើយថាជាទំនាក់ទំនងសម្រាប់ប្រភេទនេះ។
 EmptyMessageNotAllowedError=សារទទេមិនត្រូវបានអនុញ្ញាតទេ។
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/km_KH/exports.lang b/htdocs/langs/km_KH/exports.lang
index a6462f87ecf..26ed26aeafb 100644
--- a/htdocs/langs/km_KH/exports.lang
+++ b/htdocs/langs/km_KH/exports.lang
@@ -67,7 +67,7 @@ ChooseFormatOfFileToImport=ជ្រើសរើសទម្រង់ឯកស
 ChooseFileToImport=ផ្ទុកឡើងឯកសារបន្ទាប់មកចុចលើរូបតំណាង %s ដើម្បីជ្រើសរើសឯកសារជាឯកសារនាំចូលប្រភព...
 SourceFileFormat=ទ្រង់ទ្រាយឯកសារប្រភព
 FieldsInSourceFile=វាលនៅក្នុងឯកសារប្រភព
-FieldsInTargetDatabase=វាលគោលដៅនៅក្នុងមូលដ្ឋានទិន្នន័យ Dolibarr (bold=mandatory)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=គ្មានវាល
 MoveField=ផ្លាស់ទី​លេខ​ជួរ​ឈរ​វាល %s
 ExampleOfImportFile=ឧទាហរណ៍_of_import_file
@@ -82,8 +82,8 @@ NowClickToTestTheImport=ពិនិត្យមើលថាទម្រង់
 RunSimulateImportFile=ដំណើរការការក្លែងធ្វើនាំចូល
 FieldNeedSource=វាលនេះទាមទារទិន្នន័យពីឯកសារប្រភព
 SomeMandatoryFieldHaveNoSource=វាលចាំបាច់មួយចំនួនមិនមានប្រភពពីឯកសារទិន្នន័យទេ។
-InformationOnSourceFile=ព័ត៌មានអំពីឯកសារប្រភព
-InformationOnTargetTables=ព័ត៌មានអំពីវាលគោលដៅ
+InformationOnSourceFile=Source file
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=ប្ដូរ​យ៉ាង​ហោច​ណាស់​ប្រភព​មួយ​ក្នុង​ជួរ​ឈរ​នៃ​វាល​ដើម្បី​នាំចេញ
 SelectFormat=ជ្រើសរើសទម្រង់ឯកសារនាំចូលនេះ។
 RunImportFile=នាំចូលទិន្នន័យ
diff --git a/htdocs/langs/km_KH/hrm.lang b/htdocs/langs/km_KH/hrm.lang
index 502a3fdc19b..7f39c59c86f 100644
--- a/htdocs/langs/km_KH/hrm.lang
+++ b/htdocs/langs/km_KH/hrm.lang
@@ -46,11 +46,11 @@ NewEval=ការវាយតម្លៃសមត្ថភាពថ្មី។
 ValidateEvaluation=ធ្វើឱ្យការវាយតម្លៃសមត្ថភាពមានសុពលភាព
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=ការវាយតម្លៃសមត្ថភាព
-RequiredRank=ចំណាត់ថ្នាក់ដែលត្រូវការសម្រាប់ប្រវត្តិរូបការងារ
-RequiredRankShort=ចំណាត់ថ្នាក់ដែលត្រូវការ
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=មុខតំណែងដែលមានប្រវត្តិរូបការងារនេះ។
-EmployeeRank=ចំណាត់ថ្នាក់បុគ្គលិកសម្រាប់ជំនាញនេះ។
-EmployeeRankShort=ចំណាត់ថ្នាក់បុគ្គលិក
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=មុខតំណែងបុគ្គលិក
 EmployeePositions=មុខតំណែងបុគ្គលិក
 EmployeesInThisPosition=បុគ្គលិកនៅក្នុងមុខតំណែងនេះ។
@@ -72,6 +72,9 @@ AddSkill=បន្ថែមជំនាញទៅទម្រង់ការង
 RequiredSkills=ជំនាញដែលត្រូវការសម្រាប់ប្រវត្តិរូបការងារនេះ។
 UserRank=ចំណាត់ថ្នាក់អ្នកប្រើប្រាស់
 SkillList=បញ្ជីជំនាញ
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=រក្សាទុកចំណាត់ថ្នាក់
 TypeKnowHow=ចំណេះដឹង
 TypeHowToBe=តើធ្វើដូចម្តេចដើម្បីឱ្យមាន
@@ -95,3 +98,5 @@ NeedBusinessTravels=ត្រូវការការធ្វើដំណើរ
 NoDescription=គ្មានការពិពណ៌នាទេ។
 TheJobProfileHasNoSkillsDefinedFixBefore=កម្រងព័ត៌មានការងារដែលបានវាយតម្លៃរបស់និយោជិតនេះមិនមានជំនាញដែលបានកំណត់លើវាទេ។ សូមបន្ថែមជំនាញ បន្ទាប់មកលុប និងចាប់ផ្តើមការវាយតម្លៃឡើងវិញ។
 PDFStandardHrmEvaluation=គំរូស្តង់ដារដើម្បីបង្កើតឯកសារ PDF សម្រាប់ការវាយតម្លៃសមត្ថភាព
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/km_KH/mails.lang b/htdocs/langs/km_KH/mails.lang
index 6abb3a5ad39..ce451bc4c98 100644
--- a/htdocs/langs/km_KH/mails.lang
+++ b/htdocs/langs/km_KH/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=ការផ្ញើអ៊ីមែល
 EMailing=ការផ្ញើអ៊ីមែល
-EMailings=អ៊ីមែល
+EMailings=Mass EMails
 SMSings=ផ្ញើសារជាអក្សរ
-AllEMailings=អ៊ីមែលទាំងអស់។
+AllEMailings=All mass eMails
 MailCard=កាតអ៊ីមែល
 MailRecipients=អ្នកទទួល
 MailRecipient=អ្នកទទួល
@@ -26,19 +26,19 @@ MailFile=ឯកសារ​ភ្ជាប់
 MailMessage=Email body
 SubjectNotIn=មិននៅក្នុងប្រធានបទ
 BodyNotIn=មិននៅក្នុងរាងកាយ
-ShowEMailing=បង្ហាញការផ្ញើអ៊ីមែល
-ListOfEMailings=បញ្ជីអ៊ីមែល
-NewMailing=ការផ្ញើអ៊ីមែលថ្មី។
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=ការផ្ញើសារថ្មី។
-EditMailing=កែសម្រួលការផ្ញើអ៊ីមែល
-ResetMailing=ផ្ញើអ៊ីមែលឡើងវិញ
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=លុបការផ្ញើអ៊ីមែល
-PreviewMailing=មើលការផ្ញើអ៊ីមែលជាមុន
-CreateMailing=បង្កើតការផ្ញើអ៊ីមែល
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=សាកល្បង
-ValidMailing=ការផ្ញើអ៊ីមែលត្រឹមត្រូវ។
+ValidMailing=Valid mass Email
 MailingStatusDraft=សេចក្តីព្រាង
 MailingStatusValidated=មានសុពលភាព
 MailingStatusSent=បានផ្ញើ
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=តម្រងទាំងអស់ត្រូវត
 LineInFile=បន្ទាត់ %s នៅក្នុងឯកសារ
 RecipientSelectionModules=សំណើដែលបានកំណត់សម្រាប់ការជ្រើសរើសរបស់អ្នកទទួល
 MailSelectedRecipients=អ្នកទទួលដែលបានជ្រើសរើស
-MailingArea=តំបន់ផ្ញើអ៊ីមែល
-LastMailings=អ៊ីមែល %s ចុងក្រោយបង្អស់
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=ស្ថិតិគោលដៅ
 NbOfCompaniesContacts=ទំនាក់ទំនង/អាសយដ្ឋានពិសេស
 MailNoChangePossible=អ្នកទទួលសម្រាប់ការផ្ញើអ៊ីមែលដែលមានសុពលភាពមិនអាចផ្លាស់ប្តូរបានទេ។
-SearchAMailing=ស្វែងរកសំបុត្រ
-SendMailing=ផ្ញើអ៊ីមែល
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=ផ្ញើដោយ
 AdvancedAlternative=ជម្រើសកម្រិតខ្ពស់
 MailingNeedCommand=ការផ្ញើអ៊ីមែលអាចត្រូវបានអនុវត្តពីបន្ទាត់ពាក្យបញ្ជា។ សួរអ្នកគ្រប់គ្រងម៉ាស៊ីនមេរបស់អ្នកឱ្យដំណើរការពាក្យបញ្ជាខាងក្រោមដើម្បីផ្ញើអ៊ីមែលទៅអ្នកទទួលទាំងអស់៖
 MailingNeedCommand2=ទោះយ៉ាងណាក៏ដោយ អ្នកអាចផ្ញើពួកវាតាមអ៊ីនធឺណិតដោយបន្ថែមប៉ារ៉ាម៉ែត្រ MAILING_LIMIT_SENDBYWEB ជាមួយនឹងតម្លៃនៃចំនួនអតិបរមានៃអ៊ីមែលដែលអ្នកចង់ផ្ញើតាមវគ្គ។ សម្រាប់បញ្ហានេះ សូមចូលទៅកាន់ទំព័រដើម - ការដំឡើង - ផ្សេងទៀត។
 ConfirmSendingEmailing=ប្រសិនបើអ្នកចង់ផ្ញើអ៊ីមែលដោយផ្ទាល់ពីអេក្រង់នេះ សូមបញ្ជាក់ថាអ្នកប្រាកដថាអ្នកចង់ផ្ញើអ៊ីមែលឥឡូវនេះពីកម្មវិធីរុករករបស់អ្នក?
-LimitSendingEmailing=ចំណាំ៖ ការផ្ញើអ៊ីមែលពីចំណុចប្រទាក់គេហទំព័រត្រូវបានធ្វើឡើងជាច្រើនដងសម្រាប់ហេតុផលសុវត្ថិភាព និងអស់ពេល <b>%s</b> អ្នកទទួលក្នុងពេលតែមួយសម្រាប់វគ្គផ្ញើនីមួយៗ។
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=សម្អាត​បញ្ជី
 ToClearAllRecipientsClickHere=សូមចុចទីនេះដើម្បីលុបបញ្ជីអ្នកទទួលសម្រាប់ការផ្ញើអ៊ីមែលនេះ។
 ToAddRecipientsChooseHere=បន្ថែមអ្នកទទួលដោយជ្រើសរើសពីបញ្ជី
-NbOfEMailingsReceived=បានទទួលអ៊ីមែលយ៉ាងច្រើន
-NbOfEMailingsSend=បានផ្ញើអ៊ីមែលយ៉ាងច្រើន
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=កំណត់ត្រាអត្តសញ្ញាណ
 DeliveryReceipt=ការដឹកជញ្ជូន Ack ។
 YouCanUseCommaSeparatorForSeveralRecipients=អ្នកអាចប្រើសញ្ញាបំបែក <b>comma</b> ដើម្បីបញ្ជាក់អ្នកទទួលជាច្រើន។
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=គ្មានការជូនដំណឹងតា
 ANotificationsWillBeSent=ការជូនដំណឹងដោយស្វ័យប្រវត្តិ 1 នឹងត្រូវបានផ្ញើតាមអ៊ីមែល
 SomeNotificationsWillBeSent=%s ការជូនដំណឹងដោយស្វ័យប្រវត្តិនឹងត្រូវបានផ្ញើតាមអ៊ីមែល
 AddNewNotification=ជាវការជូនដំណឹងតាមអ៊ីមែលស្វ័យប្រវត្តិថ្មី (គោលដៅ/ព្រឹត្តិការណ៍)
-ListOfActiveNotifications=ការជាវសកម្ម (គោលដៅ/ព្រឹត្តិការណ៍) សម្រាប់ការជូនដំណឹងតាមអ៊ីមែលដោយស្វ័យប្រវត្តិ
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=បានផ្ញើការជូនដំណឹងតាមអ៊ីមែលដោយស្វ័យប្រវត្តិ
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=ការកំណត់រចនាសម្ព័ន្ធនៃការផ្ញើអ៊ីមែលត្រូវបានតំឡើងទៅ '%s' ។ ទម្រង់នេះមិនអាចប្រើដើម្បីផ្ញើអ៊ីមែលធំបានទេ។
 MailSendSetupIs2=ជាដំបូងអ្នកត្រូវតែចូលទៅជាមួយគណនីអ្នកគ្រប់គ្រង ចូលទៅក្នុងម៉ឺនុយ %sHome - Setup - EMails%s ដើម្បីផ្លាស់ប្តូរប៉ារ៉ាម៉ែត្រ <strong>'%s'</strong> ដើម្បីប្រើរបៀប '<span class='0ecf29ec' </span>'។ ជាមួយនឹងទម្រង់នេះ អ្នកអាចបញ្ចូលការដំឡើងម៉ាស៊ីនមេ SMTP ដែលផ្តល់ដោយអ្នកផ្តល់សេវាអ៊ីនធឺណិតរបស់អ្នក ហើយប្រើមុខងារផ្ញើអ៊ីមែលដ៏ធំ។
 MailSendSetupIs3=ប្រសិនបើអ្នកមានសំណួរអំពីរបៀបដំឡើងម៉ាស៊ីនមេ SMTP របស់អ្នក អ្នកអាចសួរទៅកាន់ %s។
@@ -183,7 +185,7 @@ Information=ព័ត៌មាន
 ContactsWithThirdpartyFilter=ទំនាក់ទំនងជាមួយតម្រងភាគីទីបី
 Unanswered=គ្មានចម្លើយ
 Answered=ឆ្លើយ
-IsNotAnAnswer=មិនមានចម្លើយ (អ៊ីមែលដំបូង)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=គឺជាចម្លើយនៃអ៊ីមែលដំបូង
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=តម្លៃលំនាំដើមសម្រាប់វាល '%s' នៅពេលបង្កើតទំនាក់ទំនងថ្មី
@@ -199,6 +201,6 @@ ModelTemplate=គំរូអ៊ីមែល
 YouCanChooseAModelForYouMailContent= អ្នកអាចជ្រើសរើសគំរូគំរូមួយ ឬបង្កើតមួយជាមួយ AI
 TitleOfMailHolder=ចំណងជើងនៃអ៊ីមែលទៅទីនេះ
 ContentOfMailHolder=ខ្លឹមសារនៃអ៊ីមែលមកទីនេះ...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index b98eb37a881..ac001bd94b2 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -37,6 +37,7 @@ Translation=ការបកប្រែ
 Translations=ការបកប្រែ
 CurrentTimeZone=TimeZone PHP (ម៉ាស៊ីនមេ)
 EmptySearchString=បញ្ចូលលក្ខណៈវិនិច្ឆ័យស្វែងរកមិនទទេ
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=បញ្ចូលលក្ខខណ្ឌកាលបរិច្ឆេទ
 NoRecordFound=រកមិនឃើញកំណត់ត្រាទេ។
 NoRecordDeleted=គ្មានកំណត់ត្រាត្រូវបានលុបទេ។
@@ -45,6 +46,7 @@ NoError=គ្មាន​កំហុស
 Error=កំហុស
 Errors=កំហុស
 ErrorFieldRequired=វាល '%s' ត្រូវបានទាមទារ
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=វាល '%s' មានតម្លៃមិនល្អ
 ErrorFileDoesNotExists=ឯកសារ %s មិនមានទេ
 ErrorFailedToOpenFile=បរាជ័យក្នុងការបើកឯកសារ %s
@@ -308,6 +310,7 @@ DateBuild=រាយការណ៍កាលបរិច្ឆេទសាងស
 DatePayment=កាលបរិច្ឆេទនៃការទូទាត់
 DateApprove=កាលបរិច្ឆេទអនុម័ត
 DateApprove2=កាលបរិច្ឆេទអនុម័ត (ការអនុម័តលើកទីពីរ)
+PendingSince=Pending since
 RegistrationDate=កាលបរិច្ឆេទ​ចុះបញ្ជី
 UserCreation=អ្នកប្រើប្រាស់បង្កើត
 UserModification=អ្នកប្រើប្រាស់កែប្រែ
@@ -495,7 +498,7 @@ ActionRunningNotStarted=ចាប់ផ្ដើម
 ActionRunningShort=កំពុង​ដំណើរការ
 ActionDoneShort=ចប់
 ActionUncomplete=មិនពេញលេញ
-LatestLinkedEvents=ព្រឹត្តិការណ៍ដែលបានភ្ជាប់ %s ចុងក្រោយបង្អស់
+LatestLinkedEvents=The last %s events
 CompanyFoundation=ក្រុមហ៊ុន/អង្គការ
 Accountant=គណនេយ្យករ
 ContactsForCompany=ទំនាក់ទំនងសម្រាប់ភាគីទីបីនេះ។
@@ -503,6 +506,7 @@ ContactsAddressesForCompany=ទំនាក់ទំនង/អាសយដ្ឋ
 AddressesForCompany=អាសយដ្ឋានសម្រាប់ភាគីទីបីនេះ។
 ActionsOnCompany=ព្រឹត្តិការណ៍សម្រាប់ភាគីទីបីនេះ។
 ActionsOnContact=ព្រឹត្តិការណ៍សម្រាប់ទំនាក់ទំនង/អាសយដ្ឋាននេះ។
+ActionsOnUser=Events for this user
 ActionsOnContract=ព្រឹត្តិការណ៍សម្រាប់កិច្ចសន្យានេះ។
 ActionsOnMember=ព្រឹត្តិការណ៍អំពីសមាជិកនេះ។
 ActionsOnProduct=ព្រឹត្តិការណ៍អំពីផលិតផលនេះ។
@@ -720,6 +724,8 @@ TextUsedInTheMessageBody=តួអ៊ីមែល
 SendAcknowledgementByMail=ផ្ញើអ៊ីមែលបញ្ជាក់
 SendMail=ផ្ញើអ៊ីមែល
 Email=អ៊ីមែល
+EMail=Email
+EMails=Emails
 NoEMail=គ្មានអ៊ីមែលទេ។
 AlreadyRead=អានរួចហើយ
 NotRead=មិនទាន់អាន
@@ -792,7 +798,7 @@ Notes=កំណត់ចំណាំ
 AddNewLine=បន្ថែមបន្ទាត់ថ្មី។
 AddFile=បន្ថែមឯកសារ
 FreeZone=ផលិតផលអត្ថបទឥតគិតថ្លៃ
-FreeLineOfType=ធាតុអត្ថបទឥតគិតថ្លៃ វាយ៖
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=ក្លូនវត្ថុជាមួយនឹងគុណលក្ខណៈចម្បងរបស់វា។
 ReGeneratePDF=បង្កើត PDF ឡើងវិញ
 PDFMerge=PDF បញ្ចូលគ្នា
@@ -878,12 +884,14 @@ toward=ឆ្ពោះទៅរក
 Access=ការចូលប្រើ
 SelectAction=ជ្រើសរើសសកម្មភាព
 SelectTargetUser=ជ្រើសរើសអ្នកប្រើប្រាស់ / បុគ្គលិកគោលដៅ
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=ប្រើ Ctrl+C ដើម្បីចម្លងទៅក្ដារតម្បៀតខ្ទាស់
 SaveUploadedFileWithMask=រក្សាទុកឯកសារនៅលើម៉ាស៊ីនមេដែលមានឈ្មោះ "<strong>%s</strong>" (បើមិនដូច្នេះទេ " %s")
 OriginFileName=ឈ្មោះឯកសារដើម
 SetDemandReason=កំណត់ប្រភព
 SetBankAccount=កំណត់គណនីធនាគារ
 AccountCurrency=រូបិយប័ណ្ណគណនី
+AccountancyCode=Accounting Code
 ViewPrivateNote=មើលកំណត់ចំណាំ
 XMoreLines=%s បន្ទាត់(s) ត្រូវបានលាក់
 ShowMoreLines=បង្ហាញបន្ទាត់ច្រើន/តិច
@@ -924,6 +932,7 @@ ConfirmMassDeletionQuestion=តើអ្នកប្រាកដថាចង់
 ConfirmMassClone=ការ​បញ្ជាក់​ក្លូន​ជា​ច្រើន​
 ConfirmMassCloneQuestion=ជ្រើសរើសគម្រោងដើម្បីក្លូន
 ConfirmMassCloneToOneProject=ក្លូន​ទៅ​គម្រោង %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=វត្ថុដែលពាក់ព័ន្ធ
 ClassifyBilled=ចាត់ថ្នាក់វិក័យប័ត្រ
 ClassifyUnbilled=ចាត់ថ្នាក់មិនទាន់ចេញវិក្កយបត្រ
@@ -960,10 +969,11 @@ PrivateDownloadLinkDesc=អ្នកត្រូវចូល ហើយអ្ន
 Download=ទាញយក
 DownloadDocument=ទាញយកឯកសារ
 DownloadSignedDocument=ទាញយកឯកសារដែលបានចុះហត្ថលេខា
-ActualizeCurrency=ធ្វើបច្ចុប្បន្នភាពអត្រារូបិយប័ណ្ណ
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=ឆ្នាំសារពើពន្ធ
 ModuleBuilder=ម៉ូឌុល និងកម្មវិធីបង្កើតកម្មវិធី
 SetMultiCurrencyCode=កំណត់រូបិយប័ណ្ណ
+SetMultiCurrencyRate=Set currency rate
 BulkActions=សកម្មភាពច្រើន
 ClickToShowHelp=ចុចដើម្បីបង្ហាញជំនួយជំនួយ
 WebSite=គេហទំព័រ
@@ -1103,6 +1113,7 @@ PayedBy=បង់ដោយ
 PayedTo=បង់ទៅ
 Monthly=ប្រចាំខែ
 Quarterly=ប្រចាំត្រីមាស
+Quarter=Quarter
 Annual=ប្រចាំឆ្នាំ
 Local=ក្នុងស្រុក
 Remote=ពីចម្ងាយ
@@ -1145,6 +1156,7 @@ ContactDefault_project_task=កិច្ចការ
 ContactDefault_propal=សំណើ
 ContactDefault_supplier_proposal=សំណើអ្នកផ្គត់ផ្គង់
 ContactDefault_ticket=សំបុត្រ
+ContactDefault_societe=Third party
 ContactAddedAutomatically=ទំនាក់ទំនងត្រូវបានបន្ថែមពីតួនាទីទំនាក់ទំនងភាគីទីបី
 More=ច្រើនទៀត
 ShowDetails=បង្ហាញព័ត៌មានលម្អិត
@@ -1187,6 +1199,8 @@ SetSupervisor=កំណត់អ្នកគ្រប់គ្រង
 CreateExternalUser=បង្កើតអ្នកប្រើប្រាស់ខាងក្រៅ
 ConfirmAffectTag=ការចាត់តាំងស្លាកភាគច្រើន
 ConfirmAffectUser=ការចាត់តាំងអ្នកប្រើប្រាស់ច្រើន
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=តួនាទីដែលបានកំណត់លើគម្រោង/ឱកាសនីមួយៗ
 TasksRole=តួនាទីដែលបានកំណត់លើកិច្ចការនីមួយៗ (ប្រសិនបើប្រើ)
 ConfirmSetSupervisor=សំណុំ Supervisor
@@ -1238,6 +1252,9 @@ CommercialsAffected=តំណាងផ្នែកលក់ត្រូវបា
 CommercialAffected=តំណាងផ្នែកលក់ត្រូវបានចាត់តាំង
 CommercialsDisaffected=តំណាងផ្នែកលក់បានផ្ដាច់
 CommercialDisaffected=តំណាងផ្នែកលក់បានផ្ដាច់
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=សារ​របស់​អ្នក
 YourMessageHasBeenReceived=សាររបស់អ្នកត្រូវបានទទួល។ យើងនឹងឆ្លើយ ឬទាក់ទងអ្នកឱ្យបានឆាប់តាមដែលអាចធ្វើទៅបាន។
 UrlToCheck=Url ដើម្បីពិនិត្យ
@@ -1280,6 +1297,7 @@ AmountSalary=ចំនួនប្រាក់ខែ
 InvoiceSubtype=ប្រភេទរងនៃវិក្កយបត្រ
 ConfirmMassReverse=ការបញ្ជាក់បញ្ច្រាសភាគច្រើន
 ConfirmMassReverseQuestion=តើអ្នកប្រាកដថាចង់បញ្ច្រាស %s ដែលបានជ្រើសរើស?
+ConfirmActionXxx=Confirm action %s
 ElementType=ប្រភេទធាតុ
 ElementId=លេខសម្គាល់ធាតុ
 Encrypted=បានអ៊ិនគ្រីប
@@ -1299,3 +1317,35 @@ AllEntities=អង្គភាពទាំងអស់។
 TranslationOfKey=ការបកប្រែគន្លឹះ AnyTranslationKey
 SignedStatus=ស្ថានភាពដែលបានចុះហត្ថលេខា
 NbRecordQualified=ចំនួនកំណត់ត្រាដែលមានលក្ខណៈសម្បត្តិគ្រប់គ្រាន់
+auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/km_KH/members.lang b/htdocs/langs/km_KH/members.lang
index 65418521d2c..7a44903c1a2 100644
--- a/htdocs/langs/km_KH/members.lang
+++ b/htdocs/langs/km_KH/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=ប្រសិនបើការជាវត្រូ
 DeleteType=លុប
 VoteAllowed=អនុញ្ញាតឱ្យបោះឆ្នោត
 Physical=បុគ្គល
-Moral=សាជីវកម្ម
-MorAndPhy=សាជីវកម្ម និងបុគ្គល
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=បើកដំណើរការឡើងវិញ
 ExcludeMember=មិនរាប់បញ្ចូលសមាជិក
 Exclude=មិនរាប់បញ្ចូល
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=ស្ថិតិសមាជិកតាមតំប
 NbOfMembers=ចំនួនសមាជិកសរុប
 NbOfActiveMembers=ចំនួនសរុបនៃសមាជិកសកម្មបច្ចុប្បន្ន
 NoValidatedMemberYet=រកមិនឃើញសមាជិកដែលមានសុពលភាពទេ។
-MembersByCountryDesc=អេក្រង់នេះបង្ហាញអ្នកពីស្ថិតិនៃសមាជិកតាមប្រទេស។ ក្រាហ្វ និងគំនូសតាងអាស្រ័យលើភាពអាចរកបាននៃសេវាកម្មក្រាហ្វអ៊ីនធឺណិតរបស់ Google ក៏ដូចជាភាពអាចរកបាននៃការតភ្ជាប់អ៊ីនធឺណិតដែលកំពុងដំណើរការ។
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=អេក្រង់នេះបង្ហាញអ្នកនូវស្ថិតិសមាជិកតាមរដ្ឋ/ខេត្ត/ខេត្ត។
 MembersByTownDesc=អេក្រង់នេះបង្ហាញអ្នកនូវស្ថិតិសមាជិកតាមទីក្រុង។
 MembersByNature=អេក្រង់នេះបង្ហាញអ្នកនូវស្ថិតិនៃសមាជិកដោយធម្មជាតិ។
diff --git a/htdocs/langs/km_KH/salaries.lang b/htdocs/langs/km_KH/salaries.lang
index c6930de1137..e3e9ec67b50 100644
--- a/htdocs/langs/km_KH/salaries.lang
+++ b/htdocs/langs/km_KH/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=ប្រាក់ខែថ្មី។
 AddSalary=បន្ថែមប្រាក់ខែ
 NewSalaryPayment=កាតប្រាក់ខែថ្មី។
 AddSalaryPayment=បន្ថែមប្រាក់ខែ
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=ការទូទាត់ប្រាក់ខែ
 SalariesPayments=ការទូទាត់ប្រាក់ខែ
 SalariesPaymentsOf=ការទូទាត់ប្រាក់ខែរបស់ %s
@@ -27,7 +29,7 @@ FillFieldFirst=បំពេញកន្លែងបុគ្គលិកជា
 UpdateAmountWithLastSalary=កំណត់ចំនួនប្រាក់ខែចុងក្រោយ
 MakeTransferRequest=ធ្វើសំណើផ្ទេរ
 VirementOrder=សំណើផ្ទេរឥណទាន
-BankTransferAmount=ចំនួនទឹកប្រាក់នៃការផ្ទេរឥណទាន
 WithdrawalReceipt=ការបញ្ជាទិញផ្ទេរឥណទាន
 OrderWaiting=កំពុងរង់ចាំការបញ្ជាទិញ
 FillEndOfMonth=បំពេញចុងខែ
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/km_KH/website.lang b/htdocs/langs/km_KH/website.lang
index 26fadc48767..eac0a687a37 100644
--- a/htdocs/langs/km_KH/website.lang
+++ b/htdocs/langs/km_KH/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=ប្រើបញ្ជីឈ្មោះ/ឈ្មោះ
 WEBSITE_CSS_URL=URL នៃឯកសារ CSS ខាងក្រៅ
 WEBSITE_CSS_INLINE=មាតិកាឯកសារ CSS (ទូទៅចំពោះទំព័រទាំងអស់)
 WEBSITE_JS_INLINE=មាតិកាឯកសារ JavaScript (ទូទៅសម្រាប់ទំព័រទាំងអស់)
-WEBSITE_HTML_HEADER=ការបន្ថែមនៅផ្នែកខាងក្រោមនៃបឋមកថា HTML (ទូទៅចំពោះទំព័រទាំងអស់)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=ឯកសារមនុស្សយន្ត (robots.txt)
 WEBSITE_HTACCESS=គេហទំព័រ .htaccess ឯកសារ
 WEBSITE_MANIFEST_JSON=ឯកសារ manifest.json គេហទំព័រ
@@ -56,16 +56,17 @@ ReadPerm=អាន
 WritePerm=សរសេរ
 TestDeployOnWeb=សាកល្បង/ដាក់ឱ្យប្រើប្រាស់លើបណ្តាញ
 PreviewSiteServedByWebServer=<u>មើលជាមុន %s នៅក្នុងផ្ទាំងថ្មី។</u><br><br> %s នឹងត្រូវបានបម្រើដោយម៉ាស៊ីនមេគេហទំព័រខាងក្រៅ (ដូចជា Apache, Nginx, IIS ) អ្នកត្រូវតែដំឡើង និងដំឡើងម៉ាស៊ីនមេនេះមុននឹងចង្អុលទៅថត៖<br><strong>%s</strong><br>URL បម្រើដោយម៉ាស៊ីនមេខាងក្រៅ៖<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL របស់ម៉ាស៊ីននិម្មិតដែលបម្រើដោយម៉ាស៊ីនមេគេហទំព័រខាងក្រៅមិនត្រូវបានកំណត់ទេ។
 NoPageYet=មិនមានទំព័រនៅឡើយទេ
 YouCanCreatePageOrImportTemplate=អ្នកអាចបង្កើតទំព័រថ្មី ឬនាំចូលគំរូគេហទំព័រពេញលេញ
 SyntaxHelp=ជួយលើគន្លឹះវាក្យសម្ព័ន្ធជាក់លាក់
 YouCanEditHtmlSourceckeditor=អ្នកអាចកែសម្រួលកូដប្រភព HTML ដោយប្រើប៊ូតុង "ប្រភព" នៅក្នុងកម្មវិធីនិពន្ធ។
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> ដើម្បីរួមបញ្ចូល  <strong>image</strong> រក្សាទុកក្នុង <strong>documents<span director class='noaspand'> ប្រើ<strong>viewimage.php</strong> wrapper។<br> រូបភាពចូលទៅក្នុងឯកសារ/ប្រព័ន្ធផ្សព្វផ្សាយ (ថតបើកសម្រាប់ការចូលប្រើជាសាធារណៈ) វាក្យសម្ព័ន្ធគឺ៖<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"7b00128 </strong><br>
-YouCanEditHtmlSource2=សម្រាប់រូបភាពដែលបានចែករំលែកជាមួយតំណចែករំលែក (បើកការចូលប្រើដោយប្រើសោការចែករំលែកនៃឯកសារ) វាក្យសម្ព័ន្ធគឺ៖<br><strong>&lt;img src="/viewimage.php?hashp=12345679012... </span><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=ទំព័រក្លូន/កុងតឺន័រ
 CloneSite=គេហទំព័រក្លូន
@@ -87,15 +88,15 @@ WebsiteAccount=គណនីគេហទំព័រ
 WebsiteAccounts=គណនីគេហទំព័រ
 AddWebsiteAccount=បង្កើតគណនីគេហទំព័រ
 BackToListForThirdParty=ត្រលប់ទៅបញ្ជីសម្រាប់ភាគីទីបី
-DisableSiteFirst=បិទគេហទំព័រជាមុនសិន
+DisableSiteFirst=Put website offline first
 MyContainerTitle=ចំណងជើងគេហទំព័ររបស់ខ្ញុំ
 AnotherContainer=នេះជារបៀបបញ្ចូលមាតិកានៃទំព័រ/កុងតឺន័រផ្សេងទៀត (អ្នកអាចមានកំហុសនៅទីនេះ ប្រសិនបើអ្នកបើកកូដថាមវន្ត ព្រោះកុងតឺន័រដែលបានបង្កប់ប្រហែលជាមិនមានទេ)
 SorryWebsiteIsCurrentlyOffLine=សូមអភ័យទោស គេហទំព័រនេះបច្ចុប្បន្នមិនមានអ៊ីនធឺណិតទេ។ សូមត្រលប់មកវិញពេលក្រោយ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=បើកដំណើរការតារាងគណនីគេហទំព័រ
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=បើកតារាងដើម្បីរក្សាទុកគណនីគេហទំព័រ (ចូល/ឆ្លងកាត់) សម្រាប់គេហទំព័រ/ភាគីទីបីនីមួយៗ
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=ដំបូងអ្នកត្រូវតែកំណត់ទំព័រដើមលំនាំដើម
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correctty when used on a grabbed external page.
-OnlyEditionOfSourceForGrabbedContent=មានតែការបោះពុម្ពប្រភព HTML ប៉ុណ្ណោះដែលអាចធ្វើទៅបាននៅពេលដែលមាតិកាត្រូវបានចាប់យកពីគេហទំព័រខាងក្រៅ
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Grab ក៏រកឃើញរូបភាពនៅក្នុង css និងទំព័រផងដែរ។
 ImagesShouldBeSavedInto=រូបភាពគួរតែត្រូវបានរក្សាទុកក្នុងថត
 WebsiteRootOfImages=ថតឫសសម្រាប់រូបភាពគេហទំព័រ
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=ចេញពីគណនីអតិថិជន
 filteredByVersion=ត្រងតាមកំណែ
 removeFilter=យកតម្រងចេញ
 viewMyCart=មើលរទេះទិញទំនិញរបស់ខ្ញុំ
+Shipping=Shipping
 freeShipping=ដឹកជញ្ជូនឥតគិតថ្លៃ!
 noProducts=គ្មានផលិតផល
 nbrItemsInCart=មាន <span class="ajax_cart_quantity">0</span> នៅក្នុងរទេះរបស់អ្នក។
@@ -284,12 +286,13 @@ productNameAToZ=ឈ្មោះផលិតផល៖ A ដល់ Z
 productNameZToA=ឈ្មោះផលិតផល៖ Z ដល់ A
 referenceLowestFirst=ឯកសារយោង៖ ទាបបំផុតដំបូង
 referenceHighestFirst=ឯកសារយោង៖ ខ្ពស់បំផុតទីមួយ
+productPerPage=products per page
 perPage=ក្នុងមួយទំព័រ
 showAll=បង្ហាញ​ទាំងអស់
 showing= បង្ហាញ
 nbrOfProducts= មានផលិតផល %s។
 noResultsHaveBeenFound=រកឃើញលទ្ធផល 0 ។
-noResultsWereFound= រកមិនឃើញលទ្ធផលទេ។
+noResultsWereFound=រកមិនឃើញលទ្ធផលទេ។
 addToCart=បញ្ចូលទៅក្នុងរទេះ
 backHome=ត្រឡប់ទៅផ្ទះវិញ។
 priceDrop=ការធ្លាក់ចុះតម្លៃ
@@ -302,10 +305,11 @@ lastUpdate=បច្ចុប្បន្នភាពចុងក្រោយ
 contactSupport=របៀបទាក់ទងជំនួយ
 noProductToDisplay=កំហុស គ្មានផលិតផលដែលត្រូវបង្ហាញ
 yourCompanyInformation=ព័ត៌មានក្រុមហ៊ុនរបស់អ្នក។
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=អ៊ីមែលនេះត្រូវបានចុះឈ្មោះរួចហើយ។
 firstnameContainsLettersOnly=<b>នាមត្រកូល</b> ត្រូវតែមានអក្សរ និងដកឃ្លាតែប៉ុណ្ណោះ
 lastnameContainsLettersOnly=<b>នាមត្រកូល</b> ត្រូវតែមានអក្សរ និងដកឃ្លាតែប៉ុណ្ណោះ
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=កំហុសមួយបានកើតឡើង។
 accountCreation=បង្កើត​គណនី
 errorsOccurred=មាន %s error%s
@@ -357,3 +361,7 @@ subtract=ដក
 LoginCheckout=ចូល & បន្តដើម្បីបង់ប្រាក់ចេញ
 paymentSuccessProcessed=ការទូទាត់របស់អ្នកត្រូវបានដំណើរការដោយជោគជ័យ។
 youWillBeRedirectedToOrderPage=អ្នកនឹងត្រូវបានបញ្ជូនបន្តទៅកាន់ទំព័រព័ត៌មានលម្អិតនៃការបញ្ជាទិញក្នុងពេលឆាប់ៗនេះ។
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index 0249c62ece2..ae9191bad20 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Country is inside the European Economic Community
 PriceFormatInCurrentLanguage=Price display format in the current language and currency
 ThirdPartyName=Third-party name
 ThirdPartyEmail=Third-party email
-ThirdParty=Third-party
-ThirdParties=Third-parties
+ThirdParty=ಮೂರನೇ ಪಾರ್ಟಿ
+ThirdParties=ಮೂರನೇ ಪಕ್ಷಗಳು
 ThirdPartyProspects=ನಿರೀಕ್ಷಿತರು
 ThirdPartyProspectsStats=ನಿರೀಕ್ಷಿತರು
 ThirdPartyCustomers=ಗ್ರಾಹಕರು
@@ -65,6 +65,7 @@ State=ರಾಜ್ಯ / ಪ್ರಾಂತ್ಯ
 StateId=State ID
 StateCode=State/Province code
 StateShort=State
+DepartmentBuyer=Buyer's state/province
 Region=ಪ್ರದೇಶ
 Region-State=Region - State
 Country=ದೇಶ
@@ -78,7 +79,7 @@ Chat=ಚಾಟ್
 PhonePro=Bus. phone
 PhonePerso=ವೈಯಿಕ್ತಿಕ ದೂರವಾಣಿ
 PhoneMobile=ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
-No_Email=Refuse bulk emailings
+No_Email=Refuse mass emails
 Fax=ಫ್ಯಾಕ್ಸ್
 Zip=ಪಿನ್ ಕೋಡ್
 Town=ನಗರ
@@ -382,11 +383,12 @@ ExportCardToFormat=ಕಾರ್ಡನ್ನು ಸ್ವರೂಪಕ್ಕೆ 
 ContactNotLinkedToCompany=ಸಂಪರ್ಕವು ಯಾವುದೇ ಮೂರನೇ ಪಾರ್ಟಿಗೆ ಕೂಡಿಸಲ್ಪಟ್ಟಿಲ್ಲ.
 DolibarrLogin=ಲಾಗಿನ್ ಆಗಿ
 NoDolibarrAccess=ಪ್ರವೇಶವಿಲ್ಲ
-ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
-ExportDataset_company_2=Contacts and their properties
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Third-parties and their properties
 ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
-ImportDataset_company_3=Third-parties Bank accounts
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
 PriceLevel=Price Level
 PriceLevelLabels=Price Level Labels
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=ಮ್ಯಾನೇಜರ್ (ಗಳು) ಹೆಸರು (ಸಿಇಒ, ನಿರ್ದೇಶಕ, ಅಧ್ಯಕ್ಷ ...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
@@ -460,3 +462,6 @@ ExternalSystemID=External system ID
 IDOfPaymentInAnExternalSystem=ID of the payment mode into an external system (like Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE Webservice Credentials
 ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index cb29adfbf0c..920ae087f59 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -37,6 +37,7 @@ Translation=Translation
 Translations=Translations
 CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criteria
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
@@ -45,6 +46,7 @@ NoError=No error
 Error=Error
 Errors=Errors
 ErrorFieldRequired=Field '%s' is required
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Field '%s' has a bad value
 ErrorFileDoesNotExists=File %s does not exist
 ErrorFailedToOpenFile=Failed to open file %s
@@ -287,6 +289,7 @@ DateStart=Start date
 DateEnd=End date
 DateCreation=Creation date
 DateCreationShort=Creat. date
+DateReading=Reading date
 IPCreation=Creation IP
 DateModification=Modification date
 DateModificationShort=Modif. date
@@ -307,6 +310,7 @@ DateBuild=Report build date
 DatePayment=Date of payment
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+PendingSince=Pending since
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
@@ -351,6 +355,9 @@ DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 SecondShort=sec
+DayShort=d
+MonthShort=m
+YearShort=y
 Rate=Rate
 CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
@@ -383,6 +390,7 @@ PriceUHT=U.P. (net)
 PriceUHTCurrency=U.P (net) (currency)
 PriceUTTC=U.P. (inc. tax)
 Amount=Amount
+Amounts=Amounts
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
 AmountInvoicedHT=Amount invoiced (excl. tax)
@@ -393,6 +401,8 @@ AmountTTCShort=Amount (inc. tax)
 AmountHT=Amount (excl. tax)
 AmountTTC=Amount (inc. tax)
 AmountVAT=Amount tax
+DiscountHT=Discount (excl. tax)
+DiscountTTC=Discount (incl. tax)
 MulticurrencyAlreadyPaid=Already paid, original currency
 MulticurrencyRemainderToPay=Remain to pay, original currency
 MulticurrencyPaymentAmount=Payment amount, original currency
@@ -416,6 +426,7 @@ SubTotal=Subtotal
 TotalHTShort=Total (excl.)
 TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
+TotalHTWithDiscount=Total (excl.) with discount
 TotalTTCShort=Total (inc. tax)
 TotalHT=Total (excl. tax)
 TotalHTforthispage=Total (excl. tax) for this page
@@ -456,6 +467,7 @@ VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
+StandardDeviationPop=Standard deviation
 Delta=Delta
 StatusToPay=To pay
 RemainToPay=Remain to pay
@@ -486,7 +498,7 @@ ActionRunningNotStarted=To start
 ActionRunningShort=In progress
 ActionDoneShort=Finished
 ActionUncomplete=Incomplete
-LatestLinkedEvents=Latest %s linked events
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Company/Organization
 Accountant=Accountant
 ContactsForCompany=Contacts for this third party
@@ -494,6 +506,7 @@ ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnUser=Events for this user
 ActionsOnContract=Events for this contract
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
@@ -533,6 +546,7 @@ ToLocation=to
 at=at
 and=and
 or=or
+otherwise=otherwise
 Other=ಇತರ
 Others=Others
 OtherInformations=Other information
@@ -561,6 +575,7 @@ New=New
 Discount=Discount
 Unknown=ತಿಳಿದಿಲ್ಲ
 General=General
+Dimensions=Dimensions
 Size=Size
 OriginalSize=Original size
 RotateImage=Rotate 90°
@@ -703,13 +718,14 @@ CloseWindow=Close window
 Response=Response
 Priority=Priority
 SendByMail=Send by email
-MailSentBy=Email sent by
 MailSentByTo=Email sent by %s to %s
 NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
 Email=Email
+EMail=Email
+EMails=Emails
 NoEMail=No email
 AlreadyRead=Already read
 NotRead=Unread
@@ -782,7 +798,7 @@ Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
 FreeZone=Free-text product
-FreeLineOfType=Free-text item, type:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
 PDFMerge=PDF Merge
@@ -841,6 +857,7 @@ ClickToEdit=Click to edit
 ClickToRefresh=Click to refresh
 EditWithEditor=Edit with CKEditor
 EditWithTextEditor=Edit with Text editor
+EditHTML=Edit HTML
 EditHTMLSource=Edit HTML Source
 ObjectDeleted=Object %s deleted
 ByCountry=By country
@@ -867,12 +884,14 @@ toward=toward
 Access=Access
 SelectAction=Select action
 SelectTargetUser=Select target user/employee
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
 SetDemandReason=Set source
 SetBankAccount=Define Bank Account
 AccountCurrency=Account currency
+AccountancyCode=Accounting Code
 ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 ShowMoreLines=Show more/less lines
@@ -913,6 +932,7 @@ ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected reco
 ConfirmMassClone=Bulk clone confirmation
 ConfirmMassCloneQuestion=Select project to clone to
 ConfirmMassCloneToOneProject=Clone to project %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Related Objects
 ClassifyBilled=Classify Billed
 ClassifyUnbilled=Classify Unbilled
@@ -949,10 +969,11 @@ PrivateDownloadLinkDesc=You need to be logged and you need permissions to view o
 Download=Download
 DownloadDocument=Download document
 DownloadSignedDocument=Download signed document
-ActualizeCurrency=Update currency rate
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Fiscal year
 ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
 WebSite=Website
@@ -1073,6 +1094,7 @@ SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
+SearchIntoSupplierReceptions=Vendor receptions
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoKM=Knowledge base
@@ -1091,6 +1113,7 @@ PayedBy=Paid by
 PayedTo=Paid to
 Monthly=Monthly
 Quarterly=Quarterly
+Quarter=Quarter
 Annual=Annual
 Local=Local
 Remote=Remote
@@ -1133,6 +1156,7 @@ ContactDefault_project_task=Task
 ContactDefault_propal=Proposal
 ContactDefault_supplier_proposal=Supplier Proposal
 ContactDefault_ticket=Ticket
+ContactDefault_societe=ಮೂರನೇ ಪಾರ್ಟಿ
 ContactAddedAutomatically=Contact added from third-party contact roles
 More=More
 ShowDetails=Show details
@@ -1168,13 +1192,15 @@ OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
 OnHold=On hold
-Civility=Civility
+Civility=Title of courtesy
 AffectTag=Assign a Tag
 AffectUser=Assign a User
 SetSupervisor=Set the supervisor
 CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Assignment
 ConfirmAffectUser=Bulk User Assignment
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=Role assigned on each project/opportunity
 TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
@@ -1219,9 +1245,16 @@ Terminated=Terminated
 Position=ಸ್ಥಾನ
 AddLineOnPosition=Add line on position (at the end if empty)
 ConfirmAllocateCommercial=Assign sales representative confirmation
+ConfirmUnallocateCommercial=Are you sure you want to unassign the sales representative(s) from all selected thirdparties?
 ConfirmAllocateCommercialQuestion=Are you sure you want to assign the %s selected record(s)?
+ConfirmUnallocateCommercialQuestion=Are you sure you want to unassign the selected %s record(s)?
 CommercialsAffected=Sales representatives assigned
 CommercialAffected=Sales representative assigned
+CommercialsDisaffected=Sales representatives unlinked
+CommercialDisaffected=Sales representative unlinked
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=Your message
 YourMessageHasBeenReceived=Your message has been received. We will answer or contact you as soon as possible.
 UrlToCheck=Url to check
@@ -1264,7 +1297,55 @@ AmountSalary=Salary amount
 InvoiceSubtype=Invoice subtype
 ConfirmMassReverse=Bulk Reverse confirmation
 ConfirmMassReverseQuestion=Are you sure you want to reverse the %s selected record(s)?
+ConfirmActionXxx=Confirm action %s
 ElementType=Element type
 ElementId=Element Id
 Encrypted=Encrypted
 Settings=Settings
+FillMessageWithALayout=Fill message with a layout
+FillMessageWithAIContent=Fill message with AI content
+FillPageWithALayout=Fill page with a layout
+FillPageWithAIContent=Fill page with AI content
+EnterYourAIPromptHere=Enter your AI prompt here
+UseOrOperatorShort=or
+GoOnList=Go on list
+ShowSearchFields=Do a search
+MyUserCard=My user file
+PublicFile=Public file
+EntityNameNotDefined=No entity name
+AllEntities=All entities
+TranslationOfKey=Translation of the key AnyTranslationKey
+SignedStatus=Signed status
+NbRecordQualified=Number of qualified records
+auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index 18cf150f0f5..db75192d614 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Country is inside the European Economic Community
 PriceFormatInCurrentLanguage=Price display format in the current language and currency
 ThirdPartyName=Third-party name
 ThirdPartyEmail=Third-party email
-ThirdParty=Third-party
-ThirdParties=Third-parties
+ThirdParty=제 3 자
+ThirdParties=협력업체
 ThirdPartyProspects=잠재고객
 ThirdPartyProspectsStats=잠재고객
 ThirdPartyCustomers=고객
@@ -65,6 +65,7 @@ State=시 /도
 StateId=State ID
 StateCode=State/Province code
 StateShort=상태
+DepartmentBuyer=Buyer's state/province
 Region=지방
 Region-State=Region - State
 Country=국가
@@ -78,7 +79,7 @@ Chat=채팅
 PhonePro=Bus. phone
 PhonePerso=개인 전화
 PhoneMobile=모바일
-No_Email=Refuse bulk emailings
+No_Email=Refuse mass emails
 Fax=팩스
 Zip=우편 번호
 Town=시
@@ -382,11 +383,12 @@ ExportCardToFormat=포맷으로 카드 내보내기
 ContactNotLinkedToCompany=협력업체와 연결되지 않은 연락처
 DolibarrLogin=Dolibarr 로그인
 NoDolibarrAccess=Dolibarr 접속 불가
-ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
-ExportDataset_company_2=Contacts and their properties
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Third-parties and their properties
 ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
-ImportDataset_company_3=Third-parties Bank accounts
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
 PriceLevel=Price Level
 PriceLevelLabels=Price Level Labels
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=관리자 이름 (CEO, 이사, 사장 ...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=협력업체 병합
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=영업 담당자 로그인
 SaleRepresentativeFirstname=영업 담당자의 이름
@@ -460,3 +462,6 @@ ExternalSystemID=External system ID
 IDOfPaymentInAnExternalSystem=ID of the payment mode into an external system (like Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE Webservice Credentials
 ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index 7ab8c6a55f1..2e20bbc087e 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -37,6 +37,7 @@ Translation=Translation
 Translations=Translations
 CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criteria
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Enter a date criteria
 NoRecordFound=레코드를 찾을 수 없습니다
 NoRecordDeleted=레코드가 삭제되지 않았습니다.
@@ -45,6 +46,7 @@ NoError=오류 없음
 Error=오류
 Errors=오류
 ErrorFieldRequired='%s' 필드가 필요합니다
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat='%s' 필드에 잘못된 값이 있습니다
 ErrorFileDoesNotExists=%s 파일이 없습니다
 ErrorFailedToOpenFile=%s 파일을 열 수 없습니다
@@ -308,6 +310,7 @@ DateBuild=보고서 작성날짜
 DatePayment=지불날짜
 DateApprove=승인 날짜
 DateApprove2=승인 날짜 (두 번째 승인)
+PendingSince=Pending since
 RegistrationDate=Registration date
 UserCreation=생성 사용자
 UserModification=수정 사용자
@@ -495,7 +498,7 @@ ActionRunningNotStarted=착수 함
 ActionRunningShort=진행 중
 ActionDoneShort=끝 마침
 ActionUncomplete=Incomplete
-LatestLinkedEvents=Latest %s linked events
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Company/Organization
 Accountant=Accountant
 ContactsForCompany=이 협력업체의 연락처
@@ -503,6 +506,7 @@ ContactsAddressesForCompany=이 협력업체의 연락처 / 주소
 AddressesForCompany=이 협력업체의 주소
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnUser=Events for this user
 ActionsOnContract=Events for this contract
 ActionsOnMember=이 멤버에 대한 이벤트
 ActionsOnProduct=Events about this product
@@ -720,6 +724,8 @@ TextUsedInTheMessageBody=이메일 본문
 SendAcknowledgementByMail=확인 이메일 보내기
 SendMail=Send email
 Email=이메일
+EMail=이메일
+EMails=Emails
 NoEMail=이메일 없음
 AlreadyRead=Already read
 NotRead=Unread
@@ -792,7 +798,7 @@ Notes=노트
 AddNewLine=새 줄 추가
 AddFile=파일 추가
 FreeZone=Free-text product
-FreeLineOfType=Free-text item, type:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=주요 속성을 가진 객체 복제
 ReGeneratePDF=Re-generate PDF
 PDFMerge=PDF 병합
@@ -878,12 +884,14 @@ toward=...쪽으로
 Access=처리
 SelectAction=조치 선택
 SelectTargetUser=대상 사용자 / 직원 선택
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Ctrl + C를 사용하여 클립 보드에 복사
 SaveUploadedFileWithMask=이름이 "<strong>%s</strong>" 인 서버에 파일 저장 (다른경우 "%s")
 OriginFileName=원본 파일 이름
 SetDemandReason=소스 설정
 SetBankAccount=은행 계좌 정의
 AccountCurrency=Account currency
+AccountancyCode=Accounting Code
 ViewPrivateNote=노트보기
 XMoreLines=%s 행 숨김
 ShowMoreLines=Show more/less lines
@@ -924,6 +932,7 @@ ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected reco
 ConfirmMassClone=Bulk clone confirmation
 ConfirmMassCloneQuestion=Select project to clone to
 ConfirmMassCloneToOneProject=Clone to project %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=관련 개체
 ClassifyBilled=Classify Billed
 ClassifyUnbilled=Classify Unbilled
@@ -960,10 +969,11 @@ PrivateDownloadLinkDesc=You need to be logged and you need permissions to view o
 Download=다운로드
 DownloadDocument=Download document
 DownloadSignedDocument=Download signed document
-ActualizeCurrency=환율 업데이트
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=회계 연도
 ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=통화 설정
+SetMultiCurrencyRate=Set currency rate
 BulkActions=벌크 작업
 ClickToShowHelp=툴팁 도움말을 보려면 클릭하십시오.
 WebSite=Website
@@ -1103,6 +1113,7 @@ PayedBy=Paid by
 PayedTo=Paid to
 Monthly=Monthly
 Quarterly=Quarterly
+Quarter=Quarter
 Annual=Annual
 Local=Local
 Remote=Remote
@@ -1145,6 +1156,7 @@ ContactDefault_project_task=Task
 ContactDefault_propal=Proposal
 ContactDefault_supplier_proposal=Supplier Proposal
 ContactDefault_ticket=Ticket
+ContactDefault_societe=제 3 자
 ContactAddedAutomatically=Contact added from third-party contact roles
 More=More
 ShowDetails=Show details
@@ -1187,6 +1199,8 @@ SetSupervisor=Set the supervisor
 CreateExternalUser=Create external user
 ConfirmAffectTag=Bulk Tag Assignment
 ConfirmAffectUser=Bulk User Assignment
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=Role assigned on each project/opportunity
 TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
@@ -1238,6 +1252,9 @@ CommercialsAffected=Sales representatives assigned
 CommercialAffected=Sales representative assigned
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=Your message
 YourMessageHasBeenReceived=Your message has been received. We will answer or contact you as soon as possible.
 UrlToCheck=Url to check
@@ -1280,6 +1297,7 @@ AmountSalary=Salary amount
 InvoiceSubtype=Invoice subtype
 ConfirmMassReverse=Bulk Reverse confirmation
 ConfirmMassReverseQuestion=Are you sure you want to reverse the %s selected record(s)?
+ConfirmActionXxx=Confirm action %s
 ElementType=Element type
 ElementId=Element Id
 Encrypted=Encrypted
@@ -1299,3 +1317,35 @@ AllEntities=All entities
 TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
+auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=추가
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 5856fd71bd3..81b48d9168a 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=ການກວດສອບຄວາມສົ
 FileIntegritySomeFilesWereRemovedOrModified=ການກວດສອບຄວາມສົມບູນຂອງໄຟລບໍ່ສໍາເລັດ. ບາງໄຟລ were ຖືກດັດແກ້, ລຶບອອກຫຼືເພີ່ມເຂົ້າໃສ່.
 GlobalChecksum=ການກວດສອບທົ່ວໂລກ
 MakeIntegrityAnalysisFrom=ເຮັດໃຫ້ການວິເຄາະຄວາມສົມບູນຂອງໄຟລ application ຄໍາຮ້ອງສະຫມັກຈາກ
-LocalSignature=signatureັງລາຍເຊັນທ້ອງຖິ່ນ (ເຊື່ອຖືໄດ້ ໜ້ອຍ ລົງ)
-RemoteSignature=ລາຍເຊັນຫ່າງໄກສອກຫຼີກຫ່າງໄກສອກຫຼີກ (ເຊື່ອຖືໄດ້ຫຼາຍກວ່າ)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=ໄຟລຫາຍໄປ
 FilesUpdated=ໄຟລທີ່ອັບເດດແລ້ວ
 FilesModified=ໄຟລດັດແກ້
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=ໃຊ້ໂດຍບາງທາງເລືອກວາ
 Security=ຄວາມປອດໄພ
 Passwords=ລະຫັດຜ່ານ
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=ເຂົ້າລະຫັດລະຫັດຜ່ານຖານຂໍ້ມູນເກັບໄວ້ໃນ conf.php. ມັນຖືກແນະນໍາຢ່າງແຂງແຮງເພື່ອເປີດໃຊ້ຕົວເລືອກນີ້.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=ເພື່ອໃຫ້ມີການໃສ່ລະຫັດລະຫັດເຂົ້າໃນໄຟລ a <b> conf.php </b>, ແທນທີ່ແຖວ <br> <b> $ dolibarr_main_db_pass = "... "; </b> <br> ໂດຍ <br> <b> $ dolibarr_main_db_pass = "ເຂົ້າລະຫັດແລ້ວ: %s"; </b>
 InstrucToClearPass=ເພື່ອໃຫ້ມີການຖອດລະຫັດລະຫັດຜ່ານ (ຈະແຈ້ງ) ໃສ່ໃນໄຟລ a <b> conf.php </b>, ແທນທີ່ແຖວ <br> <b> $ dolibarr_main_db_pass = "crypted: ... "; </b> <br> ໂດຍ <br> <b> $ dolibarr_main_db_pass = "%s"; </b>
 ProtectAndEncryptPdfFiles=ປົກປ້ອງໄຟລ PDF PDF ທີ່ສ້າງຂຶ້ນ. ອັນນີ້ບໍ່ໄດ້ຖືກແນະ ນຳ ເພາະມັນ ທຳ ລາຍການຜະລິດ PDF ເປັນກຸ່ມ.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=ຊ່ອງຂໍ້ມູນທີ່ ຄຳ ນວນແລ້ວ
-ComputedFormulaDesc=ທ່ານສາມາດໃສ່ສູດໄດ້ທີ່ນີ້ໂດຍໃຊ້ຄຸນສົມບັດອື່ນໆຂອງວັດຖຸຫຼືລະຫັດ PHP ໃດໆເພື່ອໃຫ້ໄດ້ຄ່າຄໍານວນແບບເຄື່ອນໄຫວ. ທ່ານສາມາດນໍາໃຊ້ສູດ PHP ທີ່ເຂົ້າກັນໄດ້ລວມທັງ "?" ໂຕປະຕິບັດການເງື່ອນໄຂ, ແລະປະຕິບັດຕາມວັດຖຸທົ່ວໂລກ: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>ຄຳເຕືອນ</strong>: ຖ້າທ່ານຕ້ອງການຄຸນສົມບັດຂອງວັດຖຸ. ບໍ່ໄດ້ໂຫລດ, ພຽງແຕ່ເອົາຕົວທ່ານເອງຂອງວັດຖຸເຂົ້າໄປໃນສູດຂອງທ່ານເຊັ່ນໃນຕົວຢ່າງທີສອງ.<br>ການໃຊ້ຊ່ອງຂໍ້ມູນຄໍານວນຫມາຍຄວາມວ່າທ່ານບໍ່ສາມາດໃສ່ຕົວທ່ານເອງມູນຄ່າໃດໆຈາກການໂຕ້ຕອບ. ນອກຈາກນັ້ນ, ຖ້າມີ syntax ຜິດພາດ, ສູດອາດຈະສົ່ງຄືນບໍ່ມີຫຍັງ.<br><br>ຕົວຢ່າງຂອງສູດ:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>ຕົວຢ່າງການໂຫຼດວັດຖຸຄືນໃໝ່<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id)> 0 ? $reloadedobj->array_options['options_$extrafieldkey'] >capital / 5: '-1')<br><br>ຕົວຢ່າງອື່ນໆຂອງສູດການບັງຄັບການໂຫຼດຂອງວັດຖຸ ແລະວັດຖຸຫຼັກຂອງມັນ: <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = ໂຄງການໃໝ່( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project)> 0)) ? $secondloadedobj->ref: 'ບໍ່ພົບໂຄງການແມ່'
+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'
 Computedpersistent=ບ່ອນເກັບຂໍ້ມູນ ຄຳ ນວນຮ້ານ
 ComputedpersistentDesc=ການຄິດໄລ່ຊ່ອງຂໍ້ມູນພິເສດຈະຖືກເກັບໄວ້ໃນຖານຂໍ້ມູນ, ແນວໃດກໍ່ຕາມ, ຄ່າຈະຖືກຄິດໄລ່ຄືນໃwhen່ເມື່ອວັດຖຸຂອງຊ່ອງຂໍ້ມູນນີ້ຖືກປ່ຽນໄປເທົ່ານັ້ນ. ຖ້າຊ່ອງຂໍ້ມູນທີ່ຖືກຄໍານວນຂື້ນກັບວັດຖຸອື່ນຫຼືຂໍ້ມູນທົ່ວໂລກຄ່ານີ້ອາດຈະຜິດ !!
 ExtrafieldParamHelpPassword=ການປະຊ່ອງນີ້ຫວ່າງໄວ້ໝາຍຄວາມວ່າຄ່ານີ້ຈະຖືກເກັບໄວ້ໂດຍບໍ່ມີການເຂົ້າລະຫັດ (ຊ່ອງຂໍ້ມູນຖືກເຊື່ອງໄວ້ດ້ວຍດາວໃນໜ້າຈໍ).<br><br>Enter ຄ່າ 'dolcrypt' ເພື່ອເຂົ້າລະຫັດຄ່າດ້ວຍລະບົບການເຂົ້າລະຫັດແບບປີ້ນກັບກັນ. ຂໍ້ມູນທີ່ຊັດເຈນຍັງສາມາດຮູ້ຈັກ ແລະແກ້ໄຂໄດ້ແຕ່ຖືກເຂົ້າລະຫັດໄວ້ໃນຖານຂໍ້ມູນ.<br><br>ປ້ອນ 'auto' (ຫຼື 'md5', 'sha256', 'password_hash', ...) ເພື່ອໃຊ້ລະບົບການເຂົ້າລະຫັດລະຫັດຜ່ານເລີ່ມຕົ້ນ (ຫຼື md5, sha256, password_hash...) ເພື່ອບັນທຶກລະຫັດຜ່ານ hashed ທີ່ບໍ່ສາມາດປີ້ນກັບກັນເຂົ້າໄປໃນຖານຂໍ້ມູນ (ບໍ່ມີວິທີທີ່ຈະດຶງເອົາຄ່າຕົ້ນສະບັບ)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- ການໃຊ້ເຊີບເວີ SMTP ຂອງຜູ້ໃຫ້ບໍລິການອີເມລ your ຂອງເຈົ້າເອງເພື່ອສົ່ງອີເມລ is ກໍ່ເປັນສິ່ງທີ່ ໜ້າ ສົນໃຈດັ່ງນັ້ນອີເມລ sent ທັງsentົດທີ່ສົ່ງຈາກແອັບພລິເຄຊັນກໍ່ຈະຖືກບັນທຶກໄວ້ໃນບັນຊີລາຍການ "ສົ່ງແລ້ວ" ຂອງກ່ອງຈົດyourາຍຂອງເຈົ້າ.
 WarningPHPMailD=ດັ່ງນັ້ນ, ມັນໄດ້ຖືກແນະນໍາໃຫ້ປ່ຽນວິທີການສົ່ງອີເມລ໌ກັບຄ່າ "SMTP".
 WarningPHPMailDbis=ຖ້າທ່ານຕ້ອງການຮັກສາວິທີການເລີ່ມຕົ້ນ "PHP" ໃນການສົ່ງອີເມວ, ພຽງແຕ່ບໍ່ສົນໃຈຄໍາເຕືອນນີ້, ຫຼືເອົາມັນອອກໂດຍ %sຄລິກທີ່ນີ້%s.
-WarningPHPMail2=ຖ້າຜູ້ໃຫ້ບໍລິການ SMTP ອີເມລຂອງເຈົ້າຕ້ອງການຈໍາກັດລູກຄ້າອີເມລ to ຫາບາງທີ່ຢູ່ IP (ຫາຍາກຫຼາຍ), ນີ້ແມ່ນທີ່ຢູ່ IP ຂອງຕົວແທນຜູ້ໃຊ້ຈົດ(າຍ (MUA) ສໍາລັບການສະEັກ ERP CRM ຂອງເຈົ້າ: <strong> %s </strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=ການບັນຊີ (ແບບງ່າຍ)
 Module10Desc=ບົດລາຍງານການບັນຊີທີ່ງ່າຍດາຍ (ວາລະສານ, ລາຍຮັບ) ໂດຍອີງໃສ່ເນື້ອໃນຖານຂໍ້ມູນ. ບໍ່ໃຊ້ຕາຕະລາງບັນຊີ.
 Module20Name=ຂໍ້ສະ ເໜີ
 Module20Desc=ການຈັດການການສະ ເໜີ ດ້ານການຄ້າ
-Module22Name=ການສົ່ງອີເມວ ຈຳ ນວນມະຫາສານ
-Module22Desc=ຈັດການການສົ່ງອີເມວເປັນຊຸດ
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=ພະລັງງານ
 Module23Desc=ຕິດຕາມກວດກາການບໍລິໂພກພະລັງງານ
 Module25Name=ຄໍາສັ່ງຂາຍ
@@ -847,10 +848,10 @@ Permission212=ສັ່ງແຖວ
 Permission213=ເປີດ ນຳ ໃຊ້ສາຍ
 Permission214=ຕັ້ງຄ່າໂທລະສັບ
 Permission215=ຕັ້ງຜູ້ໃຫ້ບໍລິການ
-Permission221=ອ່ານອີເມລ
-Permission222=ສ້າງ/ແກ້ໄຂການສົ່ງອີເມວ (ຫົວຂໍ້, ຜູ້ຮັບ ... )
-Permission223=ກວດສອບອີເມວ (ອະນຸຍາດການສົ່ງ)
-Permission229=ລຶບການສົ່ງອີເມວ
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=ເບິ່ງຜູ້ຮັບແລະຂໍ້ມູນ
 Permission238=ສົ່ງຈົດາຍທາງໄປສະນີດ້ວຍຕົນເອງ
 Permission239=ລຶບການໄປສະນີຫຼັງຈາກການກວດສອບຫຼືການສົ່ງ
@@ -1105,6 +1106,7 @@ DictionaryStaff=ຈຳ ນວນພະນັກງານ
 DictionaryAvailability=ການຈັດສົ່ງຊັກຊ້າ
 DictionaryOrderMethods=ວິທີການສັ່ງຊື້
 DictionarySource=ຕົ້ນກໍາເນີດຂອງການສະ ເໜີ/ຄໍາສັ່ງ
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=ກຸ່ມສ່ວນບຸກຄົນສໍາລັບການລາຍງານ
 DictionaryAccountancysystem=ແບບຈໍາລອງສໍາລັບຕາຕະລາງບັນຊີ
 DictionaryAccountancyJournal=ວາລະສານການບັນຊີ
@@ -1134,11 +1136,11 @@ BackToDictionaryList=ກັບໄປຫາລາຍການວັດຈະນ
 TypeOfRevenueStamp=ປະເພດຂອງສະແຕມພາສີ
 VATManagement=ການຄຸ້ມຄອງພາສີການຂາຍ
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=ຕາມຄ່າເລີ່ມຕົ້ນ, ອາກອນການຂາຍທີ່ສະ ເໜີ ແມ່ນ 0 ເຊິ່ງສາມາດໃຊ້ໄດ້ກັບກໍລະນີເຊັ່ນ: ສະມາຄົມ, ບຸກຄົນຫຼືບໍລິສັດຂະ ໜາດ ນ້ອຍ.
 VATIsUsedExampleFR=ໃນປະເທດFranceຣັ່ງ, ມັນmeansາຍເຖິງບໍລິສັດຫຼືອົງການຈັດຕັ້ງທີ່ມີລະບົບການເງິນທີ່ແທ້ຈິງ (ຕົວຈິງຕົວຈິງຫຼືປົກກະຕິຕົວຈິງ). ລະບົບທີ່ປະກາດອາກອນມູນຄ່າເພີ່ມ.
 VATIsNotUsedExampleFR=ໃນປະເທດFranceຣັ່ງ, ມັນmeansາຍເຖິງສະມາຄົມທີ່ບໍ່ໄດ້ປະກາດອາກອນການຂາຍຫຼືບໍລິສັດ, ອົງກອນຫຼືອາຊີບເສລີທີ່ໄດ້ເລືອກລະບົບງົບປະມານຂອງວິສາຫະກິດຂະ ໜາດ ນ້ອຍ (ອາກອນການຂາຍໃນແຟນໄຊ) ແລະໄດ້ຈ່າຍອາກອນຂາຍໄດ້ໂດຍບໍ່ມີການປະກາດເສຍພາສີການຂາຍ. ຕົວເລືອກນີ້ຈະສະແດງການອ້າງອີງ "ອາກອນການຂາຍທີ່ບໍ່ສາມາດນໍາໃຊ້ໄດ້ - ສິນລະປະ -293B ຂອງ CGI" ຢູ່ໃນໃບຮຽກເກັບເງິນ.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=ປະເພດຂອງພາສີການຂາຍ
 LTRate=ອັດຕາ
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=ອີງຕາມການຕັ້ງພາສີ (
 LabelUsedByDefault=ປ້າຍ ກຳ ກັບທີ່ໃຊ້ເປັນຄ່າເລີ່ມຕົ້ນຖ້າບໍ່ພົບການແປ ສຳ ລັບລະຫັດ
 LabelOnDocuments=ຕິດປ້າຍໃສ່ເອກະສານ
 LabelOrTranslationKey=ປ້າຍ ກຳ ກັບຫຼືກະແຈການແປ
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=ສະແດງໝາຍເລກ VAT ຂອງລູກຄ້າ/
 AddAdressInList=ສະແດງທີ່ຢູ່ລູກຄ້າ/ຜູ້ຂາຍເປັນລາຍການແບບລວມກັນ.<br>ພາກສ່ວນທີສາມຈະປາກົດດ້ວຍຮູບແບບຊື່ຂອງ "The Big Company corp. - 21 jump street 123456 Big town - USA" ແທນ " ບໍລິສັດໃຫຍ່."
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=ຖາມຫາວິທີການຂົນສົ່ງທີ່ມັກສໍາລັບພາກສ່ວນທີສາມ.
-FieldEdition=ສະບັບຂອງຊ່ອງຂໍ້ມູນ %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=ຕົວຢ່າງ: +2 (ຕື່ມຂໍ້ມູນໃສ່ໃນກໍລະນີມີບັນຫາການຊົດເຊີຍເຂດເວລາເທົ່ານັ້ນ)
 GetBarCode=ເອົາບາໂຄດ
 NumberingModules=ຕົວເລກຕົວເລກ
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=ບັງຄັບໃຊ້ວັນທີໃບຮຽກເກ
 SuggestedPaymentModesIfNotDefinedInInvoice=ຮູບແບບການຈ່າຍເງິນທີ່ແນະນໍາຢູ່ໃນໃບແຈ້ງ ໜີ້ ຕາມຄ່າເລີ່ມຕົ້ນຖ້າບໍ່ໄດ້ກໍານົດໄວ້ຢູ່ໃນໃບແຈ້ງ ໜີ້
 SuggestPaymentByRIBOnAccount=ແນະນໍາການຊໍາລະໂດຍການຖອນຢູ່ໃນບັນຊີ
 SuggestPaymentByChequeToAddress=ແນະ ນຳ ການຈ່າຍເງິນດ້ວຍເຊັກຫາ
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=ສົ່ງຂໍ້ຄວາມຟຣີຢູ່ໃນໃບແຈ້ງ ໜີ້
 WatermarkOnDraftInvoices=ລາຍນ້ ຳ ຢູ່ໃນໃບຮຽກເກັບເງິນຮ່າງ (ບໍ່ມີຖ້າຫວ່າງເປົ່າ)
 PaymentsNumberingModule=ຮູບແບບຕົວເລກການຈ່າຍເງິນ
@@ -1718,6 +1723,7 @@ CompressionOfResources=ການບີບອັດການຕອບສະ ໜ
 CompressionOfResourcesDesc=ຕົວຢ່າງການໃຊ້ ຄຳ ສັ່ງ Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=ການກວດຫາອັດຕະໂນມັດດັ່ງກ່າວແມ່ນເປັນໄປບໍ່ໄດ້ກັບຕົວທ່ອງເວັບໃນປະຈຸບັນ
 DefaultValuesDesc=ທີ່ນີ້ເຈົ້າອາດຈະ ກຳ ນົດຄ່າເລີ່ມຕົ້ນທີ່ເຈົ້າຕ້ອງການໃຊ້ໃນເວລາສ້າງບັນທຶກໃ,່, ແລະ/ຫຼືຕົວກັ່ນຕອງເລີ່ມຕົ້ນຫຼືການຈັດຮຽງລໍາດັບເມື່ອເຈົ້າເຮັດບັນທຶກລາຍການ.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=ຄ່າເລີ່ມຕົ້ນ (ເພື່ອໃຊ້ໃນແບບຟອມ)
 DefaultSearchFilters=ຕົວກັ່ນຕອງການຊອກຫາເລີ່ມຕົ້ນ
 DefaultSortOrder=ການຈັດຮຽງ ລຳ ດັບເລີ່ມຕົ້ນ
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=ການສົ່ງໂມດູນຕົວເລກ
 SendingsAbility=ສະຫນັບສະຫນູນແຜ່ນການຂົນສົ່ງສໍາລັບການຈັດສົ່ງຂອງລູກຄ້າ
 NoNeedForDeliveryReceipts=ໃນກໍລະນີຫຼາຍທີ່ສຸດ, ແຜ່ນການຂົນສົ່ງໄດ້ຖືກນໍາໃຊ້ທັງເປັນແຜ່ນສໍາລັບການຈັດສົ່ງຂອງລູກຄ້າ (ລາຍການຜະລິດຕະພັນທີ່ຈະສົ່ງ) ແລະແຜ່ນທີ່ໄດ້ຮັບແລະເຊັນໂດຍລູກຄ້າ. ເພາະສະນັ້ນໃບຮັບເງິນການຈັດສົ່ງສິນຄ້າແມ່ນມີລັກສະນະຊໍ້າກັນແລະບໍ່ຄ່ອຍໄດ້ເປີດ ນຳ ໃຊ້.
 FreeLegalTextOnShippings=ຂໍ້ຄວາມຟຣີໃນການຂົນສົ່ງ
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=ຜະລິດຕະພັນການຈັດສົ່ງໂມດູນຕົວເລກ
 DeliveryOrderModel=ຮູບແບບໃບຮັບເງິນການຈັດສົ່ງສິນຄ້າ
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=ຂໍ້ຄວາມຟຣີຢູ່ໃນໃ
 ##### FCKeditor #####
 AdvancedEditor=ຕົວແກ້ໄຂຂັ້ນສູງ
 ActivateFCKeditor=ເປີດໃຊ້ຕົວແກ້ໄຂຂັ້ນສູງ ສຳ ລັບ:
-FCKeditorForNotePublic=ການສ້າງ / ສະບັບຂອງ WYSIWYG ພາກສະຫນາມ "ບັນທຶກສາທາລະນະ" ຂອງອົງປະກອບ
-FCKeditorForNotePrivate=WYSIWYG ການສ້າງ / ສະບັບຂອງພາກສະຫນາມ "ບັນທຶກສ່ວນຕົວ" ຂອງອົງປະກອບ
-FCKeditorForCompany=WYSIWYG ການສ້າງ/ສະບັບຂອງລາຍລະອຽດພາກສະຫນາມຂອງອົງປະກອບ (ຍົກເວັ້ນຜະລິດຕະພັນ/ການບໍລິການ)
-FCKeditorForProductDetails=ການສ້າງ/ສະບັບຂອງ WYSIWYG ລາຍລະອຽດຂອງຜະລິດຕະພັນ ຫຼືເສັ້ນສຳລັບວັດຖຸ (ສາຍຂໍ້ສະເໜີ, ຄຳສັ່ງ, ໃບເກັບເງິນ, ແລະອື່ນໆ...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=ຄໍາເຕືອນ: ການນໍາໃຊ້ທາງເລືອກນີ້ສໍາລັບກໍລະນີນີ້ແມ່ນບໍ່ແນະນໍາຢ່າງຮຸນແຮງຍ້ອນວ່າມັນສາມາດສ້າງບັນຫາກັບຕົວອັກສອນພິເສດແລະການຈັດຮູບແບບຫນ້າໃນເວລາທີ່ສ້າງໄຟລ໌ PDF.
-FCKeditorForMailing= ການສ້າງ / ສະບັບ WYSIWYG ສໍາລັບ eMailings ມະຫາຊົນ (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWYG ການສ້າງ/ສະບັບຂອງລາຍເຊັນຜູ້ໃຊ້
-FCKeditorForMail=ການສ້າງ/ສະບັບ WYSIWYG ສໍາລັບຈົດໝາຍທັງໝົດ (ຍົກເວັ້ນເຄື່ອງມື->ອີເມລ)
-FCKeditorForTicket=ການສ້າງ/ສະບັບ WYSIWYG ສໍາລັບປີ້
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=ການຕັ້ງຄ່າໂມດູນຫຼັກຊັບ
 IfYouUsePointOfSaleCheckModule=ຖ້າເຈົ້າໃຊ້ໂມດູນຈຸດຂາຍ (POS) ທີ່ສະ ໜອງ ໃຫ້ຕາມຄ່າເລີ່ມຕົ້ນຫຼືໂມດູນພາຍນອກ, ການຕັ້ງຄ່ານີ້ອາດຈະຖືກລະເລີຍໂດຍໂມດູນ POS ຂອງເຈົ້າ. ໂມດູນ POS ສ່ວນໃຫຍ່ຖືກອອກແບບໂດຍມາດຕະຖານເພື່ອສ້າງໃບແຈ້ງ ໜີ້ ທັນທີແລະຫຼຸດຫຼັກຊັບໂດຍບໍ່ຄໍານຶງເຖິງຕົວເລືອກຢູ່ທີ່ນີ້. ສະນັ້ນຖ້າເຈົ້າຕ້ອງການຫຼືບໍ່ມີຫຼັກຊັບຫຼຸດລົງເມື່ອລົງທະບຽນຂາຍຈາກ POS ຂອງເຈົ້າ, ກວດເບິ່ງການຕັ້ງໂມດູນ POS ຂອງເຈົ້ານໍາ.
@@ -1867,7 +1874,6 @@ Buy=ຊື້
 Sell=ຂາຍ
 InvoiceDateUsed=ໃຊ້ວັນທີໃບຮຽກເກັບເງິນ
 YourCompanyDoesNotUseVAT=ບໍລິສັດຂອງເຈົ້າໄດ້ຖືກກໍານົດວ່າບໍ່ໃຊ້ VAT (ບ້ານ - ການຕັ້ງ - ບໍລິສັດ/ອົງການຈັດຕັ້ງ), ສະນັ້ນບໍ່ມີທາງເລືອກ VAT ເພື່ອຕັ້ງ.
-AccountancyCode=ລະຫັດບັນຊີ
 AccountancyCodeSell=ບັນຊີການຂາຍ. ລະຫັດ
 AccountancyCodeBuy=ບັນຊີການຊື້. ລະຫັດ
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=ເກັບກ່ອງເຄື່ອງ “າຍ“ ສ້າງການຈ່າຍເງິນໂດຍອັດຕະໂນມັດ” ໄວ້ເປົ່າໂດຍຄ່າເລີ່ມຕົ້ນເມື່ອສ້າງອາກອນໃ່
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = ມຸມມອງໃດທີ່ເຈົ້າຕ້ອ
 AGENDA_EVENT_PAST_COLOR = ສີເຫດການທີ່ຜ່ານມາ
 AGENDA_EVENT_CURRENT_COLOR = ສີນັດໝາຍປັດຈຸບັນ
 AGENDA_EVENT_FUTURE_COLOR = ສີນັດໝາຍໃນອະນາຄົດ
-AGENDA_REMINDER_BROWSER = ເປີດໃຊ້ງານການແຈ້ງເຕືອນເຫດການ <b> ຢູ່ໃນບຣາວເຊີຂອງຜູ້ໃຊ້ </b> (ເມື່ອຮອດວັນທີເຕືອນ, ໂປແກຼມທ່ອງເວັບຈະປາກົດຂຶ້ນມາ.
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = ເປີດໃຊ້ການແຈ້ງເຕືອນສຽງ
-AGENDA_REMINDER_EMAIL = ເປີດໃຊ້ງານການເຕືອນເຫດການ <b> ທາງອີເມລ a </b> (ຕົວເລືອກການເຕືອນ/ການຊັກຊ້າສາມາດຖືກກໍານົດໄດ້ໃນແຕ່ລະເຫດການ).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Noteາຍເຫດ: ຄວາມຖີ່ຂອງວຽກທີ່ກໍານົດໄວ້ %s ຕ້ອງພຽງພໍເພື່ອໃຫ້ແນ່ໃຈວ່າການເຕືອນຖືກສົ່ງໄປໃນເວລາທີ່ຖືກຕ້ອງ.
 AGENDA_SHOW_LINKED_OBJECT = ສະແດງວັດຖຸທີ່ເຊື່ອມໂຍງໃສ່ໃນມຸມມອງວາລະ
 AGENDA_USE_EVENT_TYPE = ໃຊ້ປະເພດເຫດການ (ຈັດການຢູ່ໃນການຕັ້ງຄ່າເມນູ -> ວັດຈະນານຸກົມ -> ປະເພດເຫດການວາລະ)
 AGENDA_USE_EVENT_TYPE_DEFAULT = ກໍານົດຄ່າເລີ່ມຕົ້ນນີ້ໂດຍອັດຕະໂນມັດສໍາລັບປະເພດຂອງເຫດການໃນຮູບແບບການສ້າງເຫດການ
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = ກຸນແຈເພື່ອອະນຸຍາດການເຊື່ອມຕໍ່ການສົ່ງອອກ
 PastDelayVCalExport=ຢ່າສົ່ງອອກເຫດການທີ່ເກົ່າກວ່າ
 SecurityKey = ກະແຈຄວາມປອດໄພ
@@ -2006,7 +2017,7 @@ BackupZipWizard=ຕົວຊ່ວຍສ້າງການເກັບບັນ
 SomethingMakeInstallFromWebNotPossible=ການຕິດຕັ້ງໂມດູນພາຍນອກແມ່ນເປັນໄປບໍ່ໄດ້ຈາກອິນເຕີເຟດເວັບດ້ວຍເຫດຜົນຕໍ່ໄປນີ້:
 SomethingMakeInstallFromWebNotPossible2=ດ້ວຍເຫດຜົນນີ້, ຂັ້ນຕອນການຍົກລະດັບທີ່ໄດ້ອະທິບາຍໄວ້ນີ້ແມ່ນຂັ້ນຕອນຄູ່ມືພຽງແຕ່ຜູ້ໃຊ້ທີ່ມີສິດພິເສດເທົ່ານັ້ນທີ່ສາມາດປະຕິບັດໄດ້.
 InstallModuleFromWebHasBeenDisabledContactUs=ການຕິດຕັ້ງຫຼືການພັດທະນາຂອງໂມດູນພາຍນອກຫຼືເວັບໄຊທ໌ແບບເຄື່ອນໄຫວ, ຈາກຄໍາຮ້ອງສະຫມັກ, ປະຈຸບັນຖືກລັອກເພື່ອຈຸດປະສົງຄວາມປອດໄພ. ກະລຸນາຕິດຕໍ່ພວກເຮົາຖ້າທ່ານຕ້ອງການເປີດໃຊ້ຄຸນສົມບັດນີ້.
-InstallModuleFromWebHasBeenDisabledByFile=ຜູ້ຄວບຄຸມຂອງເຈົ້າປິດການຕິດຕັ້ງໂມດູນພາຍນອກຈາກແອັບພລິເຄຊັນ. ເຈົ້າຕ້ອງຂໍໃຫ້ລາວເອົາໄຟລ a <strong> %s </strong> ເພື່ອອະນຸຍາດຄຸນສົມບັດນີ້.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=ການຕິດຕັ້ງຫຼືສ້າງໂມດູນພາຍນອກຈາກແອັບພລິເຄຊັນຈໍາເປັນຕ້ອງບັນທຶກໄຟລ module ໂມດູນໃສ່ໃນລະບົບ <strong> %s </strong>. ເພື່ອໃຫ້ໄດເຣັກທໍຣີນີ້ຖືກປະມວນຜົນໂດຍ Dolibarr, ເຈົ້າຕ້ອງຕັ້ງຄ່າ <strong> conf/conf.php </strong> ເພື່ອເພີ່ມ 2 ເສັ້ນຄໍາສັ່ງ: <br> <strong> $ dolibarr_main_url_root_alt; </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s/custom'; </strong>
 HighlightLinesOnMouseHover=ເນັ້ນເສັ້ນຕາຕະລາງເມື່ອການເຄື່ອນຍ້າຍເມົ້າຜ່ານ
 HighlightLinesColor=ເນັ້ນສີຂອງເສັ້ນເມື່ອເມົ້າຜ່ານ (ໃຊ້ 'ffffff' ໂດຍບໍ່ມີຈຸດເດັ່ນ)
@@ -2036,6 +2047,7 @@ Enter0or1=ໃສ່ 0 ຫຼື 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=ໃສ່ບ່ອນນີ້ລະຫວ່າງວົງປີກກາ, ລາຍການຕົວເລກໄບຕ that ທີ່ເປັນຕົວແທນຂອງສັນຍາລັກສະກຸນເງິນ. ຕົວຢ່າງ: for $, enter [36] - for brazil real R $ [82,36] - for €, enter [8364]
 ColorFormat=ສີ RGB ແມ່ນຢູ່ໃນຮູບແບບ HEX, ຕົວຢ່າງ: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=ຊື່ໄອຄອນໃນຮູບແບບ:<br>- image.png ສໍາລັບໄຟລ໌ຮູບພາບເຂົ້າໄປໃນໄດເລກະທໍລີຫົວຂໍ້ປະຈຸບັນ<br>- image.png@module ຖ້າໄຟລ໌ເຂົ້າໄປໃນໄດເລກະທໍລີ /img/ ຂອງໂມດູນ<br>- fa-xxx ສໍາລັບ FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size ສໍາລັບ FontAwesome fa-xxx picto (ມີຄໍານໍາຫນ້າ, ສີແລະຂະຫນາດທີ່ກໍານົດໄວ້)
 PositionIntoComboList=ຕຳ ແໜ່ງ ແຖວໃນລາຍການຄອມໂບ
 SellTaxRate=ອັດຕາພາສີການຂາຍ
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=ເຊື່ອງຂອບໃນກອບທີ່ຢູ່ຜູ້ສົ່ງ
 MAIN_PDF_NO_RECIPENT_FRAME=ເຊື່ອງຂອບໃນກອບທີ່ຢູ່ຜູ້ຮັບ
 MAIN_PDF_HIDE_CUSTOMER_CODE=ເຊື່ອງລະຫັດລູກຄ້າ
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=ເຊື່ອງຊື່ຜູ້ສົ່ງ/ບໍລິສັດຢູ່ໃນບລັອກທີ່ຢູ່
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=ເຊື່ອງເງື່ອນໄຂການຈ່າຍເງິນ
 PROPOSAL_PDF_HIDE_PAYMENTMODE=ເຊື່ອງໂmodeດການຈ່າຍເງິນ
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=ບໍ່ແນະນໍາ
 ARestrictedPath=ບາງເສັ້ນທາງທີ່ຖືກຈໍາກັດສໍາລັບໄຟລ໌ຂໍ້ມູນ
 CheckForModuleUpdate=ກວດເບິ່ງການອັບເດດໂມດູນພາຍນອກ
 CheckForModuleUpdateHelp=ຄຳ ສັ່ງນີ້ຈະເຊື່ອມຕໍ່ຫາຕົວແກ້ໄຂໂມດູນພາຍນອກເພື່ອກວດເບິ່ງວ່າມີເວີຊັນໃis່ຫຼືບໍ່.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=ມີອັບເດດມາໃ່
 NoExternalModuleWithUpdate=ບໍ່ພົບການອັບເດດ ສຳ ລັບໂມດູນພາຍນອກ
 SwaggerDescriptionFile=ໄຟລ description ຄໍາອະທິບາຍ Swagger API (ສໍາລັບໃຊ້ກັບ redoc ຕົວຢ່າງ)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=ສະແດງທີ່ຢູ່ຈັດສົ
 INVOICE_SHOW_SHIPPING_ADDRESSMore=ຂໍ້ບັງຄັບໃນບາງປະເທດ (ຝຣັ່ງ, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=ການເຊື່ອມຕໍ່ Url ຂອງເຄືອຂ່າຍສັງຄົມ. ໃຊ້ {socialid} ສໍາລັບພາກສ່ວນຕົວແປທີ່ມີ ID ເຄືອຂ່າຍສັງຄົມ.
 IfThisCategoryIsChildOfAnother=ຖ້າປະເພດນີ້ແມ່ນລູກຂອງຄົນອື່ນ
 DarkThemeMode=ຮູບແບບສີສັນມືດ
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=ຄຳເຕືອນ: ໂມ
 WarningModuleHasChangedSecurityCsrfParameter=ຄຳເຕືອນ: ໂມດູນ %s ໄດ້ປິດການນຳໃຊ້ຄວາມປອດໄພ CSRF ຂອງຕົວຢ່າງຂອງທ່ານ. ການປະຕິບັດນີ້ແມ່ນສົງໃສແລະການຕິດຕັ້ງຂອງທ່ານອາດຈະບໍ່ປອດໄພອີກຕໍ່ໄປ. ກະລຸນາຕິດຕໍ່ຜູ້ຂຽນຂອງໂມດູນເພື່ອຄໍາອະທິບາຍ.
 EMailsInGoingDesc=ອີເມວຂາເຂົ້າຖືກຈັດການໂດຍໂມດູນ %s. ທ່ານຕ້ອງເປີດໃຊ້ງານ ແລະກຳນົດຄ່າມັນຫາກທ່ານຕ້ອງການຮອງຮັບອີເມວທີ່ກຳລັງເຂົ້າມາ.
 MAIN_IMAP_USE_PHPIMAP=ໃຊ້ຫ້ອງສະໝຸດ PHP-IMAP ສໍາລັບ IMAP ແທນ PHP IMAP ເດີມ. ອັນນີ້ຍັງອະນຸຍາດໃຫ້ໃຊ້ການເຊື່ອມຕໍ່ OAuth2 ສໍາລັບ IMAP (ໂມດູນ OAuth ຕ້ອງຖືກເປີດໃຊ້ເຊັ່ນກັນ).
-MAIN_CHECKBOX_LEFT_COLUMN=ສະ​ແດງ​ຖັນ​ສໍາ​ລັບ​ພາກ​ສະ​ຫນາມ​ແລະ​ການ​ຄັດ​ເລືອກ​ເສັ້ນ​ຢູ່​ທາງ​ຊ້າຍ (ທາງ​ຂວາ​ເປັນ​ຄ່າ​ເລີ່ມ​ຕົ້ນ​)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=ບໍ່ໄດ້ສ້າງຂຶ້ນຕາມຄ່າເລີ່ມຕົ້ນ. ສ້າງຢູ່ໃນການເປີດໃຊ້ໂມດູນເທົ່ານັ້ນ.
 CSSPage=CSS Style
 Defaultfortype=ຄ່າເລີ່ມຕົ້ນ
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index 2720d2fcbf7..dd66106cc62 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=ຍອດເງິນສິ້ນສຸດ
 CurrentBalance=ຍອດເຫຼືອປະຈຸບັນ
 FutureBalance=ຍອດເງິນໃນອະນາຄົດ
 ShowAllTimeBalance=ສະແດງຍອດເງິນຕັ້ງແຕ່ເລີ່ມຕົ້ນ
-AllTime=ຈາກການເລີ່ມຕົ້ນ
 Reconciliation=ຄວາມປອງດອງ
 RIB=ເລກບັນຊີທະນາຄານ
 IBAN=IBາຍເລກ IBAN
@@ -133,7 +132,7 @@ DeleteTransaction=ລຶບການເຂົ້າ
 ConfirmDeleteTransaction=ເຈົ້າແນ່ໃຈບໍວ່າເຈົ້າຕ້ອງການລຶບລາຍການນີ້?
 ThisWillAlsoDeleteBankRecord=ອັນນີ້ຍັງຈະລຶບລາຍການທະນາຄານທີ່ສ້າງຂຶ້ນ
 BankMovements=ການເຄື່ອນໄຫວ
-PlannedTransactions=ລາຍການທີ່ວາງແຜນໄວ້
+PlannedTransactions=Upcoming entries
 Graph=ກຣາຟ
 ExportDataset_banque_1=ບັນຊີທະນາຄານແລະໃບແຈ້ງຍອດບັນຊີ
 ExportDataset_banque_2=ໃບເກັບເງິນາກ
@@ -151,7 +150,7 @@ FutureTransaction=ທຸລະກໍາໃນອະນາຄົດ. ບໍ່ສ
 SelectChequeTransactionAndGenerate=ເລືອກ/ກັ່ນຕອງເຊັກທີ່ຈະລວມຢູ່ໃນໃບຮັບເງິນcheckາກເຊັກ. ຫຼັງຈາກນັ້ນ, ໃຫ້ຄລິກໃສ່ "ສ້າງ".
 SelectPaymentTransactionAndGenerate=ເລືອກ/ກັ່ນຕອງເອກະສານທີ່ຈະລວມຢູ່ໃນ %s ໃບຮັບເງິນຝາກ. ຫຼັງຈາກນັ້ນ, ໃຫ້ຄລິກໃສ່ "ສ້າງ".
 InputReceiptNumber=ເລືອກໃບແຈ້ງຍອດທະນາຄານທີ່ກ່ຽວຂ້ອງກັບການປະສານງານ. ໃຊ້ຄ່າຕົວເລກທີ່ຈັດຮຽງໄດ້
-InputReceiptNumberBis=YYYYMM ຫຼື YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=ເພື່ອຄືນດີ?
 ThenCheckLinesAndConciliate=ຈາກນັ້ນ, ກວດແຖວທີ່ມີຢູ່ໃນໃບແຈ້ງຍອດທະນາຄານແລະຄລິກ
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=ຖ້າ ໜ້າ ທີ່ນີ້ຖືກເປ
 BankColorizeMovementName1=ສີພື້ນຫຼັງ ສຳ ລັບການເຄື່ອນຍ້າຍເດບິດ
 BankColorizeMovementName2=ສີພື້ນຫຼັງ ສຳ ລັບການເຄື່ອນໄຫວສິນເຊື່ອ
 IfYouDontReconcileDisableProperty=ຖ້າເຈົ້າບໍ່ເຮັດໃຫ້ການຄືນດີຂອງທະນາຄານໃນບາງບັນຊີທະນາຄານ, ປິດການ ນຳ ໃຊ້ຄຸນສົມບັດ "%s" ໃສ່ພວກມັນເພື່ອລຶບ ຄຳ ເຕືອນນີ້ອອກ.
-NoBankAccountDefined=ບໍ່ໄດ້ ກຳ ນົດບັນຊີທະນາຄານ
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=ບໍ່ພົບບັນທຶກຢູ່ໃນບັນຊີທະນາຄານ. ໂດຍທົ່ວໄປແລ້ວ, ສິ່ງນີ້ເກີດຂຶ້ນເມື່ອບັນທຶກໄດ້ຖືກລຶບດ້ວຍຕົນເອງຈາກລາຍການທຸລະກໍາໃນບັນຊີທະນາຄານ (ຕົວຢ່າງໃນລະຫວ່າງການຄືນບັນຊີທະນາຄານ). ເຫດຜົນອີກອັນ ໜຶ່ງ ແມ່ນວ່າການຊໍາລະໄດ້ຖືກບັນທຶກໄວ້ເມື່ອໂມດູນ "%s" ຖືກປິດໃຊ້ງານ.
 AlreadyOneBankAccount=ມີໜຶ່ງບັນຊີທະນາຄານທີ່ກຳນົດໄວ້ແລ້ວ
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=ຕົວແປໄຟລ໌ SEPA
diff --git a/htdocs/langs/lo_LA/blockedlog.lang b/htdocs/langs/lo_LA/blockedlog.lang
index bd05c4a886f..208d65b0b97 100644
--- a/htdocs/langs/lo_LA/blockedlog.lang
+++ b/htdocs/langs/lo_LA/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=ບັນທຶກທີ່ບໍ່ສາມາດປ່ຽນ
 ShowAllFingerPrintsMightBeTooLong=ສະແດງບັນທຶກທີ່ເກັບໄວ້ທັງ(ົດ (ອາດຈະຍາວ)
 ShowAllFingerPrintsErrorsMightBeTooLong=ສະແດງບັນທຶກການຈັດເກັບທີ່ບໍ່ຖືກຕ້ອງທັງ(ົດ (ອາດຈະຍາວ)
 DownloadBlockChain=ດາວໂຫລດລາຍນີ້ວມື
-KoCheckFingerprintValidity=ການບັນທຶກບັນທຶກໄວ້ບໍ່ຖືກຕ້ອງ. ມັນmeansາຍຄວາມວ່າບາງຄົນ (ແຮັກເກີ?) ໄດ້ແກ້ໄຂຂໍ້ມູນບາງອັນຂອງບັນທຶກນີ້ຫຼັງຈາກທີ່ມັນຖືກບັນທຶກໄວ້, ຫຼືໄດ້ລຶບບັນທຶກທີ່ເກັບໄວ້ກ່ອນ ໜ້າ ນີ້ (ກວດເບິ່ງແຖວທີ່ມີ # ຢູ່ກ່ອນ ໜ້າ ນີ້) ຫຼືໄດ້ດັດແກ້ການກວດສອບຂອງບັນທຶກກ່ອນ ໜ້າ ນີ້.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=ບັນທຶກບັນທຶກທີ່ຖືກຈັດເກັບຖືກຕ້ອງ. ຂໍ້ມູນຢູ່ໃນແຖວນີ້ບໍ່ໄດ້ຖືກດັດແກ້ແລະການປ້ອນເຂົ້າໄປຕາມອັນທີ່ຜ່ານມາ.
 OkCheckFingerprintValidityButChainIsKo=ບັນທຶກທີ່ເກັບໄວ້ເບິ່ງຄືວ່າຖືກຕ້ອງຖ້າທຽບໃສ່ກັບອັນທີ່ຜ່ານມາແຕ່ຕ່ອງໂສ້ໄດ້ຖືກເສຍຫາຍກ່ອນ ໜ້າ ນີ້.
 AddedByAuthority=ເກັບໄວ້ໃນ ອຳ ນາດທາງໄກ
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=ລາຍລະອຽດບັນທຶກ
 ListOfTrackedEvents=ລາຍການເຫດການທີ່ຕິດຕາມ
 Fingerprint=ລາຍນີ້ວມື
 DownloadLogCSV=ສົ່ງອອກບັນທຶກທີ່ເກັບໄວ້ (CSV)
-DataOfArchivedEvent=ຂໍ້ມູນເຕັມຂອງເຫດການທີ່ເກັບໄວ້
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=ວັດຖຸເດີມ (ປະເພດ %s, id %s) ບໍ່ໄດ້ເຊື່ອມຕໍ່ (ເບິ່ງຖັນ 'ຂໍ້ມູນເຕັມ' ເພື່ອເອົາຂໍ້ມູນທີ່ບັນທຶກໄວ້ບໍ່ໄດ້)
 BlockedLogAreRequiredByYourCountryLegislation=ກົດofາຍຂອງປະເທດເຈົ້າຕ້ອງການໂມດູນບັນທຶກທີ່ບໍ່ສາມາດປ່ຽນແປງໄດ້. ການປິດການ ນຳ ໃຊ້ໂມດູນນີ້ອາດເຮັດໃຫ້ທຸລະ ກຳ ໃນອະນາຄົດບໍ່ຖືກຕ້ອງຕາມກົດandາຍແລະການ ນຳ ໃຊ້ຊອບແວກົດasາຍເນື່ອງຈາກບໍ່ສາມາດກວດສອບໄດ້ໂດຍການກວດສອບອາກອນ.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=ໂມດູນບັນທຶກທີ່ບໍ່ສາມາດປ່ຽນແປງໄດ້ຖືກເປີດໃຊ້ງານເພາະວ່າກົດofາຍຂອງປະເທດຂອງເຈົ້າ. ການປິດການ ນຳ ໃຊ້ໂມດູນນີ້ອາດຈະເຮັດໃຫ້ທຸລະ ກຳ ໃນອະນາຄົດບໍ່ຖືກຕ້ອງຕາມກົດandາຍແລະການ ນຳ ໃຊ້ຊອບແວກົດasາຍເນື່ອງຈາກບໍ່ສາມາດກວດສອບໄດ້ໂດຍການກວດສອບອາກອນ.
@@ -30,6 +32,7 @@ BlockedLogEnabled=ລະບົບການຕິດຕາມເຫດການ
 BlockedLogDisabled=ລະບົບການຕິດຕາມເຫດການເຂົ້າໄປໃນບັນທຶກທີ່ບໍ່ສາມາດປ່ຽນແປງໄດ້ຖືກປິດໃຊ້ງານຫຼັງຈາກການບັນທຶກບາງອັນສຳເລັດແລ້ວ. ພວກເຮົາໄດ້ບັນທຶກລາຍນິ້ວມືພິເສດເພື່ອຕິດຕາມລະບົບຕ່ອງໂສ້ທີ່ແຕກຫັກ
 BlockedLogDisabledBis=ລະບົບການຕິດຕາມເຫດການເຂົ້າໄປໃນບັນທຶກທີ່ບໍ່ສາມາດປ່ຽນແປງໄດ້ຖືກປິດໃຊ້ງານ. ອັນນີ້ເປັນໄປໄດ້ເພາະວ່າຍັງບໍ່ມີການບັນທຶກເທື່ອ.
 LinkHasBeenDisabledForPerformancePurpose=ສໍາລັບຈຸດປະສົງການປະຕິບັດ, ການເຊື່ອມຕໍ່ໂດຍກົງກັບເອກະສານບໍ່ໄດ້ສະແດງໃຫ້ເຫັນຫຼັງຈາກເສັ້ນ 100th.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=ໃບແຈ້ງ ໜີ້ ລູກຄ້າຖືກລຶບຢ່າງມີເຫດຜົນ
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=ການລຶບເງິນທີ່ມີເຫ
 logPAYMENT_VARIOUS_CREATE=ສ້າງການຈ່າຍເງິນ (ບໍ່ໄດ້ມອບtoາຍໃຫ້ໃບແຈ້ງ ໜີ້)
 logPAYMENT_VARIOUS_DELETE=ການຊໍາລະເງິນ (ບໍ່ໄດ້ມອບtoາຍໃຫ້ໃບແຈ້ງ ໜີ້) ການລຶບຢ່າງມີເຫດຜົນ
 logPAYMENT_VARIOUS_MODIFY=ແກ້ໄຂການຈ່າຍເງິນແລ້ວ (ບໍ່ໄດ້ມອບtoາຍໃບຮຽກເກັບເງິນ)
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/lo_LA/categories.lang b/htdocs/langs/lo_LA/categories.lang
index e47664e79cd..654f69f6d53 100644
--- a/htdocs/langs/lo_LA/categories.lang
+++ b/htdocs/langs/lo_LA/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=ຕິດຕໍ່ແທັກ/ພື້ນທີ່categ
 AccountsCategoriesArea=ແທັກບັນຊີ/ພື້ນທີ່categoriesວດບັນຊີທະນາຄານ
 ProjectsCategoriesArea=ແທັກ/ພື້ນທີ່ຂອງໂຄງການ
 UsersCategoriesArea=ແທັກຜູ້ໃຊ້/ພື້ນທີ່categoriesວດູ່
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=ປະເພດຍ່ອຍ
 CatList=ລາຍຊື່ແທັກ/categoriesວດູ່
 CatListAll=ລາຍຊື່ແທັກ/categoriesວດ(ູ່ (ທຸກປະເພດ)
@@ -90,9 +91,10 @@ CategoriesSetup=ການຕິດຕັ້ງແທັກ/categoriesວດູ
 CategorieRecursiv=ເຊື່ອມໂຍງກັບແທັກ/categoryວດparentູ່ຫຼັກໂດຍອັດຕະໂນມັດ
 CategorieRecursivHelp=ຖ້າຕົວເລືອກເປີດຢູ່, ເມື່ອທ່ານເພີ່ມວັດຖຸເຂົ້າໃນໝວດໝູ່ຍ່ອຍ, ວັດຖຸຈະຖືກເພີ່ມເຂົ້າໃນໝວດໝູ່ຫຼັກ.
 AddProductServiceIntoCategory=ກໍານົດປະເພດໃຫ້ກັບຜະລິດຕະພັນ / ບໍລິການ
-AddCustomerIntoCategory=ຈັດປະເພດໃຫ້ກັບລູກຄ້າ
-AddSupplierIntoCategory=ມອບcategoryວດໃຫ້ຜູ້ສະ ໜອງ
-AssignCategoryTo=ກຳນົດປະເພດໃຫ້
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=ສະແດງແທັກ/categoryວດູ່
 ByDefaultInList=ໂດຍຄ່າເລີ່ມຕົ້ນໃນລາຍການ
 ChooseCategory=ເລືອກປະເພດ
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=ປະເພດ ໜ້າ ບັນຈຸ
 KnowledgemanagementsCategoriesArea=ໝວດໝູ່ບົດຄວາມ KM
 UseOrOperatorForCategories=ໃຊ້ຕົວ ດຳ ເນີນການ 'OR' ສຳ ລັບcategoriesວດູ່
 AddObjectIntoCategory=ມອບຫມາຍໃຫ້ປະເພດ
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index 9f97f7866bb..be8f6ec1b8c 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=ປະເທດຢູ່ພາຍໃນປະຊາຄົມເ
 PriceFormatInCurrentLanguage=ຮູບແບບການສະແດງລາຄາໃນພາສາແລະສະກຸນເງິນປັດຈຸບັນ
 ThirdPartyName=ຊື່ພາກສ່ວນທີສາມ
 ThirdPartyEmail=ອີເມວພາກສ່ວນທີສາມ
-ThirdParty=ບຸກ​ຄົນ​ທີ່​ສາມ
-ThirdParties=ພາກສ່ວນທີສາມ
+ThirdParty=Third party
+ThirdParties=Third parties
 ThirdPartyProspects=ຄວາມສົດໃສດ້ານ
 ThirdPartyProspectsStats=ຄວາມສົດໃສດ້ານ
 ThirdPartyCustomers=ລູກຄ້າ
@@ -65,6 +65,7 @@ State=ລັດ/ແຂວງ
 StateId=ID ຂອງລັດ
 StateCode=ລະຫັດລັດ/ແຂວງ
 StateShort=ລັດ
+DepartmentBuyer=Buyer's state/province
 Region=ພາກພື້ນ
 Region-State=ພາກພື້ນ - ລັດ
 Country=ປະເທດ
@@ -78,7 +79,7 @@ Chat=ສົນທະນາ
 PhonePro=ລົດເມ. ໂທລະສັບ
 PhonePerso=ບຸກຄົນ ໂທລະສັບ
 PhoneMobile=ມືຖື
-No_Email=ປະຕິເສດການສົ່ງອີເມວເປັນຊຸດ
+No_Email=Refuse mass emails
 Fax=ແຟັກ
 Zip=ລະ​ຫັດ​ໄປ​ສະ​ນີ
 Town=ເມືອງ
@@ -382,11 +383,12 @@ ExportCardToFormat=ສົ່ງບັດອອກເປັນຮູບແບບ
 ContactNotLinkedToCompany=ບໍ່ໄດ້ຕິດຕໍ່ພົວພັນກັບພາກສ່ວນທີສາມໃດ
 DolibarrLogin=ເຂົ້າສູ່ລະບົບ Dolibarr
 NoDolibarrAccess=ບໍ່ມີການເຂົ້າເຖິງ Dolibarr
-ExportDataset_company_1=ພາກສ່ວນທີສາມ (ບໍລິສັດ/ມູນນິທິ/ບຸກຄະລາກອນ) ແລະຄຸນສົມບັດຂອງເຂົາເຈົ້າ
-ExportDataset_company_2=ລາຍຊື່ຜູ້ຕິດຕໍ່ແລະຄຸນສົມບັດຂອງເຂົາເຈົ້າ
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=ພາກສ່ວນທີສາມແລະຄຸນສົມບັດຂອງເຂົາເຈົ້າ
 ImportDataset_company_2=ການຕິດຕໍ່/ທີ່ຢູ່ແລະຄຸນລັກສະນະເພີ່ມເຕີມຂອງພາກສ່ວນທີສາມ
-ImportDataset_company_3=ບັນຊີທະນາຄານພາກສ່ວນທີສາມ
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=ຕົວແທນຂາຍພາກສ່ວນທີສາມ (ມອບrepresentativesາຍຕົວແທນຂາຍ/ຜູ້ໃຊ້ໃຫ້ກັບບໍລິສັດ)
 PriceLevel=ລະດັບລາຄາ
 PriceLevelLabels=ປ້າຍລະດັບລາຄາ
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=ຊື່ຜູ້ຈັດການ (CEO, ຜູ້ ອຳ ນວຍການ, ປະທານ ... )
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=ລວມພາກສ່ວນທີສາມເຂົ້າກັນ
-ConfirmMergeThirdparties=ເຈົ້າແນ່ໃຈບໍວ່າເຈົ້າຕ້ອງການລວມພາກສ່ວນທີສາມທີ່ເລືອກເຂົ້າກັບອັນດຽວນີ້ເຂົ້າກັນ? ວັດຖຸທີ່ເຊື່ອມໂຍງທັງ(ົດ (ໃບຮຽກເກັບເງິນ, ຄຳ ສັ່ງ, ... ) ຈະຖືກຍ້າຍໄປຫາບຸກຄົນທີສາມປັດຈຸບັນ, ຫຼັງຈາກນັ້ນພາກສ່ວນທີສາມທີ່ເລືອກຈະຖືກລຶບອອກ.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=ພາກສ່ວນທີສາມໄດ້ຖືກລວມເຂົ້າກັນ
 SaleRepresentativeLogin=ເຂົ້າສູ່ລະບົບຂອງຕົວແທນຂາຍ
 SaleRepresentativeFirstname=ຊື່ຂອງຕົວແທນຂາຍ
@@ -460,3 +462,6 @@ ExternalSystemID=ID ລະບົບພາຍນອກ
 IDOfPaymentInAnExternalSystem=ID ຂອງຮູບແບບການຈ່າຍເງິນເຂົ້າໄປໃນລະບົບພາຍນອກ (ເຊັ່ນ: Stripe, Paypal, ... )
 AADEWebserviceCredentials=AADE Webservice Credentials
 ThirdPartyMustBeACustomerToCreateBANOnStripe=ພາກສ່ວນທີສາມຈະຕ້ອງເປັນລູກຄ້າເພື່ອອະນຸຍາດໃຫ້ສ້າງຂໍ້ມູນທະນາຄານຂອງຕົນຢູ່ດ້ານ Stripe
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
index 675104dc063..3dfbe9c2e30 100644
--- a/htdocs/langs/lo_LA/compta.lang
+++ b/htdocs/langs/lo_LA/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=ການຊໍາລະເງິນໃບແຈ້ງຫ
 PaymentSupplierInvoice=ການຊໍາລະເງິນໃບແຈ້ງຫນີ້ຂອງຜູ້ຂາຍ
 PaymentSocialContribution=ການຈ່າຍອາກອນທາງສັງຄົມ/ງົບປະມານ
 PaymentVat=ການຊໍາລະອາກອນມູນຄ່າເພີ່ມ
-AutomaticCreationPayment=ບັນທຶກການຈ່າຍເງິນອັດຕະໂນມັດ
+AutomaticCreationPayment=Also record the payment
 ListPayment=ລາຍການການຊໍາລະ
 ListOfCustomerPayments=ລາຍຊື່ການຊໍາລະເງິນຂອງລູກຄ້າ
 ListOfSupplierPayments=ລາຍຊື່ການຈ່າຍເງິນຂອງຜູ້ຂາຍ
@@ -118,10 +118,14 @@ SocialContributionsPayments=ການຈ່າຍອາກອນທາງສັ
 ShowVatPayment=ສະແດງການຊໍາລະອາກອນມູນຄ່າເພີ່ມ
 TotalToPay=ລວມທັງtoົດທີ່ຕ້ອງຈ່າຍ
 BalanceVisibilityDependsOnSortAndFilters=ຍອດເຫຼືອແມ່ນສາມາດເບິ່ງເຫັນໄດ້ໃນລາຍການນີ້ສະເພາະຖ້າຕາຕະລາງຖືກຈັດຮຽງຕາມ %s ແລະກັ່ນຕອງຢູ່ໃນ 1 ບັນຊີທະນາຄານ (ໂດຍບໍ່ມີຕົວກັ່ນຕອງອື່ນ)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=ລະຫັດບັນຊີລູກຄ້າ
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=ລະຫັດບັນຊີຜູ້ຂາຍ
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=ກົ້ນ. ບັນຊີ. ລະຫັດ
 SupplierAccountancyCodeShort=Sup. ບັນຊີ. ລະຫັດ
+UserAccountancyCodeShort=User account. code
 AccountNumber=ເລກບັນຊີ
 NewAccountingAccount=ບັນຊີໃ່
 Turnover=ໃບຮຽກເກັບເງິນລາຍຮັບ
@@ -129,7 +133,9 @@ TurnoverCollected=ເກັບລາຍຮັບໄດ້
 SalesTurnoverMinimum=ລາຍຮັບຕໍ່າສຸດ
 ByExpenseIncome=ຕາມລາຍຈ່າຍແລະລາຍຮັບ
 ByThirdParties=ໂດຍພາກສ່ວນທີສາມ
+ByProjects=By projects
 ByUserAuthorOfInvoice=ໂດຍຜູ້ຂຽນໃບແຈ້ງ ໜີ້
+DetailedListLowercase=detailed list
 CheckReceipt=ໃບຝາກເງິນ
 CheckReceiptShort=ໃບຝາກເງິນ
 LastCheckReceiptShort=ໃບຝາກເງິນ %s ຫຼ້າສຸດ
diff --git a/htdocs/langs/lo_LA/datapolicy.lang b/htdocs/langs/lo_LA/datapolicy.lang
index 756698883fe..d13890d52ba 100644
--- a/htdocs/langs/lo_LA/datapolicy.lang
+++ b/htdocs/langs/lo_LA/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = ນະໂຍບາຍຄວາມເປັນສ່ວນຕົ
 Module4100Desc = ໂມດູນເພື່ອຈັດການຄວາມເປັນສ່ວນຕົວຂອງຂໍ້ມູນ (ສອດຄ່ອງກັບ GDPR)
 # Administration page
 datapolicySetup = ການຕັ້ງຄ່ານະໂຍບາຍຄວາມເປັນສ່ວນຕົວຂອງຂໍ້ມູນໂມດູນ
-Deletion = ການລຶບຂໍ້ມູນ
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s ເດືອນ
 ONE_YEAR = 1 ປີ
 NB_YEARS = %s ປີ
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = ຄວາມສົດໃສດ້ານ/ລ
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = ບໍ່ແມ່ນຄວາມສົດໃສດ້ານ / ຫຼືລູກຄ້າ
 DATAPOLICY_CONTACT_FOURNISSEUR = ຜູ້ສະຫນອງ
 DATAPOLICY_ADHERENT = ສະມາຊິກ
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = ທ່ານສາມາດສົ່ງອີເມວ GDPR ໄປຫາຜູ້ຕິດຕໍ່ທີ່ກ່ຽວຂ້ອງທັງຫມົດຂອງທ່ານ (ຜູ້ທີ່ຍັງບໍ່ທັນໄດ້ຮັບອີເມລ໌ແລະທີ່ທ່ານບໍ່ໄດ້ລົງທະບຽນຫຍັງກ່ຽວກັບຂໍ້ຕົກລົງ GDPR ຂອງພວກເຂົາ). ເພື່ອເຮັດສິ່ງນີ້, ໃຊ້ປຸ່ມຕໍ່ໄປນີ້.
 SendAgreement = ສົ່ງອີເມວ
 AllAgreementSend = ອີເມວທັງໝົດຖືກສົ່ງໄປແລ້ວ
 TXTLINKDATAPOLICYACCEPT = ຂໍ້ຄວາມສໍາລັບການເຊື່ອມຕໍ່ "ຂໍ້ຕົກລົງ"
 TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR : ການປະມວນຜົນຂໍ້ມູນສ່ວນຕົວ
 DATAPOLICY_consentement = ການຍິນຍອມທີ່ໄດ້ຮັບສຳລັບການປະມວນຜົນຂໍ້ມູນສ່ວນຕົວ
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index dad2360d7f9..0c834c168e7 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=ສ້າງບັນຊີລາຍຊື່ບໍ່ ສຳ ເລັດ. ກວດເບິ່ງວ່າຜູ້ໃຊ້ເຊີບເວີເວັບມີການອະນຸຍາດຂຽນເຂົ້າໄປໃນບັນຊີລາຍການເອກະສານ Dolibarr. ຖ້າຕົວກໍານົດການ <b> safe_mode </b> ຖືກເປີດໃຊ້ໃນ PHP ນີ້, ກວດເບິ່ງວ່າໄຟລ Dol php Dolibarr ເປັນເຈົ້າຂອງກັບຜູ້ໃຊ້ web server (ຫຼືກຸ່ມ).
 ErrorNoMailDefinedForThisUser=ບໍ່ໄດ້ ກຳ ນົດອີເມວ ສຳ ລັບຜູ້ໃຊ້ນີ້
 ErrorSetupOfEmailsNotComplete=ການຕັ້ງອີເມວບໍ່ ສຳ ເລັດ
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=ຄຸນສົມບັດນີ້ຕ້ອງການເປີດໃຊ້ JavaScript ເພື່ອເຮັດວຽກ. ປ່ຽນແປງນີ້ໃນການຕັ້ງຄ່າ - ສະແດງ.
 ErrorTopMenuMustHaveAParentWithId0=ເມນູປະເພດ 'ທາງເທີງ' ບໍ່ສາມາດມີເມນູຫຼັກໄດ້. ໃສ່ 0 ໃນເມນູຫຼັກຫຼືເລືອກເມນູປະເພດ 'ຊ້າຍ'.
 ErrorLeftMenuMustHaveAParentId=ເມນູປະເພດ 'ຊ້າຍ' ຕ້ອງມີໄອດີພໍ່ແມ່.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=ການອັບໂຫຼດຖືກບລັອກ
 ErrorFileSizeTooLarge=ຂະໜາດໄຟລ໌ໃຫຍ່ເກີນໄປ ຫຼືບໍ່ໄດ້ສະໜອງໄຟລ໌ໃຫ້.
 ErrorFieldTooLong=ຊ່ອງຂໍ້ມູນ %s ຍາວເກີນໄປ.
 ErrorSizeTooLongForIntType=ຂະ ໜາດ ຍາວເກີນໄປ ສຳ ລັບປະເພດ int (ຕົວເລກສູງສຸດ %s)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=ຂະ ໜາດ ຍາວເກີນໄປ ສຳ ລັບປະເພດສະຕຣິງ (ຕົວອັກສອນສູງສຸດ %s)
 ErrorNoValueForSelectType=ກະລຸນາຕື່ມຂໍ້ມູນໃສ່ລາຍຊື່ທີ່ເລືອກ
 ErrorNoValueForCheckBoxType=ກະລຸນາຕື່ມຂໍ້ມູນໃສ່ລາຍການກ່ອງເຄື່ອງາຍ
@@ -138,8 +140,9 @@ ErrorBadValueForCode=ຄ່າບໍ່ຖືກຕ້ອງ ສຳ ລັບລ
 ErrorBothFieldCantBeNegative=ຊ່ອງຂໍ້ມູນ %s ແລະ %s ບໍ່ສາມາດເປັນທັງສອງດ້ານລົບໄດ້
 ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> ບໍ່ສາມາດເປັນຄ່າລົບໃນໃບແຈ້ງໜີ້ປະເພດນີ້ໄດ້. ຖ້າທ່ານຕ້ອງການເພີ່ມເສັ້ນສ່ວນຫຼຸດ, ພຽງແຕ່ສ້າງສ່ວນຫຼຸດກ່ອນ (ຈາກຊ່ອງຂໍ້ມູນ '%s' ໃນບັດພາກສ່ວນທີສາມ) ແລະນຳໃຊ້ມັນໃສ່ໃບແຈ້ງໜີ້.
 ErrorLinesCantBeNegativeForOneVATRate=ຈໍານວນແຖວທັງ(ົດ (ສຸດທິຂອງພາສີ) ບໍ່ສາມາດເປັນຄ່າລົບສໍາລັບອັດຕາອາກອນມູນຄ່າເພີ່ມທີ່ບໍ່ແມ່ນ null (ພົບຈໍານວນລົບສໍາລັບອັດຕາອາກອນມູນຄ່າເພີ່ມ <b> %s </b> %%).
-ErrorLinesCantBeNegativeOnDeposits=ແຖວບໍ່ສາມາດເປັນຄ່າລົບໄດ້ໃນການ.າກເງິນ. ເຈົ້າຈະປະເຊີນກັບບັນຫາເມື່ອເຈົ້າຈະຕ້ອງໃຊ້ເງິນinາກໃນໃບແຈ້ງ ໜີ້ ສຸດທ້າຍຖ້າເຈົ້າເຮັດແນວນັ້ນ.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=ປະລິມານຕໍ່ແຖວເຂົ້າໃນໃບຮຽກເກັບເງິນຂອງລູກຄ້າບໍ່ສາມາດເປັນຄ່າລົບໄດ້
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=ບັນຊີຜູ້ໃຊ້ <b> %s </b> ໃຊ້ເພື່ອດໍາເນີນການເຊີບເວີເວັບບໍ່ມີການອະນຸຍາດສໍາລັບການນັ້ນ
 ErrorNoActivatedBarcode=ບໍ່ໄດ້ເປີດໃຊ້ປະເພດບາໂຄດ
 ErrUnzipFails=ການຊິບ %s ກັບ ZipArchive ລົ້ມເຫລວ
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=ພາຣາມິເຕີ PHP ຂອງເຈົ້າ upload_max_filesize (%s) ສູງກວ່າພາລາມິເຕີ PHP post_max_size (%s). ອັນນີ້ບໍ່ແມ່ນການຕັ້ງທີ່ສອດຄ່ອງ.
 WarningPasswordSetWithNoAccount=ລະຫັດຜ່ານຖືກຕັ້ງໃຫ້ສະມາຊິກນີ້. ຢ່າງໃດກໍ່ຕາມ, ບໍ່ໄດ້ສ້າງບັນຊີຜູ້ໃຊ້. ສະນັ້ນລະຫັດຜ່ານນີ້ຖືກເກັບໄວ້ແຕ່ບໍ່ສາມາດໃຊ້ເພື່ອເຂົ້າສູ່ລະບົບຫາ Dolibarr ໄດ້. ມັນອາດຈະຖືກໃຊ້ໂດຍໂມດູນ/ອິນເຕີເຟດພາຍນອກແຕ່ຖ້າເຈົ້າບໍ່ຈໍາເປັນຕ້ອງກໍານົດການເຂົ້າສູ່ລະບົບຫຼືລະຫັດຜ່ານສໍາລັບສະມາຊິກ, ເຈົ້າສາມາດປິດຕົວເລືອກ "ຈັດການການເຂົ້າສູ່ລະບົບສໍາລັບສະມາຊິກແຕ່ລະຄົນ" ຈາກການຕັ້ງຄ່າໂມດູນສະມາຊິກ. ຖ້າເຈົ້າຕ້ອງການຈັດການການເຂົ້າສູ່ລະບົບແຕ່ບໍ່ຕ້ອງການລະຫັດຜ່ານໃດ,, ເຈົ້າສາມາດເກັບຊ່ອງນີ້ຫວ່າງໄວ້ເພື່ອຫຼີກເວັ້ນການເຕືອນນີ້. Noteາຍເຫດ: ອີເມລ also ຍັງສາມາດໃຊ້ເປັນການເຂົ້າສູ່ລະບົບໄດ້ຖ້າສະມາຊິກເຊື່ອມໂຍງກັບຜູ້ໃຊ້.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = ໃບແຈ້ງໜີ້ SwissQR ສາມາດຖືກເພີ່ມໃສ່ໃນໃບຮຽກເກັບເງິນທີ່ກຳນົດໃຫ້ຈ່າຍດ້ວຍການໂອນເງິນສິນເຊື່ອເທົ່ານັ້ນ.
 SwissQrCreditorAddressInvalid = ທີ່ຢູ່ເຈົ້າໜີ້ບໍ່ຖືກຕ້ອງ (ເປັນ ZIP ແລະເມືອງຕັ້ງບໍ? (%s)
 SwissQrCreditorInformationInvalid = ຂໍ້ມູນເຈົ້າໜີ້ບໍ່ຖືກຕ້ອງສຳລັບ IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/lo_LA/exports.lang b/htdocs/langs/lo_LA/exports.lang
index 5664d12162c..66fab32f382 100644
--- a/htdocs/langs/lo_LA/exports.lang
+++ b/htdocs/langs/lo_LA/exports.lang
@@ -46,10 +46,16 @@ LineLabel=ປ້າຍຂອງແຖວ
 LineDescription=ລາຍລະອຽດຂອງ
 LineUnitPrice=ລາຄາຫົວ ໜ່ວຍ ຂອງເສັ້ນ
 LineVATRate=ອັດຕາອາກອນມູນຄ່າເພີ່ມຂອງເສັ້ນ
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=ປະລິມານ ສຳ ລັບເສັ້ນ
 LineTotalHT=ຈຳ ນວນບໍ່ລວມເອົາ ອາກອນສໍາລັບເສັ້ນ
 LineTotalTTC=ຈຳ ນວນທີ່ມີພາສີຕໍ່ແຖວ
 LineTotalVAT=ຈຳ ນວນອາກອນມູນຄ່າເພີ່ມ ສຳ ລັບເສັ້ນ
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=ປະເພດຂອງແຖວ (0 = ຜະລິດຕະພັນ, 1 = ການບໍລິການ)
 FileWithDataToImport=ໄຟລ with ທີ່ມີຂໍ້ມູນເພື່ອນໍາເຂົ້າ
 FileToImport=ໄຟລ Source ແຫຼ່ງທີ່ຈະນໍາເຂົ້າ
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=ເລືອກຮູບແບບໄຟລ to ເພ
 ChooseFileToImport=ອັບໂຫຼດໄຟລ then ຈາກນັ້ນຄລິກທີ່ໄອຄອນ %s ເພື່ອເລືອກໄຟລ as ເປັນໄຟລ import ນໍາເຂົ້າແຫຼ່ງທີ່ມາ ...
 SourceFileFormat=ຮູບແບບໄຟລ Source ແຫຼ່ງຂໍ້ມູນ
 FieldsInSourceFile=ຊ່ອງຂໍ້ມູນໃນໄຟລ source ຕົ້ນສະບັບ
-FieldsInTargetDatabase=ເຂດເປົ້າinາຍໃນຖານຂໍ້ມູນ Dolibarr (ກ້າຫານ = ບັງຄັບ)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=ບໍ່ມີຊ່ອງຂໍ້ມູນ
 MoveField=ຍ້າຍcolumnາຍເລກຖັນພາກສະ ໜາມ %s
 ExampleOfImportFile=Example_of_import_file
@@ -76,8 +82,8 @@ NowClickToTestTheImport=ກວດເບິ່ງວ່າຮູບແບບໄ
 RunSimulateImportFile=ດໍາເນີນການຈໍາລອງການນໍາເຂົ້າ
 FieldNeedSource=ຊ່ອງຂໍ້ມູນນີ້ຕ້ອງການຂໍ້ມູນຈາກໄຟລ source ຕົ້ນສະບັບ
 SomeMandatoryFieldHaveNoSource=ເຂດຂໍ້ມູນບັງຄັບບາງບ່ອນບໍ່ມີແຫຼ່ງຂໍ້ມູນຈາກແຟ້ມຂໍ້ມູນ
-InformationOnSourceFile=ຂໍ້ມູນກ່ຽວກັບແຫຼ່ງຂໍ້ມູນ
-InformationOnTargetTables=ຂໍ້ມູນກ່ຽວກັບຂົງເຂດເປົ້າາຍ
+InformationOnSourceFile=Source file
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=ສະຫຼັບຊ່ອງຂໍ້ມູນແຫຼ່ງຂໍ້ມູນຢ່າງ ໜ້ອຍ ໜຶ່ງ ອັນໃນຖັນຊ່ອງຂໍ້ມູນເພື່ອສົ່ງອອກ
 SelectFormat=ເລືອກຮູບແບບໄຟລ import ການນໍາເຂົ້ານີ້
 RunImportFile=ນຳ ເຂົ້າຂໍ້ມູນ
diff --git a/htdocs/langs/lo_LA/hrm.lang b/htdocs/langs/lo_LA/hrm.lang
index e23725fbb61..c30afb40af9 100644
--- a/htdocs/langs/lo_LA/hrm.lang
+++ b/htdocs/langs/lo_LA/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=ອັນດັບທີ່ຕ້ອງການສໍາລັບໂປຣໄຟລ໌ວຽກ
-RequiredRankShort=ອັນດັບທີ່ຕ້ອງການ
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=ຕຳແໜ່ງທີ່ມີໂປຣໄຟລ໌ວຽກນີ້
-EmployeeRank=ລະດັບພະນັກງານສໍາລັບທັກສະນີ້
-EmployeeRankShort=ລະດັບພະນັກງານ
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=ຕໍາແໜ່ງພະນັກງານ
 EmployeePositions=ຕໍາແໜ່ງພະນັກງານ
 EmployeesInThisPosition=ພະນັກງານໃນຕໍາແໜ່ງນີ້
@@ -72,6 +72,9 @@ AddSkill=ເພີ່ມທັກສະໃສ່ໂປຣໄຟລ໌ວຽກ
 RequiredSkills=ທັກສະທີ່ຕ້ອງການສໍາລັບໂປຣໄຟລ໌ວຽກນີ້
 UserRank=ອັນດັບຜູ້ໃຊ້
 SkillList=ບັນຊີລາຍຊື່ທັກສະ
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=ບັນທຶກອັນດັບ
 TypeKnowHow=ຄວາມຮູ້
 TypeHowToBe=ຈະເປັນແນວໃດ
@@ -95,3 +98,5 @@ NeedBusinessTravels=ຕ້ອງການການເດີນທາງທຸລ
 NoDescription=ບໍ່ມີຄໍາອະທິບາຍ
 TheJobProfileHasNoSkillsDefinedFixBefore=ໂປຣໄຟລ໌ວຽກທີ່ຖືກປະເມີນຂອງພະນັກງານນີ້ບໍ່ມີທັກສະທີ່ກຳນົດໄວ້. ກະລຸນາເພີ່ມທັກສະ, ຈາກນັ້ນລຶບ ແລະເລີ່ມການປະເມີນຄືນ.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang
index 3d35457275a..d97917c40bf 100644
--- a/htdocs/langs/lo_LA/mails.lang
+++ b/htdocs/langs/lo_LA/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=ອີເມວ
 EMailing=ອີເມວ
-EMailings=ອີເມວ
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=ອີເມລທັງຫມົດ
+AllEMailings=All mass eMails
 MailCard=ບັດອີເມລ
 MailRecipients=ຜູ້ຮັບ
 MailRecipient=ຜູ້ຮັບ
@@ -26,19 +26,19 @@ MailFile=ໄຟລ ached ແນບ
 MailMessage=ເນື້ອໃນອີເມວ
 SubjectNotIn=ບໍ່ຢູ່ໃນຫົວຂໍ້
 BodyNotIn=ບໍ່ມີຢູ່ໃນຮ່າງກາຍ
-ShowEMailing=ສະແດງອີເມວ
-ListOfEMailings=ລາຍຊື່ອີເມວ
-NewMailing=ການສົ່ງອີເມວໃ່
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=ແກ້ໄຂການສົ່ງອີເມວ
-ResetMailing=ສົ່ງອີເມວຄືນໃ່
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=ລຶບການສົ່ງອີເມວ
-PreviewMailing=ເບິ່ງຕົວຢ່າງການສົ່ງອີເມວ
-CreateMailing=ສ້າງອີເມລ
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=ການສົ່ງອີເມວທີ່ຖືກຕ້ອງ
+ValidMailing=Valid mass Email
 MailingStatusDraft=ຮ່າງ
 MailingStatusValidated=ກວດສອບແລ້ວ
 MailingStatusSent=ສົ່ງແລ້ວ
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=ການກັ່ນຕອງທັງໝົດຕ້
 LineInFile=ສາຍ %s ໃນໄຟລ
 RecipientSelectionModules=ຄໍາຮ້ອງຂໍກໍານົດສໍາລັບການຄັດເລືອກຂອງຜູ້ຮັບ
 MailSelectedRecipients=ຜູ້ຮັບທີ່ເລືອກ
-MailingArea=ພື້ນທີ່ອີເມລ
-LastMailings=ການສົ່ງອີເມວ %s ຫຼ້າສຸດ
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=ສະຖິຕິເປົ້າາຍ
 NbOfCompaniesContacts=ຕິດຕໍ່ພົວພັນເປັນເອກະລັກ/ທີ່ຢູ່
 MailNoChangePossible=ບໍ່ສາມາດປ່ຽນຜູ້ຮັບ ສຳ ລັບການຢືນຢັນອີເມວໄດ້
-SearchAMailing=ຄົ້ນຫາທາງໄປສະນີ
-SendMailing=ສົ່ງອີເມລ
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=ສົ່ງໂດຍ
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=ການສົ່ງອີເມລ can ສາມາດເຮັດໄດ້ຈາກບັນທັດຄໍາສັ່ງ. ຂໍໃຫ້ຜູ້ເບິ່ງແຍງລະບົບເຊີບເວີຂອງເຈົ້າເປີດຕົວ ຄຳ ສັ່ງຕໍ່ໄປນີ້ເພື່ອສົ່ງອີເມວໄປຫາຜູ້ຮັບທັງ:ົດ:
 MailingNeedCommand2=ແນວໃດກໍ່ຕາມເຈົ້າສາມາດສົ່ງພວກມັນທາງອອນໄລນ by ໄດ້ໂດຍການເພີ່ມພາຣາມິເຕີ MAILING_LIMIT_SENDBYWEB ດ້ວຍຄ່າຂອງຈໍານວນສູງສຸດຂອງອີເມວທີ່ເຈົ້າຕ້ອງການສົ່ງເປັນເຊດຊັນ. ເພື່ອເຮັດສິ່ງນີ້, ໄປທີ່ ໜ້າ ຫຼັກ - ຕັ້ງຄ່າ - ອື່ນ Other.
 ConfirmSendingEmailing=ຖ້າເຈົ້າຕ້ອງການສົ່ງອີເມວໂດຍກົງຈາກ ໜ້າ ຈໍນີ້, ກະລຸນາຢືນຢັນວ່າເຈົ້າແນ່ໃຈວ່າເຈົ້າຕ້ອງການສົ່ງອີເມວດຽວນີ້ຈາກໂປຣແກຣມທ່ອງເວັບຂອງເຈົ້າບໍ?
-LimitSendingEmailing=Noteາຍເຫດ: ການສົ່ງອີເມວຈາກອິນເຕີເຟດເວັບແມ່ນເຮັດຫຼາຍຄັ້ງເພື່ອເຫດຜົນດ້ານຄວາມປອດໄພແລະການoutົດເວລາ, ຜູ້ຮັບ <b> %s </b> ຜູ້ຮັບໃນແຕ່ລະຄັ້ງ.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=ລຶບລ້າງລາຍຊື່
 ToClearAllRecipientsClickHere=ຄລິກບ່ອນນີ້ເພື່ອລຶບລ້າງລາຍຊື່ຜູ້ຮັບ ສຳ ລັບການສົ່ງອີເມວນີ້
 ToAddRecipientsChooseHere=ເພີ່ມຜູ້ຮັບໂດຍການເລືອກຈາກລາຍການ
-NbOfEMailingsReceived=ໄດ້ຮັບອີເມວ ຈຳ ນວນຫຼວງຫຼາຍ
-NbOfEMailingsSend=ສົ່ງອີເມວ ຈຳ ນວນຫຼວງຫຼາຍ
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ບັນທຶກ ID
 DeliveryReceipt=ການຂົນສົ່ງ Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=ເຈົ້າສາມາດໃຊ້ຕົວແຍກ <b> ຈຸດ </b> ເພື່ອລະບຸຕົວຮັບຈໍານວນນຶ່ງ.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=ບໍ່ມີການແຈ້ງອີເມລ au
 ANotificationsWillBeSent=1 ການແຈ້ງເຕືອນອັດຕະໂນມັດຈະຖືກສົ່ງທາງອີເມລ
 SomeNotificationsWillBeSent=%s ການແຈ້ງເຕືອນອັດຕະໂນມັດຈະຖືກສົ່ງທາງອີເມລ
 AddNewNotification=ສະtoັກຮັບການແຈ້ງເຕືອນທາງອີເມວອັດຕະໂນມັດໃ(່ (ເປົ້າ/າຍ/ເຫດການ)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=ການຕັ້ງຄ່າການສົ່ງອີເມວຖືກຕັ້ງເປັນ '%s'. ບໍ່ສາມາດໃຊ້ໂmodeດນີ້ເພື່ອສົ່ງອີເມວ ຈຳ ນວນຫຼາຍ.
 MailSendSetupIs2=ກ່ອນ​ອື່ນ​ເຈົ້າ​ຕ້ອງ​ໄປ​ກັບ​ບັນ​ຊີ​ຜູ້​ບໍ​ລິ​ຫານ, ເຂົ້າ​ໄປ​ໃນ​ເມ​ນູ %sHome - Setup - EMails%s ເພື່ອ​ປ່ຽນ​ພາ​ຣາ​ມິ​ເຕີ <strong>'%s'</strong> ເພື່ອໃຊ້ໂໝດ '<span class='0ecf29ec' </span>'. ດ້ວຍ​ຮູບ​ແບບ​ນີ້, ທ່ານ​ສາ​ມາດ​ເຂົ້າ​ໄປ​ໃນ​ການ​ຕັ້ງ​ຄ່າ​ຂອງ​ເຄື່ອງ​ແມ່​ຂ່າຍ SMTP ສະ​ຫນອງ​ໃຫ້​ໂດຍ​ຜູ້​ໃຫ້​ບໍ​ລິ​ການ​ອິນ​ເຕີ​ເນັດ​ຂອງ​ທ່ານ​ແລະ​ການ​ນໍາ​ໃຊ້​ຄຸນ​ນະ​ສົມ​ບັດ​ການ​ສົ່ງ​ອີ​ເມວ​ມະ​ຫາ​ຊົນ​.
 MailSendSetupIs3=ຖ້າເຈົ້າມີຄໍາຖາມກ່ຽວກັບວິທີຕັ້ງຄ່າເຊີບເວີ SMTP ຂອງເຈົ້າ, ເຈົ້າສາມາດຖາມຫາ %s.
@@ -183,7 +185,7 @@ Information=ຂໍ້ມູນຂ່າວສານ
 ContactsWithThirdpartyFilter=ລາຍຊື່ຜູ້ຕິດຕໍ່ຕົວກັ່ນຕອງຂອງພາກສ່ວນທີສາມ
 Unanswered=ບໍ່ມີ ຄຳ ຕອບ
 Answered=ຕອບ
-IsNotAnAnswer=ບໍ່ແມ່ນ ຄຳ ຕອບ (ອີເມວເບື້ອງຕົ້ນ)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=ເປັນ ຄຳ ຕອບຂອງອີເມວເບື້ອງຕົ້ນ
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=ຄ່າເລີ່ມຕົ້ນຂອງຊ່ອງຂໍ້ມູນ '%s' ເມື່ອສ້າງລາຍຊື່ຜູ່ຕິດຕໍ່ໃໝ່
@@ -199,6 +201,6 @@ ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index 3c966c465ba..9d96429f5a6 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -37,6 +37,7 @@ Translation=ການແປພາສາ
 Translations=ການແປ
 CurrentTimeZone=ເຂດເວລາ PHP (ເຊີບເວີ)
 EmptySearchString=ໃສ່ເງື່ອນໄຂການຊອກຫາທີ່ບໍ່ຫວ່າງເປົ່າ
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=ໃສ່ເກນວັນທີ
 NoRecordFound=ບໍ່ພົບບັນທຶກ
 NoRecordDeleted=ບໍ່ໄດ້ລຶບບັນທຶກ
@@ -45,6 +46,7 @@ NoError=ບໍ່ມີຂໍ້ຜິດພາດ
 Error=ຜິດພາດ
 Errors=ຂໍ້ຜິດພາດ
 ErrorFieldRequired=ຕ້ອງການຊ່ອງຂໍ້ມູນ '%s'
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=ຊ່ອງຂໍ້ມູນ '%s' ມີຄ່າບໍ່ດີ
 ErrorFileDoesNotExists=ບໍ່ມີໄຟລ a %s
 ErrorFailedToOpenFile=ລົ້ມເຫລວໃນການເປີດໄຟລ 0 %s
@@ -308,6 +310,7 @@ DateBuild=ລາຍງານວັນສ້າງ
 DatePayment=ວັນທີຂອງການຈ່າຍເງິນ
 DateApprove=ວັນທີອະນຸມັດ
 DateApprove2=ວັນທີອະນຸມັດ (ການອະນຸມັດຄັ້ງທີສອງ)
+PendingSince=Pending since
 RegistrationDate=ວັນລົງທະບຽນ
 UserCreation=ຜູ້ໃຊ້ສ້າງ
 UserModification=ຜູ້ໃຊ້ດັດແກ້
@@ -495,7 +498,7 @@ ActionRunningNotStarted=ເພື່ອເລີ່ມຕົ້ນ
 ActionRunningShort=ກຳ ລັງ ດຳ ເນີນຢູ່
 ActionDoneShort=ສໍາເລັດ
 ActionUncomplete=ບໍ່ສົມບູນ
-LatestLinkedEvents=ເຫດການທີ່ເຊື່ອມໂຍງ %s ຫຼ້າສຸດ
+LatestLinkedEvents=The last %s events
 CompanyFoundation=ບໍລິສັດ/ອົງກອນ
 Accountant=ນັກບັນຊີ
 ContactsForCompany=ລາຍຊື່ຜູ້ຕິດຕໍ່ ສຳ ລັບພາກສ່ວນທີສາມນີ້
@@ -503,6 +506,7 @@ ContactsAddressesForCompany=ລາຍຊື່ຜູ້ຕິດຕໍ່/ທີ
 AddressesForCompany=ທີ່ຢູ່ ສຳ ລັບພາກສ່ວນທີສາມນີ້
 ActionsOnCompany=ເຫດການສໍາລັບພາກສ່ວນທີສາມນີ້
 ActionsOnContact=ເຫດການສໍາລັບການຕິດຕໍ່/ທີ່ຢູ່ນີ້
+ActionsOnUser=Events for this user
 ActionsOnContract=ເຫດການສໍາລັບສັນຍານີ້
 ActionsOnMember=ເຫດການກ່ຽວກັບສະມາຊິກນີ້
 ActionsOnProduct=ເຫດການກ່ຽວກັບຜະລິດຕະພັນນີ້
@@ -720,6 +724,8 @@ TextUsedInTheMessageBody=ເນື້ອໃນອີເມວ
 SendAcknowledgementByMail=ສົ່ງອີເມວຢືນຢັນ
 SendMail=ສົ່ງອີເມລ
 Email=ອີເມລ
+EMail=Email
+EMails=Emails
 NoEMail=ບໍ່ມີອີເມວ
 AlreadyRead=ອ່ານແລ້ວ
 NotRead=ຍັງບໍ່ໄດ້ອ່ານ
@@ -792,7 +798,7 @@ Notes=າຍເຫດ
 AddNewLine=ເພີ່ມແຖວໃ່
 AddFile=ເພີ່ມໄຟລ
 FreeZone=ຜະລິດຕະພັນຂໍ້ຄວາມຟຣີ
-FreeLineOfType=ລາຍການຂໍ້ຄວາມຟຣີ, ພິມ:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Clone object ດ້ວຍຄຸນລັກສະນະຕົ້ນຕໍຂອງມັນ
 ReGeneratePDF=ສ້າງ PDF ຄືນໃ່
 PDFMerge=ການລວມ PDF
@@ -878,12 +884,14 @@ toward=ໄປສູ່
 Access=ການເຂົ້າເຖິງ
 SelectAction=ເລືອກປະຕິບັດ
 SelectTargetUser=ເລືອກຜູ້ໃຊ້/ພະນັກງານເປົ້າາຍ
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=ໃຊ້ Ctrl+C ເພື່ອ ສຳ ເນົາໄວ້ໃນຄລິບບອດ
 SaveUploadedFileWithMask=ບັນທຶກໄຟລ on ໃສ່ເຊີບເວີດ້ວຍຊື່ "<strong> %s </strong>" (ຖ້າບໍ່ດັ່ງນັ້ນ "%s")
 OriginFileName=ຊື່ໄຟລ Original ຕົ້ນສະບັບ
 SetDemandReason=ກໍານົດແຫຼ່ງ
 SetBankAccount=ກໍານົດບັນຊີທະນາຄານ
 AccountCurrency=ສະກຸນເງິນຂອງບັນຊີ
+AccountancyCode=Accounting Code
 ViewPrivateNote=ເບິ່ງບັນທຶກ
 XMoreLines=%s ແຖວຖືກເຊື່ອງໄວ້
 ShowMoreLines=ສະແດງເສັ້ນຫຼາຍ/ໜ້ອຍ
@@ -924,6 +932,7 @@ ConfirmMassDeletionQuestion=ເຈົ້າແນ່ໃຈບໍ່ວ່າເ
 ConfirmMassClone=ການຢືນຢັນການໂຄນເປັນຈຳນວນຫຼາຍ
 ConfirmMassCloneQuestion=ເລືອກໂຄງການເພື່ອ clone
 ConfirmMassCloneToOneProject=Clone ໄປຫາໂຄງການ %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=ຈຸດປະສົງທີ່ກ່ຽວຂ້ອງ
 ClassifyBilled=ຈັດ​ປະ​ເພດ​ການ​ເກັບ​ເງິນ​
 ClassifyUnbilled=ຈັດປະເພດທີ່ບໍ່ໄດ້ເກັບເງິນ
@@ -960,10 +969,11 @@ PrivateDownloadLinkDesc=ເຈົ້າຕ້ອງເຂົ້າສູ່ລ
 Download=ດາວໂຫລດ
 DownloadDocument=ດາວໂຫລດເອກະສານ
 DownloadSignedDocument=ດາວໂຫລດເອກະສານທີ່ເຊັນແລ້ວ
-ActualizeCurrency=ປັບປຸງອັດຕາສະກຸນເງິນ
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=ປີການເງິນ
 ModuleBuilder=ໂມດູນແລະຕົວສ້າງແອັບພລິເຄຊັນ
 SetMultiCurrencyCode=ຕັ້ງສະກຸນເງິນ
+SetMultiCurrencyRate=Set currency rate
 BulkActions=ຄຳ ສັ່ງຊຸດໃຫຍ່
 ClickToShowHelp=ຄລິກເພື່ອສະແດງ ຄຳ ແນະ ນຳ ການຊ່ວຍເຫຼືອ
 WebSite=ເວັບໄຊທ
@@ -1103,6 +1113,7 @@ PayedBy=ຈ່າຍໂດຍ
 PayedTo=ຈ່າຍໃຫ້
 Monthly=ປະຈໍາເດືອນ
 Quarterly=ປະຈໍາໄຕມາດ
+Quarter=Quarter
 Annual=ປະຈໍາປີ
 Local=ທ້ອງຖິ່ນ
 Remote=ຫ່າງໄກສອກຫຼີກ
@@ -1145,6 +1156,7 @@ ContactDefault_project_task=ໜ້າ ວຽກ
 ContactDefault_propal=ຂໍ້ສະ ເໜີ
 ContactDefault_supplier_proposal=ຂໍ້ສະ ເໜີ ຂອງຜູ້ສະ ໜອງ
 ContactDefault_ticket=ປີ້
+ContactDefault_societe=Third party
 ContactAddedAutomatically=ເພີ່ມການຕິດຕໍ່ຈາກບົດບາດການຕິດຕໍ່ພາກສ່ວນທີສາມ
 More=ເພີ່ມເຕີມ
 ShowDetails=ສະ​ແດງ​ລາຍ​ລະ​ອຽດ
@@ -1187,6 +1199,8 @@ SetSupervisor=ຕັ້ງຜູ້ຄຸມງານ
 CreateExternalUser=ສ້າງຜູ້ໃຊ້ພາຍນອກ
 ConfirmAffectTag=ການມອບໝາຍແທັກຫຼາຍ
 ConfirmAffectUser=ການມອບໝາຍຜູ້ໃຊ້ຈຳນວນຫຼາຍ
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=ພາລະບົດບາດມອບຫມາຍໃນແຕ່ລະໂຄງການ / ໂອກາດ
 TasksRole=ໜ້າທີ່ມອບໝາຍໃນແຕ່ລະໜ້າວຽກ (ຖ້າໃຊ້)
 ConfirmSetSupervisor=ຊຸດຜູ້ຄຸມຫຼາຍ
@@ -1238,6 +1252,9 @@ CommercialsAffected=ມອບໝາຍຕົວແທນຂາຍ
 CommercialAffected=ມອບໝາຍຕົວແທນຂາຍ
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=ຂໍ້​ຄວາມ​ຂອງ​ເຈົ້າ
 YourMessageHasBeenReceived=ຂໍ້ຄວາມຂອງເຈົ້າໄດ້ຮັບແລ້ວ. ພວກເຮົາຈະຕອບຫຼືຕິດຕໍ່ທ່ານໄວເທົ່າທີ່ຈະໄວໄດ້.
 UrlToCheck=Url ເພື່ອກວດສອບ
@@ -1280,6 +1297,7 @@ AmountSalary=ຈຳນວນເງິນເດືອນ
 InvoiceSubtype=ປະເພດຍ່ອຍຂອງໃບເກັບເງິນ
 ConfirmMassReverse=ການຢືນຢັນ Reverse ຫຼາຍ
 ConfirmMassReverseQuestion=ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການກັບຄືນ %s ບັນທຶກທີ່ເລືອກ?
+ConfirmActionXxx=Confirm action %s
 ElementType=Element type
 ElementId=Element Id
 Encrypted=ເຂົ້າລະຫັດແລ້ວ
@@ -1299,3 +1317,35 @@ AllEntities=All entities
 TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
+auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/lo_LA/members.lang b/htdocs/langs/lo_LA/members.lang
index 2a261af014b..184795b81cd 100644
--- a/htdocs/langs/lo_LA/members.lang
+++ b/htdocs/langs/lo_LA/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=ຖ້າຕ້ອງການການຈອງ, ກ
 DeleteType=ລຶບ
 VoteAllowed=ອະນຸຍາດການລົງຄະແນນສຽງ
 Physical=ບຸກຄົນ
-Moral=ບໍລິສັດ
-MorAndPhy=ບໍລິສັດແລະບຸກຄົນ
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=ເປີດໃຊ້ຄືນໃໝ່
 ExcludeMember=ບໍ່ລວມສະມາຊິກ
 Exclude=ຍົກເວັ້ນ
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=ສະຖິຕິສະມາຊິກຕາມພາ
 NbOfMembers=ຈໍານວນສະມາຊິກທັງົດ
 NbOfActiveMembers=ຈໍານວນສະມາຊິກທີ່ເຄື່ອນໄຫວໃນປະຈຸບັນທັງົດ
 NoValidatedMemberYet=ບໍ່ພົບສະມາຊິກທີ່ກວດສອບແລ້ວ
-MembersByCountryDesc=ໜ້າ ຈໍນີ້ສະແດງໃຫ້ເຈົ້າເຫັນສະຖິຕິຂອງສະມາຊິກຕາມແຕ່ລະປະເທດ. ເສັ້ນສະແດງແລະແຜນວາດແມ່ນຂຶ້ນກັບການມີໃຫ້ບໍລິການກຣາບອອນໄລນ Google ຂອງ Google ລວມທັງການມີການເຊື່ອມຕໍ່ອິນເຕີເນັດທີ່ໃຊ້ໄດ້.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=ໜ້າ ຈໍນີ້ສະແດງໃຫ້ເຈົ້າເຫັນສະຖິຕິຂອງສະມາຊິກຕາມລັດ/ແຂວງ/ເມືອງ.
 MembersByTownDesc=ໜ້າ ຈໍນີ້ສະແດງສະຖິຕິຂອງສະມາຊິກຕາມເມືອງ.
 MembersByNature=ໜ້າ ຈໍນີ້ສະແດງໃຫ້ເຈົ້າເຫັນສະຖິຕິຂອງສະມາຊິກໂດຍ ທຳ ມະຊາດ.
@@ -208,25 +209,25 @@ NewMemberbyWeb=ເພີ່ມສະມາຊິກໃ່ແລ້ວ. ກຳ 
 NewMemberForm=ແບບຟອມສະມາຊິກໃ່
 SubscriptionsStatistics=ສະຖິຕິການປະກອບສ່ວນ
 NbOfSubscriptions=ຈໍານວນການປະກອບສ່ວນ
-AmountOfSubscriptions=ຈໍານວນທີ່ເກັບກໍາຈາກການປະກອບສ່ວນ
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=ລາຍຮັບ (ສໍາລັບບໍລິສັດ) ຫຼືງົບປະມານ (ສໍາລັບພື້ນຖານ)
-DefaultAmount=ຈໍານວນເລີ່ມຕົ້ນຂອງການປະກອບສ່ວນ (ໃຊ້ພຽງແຕ່ຖ້າບໍ່ມີຈໍານວນທີ່ຖືກກໍານົດຢູ່ໃນລະດັບປະເພດສະມາຊິກ)
-MinimumAmount=ຈໍານວນຕໍາ່ສຸດທີ່ (ໃຊ້ພຽງແຕ່ເມື່ອຈໍານວນການປະກອບສ່ວນແມ່ນບໍ່ເສຍຄ່າ)
-CanEditAmount=ຈໍານວນສະມາຊິກສາມາດຖືກກໍານົດໂດຍສະມາຊິກ
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=ຜູ້ເຂົ້າຊົມສາມາດເລືອກ / ແກ້ໄຂຈໍານວນການປະກອບສ່ວນຂອງມັນໂດຍບໍ່ຄໍານຶງເຖິງປະເພດຂອງສະມາຊິກ
 AmountIsLowerToMinimumNotice=ຈຳນວນຕໍ່າກວ່າ %s
 MEMBER_NEWFORM_PAYONLINE=ຫຼັງຈາກການລົງທະບຽນອອນໄລນ໌, ປ່ຽນອັດຕະໂນມັດໄປຫາຫນ້າການຈ່າຍເງິນອອນໄລນ໌
 ByProperties=ໂດຍທໍາມະຊາດ
 MembersStatisticsByProperties=ສະຖິຕິສະມາຊິກໂດຍ ທຳ ມະຊາດ
-VATToUseForSubscriptions=ອັດຕາອາກອນມູນຄ່າເພີ່ມເພື່ອໃຊ້ສໍາລັບການປະກອບສ່ວນ
-NoVatOnSubscription=ບໍ່ມີ VAT ສໍາລັບການປະກອບສ່ວນ
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=ຜະ​ລິດ​ຕະ​ພັນ​ທີ່​ໃຊ້​ສໍາ​ລັບ​ບັນ​ຊີ​ການ​ປະ​ກອບ​ສ່ວນ​ເຂົ້າ​ໃນ​ໃບ​ເກັບ​ເງິນ​: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=ຊື່ຫຼືບໍລິສັດ
 SubscriptionRecorded=ບັນທຶກການປະກອບສ່ວນ
 NoEmailSentToMember=ບໍ່ໄດ້ສົ່ງອີເມວຫາສະມາຊິກ
 EmailSentToMember=ສົ່ງອີເມວຫາສະມາຊິກທີ່ %s
-SendReminderForExpiredSubscriptionTitle=ສົ່ງການແຈ້ງເຕືອນທາງອີເມວສຳລັບການປະກອບສ່ວນທີ່ໝົດອາຍຸແລ້ວ
-SendReminderForExpiredSubscription=ສົ່ງ​ການ​ແຈ້ງ​ເຕືອນ​ທາງ​ອີ​ເມລ​ຫາ​ສະ​ມາ​ຊິກ​ໃນ​ເວ​ລາ​ທີ່​ການ​ປະ​ກອບ​ສ່ວນ​ກໍາ​ລັງ​ຈະ​ຫມົດ​ອາ​ຍຸ (ພາ​ຣາ​ມິ​ເຕີ​ແມ່ນ​ຈໍາ​ນວນ​ຂອງ​ມື້​ກ່ອນ​ທີ່​ຈະ​ສິ້ນ​ສຸດ​ການ​ສະ​ມາ​ຊິກ​ເພື່ອ​ສົ່ງ​ການ​ແຈ້ງ​ເຕືອນ​. ມັນ​ສາ​ມາດ​ເປັນ​ລາຍ​ການ​ຂອງ​ວັນ​ທີ່​ແຍກ​ອອກ​ເປັນ​ເຄື່ອງ​ຫມາຍ​ເລກ​, ສໍາ​ລັບ​ການ​ຍົກ​ຕົວ​ຢ່າງ '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=ການເປັນສະມາຊິກໄດ້ຈ່າຍໃຫ້ກັບໄລຍະປະຈຸບັນ (ຈົນກ່ວາ %s)
 YouMayFindYourInvoiceInThisEmail=ເຈົ້າອາດຈະພົບໃບເກັບເງິນຂອງເຈົ້າຕິດຢູ່ກັບອີເມວນີ້
 XMembersClosed=ສະມາຊິກ %s ປິດ
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=ພາກສ່ວນທີສາມແມ່ນນ
 MemberFirstname=ຊື່ສະມາຊິກ
 MemberLastname=ນາມສະກຸນສະມາຊິກ
 MemberCodeDesc=ລະຫັດສະມາຊິກ, ເປັນເອກະລັກສໍາລັບສະມາຊິກທັງຫມົດ
-MemberSubscriptionStartFirstDayOf=ວັນທີເລີ່ມຕົ້ນຂອງການເປັນສະມາຊິກແມ່ນກົງກັບມື້ທໍາອິດຂອງ a
-MemberSubscriptionStartAfter=ໄລຍະເວລາຕໍ່າສຸດກ່ອນທີ່ຈະມີຜົນບັງຄັບໃຊ້ຂອງວັນທີເລີ່ມຕົ້ນຂອງການສະໝັກໃຊ້ ຍົກເວັ້ນການຕໍ່ອາຍຸ (ຕົວຢ່າງ +3m = +3 ເດືອນ, -5d = -5 ມື້, +1Y = +1 ປີ)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=ການເປັນສະມາຊິກແມ່ນເຊື່ອມໂຍງກັບທຸລະກໍາທີ່ສອດຄ່ອງກັນ ດັ່ງນັ້ນການດັດແກ້ນີ້ບໍ່ໄດ້ຮັບອະນຸຍາດ.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/lo_LA/salaries.lang b/htdocs/langs/lo_LA/salaries.lang
index ef44d253851..98cc0f48337 100644
--- a/htdocs/langs/lo_LA/salaries.lang
+++ b/htdocs/langs/lo_LA/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=ເງິນເດືອນໃ່
 AddSalary=ເພີ່ມເງິນເດືອນ
 NewSalaryPayment=ບັດເງິນເດືອນໃ່
 AddSalaryPayment=ຕື່ມການຈ່າຍເງິນເດືອນ
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=ການຈ່າຍເງິນເດືອນ
 SalariesPayments=ການຈ່າຍເງິນເດືອນ
 SalariesPaymentsOf=ການຈ່າຍເງິນເດືອນຂອງ %s
@@ -27,7 +29,7 @@ FillFieldFirst=ຕື່ມຂໍ້ມູນໃສ່ພາກສະຫນາ
 UpdateAmountWithLastSalary=ກໍານົດຈໍານວນເງິນເດືອນສຸດທ້າຍ
 MakeTransferRequest=ເຮັດການຮ້ອງຂໍການໂອນ
 VirementOrder=ການຮ້ອງຂໍການໂອນສິນເຊື່ອ
-BankTransferAmount=ຈໍານວນການໂອນສິນເຊື່ອ
 WithdrawalReceipt=ຄໍາສັ່ງໂອນສິນເຊື່ອ
 OrderWaiting=ລໍຖ້າການສັ່ງຊື້
 FillEndOfMonth=ຕື່ມທ້າຍເດືອນ
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
index 8427561f6d7..c03fb7285ff 100644
--- a/htdocs/langs/lo_LA/website.lang
+++ b/htdocs/langs/lo_LA/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=ໃຊ້ຊື່/ນາມແotherງອື່ນ other 
 WEBSITE_CSS_URL=URL ຂອງໄຟລ CSS CSS ພາຍນອກ
 WEBSITE_CSS_INLINE=ເນື້ອໃນຂອງໄຟລ CSS CSS (ທຳ ມະດາຢູ່ໃນທຸກ ໜ້າ)
 WEBSITE_JS_INLINE=ເນື້ອຫາໄຟລ໌ JavaScript (ທົ່ວໄປໃນທຸກຫນ້າ)
-WEBSITE_HTML_HEADER=ການເພີ່ມໃສ່ຢູ່ລຸ່ມສຸດຂອງສ່ວນຫົວຂອງ HTML (ທຳ ມະດາຢູ່ໃນທຸກ ໜ້າ)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=ໄຟລ ot ຫຸ່ນຍົນ (robots.txt)
 WEBSITE_HTACCESS=ເວັບໄຊທ file. ໄຟລ htaccess
 WEBSITE_MANIFEST_JSON=ໄຟລ manifest manifest.json ຂອງເວັບໄຊທ
@@ -56,16 +56,17 @@ ReadPerm=ອ່ານ
 WritePerm=ຂຽນ
 TestDeployOnWeb=ທົດສອບ/ນຳ ໃຊ້ຢູ່ເທິງເວັບ
 PreviewSiteServedByWebServer= <u> ສະແດງຕົວຢ່າງ %s ຢູ່ໃນແຖບໃ່. </u> <br> <br> %s ຈະຖືກບໍລິການໂດຍເຊີບເວີເວັບພາຍນອກ (ເຊັ່ນ Apache, Nginx, IIS). ທ່ານຕ້ອງການຕິດຕັ້ງແລະການຕັ້ງຄ່າຂອງເຄື່ອງແມ່ຂ່າຍນີ້ກ່ອນທີ່ຈະຊີ້ໃຫ້ເຫັນເຖິງລະບົບ: <br> <strong> %s </strong> <br> URL ບໍລິການໂດຍເຄື່ອງແມ່ຂ່າຍຂອງພາຍນອກ: <br> <strong> %s </strong>
-PreviewSiteServedByDolibarr= <u> ສະແດງຕົວຢ່າງ %s ຢູ່ໃນແຖບໃ່. </u> <br> <br> %s ຈະຖືກບໍລິການໂດຍເຊີບເວີ Dolibarr ດັ່ງນັ້ນມັນບໍ່ຕ້ອງການມີເວັບເຊີບເວີພິເສດໃດ ((ເຊັ່ນ: Apache, Nginx, IIS) ຕິດຕັ້ງໃສ່. <br> ຄວາມບໍ່ສະດວກແມ່ນ URL ຂອງ ໜ້າ ເວັບຕ່າງ not ບໍ່ເປັນມິດກັບຜູ້ໃຊ້ແລະເລີ່ມດ້ວຍເສັ້ນທາງຂອງ Dolibarr ຂອງທ່ານ. <br> URL ບໍລິການໂດຍກໍາໄລ: <br> <strong> %s </strong> <br> <br> ການນໍາໃຊ້ເວັບໄຊຕ໌ພາຍນອກຂອງເຄື່ອງແມ່ຂ່າຍຂອງທ່ານເອງເພື່ອຮັບໃຊ້ເວັບໄຊດັ່ງກ່າວນີ້, ສ້າງພາບ virtual ກ່ຽວກັບເຄື່ອງແມ່ຂ່າຍເວັບຂອງທ່ານທີ່ຈຸດກ່ຽວກັບລະບົບ <br> <strong> %s </strong> <br> ແລ້ວໃສ່ຊື່ຂອງເຄື່ອງແມ່ຂ່າຍ virtual ນີ້ ໃນຄຸນສົມບັດຂອງເວັບໄຊທ this ນີ້ແລະຄລິກທີ່ລິ້ງ "ທົດສອບ/ປັບໃຊ້ໃນເວັບ".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL ຂອງແມ່ຂ່າຍສະເືອນໃຫ້ບໍລິການໂດຍເຊີບເວີເວັບພາຍນອກບໍ່ໄດ້ລະບຸ
 NoPageYet=ບໍ່ມີ ໜ້າ ເທື່ອ
 YouCanCreatePageOrImportTemplate=ເຈົ້າສາມາດສ້າງ ໜ້າ ໃor່ຫຼື ນຳ ເຂົ້າແມ່ແບບເວັບໄຊທ full ເຕັມຮູບແບບ
 SyntaxHelp=ຊ່ວຍເຫຼືອກ່ຽວກັບຄໍາແນະນໍາໄວຍາກອນສະເພາະ
 YouCanEditHtmlSourceckeditor=ເຈົ້າສາມາດແກ້ໄຂລະຫັດແຫຼ່ງ HTML ໂດຍການໃຊ້ປຸ່ມ "ແຫຼ່ງ" ໃນຕົວແກ້ໄຂ.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=ສໍາລັບຮູບພາບທີ່ແບ່ງປັນກັບການເຊື່ອມຕໍ່ແບ່ງປັນ (ເປີດການເຂົ້າເຖິງໂດຍໃຊ້ລະຫັດ hash ການແບ່ງປັນຂອງໄຟລ)), ໄວຍະກອນແມ່ນ: <br> <strong> &lt;img src = "/viewimage.php? hashp = 12345679012 ... " a0012c7d009007700775 a039c087007c007c007c007c0b087c07c0b0785c087b07b0770c087b087b07b0770c07b07b07b07b0775c0b087b087b07b07b087b087b087a087b087b087b087c087c087c07b07b07b087c06b08770
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Clone page/container
 CloneSite=Clone site
@@ -87,15 +88,15 @@ WebsiteAccount=ບັນຊີເວັບໄຊທ
 WebsiteAccounts=ບັນຊີເວັບໄຊທ
 AddWebsiteAccount=ສ້າງບັນຊີເວັບໄຊທ
 BackToListForThirdParty=ກັບໄປຫາບັນຊີລາຍຊື່ສໍາລັບພາກສ່ວນທີສາມ
-DisableSiteFirst=ປິດການ ນຳ ໃຊ້ເວັບໄຊທທໍາອິດ
+DisableSiteFirst=Put website offline first
 MyContainerTitle=ຊື່ເວັບໄຊທຂອງຂ້ອຍ
 AnotherContainer=ນີ້ແມ່ນວິທີການລວມເອົາເນື້ອໃນຂອງ ໜ້າ/ຖັງອື່ນ (ເຈົ້າອາດຈະມີຂໍ້ຜິດພາດຢູ່ທີ່ນີ້ຖ້າເຈົ້າເປີດໃຊ້ລະຫັດແບບເຄື່ອນໄຫວເພາະວ່າຕົວຄວບຄຸມຍ່ອຍຍ່ອຍທີ່dedັງຢູ່ອາດຈະບໍ່ມີຢູ່)
 SorryWebsiteIsCurrentlyOffLine=ຂໍອະໄພ, ປະຈຸບັນເວັບໄຊທ off ນີ້ບໍ່ໄດ້ຢູ່ໃນເສັ້ນ. ກະລຸນາກັບມາໃນພາຍຫຼັງ ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=ເປີດໃຊ້ຕາຕະລາງເກັບຮັກສາບັນຊີເວັບໄຊທ ((ເຂົ້າສູ່ລະບົບ / ຜ່ານ) ສໍາລັບແຕ່ລະເວັບໄຊທ / / ບຸກຄົນທີສາມ
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=ທຳ ອິດເຈົ້າຕ້ອງ ກຳ ນົດ ໜ້າ ຫຼັກເລີ່ມຕົ້ນ
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correctty when used on a grabbed external page.
-OnlyEditionOfSourceForGrabbedContent=ສະບັບຂອງແຫຼ່ງ HTML ເທົ່ານັ້ນທີ່ເປັນໄປໄດ້ເມື່ອມີການດຶງເອົາເນື້ອໃນຈາກເວັບໄຊທ external ພາຍນອກ
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=ຈັບເອົາຮູບພາບຕ່າງ into ເຂົ້າໄປໃນ css ແລະ ໜ້າ.
 ImagesShouldBeSavedInto=ຮູບພາບຄວນຖືກບັນທຶກໄວ້ໃນລາຍການ
 WebsiteRootOfImages=ບັນຊີລາຍຊື່ຮາກສໍາລັບຮູບພາບຂອງເວັບໄຊທ
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Remove filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Categories
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index b9c491088b0..245d1a728d5 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however som
 FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Trūkstami failai
 FilesUpdated=Atnaujinti failai
 FilesModified=Modified Files
@@ -135,7 +135,7 @@ CurrentValueSeparatorThousand=Tūkstančių skyriklis
 Destination=Paskirties vieta
 IdModule=Modulio ID
 IdPermissions=Leidimų ID
-LanguageBrowserParameter=Parametro %-as
+LanguageBrowserParameter=Parametro %s
 LocalisationDolibarrParameters=Localization parameters
 ClientHour=Kliento laikas (vartotojas)
 OSTZ=Serverio OS laiko zona
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Naudojamas tik kai kuriose darbotvarkės opcijose
 Security=Saugumas
 Passwords=Slaptažodžiai
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Computed field
-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=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'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored WITHOUT encryption (field is just hidden with stars on screen).<br><br>Enter value 'dolcrypt' to encode value with a reversible encryption algorithm. Clear data can still be known and edited but is encrypted into database.<br><br>Enter 'auto' (or 'md5', 'sha256', 'password_hash', ...) to use the default password encryption algorithm (or md5, sha256, password_hash...) to save the non reversible hashed password into database (no way to retrieve original value)
@@ -475,7 +476,6 @@ ExtrafieldParamHelpselect=List of values must be lines with format key,value (wh
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarily a primary int key<br>- filtersql is a condition. It must use the USF syntax. Example: (active:=:1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>If you want to filter on extrafields use syntax  extra.fieldcode=... (where fieldcode is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1 to display only active value)<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
@@ -520,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
 WarningPHPMailD=It is therefore recommended to change the sending method of e-mails to the value "SMTP".
 WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
-WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -568,8 +568,8 @@ Module10Name=Accounting (simplified)
 Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
 Module20Name=Pasiūlymai
 Module20Desc=Komercinių pasiūlymų valdymas
-Module22Name=Mass Emailings
-Module22Desc=Manage bulk emailing
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energija
 Module23Desc=Stebėti energijos suvartojimą
 Module25Name=Sales Orders
@@ -848,10 +848,10 @@ Permission212=Tvarkyti rūšis/serijas
 Permission213=Aktyvinti rūšis/serijas
 Permission214=Nustatyti Telefoniją
 Permission215=Nustatyti aprūpintojus
-Permission221=Skaityti el. paštą
-Permission222=Sukurti/keisti el. paštą (temos, gavėjai...)
-Permission223=Patvirtinti el. paštą (leidžia siųsti)
-Permission229=Ištrinti el. paštą
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Peržiūrėti gavėjus ir informaciją
 Permission238=Rankiniu būdu siųsti el. paštą
 Permission239=Ištrinti laiškus po patvirtinimo arba išsiųsti
@@ -1106,6 +1106,7 @@ DictionaryStaff=Number of Employees
 DictionaryAvailability=Pristatymo vėlavimas
 DictionaryOrderMethods=Order methods
 DictionarySource=Pasiūlymų/užsakymų kilmė
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Personalized groups for reports
 DictionaryAccountancysystem=Sąskaitų plano modeliai
 DictionaryAccountancyJournal=Apskaitos žurnalai
@@ -1135,11 +1136,11 @@ BackToDictionaryList=Back to Dictionaries list
 TypeOfRevenueStamp=Type of tax stamp
 VATManagement=Sales Tax Management
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
 VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
 VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Type of sales tax
 LTRate=Norma
@@ -1175,6 +1176,7 @@ NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), yo
 LabelUsedByDefault=Etiketė naudojamas pagal nutylėjimą, jei kodui nerandamas vertimas
 LabelOnDocuments=Dokumentų etiketė
 LabelOrTranslationKey=Label or translation key
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1432,7 +1434,7 @@ AddVatInList=Display Customer/Vendor VAT number into combo lists.
 AddAdressInList=Display Customer/Vendor address into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
-FieldEdition=Lauko %s redagavimas
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Pavyzdys: +2 (pildyti tik tuomet, jei laiko juostos nuokrypio problemos yra žymios)
 GetBarCode=Gauti brūkšninį kodą
 NumberingModules=Numbering models
@@ -1487,6 +1489,8 @@ ForceInvoiceDate=Sąskaitos-faktūros data įsigalioja patvirtinimo datą
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
 SuggestPaymentByChequeToAddress=Suggest payment by check to
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Laisvos formos tekstas sąskaitoje-faktūroje
 WatermarkOnDraftInvoices=Vandens ženklas ant sąskaitos-faktūros projekto (nebus, jei lapas tuščias)
 PaymentsNumberingModule=Payments numbering model
@@ -1719,6 +1723,7 @@ CompressionOfResources=HTTP atsakymų suspaudimas
 CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Toks automatinis aptikimas negalimas su naudojama naršykle
 DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Default values (to use on forms)
 DefaultSearchFilters=Default search filters
 DefaultSortOrder=Default sort orders
@@ -1801,6 +1806,7 @@ SendingsNumberingModules=Siuntinių numeravimo modulis
 SendingsAbility=Support shipping sheets for customer deliveries
 NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Laisvas tekstas siuntų dokumentuose
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produktų pristatymo kvitų numeravimo modulis
 DeliveryOrderModel=Produktų pristatymo kvito modelis
@@ -1809,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Laisvas tekstas pristatymo kvituose
 ##### FCKeditor #####
 AdvancedEditor=Išplėstinis redaktorius
 ActivateFCKeditor=Įjungti išplėstinį redaktorių:
-FCKeditorForNotePublic=WYSIWYG creation/edition of the field "public notes" of elements
-FCKeditorForNotePrivate=WYSIWYG creation/edition of the field "private notes" of elements
-FCKeditorForCompany=WYSIWYG creation/edition of the field description of elements (except products/services)
-FCKeditorForProductDetails=WYSIWYG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, 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.
-FCKeditorForMailing= WYSIWYG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWYG creation/edition of user signature
-FCKeditorForMail=WYSIWYG creation/edition for all mail (except Tools->eMailing)
-FCKeditorForTicket=WYSIWYG creation/edition for tickets
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
@@ -1868,7 +1874,6 @@ Buy=Pirkti
 Sell=Parduoti
 InvoiceDateUsed=Naudojama sąskaitos-faktūros data
 YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
-AccountancyCode=Accounting Code
 AccountancyCodeSell=Pardavimo sąskaita. Kodas
 AccountancyCodeBuy=Pirkimo sąskaita. Kodas
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
@@ -1880,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Which view do you want to open by default when selecting m
 AGENDA_EVENT_PAST_COLOR = Past event color
 AGENDA_EVENT_CURRENT_COLOR = Current event color
 AGENDA_EVENT_FUTURE_COLOR = Future event color
-AGENDA_REMINDER_BROWSER = Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Enable sound notification
-AGENDA_REMINDER_EMAIL = Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT = Show linked object into agenda view
 AGENDA_USE_EVENT_TYPE = Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Automatically set this default value for type of event in event create form
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Eksporto sąsajos leidimo mygtukas
 PastDelayVCalExport=Neeksportuoti įvykių senesnių nei
 SecurityKey = Security Key
@@ -2007,7 +2017,7 @@ BackupZipWizard=Wizard to build the archive of documents directory
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
 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.
-InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
@@ -2037,6 +2047,7 @@ Enter0or1=Enter 0 or 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Icon name in format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sales tax rate
@@ -2132,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
 MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipient address frame
 MAIN_PDF_HIDE_CUSTOMER_CODE=Hide customer code
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Hide sender/company name in address block
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Hide payments conditions
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Hide payment mode
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2147,7 +2163,7 @@ COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLE
 DuplicateForbidden=Duplicate forbidden
 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
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
+GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact, ...)
 GDPRContactDesc=If you store personal data in your Information System, you can name the contact who is responsible for the General Data Protection Regulation here
 HelpOnTooltip=Help text to show on tooltip
 HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
@@ -2290,7 +2306,7 @@ THIRDPARTY_ALIAS=Third-party name - Third-party alias
 ALIAS_THIRDPARTY=Third-party alias - Third-party name
 PDFIn2Languages=Show labels in the PDF in 2 different languages (this feature may not work for some couple of languages)
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
-PDF_USE_A=Generate PDF documents with format PDF/A instead of default format PDF
+PDF_USE_A=PDF documents format
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
@@ -2325,6 +2341,8 @@ NotRecommended=Not recommended
 ARestrictedPath=Some restricted path for data files
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
@@ -2398,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Show shipping address
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
 DarkThemeMode=Dark theme mode
@@ -2451,7 +2471,7 @@ 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)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Not created by default. Created on module activation only.
 CSSPage=CSS Style
 Defaultfortype=Pagal nutylėjimą
@@ -2490,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2502,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2540,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2554,3 +2579,31 @@ MenuDict=Dictionary
 AddMoreParams=Add more parameters for connection (cookies, tokens, ...)<br> Example: token : value token
 ParamName=Name of parameter
 ParamValue=Value of parameter
+ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
+HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
+Captcha=Captcha
+CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
+DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang
index 4d57f234e16..7c7571cce28 100644
--- a/htdocs/langs/lt_LT/banks.lang
+++ b/htdocs/langs/lt_LT/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Pabaigos balansas
 CurrentBalance=Dabartinis balansas
 FutureBalance=Ateities balansas
 ShowAllTimeBalance=Rodyti balansą nuo pradžios
-AllTime=Nuo pradžios
 Reconciliation=Suderinimas
 RIB=Banko sąskaitos numeris
 IBAN=IBAN numeris
@@ -133,7 +132,7 @@ DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Judėjimai
-PlannedTransactions=Planned entries
+PlannedTransactions=Upcoming entries
 Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Įmokos kvitas
@@ -151,7 +150,7 @@ FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 SelectPaymentTransactionAndGenerate=Select/filter the documents which are to be included in the %s deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value
-InputReceiptNumberBis=YYYYMM or YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=To reconcile?
 ThenCheckLinesAndConciliate=Tada patikrinkite linijas, esančias banko suvestinėje ir paspauskite
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=If this function is enable, you can choose specific bac
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
-NoBankAccountDefined=No bank account defined
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
 AlreadyOneBankAccount=Already one bank account defined
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA file variant
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index 6a862f4ea65..338443dd3af 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Country is inside the European Economic Community
 PriceFormatInCurrentLanguage=Price display format in the current language and currency
 ThirdPartyName=Third-party name
 ThirdPartyEmail=Third-party email
-ThirdParty=Third-party
-ThirdParties=Third-parties
+ThirdParty=Trečioji šalis
+ThirdParties=Trečiosios šalys
 ThirdPartyProspects=Planai
 ThirdPartyProspectsStats=Planai
 ThirdPartyCustomers=Klientai
@@ -65,6 +65,7 @@ State=Valstybė/Regionas
 StateId=State ID
 StateCode=State/Province code
 StateShort=Būklė
+DepartmentBuyer=Buyer's state/province
 Region=Regionas
 Region-State=Region - State
 Country=Šalis
@@ -78,7 +79,7 @@ Chat=Kalbėtis
 PhonePro=Bus. phone
 PhonePerso=Asmeninis telefonas
 PhoneMobile=Mobilus telefonas
-No_Email=Refuse bulk emailings
+No_Email=Refuse mass emails
 Fax=Faksas
 Zip=Pašto kodas
 Town=Miestas
@@ -382,11 +383,12 @@ ExportCardToFormat=Formuoti eksporto kortelę
 ContactNotLinkedToCompany=Kontaktas nėra susijęs su jokia trečiąja šalimi
 DolibarrLogin=Dolibarr prisijungimas
 NoDolibarrAccess=Nėra Dolibarr prieigos
-ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
-ExportDataset_company_2=Contacts and their properties
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Third-parties and their properties
 ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
-ImportDataset_company_3=Third-parties Bank accounts
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
 PriceLevel=Price Level
 PriceLevelLabels=Price Level Labels
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Vadovo (-ų) pareigos (Vykdantysis direktorius (CEO), direktorius, prezidentas ...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Sujungti trečiąsias šalis
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Third parties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
@@ -460,3 +462,6 @@ ExternalSystemID=External system ID
 IDOfPaymentInAnExternalSystem=ID of the payment mode into an external system (like Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE Webservice Credentials
 ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/lt_LT/exports.lang b/htdocs/langs/lt_LT/exports.lang
index 128cb7edd9e..fa517c1aede 100644
--- a/htdocs/langs/lt_LT/exports.lang
+++ b/htdocs/langs/lt_LT/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Label of line
 LineDescription=Eilutės aprašymas
 LineUnitPrice=Eilutės vieneto kaina
 LineVATRate=Eilutės PVM tarifas
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Eilutės kiekis
 LineTotalHT=Amount excl. tax for line
 LineTotalTTC=Mokesčių suma eilutei
 LineTotalVAT=PVM suma eilutei
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Eilutės tipas (0 = produktas, 1 = paslaugos)
 FileWithDataToImport=Failas su duomenimis importui
 FileToImport=Šaltinio failas importui
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=Choose the file format to use as import file format b
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Šaltinio failo formatas
 FieldsInSourceFile=Šaltinio failo laukai
-FieldsInTargetDatabase=Uždavinių laukai Dolibarr duomenų bazėje (paryškinta=privaloma)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Nėra laukų
 MoveField=Perkelti lauko stulpelio numerį %s
 ExampleOfImportFile=Importo failo pavyzdys
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Check that the file format (field and string delimiters)
 RunSimulateImportFile=Run Import Simulation
 FieldNeedSource=Šis laukas reikalauja duomenų iš šaltinio failo
 SomeMandatoryFieldHaveNoSource=Kai kurie privalomi laukai neturi šaltinio iš duomenų failo
-InformationOnSourceFile=Šaltinio failo informacija
-InformationOnTargetTables=Duomenų adresatų informacija
+InformationOnSourceFile=Pirminis išeities failas
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Eksportui įjungti bent vieną šaltinio lauką laukų stulpelyje
 SelectFormat=Pasirinkite šį importo failo formatą
 RunImportFile=Import Data
diff --git a/htdocs/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
index 3729c9192d0..87090497b43 100644
--- a/htdocs/langs/lt_LT/mails.lang
+++ b/htdocs/langs/lt_LT/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=E-Paštas
 EMailing=E-Paštas
-EMailings=E-Paštas
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=Visi e-laiškai
+AllEMailings=All mass eMails
 MailCard=E-Pašto kortelė
 MailRecipients=Gavėjai
 MailRecipient=Gavėjas
@@ -26,17 +26,19 @@ MailFile=Prikabinti failai
 MailMessage=E-laiško pagrindinė dalis
 SubjectNotIn=Not in Subject
 BodyNotIn=Not in Body
-ShowEMailing=Rodyti e-paštą
-ListOfEMailings=E-laiškų sąrašas
-NewMailing=Naujas e-laiškas
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=Redaguoti e-laišką
-ResetMailing=Persiųsti e-laišką
-DeleteMailing=Ištrinti e-laišką
-PreviewMailing=Peržiūrėti e-laišką
-CreateMailing=Sukurti e-laišką
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Testas
-ValidMailing=Galiojantis e-paštas
+ValidMailing=Valid mass Email
 MailingStatusDraft=Projektas
 MailingStatusValidated=Patvirtintas
 MailingStatusSent=Išsiųsta
@@ -53,6 +55,7 @@ ErrorMailRecipientIsEmpty=E-laiško gavėjas yra tuščias
 WarningNoEMailsAdded=Nėra naujų e-laiškų pridėjimui į gavėjų sąrašą.
 ConfirmValidMailing=Are you sure you want to validate this emailing?
 ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
+ConfirmResetMailingTargetMassactionQuestion=Are you sure you want to reset the status of the selected recipients (this may means that email will be resent if you use the Send email feature of the emailing) ?
 ConfirmDeleteMailing=Are you sure you want to delete this emailing?
 NbOfUniqueEMails=No. of unique emails
 NbOfUniquePhones=No. of unique phones
@@ -105,24 +108,24 @@ EmailCollectorFilterDesc=All filters must match to have an email being collected
 LineInFile=Failo eilutė %s
 RecipientSelectionModules=Apibrėžtos užklausos gavėjų atrankai
 MailSelectedRecipients=Pasirinkti gavėjai
-MailingArea=E-pašto sritis
-LastMailings=Latest %s emailings
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Nuorodų statistika
 NbOfCompaniesContacts=Unikalūs kontaktai/ adresai
 MailNoChangePossible=Patvirtintų e-laiškų gavėjai negali būti pakeisti
-SearchAMailing=E-pašto paieška
-SendMailing=Siųsti e-paštą
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Išsiųsta iš
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Galite siųsti jiems internetu pridedant parametrą MAILING_LIMIT_SENDBYWEB su maks. laiškų kiekio, norimų siųsti sesijos metu, reikšme. Tam eiti į Pagrindinis-Nustatymai-Kiti.
 ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Išvalyti sąrašą
 ToClearAllRecipientsClickHere=Spauskite čia, kad išvalytumėte šio e-laiško gavėjų sąrašą
 ToAddRecipientsChooseHere=Įtraukti gavėjus pasirinkant iš sąrašų
-NbOfEMailingsReceived=Gauti masiniai e-laiškai
-NbOfEMailingsSend=Mass emailings sent
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID įrašas
 DeliveryReceipt=Delivery Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Galite naudoti <b>comma</b> atskyriklį, kad nurodyti kelis gavėjus.
@@ -139,8 +142,10 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -174,15 +179,15 @@ NoContactWithCategoryFound=No category found linked to some contacts/addresses
 NoContactLinkedToThirdpartieWithCategoryFound=No category found linked to some thirdparties
 OutGoingEmailSetup=Outgoing emails
 InGoingEmailSetup=Incoming emails
-OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+OutGoingEmailSetupForEmailing=Outgoing emails (%s)
 DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informacija
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
-IsNotAnAnswer=Is not answer (initial email)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Is an answer of an initial email
-RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+RecordCreatedByEmailCollector=Record created by the Email Collector %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.
@@ -190,9 +195,12 @@ NoMoreRecipientToSendTo=No more recipient to send the email to
 EmailOptedOut=Email owner has requested to not contact him with this email anymore
 EvenUnsubscribe=Include opt-out emails
 EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Useful for mandatory service emails for example.
-XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s operations done)
 YouCanMakeSomeInstructionForEmail=You can make some instructions for your Email (Example: generate image in email template...)
 ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
+LastNews=Latest News
+ListProducts= List of products
+PasswordReset=Password reset
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 6350342c372..cc5f7ce409e 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -37,6 +37,7 @@ Translation=Vertimas
 Translations=Translations
 CurrentTimeZone=Laiko juostos PHP (serveris)
 EmptySearchString=Enter non empty search criteria
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Enter a date criteria
 NoRecordFound=Įrašų nerasta
 NoRecordDeleted=No record deleted
@@ -45,6 +46,7 @@ NoError=Klaidos nėra
 Error=Klaida
 Errors=Klaidos
 ErrorFieldRequired=Laukelis '%s' yra būtinas
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Laukelyje '%s' yra bloga reikšmė
 ErrorFileDoesNotExists=Failas %s neegzistuoja
 ErrorFailedToOpenFile=Nepavyko atidaryti failo %s
@@ -308,6 +310,7 @@ DateBuild=Ataskaitos sudarymo data
 DatePayment=Mokėjimo data
 DateApprove=Patvirtinimo data
 DateApprove2=Patvirtinimo data (antrasis patvirtinimas)
+PendingSince=Pending since
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Pradėti
 ActionRunningShort=In progress
 ActionDoneShort=Baigtas
 ActionUncomplete=Incomplete
-LatestLinkedEvents=Latest %s linked events
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Company/Organization
 Accountant=Accountant
 ContactsForCompany=Šios trečiosios šalies adresatas
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=E-laiško pagrindinė dalis
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Siųsti e-laišką
 Email=El. paštas
+EMail=El. paštas
+EMails=Emails
 NoEMail=E-laiškų nėra
 AlreadyRead=Already read
 NotRead=Unread
@@ -793,7 +798,7 @@ Notes=Pastabos
 AddNewLine=Pridėti naują eilutę
 AddFile=Pridėti failą
 FreeZone=Free-text product
-FreeLineOfType=Free-text item, type:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Klonuoti objektą su savo pagrindiniais atributais
 ReGeneratePDF=Re-generate PDF
 PDFMerge=PDF sujungimas
@@ -879,12 +884,14 @@ toward=būsimas
 Access=Priėjimas
 SelectAction=Select action
 SelectTargetUser=Select target user/employee
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Naudokite Ctrl+C kopijuoti į iškarpinę (clipboard)
 SaveUploadedFileWithMask=Išsaugokite failą serveryje su pavadinimu "<strong>%s</strong>" (kitaip "%s")
 OriginFileName=Originalus failo pavadinimas
 SetDemandReason=Nustatykite šaltinį
 SetBankAccount=Nustatykite banko sąskaitą
 AccountCurrency=Account currency
+AccountancyCode=Accounting Code
 ViewPrivateNote=Peržiūrėti pastabas
 XMoreLines=%s paslėptos eilutės
 ShowMoreLines=Show more/less lines
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected reco
 ConfirmMassClone=Bulk clone confirmation
 ConfirmMassCloneQuestion=Select project to clone to
 ConfirmMassCloneToOneProject=Clone to project %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Related Objects
 ClassifyBilled=Classify Billed
 ClassifyUnbilled=Classify Unbilled
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=You need to be logged and you need permissions to view o
 Download=Download
 DownloadDocument=Download document
 DownloadSignedDocument=Download signed document
-ActualizeCurrency=Update currency rate
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Fiskaliniai metai
 ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
 WebSite=Website
@@ -1104,6 +1113,7 @@ PayedBy=Apmokėtas kieno
 PayedTo=Paid to
 Monthly=Monthly
 Quarterly=Quarterly
+Quarter=Quarter
 Annual=Annual
 Local=Local
 Remote=Remote
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Užduotis
 ContactDefault_propal=Pasiūlymas
 ContactDefault_supplier_proposal=Supplier Proposal
 ContactDefault_ticket=Ticket
+ContactDefault_societe=Trečioji šalis
 ContactAddedAutomatically=Contact added from third-party contact roles
 More=More
 ShowDetails=Show details
@@ -1242,6 +1253,7 @@ CommercialAffected=Sales representative assigned
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=Pranešimas
+Emailing=Emailing
 Progression=Pažanga
 YourMessage=Your message
 YourMessageHasBeenReceived=Your message has been received. We will answer or contact you as soon as possible.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Pridėti
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Nuo pradžios
+Transferred=Transferred
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index e6eda77bc6f..e27d2028b26 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -65,7 +65,7 @@ ProductStatusOnBuy=Perkama
 ProductStatusNotOnBuy=Neperkama
 ProductStatusOnBuyShort=Perkama
 ProductStatusNotOnBuyShort=Neperkama
-UpdateVAT=Update vat
+UpdateVAT=Update VAT
 UpdateDefaultPrice=Update default price
 UpdateLevelPrices=Update prices for each level
 AppliedPricesFrom=Applied from
@@ -80,8 +80,11 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Nauja kaina
 MinPrice=Min. selling price
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=Edit selling price label
-CantBeLessThanMinPrice=Pardavimo kaina negali būti mažesnė už minimalią leidžiamą šiam produktui (%s be mokesčių). Šis pranešimas taip pat gali pasirodyti, jei įvedate per labai didelę nuolaidą.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Uždarytas
 ErrorProductAlreadyExists=Produktas su nuoroda %s jau egzistuoja.
 ErrorProductBadRefOrLabel=Neteisinga nuorodos ar etiketės reikšmė
@@ -94,7 +97,6 @@ ShowService=Rodyti paslaugą
 ProductsAndServicesArea=Produkto ir paslaugų sritis
 ProductsArea=Produkto sritis
 ServicesArea=Paslaugos sritis
-ListOfStockMovements=Atsargos judėjimų sąrašas
 BuyingPrice=Pirkimo kaina
 PriceForEachProduct=Products with specific prices
 SupplierCard=Vendor card
@@ -137,18 +139,17 @@ ConfirmDeleteProductLine=Ar tikrai norite ištrinti šią produkto eilutę ?
 ProductSpecial=Specialus
 QtyMin=Min. purchase quantity
 PriceQtyMin=Price quantity min.
-PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
-VATRateForSupplierProduct=VAT Rate (for this vendor/product)
+PriceQtyMinCurrency=Price (currency) for this qty.
+WithoutDiscount=Without discount
+VATRateForSupplierProduct=Tax Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
+NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
 PredefinedItem=Predefined item
-PredefinedProductsToSell=Predefined Product
-PredefinedServicesToSell=Predefined Service
-PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
+PredefinedProducts=Predefined Product
+PredefinedServices=Predefined Service
+PredefinedProductsAndServices=Predefined products/services
 NotPredefinedProducts=Not predefined products/services
 GenerateThumb=Sukurti nykštį
 ServiceNb=Paslaugų #%s
@@ -170,7 +171,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs|Commodity|HS code
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Country of origin
 RegionStateOrigin=Region of origin
 StateOrigin=State|Province of origin
@@ -204,19 +205,16 @@ unitSET=Set
 unitS=Sekundė
 unitH=Valanda
 unitD=Diena
-unitG=Gram
-unitM=Meter
-unitLM=Linear meter
-unitM2=Square meter
-unitM3=Cubic meter
 unitL=Liter
 unitT=ton
 unitKG=kg
 unitG=Gram
+unitGAL=galonas
 unitMG=mg
 unitLB=svaras
 unitOZ=uncija
 unitM=Meter
+unitLM=Linear meter
 unitDM=dm
 unitCM=cm
 unitMM=mm
@@ -261,7 +259,7 @@ Quarter1=I ketvirtis
 Quarter2=II ketvirtis
 Quarter3=III ketvirtis
 Quarter4=IV ketvirtis
-BarCodePrintsheet=Print barcode
+BarCodePrintsheet=Print barcodes
 PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
 NumberOfStickers=Lipdukų skaičius lape
 PrintsheetForOneBarCode=Spausdinti kelis lipdukus su vienu brūkšniniu kodu
@@ -314,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.c
 UpdateInterval=Update interval (minutes)
 LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
-PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=Select PDF files
 IncludingProductWithTag=Including products/services with the tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
@@ -344,18 +342,23 @@ PossibleValues=Possible values
 GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
 UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
 ProductSupplierDescription=Vendor description for the product
-UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
-PackagingForThisProduct=Packaging
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
+UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
+PackagingForThisProduct=Packaging of quantities
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
+Attributes=Atributai
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Variant attributes
 ProductAttributes=Variant attributes for products
 ProductAttributeName=Variant attribute %s
 ProductAttribute=Variant attribute
 ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
 ProductCombinations=Variants
@@ -386,6 +389,7 @@ ErrorDeletingGeneratedProducts=There was an error while trying to delete existin
 NbOfDifferentValues=No. of different values
 NbProducts=Number of products
 ParentProduct=Parent product
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Hide variant products
 ShowChildProducts=Show variant products
 NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
@@ -396,18 +400,49 @@ ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
 ProductsPricePerCustomer=Product prices per customers
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
-AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
+AmountUsedToUpdateWAP=Unit amount to use to update the Weighted Average Price
 PMPValue=Vidutinė svertinė kaina
 PMPValueShort=WAP
 mandatoryperiod=Mandatory periods
 mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
+mandatoryHelper2=Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+MergeOriginProduct=Duplicated product (the product you want to delete)
+MergeProducts=Merge products
+ConfirmMergeProducts=Are you sure you want to merge the chosen product with the current one? All linked objects (invoices, orders, ...) will be moved to the current product, after which the chosen product will be deleted.
+ProductsMergeSuccess=Products have been merged
+ErrorsProductsMerge=Errors in products merge
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+UpdatePrice=Increase/decrease customer price
+StockMouvementExtraFields= Extra Fields (stock movement)
+InventoryExtraFields= Extra Fields (inventory)
+ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
+PuttingPricesUpToDate=Update prices with current known prices
+PuttingDescUpToDate=Update descriptions with current known descriptions
+PMPExpected=Expected PMP
+ExpectedValuation=Expected Valuation
+PMPReal=Real PMP
+RealValuation=Real Valuation
+ConfirmEditExtrafield = Select the extrafield you want modify
+ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
+ModifyValueExtrafields = Modify value of an extrafield
+OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
+AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
+AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
+ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
+WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned
+PriceLabel=Price label
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index cb61d8c460f..73ea37d56a5 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Failu integritātes pārbaude ir pagājusi, t
 FileIntegritySomeFilesWereRemovedOrModified=Failu integritātes pārbaude neizdevās. Daži faili tika mainīti, noņemti vai pievienoti.
 GlobalChecksum=Globālā kontrolsumma
 MakeIntegrityAnalysisFrom=Veiciet lietojumprogrammu failu integritātes analīzi no
-LocalSignature=Iegultais vietējais paraksts (mazāk ticams)
-RemoteSignature=Attālinātais paraksts (uzticamāks)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Trūkstošie faili
 FilesUpdated=Atjaunotie faili
 FilesModified=Modificētie faili
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Izmanto tikai dažas dienas kārtības iespējas
 Security=Drošība
 Passwords=Paroles
 DoNotStoreClearPassword=Šifrēt datubāzē saglabātās paroles.
-MainDbPasswordFileConfEncrypted=Šifrēt datubāzes paroli, kas saglabāta conf.php. Ir ļoti ieteicams aktivizēt šo opciju.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=Lai paroli šifrētu <b> conf.php </b> failā, nomainiet rindiņu <br><b> $ dolibarr_main_db_pass = "..."; </b>  <br>ar<br><b> $ dolibarr_main_db_pass = "crypted: %s"; </b>
 InstrucToClearPass=Lai <b>conf.php</b> failā dekodētu (dzēstu) paroli, nomainiet rindu <br><b>$dolibarr_main_db_pass = "crypted: ..."; </b><br>ar<br> <b>$dolibarr_main_db_pass = "%s"; </b>
 ProtectAndEncryptPdfFiles=Aizsargāt ģenerētos PDF failus. Tas nav ieteicams, jo tas pārtrauc lielapjoma PDF ģenerēšanu.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Ģeometriskais punkts
 ExtrafieldMultiPointGeo=Ģeometriski daudzpunktu
 ExtrafieldLinestringGeo=Ģeometriskā līnija
 ExtrafieldPolygonGeo=Ģeometriskais daudzstūris
+ExtrafieldStars=Stars
 ComputedFormula=Aprēķinātais lauks
-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=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'
 Computedpersistent=Veikt aprēķinātu lauku
 ComputedpersistentDesc=Aprēķinātie papildu lauki tiks saglabāti datubāzē, taču vērtība tiks pārrēķināta tikai tad, kad mainīsies šī lauka objekts. Ja aprēķinātais lauks ir atkarīgs no citiem objektiem vai globāliem datiem, šī vērtība var būt nepareiza!
 ExtrafieldParamHelpPassword=Ja atstājat šo lauku tukšu, šī vērtība tiks saglabāta BEZ šifrēšanas (lauks ekrānā ir vienkārši paslēpts ar zvaigznītēm).<br><br>Enter vērtība 'dolcrypt', lai kodētu vērtību ar atgriezenisku šifrēšanas algoritmu. Notīrītus datus joprojām var zināt un rediģēt, taču tie tiek šifrēti datu bāzē.<br><br>Ievadiet “auto” (vai “md5”, 'sha256', 'password_hash', ...), lai izmantotu noklusējuma paroles šifrēšanas algoritmu (vai md5, sha256, password_hash...), lai saglabātu neatgriezenisko jaukto paroli datu bāzē (nav iespējas izgūt sākotnējo vērtību).
@@ -519,7 +520,7 @@ WarningPHPMailB=- Ja jūsu e-pasta domēns (daļa mymaildomain.com uz myname@my
 WarningPHPMailC=- Arī sava e-pasta pakalpojumu sniedzēja SMTP servera izmantošana e-pasta ziņojumu sūtīšanai ir interesanta, tāpēc visi no lietojumprogrammas nosūtītie e-pasta ziņojumi tiks saglabāti arī jūsu pastkastes direktorijā Nosūtītie.
 WarningPHPMailD=Tāpēc ir ieteicams mainīt e-pasta sūtīšanas metodi uz vērtību "SMTP".
 WarningPHPMailDbis=Ja patiešām vēlaties saglabāt noklusējuma "PHP" metodi e-pasta sūtīšanai, vienkārši ignorējiet šo brīdinājumu vai noņemiet to, %snoklikšķinot šeit%s.
-WarningPHPMail2=Ja jūsu e-pasta SMTP pakalpojumu sniedzējs ierobežo e-pasta klientus uz dažām IP adresēm (ļoti reti), tad jūsu ERP CRM lietojumprogrammas e-pasta lietotāja aģenta (MUA) IP adrese ir: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=Ja domēna nosaukums jūsu sūtītāja e-pasta adresē ir aizsargāts ar SPF ierakstu (jautājiet savam domēna vārda reģistratoram), jums ir jāpievieno šādi IP vai ieraksts sava domēna DNS SPF ierakstā:  <strong>%s</strong>.
 WarningPHPMailSPFDMARC=Ja domēna nosaukumu jūsu sūtītāja e-pasta adresē aizsargā DMARC ieraksts, kas atšķiras no p=none (jautājiet savam domēna vārda reģistratoram), jums ir jānoņem savs DMARC ieraksts vai jāiestata uz p=none, piemēram, @gmail.com) vai izmantojiet citu sūtīšanas metodi.
 SPFAndDMARCInformation=SPF un DMARC DNS ieraksts galvenajām e-pasta adresēm
@@ -567,8 +568,8 @@ Module10Name=Grāmatvedība (vienkāršota)
 Module10Desc=Vienkāršie grāmatvedības pārskati (žurnāli, apgrozījums), pamatojoties uz datubāzes saturu. Neizmanto virsgrāmatu galdiņu.
 Module20Name=Priekšlikumi
 Module20Desc=Komerc priekšlikumu vadība
-Module22Name=Masveida e-pasta sūtījumi
-Module22Desc=Pārvaldiet lielapjoma sūtīšanu pa e-pastu
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Enerģija
 Module23Desc=Enerģijas patēriņa uzraudzība
 Module25Name=Pārdošanas pasūtījumi
@@ -847,10 +848,10 @@ Permission212=Pasūtījuma līnijas
 Permission213=Aktivizēt līniju
 Permission214=Iestatīt telefoniju
 Permission215=Iestatījumi piegādātājiem
-Permission221=Lasīt emailings
-Permission222=Izveidot/mainīt e-pasta (tēmu, saņēmējus ...)
-Permission223=Apstiprināt emailings (ļauj sūtīt)
-Permission229=Dzēst emailings
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Skatīt saņēmējus un info
 Permission238=Manuāli sūtīt sūtījumus
 Permission239=Dzēst sūtījumus pēc apstiprināšanas, vai jānosūta
@@ -1105,6 +1106,7 @@ DictionaryStaff=Darbinieku skaits
 DictionaryAvailability=Piegādes kavēšanās
 DictionaryOrderMethods=Pasūtīšanas metodes
 DictionarySource=Origin of proposals/orders
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Personalizētas grupas ziņojumiem
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryAccountancyJournal=Grāmatvedības žurnāli
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Atpakaļ uz vārdnīcu sarakstu
 TypeOfRevenueStamp=Nodokļu zīmoga veids
 VATManagement=Pārdošanas nodokļu pārvaldība
 VATIsUsedStandard=Veidojot dokumentus (priekšlikumus, rēķinus, pasūtījumus...), noklusējuma Tirdzniecības nodokļa likme tiek noteikta saskaņā ar standarta noteikumiem (atkarībā no pārdevēja un pircēja valstīm)
-VATIsUsedDesc=Pēc noklusējuma, veidojot piedāvājumus, rēķinus, pasūtījumus utt., pārdošanas nodokļa likme atbilst aktīvajam standarta kārtulam:<br>Ja pārdevējs nav apliekams ar tirdzniecības nodokli, tad pārdošanas nodokļa noklusējuma vērtība ir 0 Noteikuma beigas.<br>Ja (pārdevēja valsts = pircēja valsts), pārdošanas nodoklis pēc noklusējuma ir vienāds ar produkta pārdošanas nodokli pārdevēja valstī. Noteikuma beigas.<br>Ja gan pārdevējs, gan pircējs atrodas Eiropas Kopienā un preces ir ar transportu saistīti produkti (pārvadājumi, pārvadājumi, aviosabiedrība), noklusējuma PVN ir 0. noteikums ir atkarīgs no pārdevēja valsts – lūdzu, konsultējieties ar savu grāmatvedi. PVN ir jāmaksā pircējam savas valsts muitas iestādei, nevis pārdevējam. Noteikuma beigas.<br>Ja gan pārdevējs, gan pircējs atrodas Eiropas Kopienā un pircējs nav uzņēmums (ar reģistrētu Kopienas iekšējās PVN maksātāja numuru), PVN noklusējuma vērtība ir pārdevēja valsts PVN likme. Noteikuma beigas.<br>Ja gan pārdevējs, gan pircējs atrodas Eiropas Kopienā un pircējs ir uzņēmums (ar reģistrētu Kopienas iekšzemes PVN maksātāja numuru), PVN ir 0 pēc noklusējuma. Kārtulas beigas.<br>Jebkurā citā gadījumā piedāvātais noklusējuma noklusējums ir Sales tax=0. Noteikuma beigas.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Pēc noklusējuma piedāvātais pārdošanas nodoklis ir 0, ko var izmantot tādām lietām kā asociācijas, privātpersonas vai mazie uzņēmumi.
 VATIsUsedExampleFR=Francijā tas nozīmē uzņēmumus vai organizācijas, kurām ir reāla fiskālā sistēma (vienkāršota reāla vai reāla). Sistēma, kurā izmanto PVN.
 VATIsNotUsedExampleFR=Francijā tas nozīmē asociācijas, kas nav deklarētas par tirdzniecības nodokli, vai uzņēmumi, organizācijas vai brīvās profesijas, kas izvēlējušās mikrouzņēmumu fiskālo sistēmu (pārdošanas nodoklis franšīzē) un samaksājuši franšīzes pārdošanas nodokli bez pārdošanas nodokļa deklarācijas. Ar šo izvēli rēķinos būs redzama atsauce "Nav piemērojams pārdošanas nodoklis - CGI 293.B pants".
-VATType=Nodokļa veids
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Tirdzniecības nodokļa veids
 LTRate=Likme
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Saskaņā ar nodokļu iestatīšanu (sk. %s - %s - %s)
 LabelUsedByDefault=Label izmantots pēc noklusējuma, ja nav tulkojuma var atrast kodu
 LabelOnDocuments=Dokumentu marķējums
 LabelOrTranslationKey=Uzlīme vai tulkošanas taustiņš
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Tulkojums atrasts
 TheTranslationIsSearchedFromKey=Tulkojums tiek meklēts no tulkošanas atslēgas: <b>%s</b>
 TranslationKey=Tulkošanas atslēga
@@ -1431,7 +1434,7 @@ AddVatInList=Parādiet klienta/pārdevēja PVN numuru kombinētajos sarakstos.
 AddAdressInList=Parādiet klienta/pārdevēja adresi kombinētajos sarakstos.<br>Trešās puses tiks rādītas ar nosaukuma formātu "The Big Company corp. - 21 jump street 123456 Big town, USA", nevis "" Lielā uzņēmuma korporācija".
 AddEmailPhoneTownInContactList=Parādiet kontaktu e-pasta adresi (vai tālruņus, ja tas nav definēts) un pilsētu kombinētos sarakstos.<br>Kontaktpersonas tiks rādītas ar nosaukuma formātu "Dupond Durand - dupond.durand@example.com - Paris " vai "Dupond Durand - 06 07 59 65 66 - Paris", nevis "Dupond Durand".
 AskForPreferredShippingMethod=Pieprasiet vēlamo piegādes metodi trešajām pusēm.
-FieldEdition=Izdevums lauka %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Piemērs: +2 (aizpildiet tikai, ja sastopaties ar problēmām)
 GetBarCode=Iegūt svītrukodu
 NumberingModules=Numerācijas modeļi
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Rēķina datums kā pārbaudes datums
 SuggestedPaymentModesIfNotDefinedInInvoice=Ierosinātais maksājuma režīms rēķinā pēc noklusējuma, ja tas nav definēts rēķinā
 SuggestPaymentByRIBOnAccount=Iesakiet norēķinu ar norēķinu kontu
 SuggestPaymentByChequeToAddress=Ieteikt maksājumu ar čeku uz
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Brīvs teksts uz rēķiniem
 WatermarkOnDraftInvoices=Ūdenszīme uz sagataves rēķiniem (nav ja tukšs)
 PaymentsNumberingModule=Maksājumu numerācijas modelis
@@ -1718,6 +1723,7 @@ CompressionOfResources=Kompresijas HTTP atbildes
 CompressionOfResourcesDesc=Piemēram, izmantojot Apache direktīvu "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 DefaultValuesDesc=Šeit jūs varat definēt noklusējuma vērtību, kuru vēlaties izmantot, veidojot jaunu ierakstu, un / vai noklusējuma filtrus vai kārtošanas secību ierakstot ierakstus.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Noklusējuma vērtības (izmantošanai veidlapās)
 DefaultSearchFilters=Noklusējuma meklēšanas filtri
 DefaultSortOrder=Noklusējuma kārtošanas kārtība
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Nosūtīšanas numerācijas moduļi
 SendingsAbility=Atbalsta piegādes lapas klientu piegādēm
 NoNeedForDeliveryReceipts=Lielākajā daļā gadījumu piegādes lapas tiek izmantotas gan kā klientu pasūtījumu lapas (nosūtāmo produktu saraksts), gan arī klienta saņemtas un parakstītas lapas. Tādējādi produktu piegādes kvīts ir dublēta funkcija un reti tiek aktivizēta.
 FreeLegalTextOnShippings=Brīvais teksts piegādēs
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produkti piegādes kvīts numerācija modulis
 DeliveryOrderModel=Produkti piegādes kvīts modelis
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Brīvais teksts piegādes dokumentiem
 ##### FCKeditor #####
 AdvancedEditor=Uzlabotais redaktors
 ActivateFCKeditor=Aktivizēt uzlabotos redaktoru:
-FCKeditorForNotePublic=WYSIWYG elementu lauka "publiskās piezīmes" izveide/izdošana
-FCKeditorForNotePrivate=WYSIWYG elementu lauka "privātās piezīmes" izveide/izdošana
-FCKeditorForCompany=Elementu (izņemot produktus/pakalpojumus) lauka apraksta WYSIWYG izveide/izdošana
-FCKeditorForProductDetails=WYSIWYG produktu aprakstu vai rindu izveide/izdošana objektiem (priekšlikumu rindas, pasūtījumi, rēķini utt.).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Brīdinājums. Šīs opcijas izmantošana šajā gadījumā nav nopietni ieteicama, jo, veidojot PDF failus, tas var radīt problēmas ar speciālajām rakstzīmēm un lappušu formatējumu.
-FCKeditorForMailing= WYSIWYG izveide/izdevums masveida e-pasta sūtījumiem (Rīki->e-pasts)
-FCKeditorForUserSignature=WYSIWYG lietotāja paraksta izveide/izdevums
-FCKeditorForMail=WYSIWYG izveide/izdevums visam pastam (izņemot Rīki->e-pasts)
-FCKeditorForTicket=WYSIWYG izveide/izdevums biļetēm
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Krājumu moduļa iestatīšana
 IfYouUsePointOfSaleCheckModule=Ja jūs izmantojat Punkta pārdošanas moduli (POS), ko nodrošina pēc noklusējuma vai ārējais modulis, šo POS uzstādīšanu var ignorēt jūsu POS modulis. Lielākā daļa POS moduļu ir izveidoti pēc noklusējuma, lai nekavējoties izveidotu rēķinu un samazinātu krājumu neatkarīgi no iespējām šeit. Tātad, ja jums ir vai nav krājumu samazināšanās, reģistrējoties pārdošanai no jūsu POS, pārbaudiet arī POS moduļa iestatījumus.
@@ -1867,7 +1874,6 @@ Buy=Pirkt
 Sell=Pārdot
 InvoiceDateUsed=Rēķina izmantotais datums
 YourCompanyDoesNotUseVAT=Jūsu uzņēmumam ir noteikts, ka PVN netiek izmantots (Home - Setup - Company / Organization), tāpēc nav uzstādījumu PVN.
-AccountancyCode=Grāmatvedības kods
 AccountancyCodeSell=Tirdzniecība kontu. kods
 AccountancyCodeBuy=Iegādes konta. kods
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Veidojot jaunu nodokli, pēc noklusējuma turiet izvēles rūtiņu “Automātiski izveidot maksājumu” tukšu
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Kuru skatu vēlaties atvērt pēc noklusējuma, izvēlotie
 AGENDA_EVENT_PAST_COLOR = Pagājuša pasākuma krāsa
 AGENDA_EVENT_CURRENT_COLOR = Pašreizēja pasākuma krāsa
 AGENDA_EVENT_FUTURE_COLOR = Nākotnes pasākuma krāsa
-AGENDA_REMINDER_BROWSER = Iespējojiet notikuma atgādinājumu <b> lietotāja pārlūkprogrammā </b> (Kad ir atgādinājuma datums, pārlūkprogramma parāda uznirstošo logu. Katrs lietotājs var atspējot šādus paziņojumus pārlūka paziņojumu iestatījumos).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Iespējot skaņas paziņojumu
-AGENDA_REMINDER_EMAIL = Iespējojiet notikuma atgādinājumu <b>, nosūtot e-pastus </b> (katram notikumam var noteikt atgādinājuma opciju / aizkavi).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Piezīme: Plānotā darba %s biežumam jābūt pietiekamam, lai pārliecinātos, ka atgādinājums tiek nosūtīts pareizajā brīdī.
 AGENDA_SHOW_LINKED_OBJECT = Parādīt saistīto objektu darba kārtībā
 AGENDA_USE_EVENT_TYPE = Izmantojiet notikumu tipus (tiek pārvaldīti izvēlnē Iestatīšana -> Vārdnīcas -> Darba kārtības notikumu veids).
 AGENDA_USE_EVENT_TYPE_DEFAULT = Veidojot notikuma veidlapu, automātiski iestatiet šo noklusējuma vērtību
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Galvenais atļaut eksporta saiti
 PastDelayVCalExport=Neeksportē notikums, kuri vecāki par
 SecurityKey = Drošības atslēga
@@ -2006,7 +2017,7 @@ BackupZipWizard=Vednis, lai izveidotu dokumentu arhīva direktoriju
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=Šī iemesla dēļ šeit aprakstītais process ir manuāls process, kurā var veikt tikai priviliģēts lietotājs.
 InstallModuleFromWebHasBeenDisabledContactUs=Ārējo moduļu vai dinamisko vietņu instalēšana vai izstrāde no lietojumprogrammas pašlaik ir bloķēta drošības nolūkos. Lūdzu, sazinieties ar mums, ja nepieciešams iespējot šo funkciju.
-InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Lai instalētu vai izveidotu ārēju moduli no lietojumprogrammas, moduļa faili jāiegādājas direktorijā <strong> %s </ strong>. Lai šo direktoriju apstrādātu Dolibarr, jums ir jāiestata <strong> conf / conf.php </ strong>, lai pievienotu 2 direktīvu līnijas: <br> <strong> $ dolibarr_main_url_root_alt = "/ custom"; </ strong> < br> <strong> $ dolibarr_main_document_root_alt = '%s / custom'; </ strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Iezīmējiet līnijas krāsu, kad pele iet pāri (izmantojiet 'ffffff', lai nerādītu izcilumu)
@@ -2036,6 +2047,7 @@ Enter0or1=Ievadiet 0 vai 1
 EnterYesOrNo=Ievadiet Jā vai Nē
 UnicodeCurrency=Ievadiet šeit starp aplikācijām, baitu skaitļu sarakstu, kas attēlo valūtas simbolu. Piemēram: attiecībā uz $ ievadiet [36] - Brazīlijas reālajam R $ [82,36] - par € ievadiet [8364]
 ColorFormat=RGB krāsa ir HEX formātā, piemēram: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Ikonas nosaukums šādā formātā:<br>- image.png attēla failam pašreizējā motīva direktorijā<br>- image.png@module ja fails atrodas moduļa direktorijā /img/<br>- fa-xxx FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size FontAwesome fa-xxx attēlam (ar prefiksu, krāsu un izmēru komplektu)
 PositionIntoComboList=Līnijas novietojums kombinētajos sarakstos
 SellTaxRate=Pārdošanas nodokļa likme
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Slēpt kopējās cen
 MAIN_PDF_NO_SENDER_FRAME=Slēpt adresāta rāmja robežas
 MAIN_PDF_NO_RECIPENT_FRAME=Paslēpt adresāta adreses rāmja robežas
 MAIN_PDF_HIDE_CUSTOMER_CODE=Paslēpt klienta kodu
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Paslēpt sūtītāja/uzņēmuma nosaukumu adrešu blokā
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Slēpt maksājumu nosacījumus
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Slēpt maksāšanas režīmu
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Pievienojiet paraksta apgabalam slēptu marķējumu, lai elektroniskā paraksta rīks varētu to izmantot atkārtoti. Var izmantot ārējie rīki vai nākotnē tiešsaistes paraksta funkcija.
@@ -2324,6 +2341,8 @@ NotRecommended=Nav ieteicams
 ARestrictedPath=Datu failiem ir ierobežots ceļš
 CheckForModuleUpdate=Pārbaudiet, vai nav atjaunināti ārējie moduļi
 CheckForModuleUpdateHelp=Šī darbība izveidos savienojumu ar ārējo moduļu redaktoriem, lai pārbaudītu, vai ir pieejama jauna versija.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Ir pieejams atjauninājums
 NoExternalModuleWithUpdate=Ārējiem moduļiem nav atrasti atjauninājumi
 SwaggerDescriptionFile=Swagger API apraksta fails (piemēram, lietošanai ar pārorientēšanu)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Rādīt piegādes adresi
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Obligāta norāde dažās valstīs (Francijā, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Rādīt norēķinu kontaktpersonu priekšlikumā
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=Pēc noklusējuma kontaktpersona tiek rādīta tikai norēķiniem
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Sociālā tīkla URL saite. Mainīgajai daļai, kas satur sociālā tīkla ID, izmantojiet {socialid}.
 IfThisCategoryIsChildOfAnother=Ja šī kategorija ir citas kategorijas bērns
 DarkThemeMode=Tumšā motīva režīms
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Brīdinājums: modulis %s ir ie
 WarningModuleHasChangedSecurityCsrfParameter=Brīdinājums: modulis %s ir atspējojis jūsu instances CSRF drošību. Šī darbība ir aizdomīga, un jūsu instalācija, iespējams, vairs nebūs aizsargāta. Lūdzu, sazinieties ar moduļa autoru, lai saņemtu skaidrojumu.
 EMailsInGoingDesc=Ienākošos e-pastus pārvalda modulis %s. Tas ir jāiespējo un jākonfigurē, ja nepieciešams atbalstīt ienākošos e-pastus.
 MAIN_IMAP_USE_PHPIMAP=Izmantojiet PHP-IMAP bibliotēku IMAP, nevis vietējo PHP IMAP. Tas arī ļauj izmantot OAuth2 savienojumu IMAP (jāaktivizē arī OAuth modulis).
-MAIN_CHECKBOX_LEFT_COLUMN=Parādīt kolonnu lauku un rindu atlasei kreisajā pusē (labajā pusē pēc noklusējuma)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Nav izveidots pēc noklusējuma. Izveidots tikai moduļa aktivizēšanas laikā.
 CSSPage=CSS stils
 Defaultfortype=Noklusējums
@@ -2489,7 +2510,7 @@ AiDescription=AI (mākslīgā intelekta) funkcijas
 AiDescriptionLong=Nodrošina AI (mākslīgā intelekta) funkcijas dažādās lietojumprogrammas daļās. Nepieciešama ārēja AI API.
 AI_API_KEY=AI api atslēga
 AI_API_URL=AI API galapunkta URL
-AI_API_SERVICE=Pakalpojums, ko izmantot AI funkcijām
+AI_API_SERVICE=AI service to use
 AiSetup=AI moduļa iestatīšana
 AiCustomPrompt=AI pielāgota uzvedne
 AI_CONFIGURATIONS_PROMPT=Pielāgota uzvedne
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI pielāgotas funkcijas
 EnterAnIP=Ievadiet IP adresi
 ConvertInto=Pārvērst par
 YouAreHere=Tu esi šeit
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Parādiet svītrkodu nosūtīšanas PDF dokumentā
 BARCODE_ON_RECEPTION_PDF=Parādiet svītrkodu saņemšanas PDF dokumentā
 BARCODE_ON_STOCKTRANSFER_PDF=Parādiet svītrkodu krājumu nodošanas PDF dokumentā
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr atteikšanās URL, lai auto
 MainAuthenticationOidcLoginClaimName=Pieteikšanās prasība
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect pretenzija, kas atbilst Dolibarr lietotāja pieteikuminformācijai. Ja tas nav iestatīts vai ir tukšs, pēc noklusējuma tiek rādīts e-pasts
 BlackListWords=Melnais vārdu saraksts
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Pievienot melnajam sarakstam
 FediverseSetup=Fediversās sadaļas konfigurācija
 ConfigImportSocialNetwork=Ar Fediverse saderīgu sociālo tīklu konfigurācija
@@ -2555,6 +2581,29 @@ ParamName=Parametra nosaukums
 ParamValue=Parametra vērtība
 ConfirmDeleteParamOfSocialNetwork=Vai tiešām vēlaties dzēst šo parametru?
 HelpMariaDBToGetPossibleValues=Varat iegūt iespējamo vērtību sarakstu, izpildot šādu SQL komandu: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index ba1bf7157c5..443d0f864e4 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Beigu bilance
 CurrentBalance=Pašreizējā bilance
 FutureBalance=Nākotnes bilance
 ShowAllTimeBalance=Rādīt bilanci no sākuma
-AllTime=No sākuma
 Reconciliation=Samierināšanās
 RIB=Bankas konta numurs
 IBAN=IBAN numurs
@@ -133,7 +132,7 @@ DeleteTransaction=Dzēst ierakstu
 ConfirmDeleteTransaction=Vai tiešām vēlaties dzēst šo ierakstu?
 ThisWillAlsoDeleteBankRecord=Tas arī izdzēš izveidotos bankas darījumus
 BankMovements=Kustība
-PlannedTransactions=Plānotie darījumi
+PlannedTransactions=Upcoming entries
 Graph=Grafiki
 ExportDataset_banque_1=Banku darījumi un konta izraksts
 ExportDataset_banque_2=Depozīta kvīts
@@ -151,8 +150,8 @@ FutureTransaction=Nākotnes darījums. Nevar saskaņot.
 SelectChequeTransactionAndGenerate=Atlasiet / filtrējiet čekus, kas jāiekļauj čeku depozīta kvītī. Pēc tam noklikšķiniet uz "Izveidot".
 SelectPaymentTransactionAndGenerate=Atlasiet/filtrējiet dokumentus, kas jāiekļauj %s depozīta kvītī. Pēc tam noklikšķiniet uz "Izveidot".
 InputReceiptNumber=Izvēlieties ar izlīgumu saistīto bankas izrakstu. Izmantojiet šķirojamu skaitlisku vērtību
-InputReceiptNumberBis=GGGGMM vai GGGGMMDD
-EventualyAddCategory=Optionally, a category in which to classify the operations
+InputReceiptNumberBis=GGGGMM
+EventualyAddCategory=Pēc izvēles — kategorija, kurā operācijas klasificēt
 ToConciliate=Saskaņot?
 ThenCheckLinesAndConciliate=Tad pārbaudiet līnijas, kas atrodas bankas izrakstā, un noklikšķiniet
 DefaultRIB=Noklusējuma BAN
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Ja šī funkcija ir iespējota, jūs varat izvēlēties
 BankColorizeMovementName1=Debeta kustības fona krāsa
 BankColorizeMovementName2=Kredīta aprites fona krāsa
 IfYouDontReconcileDisableProperty=Ja dažos bankas kontos neveicat bankas saskaņošanu, atspējojiet rekvizītu "%s", lai noņemtu šo brīdinājumu.
-NoBankAccountDefined=Nav noteikts bankas konts
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Bankas kontā nav atrasts neviens ieraksts. Parasti tas notiek, ja ieraksts ir manuāli izdzēsts no bankas konta darījumu saraksta (piemēram, bankas konta saskaņošanas laikā). Vēl viens iemesls ir tas, ka maksājums tika reģistrēts, kad tika atspējots modulis "%s".
 AlreadyOneBankAccount=Viens bankas konts jau ir definēts
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA faila variants
diff --git a/htdocs/langs/lv_LV/blockedlog.lang b/htdocs/langs/lv_LV/blockedlog.lang
index 2d83bbb5b44..9aaf43a43b9 100644
--- a/htdocs/langs/lv_LV/blockedlog.lang
+++ b/htdocs/langs/lv_LV/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Nepārveidojami žurnāli
 ShowAllFingerPrintsMightBeTooLong=Rādīt visus arhivētos žurnālus (var būt daudz)
 ShowAllFingerPrintsErrorsMightBeTooLong=Rādīt visus nederīgos arhīva žurnālus (var būt garš)
 DownloadBlockChain=Lejupielādējiet pirkstu nospiedumus
-KoCheckFingerprintValidity=Arhivētais žurnāla ieraksts nav derīgs. Tas nozīmē, ka kāds (hakeris?) Ir pārveidojis dažus šī ieraksta datus pēc to ierakstīšanas, vai ir izdzēsis iepriekšējo arhivēto ierakstu (pārbaudiet, vai pastāv rinda ar iepriekšējo #) vai ir mainījusi iepriekšējā ieraksta kontrolsummu.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Arhivēts žurnāla ieraksts ir derīgs. Dati par šo līniju netika mainīti un ieraksts seko iepriekšējam.
 OkCheckFingerprintValidityButChainIsKo=Arhivētais žurnāls šķiet derīgs salīdzinājumā ar iepriekšējo, bet ķēde agrāk tika bojāta.
 AddedByAuthority=Uzglabāti tālvadības iestādē
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Žurnāla detaļas
 ListOfTrackedEvents=Saraksts ar izsekojamiem notikumiem
 Fingerprint=Pirkstu nospiedums
 DownloadLogCSV=Eksportēt arhivētos žurnālus (CSV)
-DataOfArchivedEvent=Pilni arhivētā pasākuma dati
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Oriģināls objekts (tips %s, id %s) nav saistīts (skatīt sleju "Pilnas datnes", lai iegūtu nemainīgus saglabātos datus).
 BlockedLogAreRequiredByYourCountryLegislation=Nemaināmu žurnālu moduli var pieprasīt jūsu valsts tiesību akti. Atspējojot šo moduli, nākotnes darījumi var kļūt nederīgi attiecībā uz likumu un juridiskās programmatūras izmantošanu, jo tos nevar apstiprināt ar nodokļu revīziju.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Nemaināmu žurnālu modulis tika aktivizēts jūsu valsts tiesību aktu dēļ. Atspējojot šo moduli, nākotnes darījumi var kļūt nederīgi attiecībā uz likumu un juridiskās programmatūras izmantošanu, jo tos nevar apstiprināt ar nodokļu revīziju.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Ir iespējota sistēma notikumu izsekošanai nemainīgos žurn
 BlockedLogDisabled=Sistēma notikumu izsekošanai nemainīgos žurnālos ir atspējota pēc ierakstīšanas. Mēs saglabājām īpašu pirkstu nospiedumu, lai izsekotu ķēdei kā pārrautai
 BlockedLogDisabledBis=Sistēma notikumu izsekošanai nemainīgos žurnālos ir atspējota. Tas ir iespējams, jo neviens ieraksts vēl nav veikts.
 LinkHasBeenDisabledForPerformancePurpose=Veiktspējas nolūkos tiešā saite uz dokumentu netiek rādīta pēc 100. rindiņas.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Klienta rēķins ir loģiski izdzēsts
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Klienta maksājuma loģiska dzēšana
 logPAYMENT_VARIOUS_CREATE=Izveidots maksājums (nav piešķirts rēķinam)
 logPAYMENT_VARIOUS_DELETE=Maksājums (nav piešķirts rēķinam) loģiska dzēšana
 logPAYMENT_VARIOUS_MODIFY=Mainīts maksājums (nav piešķirts rēķinam)
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index 1d292cb6ae0..19a471800c1 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Kontaktu tagu / kategoriju apgabals
 AccountsCategoriesArea=Bankas kontu tagi / kategoriju apgabals
 ProjectsCategoriesArea=Projekta tagu / kategoriju apgabals
 UsersCategoriesArea=Lietotāju tagu / kategoriju apgabals
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Apakšsadaļas
 CatList=Atslēgvārdu/sadaļu saraksts
 CatListAll=Tagu / kategoriju saraksts (visi veidi)
@@ -90,9 +91,10 @@ CategoriesSetup=Tagu / kategoriju iestatīšana
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Ja opcija ir ieslēgta, pievienojot objektu apakškategorijai, objekts tiks pievienots arī vecākkategorijām.
 AddProductServiceIntoCategory=Piešķiriet produktam/pakalpojumam kategoriju
-AddCustomerIntoCategory=Piešķirt kategoriju klientam
-AddSupplierIntoCategory=Piešķirt kategoriju piegādātājam
-AssignCategoryTo=Piešķirt kategoriju
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Izvēlies sadaļu
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Lapu konteineru kategorijas
 KnowledgemanagementsCategoriesArea=KM raksts Kategorijas
 UseOrOperatorForCategories=Kategorijām izmantojiet operatoru “OR”
 AddObjectIntoCategory=Piešķirt kategorijai
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index 85e9991fb5b..0a9f9ef7a0b 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -33,7 +33,7 @@ CountryIsInEEC=Valsts atrodas Eiropas Ekonomikas kopienā
 PriceFormatInCurrentLanguage=Cenu attēlošanas formāts pašreizējā valodā un valūtā
 ThirdPartyName=Trešās puses nosaukums
 ThirdPartyEmail=Trešās puses e-pasts
-ThirdParty=Trešā puse
+ThirdParty=Trešās puses
 ThirdParties=Trešās puses
 ThirdPartyProspects=Perspektīvas
 ThirdPartyProspectsStats=Perspektīvas
@@ -65,6 +65,7 @@ State=Valsts / province
 StateId=Valsts ID
 StateCode=Valsts/provinces kods
 StateShort=Valsts
+DepartmentBuyer=Buyer's state/province
 Region=Rajons
 Region-State=Reģions - valsts
 Country=Valsts
@@ -78,7 +79,7 @@ Chat=Čats
 PhonePro=Autobuss. tālruni
 PhonePerso=Pers. telefons
 PhoneMobile=Mobilais
-No_Email=Atteikties no lielapjoma pasta sūtījumiem
+No_Email=Refuse mass emails
 Fax=Fakss
 Zip=Pasta indekss
 Town=Pilsēta
@@ -155,7 +156,7 @@ ProfId4CH=Prof Id 2 (Tirdzniecības Ieraksta numurs)
 ProfId5CH=EORI numurs
 ProfId1CL=Prof ID 1 (RUT)
 ProfId1CM=Id. prof. 1 (Tirdzniecības reģistrs)
-ProfId2CM=Id. prof. 2 (Unique Tax Identification Number)
+ProfId2CM=Id. prof. 2 (unikālais nodokļu identifikācijas numurs)
 ProfId3CM=Id. prof. 3 (Radīšanas dekrēta Nr.)
 ProfId4CM=Id. prof. 4 (Depozīta sertifikāta Nr.)
 ProfId5CM=Id. prof. 5 (citi)
@@ -382,12 +383,12 @@ ExportCardToFormat=Eksportēt karti uz formātu
 ContactNotLinkedToCompany=Kontakts nav saistīts ar trešajām personām
 DolibarrLogin=Dolibarr pieteikšanās
 NoDolibarrAccess=Nav Dolibarr piekļuve
-ExportDataset_company_1=Trešās puses (uzņēmumi/fondi/fiziskie cilvēki) un to īpašības
-ExportDataset_company_2=Kontakti un to īpašības
-ExportDataset_company_3=Trešo pušu bankas konti
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Trešo pušu papildu kontakti/adreses un atribūti
+ExportDataset_company_3=Trešo pušu maksājumu veidi (bankas konti)
 ImportDataset_company_1=Trešās puses un to īpašības
 ImportDataset_company_2=Trešo pušu papildu kontakti/adreses un atribūti
-ImportDataset_company_3=Trešo pušu bankas konti
+ImportDataset_company_3=Trešo pušu maksājumu veidi (bankas konti)
 ImportDataset_company_4=Trešo pušu tirdzniecības pārstāvji (pārdošanas pārstāvji/lietotāji uzņēmumos)
 PriceLevel=Cenu līmenis
 PriceLevelLabels=Cenu līmeņa uzlīmes
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Bezmaksas kods bez verifikācijas.
 ManagingDirectors=Menedžera(u) vārds (CEO, direktors, prezidents...)
 MergeOriginThirdparty=Dublēta trešā puse (trešā puse, kuru vēlaties dzēst)
 MergeThirdparties=Apvienot trešās puses
-ConfirmMergeThirdparties=Vai tiešām vēlaties apvienot izvēlēto trešo pusi ar pašreizējo? Visi saistītie objekti (rēķini, pasūtījumi, ...) tiks pārvietoti uz pašreizējo trešo pusi, pēc tam izvēlētā trešā puse tiks izdzēsta.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Trešās puses ir apvienotas
 SaleRepresentativeLogin=Tirdzniecības pārstāvja pieteikšanās
 SaleRepresentativeFirstname=Tirdzniecības pārstāvja vārds
@@ -461,3 +462,6 @@ ExternalSystemID=Ārējās sistēmas ID
 IDOfPaymentInAnExternalSystem=Maksājuma režīma ID ārējā sistēmā (piemēram, Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE tīmekļa pakalpojuma akreditācijas dati
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Trešajai pusei ir jābūt klientam, lai varētu izveidot savu bankas informāciju Stripe pusē
+NewSocNameForClone=Jauns uzņēmuma nosaukums
+ConfirmCloneThirdparties=Vai tiešām vēlaties klonēt <b>%s</b> uzņēmumu?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index ededb97f9d5..eb8e1cc4551 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Klienta rēķina apmaksa
 PaymentSupplierInvoice=pārdevēja rēķina apmaksa
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=PVN maksājumi
-AutomaticCreationPayment=Automātiski reģistrēt maksājumu
+AutomaticCreationPayment=Also record the payment
 ListPayment=Maksājumu saraksts
 ListOfCustomerPayments=Klientu maksājumu  saraksts
 ListOfSupplierPayments=Pārdevēja maksājumu saraksts
@@ -118,10 +118,14 @@ SocialContributionsPayments=Sociālo/fiskālo nodokļu maksājumi
 ShowVatPayment=Rādīt PVN maksājumu
 TotalToPay=Summa
 BalanceVisibilityDependsOnSortAndFilters=Atlikums šajā sarakstā ir redzams tikai tad, ja tabula ir sakārtota %s un filtrēta 1 bankas kontā (bez citiem filtriem)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Klienta grāmatvedības kods
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Pārdevēja grāmatvedības kods
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Klienta. konta. kods
 SupplierAccountancyCodeShort=Sup. account. code
+UserAccountancyCodeShort=User account. code
 AccountNumber=Konta numurs
 NewAccountingAccount=Jauns konts
 Turnover=Apgrozījums izrakstīts rēķinā
@@ -129,7 +133,9 @@ TurnoverCollected=Iekasētais apgrozījums
 SalesTurnoverMinimum=Minimālais apgrozījums
 ByExpenseIncome=Ar izdevumiem un ienākumiem
 ByThirdParties=Trešās personas
+ByProjects=By projects
 ByUserAuthorOfInvoice=Ar rēķinu autors
+DetailedListLowercase=detailed list
 CheckReceipt=Depozīta kvīts
 CheckReceiptShort=Depozīta kvīts
 LastCheckReceiptShort=Jaunākās %s depozīta lapiņas
diff --git a/htdocs/langs/lv_LV/datapolicy.lang b/htdocs/langs/lv_LV/datapolicy.lang
index 766a606d24d..6e9ff91026e 100644
--- a/htdocs/langs/lv_LV/datapolicy.lang
+++ b/htdocs/langs/lv_LV/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Datu konfidencialitātes politika
 Module4100Desc = Datu konfidencialitātes pārvaldības modulis (atbilstība GDPR)
 # Administration page
 datapolicySetup = Moduļa datu konfidencialitātes politikas iestatīšana
-Deletion = Datu dzēšana
-datapolicySetupPage = Atkarībā no jūsu valsts tiesību aktiem (piemērs <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">VDAR 5. pants</a>) personas dati ir jāglabā noteiktu laiku. nepārsniedzot laiku, cik ilgi dati ir nepieciešami mērķim, kuram tie tika vākti, izņemot arhivēšanas nolūkos.<br>Dzēšana tiks veikta automātiski pēc noteikta laika bez notikumiem (ilgums). ko būsiet norādījis tālāk).
+DataDeletion=Datu dzēšana
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s mēneši
 ONE_YEAR = 1 gads
 NB_YEARS = %s gadi
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Iespējamais/klients
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Ne potenciālais/ne klients
 DATAPOLICY_CONTACT_FOURNISSEUR = Piegādātājs
 DATAPOLICY_ADHERENT = Dalībnieks
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Jūs varat nosūtīt GDPR e-pastu uz visām jūsu attiecīgajām kontaktpersonām (kuras vēl nav saņēmušas e-pastu un kurām neesat reģistrējis neko par viņu GDPR līgumu). Lai to izdarītu, izmantojiet šo pogu.
 SendAgreement = Sūtīt ēpastus
 AllAgreementSend = Visi e-pasti ir nosūtīti
 TXTLINKDATAPOLICYACCEPT = Teksts saitei "vienošanās"
 TXTLINKDATAPOLICYREFUSE = Teksts saitei "domstarpības"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: personas datu apstrāde
 DATAPOLICY_consentement = Saņemta piekrišana personas datu apstrādei
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index e05aa58a8bb..8c8b7681ff1 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Kļūda, veidojot attēlu failus (atrast
 ErrorFailedToCreateDir=Neizdevās izveidot direktoriju. Pārbaudiet, vai Web servera lietotājam ir tiesības rakstīt uz Dolibarr dokumentus direktorijā. Ja parametrs <b>safe_mode</b> ir iespējots uz šo PHP, pārbaudiet, Dolibarr php faili pieder web servera lietotājam (vai grupa).
 ErrorNoMailDefinedForThisUser=Nav definēts e-pasts šim lietotājam
 ErrorSetupOfEmailsNotComplete=E-pastu iestatīšana nav pabeigta
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Lai šī funkcija darbotos, ir jāaktivizē JavaScript. Mainiet to iestatījumos - displejā.
 ErrorTopMenuMustHaveAParentWithId0=Tipa &quot;Top&quot; izvēlnē nevar būt mātes ēdienkarti. Put ar 0 mātes izvēlnes vai izvēlēties izvēlni tips &quot;pa kreisi&quot;.
 ErrorLeftMenuMustHaveAParentId=Tipa 'Kreiso' izvēlne jābūt vecākiem id.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Augšupielāde bloķēja ar PHP/Apache spraudni.
 ErrorFileSizeTooLarge=Faila izmērs ir pārāk liels vai fails nav nodrošināts.
 ErrorFieldTooLong=Lauks %s ir pārāk garš.
 ErrorSizeTooLongForIntType=Izmērs ir pārāk garš int tipam (%s cipari maksimums)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Izmērs ir pārāk garš (%s simboli maksimums)
 ErrorNoValueForSelectType=Lūdzu izvēlieties vērtību no saraksta
 ErrorNoValueForCheckBoxType=Lūdzu, aizpildiet vērtību rūtiņu sarakstā
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Nepareiza drošības koda vērtība. Mēģiniet vēlreiz ar
 ErrorBothFieldCantBeNegative=Lauki %s un %s nevar būt abi negatīvi
 ErrorFieldCantBeNegativeOnInvoice=Lauks <strong>%s</strong> nevar būt negatīvs šāda veida rēķinā. Ja jums ir jāpievieno atlaides rinda, vispirms izveidojiet atlaidi (no trešās puses kartes lauka %s) un izmantojiet to rēķinam.
 ErrorLinesCantBeNegativeForOneVATRate=Rindu kopsumma (bez nodokļiem) nevar būt negatīva attiecībā uz noteiktu PVN likmi, kas nav nulles (PVN likmei <b> %s </b> %% ir negatīva kopsumma).
-ErrorLinesCantBeNegativeOnDeposits=Depozītā līnijas nevar būt negatīvas. Jūs saskarsities ar problēmām, kad jums būs jāpatērē depozīts galīgajā rēķinā, ja jūs to darāt.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Lietotāja kontam <b>%s</b> kas tiek izmantots, lai startētu web serveri nav atļaujas to startēt
 ErrorNoActivatedBarcode=Nav svītrkodu veids aktivizēts
 ErrUnzipFails=Neizdevās atarhivēt %s izmantojot ZipArchive
@@ -222,7 +225,7 @@ ErrorUserNotAssignedToTask=Lietotājam ir jāpiešķir uzdevums, lai varētu iev
 ErrorTaskAlreadyAssigned=Uzdevums jau ir piešķirts lietotājam
 ErrorModuleFileSeemsToHaveAWrongFormat=Šķiet, ka moduļu pakotne ir nepareizā formātā.
 ErrorModuleFileSeemsToHaveAWrongFormat2=Vismaz vienam obligātajam direktorijam jābūt moduļa <strong>ZIP</strong> <strong>failā</strong> : <strong>%s</strong> vai <strong>%s</strong>
-ErrorFilenameDosNotMatchDolibarrPackageRules=The file name of the module package (<strong>%s</strong>) does not match the expected name syntax: <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=Moduļa pakotnes faila nosaukums (<strong>%s</strong>) atbilst paredzētajai nosaukuma sintakse: <strong>%s</strong>
 ErrorDuplicateTrigger=Kļūda, dublikātu izraisītāja nosaukums %s. Jau piekrauts no %s.
 ErrorNoWarehouseDefined=Kļūda, noliktavas nav definētas.
 ErrorBadLinkSourceSetButBadValueForRef=Izmantotā saite nav derīga. Maksājuma avots ir definēts, bet "ref" vērtība nav derīga.
@@ -303,8 +306,8 @@ ErrorThirpdartyOrMemberidIsMandatory=Trešās puses vai partnerības dalībnieka
 ErrorFailedToWriteInTempDirectory=Neizdevās ierakstīt pagaidu direktorijā
 ErrorQuantityIsLimitedTo=Daudzums ir ierobežots līdz %s
 ErrorFailedToLoadThirdParty=Neizdevās atrast/ielādēt trešo pusi no id=%s, email=%s, name= %s
-ErrorThisPaymentModeIsNotDirectDebit=The payment mode is not direct debit
-ErrorThisPaymentModeIsNotCreditTransfer=The payment mode is not credit transfer
+ErrorThisPaymentModeIsNotDirectDebit=Maksājuma veids nav tiešais debets
+ErrorThisPaymentModeIsNotCreditTransfer=Maksājuma veids nav kredīta pārvedums
 ErrorStripeCustomerNotFoundCreateFirst=Stripe klients šai trešajai pusei nav iestatīts (vai ir iestatīta vērtība, kas svītrota pusē). Vispirms izveidojiet (vai pievienojiet to atkārtoti).
 ErrorCharPlusNotSupportedByImapForSearch=IMAP meklēšana nevar meklēt sūtītājā vai adresātā virkni, kurā ir rakstzīme +
 ErrorTableNotFound=Tabula <b> %s </b> nav atrasta
@@ -335,11 +338,18 @@ ErrorDictionaryNotFound=Vārdnīca <b>%s</b>
 ErrorFailedToCreateSymLinkToMedias=Neizdevās izveidot simbolisko saiti %s, lai norādītu uz %s
 ErrorCheckTheCommandInsideTheAdvancedOptions=Pārbaudiet eksportēšanai izmantoto komandu eksportēšanas papildu opcijās
 ErrorEndTimeMustBeGreaterThanStartTime=Beigu laikam ir jābūt lielākam par sākuma laiku
-ErrorIncoherentDates=Start date must be earlier than end date
-ErrorEndHourIsNull=End date field cannot be empty
-ErrorStartHourIsNull=Start date field cannot be empty
+ErrorIncoherentDates=Sākuma datumam ir jābūt agrākam par beigu datumu
+ErrorEndHourIsNull=Beigu datuma lauks nedrīkst būt tukšs
+ErrorStartHourIsNull=Sākuma datuma lauks nedrīkst būt tukšs
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Pārāk daudz rindu, lai apstrādātu. Lūdzu, izmantojiet selektīvāku filtru.
 ErrorEmptyValueForQty=Daudzums nevar būt nulle.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Jūsu PHP parametrs upload_max_filesize (%s) ir augstāks nekā PHP parametrs post_max_size (%s). Šī nav konsekventa iestatīšana.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=Šis vecāku ID vairs nepastāv
 WarningReadBankAlsoAllowedIfUserHasPermission=Brīdinājums, bankas konta lasīšana ir atļauta arī ar atļauju Pārvaldīt kontu plānu
 WarningNoDataTransferedInAccountancyYet=Lūdzu, ņemiet vērā, ka uzskaites tabulā nav datu. Lūdzu, pārsūtiet savus aplikācijā ierakstītos datus uz grāmatvedības sadaļu vai mainiet aprēķina režīmu, lai analizētu ārpus grāmatvedības ierakstītos datus.
 WarningChangingThisMayBreakStopTaskScheduler=Brīdinājums, šīs vērtības maiņa var atspējot plānotāju
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR rēķinu var pievienot tikai tiem rēķiniem, kas ir iestatīti apmaksai ar kredīta pārveduma maksājumiem.
 SwissQrCreditorAddressInvalid = Kreditora adrese nav derīga (vai ir iestatīts pasta indekss un pilsēta? (%s)
 SwissQrCreditorInformationInvalid = Kreditora informācija nav derīga IBAN kontam (%s): %s
@@ -422,4 +436,5 @@ OperNotDefined=Maksājuma veids nav definēts
 ErrorThisContactXIsAlreadyDefinedAsThisType=%s jau ir definēts kā šī veida kontaktpersona.
 ErrorThisGroupIsAlreadyDefinedAsThisType=Kontaktpersonas ar šo grupu jau ir definētas kā kontaktpersonas šim veidam.
 EmptyMessageNotAllowedError=Tukšs ziņojums nav atļauts
-ErrorIsNotInError=%s is not in error
+ErrorIsNotInError=%s nav kļūda
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/lv_LV/exports.lang b/htdocs/langs/lv_LV/exports.lang
index 84cfd022a52..13b6d33aa63 100644
--- a/htdocs/langs/lv_LV/exports.lang
+++ b/htdocs/langs/lv_LV/exports.lang
@@ -67,7 +67,7 @@ ChooseFormatOfFileToImport=Izvēlieties faila formātu, ko izmantot kā importa
 ChooseFileToImport=Augšupielādējiet failu, pēc tam noklikšķiniet uz %s ikonas, lai atlasītu failu kā avota importa failu ...
 SourceFileFormat=Avota faila formāts
 FieldsInSourceFile=Lauki sākotnējā failā
-FieldsInTargetDatabase=Mērķa lauki Dolibarr datu bāzē (treknrakstā = obligāti)
+FieldsInTargetDatabase=Mērķa lauki Dolibarr datubāzē
 NoFields=Nav lauki
 MoveField=Pārvietot lauka kolonnas numurs %s
 ExampleOfImportFile=Importa_faila_piemers
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Pārbaudiet, vai faila formāts (lauka un virknes norobe
 RunSimulateImportFile=Palaist importa simulāciju
 FieldNeedSource=Šim laukam nepieciešami dati no avota faila
 SomeMandatoryFieldHaveNoSource=Daži obligātie lauki nav avotu, no datu faila
-InformationOnSourceFile=Informācija avota failā
-InformationOnTargetTables=Informācija par mērķa laukiem
+InformationOnSourceFile=Avota fails
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Pārslēgt vismaz vienu avota lauku slejā jomās eksportēt
 SelectFormat=Izvēlieties šo importa failu formātu
 RunImportFile=Importēt datus
diff --git a/htdocs/langs/lv_LV/hrm.lang b/htdocs/langs/lv_LV/hrm.lang
index 8d1aa6dc9de..f003ec65e99 100644
--- a/htdocs/langs/lv_LV/hrm.lang
+++ b/htdocs/langs/lv_LV/hrm.lang
@@ -46,11 +46,11 @@ NewEval=Jauns kompetenču novērtējums
 ValidateEvaluation=Apstiprināt kompetences novērtējumu
 ConfirmValidateEvaluation=Vai tiešām vēlaties apstiprināt šo kompetenču novērtējumu, izmantojot atsauci <b>%s</b>?
 EvaluationCard=Kompetences novērtējums
-RequiredRank=Nepieciešamais rangs darba profilam
-RequiredRankShort=Nepieciešamais rangs
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Amati ar šo darba profilu
-EmployeeRank=Darbinieka pakāpe par šo prasmi
-EmployeeRankShort=Darbinieka rangs
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Darbinieka amats
 EmployeePositions=Darbinieku amati
 EmployeesInThisPosition=Darbinieki šajā amatā
@@ -72,6 +72,9 @@ AddSkill=Pievienojiet prasmes darba profilam
 RequiredSkills=Nepieciešamās prasmes šim darba profilam
 UserRank=Lietotāja rangs
 SkillList=Prasmju saraksts
+SkillCreated=Izveidotas %s prasmes
+SkillRank=Prasmju rangs
+ShowSkillRank=Parādiet prasmju rangu
 SaveRank=Saglabāt rangu
 TypeKnowHow=Know-how
 TypeHowToBe=Kā būt
@@ -95,3 +98,5 @@ NeedBusinessTravels=Nepieciešami biznesa ceļojumi
 NoDescription=Nav apraksta
 TheJobProfileHasNoSkillsDefinedFixBefore=Šī darbinieka novērtētajā darba profilā nav noteiktas prasmes. Lūdzu, pievienojiet prasmes(-es), pēc tam dzēsiet un restartējiet novērtēšanu.
 PDFStandardHrmEvaluation=Standarta veidne PDF dokumenta ģenerēšanai kompetences novērtēšanai
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index ac6ef55ab7a..4c902cea194 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=E-pasta sūtīšana
 EMailing=E-pasta sūtīšanas
-EMailings=E-pastu sūtīšana
+EMailings=Mass EMails
 SMSings=SMS sūtīšanas
-AllEMailings=Visas e-pastu sūtīšanas
+AllEMailings=All mass eMails
 MailCard=Sūtīšana pa e-kartiņu
 MailRecipients=Saņēmēji
 MailRecipient=Saņēmējs
@@ -26,19 +26,19 @@ MailFile=Pievienotie faili
 MailMessage=E-pasta saturs
 SubjectNotIn=Nav priekšmetā
 BodyNotIn=Nav ķermenī
-ShowEMailing=Rādīt e-pastus
-ListOfEMailings=E-pastu saraksts
-NewMailing=Jauna e-pasta vēstuļu sūtīšana
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Jauna sms
-EditMailing=Labot pasta vēstuļu sūtīšanu
-ResetMailing=Vēlreiz nosūtīt e-pastu
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Dzēst pasta vēstuļu sūtīšanas
-PreviewMailing=Preview pasta vēstuļu sūtīšanas
-CreateMailing=Izveidot e-pastu
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Tests
-ValidMailing=Derīgas pasta vēstuļu sūtīšanas
+ValidMailing=Valid mass Email
 MailingStatusDraft=Projekts
 MailingStatusValidated=Apstiprināts
 MailingStatusSent=Nosūtīts
@@ -55,7 +55,7 @@ ErrorMailRecipientIsEmpty=E-pasta adresāts ir tukšs
 WarningNoEMailsAdded=Nav jaunu e-pastu, lai pievienotu adresātu sarakstā.
 ConfirmValidMailing=Vai tiešām vēlaties apstiprināt šo e-pasta ziņojumu?
 ConfirmResetMailing=Brīdinājums, atkārtoti inicializējot e-pastu <b> %s </b>, jūs ļausit atkārtoti nosūtīt šo e-pastu lielapjoma pastā. Vai tiešām vēlaties to darīt?
-ConfirmResetMailingTargetMassactionQuestion=Are you sure you want to reset the status of the selected recipients (this may means that email will be resent if you use the Send email feature of the emailing) ?
+ConfirmResetMailingTargetMassactionQuestion=Vai tiešām vēlaties atiestatīt atlasīto adresātu statusu (tas var nozīmēt, ka e-pasts tiks nosūtīts atkārtoti, ja izmantojat e-pasta sūtīšanas funkciju Sūtīt e-pastu)?
 ConfirmDeleteMailing=Vai tiešām vēlaties dzēst šo e-pasta ziņojumu?
 NbOfUniqueEMails=Unikālo e-pasta ziņojumu skaits
 NbOfUniquePhones=Unikālo tālruņu skaits
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Lai tiktu vākti e-pasta ziņojumi, visiem filtriem ir
 LineInFile=Līnija %s failā
 RecipientSelectionModules=Definētie pieprasījumi saņēmēja izvēles
 MailSelectedRecipients=Atlasītie saņēmēji
-MailingArea=E-pastu nosūtīšanas sadaļa
-LastMailings=Jaunākie %s e-pasta ziņojumi
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Mērķu statistika
 NbOfCompaniesContacts=Unikālie kontakti/adreses
 MailNoChangePossible=Saņēmējiem par apstiprinātus pasta vēstuļu sūtīšanas nevar mainīt
-SearchAMailing=Meklēt e-pastu
-SendMailing=Nosūtīt e-pastu
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Nosūtīja
 AdvancedAlternative=Uzlabota alternatīva
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Taču jūs varat sūtīt tos tiešsaistē, pievienojot parametru MAILING_LIMIT_SENDBYWEB ar vērtību max skaitu e-pasta Jūs vēlaties nosūtīt pa sesiju. Lai to izdarītu, dodieties uz Home - Setup - pārējie.
 ConfirmSendingEmailing=Ja vēlaties nosūtīt e-pastu tieši no šī ekrāna, lūdzu, apstipriniet, ka esat pārliecināts, ka vēlaties nosūtīt e-pasta ziņojumus tūlīt no savas pārlūkprogrammas?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Nodzēst sarakstu
 ToClearAllRecipientsClickHere=Klikšķiniet šeit, lai notīrītu adresātu sarakstu par šo pasta vēstuļu sūtīšanas
 ToAddRecipientsChooseHere=Pievienotu adresātus, izvēloties no sarakstiem
-NbOfEMailingsReceived=Masu emailings saņemti
-NbOfEMailingsSend=Masveida e-pasts izsūtīts
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=Ieraksta ID
 DeliveryReceipt=Piegādes Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Jūs varat izmantot <b>komatu</b> kā atdalītāju, lai norādītu vairākus adresātus.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Šim notikuma veidam un uzņēmumam nav plānoti autom
 ANotificationsWillBeSent=1 automātisks paziņojums tiks nosūtīts pa e-pastu
 SomeNotificationsWillBeSent=%s automātiskie paziņojumi tiks nosūtīti pa e-pastu
 AddNewNotification=Abonējiet jaunu automātisku e-pasta paziņojumu (mērķis / notikums)
-ListOfActiveNotifications=Aktīvie abonementi (mērķi/notikumi) automātiskai e-pasta paziņošanai
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Nosūtīti automātiskie e-pasta paziņojumi
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -177,15 +179,15 @@ NoContactWithCategoryFound=Netika atrasta neviena kategorija, kas būtu saistīt
 NoContactLinkedToThirdpartieWithCategoryFound=Netika atrasta neviena kategorija, kas būtu saistīta ar dažām trešajām personām
 OutGoingEmailSetup=Izejošie e-pasti
 InGoingEmailSetup=Ienākošie e-pasti
-OutGoingEmailSetupForEmailing=Outgoing emails (%s)
+OutGoingEmailSetupForEmailing=Izejošie e-pasta ziņojumi (%s)
 DefaultOutgoingEmailSetup=Tāda pati konfigurācija kā globālā izejošā e-pasta iestatīšana
 Information=Informācija
 ContactsWithThirdpartyFilter=Kontakti ar trešās puses filtru
 Unanswered=Neatbildēts
 Answered=Atbildēts
-IsNotAnAnswer=Nav atbildes (sākotnējais e-pasts)
+IsNotAnAnswer=Neatbild (ir sākotnējais e-pasts)
 IsAnAnswer=Vai ir atbilde uz sākotnējo e-pastu
-RecordCreatedByEmailCollector=Record created by the Email Collector %s
+RecordCreatedByEmailCollector=Ierakstu izveidojis e-pasta vācējs %s
 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.
@@ -193,12 +195,12 @@ NoMoreRecipientToSendTo=Vairs nav adresātu, kam nosūtīt e-pastu
 EmailOptedOut=E-pasta īpašnieks ir pieprasījis vairs nesazināties ar viņu, izmantojot šo e-pasta ziņojumu
 EvenUnsubscribe=Iekļaujiet atteikšanās e-pasta ziņojumus
 EvenUnsubscribeDesc=Iekļaujiet atteikšanās e-pastus, kad atlasāt e-pastus kā mērķus. Noder, piemēram, obligātajiem pakalpojumu e-pastiem.
-XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s operations done)
+XEmailsDoneYActionsDone=%s e-pasta ziņojumi ir iepriekš kvalificēti, %s e-pasta ziņojumi ir veiksmīgi apstrādāti (darbībai %s darīts)
 YouCanMakeSomeInstructionForEmail=Varat izveidot dažus norādījumus savam e-pastam (piemērs: ģenerējiet attēlu e-pasta veidnē...)
 ModelTemplate=E-pasta veidne
 YouCanChooseAModelForYouMailContent= Varat izvēlēties vienu no veidņu modeļiem vai ģenerēt to ar AI
 TitleOfMailHolder=E-pasta virsraksts ir šeit
 ContentOfMailHolder=E-pasta saturs nonāk šeit...
-LastNews=Last News
-ListProducts= List of products
-PasswordReset=Password reset
+LastNews=Latest News
+ListProducts= Produktu saraksts
+PasswordReset=Paroles atiestatīšana
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 6e5ef12a77f..a1c79f11258 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -37,6 +37,7 @@ Translation=Tulkošana
 Translations=Tulkojumi
 CurrentTimeZone=Laika josla PHP (servera)
 EmptySearchString=Ievadiet netukšus meklēšanas kritērijus
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Ievadiet datuma kritērijus
 NoRecordFound=Nav atrasti ieraksti
 NoRecordDeleted=Neviens ieraksts nav dzēsts
@@ -45,6 +46,7 @@ NoError=Nav kļūdu
 Error=Kļūda
 Errors=Kļūdas
 ErrorFieldRequired=Lauks '%s' ir obligāti aizpildāms
+CustomMandatoryFieldRule=Pielāgota kārtula “Obligāts lauks”.
 ErrorFieldFormat=Laukā '%s' ir nepareiza vērtība
 ErrorFileDoesNotExists=Fails %s neeksistē
 ErrorFailedToOpenFile=Neizdevās atvērt failu %s
@@ -308,6 +310,7 @@ DateBuild=Ziņojuma veidošanas datums
 DatePayment=Maksājuma datums
 DateApprove=Apstiprināšanas datums
 DateApprove2=Apstiprināšanas datums (otrais apstiprinājums)
+PendingSince=Pending since
 RegistrationDate=Reģistrācijas datums
 UserCreation=Izveidošanas lietotājs
 UserModification=Labošanas lietotājs
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Jāsāk
 ActionRunningShort=Procesā
 ActionDoneShort=Pabeigts
 ActionUncomplete=Nepabeigts
-LatestLinkedEvents=Jaunākie %s saistītie notikumi
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Uzņēmums / organizācija
 Accountant=Grāmatvedis
 ContactsForCompany=Šīs trešās personas kontakti
@@ -503,7 +506,7 @@ ContactsAddressesForCompany=Kontakti / adreses par šīs trešās personas
 AddressesForCompany=Šīs trešās puses adreses
 ActionsOnCompany=Notikumi šai trešajai pusei
 ActionsOnContact=Notikumi šim kontaktam / adresei
-ActionsOnUser=Events for this user
+ActionsOnUser=Pasākumi šim lietotājam
 ActionsOnContract=Notikumi šim līgumam
 ActionsOnMember=Pasākumi par šo locekli
 ActionsOnProduct=Notikumi ar šo produktu
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=E-pasta ķermenis
 SendAcknowledgementByMail=Sūtīt apstiprinājuma e-pastu
 SendMail=Sūtīt e-pastu
 Email=E-pasts
+EMail=E-pasts
+EMails=E-pasti
 NoEMail=Nav e-pasta
 AlreadyRead=Jau izlasīts
 NotRead=Nelasīts
@@ -793,7 +798,7 @@ Notes=Piezīmes
 AddNewLine=Pievienot jaunu līniju
 AddFile=Pievienot failu
 FreeZone=Brīvā teksta produkts
-FreeLineOfType=Brīvais teksts, ierakstiet:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Klonēt objektu ar tā galvenajiem atribūtiem
 ReGeneratePDF=Pārveidojiet PDF failu
 PDFMerge=Apvienot PDF
@@ -879,12 +884,14 @@ toward=uz
 Access=Pieeja
 SelectAction=Izvēlēties darbību
 SelectTargetUser=Atlasiet mērķa lietotāju/darbinieku
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Izmantot taustiņu kombināciju Ctrl + C, lai kopētu
 SaveUploadedFileWithMask=Saglabāt failu uz servera ar nosaukumu "<strong>%s</strong>" (citādi "%s")
 OriginFileName=Oriģinālais faila nosaukums
 SetDemandReason=Izvēlēties avotu
 SetBankAccount=Definēt bankas kontu
 AccountCurrency=Konta valūta
+AccountancyCode=Grāmatvedības kods
 ViewPrivateNote=Apskatīt piezīmes
 XMoreLines=%s līnija(as) slēptas
 ShowMoreLines=Parādīt vairāk / mazāk rindas
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Vai tiešām vēlaties dzēst atlasīto(-s) ierakstu
 ConfirmMassClone=Lielapjoma klona apstiprināšana
 ConfirmMassCloneQuestion=Atlasiet projektu, uz kuru vēlaties klonēt
 ConfirmMassCloneToOneProject=Klonēt uz projektu %s
+ObjectClonedSuccessfuly=Objekts veiksmīgi klonēts
 RelatedObjects=Saistītie objekti
 ClassifyBilled=Klasificēt Rēķinu
 ClassifyUnbilled=Klasificēt bez rēķina
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Lai skatītu vai lejupielādētu failu, jums ir jāpiesa
 Download=Lejupielādēt
 DownloadDocument=Lejupielādēt dokumentu
 DownloadSignedDocument=Lejupielādējiet parakstītu dokumentu
-ActualizeCurrency=Atjaunināt valūtas kursu
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Fiskālais gads
 ModuleBuilder=Modulis un lietojumprogrammu veidotājs
 SetMultiCurrencyCode=Iestatīt valūtu
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Lielapjoma darbības
 ClickToShowHelp=Noklikšķiniet, lai parādītu rīka padomju palīdzību
 WebSite=Tīmekļa vietne
@@ -1104,6 +1113,7 @@ PayedBy=Apmaksājis
 PayedTo=Apmaksāts
 Monthly=Katru mēnesi
 Quarterly=Ceturksnis
+Quarter=Quarter
 Annual=Ikgadējais
 Local=Vietējais
 Remote=Attālinātais
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Uzdevums
 ContactDefault_propal=Priekšlikums
 ContactDefault_supplier_proposal=Piegādātāja priekšlikums
 ContactDefault_ticket=Biļete
+ContactDefault_societe=Trešās puses
 ContactAddedAutomatically=Kontaktpersona pievienota no trešās puses kontaktpersonu lomām
 More=Vairāk
 ShowDetails=Parādīt detaļas
@@ -1189,7 +1200,7 @@ CreateExternalUser=Izveidot ārēju lietotāju
 ConfirmAffectTag=Lielapjoma tagu piešķiršana
 ConfirmAffectUser=Lielapjoma lietotāju piešķiršana
 ContactRole=Kontaktpersonas loma
-ContactRoles=Contact roles
+ContactRoles=Kontaktu lomas
 ProjectRole=Katram projektam/iespējai piešķirta loma
 TasksRole=Katram uzdevumam piešķirtā loma (ja tiek izmantota)
 ConfirmSetSupervisor=Lielapjoma uzrauga komplekts
@@ -1242,6 +1253,7 @@ CommercialAffected=Norīkots tirdzniecības pārstāvis
 CommercialsDisaffected=Pārdošanas pārstāvji ir atsaistīti
 CommercialDisaffected=Tirdzniecības pārstāvis ir atsaistīts
 Message=Ziņa
+Emailing=Emailing
 Progression=Progress
 YourMessage=Tava ziņa
 YourMessageHasBeenReceived=Jūsu ziņojums ir saņemts. Mēs atbildēsim vai sazināsimies ar jums pēc iespējas ātrāk.
@@ -1285,7 +1297,7 @@ AmountSalary=Algas summa
 InvoiceSubtype=Rēķina apakštips
 ConfirmMassReverse=Lielapjoma Reverss apstiprinājums
 ConfirmMassReverseQuestion=Vai tiešām vēlaties atsaukt %s atlasīto(-os) ierakstu(-us)?
-ConfirmActionXxx=Confirm action %s
+ConfirmActionXxx=Apstipriniet darbību %s
 ElementType=Elementa veids
 ElementId=Elementa ID
 Encrypted=Šifrēts
@@ -1306,3 +1318,34 @@ TranslationOfKey=Atslēgas AnyTranslationKey tulkojums
 SignedStatus=Parakstīts statuss
 NbRecordQualified=Kvalificēto ierakstu skaits
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Pievienot
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=No sākuma
+Transferred=Transferred
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index 84331717723..3bfe026b6b5 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Ja ir nepieciešams abonements, abonements ar sākuma v
 DeleteType=Dzēst
 VoteAllowed=Balsot atļauts
 Physical=Individuāls
-Moral=Korporācija
-MorAndPhy=Korporācija un privātpersona
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Atkārtoti iespējot
 ExcludeMember=Izslēgt dalībnieku
 Exclude=Izslēgt
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Dalībnieku statistika pa reģioniem
 NbOfMembers=Kopējais dalībnieku skaits
 NbOfActiveMembers=Kopējais pašreizējo aktīvo dalībnieku skaits
 NoValidatedMemberYet=Nav apstiprinātas locekļi atrasti
-MembersByCountryDesc=Šajā ekrānā tiek parādīta dalībnieku statistika pa valstīm. Grafiki un diagrammas ir atkarīgas no Google tiešsaistes grafiku pakalpojuma pieejamības, kā arī no darbojoša interneta savienojuma pieejamības.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Šajā ekrānā tiek parādīta dalībvalstu statistika pēc štata / provincēm / kantona.
 MembersByTownDesc=Šajā ekrānā tiek parādīta dalībnieku statistika pa pilsētām.
 MembersByNature=Šis ekrāns parāda dalībnieku statistiku pēc būtības.
@@ -208,25 +209,25 @@ NewMemberbyWeb=Jauns dalībnieks pievienots. Gaida apstiprinājumu
 NewMemberForm=Jauna dalībnieka forma
 SubscriptionsStatistics=Ieguldījumu statistika
 NbOfSubscriptions=Iemaksu skaits
-AmountOfSubscriptions=Amount collected from membership payments
+AmountOfSubscriptions=Summa, kas iekasēta no dalības maksājumiem
 TurnoverOrBudget=Apgrozījums (uzņēmumam) vai budžets (par pamatu)
-DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
-MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
-CanEditAmount=Membership amount can be defined by the member
+DefaultAmount=Dalības maksājuma noklusējuma summa (izmanto tikai tad, ja dalībnieka veida līmenī nav noteikta summa)
+MinimumAmount=Minimālā dalības maksājuma summa (ir prioritāte attiecībā uz visām noklusējuma summām)
+CanEditAmount=Dalības summu var noteikt dalībnieks
 CanEditAmountDetail=Apmeklētājs var izvēlēties/rediģēt sava ieguldījuma apjomu neatkarīgi no dalībnieka veida
 AmountIsLowerToMinimumNotice=Summa ir mazāka par minimālo %s
 MEMBER_NEWFORM_PAYONLINE=Pēc tiešsaistes reģistrācijas automātiski pārslēdzieties uz tiešsaistes maksājumu lapu
 ByProperties=Pēc būtības
 MembersStatisticsByProperties=Dalībnieku statistika pēc būtības
-VATToUseForSubscriptions=VAT rate to use for membership payment
-NoVatOnSubscription=No VAT for membership payment
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
+VATToUseForSubscriptions=PVN likme, kas jāizmanto dalības apmaksai
+NoVatOnSubscription=Bez PVN dalības maksājumiem
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkts, kas tiek izmantots dalības rindai rēķinā: %s
 NameOrCompany=Vārds vai uzņēmums
 SubscriptionRecorded=Ieguldījums ierakstīts
 NoEmailSentToMember=Biedram nav nosūtīts neviens e-pasts
 EmailSentToMember=E-pasts tiek nosūtīts dalībniekam %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
-SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+SendReminderForExpiredSubscriptionTitle=Nosūtiet atgādinājumu pa e-pastu par dalības termiņa beigām
+SendReminderForExpiredSubscription=Sūtīt atgādinājumu dalībniekiem pa e-pastu, kad dalība drīz beigsies (parametrs ir dienu skaits pirms dalības beigām, lai nosūtītu atgādinājumu. Tas var būt dienu saraksts, kas atdalīts ar semikolu, piemēram, '10;5;0;-5 ')
 MembershipPaid=Dalība, kas samaksāta par kārtējo periodu (līdz %s)
 YouMayFindYourInvoiceInThisEmail=Jūsu rēķinu varat atrast šī e-pasta pielikumā
 XMembersClosed=%s dalībnieks (-i) slēgts
@@ -237,11 +238,11 @@ CreateDolibarrThirdPartyDesc=Trešā puse ir juridiska persona, kas tiks izmanto
 MemberFirstname=Dalībnieka vārds
 MemberLastname=Dalībnieka uzvārds
 MemberCodeDesc=Dalībnieka kods, unikāls visiem dalībniekiem
-MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
-MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
-NoCorrection=No correction
-MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
-MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
+MemberSubscriptionStartFirstDayOf=Piespiediet ieteikto dalības datumu, lai tas atbilstu a pirmajai dienai
+MemberSubscriptionStartAfter=Minimālais periods pirms pirmā dalības abonementa sākuma datuma stāšanās spēkā (izņemot atjaunošanu)
+NoCorrection=Nav labojumu
+MemberSubscriptionStartAfterDesc=Piemērs: +3 mēn = +3 mēneši, -5 d = -5 dienas, +1 gads = +1 gads
+MemberSubscriptionStartAfterDesc2=Šis ir ieteiktais datums, veidojot pirmo dalības abonementu, salīdzinot ar pašreizējo datumu. Atjaunošanai pēc noklusējuma ieteiktais datums paliks iepriekšējās dalības beigas.
 SubscriptionLinkedToConciliatedTransaction=Dalība ir saistīta ar saskaņotu darījumu, tāpēc šī modifikācija nav atļauta.
 ConfirmMassSubsriptionCreation=Apstipriniet abonementa izveidi
 ConfirmMassSubsriptionCreationQuestion=Vai tiešām vēlaties izveidot %s atlasīto(-os) abonementu(-us)?
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index c48d86f740b..9f89b1cf2a3 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -97,7 +97,6 @@ ShowService=Rādīt pakalpojumu
 ProductsAndServicesArea=Produktu un pakalpojumu sadaļa
 ProductsArea=Preču sadaļa
 ServicesArea=Pakalpojumu sadaļa
-ListOfStockMovements=Krājumu pārvietošanas saraksts
 BuyingPrice=Pirkšanas cena
 PriceForEachProduct=Prece ar specifisku cenu
 SupplierCard=Pārdevēja karte
@@ -145,7 +144,7 @@ WithoutDiscount=Bez atlaides
 VATRateForSupplierProduct=Nodokļa likme (šim pārdevējam/produktam)
 DiscountQtyMin=Atlaide šim daudzumam.
 NoPriceDefinedForThisSupplier=Šim pārdevējam / produktam nav noteikta cena / daudzums
-NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
+NoProductPriceDefinedForThisSupplier=Šim pārdevējam nav noteikta produkta cena/daudzums
 NoSupplierPriceDefinedForThisProduct=Šim produktam nav noteikta pārdevēja cena / daudzums
 PredefinedItem=Iepriekš definēts vienums
 PredefinedProducts=Iepriekš definēts produkts
@@ -172,7 +171,7 @@ BuyingPrices=Iepirkšanas cenas
 CustomerPrices=Klienta cenas
 SuppliersPrices=Pārdevēja cenas
 SuppliersPricesOfProductsOrServices=Pārdevēja cenas (produktiem vai pakalpojumiem)
-CustomCode=Muita | prece | HS kods
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Izcelsmes valsts
 RegionStateOrigin=Izcelsmes reģions
 StateOrigin=Valsts | Izcelsmes province
@@ -210,6 +209,7 @@ unitL=Litrs
 unitT=tonna
 unitKG=kg
 unitG=Grams
+unitGAL=galons
 unitMG=mg
 unitLB=mārciņa
 unitOZ=unce
@@ -312,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Pieprasījuma formāts ir {"URL": "http://examp
 UpdateInterval=Atjaunošanās intervāls (minūtes)
 LastUpdated=Pēdējo reizi atjaunots
 CorrectlyUpdated=Pareizi atjaunināts
-PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=Izvēlieties PDF failus
 IncludingProductWithTag=Ieskaitot produktus/pakalpojumus ar atzīmi
 DefaultPriceRealPriceMayDependOnCustomer=Noklusējuma cena, reālā cena var būt atkarīga no klienta
@@ -349,6 +349,10 @@ QtyRecalculatedWithPackaging=Līnijas daudzums tika pārrēķināts atbilstoši
 
 #Attributes
 Attributes=Atribūti
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Variantu atribūti
 ProductAttributes=Variantu atribūti produktiem
 ProductAttributeName=Variants atribūts %s
@@ -396,6 +400,8 @@ ErrorDestinationProductNotFound=Galamērķa produkts nav atrasts
 ErrorProductCombinationNotFound=Produkta variants nav atrasts
 ActionAvailableOnVariantProductOnly=Darbība pieejama tikai produkta variantam
 ProductsPricePerCustomer=Produktu cenas uz vienu klientu
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Papildu atribūti (piegādātāju cenas)
 DeleteLinkedProduct=Izdzēsiet kombinēto produktu, kas saistīts ar to
 AmountUsedToUpdateWAP=Vienības summa, kas jāizmanto, lai atjauninātu vidējo svērto cenu
@@ -404,8 +410,8 @@ PMPValueShort=VSC
 mandatoryperiod=Obligātie periodi
 mandatoryPeriodNeedTobeSet=Piezīme. Periods (sākuma un beigu datums) ir jādefinē
 mandatoryPeriodNeedTobeSetMsgValidate=Pakalpojumam ir nepieciešams sākuma un beigu periods
-mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
-mandatoryHelper2=Note that the message is a warning and not a blocking error.
+mandatoryHelper=Atzīmējiet šo, ja vēlaties saņemt ziņojumu lietotājam, veidojot/apstiprinot rēķinu, komerciālu piedāvājumu, pārdošanas pasūtījumu, neievadot sākuma un beigu datumu rindās ar šo pakalpojumu.
+mandatoryHelper2=Ņemiet vērā, ka ziņojums ir brīdinājums, nevis bloķēšanas kļūda.
 DefaultBOM=Noklusējuma BOM
 DefaultBOMDesc=Šī produkta ražošanai ieteicams izmantot noklusējuma BOM. Šo lauku var iestatīt tikai tad, ja produkta veids ir “%s”.
 Rank=Rangs
@@ -437,3 +443,6 @@ AllowStockMovementVariantParentHelp=Pēc noklusējuma varianta vecākais ir virt
 ConfirmSetToDraftInventory=Vai tiešām vēlaties atgriezties uz melnraksta statusu?<br>Pašlaik krājumos iestatītie daudzumi tiks atiestatīti.
 WarningLineProductNotToSell=Produktu vai pakalpojumu "%s" nedrīkst pārdot, un tas tika klonēts
 PriceLabel=Cenas etiķete
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/lv_LV/salaries.lang b/htdocs/langs/lv_LV/salaries.lang
index 49fe3d9ec7d..cd8ef637a9a 100644
--- a/htdocs/langs/lv_LV/salaries.lang
+++ b/htdocs/langs/lv_LV/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Jauna alga
 AddSalary=Pievienojiet algu
 NewSalaryPayment=Jauna algas karte
 AddSalaryPayment=Pievienot algas maksājumu
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Algas maksājums
 SalariesPayments=Algu maksājumi
 SalariesPaymentsOf=Algas maksājumi %s
@@ -27,7 +29,7 @@ FillFieldFirst=Vispirms aizpildiet darbinieka lauku
 UpdateAmountWithLastSalary=Nosakiet pēdējās algas summu
 MakeTransferRequest=Veiciet pārsūtīšanas pieprasījumu
 VirementOrder=Kredīta pārskaitījuma pieprasījums
-BankTransferAmount=Kredīta pārveduma summa
 WithdrawalReceipt=Kredīta pārveduma rīkojums
 OrderWaiting=Neapstiprināts pasūtījums
 FillEndOfMonth=Aizpildiet ar mēneša beigām
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index 77c19ade954..7d4929e545f 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Izmantojiet šeit citu nosaukumu / aizstājvārdu sarakstu,
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=JavaScript faila saturs (kopīgs visām lapām)
-WEBSITE_HTML_HEADER=Papildinājums HTML galvenes apakšā (kopīgs visām lapām)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Robotfails (robots.txt)
 WEBSITE_HTACCESS=Tīmekļa vietne .htaccess fails
 WEBSITE_MANIFEST_JSON=Vietnes manifest.json fails
@@ -56,16 +56,17 @@ ReadPerm=Lasīt
 WritePerm=Rakstīt
 TestDeployOnWeb=Pārbaudiet / izvietojiet tīmeklī
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr= <u> Priekšskatīt %s jaunā cilnē. </u> <br> <br> %s apkalpos Dolibarr serveris, tāpēc tam nav nepieciešams instalēt papildu tīmekļa serveri (piemēram, Apache, Nginx, IIS). <br> Neērti ir tas, ka lapu vietrāži URL nav lietotājam draudzīgi un sākas ar jūsu Dolibarr ceļu. <br> URL apkalpo Dolibarr: <br> <strong> %s </strong> <br> <br> Lai izmantotu savu ārējo web serveri, lai kalpotu šo tīmekļa vietni, izveidot virtuālo uzņēmējas jūsu tīmekļa serverī, kas norāda uz direktoriju <br> <strong> %s </strong> <br> tad ievadiet nosaukumu šī virtuālā servera šīs vietnes rekvizītos un noklikšķiniet uz saites "Pārbaudīt / izvietot tīmeklī".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=Virtuālā resursdatora adrese, kuru apkalpo ārējs tīmekļa serveris, nav definēts
 NoPageYet=Vēl nav nevienas lapas
 YouCanCreatePageOrImportTemplate=Jūs varat izveidot jaunu lapu vai importēt pilnu vietnes veidni
 SyntaxHelp=Palīdzība par konkrētiem sintakses padomiem
 YouCanEditHtmlSourceckeditor=Jūs varat rediģēt HTML avota kodu, izmantojot redaktorā pogu "Avots".
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Attēlam, kas tiek koplietots ar koplietošanas saiti (atvērta piekļuve, izmantojot faila koplietošanas hash atslēgu), sintakse ir: <br> <strong> &lt;img src = "/ viewimage.php? Hashp = 123456790120f0f0f0f0f0f0c0f0fcfcfcfcfcfcfcfcfcfcfcflcflcfcflcflcfl0f0flffcfcfcflflfcflflflflflflflflflflflflflflflflflflflflflflfcflflflflflflflflflflflflflrlxlrg" "
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Šajā avotā varat iekļaut PHP kodu, izmantojot tagus <strong>&lt;?php ?&gt;<span class='notranslate6fd70b10af6fd70 </span>. Ir pieejami šādi globālie mainīgie: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> Varat iekļaut arī citas lapas/konteinera saturu ar šādu sintaksi:<br><strong>&lt;?php includeContainer('alias_of_includeer'); ?&gt;</strong><br>ccfda192bz0 /span><span class='notranslate'><span class="fa fa-bug paddingright"></span> Varat veikt novirzīšanu uz citu lapu/konteineru, izmantojot šādu sintaksi (piezīme: neizvadiet nevienu saturs pirms novirzīšanas):<br><strong>&lt;?php redirectToContainer alias_of_container_to_redirect_to'); ?&gt;</strong><br>Varat arī veikt novirzīšanu, izmantojot GET parametrus. <br><strong>&lt;?php redirectToContainer,'alias_of_container, 0, 0, $array_of_get_params); ?&gt;</strong><br>ccfda192bz0 /span><span class='notranslate'><span class="fa fa-link paddingright"></span> Lai pievienotu saiti uz citu lapu, izmantojiet sintaksi:<br> <strong>&lt;a href="alias_of_page_to_link_to.php"b0012c7d0be</08c7d >mana saite<span class='notranslate'>&lt;a&gt;</strong> <br><br><p>b02bd88d791f12 classz0'no '></span> Varat dinamiski iestatīt lapas nosaukumu un <strong>SEO metatagus</strong>, ti, aprakstu ). Vienkārši definējiet šādus mainīgos:<br> <code>$__PAGE__TITLE__ = "Nosaukuma vērtība…";7b05d <br> <code>$__PAGE__KEYWORDS__ = "atslēgvārds1, atslēgvārds2, atslēgvārds…"; // Atdalīts ar komatu</code><br> <code>DESC___PAGE__ ;</code> /span></span> Lai iekļautu <strong>saiti, lai lejupielādētu</strong> failu kas saglabāti <strong>dokumentu</strong> direktorijā, izmantojiet <strong>. <span class='notranslate'></strong> iesaiņojums:<br>Piemērs, failam dokumentos/ecm (jāreģistrē), sintakse ir:<br><strong>&lt;a href="/document.php?modulepart=[ecm&fi relation_dir/]filename.ext"&gt;</strong><br> failā dokumenti/mediji (atvērts direktorijs publiskai piekļuvei), sintakse ir:<br><strong>&lt; /span>a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"<span class='notranslate'>&gt;</strong> <br>Failam, kas kopīgots ar kopīgošanas saiti (atvērta piekļuve, izmantojot faila koplietošanas jaucējatslēgu), sintakse ir šāda:<br><. span class='notranslate'><strong></span>&lt;a href="/document.php?hashp=publicsharekeyoffile"b0012c7dc0</span8c7d ><span class='notranslate'></strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Klonēt lapu / konteineru
 CloneSite=Klonēt vietni
@@ -87,15 +88,15 @@ WebsiteAccount=Tīmekļa vietnes konts
 WebsiteAccounts=Tīmekļa vietnes konti
 AddWebsiteAccount=Izveidot mājas lapas kontu
 BackToListForThirdParty=Atgriezties uz trešo pušu sarakstu
-DisableSiteFirst=Vispirms atspējojiet vietni
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Manas tīmekļa vietnes virsraksts
 AnotherContainer=Šis ir veids, kā iekļaut citas lapas / konteinera saturu (šeit, iespējams, iespējot dinamisko kodu, iespējams, ir kļūda, jo iegultais apakštvertne, iespējams, neeksistē)
 SorryWebsiteIsCurrentlyOffLine=Diemžēl šī vietne pašlaik nav pieejama. Lūdzu, atgriezieties vēlāk ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Iespējot tīmekļa vietnes kontu tabulu
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ļauj tabulai saglabāt tīmekļa vietņu kontus (pieteikšanās / caurlaide) katrai vietnei / trešajai pusei
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Vispirms ir jādefinē noklusējuma sākumlapa
-OnlyEditionOfSourceForGrabbedContentFuture=Brīdinājums: tīmekļa lapas izveide, importējot ārēju tīmekļa lapu, ir paredzēta pieredzējušiem lietotājiem. Atkarībā no avota lapas sarežģītības, importēšanas rezultāts var atšķirties no oriģināla. Arī tad, ja avota lapa izmanto izplatītus CSS stilus vai konfliktējošu JavaScript, tas var sabojāt vietnes redaktora izskatu vai funkcijas, strādājot ar šo lapu. Šī metode ir ātrāks veids, kā izveidot lapu, taču ir ieteicams izveidot jaunu lapu no jauna vai no ieteiktās lapas veidnes.<br>Ņemiet vērā arī to, ka iekļautais redaktors var nedarboties. pareizība, ja to izmanto satvertā ārējā lapā.
-OnlyEditionOfSourceForGrabbedContent=Tikai HTML avota izdevums ir pieejams, ja saturs tiek satverts no ārējas vietnes
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Grab arī attēlus, kas atrodami CSS un lapā.
 ImagesShouldBeSavedInto=Attēli jāuzglabā mapē
 WebsiteRootOfImages=Mājaslapu attēlu sakņu direktorija
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Izrakstieties no sava klienta konta
 filteredByVersion=Filtrēts pēc versijas
 removeFilter=Noņemt filtru
 viewMyCart=Skatīt manu iepirkumu grozu
+Shipping=Shipping
 freeShipping=Bezmaksas sūtīšana!
 noProducts=Nav produktu
 nbrItemsInCart=Jūsu grozā ir <span class="ajax_cart_quantity">0</span> preces.
@@ -271,8 +273,8 @@ totalTaxIncl=Kopā (ar nodokļiem)
 clickToClose=Noklikšķiniet, lai aizvērtu
 sidebarCategories=Sadaļas
 noSubCat=NoSubCat
-specialPromo=Promotions
-allSpecials=All promotions
+specialPromo=Akcijas
+allSpecials=Visas akcijas
 newProducts=Jauni produkti
 allNewProducts= Visi jaunie produkti
 view=Skatīt:
@@ -284,12 +286,13 @@ productNameAToZ=Produkta nosaukums: A līdz Z
 productNameZToA=Produkta nosaukums: Z līdz A
 referenceLowestFirst=Atsauce: Vispirms zemākais
 referenceHighestFirst=Atsauce: augstākais vispirms
+productPerPage=products per page
 perPage=uz lapu
 showAll=Parādīt visu
 showing= Rāda
 nbrOfProducts= Ir %s produkti.
 noResultsHaveBeenFound=Ir atrasti 0 rezultāti.
-noResultsWereFound= Rezultāti netika atrasti.
+noResultsWereFound=Rezultāti netika atrasti.
 addToCart=Pievienot grozam
 backHome=Atgriezties uz sākumlapu
 priceDrop=Cenas kritums
@@ -302,10 +305,11 @@ lastUpdate=Pēdējā atjaunošana
 contactSupport=Kā sazināties ar atbalsta dienestu
 noProductToDisplay=Kļūda. Nav produkta, ko parādīt
 yourCompanyInformation=Jūsu uzņēmuma informācija
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=Šis e-pasts jau ir reģistrēts.
 firstnameContainsLettersOnly=<b>Vārdā</b> drīkst būt tikai burti un atstarpes
 lastnameContainsLettersOnly=<b>Uzvārds</b> drīkst saturēt tikai burtus un atstarpes
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=Radās kļūda.
 accountCreation=Izveidot kontu
 errorsOccurred=Ir %s kļūda%s
@@ -357,3 +361,7 @@ subtract=Atņemt
 LoginCheckout=Piesakieties un dodieties uz norēķināšanos
 paymentSuccessProcessed=Jūsu maksājums ir veiksmīgi apstrādāts.
 youWillBeRedirectedToOrderPage=Drīzumā tiksiet novirzīts uz pasūtījuma informācijas lapu.
+WebPortalSetupNotComplete=Tīmekļa portāla iestatīšana nav pabeigta
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index d753dd1aba8..8b641456c31 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Проверката на интегрите
 FileIntegritySomeFilesWereRemovedOrModified=Проверката на интегритетот на датотеките не успеа. Некои датотеки беа изменети, отстранети или додадени.
 GlobalChecksum=Глобална контролна сума
 MakeIntegrityAnalysisFrom=Направете анализа на интегритетот на апликативните датотеки од
-LocalSignature=Вграден локален потпис (помалку сигурен)
-RemoteSignature=Далечински далечен потпис (посигурен)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Недостасуваат датотеки
 FilesUpdated=Ажурирани датотеки
 FilesModified=Изменети датотеки
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Се користи само од некоја опциј
 Security=Безбедност
 Passwords=Лозинки
 DoNotStoreClearPassword=Шифрирајте лозинки зачувани во базата на податоци.
-MainDbPasswordFileConfEncrypted=Шифрирајте лозинка за базата на податоци зачувана во conf.php. Силно се препорачува да ја активирате оваа опција.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Заштитете ги генерираните PDF-датотеки. Ова НЕ се препорачува бидејќи го прекинува генерирањето PDF на големо.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Геометриска точка
 ExtrafieldMultiPointGeo=Геометриски повеќе точки
 ExtrafieldLinestringGeo=Геометриска линија
 ExtrafieldPolygonGeo=Геометриски многуаголник
+ExtrafieldStars=Stars
 ComputedFormula=Пресметано поле
-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=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'
 Computedpersistent=Чувајте го пресметаното поле
 ComputedpersistentDesc=Пресметаните дополнителни полиња ќе се складираат во базата на податоци, но вредноста ќе се пресметува само кога ќе се смени објектот на ова поле. Ако пресметаното поле зависи од други објекти или глобални податоци, оваа вредност може да биде погрешна!!
 ExtrafieldParamHelpPassword=Ако го оставите ова поле празно значи дека оваа вредност ќе се зачува БЕЗ шифрирање (полето е само скриено со ѕвезди на екранот).<br><br>Внесете вредност „dolcrypt“ за да се шифрира вредноста со реверзибилен алгоритам за шифрирање. Чистите податоци сè уште може да се знаат и уредуваат, но се шифрираат во базата на податоци.<br><br>Внесете „автоматски“ (или „md5“, „sha256“, „password_hash“, ...) за користење на стандардниот алгоритам за шифрирање на лозинка (или md5, sha256, password_hash...) за зачувување на неповратната хаширана лозинка во базата на податоци (нема можност за враќање на оригиналната вредност)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Користењето на SMTP серверот на вашиот сопствен давател на е-пошта за испраќање е-пошта е исто така интересно, така што сите пораки испратени од апликацијата исто така ќе бидат зачувани во вашиот директориум „Испратени“ на вашето поштенско сандаче.
 WarningPHPMailD=Затоа се препорачува да се смени начинот на испраќање на е-пошта на вредноста „SMTP“.
 WarningPHPMailDbis=Ако навистина сакате да го задржите стандардниот „PHP“ метод за испраќање е-пошта, едноставно игнорирајте го ова предупредување или отстранете го со %sкликнете овде%s.
-WarningPHPMail2=Ако вашиот давател на е-пошта SMTP треба да го ограничи клиентот за е-пошта на некои IP адреси (многу ретко), ова е IP адресата на корисничкиот агент за пошта (MUA) за вашата ERP CRM апликација: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Сметководство (поедноставено)
 Module10Desc=Едноставни сметководствени извештаи (списанија, промет) врз основа на содржината на базата на податоци. Не користи ниту една табела за книга.
 Module20Name=Понуди
 Module20Desc=Управување со комерцијални предлози
-Module22Name=Масовни е-пошта
-Module22Desc=Управувајте со масовно испраќање е-пошта
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Енергија
 Module23Desc=Следење на потрошувачката на енергија
 Module25Name=Нарачки за продажба
@@ -847,10 +848,10 @@ Permission212=Нарачки линии
 Permission213=Активирајте линија
 Permission214=Поставете телефонија
 Permission215=Поставете провајдери
-Permission221=Читајте е-пошта
-Permission222=Креирајте/изменувајте е-пошта (тема, примачи...)
-Permission223=Потврдете ги е-поштата (дозволува испраќање)
-Permission229=Избришете е-пошта
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Погледнете ги примачите и информациите
 Permission238=Рачно испраќајте пораки
 Permission239=Избришете ги пораките по валидацијата или испратените
@@ -1105,6 +1106,7 @@ DictionaryStaff=Број на вработени
 DictionaryAvailability=Доцнење на испораката
 DictionaryOrderMethods=Нарачајте методи
 DictionarySource=Потекло на предлози/нарачки
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Персонализирани групи за извештаи
 DictionaryAccountancysystem=Модели за сметководствен план
 DictionaryAccountancyJournal=Сметководствени списанија
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Назад на списокот со речници
 TypeOfRevenueStamp=Вид на даночен печат
 VATManagement=Управување со данок на промет
 VATIsUsedStandard=При креирање документи (предлози, фактури, нарачки...), стандардната стапка на данок на промет се поставува според стандардните правила (во зависност од земјите на продавачот и купувачот)
-VATIsUsedDesc=Стандардно кога креирате предлози, фактури, нарачки итн. стапката на данокот на промет го следи активното стандардно правило:<br>Ако продавачот не подлежи на данок на промет, тогаш данокот на промет стандардно е 0 . Крај на правилото.<br>Ако продавачот и купувачот се и во Европската заедница и стоките се производи поврзани со транспорт (превоз, превоз, авиокомпанија), стандардниот ДДВ е 0. правилото зависи од земјата на продавачот - ве молиме консултирајте се со вашиот сметководител. ДДВ-то треба да го плати купувачот на царинската испостава во нивната земја, а не на продавачот. Крај на правилото.<br>Ако продавачот и купувачот се и во Европската заедница и купувачот не е компанија (со регистриран ДДВ број во Заедницата), тогаш ДДВ е стандардно стапката на ДДВ на земјата на продавачот. Крај на правилото.<br>Ако продавачот и купувачот се и во Европската заедница и купувачот е компанија (со регистриран ДДВ број во Заедницата), тогаш ДДВ е 0 стандардно. Крај на правилото.<br>Во секој друг случај предложеното стандардно е данок на промет=0. Крај на владеењето.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Стандардно, предложениот данок на промет е 0 кој може да се користи за случаи како здруженија, поединци или мали компании.
 VATIsUsedExampleFR=Во Франција, тоа значи компании или организации кои имаат вистински фискален систем (Поедноставен реален или нормален реален). Систем во кој се декларира ДДВ.
 VATIsNotUsedExampleFR=Во Франција, тоа значи здруженија кои не се декларирани данок на промет или компании, организации или либерални професии кои го избрале фискалниот систем на микро претпријатие (Данок на промет во франшиза) и платиле данок на франшиза без никаква декларација за данок на промет.  Овој избор ќе ја прикаже референцата „Неприменлив данок на промет - уметност-293B на CGI“ на фактурите.
-VATType=Вид на данок
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Вид на данок на промет
 LTRate=Оцени
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), yo
 LabelUsedByDefault=Стандардно се користи етикета ако не може да се најде превод за кодот
 LabelOnDocuments=Етикета на документите
 LabelOrTranslationKey=Етикета или клуч за превод
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Пронајден е превод
 TheTranslationIsSearchedFromKey=Преводот се пребарува од клучот за превод: <b>%s</b>
 TranslationKey=Клучот за превод
@@ -1431,7 +1434,7 @@ AddVatInList=Прикажете го ДДВ бројот на клиент/пр
 AddAdressInList=Прикажете ја адресата на клиентот/продавачот во комбо листи.<br>Трите страни ќе се појават со формат на име „The Big Company Corp. - 21 jump street 123456 Big town - USA“ наместо „ Корпорацијата на големата компанија“.
 AddEmailPhoneTownInContactList=Прикажи ги е-поштата за контакт (или телефоните ако не се дефинирани) и градот во комбо листи.<br>Контактите ќе се појават со формат на име „Dupond Durand - dupond.durand@example.com - Париз " или "Дипон Дуран - 06 07 59 65 66 - Париз" наместо "Дипон Дуран".
 AskForPreferredShippingMethod=Побарајте претпочитан начин на испорака за трети лица.
-FieldEdition=Издание на поле %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Пример: +2 (пополнете само ако има проблеми со поместувањето на временската зона)
 GetBarCode=Добијте баркод
 NumberingModules=Модели за нумерирање
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Присилете го датумот на фактурата
 SuggestedPaymentModesIfNotDefinedInInvoice=Стандардно предложен режим на плаќање на фактурата ако не е дефиниран на фактурата
 SuggestPaymentByRIBOnAccount=Предложете плаќање со повлекување на сметка
 SuggestPaymentByChequeToAddress=Предложете плаќање со чек до
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Бесплатен текст на фактури
 WatermarkOnDraftInvoices=Воден печат на нацрт-фактури (нема ако е празен)
 PaymentsNumberingModule=Модел за нумерирање на плаќања
@@ -1718,6 +1723,7 @@ CompressionOfResources=Компресија на HTTP одговори
 CompressionOfResourcesDesc=На пример користејќи ја директивата на Apache-то „AddOutputFilterByType DEFLATE“
 TestNotPossibleWithCurrentBrowsers=Таквото автоматско откривање не е можно со сегашните прелистувачи
 DefaultValuesDesc=Овде можете да ја дефинирате стандардната вредност што сакате да ја користите кога креирате нов запис и/или стандардните филтри или редоследот на сортирање кога наведувате записи.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Стандардни вредности (за употреба на формулари)
 DefaultSearchFilters=Стандардни филтри за пребарување
 DefaultSortOrder=Стандардни наредби за сортирање
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Испраќање модули за нумерирањ
 SendingsAbility=Поддршка за испорака на листови за испораки на клиенти
 NoNeedForDeliveryReceipts=Во повеќето случаи, листовите за испорака се користат и како листови за испораки на клиентите (список на производи што треба да се испратат) и листови што се примени и потпишани од клиентот. Оттука, потврдата за испорака на производи е дупликатна карактеристика и ретко се активира.
 FreeLegalTextOnShippings=Бесплатен текст на пратките
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Модул за нумерирање на сметки за испораки на производи
 DeliveryOrderModel=Модел на потврда за испорака на производи
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Бесплатен текст на сметки
 ##### FCKeditor #####
 AdvancedEditor=Напреден уредник
 ActivateFCKeditor=Активирајте напреден уредувач за:
-FCKeditorForNotePublic=WYSIWYG создавање/издание на полето „јавни белешки“ на елементи
-FCKeditorForNotePrivate=WYSIWYG создавање/издание на полето „приватни белешки“ на елементи
-FCKeditorForCompany=WYSIWYG создавање/издание на полето опис на елементи (освен производи/услуги)
-FCKeditorForProductDetails=WYSIWYG креирање/издание на опис на производи или линии за објекти (линии со предлози, нарачки, фактури итн...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Предупредување: Користењето на оваа опција за овој случај сериозно не се препорачува бидејќи може да создаде проблеми со специјални знаци и форматирање на страници при градење PDF-датотеки.
-FCKeditorForMailing= Создавање/издание на WYSIWYG за масовни е-пошта (Tools->email)
-FCKeditorForUserSignature=WYSIWYG создавање/издание на потпис на корисникот
-FCKeditorForMail=Создавање/издание на WYSIWYG за целата пошта (освен Алатки-> е-пошта)
-FCKeditorForTicket=Создавање/издание на WYSIWYG за билети
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Поставување модул за акции
 IfYouUsePointOfSaleCheckModule=Ако го користите модулот за продажба (POS) обезбеден стандардно или надворешен модул, ова поставување може да биде игнорирано од вашиот POS-модул. Повеќето POS-модули се стандардно дизајнирани да креираат фактура веднаш и да ги намалат залихите без оглед на опциите овде. Значи, ако треба или не да имате намалување на залихите кога регистрирате продажба од вашиот POS, проверете го и поставувањето на вашиот POS-модул.
@@ -1867,7 +1874,6 @@ Buy=Купи
 Sell=Продај
 InvoiceDateUsed=Искористен датум на фактура
 YourCompanyDoesNotUseVAT=Вашата компанија е дефинирана да не користи ДДВ (Дома - Поставување - Компанија/Организација), така што нема опции за ДДВ за поставување.
-AccountancyCode=Сметководствен код
 AccountancyCodeSell=Продажна сметка. код
 AccountancyCodeBuy=Купете сметка. код
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Чувајте го полето за избор „Автоматски креирајте плаќање“ стандардно празно кога креирате нов данок
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Кој приказ сакате да го отворит
 AGENDA_EVENT_PAST_COLOR = Боја за минати настани
 AGENDA_EVENT_CURRENT_COLOR = Боја на тековниот настан
 AGENDA_EVENT_FUTURE_COLOR = Боја на идниот настан
-AGENDA_REMINDER_BROWSER = Овозможи потсетник за настан <b>на прелистувачот на корисникот</b> (Кога ќе се достигне датумот на потсетување, прелистувачот се прикажува скокачки прозорец. Секој корисник може оневозможи такви известувања од поставувањето известувања на прелистувачот).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Овозможете известување за звук
-AGENDA_REMINDER_EMAIL = Овозможи потсетник за настан <b>по е-пошта</b> (опција/одложување за потсетување може да се дефинира на секој настан).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Забелешка: Фреквенцијата на закажаната работа %s мора да биде доволна за да бидете сигурни дека потсетниците се испратени во вистинскиот момент.
 AGENDA_SHOW_LINKED_OBJECT = Прикажи го поврзаниот објект во приказот на агендата
 AGENDA_USE_EVENT_TYPE = Користете типови настани (управувани во менито Поставување -> Речници -> Тип настани на агендата)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Автоматски поставете ја оваа стандардна вредност за типот на настан во формата за создавање настан
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Клуч за овластување врска за извоз
 PastDelayVCalExport=Не извезувајте настан постар од
 SecurityKey = Безбедносен клуч
@@ -2006,7 +2017,7 @@ BackupZipWizard=Волшебник за изградба на директори
 SomethingMakeInstallFromWebNotPossible=Инсталирањето на надворешен модул не е можно од веб-интерфејсот од следнава причина:
 SomethingMakeInstallFromWebNotPossible2=Поради оваа причина, процесот за надградба опишан овде е рачен процес што може да го изврши само привилегиран корисник.
 InstallModuleFromWebHasBeenDisabledContactUs=Инсталирањето или развојот на надворешни модули или динамични веб-локации, од апликацијата, моментално е заклучено заради безбедносни цели. Ве молиме контактирајте со нас ако треба да ја овозможите оваа функција.
-InstallModuleFromWebHasBeenDisabledByFile=Инсталирањето на надворешен модул од апликацијата е оневозможено од вашиот администратор. Мора да побарате од него да ја отстрани датотеката <strong>%s</strong> за да го дозволи ова карактеристика.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Означете ги линиите на табелата кога ќе помине движењето на глувчето
 HighlightLinesColor=Означете ја бојата на линијата кога глувчето ќе помине над (користете „ffffff“ за да нема означување)
@@ -2036,6 +2047,7 @@ Enter0or1=Внесете 0 или 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Внесете овде помеѓу заградите, список со број на бајти што го претставуваат симболот на валутата. На пример: за $, внесете [36] - за бразилски вистински R$ [82,36] - за €, внесете [8364]
 ColorFormat=RGB бојата е во HEX формат, на пр.: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Име на иконата во формат:<br>- image.png за датотека со слика во тековниот директориум со теми<br>- image.png@module ако датотеката е во директориумот /img/ на модулот<br>- fa-xxx за FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size за FontAwesome fa-xxx слика (со префикс, боја и сет на големина)
 PositionIntoComboList=Поставување на линијата во комбо листи
 SellTaxRate=Даночна стапка на промет
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Сокриј ги границите на рамката за адреса на испраќачот
 MAIN_PDF_NO_RECIPENT_FRAME=Сокриј ги границите на рамката за адреса на примачот
 MAIN_PDF_HIDE_CUSTOMER_CODE=Сокриј го кодот на клиентот
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Сокриј го испраќачот/името на компанијата во блокот за адреси
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Сокриј ги условите за плаќање
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Сокриј го режимот на плаќање
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Додајте скриена ознака во областа за потпис за да дозволите алатката за електронски потпис повторно да ја користи. Може да се користи од надворешни алатки или во иднина од одликата за онлајн потпис.
@@ -2324,6 +2341,8 @@ NotRecommended=Не е препорачано
 ARestrictedPath=Некоја ограничена патека за датотеки со податоци
 CheckForModuleUpdate=Проверете дали има надградби на надворешните модули
 CheckForModuleUpdateHelp=Оваа акција ќе се поврзе со уредниците на надворешните модули за да провери дали е достапна нова верзија.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Достапно е ажурирање
 NoExternalModuleWithUpdate=Не се пронајдени ажурирања за надворешни модули
 SwaggerDescriptionFile=Датотека за опис на Swagger API (за употреба со redoc на пример)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Прикажи адреса за испорака
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Задолжителна индикација во некои земји (Франција, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=УРЛ-врска на социјалната мрежа. Користете {socialid} за променливиот дел што го содржи ID на социјалната мрежа.
 IfThisCategoryIsChildOfAnother=Ако оваа категорија е дете на друга
 DarkThemeMode=Режим на темна тема
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Предупредување: 
 WarningModuleHasChangedSecurityCsrfParameter=Предупредување: модулот %s ја оневозможи безбедноста на CSRF на вашиот пример. Ова дејство е сомнително и вашата инсталација можеби повеќе нема да биде обезбедена. Ве молиме контактирајте го авторот на модулот за објаснување.
 EMailsInGoingDesc=Дојдовните пораки се управувани од модулот %s. Мора да го овозможите и конфигурирате ако треба да поддржувате влезни е-пораки.
 MAIN_IMAP_USE_PHPIMAP=Користете ја библиотеката PHP-IMAP за IMAP наместо мајчин PHP IMAP. Ова исто така овозможува користење на OAuth2 конекција за IMAP (модулот OAuth исто така мора да биде активиран).
-MAIN_CHECKBOX_LEFT_COLUMN=Прикажи ја колоната за избор на поле и линија лево (десно стандардно)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Не е стандардно создадено. Создаден само при активирање на модулот.
 CSSPage=CSS стил
 Defaultfortype=Стандардно
@@ -2489,7 +2510,7 @@ AiDescription=Карактеристики на AI (Вештачка интел
 AiDescriptionLong=Обезбедува функции за вештачка интелигенција во различни делови од апликацијата. Потребен е надворешен AI API.
 AI_API_KEY=Клуч за AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Услуга за користење за карактеристики на вештачка интелигенција
+AI_API_SERVICE=AI service to use
 AiSetup=Поставување модул за вештачка интелигенција
 AiCustomPrompt=Прилагодено барање за вештачка интелигенција
 AI_CONFIGURATIONS_PROMPT=Прилагодено барање
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=Вештачката интелигенција прилаг
 EnterAnIP=Внесете IP адреса
 ConvertInto=Претворете во
 YouAreHere=Ти си тука
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Покажете го бар-кодот на документот PDF за испорака
 BARCODE_ON_RECEPTION_PDF=Покажете го бар-кодот на PDF документот за прием
 BARCODE_ON_STOCKTRANSFER_PDF=Покажете го бар-кодот на PDF документот за трансфер на акции
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang
index 86e0eec9e84..56c9a806e40 100644
--- a/htdocs/langs/mk_MK/banks.lang
+++ b/htdocs/langs/mk_MK/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Крајна рамнотежа
 CurrentBalance=Сегашна состојба
 FutureBalance=Иден биланс
 ShowAllTimeBalance=Прикажи рамнотежа од почеток
-AllTime=Од почеток
 Reconciliation=Помирување
 RIB=Жиро сметка број
 IBAN=IBAN број
@@ -133,7 +132,7 @@ DeleteTransaction=Избриши запис
 ConfirmDeleteTransaction=Дали сте сигурни дека сакате да го избришете овој запис?
 ThisWillAlsoDeleteBankRecord=Ова исто така ќе го избрише генерираниот запис во банка
 BankMovements=Движења
-PlannedTransactions=Планирани записи
+PlannedTransactions=Upcoming entries
 Graph=Графикони
 ExportDataset_banque_1=Вписи во банка и извод од сметката
 ExportDataset_banque_2=Уплатница
@@ -151,7 +150,7 @@ FutureTransaction=Идна трансакција. Не може да се по
 SelectChequeTransactionAndGenerate=Изберете/филтрирајте ги чековите што треба да бидат вклучени во потврдата за депозит за чек. Потоа, кликнете на „Креирај“.
 SelectPaymentTransactionAndGenerate=Изберете/филтрирајте ги документите што треба да бидат вклучени во потврдата за депозит %s. Потоа, кликнете на „Креирај“.
 InputReceiptNumber=Изберете го изводот од банка поврзан со помирувањето. Користете нумеричка вредност што може да се подреди
-InputReceiptNumberBis=ГГГГММ или ГГГГММДД
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Да се помириме?
 ThenCheckLinesAndConciliate=Потоа, проверете ги линиите присутни во изводот од банката и кликнете
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Ако оваа функција е овозможен
 BankColorizeMovementName1=Боја на позадина за дебитно движење
 BankColorizeMovementName2=Боја на позадина за движење на кредити
 IfYouDontReconcileDisableProperty=Ако не ги извршите банкарските усогласувања на некои банкарски сметки, оневозможете го својството „%s“ на нив за да го отстраните ова предупредување.
-NoBankAccountDefined=Не е дефинирана банкарска сметка
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Не е пронајден запис на банкарска сметка. Најчесто, ова се случува кога записот е рачно избришан од списокот на трансакции на банкарската сметка (на пример при усогласување на банкарската сметка). Друга причина е што плаќањето е снимено кога модулот „%s“ бил оневозможен.
 AlreadyOneBankAccount=Веќе е дефинирана една банкарска сметка
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Варијанта на датотеката SEPA
diff --git a/htdocs/langs/mk_MK/blockedlog.lang b/htdocs/langs/mk_MK/blockedlog.lang
index 508c797acc3..cec461e8be7 100644
--- a/htdocs/langs/mk_MK/blockedlog.lang
+++ b/htdocs/langs/mk_MK/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Непроменливи дневници
 ShowAllFingerPrintsMightBeTooLong=Прикажи ги сите архивирани дневници (можеби се долги)
 ShowAllFingerPrintsErrorsMightBeTooLong=Прикажи ги сите невалидни дневници за архиви (можеби се долги)
 DownloadBlockChain=Преземете отпечатоци од прсти
-KoCheckFingerprintValidity=Архивираниот запис во дневникот не е валиден. Тоа значи дека некој (хакер?) изменил некои податоци од овој запис откако бил снимен, или го избришал претходниот архивиран запис (проверете дали линијата со претходниот # постои) или ја изменил контролната сума на претходниот запис.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Архивираниот запис од дневникот е валиден. Податоците на оваа линија не беа изменети и записот го следи претходниот.
 OkCheckFingerprintValidityButChainIsKo=Архивираниот дневник изгледа валиден во споредба со претходниот, но ланецот претходно беше оштетен.
 AddedByAuthority=Складирано во далечински орган
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Детали за дневник
 ListOfTrackedEvents=Список на следени настани
 Fingerprint=Отпечаток од прст
 DownloadLogCSV=Извези архивирани дневници (CSV)
-DataOfArchivedEvent=Целосни податоци за архивираниот настан
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Оригиналниот објект (тип %s, id %s) не е поврзан (видете ја колоната „Целосни податоци“ за да добиете непроменливи зачувани податоци)
 BlockedLogAreRequiredByYourCountryLegislation=Модулот за непроменливи дневници може да биде потребен според законодавството на вашата земја. Оневозможувањето на овој модул може да ги направи сите идни трансакции невалидни во однос на законот и употребата на правен софтвер бидејќи тие не можат да се потврдат со даночна контрола.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Модулот за непроменливи дневници беше активиран поради законодавството на вашата земја. Оневозможувањето на овој модул може да ги направи сите идни трансакции невалидни во однос на законот и употребата на правен софтвер бидејќи тие не можат да се потврдат со даночна контрола.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Овозможен е систем за следење нас
 BlockedLogDisabled=Системот за следење на настаните во непроменливи дневници е оневозможен откако беше направено одредено снимање. Зачувавме посебен отпечаток од прст за да го следиме ланецот како скршен
 BlockedLogDisabledBis=Системот за следење настани во непроменливи дневници е оневозможен. Ова е можно бидејќи сè уште не е направена евиденција.
 LinkHasBeenDisabledForPerformancePurpose=За целите на изведбата, директната врска до документот не се прикажува по 100-тата линија.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Корисничката фактура логично е избришана
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Логично бришење за плаќање н
 logPAYMENT_VARIOUS_CREATE=Плаќањето (не е доделено на фактура) создадено
 logPAYMENT_VARIOUS_DELETE=Плаќање (не е доделено на фактура) логично бришење
 logPAYMENT_VARIOUS_MODIFY=Плаќањето (не е доделено на фактура) е изменето
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/mk_MK/categories.lang b/htdocs/langs/mk_MK/categories.lang
index 8dc7d075f66..126c3499000 100644
--- a/htdocs/langs/mk_MK/categories.lang
+++ b/htdocs/langs/mk_MK/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Област за ознаки/категории за к
 AccountsCategoriesArea=Област за ознаки/категории на банкарска сметка
 ProjectsCategoriesArea=Област на ознаки/категории на проектот
 UsersCategoriesArea=Област за кориснички ознаки/категории
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Под-категории
 CatList=List of tags/categories
 CatListAll=Список на ознаки/категории (сите типови)
@@ -90,9 +91,10 @@ CategoriesSetup=Tags/categories setup
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Ако опцијата е вклучена, кога додавате објект во подкатегорија, објектот ќе се додаде и во родителските категории.
 AddProductServiceIntoCategory=Доделете категорија на производот/услугата
-AddCustomerIntoCategory=Доделете категорија на клиентот
-AddSupplierIntoCategory=Доделете категорија на добавувачот
-AssignCategoryTo=Доделете категорија на
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Изберете категорија
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Категории на страници-контеј
 KnowledgemanagementsCategoriesArea=Категории на написот на КМ
 UseOrOperatorForCategories=Користете го операторот „ИЛИ“ за категории
 AddObjectIntoCategory=Доделете на категоријата
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index ec6b7488997..cec0097096b 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Земјата е во рамките на Европската 
 PriceFormatInCurrentLanguage=Формат на прикажување на цените на тековниот јазик и валута
 ThirdPartyName=Име на трето лице
 ThirdPartyEmail=Е-пошта од трета страна
-ThirdParty=Трето лице
-ThirdParties=Трети лица
+ThirdParty=Third party
+ThirdParties=Third parties
 ThirdPartyProspects=Изгледите
 ThirdPartyProspectsStats=Изгледите
 ThirdPartyCustomers=Клиенти
@@ -65,6 +65,7 @@ State=Држава/Провинција
 StateId=Државна лична карта
 StateCode=Шифра на државата/покраината
 StateShort=држава
+DepartmentBuyer=Buyer's state/province
 Region=Регионот
 Region-State=Регион - држава
 Country=Земја
@@ -78,7 +79,7 @@ Chat=Разговор
 PhonePro=Автобус. телефон
 PhonePerso=Перс. телефон
 PhoneMobile=Мобилен
-No_Email=Одбијте масовно испраќање е-пошта
+No_Email=Refuse mass emails
 Fax=Факс
 Zip=Поштенски број
 Town=Градот
@@ -382,11 +383,12 @@ ExportCardToFormat=Извезете ја картичката во формат
 ContactNotLinkedToCompany=Контактот не е поврзан со трета страна
 DolibarrLogin=Најава за Dolibarr
 NoDolibarrAccess=Нема пристап до Dolibarr
-ExportDataset_company_1=Трети лица (компании/фондации/физички лица) и нивните имоти
-ExportDataset_company_2=Контакти и нивните својства
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Трети лица и нивните имоти
 ImportDataset_company_2=Дополнителни контакти/адреси и атрибути на трети лица
-ImportDataset_company_3=Банкарски сметки на трети лица
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Претставници за продажба од трети лица (назначи продажни претставници/корисници на компании)
 PriceLevel=Ниво на цена
 PriceLevelLabels=Етикети на ниво на цени
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Бесплатен код без верификација
 ManagingDirectors=Име на менаџер (извршен директор, директор, претседател...)
 MergeOriginThirdparty=Дуплирана трета страна (третата страна што сакате да ја избришете)
 MergeThirdparties=Спојте трети страни
-ConfirmMergeThirdparties=Дали сте сигурни дека сакате да ја споите избраната трета страна со сегашната? Сите поврзани објекти (фактури, нарачки, ...) ќе бидат преместени на тековната трета страна, по што избраната трета страна ќе биде избришана.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Трети лица се споени
 SaleRepresentativeLogin=Најава на претставник за продажба
 SaleRepresentativeFirstname=Име на претставник за продажба
@@ -460,3 +462,6 @@ ExternalSystemID=Идентификација на надворешен сист
 IDOfPaymentInAnExternalSystem=ID на начинот на плаќање во надворешен систем (како Stripe, Paypal, ...)
 AADEWebserviceCredentials=Акредитиви за веб-сервис на AADE
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Третото лице мора да биде клиент за да дозволи создавање на своите банкарски информации од страната на Stripe
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index af235237370..41b36bf3ede 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Плаќање на фактура од клиент
 PaymentSupplierInvoice=плаќање на фактура од продавач
 PaymentSocialContribution=Плаќање социјален/фискален данок
 PaymentVat=плаќање на ДДВ
-AutomaticCreationPayment=Автоматски снимајте го плаќањето
+AutomaticCreationPayment=Also record the payment
 ListPayment=Список на плаќања
 ListOfCustomerPayments=Список на плаќања од клиенти
 ListOfSupplierPayments=Список на плаќања од продавач
@@ -118,10 +118,14 @@ SocialContributionsPayments=Плаќања на социјални/фискал
 ShowVatPayment=Прикажи плаќање на ДДВ
 TotalToPay=Вкупно за плаќање
 BalanceVisibilityDependsOnSortAndFilters=Салдото е видливо во оваа листа само ако табелата е подредена на %s и се филтрира на 1 банкарска сметка (без други филтри)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Код за сметководство на клиентите
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Сметководствен код на продавачот
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Cust. сметка. код
 SupplierAccountancyCodeShort=Sup. сметка. код
+UserAccountancyCodeShort=User account. code
 AccountNumber=Број на сметка
 NewAccountingAccount=Нова сметка
 Turnover=Фактуриран промет
@@ -129,7 +133,9 @@ TurnoverCollected=Собран промет
 SalesTurnoverMinimum=Минимален промет
 ByExpenseIncome=По расходи и приходи
 ByThirdParties=Од страна на трети лица
+ByProjects=By projects
 ByUserAuthorOfInvoice=По автор на фактура
+DetailedListLowercase=detailed list
 CheckReceipt=Уплатница
 CheckReceiptShort=Уплатница
 LastCheckReceiptShort=Најнови %s уплатници
diff --git a/htdocs/langs/mk_MK/datapolicy.lang b/htdocs/langs/mk_MK/datapolicy.lang
index a3490e5fd00..7fb96f94dc5 100644
--- a/htdocs/langs/mk_MK/datapolicy.lang
+++ b/htdocs/langs/mk_MK/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Политика за приватност на податоц
 Module4100Desc = Модул за управување со приватноста на податоците (согласност со GDPR)
 # Administration page
 datapolicySetup = Поставување политика за приватност на податоците на модулот
-Deletion = Бришење на податоци
-datapolicySetupPage = Во зависност од законите на вашите земји (Пример <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">член 5</a> од GDPR), личните податоци мора да се чуваат одреден период не надминувајќи го времетраењето, податоците се потребни за целта за која се собрани, освен за архивски цели.<br>Бришењето ќе се изврши автоматски по одредено времетраење без настани (времетраењето кои ќе ги имате наведено подолу).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s месеци
 ONE_YEAR = 1 година
 NB_YEARS = %s години
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Проспект/клиент
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Ниту потенцијален/ниту клиент
 DATAPOLICY_CONTACT_FOURNISSEUR = Добавувачот
 DATAPOLICY_ADHERENT = Член
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Можете да испратите е-пошта за GDPR до сите ваши релевантни контакти (кои сè уште немаат добиено е-пошта и за кои не сте регистрирале ништо за нивниот договор за GDPR). За да го направите ова, користете го следното копче.
 SendAgreement = Испратете е-пошта
 AllAgreementSend = Сите пораки се испратени
 TXTLINKDATAPOLICYACCEPT = Текст за врската „договор“
 TXTLINKDATAPOLICYREFUSE = Текст за врската „несогласување“
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: Обработка на лични податоци
 DATAPOLICY_consentement = Добиена согласност за обработка на лични податоци
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 988753c587f..12277273c55 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Грешка при креирање д
 ErrorFailedToCreateDir=Не успеа да се создаде директориум. Проверете дали корисникот на веб-серверот има дозволи да запишува во директориумот со документи Dolibarr. Ако параметарот <b>safe_mode</b> е овозможен на оваа PHP, проверете дали Dolibarr php-датотеките припаѓаат на корисникот на веб-серверот (или).
 ErrorNoMailDefinedForThisUser=Не е дефинирана пошта за овој корисник
 ErrorSetupOfEmailsNotComplete=Поставувањето на е-пошта не е завршено
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Оваа функција треба да се активира JavaScript за да работи. Променете го ова во поставување - приказ.
 ErrorTopMenuMustHaveAParentWithId0=Менито од типот „Топ“ не може да има родителско мени. Ставете 0 во родителското мени или изберете мени од типот „Лево“.
 ErrorLeftMenuMustHaveAParentId=Менито од типот „Лево“ мора да има родителски ID.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Поставувањето е блокирано од
 ErrorFileSizeTooLarge=Големината на датотеката е преголема или датотеката не е обезбедена.
 ErrorFieldTooLong=Полето %s е премногу долго.
 ErrorSizeTooLongForIntType=Големината е премногу долга за типот int (%s максимум цифри)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Големината е премногу долга за типот на низа (%s максимум знаци)
 ErrorNoValueForSelectType=Ве молиме пополнете ја вредноста за избраната листа
 ErrorNoValueForCheckBoxType=Пополнете ја вредноста за списокот на полето за избор
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Лоша вредност за безбедносната 
 ErrorBothFieldCantBeNegative=Полињата %s и %s не можат да бидат и двете негативни
 ErrorFieldCantBeNegativeOnInvoice=Полето <strong>%s</strong> не може да биде негативно на овој тип. Ако треба да додадете линија за попуст, само прво креирајте го попустот (од полето '%s' во картичката од трета страна) и применете го на фактурата.
 ErrorLinesCantBeNegativeForOneVATRate=Вкупниот број линии (не од данок) не може да биде негативен за дадена не нула стапка на ДДВ (Најдена е негативна вкупна вредност за стапката на ДДВ <b>%s </b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Линиите не можат да бидат негативни во депозитот. Ќе се соочите со проблеми кога ќе треба да го потрошите депозитот во финалната фактура доколку го направите тоа.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Количината за линијата во фактурите на клиентите не може да биде негативна
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Корисничката сметка <b>%s</b> што се користи за извршување на веб-серверот тоа
 ErrorNoActivatedBarcode=Не е активиран тип на баркод
 ErrUnzipFails=Не успеа да се отпакува %s со ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Премногу линии за обработка. Користете поселективен филтер.
 ErrorEmptyValueForQty=Количината не може да биде нула.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Вашиот PHP параметар upload_max_filesize (%s) е повисок од PHP параметарот post_max_size (%s). Ова не е конзистентно поставување.
 WarningPasswordSetWithNoAccount=Поставена е лозинка за овој член. Сепак, не беше креирана корисничка сметка. Значи, оваа лозинка е зачувана, но не може да се користи за најавување на Dolibarr. Може да се користи од надворешен модул/интерфејс, но ако не треба да дефинирате никакво најавување или лозинка за член, можете да ја оневозможите опцијата „Управување со најавување за секој член“ од поставувањето на модулот за член. Ако треба да управувате со најавување, но не ви треба лозинка, можете да го задржите ова поле празно за да го избегнете ова предупредување. Забелешка: Е-поштата може да се користи и како најавување ако членот е поврзан со корисник.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=Овој родителски ID веќе н
 WarningReadBankAlsoAllowedIfUserHasPermission=Предупредување, читањето банкарска сметка е дозволено и со дозвола за управување со сметководствен план
 WarningNoDataTransferedInAccountancyYet=Имајте предвид дека нема податоци во сметководствената табела. Ве молиме префрлете ги вашите податоци запишани во апликацијата во делот за сметководство или променете го режимот на пресметка за да ги анализирате податоците снимени надвор од сметководството.
 WarningChangingThisMayBreakStopTaskScheduler=Предупредување, менувањето на оваа вредност може да го оневозможи распоредувачот
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = Фактурата SwissQR може да се додаде само на фактурите што се поставени да се платат со плаќања за пренос на кредит.
 SwissQrCreditorAddressInvalid = Адресата на доверителот е неважечка (дали ZIP и градот се поставени? (%s)
 SwissQrCreditorInformationInvalid = Информациите за доверителот се неважечки за IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s е веќе дефиниран к
 ErrorThisGroupIsAlreadyDefinedAsThisType=Контактите со оваа група се веќе дефинирани како контакт за овој тип.
 EmptyMessageNotAllowedError=Празна порака не е дозволена
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/mk_MK/exports.lang b/htdocs/langs/mk_MK/exports.lang
index 6504d5551ce..1560bd458a3 100644
--- a/htdocs/langs/mk_MK/exports.lang
+++ b/htdocs/langs/mk_MK/exports.lang
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Check that the file format (field and string delimiters)
 RunSimulateImportFile=Изврши симулација за увоз
 FieldNeedSource=Ова поле бара податоци од изворната датотека
 SomeMandatoryFieldHaveNoSource=Некои задолжителни полиња немаат извор од датотеката со податоци
-InformationOnSourceFile=Информации за изворната датотека
-InformationOnTargetTables=Информации за целните полиња
+InformationOnSourceFile=Source file
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Променете најмалку едно изворно поле во колоната полиња за извоз
 SelectFormat=Изберете го овој формат на датотека за увоз
 RunImportFile=Увезете податоци
diff --git a/htdocs/langs/mk_MK/hrm.lang b/htdocs/langs/mk_MK/hrm.lang
index 3650cccc8a0..aac0a9060bc 100644
--- a/htdocs/langs/mk_MK/hrm.lang
+++ b/htdocs/langs/mk_MK/hrm.lang
@@ -46,11 +46,11 @@ NewEval=Нова проценка на компетентност
 ValidateEvaluation=Потврдете ја проценката на компетентноста
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Проценка на компетентност
-RequiredRank=Задолжителен ранг за работниот профил
-RequiredRankShort=Потребен ранг
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Позиции со овие работни профили
-EmployeeRank=Ранг на вработен за оваа вештина
-EmployeeRankShort=Ранг на вработен
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Позиција на вработен
 EmployeePositions=Позиции на вработени
 EmployeesInThisPosition=Вработените на оваа позиција
@@ -72,6 +72,9 @@ AddSkill=Додадете вештини на профилот за работа
 RequiredSkills=Потребни вештини за овој работен профил
 UserRank=Кориснички ранг
 SkillList=Список на вештини
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Зачувај ранг
 TypeKnowHow=Знае како
 TypeHowToBe=Како да се биде
@@ -95,3 +98,5 @@ NeedBusinessTravels=Потребни се деловни патувања
 NoDescription=Нема опис
 TheJobProfileHasNoSkillsDefinedFixBefore=Оценетиот работен профил на овој вработен нема дефинирана вештина на него. Ве молиме додадете вештина(и), потоа избришете и рестартирајте ја евалуацијата.
 PDFStandardHrmEvaluation=Стандарден образец за генерирање PDF документ за проценка на компетентност
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang
index eed6c638a51..a556eb31b77 100644
--- a/htdocs/langs/mk_MK/mails.lang
+++ b/htdocs/langs/mk_MK/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Испраќање е-пошта
 EMailing=Испраќање е-пошта
-EMailings=Е-пошта
+EMailings=Mass EMails
 SMSings=СМС пораки
-AllEMailings=Сите е-пошта
+AllEMailings=All mass eMails
 MailCard=Картичка за е-пошта
 MailRecipients=Приматели
 MailRecipient=Примател
@@ -26,19 +26,19 @@ MailFile=Прикачени датотеки
 MailMessage=Тело на е-пошта
 SubjectNotIn=Не во Тема
 BodyNotIn=Не во телото
-ShowEMailing=Прикажи испраќање е-пошта
-ListOfEMailings=Список на е-пошта
-NewMailing=Ново испраќање е-пошта
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Ново смс
-EditMailing=Уредете е-пошта
-ResetMailing=Повторно испратете е-пошта
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Избришете е-пошта
-PreviewMailing=Преглед на е-пошта
-CreateMailing=Креирајте е-пошта
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Тест
-ValidMailing=Валидно испраќање е-пошта
+ValidMailing=Valid mass Email
 MailingStatusDraft=Draft
 MailingStatusValidated=Валидирано
 MailingStatusSent=Испратено
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Сите филтри мора да се совпаѓа
 LineInFile=Линија %s во датотеката
 RecipientSelectionModules=Дефинирани барања за избор на примач
 MailSelectedRecipients=Избрани примачи
-MailingArea=Областа за е-пошта
-LastMailings=Најнови %s е-пошта
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Цели статистика
 NbOfCompaniesContacts=Единствени контакти/адреси
 MailNoChangePossible=Примачите за потврдена е-пошта не може да се променат
-SearchAMailing=Барај пошта
-SendMailing=Испрати е-пошта
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Испратено од
 AdvancedAlternative=Напредна алтернатива
 MailingNeedCommand=Испраќањето е-пошта може да се изврши од командната линија. Побарајте од администраторот на вашиот сервер да ја стартува следнава команда за да испрати е-пошта до сите примачи:
 MailingNeedCommand2=Сепак, можете да ги испратите онлајн со додавање на параметар MAILING_LIMIT_SENDBYWEB со вредност од максималниот број на е-пошта што сакате да ги испраќате по сесија. За ова, одете на Home - Setup - Other.
 ConfirmSendingEmailing=Ако сакате да испраќате е-пошта директно од овој екран, потврдете дека сте сигурни дека сакате да испратите е-пошта сега од вашиот прелистувач?
-LimitSendingEmailing=Забелешка: Испраќањето на е-пошта од веб-интерфејсот се врши неколку пати поради безбедносни причини и истек на време, <b>%s</b> примачи во исто време за секоја сесија за испраќање.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Чиста листа
 ToClearAllRecipientsClickHere=Кликнете овде за да ја исчистите листата на примачи за оваа е-пошта
 ToAddRecipientsChooseHere=Додадете примачи со избирање од списоците
-NbOfEMailingsReceived=Примени масовни е-пошта
-NbOfEMailingsSend=Испратени масовни мејлови
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=лична карта
 DeliveryReceipt=Испорака Ак.
 YouCanUseCommaSeparatorForSeveralRecipients=Можете да го користите сепараторот <b>запирка</b> за да наведете неколку примачи.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Не се планирани автоматски из
 ANotificationsWillBeSent=1 автоматско известување ќе биде испратено по е-пошта
 SomeNotificationsWillBeSent=%s автоматските известувања ќе бидат испратени по е-пошта
 AddNewNotification=Претплатете се на ново автоматско известување по е-пошта (цел/настан)
-ListOfActiveNotifications=Активни претплати (цели/настани) за автоматско известување преку е-пошта
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Испратени се автоматски известувања за е-пошта
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Конфигурацијата за испраќање е-пошта е поставена на „%s“. Овој режим не може да се користи за испраќање масовни е-пошта.
 MailSendSetupIs2=Прво мора да отидете, со администраторска сметка, во менито %sДома - Поставување - Е-пошта%s за да го промените параметарот <strong>'%s'</strong> за да се користи режимот „<4b2ec87f49fz0" </span>“. Со овој режим, можете да го внесете поставувањето на SMTP-серверот обезбеден од вашиот Интернет-провајдер и да ја користите функцијата за масовно испраќање е-пошта.
 MailSendSetupIs3=Ако имате какви било прашања за тоа како да го поставите вашиот SMTP-сервер, може да прашате до %s.
@@ -183,7 +185,7 @@ Information=Информации
 ContactsWithThirdpartyFilter=Контакти со филтер од трета страна
 Unanswered=Неодговорено
 Answered=Одговорено
-IsNotAnAnswer=Не е одговорен (почетна е-пошта)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Е одговор на првичната е-пошта
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Стандардна вредност за полето „%s“ при креирање нов контакт
@@ -199,6 +201,6 @@ ModelTemplate=Шаблон за е-пошта
 YouCanChooseAModelForYouMailContent= Можете да изберете еден од моделите на шаблони или да генерирате еден со вештачка интелигенција
 TitleOfMailHolder=Насловот на е-поштата оди овде
 ContentOfMailHolder=Содржината на е-пошта оди овде...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 2e5d1e12dbb..3cfd6ffd6c8 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -37,6 +37,7 @@ Translation=Превод
 Translations=Преводи
 CurrentTimeZone=Временска зона PHP (сервер)
 EmptySearchString=Внесете непразни критериуми за пребарување
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Внесете критериуми за датум
 NoRecordFound=Не е пронајден запис
 NoRecordDeleted=Ниту еден запис не е избришан
@@ -45,6 +46,7 @@ NoError=Нема грешка
 Error=Грешка
 Errors=Грешки
 ErrorFieldRequired=Полето „%s“ е потребно
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Полето „%s“ има лоша вредност
 ErrorFileDoesNotExists=Датотеката %s не постои
 ErrorFailedToOpenFile=Не успеа да се отвори датотеката %s
@@ -308,6 +310,7 @@ DateBuild=Пријавете го датумот на изградба
 DatePayment=Датум на плаќање
 DateApprove=Датум на одобрување
 DateApprove2=Датум на одобрување (второ одобрување)
+PendingSince=Pending since
 RegistrationDate=Датум на регистрација
 UserCreation=Корисник за создавање
 UserModification=Корисник за модификација
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Да започне
 ActionRunningShort=Во тек
 ActionDoneShort=Завршено
 ActionUncomplete=Нецелосни
-LatestLinkedEvents=Најнови %s поврзани настани
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Компанија/Организација
 Accountant=Сметководител
 ContactsForCompany=Контакти за оваа трета страна
@@ -503,6 +506,7 @@ ContactsAddressesForCompany=Контакти/адреси за оваа трет
 AddressesForCompany=Адреси за оваа трета страна
 ActionsOnCompany=Настани за оваа трета страна
 ActionsOnContact=Настани за овој контакт/адреса
+ActionsOnUser=Events for this user
 ActionsOnContract=Настани за овој договор
 ActionsOnMember=Настани за овој член
 ActionsOnProduct=Настани за овој производ
@@ -720,6 +724,8 @@ TextUsedInTheMessageBody=Тело на е-пошта
 SendAcknowledgementByMail=Испратете е-пошта за потврда
 SendMail=Испрати е-маил
 Email=Е-пошта
+EMail=Email
+EMails=Emails
 NoEMail=Нема е-пошта
 AlreadyRead=Веќе прочитано
 NotRead=Непрочитано
@@ -792,7 +798,7 @@ Notes=Белешки
 AddNewLine=Додадете нова линија
 AddFile=Додадете датотека
 FreeZone=Производ со слободен текст
-FreeLineOfType=Ставка со слободен текст, напишете:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Клонирајте го објектот со неговите главни атрибути
 ReGeneratePDF=Повторно генерирајте PDF
 PDFMerge=Спојување на PDF
@@ -878,12 +884,14 @@ toward=кон
 Access=Пристап
 SelectAction=Изберете дејство
 SelectTargetUser=Изберете цел корисник/вработен
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Користете Ctrl+C за копирање во таблата со исечоци
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Оригинално име на датотека
 SetDemandReason=Поставете извор
 SetBankAccount=Дефинирајте банкарска сметка
 AccountCurrency=Валута на сметката
+AccountancyCode=Accounting Code
 ViewPrivateNote=Погледнете ги белешките
 XMoreLines=%s линија(и) скриени
 ShowMoreLines=Прикажи повеќе/помалку линии
@@ -924,6 +932,7 @@ ConfirmMassDeletionQuestion=Дали сте сигурни дека сакате
 ConfirmMassClone=Масовна потврда за клонирање
 ConfirmMassCloneQuestion=Изберете проект за клонирање
 ConfirmMassCloneToOneProject=Клонирајте во проектот %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Поврзани објекти
 ClassifyBilled=Класифицирајте ги фактурираните
 ClassifyUnbilled=Класифицирајте ги нефактурираните
@@ -960,10 +969,11 @@ PrivateDownloadLinkDesc=Треба да сте најавени и ви треб
 Download=Преземи
 DownloadDocument=Преземете документ
 DownloadSignedDocument=Преземете потпишан документ
-ActualizeCurrency=Ажурирајте ја стапката на валута
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Фискална година
 ModuleBuilder=Изградувач на модули и апликации
 SetMultiCurrencyCode=Поставете валута
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Масовни акции
 ClickToShowHelp=Кликнете за да се прикаже помош за советот за алатка
 WebSite=Веб-страница
@@ -1103,6 +1113,7 @@ PayedBy=Платено од
 PayedTo=Платено на
 Monthly=Месечно
 Quarterly=Квартално
+Quarter=Quarter
 Annual=Годишен
 Local=Локално
 Remote=Далечински управувач
@@ -1145,6 +1156,7 @@ ContactDefault_project_task=Задача
 ContactDefault_propal=Предлог
 ContactDefault_supplier_proposal=Предлог на добавувачот
 ContactDefault_ticket=Билет
+ContactDefault_societe=Third party
 ContactAddedAutomatically=Контакт е додаден од улоги за контакт од трета страна
 More=Повеќе
 ShowDetails=Покажи детали
@@ -1187,6 +1199,8 @@ SetSupervisor=Поставете го супервизорот
 CreateExternalUser=Креирајте надворешен корисник
 ConfirmAffectTag=Масовно доделување ознаки
 ConfirmAffectUser=Масовно доделување на корисници
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=Доделена улога на секој проект/можност
 TasksRole=Доделена улога на секоја задача (ако се користи)
 ConfirmSetSupervisor=Масовен сет на супервизор
@@ -1238,6 +1252,9 @@ CommercialsAffected=Доделени претставници за продаж
 CommercialAffected=Доделен претставник за продажба
 CommercialsDisaffected=Претставниците за продажба не се поврзани
 CommercialDisaffected=Претставникот за продажба е прекинат
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=Вашата порака
 YourMessageHasBeenReceived=Вашата порака е примена. Ќе одговориме или ќе ве контактираме што е можно поскоро.
 UrlToCheck=УРЛ за проверка
@@ -1280,6 +1297,7 @@ AmountSalary=Износ на плата
 InvoiceSubtype=Подтип на фактура
 ConfirmMassReverse=Масовно обратна потврда
 ConfirmMassReverseQuestion=Дали сте сигурни дека сакате да ги промените избраните записи %s?
+ConfirmActionXxx=Confirm action %s
 ElementType=Тип на елемент
 ElementId=Ид на елементот
 Encrypted=Шифрирана
@@ -1300,3 +1318,34 @@ TranslationOfKey=Превод на клучот AnyTranslationKey
 SignedStatus=Потпишан статус
 NbRecordQualified=Број на квалификувани записи
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/mk_MK/members.lang b/htdocs/langs/mk_MK/members.lang
index ff3a15ad5cd..b258e35eada 100644
--- a/htdocs/langs/mk_MK/members.lang
+++ b/htdocs/langs/mk_MK/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Доколку е потребна претплата,
 DeleteType=Delete
 VoteAllowed=Гласањето е дозволено
 Physical=Индивидуален
-Moral=Корпорација
-MorAndPhy=Корпорација и поединец
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Овозможи повторно
 ExcludeMember=Исклучи член
 Exclude=Исклучи
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Статистика на членовите по ре
 NbOfMembers=Вкупен број на членови
 NbOfActiveMembers=Вкупен број на тековни активни членови
 NoValidatedMemberYet=Не се пронајдени потврдени членови
-MembersByCountryDesc=Овој екран ви ја прикажува статистиката на членовите по земји. Графиконите и графиконите зависат од достапноста на услугата за онлајн графикони на Google, како и од достапноста на работната интернет конекција.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Овој екран ви прикажува статистика на членови по држава/провинција/кантон.
 MembersByTownDesc=Овој екран ви прикажува статистика на членови по град.
 MembersByNature=Овој екран ви прикажува статистика на членови по природа.
diff --git a/htdocs/langs/mk_MK/salaries.lang b/htdocs/langs/mk_MK/salaries.lang
index 9b8e3ee69e1..fa49a3cd742 100644
--- a/htdocs/langs/mk_MK/salaries.lang
+++ b/htdocs/langs/mk_MK/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Нова плата
 AddSalary=Додадете плата
 NewSalaryPayment=Нова картичка за плата
 AddSalaryPayment=Додадете исплата на плата
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 SalariesPaymentsOf=Исплати на плати од %s
@@ -27,7 +29,7 @@ FillFieldFirst=Прво пополнете го полето за вработе
 UpdateAmountWithLastSalary=Поставете го износот на последната плата
 MakeTransferRequest=Направете барање за трансфер
 VirementOrder=Барање за трансфер на кредит
-BankTransferAmount=Износ на трансфер на кредит
 WithdrawalReceipt=Налог за трансфер на кредит
 OrderWaiting=Нарачка во очекување
 FillEndOfMonth=Пополнете со крајот на месецот
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang
index 065e74c4883..090b7f572de 100644
--- a/htdocs/langs/mk_MK/website.lang
+++ b/htdocs/langs/mk_MK/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Користете го списокот со други и
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=Содржина на CSS датотека (заедничка за сите страници)
 WEBSITE_JS_INLINE=Содржина на датотеката JavaScript (заедничка за сите страници)
-WEBSITE_HTML_HEADER=Додаток на дното на HTML заглавието (заедничко за сите страници)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Датотека со роботи (robots.txt)
 WEBSITE_HTACCESS=Датотека .htaccess на веб-страница
 WEBSITE_MANIFEST_JSON=Датотека на веб-страница manifest.json
@@ -56,16 +56,17 @@ ReadPerm=Прочитајте
 WritePerm=Напиши
 TestDeployOnWeb=Тестирајте/распоредете на веб
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL-то на виртуелниот домаќин што го опслужува надворешен веб-сервер не е дефинирано
 NoPageYet=Сè уште нема страници
 YouCanCreatePageOrImportTemplate=Можете да креирате нова страница или да увезете целосен образец на веб-локација
 SyntaxHelp=Помош за специфични совети за синтакса
 YouCanEditHtmlSourceckeditor=Можете да го уредувате изворниот код на HTML користејќи го копчето „Извор“ во уредникот.
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=За слика споделена со врска за споделување (отворен пристап користејќи го хаш-клучот за споделување на датотеката), синтаксата е:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;<span class='70f6000000012c7dcbe087z0 </span><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Клонирајте страница/контејнер
 CloneSite=Сајт за клонирање
@@ -87,15 +88,15 @@ WebsiteAccount=Сметка на веб-страница
 WebsiteAccounts=Сметки на веб-страници
 AddWebsiteAccount=Креирајте сметка на веб-страница
 BackToListForThirdParty=Назад на списокот за трети лица
-DisableSiteFirst=Прво исклучете ја веб-локацијата
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Наслов на мојата веб-страница
 AnotherContainer=Ова е како да вклучите содржина на друга страница/контејнер (може да имате грешка овде ако овозможите динамичен код бидејќи вградениот подконтејнер можеби не постои)
 SorryWebsiteIsCurrentlyOffLine=За жал, оваа веб-локација моментално е офлајн. Ве молиме вратете се подоцна...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Овозможете ја табелата за сметки на веб-страницата
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Овозможете ја табелата за складирање на сметки на веб-страници (најава/пропусница) за секоја веб-локација / трета страна
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Прво мора да ја дефинирате стандардната почетна страница
-OnlyEditionOfSourceForGrabbedContentFuture=Предупредување: Креирањето веб-страница со увоз на надворешна веб-страница е резервирано за искусни корисници. Во зависност од сложеноста на изворната страница, резултатот од увозот може да се разликува од оригиналот. Исто така, ако изворната страница користи вообичаени CSS стилови или конфликтни JavaScript, може да го наруши изгледот или карактеристиките на уредникот на веб-локацијата кога работите на оваа страница. Овој метод е побрз начин за креирање страница, но се препорачува да ја креирате вашата нова страница од нула или од предложен шаблон за страница.<br>Исто така, имајте предвид дека вградениот уредувач може да не работи исправност кога се користи на фатена надворешна страница.
-OnlyEditionOfSourceForGrabbedContent=Можно е само издание на изворот на HTML кога содржината е одземена од надворешна страница
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Земи и слики пронајдени во css и страница.
 ImagesShouldBeSavedInto=Сликите треба да се зачуваат во директориумот
 WebsiteRootOfImages=Корен директориум за слики на веб-страници
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Одјавете се од вашата корис
 filteredByVersion=Филтрирано по верзија
 removeFilter=Отстранете го филтерот
 viewMyCart=Погледнете ја мојата количка
+Shipping=Shipping
 freeShipping=Бесплатна испорака!
 noProducts=Нема производи
 nbrItemsInCart=Има <span class="ajax_cart_quantity">0</span> ставки во вашата кошничка.
@@ -284,12 +286,13 @@ productNameAToZ=Име на производ: А до Ш
 productNameZToA=Име на производ: од Z до A
 referenceLowestFirst=Референца: Прво најниско
 referenceHighestFirst=Референца: Прво највисоко
+productPerPage=products per page
 perPage=по страница
 showAll=Покажи се
 showing= Се прикажува
 nbrOfProducts= Има производи %s.
 noResultsHaveBeenFound=Пронајдени се 0 резултати.
-noResultsWereFound= Не беа пронајдени резултати.
+noResultsWereFound=Не беа пронајдени резултати.
 addToCart=Додади го во кошничка
 backHome=Врати се дома
 priceDrop=Пад на цената
@@ -302,10 +305,11 @@ lastUpdate=Последно ажурирање
 contactSupport=Како да контактирате со поддршката
 noProductToDisplay=Грешка, нема производ за прикажување
 yourCompanyInformation=Информации за вашата компанија
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=Оваа електронска адреса е веќе регистрирана.
 firstnameContainsLettersOnly=<b>Името</b> мора да содржи само букви и празни места
 lastnameContainsLettersOnly=<b>Презиме</b> мора да содржи само букви и празни места
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=Се појави грешка.
 accountCreation=Направете сметка
 errorsOccurred=Има %s грешка%s
@@ -357,3 +361,7 @@ subtract=Одземете
 LoginCheckout=Најавете се и продолжете на наплатата
 paymentSuccessProcessed=Вашата уплата е успешно обработена.
 youWillBeRedirectedToOrderPage=Наскоро ќе бидете пренасочени на страницата со детали за нарачката.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 7d1fc71aeb6..bb55dd6f228 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Fil-integritetssjekk ble godkjent, men noen n
 FileIntegritySomeFilesWereRemovedOrModified=Filintegritetssjekk mislyktes. Noen filer ble endret, fjernet eller lagt til.
 GlobalChecksum=Global sjekksum
 MakeIntegrityAnalysisFrom=Opprett integritetsanalyse av applikasjonsfiler fra
-LocalSignature=Innebygget lokal signatur (mindre pålitelig)
-RemoteSignature=Fjernsignatur (mer pålitelig)
+LocalSignature=Innebygd lokal signatur
+RemoteSignature=Ekstern fjernsignatur
 FilesMissing=Manglende filer
 FilesUpdated=Oppdaterte filer
 FilesModified=Endrede filer
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Kun brukt i noen Agenda-opsjoner
 Security=Sikkerhet
 Passwords=Passord
 DoNotStoreClearPassword=Krypter passord lagret i databasen.
-MainDbPasswordFileConfEncrypted=Krypter databasepassord lagret i conf.php. Det anbefales sterkt å aktivere dette alternativet.
+MainDbPasswordFileConfEncrypted=Tilslør databasepassordet som er lagret i conf.php. Det anbefales å aktivere dette alternativet.
 InstrucToEncodePass=For å kryptere passordet i <b>conf.php</b> , bytt ut linjen <br><b>$dolibarr_main_db_pass="...";</b><br>med<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=For passord i klartekst(helst ikke) i <b>conf.php</b> , bytt ut linjen <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>med<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Beskytt genererte PDF-filer. Dette anbefales IKKE, da det ødelegger masse PDF-generering.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometrisk punkt
 ExtrafieldMultiPointGeo=Geometrisk multipunkt
 ExtrafieldLinestringGeo=Geometrisk linjestreng
 ExtrafieldPolygonGeo=Geometrisk polygon
+ExtrafieldStars=Stjerner
 ComputedFormula=Beregnet felt
-ComputedFormulaDesc=Her kan du angi en formel ved å bruke andre egenskaper til objektet eller en hvilken som helst PHP-koding for å få en dynamisk beregnet verdi. Du kan bruke alle PHP-kompatible formler inkludert "?" betingelsesoperator og følgende globale objekt: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>WARNING</strong>: Hvis du trenger egenskapene til et objekt som ikke er lastet, kan du bare hente objektet inn i formelen din som i det andre eksempelet.<br>Å bruke et beregnet felt betyr at du ikke kan angi noen verdi fra grensesnittet. Dessuten, hvis det er en syntaksfeil, kan det hende at formelen ikke returnerer noe.<br><br>Eksempel på formel:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Eksempel for å laste inn objektet på nytt<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')<br><br>Annet eksempel på formel for å tvinge inn lasting av objektet og dets overordnede objekt:<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=Her kan du skrive inn en formel ved å bruke andre egenskaper til objektet eller en hvilken som helst PHP-koding for å få en dynamisk beregnet verdi. Du kan bruke alle PHP-kompatible formler inkludert "?" operator, og følgende globale objekt: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>ADVARSEL</strong>: Hvis du trenger egenskapene til et objekt som ikke er lastet, kan du bare hente objektet inn i formelen din som i det andre eksemplet. <br>Å bruke et beregnet felt betyr at du kan t skriv inn noen verdi fra grensesnittet. Hvis det er en syntaksfeil, kan det hende at formelen ikke returnerer noe. <br><br>Eksempel på formel:<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>Annet eksempel på formel for å tvinge belastning av objektet og dets overordnede objekt:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Overordnet prosjekt ikke funnet'
 Computedpersistent=Lagre beregnede felt
 ComputedpersistentDesc=Beregnede ekstrafelt vil bli lagret i databasen, men verdien blir bare omregnet når objektet til dette feltet endres. Hvis det beregnede feltet avhenger av andre objekter eller globale data, kan denne verdien være feil!
 ExtrafieldParamHelpPassword=Å la dette feltet stå tomt betyr at denne verdien vil bli lagret UTEN kryptering (feltet er bare skjult med stjerner på skjermen).<br><br>Enter verdi 'dolcrypt' for å kode verdi med en reversibel krypteringsalgoritme. Tydelige data kan fortsatt være kjent og redigert, men de er kryptert inn i databasen.<br><br>Skriv inn 'auto' (eller 'md5', 'sha256', 'password_hash', ...) for å bruke standard passordkrypteringsalgoritme (eller md5, sha256, password_hash...) for å lagre det ikke-reversible hashed-passordet i databasen (ingen måte å hente opprinnelig verdi)
@@ -519,7 +520,7 @@ WarningPHPMailB=- Hvis domenet til epost (delen mymaildomain.com i mittnavn@myma
 WarningPHPMailC=- Ved å bruke SMTP-serveren til din egen e-posttjenesteleverandør for å sende e-post vil alle e-postmeldinger som sendes fra applikasjonen bli lagret i "Sendt"-katalogen i postkassen din.
 WarningPHPMailD=Det anbefales derfor å endre sendemetoden for e-post til verdien "SMTP".
 WarningPHPMailDbis=Hvis du virkelig ønsker å beholde standard "PHP"-metoden for å sende e-poster, bare ignorer denne advarselen, eller fjern den ved å %sklikke her%s.
-WarningPHPMail2=Hvis din epost-SMTP-leverandør må begrense epostklienten til noen IP-adresser (svært sjelden), er dette IP-adressen til epost-brukeragenten (MUA) for ERP CRM-programmet: <strong> %s </strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=Hvis domenenavnet i avsenderens epost-adresse er beskyttet av en SPF-post (spør domenenavnsregistratoren), må du legge til følgende IP-er eller oppføring i SPF-posten til DNS av domenet ditt: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=Hvis domenenavnet i epost-adressen til avsenderen din er beskyttet av en annen DMARC-post enn p=none (spør domenenavnsregistratoren), må du fjerne DMARC-posten din, eller angi p=none på samme måte som @gmail.com, eller bruk send med en annen metode.
 SPFAndDMARCInformation=SPF og DMARC DNS-post for epost hovedadresser
@@ -567,8 +568,8 @@ Module10Name=Regnskap (forenklet)
 Module10Desc=Enkle regnskapsrapporter (tidsskrifter, omsetning) basert på databaseinnhold. Bruker ikke en hovedbok.
 Module20Name=Tilbud
 Module20Desc=Behandling av tilbud
-Module22Name=Masseutsendelser
-Module22Desc=Behandle masse-epost
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energi
 Module23Desc=Overvåking av energiforbruk
 Module25Name=Salgsordre
@@ -847,10 +848,10 @@ Permission212=Bestill linjer
 Permission213=Aktiver linje
 Permission214=Oppsett Telefoni
 Permission215=Oppsett tilbydere
-Permission221=Les e-postutsendelser
-Permission222=Opprett/endre e-postutsendelser (emne, mottagere...)
-Permission223=Valider postutsendelser (tillater sending)
-Permission229=Slett e-postutsendelser
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Vis mottakere og info
 Permission238=Manuelt sende utsendelser
 Permission239=Slett utsendelser etter validering eller sendt
@@ -1105,6 +1106,7 @@ DictionaryStaff=Antall ansatte
 DictionaryAvailability=Leveringsforsinkelse
 DictionaryOrderMethods=Bestillingsmetoder
 DictionarySource=Tilbud/ordre-opprinnelse
+DictionaryAccountancyReport=Personlige regnskapsrapporter
 DictionaryAccountancyCategory=Personlige grupper for rapporter
 DictionaryAccountancysystem=Diagram-modeller for kontoer
 DictionaryAccountancyJournal=Regnskapsjournaler
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Tilbake til Ordboklisten
 TypeOfRevenueStamp=Type skattestempel
 VATManagement=MVA-håndtering
 VATIsUsedStandard=Når du oppretter dokumenter (tilbud, fakturaer, ordre...), settes standard mva-sats i henhold til standardreglene (avhengig av selgers og kjøpers land)
-VATIsUsedDesc=Som standard, når du oppretter tilbud, fakturaer, ordre osv., følger MVA den aktive standardregelen:<br>Hvis selgeren ikke er underlagt MVA, blir MVA satt til 0. Slutt på regelen.<br>Hvis (selgerens land = kjøperens land), blir MVA som standard satt til MVA for produktet i selgerens land. Slutt på regelen.<br>Hvis selgeren og kjøperen begge er i Den europeiske union og varene er transportrelaterte produkter (frakt, shipping, flyselskap), er standard merverdiavgift (MVA) 0. Denne regelen avhenger av selgerens land - vennligst konsulter regnskapsføreren din. MVA skal betales av kjøperen til tollkontoret i deres eget land og ikke til selgeren. Slutt på regelen.<br>Hvis selgeren og kjøperen begge er i Den europeiske union og kjøperen ikke er et selskap (med et registrert intra-Community VAT-nummer), blir MVA satt til MVA-satsen i selgerens land. Slutt på regelen.<br>Hvis selgeren og kjøperen begge er i Den europeiske union og kjøperen er et selskap (med et registrert intra-Community VAT-nummer), blir MVA som standard satt til 0. Slutt på regelen.<br>I alle andre tilfeller er det foreslåtte standardverdien for MVA 0. Slutt på regelen.
+VATIsUsedDesc=Som standard når du oppretter tilbud, fakturaer, bestillinger osv., følger omsetningsavgiftssatsen den aktive standardregelen:<br>Hvis selgeren ikke er underlagt mva, er satsen som standard 0. Slutt på regelen.<br>Hvis kjøperens stat eller provins har en mva-regel fra mva-satsordboken, er det standard mva-sats. Slutt på regel.<br>Hvis (selgers land = kjøpers land), er omsetningsavgiften som standard lik omsetningsavgiften til vare i selgerens land. Slutt på regel.<br>Hvis selgeren og kjøper begge er i det europeiske fellesskapet og varer er transportrelaterte varer (transport, frakt, flyselskap), standard mva er 0. Denne regelen er avhengig av selgerens land - vennligst ta kontakt med regnskapsføreren din. MVA skal betales av kjøperen til tollkontoret i deres land og ikke til selgeren. Slutt på regel.<br>Hvis selgeren og kjøper begge er i det europeiske fellesskapet og kjøperen er ikke et selskap (med registrert mva nummer), så er MVA som standard MVA-satsen i selgerens land. Slutt på regel.<br>Hvis selgeren og kjøper begge er i det europeiske fellesskapet og kjøperen er et selskap (med registrert mva nummer), så er MVA 0 som standard. Slutt på regelen.<br>I alle andre tilfeller er den foreslåtte standarden MVA=0. Slutt på regelen.
 VATIsNotUsedDesc=Foreslått MVA er som standard 0. Den kan brukes mot foreninger, enkeltpersoner eller nystardede bedrifter.
 VATIsUsedExampleFR=I Frankrike betyr det at bedrifter eller organisasjoner har et reelt finanssystem (forenklet reell eller normal reell). Et system hvor MVA er erklært.
 VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
-VATType=Avgiftstype
+VATType=Skattebruk
 ##### Local Taxes #####
 TypeOfSaleTaxes=Type omsetningsavgift
 LTRate=Rate
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=I henhold til avgiftsoppsettet (Se %s - %s - %s), tren
 LabelUsedByDefault=Etiketten som brukes som standard hvis ingen oversettelse kan bli funnet for kode
 LabelOnDocuments=Etiketten på dokumenter
 LabelOrTranslationKey=Etikett eller oversettelsessnøkkel
+LabelTranslatedInCurrentLanguage=Etikett oversatt til gjeldende språk
 TranslationFound=Oversettelse funnet
 TheTranslationIsSearchedFromKey=Oversettelsen søkes fra oversettelsesnøkkelen: <b>%s</b>
 TranslationKey=Oversettelsesnøkkel
@@ -1431,7 +1434,7 @@ AddVatInList=Vis kunde-/leverandør-mva-nummer i kombinasjonslister.
 AddAdressInList=Vis kunde/leverandøradresse i kombinasjonslister.<br>Tredjeparter vil vises med navneformatet "The Big Company corp. - 21 jump street 123456 Big town - USA" i stedet for "The Big Company corp".
 AddEmailPhoneTownInContactList=Vis kontakt-epost (eller telefoner hvis ikke definert) og by i kombinasjonslister<br>Kontakter vil vises med navneformatet " Ola Normann - ola.normann@eksempel.no - Bergen" eller "Ola Normann - +47 12 34 56 78 - Bergen" i stedet for "Ola Normann".
 AskForPreferredShippingMethod=Spør etter foretrukket sendingsmetode for tredjeparter
-FieldEdition=Endre felt %s
+FieldEdition=Endring av feltet %s
 FillThisOnlyIfRequired=Eksempel: +2 (brukes kun hvis du opplever problemer med tidssone offset)
 GetBarCode=Hent strekkode
 NumberingModules=Nummereringsmodeller
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Tving fakturadato til godkjenningsdato
 SuggestedPaymentModesIfNotDefinedInInvoice=Foreslått betalingsmodus på faktura som standard hvis den ikke er definert på fakturaen
 SuggestPaymentByRIBOnAccount=Foreslå betaling trukket fra konto
 SuggestPaymentByChequeToAddress=Foreslå betaling med sjekk til
+InvoicePaymentManageStructuredCommunication=Generer strukturert kommunikasjon for fakturabetaling
+InvoicePaymentManageStructuredCommunicationHelp=I noen land er det nødvendig å vise en strukturert referanse for å forenkle betalinger og deres avstemming
 FreeLegalTextOnInvoices=Fritekst på fakturaer
 WatermarkOnDraftInvoices=Vannmerke på fakturakladder (ingen hvis tom)
 PaymentsNumberingModule=Modell for betalingsnummerering
@@ -1718,6 +1723,7 @@ CompressionOfResources=Undertrykkelse av HTTP-respons
 CompressionOfResourcesDesc=For eksempel ved bruk av Apache-direktivet "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=En slik automatisk deteksjon er ikke mulig med nåværende nettlesere
 DefaultValuesDesc=Her kan du definere standardverdien du vil bruke når du oppretter en ny post, og/eller standardfiltre eller sorteringsrekkefølgen når du lister oppføringer.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Standardverdier (for bruk på skjemaer)
 DefaultSearchFilters=Standard søkefiltre
 DefaultSortOrder=Standard sorteringsorden
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Nummereringsmodell for for sendelser
 SendingsAbility=Støtt forsendelsesskjemaer for kundeleveranser
 NoNeedForDeliveryReceipts=I de fleste tilfeller er forsendelsesskjemaer bruket både som skjema for kundeleveranser (liste over varer som skal sendes) og skjema som er mottatt og signert av kunden. Så produktleveranse-kvitteringer er en duplisert funksjon og er sjelden aktivert.
 FreeLegalTextOnShippings=Fritekst på leveringer
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Nummereringsmodul for vareleveringskvitteringer
 DeliveryOrderModel=Kvitteringsmodell for vareleveringer
@@ -1810,13 +1817,13 @@ AdvancedEditor=Avansert editor
 ActivateFCKeditor=Aktiver avansert editor for:
 FCKeditorForNotePublic=WYSIWYG opprettelse/endring av feltet "offentlige notater" av elementer
 FCKeditorForNotePrivate=WYSIWYG opprettelse/endring av feltet "private notater" av elementer
-FCKeditorForCompany=WYSIWYG opprettelse/endring av feltbeskrivelsen av elementer (unntatt produkter/tjenester)
-FCKeditorForProductDetails=WYSIWYG opprettelse/endring av varebeskrivelse eller linjer for objekter (linjer med forslag, bestillinger, fakturaer, etc...).
+FCKeditorForCompany=WYSIWYG opprettelse/endring av feltbeskrivelsen av elementer (unntatt varer/tjenester)
+FCKeditorForProductDetails=WYSIWYG opprettelse/endring av varebeskrivelse eller linjer for objekter (linjer med tilbud, ordrer,  fakturaer, osv...).
 FCKeditorForProductDetails2=Advarsel: Å bruke dette alternativet for dette tilfellet anbefales ikke, da det kan skape problemer med spesialtegn og sideformatering når du bygger PDF-filer.
-FCKeditorForMailing= WYSIWYG-oppretting/-endring for masse-epostutsendelser (Verktøy->epost)
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
 FCKeditorForUserSignature=WYSIWYG opprettelse/endring av brukersignatur
-FCKeditorForMail=WYSIWYG-oppretting/-endring for all post (unntatt Verktøy->e-post)
-FCKeditorForTicket=WYSIWYG opprettelse/endring av billetter
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG-oppretting/endring av supportsedler
 ##### Stock #####
 StockSetup=Oppsett av lagermodul
 IfYouUsePointOfSaleCheckModule=Hvis du bruker Point-of-Sale (POS) som tilbys som standard eller en ekstern modul, kan dette oppsettet ignoreres av din POS-modul. De fleste POS-moduler er som standard designet for å opprette en faktura umiddelbart og redusere lager uavhengig av alternativene her. Så hvis du trenger eller ikke skal ha et lagerreduksjon når du registrerer et salg fra ditt POS, kan du også sjekke innstillingen av POS-modulen.
@@ -1867,7 +1874,6 @@ Buy=Kjøp
 Sell=Selg
 InvoiceDateUsed=Fakturadatoen brukes
 YourCompanyDoesNotUseVAT=Ditt firma er definert til ikke å bruke MVA (Hjem - Oppsett - Firma/Organisasjon), så det er ingen MVA-alternativer å sette opp.
-AccountancyCode=Regnskapskode
 AccountancyCodeSell=Kontokode for salg
 AccountancyCodeBuy=Kontokode for innkjøp
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Hold avkrysningsboksen "Opprett automatisk betalingen" tom som standard når du oppretter en ny avgift
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Hvilken visning vil du åpne som standard når du velger m
 AGENDA_EVENT_PAST_COLOR = Farge på tidligere hendelser
 AGENDA_EVENT_CURRENT_COLOR = Gjeldende hendelsesfarge
 AGENDA_EVENT_FUTURE_COLOR = Farge på fremtiden
-AGENDA_REMINDER_BROWSER = Aktiver påminnelse om hendelse <b> i brukerens nettleser </b> (Når påminnelsesdato er nådd, vises en popup i nettleseren. Hver bruker kan deaktivere slike varsler i nettleseren).
+AGENDA_REMINDER_BROWSER = Tillat hendelsespåminnelser <b>i brukerens nettleser</b>
+AGENDA_REMINDER_BROWSERHelp = Når påminnelsesdatoen er nådd, vises en popup av nettleseren). Påminnelsesalternativ/forsinkelse defineres av brukeren ved opprettelse av hendelse.
 AGENDA_REMINDER_BROWSER_SOUND = Aktiver lydvarsler
-AGENDA_REMINDER_EMAIL = Aktiver påminnelse om hendelse <b> via epost </b> (påminnelsesalternativ/forsinkelse kan defineres for hver hendelse).
+AGENDA_REMINDER_EMAIL = Tillat hendelsespåminnelser <b>via epost</b>
 AGENDA_REMINDER_EMAIL_NOTE = Merk: Hyppigheten av den planlagte jobben %s må være nok til å være sikker på at påminnelsen sendes i riktig øyeblikk.
 AGENDA_SHOW_LINKED_OBJECT = Vis koblet objekt i agendavisning
 AGENDA_USE_EVENT_TYPE = Bruk hendelsestyper (administrert i menyoppsett -> Ordbøker -> Type agendahendelser)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Angi denne standardverdien automatisk for type hendelse i skjema for hendelsesoppretting
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Bruk standard påminnelse for disse hendelsene
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = Skjemaet for automatisk påminnelse vil fylles ut som standard når arrangementet opprettes
+AGENDA_DEFAULT_REMINDER_OFFSET = Standard påminnelsesperiode før arrangementet
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Epostmal som skal brukes som standard påminnelse
 PasswordTogetVCalExport = Nøkkel for å autorisere eksportlenke
 PastDelayVCalExport=Ikke eksporter hendelser eldre enn
 SecurityKey = Sikkerhetsnøkkel
@@ -2006,7 +2017,7 @@ BackupZipWizard=Veiviser for å bygge arkivet med dokumentkatalog
 SomethingMakeInstallFromWebNotPossible=Installasjon av ekstern modul er ikke mulig fra webgrensesnittet på grunn av:
 SomethingMakeInstallFromWebNotPossible2=Av denne grunn er prosessen for å oppgradere beskrevet her, en manuell prosess som bare en privilegert bruker kan utføre.
 InstallModuleFromWebHasBeenDisabledContactUs=Installasjon eller utvikling av eksterne moduler eller dynamiske nettsteder, fra applikasjonen, er for øyeblikket låst av sikkerhetshensyn. Ta kontakt med oss hvis du trenger å aktivere denne funksjonen.
-InstallModuleFromWebHasBeenDisabledByFile=Administrator har deaktivert muligheten for å installere eksterne moduler. Administrator må fjerne filen <strong>%s</strong> for å tillate dette.
+InstallModuleFromWebHasBeenDisabledByFile=Installasjon av ekstern modul fra applikasjonen og bruk av funksjoner som tillater å kjøre kode på serveren har blitt deaktivert av administratoren din. Du må be ham fjerne filen <strong>%s</strong> for å tillate denne egenskapen.
 ConfFileMustContainCustom=Ved installering eller bygging av en ekstern modul fra programmet må modulfilene lagres i katalogen <strong> %s</strong>. Hvis du vil ha denne katalogen behandlet av Dolibarr, må du sette opp <strong> conf/conf.php</strong> for å legge til 2 direktivlinjer: <br><strong> $dolibarr_main_url_root_alt = '/custom'; </strong><br><strong> $dolibarr_main_document_root_alt = '%s/custom'; </strong>
 HighlightLinesOnMouseHover=Fremhev tabellinjer når musen flyttes over
 HighlightLinesColor=Fremhev fargen på linjen når musen går over (bruk 'ffffff' for ingen fremheving)
@@ -2036,6 +2047,7 @@ Enter0or1=Skriv inn 0 eller 1
 EnterYesOrNo=Skriv inn Ja eller Nei
 UnicodeCurrency=Her legger du inn en liste med Ascii-verdier, som representerer et valutasymbol. For eksempel: $ = [36], Brasilsk real R$ = [82,36], € = [8364]
 ColorFormat=RGB-fargen er i HEX-format, for eksempel: FF0000
+NumberFormatForATotalPrice=Tallformat for totalprisen %s
 PictoHelp=Ikonnavn i formatet:<br>- image.png for en bildefil til gjeldende temakatalog<br>- image.png@module hvis filen er i katalogen /img/ til en modul<br>- fa-xxx for en FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size for et FontAwesome fa-xxx-bilde (med prefiks, farge og størrelse satt)
 PositionIntoComboList=Plassering av linje i kombinasjonslister
 SellTaxRate=MVA-sats
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Skjul totalpriskolon
 MAIN_PDF_NO_SENDER_FRAME=Skjul kanter på rammen rundt avsenderadresse
 MAIN_PDF_NO_RECIPENT_FRAME=Skjul kanter på mottakeradresserammen
 MAIN_PDF_HIDE_CUSTOMER_CODE=Skjul kundekode
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Skjul kunde regnskapskode
 MAIN_PDF_HIDE_SENDER_NAME=Skjul avsender/firmanavn i adresseblokk
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Skjul betalingsbetingelser
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Skjul betalingsmodus
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Legg til en skjult markering i signaturområdet for å la elektronisk signaturverktøy gjenbruke den. Kan brukes av eksterne verktøy eller fremtidig av den elektroniske signaturfunksjonen.
@@ -2324,6 +2341,8 @@ NotRecommended=Ikke anbefalt
 ARestrictedPath=Noen begrenset bane for datafiler
 CheckForModuleUpdate=Se etter oppdateringer for eksterne moduler
 CheckForModuleUpdateHelp=Denne handlingen kobles til editorer for eksterne moduler for å sjekke om en ny versjon er tilgjengelig.
+CheckForModuleUpdateHelp2=En tilkobling gjøres også til %s for å sjekke om noen av dine eksterne moduler har blitt rapportert som skadelig programvare av fellesskapet.
+YourIPWillBeRevealedToThisExternalProviders=Din IP vil bli avslørt for alle disse eksterne leverandørene.
 ModuleUpdateAvailable=En oppdatering er tilgjengelig
 NoExternalModuleWithUpdate=Ingen oppdateringer funnet for eksterne moduler
 SwaggerDescriptionFile=Swagger API-beskrivelsesfil (for bruk med f.eks redoc)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Vis leveringsadresse
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Obligatorisk indikasjon i noen land (Frankrike, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Vis faktureringskontakt på tilbud
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=Som standard vises kontakten kun for fakturering
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=URL-lenke til sosialt nettverk. Bruk {socialid} for den variable delen som inneholder ID-en for det sosiale nettverket.
 IfThisCategoryIsChildOfAnother=Hvis denne kategorien er en underkategori av en annen
 DarkThemeMode=Mørkt tema-modus
@@ -2450,7 +2471,7 @@ 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)
+MAIN_CHECKBOX_LEFT_COLUMN=Vis kolonnen for feltet og linjevalg til venstre (til høyre er deaktivert)
 NotAvailableByDefaultEnabledOnModuleActivation=Ikke opprettet som standard. Kun opprettet ved modulaktivering.
 CSSPage=CSS-stil
 Defaultfortype=Standard
@@ -2489,7 +2510,7 @@ AiDescription=KI (kunstig intelligense) funksjoner
 AiDescriptionLong=Gir AI (Artificial Intelligence) funksjoner i forskjellige deler av applikasjonen. Trenger ekstern AI API.
 AI_API_KEY=Nøkkel for AI-api
 AI_API_URL=Endpoint URL for AI API
-AI_API_SERVICE=Tjeneste som skal brukes for AI-funksjoner
+AI_API_SERVICE=AI service to use
 AiSetup=AI-moduloppsett
 AiCustomPrompt=Tilpasset ledetekst for AI
 AI_CONFIGURATIONS_PROMPT=Egendefinert ledetekst
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI Egendefinert ledetekst for funksjoner
 EnterAnIP=Skriv inn en IP-adresse
 ConvertInto=Konverter til
 YouAreHere=Du er her
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Vis strekkode på PDF-dokumentet for frakt
 BARCODE_ON_RECEPTION_PDF=Vis strekkode på mottaks-PDF-dokumentet
 BARCODE_ON_STOCKTRANSFER_PDF=Vis strekkode på beholdning overførings-PDF-dokumentet
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr utloggings-URL for å autor
 MainAuthenticationOidcLoginClaimName=Innloggingskrav
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect-krav som samsvarer med Dolibarr-brukerpåloggingen. Hvis det ikke er angitt eller tomt, er standard til epost
 BlackListWords=Svarteliste over ord
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Legg til svarteliste
 FediverseSetup=Konfigurasjon av fødivers-seksjon
 ConfigImportSocialNetwork=Konfigurasjon av sosiale nettverk som er kompatible med Fødivers
@@ -2555,6 +2581,29 @@ ParamName=Navn på parameter
 ParamValue=Verdi på parameter
 ConfirmDeleteParamOfSocialNetwork=Er du sikker på at du vil slette denne parameteren?
 HelpMariaDBToGetPossibleValues=Du kan få en liste over mulige verdier ved å kjøre følgende SQL-kommando: %s
+HelpMariaDBToGetValue=Denne verdien ble hentet med kommandoen: %s
+PDFBoxFrameRoundedCorners=Rammer med avrundede hjørner
+MAIN_PDF_FRAME_CORNER_RADIUS=Standardverdien for hjørneradius er 0, så ingen avrundede hjørner. Velg verdier mellom 1-3 for å øke hjørneradius og legg til avrundede hjørner i rammer
 Captcha=Captcha
 CaptchaDesc=Hvis du vil beskytte påloggingssiden din med en Captcha, kan du velge hvilken du skal bruke her
 DolibarrStandardCaptcha=En captcha generert av Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Vis leveringsadresse
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Obligatorisk indikasjon i noen land (Frankrike, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Vis mva-analyse per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=Du har en standard maksstørrelse for lister satt til <b>%s</b> . Dette er en stor verdi som må rulles for å se alle svarene. Det er bedre å ha en verdi lavere enn <b>%s</b> og bruk paginering for å se posten over dette nummeret. Endre dette i menyen Hjem - Oppsett - Skjerm.
+RoundBorders=Runde kanter
+CheckIfModuleIsNotBlackListed=Blokker installasjon for moduler funnet i <b>Ekstern svarteliste</b>
+CheckIfModuleIsNotBlackListedHelp=Noen moduler kan leveres av enkelte selskaper som ikke respekterer prosjektets regler for goodwill (manglende overholdelse av GDPR, brudd på reglene for bruk av Dolibarr-merkenavnet, etc.). Ved å merke av i denne boksen vil en forespørsel bli sendt til prosjektserveren for å se om det ble mottatt en rapport om denne modulen, og vil beskytte deg ved å blokkere distribusjonen av flaggede moduler
+DatabaseEncryption=Kryptering i database
+AlgorithmFor=Algoritme for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Verktøy for å dekryptere en streng
+Decrypt=Dekrypter
+FilesIntegrityDesc=Hvis du vil sjekke integriteten til filene i stedet for databasen, kan du gjøre det ved å bruke <a href="%s">dette verktøyet</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=Det er mer enn %s svar med filteret ditt. Vennligst legg til flere filtre...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index 7d516c9357a..5072dd26060 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Utgående balanse
 CurrentBalance=Gjeldende balanse
 FutureBalance=Framtidig balanse
 ShowAllTimeBalance=Vis balanse fra oppstart
-AllTime=Fra start
 Reconciliation=Bankavstemming
 RIB=Bankkontonummer
 IBAN=IBAN-nummer
@@ -133,7 +132,7 @@ DeleteTransaction=Slett oppføring
 ConfirmDeleteTransaction=Er du sikker på at du vil slette denne oppføringen?
 ThisWillAlsoDeleteBankRecord=Dette vil også slette generert bankoppføring
 BankMovements=Bevegelser
-PlannedTransactions=Planlagte oppføringer
+PlannedTransactions=Kommende oppføringer
 Graph=Grafer
 ExportDataset_banque_1=Bankoppføringer og kontoutskrifter
 ExportDataset_banque_2=Kvittering
@@ -151,8 +150,8 @@ FutureTransaction=Fremtidig transaksjon. Kan ikke avstemme.
 SelectChequeTransactionAndGenerate=Velg/filtrer sjekkene som skal inkluderes i sjekkinnskuddskvitteringen. Klikk deretter på "Opprett".
 SelectPaymentTransactionAndGenerate=Velg/filtrer dokumentene som skal inkluderes i %s innskuddskvittering. Klikk deretter på "Opprett".
 InputReceiptNumber=Velg kontoutskriften knyttet til forlikningen. Bruk en sorterbar numerisk verdi
-InputReceiptNumberBis=ÅÅÅÅMM eller ÅÅÅÅMMDD
-EventualyAddCategory=Til slutt, velg en kategori for å klassifisere postene
+InputReceiptNumberBis=ÅÅÅÅMM
+EventualyAddCategory=Eventuelt en kategori for å klassifisere operasjonene
 ToConciliate=Slå sammen?
 ThenCheckLinesAndConciliate=Sjekk linjene i kontoutskriften og klikk
 DefaultRIB=Standard BAN
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Hvis denne funksjonen er aktivert, kan du velge spesifi
 BankColorizeMovementName1=Bakgrunnsfarge for debetbevegelse
 BankColorizeMovementName2=Bakgrunnsfarge for kredittbevegelse
 IfYouDontReconcileDisableProperty=Hvis du ikke foretar bankavstemninger på noen bankkontoer, deaktiverer du egenskapen"%s" for å fjerne denne advarselen.
-NoBankAccountDefined=Ingen bankkonto definert
+NoBankAccountDefined=Ingen bankkonto funnet
 NoRecordFoundIBankcAccount=Ingen poster funnet på bankkontoen. Vanligvis skjer dette når en post er slettet manuelt fra listen over transaksjoner på bankkontoen (for eksempel under en avstemming av bankkontoen). En annen årsak er at betalingen ble registrert da modulen "%s" ble deaktivert.
 AlreadyOneBankAccount=En bankkonto er allerede definert
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA-filvariant
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 852253c0eb9..5d8bd103e70 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -169,6 +169,7 @@ BillTo=Til
 ShippingTo=Sendes til
 ActionsOnBill=Handlinger på faktura
 ActionsOnBillRec=Handlinger på gjentakende faktura
+InvoicesGeneratedFromRec=Genererte fakturaer
 RecurringInvoiceTemplate=Mal/Gjentakende faktura
 NoQualifiedRecurringInvoiceTemplateFound=Ingen gjentagende-fakturamal kvalifisert for generering
 FoundXQualifiedRecurringInvoiceTemplate=%s gjentakende malfaktura(er) kvalifisert for generering.
@@ -182,6 +183,7 @@ LastCustomersBills=Siste %s kundefakturaer
 LastSuppliersBills=Siste %s leverandørfakturaer
 AllBills=Alle fakturaer
 AllCustomerTemplateInvoices=Alle fakturamaler
+AllSupplierTemplateInvoices=Alle fakturamaler
 OtherBills=Andre fakturaer
 DraftBills=Fakturakladder
 CustomersDraftInvoices=Kunde fakturamal
@@ -419,6 +421,7 @@ InvoiceAutoValidate=Valider fakturaer automatisk
 GeneratedFromRecurringInvoice=Generert fra gjentagende-fakturamal %s
 DateIsNotEnough=Dato ikke nådd enda
 InvoiceGeneratedFromTemplate=Faktura %s generert fra gjentagende-fakturamal %s
+InvoiceGeneratedFromTemplateError=Error Invoice %s generated from recurring template invoice %s : %s
 GeneratedFromTemplate=Generert fra fakturamal %s
 WarningInvoiceDateInFuture=Advarsel, fakturadato er høyere enn dagens dato
 WarningInvoiceDateTooFarInFuture=Advarsel, er fakturadato for langt fra dagens dato
@@ -495,6 +498,8 @@ IBANNumber=IBAN kontonummer
 IBAN=IBAN
 CustomerIBAN=Kundes IBAN
 SupplierIBAN=Leverandørs IBAN
+DebitBankAccount = Direktedebet bankkonto
+SetDebitBankAccount = Definer direktedebet bankkonto
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT-kode
 ExtraInfos=Ekstra informasjon
@@ -513,10 +518,12 @@ PrettyLittleSentence=Aksepter forfalte beløp godkjent av regnskapsfører.
 IntracommunityVATNumber=Intracommunity number of VAT (ikke i Norge)
 PaymentByChequeOrderedTo=Sjekkbetaling (inkl. MVA) til %s send til
 PaymentByChequeOrderedToShort=Sjekkbetaling (inkl. MVA) til
+StructuredCommunication=Strukturert kommunikasjon
 SendTo=sendt til
 PaymentByTransferOnThisBankAccount=Betaling ved overføring til følgende bankkonto
 VATIsNotUsedForInvoice=* Avgiftsfritt
 VATIsNotUsedForInvoiceAsso=* Ikke gjeldende MVA art-261-7 av CGI
+VATIsNotUsedReverseChargeProcedure=* Non applicable VAT art-259-1 of CGI
 LawApplicationPart1=Alle varer forblir vår eiendom
 LawApplicationPart2=til de er fullt ut betalt.
 LawApplicationPart3=selgeren til full betaling av
@@ -661,6 +668,7 @@ MentionCategoryOfOperations0=Varelevering
 MentionCategoryOfOperations1=Levering av tjenester
 MentionCategoryOfOperations2=Blandet - Levering av varer og levering av tjenester
 Salaries=Lønn
+InvoiceSubtype=Faktura undertype
 SalaryInvoice=Lønn
 BillsAndSalaries=Regninger og lønn
 CreateCreditNoteWhenClientInvoiceExists=Dette alternativet er bare aktivert når validerte faktura(er) eksisterer for en kunde eller når konstant INVOICE_CREDIT_NOTE_STANDALONE brukes (nyttig for noen land)
diff --git a/htdocs/langs/nb_NO/blockedlog.lang b/htdocs/langs/nb_NO/blockedlog.lang
index fa63189860c..e9d58205064 100644
--- a/htdocs/langs/nb_NO/blockedlog.lang
+++ b/htdocs/langs/nb_NO/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Uforanderlige logger
 ShowAllFingerPrintsMightBeTooLong=Vis alle arkiverte logger (kan være lang)
 ShowAllFingerPrintsErrorsMightBeTooLong=Vis alle ikke-gyldige arkivlogger (kan være lang)
 DownloadBlockChain=Last ned fingeravtrykk
-KoCheckFingerprintValidity=Arkiverte loggoppføringer er ikke gyldige. Det betyr at noen (en hacker?) Har endret noen data fra denne posten etter at den ble spilt inn, eller har slettet den forrige arkiverte posten (sjekk at linjen med forrige # eksisterer) eller har endret kontrollsummen for den forrige posten.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Arkivert logg er gyldig. Det betyr at ingen data på denne linjen ble endret og posten følger den forrige.
 OkCheckFingerprintValidityButChainIsKo=Arkivert logg ser ut til å være gyldig i forhold til den forrige, men kjeden var ødelagt tidligere.
 AddedByAuthority=Lagret hos ekstern myndighet
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Loggdetaljer
 ListOfTrackedEvents=Liste over sporede hendelser
 Fingerprint=Fingeravtrykk
 DownloadLogCSV=Eksporter arkiverte logger (CSV)
-DataOfArchivedEvent=Alle data om arkivert hendelse
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Originalobjekt (type %s, id %s) ikke koblet (se kolonnen 'Alle data' for å få uforandret lagret data)
 BlockedLogAreRequiredByYourCountryLegislation=Ikke Modifiserbare Logger-modul kan være påkrevet av lovgivningen i ditt land. Deaktivering av denne modulen kan gjøre eventuelle fremtidige transaksjoner ugyldige med hensyn til loven og bruken av lovlig programvare, da de ikke kan bekreftes av en skattemessig revisjon.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Ikke Modifiserbare Logger-modul ble aktivert på grunn av lovgivningen i ditt land. Deaktivering av denne modulen kan gjøre eventuelle fremtidige transaksjoner ugyldige med hensyn til loven og bruken av lovlig programvare, da de ikke kan valideres av en skattemessig revisjon.
@@ -30,6 +32,7 @@ BlockedLogEnabled=System for å spore hendelser inn i uforanderlige logger er ak
 BlockedLogDisabled=System for å spore hendelser inn i uforanderlige logger har blitt deaktivert etter at noen opptak ble gjort. Vi lagret et spesielt fingeravtrykk for å spore kjeden som ødelagt
 BlockedLogDisabledBis=System for å spore hendelser inn i uforanderlige logger har blitt deaktivert. Dette er mulig fordi ingen registrering er gjort ennå.
 LinkHasBeenDisabledForPerformancePurpose=For ytelsesformål vises ikke direkte lenke til dokumentet etter 100. linje.
+SavedOnLine=Lagret på nett
 
 ## logTypes
 logBILL_DELETE=Kundefaktura logisk slettet
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Kundebetaling logisk sletting
 logPAYMENT_VARIOUS_CREATE=Betaling (ikke tildelt faktura) opprettet
 logPAYMENT_VARIOUS_DELETE=Betaling (ikke tildelt faktura) logisk sletting
 logPAYMENT_VARIOUS_MODIFY=Betaling (ikke tildelt faktura) endret
+logBLOCKEDLOG_EXPORT=Eksport av uforanderlige logger til en fil
diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang
index 6faebe37b4f..f43f9ab443c 100644
--- a/htdocs/langs/nb_NO/categories.lang
+++ b/htdocs/langs/nb_NO/categories.lang
@@ -10,13 +10,14 @@ modify=endre
 Classify=Klassifiser
 CategoriesArea=Merker/Kategorier-område
 ProductsCategoriesArea=Område for vare/tjeneste etiketter/kategorier
-SuppliersCategoriesArea=Område for Leverandøretiketter/kategorier 
+SuppliersCategoriesArea=Område for Leverandøretiketter/kategorier
 CustomersCategoriesArea=Kunde tags/kategorier område
 MembersCategoriesArea=Område for medlemstags/kategorier
 ContactsCategoriesArea=Kontakt tags/kategorier område
 AccountsCategoriesArea=Bankkonto etikett/kategorier område
 ProjectsCategoriesArea=Prosjekt tags/kategorier område
 UsersCategoriesArea=Område for brukertagger/kategorier
+Bank_linesCategoriesArea==Banklinjer merker/kategorier-område
 SubCats=Underkategorier
 CatList=Liste over merker/kategorier
 CatListAll=Liste over etiketter/kategorier (alle typer)
@@ -90,9 +91,10 @@ CategoriesSetup=Oppsett av merker/kategorier
 CategorieRecursiv=Automatisk lenke til overordnet merke/kategori
 CategorieRecursivHelp=Hvis alternativet er på, vil objektet også bli lagt til i de overordnede kategoriene når du legger til et objekt i en underkategori.
 AddProductServiceIntoCategory=Tildel kategori til varen/tjenesten
-AddCustomerIntoCategory=Tilordne kategori til kunde
-AddSupplierIntoCategory=Tilordne kategori til leverandør
-AssignCategoryTo=Tilordne kategori til
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Vis merke/kategori
 ByDefaultInList=Som standard i liste
 ChooseCategory=Velg kategori
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Side-Container Kategorier
 KnowledgemanagementsCategoriesArea=KM artikkel Kategorier
 UseOrOperatorForCategories=Bruk 'ELLER'-operator for kategorier
 AddObjectIntoCategory=Tilordne til kategorien
+FichintersCategoriesArea=Intervensjonskategorier
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index 344c98f7f3c..d3a40b58b88 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -65,6 +65,7 @@ State=Fylke(delstat)
 StateId=Stats-ID
 StateCode=Stat-/provinskode
 StateShort=Stat
+DepartmentBuyer=Kjøpers stat/provins
 Region=Region
 Region-State=Region - Stat
 Country=Land
@@ -78,7 +79,7 @@ Chat=Chat
 PhonePro=Firmatelefon
 PhonePerso=Tlf. privat
 PhoneMobile=Tlf. mobil
-No_Email=Avvis masse-e-post
+No_Email=Refuse mass emails
 Fax=Faks
 Zip=Postnummer
 Town=Poststed
@@ -382,12 +383,12 @@ ExportCardToFormat=Eksporter kort til format
 ContactNotLinkedToCompany=Kontaktpersonen er ikke lenket til noen tredjepart
 DolibarrLogin=Dolibarr innlogging
 NoDolibarrAccess=Ingen tilgang til Dolibarr
-ExportDataset_company_1=Tredjeparter (Selskaper/organisasjoner/fysiske personer) og deres egenskaper
-ExportDataset_company_2=Kontakter og deres egenskaper
-ExportDataset_company_3=Tredjeparts bankkontoer
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Tredjeparts tilleggs-kontakter/adresser og attributter
+ExportDataset_company_3=Tredjeparts betalingsmåter (bankkontoer)
 ImportDataset_company_1=Tredjeparter og deres egenskaper
 ImportDataset_company_2=Tredjeparts tilleggs-kontakter/adresser og attributter
-ImportDataset_company_3=Tredjeparts bankkontoer
+ImportDataset_company_3=Tredjeparts betalingsmåter (bankkontoer)
 ImportDataset_company_4=Tredjeparts salgsrepresentanter (tilordne salgsrepresentanter/brukere til bedrifter)
 PriceLevel=Prisnivå
 PriceLevelLabels=Prisnivåetiketter
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Gratiskode uten bekreftelse.
 ManagingDirectors=(E) navn (CEO, direktør, president ...)
 MergeOriginThirdparty=Duplisert tredjepart (tredjeparten du vil slette)
 MergeThirdparties=Flett tredjeparter
-ConfirmMergeThirdparties=Er du sikker på at du vil slå sammen den valgte tredjeparten med den nåværende? Alle tilknyttede objekter (fakturaer, ordre, ...) vil bli flyttet til gjeldende tredjepart, hvoretter den valgte tredjeparten vil bli slettet.
+ConfirmMergeThirdparties=Er du sikker på at du vil slå sammen den valgte tredjeparten med den nåværende? Alle tilknyttede objekter (fakturaer, bestillinger, ...) vil bli flyttet til gjeldende tredjepart, deretter vil den valgte tredjeparten bli slettet.
 ThirdpartiesMergeSuccess=Tredjeparter har blitt flettet
 SaleRepresentativeLogin=Innlogging for salgsrepresentant
 SaleRepresentativeFirstname=Selgers fornavn
@@ -461,3 +462,6 @@ ExternalSystemID=Ekstern system-ID
 IDOfPaymentInAnExternalSystem=ID for betalingsmodus til et eksternt system (som Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE Webservice-legitimasjon
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Tredjeparten må være en kunde for å tillate opprettelse av bankinformasjonen på Stripe-siden
+NewSocNameForClone=Nytt firmanavn
+ConfirmCloneThirdparties=Er du sikker på at du vil klone <b>%s</b> selskap?
+SocialNetworksBusiness=Sosiale nettverk for bedrift
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 1e05723f07f..eefa551c729 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Kundefaktura-betaling
 PaymentSupplierInvoice=betaling av leverandørfaktura
 PaymentSocialContribution=Skatter- og avgiftsbetaling
 PaymentVat=MVA betaling
-AutomaticCreationPayment=Registrer betalingen automatisk
+AutomaticCreationPayment=Also record the payment
 ListPayment=Liste over betalinger
 ListOfCustomerPayments=Liste over kundebetalinger
 ListOfSupplierPayments=Liste over leverandørbetalinger
@@ -118,10 +118,14 @@ SocialContributionsPayments=Skatter- og avgiftsbetalinger
 ShowVatPayment=Vis MVA betaling
 TotalToPay=Sum å betale
 BalanceVisibilityDependsOnSortAndFilters=Balanse er bare synlig i denne listen hvis tabellen er sortert på %s og filtrert på 1 bankkonto (uten andre filtre)
+CustomerAccountancyCodeGeneral=Generell regnskapskode
 CustomerAccountancyCode=Kunde-regnskapskode
+SupplierAccountancyCodeGeneral=Generell regnskapskode
 SupplierAccountancyCode=Leverandørens regnskapskode
+UserAccountancyCodeGeneral=Generell regnskapskode
 CustomerAccountancyCodeShort=Kundens regnskapskode
 SupplierAccountancyCodeShort=Leverandørens regnskapskode
+UserAccountancyCodeShort=Brukerkonto kode
 AccountNumber=Kontonummer
 NewAccountingAccount=Ny konto
 Turnover=Omsetning fakturert
@@ -129,7 +133,9 @@ TurnoverCollected=Omsetning mottatt
 SalesTurnoverMinimum=Minimum omsetning
 ByExpenseIncome=Etter utgifter & inntekter
 ByThirdParties=Etter tredjepart
+ByProjects=Etter prosjekter
 ByUserAuthorOfInvoice=Etter faktura-oppretter
+DetailedListLowercase=detaljert liste
 CheckReceipt=Kvittering
 CheckReceiptShort=Kvittering
 LastCheckReceiptShort=Siste %s innskuddskvitteringer
diff --git a/htdocs/langs/nb_NO/datapolicy.lang b/htdocs/langs/nb_NO/datapolicy.lang
index fe00a709085..46883103bf4 100644
--- a/htdocs/langs/nb_NO/datapolicy.lang
+++ b/htdocs/langs/nb_NO/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Retningslinjer for personvern
 Module4100Desc = Modul for å administrere personvern (samsvar med GDPR)
 # Administration page
 datapolicySetup = Modul for oppsett av retningslinjer for personvern
-Deletion = Sletting av data
-datapolicySetupPage = Avhengig av lovene i landene dine (eksempel <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Artikkel 5</a> i GDPR), må personopplysninger oppbevares i en periode som ikke overskrider varigheten dataene er nødvendige for formålet de ble samlet inn for, bortsett fra for arkivformål.<br>Slettingen vil gjøres automatisk etter en viss varighet uten hendelser (varigheten som du vil ha angitt nedenfor).
+DataDeletion=Sletting av data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s måneder
 ONE_YEAR = 1 år
 NB_YEARS = %s år
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Prospekt/kunde
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Ikke prospekt/ikke kunde
 DATAPOLICY_CONTACT_FOURNISSEUR = Leverandør
 DATAPOLICY_ADHERENT = Medlem
-DATAPOLICY_Tooltip_SETUP=Definer tiden uten interaksjon til du vil at posten skal slettes automatisk.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Du kan sende en GDPR-e-post til alle dine relevante kontakter (som ennå ikke har mottatt en e-post og som du ikke har registrert noe om deres GDPR-avtale). For å gjøre dette, bruk følgende knapp.
 SendAgreement = Send e-poster
 AllAgreementSend = Alle e-poster er sendt
 TXTLINKDATAPOLICYACCEPT = Tekst for lenken "avtale"
 TXTLINKDATAPOLICYREFUSE = Tekst for lenken "uenighet"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: Behandling av personopplysninger
 DATAPOLICY_consentement = Samtykke innhentet for behandling av personopplysninger
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 35aed9bdb94..cabdec978cb 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Feil ved oppretting av bildefiler (funne
 ErrorFailedToCreateDir=Kunne ikke opprette mappen. Kontroller at webserverbrukeren har skriverettigheter i dokumentmappen i Dolibarr. Hvis <b>safe_mode</b> er akivert i PHP, sjekk at webserveren eier eller er med i gruppen(eller bruker) for Dolibarr php-filer.
 ErrorNoMailDefinedForThisUser=Ingen e-post angitt for denne brukeren.
 ErrorSetupOfEmailsNotComplete=Installasjonen av e-post er ikke fullført
+ErrorAccountingClosureSetupNotComplete=Oppsett av avslutningskontoer ikke fullført
 ErrorFeatureNeedJavascript=Denne funksjonen trenger at JavaScript må aktivert for å fungere. Endre dette i oppsett - visning.
 ErrorTopMenuMustHaveAParentWithId0=En meny av typen 'Topp' kan ikke ha noen foreldremeny. Skriv 0 i foreldremeny eller velg menytypen 'Venstre'.
 ErrorLeftMenuMustHaveAParentId=En meny av typen 'Venstre' må ha foreldre-ID.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Opplastning blokkert av en PHP/Apache plugin.
 ErrorFileSizeTooLarge=Filstørrelsen er for stor eller filen er ikke oppgitt.
 ErrorFieldTooLong=Felt %s er for langt.
 ErrorSizeTooLongForIntType=Størrelse for lang for int-type (%s sifre maksimum)
+ErrorSizeForStarsType=Stjernestørrelsen må være et tall mellom 1 og 10
 ErrorSizeTooLongForVarcharType=Størrelse for lang for streng-type (%s tegn maksimum)
 ErrorNoValueForSelectType=Sett inn verdi for å velge liste
 ErrorNoValueForCheckBoxType=Sett inn verdi for å velge avkrysningsboks-liste
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Feil verdi for sikkerhetskode. Prøv igjen med ny verdi ...
 ErrorBothFieldCantBeNegative=Feltene %s og %s kan ikke begge være negative
 ErrorFieldCantBeNegativeOnInvoice=Feltet <strong>%s</strong> kan ikke være negativt på denne typen faktura. Hvis du trenger å legge til en rabattlinje, oppretter du bare rabatten først (fra feltet '%s' på tredjepartskortet) og bruker den på fakturaen.
 ErrorLinesCantBeNegativeForOneVATRate=Totalt antall linjer (netto skatt) kan ikke være negativt for en gitt ikke null mva-sats (Fant en negativ sum for mva-sats <b> %s </b> %%).
-ErrorLinesCantBeNegativeOnDeposits=Linjer kan ikke være negative i et innskudd. Du vil få problemer når du trenger å bruke innskuddet på sluttfaktura hvis du gjør det.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Kvantum på linjer i kundefakturaer kan ikke være negativ
+ErrorQtyForSupplierInvoiceCantBeNegative=Antallet for linje i leverandørfakturaer kan ikke være negativt
 ErrorWebServerUserHasNotPermission=Brukerkonto <b>%s</b> som brukes til å kjøre web-server har ikke tillatelse til det
 ErrorNoActivatedBarcode=Ingen strekkodetype aktivert
 ErrUnzipFails=Klarte ikke å pakke ut %s med ZipArchive
@@ -222,7 +225,7 @@ ErrorUserNotAssignedToTask=Bruker må tilordnes til en oppgave for å være i st
 ErrorTaskAlreadyAssigned=Oppgaven er allerede tildelt bruker
 ErrorModuleFileSeemsToHaveAWrongFormat=Modulpakken ser ut til å ha feil format.
 ErrorModuleFileSeemsToHaveAWrongFormat2=Minst en obligatorisk katalog må finnes i modulens zip-fil: <strong>%s</strong> eller <strong>%s</strong>
-ErrorFilenameDosNotMatchDolibarrPackageRules=The file name of the module package (<strong>%s</strong>) does not match the expected name syntax: <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=Filnavnet til modulpakken (<strong>%s</strong>) samsvarer ikke med den forventede navnesyntaksen: <strong>%s</strong>
 ErrorDuplicateTrigger=Feil, duplikat utløsernavn %s. Allerede lastet fra %s.
 ErrorNoWarehouseDefined=Feil, ingen lagre definert.
 ErrorBadLinkSourceSetButBadValueForRef=Lenken du bruker er ikke gyldig. En 'kilde' for betaling er definert, men verdien for 'ref' er ikke gyldig.
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=Sluttdato-feltet kan ikke være tomt
 ErrorStartHourIsNull=Startdato-feltet kan ikke være tomt
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=For mange linjer å behandle. Vennligst bruk et mer selektivt filter.
 ErrorEmptyValueForQty=Mengden kan ikke være null.
+ErrorNoCloneWithoutName=Den nye brukeren må ha et navn
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = Mengden som er bestilt kan ikke være mindre enn den leverte.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Feil, opprettelse av en annen betaling på en bankkonto med en annen valuta enn selskapets valuta støttes ikke ennå.
+ErrorStreamMustBeEnabled=PHP-strømmen %s er ikke tilgjengelig. Sjekk PHP-modulene dine og Dolibarr-parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP-parameteren upload_max_filesize (%s) er høyere enn PHP-parameteren post_max_size (%s). Dette er ikke et konsistent oppsett.
 WarningPasswordSetWithNoAccount=Et passord ble satt for dette medlemmet, men ingen brukerkonto ble opprettet. Det fører til at passordet ikke kan benyttes for å logge inn på Dolibarr. Det kan brukes av en ekstern modul/grensesnitt, men hvis du ikke trenger å definere noen innlogging eller passord for et medlem, kan du deaktivere alternativet "opprett en pålogging for hvert medlem" fra medlemsmodul-oppsettet. Hvis du trenger å administrere en pålogging, men ikke trenger noe passord, kan du holde dette feltet tomt for å unngå denne advarselen. Merk: E-post kan også brukes som en pålogging dersom medlemmet er knyttet til en bruker.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=Denne foreldre-ID-en eksisterer ikke lenger
 WarningReadBankAlsoAllowedIfUserHasPermission=Advarsel, lesing av bankkonto er også tillatt med tillatelse til å administrere kontoplan
 WarningNoDataTransferedInAccountancyYet=Vær oppmerksom på at det ikke er data i regnskapstabellen. Vennligst overfør dataene som er registrert i applikasjonen til regnskapsdelen eller endre beregningsmodus for å analysere dataene som er registrert utenfor regnskapet.
 WarningChangingThisMayBreakStopTaskScheduler=Advarsel, endring av denne verdien kan deaktivere planleggeren
+WarningAmountOfFileDiffersFromSumOfLines=Advarsel, mengden i fil (%s) er forskjellig fra summen av linjer (%s)
+WarningModuleAffiliatedToAReportedCompany=Advarsel, denne modulen har blitt rapportert til Dolibarr-stiftelsen som publisert av et selskap som bruker ulovlig praksis (manglende overholdelse av reglene for bruk av Dolibarr-merket, innsamling av data uten ditt samtykke eller distribusjon av skadelig programvare).
+WarningModuleAffiliatedToAPiratPlatform=Vær forsiktig når du får en modul (betalt eller gratis) fra en mistenkelig ikke-offisiell plattform som %s
+
 SwissQrOnlyVIR = SwissQR-faktura kan kun legges til på fakturaer som skal betales med kredittoverføring.
 SwissQrCreditorAddressInvalid = Kreditoradressen er ugyldig (er postnummer og sted angitt? (%s)
 SwissQrCreditorInformationInvalid = Kreditorinformasjon er ugyldig for IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s er allerede definert som kontakt
 ErrorThisGroupIsAlreadyDefinedAsThisType=Kontaktene med denne gruppen er allerede definert som kontakt for denne typen.
 EmptyMessageNotAllowedError=Tom melding er ikke tillatt
 ErrorIsNotInError=%s er ikke i feil
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/nb_NO/exports.lang b/htdocs/langs/nb_NO/exports.lang
index 3539a2ad708..5dac8749577 100644
--- a/htdocs/langs/nb_NO/exports.lang
+++ b/htdocs/langs/nb_NO/exports.lang
@@ -67,7 +67,7 @@ ChooseFormatOfFileToImport=Velg filformatet som skal brukes som importfilformat
 ChooseFileToImport=Last opp fil og klikk deretter på %s ikonet for å velge fil som kilde-importfil ...
 SourceFileFormat=Kildefil-format
 FieldsInSourceFile=Felt i kildefilen
-FieldsInTargetDatabase=Målfelt i Dolibarr-databasen (uthevet=obligatorisk)
+FieldsInTargetDatabase=Målfelt i Dolibarr-databasen
 NoFields=Ingen felt
 MoveField=Flytt feltet med kolonnenummer %s
 ExampleOfImportFile=Importfil_eksempel
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Kontroller at filformatet (felt- og strengskillere) for
 RunSimulateImportFile=Kjør Importsimulering
 FieldNeedSource=Dette feltet krever data fra kildefilen
 SomeMandatoryFieldHaveNoSource=Noen obligatoriske felt har ikke noen kilder fra datafilen
-InformationOnSourceFile=Informasjon om kildefilen
-InformationOnTargetTables=Informasjon om målfeltene
+InformationOnSourceFile=Kildefil
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Bytt minst ett kildefelt i kolonnen av felt som skal eksporteres
 SelectFormat=Velg dette filformatet for import
 RunImportFile=Importer data
diff --git a/htdocs/langs/nb_NO/hrm.lang b/htdocs/langs/nb_NO/hrm.lang
index 60057f4ffd7..ca5a84db53d 100644
--- a/htdocs/langs/nb_NO/hrm.lang
+++ b/htdocs/langs/nb_NO/hrm.lang
@@ -46,11 +46,11 @@ NewEval=Ny kompetansevurdering
 ValidateEvaluation=Validere kompetansevurdering
 ConfirmValidateEvaluation=Er du sikker på at du vil validere denne kompetansevurderingen med referansen <b>%s</b>?
 EvaluationCard=Kompetansevurdering
-RequiredRank=Nødvendig rangering for jobbprofilen
-RequiredRankShort=Nødvendig rangering
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Stillinger med denne stillingsprofilen
-EmployeeRank=Ansatt rangering for denne ferdigheten
-EmployeeRankShort=Ansattes rangering
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Ansattstilling
 EmployeePositions=Ansattstillinger
 EmployeesInThisPosition=Ansatte i denne stillingen
@@ -98,3 +98,5 @@ NeedBusinessTravels=Trenger forretningsreiser
 NoDescription=ingen beskrivelse
 TheJobProfileHasNoSkillsDefinedFixBefore=Den evaluerte jobbprofilen til denne ansatte har ingen ferdigheter definert. Legg til ferdighet(er), slett og start evalueringen på nytt.
 PDFStandardHrmEvaluation=Standardmal for å generere et PDF-dokument for en kompetansevurdering
+SkillNotRequired=Ferdighet ikke nødvendig
+LinkToUserCreated=Koble til en ansatt hvis søkeren har blitt ansatt og omgjort til bruker.
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index ba13102cfb6..c71142f9725 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=E-postutsendelser
 EMailing=E-postutsendelser
-EMailings=E-postutsendelser
+EMailings=Mass EMails
 SMSings=SMS-er
-AllEMailings=Alle utsendelser
+AllEMailings=All mass eMails
 MailCard=E-postkort
 MailRecipients=Mottagere
 MailRecipient=Mottager
@@ -26,19 +26,19 @@ MailFile=Filvedlegg
 MailMessage=E-mail meldingstekst
 SubjectNotIn=Ikke i emne
 BodyNotIn=Ikke i body
-ShowEMailing=Vis utsendelse
-ListOfEMailings=Oversikt over utsendelser
-NewMailing=Ny utsendelse
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Ny sms
-EditMailing=Rediger utsendelse
-ResetMailing=Start utsendelse på nytt
-ConfirmResetMailingTargetMassaction=Bekreftelse av tilbakestilling av målstatus
-ResetMailingTargetMassaction=Tilbakestill målstatus
-DeleteMailing=Slett utsendelse
-PreviewMailing=Forhåndsvis utsendelse
-CreateMailing=Opprett utsendelse
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Tilbakestill status feil
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=Valider utsendelse
+ValidMailing=Valid mass Email
 MailingStatusDraft=Kladd
 MailingStatusValidated=Validert
 MailingStatusSent=Sendt
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Alle filtre må samsvare for at en e-post skal samles i
 LineInFile=Antall linjer i filen: %s
 RecipientSelectionModules=Forespørsel om lesebekreftelse
 MailSelectedRecipients=Valgte mottagere
-MailingArea=Område for e-postutsendelser
-LastMailings=Siste %s epostutsendelser
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Statistikk over målgruppe
 NbOfCompaniesContacts=Unike kontakter/adresser
 MailNoChangePossible=Du kan ikke endre mottagere når utsendelsen er validert
-SearchAMailing=Finn utsendelse
-SendMailing=Send utesendelse
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Sendt av
 AdvancedAlternative=Avansert alternativ
 MailingNeedCommand=Å sende en epost kan utføres fra kommandolinjen. Spør din server-administrator å kjøre følgende kommando for å sende e-post til alle mottakere:
 MailingNeedCommand2=Du kan imidlertid sende dem online ver å sette parameteret MAILING_LIMIT_SENDBYWEB til en verdi tilsvarende den maksimale antalle e-poster du ønsker å sende i en økt.
 ConfirmSendingEmailing=Hvis du ønsker å sende epost direkte fra denne siden, må du bekrefte at du er sikker på at du vil sende epost nå fra nettleseren
-LimitSendingEmailing=Merk: E-postutsendelser fra web-grensenitt er delt opp i flere omganger av sikkerhets-/timeout-hensyn.<b>%s</b> mottakere for hver utsendelse.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Tøm liste
 ToClearAllRecipientsClickHere=Trykk på knappen for å tømme mottagerlisten
 ToAddRecipientsChooseHere=Velg i listene for å legge til mottagere
-NbOfEMailingsReceived=E-postutsendelser mottatt
-NbOfEMailingsSend=Masse-epost sendt
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=Post ID
 DeliveryReceipt=Levering godkj.
 YouCanUseCommaSeparatorForSeveralRecipients=Du kan bruke <b>komma</b> som skilletegn for å angi flere mottakere.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Ingen automatiske e-postvarsler er planlagt for denne
 ANotificationsWillBeSent=Én automatisk varsling vil bli sendt via e-post
 SomeNotificationsWillBeSent=%s automatiske varsler vil bli sendt via e-post
 AddNewNotification=Abonner på et nytt automatisk e-postvarsel (mål/hendelse)
-ListOfActiveNotifications=Aktive abonnementer (mål/hendelser) for automatisk epostvarsling
+ListOfActiveNotifications=Aktive abonnementer
+ListOfActiveNotificationsHelp=Liste over par %s/%s som abonnerer på automatisk epostvarsling
 ListOfNotificationsDone=Automatiske epostvarsler sendt
+ListOfNotificationsDoneHelp=Liste over tidligere sendte epostvarsler
 MailSendSetupIs=E-postutsendelser er  blitt satt opp til '%s'. Denne modusen kan ikke brukes ved masseutsendelser
 MailSendSetupIs2=Logg på som administrator, gå til menyen %sHjem - Oppsett - E-post%s for å endre parameter <strong>'%s'</strong> for å bruke '%s' modus. I denne modusen for du tilgang til oppsett av SMTP-server og muligheten til å bruke masseutsendelser.
 MailSendSetupIs3=Ved spørsmål om hvordan du skal sette opp SMTP-serveren din, kontakt %s
@@ -183,7 +185,7 @@ Information=Informasjon
 ContactsWithThirdpartyFilter=Kontakter med tredjepartsfilter
 Unanswered=Ubesvart
 Answered=Besvarte
-IsNotAnAnswer=Er ikke svar (første e-post)
+IsNotAnAnswer=Er ikke svar (Er en initial epost)
 IsAnAnswer=Er et svar på en første e-post
 RecordCreatedByEmailCollector=Post opprettet av epost-samleren %s
 DefaultBlacklistMailingStatus=Standardverdi for feltet '%s' når du oppretter en ny kontakt
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index bd76455284e..63bdd645037 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -37,6 +37,7 @@ Translation=Oversettelse
 Translations=Oversettelser
 CurrentTimeZone=Tidssone for PHP (server)
 EmptySearchString=Angi ikke-tomme søkekriterier
+EnterNonEmptyLinesFirst=skriv inn ikke-tomme linjer først
 EnterADateCriteria=Skriv inn datokriterier
 NoRecordFound=Ingen post funnet
 NoRecordDeleted=Ingen poster slettet
@@ -45,6 +46,7 @@ NoError=Ingen feil
 Error=Feil
 Errors=Feil
 ErrorFieldRequired=Feltet '%s' er påkrevet
+CustomMandatoryFieldRule=Egendefinert «Obligatorisk felt»-regel
 ErrorFieldFormat=Feltet '%s' har ugyldig verdi
 ErrorFileDoesNotExists=Filen %s finnes ikke
 ErrorFailedToOpenFile=Kunne ikke åpne filen %s
@@ -308,6 +310,7 @@ DateBuild=Rapport byggedato
 DatePayment=Dato for betaling
 DateApprove=Godkjennelsesdato
 DateApprove2=Godkjennelsesdato (2. godkjennelse)
+PendingSince=Ventende siden
 RegistrationDate=Registreringsdato
 UserCreation=Opprettelse av bruker
 UserModification=Endre bruker
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Ikke startet
 ActionRunningShort=Pågår
 ActionDoneShort=Fullført
 ActionUncomplete=Ufullstendig
-LatestLinkedEvents=Siste %s koblede hendelser
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Firma/organisasjon
 Accountant=Regnskapsfører
 ContactsForCompany=Kontakter for denne tredjeparten
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=E-mail meldingstekst
 SendAcknowledgementByMail=Send bekrftelse på epost
 SendMail=Send e-post
 Email=E-post
+EMail=E-post
+EMails=Epost
 NoEMail=Ingen e-post
 AlreadyRead=Allerede lest
 NotRead=Ulest
@@ -793,7 +798,7 @@ Notes=Merknader
 AddNewLine=Legg til ny linje
 AddFile=Legg til fil
 FreeZone=Fritekstvare
-FreeLineOfType=Fritekst element, type:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Klon objektet med de viktigste attributtene
 ReGeneratePDF=Regenerere PDF
 PDFMerge=PDF Flett
@@ -879,12 +884,14 @@ toward=mot
 Access=Tilgang
 SelectAction=Velg handling
 SelectTargetUser=Velg målbruker/-ansatt
+ClickToCopyToClipboard=Klikk for å kopiere til utklippstavlen
 HelpCopyToClipboard=Bruk Ctrl + C for å kopiere til utklippstavle
 SaveUploadedFileWithMask=Lagre filen på serveren med navnet <strong>"%s"</strong> (ellers "%s")
 OriginFileName=Originalt filnavn
 SetDemandReason=Sett kilde
 SetBankAccount=Definer Bankkonto
 AccountCurrency=Konto valuta
+AccountancyCode=Regnskapskode
 ViewPrivateNote=Vis notater
 XMoreLines=%s linje(r) skjult
 ShowMoreLines=Vis flere/færre linjer
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Er du sikker på at du vil slette de %s valgte poste
 ConfirmMassClone=Bekreftelse av bulk-kloning
 ConfirmMassCloneQuestion=Velg prosjektet du vil klone til
 ConfirmMassCloneToOneProject=Klon til prosjekt %s
+ObjectClonedSuccessfuly=Objektkloning vellykket
 RelatedObjects=Relaterte objekter
 ClassifyBilled=Klassifiser fakturert
 ClassifyUnbilled=Klassifiser Ufakturert
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Du må være innlogget og ha tillatelse for å se eller
 Download=Last ned
 DownloadDocument=Last ned dokument
 DownloadSignedDocument=Last ned signert dokument
-ActualizeCurrency=Oppdater valutakurs
+ActualizeCurrency=Bruk den siste kjente kursen for valutaen
 Fiscalyear=Regnskapsår
 ModuleBuilder=Modul- og applikasjonsbygger
 SetMultiCurrencyCode=Angi valuta
+SetMultiCurrencyRate=Angi valutakurs
 BulkActions=Massehandlinger
 ClickToShowHelp=Klikk for å vise verktøytipshjelp
 WebSite=Nettsted
@@ -1104,6 +1113,7 @@ PayedBy=Betalt av
 PayedTo=Betalt til
 Monthly=Månedlig
 Quarterly=Kvartalsvis
+Quarter=Kvartal
 Annual=Årlig
 Local=Lokal
 Remote=Ekstern
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Oppgave
 ContactDefault_propal=Tilbud
 ContactDefault_supplier_proposal=Leverandørtilbud
 ContactDefault_ticket=Billett
+ContactDefault_societe=Tredjepart
 ContactAddedAutomatically=Kontakt lagt til fra tredjeparts kontaktroller
 More=Mer
 ShowDetails=Vis detaljer
@@ -1242,6 +1253,7 @@ CommercialAffected=Tildelt salgsrepresentant
 CommercialsDisaffected=Salgsrepresentanter koblet fra
 CommercialDisaffected=Salgsrepresentant frakoblet
 Message=Melding
+Emailing=Emailing
 Progression=Fremdrift
 YourMessage=Din beskjed
 YourMessageHasBeenReceived=Meldingen din er mottatt. Vi vil svare eller kontakte deg så snart som mulig.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Oversettelse av nøkkelen AnyTranslationKey
 SignedStatus=Signert status
 NbRecordQualified=Antall kvalifiserte poster
 auto=auto
+UploadFile=Direkte import av dokument
+OrClickToSelectAFile=eller klikk for å velge en fil på disken
+NetTotal=Netto totalt
+VATAmount=MVA-beløp
+TotalDiscount=Total rabatt
+TotalHTBeforeDiscount=Total netto før rabatt
+Contains=Inneholder
+DoesNotContain=Inneholder ikke
+Is=Er
+IsNot=Er ikke
+StartsWith=Starter med
+EndsWith=Ender med
+IsBefore=Er før
+IsAfter=Er etter
+IsOnOrBefore=Er før eller lik
+IsOnOrAfter=Er etter eller lik
+IsHigherThan=Er høyere enn
+IsHigherThanOrEqual=Er høyere enn eller lik
+IsLowerThan=Er lavere enn
+IsLowerThanOrEqual=Er lavere enn eller lik
+addToFilter=Legg til
+FilterAssistance=Filterredigering
+Operator=Operator
+AllFieldsRequired=Alle felt er obligatoriske.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Fra start
+Transferred=Transferred
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index 4b1fed01dfe..f7288bf731d 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Dersom det kreves abonnement, må det registreres et ab
 DeleteType=Slett
 VoteAllowed=Stemming tillatt
 Physical=Individuell
-Moral=Selskap
-MorAndPhy=Selskap og individ
+Moral=Juridisk enhet
+MorAndPhy=Juridisk enhet og Individuell
 Reenable=Aktiver på nytt
 ExcludeMember=Ekskluder et medlem
 Exclude=Ekskluder
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Medlem statistikk etter region
 NbOfMembers=Totalt antall medlemmer
 NbOfActiveMembers=Totalt antall nåværende aktive medlemmer
 NoValidatedMemberYet=Ingen validerte medlemmer funnet
-MembersByCountryDesc=Dette skjermbildet viser statistikk over medlemmer etter land. Grafer og diagrammer avhenger av tilgjengeligheten til Googles online graftjeneste, samt av en fungerende internettforbindelse.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Dette skjermbildet viser deg statistikk over medlemmer etter stat/provinser/kantoner.
 MembersByTownDesc=Dette skjermbildet viser statistikk over medlemmer etter by.
 MembersByNature=Dette skjermbildet viser statistikk over medlemmene etter natur.
@@ -205,28 +206,28 @@ MembersNature=Medlemmenes art
 Public=%s kan publisere mitt medlemskap i <a target="_blank" href="%s"> det offentlige registeret </a>
 MembershipPublic=Offentlig medlemskap
 NewMemberbyWeb=Nytt medlem lagt til. Venter på godkjenning
-NewMemberForm=Skjema for nytt medlem 
+NewMemberForm=Skjema for nytt medlem
 SubscriptionsStatistics=Bidragsstatistikk
 NbOfSubscriptions=Antall bidrag
-AmountOfSubscriptions=Beløp samlet inn fra bidrag
+AmountOfSubscriptions=Beløp innkrevd fra medlemsinnbetalinger
 TurnoverOrBudget=Omsetning (for et selskap) eller Budsjett (for en organisasjon)
-DefaultAmount=Standard bidragsbeløp (brukes bare hvis ingen beløp er definert på medlemstypenivå)
-MinimumAmount=Minimumsbeløp (brukes bare når bidragsbeløpet er gratis)
-CanEditAmount=Abonnementsbeløp kan defineres av medlemmet
+DefaultAmount=Standardbeløp for medlemsbetaling (brukes bare hvis ingen beløp er definert på medlemstypenivå)
+MinimumAmount=Minimumsbeløp for medlemskapsbetaling (har prioritet på eventuelle standardbeløp)
+CanEditAmount=Medlemsbeløpet kan defineres av medlemmet
 CanEditAmountDetail=Besøkende kan velge/redigere beløpet for sitt bidrag uavhengig av medlemstype
 AmountIsLowerToMinimumNotice=Beløpet er lavere enn minimum %s
 MEMBER_NEWFORM_PAYONLINE=Etter online registrering, bytt automatisk til online betalingsside
 ByProperties=Etter egenskap
 MembersStatisticsByProperties=Medlemsstatistikk etter egenskap
-VATToUseForSubscriptions=MVA-sats til bruk for bidrag
-NoVatOnSubscription=Ingen MVA for bidrag
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt brukt for bidragslinje til faktura: %s
+VATToUseForSubscriptions=MVA-sats til bruk for medlemsbetaling
+NoVatOnSubscription=Ingen mva for medlemsbetaling
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Vare brukt for medlemskapslinje til faktura: %s
 NameOrCompany=Navn eller firma
 SubscriptionRecorded=Bidrag registrert
 NoEmailSentToMember=Ingen epost sendt til medlem
 EmailSentToMember=E-post sendt til medlem på %s
-SendReminderForExpiredSubscriptionTitle=Send påminnelse på e-post for utløpte bidrag
-SendReminderForExpiredSubscription=Send påminnelse via epost til medlemmer når abonnementet er i ferd med å utløpe (parameteren er antall dager før slutten av medlemskapet for å sende påminnelsen. Det kan være en liste over dager atskilt med semikolon , for eksempel '10;5;0;-5')
+SendReminderForExpiredSubscriptionTitle=Send påminnelse via epost for utløpt medlemskap
+SendReminderForExpiredSubscription=Send påminnelse med epost til medlemmer når medlemskapet er i ferd med å utløpe (parameteren er antall dager før slutten av medlemskapet for å sende påminnelsen. Det kan være en liste over dager atskilt med semikolon , for eksempel '10;5;0;-5')
 MembershipPaid=Medlemskap betalt for gjeldende periode (til %s)
 YouMayFindYourInvoiceInThisEmail=Du kan finne fakturaen din vedlagt denne e-posten
 XMembersClosed=%s medlem(mer) lukket
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=En tredjepart er den juridiske enheten som vil bli
 MemberFirstname=Medlemmets fornavn
 MemberLastname=Medlemmets etternavn
 MemberCodeDesc=Medlemskode, unik for alle medlemmer
-MemberSubscriptionStartFirstDayOf=Startdatoen for et medlemskap tilsvarer den første dagen i en
-MemberSubscriptionStartAfter=Minimum periode før ikrafttredelse av startdato for et abonnement, unntatt fornyelser (eksempelvis +3m = +3 måneder, -5d = -5 dager, +1Y = +1 år)
+MemberSubscriptionStartFirstDayOf=Tving den foreslåtte datoen for et medlemskap til å tilsvare den første dagen i en
+MemberSubscriptionStartAfter=Minimumsperiode før ikrafttredelsen av startdatoen for et første medlemskapsabonnement (unntatt fornyelser)
+NoCorrection=Ingen korreksjon
+MemberSubscriptionStartAfterDesc=Eksempel: +3m = +3 måneder, -5d = -5 dager, +1Y = +1 år
+MemberSubscriptionStartAfterDesc2=Dette er den foreslåtte datoen når du oppretter et første medlemskapsabonnement sammenlignet med gjeldende dato. For fornyelse vil den foreslåtte datoen som standard forbli slutten av det forrige medlemskapet.
 SubscriptionLinkedToConciliatedTransaction=Medlemskap er knyttet til en konsolidert transaksjon, så denne endringen er ikke tillatt.
 ConfirmMassSubsriptionCreation=Bekreft opprettelsen av abonnement
 ConfirmMassSubsriptionCreationQuestion=Er du sikker på at du vil opprette %s valgte abonnement(er)?
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index b6976591bfe..f704fa9ef08 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -97,7 +97,6 @@ ShowService=Vis tjeneste
 ProductsAndServicesArea=Område for varer/tjenester
 ProductsArea=Vareområde
 ServicesArea=Tjenesteområde
-ListOfStockMovements=Vis lagerbevegelser
 BuyingPrice=Innkjøpspris
 PriceForEachProduct=Varer med spesifikke priser
 SupplierCard=Leverandørkort
@@ -145,6 +144,7 @@ WithoutDiscount=Uten rabatt
 VATRateForSupplierProduct=Mva-sats (for denne leverandøren/varen)
 DiscountQtyMin=Rabatt for denne kvantiteten.
 NoPriceDefinedForThisSupplier=Ingen pris/antall definert for denne leverandøren/varen
+NoProductPriceDefinedForThisSupplier=Ingen vare pris/antall definert for denne leverandøren
 NoSupplierPriceDefinedForThisProduct=Ingen leverandørpris/antall definert for denne varen
 PredefinedItem=Forhåndsdefinert vare
 PredefinedProducts=Forhåndsdefinert vare
@@ -171,7 +171,7 @@ BuyingPrices=Innkjøpspris
 CustomerPrices=Kundepriser
 SuppliersPrices=Leverandørpriser
 SuppliersPricesOfProductsOrServices=Leverandørpriser (av varer eller tjenester)
-CustomCode=Toll | Råvare | HS-kode
+CustomCode=Toll|Vare|HS|TARIC-kode
 CountryOrigin=Opprinnelsesland
 RegionStateOrigin=Opprinnelsesregion
 StateOrigin=Stat|Opprinnelsesprovins
@@ -209,6 +209,7 @@ unitL=Liter
 unitT=tonn
 unitKG=kg
 unitG=Gram
+unitGAL=gallon
 unitMG=mg
 unitLB=pund
 unitOZ=unse
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Format for forespørsel er {"URL": "http://exam
 UpdateInterval=Oppdateringsintervall (minutter)
 LastUpdated=Siste oppdatering
 CorrectlyUpdated=Korrekt oppdatert
-PropalMergePdfProductActualFile=Filer brukt for å legge til i PDF Azur er
+PropalMergePdfProductActualFile=PDF-fil som skal inkluderes i PDF-tilbud hvis vare er en del av tilbudet...
 PropalMergePdfProductChooseFile=Velg PDF-filer
 IncludingProductWithTag=Inkludert varer/tjenester med taggen
 DefaultPriceRealPriceMayDependOnCustomer=Standardpris, virkelig pris avhenger av kunde
@@ -319,7 +320,7 @@ WarningSelectOneDocument=Velg minst ett dokument
 DefaultUnitToShow=Enhet
 NbOfQtyInProposals=Antall i tilbud
 ClinkOnALinkOfColumn=Klikk på en link i kolonnen %s for detaljert visning...
-ProductsOrServicesTranslations=Oversettelser for Varer/Tjenester 
+ProductsOrServicesTranslations=Oversettelser for Varer/Tjenester
 TranslatedLabel=Oversatt etikett
 TranslatedDescription=Oversatt beskrivelse
 TranslatedNote=Oversatte notater
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=Mengden på linjen ble beregnet på nytt i henhold
 
 #Attributes
 Attributes=Attributter
+ProductAttributeExtrafields=Variantattributter ekstrafelt
+ProductAttributeExtrafieldsSetup=Oppsett av ekstrafelt for variantattributter
+ProductAttributeValueExtrafields=Variantattributter verdier ekstrafelt
+ProductAttributeValueExtrafieldsSetup=Oppsett av variantattributter verdier ekstrafelt
 VariantAttributes=Variantattributter
 ProductAttributes=Variantattributter for varer
 ProductAttributeName=Variantattributt %s
@@ -395,6 +400,8 @@ ErrorDestinationProductNotFound=Varereferanse-destinasjon ikke funnet
 ErrorProductCombinationNotFound=Varevariant ikke funnet
 ActionAvailableOnVariantProductOnly=Handling kun tilgjengelig på varianter av varen
 ProductsPricePerCustomer=Varepriser per kunde
+ProductLevelExtraFields=Ytterligere attributter (nivåpris)
+ProductCustomerExtraFields=Ytterligere attributter (kundepris)
 ProductSupplierExtraFields=Ekstra attributter (leverandørpriser)
 DeleteLinkedProduct=Slett sub-produktet som er knyttet til kombinasjonen
 AmountUsedToUpdateWAP=Enhetsbeløp som skal brukes til å oppdatere den vektede gjennomsnittsprisen
@@ -403,7 +410,8 @@ PMPValueShort=WAP
 mandatoryperiod=Obligatoriske perioder
 mandatoryPeriodNeedTobeSet=Merk: Periode (start- og sluttdato) må defineres
 mandatoryPeriodNeedTobeSetMsgValidate=En tjeneste krever en start- og sluttperiode
-mandatoryHelper=Kryss av for dette hvis du ønsker en melding til brukeren ved opprettelse/validering av faktura, kommersielt forslag, salgsordre uten å angi start- og sluttdato på linjer med denne tjenesten. <br> Merk at meldingen er en advarsel og ikke en blokkeringsfeil.
+mandatoryHelper=Kryss av for dette hvis du vil ha en melding til brukeren når du oppretter/validerer en faktura, tilbud, salgsordre uten å angi en start og sluttdato på linjer med denne tjenesten.
+mandatoryHelper2=Merk at meldingen er en advarsel og og ikke en blokkeringsfeil.
 DefaultBOM=Standard stykkliste (BOM)
 DefaultBOMDesc=Standard stykkliste som anbefales å bruke for å produsere dette produktet. Dette feltet kan bare angis hvis produktets natur er '%s'.
 Rank=Rangering
@@ -428,10 +436,13 @@ ConfirmEditExtrafield = Velg ekstrafeltet du vil endre
 ConfirmEditExtrafieldQuestion = Er du sikker på at du vil endre dette ekstrafeltet?
 ModifyValueExtrafields = Endre verdien for et ekstrafelt
 OrProductsWithCategories=Eller varer med tagger/kategorier
-WarningTransferBatchStockMouvToGlobal = Hvis du ønsker å deserialisere denne varen, vil alle dens serialiserte beholdning bli transformert til globale vare 
+WarningTransferBatchStockMouvToGlobal = Hvis du ønsker å deserialisere denne varen, vil alle dens serialiserte beholdning bli transformert til globale vare
 WarningConvertFromBatchToSerial=Hvis du for øyeblikket har en mengde høyere eller lik 2 for vare, betyr å bytte til dette valget at du fortsatt vil ha en vare med forskjellige objekter av samme batch (mens du ønsker et unikt serienummer). Duplikatet vil forbli til en inventar eller en manuell varebevegelse for å fikse dette er gjort.
 AllowStockMovementVariantParent=Registrerer også varebevegelser på overordnede varer av varianter
 AllowStockMovementVariantParentHelp=Som standard er en forelder til en variant en virtuell vare, så ingen beholdning administreres for den. Ved å aktivere dette alternativet vil en beholdning bli administrert for overordnede varer og hver gang en beholdning mengde endres for en variant vare, vil samme mengde bli endret for den overordnede vare. Du bør ikke trenge dette alternativet, bortsett fra hvis du bruker variant for å administrere den samme vare i stedet for overordnet (men med andre beskrivelser, priser...)
 ConfirmSetToDraftInventory=Er du sikker på at du vil gå tilbake til utkaststatus?<br>Mengdene som for øyeblikket er angitt i beholdningen vil bli tilbakestilt.
 WarningLineProductNotToSell=Vare eller tjeneste "%s" skal ikke selges og ble klonet
 PriceLabel=Prislapp
+GenerateImage=Generer bilde
+GenerateWithAI=Generer med AI
+PriceByCustomeAndMultiPricesAbility=Ulike priser for hver kunde + flere prissegmenter per vare/tjeneste (hver kunde er i ett prissegment)
diff --git a/htdocs/langs/nb_NO/salaries.lang b/htdocs/langs/nb_NO/salaries.lang
index 8e6d19341fe..18c65ca4ed8 100644
--- a/htdocs/langs/nb_NO/salaries.lang
+++ b/htdocs/langs/nb_NO/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Ny lønn
 AddSalary=Legg til lønn
 NewSalaryPayment=Nytt lønnskort
 AddSalaryPayment=Legg til lønnsutbetaling
+SalaryID=Lønns-ID
+SalaryAmount=Lønnsbeløp
 SalaryPayment=Lønnsutbetaling
 SalariesPayments=Lønnsutbetalinger
 SalariesPaymentsOf=Lønnsutbetalinger på %s
@@ -27,7 +29,7 @@ FillFieldFirst=Fyll ansatt-feltet først
 UpdateAmountWithLastSalary=Angi beløp for siste lønn
 MakeTransferRequest=Lag overføringsforespørsel
 VirementOrder=Kredittoverføringsforespørsel
-BankTransferAmount=Kredittoverføringsbeløp
 WithdrawalReceipt=Kredittoverføring ordre
 OrderWaiting=Ventende ordre
 FillEndOfMonth=Fyll med slutten av måneden
+UserPaySlip=Lønnsslipp
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index 1d1fe2dd885..c1f054aa884 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Liste over andre navn/aliaser, slik at siden også kan nås
 WEBSITE_CSS_URL=URL til ekstern CSS-fil
 WEBSITE_CSS_INLINE=CSS-filinnhold (vanlig for alle sider)
 WEBSITE_JS_INLINE=JavaScript-filinnhold (felles for alle sider)
-WEBSITE_HTML_HEADER=Tillegg nederst på HTML-header(felles for alle sider)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Robotfil (robots.txt)
 WEBSITE_HTACCESS=Nettstedets .htaccess-fil
 WEBSITE_MANIFEST_JSON=Nettstedets manifest.json-fil
@@ -56,16 +56,17 @@ ReadPerm=Les
 WritePerm=Skriv
 TestDeployOnWeb=Test/distribuer på nett
 PreviewSiteServedByWebServer=<u> Forhåndsvis %s i en ny fane. </u><br><br>%s vil bli servet av en ekstern webserver (som Apache, Nginx, IIS). Du må installere og sette opp denne serveren før du peker på katalogen:<br><strong>%s</strong><br>URL servet av ekstern server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr= <u> Forhåndsvisning %s i en ny fane. </u><br><br> %s vil bli utført av Dolibarr-serveren, slik at den ikke trenger noen ekstra webserver (som Apache, Nginx, IIS) for å installeres. <br> Det ubeleilige er at nettadressene til sidene ikke er brukervennlige og starter med banen til Dolibarr. <br> URL fra Dolibarr: <br><strong>%s</strong><br><br> for å bruke din egen eksterne webserver til å tjene dette nettstedet, opprett en virtuell maskin på webserveren som peker på katalogen <br> <strong> %s </strong> <br> , skriv deretter inn navnet på denne virtuelle serveren i egenskapene til dette nettstedet og klikk på lenken "Test/implementer på nett".
+PreviewSiteServedByDolibarr=<u>Forhåndsvis  i en ny fane.</u><br><br>%s vil bli servet av Dolibarr-serveren, så den trenger ikke noen ekstra webserver (som Apache, Nginx, IIS) som skal installeres.<br>Det ubeleilige er at nettadressene til sidene ikke er brukervennlige og starter med banen til Dolibarr.<br>URL servet av Dolibarr:<br><strong>%s</strong><br><br>For å distribuere eller teste ved hjelp av din egen eksterne webserver (som Apache, Nginx, Lighttp), bruk linken "%s".
 VirtualHostUrlNotDefined=URL til ekstern webserver ikke definert
 NoPageYet=Ingen sider ennå
 YouCanCreatePageOrImportTemplate=Du kan opprette en ny side eller importere en full nettsidemal
 SyntaxHelp=Hjelp med spesifikke syntakstips
 YouCanEditHtmlSourceckeditor=Du kan redigere HTML kildekode ved hjelp av "Kilde" -knappen i redigeringsprogrammet.
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> For å inkludere et <strong>bilde</strong> lagret i <strong>dokument</strong>mappen, bruk<strong>viewimage.php</strong>-wrapperen<br>Eksempel: For et bilde i dokumenter/medier (åpen katalog for offentlig tilgang), er syntaks:<br><strong>78&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=For et bilde som deles med en delekobling (åpen tilgang ved hjelp av delings-hash-nøkkelen til filen), er syntaksen: <br> <strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> For å inkludere et  <strong>bilde</strong> lagret i <strong>medias</strong> katalogen (katalog åpen for offentlig tilgang), bruk den relative banen som starter med <strong>/medias</strong>, eksempel:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt; </strong><br>
+YouCanEditHtmlSource2=For et bilde som er delt med en delingslenke (åpen tilgang ved å bruke hash-nøkkelen for deling av filen), bruk innpakningen:<br><strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt; </strong><br>
 YouCanEditHtmlSource3=For å få nettadressen til bildet av et PHP-objekt, bruk<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=For å få nettadressen til et bilde i et html-innhold i en artikkel, bruk<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Flere eksempler på HTML eller dynamisk kode tilgjengelig på <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">wikidokumentasjonen</a> <br>
 ClonePage=Klon side/container
 CloneSite=Klon side
@@ -87,15 +88,15 @@ WebsiteAccount=Nettstedskonto
 WebsiteAccounts=Nettstedskontoer
 AddWebsiteAccount=Opprett nettsidekonto
 BackToListForThirdParty=Tilbake til listen for tredjeparter
-DisableSiteFirst=Deaktiver nettsted først
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Mitt nettsteds tittel
 AnotherContainer=Slik inkluderer du innhold på en annen side/container (du kan ha en feil her hvis du aktiverer dynamisk kode fordi den innebygde undercontaineren kanskje ikke eksisterer)
 SorryWebsiteIsCurrentlyOffLine=Beklager, dette nettstedet er for øyeblikket offline. Kom tilbake senere ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Aktiver nettstedkontotabellen
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktiver tabellen for å lagre nettstedkontoer (innlogging/pass) for hvert nettsted/tredjepart
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Du må først definere standard startside
-OnlyEditionOfSourceForGrabbedContentFuture=Advarsel: Å lage en nettside ved å importere en ekstern nettside er reservert for erfarne brukere. Avhengig av kompleksiteten til kildesiden, kan resultatet av importen avvike fra originalen. Også hvis kildesiden bruker vanlige CSS-stiler eller motstridende JavaScript, kan det ødelegge utseendet eller funksjonene til nettstedets editor når du arbeider med denne siden. Denne metoden er en raskere måte å lage en side på, men det anbefales å lage den nye siden fra bunnen av eller fra en foreslått sidemal.<br>Merk også at det innebygde redigeringsprogrammet kanskje ikke fungerer korrekt når den brukes på en hentet ekstern side.
-OnlyEditionOfSourceForGrabbedContent=Kun HTML-kilde er mulig når innholdet ble tatt fra et eksternt nettsted
+OnlyEditionOfSourceForGrabbedContentFuture=Advarsel: Å lage en nettside ved å importere en ekstern nettside er reservert for erfarne brukere. Avhengig av kompleksiteten til kildesiden, kan resultatet av importen avvike fra originalen. Også hvis kildesiden bruker vanlige CSS-stiler eller motstridende JavaScript, kan det ødelegge utseendet eller funksjonene til nettstedets editor når du arbeider med denne siden. Denne metoden er en raskere måte å opprette en side på, men det anbefales å lage den nye siden fra bunnen av eller fra en foreslått sidemal.<br>Merk også at den innebygde editoren kanskje ikke fungerer riktig når den brukes på en ekstern side.
+OnlyEditionOfSourceForGrabbedContent=Bare HTML-kildeendring er mulig når innhold hentes fra et eksternt nettsted
 GrabImagesInto=Hent bilder som er funnet i css og side også.
 ImagesShouldBeSavedInto=Bilder bør lagres i katalogen
 WebsiteRootOfImages=Rotkatalog for nettstedbilder
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Logg ut fra kunde-kontoen din
 filteredByVersion=Filtrert etter versjon
 removeFilter=Fjern filter
 viewMyCart=Se handlekurven min
+Shipping=Shipping
 freeShipping=Gratis frakt!
 noProducts=Ingen varer
 nbrItemsInCart=Det er <span class="ajax_cart_quantity">0</span> varer i handlekurven din.
@@ -284,12 +286,13 @@ productNameAToZ=Varenavn: A til Å
 productNameZToA=Varenavn: Å til A
 referenceLowestFirst=Referanse: Lavest først
 referenceHighestFirst=Referanse: Høyest først
+productPerPage=products per page
 perPage=per side
 showAll=Vis alt
 showing= Viser
 nbrOfProducts= Det er %s varer.
 noResultsHaveBeenFound=0 resultater er funnet.
-noResultsWereFound= Ingen resultater ble funnet.
+noResultsWereFound=Ingen resultater ble funnet.
 addToCart=Legg i handlekurv
 backHome=Gå tilbake til Hjem
 priceDrop=Prisfall
@@ -302,10 +305,11 @@ lastUpdate=Siste oppdatering
 contactSupport=Hvordan kontakte support
 noProductToDisplay=Feil, ingen vare å vise
 yourCompanyInformation=Din bedriftsinformasjon
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=Denne epostadressen er allerede registrert.
 firstnameContainsLettersOnly=<b>Fornavn</b> må bare inneholde bokstaver og mellomrom
 lastnameContainsLettersOnly=<b>Etternavn</b> må bare inneholde bokstaver og mellomrom
-passwordCriteria=<b>Passord</b> må oppfylle følgende kriterier:<br>- 12 tegn<br>- 1 stor bokstav<br>- 1 siffer<br>- Ingen spesialtegn <br>- Unngå å gjenta tegn mer enn 3 ganger<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=Det har oppstått en feil.
 accountCreation=Opprett en konto
 errorsOccurred=Det er %s feil%s
@@ -357,3 +361,7 @@ subtract=Trekk fra
 LoginCheckout=Logg inn og gå videre til kassen
 paymentSuccessProcessed=Betalingen din har blitt behandlet.
 youWillBeRedirectedToOrderPage=Du vil straks bli omdirigert til ordredetaljer-siden.
+WebPortalSetupNotComplete=Nettportaloppsettet er ikke fullført
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index a6aaa19d63d..b7a8f792b20 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -7,7 +7,6 @@ FileIntegrityIsStrictlyConformedWithReference=Bestandsintegriteit is strikt conf
 FileIntegrityIsOkButFilesWereAdded=Controle van de integriteit van bestanden is verstreken, maar er zijn enkele nieuwe bestanden toegevoegd.
 FileIntegritySomeFilesWereRemovedOrModified=Controle van de integriteit van bestanden is mislukt. Sommige bestanden zijn gewijzigd, verwijderd of toegevoegd.
 GlobalChecksum=Globale checksum
-RemoteSignature=Remote distant handtekening (betrouwbaarder)
 FilesAdded=Bestanden toegevoegd
 AvailableOnlyOnPackagedVersions=Het lokale bestand voor integriteitscontrole is alleen beschikbaar als de toepassing is geïnstalleerd vanuit een officieel pakket
 XmlNotFound=Xml-integriteitsbestand van toepassing niet gevonden
@@ -207,12 +206,12 @@ Permission95=Bekijk de verslagen
 Permission161=Lees contracten/abonnementen
 Permission193=Regels beëindigen
 Permission204=Creëer links
-Permission221=Bekijk EMailings
 PermissionAdvanced251=Lees andere gebruikers
 Permission252=Creëren / wijzigen van andere gebruikers, groepen en rechten
 Permission255=Creëren / wijzigen eigen gebruikersgegevens
 Permission256=Wijzigen eigen wachtwoord
 Permission286=Contactpersonen Exporteren
+Permission1001=Lees magazijnen en voorraden
 Permission1004=Bekijk voorraadmutaties
 Permission1005=Creëren / wijzigen voorraadmutaties
 Permission1011=Bekijk inventarissen
@@ -223,7 +222,6 @@ Permission2502=Uploaden of verwijderen van documenten
 Permission2503=In te dienen of te verwijderen documenten
 Permission2515=Instellen documentabonneelijsten
 Permission50202=Import transacties
-VATIsUsedDesc=Bij het maken van voorstellen, facturen, bestellingen etc. volgt het BTW-tarief standaard de actieve standaardregel:<br>Als de verkoper niet onderworpen is aan omzetbelasting, wordt de omzetbelasting standaard ingesteld op 0 . Einde van regel.<br>Als (land van de verkoper = land van de koper), is de omzetbelasting standaard gelijk aan de omzetbelasting van het product in het land van de verkoper. Einde van de regel.<br>Als de verkoper en koper zich beide in de Europese Gemeenschap bevindt en goederen zijn transportgerelateerd producten (transport, verzending, luchtvaartmaatschappij), de standaard BTW is 0. Deze regel is afhankelijk van het land van de verkoper - raadpleeg uw accountant. De BTW moet Betaald zijn door de koper naar het douanekantoor in zijn land en span> niet aan de verkoper. Einde van de regel.<br>Als de verkoper en koper zich beide in de Europese Gemeenschap bevindt en de koper is geen bedrijf (met een geregistreerde intracommunautaire BTW Nummer ), dan wordt het BTW standaard ingesteld op het BTW tarief van het land van de verkoper. Einde van de regel.<br>Als de verkoper en koper zich beide in de Europese Gemeenschap bevindt en de koper is een bedrijf (met een geregistreerde intracommunautaire BTW Nummer), dan is BTW standaard 0. Einde van de regel.<br>In elk ander geval is de voorgestelde standaard omzetbelasting=0. Einde van de heerschappij.
 DatabaseUser=Databasegebruikersnaam
 DatabasePassword=Databasewachwoord
 Skin=Uiterlijksthema
@@ -235,20 +233,28 @@ AccountantFileNumber=Code voor boekhouder
 AvailableModules=Beschikbare app / modules
 ParameterActiveForNextInputOnly=De instelling word pas actief voor de volgende invoer
 YouMustEnableOneModule=Je moet minstens 1 module aktiveren
+GetBarCode=Barcode ophalen
 BillsPDFModules=Factuur documentsjablonen
 LDAPGlobalParameters=Globale instellingen
 LDAPPassword=Beheerderswachtwoord
+LDAPFieldZip=Postcode
 SalariesSetup=Setup van module salarissen
 MailToSendProposal=Klant voorstellen
 MailToSendInvoice=Klantfacturen
+MailToSendSupplierOrder=Aankooporders
 MailToSendSupplierInvoice=Facturen leveranciers
 MailToSendReception=Ontvangen
 MailToExpenseReport=Uitgaven rapporten
 MailToThirdparty=Klant
 AddBoxes=Widgets toevoegen
+activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
+ChartLoaded=Rekeningstelsel geladen
 GeneralOptions=Algemene opties
 ExportSetup=Installatie van module Exporteren
+MailToPartnership=Partnerschap
 InventorySetup=Inventaris instellen
+INVOICE_ADD_EPC_QR_CODE=Toon de EPC QR-code op facturen (met een bankrekening die is gedefinieerd voor SEPA-overschrijving)
+INVOICE_ADD_EPC_QR_CODEMore=Met deze functie kunt u een EPC QR-code toevoegen of verwijderen op uw facturen, wat automatische SEPA-overschrijvingen mogelijk maakt. Door deze optie in te schakelen, kunnen uw klanten eenvoudig betalingen doen door de QR-code te scannen, waardoor handmatige invoerfouten worden verminderd. Gebruik deze functie als u klanten hebt in landen als Oostenrijk, België, Finland, Duitsland, en Nederland waar dit systeem wordt ondersteund. Schakel het uit als het niet vereist is voor uw bedrijfsvoering of klantenbestand.
 ShowAdvancedOptions=Geavanceerde opties weergeven
 Images=Beelden
 YouAreHere=U bent hier
diff --git a/htdocs/langs/nl_BE/assets.lang b/htdocs/langs/nl_BE/assets.lang
index e07ca8062da..56ddbcc43ac 100644
--- a/htdocs/langs/nl_BE/assets.lang
+++ b/htdocs/langs/nl_BE/assets.lang
@@ -1,9 +1,17 @@
 # Dolibarr language file - Source file is en_US - assets
+AccountancyCodeAsset=Boekhoudcode (activum)
+AccountancyCodeDepreciationAsset=Boekhoudcode (afschrijvingsrekening)
+AccountancyCodeDepreciationExpense=Boekhoudcode (afschrijvingskostenrekening)
 AssetsLines=Middelen
-DeleteAnAssetType=Verwijder een bestandstype
-ConfirmDeleteAssetType=Weet u zeker dat u dit bestandstype wilt verwijderen?
-AssetsType=Activa type
-AssetsTypeId=Activa type id
-AssetsTypeLabel=Label van het activatype
-AssetsTypes=Activa types
-AssetType=Activa type
+ModuleAssetsName=Middelen
+ModuleAssetsDesc=Activabeschrijving
+AssetSetup=Activa instellen
+AssetSetupPage=Activa-instellingenpagina
+MenuAssets=Middelen
+MenuListAssets=Lijst
+MenuListAssetModels=Lijst
+AssetAccountancyCodes=Accounts boekhouding
+Assets=Middelen
+AssetTypeInProgress=Bezig
+AssetInProgress=Bezig
+AssetAccountancyCodeAcceleratedDepreciation=Rekening
diff --git a/htdocs/langs/nl_BE/banks.lang b/htdocs/langs/nl_BE/banks.lang
index 2cee66fef95..310691d54e1 100644
--- a/htdocs/langs/nl_BE/banks.lang
+++ b/htdocs/langs/nl_BE/banks.lang
@@ -1,5 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
+MenuNewVariousPayment=Nieuw Diversen Betaling
+BalanceMinimalAllowed=Minimaal toegestaan saldo
 ShowAllTimeBalance=Toon saldo sinds begin
+IBAN=IBAN-nummer
+BIC=BIC/SWIFT-code
+SwiftValid=BIC/SWIFT geldig
+SwiftNotValid=BIC/SWIFT niet geldig
+IbanValid=BAN geldig
+IbanNotValid=BAN niet geldig
 BankAccountOwnerZip=Rekeninghouder postcode
 BankAccountOwnerTown=Rekeninghouder gemeente
 BankAccountOwnerCountry=Rekeninghouder land
@@ -7,9 +15,16 @@ LabelBankCashAccount=label van bank of kas
 TransferTo=Tot
 BankChecksToReceipt=Te innen cheques
 BankChecksToReceiptShort=Te innen cheques
-EventualyAddCategory=Tenslotte een categorie opgeven waarin de gegevens bewaard kunnen worden
 ThenCheckLinesAndConciliate=Duid dan de lijnen aan van het bankafschrift en klik
 DeleteARib=Verwijderen BAN gegeven
+ConfirmDeleteRib=Weet u zeker dat u deze BAN wilt verwijderen?
 RejectCheck=Teruggekeerde cheque
 RejectCheckDate=Datum de cheque was teruggekeerd
 CheckRejected=Teruggekeerde cheque
+DocumentModelBan=Sjabloon om een pagina met BAN-informatie af te drukken.
+NewVariousPayment=Nieuwe diverse betaling
+VariousPayment=Diversen betaling
+ShowVariousPayment=Toon diverse betaling
+AddVariousPayment=Voeg diverse betaling toe
+NoBankAccountDefined=Geen bankrekening gevonden
+AlreadyOneBankAccount=Al één bankrekening gedefinieerd
diff --git a/htdocs/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang
index d60e7dca6e1..86b6094b6c6 100644
--- a/htdocs/langs/nl_BE/companies.lang
+++ b/htdocs/langs/nl_BE/companies.lang
@@ -10,8 +10,7 @@ ThirdPartyAddress=Adres derde
 CountryIsInEEC=Land ligt binnen de Europese Economische Gemeenschap
 ThirdPartyName=Naam derde partij
 ThirdPartyEmail=E-mail van derden
-ThirdParty=Derde partij
-ThirdParties=Derden
+ThirdParties=Klant
 ThirdPartySuppliers=Verkopers
 ThirdPartyType=Soort derde partij
 ReportByMonth=Rapportage per maand
@@ -22,7 +21,6 @@ NationalRegistrationNumber=Nationaal registratienummer
 NatureOfThirdParty=Aard van derden
 StateShort=Staat
 PhoneShort=Telefoonnummer
-No_Email=Weiger bulk e-mailings
 CopyAddressFromSoc=Adres kopiëren van gegevens van derden
 ThirdpartyNotCustomerNotSupplierSoNoRef=Derden noch klant, noch verkoper, geen beschikbare verwijzende objecten
 ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Derden noch klant, noch verkoper, kortingen zijn niet beschikbaar
@@ -76,7 +74,6 @@ StatusProspect1=Contact opnemen
 StatusProspect2=Contact lopende
 ChangeToContact=Status veranderen naar 'Contact opnemen'
 ImportDataset_company_1=Derden en hun eigenschappen
-ImportDataset_company_3=Bankrekeningen van derden
 SupplierCategory=Categorie verkoper
 YouMustAssignUserMailFirst=U moet een e-mail voor deze gebruiker maken voordat u een e-mail melding kunt toevoegen.
 YouMustCreateContactFirst=U dient voor de Klant eerst contactpersonen met een e-mailadres in te stellen, voordat u kennisgevingen per e-mail kunt sturen.
diff --git a/htdocs/langs/nl_BE/mails.lang b/htdocs/langs/nl_BE/mails.lang
index fc7f7a85860..7a555825f92 100644
--- a/htdocs/langs/nl_BE/mails.lang
+++ b/htdocs/langs/nl_BE/mails.lang
@@ -1,31 +1,16 @@
 # Dolibarr language file - Source file is en_US - mails
-AllEMailings=Alle EMailings
 MailCard=EMailings kaart
 MailTo=Geadresseerd aan
 MailCC=Kopiëren naar
 MailCCC=Gecachde kopie aan
 MailMessage=E-mailinhoud
-ShowEMailing=Toon EMailing
-ListOfEMailings=EMailingenlijst
-NewMailing=Nieuwe EMailing
-EditMailing=Bewerk EMailing
-ResetMailing=EMailing opnieuw verzenden
-DeleteMailing=Verwijder EMailing
-PreviewMailing=Voorbeeldweergave EMailing
-CreateMailing=Creëer EMailing
-ValidMailing=Geldige EMailing
 MailingSuccessfullyValidated=Emailing succesvol gevalideerd
 MailingStatusNotContact=Niet meer contacten
 WarningNoEMailsAdded=Geen nieuw E-mailadres aan de lijst van ontvangers toe te voegen.
 YouCanAddYourOwnPredefindedListHere=Om uw e-mailselectormodule te creëren, zie htdocs/core/modules/mailings/README.
 XTargetsAdded=<b>%s</b> ontvangers toegevoegd in bestemming-lijst
 MailingModuleDescThirdPartiesByCategories=Klant
-MailingArea=EMailingsoverzicht
 TargetsStatistics=Geaddresseerdenstatistieken
 MailNoChangePossible=Ontvangers voor gevalideerde EMailings kunnen niet worden gewijzigd
-SearchAMailing=Zoek een E-mailing
-SendMailing=Verzend E-mailing
 TargetsReset=Lijst legen
 ToClearAllRecipientsClickHere=Klik hier om de lijst met ontvangers van deze EMailing te legen
-NbOfEMailingsReceived=Bulk Emailings ontvangen
-NbOfEMailingsSend=Mailings verstuurd
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index a92f09e92ba..d1a28c2b248 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -20,7 +20,6 @@ FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 NoTranslation=Geen vertaling
-CurrentTimeZone=Huidige Tijdszone
 ErrorCanNotCreateDir=Kan dir %s niet maken
 ErrorCanNotReadDir=Kan dir %s niet lezen
 ErrorLogoFileNotFound=Logobestand '%s' is niet gevonden
@@ -30,6 +29,7 @@ ErrorFileNotUploaded=Bestand is niet geüpload. Controleer of de grootte niet me
 ErrorRecordIsUsedByChild=Kan dit record niet verwijderen. Dit record wordt gebruikt door ten minste één child-record.
 ErrorServiceUnavailableTryLater=Dienst momenteel niet beschikbaar. Probeer het later nog eens.
 ErrorCannotAddThisParentWarehouse=U probeert een bovenliggend magazijn toe te voegen dat al een 'child' van een bestaand magazijn is
+FieldCannotBeNegative=Veld "%s" kan niet negatief zijn
 NotAuthorized=U bent niet toegelaten om dat te doen.
 FileRenamed=Het bestand is succesvol hernoemd
 FileGenerated=Het bestand is succesvol gegenereerd
@@ -39,15 +39,20 @@ GoToHelpPage=Contacteer helpdesk
 RecordSaved=Tabelregel opgeslagen
 RecordDeleted=Record verwijderd
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr-authenticatiemodus is ingesteld op <b>%s</b> in configuratiebestand <b>conf.php</b>. <br> Dit betekent dat de wachtwoorddatabase extern is van Dolibarr, dus het wijzigen van dit veld heeft mogelijk geen effect.
+Administrator=Systeembeheerder
 LastConnexion=Laatste login
 AuthenticationMode=Verificatiemodus
 RequestedUrl=Gevraagde URL
 RequestLastAccessInError=Laatste database toegangsaanvraag fout
 LineID=Regel ID
+Enable=Inschakelen
+Deprecated=Verouderd
 CloseAs=Zet de status op
 Resiliate=Beëindigen
 Hide=Verbergen
+PasswordRetype=Herhaal uw wachtwoord
 NewObject=Nieuwe %s
+FieldXModified=Veld %s gewijzigd
 Model=Doc-sjabloon
 DefaultModel=Standaard doc-sjabloon
 DateToday=Datum van vandaag
@@ -66,6 +71,8 @@ UserAuthor=Gemaakt door
 PriceU=E.P.
 PriceUHT=EP (netto)
 Amount=Hoeveelheid
+DiscountHT=Korting (excl. btw)
+DiscountTTC=Korting (incl. btw)
 MulticurrencyRemainderToPay=Blijf betalen, oorspronkelijke valuta
 MulticurrencyPaymentAmount=Betalingsbedrag, oorspronkelijke valuta
 MulticurrencyAmountHT=Bedrag (excl. Btw), oorspronkelijke valuta
@@ -73,8 +80,10 @@ MulticurrencyAmountTTC=Bedrag (incl. Btw), oorspronkelijke valuta
 MulticurrencyAmountVAT=Bedragsbelasting, oorspronkelijke valuta
 PriceQtyMinHT=Prijs hoeveelheid min. (excl. BTW)
 PriceQtyMinHTCurrency=Prijs hoeveelheid min. (excl. BTW) (valuta)
+RemainToPay=Nog te betalen
 List=Lijstoverzicht
 ActionRunningShort=Bezig
+ActionUncomplete=Onvolledig
 Running=Bezig
 Categories=Tags / categorieën
 Category=Tag / categorie
@@ -84,25 +93,56 @@ ToDate=aan
 ToLocation=aan
 OtherInformations=Andere informatie
 ApprovedBy2=Goedgekeurd door (tweede goedkeuring)
+StatusInterInvoiced=Gefactureerd
+RotateImage=90° draaien
 DateFormatYYYYMMDDHHMM=JJJJ-MM-DD HH: SS
 Reports=Rapporten
+SendAcknowledgementByMail=Bevestigingsmail verzenden
 NotRead=Ongelezen
-Offered=Beschikbaar
+Offered=Aangeboden
+ExpectedValue=Verwachte Waarde
+ExpectedQty=Verwachte hoeveelheid
 SetLinkToAnotherThirdParty=Link naar een derde partij
+ByTown=Per stad
+MyDashboard=Mijn Dashboard
 SelectAction=Selecteer actie
+AccountCurrency=Rekeningvaluta
+ShowMoreLines=Meer/minder regels weergeven
 Denied=Geweigerd
 Genderother=Ander
 Sincerely=Met vriendelijke groeten
 DeleteLine=Verwijder lijn
+Export=Exporteren
 Exports=Exporten
 ExpenseReports=Uitgaven rapporten
+MondayMin=Ma
+TuesdayMin=Di
+WednesdayMin=Wo
+ThursdayMin=Do
+FridayMin=Vr
+SaturdayMin=Za
+SundayMin=Zo
+ShortTuesday=D
+ShortThursday=D
+ShortFriday=V
+ShortSaturday=Z
+ShortSunday=Z
+one=een
+eighteen=achtien
+quadrillion=quadriljoen
 Select2NotFound=Geen resultaten gevonden
 Select2LoadingMoreResults=Laden van meer resultaten...
 Select2SearchInProgress=Zoeken is aan de gang...
 SearchIntoProductsOrServices=Producten of diensten
 SearchIntoCustomerInvoices=Klant facturen
 SearchIntoSupplierInvoices=Facturen leveranciers
+SearchIntoSupplierOrders=Aankooporders
 SearchIntoExpenseReports=Uitgaven rapporten
+NbComments=Aantal opmerkingen
+CommentPage=Ruimte voor opmerkingen
+CommentAdded=Opmerking toegevoegd
+CommentDeleted=Opmerking verwijderd
+Quarter=Kwartaal
 Inventory=Inventaris
 OnHold=Tijdelijk geblokkeerd
 ClientTZ=Tijdzone van de klant (gebruiker)
diff --git a/htdocs/langs/nl_BE/orders.lang b/htdocs/langs/nl_BE/orders.lang
index 044a058f178..39009d47ecd 100644
--- a/htdocs/langs/nl_BE/orders.lang
+++ b/htdocs/langs/nl_BE/orders.lang
@@ -3,11 +3,13 @@ OrderToProcess=Te verwerken bestelling
 NewOrder=Nieuwe bestelling
 NewSupplierOrderShort=Nieuwe bestelling
 MakeOrder=Bestelling ingeven
+SuppliersOrders=Aankooporders
 StatusOrderDraftShort=Ontwerp bestelling
 StatusOrderSentShort=In uitvoering
 StatusOrderDelivered=Geleverd
 StatusOrderDeliveredShort=Geleverd
-UnvalidateOrder=Maak validatie bestelling ongedaan
+AddOrder=Nieuwe bestelling
+AddSupplierOrderShort=Nieuwe bestelling
 SecondApprovalAlreadyDone=Tweede controle reeds uitgevoerd
 StatusSupplierOrderSentShort=In uitvoering
 StatusSupplierOrderDelivered=Geleverd
diff --git a/htdocs/langs/nl_BE/website.lang b/htdocs/langs/nl_BE/website.lang
index 8a83256f2c0..413f31b755f 100644
--- a/htdocs/langs/nl_BE/website.lang
+++ b/htdocs/langs/nl_BE/website.lang
@@ -8,4 +8,6 @@ ViewPageInNewTab=Bekijk de pagina in een nieuwe tab
 SetAsHomePage=Zet als Homepagina
 ViewWebsiteInProduction=Bekijk website via de home URL's
 WebPortalMemberCardTitle=Lidmaatschapskaart
-WebPortalMemberCardDesc=Lidmaatschapskaart
+WebPortalPartnershipCardMenu=Partnerschap
+WebPortalPartnership=Partnerschap
+backHome=Terug naar Home
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index d61a3c21881..01eb1765236 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Integriteitscontrole van bestanden is geslaag
 FileIntegritySomeFilesWereRemovedOrModified=Controle op integriteit van de bestanden is mislukt. Sommige bestanden zijn gewijzigd, verwijderd of toegevoegd.
 GlobalChecksum=Globaal controlegetal
 MakeIntegrityAnalysisFrom=Maak integriteitsanalyse van toepassingsbestanden van
-LocalSignature=Ingebedde lokale handtekening (minder betrouwbaar)
-RemoteSignature=Remote handtekening (betrouwbaarder)
+LocalSignature=Ingebedde lokale handtekening
+RemoteSignature=Verre afstandelijke handtekening
 FilesMissing=Ontbrekende bestanden
 FilesUpdated=Bijgewerkte bestanden
 FilesModified=Gewijzigde bestanden
@@ -78,8 +78,8 @@ ErrorReservedTypeSystemSystemAuto=De waarde 'system' en 'systemauto' als type zi
 ErrorCodeCantContainZero=Code mag geen 0 bevatten
 DisableJavascript=Schakel JavaScript en AJAX-functionaliteit uit
 DisableJavascriptNote=Opmerking: alleen voor test- of foutopsporingsdoeleinden. Voor optimalisatie voor blinde personen of tekstbrowsers, kunt u er de voorkeur aan geven om de instellingen op het profiel van de gebruiker te gebruiken
-UseSearchToSelectCompanyTooltip=Ook als u een groot aantal relaties (> 100 000) heeft, kunt u de snelheid verhogen door in de Setup-> Overig constant COMPANY_DONOTSEARCH_ANYWHERE op 1 te zetten. Zoeken wordt dan beperkt tot het begin van de reeks.
-UseSearchToSelectContactTooltip=Ook als u een groot aantal relaties (> 100 000) heeft, kunt u de snelheid verhogen door constante CONTACT_DONOTSEARCH_ANYWHERE in Setup -> Overig op 1 te zetten. Zoeken wordt dan beperkt tot het begin van de reeks.
+UseSearchToSelectCompanyTooltip=Ook als u een groot aantal derde partijen hebt (> 100.000), kunt u de snelheid verhogen door de constante COMPANY_DONOTSEARCH_ANYWHERE in te stellen op 1 in Setup->Other. Zoeken wordt dan beperkt tot het begin van de string.
+UseSearchToSelectContactTooltip=Ook als u een groot aantal derde partijen hebt (> 100 000), kunt u de snelheid verhogen door de constante CONTACT_DONOTSEARCH_ANYWHERE in te stellen op 1 in Setup->Other. Zoeken wordt dan beperkt tot het begin van de string.
 DelaiedFullListToSelectCompany=Wacht tot een toets wordt ingedrukt voordat inhoud van de keuzelijst met relaties wordt geladen.<br>Dit kan de prestaties verbeteren als u een groot aantal relaties hebt, maar dit is minder handig.
 DelaiedFullListToSelectContact=Wacht tot een toets wordt ingedrukt voordat de inhoud van de combo-lijst met contactpersonen wordt geladen. <br> Dit kan de prestaties verbeteren als u een groot aantal contacten heeft, maar het is minder handig.
 NumberOfKeyToSearch=Aantal tekens om de zoekopdracht te activeren: %s
@@ -88,8 +88,8 @@ SearchString=Zoekreeks
 NotAvailableWhenAjaxDisabled=Niet beschikbaar wanneer AJAX functionaliteit is uitgeschakeld
 AllowToSelectProjectFromOtherCompany=Bij een document van een relatie, kan een project worden gekozen dat  gekoppeld is aan een andere relatie
 TimesheetPreventAfterFollowingMonths=Voorkom opnameduur na het volgende aantal maanden
-PROJECT_DISPLAY_LINKED_BY_CONTACT=Geef een project weer dat is gekoppeld door een gemeenschappelijke contactpersoon
-PROJECT_DISPLAY_LINKED_BY_CONTACT_help=Deze optie voegt een nieuwe lijst toe op het tabblad Project met alle projecten die via een contactrelatie aan derden zijn gekoppeld
+PROJECT_DISPLAY_LINKED_BY_CONTACT=Project weergeven dat is gekoppeld aan een gemeenschappelijk contact
+PROJECT_DISPLAY_LINKED_BY_CONTACT_help=Met deze optie wordt een nieuwe lijst toegevoegd op het tabblad Project met alle projecten die via een contactrelatie aan derden zijn gekoppeld
 JavascriptDisabled=JavaScript uitgeschakeld
 UsePreviewTabs=Gebruik voorbeeldtabbladen
 ShowPreview=Toon voorbeeldweergave
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Alleen gebruikt door sommige agenda opties
 Security=Beveiliging
 Passwords=Wachtwoorden
 DoNotStoreClearPassword=Versleutel wachtwoorden die zijn opgeslagen in de database.
-MainDbPasswordFileConfEncrypted=Codeer het database wachtwoord opgeslagen in conf.php. Het wordt sterk aanbevolen om deze optie te activeren.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=Om je paswoord versleuteld (gecodeerd) te krijgen in dit bestand <b>conf.php</b> , vervang de regel <br><b>$dolibarr_main_db_pass="...";</b><br>door<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Om je paswoord gedecodeerd te verkrijgen in dit bestand <b>conf.php</b>,  vervang de regel <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>door<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Bescherm gegenereerde PDF-bestanden. Dit wordt NIET aanbevolen omdat dit het genereren van bulk-PDF's verbreekt.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometrisch punt
 ExtrafieldMultiPointGeo=Geometrisch multipunt
 ExtrafieldLinestringGeo=Geometrische lijnstring
 ExtrafieldPolygonGeo=Geometrische veelhoek
+ExtrafieldStars=Stars
 ComputedFormula=Berekend veld
-ComputedFormulaDesc=U kunt hier een formule invoeren met behulp van andere eigenschappen van een object of een willekeurige PHP-codering om een dynamische berekende waarde te krijgen. U kunt alle PHP-compatibele formules gebruiken, inclusief de "?" condition-operator en het volgende globale object: <strong> $db, $conf, $langs, $mysoc, $user, $objectoffield </strong> . <br> <strong> WAARSCHUWING </strong> : Als u eigenschappen nodig hebt van een object dat niet is geladen, haalt u het object gewoon in uw formule op, zoals in het tweede voorbeeld. <br> Het gebruik van een berekend veld betekent dat u zelf geen waarde kunt invoeren via de interface. Als er een syntaxisfout is, retourneert de formule mogelijk niets. <br> <br> Voorbeeld van formule: <br> $objectoffield->id < 10 ? round($objectoffield-> id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2 ) <br> <br> Voorbeeld om object opnieuw te laden <br> (($reloadedobj = nieuwe Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $ opnieuw geladen obj ->hoofdletter / 5: '-1') <br> <br> Ander voorbeeld van een formule om het laden van een object en het bovenliggende object te forceren: <br> (($reloadedobj = nieuwe taak($db)) && ($reloadedobj->fetchNoCompute($objectoffield ->id) > 0) && ($secondloadedobj = nieuw project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) $secondloadedobj->ref: 'Ouderproject niet gevonden'
+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'
 Computedpersistent=Berekend veld opslaan
 ComputedpersistentDesc=Berekende extra velden worden opgeslagen in de database, maar de waarde wordt alleen opnieuw berekend als het object van dit veld wordt gewijzigd. Als het berekende veld afhankelijk is van andere objecten of algemene gegevens, kan deze waarde onjuist zijn !!
 ExtrafieldParamHelpPassword=Als u dit veld leeg laat, betekent dit dat deze waarde ZONDER codering wordt opgeslagen (het veld is alleen verborgen met sterren op het scherm).<br><br>Enter waarde 'dolcrypt' om waarde te coderen met een omkeerbaar coderingsalgoritme. Duidelijke gegevens kunnen nog steeds bekend en bewerkt worden, maar worden gecodeerd in de database.<br><br>Voer 'auto' in (of 'md5', 'sha256', 'password_hash', ...) om het standaard wachtwoordversleutelingsalgoritme (of md5, sha256, wachtwoord_hash...) te gebruiken om het niet-omkeerbare gehashte wachtwoord in de database op te slaan (geen manier om de oorspronkelijke waarde op te halen)
@@ -519,7 +520,7 @@ WarningPHPMailB=- Als het domein van uw e-mail (het deel mymaildomain.com in myn
 WarningPHPMailC=- Het gebruik van de SMTP-server van uw eigen e-mailserviceprovider om e-mails te verzenden is ook interessant, dus alle e-mails die vanuit de toepassing worden verzonden, worden ook opgeslagen in uw "Verzonden" -map van uw mailbox.
 WarningPHPMailD=Het is daarom aan te raden om de verzendmethode van e-mails te wijzigen in de waarde "SMTP".
 WarningPHPMailDbis=Als u echt de standaard "PHP"-methode voor het verzenden van e-mails wilt behouden, negeert u deze waarschuwing of verwijdert u deze door %shier te klikken%s.
-WarningPHPMail2=Als uw e-mail SMTP-provider de e-mailclient moet beperken tot bepaalde IP-adressen (zeer zeldzaam), is dit het IP-adres van de mail user agent (MUA) voor uw ERP CRM-toepassing: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=Als de domeinnaam in uw afzender-e-mailadres wordt beschermd door een SPF-record (vraag dit na bij uw domeinnaamregistrar), moet u de volgende IP's of vermeldingen toevoegen aan het SPF-record van de DNS van uw domein: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=Als de domeinnaam in uw verzend-e-mailadres wordt beschermd door een DMARC-record dat anders is dan p=none (vraag dit na bij uw domeinnaamregistrar), moet u uw DMARC-record verwijderen of instellen op p=none (zoals do@gmail.com) of een andere verzendmethode gebruiken.
 SPFAndDMARCInformation=SPF- en DMARC-DNS-record voor hoofd-e-mailadressen
@@ -567,8 +568,8 @@ Module10Name=Boekhouding (vereenvoudigd)
 Module10Desc=Eenvoudige boekhoudrapporten (journaals, omzet) op basis van database-inhoud. Gebruikt geen dubbel boekhouden.
 Module20Name=Zakelijke voorstellen / Offertes
 Module20Desc=Beheer van offertes
-Module22Name=Bulk e-mail
-Module22Desc=Beheer bulk e-mail
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energie
 Module23Desc=Monitoring van het verbruik van energie
 Module25Name=Verkooporders
@@ -847,10 +848,10 @@ Permission212=Orderregels
 Permission213=Schakel lijn
 Permission214=Configureer telefonie
 Permission215=Configureer leveranciers
-Permission221=Bekijk e-mails
-Permission222=Creëren / wijzigen e-mailings (onderwerp, ontvangers etc)
-Permission223=Valideer EMailings (laat sturen)
-Permission229=Verwijderen EMailings
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Bekijk ontvangers en info
 Permission238=Handmatig verzenden van mailings
 Permission239=Verwijder mailings na validatie of verzonden
@@ -1105,6 +1106,7 @@ DictionaryStaff=Aantal werknemers
 DictionaryAvailability=Leverings vertraging
 DictionaryOrderMethods=Bestelmethoden:
 DictionarySource=Oorsprong van offertes / bestellingen
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Gepersonaliseerde groepen voor rapporten
 DictionaryAccountancysystem=Modellen voor rekeningschema
 DictionaryAccountancyJournal=Dagboeken
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Terug naar woordenboekenlijst
 TypeOfRevenueStamp=Soort belastingstempel
 VATManagement=Omzetbelastingbeheer
 VATIsUsedStandard=Bij het maken van documenten (voorstellen, Facturen, bestellingen...) wordt het standaard verkooptarief belasting ingesteld volgens de standaardregels (afhankelijk van het land van verkoper en koper)
-VATIsUsedDesc=Standaard volgt bij het maken van voorstellen, Facturen, bestellingen etc. het verkooppercentage belasting de actieve standaardregel:<br>Als de verkoper niet onderworpen is aan Sales belasting, dan wordt Sales belasting standaard ingesteld op 0. Einde van de regel.<br>Als (land van de verkoper = land van de koper), dan is de Verkoop belasting standaard gelijk aan de Verkoop belasting van het product in het land van de verkoper. Einde van de regel.<br>Als de verkoper en de koper zich beide in de Europese Gemeenschap bevinden en de goederen transportgerelateerde producten zijn (vervoer, verzending, luchtvaartmaatschappij), is de standaard BTW 0. Dit regel is afhankelijk van het land van de verkoper - raadpleeg uw accountant. De BTW moet door de koper worden betaald aan het douanekantoor in zijn land en niet aan de verkoper. Einde van de regel.<br>Als de verkoper en de koper zich beide in de Europese Gemeenschap bevinden en de koper geen bedrijf is (met een geregistreerd intracommunautair BTW-nummer), dan wordt de BTW standaard ingesteld op het BTW-tarief van het land van de verkoper. Einde van de regel.<br>Als de verkoper en de koper zich beide in de Europese Gemeenschap bevinden en de koper een bedrijf is (met een geregistreerd intracommunautair BTW-nummer), dan is de BTW standaard 0. Einde van de regel.<br>In elk ander geval is de voorgestelde standaard Verkoop belasting=0. Einde van de heerschappij.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Standaard is de voorgestelde btw 0. Dit kan gebruikt worden in situaties zoals verenigingen, particulieren of kleine bedrijven.
 VATIsUsedExampleFR=In Frankrijk betekent dit dat bedrijven of organisaties een echt fiscaal systeem hebben (Vereenvoudigd echt of normaal echt). Een systeem waarin btw wordt aangegeven.
 VATIsNotUsedExampleFR=In Frankrijk betekent dit verenigingen die niet-omzetbelasting zijn aangegeven of bedrijven, organisaties of vrije beroepen die hebben gekozen voor het micro-onderneming fiscale systeem (omzetbelasting in franchise) en een franchise omzetbelasting hebben betaald zonder aangifte omzetbelasting. Bij deze keuze wordt de verwijzing "Niet van toepassing omzetbelasting - art-293B van CGI" op facturen weergegeven.
-VATType=belasting type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Soort omzetbelasting
 LTRate=Tarief
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Volgens de instelling van belastingen (Zie %s - %s - %
 LabelUsedByDefault=Standaard te gebruiken label indien er geen vertaling kan worden gevonden voor de code
 LabelOnDocuments=Etiket op documenten
 LabelOrTranslationKey=Label- of vertaalsleutel
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Vertaling gevonden
 TheTranslationIsSearchedFromKey=De vertaling wordt gezocht via de vertaalsleutel: <b>%s</b>
 TranslationKey=Vertaalsleutel
@@ -1431,7 +1434,7 @@ AddVatInList=Geef het btw-nummer van de klant/leverancier weer in combolijsten.
 AddAdressInList=Geef Klant/leveranciersadres weer in combolijsten.<br>Derde partijen worden weergegeven met de naamnotatie 'The Big bedrijf corp. - 21 jump street 123456 Big town - VS" in plaats van "The Big bedrijf corp".
 AddEmailPhoneTownInContactList=Geef e-mailadres van contact (of telefoonnummer indien niet gedefinieerd) en stad weer in combinatielijsten.<br>Contacten worden weergegeven met de naamnotatie 'Dupond Durand - dupond.durand@example.com - Parijs " of "Dupond Durand - 06 07 59 65 66 - Parijs" in plaats van "Dupond Durand".
 AskForPreferredShippingMethod=Vraag de gewenste verzendmethode voor derden.
-FieldEdition=Wijziging van het veld %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Voorbeeld: +2 (alleen invullen als tijdzone offset problemen worden ervaren)
 GetBarCode=Haal barcode
 NumberingModules=Nummeringsmodellen
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Forceer factuurdatum naar validatiedatum
 SuggestedPaymentModesIfNotDefinedInInvoice=Voorgestelde betaalmethode op factuur standaard indien niet gedefinieerd op de factuur
 SuggestPaymentByRIBOnAccount=Stel de betaling voor door opname op rekening
 SuggestPaymentByChequeToAddress=Stel betaling per cheque voor aan
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Vrije tekst op facturen
 WatermarkOnDraftInvoices=Watermerk op ontwerp-facturen (geen indien leeg)
 PaymentsNumberingModule=Nummeringsmodel voor betalingen
@@ -1718,6 +1723,7 @@ CompressionOfResources=Compressie van HTTP-reacties
 CompressionOfResourcesDesc=Bijvoorbeeld met behulp van de Apache-richtlijn &quot;AddOutputFilterByType DEFLATE&quot;
 TestNotPossibleWithCurrentBrowsers=Automatische detectie niet mogelijk
 DefaultValuesDesc=Hier kunt u de standaardwaarde definiëren die u wilt gebruiken bij het maken van een nieuw record en / of standaardfilters of de sorteervolgorde wanneer u records vermeldt.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Standaardwaarden (te gebruiken op formulieren)
 DefaultSearchFilters=Standaard zoekfilters
 DefaultSortOrder=Standaard order-sortering
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Verzendingen nummering modules
 SendingsAbility=Ondersteun verzendingsbrieven voor afnemersleveringen
 NoNeedForDeliveryReceipts=In de meeste gevallen worden verzendbladen gebruikt als bladen voor klantleveringen (lijst met te verzenden producten) en bladen die door de klant worden ontvangen en ondertekend. Daarom is de ontvangst van de productleveringen een dubbele functie en wordt deze zelden geactiveerd.
 FreeLegalTextOnShippings=Vrije tekst op verzendingen
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=ontvangstbevestigingennummeringsmodule
 DeliveryOrderModel=ontvangstbevestigingensjablonen
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Vrije tekst op ontvangstbevestigingen
 ##### FCKeditor #####
 AdvancedEditor=Geavanceerde editor
 ActivateFCKeditor=Activeer FCKeditor voor:
-FCKeditorForNotePublic=WYSIWYG creatie/editie van het veld "openbare notities" van elementen
-FCKeditorForNotePrivate=WYSIWYG creatie/editie van het veld "privénotities" van elementen
-FCKeditorForCompany=WYSIWYG creatie/editie van de veldbeschrijving van elementen (behalve producten/diensten)
-FCKeditorForProductDetails=WYSIWYG creatie/editie van productbeschrijvingen of regels voor objecten (regels met voorstellen, bestellingen, Facturen, enz...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Waarschuwing: het gebruik van deze optie wordt in dit geval serieus afgeraden, omdat dit problemen kan veroorzaken met speciale tekens en paginaopmaak bij het samenstellen van PDF-bestanden.
-FCKeditorForMailing= WYSIWYG creatie/editie voor massale e-mailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWYG creatie/editie van gebruikershandtekening
-FCKeditorForMail=WYSIWYG creatie/editie voor alle e-mail (behalve Tools->eMailing)
-FCKeditorForTicket=WYSIWYG creatie/editie voor tickets
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Voorraad-module instellen
 IfYouUsePointOfSaleCheckModule=Als u de POS-module (POS) die standaard wordt aangeboden of een externe module gebruikt, kan deze configuratie door uw POS-module worden genegeerd. De meeste POS-modules zijn standaard ontworpen om direct een factuur te maken en de voorraad te verminderen, ongeacht de opties hier. Dus als u al dan niet een voorraadvermindering moet hebben bij het registreren van een verkoop vanuit uw POS, controleer dan ook de instellingen van uw POS-module.
@@ -1867,7 +1874,6 @@ Buy=Kopen
 Sell=Verkopen
 InvoiceDateUsed=Factuurdatum gebruiken
 YourCompanyDoesNotUseVAT=Uw bedrijf is ingesteld als zijnde vrijgesteld van BTW (Home->Instellingen->Bedrijf /Stichting), er zijn dus geen BTW opties in te stellen.
-AccountancyCode=Grootboekrekening
 AccountancyCodeSell=Boekhoudkundige afnemerscode
 AccountancyCodeBuy=Boekhoudkundige leverancierscode
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Houd de checkbox “Automatisch de betaling aanmaken” standaard leeg bij het aanmaken van een nieuwe belasting
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Welke weergave wil je standaard openen als je menu Agenda
 AGENDA_EVENT_PAST_COLOR = Kleur van afgelopen evenement
 AGENDA_EVENT_CURRENT_COLOR = Huidige gebeurteniskleur
 AGENDA_EVENT_FUTURE_COLOR = Toekomstige evenementkleur
-AGENDA_REMINDER_BROWSER = Schakel gebeurtenisherinnering <b> in de browser van de gebruiker </b> in (wanneer de herinneringsdatum wordt bereikt, wordt een pop-up weergegeven door de browser. Elke gebruiker kan dergelijke meldingen uitschakelen via de instellingen van de browser).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Schakel geluidsmelding in
-AGENDA_REMINDER_EMAIL = Schakel gebeurtenisherinnering <b> per e-mail in </b> (herinneringsoptie / vertraging kan voor elke gebeurtenis worden gedefinieerd).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Opmerking: de frequentie van de geplande taak %s moet voldoende zijn om er zeker van te zijn dat de herinnering op het juiste moment wordt verzonden.
 AGENDA_SHOW_LINKED_OBJECT = Gekoppeld object weergeven in agendaweergave
 AGENDA_USE_EVENT_TYPE = Gebruik gebeurtenistypen (beheerd in menu Setup -&gt; Woordenboeken -&gt; Type agenda-evenementen)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Stel deze standaardwaarde automatisch in voor het type evenement in het formulier voor het maken van een evenement
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = autorisatiecode van de exportlink
 PastDelayVCalExport=Exporteer geen gebeurtenissen ouder dan
 SecurityKey = Veiligheidssleutel
@@ -2006,7 +2017,7 @@ BackupZipWizard=Wizard om een archief met documentenmap te maken
 SomethingMakeInstallFromWebNotPossible=Installatie van externe module is niet mogelijk via de webinterface om de volgende reden:
 SomethingMakeInstallFromWebNotPossible2=Om deze reden is het hier beschreven upgradeproces een handmatig proces dat alleen een bevoorrechte gebruiker mag uitvoeren.
 InstallModuleFromWebHasBeenDisabledContactUs=Het installeren of ontwikkelen van externe modules of dynamische websites vanuit de applicatie is momenteel om veiligheidsredenen vergrendeld. Neem contact met ons op als u deze functie wilt inschakelen.
-InstallModuleFromWebHasBeenDisabledByFile=Installeren van externe module van toepassing is uitgeschakeld door uw beheerder. Je moet hem vragen om het bestand <strong>%s</strong>  te verwijderen om deze functie mogelijk te maken.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Het installeren of bouwen van een externe module vanuit de applicatie moet de modulebestanden opslaan in de map <strong>%s</strong> . Om deze map door Dolibarr te laten verwerken, moet u uw <strong>conf / conf.php instellen</strong> om de 2 richtlijnregels toe te voegen: <br> <strong>$ dolibarr_main_url_root_alt = '/ custom'</strong> <br> <strong>$ dolibarr_main_document_root_alt = '%s / custom'</strong>
 HighlightLinesOnMouseHover=Markeer tabellijnen wanneer u er met de muis overheen gaat
 HighlightLinesColor=Markeer de kleur van de lijn wanneer de muis overgaat (gebruik 'ffffff' voor geen hoogtepunt)
@@ -2036,6 +2047,7 @@ Enter0or1=Voer 0 of 1 in
 EnterYesOrNo=Vul Ja of Nee in
 UnicodeCurrency=Voer hier tussen accolades in, lijst met byte-nummers die het valutasymbool vertegenwoordigen. Bijvoorbeeld: voer voor $ [36] in - voor Brazilië real R $ [82,36] - voer voor € [8364] in
 ColorFormat=De RGB-kleur heeft het HEX-formaat, bijvoorbeeld: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Pictogramnaam in formaat:<br>- image.png voor een afbeeldingsbestand in de huidige themamap<br>- image.png@module als het bestand zich in de map /img/ van een module bevindt<br>- fa-xxx voor een FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size voor een FontAwesome fa-xxx picto (met voorvoegsel, kleur en grootte ingesteld)
 PositionIntoComboList=Positie van regel in combolijst
 SellTaxRate=Btw tarief
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Verberg de kolom met
 MAIN_PDF_NO_SENDER_FRAME=Verberg randen op frame van afzenderadres
 MAIN_PDF_NO_RECIPENT_FRAME=Randen in het adresframe van de ontvanger verbergen
 MAIN_PDF_HIDE_CUSTOMER_CODE=Klantcode verbergen
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Verberg afzender/bedrijfsnaam in adresblok
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Betalingsvoorwaarden verbergen
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Betalingsmodus verbergen
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Voeg een verborgen markering toe aan het handtekeninggebied, zodat de elektronische handtekeningtool deze opnieuw kan gebruiken. Kan worden gebruikt door externe tools of in de toekomst door de online handtekeningfunctie.
@@ -2324,6 +2341,8 @@ NotRecommended=Niet aangeraden
 ARestrictedPath=Een beperkt pad voor gegevensbestanden
 CheckForModuleUpdate=Controleren op updates van externe modules
 CheckForModuleUpdateHelp=Deze actie maakt verbinding met editors van externe modules om te controleren of er een nieuwe versie beschikbaar is.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Een update is beschikbaar
 NoExternalModuleWithUpdate=Geen updates gevonden voor externe modules
 SwaggerDescriptionFile=Swagger API-beschrijvingsbestand (voor gebruik met bijvoorbeeld redoc)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Verzendadres tonen
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Verplichte vermelding in sommige landen (Frankrijk, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Facturatiecontact weergeven op voorstel
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=Standaard wordt het contact alleen weergegeven voor facturering
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=URL-link van sociaal netwerk. Gebruik {socialid} voor het variabele deel dat de sociale netwerk-ID bevat.
 IfThisCategoryIsChildOfAnother=Als deze categorie een kind is van een andere
 DarkThemeMode=Donkere themamodus
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Waarschuwing: de module %s heef
 WarningModuleHasChangedSecurityCsrfParameter=Waarschuwing: de module %s heeft de CSRF-beveiliging van uw instantie uitgeschakeld. Deze actie is verdacht en uw installatie is mogelijk niet meer beveiligd. Neem contact op met de auteur van de module voor uitleg.
 EMailsInGoingDesc=Inkomende e-mails worden beheerd door de module %s. U moet het inschakelen en configureren als u inkomende e-mails wilt ondersteunen.
 MAIN_IMAP_USE_PHPIMAP=Gebruik de PHP-IMAP-bibliotheek voor IMAP in plaats van native PHP IMAP. Hierdoor kan ook een OAuth2-verbinding voor IMAP worden gebruikt (module OAuth moet ook geactiveerd zijn).
-MAIN_CHECKBOX_LEFT_COLUMN=Toon de kolom voor veld- en lijnselectie aan de linkerkant (standaard aan de rechterkant)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Wordt niet standaard aangemaakt. Alleen gemaakt bij activering van de module.
 CSSPage=CSS-stijl
 Defaultfortype=Standaard
@@ -2489,7 +2510,7 @@ AiDescription=AI-functies (kunstmatige intelligentie).
 AiDescriptionLong=Biedt AI-functies (kunstmatige intelligentie) in verschillende delen van de applicatie. Externe AI API nodig.
 AI_API_KEY=Sleutel voor AI-api
 AI_API_URL=Eindpunt-URL voor AI-API
-AI_API_SERVICE=Service om te gebruiken voor AI-functies
+AI_API_SERVICE=AI service to use
 AiSetup=Installatie van AI-module
 AiCustomPrompt=Aangepaste AI-prompt
 AI_CONFIGURATIONS_PROMPT=Aangepaste prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=Aangepaste AI-prompts voor functies
 EnterAnIP=Voer een IP-adres in
 ConvertInto=Converteren naar
 YouAreHere=Je bent hier
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Toon de streepjescode op het PDF-verzendingsdocument
 BARCODE_ON_RECEPTION_PDF=Toon de streepjescode op het PDF-ontvangstdocument
 BARCODE_ON_STOCKTRANSFER_PDF=Toon de streepjescode op het voorraad overdrachts-PDF-document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr-uitlog-URL om te autorisere
 MainAuthenticationOidcLoginClaimName=Inloggen claimen
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim die overeenkomt met de Dolibarr-gebruikerslogin. Indien niet ingesteld of leeg, standaard e-mail
 BlackListWords=Zwarte lijst met woorden
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Toevoegen aan zwarte lijst
 FediverseSetup=Configuratie van fediverse-sectie
 ConfigImportSocialNetwork=Configuratie van sociale netwerken die compatibel zijn met Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Naam van parameter
 ParamValue=Waarde van parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=U kunt een lijst met mogelijke waarden verkrijgen door de volgende SQL-opdracht uit te voeren: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index d21a0573a25..3c5ce94f8a4 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Eindbalans
 CurrentBalance=Huidig saldo
 FutureBalance=Toekomstig saldo
 ShowAllTimeBalance=Toon saldo vanaf begin
-AllTime=Vanaf het begin
 Reconciliation=Overeenstemming
 RIB=Bankrekeningnummer
 IBAN=IBAN nummer
@@ -133,7 +132,7 @@ DeleteTransaction=Ingave verwijderen
 ConfirmDeleteTransaction=Weet u zeker dat u deze boeking wilt verwijderen?
 ThisWillAlsoDeleteBankRecord=Hiermee wordt ook de boeking in de bank verwijderd
 BankMovements=Mutaties
-PlannedTransactions=Nog te verwerken
+PlannedTransactions=Upcoming entries
 Graph=Grafieken
 ExportDataset_banque_1=Bankboekingen en rekeningafschriften
 ExportDataset_banque_2=Stortingsbewijs
@@ -151,7 +150,7 @@ FutureTransaction=Toekomstige transactie. Nog niet mogelijk af te stemmen
 SelectChequeTransactionAndGenerate=Selecteer/filter de cheques die in het chequebewijs moeten worden opgenomen. Klik vervolgens op "Maken".
 SelectPaymentTransactionAndGenerate=Selecteer/filter de documenten die in het %s depotbewijs moeten worden opgenomen. Klik vervolgens op "Creëren".
 InputReceiptNumber=Kies het bankafschrift dat bij de bemiddeling hoort. Gebruik een sorteerbare numerieke waarde
-InputReceiptNumberBis=JJJJMM of JJJJMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optioneel, een Categorie waarin de bewerkingen worden geclassificeerd
 ToConciliate=Afstemmen?
 ThenCheckLinesAndConciliate=Controleer vervolgens de regels op het bankafschrift en klik
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Als deze functie is ingeschakeld, kunt u een specifieke
 BankColorizeMovementName1=Achtergrondkleur voor debetmutatie
 BankColorizeMovementName2=Achtergrondkleur voor creditmutatie
 IfYouDontReconcileDisableProperty=Als u op sommige bankrekeningen geen bankafstemmingen uitvoert, schakelt u de eigenschap "%s" uit om deze waarschuwing te verwijderen.
-NoBankAccountDefined=Geen bankrekening gedefinieerd
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Geen record gevonden in de bankrekening. Vaak gebeurt dit wanneer een record handmatig is verwijderd uit de lijst van banktransacties (bijvoorbeeld tijdens een reconciliatie van de bankrekening). Een andere reden is dat de betaling was vastgelegd terwijl module "%s" was uitgeschakeld.
 AlreadyOneBankAccount=Er is al een bankrekening gedefinieerd
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA-bestandsvariant
diff --git a/htdocs/langs/nl_NL/blockedlog.lang b/htdocs/langs/nl_NL/blockedlog.lang
index 58845f5c9f1..42164596d21 100644
--- a/htdocs/langs/nl_NL/blockedlog.lang
+++ b/htdocs/langs/nl_NL/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Niet aanpasbare logboeken
 ShowAllFingerPrintsMightBeTooLong=Toon alle gearchiveerde logs (kunnen lang zijn)
 ShowAllFingerPrintsErrorsMightBeTooLong=Toon alle ongeldige archieflogboeken (kunnen lang zijn)
 DownloadBlockChain=Vingerafdrukken downloaden
-KoCheckFingerprintValidity=Gearchiveerde logboekinvoer is niet geldig. Het betekent dat iemand (een hacker?) enkele gegevens van dit record heeft gewijzigd nadat het was opgenomen, of het vorige gearchiveerde record heeft gewist (controleer of de regel met het vorige # bestaat) of de controlesom van het vorige record heeft gewijzigd.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Gearchiveerde logboekrecord is geldig. De gegevens op deze regel zijn niet gewijzigd en de invoer volgt op de vorige.
 OkCheckFingerprintValidityButChainIsKo=Gearchiveerd log lijkt geldig in vergelijking met de vorige, maar de ketting was eerder beschadigd.
 AddedByAuthority=Opgeslagen in autoriteit op afstand
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Log Details
 ListOfTrackedEvents=Lijst met bijgehouden gebeurtenissen
 Fingerprint=Vingerafdruk
 DownloadLogCSV=Gearchiveerde logboeken exporteren (CSV)
-DataOfArchivedEvent=Volledige gegevens van gearchiveerde gebeurtenis
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Origineel object (type %s , id %s) niet gekoppeld  (zie kolom 'Volledige gegevens' om niet wijzigbare opgeslagen gegevens te krijgen)
 BlockedLogAreRequiredByYourCountryLegislation=Niet wijzigbare logboeken kunnen vereist zijn vanwege de wetgeving van uw land. Het uitschakelen van deze module kan toekomstige transacties ongeldig maken met betrekking tot de wet en het gebruik van legale software, aangezien ze niet kunnen worden gevalideerd door een belasting controle.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Niet aanpasbare Logs-module is geactiveerd vanwege de wetgeving van uw land. Het uitschakelen van deze module kan toekomstige transacties ongeldig maken met betrekking tot de wet en het gebruik van legale software, aangezien ze niet kunnen worden gevalideerd door een belasting controle
@@ -27,9 +29,10 @@ OnlyNonValid=Niet geldig
 TooManyRecordToScanRestrictFilters=Te veel records om te scannen / analyseren. Beperk de lijst met restrictievere filters.
 RestrictYearToExport=Beperk maand / jaar om te exporteren
 BlockedLogEnabled=Systeem om gebeurtenissen bij te houden in onveranderlijke logboeken is ingeschakeld
-BlockedLogDisabled=Systeem om gebeurtenissen bij te houden in onveranderlijke logboeken is uitgeschakeld nadat er wat opnamen zijn gemaakt. We hebben een speciale vingerafdruk bewaard om de ketting als gebroken te volgen 
+BlockedLogDisabled=Systeem om gebeurtenissen bij te houden in onveranderlijke logboeken is uitgeschakeld nadat er wat opnamen zijn gemaakt. We hebben een speciale vingerafdruk bewaard om de ketting als gebroken te volgen
 BlockedLogDisabledBis=Systeem om gebeurtenissen bij te houden in onveranderlijke logboeken is uitgeschakeld. Dit is mogelijk omdat er nog geen registratie is gedaan.
 LinkHasBeenDisabledForPerformancePurpose=Om prestatieredenen wordt de directe link naar het document niet weergegeven na de 100e regel.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Klant factuur logisch verwijderd
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Klant betaling logische verwijdering
 logPAYMENT_VARIOUS_CREATE=Betaling (niet toegewezen aan een factuur) gemaakt
 logPAYMENT_VARIOUS_DELETE=Betaling (niet toegewezen aan een factuur) logische verwijdering
 logPAYMENT_VARIOUS_MODIFY=Betaling (niet toegewezen aan een factuur) gewijzigd
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
index 022f582b411..76cce630229 100644
--- a/htdocs/langs/nl_NL/categories.lang
+++ b/htdocs/langs/nl_NL/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Contactlabels/categorieën gebied
 AccountsCategoriesArea=Gebied met bankrekeningtags/categorieën
 ProjectsCategoriesArea=Gebied met projectlabels/categorieën
 UsersCategoriesArea=Gebied met gebruikerslabels/categorieën
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Sub-categorieën
 CatList=Lijst van kenmerken/categorieën
 CatListAll=Lijst met groepen /categorieën (alle typen)
@@ -90,9 +91,10 @@ CategoriesSetup=Labels/categorieën instelling
 CategorieRecursiv= Automatische koppeling met bovenliggende label/categorie
 CategorieRecursivHelp=Als de optie is ingeschakeld en u een object toevoegt aan een subcategorie, wordt het object ook toegevoegd aan de bovenliggende categorieën.
 AddProductServiceIntoCategory=Wijs categorie toe aan dit product / dienst
-AddCustomerIntoCategory=Wijs categorie toe aan klant
-AddSupplierIntoCategory=Wijs categorie toe aan leverancier
-AssignCategoryTo=Categorie toewijzen aan
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Toon label/categorie
 ByDefaultInList=Standaard in de lijst
 ChooseCategory=Kies categorie
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea= Categorieën voor Page-Container
 KnowledgemanagementsCategoriesArea=KM artikel Categorieën
 UseOrOperatorForCategories=Gebruik de 'OF'-operator voor categorieën
 AddObjectIntoCategory=Toewijzen aan de categorie
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index 410660b4e59..bd9998c1427 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Land is EU lid
 PriceFormatInCurrentLanguage=Prijsweergaveformaat in de huidige taal en valuta
 ThirdPartyName=Naam relatie
 ThirdPartyEmail=E-mail relatie
-ThirdParty=Relatie
-ThirdParties=Relaties
+ThirdParty=Third party
+ThirdParties=Derde partijen
 ThirdPartyProspects=Prospecten
 ThirdPartyProspectsStats=Prospecten
 ThirdPartyCustomers=Afnemers
@@ -65,6 +65,7 @@ State=Provincie
 StateId=Staat-ID
 StateCode=Staat / Provincie code
 StateShort=Provincie
+DepartmentBuyer=Buyer's state/province
 Region=Regio
 Region-State=Regio - Staat
 Country=Land
@@ -78,7 +79,7 @@ Chat=Chat
 PhonePro=Zakel. telefoon
 PhonePerso=Telefoonnummer privé
 PhoneMobile=Telefoonnummer mobiel
-No_Email=Weigeren bulk e-mailings
+No_Email=Refuse mass emails
 Fax=Faxnummer
 Zip=Postcode
 Town=Plaats
@@ -382,12 +383,12 @@ ExportCardToFormat=Export details naar formaat
 ContactNotLinkedToCompany=Contact niet gekoppeld aan enige Klant
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=Geen Dolibarr toegang
-ExportDataset_company_1=Derden (bedrijven / stichtingen / fysieke mensen) en hun eigenschappen
-ExportDataset_company_2=Contacten en hun eigenschappen
-ExportDataset_company_3=Bankrekeningen van relaties
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Betaalwijzen van derden (bankrekeningen)
 ImportDataset_company_1=Relaties en hun eigenschappen
 ImportDataset_company_2=Bijkomende contacten / adressen en attributen van derden
-ImportDataset_company_3=Bankrekeningen van relaties
+ImportDataset_company_3=Betaalwijzen van derden (bankrekeningen)
 ImportDataset_company_4=Derden Vertegenwoordigers (wijs vertegenwoordigers / gebruikers toe aan bedrijven)
 PriceLevel=Prijsniveau
 PriceLevelLabels=Prijsniveau Labels
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Gratis code zonder verificatie.
 ManagingDirectors=Manager(s) Naam (CEO, directeur, voorzitter ...)
 MergeOriginThirdparty=Gedupliceerde derde partij (de derde partij die u wilt verwijderen)
 MergeThirdparties=Samenvoegen third parties
-ConfirmMergeThirdparties=Weet u zeker dat u de gekozen derde partij wilt samenvoegen met de huidige? Alle gekoppelde objecten (facturen, bestellingen, ...) worden verplaatst naar de huidige derde partij, waarna de gekozen derde partij wordt verwijderd.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Relaties zijn samengevoegd
 SaleRepresentativeLogin=Login vertegenwoordiger
 SaleRepresentativeFirstname=Vertegenwoordiger voornaam
@@ -461,3 +462,6 @@ ExternalSystemID=Extern systeem-ID
 IDOfPaymentInAnExternalSystem=ID van de betalingswijze in een extern systeem (zoals Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE-webservice-referenties
 ThirdPartyMustBeACustomerToCreateBANOnStripe=De derde partij moet een Klant zijn om het aanmaken van zijn bankgegevens aan de Stripe-kant mogelijk te maken
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index 12c4d90eeb1..22f147b775b 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Afnemersfactuur betaling
 PaymentSupplierInvoice=Betaling leverancier
 PaymentSocialContribution=Sociale/fiscale belastingbetaling
 PaymentVat=BTW betaling
-AutomaticCreationPayment=Automatisch de betaling registreren
+AutomaticCreationPayment=Also record the payment
 ListPayment=Betalingenlijst
 ListOfCustomerPayments=Afnemersbetalingenlijst
 ListOfSupplierPayments=Lijst met leveranciersbetalingen
@@ -118,10 +118,14 @@ SocialContributionsPayments=Betaling Sociale/fiscale lasten
 ShowVatPayment=Toon BTW-betaling
 TotalToPay=Totaal te voldoen
 BalanceVisibilityDependsOnSortAndFilters=Saldo is alleen zichtbaar in deze lijst als de tabel is gesorteerd op %s en gefilterd op 1 bankrekening (zonder andere filters)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Debiteurenrekening
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Boekcode leverancier
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Klant account. code
 SupplierAccountancyCodeShort=Lev. account. code
+UserAccountancyCodeShort=User account. code
 AccountNumber=Rekeningnummer
 NewAccountingAccount=Nieuwe rekening
 Turnover=Omzet gefactureerd
@@ -129,7 +133,9 @@ TurnoverCollected=Omzet verzameld
 SalesTurnoverMinimum=Minimum omzet
 ByExpenseIncome=Op kosten en inkomsten
 ByThirdParties=Door derde partijen
+ByProjects=By projects
 ByUserAuthorOfInvoice=Op factuurauteur
+DetailedListLowercase=detailed list
 CheckReceipt=Stortingsbewijs
 CheckReceiptShort=Stortingsbewijs
 LastCheckReceiptShort=Laatste %s stortingsbewijzen
diff --git a/htdocs/langs/nl_NL/datapolicy.lang b/htdocs/langs/nl_NL/datapolicy.lang
index 4443ce1d387..65fc057facf 100644
--- a/htdocs/langs/nl_NL/datapolicy.lang
+++ b/htdocs/langs/nl_NL/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Gegevensprivacybeleid
 Module4100Desc = Module om gegevensprivacy te beheren (conformiteit met de AVG)
 # Administration page
 datapolicySetup = Module Gegevensprivacybeleid instellen
-Deletion = Verwijderen van gegevens
-datapolicySetupPage = Afhankelijk van de wetten van uw land (bijvoorbeeld <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Artikel 5</a> van de AVG), moeten persoonlijke gegevens gedurende een bepaalde periode worden bewaard. niet langer dan de duur dat de gegevens nodig zijn voor het doel waarvoor ze zijn verzameld, behalve voor archiveringsdoeleinden.<br>De verwijdering wordt automatisch uitgevoerd na een bepaalde duur zonder gebeurtenissen (de duur die u hieronder zult hebben aangegeven).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s maanden
 ONE_YEAR = 1 jaar
 NB_YEARS = %s jaar
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Prospect/Klant
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Noch prospect/noch klant
 DATAPOLICY_CONTACT_FOURNISSEUR = Leverancier
 DATAPOLICY_ADHERENT = Lid
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = U kunt een AVG-e-mail sturen naar al uw relevante contacten (die nog geen e-mail hebben ontvangen en waarvoor u niets hebt geregistreerd over hun AVG-overeenkomst). Gebruik hiervoor de volgende knop.
 SendAgreement = Stuur emails
 AllAgreementSend = Alle e-mails zijn verzonden
 TXTLINKDATAPOLICYACCEPT = Tekst voor de link "overeenkomst"
 TXTLINKDATAPOLICYREFUSE = Tekst voor de link "onenigheid"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = AVG: Verwerking van persoonsgegevens
 DATAPOLICY_consentement = Toestemming verkregen voor de verwerking van persoonsgegevens
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 1087cca699b..bec3fc7cc95 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Fout bij het maken van afbeeldingsbestan
 ErrorFailedToCreateDir=Creëren van een map mislukt. Controleer of de Webservergebruiker toestemming heeft om te schrijven in Dolibarr documentenmap. Wanneer de parameter <b>safe_mode</b> is ingeschakeld in PHP, controleer dan dat de Dolibarr php bestanden eigendom zijn van de de webserve gebruiker (of groep).
 ErrorNoMailDefinedForThisUser=Geen e-mailadres ingesteld voor deze gebruiker
 ErrorSetupOfEmailsNotComplete=Het instellen van e-mails is niet voltooid
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Deze functie heeft JavaScript nodig om te kunnen werken. Wijzig dit in setup - weergave.
 ErrorTopMenuMustHaveAParentWithId0=Een menu van het type 'Top' kan niet beschikken over een bovenliggend menu. Stel 0 in in het 'Top' menu of kies een menu van het type  'Left'.
 ErrorLeftMenuMustHaveAParentId=Een menu van het type 'Left' moeten een id van een bovenliggend menu hebben.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Upload geblokkeerd door een PHP- en / of Apache-plugin
 ErrorFileSizeTooLarge=De bestandsgrootte is te groot of het bestand is niet verstrekt.
 ErrorFieldTooLong=Veld %s is te lang.
 ErrorSizeTooLongForIntType=Grootte te lang voor int type (%s cijfers maximum)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Grootte te lang voor string type (%s tekens maximum)
 ErrorNoValueForSelectType=Vul waarde in voor selectielijst
 ErrorNoValueForCheckBoxType=Vul waarde in voor checkbox lijst
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Onjuist waardetypen voor code. Probeer het opnieuw met een
 ErrorBothFieldCantBeNegative=Velden %s %s en kan niet beide negatief
 ErrorFieldCantBeNegativeOnInvoice=Veld <strong>%s</strong> kan niet negatief zijn voor dit type <span-klasse ='niet vertalen'>Factuur</span>. Als u een kortingsregel moet toevoegen, maakt u eerst de korting aan (uit het veld '%s' in een kaart van derden) en past u deze toe op de Factuur.
 ErrorLinesCantBeNegativeForOneVATRate=Totaal aantal regels (na aftrek van belastingen) kan niet negatief zijn voor een bepaald btw-tarief dat niet nul is (negatief totaal gevonden voor btw-tarief <b>%s</b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Lijnen kunnen niet negatief zijn in een storting. U zult problemen ondervinden wanneer u de aanbetaling in de eindfactuur moet verbruiken als u dit doet.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Aantal voor regel in klantfacturen kan niet negatief zijn
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> gebruikt om web-server uit te voeren heeft geen toestemming voor die
 ErrorNoActivatedBarcode=Geen geactiveerde barcode soort
 ErrUnzipFails=uitpakken %s mislukt met ZipArchive
@@ -222,7 +225,7 @@ ErrorUserNotAssignedToTask=De gebruiker moet een taak toegewezen krijgen om de t
 ErrorTaskAlreadyAssigned=Taak al toegewezen aan gebruiker
 ErrorModuleFileSeemsToHaveAWrongFormat=Het modulepakket lijkt een verkeerde indeling te hebben.
 ErrorModuleFileSeemsToHaveAWrongFormat2=Ten minste één verplichte map moet bestaan in de zip van de module: <strong>%s</strong> of <strong>%s</strong>
-ErrorFilenameDosNotMatchDolibarrPackageRules=The file name of the module package (<strong>%s</strong>) does not match the expected name syntax: <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=De bestandsnaam van het modulepakket (<strong>%s</strong>) komt niet overeen met de verwachte naamsyntaxis: <strong>%s</strong>
 ErrorDuplicateTrigger=Fout, dubbele triggernaam %s. Al geladen van %s.
 ErrorNoWarehouseDefined=Fout, geen magazijnen gedefinieerd.
 ErrorBadLinkSourceSetButBadValueForRef=De link die u gebruikt is niet geldig. Een 'bron' voor betaling is gedefinieerd, maar de waarde voor 'ref' is niet geldig.
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=Einddatumveld mag niet leeg zijn
 ErrorStartHourIsNull=Het veld Startdatum mag niet leeg zijn
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Te veel regels om te verwerken. Gebruik een selectiever filter.
 ErrorEmptyValueForQty=De hoeveelheid kan niet nul zijn.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Uw PHP-parameter upload_max_filesize (%s) is hoger dan PHP-parameter post_max_size (%s). Dit is geen consistente opstelling.
 WarningPasswordSetWithNoAccount=Er is een wachtwoord ingesteld voor dit lid. Er is echter geen gebruikersaccount gemaakt. Dus dit wachtwoord is opgeslagen maar kan niet worden gebruikt om in te loggen bij Dolibarr. Het kan worden gebruikt door een externe module / interface, maar als u geen gebruikersnaam of wachtwoord voor een lid hoeft aan te maken, kunt u de optie "Beheer een login voor elk lid" in de module-setup van Member uitschakelen. Als u een login moet beheren maar geen wachtwoord nodig heeft, kunt u dit veld leeg houden om deze waarschuwing te voorkomen. Opmerking: e-mail kan ook worden gebruikt als login als het lid aan een gebruiker is gekoppeld.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=Deze ouder-ID bestaat niet meer
 WarningReadBankAlsoAllowedIfUserHasPermission=Waarschuwing: het lezen van bankrekeningen is ook toegestaan met de toestemming om het rekeningschema te beheren
 WarningNoDataTransferedInAccountancyYet=Let op: er staan geen gegevens in de boekhoudtabel. Breng uw in de applicatie geregistreerde gegevens over naar het boekhoudgedeelte of wijzig de berekeningsmodus om de gegevens te analyseren die buiten de boekhouding zijn geregistreerd.
 WarningChangingThisMayBreakStopTaskScheduler=Waarschuwing: het wijzigen van deze waarde kan de planner uitschakelen
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR-factuur kan alleen worden toegevoegd aan facturen die zijn ingesteld om te worden betaald met overboekingen.
 SwissQrCreditorAddressInvalid = Crediteur adres is ongeldig (zijn postcode en plaats ingesteld? (%s)
 SwissQrCreditorInformationInvalid = Crediteur gegevens zijn ongeldig voor IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is al gedefinieerd als contactper
 ErrorThisGroupIsAlreadyDefinedAsThisType=De contacten met deze groep zijn al gedefinieerd als contact voor dit type.
 EmptyMessageNotAllowedError=Een leeg bericht is niet toegestaan
 ErrorIsNotInError=%s is niet fout
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/nl_NL/exports.lang b/htdocs/langs/nl_NL/exports.lang
index d3227e60e9b..b381cc87f8f 100644
--- a/htdocs/langs/nl_NL/exports.lang
+++ b/htdocs/langs/nl_NL/exports.lang
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Controleer of de bestandsindeling (veld- en tekenreekssc
 RunSimulateImportFile=Voer Import Simulation uit
 FieldNeedSource=Dit veld heeft gegevens uit het bronbestand nodig
 SomeMandatoryFieldHaveNoSource=Sommige verplichte velden hebben geen bronveld uit het gegevensbestand
-InformationOnSourceFile=Informatie over het bronbestand
-InformationOnTargetTables=Informatie over doelvelden
+InformationOnSourceFile=Bronbestand
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Kies tenminste een bronveld om te exporteren in de kolom velden
 SelectFormat=Kies het importeerbestandsformaat
 RunImportFile=Data importeren
diff --git a/htdocs/langs/nl_NL/hrm.lang b/htdocs/langs/nl_NL/hrm.lang
index dc2166be798..33654dbbe89 100644
--- a/htdocs/langs/nl_NL/hrm.lang
+++ b/htdocs/langs/nl_NL/hrm.lang
@@ -46,11 +46,11 @@ NewEval=Nieuwe competentiebeoordeling
 ValidateEvaluation=Valideer competentiebeoordeling
 ConfirmValidateEvaluation=Weet u zeker dat u deze competentiebeoordeling wilt valideren met de referentie <b>%s</b></b> span>?
 EvaluationCard=Competentiebeoordeling
-RequiredRank=Vereiste rang voor het functieprofiel
-RequiredRankShort=Vereiste rang
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Functies met dit functieprofiel
-EmployeeRank=Werknemersrang voor deze vaardigheid
-EmployeeRankShort=Rang van werknemer
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Functie werknemer
 EmployeePositions=Werknemersfuncties
 EmployeesInThisPosition=Medewerkers in deze functie
@@ -72,6 +72,9 @@ AddSkill=Voeg vaardigheden toe aan het functieprofiel
 RequiredSkills=Vereiste vaardigheden voor dit functieprofiel
 UserRank=Gebruikersrang
 SkillList=Vaardighedenlijst
+SkillCreated=%s vaardigheden gecreëerd
+SkillRank=Vaardigheidsrang
+ShowSkillRank=Toon vaardigheidsrang
 SaveRank=Rang opslaan
 TypeKnowHow=Weet hoe
 TypeHowToBe=Hoe te zijn
@@ -95,3 +98,5 @@ NeedBusinessTravels=Zakenreizen nodig
 NoDescription=Geen beschrijving
 TheJobProfileHasNoSkillsDefinedFixBefore=In het geëvalueerde functieprofiel van deze medewerker zijn geen vaardigheden gedefinieerd. Voeg vaardigheid(en) toe, verwijder de evaluatie en start deze opnieuw.
 PDFStandardHrmEvaluation=Standaardsjabloon om een PDF-document te genereren voor een competentiebeoordeling
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index de77e91701a..4990d1b952d 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=E-Mailing
 EMailing=E-Mailing
-EMailings=E-Mailings
+EMailings=Mass EMails
 SMSings=SMS-berichten
-AllEMailings=Alle E-Mailings
+AllEMailings=All mass eMails
 MailCard=E-Mailings kaart
 MailRecipients=Ontvangers
 MailRecipient=Ontvanger
@@ -26,19 +26,19 @@ MailFile=Bijgevoegde bestanden
 MailMessage=E-mail inhoud
 SubjectNotIn=Niet in onderwerp
 BodyNotIn=Niet in berichtvenster
-ShowEMailing=Toon E-Mailing
-ListOfEMailings=E-Mailingenlijst
-NewMailing=Nieuwe E-Mailing
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Nieuwe sms
-EditMailing=Bewerk E-Mailing
-ResetMailing=E-Mailing opnieuw verzenden
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Verwijder E-Mailing
-PreviewMailing=Voorbeeldweergave E-Mailing
-CreateMailing=Creëer E-Mailing
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=Geldige E-Mailing
+ValidMailing=Valid mass Email
 MailingStatusDraft=Concept
 MailingStatusValidated=Gevalideerd
 MailingStatusSent=Verzonden
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Alle filters moeten overeenkomen om een e-mail te laten
 LineInFile=Regel %s in bestand
 RecipientSelectionModules=Gedefinieerde verzoeken om ontvangers te selecteren
 MailSelectedRecipients=Geselecteerde ontvangers
-MailingArea=E-Mailings overzicht
-LastMailings=Laatste %s e-mails
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Geaddresseerden statistieken
 NbOfCompaniesContacts=Unieke contacten van bedrijven
 MailNoChangePossible=Ontvangers voor gevalideerde E-Mailings kunnen niet worden gewijzigd
-SearchAMailing=Zoek een E-Mailing
-SendMailing=Verzend E-Mailing
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Verzonden door
 AdvancedAlternative=Geavanceerd alternatief
 MailingNeedCommand=Het versturen van een mailing kan ook vanaf de command line. Vraag uw systeembeheerder het volgende commando te geven om de mailing te verzenden aan alle ontvangers:
 MailingNeedCommand2=U kunt ze echter online verzenden door toevoeging van de parameter MAILING_LIMIT_SENDBYWEB met een waarde van het maximaal aantal e-mails dat u wilt verzenden per sessie.
 ConfirmSendingEmailing=Als u rechtstreeks vanuit dit scherm e-mail wilt verzenden, bevestigt u dat u zeker weet dat u nu e-mail wilt verzenden vanuit uw browser?
-LimitSendingEmailing=Opmerking: het verzenden van e- <b>mailings</b> vanuit de web interface gebeurt meerdere keren om veiligheids- en time- <b>outredenen</b> , <b>%s</b> ontvangers per keer voor elke <b>verzendsessie</b> .
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Lijst leegmaken
 ToClearAllRecipientsClickHere=Klik hier om de lijst met ontvangers van deze E-Mailing te legen
 ToAddRecipientsChooseHere=Voeg geadresseerden toe door deze uit de lijst te kiezen
-NbOfEMailingsReceived=Bulk E-mailings ontvangen
-NbOfEMailingsSend=Massa E-mailings verstuurd
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID-tabelregel
 DeliveryReceipt=Ontvangstbevestiging
 YouCanUseCommaSeparatorForSeveralRecipients=U kunt het <b>komma</b> scheidingsteken gebruiken om meerdere ontvangers te specificeren.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Er staan geen e-mail kennisgevingen gepland voor dit t
 ANotificationsWillBeSent=1 automatische notificatie zal worden verstuurd per e-mail
 SomeNotificationsWillBeSent=%s automatische notificatie zal per e-mail worden verstuurd
 AddNewNotification=Abonneer u op een nieuwe automatische e-mailmelding (doel/gebeurtenis)
-ListOfActiveNotifications=Actieve abonnementen (doelen/gebeurtenissen) voor automatische e-mailmeldingen
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatische e-mailmeldingen verzonden
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Configuratie van e-mailverzending is ingesteld op '%s'. Deze modus kan niet worden gebruikt om bulk e-mails te verzenden.
 MailSendSetupIs2=Ga eerst met een beheerdersaccount naar menu %s Home - Set-up - E-mails%s om de parameter <strong>'%s'</strong> te wijzigen om de modus '%s' te gebruiken. Met deze modus kunt u de installatie van de SMTP-server van uw internetprovider openen en de functie Bulk e-mails gebruiken.
 MailSendSetupIs3=Indien u vragen heeft inzake de SMTP server, went u zich dan tot %s.
@@ -183,7 +185,7 @@ Information=Informatie
 ContactsWithThirdpartyFilter=Contacten met filter van derden
 Unanswered=Onbeantwoord
 Answered=Beantwoord
-IsNotAnAnswer=Is geen antwoord (initiële e-mail)
+IsNotAnAnswer=Is geen antwoord (Is een eerste e-mail)
 IsAnAnswer=Is een antwoord van een initiële e-mail
 RecordCreatedByEmailCollector=Record gemaakt door de Email Collector %s
 DefaultBlacklistMailingStatus=Standaardwaarde voor veld '%s' bij het aanmaken van een nieuw contact
@@ -193,12 +195,12 @@ NoMoreRecipientToSendTo=Geen ontvanger meer om de e-mail naar te sturen
 EmailOptedOut=E-maileigenaar heeft verzocht om geen contact meer met hem op te nemen via deze e-mail
 EvenUnsubscribe=Inclusief opt-out e-mails
 EvenUnsubscribeDesc=Neem opt-out-e-mails op wanneer u e-mails als doelwit selecteert. Handig voor bijvoorbeeld verplichte servicemails.
-XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s operations done)
+XEmailsDoneYActionsDone=%s e-mails vooraf gekwalificeerd, %s e-mails succesvol verwerkt (voor %s bewerkingen voltooid)
 YouCanMakeSomeInstructionForEmail=U kunt enkele instructies voor uw e-mail maken (bijvoorbeeld: genereer een afbeelding in een e-mailsjabloon...)
 ModelTemplate=Email sjabloon
 YouCanChooseAModelForYouMailContent= U kunt een van de sjabloonmodellen kiezen of er een genereren met AI
 TitleOfMailHolder=Titel van de e-mail komt hier
 ContentOfMailHolder=De inhoud van de e-mail komt hier...
-LastNews=Laatste nieuws
+LastNews=Latest News
 ListProducts= Lijst met producten
 PasswordReset=Wachtwoord opnieuw instellen
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 662f9340076..181100c0b0b 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -37,6 +37,7 @@ Translation=Vertaling
 Translations=Vertalingen
 CurrentTimeZone=Tijdzone PHP (server)
 EmptySearchString=Voer niet-lege zoekcriteria in
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Voer een datum criterium in
 NoRecordFound=Geen record gevonden
 NoRecordDeleted=Geen record verwijderd
@@ -45,6 +46,7 @@ NoError=Geen fout
 Error=Fout
 Errors=Fouten
 ErrorFieldRequired=Veld '%s' is vereist
+CustomMandatoryFieldRule=Aangepaste regel 'Verplicht veld'
 ErrorFieldFormat=Veld '%s' heeft een incorrecte waarde
 ErrorFileDoesNotExists=Bestand %s bestaat niet
 ErrorFailedToOpenFile=Kan bestand %s niet openen
@@ -308,6 +310,7 @@ DateBuild=Datum van rapportgeneratie
 DatePayment=Datum van betaling
 DateApprove=Goedkeurings datum
 DateApprove2=Datum akkoord (tweede)
+PendingSince=Pending since
 RegistrationDate=Registratie datum
 UserCreation=Aanmaken gebruiker
 UserModification=Wijzigen gebruiker
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Niet gestart
 ActionRunningShort=Reeds bezig
 ActionDoneShort=Uitgevoerd
 ActionUncomplete=Incompleet
-LatestLinkedEvents=Laatste %s gekoppelde evenementen
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Bedrijf/Organisatie
 Accountant=Accountant
 ContactsForCompany=Bedrijfscontacten
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=E-mailinhoud
 SendAcknowledgementByMail=Stuur e-mail ter bevestiging
 SendMail=Verzend e-mail
 Email=Email
+EMail=E-mail
+EMails=E-mails
 NoEMail=Geen e-mail
 AlreadyRead=Al gelezen
 NotRead=Niet gelezen
@@ -793,7 +798,7 @@ Notes=Notitie
 AddNewLine=Voeg nieuwe regel toe
 AddFile=Voeg bestand toe
 FreeZone=Product met vrije tekst
-FreeLineOfType=Vrije omschrijving, type:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Kloon het object met de belangrijkste kenmerken
 ReGeneratePDF=PDF opnieuw genereren
 PDFMerge=Voeg PDF samen
@@ -879,12 +884,14 @@ toward=richting
 Access=Toegang
 SelectAction=Maak keuze
 SelectTargetUser=Kies gebruiker/medewerker
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Gebruik Ctrl + C om te kopiëren naar het klembord
 SaveUploadedFileWithMask=Sla het bestand op de server met de naam "<strong>%s</strong>" (anders "%s")
 OriginFileName=Oorspronkelijke bestandsnaam
 SetDemandReason=Stel bron in
 SetBankAccount=Definieer Bank Rekening
 AccountCurrency=Rekening Valuta
+AccountancyCode=Grootboekrekening
 ViewPrivateNote=Notities bekijken
 XMoreLines=%s regel(s) verborgen
 ShowMoreLines=Laat meer/minder regels zien
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Weet u zeker dat u de  %s geselecteerde record (s) w
 ConfirmMassClone=Bevestiging van bulkkloon
 ConfirmMassCloneQuestion=Selecteer het project om naar te klonen
 ConfirmMassCloneToOneProject=Kloon om %s te projecteren
+ObjectClonedSuccessfuly=Object succesvol gekloond
 RelatedObjects=Gerelateerde objecten
 ClassifyBilled=Classificeren gefactureerd
 ClassifyUnbilled=Classificeer niet-gefactureerd
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Je moet ingelogd zijn en je hebt rechten nodig om het be
 Download=Downloaden
 DownloadDocument=Download document
 DownloadSignedDocument=Ondertekend document downloaden
-ActualizeCurrency=Bijwerken valutakoers
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Boekjaar
 ModuleBuilder=Module- en applicatie ontwikkelomgeving
 SetMultiCurrencyCode=Kies valuta
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Bulkacties
 ClickToShowHelp=Klik om tooltip-help weer te geven
 WebSite=Website
@@ -1077,7 +1086,7 @@ SearchIntoProjects=Projecten
 SearchIntoMO=Productieorders
 SearchIntoTasks=Taken
 SearchIntoCustomerInvoices=Klantenfactuur
-SearchIntoSupplierInvoices=Facturen van leveranciers
+SearchIntoSupplierInvoices=Leveranciersfacturen
 SearchIntoCustomerOrders=Verkooporders
 SearchIntoSupplierOrders=Inkooporders
 SearchIntoCustomerProposals=Offertes
@@ -1104,6 +1113,7 @@ PayedBy=Betaald door
 PayedTo=Betaald om
 Monthly=Maandelijks
 Quarterly=Per kwartaal
+Quarter=Quarter
 Annual=Jaarlijks
 Local=lokaal
 Remote=Op afstand
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Taak
 ContactDefault_propal=Offerte
 ContactDefault_supplier_proposal=Voorstel van leverancier
 ContactDefault_ticket=Ticket
+ContactDefault_societe=Third party
 ContactAddedAutomatically=Contact toegevoegd vanuit contactrollen van derden
 More=Meer
 ShowDetails=Toon details
@@ -1242,6 +1253,7 @@ CommercialAffected=Verkoopvertegenwoordiger toegewezen
 CommercialsDisaffected=Verkoopvertegenwoordigers ontkoppeld
 CommercialDisaffected=Verkoopvertegenwoordiger ontkoppeld
 Message=Bericht
+Emailing=Emailing
 Progression=Voortgang
 YourMessage=Uw bericht
 YourMessageHasBeenReceived=Je bericht is ontvangen. We zullen zo snel mogelijk antwoorden of contact met je opnemen.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Vertaling van de sleutel AnyTranslationKey
 SignedStatus=Ondertekende status
 NbRecordQualified=Aantal gekwalificeerde records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Toevoegen
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Vanaf het begin
+Transferred=Transferred
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index a06a120bbd1..50d06429d53 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Als een abonnement vereist is, moet een abonnement met
 DeleteType=Verwijderen
 VoteAllowed=Stemming toegestaan
 Physical=Individu
-Moral=Bedrijf
-MorAndPhy=Bedrijf en individu
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Opnieuw inschakelen
 ExcludeMember=Een lid uitsluiten
 Exclude=Uitsluiten
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Leden statistieken per regio
 NbOfMembers=Totaal aantal leden
 NbOfActiveMembers=Totaal aantal huidige actieve leden
 NoValidatedMemberYet=Geen gevalideerde leden gevonden
-MembersByCountryDesc=Dit scherm toont u de statistieken van leden per land. Grafieken en grafieken zijn afhankelijk van de beschikbaarheid van de online grafiekenservice van Google en van de beschikbaarheid van een werkende internetverbinding.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Dit scherm toont u statistieken van leden per staat/provincies/kanton.
 MembersByTownDesc=Dit scherm toont u statistieken van leden per stad.
 MembersByNature=Dit scherm toont u statistieken van leden van nature.
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 1466ec15992..fbdd0352a0d 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -97,7 +97,6 @@ ShowService=Toon dienst
 ProductsAndServicesArea=Producten- en dienstenoverzicht
 ProductsArea=Productoverzicht
 ServicesArea=Dienstenoverzicht
-ListOfStockMovements=Mutatielijst voorraad
 BuyingPrice=Inkoopprijs
 PriceForEachProduct=Producten met specifieke prijzen
 SupplierCard=Leverancierskaart
@@ -172,7 +171,7 @@ BuyingPrices=Inkoop prijzen
 CustomerPrices=Consumenten prijzen
 SuppliersPrices=Prijzen van leveranciers
 SuppliersPricesOfProductsOrServices=Leverancierprijzen (van producten of services)
-CustomCode=Douane | Goederen | HS-code
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Land van oorsprong
 RegionStateOrigin=Regio van Oorsprong
 StateOrigin=Regio van herkomst
@@ -210,6 +209,7 @@ unitL=Liter
 unitT=ton
 unitKG=kg
 unitG=Gram
+unitGAL=gallon
 unitMG=mg
 unitLB=pond
 unitOZ=ons
@@ -312,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Indeling voor aanvraag is {"URL": "http://examp
 UpdateInterval=Update-interval (minuten)
 LastUpdated=Laatst bijgewerkt
 CorrectlyUpdated=Correct bijgewerkt
-PropalMergePdfProductActualFile=Gebruikte bestanden om toe te voegen aan PDF Azur zijn/is
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=Selecteer PDF bestanden
 IncludingProductWithTag=Inclusief producten/diensten met de tag
 DefaultPriceRealPriceMayDependOnCustomer=Standaard verkoopprijs, echte verkoopprijs kan bij klant zijn vastgelegd
@@ -349,6 +349,10 @@ QtyRecalculatedWithPackaging=De hoeveelheid van de lijn werd herberekend volgens
 
 #Attributes
 Attributes=Attributen
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Variatie attributen
 ProductAttributes=Variatie attributen bij producten
 ProductAttributeName=Variatie attribuut %s
@@ -396,6 +400,8 @@ ErrorDestinationProductNotFound=Bestemmingsproduct niet gevonden
 ErrorProductCombinationNotFound=Productvariant niet gevonden
 ActionAvailableOnVariantProductOnly=Actie alleen beschikbaar op de variant van het product
 ProductsPricePerCustomer=Productprijzen per klant
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Aanvullende attributen (leveranciersprijzen)
 DeleteLinkedProduct=Verwijder het onderliggende product dat aan de combinatie is gekoppeld
 AmountUsedToUpdateWAP=Eenheidsbedrag dat moet worden gebruikt om de gewogen gemiddelde prijs bij te werken
@@ -437,3 +443,6 @@ AllowStockMovementVariantParentHelp=Standaard is een ouder van een variant een v
 ConfirmSetToDraftInventory=Weet u zeker dat u terug wilt naar de conceptstatus?<br>De hoeveelheden die momenteel in de inventaris zijn ingesteld, worden opnieuw ingesteld.
 WarningLineProductNotToSell=Product of dienst "%s" is niet bedoeld voor verkoop en is gekloond
 PriceLabel=Prijskaartje
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/nl_NL/salaries.lang b/htdocs/langs/nl_NL/salaries.lang
index cfdfa49998c..2f954817e6b 100644
--- a/htdocs/langs/nl_NL/salaries.lang
+++ b/htdocs/langs/nl_NL/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Nieuw salaris
 AddSalary=Salaris toevoegen
 NewSalaryPayment=Nieuwe salariskaart
 AddSalaryPayment=Salarisbetaling toevoegen
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Salarisbetaling
 SalariesPayments=Salarisbetalingen
 SalariesPaymentsOf=Salarisbetalingen van %s
@@ -27,7 +29,7 @@ FillFieldFirst=Vul eerst het werknemersveld in
 UpdateAmountWithLastSalary=Stel het bedrag van het laatste salaris in
 MakeTransferRequest=Overdrachtsverzoek indienen
 VirementOrder=Verzoek om overboeking
-BankTransferAmount=Bedrag van de overboeking
 WithdrawalReceipt=Betalingsopdracht
 OrderWaiting=In behandeling Bestelling
 FillEndOfMonth=Vul het einde van de maand in
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index 0b3f7616751..cda7a6f2766 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Gebruik hier een lijst met andere naam / aliassen zodat de
 WEBSITE_CSS_URL=URL van extern CSS-bestand
 WEBSITE_CSS_INLINE=CSS-bestandsinhoud (gemeenschappelijk voor alle pagina's)
 WEBSITE_JS_INLINE=JavaScript-bestandsinhoud (gemeenschappelijk voor alle pagina's)
-WEBSITE_HTML_HEADER=Toevoeging onderaan HTML-koptekst (gemeenschappelijk voor alle pagina&#39;s)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Robotbestand (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess bestand
 WEBSITE_MANIFEST_JSON=Website manifest.json bestand
@@ -56,16 +56,17 @@ ReadPerm=Lezen
 WritePerm=Schrijven
 TestDeployOnWeb=Testen / implementeren op internet
 PreviewSiteServedByWebServer=<u>Voorbeeld %s op een nieuw tabblad.</u> <br><br> De %s wordt bediend door een externe webserver (zoals Apache, Nginx, IIS). U moet deze server installeren en instellen voordat u naar de map verwijst: <br> <strong>%s</strong> <br> URL aangeboden door externe server: <br> <strong>%s</strong>
-PreviewSiteServedByDolibarr= <u> Bekijk een voorbeeld van %s op een nieuw tabblad. </u> <br> <br> De %s wordt bediend door de Dolibarr-server, dus er is geen extra webserver (zoals Apache, Nginx, IIS) nodig om te worden geïnstalleerd. <br> Het vervelende is dat de URL's van pagina's niet gebruiksvriendelijk zijn en beginnen met het pad van uw Dolibarr. <br> URL geserveerd door Dolibarr: <br> <strong> %s </strong> <br> <br> Om uw eigen externe webserver gebruiken om deze website te dienen, maakt u een virtuele host op uw webserver die punten op directory <br> <strong> %s </strong> <br> voer vervolgens de naam van deze virtuele server in de eigenschappen van deze website en klik op de link "Test/Deploy on the web".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL van de virtuele host bediend door externe webserver niet gedefinieerd
 NoPageYet=Nog geen pagina's
 YouCanCreatePageOrImportTemplate=U kunt een nieuwe pagina maken of een volledige websitesjabloon importeren
 SyntaxHelp=Help bij specifieke syntax-tips
 YouCanEditHtmlSourceckeditor=U kunt HTML-broncode bewerken met de knop "Bron" in de editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Om een  op te nemen <strong>afbeelding</strong> opgeslagen in de map <strong>documenten</strong> map , gebruik de wrapper <strong>viewimage.php</strong> wrapper.<br>Voorbeeld voor een afbeelding in documenten/media (open map voor publieke toegang), syntaxis is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt; </strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> U kunt PHP-code in deze bron opnemen met behulp van labels <strong>&lt;?php ?&gt;</strong>. De volgende globale variabelen zijn beschikbaar: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> U kunt ook inhoud van een andere pagina/container opnemen met de volgende syntaxis:<br><strong>&lt;?php includeContainer('alias_van_de_container_om_op_te_nemen'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> U kunt een omleiding naar een andere pagina/container maken met de volgende syntaxis (Let op: voer geen inhoud uit vóór een omleiding):<br><strong>&lt;?php redirectToContainer('alias_van_container_om_naar_te_omleiden'); ?&gt;</strong><br>U kunt ook een omleiding maken met GET-parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> Om een link naar een andere pagina toe te voegen, gebruikt u de volgende syntaxis:<br><strong>&lt;a href="alias_van_pagina_om_naar_te_linken.php"&gt;mijnlink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> U kunt de paginatitel en <strong>SEO-metatags</strong> (titel, trefwoorden, beschrijving) dynamisch instellen. Definieer eenvoudig de volgende variabelen:<br> <code>$__PAGE__TITLE__ = "Titelwaarde …";</code><br> <code>$__PAGE__KEYWORDS__ = "trefwoord1, trefwoord2, trefwoord3 …"; // Door komma's gescheiden</code><br> <code>$__PAGE__DESC__ = "Beschrijving …";b0088771d5 a6b7z0</p><br><span class="fa fa-download paddingright"></span> Om een <strong>link op te nemen om</strong> een bestand te downloaden dat is opgeslagen in de map <strong>documenten</strong>, gebruikt u de wrapper <strong>document.php</strong>:<br>Voorbeeld, voor een bestand in documenten/ecm (moet worden geregistreerd), is de syntaxis:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Voor een bestand in documenten/media (open directory voor openbare toegang), de syntaxis is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Voor een bestand dat gedeeld wordt met een share link (open access met behulp van de sharing hash key van het bestand), is de syntaxis:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt; </strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Meer voorbeelden van HTML of dynamische code beschikbaar op <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">de wiki-documentatie</a>.<br>
 ClonePage=Kloon pagina/container
 CloneSite=Klonen site
@@ -87,15 +88,15 @@ WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Maak een website-account
 BackToListForThirdParty=Terug naar lijst voor derden
-DisableSiteFirst=Schakel website eerst uit
+DisableSiteFirst=Put website offline first
 MyContainerTitle=De titel van mijn website
 AnotherContainer=Zo neemt u inhoud van een andere pagina / container op (mogelijk hebt u hier een foutmelding als u dynamische code inschakelt omdat de ingesloten subcontainer mogelijk niet bestaat)
 SorryWebsiteIsCurrentlyOffLine=Sorry, deze website is momenteel offline. Kom later terug ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Schakel de website-accounttabel in
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Schakel de tabel in om websiteaccounts (login/wachtwoord) voor elke website/relatie op te slaan
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=U moet eerst de standaard startpagina definiëren
-OnlyEditionOfSourceForGrabbedContentFuture=Waarschuwing: het maken van een webpagina door het importeren van een externe webpagina is voorbehouden aan ervaren gebruikers. Afhankelijk van de complexiteit van de bronpagina kan het importresultaat afwijken van het origineel. Ook als de bronpagina algemene CSS-stijlen of conflicterend JavaScript gebruikt, kan dit het uiterlijk of de functies van de website-editor verstoren wanneer u op deze pagina werkt. Deze methode is een snellere manier om een pagina te maken, maar het wordt aanbevolen om uw nieuwe pagina helemaal opnieuw te maken of op basis van een voorgesteld paginasjabloon.<br>Houd er rekening mee dat de inline-editor mogelijk niet werkt correct bij gebruik op een opgehaalde externe pagina.
-OnlyEditionOfSourceForGrabbedContent=Alleen de HTML-bronversie is mogelijk wanneer inhoud van een externe site is opgehaald
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Importeer ook afbeeldingen gevonden in css en pagina.
 ImagesShouldBeSavedInto=Afbeeldingen moeten worden opgeslagen in de directory
 WebsiteRootOfImages=Hoofdmap voor website-afbeeldingen
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Meld u af bij uw Klant-account
 filteredByVersion=Gefilterd op versie
 removeFilter=Verwijder filter
 viewMyCart=Bekijk mijn winkelwagen
+Shipping=Shipping
 freeShipping=Geen verzendkosten!
 noProducts=Geen producten
 nbrItemsInCart=Er zijn <span class="ajax_cart_quantity">0</span> artikelen in uw winkelwagen.
@@ -284,12 +286,13 @@ productNameAToZ=Productnaam: A tot Z
 productNameZToA=Productnaam: Z tot A
 referenceLowestFirst=Referentie: Laagste eerst
 referenceHighestFirst=Referentie: Hoogste eerst
+productPerPage=products per page
 perPage=per pagina
 showAll=Toon alles
 showing= Tonen
 nbrOfProducts= Er zijn %s producten.
 noResultsHaveBeenFound=Er zijn 0 resultaten gevonden.
-noResultsWereFound= Er zijn geen resultaten gevonden.
+noResultsWereFound=Er zijn geen resultaten gevonden.
 addToCart=Voeg toe aan winkelkar
 backHome=Terugkeren naar huis
 priceDrop=Prijsdaling
@@ -302,10 +305,11 @@ lastUpdate=Laatste update
 contactSupport=Contact opnemen met ondersteuning
 noProductToDisplay=Fout, geen product om weer te geven
 yourCompanyInformation=Uw bedrijf-gegevens
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=Deze e-mail is al geregistreerd.
 firstnameContainsLettersOnly=<b>Voornaam</b> mag alleen letters en spaties bevatten
 lastnameContainsLettersOnly=<b>Achternaam</b> mag alleen letters en spaties bevatten
-passwordCriteria=<b>Wachtwoord</b> moet aan de volgende criteria voldoen:<br>- 12 tekens<br>- 1 hoofdletter<br>- 1 cijfer<br>- Geen speciale tekens<br>- Vermijd het vaker dan drie keer herhalen van tekens<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=Er is een fout opgetreden.
 accountCreation=Account aanmaken
 errorsOccurred=Er is een %s fout%s
@@ -357,3 +361,7 @@ subtract=Aftrekken
 LoginCheckout=Inloggen en doorgaan naar afrekenen
 paymentSuccessProcessed=Uw betaling is succesvol verwerkt.
 youWillBeRedirectedToOrderPage=U wordt binnenkort doorgestuurd naar de Bestelling detailpagina.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 024eb4b0599..655f77de766 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Sprawdzenie integralności plików przebiegł
 FileIntegritySomeFilesWereRemovedOrModified=Sprawdzenie integralności plików zakończylo się niepowodzeniem. Niektóre pliki zostaly zmodyfikowane, usunięte lub dodane.
 GlobalChecksum=Globalna suma kontrolna
 MakeIntegrityAnalysisFrom=Wykonaj analizę integralności plików aplikacji z
-LocalSignature=Wbudowany podpis lokalny (mniej niezawodny)
-RemoteSignature=Zdalny odległy podpis (bardziej niezawodny)
+LocalSignature=Wbudowany podpis lokalny
+RemoteSignature=Zdalny podpis
 FilesMissing=Brakujące pliki
 FilesUpdated=Aktualizacja plików
 FilesModified=Zmodyfikowane pliki
@@ -88,8 +88,8 @@ SearchString=Szukana fraza
 NotAvailableWhenAjaxDisabled=Niedostępne kiedy Ajax nie działa
 AllowToSelectProjectFromOtherCompany=Na dokumencie kontrahenta można wybrać projekt powiązany z innym kontrahentem
 TimesheetPreventAfterFollowingMonths=Zapobiegaj rejestrowaniu czasu spędzonego po upływie kolejnej liczby miesięcy
-PROJECT_DISPLAY_LINKED_BY_CONTACT=Display project linked by a common contact
-PROJECT_DISPLAY_LINKED_BY_CONTACT_help=This option adds a new list on Project tab with all projects linked to thirdparty via a contact relationship
+PROJECT_DISPLAY_LINKED_BY_CONTACT=Wyświetl projekt połączony wspólnym kontaktem
+PROJECT_DISPLAY_LINKED_BY_CONTACT_help=Ta opcja dodaje nową listę na karcie Projekt ze wszystkimi projektami powiązanymi z kontrahentami za pośrednictwem relacji kontaktowej
 JavascriptDisabled=JavaScript wyłączony
 UsePreviewTabs=Użyj podgląd karty
 ShowPreview=Pokaż podgląd
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Używane przez niektórych opcji porządku obrad tylko
 Security=Bezpieczeństwo
 Passwords=Hasła
 DoNotStoreClearPassword=Szyfruj hasła przechowywane w bazie danych.
-MainDbPasswordFileConfEncrypted=Zaszyfruj hasło do bazy danych przechowywane w pliku conf.php. Zdecydowanie zaleca się aktywowanie tej opcji.
+MainDbPasswordFileConfEncrypted=Zaciemnij hasło bazy danych zapisane w conf.php. Zaleca się aktywowanie tej opcji.
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Chroń wygenerowane pliki PDF. To NIE jest zalecane, ponieważ przerywa generowanie zbiorczego pliku PDF.
@@ -303,13 +303,13 @@ MAIN_MAIL_AUTOCOPY_TO= Kopiuj (Cc) wszystkie wysłane emaile do
 MAIN_DISABLE_ALL_MAILS=Wyłącz wysyłanie wszystkich wiadomości e-mail (do celów testowych lub pokazów)
 MAIN_MAIL_FORCE_SENDTO=Zamiast do prawdziwych odbiorców wysyłaj wszystkie wiadomości e-mail do (wprowadzone w celach testowych)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Sugeruj adresy e-mail pracowników (jeśli są zdefiniowane) na liście proponowanych odbiorców, dostępnej podczas pisania nowej wiadomości e-mail
-MAIN_MAIL_NO_WITH_TO_SELECTED=Disable the selection of a default recipient when writing an email, even if there is only 1 possible choice
+MAIN_MAIL_NO_WITH_TO_SELECTED=Wyłącz wybór domyślnego odbiorcy podczas pisania wiadomości e-mail, nawet jeśli jest tylko 1 możliwy wybór
 MAIN_MAIL_SENDMODE=Metoda wysyłki
 MAIN_MAIL_SMTPS_ID=SMTP username or ID (if sending server requires an authentication)
 MAIN_MAIL_SMTPS_PW=SMTP password or token (if sending server requires an authentication)
 MAIN_MAIL_EMAIL_TLS=Użyj szyfrowania TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Użyj szyfrowania TLS (STARTTLS)
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Allow connection to mail servers that are using self-signed certificates
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Zezwalaj na połączenie z serwerami pocztowymi, które używają certyfikatów podpisanych przez siebie
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Użyj metody uwierzytelniania DKIM do generowania podpisu e-mail
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domena email do użycia z kluczem dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Nazwa selektora DKIM
@@ -374,7 +374,7 @@ GenericMaskCodes4c=<u>Przykład produktu utworzonego 2023-01-31: </u><br>
 GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
 GenericMaskCodes5b=<b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
 GenericNumRefModelDesc=Zwraca numer wysyłki zgodnie z zdefiniowaną maską
-DateStartThatModel=Disable use of this numbering rule for all thirdparties created before
+DateStartThatModel=Wyłącz użycie tej reguły numeracji dla wszystkich utworzonych wcześniej stron trzecich
 DateStartThatModelHelp=You can disable elephant numbering rule for thirdparties created before a date (for example, because they were imported by a migration, from another software using a different rule). Let that field empty to have the rule applied on all thirdparties.
 ServerAvailableOnIPOrPort=Serwer dostępny jest pod <b>adresem %s</b> na <b>porcie %s</b>
 ServerNotAvailableOnIPOrPort=Serwer nie jest dostępna pod <b>adresem %s</b> na <b>porcie %s</b>
@@ -397,7 +397,7 @@ LanguageFile=Plik języka
 ExamplesWithCurrentSetup=Przykłady z aktualną konfiguracją
 ListOfDirectories=Lista katalogów szablonów OpenDocument
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS template files found
+NumberOfModelFilesFound= Liczba znalezionych plików szablonów ODT/ODS
 ExampleOfDirectoriesForModelGen=Przykłady składni: <br> c:\\myapp\\mydocumentdir\\mysubdir <br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Aby dowiedzieć się jak stworzyć szablony dokumentów odt, przed zapisaniem ich w katalogach, zapoznaj się z dokumentacją wiki:
 FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
@@ -459,15 +459,16 @@ ExtrafieldSelectList=Wybierz z tabeli
 ExtrafieldSeparator=Separator (nie pole)
 ExtrafieldPassword=Hasło
 ExtrafieldRadio=Radio buttons (1 choice only)
-ExtrafieldCheckBox=Select list (n choices)
+ExtrafieldCheckBox=Wybierz listę (n opcji)
 ExtrafieldCheckBoxFromList=Select from table (n choices)
 ExtrafieldLink=Link do obiektu
-ExtrafieldPointGeo=Geometric Point
-ExtrafieldMultiPointGeo=Geometric Multi Point
+ExtrafieldPointGeo=Punkt geometryczny
+ExtrafieldMultiPointGeo=Geometryczy wielopunkt
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Gwiazdy
 ComputedFormula=Obliczone pole
-ComputedFormulaDesc=Można tu wprowadzić formułę korzystającą z innych właściwości obiektu lub dowolnego kodu PHP, aby otrzymać dynamicznie obliczoną wartość. Możesz użyć dowolnych formuł zgodnych z PHP, w tym „?” operator warunku i następujący obiekt globalny: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>OSTRZEŻENIE</strong>: Jeśli potrzebujesz właściwości obiektu nie został załadowany, po prostu pobierz obiekt do formuły, jak w drugim przykładzie.<br>Korzystanie z pola obliczeniowego oznacza, że nie możesz wprowadzić żadnej wartości z interfejsu. Ponadto jeśli wystąpi błąd składniowy, formuła może nic nie zwrócić.<br><br>Przykład formuły:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Przykład ponownego załadowania obiektu<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj- >capital / 5: '-1')<br><br>Inny przykład formuły wymuszającej ładowanie obiektu i jego obiektu nadrzędnego: <br>(($reloadedobj = nowe zadanie($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($ secondloadedobj = nowy projekt( $db)) && ($ secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0))? $ secondloadedobj->ref: „Nie znaleziono projektu nadrzędnego”
+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'
 Computedpersistent=Zapisz obliczone pole
 ComputedpersistentDesc=Obliczone dodatkowe pola zostaną zapisane w bazie danych, jednak wartość zostanie przeliczona tylko wtedy, gdy obiekt tego pola zostanie zmieniony. Jeśli obliczone pole zależy od innych obiektów lub danych globalnych, ta wartość może być nieprawidłowa !!
 ExtrafieldParamHelpPassword=Pozostawienie tego pola pustego oznacza, że wartość będzie przechowywana BEZ szyfrowania (pole jest po prostu ukryte i oznaczone gwiazdkami na ekranie). <br><br>Wprowadź wartość „dolcrypt”, aby zakodować wartość za pomocą odwracalnego algorytmu szyfrowania. Wyczyszczone dane można nadal przeglądać i edytować, ale są one szyfrowane w bazie danych. <br><br>Wpisz „auto” (lub „md5”, „sha256”, „password_hash”, ...), aby użyć domyślnego algorytmu szyfrowania hasła (lub md5, sha256, hasło_hash ...), aby zapisać nieodwracalne zaszyfrowane hasło w bazie danych (nie ma możliwości odzyskania oryginalnej wartości)
@@ -519,10 +520,10 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Używanie serwera SMTP własnego dostawcy usług pocztowych do wysyłania e-maili jest również interesujące, ponieważ wszystkie e-maile wysyłane z aplikacji będą również zapisywane w katalogu „Wysłane” Twojej skrzynki pocztowej.
 WarningPHPMailD=Zaleca się zmianę sposobu wysyłania wiadomości e-mail na wartość „SMTP”.
 WarningPHPMailDbis=Jeśli naprawdę chcesz zachować domyślną metodę wysyłania e-maili „PHP”, po prostu zignoruj to ostrzeżenie lub usuń je %sklikając tutaj%s.
-WarningPHPMail2=Jeśli Twój dostawca poczty e-mail SMTP musi ograniczyć klienta poczty e-mail do niektórych adresów IP (bardzo rzadko), jest to adres IP agenta użytkownika poczty (MUA) dla aplikacji ERP CRM: <strong> %s </strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
-SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
+SPFAndDMARCInformation=Rekord DNS SPF i DMARC dla głównych adresów e-mail
 ActualMailDNSRecordFound=Actual %s record found (for email %s) : %s
 ClickToShowDescription=Kliknij aby zobaczyć opis
 DependsOn=Ten moduł wymaga modułu
@@ -544,7 +545,7 @@ WatermarkOnDraftExpenseReports=Znak wodny na projektach raportów z wydatków
 ProjectIsRequiredOnExpenseReports=Projekt jest obowiązkowy do wprowadzenia raportu z wydatków
 PrefillExpenseReportDatesWithCurrentMonth=Wstępnie wypełnij daty rozpoczęcia i zakończenia nowego raportu wydatków datami rozpoczęcia i zakończenia bieżącego miesiąca
 ForceExpenseReportsLineAmountsIncludingTaxesOnly=Wymuś wprowadzenie kwot raportu wydatków zawsze w kwocie zawierającej podatki
-BlockExpenseReportLineCreationIfNotBetweenDates=Block line creation if the date of the added line is not in the expense report range
+BlockExpenseReportLineCreationIfNotBetweenDates=Zablokuj utworzenie wiersza, jeśli data dodanego wiersza nie mieści się w zakresie raportu wydatków
 AttachMainDocByDefault=Ustaw tę opcję na <b>Tak</b>, jeśli chcesz domyślnie załączyć dokument główny do wiadomości e-mail (jeśli ma to zastosowanie)
 FilesAttachedToEmail=Załącz plik
 SendEmailsReminders=Wysyłaj przypomnienia o agendzie pocztą elektroniczną
@@ -567,8 +568,8 @@ Module10Name=Księgowość (uproszczona)
 Module10Desc=Proste raporty księgowe (dzienniki, obroty) na podstawie zawartości bazy danych. Nie używa żadnej tabeli księgi.
 Module20Name=Propozycje
 Module20Desc=Zarządzanie propozycjami reklam
-Module22Name=Masowe wiadomości e-mail
-Module22Desc=Zarządzaj masowym wysyłaniem e-maili
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energia
 Module23Desc=Monitorowanie zużycia energii
 Module25Name=Zlecenia sprzedaży
@@ -800,7 +801,7 @@ Permission116=Przelewy pomiędzy rachunkami
 Permission117=Zarządzaj wysyłaniem czeków
 Permission121=Przeglądaj kontrahentów związanych z użytkownikiem
 Permission122=Tworzenie / modyfikacja stron trzecich związanych z użytkownikiem
-Permission122b=Not effective for external users (always limited to their third party).
+Permission122b=Nieskuteczne dla użytkowników zewnętrznych (zawsze ograniczone do ich osób trzecich).
 Permission125=Usuń kontrahentów związanych z użytkownikiem z użytkownikiem
 Permission126=Eksport stron trzecich
 Permission130=Twórz/modyfikuj informacje o płatnościach kontrahentów
@@ -847,10 +848,10 @@ Permission212=Zamów linie
 Permission213=Uaktywnij linię
 Permission214=Konfiguracja Telefonii
 Permission215=Konfiguracja dostawców
-Permission221=Czytaj listy emailowe
-Permission222=Tworzenie / modyfikacja list emailowych (tematów, odbiorców ...)
-Permission223=Walidacja list emailowych (umożliwia wysyłanie)
-Permission229=Usuń listy emailowe
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Zobacz odbiorców oraz informacje
 Permission238=Ręczne wysyłanie list emailowych
 Permission239=Usuń wysyłki po zatwierdzeniu lub wysłany
@@ -867,8 +868,8 @@ Permission254=Tworzenie / modyfikacja jedynie zewnętrznych użytkowników
 Permission255=Modyfikacja haseł innych użytkowników
 Permission256=Usuń lub dezaktywuj innych użytkowników
 Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is linked as a sale representative).
-Permission262b=Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).
-Permission262c=Not effective for projects (only rules on project permissions, visibility and users assignment matter).
+Permission262b=Nieskuteczne dla użytkowników zewnętrznych (zawsze ograniczających się do siebie w przypadku ofert, zamówień, faktur, umów itp.).
+Permission262c=Nieskuteczne w przypadku projektów (liczą się tylko zasady dotyczące uprawnień projektu, widoczności i przypisania użytkowników).
 Permission263=Rozszerz dostęp na wszystkie osoby trzecie BEZ ich przedmiotu (nie tylko osoby trzecie, dla których użytkownik jest przedstawicielem handlowym). <br> Nieefektywne dla użytkowników zewnętrznych (zawsze ograniczone do siebie samych w przypadku ofert, zamówień, faktur, umów itp.). <br> Nieefektywne dla projektów (tylko reguły dotyczące pozwoleń na projekty, widoczności i przydziałów mają znaczenie).
 Permission271=Czytaj CA
 Permission272=Czytaj faktury
@@ -932,7 +933,7 @@ Permission651=Przeczytaj listy materiałów
 Permission652=Utwórz/zaktualizuj listy materiałów
 Permission653=Usuń listy materiałów
 Permission661=Przeczytaj zamówienie produkcyjne (MO)
-Permission662=Utwórz/zaktualizuj zamówienie produkcyjne (MO)
+Permission662=Utwórz/zaktualizuj zlecenie produkcyjne (MO)
 Permission663=Usuń zlecenie produkcyjne (MO)
 Permission701=Zobacz darowizny
 Permission702=Tworzenie / modyfikacja darowizn
@@ -1105,6 +1106,7 @@ DictionaryStaff=Liczba zatrudnionych
 DictionaryAvailability=Opóźnienie dostawy
 DictionaryOrderMethods=Metody składania zamówień
 DictionarySource=Źródła dla ofert i zamówień
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Spersonalizowane grupy raportów
 DictionaryAccountancysystem=Modele dla planu kont
 DictionaryAccountancyJournal=Dzienniki księgowe
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Powrót do listy słowników
 TypeOfRevenueStamp=Rodzaj znaku skarbowego
 VATManagement=Zarządzanie podatkami od sprzedaży
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Domyślnie proponowany podatek od sprzedaży wynosi 0 i może być stosowany w przypadkach takich jak stowarzyszenia, osoby fizyczne lub małe firmy.
 VATIsUsedExampleFR=We Francji oznacza to firmy lub organizacje posiadające rzeczywisty system podatkowy (rzeczywisty uproszczony lub normalny). System, w którym deklarowany jest podatek VAT.
 VATIsNotUsedExampleFR=We Francji oznacza to stowarzyszenia, które nie są zadeklarowane jako podatek od sprzedaży lub firmy, organizacje lub wolne zawody, które wybrały system podatkowy dla mikroprzedsiębiorstw (podatek od sprzedaży na zasadzie franczyzy) i zapłaciły franczyzę Podatek obrotowy bez żadnej deklaracji podatkowej. Ten wybór spowoduje wyświetlenie na fakturach odniesienia „Nie dotyczy podatku od sprzedaży - art-293B CGI”.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Rodzaj podatku od sprzedaży
 LTRate=Stawka
@@ -1174,7 +1176,8 @@ NoLocalTaxXForThisCountry=Zgodnie z konfiguracją podatków (patrz %s - %s - %s)
 LabelUsedByDefault=Wytwórnia używany domyślnie, jeśli nie można znaleźć tłumaczenie dla kodu
 LabelOnDocuments=Etykieta na dokumenty
 LabelOrTranslationKey=Etykieta lub klucz tłumaczenia
-TranslationFound=Translation found
+LabelTranslatedInCurrentLanguage=Label translated in current language
+TranslationFound=Znaleziono tłumaczenie
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Klucz tłumaczenia
 ValueOfConstantKey=Wartość stałej konfiguracji
@@ -1216,7 +1219,7 @@ Skin=Skórka
 DefaultSkin=Domyślna skórka
 MaxSizeList=Max length for lists
 DefaultMaxSizeList=Domyślna maksymalna długość listy
-MaxSizeShortList=Max length for short lists
+MaxSizeShortList=Maksymalna długość krótkich list
 DefaultMaxSizeShortList=Domyślna maksymalna długość krótkich list (np. Na karcie klienta)
 DisplayGrandTotalInList=Display grand total (for all pages) in lists footer
 MessageOfDay=Wiadomość dnia
@@ -1227,7 +1230,7 @@ PermanentLeftSearchForm=Stały formularz wyszukiwania w lewym menu
 DefaultLanguage=Domyślny język
 EnableMultilangInterface=Włącz obsługę wielu języków dla relacji z klientami lub dostawcami
 EnableShowLogo=Show the company logos in the menu
-THEME_MENU_COLORLOGO=Show main menu images in color
+THEME_MENU_COLORLOGO=Pokaż w kolorze obrazy głównego menu
 CompanyInfo=Firma/Organizacja
 CompanyIds=Dane identyfikacyjne firmy/organizacji
 CompanyAddress=Adres
@@ -1431,7 +1434,7 @@ AddVatInList=Wyświetlaj numer VAT odbiorcy/dostawcy na listach kombi.
 AddAdressInList=Wyświetlaj adresy klientów/dostawców na listach kombi.<br>Nazwa firm zewnętrznych będzie wyświetlana w formacie „The Big Company corp. - 21 jump street 123456 Big Town – USA” zamiast „ Korporacja Wielkiej Kompanii”.
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Zapytaj o preferowaną metodę wysyłki dla stron trzecich.
-FieldEdition=Edycja pola %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Przykład: +2 (wypełnić tylko w przypadku strefy czasowej w stosunku problemy są doświadczeni)
 GetBarCode=Pobierz kod kreskowy
 NumberingModules=Model numeracji
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Siły daty wystawienia faktury do walidacji daty
 SuggestedPaymentModesIfNotDefinedInInvoice=Sugerowany tryb płatności na fakturze domyślnie, jeśli nie został zdefiniowany na fakturze
 SuggestPaymentByRIBOnAccount=Zaproponuj płatność poprzez wypłatę na konto
 SuggestPaymentByChequeToAddress=Zaproponuj płatność czekiem na
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Wolny tekst na fakturach
 WatermarkOnDraftInvoices=Znak wodny na projekt faktury (brak jeśli pusty)
 PaymentsNumberingModule=Model numeracji płatności
@@ -1718,6 +1723,7 @@ CompressionOfResources=Kompresja odpowiedzi HTTP
 CompressionOfResourcesDesc=Na przykład przy użyciu dyrektywy Apache „AddOutputFilterByType DEFLATE”
 TestNotPossibleWithCurrentBrowsers=Taka automatyczna detekcja nie jest możliwe przy obecnych przeglądarek
 DefaultValuesDesc=Tutaj możesz zdefiniować domyślną wartość, której chcesz użyć podczas tworzenia nowego rekordu i/lub domyślne filtry lub kolejność sortowania podczas tworzenia listy rekordów.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Wartości domyślne (do użycia w formularzach)
 DefaultSearchFilters=Domyślne filtry wyszukiwania
 DefaultSortOrder=Domyślna kolejność sortowania
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Model numeracji wysyłek
 SendingsAbility=Obsługuj arkusze wysyłkowe dla dostaw do klientów
 NoNeedForDeliveryReceipts=W większości przypadków arkusze wysyłkowe są używane zarówno jako arkusze dostaw do klientów (lista produktów do wysłania), jak i arkusze, które są odbierane i podpisywane przez klienta. W związku z tym pokwitowanie dostaw produktów jest funkcją zduplikowaną i rzadko jest aktywowane.
 FreeLegalTextOnShippings=Dowolny tekst sprawie przemieszczania
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Model numeracji potwierdzeń dostaw produktów
 DeliveryOrderModel=Produkty dostaw otrzymania modelu
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Dowolny tekst na dokumentach dostawy
 ##### FCKeditor #####
 AdvancedEditor=Zaawansowany edytor
 ActivateFCKeditor=Uaktywnij FCKeditor za:
-FCKeditorForNotePublic=Tworzenie/edycja WYSIWYG pola „notatki publiczne” elementów
-FCKeditorForNotePrivate=Tworzenie/edycja WYSIWYG pola „prywatne notatki” elementów
-FCKeditorForCompany=Tworzenie/edycja WYSIWYG pola opisu elementów (z wyjątkiem produktów/usług)
-FCKeditorForProductDetails=Tworzenie/edycja WYSIWYG opisów produktów lub linii obiektów (linie ofert, zamówień, faktur itp.).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Ostrzeżenie: użycie tej opcji w tym przypadku nie jest zdecydowanie zalecane, ponieważ może powodować problemy ze znakami specjalnymi i formatowaniem strony podczas tworzenia plików PDF.
-FCKeditorForMailing= Tworzenie/edycja WYSIWYG dla masowych eMailingów (Narzędzia->eMailing)
-FCKeditorForUserSignature=Tworzenie/edycja podpisu użytkownika WYSIWYG
-FCKeditorForMail=Tworzenie/edycja WYSIWYG dla całej poczty (z wyjątkiem Narzędzia->eMailing)
-FCKeditorForTicket=Tworzenie/edycja WYSIWYG dla biletów
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Konfiguracja modułu magazynowego
 IfYouUsePointOfSaleCheckModule=Jeśli korzystasz z modułu punktu sprzedaży (POS) dostarczanego domyślnie lub modułu zewnętrznego, ta konfiguracja może zostać zignorowana przez moduł POS. Większość modułów POS jest domyślnie zaprojektowana do natychmiastowego tworzenia faktury i zmniejszania zapasów niezależnie od dostępnych tutaj opcji. Jeśli więc chcesz lub nie chcesz mieć spadku zapasów podczas rejestrowania sprzedaży w punkcie sprzedaży, sprawdź również konfigurację modułu POS.
@@ -1867,7 +1874,6 @@ Buy=Kupić
 Sell=Sprzedać
 InvoiceDateUsed=Data użyta na fakturze
 YourCompanyDoesNotUseVAT=Twoja firma została zdefiniowana tak, aby nie używać podatku VAT (Strona Główna - Ustawienia - Firma/Organizacja), więc nie ma opcji dotyczących podatku VAT do skonfigurowania.
-AccountancyCode=Kod księgowy
 AccountancyCodeSell=Rachunek sprzedaży. kod
 AccountancyCodeBuy=Kup konto. kod
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Podczas tworzenia nowego podatku pozostaw domyślnie puste pole wyboru „Automatycznie utwórz płatność”
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Który widok chcesz otworzyć domyślnie po wybraniu menu
 AGENDA_EVENT_PAST_COLOR = Kolor poprzedniego wydarzenia
 AGENDA_EVENT_CURRENT_COLOR = Kolor bieżącego wydarzenia
 AGENDA_EVENT_FUTURE_COLOR = Kolor przyszłego wydarzenia
-AGENDA_REMINDER_BROWSER = Włącz przypomnienie o zdarzeniu <b> w przeglądarce użytkownika </b> (Kiedy nadejdzie data przypomnienia, przeglądarka wyświetli wyskakujące okienko. Każdy użytkownik może wyłączyć takie powiadomienia w ustawieniach powiadomień przeglądarki).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Włącz powiadomienia dźwiękowe
-AGENDA_REMINDER_EMAIL = Włącz przypomnienie o wydarzeniu <b> przez e-mail </b> (opcję przypomnienia / opóźnienie można zdefiniować dla każdego zdarzenia).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Uwaga: Częstotliwość zaplanowanego zadania %s musi być wystarczająca, aby przypomnienie zostało wysłane we właściwym momencie.
 AGENDA_SHOW_LINKED_OBJECT = Pokaż połączony obiekt w widoku planu zajęć
 AGENDA_USE_EVENT_TYPE = Użyj typów wydarzeń (zarządzanych w menu Ustawienia -> Słowniki -> Typ wydarzeń w programie)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Automatycznie ustaw tę domyślną wartość dla typu zdarzenia w formularzu tworzenia wydarzenia
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Klucz do wywozu zezwolić na link
 PastDelayVCalExport=Nie starsze niż eksport przypadku
 SecurityKey = Klucz bezpieczeństwa
@@ -2006,7 +2017,7 @@ BackupZipWizard=Kreator do utworzenia archiwum katalogu dokumentów
 SomethingMakeInstallFromWebNotPossible=Instalacja zewnętrznych modułów za pomocą interfejsu sieciowego nie jest możliwa z powodu następujących przyczyn:
 SomethingMakeInstallFromWebNotPossible2=Z tego powodu, proces ulepszenia (upgrade) jest procesem ręcznym, przeprowadzanym jedynie przez użytkownika uprzywilejowanego.
 InstallModuleFromWebHasBeenDisabledContactUs=Instalacja lub rozwój modułów zewnętrznych lub dynamicznych stron internetowych z poziomu aplikacji jest obecnie zablokowana ze względów bezpieczeństwa. Jeśli chcesz włączyć tę funkcję, skontaktuj się z nami.
-InstallModuleFromWebHasBeenDisabledByFile=Instalacja zewnętrznych modułów z poziomu aplikacji została wyłączona przez administratora. Musisz poprosić go o usunięcie pliku <strong>%s</strong> aby włączyć odpowiednią funkcję.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Instalowanie lub budowanie modułu zewnętrznego z poziomu Dolibarr wymaga zapisania plików modułu w katalogu <strong>%s</strong>. Dolibarr będzie przetwarzał ten katalog jeśli w pliku <strong>conf/conf.php</strong> będzie miał odpowiednie wpisy:<br><strong>$dolibarr_main_url_root_alt='/ custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Podświetl kolor linii, gdy mysz przesuwa się nad linią (użyj „ffffff”, aby nie podświetlać)
@@ -2036,6 +2047,7 @@ Enter0or1=Wpisz 0 lub 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Wpisz między nawiasami kwadratowymi wielkość dziesiętną Unicode reprezentującą symbol waluty. Na przykład: dla $ [36] - dla zł [122,322] - dla € wpisz [8364]
 ColorFormat=Kolor RGB jest w formacie HEX, np .: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Nazwa ikony w formacie:<br>- image.png dla pliku obrazu do bieżącego katalogu motywu<br>- image.png@module jeśli plik znajduje się w katalogu /img/ modułu<br>- fa-xxx dla FontAwesome fa-xxx picto<br>- Fontawesome_xxx_fa_color_size dla obrazu FontAwesome fa-xxx (z ustawionym przedrostkiem, kolorem i rozmiarem)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Stawka podatku od sprzedaży
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Ukryj obramowania ramki adresu nadawcy
 MAIN_PDF_NO_RECIPENT_FRAME=Ukryj obramowania ramki adresu odbiorcy
 MAIN_PDF_HIDE_CUSTOMER_CODE=Ukryj kod klienta
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Ukryj nazwę nadawcy/firmy w bloku adresowym
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Ukryj warunki płatności
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Ukryj tryb płatności
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2273,7 +2290,7 @@ ConfirmDeleteEmailCollector=Czy na pewno chcesz usunąć tego kolektora e-maili?
 RecipientEmailsWillBeReplacedWithThisValue=E-maile adresatów będą zawsze zastępowane tą wartością
 AtLeastOneDefaultBankAccountMandatory=Należy zdefiniować co najmniej 1 domyślne konto bankowe
 RESTRICT_ON_IP=Zezwalaj na dostęp API tylko do określonych adresów IP klientów (niedozwolony symbol wieloznaczny, użyj spacji między wartościami). Pusty oznacza, że dostęp mają wszyscy klienci.
-StaticIPsOfUsers=If applicable, list of all static IPs of users
+StaticIPsOfUsers=Jeśli ma to zastosowanie, lista wszystkich statycznych adresów IP użytkowników
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Oparty na wersji biblioteki SabreDAV
 NotAPublicIp=To nie jest publiczny adres IP
@@ -2289,7 +2306,7 @@ THIRDPARTY_ALIAS=Nazwa strony trzeciej — alias strony trzeciej
 ALIAS_THIRDPARTY=Alias strony trzeciej — nazwa strony trzeciej
 PDFIn2Languages=Pokaż etykiety w pliku PDF w 2 różnych językach (ta funkcja może nie działać w przypadku niektórych języków)
 PDF_USE_ALSO_LANGUAGE_CODE=Jeśli chcesz, aby niektóre teksty w pliku PDF zostały skopiowane w 2 różnych językach w tym samym wygenerowanym pliku PDF, musisz ustawić tutaj ten drugi język, aby wygenerowany plik PDF zawierał 2 różne języki na tej samej stronie, ten wybrany podczas generowania pliku PDF i ten ( tylko kilka szablonów PDF to obsługuje). Pozostaw puste dla 1 języka na plik PDF.
-PDF_USE_A=PDF documents format
+PDF_USE_A=Format dokumentów PDF
 FafaIconSocialNetworksDesc=Wpisz tutaj kod ikony FontAwesome. Jeśli nie wiesz, co to jest FontAwesome, możesz użyć ogólnej wartości fa-address-book.
 RssNote=Uwaga: każda definicja źródła danych RSS zawiera widżet, który należy włączyć, aby był dostępny na pulpicie nawigacyjnym
 JumpToBoxes=Przejdź do Ustawienia -> Widżety
@@ -2324,6 +2341,8 @@ NotRecommended=Niepolecane
 ARestrictedPath=Niektóre ograniczone ścieżki do plików danych
 CheckForModuleUpdate=Sprawdź aktualizacje modułów zewnętrznych
 CheckForModuleUpdateHelp=Ta akcja połączy się z edytorami zewnętrznych modułów, by sprawdzić dostępność ich nowych wersji.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Aktualizacja jest dostępna
 NoExternalModuleWithUpdate=Nie znaleziono aktualizacji dla modułów zewnętrznych
 SwaggerDescriptionFile=Plik opisu Swagger API (na przykład, do użytku z redoc)
@@ -2395,8 +2414,10 @@ INVOICE_ADD_EPC_QR_CODE=Show the EPC QR code on invoices (with a bank account de
 INVOICE_ADD_EPC_QR_CODEMore=This feature allows you to add or remove an EPC QR Code on your invoices, which facilitates automatic SEPA credit transfers. Enabling this option helps your clients make payments easily by scanning the QR code, reducing manual entry errors. Use this feature if you have clients in countries like Austria, Belgium, Finland, Germany, and the Netherlands where this system is supported. Disable it if it's not required for your business operations or client base.
 INVOICE_SHOW_SHIPPING_ADDRESS=Pokaż adres wysyłki
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Wskazanie obowiązkowe w niektórych krajach (Francja, ...)
-SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
+SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Pokaż kontakt proponowany do rozliczeń
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Adres URL sieci społecznościowej. Użyj {socialid} jako części zmiennej zawierającej identyfikator sieci społecznościowej.
 IfThisCategoryIsChildOfAnother=Jeśli ta kategoria jest dzieckiem innej
 DarkThemeMode=Tryb ciemny
@@ -2410,7 +2431,7 @@ HideAdvancedoptions= Ukryj opcje zaawansowane
 OauthNotAvailableForAllAndHadToBeCreatedBefore=Uwierzytelnianie OAUTH2 nie jest dostępne dla wszystkich hostów, a token z odpowiednimi uprawnieniami musiał zostać utworzony przed modułem OAUTH
 MAIN_MAIL_SMTPS_OAUTH_SERVICE=Usługa uwierzytelniania OAUTH2
 DontForgetCreateTokenOauthMod=Token z odpowiednimi uprawnieniami musiał zostać utworzony wcześniej za pomocą modułu OAUTH
-AuthenticationMethod=Authentication method
+AuthenticationMethod=Metoda Uwierzytelnienia
 MAIN_MAIL_SMTPS_AUTH_TYPE=Metoda Uwierzytelnienia
 UsePassword=Użyj hasła
 UseAUTHLOGIN=Use a password (AUTH LOGIN)
@@ -2442,7 +2463,7 @@ DesktopsAndSmartphones=Komputery stacjonarne i smartfony
 AllowOnlineSign=Zezwalaj na podpisywanie online
 AllowExternalDownload=Zezwalaj na pobieranie zewnętrzne (bez logowania, przy użyciu udostępnionego linku)
 DeadlineDayVATSubmission=Ostateczny termin złożenia deklaracji VAT w następnym miesiącu
-MaxNumberOfAttachementOnForms=Max number of joined files in a form
+MaxNumberOfAttachementOnForms=Maksymalna liczba połączonych plików w formularzu
 IfDefinedUseAValueBeetween=Jeśli zdefiniowano, użyj wartości od %s do %s
 Reload=Przeładować
 ConfirmReload=Potwierdź ponowne załadowanie modułu
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Uwaga: moduł %s ustawił param
 WarningModuleHasChangedSecurityCsrfParameter=Ostrzeżenie: moduł %s wyłączył zabezpieczenia CSRF Twojej instancji. To działanie jest podejrzane i Twoja instalacja może nie być już zabezpieczona. Aby uzyskać wyjaśnienia, skontaktuj się z autorem modułu.
 EMailsInGoingDesc=Przychodzące e-maile zarządzane są przez moduł %s. Musisz ją włączyć i skonfigurować, jeśli chcesz obsługiwać przychodzące wiadomości e-mail.
 MAIN_IMAP_USE_PHPIMAP=Użyj biblioteki PHP-IMAP dla IMAP zamiast natywnego PHP IMAP. Pozwala to również na wykorzystanie połączenia OAuth2 dla IMAP (musi być także aktywowany moduł OAuth).
-MAIN_CHECKBOX_LEFT_COLUMN=Pokaż kolumnę wyboru pola i linii po lewej stronie (domyślnie po prawej)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Nie jest tworzony domyślnie. Utworzono wyłącznie po aktywacji modułu.
 CSSPage=Styl CSS
 Defaultfortype=Domyślny
@@ -2489,7 +2510,7 @@ AiDescription=Funkcje AI (Sztucznej Inteligencji)
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Pokaż adres wysyłki
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Pokaż analizę vat według stawki
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorytm dla: %s
+SensitiveData=Dane wrażliwe
+ToolToDecryptAString=Narzędzie do odszyfrowania ciągu znaków
+Decrypt=Odszyfruj
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index d6a03be111f..4fee34dba70 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Saldo końcowe
 CurrentBalance=Saldo bieżące
 FutureBalance=Przyszłe saldo
 ShowAllTimeBalance=Pokaż saldo od początku
-AllTime=Od początku
 Reconciliation=Rekoncyliacja - uzgadanie stanów kont bankowych
 RIB=Numer konta bankowego
 IBAN=Numer IBAN
@@ -133,7 +132,7 @@ DeleteTransaction=Usuń wpis
 ConfirmDeleteTransaction=Czy jesteś pewien, że chcesz usunąć te wpis?
 ThisWillAlsoDeleteBankRecord=To usunie wygenerowany wpis bankowy
 BankMovements=Ruchy
-PlannedTransactions=Zaplanowane wpisy
+PlannedTransactions=Upcoming entries
 Graph=Wykresy
 ExportDataset_banque_1=Wpisy bankowe i stan konta
 ExportDataset_banque_2=Odcinek wpłaty
@@ -151,7 +150,7 @@ FutureTransaction=Przyszła transakcja. Nie można się pogodzić.
 SelectChequeTransactionAndGenerate=Wybierz/przefiltruj czeki, które mają znaleźć się na potwierdzeniu wpłaty czeku. Następnie kliknij „Utwórz”.
 SelectPaymentTransactionAndGenerate=Wybierz/filtruj dokumenty, które mają znaleźć się na %s potwierdzeniu wpłaty. Następnie kliknij „Utwórz”.
 InputReceiptNumber=Wybierz wyciąg bankowy związany z postępowaniem pojednawczym. Użyj sortowalnej wartości liczbowej
-InputReceiptNumberBis=RRRRMM lub RRRRMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Do zaksięgowania?
 ThenCheckLinesAndConciliate=Następnie sprawdź linie obecne w wyciągu bankowym i kliknij
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Jeśli ta funkcja jest włączona, możesz wybrać okre
 BankColorizeMovementName1=Kolor tła dla przelewu debetowego
 BankColorizeMovementName2=Kolor tła dla przesunięcia kredytu
 IfYouDontReconcileDisableProperty=Jeśli nie dokonasz uzgodnień bankowych na niektórych kontach bankowych, wyłącz na nich właściwość „%s”, aby usunąć to ostrzeżenie.
-NoBankAccountDefined=Nie zdefiniowano konta bankowego
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Nie znaleziono rekordu na koncie bankowym. Często dzieje się tak, gdy rekord został ręcznie usunięty z listy transakcji na rachunku bankowym (na przykład podczas uzgadniania rachunku bankowego). Innym powodem jest to, że płatność została zarejestrowana, gdy moduł „%s” był wyłączony.
 AlreadyOneBankAccount=Zdefiniowano już jedno konto bankowe
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Wariant pliku SEPA
diff --git a/htdocs/langs/pl_PL/blockedlog.lang b/htdocs/langs/pl_PL/blockedlog.lang
index 351b71b9b08..cdb864a4d3e 100644
--- a/htdocs/langs/pl_PL/blockedlog.lang
+++ b/htdocs/langs/pl_PL/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Niezmienione dzienniki
 ShowAllFingerPrintsMightBeTooLong=Pokaż wszystkie zarchiwizowane dzienniki (może długo trwać)
 ShowAllFingerPrintsErrorsMightBeTooLong=Pokaż wszystkie nieprawidłowe dzienniki logów (może długo trwać)
 DownloadBlockChain=Pobierz odciski palców
-KoCheckFingerprintValidity=Zarchiwizowany wpis dziennika jest nieprawidłowy. Oznacza to, że ktoś (haker?) Zmodyfikował niektóre dane tego rekordu po jego nagraniu lub usunął poprzedni zarchiwizowany rekord (sprawdź, czy istnieje wiersz z poprzednim #) lub zmodyfikował sumę kontrolną poprzedniego rekordu.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Zarchiwizowany rekord dziennika jest prawidłowy. Dane w tym wierszu nie zostały zmodyfikowane, a wpis następuje po poprzednim.
 OkCheckFingerprintValidityButChainIsKo=Zarchiwizowany dziennik wydaje się prawidłowy w porównaniu z poprzednim, ale łańcuch był wcześniej uszkodzony.
 AddedByAuthority=Przechowywane w zdalnym urzędzie
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Szczegóły logu
 ListOfTrackedEvents=Lista śledzonych zdarzeń
 Fingerprint=Odcisk palca
 DownloadLogCSV=Eksportuj zarchiwizowane logi (CSV)
-DataOfArchivedEvent=Pełne dane zarchiwizowanego wydarzenia
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Oryginalny obiekt (typ %s, id %s) nie jest połączony (zobacz kolumnę „Pełne dane”, aby uzyskać niezmienione zapisane dane)
 BlockedLogAreRequiredByYourCountryLegislation=Moduł niezmiennych logów może być wymagany przez ustawodawstwo twojego kraju. Wyłączenie tego modułu może spowodować, że wszelkie przyszłe transakcje będą nieważne z punktu widzenia prawa i korzystania z legalnego oprogramowania, ponieważ nie mogą one zostać zweryfikowane przez kontrolę podatkową.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Moduł Unalterable Logs został aktywowany ze względu na ustawodawstwo Twojego kraju. Wyłączenie tego modułu może spowodować, że wszelkie przyszłe transakcje będą nieważne z punktu widzenia prawa i korzystania z legalnego oprogramowania, ponieważ nie mogą one zostać zweryfikowane przez kontrolę podatkową.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Włączono system śledzenia zdarzeń w niezmiennych dziennika
 BlockedLogDisabled=System śledzenia zdarzeń w niemodyfikowalnych dziennikach został wyłączony po wykonaniu niektórych nagrań. Zapisaliśmy specjalny odcisk palca, aby śledzić, czy łańcuch jest uszkodzony
 BlockedLogDisabledBis=System śledzenia zdarzeń w niezmiennych dziennikach został wyłączony. Jest to możliwe, ponieważ nie dokonano jeszcze żadnego zapisu.
 LinkHasBeenDisabledForPerformancePurpose=Ze względów wydajnościowych bezpośredni link do dokumentu nie jest pokazywany po setnym wierszu.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Faktura klienta została logicznie usunięta
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Logiczne usunięcie płatności klienta
 logPAYMENT_VARIOUS_CREATE=Utworzono płatność (nieprzypisaną do faktury)
 logPAYMENT_VARIOUS_DELETE=Logiczne usunięcie płatności (nie przypisanej do faktury)
 logPAYMENT_VARIOUS_MODIFY=Zmieniono płatność (nie przypisaną do faktury)
+logBLOCKEDLOG_EXPORT=Eksport niezmienionych logów do pliku
diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang
index aa72eb5680c..638c429f5e7 100644
--- a/htdocs/langs/pl_PL/categories.lang
+++ b/htdocs/langs/pl_PL/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Obszar tagów/kategorii kontaktów
 AccountsCategoriesArea=Obszar tagów/kategorii kont bankowych
 ProjectsCategoriesArea=Obszar tagów/kategorii projektów
 UsersCategoriesArea=Obszar tagów/kategorii użytkowników
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Podkategorie
 CatList=Lista tagów / kategorii
 CatListAll=Lista tagów / kategorii (wszystkie typy)
@@ -90,9 +91,10 @@ CategoriesSetup=Tagi / kategorie Konfiguracja
 CategorieRecursiv=Związek z dominującą tag / kategorii automatycznie
 CategorieRecursivHelp=Jeśli opcja jest włączona, po dodaniu obiektu do podkategorii obiekt zostanie również dodany do kategorii nadrzędnych.
 AddProductServiceIntoCategory=Przypisz kategorię do produktu/usługi
-AddCustomerIntoCategory=Przypisz kategorię do klienta
-AddSupplierIntoCategory=Przypisz kategorię do dostawcy
-AssignCategoryTo=Przypisz kategorię do
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Pokaż tag / kategoria
 ByDefaultInList=Domyśłnie na liście
 ChooseCategory=Wybrane kategorie
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Kategorie kontenerów stron
 KnowledgemanagementsCategoriesArea=Kategorie artykułów KM
 UseOrOperatorForCategories=Użyj operatora „OR” dla kategorii
 AddObjectIntoCategory=Przypisz do kategorii
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 5618b5999b7..ec78e371170 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -65,6 +65,7 @@ State=Województwo
 StateId=ID stanu
 StateCode=Kod Stanu/Prowincji
 StateShort=Województwo
+DepartmentBuyer=Buyer's state/province
 Region=Region
 Region-State=Region - Województwo
 Country=Kraj
@@ -78,7 +79,7 @@ Chat=Czat
 PhonePro=Telefon stacjonarny
 PhonePerso=Telefon prywatny
 PhoneMobile=Telefon komórkowy
-No_Email=Odrzuć masowe wysyłanie e-maili
+No_Email=Refuse mass emails
 Fax=Faks
 Zip=Kod pocztowy
 Town=Miasto
@@ -259,23 +260,23 @@ CompanyHasRelativeDiscount=Ten klient ma standardowy rabat <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Ten klient domyślnie nie posiada względnego rabatu
 HasRelativeDiscountFromSupplier=Twój standardowy rabat u tego dostawcy to <b>%s%%</b>
 HasNoRelativeDiscountFromSupplier=Nie masz przypisanego rabatu standardowego u tego dostawcy
-CompanyHasAbsoluteDiscount=Ten klient ma dostępne zniżki (z korekt faktur lub zaliczek) dla <b> %s </b> %s
-CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b>
-CompanyHasCreditNote=This customer still has credit notes for <b>%s</b>
-HasNoAbsoluteDiscountFromSupplier=Nie masz dostępnej zniżki, ani nadpłaty u tego dostawcy
-HasAbsoluteDiscountFromSupplier=Masz dostępne rabaty (noty kredytowe lub zaliczki) dla <b> %s </b> %s od tego dostawcy
-HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> from this vendor
-HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> from this vendor
+CompanyHasAbsoluteDiscount=Ten klient ma dostępne zniżki (z korekt faktur lub zaliczek) na kwotę <b> %s </b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Ten klient ma dostępne zniżki (z korekt faktur lub zaliczek) na kwotę <b>%s</b>
+CompanyHasCreditNote=Ten klient ma nadal korekty na kwotę <b>%s</b>
+HasNoAbsoluteDiscountFromSupplier=Nie masz dostępnej zniżki, ani kredytu kupieckiego u tego sprzedawcy
+HasAbsoluteDiscountFromSupplier=Masz u tego sprzedawcy dostępne rabaty (korekty faktur lub zaliczki) na kwotę <b>%s</b>%s
+HasDownPaymentOrCommercialDiscountFromSupplier=Masz u tego sprzedawcy dostępne rabaty (zniżki handlowe, zaliczki) na kwotę<b> %s </b>
+HasCreditNoteFromSupplier=Masz u tego sprzedawcy faktury korekty na kwotę <b>%s</b>
 CompanyHasNoAbsoluteDiscount=Ten klient nie posiada punktów rabatowych
 CustomerAbsoluteDiscountAllUsers=Zniżki dla klienta (udzielone przez wszystkich użytkowników)
 CustomerAbsoluteDiscountMy=Zniżki dla klienta (udzielone przez Ciebie)
-SupplierAbsoluteDiscountAllUsers=Zniżki od dostawcy (wprowadzone przez wszystkich użytkowników)
-SupplierAbsoluteDiscountMy=Zniżki od dostawcy (wprowadzone przez Ciebie)
+SupplierAbsoluteDiscountAllUsers=Zniżki od sprzedawcy (wprowadzone przez wszystkich użytkowników)
+SupplierAbsoluteDiscountMy=Zniżki od sprzedawcy (wprowadzone przez Ciebie)
 DiscountNone=Żaden
-Vendor=Dostawca
-Supplier=Dostawca
-AddContact=Stwórz konktakt
-AddContactAddress=Stwórz kontakt/adres
+Vendor=Sprzedawca
+Supplier=Sprzedawca
+AddContact=Utwórz kontakt
+AddContactAddress=Utwórz kontakt/adres
 EditContact=Edytuj kontakt
 EditContactAddress=Edytuj kontakt / adres
 Contact=Kontakt/Adres
@@ -382,12 +383,12 @@ ExportCardToFormat=Eksport karty do formatu
 ContactNotLinkedToCompany=Kontakt nie połączony z żadnym kontrahentem
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=Brak dostępu do Dolibarr
-ExportDataset_company_1=Kontrahenci (firmy/fundacje/osoby fizyczne) i ich własności
-ExportDataset_company_2=Kontakty i ich właściwości
-ExportDataset_company_3=Rachunki bankowe kontrahentów
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Dodatkowe kontakty/adresy i atrybuty kontrahentów
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Kontrahenci i ich właściwości
 ImportDataset_company_2=Dodatkowe kontakty/adresy i atrybuty kontrahentów
-ImportDataset_company_3=Rachunki bankowe kontrahentów
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Zewnętrzni przedstawiciele handlowi (przypisywanie przedstawicieli handlowych/użytkowników do firm)
 PriceLevel=Poziom ceny
 PriceLevelLabels=Etykiety cenowe
@@ -415,23 +416,23 @@ ListSuppliersShort=Sprzedawcy
 ListProspectsShort=Potencjalni klienci
 ListCustomersShort=Klienci
 ThirdPartiesArea=Kontrahenci/Kontakty
-LastModifiedThirdParties=The latest %s modified Third Parties
-LastModifiedContacts=The latest %s modified contacts
+LastModifiedThirdParties=%s ostatnio zmodyfikowanych kontrahentów
+LastModifiedContacts=%s ostatnio zmodyfikowanych kontaktów
 UniqueThirdParties=Łączna liczba kontrahentów
 InActivity=Otwarte
 ActivityCeased=Zamknięte
 ThirdPartyIsClosed=Kontrahent jest zamknięty
-ProductsIntoElements=Lista produktów/usług zmapowanych na %s
+ProductsIntoElements=Lista produktów/usług zmapowanych do %s
 CurrentOutstandingBill=Biężący, niezapłacony rachunek
 OutstandingBill=Maksymalna kwota niezapłaconego rachunku
 OutstandingBillReached=Maksymalna kwota dla niespłaconych rachunków osiągnięta
 OrderMinAmount=Minimalna kwota dla zamówienia
 MonkeyNumRefModelDesc=Zwróć liczbę w formacie %syymm-nnnn dla kodu klienta i %syymm-nnnn dla kodu dostawcy, gdzie y oznacza rok, mm to miesiąc, a nnnn to sekwencyjna, automatycznie zwiększająca się liczba, bez przerwy i bez powrotu do 0.
-LeopardNumRefModelDesc=Free code without verification.
+LeopardNumRefModelDesc=Dowolny kod bez weryfikacji.
 ManagingDirectors=Funkcja(e) managera (prezes, dyrektor generalny...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Scal kontrahentów
-ConfirmMergeThirdparties=Czy na pewno chcesz scalić wybranego kontrahenta z kontrahentem bieżącym? Wszystkie obiekty (faktury, zamówienia, ...) wybranego kontrahenta zostaną przeniesione do kontrahenta bieżącego, po czym wybrany kontrahent zostanie usunięty.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Kontrahenci zostali połączeni
 SaleRepresentativeLogin=Login przedstawiciela handlowego
 SaleRepresentativeFirstname=Imię przedstawiciela handlowego
@@ -461,3 +462,6 @@ ExternalSystemID=Identyfikator systemu zewnętrznego
 IDOfPaymentInAnExternalSystem=Identyfikator trybu płatności w systemie zewnętrznym (np. Stripe, Paypal, ...)
 AADEWebserviceCredentials=Poświadczenia usługi internetowej AADE
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Osoba trzecia musi być klientem, aby umożliwić utworzenie informacji bankowych po stronie Stripe
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 69f7cf46c1e..bb7a78dfec7 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Fakturowanie | Zapłata
+MenuFinancial=Fakturowanie | Płatności
 TaxModuleSetupToModifyRules=Przejdź do <a href="%s">konfiguracji modułu Podatki</a> zmodyfikować zasady obliczania
 TaxModuleSetupToModifyRulesLT=Przejdź do <a href="%s">konfiguracji firmy</a> zmodyfikować zasady obliczania
 OptionMode=Opcja dla księgowości
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Płatność za fakturę klienta
 PaymentSupplierInvoice=płatność za fakturę dostawcy
 PaymentSocialContribution=Płatność za ZUS/podatek
 PaymentVat=Zapłata podatku VAT
-AutomaticCreationPayment=Automatycznie rejestruj płatność
+AutomaticCreationPayment=Also record the payment
 ListPayment=Wykaz płatności
 ListOfCustomerPayments=Lista płatności klientów
 ListOfSupplierPayments=Lista płatności dostawcy
@@ -118,10 +118,14 @@ SocialContributionsPayments=Płatności za ZUS/podatki
 ShowVatPayment=Pokaż płatności za podatek VAT
 TotalToPay=Razem do zapłaty
 BalanceVisibilityDependsOnSortAndFilters=Saldo jest widoczne na tej liście tylko wtedy, gdy tabela jest posortowana według %s i przefiltrowana na 1 koncie bankowym (bez innych filtrów)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Kod księgowy klienta
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Kod księgowy dostawcy
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Kod księg. klienta
 SupplierAccountancyCodeShort=Kod rach. dost.
+UserAccountancyCodeShort=User account. code
 AccountNumber=Numer konta
 NewAccountingAccount=Nowe konto
 Turnover=Zafakturowany obrót
@@ -129,7 +133,9 @@ TurnoverCollected=Zebrany obrót
 SalesTurnoverMinimum=Minimalny obrót
 ByExpenseIncome=Według wydatków i dochodów
 ByThirdParties=Przez kontrahentów
+ByProjects=By projects
 ByUserAuthorOfInvoice=Na autora faktury
+DetailedListLowercase=detailed list
 CheckReceipt=Odcinek wpłaty
 CheckReceiptShort=Odcinek wpłaty
 LastCheckReceiptShort=Najnowsze %s dowody wpłaty
diff --git a/htdocs/langs/pl_PL/datapolicy.lang b/htdocs/langs/pl_PL/datapolicy.lang
index d85aca916b6..be8fe433408 100644
--- a/htdocs/langs/pl_PL/datapolicy.lang
+++ b/htdocs/langs/pl_PL/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Polityka prywatności danych
 Module4100Desc = Moduł do zarządzania Prywatnością Danych (Zgodność z RODO)
 # Administration page
 datapolicySetup = Konfiguracja polityki prywatności danych modułu
-Deletion = Usuwanie danych
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+DataDeletion=Usuwanie danych
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s miesięcy
 ONE_YEAR = 1 rok
 NB_YEARS = %s lat
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Potencjalny klient/Klient
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Ani Potencjalny klient, ani klient
 DATAPOLICY_CONTACT_FOURNISSEUR = Dostawca
 DATAPOLICY_ADHERENT = Członek
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Możesz wysłać wiadomość e-mail dotyczącą RODO do wszystkich odpowiednich kontaktów (które nie otrzymały jeszcze wiadomości e-mail i dla których nie zarejestrowałeś niczego na temat ich umowy dotyczącej RODO). Aby to zrobić, użyj poniższego przycisku.
 SendAgreement = Wyślij wiadomość email
 AllAgreementSend = Wszystkie e-maile zostały wysłane
 TXTLINKDATAPOLICYACCEPT = Tekst linku „umowa”
 TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = RODO: Przetwarzanie danych osobowych
 DATAPOLICY_consentement = Uzyskana zgoda na przetwarzanie danych osobowych
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 1e9b03064c7..8fe55de456c 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Nie można utworzyć katalogu. Sprawdź, czy serwer WWW użytkownik ma uprawnienia do zapisu do katalogu dokumentów Dolibarr. Jeśli parametr <b>safe_mode</b> jest włączona w tym PHP, czy posiada Dolibarr php pliki do serwera internetowego użytkownika (lub grupy).
 ErrorNoMailDefinedForThisUser=Nie określono adresu email dla tego użytkownika
 ErrorSetupOfEmailsNotComplete=Konfiguracja e-maili nie została zakończona
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Aby ta funkcja działała, wymagana jest aktywacja JavaScript. Zmień to w ustawieniach – wyświetlacz.
 ErrorTopMenuMustHaveAParentWithId0=Menu typu "góry" nie może mieć dominującej menu. Umieść 0 dominującej w menu lub wybrać z menu typu "Lewy".
 ErrorLeftMenuMustHaveAParentId=Menu typu "Lewy" musi mieć identyfikator rodzica.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Przesyłanie zablokowane przez PHP/Apache.
 ErrorFileSizeTooLarge=Rozmiar pliku jest za duży lub plik nie został dostarczony.
 ErrorFieldTooLong=Pole %s jest za długie.
 ErrorSizeTooLongForIntType=Rozmiar zbyt długi dal typu int (max %s cyfr)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Za dużo znaków dla tego typu (maksymalnie %s znaków)
 ErrorNoValueForSelectType=Proszę wypełnić wartości dla listy wyboru
 ErrorNoValueForCheckBoxType=Proszę wypełnić wartości dla listy checkbox
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Zła wartość kody zabezpieczeń. Wprowadź nową wartoś
 ErrorBothFieldCantBeNegative=Pola %s i %s nie mogą być jednocześnie ujemne
 ErrorFieldCantBeNegativeOnInvoice=Pole <strong>%s</strong> nie może być ujemne na tego typu fakturze. Jeśli chcesz dodać linię rabatową, po prostu najpierw utwórz rabat (z pola „%s” na karcie innej firmy) i zastosuj go do faktury.
 ErrorLinesCantBeNegativeForOneVATRate=Suma wierszy (bez podatku) nie może być ujemna dla danej niezerowej stawki VAT (Znaleziono sumę ujemną dla stawki VAT <b> %s </b> %%).
-ErrorLinesCantBeNegativeOnDeposits=Wiersze nie mogą być ujemne w depozycie. Jeśli to zrobisz, napotkasz problemy, kiedy będziesz musiał wykorzystać depozyt w końcowej fakturze.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Ilość dla pozycji na fakturach klientów nie może być ujemna
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Konto użytkownika <b>%s</b> wykorzystywane do wykonywania serwer WWW nie ma zgody na który
 ErrorNoActivatedBarcode=Nie Typ aktywny kodów kreskowych
 ErrUnzipFails=Nie udało się rozpakować %s za pomocą ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Twój parametr PHP upload_max_filesize (%s) jest wyższy niż parametr PHP post_max_size (%s). To nie jest spójna konfiguracja.
 WarningPasswordSetWithNoAccount=Hasło zostało ustawione dla tego użytkownika. Jednakże nie Konto użytkownika zostało utworzone. Więc to hasło jest przechowywane, ale nie mogą być używane do logowania do Dolibarr. Może być stosowany przez zewnętrzny moduł / interfejsu, ale jeśli nie trzeba definiować dowolną logowania ani hasła do członka, można wyłączyć opcję "Zarządzaj login dla każdego członka" od konfiguracji modułu użytkownika. Jeśli potrzebujesz zarządzać logowanie, ale nie wymagają hasła, możesz zachować to pole puste, aby uniknąć tego ostrzeżenia. Uwaga: E może być również stosowany jako login, jeśli element jest połączony do użytkownika.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = Fakturę SwissQR można dodać wyłącznie do faktur ustawionych na płatność przelewem.
 SwissQrCreditorAddressInvalid = Adres wierzyciela jest nieprawidłowy (czy ustawiony jest kod pocztowy i miasto? (%s)
 SwissQrCreditorInformationInvalid = Informacje o wierzycielu są nieprawidłowe dla numeru IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/pl_PL/exports.lang b/htdocs/langs/pl_PL/exports.lang
index d07b0b87a0b..89a7aa0e528 100644
--- a/htdocs/langs/pl_PL/exports.lang
+++ b/htdocs/langs/pl_PL/exports.lang
@@ -14,8 +14,8 @@ SaveExportModel=Zapisz swoje wybory jako profil / szablon eksportu (do ponownego
 SaveImportModel=Zapisz ten profil importu (do ponownego wykorzystania) ...
 ExportModelName=Nazwa profilu eksportowego
 ExportModelSaved=Profil eksportu zapisany jako <b> %s </b>.
-ExportableFields=Wywóz pola
-ExportedFields=Eksportowane pola
+ExportableFields=Eksportowane punkty
+ExportedFields=Eksportowane punkty
 ImportModelName=Importuj nazwę profilu
 ImportModelSaved=Importuj profil zapisany jako <b> %s </b>.
 ImportProfile=Importuj profil
@@ -31,7 +31,7 @@ ExportCsvSeparator=Znak separatora w pliku CSV
 ImportCsvSeparator=Znak separatora w pliku CSV
 Step=Krok
 FormatedImport=Asystent importu
-FormatedImportDesc1=Moduł ten umożliwia aktualizację istniejących danych lub dodawanie nowych obiektów do bazy danych z pliku bez wiedzy technicznej, przy pomocy asystenta.
+FormatedImportDesc1=Moduł ten umożliwia aktualizację istniejących danych lub dodawanie nowych obiektów do bazy danych z pliku przy pomocy asystenta, bez wiedzy technicznej.
 FormatedImportDesc2=Pierwszym krokiem jest wybór rodzaju danych, które chcesz zaimportować, następnie format pliku źródłowego, a następnie pola, które chcesz zaimportować.
 FormatedExport=Asystent Eksportu
 FormatedExportDesc1=Narzędzia te pozwalają na eksport spersonalizowanych danych za pomocą asystenta, aby pomóc Ci w procesie bez konieczności posiadania wiedzy technicznej.
@@ -51,11 +51,11 @@ LineLT2Rate=Tax 3 rate for line
 LineLT1Type=Tax 2 type for line
 LineLT2Type=Tax 3 type for line
 LineQty=Ilość dla pozycji
-LineTotalHT=Kwota bez podatek za linię
+LineTotalHT=Kwota bez podatku dla pozycji
 LineTotalTTC=Kwota z podatkiem dla pozycji
 LineTotalVAT=Kwota podatku VAT dla pozycji
-LineTotalLT1=Amount of tax 2 for line
-LineTotalLT2=Amount of tax 3 for line
+LineTotalLT1=Kwota podatku 2 dla pozycji
+LineTotalLT2=Kwota podatku 3 dla pozycji
 TypeOfLineServiceOrProduct=Rodzaj pozycji (0=produkt, 1=usługa)
 FileWithDataToImport=Plik z danymi do importu
 FileToImport=Plik źródłowy do zaimportowania
@@ -67,7 +67,7 @@ ChooseFormatOfFileToImport=Wybierz format importowanego pliku, klikając ikonę
 ChooseFileToImport=Prześlij plik z danymi, a następnie kliknij ikonę %s, aby ustawić go jako aktualne źródło danych do zaimportowania...
 SourceFileFormat=Format pliku źródłowego
 FieldsInSourceFile=Pola w pliku źródłowym
-FieldsInTargetDatabase=Pola docelowe w bazie danych Dolibarr (wytłuszczenie = obowiązkowe)
+FieldsInTargetDatabase=Pola docelowe w bazie danych Dolibarr
 NoFields=Brak pól
 MoveField=Przenieś %s kolumnie polu numeru
 ExampleOfImportFile=Przykład_importowanego_pliku
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Sprawdź, czy format Twojego pliku (separatory pól i ci
 RunSimulateImportFile=Uruchom symulację importu
 FieldNeedSource=To pole wymaga danych z pliku źródłowego
 SomeMandatoryFieldHaveNoSource=Niektóre z obowiązkowych pól nie maja źródła w pliku danych
-InformationOnSourceFile=Informacje o pliku źródłowym
-InformationOnTargetTables=Informacje o tabelach docelowych
+InformationOnSourceFile=Plik źródłowy
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Switch co najmniej jednego źródła pola w kolumnie pól do eksportu
 SelectFormat=Wybierz ten format pliku importu
 RunImportFile=Importuj dane
diff --git a/htdocs/langs/pl_PL/hrm.lang b/htdocs/langs/pl_PL/hrm.lang
index 75c99d55335..27014f9b6f0 100644
--- a/htdocs/langs/pl_PL/hrm.lang
+++ b/htdocs/langs/pl_PL/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=Wymagana ranga dla profilu stanowiska
-RequiredRankShort=Wymagana ranga
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Stanowiska z tym profilem stanowisk
-EmployeeRank=Ranga pracownika dla tej umiejętności
-EmployeeRankShort=Ranga pracownika
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Stanowisko pracownika
 EmployeePositions=Stanowiska pracownicze
 EmployeesInThisPosition=Pracownicy na tym stanowisku
@@ -72,6 +72,9 @@ AddSkill=Dodaj umiejętności do profilu stanowiska
 RequiredSkills=Umiejętności wymagane dla tego profilu stanowiska
 UserRank=Ranga użytkownika
 SkillList=Lista umiejętności
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Zapisz rangę
 TypeKnowHow=Wiedza
 TypeHowToBe=Jak być
@@ -95,3 +98,5 @@ NeedBusinessTravels=Potrzebujesz podróży służbowych
 NoDescription=Bez opisu
 TheJobProfileHasNoSkillsDefinedFixBefore=Oceniany profil stanowiska tego pracownika nie ma zdefiniowanych umiejętności. Dodaj umiejętności, a następnie usuń i rozpocznij ocenę ponownie.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index 05b023d3d4f..cf804deb38e 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Mailingi
 EMailing=Mailing
-EMailings=Mailingi
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=Wszystkie Mailingi
+AllEMailings=All mass eMails
 MailCard=Karta Mailingu
 MailRecipients=Odbiorcy
 MailRecipient=Odbiorca
@@ -26,19 +26,19 @@ MailFile=Dołączone pliki
 MailMessage=Zawartość emaila
 SubjectNotIn=Nie w temacie
 BodyNotIn=Nie w ciele
-ShowEMailing=Pokaż mailingi
-ListOfEMailings=Lista mailingów
-NewMailing=Nowy mailing
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=Edytuj mailing
-ResetMailing=Wyślij ponownie mailing
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Usuń mailing
-PreviewMailing=Podgląd mailingu
-CreateMailing=Tworzenie mailingu
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=Aktualny mailing
+ValidMailing=Valid mass Email
 MailingStatusDraft=Szkic
 MailingStatusValidated=Sprawdzone
 MailingStatusSent=Wysłany
@@ -81,7 +81,7 @@ YourMailUnsubcribeOK=E-mail <b> %s </b> jest poprawnie wypisany z listy mailingo
 ActivateCheckReadKey=Klucz używany do szyfrowania adresu URL używany do funkcji „Potwierdzenie odczytu” i „Anuluj subskrypcję”
 EMailSentToNRecipients=E-mail wysłany do %s odbiorców.
 EMailSentForNElements=Wiadomość e-mail wysłana dla elementów %s.
-XTargetsAdded=<b>% s</b> dodany do listy odbiorców docelowych
+XTargetsAdded=<b>%s</b> dodany do listy odbiorców docelowych
 OnlyPDFattachmentSupported=Jeśli dokumenty PDF zostały już wygenerowane dla obiektów do wysłania, zostaną załączone do wiadomości e-mail. Jeśli nie, żadna wiadomość e-mail nie zostanie wysłana (należy również pamiętać, że w tej wersji obsługiwane są tylko dokumenty PDF jako załączniki w masowej wysyłce).
 AllRecipientSelected=Odbiorcy wybranego rekordu %s (jeśli ich adres e-mail jest znany).
 GroupEmails=Grupowe e-maile
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Aby e-mail został odebrany, wszystkie filtry muszą by
 LineInFile=Linia w pliku %s
 RecipientSelectionModules=Definiowane wnioski dla wybranych odbiorców
 MailSelectedRecipients=Wybrani odbiorcy
-MailingArea=Obszar mailingów
-LastMailings=Najnowsze wiadomości e-mail %s
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Celów statystycznych
 NbOfCompaniesContacts=Unikalne kontakty firm
 MailNoChangePossible=Odbiorcy dla potwierdzonych mailingów nie mogą być zmienieni
-SearchAMailing=Szukaj mailingu
-SendMailing=Wyślij mailing
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Wysłane przez
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Wysyłanie wiadomości e-mail można wykonać z wiersza poleceń. Poproś administratora serwera o uruchomienie następującego polecenia, aby wysłać wiadomość e-mail do wszystkich odbiorców:
 MailingNeedCommand2=Możesz jednak wysłać je w sieci poprzez dodanie parametru MAILING_LIMIT_SENDBYWEB o wartości max liczba wiadomości e-mail, który chcesz wysłać przez sesji.
 ConfirmSendingEmailing=Jeśli chcesz wysyłać e-maile bezpośrednio z tego ekranu, potwierdź, że na pewno chcesz teraz wysyłać e-maile z przeglądarki?
-LimitSendingEmailing=Uwaga: Wysyłanie Emailings z interfejsu WWW jest wykonywana w kilku czasach ze względów bezpieczeństwa oraz limitu <b>czasu,% s</b> odbiorców jednocześnie dla każdej sesji wysyłającego.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Wyczyść listę
 ToClearAllRecipientsClickHere=Aby wyczyścić odbiorców tego e-maila na listę, kliknij przycisk
 ToAddRecipientsChooseHere=Aby dodać odbiorców, wybierz w tych wykazach
-NbOfEMailingsReceived=Masowe mailingi otrzymane
-NbOfEMailingsSend=Masowe mailingi wysłane
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID rekordu
 DeliveryReceipt=Potwierdzenie dostawy.
 YouCanUseCommaSeparatorForSeveralRecipients=Możesz używać <b>przecinka</b> aby określić kilku odbiorców.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Dla tego rodzaju zdarzenia i tej firmy nie zostały za
 ANotificationsWillBeSent=Na e-mail zostanie wysłane 1 automatyczne powiadomienie
 SomeNotificationsWillBeSent=Na e-mail zostanie wysłane %s automatyczne powiadomienie
 AddNewNotification=Zasubskrybuj nowe automatyczne powiadomienie e-mail (cel / wydarzenie)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Konfiguracja poczty e-mail wysyłającego musi być połączone z '% s'. Tryb ten może być wykorzystywany do wysyłania masowego wysyłania.
 MailSendSetupIs2=Najpierw trzeba przejść, z konta administratora, w menu% sHome - Ustawienia - e-maile% s, aby zmienić parametr <strong>'% s'</strong> na tryb '% s' używać. W tym trybie można wprowadzić ustawienia serwera SMTP dostarczonych przez usługodawcę internetowego i używać funkcji e-maila Mszę św.
 MailSendSetupIs3=Jeśli masz jakieś pytania na temat konfiguracji serwera SMTP, możesz zapytać %s.
@@ -183,7 +185,7 @@ Information=Informacja
 ContactsWithThirdpartyFilter=Kontakty z filtrem innej firmy
 Unanswered=Bez odpowiedzi
 Answered=Odpowiedział
-IsNotAnAnswer=Brak odpowiedzi (pierwszy e-mail)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=To odpowiedź na pierwszą wiadomość e-mail
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Domyślna wartość pola „%s” podczas tworzenia nowego kontaktu
@@ -199,6 +201,6 @@ ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 5d55c59cb34..0aff3290f7b 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -37,6 +37,7 @@ Translation=Tłumaczenie
 Translations=Tłumaczenia
 CurrentTimeZone=Strefa czasowa PHP (server)
 EmptySearchString=Wprowadź niepuste kryteria wyszukiwania
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Wprowadź kryteria daty
 NoRecordFound=Rekord nie został znaleziony.
 NoRecordDeleted=Brak usuniętych rekordów
@@ -45,6 +46,7 @@ NoError=Brak błędów
 Error=Błąd
 Errors=Błędy
 ErrorFieldRequired=Pole ' %s' jest wymagane
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Pole ' %s' ma złe wartości
 ErrorFileDoesNotExists=Plik %s nie istnieje
 ErrorFailedToOpenFile=Nie można otworzyć pliku %s
@@ -308,6 +310,7 @@ DateBuild=Raport stworzenia daty
 DatePayment=Data płatności
 DateApprove=Data akceptacji
 DateApprove2=Data akceptacji (druga akceptacja)
+PendingSince=Pending since
 RegistrationDate=Data rejestracji
 UserCreation=Tworzenie użytkownika
 UserModification=Modyfikacja użytkownika
@@ -495,7 +498,7 @@ ActionRunningNotStarted=By rozpocząć
 ActionRunningShort=W trakcie
 ActionDoneShort=Zakończone
 ActionUncomplete=Niekompletny
-LatestLinkedEvents=Najnowsze powiązane wydarzenia %s
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Firma/Organizacja
 Accountant=Księgowa
 ContactsForCompany=Kontakty dla tego zamówienia
@@ -514,7 +517,7 @@ Completed=Zakończony
 Running=W trakcie
 RequestAlreadyDone=Żądanie już wysłane
 Filter=Filtr
-FilterOnInto=Kryteria poszukiwania <strong>'% s'</strong> w polach% s
+FilterOnInto=Kryteria poszukiwania '<strong>%s</strong>' w polach %s
 RemoveFilter=Usuń filtr
 ChartGenerated=Wykres wygenerowany
 ChartNotGenerated=Wykres niewygenerowany
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=Zawartość emaila
 SendAcknowledgementByMail=Wyślij email potwierdzający
 SendMail=Wyślij wiadomość email
 Email=Adres e-mail
+EMail=Adres e-mail
+EMails=Wiadomości email
 NoEMail=Brak e-mail
 AlreadyRead=Obecnie przeczytane
 NotRead=nieprzeczytane
@@ -793,7 +798,7 @@ Notes=Uwagi
 AddNewLine=Dodaj nową pozycję
 AddFile=Dodaj plik
 FreeZone=Produkt opisany dowolnym tekstem
-FreeLineOfType=Pozycja opisana dowolnym tekstem, rodzaj:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Skopiuj obiekt z jego głównymi atrybutami
 ReGeneratePDF=Wygeneruj ponownie PDF
 PDFMerge=Scalanie/ dzielenie PDF
@@ -879,12 +884,14 @@ toward=kierunek
 Access=Dostęp
 SelectAction=Wybierz działanie
 SelectTargetUser=Wybierz docelowego użytkownika / pracownika
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Użyj Ctrl+C by skopiować
 SaveUploadedFileWithMask=Zapisz plik na serwerze z nazwą "<strong>%s</strong>" (w innym wypadku "%s")
 OriginFileName=Oryginalna nazwa pliku
 SetDemandReason=Wybierz źródło
 SetBankAccount=Przypisz konto bankowe
 AccountCurrency=Waluta konta
+AccountancyCode=Kod księgowy
 ViewPrivateNote=Wyświetl notatki
 XMoreLines=%s lini(e) ukryte
 ShowMoreLines=Pokaż więcej / mniej linii
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Czy na pewno chcesz usunąć wybrane rekordy %s?
 ConfirmMassClone=Potwierdzenie klonowania zbiorczego
 ConfirmMassCloneQuestion=Wybierz projekt, do którego chcesz sklonować
 ConfirmMassCloneToOneProject=Sklonuj do projektu %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Powiązane obiekty
 ClassifyBilled=Klasyfikuj płatne
 ClassifyUnbilled=Klasyfikuj jako niezafakturowane
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Musisz być zalogowany i potrzebujesz uprawnień, aby wy
 Download=Pobierz
 DownloadDocument=Pobierz dokument
 DownloadSignedDocument=Pobierz podpisany dokument
-ActualizeCurrency=Aktualizuj kurs walut
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Rok podatkowy
 ModuleBuilder=Kreator modułów i aplikacji
 SetMultiCurrencyCode=Ustaw walutę
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Masowe działania
 ClickToShowHelp=Kliknij, aby wyświetlić etykietę pomocy
 WebSite=Strona internetowa
@@ -1077,7 +1086,7 @@ SearchIntoProjects=Projekty
 SearchIntoMO=Zamówienia produkcyjne
 SearchIntoTasks=Zadania
 SearchIntoCustomerInvoices=Faktury klienta
-SearchIntoSupplierInvoices=Faktury dostawcy
+SearchIntoSupplierInvoices=Faktury sprzedawcy
 SearchIntoCustomerOrders=Zlecenia sprzedaży
 SearchIntoSupplierOrders=Zamówienia zakupowe
 SearchIntoCustomerProposals=Oferty komercyjne
@@ -1104,6 +1113,7 @@ PayedBy=Płacone przez
 PayedTo=Zapłacono do
 Monthly=Miesięcznie
 Quarterly=Kwartalnie
+Quarter=Quarter
 Annual=Rocznie
 Local=Lokalnie
 Remote=Zdalnie
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Zadanie
 ContactDefault_propal=Oferta
 ContactDefault_supplier_proposal=Propozycja dostawcy
 ContactDefault_ticket=Zgłoszenie
+ContactDefault_societe=Kontrahent
 ContactAddedAutomatically=Kontakt dodano z ról kontaktów innych firm
 More=Więcej
 ShowDetails=Pokaż szczegóły
@@ -1242,6 +1253,7 @@ CommercialAffected=Przydzielony przedstawiciel handlowy
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=Wiadomość
+Emailing=Emailing
 Progression=Postęp
 YourMessage=Twoja wiadomość
 YourMessageHasBeenReceived=Twoja wiadomość została odebrana. Odpowiemy lub skontaktujemy się z Tobą tak szybko, jak to możliwe.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Dodaj
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=Wszystkie pola są wymagane.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Od początku
+Transferred=Transferred
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index 8372e4cf2f8..c01fb964286 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - members
 MembersArea=Strefa
-MemberCard=Państwa karty
-SubscriptionCard=Subskrypcja karty
+MemberCard=Karta członkowska
+SubscriptionCard=Karta subskrypcji
 Member=Członek
 Members=Członkowie
 NoRecordedMembers=Brak zarejestrowanych członków
 NoRecordedMembersByType=Brak zarejestrowanych członków
 ShowMember=Pokaż kartę członka
 UserNotLinkedToMember=Użytkownik nie wiąże się z członkiem
-ThirdpartyNotLinkedToMember=Strona trzecia niepowiązana z członkiem
+ThirdpartyNotLinkedToMember=Kontrahent niepowiązany z członkiem
 MembersTickets=Arkusz adresowy członkostwa
 FundationMembers=Członkowie fundacji
 ListOfValidatedPublicMembers=Wykaz zatwierdzonych publicznej użytkowników
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Jeśli wymagana jest subskrypcja, należy zarejestrowa
 DeleteType=Usuń
 VoteAllowed=Głosowanie dozwolone
 Physical=Osoba fizyczna
-Moral=Korporacja
-MorAndPhy=Korporacja i osoba fizyczna
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Włącz ponownie
 ExcludeMember=Wyklucz członka
 Exclude=Wykluczać
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Użytkownicy statystyki regionu
 NbOfMembers=Całkowita liczba członków
 NbOfActiveMembers=Całkowita liczba obecnych aktywnych członków
 NoValidatedMemberYet=Żadna potwierdzona znaleziono użytkowników
-MembersByCountryDesc=Statystyki członków według krajów. Wykresy zależą od dostępności usługi wykresów online Google, a także od dostępności działającego połączenia internetowego.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Statystyki członków według podziału terytorialnego.
 MembersByTownDesc=Statystyki członków według miast.
 MembersByNature=Statystyki członków według charakteru.
@@ -208,25 +209,25 @@ NewMemberbyWeb=Nowy członek dodaje. Oczekuje na zatwierdzenie
 NewMemberForm=Nowa forma członkiem
 SubscriptionsStatistics=Statystyki składek
 NbOfSubscriptions=Liczba składek
-AmountOfSubscriptions=Kwota zebrana ze składek
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=Obrót (dla firmy) lub Budżet (na fundamencie)
-DefaultAmount=Domyślna kwota składki (stosowana tylko wtedy, gdy na poziomie rodzaju członka nie zdefiniowano kwoty)
-MinimumAmount=Kwota minimalna (stosowana tylko wtedy, gdy kwota składki jest bezpłatna)
-CanEditAmount=Wysokość abonamentu może być określona przez członka
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=Odwiedzający może wybrać/edytować kwotę swojego wkładu niezależnie od typu członka
 AmountIsLowerToMinimumNotice=Kwota jest niższa niż minimalna %s
 MEMBER_NEWFORM_PAYONLINE=Po rejestracji online następuje automatyczne przejście do strony płatności online
 ByProperties=Przez naturę
 MembersStatisticsByProperties=Statystyki członków według natury
-VATToUseForSubscriptions=Stawka VAT stosowana przy składkach
-NoVatOnSubscription=Brak podatku VAT za składki
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt użyty w wierszu wkładu na fakturze: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=Imię lub firma
 SubscriptionRecorded=Wkład zarejestrowany
 NoEmailSentToMember=Żaden e-mail nie został wysłany do członka
 EmailSentToMember=E-mail wysłany do członka pod adresem %s
-SendReminderForExpiredSubscriptionTitle=Wyślij przypomnienie e-mailem o wygasłych wkładach
-SendReminderForExpiredSubscription=Wysyłaj przypomnienie e-mailem do członków, gdy składka wkrótce wygaśnie (parametr to liczba dni przed końcem członkostwa, na które należy wysłać przypomnienie. Może to być lista dni oddzielonych średnikiem, na przykład „10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Członkostwo opłacone za bieżący okres (do %s)
 YouMayFindYourInvoiceInThisEmail=Możesz znaleźć fakturę w załączniku do tej wiadomości e-mail
 XMembersClosed=%s członków zamkniętych
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Osoba trzecia to podmiot prawny, który będzie uż
 MemberFirstname=Imię członka
 MemberLastname=Nazwisko członka
 MemberCodeDesc=Kod członkowski, unikalny dla wszystkich członków
-MemberSubscriptionStartFirstDayOf=Data rozpoczęcia członkostwa odpowiada pierwszemu dniu a
-MemberSubscriptionStartAfter=Minimalny okres przed wejściem w życie daty rozpoczęcia subskrypcji z wyjątkiem odnowień (przykład +3m = +3 miesiące, -5d = -5 dni, +1Y = +1 rok)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index 4e64cf21112..3a948af30a6 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -97,7 +97,6 @@ ShowService=Pokaż usługę
 ProductsAndServicesArea=Obszar produktów i usług
 ProductsArea=Obszar produktu
 ServicesArea=Obszar usług
-ListOfStockMovements=Wykaz przesunięć magazynowych
 BuyingPrice=Cena zakupu
 PriceForEachProduct=Produkt z konkretną ceną
 SupplierCard=Karta sprzedawcy
@@ -172,7 +171,7 @@ BuyingPrices=Cena zakupu
 CustomerPrices=Ceny klienta
 SuppliersPrices=Ceny dostawców
 SuppliersPricesOfProductsOrServices=Ceny dostawców (produktów lub usług)
-CustomCode=Cła | Towar | Kod HS
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Kraj pochodzenia
 RegionStateOrigin=Region pochodzenia
 StateOrigin=Stan/prowincja pochodzenia
@@ -210,6 +209,7 @@ unitL=Litr
 unitT=tona
 unitKG=kg
 unitG=Gram
+unitGAL=galon
 unitMG=mg
 unitLB=funt
 unitOZ=uncja
@@ -312,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Formatem żądania jest {"URL": "http://example
 UpdateInterval=Aktualizacja co (min)
 LastUpdated=Ostatnia aktualizacja
 CorrectlyUpdated=Poprawnie zaktualizowane
-PropalMergePdfProductActualFile=Pliki użyć, aby dodać do PDF Azur są / jest
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=Wybierz plik PDF
 IncludingProductWithTag=Zawierające produkty/usługi z określonym tagiem
 DefaultPriceRealPriceMayDependOnCustomer=Domyślna cena, faktyczna cena może zależeć od klienta
@@ -349,6 +349,10 @@ QtyRecalculatedWithPackaging=Ilość linii została przeliczona zgodnie z opakow
 
 #Attributes
 Attributes=Atrybuty
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Atrybuty wariantu
 ProductAttributes=Atrybuty wariantu dla produktów
 ProductAttributeName=Atrybut wariantu %s
@@ -396,6 +400,8 @@ ErrorDestinationProductNotFound=Nie znaleziono produktu docelowego
 ErrorProductCombinationNotFound=Wariant produktu nie znaleziony
 ActionAvailableOnVariantProductOnly=Akcja dostępna tylko w wariancie produktu
 ProductsPricePerCustomer=Ceny produktów na klientów
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Dodatkowe atrybuty (ceny dostawców)
 DeleteLinkedProduct=Usuń produkt podrzędny powiązany z kombinacją
 AmountUsedToUpdateWAP=Kwota jednostkowa używana do aktualizacji średniej ważonej ceny
@@ -437,3 +443,6 @@ AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtu
 ConfirmSetToDraftInventory=Czy jesteś pewien, że chcesz wrócić do statusu Szkicu? <br> Ilości ustawione obecnie zostaną zresetowane do stanu sprzed zatwierdzenia.
 WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned
 PriceLabel=Price label
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/pl_PL/salaries.lang b/htdocs/langs/pl_PL/salaries.lang
index 4a625ac21e3..4d787b91f53 100644
--- a/htdocs/langs/pl_PL/salaries.lang
+++ b/htdocs/langs/pl_PL/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Nowe wynagrodzenie
 AddSalary=Dodaj wynagrodzenie
 NewSalaryPayment=Nowa karta wynagrodzeń
 AddSalaryPayment=Dodaj płatność wynagrodzenia
+SalaryID=Salary ID
+SalaryAmount=Wysokość wynagrodzenia
 SalaryPayment=Wypłata wynagrodzenia
 SalariesPayments=Wypłaty wynagordzeń
 SalariesPaymentsOf=Wypłaty wynagrodzeń w wysokości %s
@@ -27,7 +29,7 @@ FillFieldFirst=Najpierw wypełnij pole pracownika
 UpdateAmountWithLastSalary=Ustaw kwotę ostatniego wynagrodzenia
 MakeTransferRequest=Złóż wniosek o przeniesienie
 VirementOrder=Żądanie przelewu kredytowego
-BankTransferAmount=Kwota przelewu
 WithdrawalReceipt=Polecenie przelewu
 OrderWaiting=Oczekujące zamówienie
 FillEndOfMonth=Wypełnij końcem miesiąca
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index 7c646e9efce..627afa59400 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Użyj tutaj listy innych nazw/aliasów, aby uzyskać dostę
 WEBSITE_CSS_URL=URL zewnętrznego pliku CSS
 WEBSITE_CSS_INLINE=Zawartość pliku CSS (wspólna dla wszystkich stron)
 WEBSITE_JS_INLINE=Zawartość pliku JavaScript (wspólna dla wszystkich stron)
-WEBSITE_HTML_HEADER=Dodanie nagłówka HTML u dołu (wspólne dla wszystkich stron)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Plik robota (robots.txt)
 WEBSITE_HTACCESS=Plik .htaccess witryny
 WEBSITE_MANIFEST_JSON=Plik manifest.json witryny
@@ -29,7 +29,7 @@ EditMedias=Edytuj multimedia
 EditPageMeta=Edytuj właściwości strony/pojemnika
 EditInLine=Edytuj w linii
 AddWebsite=Dodaj witrynę
-WebsitePage=Website page
+WebsitePage=Strona internetowa
 Webpage=Strona/pojemnik
 AddPage=Dodaj stronę
 PageContainer=Strona
@@ -46,7 +46,7 @@ RealURL=Prawdziwy adres URL
 ViewWebsiteInProduction=Zobacz stronę używając linków ze strony głównej
 Virtualhost=Wirtualny host lub nazwa domeny
 VirtualhostDesc=Nazwa wirtualnego hosta lub domeny (na przykład: www.mywebsite.com, mybigcompany.net, ...)
-ToDeployYourWebsiteOnLiveYouHave3Solutions=To deploy this website live, you have 3 solutions...
+ToDeployYourWebsiteOnLiveYouHave3Solutions=Aby wdrożyć tę witrynę na żywo, masz 3 rozwiązania...
 SetHereVirtualHost= <u> Użyj z Apache / NGinx / ... </u> <br> Utwórz na swoim serwerze internetowym (Apache, Nginx, ...) dedykowany wirtualny host z włączoną obsługą PHP i katalog główny na <br> <strong>%s</strong>
 ExampleToUseInApacheVirtualHostConfig=Przykład do użycia w konfiguracji hosta wirtualnego Apache:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server by running
@@ -56,16 +56,17 @@ ReadPerm=Czytanie
 WritePerm=Zapis
 TestDeployOnWeb=Testuj/wdróż na web serwerze
 PreviewSiteServedByWebServer=<u>Podgląd %s w nowej zakładce.</u><br><br>%s będzie obsługiwana przez zewnętrzny web serwer (np. Apache, Nginx, IIS). Musisz zainstalować i skonfigurować taki web serwer, zanim wskazanie do katalogu:<br><strong>%s</strong><br>URL obsługiwany przez zewnętrzny web serwer:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr= <u> Podgląd %s w nowej karcie. </u> <br> <br> Serwer %s będzie obsługiwany przez serwer Dolibarr, więc nie jest potrzebny żaden dodatkowy serwer WWW (taki jak Apache, Nginx, IIS) do zainstalowania. <br> Niedogodnością jest to, że adresy URL stron nie są przyjazne dla użytkownika i zaczynają się od ścieżki do Twojego Dolibarra. <br> URL podawane przez Dolibarr: <br> <strong> %s </strong> <br> <br> Aby korzystać z własnego serwera zewnętrznego internetowej, aby służyć tej strony internetowej, stworzenie wirtualnego hosta na serwerze WWW, które punkty na katalogu <br> <strong> %s </strong> <br> następnie wprowadź nazwę tego serwera wirtualnego we właściwościach tej witryny i kliknij łącze „Przetestuj / Wdróż w sieci”.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=Adres URL wirtualnego hosta obsługiwanego przez zewnętrzny web serwer nie został zdefiniowany
 NoPageYet=Brak stron
 YouCanCreatePageOrImportTemplate=Możesz utworzyć nową stronę albo załadować pełny szablon witryny
 SyntaxHelp=Pomoc na temat określonych wskazówek dotyczących składni
 YouCanEditHtmlSourceckeditor=Możesz edytować kod źródłowy HTML używając przycisku „Źródło” w edytorze.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=W przypadku obrazu udostępnionego za pomocą linku do udostępniania (otwarty dostęp przy użyciu klucza współdzielenia skrótu pliku) składnia jest następująca: <br> <strong> &lt;img src = "/ viewimage.php? Hashp = 12345679012 ..." a0012c7dcbe087c65z071
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Więcej przykładów HTML i kodu dynamicznego znajdziesz na <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">stronach dokumentacji wiki</a>.<br>
 ClonePage=Powiel stronę/pojemnik
 CloneSite=Duplikuj stronę
@@ -87,15 +88,15 @@ WebsiteAccount=Konto witryny
 WebsiteAccounts=Konta witryny
 AddWebsiteAccount=Utwórz konto witryny
 BackToListForThirdParty=Powrót do listy dla osób trzecich
-DisableSiteFirst=Najpierw wyłącz witrynę
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Tytuł mojej witryny
 AnotherContainer=W ten sposób można dołączyć zawartość innej web strony/pojemnika (może pojawić się błąd, gdy włączysz obsługę kodu dynamicznego a wbudowany podrzędny pojemnik nie istnieje)
 SorryWebsiteIsCurrentlyOffLine=Przepraszamy, ta witryna jest obecnie niedostępna. Proszę wrócić później...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Włącz tabelę kont witryny
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Włącz tabelę kont witryny (login/hasło) dla każdej witryny/strony trzeciej
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Najpierw musisz zdefiniować domyślną stronę główną
-OnlyEditionOfSourceForGrabbedContentFuture=Uwaga: Tworzenie strony internetowej poprzez import zewnętrznej strony internetowej jest zarezerwowane dla doświadczonych użytkowników. W zależności od złożoności strony źródłowej wynik importu może różnić się od oryginału. Ponadto, jeśli strona źródłowa używa popularnych stylów CSS lub sprzecznego JavaScriptu, może to spowodować uszkodzenie wyglądu lub funkcji edytora witryny podczas pracy na tej stronie. Ta metoda umożliwia szybsze utworzenie strony, ale zaleca się utworzenie nowej strony od podstaw lub na podstawie sugerowanego szablonu strony.<br>Pamiętaj również, że edytor wbudowany może nie działać poprawność w przypadku użycia na przechwyconej stronie zewnętrznej.
-OnlyEditionOfSourceForGrabbedContent=Po zaciągnięciu zawartości z zewnętrznej web witryny możliwa jest jedynie edycja kodu źródłowego HTML
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Przechwyć także obrazy znalezione w CSS i na stronie.
 ImagesShouldBeSavedInto=Obrazy powinny być zapisane w katalogu
 WebsiteRootOfImages=Katalog główny dla obrazów witryny
@@ -165,7 +166,7 @@ WebsiteTypeLabel=Typ witryny internetowej
 WebsiteTypeDolibarrWebsite=Web site (Module WebSites CMS)
 WebsiteTypeDolibarrPortal=Native and ready to use web portal (Module Web Portal)
 WebPortalURL=Web portal URL
-NewWebsiteAccount=New accounts for websites
+NewWebsiteAccount=Nowe konta dla stron internetowych
 ModuleWebPortalName=Web portal
 ModuleWebPortalDesc=Gotowy do użycia natywny portal dla klientów, dostawców, partnerów i członków
 WebPortalDescription=Public web portal module for membership and partnership
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Usuń filtr
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Kategorie
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 21bc7630a05..3382d40c4ab 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -14,8 +14,6 @@ FileIntegrityIsOkButFilesWereAdded=Expirou o processo para verificar a integrida
 FileIntegritySomeFilesWereRemovedOrModified=A verificação da integridade dos arquivos falhou. Alguns arquivos foram modificados, removidos ou adicionados.
 GlobalChecksum=Verificação global
 MakeIntegrityAnalysisFrom=Realizar a análise da integridade dos arquivos do aplicativo em
-LocalSignature=Assinatura local integrada (menos confiável)
-RemoteSignature=Assinatura remota distante (mais confiável)
 FilesMissing=Arquivos ausentes
 FilesUpdated=Arquivos atualizados
 FilesModified=Arquivos Alterados
@@ -200,7 +198,6 @@ AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponível somente se Javascript n
 UsedOnlyWithTypeOption=Usado por alguns opção agenda única
 Passwords=Senhas
 DoNotStoreClearPassword=Criptografe senhas armazenadas no banco de dados.
-MainDbPasswordFileConfEncrypted=Criptografe a senha do banco de dados armazenada em conf.php. É altamente recomendável ativar esta opção.
 InstrucToEncodePass=Para ter a senha codificada no arquivo <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="..."</b><br>por<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
 InstrucToClearPass=Para ter a senha não codificada(limpa) no arquivo <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>por<br><b>$dolibarr_main_db_pass="%s"</b>
 ProtectAndEncryptPdfFilesDesc=Proteção de um documento PDF mantém ele disponível para ler e imprimir com qualquer navegador PDF. No entanto, edição e cópia não é possível. Observe que a utilização deste recurso faz com que a construção de um PDF global mesclado não funcione.
@@ -229,8 +226,11 @@ MAIN_MAIL_AUTOCOPY_TO=Copiar (Cco) todos os e-mails enviados para
 MAIN_DISABLE_ALL_MAILS=Desativar todo o envio de e-mail (para fins de teste ou demonstrações)
 MAIN_MAIL_FORCE_SENDTO=Envie todos os e-mails para (em vez de destinatários reais, para fins de teste)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Sugira e-mails de funcionários (se definidos) na lista de destinatários predefinidos ao escrever um novo e-mail
+MAIN_MAIL_NO_WITH_TO_SELECTED=Desabilitar a seleção de um destinatário padrão ao escrever um e-mail, mesmo que haja apenas 1 escolha possível
 MAIN_MAIL_SENDMODE=Método de envio
 MAIN_MAIL_SMTPS_ID=Nome de usuário SMTP ou ID (se o servidor de envio exigir autenticação)
+MAIN_MAIL_SMTPS_PW=Senha ou token SMTP (se o servidor de envio exigir autenticação)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Permitir conexão com servidores de e-mail que estejam usando certificados autoassinados
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use o DKIM para gerar assinatura de e-mail
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domínio de e-mail para uso com o dkim
 MAIN_SMS_SENDMODE=Método usado para enviar SMS
@@ -269,9 +269,11 @@ LastActivationIP=Último IP de ativação
 LastActivationVersion=Versão de ativação mais recente
 UpdateServerOffline=Atualização de servidor off-line
 WithCounter=Gerenciar um contador
+GenericMaskCodes2b=<b>{uuuu}</b> os n primeiros caracteres do sobrenome do usuário que cria o objeto (n é o número de "u").
 GenericMaskCodes3=Não é permitido espaços. <br>Mascara fixa, basta colocar uma letra ou número sem <b>{}</b> ex:<b>CLI</b>,<b>FOR</b></b><br>
 GenericMaskCodes3EAN=Todos os outros caracteres na máscara permanecerão intactos (exceto * ou ? na 13ª posição em EAN13). <br> Espaços não são permitidos. <br> Em EAN13, o último caractere após o último } na 13ª posição deve ser * ou ? . Ela será substituída pela chave calculada. <br>
 GenericNumRefModelDesc=Retorna um número costomizado de acordo com a mascara definida.
+DateStartThatModelHelp=Você pode desabilitar a regra de numeração de elefantes para terceiros criados antes de uma data (por exemplo, porque eles foram importados por uma migração, de outro software usando uma regra diferente). Deixe esse campo vazio para que a regra seja aplicada a todos os terceiros.
 ServerAvailableOnIPOrPort=Servidor disponível no endeço <b>%s</b> e porta <b>%s</b>
 ServerNotAvailableOnIPOrPort=Servidor não disponível no endereço <b>%s</b> e porta <b>%s</b>
 DoTestServerAvailability=Teste de conectividade com o servidor
@@ -330,7 +332,6 @@ ExtrafieldMultiPointGeo=Multiponto Geométrico
 ExtrafieldLinestringGeo=Linha geométrica
 ExtrafieldPolygonGeo=Polígono Geométrico
 ComputedFormula=Campo computado
-ComputedFormulaDesc=Você pode inserir aqui uma fórmula usando outras propriedades do objeto ou qualquer código PHP para obter um valor computado. Você pode usar quaisquer fórmulas compatíveis com PHP incluindo o operador condicional "?", e os seguintes objetos globais: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>ATENCÃO</strong>: Se você precisa de propriedades de um objeto não carregado, busque o objeto você mesmo para a fórmula como no segundo exemplo. <br>Usando um campo computado significa que você não pode inserir você mesmo nenhum valor a partir da interface. Além disso, se houver um erro de síntaxe, a fórmula pode não retornar nada. <br><br>Exemplo 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>Exemplo para recarregar objeto <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')<br><br>Outros exemplos de fórmula que forçam o carregamento de um objeto e de seu objeto pai: <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'
 ComputedpersistentDesc=Campos extra computados serão armazenados no banco de dados, no entanto, o valor será recalculado somente quando o objeto deste campo for alterado. Se o campo computado depender de outros objetos ou dados globais, esse valor pode estar errado !!
 ExtrafieldParamHelpselect=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> código3, valor3 <br>...<br><br> Para que a lista dependa de outra lista de atributos complementares: <br> 1, valor1 | <i>opções_ pai_list_code</i> : parent_key <br> 2, valor2 | <i>opções_ pai_list_code</i> : parent_key <br><br> Para ter a lista dependendo de outra lista: <br> 1, valor1 | <i>parent_list_code</i> : parent_key <br> 2, value2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
@@ -371,7 +372,6 @@ UseDoubleApproval=Usar uma aprovação de 3 etapas quando o valor (sem taxa) é
 WarningPHPMailC=- Usar o servidor SMTP do seu próprio provedor de serviços de e-mail para enviar e-mails também é interessante, portanto, todos os e-mails enviados do aplicativo também serão salvos no diretório "Enviados" da sua caixa de correio.
 WarningPHPMailD=É por tanto recomendado mudar o método de envio de e-mails para o valor "SMTP".
 WarningPHPMailDbis=Se você realmente deseja manter o padrão "PHP" para o envio de e-mails, ignore este aviso ou remova-o %sclicando aqui%s.
-WarningPHPMail2=Se o seu provedor SMTP de e-mail precisar restringir o cliente de e-mail a alguns endereços IP (muito raro), esse é o endereço IP do agente de usuário de e-mail (MUA) para seu aplicativo ERP CRM: <strong>%s</strong>.
 ClickToShowDescription=Clique para exibir a descrição
 RequiredBy=Este módulo é exigido por módulo(s)
 PageUrlForDefaultValues=Você precisa entrar o caminho relativo da URL da página. Se você incluir parâmetros na URL, será mais otimizado se todos os parâmetros da URL estiverem definidos aqui.
@@ -401,8 +401,6 @@ Module1Desc=Gestão de empresas e contatos (clientes, prospectos ...)
 Module2Desc=Gestor Comercial
 Module10Name=Contabilidade (simplificada)
 Module20Desc=Gestor de Orçamentos
-Module22Name=E-mails em massa
-Module22Desc=Gerenciar o envio em massa de e-mails
 Module23Desc=Monitoramento de Consumo de Energia
 Module25Name=Pedidos de venda
 Module25Desc=Gerenciamento de pedidos de vendas
@@ -599,10 +597,6 @@ Permission212=Linhas de Pedidos
 Permission213=Ativar Linha
 Permission214=Configurar Telefone
 Permission215=Configurar Provedores
-Permission221=Ler E-Mails
-Permission222=Criar/Modificar E-Mails (assunto, destinatários...)
-Permission223=Validar E-Mails (permite enviar)
-Permission229=Deletar E-Mails
 Permission237=Visualisar Destinatário e Informações
 Permission238=Enviar Cartas Manualmente
 Permission239=Deletar Cartas depois de Validado ou Enviado
@@ -1266,9 +1260,7 @@ AccountancyCodeSell=Código de contas de vendas
 AccountancyCodeBuy=Código de contas de compras
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mantenha a caixa de seleção “Criar automaticamente o pagamento” vazia por padrão ao criar um novo imposto
 AgendaSetup =Configurações do módulo de eventos e agenda
-AGENDA_REMINDER_BROWSER =Habilitar o lembrete de evento no <b>navegador do usuário</b> (quando a data do lembrete é atingida, um pop-up é mostrado pelo navegador. Cada usuário pode desabilitar tais notificações na configuração de notificação do navegador).
 AGENDA_REMINDER_BROWSER_SOUND =Habilitar a notificação sonora
-AGENDA_REMINDER_EMAIL =Habilitar lembrete de evento <b>por e-mail </b> (opção de lembrete / atraso pode ser definido em cada evento)
 AGENDA_REMINDER_EMAIL_NOTE =Obs: A frequência do agendamento %s deve ser suficiente para garantir que o lembrete seja enviado no momento correto.
 AGENDA_SHOW_LINKED_OBJECT =Exibir objeto conectado na visualização da agenda
 PasswordTogetVCalExport =Chave para autorizar exportação do link
@@ -1348,7 +1340,6 @@ BackupDumpWizard=Assistente para criar arquivo de backup do banco de dados
 BackupZipWizard=Assistente para criar arquivo do diretório de documentos
 SomethingMakeInstallFromWebNotPossible=A instalação do módulo externo não é possível a partir da interface web pelo seguinte motivo:
 SomethingMakeInstallFromWebNotPossible2=Por esse motivo, o processo de atualização descrito aqui é um processo manual que somente um usuário privilegiado pode executar.
-InstallModuleFromWebHasBeenDisabledByFile=A instalação do módulo externo do aplicativo foi desabilitada pelo seu Administrador. Você deve pedir que ele remova o arquivo <strong>%s</strong> para permitir esta funcionalidade.
 ConfFileMustContainCustom=A instalação ou construção de um módulo externo a partir do aplicativo precisa salvar os arquivos do módulo no diretório <strong>%s</strong>. Para ter esse diretório processado pelo Dolibarr, você deve configurar o seu <strong>conf/conf.php</strong> para adicionar as 2 linhas de diretivas :<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Destacar linhas de tabela quando o mouse passar sobre elas
 HighlightLinesColor=Destaque a cor da linha quando o mouse passar (use 'ffffff' para não destacar)
diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
index c1a163024d8..16cf99df96b 100644
--- a/htdocs/langs/pt_BR/banks.lang
+++ b/htdocs/langs/pt_BR/banks.lang
@@ -20,6 +20,7 @@ FutureBalance=Saldo futuro
 ShowAllTimeBalance=Mostrar saldo desde o início
 Reconciliation=Reconciliação
 RIB=Número da conta bancária
+BIC=Código BIC/SWIFT
 SwiftValid=Código de identificação bancária / Sociedade para Telecomunicações Financeiras Interbancárias Internacionais válido
 SwiftNotValid=Código de identificação bancária / Sociedade para Telecomunicações Financeiras Interbancárias Internacionais inválido
 IbanValid=Numero de conta bancária valida
@@ -96,7 +97,6 @@ NumberOfCheques=Nº. do Cheque
 DeleteTransaction=Excluir transação
 ConfirmDeleteTransaction=Você tem certeza que deseja excluir esta transação?
 ThisWillAlsoDeleteBankRecord=Isto também excluirá as transações geradas
-PlannedTransactions=Transações planejadas
 ExportDataset_banque_1=Entradas bancárias e demonstrações contábeis
 ExportDataset_banque_2=Comprovante de depósito
 TransactionOnTheOtherAccount=Transação de outra conta
diff --git a/htdocs/langs/pt_BR/blockedlog.lang b/htdocs/langs/pt_BR/blockedlog.lang
index c37c27dbdd6..9697572d287 100644
--- a/htdocs/langs/pt_BR/blockedlog.lang
+++ b/htdocs/langs/pt_BR/blockedlog.lang
@@ -8,7 +8,6 @@ BrowseBlockedLog=Logs nao modificaveis
 ShowAllFingerPrintsMightBeTooLong=Mostrar todos os Logs Arquivados (pode ser demorado)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostrar todos os arquivos de log inválidos (pode demorar)
 DownloadBlockChain=Baixar impressoes digitais
-KoCheckFingerprintValidity=A entrada de registro arquivada não é válida. Isso significa que alguém (um hacker?) Modificou alguns dados deste registro depois que ele foi gravado, ou apagou o registro arquivado anterior (verifique se a linha com o anterior # existe) ou modificou a soma de verificação do registro anterior.
 OkCheckFingerprintValidity=O registro de log arquivado é válido. Os dados nesta linha não foram modificados e a entrada segue a anterior.
 OkCheckFingerprintValidityButChainIsKo=O log arquivado parece válido em comparação com o anterior, mas a cadeia foi previamente corrompida.
 AddedByAuthority=Salvo na autoridade remota
diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang
index fa012ccdca1..d02c3597d57 100644
--- a/htdocs/langs/pt_BR/categories.lang
+++ b/htdocs/langs/pt_BR/categories.lang
@@ -71,10 +71,12 @@ CatProdLinks=Relação/links entre produtos / serviços e tags / categorias
 CatMembersLinks=Ligações entre os membros e tags / categorias
 CatProjectsLinks=Links entre projetos e tags/categorias
 CatUsersLinks=Links entre usuários e tags / categorias
+DeleteFromCat=Remover de tags / categoria
 ExtraFieldsCategories=atributos complementares
 CategoriesSetup=Configuração Tags / categorias
 CategorieRecursiv=Fazer a ligação com os pais tag/categoria automaticamente
 ShowCategory=Mostrar tag / categoria
+ByDefaultInList=Por padrão em lista
 ChooseCategory=Escolher categoria
 TicketsCategoriesArea=Categorias de ingressos
 ActionCommCategoriesArea=Categorias de Eventos
diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index d453afcead4..e4dd0704693 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -48,7 +48,6 @@ CountryId=ID do País
 Call=Chamar
 PhonePerso=Tel. particular
 PhoneMobile=Celular
-No_Email=Recusar e-mails em massa
 Zip=CEP
 Town=Município
 Web=Website
@@ -214,7 +213,7 @@ ChangeContactDone=Trocar status para 'Contato feito'
 ProspectsByStatus=Prospectos por status
 ContactNotLinkedToCompany=Contato não esta vinculado a nenhum terceiro
 NoDolibarrAccess=Sem acesso ao Dolibarr
-ExportDataset_company_1=Terceiros(Companhias/fundações/pessoas físicas) e suas propriedades
+ExportDataset_company_2=Contatos/Enderecos adicionais e atributos de terceiros
 ImportDataset_company_2=Contatos/Enderecos adicionais e atributos de terceiros
 ImportDataset_company_4=Vendedores de terceiros (assinalar vendedores/usuários para empresas)
 DeliveryAddress=Endereço de entrega
@@ -241,7 +240,6 @@ OutstandingBill=Conta excelente
 OutstandingBillReached=Máx. para dívida a ser alcançado
 ManagingDirectors=Nome do Representante(CEO,Diretor,Presidente...)
 MergeThirdparties=Mesclar terceiros
-ConfirmMergeThirdparties=Tem certeza de que deseja mesclar o terceiro escolhido com o atual? Todos os objetos vinculados (faturas, pedidos, ...) serão movidos para o terceiro atual, após o que o terceiro escolhido será excluído.
 ThirdpartiesMergeSuccess=Terceiros foram mesclados
 SaleRepresentativeLogin=Login para o representante de vendas
 SaleRepresentativeLastname=Sobrenome do representante de vendas
diff --git a/htdocs/langs/pt_BR/datapolicy.lang b/htdocs/langs/pt_BR/datapolicy.lang
index 1d6469006d8..89ab775fb5d 100644
--- a/htdocs/langs/pt_BR/datapolicy.lang
+++ b/htdocs/langs/pt_BR/datapolicy.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - datapolicy
 Module4100Name =Política de privacidade de dados
 datapolicySetup =Configuração do módulo de política de privacidade
+DataDeletion=Exclusão de dados
 DATAPOLICY_TIERS_PROSPECT =Prospecto de cliente
 DATAPOLICY_TIERS_PROSPECT_CLIENT =Prospecto/Cliente
 DATAPOLICY_TIERS_NIPROSPECT_NICLIENT =Nem prospecto/Nem cliente
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 6b1b2cf93d9..398d6c5a989 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -81,7 +81,6 @@ ErrorLoginDoesNotExists=Não existe um usuário com login <b>%s</b>.
 ErrorLoginHasNoEmail=Este usuário não tem endereço de e-mail. Processo abortado.
 ErrorBadValueForCode=Valor inadequado para código de segurança. Tente novamente com um novo valor...
 ErrorBothFieldCantBeNegative=Os campos %s e %s não podem ser ambos negativos
-ErrorLinesCantBeNegativeOnDeposits=As linhas não podem ser negativas em um depósito. Você terá problemas quando precisar apagar o depósito na fatura final, se o fizer.
 ErrorQtyForCustomerInvoiceCantBeNegative=A quantidade nas linhas das notas de clientes não pode ser negativa
 ErrorWebServerUserHasNotPermission=A conta de usuário <b>%s</b> usada para executar o servidor web não possui permissão para isto
 ErrorNoActivatedBarcode=Nenhum tipo de código de barras foi ativado
diff --git a/htdocs/langs/pt_BR/exports.lang b/htdocs/langs/pt_BR/exports.lang
index e8fc5193279..256b702c9e5 100644
--- a/htdocs/langs/pt_BR/exports.lang
+++ b/htdocs/langs/pt_BR/exports.lang
@@ -20,7 +20,6 @@ LineTotalVAT=Valor ICMS por Linha
 TypeOfLineServiceOrProduct=Tipo de Linha (0
 FileToImport=Arquivo de origem de importação
 FieldsInSourceFile=Campos em arquivo de origem
-FieldsInTargetDatabase=Campos de destino no banco de dados Dolibarr (negrito = obrigatório)
 MoveField=Mover campo número da colunas
 ExampleOfImportFile=Exemplo de arquivo de importação
 SaveImportProfile=Guardar este perfil de importação
@@ -32,7 +31,7 @@ FieldSource=Campo Fonte
 NowClickToTestTheImport=Verifique se o formato de arquivo (delimitadores de campo e cadeia) do arquivo corresponde às opções mostradas e se você omitiu a linha de cabeçalho ou se elas serão sinalizadas como erros na simulação a seguir. <br> Clique no botão "<b>%s</b>" para executar uma verificação da estrutura/conteúdo do arquivo e simular o processo de importação. <br> <b>Nenhum dado será alterado em seu banco de dados</b>.
 FieldNeedSource=Este campo requer dados do arquivo de origem
 SomeMandatoryFieldHaveNoSource=Alguns campos obrigatórios não têm nenhuma fonte de arquivo de dados
-InformationOnSourceFile=Informações sobre arquivo de origem
+InformationOnSourceFile=Arquivo Fonte
 SelectAtLeastOneField=Mude pelo menos um campo de origem na coluna de campos para exportar
 SelectFormat=Escolha este formato de arquivo de importação
 DataLoadedWithId=Os dados importados terão um campo adicional em cada tabela de banco de dados com este ID de importação: <b>%s</b>, para permitir que ele seja pesquisável no caso de investigar um problema relacionado a essa importação.
diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang
index ff20ae972e4..e7e037d2de7 100644
--- a/htdocs/langs/pt_BR/mails.lang
+++ b/htdocs/langs/pt_BR/mails.lang
@@ -10,8 +10,6 @@ MailCC=Copiar para
 MailToCCUsers=Copiar para o (s) usuário (s)
 MailFile=Arquivos anexados
 SubjectNotIn=Não no assunto
-NewMailing=Novo Mailing
-ResetMailing=Limpar Mailing
 TestMailing=Teste
 MailSuccessfulySent=E-mail (de %s para %s)  aceito com sucesso para entrega
 MailingSuccessfullyValidated=Emailins validado com sucesso
@@ -53,11 +51,8 @@ NbOfCompaniesContacts=Contatos únicos de empresas
 MailNoChangePossible=Destinatários de um mailing validado não modificaveis
 MailingNeedCommand=O envio de um e-mail pode ser executado a partir da linha de comando. Peça ao administrador do servidor para iniciar o seguinte comando para enviar o e-mail para todos os destinatários:
 MailingNeedCommand2=Pode enviar em linha adicionando o parâmetro MAILING_LIMIT_SENDBYWEB com um valor número que indica o número máximo de e-mails enviados por Sessão.
-LimitSendingEmailing=Observação: Envios de mailings em massa da interface web são feitas em varias vezes por causa de segurança e tempo limite, <b>%s</b> destinatarios por sessão de envio.
 ToClearAllRecipientsClickHere=Para limpar a lista dos destinatários deste mailing, faça click ao botão
 ToAddRecipientsChooseHere=Para Adicionar destinatários, escoja os que figuran em listas a continuação
-NbOfEMailingsReceived=Mailings em massa recebidos
-NbOfEMailingsSend=E-mails em massa enviados
 IdRecord=ID registro
 DeliveryReceipt=Entrega Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Pode usar o caracter0 de separação <b>coma </b> para especificar multiplos destinatários.
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index 0c9bed38c31..01c35f85859 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -259,7 +259,6 @@ ActionsToDo=Ações a realizar
 ActionNotApplicable=Não aplicavel
 ActionRunningNotStarted=A Iniciar
 ActionUncomplete=Incompleto
-LatestLinkedEvents=Últimos eventos vinculados %s
 CompanyFoundation=Empresa / Organização
 Accountant=Contador
 ContactsForCompany=Contatos desta empresa
@@ -330,6 +329,8 @@ ShowCustomerPreview=Ver Historico Cliente
 SeeAll=Ver tudo
 SendByMail=Envio por e-mail
 Email=E-mail
+EMail=E-mail
+EMails=E-mails
 NotRead=Não lido
 NoMobilePhone=Sem celular
 Refresh=Atualizar
@@ -365,7 +366,6 @@ HidePassword=Mostrar comando com senha oculta
 UnHidePassword=Mostrar comando real com a senha visivel
 AddFile=Adicionar arquivo
 FreeZone=Produto de texto livre
-FreeLineOfType=Item de texto livre, digite:
 CloneMainAttributes=Clonar o objeto com estes atributos
 ReGeneratePDF=Re-gerar PDF
 PDFMerge=Fusão de PDF
@@ -478,7 +478,6 @@ DirectDownloadInternalLink=Link privado para baixar
 PrivateDownloadLinkDesc=Você precisa estar logado e precisa de permissões para visualizar ou baixar o arquivo
 Download=Baixar
 DownloadDocument=Descarregar documento
-ActualizeCurrency=Atualizar taxa de câmbio
 Fiscalyear=Ano fiscal
 ModuleBuilder=Módulo e Application Builder
 ClickToShowHelp=Clique para mostrar ajuda de ajuda
@@ -587,3 +586,4 @@ ErrorFailedToDeleteLink=Falha ao remover link '<b>%s</b>'
 ErrorFailedToUpdateLink=Falha ao atualizar link '<b>%s</b>'
 URLToLink=URL para link
 Settings=Configurações
+AllTime=Desde o início
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index cbbba433b2d..5f4a952be7b 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -27,7 +27,9 @@ ServicesNotOnSell=Serviços não para venda e não para compra
 ServicesOnSellAndOnBuy=Serviços para venda e compra
 LastRecordedProducts=Últimos %s produtos gravados
 LastRecordedServices=Últimos %s serviços gravados
+Stock=Estoque
 MenuStocks=Estoques
+Stocks=Estoques e localizações (armazéns) de produtos
 OnSell=Vende-se
 OnBuy=Para compra
 NotOnSell=Não se vende
@@ -37,7 +39,6 @@ ProductStatusOnSellShort=Vende-se
 ProductStatusNotOnSellShort=Não se vende
 ProductStatusNotOnBuy=Não para-se comprar
 ProductStatusNotOnBuyShort=Não para-se comprar
-UpdateVAT=Atualização IVA
 UpdateDefaultPrice=Atualização de preço padrão
 AppliedPricesFrom=Aplicado a partir de
 SellingPriceTTC=Preço de venda (incl. taxas)
@@ -46,6 +47,7 @@ SoldAmount=Total vendido
 PurchasedAmount=Total comprado
 MinPrice=Preço mínimo de venda
 MinPriceTTC=Min. preço de venda (inc. impostos)
+ContractStatusClosed=Encerrado
 ErrorProductBadRefOrLabel=O valor da referencia ou etiqueta é incorreto
 ErrorProductClone=Aconteceu um problema durante a clonação do produto ou serviço.
 SupplierRef=Código do produto do fornecedor
@@ -63,10 +65,11 @@ ConfirmDeleteProduct=? Tem certeza que quer eliminar este produto/serviço?
 ConfirmDeleteProductLine=Tem certeza que quer eliminar esta linha de produto?
 QtyMin=Quant. de compra mín.
 PriceQtyMin=Quant. de preço mín.
-VATRateForSupplierProduct=Taxa de IVA (para este fornecedor/produto)
 DiscountQtyMin=Desconto para esta quant.
 NoPriceDefinedForThisSupplier=Nenhum Preço/Quant. definido para este fornecedor/produto
 NoSupplierPriceDefinedForThisProduct=Nenhum Preço/Quant. do fornecedor definido para este produto
+PredefinedProducts=Produto predefinido
+PredefinedServices=Serviço predefinido
 NotPredefinedProducts=Produtos/Serviços sem predefinição
 ServiceNb=Serviço n� %s
 ListProductServiceByPopularity=Lista de produtos/serviços por popularidade
@@ -82,7 +85,6 @@ BuyingPrices=Preços para Compra
 CustomerPrices=Preços de cliente
 SuppliersPrices=Preços de fornecedores
 SuppliersPricesOfProductsOrServices=Preços do fornecedor (produtos ou serviços)
-CustomCode=Código da mercadoria alfandegária
 CountryOrigin=País de Origem
 StateOrigin=Estado / país de origem
 ShortLabel=Etiqueta curta
@@ -142,7 +144,6 @@ GlobalVariables=As variáveis ​​globais
 GlobalVariableUpdaterHelp0=Analisa os dados JSON de URL especificada, valor especifica a localização de valor relevante,
 GlobalVariableUpdaterType1=Dados WebService
 GlobalVariableUpdaterHelp1=Analisa os dados WebService de URL especificada, NS especifica o namespace, valor especifica a localização de valor relevante, os dados devem conter os dados para enviar e método é o método chamando WS
-PropalMergePdfProductActualFile=Usar arquivos para adicionar em PDF Azur são / é
 PropalMergePdfProductChooseFile=Selecione os arquivos PDF
 DefaultPriceRealPriceMayDependOnCustomer=Preço padrão, o preço real pode depender do cliente
 NbOfQtyInProposals=Qtde nas Propostas
diff --git a/htdocs/langs/pt_BR/website.lang b/htdocs/langs/pt_BR/website.lang
index 26580a9e598..aeee4090931 100644
--- a/htdocs/langs/pt_BR/website.lang
+++ b/htdocs/langs/pt_BR/website.lang
@@ -6,7 +6,6 @@ WEBSITE_PAGE_EXAMPLE=Página da Web para usar como exemplo
 WEBSITE_PAGENAME=Nome da Página/Apelido
 WEBSITE_ALIASALT=Nomes / alias alternativos de página
 WEBSITE_CSS_URL=URL do arquivo CSS externo.
-WEBSITE_HTML_HEADER=Adição na parte inferior do cabeçalho HTML (comum a todas as páginas)
 WEBSITE_ROBOT=Arquivo robô (robots.txt)
 WEBSITE_MANIFEST_JSON=Arquivo manifest.json do site
 HtmlHeaderPage=Cabeçalho HTML (específico apenas para esta página)
@@ -41,14 +40,10 @@ FetchAndCreate=Procure e comece a criar
 BlogPost=Postagem do blog
 WebsiteAccounts=Conta do website
 AddWebsiteAccount=Criar conta do site
-DisableSiteFirst=Desativar o site primeiro
 MyContainerTitle=Título do meu site
 AnotherContainer=É assim que se inclui o conteúdo de outra página / contêiner (você pode ter um erro aqui se ativar o código dinâmico porque o subcontêiner incorporado pode não existir)
 SorryWebsiteIsCurrentlyOffLine=Desculpe, este site está off-line. Volte mais tarde ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Habilitar a tabela da conta do site
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ative a tabela para armazenar contas do site (login / senha) para cada site /  terceiros
 YouMustDefineTheHomePage=Você deve primeiro definir a Home page padrão
-OnlyEditionOfSourceForGrabbedContent=Apenas uma edição de fonte HTML é possível quando o conteúdo foi extraído de um site externo
 GrabImagesInto=Pegue também imagens encontradas no css e na página.
 WebsiteRootOfImages=Diretório raiz para imagens do site
 AliasPageAlreadyExists=Página de alias <strong>%s</strong> já existe
diff --git a/htdocs/langs/pt_MZ/admin.lang b/htdocs/langs/pt_MZ/admin.lang
index 757f4c5ceb2..001ce1b3e74 100644
--- a/htdocs/langs/pt_MZ/admin.lang
+++ b/htdocs/langs/pt_MZ/admin.lang
@@ -14,8 +14,6 @@ FileIntegrityIsOkButFilesWereAdded=Expirou o processo para verificar a integrida
 FileIntegritySomeFilesWereRemovedOrModified=A verificação da integridade dos arquivos falhou. Alguns arquivos foram modificados, removidos ou adicionados.
 GlobalChecksum=Verificação global
 MakeIntegrityAnalysisFrom=Realizar a análise da integridade dos arquivos do aplicativo em
-LocalSignature=Assinatura local integrada (menos confiável)
-RemoteSignature=Assinatura remota distante (mais confiável)
 FilesMissing=Arquivos ausentes
 FilesUpdated=Arquivos atualizados
 FilesModified=Arquivos Alterados
@@ -195,7 +193,6 @@ SourceFile=Arquivo Fonte
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponível somente se Javascript não estiver desativado
 UsedOnlyWithTypeOption=Usado por alguns opção agenda única
 Passwords=Senhas
-MainDbPasswordFileConfEncrypted=Criptografe a senha do banco de dados armazenada em conf.php. É altamente recomendável ativar esta opção.
 InstrucToEncodePass=Para ter a senha codificada no arquivo <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="..."</b><br>por<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
 InstrucToClearPass=Para ter a senha não codificada(limpa) no arquivo <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>por<br><b>$dolibarr_main_db_pass="%s"</b>
 ProtectAndEncryptPdfFilesDesc=Proteção de um documento PDF mantém ele disponível para ler e imprimir com qualquer navegador PDF. No entanto, edição e cópia não é possível. Observe que a utilização deste recurso faz com que a construção de um PDF global mesclado não funcione.
@@ -353,7 +350,6 @@ ModuleCompanyCodeSupplierDigitaria=%s seguido pelo nome do fornecedor truncado p
 Use3StepsApproval=Por padrão, os Pedidos de Compra necessitam ser criados e aprovados por 2 usuários diferentes (uma etapa para a criação e a outra etapa para a aprovação. Note que se o usuário possui ambas permissões para criar e aprovar, uma única etapa por usuário será suficiente). Você pode pedir, com esta opção, para introduzir uma terceira etapa para aprovação por outro usuário, se o montante for superior a um determinado valor (assim 3 etapas serão necessárias : 1=validação, 2=primeira aprovação e 3=segunda aprovação se o montante for suficiente). <br>Defina como vazio se uma aprovação (2 etapas) é suficiente, defina com um valor muito baixo (0.1) se uma segunda aprovação (3 etapas) é sempre exigida.
 UseDoubleApproval=Usar uma aprovação de 3 etapas quando o valor (sem taxa) é maior do que ...
 WarningPHPMailC=- Usar o servidor SMTP do seu próprio provedor de serviços de e-mail para enviar e-mails também é interessante, portanto, todos os e-mails enviados do aplicativo também serão salvos no diretório "Enviados" da sua caixa de correio.
-WarningPHPMail2=Se o seu provedor SMTP de e-mail precisar restringir o cliente de e-mail a alguns endereços IP (muito raro), esse é o endereço IP do agente de usuário de e-mail (MUA) para seu aplicativo ERP CRM: <strong>%s</strong>.
 ClickToShowDescription=Clique para exibir a descrição
 RequiredBy=Este módulo é exigido por módulo(s)
 PageUrlForDefaultValuesCreate=<br> Exemplo: <br> Para o formulário para criar um novo terceiro, é <strong>%s</strong> . <br> Para a URL dos módulos externos instalados no diretório personalizado, não inclua o "custom /", portanto, use o caminho como <strong>mymodule / mypage.php</strong> e não o custom / mymodule / mypage.php. <br> Se você quer o valor padrão somente se o url tiver algum parâmetro, você pode usar <strong>%s</strong>
@@ -378,8 +374,6 @@ Module1Desc=Gestão de empresas e contatos (clientes, prospectos ...)
 Module2Desc=Gestor Comercial
 Module10Name=Contabilidade (simplificada)
 Module20Desc=Gestor de Orçamentos
-Module22Name=E-mails em massa
-Module22Desc=Gerenciar o envio em massa de e-mails
 Module23Desc=Monitoramento de Consumo de Energia
 Module25Name=Pedidos de venda
 Module25Desc=Gerenciamento de pedidos de vendas
@@ -561,10 +555,6 @@ Permission212=Linhas de Pedidos
 Permission213=Ativar Linha
 Permission214=Configurar Telefone
 Permission215=Configurar Provedores
-Permission221=Ler E-Mails
-Permission222=Criar/Modificar E-Mails (assunto, destinatários...)
-Permission223=Validar E-Mails (permite enviar)
-Permission229=Deletar E-Mails
 Permission237=Visualisar Destinatário e Informações
 Permission238=Enviar Cartas Manualmente
 Permission239=Deletar Cartas depois de Validado ou Enviado
@@ -1230,9 +1220,7 @@ AccountancyCodeSell=Código de contas de vendas
 AccountancyCodeBuy=Código de contas de compras
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mantenha a caixa de seleção “Criar automaticamente o pagamento” vazia por padrão ao criar um novo imposto
 AgendaSetup =Configurações do módulo de eventos e agenda
-AGENDA_REMINDER_BROWSER =Habilitar o lembrete de evento no <b>navegador do usuário</b> (quando a data do lembrete é atingida, um pop-up é mostrado pelo navegador. Cada usuário pode desabilitar tais notificações na configuração de notificação do navegador).
 AGENDA_REMINDER_BROWSER_SOUND =Habilitar a notificação sonora
-AGENDA_REMINDER_EMAIL =Habilitar lembrete de evento <b>por e-mail </b> (opção de lembrete / atraso pode ser definido em cada evento)
 AGENDA_REMINDER_EMAIL_NOTE =Obs: A frequência do agendamento %s deve ser suficiente para garantir que o lembrete seja enviado no momento correto.
 AGENDA_SHOW_LINKED_OBJECT =Exibir objeto conectado na visualização da agenda
 PasswordTogetVCalExport =Chave para autorizar exportação do link
@@ -1240,6 +1228,7 @@ PastDelayVCalExport=Não exportar eventos antigos de
 ClickToDialSetup=Configurações do módulo clique para discar
 ClickToDialUseTelLink=Use apenas o link "tel." para os números de telefone
 ClickToDialUseTelLinkDesc=Use este método se seus usuários tiverem um softphone ou uma interface de software, instalados no mesmo computador que o navegador e chamados quando você clicar em um link que comece com "tel:" em seu navegador. Se você precisar de um link que comece com "sip:" ou uma solução de servidor completo (sem necessidade de instalação de software local), você deve definir isso como "Não" e preencher o próximo campo.
+CashDesk=Ponto de vendas
 CashDeskBankAccountForSell=Conta default para usar nos pagamentos em dinheiro
 CashDeskBankAccountForCheque=Conta padrão a ser usada para receber pagamentos por cheque
 CashDeskBankAccountForCB=Conta default para usar nos pagamentos em cartão de crédito
@@ -1312,7 +1301,6 @@ BackupDumpWizard=Assistente para criar arquivo de backup do banco de dados
 BackupZipWizard=Assistente para criar arquivo do diretório de documentos
 SomethingMakeInstallFromWebNotPossible=A instalação do módulo externo não é possível a partir da interface web pelo seguinte motivo:
 SomethingMakeInstallFromWebNotPossible2=Por esse motivo, o processo de atualização descrito aqui é um processo manual que somente um usuário privilegiado pode executar.
-InstallModuleFromWebHasBeenDisabledByFile=A instalação do módulo externo do aplicativo foi desabilitada pelo seu Administrador. Você deve pedir que ele remova o arquivo <strong>%s</strong> para permitir esta funcionalidade.
 ConfFileMustContainCustom=A instalação ou construção de um módulo externo a partir do aplicativo precisa salvar os arquivos do módulo no diretório <strong>%s</strong>. Para ter esse diretório processado pelo Dolibarr, você deve configurar o seu <strong>conf/conf.php</strong> para adicionar as 2 linhas de diretivas :<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Destacar linhas de tabela quando o mouse passar sobre elas
 HighlightLinesColor=Destaque a cor da linha quando o mouse passar (use 'ffffff' para não destacar)
@@ -1375,6 +1363,7 @@ AddTriggers=Adicionar disparadores
 AddModels=Adicionar temas de documentos ou de numeração
 DetectionNotPossible=Não foi possível a detecção
 ListOfAvailableAPIs=Lista de API's disponíveis
+activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=O comando que você está tentando executar não está na lista de comandos permitidos definidos no parâmetro <strong>$ dolibarr_main_restrict_os_commands</strong> no arquivo <strong>conf.php</strong> .
 LandingPage=Página de destino
 ModuleEnabledAdminMustCheckRights=O módulo foi ativado. As permissões para módulo(s) ativado foram fornecidas apenas aos usuários de administração. Talvez seja necessário conceder permissões para outros usuários ou grupos manualmente, se necessário.
diff --git a/htdocs/langs/pt_MZ/blockedlog.lang b/htdocs/langs/pt_MZ/blockedlog.lang
index fe240049d22..9277a3038b3 100644
--- a/htdocs/langs/pt_MZ/blockedlog.lang
+++ b/htdocs/langs/pt_MZ/blockedlog.lang
@@ -8,7 +8,6 @@ BrowseBlockedLog=Logs nao modificaveis
 ShowAllFingerPrintsMightBeTooLong=Mostrar todos os Logs Arquivados (pode ser demorado)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostrar todos os arquivos de log inválidos (pode demorar)
 DownloadBlockChain=Baixar impressoes digitais
-KoCheckFingerprintValidity=A entrada de registro arquivada não é válida. Isso significa que alguém (um hacker?) Modificou alguns dados deste registro depois que ele foi gravado, ou apagou o registro arquivado anterior (verifique se a linha com o anterior # existe) ou modificou a soma de verificação do registro anterior.
 OkCheckFingerprintValidity=O registro de log arquivado é válido. Os dados nesta linha não foram modificados e a entrada segue a anterior.
 OkCheckFingerprintValidityButChainIsKo=O log arquivado parece válido em comparação com o anterior, mas a cadeia foi previamente corrompida.
 AddedByAuthority=Salvo na autoridade remota
diff --git a/htdocs/langs/pt_MZ/companies.lang b/htdocs/langs/pt_MZ/companies.lang
index 16ea207bc0d..fd350227518 100644
--- a/htdocs/langs/pt_MZ/companies.lang
+++ b/htdocs/langs/pt_MZ/companies.lang
@@ -47,7 +47,6 @@ CountryCode=Código do país
 Call=Chamar
 PhonePerso=Tel. particular
 PhoneMobile=Celular
-No_Email=Recusar e-mails em massa
 Zip=CEP
 Town=Município
 Web=Website
@@ -92,8 +91,6 @@ ProfId1CH=Número UID
 ProfId3CH=Prof Id 1 (Número federal)
 ProfId4CH=Prof Id 2 (Número gravado comercial)
 ProfId1CM=Id. prof. 1 (Registro Comercial)
-ProfId2CM=Id. prof. 2 (nº de Contribuinte)
-ProfId2ShortCM=Taxpayer No.
 ProfId1DE=Prof Id 1 (IVA)
 ProfId2DE=Prof Id 2 (Inscrição Estadual)
 ProfId3DE=Prof Id 3 (Inscrição Municipal)
@@ -215,7 +212,7 @@ ProspectsByStatus=Prospectos por status
 NoParentCompany=Nenhum
 ContactNotLinkedToCompany=Contato não esta vinculado a nenhum terceiro
 NoDolibarrAccess=Sem acesso ao Dolibarr
-ExportDataset_company_1=Terceiros(Companhias/fundações/pessoas físicas) e suas propriedades
+ExportDataset_company_2=Contatos/Enderecos adicionais e atributos de terceiros
 ImportDataset_company_2=Contatos/Enderecos adicionais e atributos de terceiros
 ImportDataset_company_4=Vendedores de terceiros (assinalar vendedores/usuários para empresas)
 DeliveryAddress=Endereço de entrega
diff --git a/htdocs/langs/pt_MZ/errors.lang b/htdocs/langs/pt_MZ/errors.lang
index a00901435a7..bfad435dfb3 100644
--- a/htdocs/langs/pt_MZ/errors.lang
+++ b/htdocs/langs/pt_MZ/errors.lang
@@ -33,7 +33,6 @@ ErrorFoundBadEmailInFile=Encontrado uma sintaxe de e-mail incorreta para as linh
 ErrorSubjectIsRequired=O assunto do email é obrigatório
 ErrorFailedToCreateDir=Error na creação de uma carpeta. Compruebe que 0 usuario del servidor Web tiene derechos de escritura en las carpetas de documentos de Dolibarr. Si 0  parámetro <b>safe_mode</b> está ativo en este PHP, Compruebe que los archivos php dolibarr pertencen ao usuario del servidor Web.
 ErrorNoMailDefinedForThisUser=Nenhum e-mail definido para este usuário
-ErrorFeatureNeedJavascript=Esta funcionalidade requer que o javascript seja ativado para funcionar. Altere isto em Configuração >> Aparência.
 ErrorTopMenuMustHaveAParentWithId0=Um menu do tipo 'Topo' não pode ter um menu pai. Coloque 0 no menu pai ou opte por um menu do tipo 'Esquerdo'.
 ErrorLeftMenuMustHaveAParentId=Um menu do tipo 'Esquerdo' deve ter um ID de pai.
 ErrorFileNotFound=Arquivo não encontrado (Rota incorreta, permissões incorretos o acesso prohibido por o parâmetro openbasedir)
@@ -42,7 +41,6 @@ ErrorFunctionNotAvailableInPHP=A função <b>%s</b> é requisitada por esta func
 ErrorDirAlreadyExists=Já existe um diretório com este nome.
 ErrorFileAlreadyExists=Já existe um arquivo com este nome.
 ErrorPartialFile=O arquivo não foi completamente recebido pelo servidor.
-ErrorNoTmpDir=O diretório temporário %s não existe.
 ErrorUploadBlockedByAddon=Upload bloqueado por uma extensão do PHP/Apache.
 ErrorSizeTooLongForIntType=Tamanho longo demais para o tipo int (o máximo é %s dígitos)
 ErrorSizeTooLongForVarcharType=Tamanho longo demais para o tipo string (o máximo é %s caracteres)
@@ -54,9 +52,7 @@ ErrorNoAccountancyModuleLoaded=Módulo de Contabilidade não ativado
 ErrorExportDuplicateProfil=Este nome de perfil já existe para este lote de exportação.
 ErrorLDAPSetupNotComplete=A correspondência Dolibarr-LDAP não está completa.
 ErrorLDAPMakeManualTest=foi criado unn Arquivo .ldif na pasta %s. Trate de gastor manualmente este Arquivo a partir da linha de comandos para Obter mais detalles acerca do error.
-ErrorModuleRequireJavascript=Javascript não deve ser desativado para ter esse recurso funcionando. Para ativar / desativar o Javascript, vá ao menu Home-> Configuração-> Display.
 ErrorPasswordsMustMatch=Deve existir correspondência entre as senhas digitadas
-ErrorContactEMail=Ocorreu um erro técnico. Por favor, entre em contato com o administrador para o seguinte e-mail <b>%s</b> e forneça o código de erro <b>%s</b> em sua mensagem ou adicione uma cópia da tela desta página.
 ErrorWrongValueForField=Campo <b>%s</b> : '<b>%s</b>' não corresponde à regra de regex <b>%s</b>
 ErrorFieldValueNotIn=Campo <b>%s</b> : '<b>%s</b>' não é um valor encontrado no campo <b>%s</b> de <b>%s</b>
 ErrorFieldRefNotIn=Campo <b>%s</b> : '<b>%s</b>' não é uma referência existente <b>%s</b>
@@ -65,7 +61,6 @@ ErrorFileIsInfectedWithAVirus=O antivírus não foi capaz de atestar o arquivo (
 ErrorNumRefModel=Uma referência existe no banco de dados (% s) e não é compatível com esta regra de numeração. Remover registro ou referência renomeado para ativar este módulo.
 ErrorQtyTooLowForThisSupplier=Quantidade muito baixa para este fornecedor ou nenhum preço definido neste produto para este fornecedor
 ErrorOrdersNotCreatedQtyTooLow=Algumas encomendas não foram criadas por causa de quantidades muito baixas
-ErrorModuleSetupNotComplete=A configuração do módulo %s parece estar incompleta. Vá em Home - Setup - Modules para concluir.
 ErrorBadMaskFailedToLocatePosOfSequence=Erro, máscara sem número de sequência
 ErrorBadMaskBadRazMonth=Erro, valor de redefinição ruim
 ErrorCounterMustHaveMoreThan3Digits=Contador deve ter mais de 3 dígitos
@@ -85,7 +80,6 @@ ErrorLoginDoesNotExists=Não existe um usuário com login <b>%s</b>.
 ErrorLoginHasNoEmail=Este usuário não tem endereço de e-mail. Processo abortado.
 ErrorBadValueForCode=Valor inadequado para código de segurança. Tente novamente com um novo valor...
 ErrorBothFieldCantBeNegative=Os campos %s e %s não podem ser ambos negativos
-ErrorLinesCantBeNegativeOnDeposits=As linhas não podem ser negativas em um depósito. Você terá problemas quando precisar apagar o depósito na fatura final, se o fizer.
 ErrorQtyForCustomerInvoiceCantBeNegative=A quantidade nas linhas das notas de clientes não pode ser negativa
 ErrorWebServerUserHasNotPermission=A conta de usuário <b>%s</b> usada para executar o servidor web não possui permissão para isto
 ErrorNoActivatedBarcode=Nenhum tipo de código de barras foi ativado
@@ -137,7 +131,6 @@ ErrorVariableKeyForContentMustBeSet=Erro, a constante com nome %s (com conteúdo
 ErrorURLMustStartWithHttp=O URL %s deve começar com http:// ou https://
 ErrorNewRefIsAlreadyUsed=Erro, a nova referência já está sendo usada
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Erro, não é possível excluir o pagamento vinculado a uma fatura fechada.
-ErrorSearchCriteriaTooSmall=Critérios de pesquisa insuficientes.
 ErrorObjectMustHaveStatusActiveToBeDisabled=Os objetos devem ter o status 'Ativo' para serem desativados
 ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Os objetos devem ter o status 'Rascunho' ou 'Desativado' para serem ativados
 ErrorNoFieldWithAttributeShowoncombobox=Nenhum campo possui a propriedade 'show combo box' na definição do objeto '%s'. Não há como mostrar a lista de combinação.
diff --git a/htdocs/langs/pt_MZ/exports.lang b/htdocs/langs/pt_MZ/exports.lang
index 061d20450dd..0e7c3949675 100644
--- a/htdocs/langs/pt_MZ/exports.lang
+++ b/htdocs/langs/pt_MZ/exports.lang
@@ -1,5 +1,66 @@
 # Dolibarr language file - Source file is en_US - exports
-ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
-DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
-DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
+ImportableDatas=Conjunto de dados que podem ser importados
+SelectExportDataSet=Escolha um conjunto predefinido de dados que deseja exportar...
+SelectImportDataSet=Escolha um conjunto predefinido de dados que deseja importar...
+NotImportedFields=Os campos de arquivo de origem não importado
+ExportModelSaved=Exportar perfil salvo como <b> %s </b>.
+ImportModelName=Nome do perfil de importação
+DatasetToImport=Conjunto de dados a importar
+FormatedImportDesc1=Este módulo permite atualizar dados existentes ou adicionar novos objetos ao banco de dados a partir de um arquivo sem conhecimento técnico, usando um assistente.
+NoImportableData=Não existe tipo de dados importavel (não existe nenhum módulo com definições de dados importavel ativado)
+FileSuccessfullyBuilt=Arquivo gerado
+LineLabel=Rótulo de linha
+LineDescription=Descrição da Linha
+LineUnitPrice=Preço Unitário da Linha
+LineVATRate=Taxa de IVA por Linha
+LineQty=Quantidade por Linha
+LineTotalHT=Quantidade de imposto liq. por linha
+LineTotalTTC=Acrescido de IVA da linha
+LineTotalVAT=Valor de IVA por Linha
+TypeOfLineServiceOrProduct=Tipo de Linha (0
+FileToImport=Arquivo de origem de importação
+FieldsInSourceFile=Campos em arquivo de origem
+MoveField=Mover campo número da colunas
+ExampleOfImportFile=Exemplo de arquivo de importação
+SaveImportProfile=Guardar este perfil de importação
+ErrorImportDuplicateProfil=Falha ao salvar este perfil de importação com este nome. Um perfil existente já existe com este nome.
+TablesTarget=Mesas alvejados
+FieldsTarget=Alvo
+FieldTarget=Campo de destino
+FieldSource=Campo Fonte
+NowClickToTestTheImport=Verifique se o formato de arquivo (delimitadores de campo e cadeia) do arquivo corresponde às opções mostradas e se você omitiu a linha de cabeçalho ou se elas serão sinalizadas como erros na simulação a seguir. <br> Clique no botão "<b>%s</b>" para executar uma verificação da estrutura/conteúdo do arquivo e simular o processo de importação. <br> <b>Nenhum dado será alterado em seu banco de dados</b>.
+FieldNeedSource=Este campo requer dados do arquivo de origem
+SomeMandatoryFieldHaveNoSource=Alguns campos obrigatórios não têm nenhuma fonte de arquivo de dados
+InformationOnSourceFile=Arquivo Fonte
+SelectAtLeastOneField=Mude pelo menos um campo de origem na coluna de campos para exportar
+SelectFormat=Escolha este formato de arquivo de importação
+DataLoadedWithId=Os dados importados terão um campo adicional em cada tabela de banco de dados com este ID de importação: <b>%s</b>, para permitir que ele seja pesquisável no caso de investigar um problema relacionado a essa importação.
+EmptyLine=Linha vazia (serão descartados)
+FileWasImported=O arquivo foi importado com o números.
+NbOfLinesOK=Número de linhas sem erros e sem avisos:
+NbOfLinesImported=Número de linhas de importados com sucesso:
+DataComeFromNoWhere=Valor para inserir vem do erro,no arquivo de origem.
+DataComeFromFileFieldNb=Valor para inserir vem do campo de número do arquivo de origem.
+DataIsInsertedInto=Dados provenientes do arquivo de origem será inserido o seguinte campo:
+SourceExample=Exemplo de possível valor dos dados
+ExampleAnyRefFoundIntoElement=Qualquer ref encontrada para o elemento
+ExampleAnyCodeOrIdFoundIntoDictionary=Qualquer código (ou id) encontrado em dicionário
+TsvFormatDesc=Formato de arquivo Tab Separated Value (. TSV) Este é um formato de arquivo de texto, onde os campos são separados por um tabulador [Tab].
+ExportFieldAutomaticallyAdded=O campo <b>%s</b> foi adicionado automaticamente. Isto evitará que você tenha linhas semelhantes a serem tratadas como registro duplicado (com este campo adicionado, todas as linhas terão sua própria ID e serão então diferentes).
+SpecialCode=Código especial
+ExportStringFilter=Permite substituir um ou mais caracteres no texto
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filtra por um ano/mês/dia <br> YYYY + YYYY, YYYYMM + YYYYMM, YYYYMMDD + YYYYMMDD: filtros ao longo de um intervalo de anos/meses/dias <br> > YYYY, > YYYYMM, > YYYYMMDD: filtros em todos os anos / meses / dias seguintes <br> < YYYY, < YYYYMM, < YYYYMMDD: filtros em todos os anos / meses / dias anteriores
+ExportNumericFilter=filtros NNNNN por um valor <br> filtros NNNNN+NNNNN acima de uma faixa de valores <br> < filtros NNNNN por valores mais baixos <br> > filtros NNNNN por valores mais elevados
+ImportFromLine=Importar iniciando da linha número
+ImportFromToLine=Intervalo de limite (de - até). Por exemplo. omitir linhas de cabeçalho.
+SetThisValueTo2ToExcludeFirstLine=Por exemplo, defina esse valor como 3 para excluir as 2 primeiras linhas. <br> Se as linhas de cabeçalho NÃO forem omitidas, isso resultará em vários erros na simulação de importação.
+KeepEmptyToGoToEndOfFile=Mantenha este campo vazio para processar todas as linhas até o final do arquivo.
+SelectPrimaryColumnsForUpdateAttempt=Selecione coluna(s) para usar como chave primária para uma importação de UPDATE
+UpdateNotYetSupportedForThisImport=Atualizar não é suportado para este tipo de importação (apenas inserir)
+NoUpdateAttempt=Nenhuma tentativa de atualização foi realizada, apenas insira
+ImportDataset_user_1=Usuários (funcionários ou não) e propriedades
+ComputedField=Campo computado
+SelectFilterFields=Se você deseja filtrar alguns valores, apenas os valores de entrada aqui.
+FilteredFieldsValues=Valor para o filtro
+MultipleRecordFoundWithTheseFilters=Múltiplos registros foram encontrados com esses filtros: %s
+StocksWithBatch=Estoques e localização (armazém) de produtos com lote / número de série
diff --git a/htdocs/langs/pt_MZ/main.lang b/htdocs/langs/pt_MZ/main.lang
index b69fd5e4398..7cd92d52be6 100644
--- a/htdocs/langs/pt_MZ/main.lang
+++ b/htdocs/langs/pt_MZ/main.lang
@@ -252,7 +252,6 @@ ActionsToDoShort=Para fazer
 ActionNotApplicable=Não aplicavel
 ActionRunningNotStarted=A Iniciar
 ActionUncomplete=Incompleto
-LatestLinkedEvents=Últimos eventos vinculados %s
 CompanyFoundation=Empresa / Organização
 Accountant=Contador
 ContactsForCompany=Contatos desta empresa
@@ -327,6 +326,8 @@ ShowCustomerPreview=Ver Historico Cliente
 SeeAll=Ver tudo
 SendByMail=Envio por e-mail
 Email=E-mail
+EMail=E-mail
+EMails=E-mails
 NotRead=Não lido
 NoMobilePhone=Sem celular
 Refresh=Atualizar
@@ -361,7 +362,6 @@ HidePassword=Mostrar comando com senha oculta
 UnHidePassword=Mostrar comando real com a senha visivel
 AddFile=Adicionar arquivo
 FreeZone=Produto de texto livre
-FreeLineOfType=Item de texto livre, digite:
 CloneMainAttributes=Clonar o objeto com estes atributos
 ReGeneratePDF=Re-gerar PDF
 PDFMerge=Fusão de PDF
@@ -469,7 +469,6 @@ RemoveString=Remover string '%s'
 DirectDownloadInternalLink=Link privado para baixar
 Download=Baixar
 DownloadDocument=Descarregar documento
-ActualizeCurrency=Atualizar taxa de câmbio
 Fiscalyear=Ano fiscal
 ModuleBuilder=Módulo e Application Builder
 ClickToShowHelp=Clique para mostrar ajuda de ajuda
diff --git a/htdocs/langs/pt_MZ/website.lang b/htdocs/langs/pt_MZ/website.lang
index c8fa4f5644c..021cef95e27 100644
--- a/htdocs/langs/pt_MZ/website.lang
+++ b/htdocs/langs/pt_MZ/website.lang
@@ -6,7 +6,6 @@ WEBSITE_PAGE_EXAMPLE=Página da Web para usar como exemplo
 WEBSITE_PAGENAME=Nome da Página/Apelido
 WEBSITE_ALIASALT=Nomes / alias alternativos de página
 WEBSITE_CSS_URL=URL do arquivo CSS externo.
-WEBSITE_HTML_HEADER=Adição na parte inferior do cabeçalho HTML (comum a todas as páginas)
 WEBSITE_ROBOT=Arquivo robô (robots.txt)
 WEBSITE_MANIFEST_JSON=Arquivo manifest.json do site
 HtmlHeaderPage=Cabeçalho HTML (específico apenas para esta página)
@@ -41,14 +40,10 @@ FetchAndCreate=Procure e comece a criar
 BlogPost=Postagem do blog
 WebsiteAccounts=Conta do website
 AddWebsiteAccount=Criar conta do site
-DisableSiteFirst=Desativar o site primeiro
 MyContainerTitle=Título do meu site
 AnotherContainer=É assim que se inclui o conteúdo de outra página / contêiner (você pode ter um erro aqui se ativar o código dinâmico porque o subcontêiner incorporado pode não existir)
 SorryWebsiteIsCurrentlyOffLine=Desculpe, este site está off-line. Volte mais tarde ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Habilitar a tabela da conta do site
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ative a tabela para armazenar contas do site (login / senha) para cada site /  terceiros
 YouMustDefineTheHomePage=Você deve primeiro definir a Home page padrão
-OnlyEditionOfSourceForGrabbedContent=Apenas uma edição de fonte HTML é possível quando o conteúdo foi extraído de um site externo
 GrabImagesInto=Pegue também imagens encontradas no css e na página.
 WebsiteRootOfImages=Diretório raiz para imagens do site
 AliasPageAlreadyExists=Página de alias <strong>%s</strong> já existe
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 72add87a786..7154aadf91b 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=A verificação de integridade dos arquivos p
 FileIntegritySomeFilesWereRemovedOrModified=A verificação da integridade dos ficheiros falhou. Alguns ficheiros foram modificados, removidos ou adicionados.
 GlobalChecksum=Checksum global
 MakeIntegrityAnalysisFrom=Fazer a análise de integridade dos ficheiros de aplicativos a partir de
-LocalSignature=Assinatura local embutida (menos segura)
-RemoteSignature=Assinatura remota (mais segura)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Ficheiros em falta
 FilesUpdated=Ficheiros atualizados
 FilesModified=Ficheiros modificados
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Utilizado apenas por algumas opções da agenda
 Security=Segurança
 Passwords=Palavras-passe
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Criptografe a palavra-passe da base de dados armazenada em conf.php. É altamente recomendável ativar esta opção.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=Para que a palavra passe seja codificada no ficheiro <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="...";</b><br>por<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Para que a palavra passe seja descodificada no ficheiro <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>por<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Proteja arquivos PDF gerados. Isso NÃO é recomendado, pois interrompe a geração de PDF em massa.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Campo calculado
-ComputedFormulaDesc=Você pode inserir aqui uma fórmula usando outras propriedades do objeto ou qualquer codificação PHP para obter um valor computado dinâmico. Você pode usar qualquer fórmula compatível com PHP, incluindo "?" operador de condição, e seguinte objeto global: <strong>$db, $conf, $langs, $mysoc, $utilizador, $objectoffield</strong>.<br><strong>AVISO</strong>: Se você precisar de propriedades de um objeto não carregado, basta buscar o objeto em sua fórmula como no segundo exemplo.<br> Usar um campo computado significa que você não pode inserir nenhum valor na interface. Além disso, se houver um erro de sintaxe, a fórmula poderá não retornar nada.<br><br>Exemplo de fórmula:<br>$objectoffield->Id. < 10 ? round($objectoffield-> id / 2, 2): ($objectoffield->Id. + 2 * $utilizador-> '>Id.) * (int) substr($mysoc->zip, 1, 2)<br><br> Exemplo para recarregar o objeto<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->Id. ) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')<br><br>Outro exemplo de fórmula para forçar o carregamento do objeto e seu origem, fonte objeto:<br>(($reloadedobj = nova tarefa($db)) && ($reloadedobj->fetchNoCompute($objectoffield->Id.) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'origem, fonte projeto não encontrado'
+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'
 Computedpersistent=Armazenar campo computado
 ComputedpersistentDesc=Os campos extras computados serão armazenados no banco de dados, porém o valor só será recalculado quando o objeto deste campo for alterado. Se o campo computado depender de outros objetos ou dados globais este valor pode estar errado!!
 ExtrafieldParamHelpPassword=Deixar este campo em branco significa que este valor será armazenado SEM criptografia (o campo está apenas oculto com estrelas na tela).<br><br>Enter valor 'dolcrypt' para codificar o valor com um algoritmo de criptografia reversível. Os dados limpos ainda podem ser conhecidos e editados, mas são criptografados no banco de dados.<br><br> Digite 'auto' (ou 'md5', 'sha256', 'password_hash', ...) para usar o algoritmo de criptografia de senha padrão (ou md5, sha256, password_hash...) para salvar a senha com hash não reversível em banco de dados (não há como recuperar o valor original)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Usar o servidor SMTP do seu próprio provedor de serviços de e-mail para enviar e-mails também é interessante, pois todos os e-mails enviados de Aplicação também serão salvos em sua pasta "Enviados" diretoria da sua caixa de correio.
 WarningPHPMailD=Recomenda-se portanto alterar o método de envio de e-mails para o valor “SMTP”.
 WarningPHPMailDbis=Se você realmente deseja manter o método "PHP" padrão para enviar e-mails, simplesmente ignore este aviso ou remova-o %sclicando aqui%s.
-WarningPHPMail2=Se o seu serviço de e-mail SMTP restringir o cliente de e-mail a alguns endereços IP (muito raro), utilize o seguinte endereço IP da sua instalação ERP CRM Dolibarr: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Contabilidade (simplificado)
 Module10Desc=Relatórios contábeis simples (periódicos, faturamento) com base no conteúdo do banco de dados. Não usa nenhuma tabela de razão.
 Module20Name=Orçamentos
 Module20Desc=Gestão de orçamentos
-Module22Name=Emailings em massa
-Module22Desc=Gerenciar e-mails em massa
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energia
 Module23Desc=Monitorização do consumo de energia
 Module25Name=Ordens de venda
@@ -847,10 +848,10 @@ Permission212=Encomendar linhas de rede
 Permission213=Ativar linha de rede
 Permission214=Configurar telefonia
 Permission215=Configurar fornecedores de rede
-Permission221=Consultar emails
-Permission222=Criar/modificar emails (assunto, destinatários, etc.)
-Permission223=Validar emails (permite o envío)
-Permission229=Eliminar emails
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Ver destinatários e informação
 Permission238=Envie correio manualmente
 Permission239=Apagar o correio depois da validação ou envio
@@ -1105,6 +1106,7 @@ DictionaryStaff=número de empregados
 DictionaryAvailability=Atraso na entrega
 DictionaryOrderMethods=encomenda métodos
 DictionarySource=Origem dos orçamentos/encomendas
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Grupos personalizados para os relatórios
 DictionaryAccountancysystem=Modelos para o gráfíco de contas
 DictionaryAccountancyJournal=Diários contabilisticos
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Voltar à lista de dicionários
 TypeOfRevenueStamp=Tipo de selo fiscal
 VATManagement=Gestão de impostos sobre vendas
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Por padrão, o imposto sobre vendas proposto é 0, que pode ser usado para casos como associações, indivíduos ou pequenas empresas.
 VATIsUsedExampleFR=Na França, significa empresas ou organizações com um sistema fiscal real (real simplificado ou real normal). Um sistema em que o IVA é declarado.
 VATIsNotUsedExampleFR=Na França, significa associações que não são declaradas como imposto sobre vendas ou empresas, organizações ou profissões liberais que escolheram o sistema fiscal de microempresa (imposto sobre vendas em franquia) e pagaram um imposto sobre vendas de franquia sem qualquer declaração de imposto sobre vendas. Essa escolha exibirá a referência "Imposto sobre vendas não aplicável - art-293B do CGI" nas faturas.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Tipo de imposto sobre vendas
 LTRate=Taxa
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=De acordo com a configuração dos impostos (Veja %s -
 LabelUsedByDefault=Etiqueta que será utilizada por defeito se não for encontrada tradução para este código
 LabelOnDocuments=Etiqueta sobre documentos
 LabelOrTranslationKey=Etiqueta ou chave de tradução
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=Exibir cliente/Fornecedor, Vendedor número de IVA em listas combin
 AddAdressInList=Exiba o endereço cliente/Fornecedor, Vendedor em listas combinadas.<br>Terceiros aparecerão com um formato de nome de "The Big empresa, companhia corp. - 21 jump street 123456 Big town - USA" em vez de "The Big empresa, companhia corporação".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Peça o método de envio preferido para terceiros.
-FieldEdition=Edição do campo %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Exemplo: +2 (para preencher apenas se existir problemas de desvios de fuso horário)
 GetBarCode=Obter código de barras
 NumberingModules=Modelos de numeração
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Forçar a data de fatura para a data de validação
 SuggestedPaymentModesIfNotDefinedInInvoice=Modo de pagamento sugerido na fatura por padrão, se não estiver definido na fatura
 SuggestPaymentByRIBOnAccount=Sugerir pagamento por saque na conta
 SuggestPaymentByChequeToAddress=Sugira pagamento em cheque para
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Texto livre em faturas
 WatermarkOnDraftInvoices=Marca d'água nas faturas rascunho (nenhuma se em branco)
 PaymentsNumberingModule=Modelo de numeração de pagamentos
@@ -1718,6 +1723,7 @@ CompressionOfResources=Compressão das respostas HTTP
 CompressionOfResourcesDesc=Por exemplo, usando a diretiva Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=A detecção automática não é possível com os navegadores atuais
 DefaultValuesDesc=Aqui você pode definir o valor padrão que deseja usar ao criar um novo registro, e/ou filtros padrão ou a classificação encomenda quando você lista registros.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Valores padrão (para usar em formulários)
 DefaultSearchFilters=Filtros de pesquisa predefinidos
 DefaultSortOrder=Pedidos de classificação padrão
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Envios módulos numerados
 SendingsAbility=Suporte para guias de transporte para entregas a clientes
 NoNeedForDeliveryReceipts=Na maioria dos casos, as folhas de remessa são usadas como folhas para entregas ao cliente (lista de produtos a serem enviados) e folhas recebidas e assinadas pelo cliente. Portanto, o recibo de entrega do produto é um recurso duplicado e raramente é ativado.
 FreeLegalTextOnShippings=Texto livre nas expedições
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Módulo de numeração de notas de entrega de produtos
 DeliveryOrderModel=Modelo de nota de entrega de produtos
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Texto livre em notas de entregas
 ##### FCKeditor #####
 AdvancedEditor=Editor avançado
 ActivateFCKeditor=Ativar editor avançado para:
-FCKeditorForNotePublic=Criação/edição WYSIWYG do campo “notas públicas” de elementos
-FCKeditorForNotePrivate=Criação/edição WYSIWYG do campo “notas privadas” dos elementos
-FCKeditorForCompany=Criação/edição WYSIWYG do campo Descrição de elementos (exceto produtos/serviços)
-FCKeditorForProductDetails=Criação/edição WYSIWYG de produtos Descrição ou linhas para objetos (linhas de orçamentos, pedidos, faturas, etc...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Aviso: Usar esta opção neste caso não é recomendado, pois pode criar problemas com caracteres especiais na formatação da página e ao criar arquivos PDF.
-FCKeditorForMailing= Criação/edição WYSIWYG para eMailings em massa (Ferramentas->eMailing)
-FCKeditorForUserSignature=Criação/edição WYSIWYG da assinatura utilizador
-FCKeditorForMail=Criação/edição WYSIWYG para todos os e-mails (exceto Ferramentas->eMailing)
-FCKeditorForTicket=Criação/edição WYSIWYG para ingressos
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Configuração do módulo Stock
 IfYouUsePointOfSaleCheckModule=Se você usar o módulo Point of Sale (POS) fornecido por padrão ou um módulo externo, essa configuração pode ser ignorada pelo seu módulo POS. A maioria dos módulos PDV é projetada por padrão para criar uma fatura imediatamente e diminuir o estoque, independentemente das opções aqui. Portanto, se você precisar ou não de uma redução de estoque ao registrar uma venda no seu PDV, verifique também a configuração do seu módulo PDV.
@@ -1867,7 +1874,6 @@ Buy=Comprar
 Sell=Vender
 InvoiceDateUsed=Data da fatura usada
 YourCompanyDoesNotUseVAT=A sua empresa foi definida para não utilizar IVA (Início->Configuração->Empresa/Organização), assim, não há opções relacionadas com o IVA para configurar.
-AccountancyCode=Código de Contabilidade
 AccountancyCodeSell=Código de contabilidade de vendas
 AccountancyCodeBuy=Código de contabilidade de compras
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mantenha a caixa de seleção “automaticamente criar o pagamento” vazia por padrão ao criar um novo imposto
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Qual visualização você deseja abrir por padrão ao sele
 AGENDA_EVENT_PAST_COLOR = Evento anterior Cor
 AGENDA_EVENT_CURRENT_COLOR = Evento atual Cor
 AGENDA_EVENT_FUTURE_COLOR = Evento futuro Cor
-AGENDA_REMINDER_BROWSER = Ative o lembrete de evento <b>no navegador utilizador</b> (quando lembrar data é alcançado, um pop-up é mostrado pelo navegador. Cada utilizador pode desativar essas notificações na configuração de notificação do navegador).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Ativar notificação sonora
-AGENDA_REMINDER_EMAIL = Ative o lembrete de evento <b>por e-mail</b> (a opção/atraso de lembrete pode ser definida em cada evento).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Nota: A frequência do job agendado %s deve ser suficiente para garantir que os lembretes sejam enviados no momento correto.
 AGENDA_SHOW_LINKED_OBJECT = Mostrar o objeto associado na vista de agenda
 AGENDA_USE_EVENT_TYPE = Use tipos de eventos (gerenciados no menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Definir automaticamente este valor padrão para o tipo de evento no formulário de criação de evento
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Chave de autorização para exportação do link vcal.
 PastDelayVCalExport=Não exportar evento com mais de
 SecurityKey = Chave de segurança
@@ -2006,7 +2017,7 @@ BackupZipWizard=Assistente para construir o arquivo de documentos diretoria
 SomethingMakeInstallFromWebNotPossible=Instalação do módulo externo não é possível a partir da interface web pelo seguinte motivo:
 SomethingMakeInstallFromWebNotPossible2=Por esse motivo, o processo de atualização descrito aqui é um processo manual que somente um utilizador privilegiado pode executar.
 InstallModuleFromWebHasBeenDisabledContactUs=A instalação ou desenvolvimento de módulos externos ou sites dinâmicos, do Aplicação, está atualmente bloqueado por motivos de segurança. Entre em contato conosco se precisar ativar esse recurso.
-InstallModuleFromWebHasBeenDisabledByFile=Instalação de um módulo externo da aplicação foi desativada pelo seu administrador. Você deve pedir-lhe para remover o ficheiro <strong>%s</strong> para permitir esta funcionalidade.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Instalar ou construir um módulo externo do aplicativo precisa salvar os arquivos do módulo no diretório. <strong>%s</strong>Para que este diretório seja processado pelo Dolibarr, você deve configurar seu <strong>conf/conf.php</strong> para adicionar as 2 linhas diretivas:<br><strong> $dolibarr_main_url_root_alt ='/ custom';</strong><br><strong> $dolibarr_main_document_root_alt='%s/ custom';</strong>
 HighlightLinesOnMouseHover=Realçar as linhas da tabela quando o rato passar sobre elas
 HighlightLinesColor=Destaque Cor da linha quando o mouse passar (use 'ffffff' para não destacar)
@@ -2036,6 +2047,7 @@ Enter0or1=Digite 0 ou 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Entre aqui entre chaves, lista de números de bytes que representam o símbolo da moeda. Por exemplo: para $, insira [36] - para o brasil real R $ [82,36] - para €, insira [8364]
 ColorFormat=As cores RGB está no formato HEX, por exemplo: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Nome do ícone no formato:<br>- image.png para uma imagem ficheiro no diretório do tema atual<br>- image.png@módulo if ficheiro está no diretoria /img/ de um módulo<br>- fa-xxx para um FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size para um picto FontAwesome fa-xxx (com prefixo, Cor e tamanho definido )
 PositionIntoComboList=Posição da linha nas listas de seleção
 SellTaxRate=Taxa de imposto sobre vendas
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Ocultar bordas no quadro de endereço do remetente
 MAIN_PDF_NO_RECIPENT_FRAME=Ocultar bordas no quadro de endereço do destinatário
 MAIN_PDF_HIDE_CUSTOMER_CODE=Ocultar cliente Código
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Ocultar nome do remetente/empresa, companhia no bloco de endereço
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Ocultar condições de pagamento
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Ocultar modo de pagamento
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=Não recomendado
 ARestrictedPath=Algum caminho restrito para arquivos de dados
 CheckForModuleUpdate=verificar para atualizações externas módulos
 CheckForModuleUpdateHelp=Esta ação se conectará a editores de módulos externos a verificar se uma nova versão estiver disponível.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Uma atualização está disponível
 NoExternalModuleWithUpdate=Nenhuma atualização encontrada para módulos externo
 SwaggerDescriptionFile=API Swagger Descrição ficheiro (para uso com redoc, por exemplo)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Mostrar endereço de entrega
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Indicação obrigatória em alguns países (França, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=URL hiperligação, conexão da rede social. Use {socialid} para a parte variável que contém a rede social Id..
 IfThisCategoryIsChildOfAnother=Se este Categoria for filho de outro
 DarkThemeMode=Modo tema escuro
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Aviso: o módulo %s definiu um
 WarningModuleHasChangedSecurityCsrfParameter=Aviso: o módulo %s tem Desativado a segurança CSRF da sua instância. Esta ação é suspeita e sua instalação pode não estar mais segura. Entre em contato com o autor do módulo para obter explicações.
 EMailsInGoingDesc=Os e-mails recebidos são gerenciados pelo módulo %s. Você deve ativar e e configurá-lo se precisar oferecer suporte ao recebimento de e-mails.
 MAIN_IMAP_USE_PHPIMAP=Use a biblioteca PHP-IMAP para IMAP em vez do PHP IMAP nativo. Isso também permite o uso de um OAuth2 ligação para IMAP (módulo OAuth também deve estar ativado).
-MAIN_CHECKBOX_LEFT_COLUMN=Mostrar a coluna para seleção de linha do campo e à esquerda (à direita por padrão)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Não criado por padrão. Criado apenas na ativação de módulo.
 CSSPage=Estilo CSS
 Defaultfortype=Predefinição
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index 1e83d18f51c..4d592be69e3 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Saldo Final
 CurrentBalance=Saldo Actual
 FutureBalance=Saldo Previsto
 ShowAllTimeBalance=Mostrar Balanço Desde o Início
-AllTime=Do início
 Reconciliation=Conciliação
 RIB=Conta bancária
 IBAN=Número IBAN
@@ -133,7 +132,7 @@ DeleteTransaction=Eliminar entrada
 ConfirmDeleteTransaction=Tem a certeza que deseja eliminar esta entrada?
 ThisWillAlsoDeleteBankRecord=Isto também eliminará a entrada bancária gerada
 BankMovements=Movimentos
-PlannedTransactions=Entradas previstas
+PlannedTransactions=Upcoming entries
 Graph=Gráficos
 ExportDataset_banque_1=Entradas bancárias e extrato de conta
 ExportDataset_banque_2=Comprovativo de depósito
@@ -151,7 +150,7 @@ FutureTransaction=Transação futura. Incapaz de reconciliar.
 SelectChequeTransactionAndGenerate=Selecione / filtre os cheques que devem ser incluídos no recibo de depósito do cheque. Em seguida clique em Criar.
 SelectPaymentTransactionAndGenerate=Selecione/filtre os documentos que serão incluídos no comprovante de depósito %s. Em seguida, clique em “Criar”.
 InputReceiptNumber=Escolha o extrato bancário relacionado à conciliação. Use um valor numérico classificável
-InputReceiptNumberBis=AAAAAMM ou AAAAMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Para reconciliar?
 ThenCheckLinesAndConciliate=Em seguida, verifique as linhas presentes no extrato bancário e clique
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Se essa função estiver ativada, você pode escolher u
 BankColorizeMovementName1=Cor de fundo para movimento a débito
 BankColorizeMovementName2=Cor de fundo para movimento a crédito
 IfYouDontReconcileDisableProperty=Se você não fizer as reconciliações bancárias em algumas contas bancárias, desative a propriedade "%s" para remover este aviso.
-NoBankAccountDefined=Nenhuma conta bancária definida
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Nenhum registo encontrado na conta bancária. Normalmente, isso ocorre quando um registo foi excluído manualmente da lista de transações na conta bancária (por exemplo, durante uma reconciliação da conta bancária). Outra razão é que o pagamento foi registado quando o módulo "%s" foi desativado.
 AlreadyOneBankAccount=Já tem uma conta bancária definida
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Variante ficheiro SEPA
diff --git a/htdocs/langs/pt_PT/blockedlog.lang b/htdocs/langs/pt_PT/blockedlog.lang
index fac9d91d97a..490ddffa52c 100644
--- a/htdocs/langs/pt_PT/blockedlog.lang
+++ b/htdocs/langs/pt_PT/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Logs inalteráveis
 ShowAllFingerPrintsMightBeTooLong=Mostrar todos os logs arquivados (podem ser longos)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostrar todos os logs de arquivo não válidos (podem ser longos)
 DownloadBlockChain=Baixe impressões digitais
-KoCheckFingerprintValidity=A entrada de log arquivada não é válida. Isso significa que alguém (um hacker?) tem modificado alguns dados deste registro depois de ele ter sido gravado ou apagou o registro arquivado anterior (verificar aquela linha com # anterior existe) ou tem modificado soma de verificação do registro anterior.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=O registro de log arquivado é válido. Os dados nesta linha não eram modificado e a entrada segue a anterior.
 OkCheckFingerprintValidityButChainIsKo=O log arquivado parece válido em comparação com o anterior, mas a cadeia foi corrompida anteriormente.
 AddedByAuthority=Armazenado em autoridade remota
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Detalhes do log
 ListOfTrackedEvents=Lista de eventos rastreados
 Fingerprint=Impressão digital
 DownloadLogCSV=Exportar logs arquivados (CSV)
-DataOfArchivedEvent=Dados completos do evento arquivado
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Objeto original (tipo %s, id %s) não vinculado (consulte a coluna 'Dados completos' para obter dados salvos inalteráveis)
 BlockedLogAreRequiredByYourCountryLegislation=O módulo Logs Inalteráveis ​​pode ser exigido pela legislação do seu país. Desabilitar este módulo pode invalidar quaisquer transações futuras com relação à lei e ao uso de software legal, já que elas não podem ser validadas por uma auditoria fiscal.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=O módulo Logs Inalteráveis ​​foi ativado devido à legislação do seu país. Desabilitar este módulo pode invalidar quaisquer transações futuras com relação à lei e ao uso de software legal, já que elas não podem ser validadas por uma auditoria fiscal.
@@ -30,6 +32,7 @@ BlockedLogEnabled=O sistema para rastrear eventos em registros inalteráveis foi
 BlockedLogDisabled=O sistema para rastrear eventos em registros inalteráveis foi Desativado após a conclusão de algumas gravações. Salvamos uma impressão digital especial para rastrear a corrente como quebrada
 BlockedLogDisabledBis=O sistema para rastrear eventos em registros inalteráveis foi Desativado. Isso é possível porque nenhum registro foi feito ainda.
 LinkHasBeenDisabledForPerformancePurpose=Para fins de desempenho, hiperligação, conexão direto para o documento não é mostrado após a 100ª linha.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Fatura do cliente excluída logicamente
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Exclusão lógica de pagamento do cliente
 logPAYMENT_VARIOUS_CREATE=Pagamento (não atribuído a uma fatura) criado
 logPAYMENT_VARIOUS_DELETE=Pagamento (não atribuído a uma fatura) excluído
 logPAYMENT_VARIOUS_MODIFY=Pagamento (não atribuído a uma fatura) modificado
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang
index 57712c14bfe..48a1f9f6b8f 100644
--- a/htdocs/langs/pt_PT/categories.lang
+++ b/htdocs/langs/pt_PT/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Área de etiquetas/categorias de contatos/endereços
 AccountsCategoriesArea=Área de etiquetas/categorias de bancos
 ProjectsCategoriesArea=Área de tags/categorias de projetos
 UsersCategoriesArea=Área de etiquetas/categorias de utilizadores
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Subcategorias
 CatList=Lista de etiquetas/categorias
 CatListAll=Lista etiquetas/categorias (todos os tipos)
@@ -90,9 +91,10 @@ CategoriesSetup=Configuração de etiquetas/categorias
 CategorieRecursiv=Ligar com a etiqueta/categoria pai automaticamente
 CategorieRecursivHelp=Se a opção estiver ativada, quando você adicionar um produto a uma subcategoria, o produto também será adicionado à categoria principal.
 AddProductServiceIntoCategory=Atribuir categoria ao produto/serviço
-AddCustomerIntoCategory=Atribuir categoria ao cliente
-AddSupplierIntoCategory=Atribuir categoria ao fornecedor
-AssignCategoryTo=Atribuir categoria a
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Mostrar etiqueta/categoria
 ByDefaultInList=Por predefinição na lista
 ChooseCategory=Escolha a categoria
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Página de categorias
 KnowledgemanagementsCategoriesArea=Categorias de artigos KM
 UseOrOperatorForCategories=Use o operador 'OR' para categorias
 AddObjectIntoCategory=Atribuído a uma categoria
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index 82ee69090b5..093ca68e17e 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -65,6 +65,7 @@ State=Concelho
 StateId=Identificação Estatal
 StateCode=Código de região
 StateShort=Concelho
+DepartmentBuyer=Buyer's state/province
 Region=Distrito
 Region-State=Distrito - Concelho
 Country=País
@@ -78,7 +79,7 @@ Chat=Chat
 PhonePro=Telefone comercial
 PhonePerso=Telef. particular
 PhoneMobile=Telemovel
-No_Email=Recusar emails em massa
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=Código postal
 Town=Localidade
@@ -382,11 +383,12 @@ ExportCardToFormat=Exportar ficha para o formato
 ContactNotLinkedToCompany=Contacto não vinculado a um Terceiro
 DolibarrLogin=Dolibarr - Iniciar Sessão
 NoDolibarrAccess=Sem Acesso
-ExportDataset_company_1=Terceiros (empresas / fundações / pessoas físicas) e suas propriedades
-ExportDataset_company_2=Contatos e suas propriedades
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Contactos / endereços e atributos adicionais de terceiros
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Terceiros e suas propriedades
 ImportDataset_company_2=Contactos / endereços e atributos adicionais de terceiros
-ImportDataset_company_3=Contas bancárias de terceiros
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Representantes de vendas terceirizados (atribuir representantes de vendas/usuários às empresas)
 PriceLevel=Nível de preço
 PriceLevelLabels=Etiquetas de nível de preço
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Nome Diretor(es) (DE, diretor, presidente ...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Gerir terceiros
-ConfirmMergeThirdparties=Tem a certeza que pretende para mesclar o terceiro escolhido com o atual? Todos os objetos vinculados (faturas, pedidos, ...) serão movidos para o terceiro atual, após o qual o terceiro escolhido será excluído.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Os terceiros foram fundidos
 SaleRepresentativeLogin=Nome de utilizador do representante de vendas
 SaleRepresentativeFirstname=Primeiro nome do representante de vendas
@@ -460,3 +462,6 @@ ExternalSystemID=Sistema externo Id.
 IDOfPaymentInAnExternalSystem=Id. da forma de pagamento em um sistema externo (como Stripe, Paypal, ...)
 AADEWebserviceCredentials=Credenciais de serviço da Web AADE
 ThirdPartyMustBeACustomerToCreateBANOnStripe=O terceiro deve ser um cliente para permitir a criação de suas informações bancárias no lado do Stripe
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index 83a1a444c78..3a9c5797f61 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Pagamento de fatura do cliente
 PaymentSupplierInvoice=Fornecedor, Vendedor fatura pagamento
 PaymentSocialContribution=Pagamento da taxa social/fiscal
 PaymentVat=Pagamento IVA
-AutomaticCreationPayment=automaticamente registre o pagamento
+AutomaticCreationPayment=Also record the payment
 ListPayment=Lista de pagamentos
 ListOfCustomerPayments=Lista de pagamentos de clientes
 ListOfSupplierPayments=Lista de pagamentos de fornecedores
@@ -118,10 +118,14 @@ SocialContributionsPayments=Pagamentos de impostos sociais/fiscais
 ShowVatPayment=Ver Pagamentos IVA
 TotalToPay=Total a Pagar
 BalanceVisibilityDependsOnSortAndFilters=balanço, saldo só será visível nesta lista se a tabela estiver classificada em %s e filtrado em 1 conta bancária (sem outros filtros)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Código de contabilidade do cliente
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Código de contabilidade do fornecedor
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Cust. conta. código
 SupplierAccountancyCodeShort=Sup. conta. código
+UserAccountancyCodeShort=User account. code
 AccountNumber=Número de conta
 NewAccountingAccount=Nova conta
 Turnover=Volume de negócios faturado
@@ -129,7 +133,9 @@ TurnoverCollected=Volume de negócios recolhido
 SalesTurnoverMinimum=Volume de negócios mínimo
 ByExpenseIncome=Por despesas e rendas
 ByThirdParties=Por Terceiro
+ByProjects=By projects
 ByUserAuthorOfInvoice=Por autor da fatura
+DetailedListLowercase=detailed list
 CheckReceipt=Comprovativo de depósito
 CheckReceiptShort=Comprovativo de depósito
 LastCheckReceiptShort=Últimos comprovantes de depósito %s
diff --git a/htdocs/langs/pt_PT/datapolicy.lang b/htdocs/langs/pt_PT/datapolicy.lang
index 967684e9983..7c29b57653a 100644
--- a/htdocs/langs/pt_PT/datapolicy.lang
+++ b/htdocs/langs/pt_PT/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Política de Privacidade de Dados
 Module4100Desc = módulo para gerenciar a privacidade de dados (conformidade com o GDPR)
 # Administration page
 datapolicySetup = módulo Configuração da política de privacidade de dados
-Deletion = Exclusão de dados
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s meses
 ONE_YEAR = 1 ano
 NB_YEARS = %s anos
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Cliente potencial/cliente
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Nem cliente potencial/Nem cliente
 DATAPOLICY_CONTACT_FOURNISSEUR = Fornecedor
 DATAPOLICY_ADHERENT = Membro
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Você pode enviar um e-mail do GDPR para todos os seus contatos relevantes (que ainda não receberam um e-mail e para o qual você não registrou nada sobre o contrato do GDPR). Para fazer isso, use o botão a seguir.
 SendAgreement = Mande emails
 AllAgreementSend = Todos os e-mails foram enviados
 TXTLINKDATAPOLICYACCEPT = Texto para o hiperligação, conexão "acordo"
 TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: Tratamento de dados pessoais
 DATAPOLICY_consentement = Consentimento obtido para o tratamento de dados pessoais
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 24896e8f22f..5304793003a 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Erro na criação de uma pasta. Verifique se o usuário do servidor Web tem acesso de escrita aos documentos Dolibarr. Se o parâmetro <b> safe_mode </ b> está ativo no PHP, Verifique se os arquivos php do Dolibarr são da propriedade do usuário do servidor web.
 ErrorNoMailDefinedForThisUser=E-Mail não definido para este utilizador
 ErrorSetupOfEmailsNotComplete=A configuração dos e-mails não está concluída
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Este recurso precisa que o JavaScript esteja ativado para funcionar. Altere isso em configuração - exibição.
 ErrorTopMenuMustHaveAParentWithId0=Um menu do tipo 'Superior' não pode ter um menu pai. Coloque 0 ao ID pai ou busque um menu do tipo 'esquerdo'
 ErrorLeftMenuMustHaveAParentId=Um menu do tipo 'esquerdo' deve de ter um ID de pai
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Upload bloqueado por um plugin PHP Apache /.
 ErrorFileSizeTooLarge=O tamanho de ficheiro é muito grande ou ficheiro não foi fornecido.
 ErrorFieldTooLong=O campo %s é muito longo.
 ErrorSizeTooLongForIntType=Tamanho demasiado longo para o tipo int (%s máximo dígitos)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Tamanho demasiado longo para o tipo string (%s máximo chars)
 ErrorNoValueForSelectType=Por favor, preencha o valor para lista de selecção
 ErrorNoValueForCheckBoxType=Preencha o valor da lista da caixa de seleção
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Valor incorreto para o código de segurança. Tente novamen
 ErrorBothFieldCantBeNegative=Campos %s %s e não pode ser tanto negativo
 ErrorFieldCantBeNegativeOnInvoice=Campo <strong>%s</strong> Não pode seja negativo neste tipo de fatura. Se você precisar adicionar uma linha de desconto, basta criar o desconto primeiro (no campo '%s' no cartão de terceiros) e aplique-o ao fatura.
 ErrorLinesCantBeNegativeForOneVATRate=O total de linhas (líquido de impostos) não pode ser negativo para uma determinada taxa de IVA não nula (encontrado um total negativo para a taxa de IVA <b>%s </b>%%).
-ErrorLinesCantBeNegativeOnDeposits=As linhas não podem ser negativas em um depósito. Você enfrentará problemas quando precisar consumir o depósito no fatura final se fizer isso.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=A quantidade de linha nas faturas do cliente não pode ser negativa
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Conta de usuário utilizada para executar <b>%s</b> servidor web não tem permissão para que
 ErrorNoActivatedBarcode=Nenhum tipo de código de barras ativado
 ErrUnzipFails=Falha ao extrair %s com o ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Seu parâmetro PHP upload_max_filesize (%s) é maior que o parâmetro PHP post_max_size (%s). Esta não é uma configuração consistente.
 WarningPasswordSetWithNoAccount=Uma senha foi definida para este membro. No entanto, nenhuma conta de usuário foi criada. Portanto, essa senha é armazenada, mas não pode ser usada para fazer login no Dolibarr. Pode ser usado por um módulo externo / interface, mas se você não precisa definir nenhum login nem senha para um membro, você pode desativar a opção "Gerenciar um login para cada membro" da configuração do módulo de membro. Se você precisar gerenciar um login, mas não precisar de nenhuma senha, poderá manter esse campo vazio para evitar esse aviso. Nota: O email também pode ser usado como um login se o membro estiver vinculado a um usuário.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR fatura só pode ser adicionado em faturas definidas para serem pagas com transferência de crédito.
 SwissQrCreditorAddressInvalid = O endereço Credor é inválido (o ZIP e cidade está definido? (%s)
 SwissQrCreditorInformationInvalid = As informações de Credor são inválidas para o IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/pt_PT/exports.lang b/htdocs/langs/pt_PT/exports.lang
index a05f4406b12..59a773c332a 100644
--- a/htdocs/langs/pt_PT/exports.lang
+++ b/htdocs/langs/pt_PT/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Etiqueta da linha
 LineDescription=Descrição da linha
 LineUnitPrice=Preço por unidade de linha
 LineVATRate=Taxa de IVA de linha
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Quantidade de linha
 LineTotalHT=Valor sem incluir imposto para linha
 LineTotalTTC=Montante do imposto para a linha
 LineTotalVAT=Montante do IVA para a linha
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Tipo de linha (0= produto, serviço de 1=)
 FileWithDataToImport=Arquivo com os dados de importação
 FileToImport=Fonte ficheiro a importar
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=Escolha o formato de arquivo para usar como formato d
 ChooseFileToImport=Carregar arquivo, em seguida, clique no ícone %s para selecionar o arquivo como arquivo de importação de origem ...
 SourceFileFormat=Formato de arquivo de origem
 FieldsInSourceFile=Os campos em arquivo fonte
-FieldsInTargetDatabase=Campos de destino na base de dados Dolibarr (negrito=obrigatório)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Nenhum campo
 MoveField=Mover %s campo número da coluna
 ExampleOfImportFile=Examplo_de_importação_ficheiro
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Check that the file format (field and string delimiters)
 RunSimulateImportFile=Executar Simulação de Importação
 FieldNeedSource=Este campo requer dados do ficheiro fonte
 SomeMandatoryFieldHaveNoSource=Alguns campos obrigatórios não têm nenhuma fonte de dados de arquivo
-InformationOnSourceFile=Informações sobre a fonte de arquivo
-InformationOnTargetTables=Informações sobre os campos de destino
+InformationOnSourceFile=Ficheiro origem
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Mudar de campo pelo menos uma fonte na coluna de campos para exportar
 SelectFormat=Escolha esse formato de arquivo de importação
 RunImportFile=Importar dados
diff --git a/htdocs/langs/pt_PT/hrm.lang b/htdocs/langs/pt_PT/hrm.lang
index f6d60205ee3..aa4fd6eb3db 100644
--- a/htdocs/langs/pt_PT/hrm.lang
+++ b/htdocs/langs/pt_PT/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=Classificação exigida para o perfil de trabalho
-RequiredRankShort=Classificação obrigatória
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Cargos com este perfil de trabalho
-EmployeeRank=empregado, funcionário classificação para esta habilidade
-EmployeeRankShort=empregado, funcionário classificação
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Posição empregado, funcionário
 EmployeePositions=empregado, funcionário posições
 EmployeesInThisPosition=Funcionários nesta posição
@@ -72,6 +72,9 @@ AddSkill=Adicione habilidades ao perfil de trabalho
 RequiredSkills=Habilidades exigidas para este perfil de trabalho
 UserRank=utilizador Classificação
 SkillList=Lista de habilidades
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Salvar classificação
 TypeKnowHow=Saber como
 TypeHowToBe=Como ser
@@ -95,3 +98,5 @@ NeedBusinessTravels=Precisa de viagens de negócios
 NoDescription=Não Descrição
 TheJobProfileHasNoSkillsDefinedFixBefore=O perfil de trabalho avaliado deste empregado, funcionário não possui nenhuma habilidade definida. Adicione habilidades e eliminar, apagar e reinicie a avaliação.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index 3ef10e78e27..1c4a1e18c0d 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=E-mailing
 EMailing=Mailing
-EMailings=Mailings
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=Todos os E-Mailings
+AllEMailings=All mass eMails
 MailCard=Ficha de Emailing
 MailRecipients=Destinatários
 MailRecipient=Destinatario
@@ -26,19 +26,19 @@ MailFile=Ficheiro
 MailMessage=Texto utilizado no corpo da mensagem
 SubjectNotIn=Não está no assunto
 BodyNotIn=Não no corpo
-ShowEMailing=Mostrar E-Mailing
-ListOfEMailings=Lista de mailings
-NewMailing=Novo emailing
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=Editar Mailing
-ResetMailing=Reenviar e-mail
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Eliminar Mailing
-PreviewMailing=Previsualizar um Mailing
-CreateMailing=Criar E-Mailing
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Testar
-ValidMailing=Confirmar Mailing
+ValidMailing=Valid mass Email
 MailingStatusDraft=Rascunho
 MailingStatusValidated=Validado
 MailingStatusSent=Enviado
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Todos os filtros devem corresponder para que um e-mail
 LineInFile=Linha %s em Ficheiro
 RecipientSelectionModules=Módulos de selecção dos destinatarios
 MailSelectedRecipients=Destinatarios seleccionados
-MailingArea=Área mailings
-LastMailings=Últimos e-mails %s
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Estatísticas destinatarios
 NbOfCompaniesContacts=Contactos únicos de empresas
 MailNoChangePossible=Destinatarios de um mailing validado não modificaveis
-SearchAMailing=Procurar um mailing
-SendMailing=Enviar mailing
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Enviado por
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=O envio de um email pode ser executado a partir da linha de comando. Peça ao administrador do servidor para iniciar o seguinte comando para enviar o email para todos os destinatários:
 MailingNeedCommand2=Contudo, pode enviá-los on-line adicionando o parâmetro MAILING_LIMIT_SENDBYWEB com o valor de número máximo de e-mails que pretende enviar por sessão. Para isto, vá para Início->Configuração->Outros.
 ConfirmSendingEmailing=Se você quiser enviar e-mails diretamente desta tela, confirme se deseja enviar e-mails a partir do seu navegador?
-LimitSendingEmailing=Nota: O envio de e-mails da interface da web é feito várias vezes por motivos de segurança e tempo de espera, <b> %s </ b> destinatários por vez para cada sessão de envio.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Limpar lista
 ToClearAllRecipientsClickHere=Para limpar a lista dos destinatarios deste mailing, faça click ao botão
 ToAddRecipientsChooseHere=Para Adicionar destinatarios, escoja os que figuran em listas a continuação
-NbOfEMailingsReceived=Mailings em masa recibidos
-NbOfEMailingsSend=Envios em massa enviados
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID registo
 DeliveryReceipt=Recibo de entrega
 YouCanUseCommaSeparatorForSeveralRecipients=Pode usar o carácter de separação <b>coma </b> para especificar multiplos destinatarios.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Nenhuma notificação automática por e-mail está pla
 ANotificationsWillBeSent=1 notificação automática será enviada por e-mail
 SomeNotificationsWillBeSent=%s notificações automáticas serão enviadas por e-mail
 AddNewNotification=Assine uma nova notificação automática por e-mail (alvo/evento)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=A configuração do envio de email foi configurada para '%s'. Este modo não pode ser usado para enviar e-mails em massa.
 MailSendSetupIs2=Você deve primeiro ir, com uma conta admin, no menu %sHome - Setup - EMails%s para alterar o parâmetro <strong> '%s' </ strong> para usar o modo '%s'. Com esse modo, você pode inserir a configuração do servidor SMTP fornecido pelo seu provedor de serviços de Internet e usar o recurso de envio de email em massa.
 MailSendSetupIs3=Se você tiver alguma dúvida sobre como configurar seu servidor SMTP, você pode perguntar para %s.
@@ -183,7 +185,7 @@ Information=Informação
 ContactsWithThirdpartyFilter=Contatos com filtro de terceiros
 Unanswered=Sem resposta
 Answered=Respondidas
-IsNotAnAnswer=Não é resposta (e-mail inicial)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=É uma resposta de um e-mail inicial
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Valor padrão para o campo '%s' ao criar um novo contato
@@ -199,6 +201,6 @@ ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 39fa317bae5..5b48c0baa81 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -37,6 +37,7 @@ Translation=Tradução
 Translations=Traduções
 CurrentTimeZone=Zona Horária PHP (servidor)
 EmptySearchString=Insira critérios de pesquisa não vazios
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Insira um critério de data
 NoRecordFound=Nenhum foi encontrado nenhum registo
 NoRecordDeleted=Nenhum registo eliminado
@@ -45,6 +46,7 @@ NoError=Nenhum erro
 Error=Erro
 Errors=Erros
 ErrorFieldRequired=O campo '%s' é obrigatório
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=O campo '%s' tem um valor incorrecto
 ErrorFileDoesNotExists=O Ficheiro %s não existe
 ErrorFailedToOpenFile=Impossível abrir o fichero %s
@@ -308,6 +310,7 @@ DateBuild=Data da geração do Relatório
 DatePayment=Data de pagamento
 DateApprove=Data de aprovação
 DateApprove2=Data de aprovação (segunda aprovação)
+PendingSince=Pending since
 RegistrationDate=Data de registo
 UserCreation=Utilizador que criou
 UserModification=Utilizador que modificou
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Não Iniciado
 ActionRunningShort=Em progresso
 ActionDoneShort=Terminado
 ActionUncomplete=Incompleta
-LatestLinkedEvents=Os últimos %s eventos relacionados
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Empresa/Organização
 Accountant=Contabilista
 ContactsForCompany=Contactos para este terceiro
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=Texto utilizado no corpo da mensagem
 SendAcknowledgementByMail=Enviar email de confirmação
 SendMail=Enviar e-mail
 Email=Email
+EMail=Email
+EMails=Emails
 NoEMail=Sem e-mail
 AlreadyRead=Já lido
 NotRead=Não lida
@@ -793,7 +798,7 @@ Notes=Notas
 AddNewLine=Adicionar nova linha
 AddFile=Adicionar ficheiro
 FreeZone=Produto de Texto Livre
-FreeLineOfType=Item de Texto Livre, tipo:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Copiar objeto com os seus atributos principais
 ReGeneratePDF=Regenerar PDF
 PDFMerge=PDF Merge
@@ -879,12 +884,14 @@ toward=relativamente a
 Access=Acesso
 SelectAction=Selecione a ação
 SelectTargetUser=Selecione o utilizador/empregado alvo
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Use Ctrl+C para copiar
 SaveUploadedFileWithMask=Guardar o ficheiro no servidor com o nome  "<strong>%s</strong>" (caso contrário "%s")
 OriginFileName=Nome do ficheiro original
 SetDemandReason=Definir fonte
 SetBankAccount=Definir Conta Bancária
 AccountCurrency=Moeda da conta
+AccountancyCode=Código de Contabilidade
 ViewPrivateNote=Ver notas
 XMoreLines=%s linhas(s) ocultas
 ShowMoreLines=Mostrar mais/menos linhas
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Tem a certeza de que quer apagar os %s registo(s) se
 ConfirmMassClone=Confirmação de clonagem em massa
 ConfirmMassCloneQuestion=Selecione o projeto para clonar
 ConfirmMassCloneToOneProject=Clonar para projeto %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Objetos relacionados
 ClassifyBilled=Classificar faturado
 ClassifyUnbilled=Classificar não faturado
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Necessita de estar conectado e de permissões para visua
 Download=Download
 DownloadDocument=Download do documento
 DownloadSignedDocument=Fazer download do documento assinado
-ActualizeCurrency=Atualizar taxa de conversão da moeda
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Ano Fiscal
 ModuleBuilder=Construtor de Módulos e Aplicações
 SetMultiCurrencyCode=Definir moeda
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Ações em massa
 ClickToShowHelp=Clique para mostrar o balão de ajuda
 WebSite=Site da Web
@@ -1104,6 +1113,7 @@ PayedBy=Paga por
 PayedTo=Pago a
 Monthly=Mensal
 Quarterly=Trimestral
+Quarter=Quarter
 Annual=Anual
 Local=Local
 Remote=Remoto
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Tarefa
 ContactDefault_propal=Orçamento
 ContactDefault_supplier_proposal=Proposta de Fornecedor
 ContactDefault_ticket=Ticket
+ContactDefault_societe=Terceiro
 ContactAddedAutomatically=Contato adicionado de funções de contato de terceiros
 More=Mais
 ShowDetails=Mostrar detalhes
@@ -1242,6 +1253,7 @@ CommercialAffected=Representante de vendas designado
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=Mensagem
+Emailing=Emailing
 Progression=Progresso
 YourMessage=Sua mensagem
 YourMessageHasBeenReceived=A sua mensagem foi recebida. Responderemos ou entraremos em contacto o mais breve possível.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Adicionar
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Do início
+Transferred=Transferred
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index dc19e5c0c98..cf658e8d5c0 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Se a assinatura for necessária, uma assinatura com in
 DeleteType=Apagar
 VoteAllowed=Voto autorizado
 Physical=Individual
-Moral=Corporação
-MorAndPhy=Corporação e Pessoa Física
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Reativar
 ExcludeMember=Excluir um membro
 Exclude=Excluir
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Estatísticas do membros por região
 NbOfMembers=Número total de membros
 NbOfActiveMembers=Número total de membros ativos no momento
 NoValidatedMemberYet=Nenhum membro validado encontrado
-MembersByCountryDesc=Esta tela mostra as estatísticas de membros por país. Gráficos e dependem da disponibilidade do serviço gráfico on-line do Google, bem como da disponibilidade de uma Internet funcional ligação.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Esta tela mostra estatísticas de membros por estado/províncias/cantão.
 MembersByTownDesc=Esta tela mostra estatísticas de membros por cidade.
 MembersByNature=Esta tela mostra estatísticas de membros por natureza.
@@ -208,25 +209,25 @@ NewMemberbyWeb=Novo membro acrescentou. Aguardando aprovação
 NewMemberForm=Forma novo membro
 SubscriptionsStatistics=Estatísticas de contribuições
 NbOfSubscriptions=Número de contribuições
-AmountOfSubscriptions=Valor arrecadado com contribuições
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=Volume de negócios (para uma empresa) ou do Orçamento (para uma fundação)
-DefaultAmount=Valor padrão de Contribuição (usado somente se nenhum valor for definido no nível do tipo membro)
-MinimumAmount=Valor mínimo (usado somente quando o valor Contribuição é gratuito)
-CanEditAmount=O valor da assinatura pode ser definido pelo membro
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=O visitante pode escolher/editar a quantidade de seu Contribuição independentemente do tipo membro
 AmountIsLowerToMinimumNotice=O valor é inferior ao mínimo %s
 MEMBER_NEWFORM_PAYONLINE=Após o registro on-line, mude automaticamente para a página de pagamento on-line
 ByProperties=Por natureza
 MembersStatisticsByProperties=Estatísticas dos membros por natureza
-VATToUseForSubscriptions=Taxa de IVA a utilizar para contribuições
-NoVatOnSubscription=Sem IVA para contribuições
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produto usado para a linha Contribuição em fatura: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=Nome ou empresa
 SubscriptionRecorded=Contribuição gravado
 NoEmailSentToMember=Nenhum email enviado para o membro
 EmailSentToMember=E-mail enviado para o membro em %s
-SendReminderForExpiredSubscriptionTitle=Enviar lembrete por e-mail para contribuições expiradas
-SendReminderForExpiredSubscription=Envie um lembrete por e-mail para membros quando Contribuição estiver prestes a expirar (o parâmetro é o número de dias antes do final da assinatura para enviar o lembrete . Pode ser uma lista de dias separados por ponto e vírgula, por exemplo '10;5;0;-5')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Assinatura paga para o período atual (até %s)
 YouMayFindYourInvoiceInThisEmail=Você pode encontrar seu fatura anexado a este e-mail
 XMembersClosed=%s membro(s) fechado(s)
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Um terceiro é a entidade legal que será usada no
 MemberFirstname=membro nome
 MemberLastname=membro sobrenome
 MemberCodeDesc=membro Código, exclusivo para todos os membros
-MemberSubscriptionStartFirstDayOf=O início data de uma assinatura corresponde ao primeiro dia de uma
-MemberSubscriptionStartAfter=Período mínimo antes da entrada em vigor do início data de uma assinatura, exceto renovações (exemplo +3m = +3 meses, -5d = -5 dias, +1Y = +1 ano )
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=A adesão está vinculada a uma transação conciliada, portanto esta modificação não é permitida.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 6fe22960bf9..fe6d76eb856 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -97,7 +97,6 @@ ShowService=Mostrar serviço
 ProductsAndServicesArea=Área de Produtos e Serviços
 ProductsArea=Área de Produtos
 ServicesArea=Área de Serviços
-ListOfStockMovements=Lista de movimentos de stock
 BuyingPrice=Preço de compra
 PriceForEachProduct=Produtos com preços específicos
 SupplierCard=Cartão Fornecedor, Vendedor
@@ -145,6 +144,7 @@ WithoutDiscount=Sem desconto
 VATRateForSupplierProduct=Tax Rate (for this vendor/product)
 DiscountQtyMin=Desconto para esta quantidade.
 NoPriceDefinedForThisSupplier=Nenhum preço/quantidade definido para este Fornecedor, Vendedor/produto
+NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
 NoSupplierPriceDefinedForThisProduct=Nenhum Fornecedor, Vendedor preço/quantidade definido para este produto
 PredefinedItem=Item predefinido
 PredefinedProducts=Predefined Product
@@ -171,7 +171,7 @@ BuyingPrices=Preços de compra
 CustomerPrices=Preços aos clientes
 SuppliersPrices=Preços de fornecedor
 SuppliersPricesOfProductsOrServices=Fornecedor, Vendedor preços (de produtos ou serviços)
-CustomCode=Alfândega|Commodities|HS Código
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=País de origem
 RegionStateOrigin=Região de origem
 StateOrigin=Estado|Província de origem
@@ -209,6 +209,7 @@ unitL=Litro
 unitT=tonelada
 unitKG=kg
 unitG=Grama
+unitGAL=galão
 unitMG=mg
 unitLB=libra
 unitOZ=onça
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=O formato da solicitação é {"URL": "http://e
 UpdateInterval=Intervalo de atualização (minutos)
 LastUpdated=Última atualização
 CorrectlyUpdated=Corretamente atualizado
-PropalMergePdfProductActualFile=Os arquivos usados ​​para adicionar ao PDF Azur são / é
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=Selecionar ficheiros PDF
 IncludingProductWithTag=Incluindo produtos/serviços com a tag
 DefaultPriceRealPriceMayDependOnCustomer=Preço padrão, preço real pode depender do cliente
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=As quantidades da linha foram recalculadas conforme
 
 #Attributes
 Attributes=Atributos
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Atributos variantes
 ProductAttributes=Atributos variantes para produtos
 ProductAttributeName=Atributo variante %s
@@ -395,6 +400,8 @@ ErrorDestinationProductNotFound=Produto de destino não encontrado
 ErrorProductCombinationNotFound=Variante de produto não encontrada
 ActionAvailableOnVariantProductOnly=Ação disponível apenas na variante do produto
 ProductsPricePerCustomer=Preços dos produtos por clientes
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Atributos Adicionais (Preços do Fornecedor)
 DeleteLinkedProduct=eliminar, apagar o produto filho vinculado à combinação
 AmountUsedToUpdateWAP=Valor unitário a ser usado para atualizar o Preço Médio Ponderado
@@ -403,7 +410,8 @@ PMPValueShort=PMP
 mandatoryperiod=Períodos obrigatórios
 mandatoryPeriodNeedTobeSet=Observação: o período (início e fim data) deve ser definido
 mandatoryPeriodNeedTobeSetMsgValidate=Um serviço requer um período inicial e final
-mandatoryHelper=verificar isto se você quiser uma mensagem para o utilizador ao criar/validar um fatura, Orçamento, vendas encomenda sem inserir um início e fim data em linhas com este serviço.<br>Observe que a mensagem é um aviso e não é um erro de bloqueio.
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
+mandatoryHelper2=Note that the message is a warning and not a blocking error.
 DefaultBOM=FM padrão
 DefaultBOMDesc=O FM padrão recomendado para uso na fabricação deste produto. Este campo só poderá ser definido se a natureza do produto for '%s'.
 Rank=Classificação
@@ -435,3 +443,6 @@ AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtu
 ConfirmSetToDraftInventory=Tem a certeza que pretende retornar ao status Rascunho?<br>As quantidades atualmente definidas no inventário serão redefinidas.
 WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned
 PriceLabel=Price label
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/pt_PT/salaries.lang b/htdocs/langs/pt_PT/salaries.lang
index c58b4033eaf..ee930618e6c 100644
--- a/htdocs/langs/pt_PT/salaries.lang
+++ b/htdocs/langs/pt_PT/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Novo salário
 AddSalary=Adicionar salário
 NewSalaryPayment=Novo cartão salarial
 AddSalaryPayment=Adicionar pagamento de salário
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Pagamento de Salário
 SalariesPayments=Pagamentos de Salários
 SalariesPaymentsOf=Pagamentos de salários de %s
@@ -27,7 +29,7 @@ FillFieldFirst=Preencha o campo empregado, funcionário primeiro
 UpdateAmountWithLastSalary=Definir valor do último salário
 MakeTransferRequest=Fazer solicitação de transferência
 VirementOrder=Solicitação de transferência de crédito
-BankTransferAmount=Valor da transferência de crédito
 WithdrawalReceipt=Transferência de crédito encomenda
 OrderWaiting=Pendente encomenda
 FillEndOfMonth=Preencha com final do mês
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
index 79648776f01..eab1ae8fb58 100644
--- a/htdocs/langs/pt_PT/website.lang
+++ b/htdocs/langs/pt_PT/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Use aqui a lista de outros nomes / aliases para que a pági
 WEBSITE_CSS_URL=URL do ficheiro CSS externo
 WEBSITE_CSS_INLINE=Conteúdo do arquivo CSS (comum a todas as páginas)
 WEBSITE_JS_INLINE=Conteúdo JavaScript ficheiro (comum a todas as páginas)
-WEBSITE_HTML_HEADER=Inclusão na parte inferior do cabeçalho HTML (comum a todas as páginas)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Arquivo Robot (robots.txt)
 WEBSITE_HTACCESS=Arquivo .htaccess do site
 WEBSITE_MANIFEST_JSON=Site da Web manifesto.json ficheiro
@@ -56,16 +56,17 @@ ReadPerm=Ler
 WritePerm=Escrever
 TestDeployOnWeb=Testar/implantar na web
 PreviewSiteServedByWebServer=<u> Pré-visualize %s num novo separador. </ u> <br> <br> O %s será servido por um servidor Web externo (como Apache, Nginx, IIS). Você deve instalar e configurar este servidor antes de apontar para o diretório: <br> <strong> %s </ strong> <br> URL fornecida pelo servidor externo: <br> <strong> %s </ strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL do host virtual servido pelo servidor da web externo não definido
 NoPageYet=Ainda sem páginas
 YouCanCreatePageOrImportTemplate=Você pode criar uma nova página ou importar um modelo de site completo
 SyntaxHelp=Ajuda em dicas de sintaxe específicas
 YouCanEditHtmlSourceckeditor=Você pode editar o código-fonte HTML usando o botão "Fonte" no editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Para uma imagem compartilhada com um acesso de compartilhamento hiperligação, conexão (abrir usando a chave hash de compartilhamento de ficheiro ), a sintaxe é:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=Para obter o URL da imagem de um objeto PHP, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Mais exemplos de HTML ou Código disponíveis na <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">documentação wiki </a>.<br>
 ClonePage=Página / contêiner clone
 CloneSite=Site clone
@@ -87,15 +88,15 @@ WebsiteAccount=Conta do site
 WebsiteAccounts=Contas do site
 AddWebsiteAccount=Crie uma conta do site
 BackToListForThirdParty=Voltar à lista para terceiros
-DisableSiteFirst=Desativar primeiro site
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Meu título do site
 AnotherContainer=É assim que você inclui o conteúdo de outra página/contêiner (você pode ter um erro aqui se ativar o Código dinâmico porque o subcontêiner incorporado pode não existir)
 SorryWebsiteIsCurrentlyOffLine=Desculpe, este Site da Web está off-line no momento. Por favor, volte mais tarde...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ative a tabela para armazenar contas de sites (login/senha) para cada Site da Web/terceiro
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Primeiro deve definir a página de Início predefinida
-OnlyEditionOfSourceForGrabbedContentFuture=Aviso: A criação de uma página web importando uma página web externa é reservada a usuários experientes. Dependendo da complexidade da página de origem, o resultado da importação pode ser diferente do original. Além disso, se a página de origem usar estilos CSS comuns ou JavaScript conflitante, isso poderá prejudicar a aparência ou os recursos do editor Site da Web ao trabalhar nesta página. Este método é uma maneira mais rápida de criar uma página, mas é recomendado criar sua nova página do zero ou a partir de um modelo de página sugerido.<br>Observe também que o editor embutido pode não funcionar correto quando usado em uma página externa capturada.
-OnlyEditionOfSourceForGrabbedContent=Somente edição de fonte HTML é possível quando o conteúdo foi obtido de um site externo
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Pegue também imagens encontradas em css e página.
 ImagesShouldBeSavedInto=As imagens devem ser salvas no diretório
 WebsiteRootOfImages=Diretório raiz para imagens de sites
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Remover filtro
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Categorias
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 80b5d5b7ee9..1e29c5e0174 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Verificarea integrității fișierelor a reu
 FileIntegritySomeFilesWereRemovedOrModified=Verificarea integrității fișierelor a eșuat. Unele fișiere au fost modificate, eliminate sau adăugate.
 GlobalChecksum=Sumă de control globală
 MakeIntegrityAnalysisFrom=Analizați integritatea fișierelor aplicației din
-LocalSignature=Semnătura locală încorporată (mai puțin fiabilă)
-RemoteSignature=Semnătura remote (mai fiabilă)
+LocalSignature=Semnătură locală încorporată
+RemoteSignature=Semnătură la distanță
 FilesMissing=Fișiere lipsă
 FilesUpdated=Fișiere actualizate
 FilesModified=Fișiere modificate
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Folosit numai de unele opţiuni agendă
 Security=Securitate
 Passwords=Parole
 DoNotStoreClearPassword=Criptare parole stocate în baza de date.
-MainDbPasswordFileConfEncrypted=Criptați parola bazei de date stocată în conf.php. Este foarte recomandat să activați această opțiune.
+MainDbPasswordFileConfEncrypted=Obfuscare parolă bază de date stocată în conf.php. Este recomandat să activezi această opțiune.
 InstrucToEncodePass=Pentru a codifica parola în fişierul <b>conf.php</b>, înlocuiţi linia <br><b>$dolibarr_main_db_pass="...";</b><br>cu<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Pentru a avea o parolă decodificată(în clar) în fișierul <b>conf.php </b>, înlocuiți linia <br> <b>$dolibarr_main_db_pass="crypted:..."; </b> <br> cu <br> <b>$dolibarr_main_db_pass = "%s"; </b>
 ProtectAndEncryptPdfFiles=Protejați fișierele PDF generate. Acest lucru NU este recomandat, deoarece încalcă generarea PDF în bloc.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Punct geometric
 ExtrafieldMultiPointGeo=Multipunct geometric
 ExtrafieldLinestringGeo=Șir de linii geometric
 ExtrafieldPolygonGeo=Poligon geometric
+ExtrafieldStars=Stele
 ComputedFormula=Câmp calculat
-ComputedFormulaDesc=Poți introduce aici o formulă folosind alte proprietăți ale obiectului sau orice codare PHP pentru a obține o valoare calculată dinamică. Poți utiliza orice formulă compatibilă cu PHP, inclusiv "?" operator de condiție și următorul obiect global: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>. <br><strong>ATENȚIE</strong>: Dacă ai nevoie de proprietățile unui obiect neîncărcat, adu obiectul în formula ta ca în a doilea exemplu. <br>Folosind un câmp calculat înseamnă că nu poți introduce nicio valoare din interfață. De asemenea, dacă există o eroare de sintaxă, formula poate returna nimic.<br><br>Exemplu de formulă:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2) <br><br>Exemplu de reîncărcare a obiectului <br>(( $reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1' ) <br><br>Alt exemplu de formulă pentru a forța încărcarea obiectului și a obiectului părinte: <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Proiect($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: „Proiectul părinte nu a fost găsit”
+ComputedFormulaDesc=Poți introduce aici o formulă folosind alte proprietăți ale obiectului sau orice codare PHP pentru a obține o valoare calculată dinamic. Poți utiliza orice formulă compatibilă cu PHP, inclusiv "?" operator de condiție și următorul obiect global:<strong> $db, $conf, $langs, $mysoc, $user, $objectoffield</strong>. <br><strong>ATENȚIE</strong>: Dacă ai nevoie de proprietățile unui obiect neîncărcat, adu obiectul în formula ta ca în al doilea exemplu. <br>Folosind un câmp calculat înseamnă că nu vei putea introduce nicio valoare din interfață. De asemenea, dacă există o eroare de sintaxă, formula poate returna nimic. <br><br>Exemplu de formulă:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Exemplu de reîncărcare a obiectului<br>(( ($reloadedobj = new Societe($db)) && $reloadedobj->fetchNoCompute($objectoffield->id) > 0) $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1 ')<br><br>Alt exemplu de formulă pentru a forța încărcarea obiectului și a obiectului părinte:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = Proiect nou($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: „Proiectul părinte nu a fost găsit”
 Computedpersistent=Câmp calculat stocat
 ComputedpersistentDesc=Extracâmpurile calculate vor fi stocate în baza de date, cu toate acestea, valorile lor vor fi recalculate numai atunci când obiectul acestui câmp este modificat. Dacă câmpul calculat depinde de alte obiecte sau date globale, aceste valori ar putea fi greșite!!
 ExtrafieldParamHelpPassword=Lăsând acest câmp necompletat înseamnă că această valoare va fi stocată FĂRĂ criptare (câmpul este doar ascuns cu steluțe pe ecran). <br><br>Introdu valoarea „dolcrypt” pentru a codifica valoarea cu un algoritm de criptare reversibil. Datele clare pot fi în continuare cunoscute și editate, dar sunt criptate în baza de date. <br><br>Introdu „auto” (sau „md5”, „sha256”, „password_hash”, ...) pentru a utiliza algoritmul implicit de criptare a parolei (sau md5, sha256, password_hash ...) pentru a salva parola hashing nereversibilă în baza de date (nici o modalitate de a prelua valoarea originală)
@@ -519,7 +520,7 @@ WarningPHPMailB=- Dacă domeniul tău de email (partea mymaildomain.com în myna
 WarningPHPMailC=- Utilizând serverul SMTP al furnizorului de servicii email pentru a trimite email-uri este, de asemenea, interesantă, astfel încât toate email-urile trimise din aplicație vor fi, de asemenea, salvate în directorul "Trimise" al cutiei poștale.
 WarningPHPMailD=Prin urmare, este recomandat să schimbi metoda de trimitere a email-urilor la valoarea "SMTP".
 WarningPHPMailDbis=Dacă vrei cu adevărat să păstrezi metoda implicită "PHP" pentru a trimite email-uri, ignoră acest avertisment sau elimină-l făcând %sclic aici%s.
-WarningPHPMail2=Dacă furnizorul dvs. de e-mail SMTP trebuie să restricționeze clientul de email la unele adrese IP (foarte rar), aceasta este adresa IP a agentului utilizator de email (MUA) pentru aplicația ERP CRM: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=Dacă numele de domeniu din adresa ta de email expeditorului este protejat de o înregistrare SPF (adresează-te registratorului numelui de domeniu), trebuie să adaugi următoarele IP-uri sau înregistrarea SPF DNS pentru tău. <strong>%s</strong>.
 WarningPHPMailSPFDMARC=Dacă numele de domeniu din adresa ta de email de expeditor este protejat de o înregistrare DMARC diferită de p=none (întreabă-l pe registarul numelui de domeniu), trebuie să elimini înregistrarea DMARC sau să o setezi la p=none, cum ar fi @gmail.com) sau folosește trimiterea printr-o altă metodă.
 SPFAndDMARCInformation=Înregistrare DNS SPF și DMARC pentru adresele de email principale
@@ -567,8 +568,8 @@ Module10Name=Contabilitate (în partidă simplă)
 Module10Desc=Rapoarte contabile simple (jurnale, cifre de afaceri) bazate pe conținutul bazei de date. Nu folosește niciun registru jurnal contabil.
 Module20Name=Oferte comerciale
 Module20Desc=Managementul Ofertelor Comerciale
-Module22Name=Newslettere
-Module22Desc=Transmitere şi gestionare newslettere
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energie
 Module23Desc=Monitorizarea consumului de energie
 Module25Name=Comenzi de vânzări
@@ -847,10 +848,10 @@ Permission212=Comandă linii
 Permission213=Activare linie
 Permission214=Configurare Telefonie
 Permission215=Configurare furnizori
-Permission221=Citeşte newslettere
-Permission222=Creare/modificare newslettere (subiect, destinatari..)
-Permission223=Validare newslettere (permite trimiterea)
-Permission229=Şterge newslettere
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Vizualizare destinatari și informații
 Permission238=Trimitere manuală emailuri
 Permission239=Şterge newslettere după validare sau trimitere
@@ -1105,6 +1106,7 @@ DictionaryStaff=Număr de angajaţi
 DictionaryAvailability=Întârzieri livrare
 DictionaryOrderMethods=Modalităţi de comandă
 DictionarySource=Originea ofertei/comenzii
+DictionaryAccountancyReport=Rapoarte contabile personalizate
 DictionaryAccountancyCategory=Grupuri personalizate pentru rapoarte
 DictionaryAccountancysystem=Modele planuri de conturi
 DictionaryAccountancyJournal=Jurnale contabile
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Înapoi la lista de dicționare
 TypeOfRevenueStamp=Tip taxă de timbru
 VATManagement=Gestionarea taxelor de vânzare
 VATIsUsedStandard=La crearea documentelor (oferte, facturi, comenzi...), cota implicită a taxei pe vânzări este stabilită conform regulilor standard (în funcție de țările vânzătorului și cumpărătorului)
-VATIsUsedDesc=În mod implicit, atunci când se creează oferte, facturi, comenzi etc. cota taxei pe vânzări urmează regula standard activă: <br>dacă vânzătorul nu este supus taxei pe vânzări, atunci taxa pe vânzări este implicit 0. Sfârșitul regulii. <br>Dacă (țara vânzătorului = țara cumpărătorului ), atunci taxa pe vânzări implicit este egală cu taxa pe vânzări a produsului în țara vânzătorului. Sfârșitul regulii. <br>Dacă vânzătorul și cumpărătorul se află amândoi în ​​Comunitatea Europeană, iar mărfurile sunt produse legate de transport (transport mărfuri, transport, transport aerian), TVA-ul implicit este 0. Această regulă depinde de țara vânzătorului - consultă contabilul. TVA-ul trebuie plătit de cumpărător la biroul vamal din țara sa și nu vânzătorului. Sfârșitul regulii. <br>Dacă vânzătorul și cumpărătorul sunt atât în ​​Comunitatea Europeană, iar cumpărătorul nu este o companie (cu un număr înregistrat de TVA intracomunitar), atunci TVA-ul este implicit la cota de TVA din țara vânzătorului. Sfârșitul regulii. <br>Dacă vânzătorul și cumpărătorul sunt ambii în Comunitatea Europeană, iar cumpărătorul este o companie (cu un număr înregistrat de TVA intracomunitar), atunci TVA-ul este 0 în mod implicit. Sfârșitul regulii.<br> În orice alt caz, valoarea implicită propusă este Taxa pe vânzări=0. Sfârșitul regulii.
+VATIsUsedDesc=În mod implicit, atunci când se creează oferte, facturi, comenzi etc. cota TVA urmează regula standard activă:<br> Dacă vânzătorul nu este supus taxării TVA, atunci cota TVA este implicit 0. Sfârșitul regulii.<br> Dacă statul sau provincia cumpărătorul are cotă de TVA din dicționarul de TVA, atunci este rata implicită de TVA. Sfârșitul regulii.<br> Dacă (țara vânzătorului = țara cumpărătorului), atunci cota TVA este egală implicit cu cota TVA a produsului în țara vânzătorului. Sfârșitul regulii.<br> Dacă vânzătorul și cumpărătorul se află deopotrivă în ​​Comunitatea Europeană, iar mărfurile sunt produse legate de transport (transport, transport, transport aerian), TVA-ul implicit este 0. Această regulă depinde de țara vânzătorului - consultați contabilul. TVA-ul trebuie plătit de cumpărător la biroul vamal din țara sa și nu de către vânzător. Sfârșitul regulii.<br> Dacă vânzătorul și cumpărătorul sunt atât în ​​Comunitatea Europeană, iar cumpărătorul nu este o companie (cu un număr înregistrat de TVA intracomunitar), atunci TVA-ul este implicit la cota de TVA din țara vânzătorului. Sfârșitul regulii.<br> Dacă vânzătorul și cumpărătorul sunt ambii în Comunitatea Europeană, iar cumpărătorul este o companie (cu un număr înregistrat de TVA intracomunitar), atunci TVA-ul este 0 în mod implicit. Sfârșitul regulii.<br> În orice alt caz, valoarea implicită propusă este cota TVA=0. Sfârșitul regulii.
 VATIsNotUsedDesc=Implicit, taxa de vânzare propusă este 0, ea poate fi utilizată pentru cazuri precum asociații, persoane fizice sau companii mici.
 VATIsUsedExampleFR=În Franța, se referă la companii sau organizații care au un sistem fiscal real (Simplificat real sau normă de venit). Un sistem în care TVA este declarat.
 VATIsNotUsedExampleFR=În Franța, înseamnă că sunt declarate asociații sau societăţi care nu sunt plătitoare de taxe, organizații sau profesii liberale care au ales sistemul fiscal micro intreprindere (taxe de vânzări în franciză) şi plătesc taxe de vânzare de franciză fără nicio declarație de taxe de vânzare. Această opțiune va afișa referinţa "Vânzări cu taxe neaplicabile - art-293B de CGI" pe facturi.
-VATType=Tip taxă
+VATType=Utilizare cotă TVA
 ##### Local Taxes #####
 TypeOfSaleTaxes=Tipuri taxe vânzări
 LTRate=Cotă
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry= Conform configurării de impozite şi taxe (Vezi %s-%
 LabelUsedByDefault=Eticheta utilizată în mod implicit în cazul în care nu găseşte un cod de traducere
 LabelOnDocuments=Eticheta de pe documente
 LabelOrTranslationKey=Etichetă sau cheie de traducere
+LabelTranslatedInCurrentLanguage=Etichetă tradusă in limba curentă
 TranslationFound=Traducere găsită
 TheTranslationIsSearchedFromKey=Traducerea este căutată din cheia de traducere: <b>%s</b>
 TranslationKey=Cheie traducere
@@ -1431,7 +1434,7 @@ AddVatInList=Afișează codul de TVA al clientului/furnizorului în listele comb
 AddAdressInList=Afișare adresa client/furnizor în listele combinate. <br>Terții vor apărea cu un format de nume „The Big Company corp. - 21 jump street 123456 Big town - USA” în loc de „The Big Company corp”.
 AddEmailPhoneTownInContactList=Afișare email de contact (sau telefoanele dacă nu sunt definite) și orașul în liste combinate.<br>Persoanele de contact vor apărea cu un format de nume "Dupond Durand - dupond.durand@example.com - Paris" sau "Dupond Durand - 06 07 59 65 66 - Paris" în loc de "Dupond Durand".
 AskForPreferredShippingMethod=Solicitare metodă de transport agreată cu terţii.
-FieldEdition=Editarea câmpului %s
+FieldEdition=Modificare câmp %s
 FillThisOnlyIfRequired=Exemplu: +2 (completați numai dacă există probleme cu decalajul de fus orar)
 GetBarCode=Preia cod de bare
 NumberingModules=Modele de numerotare
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Forţează data facturii la data de validare
 SuggestedPaymentModesIfNotDefinedInInvoice=Modalitatea de plată sugerată pe factură în mod implicit, dacă nu este definită pe factură
 SuggestPaymentByRIBOnAccount=Sugerați plata prin retragere din cont
 SuggestPaymentByChequeToAddress=Sugerați plata de prin cec la
+InvoicePaymentManageStructuredCommunication=Generare comunicare structurată pentru plata facturii
+InvoicePaymentManageStructuredCommunicationHelp=În unele țări, este necesară afișarea unei referințe structurate pentru a facilita plățile și reconcilierea acestora
 FreeLegalTextOnInvoices=Text liber pe facturi
 WatermarkOnDraftInvoices=Filigranul pe facturile schiţă (niciunul dacă e gol)
 PaymentsNumberingModule=Model de numerotare a plăților
@@ -1718,6 +1723,7 @@ CompressionOfResources=Compresie răspunsuri HTTP
 CompressionOfResourcesDesc=De exemplu, utilizând directiva Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=O astfel de detectare automată nu este posibilă cu browserele curente
 DefaultValuesDesc=Aici puteți defini valoarea implicită pe care doriți să o utilizați când creați o nouă înregistrare, şi/sau filtrele implicite sau ordinea de sortare când listați înregistrările.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Valori implicite (de utilizat pe formulare)
 DefaultSearchFilters=Filtre de căutare implicite
 DefaultSortOrder=Ordine de sortare implicite
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Modele de numerotare livrări
 SendingsAbility=Suport avize de expediţie pentru livrările către clienți.
 NoNeedForDeliveryReceipts=În majoritatea cazurilor, avizele de expediţie sunt utilizate atât pentru livrările către clienți (lista produselor care trebuie expediate), cât și pentru confirmarea şi semnarea de către client. Prin urmare, nota de confirmare a livrărilor de produse este o caracteristică duplicată și este rar activată.
 FreeLegalTextOnShippings=Text liber pe livrări
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Model de numerotare pentru recepţia livărilor de produse
 DeliveryOrderModel=Şablon recepţie produse de la furnizor
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Text liber pe notele de recepţie produse
 ##### FCKeditor #####
 AdvancedEditor=Editor avansat
 ActivateFCKeditor=Activaţi editorul avansat pentru:
-FCKeditorForNotePublic=Creare/editare WYSIWYG pentru câmpul "notă publică" a elementelor
-FCKeditorForNotePrivate=Creare/editare WYSIWYG pentru câmpul "notă privată" a elementelor
-FCKeditorForCompany=Creare/editare WYSIWYG pentru câmpul descriere al elementelor (exceptând produse/servicii)
-FCKeditorForProductDetails=Creare/editare WYSIWYG a descrierii produselor sau a liniilor pentru obiecte (linii de oferte, comenzi, facturi etc...).
+FCKeditorForNotePublic=Creare/modificare WYSIWYG câmp "note publice" elemente
+FCKeditorForNotePrivate=Creare/modificare WYSIWYG câmp "note private" elemente
+FCKeditorForCompany=Creare/modificare WYSIWYG a câmpului descriere a elementelor (cu excepția produselor/serviciilor)
+FCKeditorForProductDetails=Creare/modificare WYSIWYG a descrierii produselor sau a liniilor pentru obiecte (linii de oferte, comenzi, facturi etc...).
 FCKeditorForProductDetails2=Atenție: Utilizarea acestei opțiuni pentru acest caz nu este recomandată, deoarece poate crea probleme cu caracterele speciale și formatarea paginii la generarea fișierelor PDF.
-FCKeditorForMailing= Creare/editare WYSIWYG pentru emailuri în masă (Instrumente->eMailing)
-FCKeditorForUserSignature=Creare/editare WYSIWYG semnătură utilizator
-FCKeditorForMail=Creare/editare WYSIWYG pentru toate email-urile (cu excepția Instrumente->EMailing)
-FCKeditorForTicket=Creare/editare WYSIWYG pentru tichete
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=Creare/modificare WYSIWYG a semnăturii utilizatorului
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=Creare/modificare WYSIWYG pentru tichete
 ##### Stock #####
 StockSetup=Configurare modul Stocuri
 IfYouUsePointOfSaleCheckModule=Dacă utilizezi modulul Punct de vânzare (POS) furnizat în mod implicit sau de un modul extern, această configurare poate fi ignorată de modulul POS. Cele mai multe module POS sunt proiectate în mod implicit să creeze o factură imediat și să scadă din stoc, indiferent de opțiunile de aici. Deci, dacă ai nevoie sau nu să faci o scădere din stoc la înregistrarea unei vânzări de pe POS, verifică și configurarea modulului POS.
@@ -1867,7 +1874,6 @@ Buy=Cumpără
 Sell=Vinde
 InvoiceDateUsed=Se utilizează data facturii
 YourCompanyDoesNotUseVAT=Compania ta a fost definită ca să nu folosească taxa TVA (Acasă - Setări - Companie/Organizaţie), deci nu există opțiuni de configurare TVA.
-AccountancyCode=Cod contabil
 AccountancyCodeSell=Cont contabil vânzare
 AccountancyCodeBuy=Cont contabil achiziţie
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Păstrați caseta de selectare "Creare automată plată" goală în mod implicit atunci când creați o nouă taxă
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Ce vizualizare doriți să deschideți implicit atunci câ
 AGENDA_EVENT_PAST_COLOR = Culoarea evenimentului trecut
 AGENDA_EVENT_CURRENT_COLOR = Culoarea evenimentului curent
 AGENDA_EVENT_FUTURE_COLOR = Culoarea evenimentului viitor
-AGENDA_REMINDER_BROWSER = Activați memento-uri evenimente în <b>browserul utilizatorului</b> (Când este atinsă data de reamintire, browserul afișează un popup. Fiecare utilizator poate dezactiva astfel de notificări din configurarea sa de notificări browser).
+AGENDA_REMINDER_BROWSER = Permite reminder-e pentru evenimente <b>în browserul utilizatorului</b>
+AGENDA_REMINDER_BROWSERHelp = Când se ajunge la data de reamintire, browserul afișează o fereastră pop-up). Opțiunea/întârzierea de reamintire este definită de utilizator la crearea evenimentului.
 AGENDA_REMINDER_BROWSER_SOUND = Activați notificarea sonoră
-AGENDA_REMINDER_EMAIL = Activați memento evenimente <b>prin email</b> (opțiunea de reamintire/întârziere poate fi definită pentru fiecare eveniment).
+AGENDA_REMINDER_EMAIL = Permiteți reminder-e de evenimente <b>prin email-uri</b>
 AGENDA_REMINDER_EMAIL_NOTE = Notă: Frecvența jobului programat %s trebuie să fie suficientă pentru a vă asigura că reminder-ul este trimis la momentul corect.
 AGENDA_SHOW_LINKED_OBJECT = Afișați un obiect asociat în vizualizarea agendei
 AGENDA_USE_EVENT_TYPE = Utilizați tipuri de evenimente (gestionate în menu Setări->Dicționare->Tip evenimente agendă)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Setează automat această valoare implicită pentru tipul de eveniment în formularul de creare a evenimentului
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Utilizare reminder prestabilit pentru aceste evenimente
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = Formularul de notificare automată reminder va fi completat implicit la crearea evenimentului
+AGENDA_DEFAULT_REMINDER_OFFSET = Perioadă reminder implicită înainte de eveniment
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Șablon email de utilizat pentru reminder implicit
 PasswordTogetVCalExport = Cheie de autorizare export link
 PastDelayVCalExport=Nu exporta evenimente mai vechi de
 SecurityKey = Cheie de securitate
@@ -2006,7 +2017,7 @@ BackupZipWizard=Wizard pentru generarea arhivei cu directul de documente
 SomethingMakeInstallFromWebNotPossible=Instalarea modulului extern nu este posibilă din interfața web din următorul motiv:
 SomethingMakeInstallFromWebNotPossible2=Din acest motiv, procesul de actualizare descris aici este un proces manual pe care numai un utilizator privilegiat îl poate face.
 InstallModuleFromWebHasBeenDisabledContactUs=Instalarea sau dezvoltarea de module externe sau site-uri web dinamice, din aplicație, este în prezent blocată din motive de securitate. Vă rugăm să ne contactați dacă trebuie să activați această funcție.
-InstallModuleFromWebHasBeenDisabledByFile=Instalarea de module externe din aplicație a fost dezactivată de administrator. Trebuie să-i soliciţi să şteargă fişierul <strong>%s</strong> pentru a permite această caracteristică.
+InstallModuleFromWebHasBeenDisabledByFile=Instalarea modulului extern din aplicație și utilizarea caracteristicilor care permit rularea codului pe server au fost dezactivate de administratorul tău. Trebuie să-i ceri să elimine fișierul <strong>%s</strong> pentru a permite această funcție.
 ConfFileMustContainCustom=Instalarea sau construirea unui modul extern din aplicație trebuie să salveze fişierele în directorul <strong>%s</strong>. Pentru a putea fi folosit de sistem, trebuie să configurezi<strong>conf/conf.php</strong> adaugă 2 linii de directivă: <br> <strong>$dolibarr_main_url_root_alt='/custom';</strong> <br><strong> $dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Evidențiați liniile tabelului când treceţi cu mouse-ul peste ele
 HighlightLinesColor=Evidențiere culoare linie la trecerea cu mouse-ul (foloseşte „ffffff” pentru dezactivare)
@@ -2036,6 +2047,7 @@ Enter0or1=Introdu 0 sau 1
 EnterYesOrNo=Introdu Da sau Nu
 UnicodeCurrency=Introdu aici între paranteze, lista de octeți care reprezintă simbolul monedei. De exemplu: pentru $, introdu [36] - pentru Real brazilian R$ [82,36] - pentru €, introdu [8364]
 ColorFormat=Culoarea RGB este în format HEX , de exemplu: FF0000
+NumberFormatForATotalPrice=Format numeric pentru prețul total %s
 PictoHelp=Numele pictogramei în format:<br> - image.png pentru un fișier imagine în directorul curent al temei<br> - image.png@module dacă fișierul se află în directorul /img/ al unui modul<br> - fa-xxx pentru o pictogramă FontAwesome fa-xxx<br> - fontawesome_xxx_fa_color_size pentru o pictogramă FontAwesome fa-xxx (cu set de prefix, culoare și dimensiune)
 PositionIntoComboList=Poziția linei în listele combo
 SellTaxRate=Cote taxe/impozite pe vânzări
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Ascunde coloana de p
 MAIN_PDF_NO_SENDER_FRAME=Ascunde marginile chenarului de adresă expeditor/furnizor
 MAIN_PDF_NO_RECIPENT_FRAME=Ascundere chenare cadru adresă destinatar
 MAIN_PDF_HIDE_CUSTOMER_CODE=Ascunde cod client
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Ascundere cod contabil client
 MAIN_PDF_HIDE_SENDER_NAME=Ascunde expeditor/nume companie din blocul de adresă
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Ascundere termeni de plată
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Ascundere mod de plată
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Adăugare marcaj ascuns în zona de semnătură pentru a permite instrumentului de semnătură electronică să îl refolosească. Poate fi folosit de instrumente externe sau în viitor de funcția de semnătură online.
@@ -2324,6 +2341,8 @@ NotRecommended=Nerecomandat
 ARestrictedPath=O cale restricționată pentru fișierele de date
 CheckForModuleUpdate=Verificare actualizări module externe
 CheckForModuleUpdateHelp=Această acțiune se va conecta la editori de module externe pentru a verifica dacă este disponibilă o nouă versiune.
+CheckForModuleUpdateHelp2=De asemenea, se face o conexiune la %s pentru a verifica dacă unele dintre modulele tale externe au fost raportate ca malware de către comunitate.
+YourIPWillBeRevealedToThisExternalProviders=IP-ul tău va fi dezvăluit tuturor acestor furnizori externi.
 ModuleUpdateAvailable=O actualizare este disponibilă
 NoExternalModuleWithUpdate=Nu au fost găsite actualizări pentru modulele externe
 SwaggerDescriptionFile=Fişier descriptor Swagger API (pentru utilizare redoc de exemplu)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Afișează adresa de livrare
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Mențiune obligatorie în unele țări (Franța, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Afișare persoană de contact pentru facturare pe oferta comercială
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=În mod implicit, contactul apare doar pentru facturare
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Link URL rețea socială. Utilizează {socialid} pentru partea variabilă care conține ID-ul rețelei sociale.
 IfThisCategoryIsChildOfAnother=Dacă această categorie este un copil al alteia
 DarkThemeMode=Mod întunecat temă
@@ -2450,7 +2471,7 @@ 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)
+MAIN_CHECKBOX_LEFT_COLUMN=Afișează coloana pentru selecția câmpului și a liniei din stânga (în dreapta este dezactivată)
 NotAvailableByDefaultEnabledOnModuleActivation=Nu este creat implicit. Creat numai la activarea modulului.
 CSSPage=Stil CSS
 Defaultfortype=Implicit
@@ -2489,7 +2510,7 @@ AiDescription=Caracteristici AI (Inteligență Artificială)
 AiDescriptionLong=Oferă funcții AI (Inteligență Artificială) în diferite părți ale aplicației. Ai nevoie de un API AI extern.
 AI_API_KEY=Cheie pentru API AI
 AI_API_URL=URL endpoint pentru API AI
-AI_API_SERVICE=Serviciu de utilizat pentru caracteristici AI
+AI_API_SERVICE=AI service to use
 AiSetup=Configurare modul AI
 AiCustomPrompt=Solicitare personalizată AI
 AI_CONFIGURATIONS_PROMPT=Solicitare personalizată
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=Solicitare personalizată AI pentru caracteristici
 EnterAnIP=Introdu o adresă IP
 ConvertInto=Convertește în
 YouAreHere=Ești aici
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Afișare cod de bare pe documentul PDF de livrare/expediție
 BARCODE_ON_RECEPTION_PDF=Afișare cod de bare pe documentul PDF de recepție
 BARCODE_ON_STOCKTRANSFER_PDF=Afișare cod de bare pe documentul PDF de transfer de stoc
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=URL deconectare Dolibarr de autoriza
 MainAuthenticationOidcLoginClaimName=Revendicare de conectare
 MainAuthenticationOidcLoginClaimDesc=Revendicarea OpenID Connect se potrivește cu datele de conectare ale utilizatorului Dolibarr. Dacă nu este setat sau este gol, este implicit email
 BlackListWords=Blacklist de cuvinte
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Adăugare în blacklist
 FediverseSetup=Configurare secțiune fediverse
 ConfigImportSocialNetwork=Configurare rețele sociale compatibile cu Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Nume parametru
 ParamValue=Valoare parametru
 ConfirmDeleteParamOfSocialNetwork=Ești sigur că vrei să ștergi acest parametru?
 HelpMariaDBToGetPossibleValues=Poți obține o listă de valori posibile rulând următoarea comandă SQL: %s
+HelpMariaDBToGetValue=Această valoare a fost preluată cu comanda: %s
+PDFBoxFrameRoundedCorners=Cadre cu colțuri rotunjite
+MAIN_PDF_FRAME_CORNER_RADIUS=Valoarea implicită pentru raza colțului este 0, deci nu există colțuri rotunjite. Alege valori între 1-3 pentru a crește raza colțului și adaugăi colțuri rotunjite la cadre
 Captcha=Captcha
 CaptchaDesc=Dacă vrei să-ți protejezi pagina de autentificare cu un cod Captcha, poți alege pe cel care să-l utilizezi aici
 DolibarrStandardCaptcha=Un captcha nativ generat de Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Afișează adresa de livrare
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Mențiune obligatorie în unele țări (Franța, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Afișare analiză TVA după cotă
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=Ai o dimensiune maximă implicită pentru liste setată la <b>%s</b> linii. Aceasta este o valoare mare care necesită derulare pentru a vedea toate răspunsurile. Este mai bine să ai o valoare mai mică de <b>%s</b> și să utilizezi paginarea pentru a vedea înregistrarea peste acest număr. Schimbă acest lucru în meniul Acasă - Configurare - Afișare.
+RoundBorders=Colțuri rotunde
+CheckIfModuleIsNotBlackListed=Blochează instalarea pentru modulele găsite în<b> Lista neagră de la distanță</b>
+CheckIfModuleIsNotBlackListedHelp=Unele module pot fi furnizate de unele companii care nu respectă regulile de bunăvoință ale proiectului (nerespectarea GDPR, încălcarea regulilor de utilizare a mărcii Dolibarr etc.). Bifând această casetă, se va face o solicitare către serverul de proiect pentru a vedea dacă a fost primit un raport despre acest modul și vă va proteja prin blocarea implementării modulelor marcate.
+DatabaseEncryption=Criptare în baza de date
+AlgorithmFor=Algoritm pentru: %s
+SensitiveData=Date sensibile
+ToolToDecryptAString=Instrument pentru decriptare text
+Decrypt=Decriptare
+FilesIntegrityDesc=Dacă vrei să verifici integritatea fișierelor în loc de baza de date, o poți face folosind <a href="%s">acest instrument</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=Există mai mult decât %s răspunsuri cu filtrul tău. Adaugă mai multe filtre...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index 2d1797fedcb..0c413a2bf41 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -27,11 +27,10 @@ EndBankBalance=Sold final
 CurrentBalance=Sold curent
 FutureBalance=Sold viitor
 ShowAllTimeBalance=Arată soldul iniţial
-AllTime=De la început
 Reconciliation=Reconciliere
 RIB=Număr Cont Bancar
 IBAN=Cod IBAN
-BIC=Cod BIC/SWIFT 
+BIC=Cod BIC/SWIFT
 SwiftValid=BIC/SWIFT valid
 SwiftNotValid=BIC/SWIFT invalid
 IbanValid=IBAN valid
@@ -85,7 +84,7 @@ Conciliation=Reconciliere
 SaveStatementOnly=Salvați numai declarația
 ReconciliationLate=Reconciliere întârziată
 IncludeClosedAccount=Include conturile închise
-OnlyOpenedAccount=Doar conturile deschise 
+OnlyOpenedAccount=Doar conturile deschise
 AccountToCredit=Cont de creditat
 AccountToDebit=Cont de debitat
 DisableConciliation=Dezactivaţi reconcilierea pentru acest cont
@@ -121,7 +120,7 @@ TransferFromToDone=Un transfer de la  <b>%s</b> la <b> %s </b>  de<b>%s</b> %s a
 CheckTransmitter=Expeditor
 ValidateCheckReceipt=Validați această chitanță cec?
 ConfirmValidateCheckReceipt=Sigur vrei să trimiți această filă cec pentru validare? Nu vor fi posibile modificări după validare.
-DeleteCheckReceipt=Ștergeți această chitanță cec? 
+DeleteCheckReceipt=Ștergeți această chitanță cec?
 ConfirmDeleteCheckReceipt=Sigur stergeți această chitanță cec?
 DocumentsForDeposit=Documente de depus la bancă
 BankChecks=Cecuri bancare
@@ -133,7 +132,7 @@ DeleteTransaction=Șterge intrare
 ConfirmDeleteTransaction=Sigur doriți să ștergeți această intrare?
 ThisWillAlsoDeleteBankRecord=Aceasta va șterge, de asemenea, intrarea bancară generată
 BankMovements=Mişcări
-PlannedTransactions=Tranzacţii planificate
+PlannedTransactions=Intrări viitoare
 Graph=Grafice
 ExportDataset_banque_1=Înregistrări bancare și extras de cont
 ExportDataset_banque_2=Formular depunere
@@ -151,8 +150,8 @@ FutureTransaction=Tranzacție viitoare. Imposibil de reconciliat.
 SelectChequeTransactionAndGenerate=Acest ecran vă arată statistici ale membrilor în funcție de regiune.
 SelectPaymentTransactionAndGenerate=Selectează/filtrează documentele care urmează să fie incluse în bonul de depozit %s. Apoi, fă clic pe "Creare".
 InputReceiptNumber=Alege extrasul bancar aferent concilierii. Utilizează o valoare numerică sortabilă
-InputReceiptNumberBis=YYYYMM sau YYYYMMDD
-EventualyAddCategory=În cele din urmă, specifică o categorie în care să clasezi înregistrările
+InputReceiptNumberBis=YYYYMM
+EventualyAddCategory=Opțional, o categorie în care să se încadreze operațiunile
 ToConciliate=Să se reconcilieze?
 ThenCheckLinesAndConciliate=Apoi, verifică liniile prezente în extrasul bancar şi dă click
 DefaultRIB=IBAN implicit
@@ -177,8 +176,8 @@ AddVariousPayment=Adaugă plată diversă
 VariousPaymentId=ID plată diversă
 VariousPaymentLabel=Etichetă plată diversă
 ConfirmCloneVariousPayment=Confirmă clona unei plăţi diverse
-SEPAMandate=Mandat SEPA 
-YourSEPAMandate=Mandatul tău SEPA  
+SEPAMandate=Mandat SEPA
+YourSEPAMandate=Mandatul tău SEPA
 FindYourSEPAMandate=Acesta este mandatul tău SEPA pentru a autoriza compania noastră să efectueze un ordin de debitare directă către banca ta. Returnaţi-l semnat (document scanat semnat) sau trimiteți-l prin poștă la
 AutoReportLastAccountStatement=Completați automat câmpul "numărul extrasului de cont" cu ultimul număr al declarației atunci când efectuați reconcilierea
 CashControl=Control numerar POS 
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Dacă această funcţie este activată, poţi alege o c
 BankColorizeMovementName1=Culoarea de fundal pentru tranzacţiile de debit
 BankColorizeMovementName2=Culoarea de fundal pentru tranzacţiile de credit
 IfYouDontReconcileDisableProperty= Dacă nu faceți decontări bancare pe unele conturi bancare, dezactivați proprietatea "%s" de pe ele pentru a elimina acest avertisment
-NoBankAccountDefined=Nu a fost definit niciun cont bancar
+NoBankAccountDefined=Nu a fost găsit niciun cont bancar
 NoRecordFoundIBankcAccount=Nu s-a găsit nicio înregistrare în contul bancar. În mod obișnuit, acest lucru se întâmplă atunci când o înregistrare a fost ștearsă manual din lista tranzacțiilor din contul bancar (de exemplu, în timpul decontării contului bancar). Un alt motiv este că plata a fost înregistrată când modulul "%s" a fost dezactivat.
 AlreadyOneBankAccount=Este deja definit un cont bancar
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Fișier variant SEPA
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 76e8cb21c7f..9cd59480079 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -169,6 +169,7 @@ BillTo=La
 ShippingTo=Livrare pentru
 ActionsOnBill=Evenimente pe factură
 ActionsOnBillRec=Acțiuni pe factură recurentă
+InvoicesGeneratedFromRec=Facturi generate
 RecurringInvoiceTemplate=Șablon / factură recurentă
 NoQualifiedRecurringInvoiceTemplateFound=Nu există un model de factură potrivit pentru generare.
 FoundXQualifiedRecurringInvoiceTemplate=%s factur(i) recurente șablon calificate pentru generare.
@@ -182,6 +183,7 @@ LastCustomersBills=Ultimele %s facturi client
 LastSuppliersBills=Ultimele %s facturi furnizor
 AllBills=Toate facturile
 AllCustomerTemplateInvoices=Toate șabloanele de factură
+AllSupplierTemplateInvoices=Toate șabloanele de factură
 OtherBills=Alte facturi
 DraftBills=Facturi schiţă
 CustomersDraftInvoices=Facturi client schiţă
@@ -419,6 +421,7 @@ InvoiceAutoValidate=Validare automată facturi
 GeneratedFromRecurringInvoice=Generate din model factura recurentă %s
 DateIsNotEnough=Incă nu este data setată
 InvoiceGeneratedFromTemplate=Factură %s generată din model factură recurentă %s
+InvoiceGeneratedFromTemplateError=Error Invoice %s generated from recurring template invoice %s : %s
 GeneratedFromTemplate=Generată din şablonul de factură %s
 WarningInvoiceDateInFuture=Atenţie, data facturii este mai mare decât data curentă
 WarningInvoiceDateTooFarInFuture=Atenţie, data facturii este prea îndepărtată de data curentă
@@ -495,6 +498,8 @@ IBANNumber=Nr. cont IBAN
 IBAN=IBAN
 CustomerIBAN=IBAN client
 SupplierIBAN=IBAN furnizor
+DebitBankAccount = Cont bancar direct debit
+SetDebitBankAccount = Definire cont bancar direct debit
 BIC=BIC / SWIFT
 BICNumber=Cod BIC/SWIFT
 ExtraInfos=Informaţii suplimentare
@@ -513,10 +518,12 @@ PrettyLittleSentence=Accept  plata sumelor datorate prin  cecurile emise pe nume
 IntracommunityVATNumber=Cod de identificare TVA intracomunitar
 PaymentByChequeOrderedTo=Plăți cu cec (cu taxe) achitate către %s, predate
 PaymentByChequeOrderedToShort=Plățile cu cec (cu taxe) se fac către
+StructuredCommunication=Comunicare stucturată
 SendTo=trimis la
 PaymentByTransferOnThisBankAccount=Plată prin transfer către următorul cont bancar
 VATIsNotUsedForInvoice=* TVA neaplicabil art-293B din CGI
 VATIsNotUsedForInvoiceAsso=* TVA neaplicabil art-261-7 of CGI
+VATIsNotUsedReverseChargeProcedure=* Non applicable VAT art-259-1 of CGI
 LawApplicationPart1=Prin aplicarea legii 80.335 din 12.05.80
 LawApplicationPart2=mărfurile rămân în proprietatea
 LawApplicationPart3=vânzătorul până la plată integrală
@@ -661,6 +668,7 @@ MentionCategoryOfOperations0=Livrare de bunuri
 MentionCategoryOfOperations1=Prestare de servicii
 MentionCategoryOfOperations2=Mixt - Livrare de bunuri și prestare de servicii
 Salaries=Salarii
+InvoiceSubtype=Subtip factură
 SalaryInvoice=Salariu
 BillsAndSalaries=Facturi & Salarii
 CreateCreditNoteWhenClientInvoiceExists=Această opțiune este activată numai atunci când există factur(i) validate pentru un client sau când este utilizată constanta INVOICE_CREDIT_NOTE_STANDALONE (utilă pentru unele țări)
diff --git a/htdocs/langs/ro_RO/blockedlog.lang b/htdocs/langs/ro_RO/blockedlog.lang
index b9e859309b0..aab3b851315 100644
--- a/htdocs/langs/ro_RO/blockedlog.lang
+++ b/htdocs/langs/ro_RO/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Jurnale nemodificabile
 ShowAllFingerPrintsMightBeTooLong=Arată toate jurnalele arhivate (ar putea fi lungi)
 ShowAllFingerPrintsErrorsMightBeTooLong=Arată toate jurnalele de arhivă nevalide (ar putea fi lungi)
 DownloadBlockChain=Descărcați amprentele digitale
-KoCheckFingerprintValidity=Înregistrarea din jurnalul arhivă nu este validă. Înseamnă că cineva (un hacker?) a modificat unele date ale acestei înregistrări după ce a fost înregistrată sau a șters înregistrarea arhivată anterioară (verificați dacă există linia cu numărul anterior) sau a modificat suma de control a înregistrării anterioare.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Intrarea în jurnalul arhivă este validă. Datele de pe această linie nu au fost modificate şi înregistrarea urmează cele precedente.
 OkCheckFingerprintValidityButChainIsKo=Jurnalul arhivă pare valid în comparație cu cel precedent, dar lanțul a fost corupt anterior.
 AddedByAuthority=Stocat într-o autoritate la distanţă
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Detalii înregistrare
 ListOfTrackedEvents=Lista evenimentelor urmărite
 Fingerprint=Amprentă digitală
 DownloadLogCSV=Exportați jurnale arhivate (CSV)
-DataOfArchivedEvent=Date complete ale evenimentului arhivat
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Obiect original  (tip %s, id %s) nu este legat (vedeți coloana "Date complete" pentru a obține date salvate nemodificate)
 BlockedLogAreRequiredByYourCountryLegislation=Modulul Jurnale Nealterabile poate fi impus de legislația țării tale. Dezactivarea acestui modul poate face ca orice tranzacție viitoare să nu fie validată și utilizarea software-ului  să nu fie corespunzătoare din punct de vedere legal, deoarece operaţiunile economice efectuate nu pot fi validate de un audit fiscal din perspectiva taxării.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Modulul Jurnale Nealterabile a fost activat de legislația țării tale. Dezactivarea acestui modul poate face ca orice tranzacție viitoare să nu fie validă din punct de vedere legal și utilizarea software-ului să fie considerată necorespunzătoare, deoarece acestea nu pot fi validate de un audit fiscal.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Sistemul de urmărire a evenimentelor în jurnale inalterabile
 BlockedLogDisabled=Sistemul de urmărire a evenimentelor în jurnale inalterabile a fost dezactivat după ce au fost efectuate înregistrări. Am salvat o amprentă specială pentru a marca lanțul ca fiind rupt
 BlockedLogDisabledBis=Sistemul de urmărire a evenimentelor în jurnale inalterabile a fost dezactivat. Acest lucru este posibil deoarece încă nu au fost create înregistrări.
 LinkHasBeenDisabledForPerformancePurpose=Din motive de performanță, legătura directă către document nu este afișată după a 100-lea rând.
+SavedOnLine=Salvat pe linie
 
 ## logTypes
 logBILL_DELETE=Factura clientului a fost ștearsă logic
@@ -41,7 +44,7 @@ logCASHCONTROL_VALIDATE= Înregistrare închidere casierie
 logDOC_DOWNLOAD=Descărcarea unui document validat pentru imprimare sau trimitere
 logDOC_PREVIEW=Previzualizarea unui document validat pentru imprimare sau descărcare
 logDONATION_PAYMENT_CREATE=Plata donaţiei a fost creată
-logDONATION_PAYMENT_DELETE=Ștergerea logică a plăţii donaţiei 
+logDONATION_PAYMENT_DELETE=Ștergerea logică a plăţii donaţiei
 logDON_DELETE=Ştergerea logică a donaţiei
 logDON_MODIFY=Donaţie modificată
 logDON_VALIDATE=Donaţie validată
@@ -54,5 +57,6 @@ logPAYMENT_ADD_TO_BANK=Plată adăugată în bancă
 logPAYMENT_CUSTOMER_CREATE=Plata clientului a fost creată
 logPAYMENT_CUSTOMER_DELETE=Ștergerea logică a plăţii clientului
 logPAYMENT_VARIOUS_CREATE=Plată (ne-asignată unei facturi) creată
-logPAYMENT_VARIOUS_DELETE=Ştergere logică plată (ne-asignată unei facturi) 
+logPAYMENT_VARIOUS_DELETE=Ştergere logică plată (ne-asignată unei facturi)
 logPAYMENT_VARIOUS_MODIFY=Plată ( ne-asignată unei facturi) modificată
+logBLOCKEDLOG_EXPORT=Export jurnale inalterabile într-un fișier
diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang
index 8af678c87e5..9305aadc36b 100644
--- a/htdocs/langs/ro_RO/categories.lang
+++ b/htdocs/langs/ro_RO/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Tag-uri/categorii contact
 AccountsCategoriesArea=Tag-uri/categorii cont bancar
 ProjectsCategoriesArea=Tag-uri/categorii proiect
 UsersCategoriesArea=Tag-uri/categorii utilizator
+Bank_linesCategoriesArea==Zona de etichete/categorii linii bancare
 SubCats=Subcategorii
 CatList=Listă tag-uri/categorii
 CatListAll=Listă tag-uri/categorii (toate tipurile)
@@ -72,14 +73,14 @@ ParentCategoryID=ID tag/categorie părinte
 ParentCategoryLabel=Etichetă tag/categorie părinte
 CatSupList=Listă tag-uri/categorii furnizori
 CatCusList=Listă tag-uri/categorii clienţi/prospecţi
-CatProdList=Listă tag-uri/categorii produse 
+CatProdList=Listă tag-uri/categorii produse
 CatMemberList=Listă tag-uri/categorii membri
 CatContactList=Listă tag-uri/categorii contacte
 CatProjectsList=Listă tag-uri/categorii proiecte
 CatUsersList=Listă tag-uri/categorii utilizatori
 CatSupLinks=Legături între furnizori și tag-uri/categorii
 CatCusLinks=Asocieri între clienţi/prospecţi şi tag-uri/categorii
-CatContactsLinks=Asocieri între contacte/adrese şi tag-uri/categorii 
+CatContactsLinks=Asocieri între contacte/adrese şi tag-uri/categorii
 CatProdLinks=Asocieri între produse/servicii şi tag-uri/categorii
 CatMembersLinks=Asocieri între membri şi tag-uri/categorii
 CatProjectsLinks=Asocieri între proiecte și tag-uri/categorii
@@ -90,9 +91,10 @@ CategoriesSetup=Configurare tag-uri/categorii
 CategorieRecursiv=Asociere automată către tag/categorie părinte
 CategorieRecursivHelp=Dacă opțiunea este activată, atunci când adaugi un obiect într-o subcategorie, obiectul va fi adăugat și în categoriile părinte.
 AddProductServiceIntoCategory=Asignare categorie la produs/serviciu
-AddCustomerIntoCategory=Atribuire categorie clientului
-AddSupplierIntoCategory=Atribuire categorie furnizorului
-AssignCategoryTo=Asignare categorie la
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Arată tag/categorie
 ByDefaultInList=Implicit în listă
 ChooseCategory=Alegeți categoria
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Categorii Pagină-Container
 KnowledgemanagementsCategoriesArea=Categorii articole Bază de cunoştinţe
 UseOrOperatorForCategories=Foloseşte operatorul 'SAU' pentru categorii
 AddObjectIntoCategory=Asignare la categorie
+FichintersCategoriesArea=Categorii intervenție
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 130f35dbaa7..fa892d6d2eb 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Țara se află în interiorul Comunității Economice Europene
 PriceFormatInCurrentLanguage=Afişează formatul preţului în limba şi moneda curentă
 ThirdPartyName=Nume terț
 ThirdPartyEmail=Email terț
-ThirdParty=Terți
-ThirdParties=Terți
+ThirdParty=Terţi
+ThirdParties=Terţi
 ThirdPartyProspects=Prospecţi
 ThirdPartyProspectsStats=Prospecţi
 ThirdPartyCustomers=Clienţi
@@ -65,6 +65,7 @@ State=Regiune/Judeţ
 StateId=ID Județ
 StateCode=Cod judeţ/provincie
 StateShort=Stat
+DepartmentBuyer=Regiunea/provincia cumpărătorului
 Region=Regiune
 Region-State=Regiune - Țară
 Country=Ţară
@@ -78,7 +79,7 @@ Chat=Chat
 PhonePro=Telefon serviciu
 PhonePerso=Telefon pers.
 PhoneMobile=Telefon mobil
-No_Email=Refuză newslettere
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=Cod poştal
 Town=Oraş
@@ -382,12 +383,12 @@ ExportCardToFormat=Export fişă în format
 ContactNotLinkedToCompany=Contact neasociat la un terţ
 DolibarrLogin=Nume de autentificare
 NoDolibarrAccess=Utilizator fără acces în sistem
-ExportDataset_company_1=Terți (companii/fundații/persoane fizice) și proprietățile acestora
-ExportDataset_company_2=Persoane de contact și proprietățile acestora
-ExportDataset_company_3=Conturi bancare Terți
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Contacte/adrese și atribute suplimentare pentru terţi
+ExportDataset_company_3=Moduri de plată terți (conturi bancare)
 ImportDataset_company_1=Terți și proprietățile acestora
 ImportDataset_company_2=Contacte/adrese și atribute suplimentare pentru terţi
-ImportDataset_company_3=Conturi bancare Terți
+ImportDataset_company_3=Moduri de plată terți (conturi bancare)
 ImportDataset_company_4=Reprezentanți de vânzări ai terților (asociere reprezentanți vânzări/utilizatori la companii)
 PriceLevel=Nivel de preț
 PriceLevelLabels=Etichete nivel de preț
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Cod liber fără verificare.
 ManagingDirectors=Nume manager(i) (CEO, director, preşedinte...)
 MergeOriginThirdparty=Terț duplicat (terțul pe care vrei să-l ștergi)
 MergeThirdparties=Îmbinare terţi
-ConfirmMergeThirdparties=Sigur vrei să îmbinii terțul ales cu cel actual? Toate obiectele asociate (facturi, comenzi, ...) vor fi mutate la terțul curent, după care terțul ales va fi șters.
+ConfirmMergeThirdparties=Sigur vrei să îmbini terțul ales cu cel curent? Toate obiectele legate (facturi, comenzi, ...) vor fi mutate la terțul curent, apoi terțul ales va fi șters.
 ThirdpartiesMergeSuccess=Terții au fost unificaţi
 SaleRepresentativeLogin=Autentificare reprezentant vânzări
 SaleRepresentativeFirstname=Numele reprezentantului vânzări
@@ -461,3 +462,6 @@ ExternalSystemID=ID sistem extern
 IDOfPaymentInAnExternalSystem=ID mod de plată dintr-un sistem extern (cum ar fi Stripe, Paypal, ...) 
 AADEWebserviceCredentials=Credențiale AADE Webservice
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Terțul trebuie să fie un client pentru a permite crearea informațiilor sale bancare pe partea Stripe
+NewSocNameForClone=Denumire nouă de companie
+ConfirmCloneThirdparties=Ești sigur că vrei să clonezi această companie <b>%s</b>?
+SocialNetworksBusiness=Rețele sociale pentru companie
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index e2e198bce69..f08b51c2c53 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Plată factură client
 PaymentSupplierInvoice=Plată factură furnizor
 PaymentSocialContribution=Plată taxe sociale sau fiscale
 PaymentVat=Plată TVA
-AutomaticCreationPayment=Înregistrare automată a plăţii
+AutomaticCreationPayment=Also record the payment
 ListPayment=Listă plăţi
 ListOfCustomerPayments=Listă plăţi clienţi
 ListOfSupplierPayments=Listă plăți furnizori
@@ -118,10 +118,14 @@ SocialContributionsPayments=Plăţi de taxe sociale/fiscale
 ShowVatPayment=Arata plata TVA
 TotalToPay=Total de plată
 BalanceVisibilityDependsOnSortAndFilters= Soldul este vizibil în această listă numai dacă tabelul este sortat și filtrat pe %s 1 cont bancar (fără alte filtre)
+CustomerAccountancyCodeGeneral=Cod contabil general client
 CustomerAccountancyCode=Cod contabil client
+SupplierAccountancyCodeGeneral=Cod contabil general furnizor
 SupplierAccountancyCode=Codul contabil furnizor
+UserAccountancyCodeGeneral=Cod contabil general
 CustomerAccountancyCodeShort=Cont contabil client
 SupplierAccountancyCodeShort=Cont contabil furnizor
+UserAccountancyCodeShort=Cont de utilizator. cod
 AccountNumber=Număr cont
 NewAccountingAccount=Cont nou
 Turnover=Cifra de afaceri facturată
@@ -129,7 +133,9 @@ TurnoverCollected=Cifra de afaceri colectată
 SalesTurnoverMinimum=Cifra de afaceri minimă
 ByExpenseIncome= După cheltuieli & venituri
 ByThirdParties=După terţi
+ByProjects=După proiecte
 ByUserAuthorOfInvoice=După autorul facturii
+DetailedListLowercase=listă detaliată
 CheckReceipt=Filă CEC
 CheckReceiptShort=Filă CEC
 LastCheckReceiptShort=Ultimile %s ordine de plată
diff --git a/htdocs/langs/ro_RO/datapolicy.lang b/htdocs/langs/ro_RO/datapolicy.lang
index efc6dfe2912..68d8189028a 100644
--- a/htdocs/langs/ro_RO/datapolicy.lang
+++ b/htdocs/langs/ro_RO/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Politica de confidențialitate a datelor
 Module4100Desc = Modul de gestionare a confidențialității datelor cu caracter personal (conformitate cu GDPR)
 # Administration page
 datapolicySetup = Configurare modul Confidențialitatea datelor cu caracter personal
-Deletion = Ștergere date
-datapolicySetupPage = În funcție de legile din țara ta (Exemplu <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Articolul 5</a> din GDPR), datele cu caracter personal trebuie păstrate pentru o perioadă care nu depășește durata în care datele sunt necesare pentru scopul pentru care au fost colectate, cu excepția scopurilor de arhivare.<br>Ștergerea va fi se face automat după o anumită durată fără evenimente (durata pe care o vei indica mai jos).
+DataDeletion=Ștergere date
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s luni
 ONE_YEAR = 1 an
 NB_YEARS = %s ani
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Prospect/Client
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Nici prospect/Nici client
 DATAPOLICY_CONTACT_FOURNISSEUR = Furnizor
 DATAPOLICY_ADHERENT = Membru
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Poți trimite un email de acord GDPR tuturor persoanelor de contact relevante (care nu au primit încă un email și pentru care nu ai înregistrat nimic despre acordul lor GDPR). Pentru a face acest lucru, utilizează următorul buton.
 SendAgreement = Trimite email-uri
 AllAgreementSend = Toate email-urile au fost trimise
 TXTLINKDATAPOLICYACCEPT = Text pentru linkul "acord"
 TXTLINKDATAPOLICYREFUSE = Text pentru link "dezacord"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: Prelucrarea datelor cu caracter personal
 DATAPOLICY_consentement = Consimțământul obținut pentru prelucrarea datelor cu caracter personal
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index e182a9bdb93..e1478174b0e 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Eroare la crearea fișierelor imagine (g
 ErrorFailedToCreateDir=Eşec la crearea unui director. Verificaţi dacă user-ul server-ului web are permisiuni pentru a scrie în directorul de documente. Dacă parametrul <b>safe_mode</b> este activat în PHP, verifică dacă user-ul sistem deţine fişierele  de pe server(sau grup).
 ErrorNoMailDefinedForThisUser=Nicio adresă de email definită pentru acest utilizator
 ErrorSetupOfEmailsNotComplete=Configurarea emailurilor nu este finalizată
+ErrorAccountingClosureSetupNotComplete=Configurarea conturilor de închidere nu este completă
 ErrorFeatureNeedJavascript=Această funcție necesită JavaScript activat pentru a funcționa. Schimbă setările în Setări - Afișare.
 ErrorTopMenuMustHaveAParentWithId0=Un meniu de tip 'Top' nu poate avea un meniu părinte. Pune 0 la meniul părinte sau alege un meniu de tip 'Stânga'.
 ErrorLeftMenuMustHaveAParentId=Un meniu de tip 'Stânga' trebuie să aibă un id părinte.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Încărcarea este blocată de un plugin PHP/Apache.
 ErrorFileSizeTooLarge=Dimensiunea fișierului este prea mare sau fișierul nu este furnizat.
 ErrorFieldTooLong=Câmpul %s este prea lung.
 ErrorSizeTooLongForIntType=Dimensiunea este prea mare pentru tipul int (%s cifre maxim)
+ErrorSizeForStarsType=Mărimea stelei trebuie să fie un număr între 1 și 10
 ErrorSizeTooLongForVarcharType=Dimensiune prea mare pentru tipul string(%s caractere maxim)
 ErrorNoValueForSelectType=Completaţi valorile pentru lista de selecţie
 ErrorNoValueForCheckBoxType=Completaţi valorile pentru lista checkbox
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Cod de securitate eronat. Încercaţi cu un cod nou...
 ErrorBothFieldCantBeNegative=Câmpurile %s şi %s nu pot fi ambele negative
 ErrorFieldCantBeNegativeOnInvoice=Câmpul <strong>%s</strong> nu poate fi negativ pentru acest tip de factură. Dacă trebuie să adaugi o linie de reducere, trebuie doar să creezi mai întâi reducerea (din câmpul '%s' de pe fișa terțului) și să o aplici pe factură.
 ErrorLinesCantBeNegativeForOneVATRate=Totalul liniilor (fără taxe) nu poate fi negativ pentru o cotă TVA diferită de zero  (S-a găsit un total negativ cota TVA <b>%s</b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Liniile nu pot fi negative într-un depozit. Dacă faceți acest lucru, vă veţi confrunta cu probleme atunci când veți consuma din stoc.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Cantitatea pentru linia unei facturi client nu poate fi negativă.
+ErrorQtyForSupplierInvoiceCantBeNegative=Cantitatea pentru articol în facturile de achiziție nu poate fi negativă
 ErrorWebServerUserHasNotPermission=Contul de utilizator <b>%s</b> folosit pentru a execuţia serverului de web nu are permisiunea pentru aceasta
 ErrorNoActivatedBarcode=Niciun tip de coduri de bare activat
 ErrUnzipFails=Eşec la dezarhivarea fişierului %s cu ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=Câmpul dată de încheiere nu poate fi gol
 ErrorStartHourIsNull=Câmpul dată de început nu poate fi gol
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Prea multe linii de procesat. Utilizează un filtru mai selectiv.
 ErrorEmptyValueForQty=Cantitatea nu poate fi zero.
+ErrorNoCloneWithoutName=Noul utilizator trebuie să aibă nume
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = Cantitatea comandată nu poate fi mai mică decât cantitatea expediată.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Eroare, crearea unei plăți diferite pe un cont bancar cu o monedă diferită de moneda companiei nu este încă acceptată.
+ErrorStreamMustBeEnabled=Fluxul PHP %s nu este disponibil. Verifică modulele PHP și parametrul Dolibarr $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # 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ă.
 WarningPasswordSetWithNoAccount= O parolă a fost trimisă către acest membru. Cu toate acestea, nu a fost creat nici un cont de utilizator. Astfel, această parolă este stocată, dar nu poate fi utilizată pentru autentificare. Poate fi utilizată de către un modul / interfată externă, dar dacă nu aveți nevoie să definiți un utilizator sau o parolă pentru un membru, puteți dezactiva opțiunea "Gestionați o conectare pentru fiecare membru" din modul de configurare membri. În cazul în care aveți nevoie să gestionați un utilizator, dar nu este nevoie de parolă, aveți posibilitatea să păstrați acest câmp gol pentru a evita acest avertisment. Notă: Adresa de e-mail poate fi utilizată ca utilizator la autentificare, în cazul în care membrul este legat de un utilizator.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=Acest ID părinte nu mai există
 WarningReadBankAlsoAllowedIfUserHasPermission=Atenție, citirea contului bancar este permisă și cu permisiunea de a gestiona planul de conturi
 WarningNoDataTransferedInAccountancyYet=Reține că nu există date în tabela contabilă. Transferă datele înregistrate în aplicație în secțiunea de contabilitate sau să schimbă modul de calcul pentru a analiza datele înregistrate în afara contabilității.
 WarningChangingThisMayBreakStopTaskScheduler=Atenție, modificarea acestei valori poate dezactiva programatorul de taskuri
+WarningAmountOfFileDiffersFromSumOfLines=Atenție, cantitatea din fișă (%s) diferă de suma liniilor de articol (%s)
+WarningModuleAffiliatedToAReportedCompany=Atenție, acest modul a fost raportat fundației Dolibarr ca fiind publicat de o companie care folosește practici ilegale (nerespectarea regulilor de utilizare a mărcii Dolibarr, colectarea datelor tale fără consimțământul tău sau implementarea de malware).
+WarningModuleAffiliatedToAPiratPlatform=Fii atent când obții un modul (plătit sau gratuit) de pe o platformă neoficială suspectă, cum ar fi %s
+
 SwissQrOnlyVIR = Factura SwissQR poate fi adăugată numai pe facturile setate să fie plătite cu plăți prin transfer de credit. 
 SwissQrCreditorAddressInvalid = Adresa creditorului este invalidă (este setat codul poștal și județul? (%s)
 SwissQrCreditorInformationInvalid = Informațiile despre creditor sunt invalide pentru IBAN-ul (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s este deja definit ca și contact
 ErrorThisGroupIsAlreadyDefinedAsThisType=Persoanele de contact cu acest grup sunt deja definite ca persoane de contact pentru acest tip.
 EmptyMessageNotAllowedError=Mesajul gol nu este permis
 ErrorIsNotInError=%s nu este cu eroare
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/ro_RO/exports.lang b/htdocs/langs/ro_RO/exports.lang
index c2232df9a6e..b9728300ad0 100644
--- a/htdocs/langs/ro_RO/exports.lang
+++ b/htdocs/langs/ro_RO/exports.lang
@@ -67,7 +67,7 @@ ChooseFormatOfFileToImport=Alegeți formatul de fișier care va fi utilizat ca f
 ChooseFileToImport=Încărcați fișierul, apoi dați clic pe pictograma %s pentru a selecta fișierul ca sursă de import...
 SourceFileFormat=Format fişier sursă
 FieldsInSourceFile=Câmpuri în fişierul sursă
-FieldsInTargetDatabase=Câmpuri-țintă în baza de date a sistemului (bold = obligatoriu)
+FieldsInTargetDatabase=Câmpuri țintă din baza de date Dolibarr
 NoFields=Niciun câmp
 MoveField=Mută câmpul coloană cu numărul %s
 ExampleOfImportFile=Example_of_import_file
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Verifică dacă formatul fișierului (câmpurile și del
 RunSimulateImportFile=Rulați simularea de import
 FieldNeedSource=Acest câmp cere date din fişierul sursă
 SomeMandatoryFieldHaveNoSource=Unele câmpuri obligatorii nu au nicio sursă de date din fişier
-InformationOnSourceFile=Informaţii privind fişierul sursă
-InformationOnTargetTables=Informaţii privind câmpurile ţintă
+InformationOnSourceFile=Fişier sursă
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Comută cel puțin un câmp sursă în coloana de câmpuri de exportat
 SelectFormat=Alege acest format de fişier de import
 RunImportFile=Import date
@@ -108,7 +108,7 @@ DataCodeIDSourceIsInsertedInto=ID-ul liniei părinte, care a fost găsit din cod
 SourceRequired=Valoarea de tip dată este obligatorie
 SourceExample=Exemplu de valoare posibilă
 ExampleAnyRefFoundIntoElement=Orice referinţă gasită pentru elementul <b>%s</b>
-ExampleAnyCodeOrIdFoundIntoDictionary=Orice cod (sau id) găsit  în dicţionarul <b>%s</b> 
+ExampleAnyCodeOrIdFoundIntoDictionary=Orice cod (sau id) găsit  în dicţionarul <b>%s</b>
 CSVFormatDesc=Formatul de fişier (.csv) <b> Valoare separată prin virgulă </b>. <br> Acesta este un format de fișier text în care câmpurile sunt separate printr-un separator [%s]. Dacă separatorul se găsește într-un câmp de conţinut, câmpul este trunchiat de caracterul [%s]. Caracterul de evadare este [%s].
 Excel95FormatDesc=Formatul de fişier <b>Excel</b> (.xls) <br> Acesta este formatul nativ Excel 95 (BIFF5).
 Excel2007FormatDesc=Formatul de fişier <b>Excel</b> (.xlsx) <br> Acesta este formatul nativ Excel 2007 (SpreadsheetML).
@@ -121,9 +121,9 @@ SpecialCode=Cod special
 ExportStringFilter=%% permite înlocuirea unuia sau mai multor caractere în text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filtre după an/lună/zi<br> YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filtre pe o perioadă de ani/luni/zile <br> > YYYY, > YYYYMM, > YYYYMMDD: filtre pentru toţi anii/lunile/zilele următoare<br> < YYYY, < YYYYMM, < YYYYMMDD: filtre pentru toți anii/lunile/zilele anterioare
 ExportNumericFilter=NNNNN filtrează după o valoare <br> NNNNN + NNNNN filtrează după un interval de valori <br>< NNNNN filtrează după valori mai mici <br>> NNNNN după valori mai mari
-ImportFromLine=Importă începând cu linia numărul 
-EndAtLineNb=Sfârșit la linia numărul 
-ImportFromToLine=Interval limită (De la - Până la). Ex. pentru a omite linia(ile) de cap de tabel.  
+ImportFromLine=Importă începând cu linia numărul
+EndAtLineNb=Sfârșit la linia numărul
+ImportFromToLine=Interval limită (De la - Până la). Ex. pentru a omite linia(ile) de cap de tabel.
 SetThisValueTo2ToExcludeFirstLine=De exemplu, setează această valoare la 3 pentru a exclude primele 2 linii. <br> Dacă liniile de antet NU sunt omise, aceasta va duce la mai multe erori în simularea importului.
 KeepEmptyToGoToEndOfFile=Păstrați acest câmp gol pentru a procesa toate liniile până la sfârșitul fișierului.
 SelectPrimaryColumnsForUpdateAttempt=Selectează coloana(coloanele) de utilizat ca cheie primară pentru un import cu actualizare UPDATE
@@ -137,7 +137,7 @@ FilteredFields=Câmpuri filtrate
 FilteredFieldsValues=Valoare pentru filtru
 FormatControlRule=Regula de control a formatelor
 ## imports updates
-KeysToUseForUpdates=Cheie (coloană) de utilizat pentru <b>actualizarea </b> datelor existente 
+KeysToUseForUpdates=Cheie (coloană) de utilizat pentru <b>actualizarea </b> datelor existente
 NbInsert=Număr linii inserate: %s
 NbInsertSim=Număr de linii care vor fi inserate: %s
 NbUpdate=Număr linii actualizate: %s
diff --git a/htdocs/langs/ro_RO/hrm.lang b/htdocs/langs/ro_RO/hrm.lang
index 8f24e3b8499..a614f514693 100644
--- a/htdocs/langs/ro_RO/hrm.lang
+++ b/htdocs/langs/ro_RO/hrm.lang
@@ -46,11 +46,11 @@ NewEval=Evaluare competență nouă
 ValidateEvaluation=Validare evaluare competență
 ConfirmValidateEvaluation=Sigur vrei să validezi evaluarea competențelor cu referința <b>%s</b>?
 EvaluationCard=Evaluare competență
-RequiredRank=Clasament necesar pentru profil job
-RequiredRankShort=Rang necesar
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Posturi pentru aceste profile de job
-EmployeeRank=Rang angajat pentru această abilitate
-EmployeeRankShort=Rang angajat
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Funcţie angajat
 EmployeePositions=Funcţii angajaţi
 EmployeesInThisPosition=Angajaţii în această poziţie - funcţie
@@ -98,3 +98,5 @@ NeedBusinessTravels=Necesar călătorii de afaceri
 NoDescription=Nicio descriere
 TheJobProfileHasNoSkillsDefinedFixBefore=Profilul de post evaluat al acestui angajat nu are nicio aptitudine definită pe el. Adaugă aptitudin(i), apoi șterge și repornește evaluarea.
 PDFStandardHrmEvaluation=Șablon standard generare document PDF pentru evaluarea competențelor 
+SkillNotRequired=Abilitatea nu este necesară
+LinkToUserCreated=Asociere la un angajat dacă solicitantul a fost angajat și convertit în utilizator.
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index cfae7327660..cdbc0d06c80 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Newsletter
 EMailing=Newsletter
-EMailings=Newslettere
+EMailings=Mass EMails
 SMSings=Trimitere de SMS-uri
-AllEMailings=Toate newsletterele
+AllEMailings=All mass eMails
 MailCard=Fişă newsletter
 MailRecipients=Destinatari
 MailRecipient=Destinatar
@@ -26,19 +26,19 @@ MailFile=Fişiere ataşate
 MailMessage=Conţinut email
 SubjectNotIn=Nu în subiect
 BodyNotIn=Nu în corpul emailului
-ShowEMailing=Arată newsletter
-ListOfEMailings=Listă newslettere
-NewMailing=Newsletter nou
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Trimitere de SMS-uri nouă
-EditMailing=Editare newsletter
-ResetMailing=Retrimitere newsletter
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Ştergere newsletter
-PreviewMailing=Previzualizare newsletter
-CreateMailing=Creare newsletter
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Resetare stare în eroare
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Testare
-ValidMailing=Validare emailuri
+ValidMailing=Valid mass Email
 MailingStatusDraft=Schiţă
 MailingStatusValidated=Validat
 MailingStatusSent=Trimis
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Toate filtrele trebuie să se potrivească pentru ca un
 LineInFile=Linia %s în fişierul
 RecipientSelectionModules=Solicitări definite pentru destinatarii selectaţi
 MailSelectedRecipients=Destinatari selectaţi
-MailingArea=Newslettere
-LastMailings=Ultimele %s newslettere
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Statistici Destinatari
 NbOfCompaniesContacts=Contacte/adrese unice
 MailNoChangePossible=Destinatarii validaţi pentru trimiterea newsletter-ului nu pot fi  modificaţi
-SearchAMailing=Căutare newsletter
-SendMailing=Trimitere newsletter
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Trimis de
 AdvancedAlternative=Aternativă avansată
 MailingNeedCommand=Trimiterea unui newsletter poate fi efectuată din linia de comandă. Cere administratorului serverului să lanseze următoarea comandă pentru a trimite newsletter-ul tuturor destinatarilor:
 MailingNeedCommand2=Totuşi, îl poţi trimite online, prin adăugarea parametrului MAILING_LIMIT_SENDBYWEB cu valoarea maximă de email-uri de trimis per sesiune.
 ConfirmSendingEmailing=Dacă doreşti să trimiți newsletter-ul direct de pe acest ecran, confirmă că eşti  sigur că doreşti să trimiți acum newsletter-ul din browserul tău?
-LimitSendingEmailing=Notă: Trimiterea de emailurilor din interfata web se face în mai multe etape din motive de securitate și timing, <b>%s</b> destinatari la un moment dat pentru fiecare sesiune trimitere.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Şterge listă
 ToClearAllRecipientsClickHere=Pentru a goli lista de destinatari pentru acest newsletter, fă clic
 ToAddRecipientsChooseHere=Pentru a adăuga destinatari, alegeţi din aceste liste
-NbOfEMailingsReceived=Newslettere primite
-NbOfEMailingsSend=Newslettere trimise
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID înregistrare
 DeliveryReceipt=Confirmare livrare.
 YouCanUseCommaSeparatorForSeveralRecipients=Aveţi posibilitatea de a utiliza <b>virgula</b> ca separator pentru a specifica mai mulţi destinatari.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Nu sunt planificate notificări automate prin email pe
 ANotificationsWillBeSent=1 notificare automată va fi transmisă pe email
 SomeNotificationsWillBeSent=%s notificări automate vor fi transmise pe email
 AddNewNotification=Abonare la o nouă notificare automată prin email (țintă/eveniment)
-ListOfActiveNotifications=Adeziuni/abonamente active (ținte/evenimente) pentru notificarea automată prin email
+ListOfActiveNotifications=Abonamente active
+ListOfActiveNotificationsHelp=Lista cuplurilor%s/%s de abonați pentru notificarea automată prin email
 ListOfNotificationsDone=Notificările automate prin email au fost trimise
+ListOfNotificationsDoneHelp=Lista notificărilor anterioare trimise prin email
 MailSendSetupIs=Configurarea trimiterii de email a fost setată la '%s'.  Acest mod nu poate fi utilizat pentru a trimite newslettere.
 MailSendSetupIs2=Trebuie mai întâi să mergi, cu un cont de administrator, în meniul %sAcasă - Setări - Emailuri%s  pentru a schimba parametrul  <strong>'%s'</strong> de utilizare în modul '%s'.  Cu acest mod, puteți introduce configurarea serverului SMTP al furnizorul de servicii Internet și de a folosi facilitatea Newslettere.
 MailSendSetupIs3=Dacă ai întrebări cu privire la modul de configurare al serverului SMTP, poţi cere informaţii la %s.
@@ -183,7 +185,7 @@ Information=Informaţii
 ContactsWithThirdpartyFilter=Contacte cu filtrare după terț
 Unanswered=Fără răspuns
 Answered=Răspuns
-IsNotAnAnswer=Nu răspunde (email inițial)
+IsNotAnAnswer=Nu este răspuns (este un email inițial)
 IsAnAnswer= Este un răspuns al unui email inițial
 RecordCreatedByEmailCollector=Înregistrare creată de colectorul de email %s
 DefaultBlacklistMailingStatus=Valoare implicită pentru câmpul '%s' când este creat un nou contact
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 01b296573f1..86d4c954f37 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -37,6 +37,7 @@ Translation=Traduceri
 Translations=Traduceri
 CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Introdu criterii de căutare care sunt completate
+EnterNonEmptyLinesFirst=introdu mai întâi liniile care nu sunt goale
 EnterADateCriteria= Introduceți un criteriu de tip dată
 NoRecordFound=Nicio înregistrare  gasită
 NoRecordDeleted=Nu s-au șters înregistrări
@@ -309,6 +310,7 @@ DateBuild=Dată generare raport
 DatePayment=Data plății
 DateApprove=Data aprobare
 DateApprove2=Data aprobare(a doua aprobare)
+PendingSince=În așteptare după
 RegistrationDate=Data înregistrării
 UserCreation=Utilizatorul care a creat
 UserModification=Utilizatorul care a modificat
@@ -496,7 +498,7 @@ ActionRunningNotStarted=De început
 ActionRunningShort=În progres
 ActionDoneShort=Finalizat
 ActionUncomplete=Incomplet
-LatestLinkedEvents=Ultimele %s evenimente asociate
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Companie/Organizație
 Accountant=Contabil
 ContactsForCompany=Contacte pentru acest terţ
@@ -722,6 +724,8 @@ TextUsedInTheMessageBody=Conţinut email
 SendAcknowledgementByMail=Trimite email cu confirmare
 SendMail=Trimite email
 Email=Email
+EMail=Email
+EMails=Email-uri
 NoEMail=Niciun email
 AlreadyRead=Citit deja
 NotRead=Necitit
@@ -794,7 +798,7 @@ Notes=Note
 AddNewLine=Adaugă linie nouă
 AddFile=Adaugă fişier
 FreeZone=Text liber pentru produs
-FreeLineOfType=Element text liber, tip:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Clonează obiect cu atributele sale principale
 ReGeneratePDF=Re-generare PDF
 PDFMerge=Îmbinare PDF
@@ -880,12 +884,14 @@ toward=spre
 Access=Acces
 SelectAction=Selectați acțiune
 SelectTargetUser=Selectați utilizatorul/angajatul țintă
+ClickToCopyToClipboard=Clic pentru a copia în clipboard
 HelpCopyToClipboard=Foloseşte Ctrl+C pentru a copia în clipboard
 SaveUploadedFileWithMask=Salvați fișierul pe server cu numele "<strong>%s</strong>" (altfel "%s")
 OriginFileName=Nume fişier original
 SetDemandReason=Setează sursa
 SetBankAccount=Definire Cont bancar
 AccountCurrency=Moneda contului
+AccountancyCode=Cod contabil
 ViewPrivateNote=Vezi notițe
 XMoreLines=%s linii(e) ascunse
 ShowMoreLines=Afișează mai multe/mai puține linii
@@ -926,6 +932,7 @@ ConfirmMassDeletionQuestion=Sigur doriți să ștergeți %s înregistrările(în
 ConfirmMassClone=Confirmare clonare în masă
 ConfirmMassCloneQuestion=Selectează proiectul în care să clonezi
 ConfirmMassCloneToOneProject=Clonare la proiectul %s
+ObjectClonedSuccessfuly=Obiect clonat cu succes
 RelatedObjects=Obiecte asociate
 ClassifyBilled=Clasifică Facturat
 ClassifyUnbilled=Clasifică Nefacturat
@@ -962,10 +969,11 @@ PrivateDownloadLinkDesc=Trebuie să fiți conectat și aveți nevoie de permisiu
 Download=Descărcare
 DownloadDocument=Descărcare document
 DownloadSignedDocument=Descărcare document semnat
-ActualizeCurrency=Actualizare curs valutar
+ActualizeCurrency=Utilizează ultimul curs valutar cunoscut
 Fiscalyear=An fiscal
 ModuleBuilder=Dezvoltator de module şi aplicaţii
 SetMultiCurrencyCode=Setare monedă
+SetMultiCurrencyRate=Setare curs valutar
 BulkActions=Acțiuni în masă
 ClickToShowHelp=Faceți clic pentru a afișa instrumentele de ajutor
 WebSite=Site
@@ -1105,6 +1113,7 @@ PayedBy=Plătite de
 PayedTo=Plătit lui
 Monthly=Lunar
 Quarterly=Trimestrial
+Quarter=Trimestru
 Annual=Anual
 Local=Local
 Remote=La distanţă
@@ -1147,6 +1156,7 @@ ContactDefault_project_task=Task
 ContactDefault_propal=Ofertă
 ContactDefault_supplier_proposal=Ofertă furnizor
 ContactDefault_ticket=Tichet
+ContactDefault_societe=Terţi
 ContactAddedAutomatically=Persoană de contact adăugată din roluri terț
 More=Mai mult
 ShowDetails=Arată detalii
@@ -1243,6 +1253,7 @@ CommercialAffected=Reprezentant vânzări asignat
 CommercialsDisaffected=Reprezentanți de vânzări dealocați
 CommercialDisaffected=Reprezentant de vânzări dealocat
 Message=Mesaj
+Emailing=Emailing
 Progression=Progres
 YourMessage=Mesajul tău
 YourMessageHasBeenReceived=Mesajul tău a fost primit. Vă vom răspunde sau vă vom contacta cât mai curând posibil.
@@ -1307,3 +1318,34 @@ TranslationOfKey=Traducerea cheii AnyTranslationKey
 SignedStatus=Status semnare
 NbRecordQualified=Număr de înregistrări calificate
 auto=auto
+UploadFile=Import direct document
+OrClickToSelectAFile=sau clic pentru a selecta un fișier de pe disc
+NetTotal=Total net
+VATAmount=Valoare TVA
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net înainte de discount
+Contains=Conține
+DoesNotContain=Nu conține
+Is=Este
+IsNot=Nu este
+StartsWith=Începe cu
+EndsWith=Se termină cu
+IsBefore=Este înainte de
+IsAfter=Este după
+IsOnOrBefore=Este înainte sau egal cu
+IsOnOrAfter=Este după sau egal cu
+IsHigherThan=este mai mare decât
+IsHigherThanOrEqual=Este mai mare sau egal cu
+IsLowerThan=Este mai mic decât
+IsLowerThanOrEqual=Este mai mic sau egal cu
+addToFilter=Adaugă
+FilterAssistance=Editor filtru
+Operator=Operator
+AllFieldsRequired=Toate câmpurile sunt obligatorii.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=De la început
+Transferred=Transferred
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index 73786f053b1..ab5451be08f 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Dacă este necesar un abonament, trebuie înregistrat u
 DeleteType=Şterge
 VoteAllowed=Drept de vot
 Physical=Persoană fizică
-Moral=Persoană juridică
-MorAndPhy=Persoană juridică sau persoană fizică
+Moral=Entitate legală
+MorAndPhy= Persoană juridică și persoană fizică
 Reenable=Re-activare
 ExcludeMember=Exclude membru
 Exclude=Exclude
@@ -134,7 +134,7 @@ SendingEmailOnAutoSubscription=Trimitere email la înregistrarea automată
 SendingEmailOnMemberValidation=Trimitere email la validarea noului membru
 SendingEmailOnNewSubscription=Se trimite email pentru o contribuţie nouă
 SendingReminderForExpiredSubscription=Se trimite reminder pentru contribuţiile/adeziunile expirate
-SendingEmailOnCancelation=Trimitere email la anulare 
+SendingEmailOnCancelation=Trimitere email la anulare
 SendingReminderActionComm=Se trimite reminder pentru evenimentul din agendă
 # Topic of email templates
 YourMembershipRequestWasReceived=Adeziunea ta de membru a fost primită
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Statistici Membri după regiune
 NbOfMembers=Număr total de membri
 NbOfActiveMembers=Numărul total de membri activi
 NoValidatedMemberYet=Niciun membru validat găsit
-MembersByCountryDesc=Acest ecran vă arată statisticile membrilor pe țări. Graficele și hărţile depind de disponibilitatea serviciului de hărţi online Google, precum și de disponibilitatea unei conexiuni la internet funcționale.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Acest ecran vă arată statistici ale membrilor în funcție de judeţe/uat-uri/localităţi.
 MembersByTownDesc=Acest ecran vă arată statisticile membrilor după oraș.
 MembersByNature=Acest ecran vă arată statisticile membrilor după natură.
@@ -208,25 +209,25 @@ NewMemberbyWeb=Membru nou adăugat. În aşteptarea validării
 NewMemberForm=Formular Membru nou
 SubscriptionsStatistics=Statistici contribuţii
 NbOfSubscriptions=Număr contribuţii
-AmountOfSubscriptions=Suma colectată din contribuţii
+AmountOfSubscriptions=Suma colectată din plățile abonamentelor de membru
 TurnoverOrBudget=Cifra de afaceri (pentru o companie), sau Bugetul (pentru o fundaţie)
-DefaultAmount=Valoarea implicită a contribuției (utilizată numai dacă nu este definită nicio sumă la nivel de tip de membru)
-MinimumAmount=Suma minimă (utilizată numai atunci când suma contribuției este gratuită)
-CanEditAmount=Valoarea abonamentului/adeziunii poate fi definită de membru
+DefaultAmount=Valoarea implicită de plată abonament membru (utilizată numai dacă nu este definită nicio sumă la nivel de tip de membru)
+MinimumAmount=Suma minimă de plată pentru abomnament membru (are prioritate asupra oricăror sume implicite)
+CanEditAmount=Valoarea abonamentului poate fi definită de membru
 CanEditAmountDetail=Vizitatorul poate alege/modifica suma cu care contribuie, indiferent de tipul de membru
 AmountIsLowerToMinimumNotice=Suma este mai mică decât minimul de %s
 MEMBER_NEWFORM_PAYONLINE=După înregistrarea online, treci automat la pagina de plată online
 ByProperties=După natură
 MembersStatisticsByProperties=Statistici membri după natură
-VATToUseForSubscriptions=Cota TVA utilizată pentru contribuții
-NoVatOnSubscription=Nu se utilizează TVA la contribuţii
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produsul utilizat pentru linia de contribuţie de pe factură: %s
+VATToUseForSubscriptions=Cota de TVA de utilizat pentru plata abonamentului
+NoVatOnSubscription=Fără TVA pentru plata abonamentului
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produs utilizat pentru linia de abonament membru în factură: %s
 NameOrCompany=Nume sau companie
 SubscriptionRecorded=Contribuţie înregistrată
 NoEmailSentToMember=Nu a fost trimis niciun email membrilor
 EmailSentToMember=Email trimis la membru de la %s
-SendReminderForExpiredSubscriptionTitle=Trimite reminder pe email pentru contribuţiile/adeziunile expirate
-SendReminderForExpiredSubscription=Trimite memento prin email membrilor atunci când contribuția este pe cale să expire (parametrul este numărul de zile înainte de încheierea calității de membru pentru a trimite memento. Poate fi o listă de zile separate prin punct și virgulă, de exemplu '10;5;0;-5')
+SendReminderForExpiredSubscriptionTitle=Trimitere reminder pe email pentru abonamentul de membru expirat
+SendReminderForExpiredSubscription=Trimitere reminder pe email membrilor atunci când abonamentul de membru este pe cale să expire (parametrul este numărul de zile înainte de încheierea abonamentului pentru a trimite reminder-ul. Poate fi o listă de zile separate prin punct și virgulă, de exemplu '10;5;0;-5')
 MembershipPaid=Adeziune plătită pentru perioada curentă (până la %s)
 YouMayFindYourInvoiceInThisEmail=Găseşti factura ta atașată acestui email
 XMembersClosed=%s membru(i) închis
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Un terț este entitatea juridică care va fi utiliz
 MemberFirstname=Prenume membru
 MemberLastname=Nume membru
 MemberCodeDesc=Cod de membru, unic pentru toți membrii 
-MemberSubscriptionStartFirstDayOf=Data de începere a unei adeziuni/unui membru corespunde primei zile a
-MemberSubscriptionStartAfter=Perioada minimă înainte de intrarea în vigoare a datei de începere a unui abonament, cu excepția reînnoirilor (exemplu +3m = +3 luni, -5d = -5 zile, +1Y = +1 an)
+MemberSubscriptionStartFirstDayOf=Forțează data sugerată a unui membru să corespundă cu prima zi a
+MemberSubscriptionStartAfter=Perioada minimă înainte de intrarea în vigoare a datei de începere a primului abonament de membru (excluzând reînnoirile)
+NoCorrection=Nicio corecție
+MemberSubscriptionStartAfterDesc=Exemplu: +3m = +3 luni, -5d = -5 zile, +1Y = +1 an
+MemberSubscriptionStartAfterDesc2=Aceasta este data sugerată la crearea unui prim abonament de membru în comparație cu data curentă. Pentru reînnoire, data sugerată implicit va rămâne sfârșitul abonamentului anterior.
 SubscriptionLinkedToConciliatedTransaction=Calitatea de membru este legată de o tranzacție conciliată, așa că această modificare nu este permisă.
 ConfirmMassSubsriptionCreation=Confirmare creare adeziune/abonament
 ConfirmMassSubsriptionCreationQuestion=Sigur vrei să creezi abonamentele/adeziunile %s selectat(e)?
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index c1e39441d63..bce3c32e81a 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -33,7 +33,7 @@ ProductsOrServices=Produse sau servicii
 ProductsPipeServices=Produse | Servicii
 ProductsOnSale=Produse de vânzare
 ProductsOnPurchase=Produse de achiziţionat
-ProductsOnSaleOnly=Produse doar de vânzare 
+ProductsOnSaleOnly=Produse doar de vânzare
 ProductsOnPurchaseOnly=Produse doar pentru achiziţie
 ProductsNotOnSell=Produse care nu sunt de vânzare și nici de achiziţionat
 ProductsOnSellAndOnBuy=Produse de vânzare sau de achiziţionat
@@ -45,7 +45,7 @@ ServicesNotOnSell=Servicii care nu sunt nici de vânzare și nici de achiziţion
 ServicesOnSellAndOnBuy=Servicii de vânzare sau de achiziţionat
 LastModifiedProductsAndServices=Ultimele %s produse/servicii modificate
 LastRecordedProducts=Ultimele %s produse înregistrate
-LastRecordedServices=Ultimele %s servicii înregistrate 
+LastRecordedServices=Ultimele %s servicii înregistrate
 CardProduct0=Produs
 CardProduct1=Serviciu
 Stock=Stoc
@@ -97,7 +97,6 @@ ShowService=Afişează serviciu
 ProductsAndServicesArea=Produse şi Servicii
 ProductsArea=Produse
 ServicesArea=Servicii
-ListOfStockMovements=Listă mişcări de stoc
 BuyingPrice=Preț de achiziţie
 PriceForEachProduct=Produse cu prețuri specifice
 SupplierCard=Fişă furnizor
@@ -145,6 +144,7 @@ WithoutDiscount=Fără discount
 VATRateForSupplierProduct=Cotă TVA (pentru acest furnizor/produs)
 DiscountQtyMin=Reducere pentru această cantitate.
 NoPriceDefinedForThisSupplier=Nu există preț/cantitate definite pentru acest furnizor/produs
+NoProductPriceDefinedForThisSupplier=Nu s-a definit un preț/cantitate produs pentru acest furnizor
 NoSupplierPriceDefinedForThisProduct=Nici un preț/cantitate furnizor nu este definită pentru acest produs
 PredefinedItem=Element predefinit
 PredefinedProducts=Produs predefinit
@@ -167,11 +167,11 @@ CloneCombinationsProduct=Clonare variante de produs
 ProductIsUsed=Acest produs este utilizat
 NewRefForClone=Ref. noului produs/serviciu
 SellingPrices=Preţuri de vânzare
-BuyingPrices=Prețuri de achiziție 
+BuyingPrices=Prețuri de achiziție
 CustomerPrices=Preţuri client
 SuppliersPrices=Prețuri furnizor
 SuppliersPricesOfProductsOrServices=Prețuri furnizori (pentru produse sau servicii)
-CustomCode=Cod vamal/Marfă/Cod HS
+CustomCode=Cod vamal|Marfă|HS|TARIC
 CountryOrigin=Ţara de origine
 RegionStateOrigin=Regiunea de origine
 StateOrigin=Judeţul/UAT-ul de origine
@@ -209,6 +209,7 @@ unitL=Litru
 unitT=tonă
 unitKG=kg
 unitG=Gram
+unitGAL=galon
 unitMG=mg
 unitLB=livră
 unitOZ=uncie
@@ -234,7 +235,7 @@ unitIN3=in³
 unitOZ3=uncie
 unitgallon=galon
 ProductCodeModel=Şablon ref Produs
-ServiceCodeModel=Şablon ref Serviciu 
+ServiceCodeModel=Şablon ref Serviciu
 CurrentProductPrice=Preţ curent
 AlwaysUseNewPrice=Foloseşte întotdeauna preţul curent al produsului/serviciului
 AlwaysUseFixedPrice=Foloseşte preţ fix
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Formatul pentru solicitare este {"URL": "http:/
 UpdateInterval=Interval de actualizare (minute)
 LastUpdated=Ultima actualizare
 CorrectlyUpdated=Actualizat corect
-PropalMergePdfProductActualFile=Fișierele de adăugat în PDF Azur sunt/este
+PropalMergePdfProductActualFile=Fișier PDF de inclus în ofertele comerciale PDF dacă produsul face parte din ofertă...
 PropalMergePdfProductChooseFile=Selectare fișiere PDF
 IncludingProductWithTag=Incluzând produse/servicii cu tag-ul
 DefaultPriceRealPriceMayDependOnCustomer=Preț implicit, prețul real poate depinde de client
@@ -327,7 +328,7 @@ ProductWeight=Greutate pentru 1 produs
 ProductVolume=Volum pentru 1 produs
 WeightUnits=Unitate de greutate
 VolumeUnits=Unitate de volum
-WidthUnits=Unitate lățime 
+WidthUnits=Unitate lățime
 LengthUnits=Unitate lungime
 HeightUnits=Unitate înălţime
 SurfaceUnits=Unitate suprafaţă
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=Cantitatea liniei a fost recalculată conform împa
 
 #Attributes
 Attributes=Atribute
+ProductAttributeExtrafields=Extracâmpuri atribute variante
+ProductAttributeExtrafieldsSetup=Configurare extracâmpuri atribute variante
+ProductAttributeValueExtrafields=Valori extracâmpuri atribute variante
+ProductAttributeValueExtrafieldsSetup=Configurare valori extracâmpuri atribute variante
 VariantAttributes=Atribute variantă
 ProductAttributes=Atribute pentru variante de produs
 ProductAttributeName=Atribut variantă %s
@@ -357,7 +362,7 @@ ProductAttributeValueDeleteDialog=Sigur vrei să ștergi valoarea "%s" cu referi
 ProductCombinationDeleteDialog=Sigur doriți să ștergeți varianta de produs "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=A apărut o eroare la ștergerea variantei. Verificați că nu este folosită de niciun obiect
 ProductCombinations=Variante
-PropagateVariant=Propagare variante de produs 
+PropagateVariant=Propagare variante de produs
 HideProductCombinations=Ascunde varianta de produs în selectorul de produse
 ProductCombination=Variantă
 NewProductCombination=Variantă nouă
@@ -389,12 +394,14 @@ HideChildProducts=Ascundeți variantele de produs
 ShowChildProducts=Afișare variante de produs
 NoEditVariants=Accesați fişa produsul părinte și modificați impactul asupra prețurilor variantelor în fişa Variante
 ConfirmCloneProductCombinations=Doriți să copiați toate variantele de produs la celălalt produs părinte cu referința dată?
-CloneDestinationReference=Referință produs destinație 
+CloneDestinationReference=Referință produs destinație
 ErrorCopyProductCombinations=A apărut o eroare la copierea variantelor de produs
 ErrorDestinationProductNotFound=Produsul destinația nu a fost găsit
 ErrorProductCombinationNotFound=Varianta de produs nu a fost găsită
 ActionAvailableOnVariantProductOnly=Acțiune disponibilă numai pentru varianta de produs
 ProductsPricePerCustomer=Preţuri produs per clienţi
+ProductLevelExtraFields=Atribute suplimentare (Nivel preț)
+ProductCustomerExtraFields=Atribute suplimentare (Preț client)
 ProductSupplierExtraFields=Atribute suplimentare (Preţuri furnizor)
 DeleteLinkedProduct=Ștergeți produsul copil asociat la combinație
 AmountUsedToUpdateWAP=Valoarea unitară de utilizat pentru a actualiza prețul mediu ponderat
@@ -403,7 +410,8 @@ PMPValueShort=PMP
 mandatoryperiod=Perioade obligatorii
 mandatoryPeriodNeedTobeSet=Atenţie: Perioada (data de început si data de sfârşit) trebuie definită
 mandatoryPeriodNeedTobeSetMsgValidate=Un serviciu necesită o perioadă de început și una de sfârșit
-mandatoryHelper=Bifează dacă doreşti un mesaj către utilizator la crearea/validarea unei facturi, oferte comerciale, comenzi de vânzare fără a introduce o dată de începere și de sfârșit pe liniile cu acest serviciu. <br>Reține că mesajul este un avertisment și nu o eroare blocantă.
+mandatoryHelper=Bifează dacă dorești un mesaj către utilizator la crearea/validarea unei facturi, oferte comerciale, comenzi de vânzare fără a introduce o dată de începere și de sfârșit pe liniile cu acest serviciu.
+mandatoryHelper2=Reține că mesajul este un avertisment și nu o eroare blocantă.
 DefaultBOM=Bon de consum implicit
 DefaultBOMDesc=Bon de consum implicit recomandat pentru fabricarea acestui produs. Acest câmp poate fi setat numai dacă natura produsului este '%s'.
 Rank=Rang
@@ -435,3 +443,6 @@ AllowStockMovementVariantParentHelp=În mod implicit, un părinte al unei varian
 ConfirmSetToDraftInventory=Sigur vrei să reîntorci în starea Schiță?<br> Cantitățile stabilite în prezent în inventar vor fi resetate.
 WarningLineProductNotToSell=Produsul sau serviciul "%s" care nu este de vânzare și care a fost clonat
 PriceLabel=Etichetă preț
+GenerateImage=Generare imagine
+GenerateWithAI=Generare cu AI
+PriceByCustomeAndMultiPricesAbility=Prețuri diferite pentru fiecare client + Mai multe segmente de preț per produs/serviciu (fiecare client este într-un singur segment de preț)
diff --git a/htdocs/langs/ro_RO/salaries.lang b/htdocs/langs/ro_RO/salaries.lang
index 7ddeac87b9e..c4c6a27e3ea 100644
--- a/htdocs/langs/ro_RO/salaries.lang
+++ b/htdocs/langs/ro_RO/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Salariu nou
 AddSalary=Adaugă salariu
 NewSalaryPayment=Card de salariu nou
 AddSalaryPayment=Adăugare plată salariu
+SalaryID=ID salariu
+SalaryAmount=Valoare salariu
 SalaryPayment=Plată salariu
 SalariesPayments=Plăţi salarii
 SalariesPaymentsOf=Plăţi salarii pentru %s
@@ -27,7 +29,7 @@ FillFieldFirst=Completați mai întâi câmpul angajat
 UpdateAmountWithLastSalary=Setare valoare a ultimului salariu
 MakeTransferRequest=Fă o cerere de transfer
 VirementOrder=Cerere tranfer credit
-BankTransferAmount=Valoare transfer credit
 WithdrawalReceipt=Ordin de transfer de credit
 OrderWaiting=Comandă în așteptare
 FillEndOfMonth=Completează cu sfârșitul lunii
+UserPaySlip=Fișă de plată
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index b12ccb44081..568acff3d26 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Utilizați aici o listă cu alte nume / aliasuri, astfel î
 WEBSITE_CSS_URL=Adresa URL a fișierului CSS extern
 WEBSITE_CSS_INLINE=Conținutul fișierului CSS (comun pentru toate paginile)
 WEBSITE_JS_INLINE=Conținut fișier JavaScript (comun tuturor paginilor)
-WEBSITE_HTML_HEADER=Adăugare în partea de jos a antetului HTML (comun pentru toate paginile)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Fișier robot (robots.txt)
 WEBSITE_HTACCESS=Fișier .htaccess site
 WEBSITE_MANIFEST_JSON=Fişier manifest.json website
@@ -56,16 +56,17 @@ ReadPerm=Citire
 WritePerm=Scriere
 TestDeployOnWeb=Testare/implementare pe web
 PreviewSiteServedByWebServer=<u>Previzualizați %s într-o filă nouă. </u> <br> <br> %s va fi deservit de un server web extern (cum ar fi Apache, Nginx, IIS). Trebuie să instalați și să configurați acest server înainte să indicați directorul: <br> <strong> %s </strong> <br> URL server extern: <br> <strong> %s </strong>
-PreviewSiteServedByDolibarr=<u>Previzualizare %s într-o filă nouă. </u><br><br> Acest %s va fi servit de serverul Dolibarr, astfel încât să nu fie nevoie de niciun server web suplimentar (cum ar fi Apache, Nginx, IIS) pentru a fi instalat.<br> Inconvenientul este că adresele URL ale paginilor nu sunt ușor de utilizat și începeți cu calea Dolibarr.<br>URL dvs. servit de Dolibarr:<br><strong>%s</strong><br><br> Pentru a utiliza propriul server web extern pentru a servi acest site web, creați virtualhost pe serverul dvs. web care indică directorul <br><strong>%s</strong><br>, apoi introduceți numele acestui virtualhost  în proprietățile acestui site și faceți clic pe pe linkul "Testare/Impementare pe web".
+PreviewSiteServedByDolibarr=<u>Previzualizare %s într-o filă nouă.</u><br><br>%s va fi servit de serverul Dolibarr, așa că nu are nevoie de niciun server web suplimentar (cum ar fi Apache, Nginx, IIS) pentru a fi instalat.<br> Inconveninetul este că adresele URL ale paginilor nu sunt ușor de utilizat și încep cu calea Dolibarr.<br> URL-ul tău deservit de Dolibarr:<br><strong>%s</strong><br><br> Pentru a implementa sau testa folosind propriul tău server web extern (cum ar fi Apache, Nginx, Lighttp) utilizează link-ul "%s".
 VirtualHostUrlNotDefined=URL virtualhost server web extern nu este definit
 NoPageYet=Nicio pagină încă
 YouCanCreatePageOrImportTemplate=Puteți să creați o pagină nouă sau să importați un șablon de site complet
 SyntaxHelp=Ajutor şi sfaturi pentru sintaxa specifică
 YouCanEditHtmlSourceckeditor=Puteți edita codul sursă HTML folosind butonul "Sursă" din editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span>Pentru a include o <strong>imagine</strong> stocată în directorul de <strong>documente</strong>, utilizează wrapper-ul <strong>viewimage.php</strong>.<br>De exemplu, pentru o imagine din documente/media (director deschis pentru acces public), sintaxa este:<br><strong>&lt;img src="/viewimage.php?modulepart= medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Pentru o imagine partajată cu un link de partajare (acces deschis folosind cheia de distribuire a fișierului), sintaxa este:<br><strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span>Poți include cod PHP în această sursă folosind etichetele <strong>&lt;?php ?&gt;</strong>. Sunt disponibile următoarele variabile globale: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> De asemenea, poți include conținutul unei alte pagini/container cu următoarea sintaxă:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> Poți face o redirecționare către o altă pagină/container cu următoarea sintaxă (Notă: nu afișați niciun conținut înainte de redirecționare):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>De asemenea, poți face o redirecționare cu parametrii GET:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> Pentru a adăuga un link către o altă pagină, utilizează sintaxa:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> Poți seta în mod dinamic titlul paginii și <strong>metaetichetele SEO</strong> (titlu, cuvinte cheie, descriere). Pur și simplu definește următoarele variabile:<br><code> $__PAGE__TITLE__ = "Valoarea titlului...";</code><br><code> $__PAGE__KEYWORDS__ = "cuvânt cheie1, cuvânt cheie2, cuvânt cheie3..."; // Separat prin virgulă</code><br><code> $__PAGE__DESC__ = "Descriere...";</code></p><br><span class="fa fa-download paddingright"></span> Pentru a include <strong>un link pentru a descărca</strong> un fișier stocat în directorul de <strong>documente</strong>, utilizează <strong>document.php</strong> wrapper:<br>Exemple, pentru un fișier în documente/ecm (trebuie să fie înregistrat), sintaxa este:<br><strong>&lt;a href="/document.php ?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Pentru un fișier în documente/media (director deschis pentru acces public), sintaxa este:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir /]filename.ext"&gt;</strong><br>Pentru un fișier partajat cu un link de partajare (acces deschis folosind cheia hash de partajare a fișierului), sintaxa este:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span>Pentru a include o <strong>imagine</strong> stocată în directorul <strong>medias</strong> (director deschis pentru acces public), utilizează calea relativă care începe cu <strong>/medias</strong>, de exemplu:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=Pentru o imagine partajată cu un link de partajare (acces deschis folosind cheia hash de partajare a fișierului), utilizează wrapper-ul:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=Pentru a obține adresa URL a imaginii unui obiect PHP, utilizează <br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=Pentru a obține adresa URL a unei imagini în conținutul html al unui articol, utilizează <br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Mai multe exemple HTML sau cod dinamic sunt disponibile în <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">documentația wiki</a>.<br>
 ClonePage=Clonare pagină/container
 CloneSite=Clonare site
@@ -87,15 +88,15 @@ WebsiteAccount=Cont site
 WebsiteAccounts=Conturi site
 AddWebsiteAccount=Creare cont site web
 BackToListForThirdParty=Înapoi la lista terților
-DisableSiteFirst=Dezactivează mai întâi site-ul web
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Titlul site-ului meu web
 AnotherContainer=Așa se include conținutul altei pagini/container (este posibil să aveți o eroare aici dacă activați codul dinamic, deoarece subcontainerul încorporat poate să nu existe)
 SorryWebsiteIsCurrentlyOffLine=Ne pare rău, acest site este în prezent offline. Reveniţi mai târziu ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Activare tabel cont site web
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activează tabelul de stocare conturile site-uri web (nume de autentificare/parolă) pentru fiecare site/terț
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Mai întâi trebuie să definiți pagina de Home implicită
-OnlyEditionOfSourceForGrabbedContentFuture=Atenție: Crearea unei pagini web prin importul unei pagini web externe este rezervată utilizatorilor experimentați. În funcție de complexitatea paginii sursă, rezultatul importului poate diferi de cel original. De asemenea, dacă pagina sursă folosește stiluri CSS obișnuite sau JavaScript în conflict, este posibil să rupă aspectul sau caracteristicile editorului de site-uri atunci când lucrează pe această pagină. Această metodă este o modalitate mai rapidă de a crea o pagină, dar este recomandat să creezi noua pagină de la zero sau dintr-un șablon de pagină sugerat. <br>Reține, că editorul inline poate să nu funcționeze corect atunci când este utilizat pe o pagină externă preluată.
-OnlyEditionOfSourceForGrabbedContent=Numai editarea sursei HTML este posibilă atunci când conținutul a fost preluat de pe un site extern
+OnlyEditionOfSourceForGrabbedContentFuture=Atenție: Crearea unei pagini web prin importul unei pagini web externe este rezervată utilizatorilor experimentați. În funcție de complexitatea paginii sursă, rezultatul importului poate diferi de cel original. De asemenea, dacă pagina sursă folosește stiluri CSS obișnuite sau JavaScript în conflict, este posibil să altereze aspectul sau caracteristicile editorului de site-uri atunci când lucrează pe această pagină. Această metodă este o modalitate mai rapidă de a crea o pagină, dar este recomandat să creezi noua pagină de la zero sau dintr-un șablon de pagină sugerat.<br> Reține, de asemenea, că editorul inline ar putea să nu funcționeze corect atunci când este utilizat pe o pagină externă preluată.
+OnlyEditionOfSourceForGrabbedContent=Numai modificarea sursei HTML este posibilă atunci când conținutul este preluat de pe un site extern
 GrabImagesInto=Luați și imaginile găsite în CSS și pagină.
 ImagesShouldBeSavedInto=Imaginile trebuie salvate în director
 WebsiteRootOfImages=Directorul rădăcină pentru imaginile de pe site
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Ieși din contul tău de client
 filteredByVersion=Filtrat după versiune
 removeFilter=Îndepărtare filtru
 viewMyCart=Afișează coșul meu de cumpărături
+Shipping=Shipping
 freeShipping=Livrare gratuită!
 noProducts=Niciun produs
 nbrItemsInCart=Sunt <span class="ajax_cart_quantity">0</span> articole în coșul tău.
@@ -284,12 +286,13 @@ productNameAToZ=Nume produs: de la A la Z
 productNameZToA=Nume produs: de la Z la A
 referenceLowestFirst=Referință: mai întâi cea mai mică
 referenceHighestFirst=Referință: mai întâi cea mai mare
+productPerPage=products per page
 perPage=pe pagină
 showAll=Arată tot
 showing= Se afișează
 nbrOfProducts= Sunt %s produse.
 noResultsHaveBeenFound=0 rezultate au fost găsite.
-noResultsWereFound= Nu au fost găsite rezultate.
+noResultsWereFound=Nu au fost găsite rezultate.
 addToCart=Adaugă în coș
 backHome=Înapoi Acasă
 priceDrop=Reduceri de prețuri
@@ -302,10 +305,11 @@ lastUpdate=Ultima actualizare
 contactSupport=Cum contactez echipa de suport
 noProductToDisplay=Eroare, niciun produs de afișat
 yourCompanyInformation=Datele companiei tale
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=Aceată adresă de email este deja inregistrată.
 firstnameContainsLettersOnly=<b>Prenumele</b> trebuie să conțină doar litere și spații
 lastnameContainsLettersOnly=<b>Numele</b> trebuie să conțină doar litere și spații
-passwordCriteria=<b>Parola</b> trebuie să îndeplinească următoarele criterii:<br>- 12 caractere<br>- 1 literă mare<br>- 1 cifră<br>- Fără caractere speciale<br>- Evită repetarea caracterelor de mai mult de 3 ori<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=A apărut o eroare
 accountCreation=Crează un cont
 errorsOccurred=Sunt %s erori %s
@@ -357,3 +361,7 @@ subtract=Scădere
 LoginCheckout=Autentificare & Finalizare cumpărături
 paymentSuccessProcessed=Plata ta a fost procesată cu succes.
 youWillBeRedirectedToOrderPage=Vei fi redirecționat în scurt timp către pagina cu detaliile comenzii.
+WebPortalSetupNotComplete=Configurarea Portal web nu este finalizată
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 93e70c25150..76f0db6c5c1 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Проверка целостности фа
 FileIntegritySomeFilesWereRemovedOrModified=Ошибка проверки целостности файлов. Некоторые файлы были изменены, удалены или добавлены.
 GlobalChecksum=Глобальная контрольная сумма
 MakeIntegrityAnalysisFrom=Сделайте анализ целостности файлов приложений
-LocalSignature=Встроенная локальная подпись (менее надежная)
-RemoteSignature=Подпись на удаленном сервере (более надежная)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Отсутсвующие файлы
 FilesUpdated=Обновлённые файлы
 FilesModified=Модифицированные файлы
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Используется только для некото
 Security=Безопасность
 Passwords=Пароли
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Зашифруйте пароль базы данных, хранящийся в conf.php. Настоятельно рекомендуем активировать эту опцию.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=Чтобы поместить зашифрованный пароль в файл <b>conf.php</b>, замените строку<br><b>$dolibarr_main_db_pass ="..."</b><br>на<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
 InstrucToClearPass=Чтобы поместить не зашифрованный пароль в файл <b>conf.php</b>, замените строку<br><b>$dolibarr_main_db_pass="crypted:..."</b><br>на<br><b>$dolibarr_main_db_pass="%s"</b>
 ProtectAndEncryptPdfFiles=Защита сгенерированных PDF-файлов. Это НЕ рекомендуется, поскольку это нарушает массовую генерацию PDF.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Вычисленное поле
-ComputedFormulaDesc=Вы можете ввести здесь формулу, используя другие свойства объекта или любой код PHP, чтобы получить динамическое вычисляемое значение. Вы можете использовать любые формулы, совместимые с PHP, включая "?" оператор условия и следующий глобальный объект: <strong> $db, $conf, $langs, $mysoc, $user, $objectoffield </strong> . <br> <strong> ПРЕДУПРЕЖДЕНИЕ </strong> : Если вам нужны незагруженные свойства объекта, просто выберите объект в своей формуле, как во втором примере. <br> Использование вычисляемого поля означает, что вы не можете ввести себе какое-либо значение из интерфейса. Кроме того, при наличии синтаксической ошибки формула может ничего не возвращать. <br> <br> Пример формулы: <br> $objectoffield->id < 10 ? round($objectoffield-> id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2 ) <br> <br> Пример перезагрузки объекта <br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extra ключ поля'] * $reloadedobj ->capital / 5: '-1') <br> <br> Другой пример формулы для принудительной загрузки объекта и его родительского объекта: <br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield) ->id) > 0) && ($secondloadedobj = новый проект($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Родительский проект не найден'
+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'
 Computedpersistent=Сохранить вычисленное поле
 ComputedpersistentDesc=Вычисленные дополнительные поля будут сохранены в базе данных, однако значение будет пересчитано только при изменении объекта этого поля. Если вычисляемое поле зависит от других объектов или глобальных данных, это значение может быть неправильным!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored WITHOUT encryption (field is just hidden with stars on screen).<br><br>Enter value 'dolcrypt' to encode value with a reversible encryption algorithm. Clear data can still be known and edited but is encrypted into database.<br><br>Enter 'auto' (or 'md5', 'sha256', 'password_hash', ...) to use the default password encryption algorithm (or md5, sha256, password_hash...) to save the non reversible hashed password into database (no way to retrieve original value)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Использование SMTP-сервера вашего собственного поставщика услуг электронной почты для отправки электронных писем также интересно, поэтому все электронные письма, отправленные из приложения, также будут сохранены в вашем каталоге «Отправленные» вашего почтового ящика.
 WarningPHPMailD=Поэтому рекомендуется изменить метод отправки электронной почты на значение «SMTP».
 WarningPHPMailDbis=Если вы действительно хотите сохранить метод по умолчанию "PHP" для отправки электронных писем, просто проигнорируйте это предупреждение или удалите его с помощью %s нажмите здесь%s.
-WarningPHPMail2=Если вашему SMTP-провайдеру электронной почты необходимо ограничить почтовый клиент некоторыми IP-адресами (это очень редко), это IP-адрес почтового пользователя (MUA) для вашего приложения ERP CRM: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Бухгалтерский учет (упрощенный)
 Module10Desc=Простые бухгалтерские отчеты (журналы, обороты) на основе содержимого базы данных. Не использует таблицы гроссбуха.
 Module20Name=Предложения
 Module20Desc=Управление коммерческими предложеними
-Module22Name=Массовые рассылки
-Module22Desc=Управление массовой рассылкой
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Энергия
 Module23Desc=Мониторинг потребления энергии
 Module25Name=Заказы на продажу
@@ -847,10 +848,10 @@ Permission212=Строки заказа
 Permission213=Включить строку
 Permission214=Настройка телефонии
 Permission215=Настройка провайдеров
-Permission221=Посмотреть переписку
-Permission222=Создать/изменить отправки электронной почты (тема, получатели ...)
-Permission223=Проверка отправки электронной почты (разрешение на отправку)
-Permission229=Удалить отправки электронной почты
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Посмотреть получателей и информацию
 Permission238=Ручная отправка почты
 Permission239=Удалить почту после подтверждения или отправки
@@ -1105,6 +1106,7 @@ DictionaryStaff=Количество работников
 DictionaryAvailability=Задержка доставки
 DictionaryOrderMethods=Способы заказа
 DictionarySource=Происхождение Коммерческих предложений / Заказов
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Персонализированные группы для отчетов
 DictionaryAccountancysystem=Модели для диаграммы счетов
 DictionaryAccountancyJournal=Бухгалтерские журналы
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Вернуться к списку словарей
 TypeOfRevenueStamp=Тип налоговой печати
 VATManagement=Управление налогом с продаж
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=По умолчанию предлагаемый налог с продаж равен 0, и его можно использовать в таких случаях, как ассоциации, частные лица или небольшие компании.
 VATIsUsedExampleFR=Во Франции это означает компании или организации, имеющие реальную фискальную систему (упрощенная реальная или обычная реальная). Система, в которой декларируется НДС.
 VATIsNotUsedExampleFR=Во Франции это означает ассоциации, которые не декларируют НДС, или компании, организации или либеральные профессии, которые выбрали фискальную систему микропредприятий (НДС во франшизе) и уплатили налог на франшизу  без какой-либо декларации НДС. При выборе этого варианта в счетах будет отображаться ссылка "Не применяется налог с продаж - art-293B CGI" («НДС не применяется - art-293B CGI»).
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Тип налога с продаж
 LTRate=Ставка
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Согласно настройке налогов (с
 LabelUsedByDefault=Метки, используемые по умолчанию, если нет перевода можно найти код
 LabelOnDocuments=Этикетка на документах
 LabelOrTranslationKey=Метка или ключ перевода
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=Отображение номера НДС клиента/пост
 AddAdressInList=Display Customer/Vendor address into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Запросить предпочтительный способ доставки для контрагентов.
-FieldEdition=Редакция поля %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Например, +2 (заполняйте это поле только тогда, когда ваш часовой пояс отличается от того, который используется на сервере)
 GetBarCode=Получить штрих-код
 NumberingModules=Модели нумерации
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Принудительно приравнять дату выс
 SuggestedPaymentModesIfNotDefinedInInvoice=Предлагаемый режим оплаты в счете-фактуре по умолчанию, если он не определен в счете-фактуре
 SuggestPaymentByRIBOnAccount=Предложить оплату выводом средств на счет
 SuggestPaymentByChequeToAddress=Предложить оплату чеком на
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Свободный текст на счетах-фактурах
 WatermarkOnDraftInvoices=Водяные знаки на черновиках счетов-фактур ("Нет" если пусто)
 PaymentsNumberingModule=Модель нумерации платежей
@@ -1718,6 +1723,7 @@ CompressionOfResources=Сжатие HTTP заголовков
 CompressionOfResourcesDesc=Например, используя директиву Apache  "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Такое автоматическое обнаружение невозможно с текущими браузерами
 DefaultValuesDesc=Здесь вы можете определить значение по умолчанию, которое вы хотите использовать при создании новой записи, и/или фильтры по умолчанию или порядок сортировки при перечислении записей.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Значения по умолчанию (для использования в формах)
 DefaultSearchFilters=Фильтры поиска по умолчанию
 DefaultSortOrder=Заказы сортировки по умолчанию
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Модули нумерации отправлений
 SendingsAbility=Поддержка накладных для доставки клиенту
 NoNeedForDeliveryReceipts=В большинстве случаев отгрузочные листы используются как в качестве листов для доставки клиенту (список продуктов для отправки), так и в качестве листов, которые принимаются и подписываются клиентом. Следовательно, квитанция о доставке товара - это дублированная функция, которая редко активируется.
 FreeLegalTextOnShippings=Дополнительный текст для поставок
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Модуль нумерации чеков поставки продукции
 DeliveryOrderModel=Шаблон бланка товарного чека
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Бесплатная доставка по те
 ##### FCKeditor #####
 AdvancedEditor=Расширенный редактор
 ActivateFCKeditor=Включить FCKeditor для:
-FCKeditorForNotePublic=WYSIWYG создание/редактирование поля «публичные заметки» элементов
-FCKeditorForNotePrivate=WYSIWYG создание/редактирование поля «личные заметки» элементов
-FCKeditorForCompany=WYSIWYG creation/edition of the field description of elements (except products/services)
-FCKeditorForProductDetails=WYSIWYG-создание/редактирование продукты Описание или линии для объектов (линии из предложения, заказы, счета-фактуры и т. д.).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Предупреждение. Использование этой опции в этом случае категорически не рекомендуется, так как это может привести к создать проблемам со специальными символами, и форматированием страницы при создании PDF-файла. файлы.
-FCKeditorForMailing= Создание/редактирование WYSIWYG для массовых рассылок по электронной почте (инструменты->eMailing)
-FCKeditorForUserSignature=Создание/редактирование WYSIWYG подписи пользователь
-FCKeditorForMail=Создание/редактирование WYSIWYG для всей почты (кроме инструменты->eMailing)
-FCKeditorForTicket=Создание/редактирование WYSIWYG для талоны
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Настройка модуля запаса
 IfYouUsePointOfSaleCheckModule=Если вы используете модуль торговой точки (модуль POS, поставляемый по умолчанию, или другой внешний модуль), эта конфигурация может игнорироваться вашим модулем торговой точки. Большинство модулей Торговая точка предназначены для немедленного создания счета-фактуры и сокращения запасов по умолчанию, независимо от представленных здесь опций. Поэтому независимо от того, нужно ли вам уменьшать запасы при регистрации продажи в вашей торговой точке, также проверьте настройку модуля POS.
@@ -1867,7 +1874,6 @@ Buy=Покупать
 Sell=Продавать
 InvoiceDateUsed=Счет дата, используемая
 YourCompanyDoesNotUseVAT=В вашей компании определено, что вы не используете НДС (Главная - Настройки - Компания/Организация), поэтому для настройки нет параметров НДС.
-AccountancyCode=Бухгалтерский код
 AccountancyCodeSell=Бух. код продаж
 AccountancyCodeBuy=Бух. код покупок
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Оставьте флажок «Автоматически создавать платеж» пустым по умолчанию при создании нового налога.
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Какой вид вы хотите открыть по у
 AGENDA_EVENT_PAST_COLOR = Прошедшее событие Цвет
 AGENDA_EVENT_CURRENT_COLOR = Текущее событие Цвет
 AGENDA_EVENT_FUTURE_COLOR = Будущее событие Цвет
-AGENDA_REMINDER_BROWSER = Включить напоминание о событии <b> в браузере пользователя </b> (при достижении даты напоминания в браузере отображается всплывающее окно. Каждый пользователь может отключить такие уведомления в настройках уведомлений браузера).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Включить звуковое оповещение
-AGENDA_REMINDER_EMAIL = Включить напоминание о событии <b> по электронной почте </b> (опция напоминания / задержка может быть определена для каждого события).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Примечание. Частота выполнения запланированного задания %s должна быть достаточной, чтобы напоминание было отправлено в нужный момент.
 AGENDA_SHOW_LINKED_OBJECT = Показывать связанный объект в представлении повестки дня
 AGENDA_USE_EVENT_TYPE = Использовать типы событий (управляется в меню Настройка -> Словари -> Тип событий повестки дня)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Автоматически устанавливать это значение по умолчанию для типа события в форме создания события
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Ключевые разрешить экспорт ссылке
 PastDelayVCalExport=Не экспортировать события старше
 SecurityKey = Электронный ключ
@@ -2006,7 +2017,7 @@ BackupZipWizard=Мастер создания архива каталога до
 SomethingMakeInstallFromWebNotPossible=Установка внешних модулей через веб-интерфейс не возможна по следующей причине:
 SomethingMakeInstallFromWebNotPossible2=По этой причине описанный здесь процесс обновления является ручным процессом, который может выполнить только привилегированный пользователь.
 InstallModuleFromWebHasBeenDisabledContactUs=Установка или разработка внешних модули или динамических веб-сайтов из приложения в настоящее время заблокирована в целях безопасности. Если вам нужно включить этот особенность, свяжитесь с нами.
-InstallModuleFromWebHasBeenDisabledByFile=Установка внешних модулей из приложения отключена вашим администратором. Вы должны попросить его удалить файл <strong>%s</strong>, чтобы использовать эту функцию.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Для установки или создания внешнего модуля из приложения необходимо сохранить файлы модулей в каталог <strong>%s</strong>. Чтобы этот каталог обрабатывался Dolibarr, вы должны настроить <strong>conf/conf.php</strong>, чтобы добавить 2 директивные строки:<br><strong>$dolibarr_main_url_root_alt = '/custom';</strong><br><strong>$dolibarr_main_document_root_alt = '%s/custom';</strong>
 HighlightLinesOnMouseHover=Выделите строки таблицы при перемещении мыши
 HighlightLinesColor=Цвет выделения строки при наведении курсора мыши (используйте 'ffffff', чтобы не выделять)
@@ -2036,6 +2047,7 @@ Enter0or1=Введите 0 или 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Введите здесь в фигурных скобках список номеров байтов, представляющих символ валюты. Например: для $ введите [36] - для бразильских реалов [82,36] - для € введите [8364].
 ColorFormat=Цвет RGB находится в формате HEX, например: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Имя значка в формате :<br>- image.png для изображения файл в текущий каталог темы<br>- image.png@модуль if файл находится в каталог /img/ модуля<br>- fa-xxx для изображения FontAwesome fa-xxx<br> - fontawesome_xxx_fa_color_size для пиктограммы FontAwesome fa-xxx (с префиксом Цвет и Размер установлен)
 PositionIntoComboList=Позиция строки в комбинированных списках
 SellTaxRate=Ставка налога с продаж
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Скрыть границы в рамке адреса отправителя
 MAIN_PDF_NO_RECIPENT_FRAME=Скрыть границы рамки адреса получателя
 MAIN_PDF_HIDE_CUSTOMER_CODE=Скрыть код клиента
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Скрыть название отправителя/компании в адресном блоке
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Скрыть условия оплаты
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Скрыть способ оплаты
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=Не рекомендуется
 ARestrictedPath=Некоторый ограниченный путь для файлов данных
 CheckForModuleUpdate=Проверить обновления внешних модулей
 CheckForModuleUpdateHelp=Это действие подключится к редакторам внешних модулей, чтобы проверить, доступна ли новая версия.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Доступно обновление
 NoExternalModuleWithUpdate=Обновлений для внешних модулей не найдено
 SwaggerDescriptionFile=Файл описания Swagger API (например, для использования с redoc)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Показать перевозка адрес
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Обязательное указание в некоторых странах (Франция, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=URL-ссылка социальной сети. Используйте {socialid} для переменной части, которая содержит идентификатор социальной сети.
 IfThisCategoryIsChildOfAnother=Если эта категория является потомком другой
 DarkThemeMode=Режим темной темы
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Предупреждение: 
 WarningModuleHasChangedSecurityCsrfParameter=Предупреждение: модуль %s имеет Отключено CSRF-безопасность вашего экземпляра. Это действие вызывает подозрение, что и ваша установка больше не защищена. Пожалуйста, свяжитесь с автором модуль для получения объяснений.
 EMailsInGoingDesc=Входящие электронные письма управляются модуль %s. Вы должны включить и настроить его, если вам нужно поддерживать входящие электронные письма.
 MAIN_IMAP_USE_PHPIMAP=Используйте библиотеку PHP-IMAP для IMAP вместо встроенного PHP IMAP. Это также позволяет использовать OAuth2 соединение для IMAP (модуль OAuth также должен быть активирован).
-MAIN_CHECKBOX_LEFT_COLUMN=Показать столбец для поля и линия слева (на прямо у по умолчанию)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Не создан по умолчанию. Создано только при активации модуль.
 CSSPage=CSS-стиль
 Defaultfortype=По умолчанию
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index 130d54a55f8..3eb35e35c74 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Конечный баланс
 CurrentBalance=Текущий баланс
 FutureBalance=Будущий баланс
 ShowAllTimeBalance=Показать баланс с самого начала
-AllTime=Сначала
 Reconciliation=Примирение
 RIB=Номер банковского счета
 IBAN=IBAN номера
@@ -133,7 +132,7 @@ DeleteTransaction=Удалить запись
 ConfirmDeleteTransaction=Вы действительно хотите удалить эту запись?
 ThisWillAlsoDeleteBankRecord=Это также приведет к удалению сгенерированной записи банка
 BankMovements=Перевозкой
-PlannedTransactions=Запланированные записи
+PlannedTransactions=Upcoming entries
 Graph=Графики
 ExportDataset_banque_1=Банковские записи и выписка по счету
 ExportDataset_banque_2=Бланк депозита
@@ -151,7 +150,7 @@ FutureTransaction=Будущая сделка. Невозможно примир
 SelectChequeTransactionAndGenerate=Выберите / отфильтруйте чеки, которые должны быть включены в квитанцию о внесении чека. Затем нажмите «Создать».
 SelectPaymentTransactionAndGenerate=Выберите/отфильтруйте документы, которые должны быть включены в %s депозит квитанция. Затем нажмите «создать».
 InputReceiptNumber=Выберите банковскую выписку, связанную с согласованием. Используйте сортируемое числовое значение
-InputReceiptNumberBis=ГГГГММ или ГГГГММДД
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Согласовать?
 ThenCheckLinesAndConciliate=Проверьте последние строки в выписке по счёту из банка и нажмите
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Если эта функция включена, вы 
 BankColorizeMovementName1=Цвет фона для движения дебета
 BankColorizeMovementName2=Цвет фона для движения кредита
 IfYouDontReconcileDisableProperty=Если вы не проводите выверку банковских счетов для некоторых банковских счетов, отключите для них свойство «%s», чтобы удалить это предупреждение.
-NoBankAccountDefined=Банковский счет не указан
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Никаких записей на банковском счете не найдено. Обычно это происходит, когда запись была вручную удалена из списка транзакций на банковском счете (например, во время выверки банковского счета). Другая причина в том, что платеж был записан при отключении модуля «%s».
 AlreadyOneBankAccount=Уже определен один банковский счет
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA файл вариант
diff --git a/htdocs/langs/ru_RU/blockedlog.lang b/htdocs/langs/ru_RU/blockedlog.lang
index 4d5c167068e..a9d4475af29 100644
--- a/htdocs/langs/ru_RU/blockedlog.lang
+++ b/htdocs/langs/ru_RU/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Неизменяемые журналы
 ShowAllFingerPrintsMightBeTooLong=Показать все архивные логи (может быть долго)
 ShowAllFingerPrintsErrorsMightBeTooLong=Показать все недействительные архивные логи (может быть долго)
 DownloadBlockChain=Скачать отпечатки пальцев
-KoCheckFingerprintValidity=Запись в архиве журнала недействительна. Это означает, что кто-то (хакер?) Изменил некоторые данные этой записи после того, как она была записана, или удалил предыдущую архивную запись (проверьте, существует ли строка с предыдущим #) или изменил контрольную сумму предыдущей записи.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Архивная запись в журнале действительна. Данные в этой строке не были изменены, и запись следует за предыдущей.
 OkCheckFingerprintValidityButChainIsKo=Архивный журнал кажется действительным по сравнению с предыдущим, но цепочка ранее была повреждена.
 AddedByAuthority=Сохранено в удаленном центре
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Детали журнала
 ListOfTrackedEvents=Список отслеживаемых событий
 Fingerprint=Отпечаток пальца
 DownloadLogCSV=Экспорт архивных журналов (CSV)
-DataOfArchivedEvent=Полные данные заархивированного события
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Исходный объект (тип %s, id %s) не связан (см. Столбец «Полные данные», чтобы получить неизменяемые сохраненные данные)
 BlockedLogAreRequiredByYourCountryLegislation=Модуль «Неизменяемые журналы» может потребоваться законодательством вашей страны. Отключение этого модуля может сделать любые будущие транзакции недействительными с точки зрения закона и использования юридического программного обеспечения, поскольку они не могут быть подтверждены налоговой проверкой.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Модуль «Неизменяемые журналы» был активирован в соответствии с законодательством вашей страны. Отключение этого модуля может сделать любые будущие транзакции недействительными с точки зрения закона и использования юридического программного обеспечения, поскольку они не могут быть подтверждены налоговой проверкой.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Включена система для отслеживани
 BlockedLogDisabled=Система для отслеживания событий в неизменяемых журналах была отключена после того, как были сделаны некоторые записи. Мы сохранили специальный отпечаток пальца, чтобы отслеживать цепочку как сломанную.
 BlockedLogDisabledBis=Система для отслеживания событий в неизменяемых журналах отключена. Это возможно, потому что запись еще не была сделана.
 LinkHasBeenDisabledForPerformancePurpose=For performance purpose, direct link to the document is not shown after the 100th line.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Счет клиента удален логически
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Логическое удаление платежа
 logPAYMENT_VARIOUS_CREATE=Платеж (не привязанный к счету) создан
 logPAYMENT_VARIOUS_DELETE=Логическое удаление платежа (не привязанного к счету)
 logPAYMENT_VARIOUS_MODIFY=Платеж (не привязанный к счету) изменен
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang
index d30e89544ae..eb1b90e457b 100644
--- a/htdocs/langs/ru_RU/categories.lang
+++ b/htdocs/langs/ru_RU/categories.lang
@@ -8,7 +8,7 @@ In=В
 AddIn=Добавить в
 modify=изменить
 Classify=Классифицировать
-CategoriesArea=Раздел тегов/категорий 
+CategoriesArea=Раздел тегов/категорий
 ProductsCategoriesArea=Область тегов/категорий продуктов/услуг
 SuppliersCategoriesArea=Область тегов/категорий поставщиков
 CustomersCategoriesArea=Область тегов/категорий клиентов
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Область тегов/категорий контак
 AccountsCategoriesArea=Область тегов/категорий банковских счетов
 ProjectsCategoriesArea=Область тегов/категорий проекта
 UsersCategoriesArea=Область тегов/категорий пользователей
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Подкатегории
 CatList=Список тегов/категорий
 CatListAll=Список тегов/категорий (все типы)
@@ -68,7 +69,7 @@ StockCategoriesShort=Теги/категории склада
 ThisCategoryHasNoItems=Эта категория не содержит никаких элементов.
 CategId=ID тега/категории
 ParentCategory=Родительский тег/категория
-ParentCategoryID=ID из родитель ярлык/категория 
+ParentCategoryID=ID из родитель ярлык/категория
 ParentCategoryLabel=Метка родительского тега/категории
 CatSupList=Список тегов/категорий поставщиков
 CatCusList=Список тегов/категорий клиентов/лидов
@@ -90,9 +91,10 @@ CategoriesSetup=Настройка тегов/категорий
 CategorieRecursiv=Автоматическая ссылка на родительский тег/категорию
 CategorieRecursivHelp=Если опция включена, при добавлении объекта в подкатегорию объект также будет добавлен в родительские категории.
 AddProductServiceIntoCategory=Назначьте категория для продукт/услуга
-AddCustomerIntoCategory=Присвоить категорию клиенту
-AddSupplierIntoCategory=Присвоить категорию поставщику
-AssignCategoryTo=Присвоить категорию
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Показать тег/категорию
 ByDefaultInList=По умолчанию в списке
 ChooseCategory=Выберите категорию
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Категории страниц-контейнер
 KnowledgemanagementsCategoriesArea=Категории записей управления знаниями
 UseOrOperatorForCategories=Используйте оператор "ИЛИ" для категорий
 AddObjectIntoCategory=Назначьте категория
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index eb5de2b337e..371c4988e30 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -33,7 +33,7 @@ CountryIsInEEC=Страна внутри Европейского Экономи
 PriceFormatInCurrentLanguage=Формат отображения цены в текущем языке и валюте
 ThirdPartyName=Название контрагента
 ThirdPartyEmail=E-mail контрагента
-ThirdParty=Контрагент
+ThirdParty=Третье лицо
 ThirdParties=Контрагенты
 ThirdPartyProspects=Лиды
 ThirdPartyProspectsStats=Потенциальные клиенты
@@ -65,6 +65,7 @@ State=Штат/Провинция
 StateId=Кирилл молодец
 StateCode=Код штата/провинции
 StateShort=Штат
+DepartmentBuyer=Buyer's state/province
 Region=Регион
 Region-State=Регион - Штат
 Country=Страна
@@ -78,7 +79,7 @@ Chat=Чат
 PhonePro=Рабоч. Телефон
 PhonePerso=Личн. телефон
 PhoneMobile=Мобильный
-No_Email=Отказаться от массовых рассылок
+No_Email=Refuse mass emails
 Fax=Факс
 Zip=Почтовый индекс
 Town=Город
@@ -382,12 +383,12 @@ ExportCardToFormat=Экспорт карточки в формате
 ContactNotLinkedToCompany=Контакт не связан с каким-либо контрагентом
 DolibarrLogin=Имя пользователя Dolibarr
 NoDolibarrAccess=Нет доступа к Dolibarr
-ExportDataset_company_1=Контрагенты (компании/фонды/физические лица) и их свойства
-ExportDataset_company_2=Контакты и их свойства
-ExportDataset_company_3=Банковские счета контрагентов
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Дополнительные контакты/адреса и атрибуты контрагентов
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Контрагенты и их свойства
 ImportDataset_company_2=Дополнительные контакты/адреса и атрибуты контрагентов
-ImportDataset_company_3=Банковские счета контрагентов
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Торговые представители контрагентов (назначить торговых представителей/пользователей для компаний)
 PriceLevel=Уровень цены
 PriceLevelLabels=Метки уровня цены
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Имя руковаодителя(лей) (коммерческого директора, директора, президента...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Объединить контрагентов
-ConfirmMergeThirdparties=Вы уверены, что хотите объединить выбранного контрагента с текущим? Все связанные объекты (счета, заказы и т.д.) Будут перемещены текущему контрагенту, после чего выбранный контрагент будет удален.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Контрагенты были объединены
 SaleRepresentativeLogin=Логин торгового представителя
 SaleRepresentativeFirstname=Имя торгового представителя
@@ -461,3 +462,6 @@ ExternalSystemID=Внешняя система ID
 IDOfPaymentInAnExternalSystem=ID режима платеж во внешнюю систему (например, Stripe, Paypal, ...)
 AADEWebserviceCredentials=Учетные данные веб-службы AADE
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Сторонняя сторона должна быть клиент, чтобы разрешить создание своего банка информация на стороне Stripe.
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index 6f4fb8a18db..9da1a9f2cb3 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Заказчиком оплаты счетов-факту
 PaymentSupplierInvoice=оплата по счету поставщика
 PaymentSocialContribution=Социальный/налоговый сбор
 PaymentVat=НДС платеж
-AutomaticCreationPayment=Автоматически записывать платеж
+AutomaticCreationPayment=Also record the payment
 ListPayment=Список платежей
 ListOfCustomerPayments=Список клиентов платежи
 ListOfSupplierPayments=Список платежей поставщикам
@@ -118,10 +118,14 @@ SocialContributionsPayments=Платежи по социальным/налог
 ShowVatPayment=Показать оплате НДС
 TotalToPay=Всего к оплате
 BalanceVisibilityDependsOnSortAndFilters=Баланс отображается в этом списке только в том случае, если таблица отсортирована по %s и отфильтрована по 1 банковскому счету (без других фильтров)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Код бухгалтерского учета клиента
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Код учета поставщика
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Cust. учетная запись. код
 SupplierAccountancyCodeShort=Как дела. учетная запись. код
+UserAccountancyCodeShort=User account. code
 AccountNumber=Номер счета
 NewAccountingAccount=Новый счет
 Turnover=Счет за оборот
@@ -129,7 +133,9 @@ TurnoverCollected=Собранный оборот
 SalesTurnoverMinimum=Минимальный оборот
 ByExpenseIncome=По расходам и доходам
 ByThirdParties=Бу-третьих сторон
+ByProjects=By projects
 ByUserAuthorOfInvoice=По счету автора
+DetailedListLowercase=detailed list
 CheckReceipt=Бланк депозита
 CheckReceiptShort=Бланк депозита
 LastCheckReceiptShort=Последние депозитные квитанции %s
diff --git a/htdocs/langs/ru_RU/datapolicy.lang b/htdocs/langs/ru_RU/datapolicy.lang
index bbbd95f0946..23914b2dd33 100644
--- a/htdocs/langs/ru_RU/datapolicy.lang
+++ b/htdocs/langs/ru_RU/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Политика конфиденциальности данн
 Module4100Desc = модуль для управления конфиденциальностью данных (соответствие GDPR)
 # Administration page
 datapolicySetup = модуль Политика конфиденциальности данных настройка
-Deletion = Удаление данных
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s месяцев
 ONE_YEAR = 1 год
 NB_YEARS = %s лет
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = перспектива/клиент
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Ни перспектива/Нор клиент
 DATAPOLICY_CONTACT_FOURNISSEUR = Поставщик
 DATAPOLICY_ADHERENT = Участник
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Вы можете отправить электронное письмо о GDPR всем своим контактам (которые еще не получили электронное письмо и, для которого вы не зарегистрировали ничего об их соглашении GDPR). Для этого используйте кнопку следующий.
 SendAgreement = Отправить письма
 AllAgreementSend = Все письма отправлены
 TXTLINKDATAPOLICYACCEPT = Текст ссылка «соглашения»
 TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: обработка Личныйданных
 DATAPOLICY_consentement = Получено согласие на обработку Личныйданных.
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 8f0bcf16cd3..bb619160dca 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Не удалось создать каталог. Убедитесь, что веб-сервер пользователь имеет разрешения на запись в каталог Dolibarr документы. Если параметр <b>safe_mode</b> включен по этому PHP, проверьте, что Dolibarr PHP файлы принадлежат к веб-серверу пользователей (или группы).
 ErrorNoMailDefinedForThisUser=Нет определена почта для этого пользователя
 ErrorSetupOfEmailsNotComplete=Настройка писем не завершена
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Для работы этого особенность требуется активация JavaScript. Измените это в настройка — display.
 ErrorTopMenuMustHaveAParentWithId0=Меню типа 'Верх' не может быть родителем меню. Положить 0 родителей в меню или выбрать меню типа 'левых'.
 ErrorLeftMenuMustHaveAParentId=Меню типа 'левых' должен иметь родителя ID.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Добавить заблокирован PHP/Apache 
 ErrorFileSizeTooLarge=Размер файла слишком велик или файл не предоставлен.
 ErrorFieldTooLong=Поле %s слишком длинное.
 ErrorSizeTooLongForIntType=Размер слишком долго для целого типа (%s цифр максимум)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Размер слишком долго для струнного типа (%s символов максимум)
 ErrorNoValueForSelectType=Пожалуйста, заполните значение для выпадающего списка
 ErrorNoValueForCheckBoxType=Пожалуйста, заполните значение для списка флажков
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Плохо значения типов кода. Попро
 ErrorBothFieldCantBeNegative=Поля %s и %s не может быть и отрицательным
 ErrorFieldCantBeNegativeOnInvoice=Поле <strong>%s</strong> Не может быть отрицательным для этого типа счет-фактура. Если вам нужно добавить скидку линия, просто создать сначала укажите скидку (из поля ') %s' в сторонней карте) и примените его к счет-фактура.
 ErrorLinesCantBeNegativeForOneVATRate=Сумма строк (за вычетом налога) не может быть отрицательной для данной ненулевой ставки НДС (Найдена отрицательная сумма для ставки НДС <b> %s </b> %%).
-ErrorLinesCantBeNegativeOnDeposits=Строки не могут быть отрицательными в депозите. Вы столкнетесь с проблемами, когда вам нужно будет израсходовать залог в окончательном счете-фактуре, если вы это сделаете.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Количество строк в счетах клиента не может быть отрицательным
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Учетная запись пользователя <b>%s</b> используется для выполнения веб-сервер не имеет разрешения для этого
 ErrorNoActivatedBarcode=Нет штрих-кодов типа активированного
 ErrUnzipFails=Невозможно распаковать %s с помощью  ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ваш параметр PHP upload_max_filesize (%s) выше, чем параметр PHP post_max_size (%s). Это непоследовательная установка.
 WarningPasswordSetWithNoAccount=Для этого участника был установлен пароль. Однако учетная запись пользователя не была создана. Таким образом, этот пароль сохраняется, но не может использоваться для входа в Dolibarr. Он может использоваться внешним модулем / интерфейсом, но если вам не нужно определять логин или пароль для члена, вы можете отключить опцию «Управлять логином для каждого члена» в настройках модуля «Член». Если вам нужно управлять логином, но пароль не нужен, вы можете оставить это поле пустым, чтобы избежать появления этого предупреждения. Примечание. Электронная почта также может использоваться в качестве логина, если член связан с пользователем.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR счет-фактура можно добавить только на счета-фактуры, для которого установлено значение Оплачен с кредитом перевод платежей.
 SwissQrCreditorAddressInvalid = Кредитор адрес недействителен (установлен ли почтовый индекс и города? (%s)
 SwissQrCreditorInformationInvalid = Информация Кредитор недействительна для IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/ru_RU/exports.lang b/htdocs/langs/ru_RU/exports.lang
index e697394751c..18c173a03a1 100644
--- a/htdocs/langs/ru_RU/exports.lang
+++ b/htdocs/langs/ru_RU/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Этикетка линии
 LineDescription=Описание строки
 LineUnitPrice=Цена за единицу линии
 LineVATRate=Ставка НДС в строке
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Кол-во в строке
 LineTotalHT=Сумма искл. налог на линию
 LineTotalTTC=Сумма налога с на линию
 LineTotalVAT=Сумма налога на добавленную стоимость по строке
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Тип линии (0= продукт, 1=услуга)
 FileWithDataToImport=Файл с данными для импорта
 FileToImport=Исходный файл для импорта
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=Выберите формат файла для ис
 ChooseFileToImport=Загрузите файл, затем щелкните значок %s, чтобы выбрать файл в качестве исходного файла импорта ...
 SourceFileFormat=Формат исходного файла
 FieldsInSourceFile=Поля в исходном файле
-FieldsInTargetDatabase=Целевые поля в БД системы Dolibarr  (жирным - обязательные)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Нет поля
 MoveField=Перемещение поля %s номер столбца
 ExampleOfImportFile=Пример файла импорта
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Убедитесь, что формат файла (ра
 RunSimulateImportFile=Запустить моделирование импорта
 FieldNeedSource=Это поле требует данных из исходного файла
 SomeMandatoryFieldHaveNoSource=Некоторые обязательные поля не имеют источника из файла данных
-InformationOnSourceFile=Информация об исходном файле
-InformationOnTargetTables=Информация о целевых полей
+InformationOnSourceFile=Исходный файл
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Switch по крайней мере один источник поля в колонке полей для экспорта
 SelectFormat=Выберите этот формат файла для импорта
 RunImportFile=Импортировать данные
diff --git a/htdocs/langs/ru_RU/hrm.lang b/htdocs/langs/ru_RU/hrm.lang
index 7d561aa2ee1..aa96a4a195a 100644
--- a/htdocs/langs/ru_RU/hrm.lang
+++ b/htdocs/langs/ru_RU/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=Требуемый ранг для должности Профиль
-RequiredRankShort=Требуемый ранг
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Должности с этим профилем работы
-EmployeeRank=Звание сотрудника по этому навыку
-EmployeeRankShort=Наемный работник ранг
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Должность сотрудника
 EmployeePositions=Должности сотрудников
 EmployeesInThisPosition=Сотрудники на этой должности
@@ -72,6 +72,9 @@ AddSkill=Добавить навыки к вакансии Профиль
 RequiredSkills=Необходимые навыки для этой работы Профиль
 UserRank=Рейтинг пользователя
 SkillList=Список навыков
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Сохранить рейтинг
 TypeKnowHow=Секрет производства
 TypeHowToBe=Как быть
@@ -95,3 +98,5 @@ NeedBusinessTravels=Нужны деловые поездки
 NoDescription=Нет Описание
 TheJobProfileHasNoSkillsDefinedFixBefore=Оцениваемое задание Профиль этого Наемный работник не имеет определенного навыка. Добавьте навыки, а затем удалить и перезапустите оценку.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index 2b0bc8a52e1..227a2e481de 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Рассылка
 EMailing=Рассылка
-EMailings=Рассылки
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=Все рассылки
+AllEMailings=All mass eMails
 MailCard=Карточка рассылки
 MailRecipients=Получатели
 MailRecipient=Получатель
@@ -26,19 +26,19 @@ MailFile=Присоединенные файлы
 MailMessage=Текст письма
 SubjectNotIn=Не в теме
 BodyNotIn=Не в теле
-ShowEMailing=Показать адреса
-ListOfEMailings=Список рассылок
-NewMailing=Новая рассылка
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=Изменить рассылку
-ResetMailing=Повторная рассылка
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Удалить рассылку
-PreviewMailing=Предварительный электронной почте
-CreateMailing=Создание электронной почте
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Проверить
-ValidMailing=Подтвердить рассылку
+ValidMailing=Valid mass Email
 MailingStatusDraft=Черновик
 MailingStatusValidated=Подтвержденные
 MailingStatusSent=Отправленные
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Все фильтры должны совпадать,
 LineInFile=Строка %s в файле
 RecipientSelectionModules=Определенные запросы для выбора получателя
 MailSelectedRecipients=Отобранные получатели
-MailingArea=Область рассылки
-LastMailings=Последние электронные письма от %s
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Статистика целей
 NbOfCompaniesContacts=Уникальные контакты/адреса
 MailNoChangePossible=Невозможно изменить получателей для подтвержденных рассылок.
-SearchAMailing=Поиск рассылки
-SendMailing=Отправить рассылку
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Прислал
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Отправку рассылки можно выполнить из командной строки. Попросите администратора сервера запустить следующую команду, чтобы отправить электронное письмо всем получателям:
 MailingNeedCommand2=Однако вы можете отправить их онлайн, добавив параметр MAILING_LIMIT_SENDBYWEB со значением максимального количества писем, которые вы хотите отправить за сеанс. Для этого зайдите на Главная - Настройка - Другое.
 ConfirmSendingEmailing=Если вы хотите выполнить рассылку прямо с этого экрана, подтвердите, что вы действительно хотите выполнить рассылку прямо сейчас из своего браузера?
-LimitSendingEmailing=Примечание. Отправка рассылок из веб-интерфейса выполняется несколько раз по соображениям безопасности и тайм-аута, <b>%s</b> получателям одновременно для каждого сеанса отправки.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Очистить список
 ToClearAllRecipientsClickHere=Щелкните здесь, чтобы очистить список получателей этой рассылки
 ToAddRecipientsChooseHere=Добавьте получателей, выбрав их из списков
-NbOfEMailingsReceived=Получено массовых рассылок
-NbOfEMailingsSend=Массовая Email-рассылка
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=Код записи
 DeliveryReceipt=Подтверждение доставки.
 YouCanUseCommaSeparatorForSeveralRecipients=Вы можете использовать разделитель <b>запятая</b>, чтобы указать нескольких получателей.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Для этого типа мероприятия и 
 ANotificationsWillBeSent=1 автоматическое уведомление будет отправлено по электронной почте
 SomeNotificationsWillBeSent=%s автоматические уведомления будут отправляться по электронной почте
 AddNewNotification=Подпишитесь на новое автоматическое уведомление по электронной почте (цель/событие)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Конфигурация отправки электронной почты была настроена на '%s'. Этот режим нельзя использовать для массовой рассылки электронных писем.
 MailSendSetupIs2=Сначала необходимо зайти с учетной записью администратора в меню %sГлавная - Настройки - EMails%s и изменить параметр <strong>'%s'</strong> в режим использования '%s'. В этом режиме вы можете войти в настройку SMTP-сервера, предоставленного вашим интернет-провайдером, и использовать функцию массовой рассылки электронной почты.
 MailSendSetupIs3=Если у вас есть какие-либо вопросы о том, как настроить SMTP-сервер, вы можете задать их по адресу %s.
@@ -183,7 +185,7 @@ Information=Информация
 ContactsWithThirdpartyFilter=Контакты с фильтром контрагента
 Unanswered=Без ответа
 Answered=Ответил
-IsNotAnAnswer=Нет ответа (исходное письмо)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Это ответ на исходное электронное письмо
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Значение по умолчанию для поля '%s' при создании нового контакта
@@ -199,6 +201,6 @@ ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index f6978b9e280..57bdd6c44aa 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -37,6 +37,7 @@ Translation=Перевод
 Translations=Переводы
 CurrentTimeZone=Текущий часовой пояс в настройках PHP
 EmptySearchString=входить непустые критерии поиска
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Введите критерии даты
 NoRecordFound=Запись не найдена
 NoRecordDeleted=Нет удаленных записей
@@ -45,6 +46,7 @@ NoError=Нет ошибки
 Error=Ошибка
 Errors=Ошибки
 ErrorFieldRequired=Поле '%s' обязательно для заполнения
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Поле '%s' имеет неверное значение
 ErrorFileDoesNotExists=Файл %s не существует
 ErrorFailedToOpenFile=Не удалось открыть файл %s
@@ -308,6 +310,7 @@ DateBuild=Дата формирования отчета
 DatePayment=Дата оплаты
 DateApprove=Дата утверждения
 DateApprove2=Дата утверждения (повторного)
+PendingSince=Pending since
 RegistrationDate=Дата регистрации
 UserCreation=Создание пользователя
 UserModification=Изменение пользователя
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Не начато
 ActionRunningShort=Выполняется
 ActionDoneShort=Завершено
 ActionUncomplete=Не завершено
-LatestLinkedEvents=Последние связанные события %s
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Компания/Организация
 Accountant=Бухгалтер
 ContactsForCompany=Контакты для этого контрагента
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=Текст сообщения электронной п
 SendAcknowledgementByMail=Отправить подтверждение на электронную почту
 SendMail=Отправить письмо
 Email=Адрес электронной почты
+EMail=Адрес электронной почты
+EMails=Электронная почта
 NoEMail=Нет электронной почты
 AlreadyRead=Прочитано
 NotRead=Непрочитанный
@@ -793,7 +798,7 @@ Notes=Примечания
 AddNewLine=Добавить новую строку
 AddFile=Добавить файл
 FreeZone=Произвольный текст
-FreeLineOfType=Элемент произвольного текста, набрать:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Клонирование объекта с его основными атрибутами
 ReGeneratePDF=Повторно сгенерировать PDF
 PDFMerge=Слияние PDF
@@ -879,12 +884,14 @@ toward=к
 Access=Доступ
 SelectAction=Выбор действия
 SelectTargetUser=Выберите конечного пользователя/сотрудника
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Для копировани в буфер обмена используйте Ctrl+C
 SaveUploadedFileWithMask=Сохранить файл на сервер под именем "<strong>%s</strong>" (иначе "%s")
 OriginFileName=Изначальное имя файла
 SetDemandReason=Установить источник
 SetBankAccount=Задать счёт в банке
 AccountCurrency=Валюта счета
+AccountancyCode=Бухгалтерский код
 ViewPrivateNote=Посмотреть заметки
 XMoreLines=%s строк(и) скрыто
 ShowMoreLines=Показать больше/меньше строк
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Вы уверены, что хотите удали
 ConfirmMassClone=Подтверждение массового клонирования
 ConfirmMassCloneQuestion=Выберите проект для клонирования.
 ConfirmMassCloneToOneProject=Клонировать в проект %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Связанные объекты
 ClassifyBilled=Классифицировать выставленный счет
 ClassifyUnbilled=Классифицировать без выставления счетов
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Вам необходимо войти в систему
 Download=Загрузка
 DownloadDocument=Скачать документ
 DownloadSignedDocument=Скачать подписанный документ
-ActualizeCurrency=Обновить текущий курс
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Финансовый год
 ModuleBuilder=Конструктор Модулей и Приложений
 SetMultiCurrencyCode=Настройка валюты
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Массовые действия
 ClickToShowHelp=Нажмите для отображения подсказок
 WebSite=Веб-сайт
@@ -1104,6 +1113,7 @@ PayedBy=Оплачивается
 PayedTo=Оплатить до
 Monthly=ежемесячно
 Quarterly=Ежеквартальный
+Quarter=Quarter
 Annual=годовой
 Local=Локальный
 Remote=Удаленный
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Задача
 ContactDefault_propal=Предложение
 ContactDefault_supplier_proposal=Предложение поставщика
 ContactDefault_ticket=Тикет
+ContactDefault_societe=Третье лицо
 ContactAddedAutomatically=Контакт добавлен из сторонних ролей контактов
 More=Более
 ShowDetails=Показать детали
@@ -1242,6 +1253,7 @@ CommercialAffected=торговый представитель назначен
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=Сообщение
+Emailing=Emailing
 Progression=Прогресс
 YourMessage=Ваше сообщение
 YourMessageHasBeenReceived=Ваше сообщение было получено. Мы ответим или свяжемся с вами в ближайшее время.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Добавить
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Сначала
+Transferred=Transferred
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index 94eb3411897..7f29be08272 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Если требуется подписание, по
 DeleteType=Удалить
 VoteAllowed=Голосовать разрешается
 Physical=Физическое лицо
-Moral=Корпорация
-MorAndPhy=Корпорация и частное лицо
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Повторно включить
 ExcludeMember=Исключить участника
 Exclude=Исключать
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Статистика участников по рег
 NbOfMembers=Общее количество участников
 NbOfActiveMembers=Общее количество текущих активных участников
 NoValidatedMemberYet=Нет проверки члены найдены
-MembersByCountryDesc=На этом экране отображается статистика участников по странам. Графики и диаграммы зависят от доступности службы онлайн-графиков Google, а также от наличия рабочего подключения к Интернету.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=На этом экране отображается статистика членов по штатам/провинциям/кантонам.
 MembersByTownDesc=На этом экране отображается статистика участников по городам.
 MembersByNature=Этот экран показывает статистику участников по природе.
@@ -208,25 +209,25 @@ NewMemberbyWeb=Новый участник добавил. В ожидании 
 NewMemberForm=Новая форма члена
 SubscriptionsStatistics=Статистика вкладов
 NbOfSubscriptions=Количество вкладов
-AmountOfSubscriptions=Сумма, полученная от взносов
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=Оборот (за компанию) или бюджета (за основу)
-DefaultAmount=Сумма взноса по умолчанию (используется, только если сумма не определена на уровне типа члена)
-MinimumAmount=Минимальная сумма (используется только в том случае, если сумма взноса бесплатна)
-CanEditAmount=Сумма подписки может быть определена участником
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=Посетитель может выбирать/редактировать сумму своего вклада независимо от типа член.
 AmountIsLowerToMinimumNotice=Сумма ниже минимальной %s
 MEMBER_NEWFORM_PAYONLINE=После онлайн-регистрации переключитесь автоматически на онлайн-страницу платеж.
 ByProperties=По природе
 MembersStatisticsByProperties=Статистика участников по характеру
-VATToUseForSubscriptions=НДС ставка для использования в качестве взносов
-NoVatOnSubscription=Без НДС для взносов
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Продукт, использованный для строки взноса в счете: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=Имя или Название компании
 SubscriptionRecorded=Взнос записан
 NoEmailSentToMember=Электронное письмо не отправлено участнику
 EmailSentToMember=Электронное письмо отправлено участнику на %s
-SendReminderForExpiredSubscriptionTitle=Отправить напоминание по электронной почте о просроченных взносах
-SendReminderForExpiredSubscription=Отправьте напоминание по электронной почте на адрес члены, когда срок действия взноса истекает (параметр номер дней до окончания членства, чтобы отправить напоминание). . Это может быть Список дней, разделенных точкой с запятой, для Пример '10;5;0;-5')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Членство оплачивается за текущий период (до %s)
 YouMayFindYourInvoiceInThisEmail=К этому письму может быть прикреплен счет.
 XMembersClosed=участник(и) %s закрыт(ы)
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Третья сторона — это юриди
 MemberFirstname=Имя участника
 MemberLastname=Фамилия участника
 MemberCodeDesc=член код, уникальный для всех члены
-MemberSubscriptionStartFirstDayOf=Начало дата членства соответствует первому дню
-MemberSubscriptionStartAfter=Минимальный период до вступления в силу начала дата подписание за исключением продлений (Пример  +3m = +3 месяца, -5d = -5 дней, +1Y = +1 год)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index f8de9e8aa64..86a4ad01594 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -97,7 +97,6 @@ ShowService=Показать услугу
 ProductsAndServicesArea=Раздел товаров и услуг
 ProductsArea=Раздел товаров
 ServicesArea=Раздел услуг
-ListOfStockMovements=Список движения запасов
 BuyingPrice=Цена покупки
 PriceForEachProduct=Продукты со специфическими ценами
 SupplierCard=Карточка продавца
@@ -145,6 +144,7 @@ WithoutDiscount=Без скидки
 VATRateForSupplierProduct=Tax Rate (for this vendor/product)
 DiscountQtyMin=Скидка на это кол-во.
 NoPriceDefinedForThisSupplier=Цена/количество не определены для этого поставщика/продукта
+NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
 NoSupplierPriceDefinedForThisProduct=Цена/количество поставщика для этого продукта не определены
 PredefinedItem=Предопределенный элемент
 PredefinedProducts=Predefined Product
@@ -171,7 +171,7 @@ BuyingPrices=Цены на покупку
 CustomerPrices=Цены клиентов
 SuppliersPrices=Цены от поставщиков
 SuppliersPricesOfProductsOrServices=Цены поставщиков (товаров или услуг)
-CustomCode=Таможня | Товар | Код ТН ВЭД
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Страна происхождения
 RegionStateOrigin=Регион происхождения
 StateOrigin=Штат | Провинция происхождения
@@ -209,6 +209,7 @@ unitL=Литр
 unitT=тонна
 unitKG=кг
 unitG=Грамм
+unitGAL=галлон
 unitMG=мг
 unitLB=фунт
 unitOZ=унция
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Формат запроса: {"URL": "http://ex
 UpdateInterval=Интервал обновления (в минутах)
 LastUpdated=Последнее обновление
 CorrectlyUpdated=Правильно обновлено
-PropalMergePdfProductActualFile=Файлы, используемые для добавления в PDF Azur, являются
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=Выберите PDF-файлы
 IncludingProductWithTag=Включите продукты/услуги с тегом
 DefaultPriceRealPriceMayDependOnCustomer=Цена по умолчанию, реальная цена может зависеть от клиента
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=Количество линии пересчита
 
 #Attributes
 Attributes=Атрибуты
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Вариант атрибутов
 ProductAttributes=Вариант атрибутов для продуктов
 ProductAttributeName=Атрибут варианта %s
@@ -395,6 +400,8 @@ ErrorDestinationProductNotFound=Продукт назначения не най
 ErrorProductCombinationNotFound=Вариант продукта не найден
 ActionAvailableOnVariantProductOnly=Действие доступно только для варианта продукта
 ProductsPricePerCustomer=Цены на продукцию для каждого покупателя
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Дополнительные атрибуты (цены поставщиков)
 DeleteLinkedProduct=Удалить дочерний продукт, связанный с комбинацией
 AmountUsedToUpdateWAP=ед.измерения сумма, используемая для обновления средневзвешенного значения цена
@@ -403,7 +410,8 @@ PMPValueShort=СВЦ
 mandatoryperiod=Обязательные периоды
 mandatoryPeriodNeedTobeSet=Примечание. Период (дата начала и окончания) должен быть определен
 mandatoryPeriodNeedTobeSetMsgValidate=Услуге требуются начальный и конечный периоды
-mandatoryHelper=Установите этот флажок, если вы хотите, чтобы при создании/проверке счета-фактуры, коммерческого предложения, заказа на продажу пользователь получал сообщение без ввода даты начала и окончания в строках с этой услугой. <br> Обратите внимание, что это сообщение является предупреждением, а не блокирующей ошибкой.
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
+mandatoryHelper2=Note that the message is a warning and not a blocking error.
 DefaultBOM=Спецификация материалов по умолчанию
 DefaultBOMDesc=Спецификация материалов по умолчанию, рекомендованная для производства этого продукта. Это поле может быть установлено только в том случае, если тип продукта - "%s".
 Rank=Ранг
@@ -428,10 +436,13 @@ ConfirmEditExtrafield = Выберите дополнительное поле,
 ConfirmEditExtrafieldQuestion = Вы уверены, что хотите изменить это дополнительное поле?
 ModifyValueExtrafields = Изменить значение дополнительного поля
 OrProductsWithCategories=Или продукты с ярлыки/категории
-WarningTransferBatchStockMouvToGlobal = Если вы хотите десериализовать этот продукт, все его сериализованные остаток будут преобразованы в глобальные остаток 
+WarningTransferBatchStockMouvToGlobal = Если вы хотите десериализовать этот продукт, все его сериализованные остаток будут преобразованы в глобальные остаток
 WarningConvertFromBatchToSerial=Если в настоящее время у вас есть количество, превышающее или равное 2 для продукт, переключение на этот вариант означает, что у вас все еще будет продукт с разными объектами одного пакета (хотя вам нужен уникальный Серийный номер). Дубликат останется до тех пор, пока не будет произведена инвентаризация или перемещение вручную остаток для исправления ситуации.
 AllowStockMovementVariantParent=Also records stock movements on parent products of variant products
 AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtual product, so no stock is managed for it. By enabling this option, a stock will be managed for parent products and each time a stock quantity is modified for a variant product, the same quantity will be modified for the parent product. You should not need this option, except if you are using variant to manage the same product than parent (but with different descriptions, prices...)
 ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
 WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned
 PriceLabel=Price label
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/ru_RU/propal.lang b/htdocs/langs/ru_RU/propal.lang
index 9732d6db818..4b2badce734 100644
--- a/htdocs/langs/ru_RU/propal.lang
+++ b/htdocs/langs/ru_RU/propal.lang
@@ -52,7 +52,7 @@ DatePropal=Дата предложения
 DateEndPropal=Дата окончания действия
 ValidityDuration=Срок действия
 SetAcceptedRefused=Набор принят / отклонен
-ErrorPropalNotFound=Пропал% не найдены
+ErrorPropalNotFound=Пропал %s не найден
 AddToDraftProposals=Добавить проект коммерческого предложения
 NoDraftProposals=Нет проектов коммерческих дредложений
 CopyPropalFrom=Создание коммерческого предложения, копируя существующие предложения
@@ -77,13 +77,11 @@ AvailabilityTypeAV_1W=1 неделя
 AvailabilityTypeAV_2W=2 недели
 AvailabilityTypeAV_3W=3 недели
 AvailabilityTypeAV_1M=1 месяц
-
 ##### Types ofe contacts #####
 TypeContact_propal_internal_SALESREPFOLL=Представитель следующие меры предложение
 TypeContact_propal_external_BILLING=свяжитесь со счета
 TypeContact_propal_external_CUSTOMER=Абонентский отдел следующие меры предложение
 TypeContact_propal_external_SHIPPING=Контактное лицо для доставки
-
 # Document models
 CantBeNoSign=нельзя установить не подписанным
 CaseFollowedBy=Дело, за которым следует
@@ -122,3 +120,5 @@ SignSociete_rib=Sign mandate
 SignPropal=Принять предложение
 Signed=подписал
 SignedOnly=Только подписано
+ExpeditionSigned=Shipment signed
+SignExpedition=Sign shipment
diff --git a/htdocs/langs/ru_RU/salaries.lang b/htdocs/langs/ru_RU/salaries.lang
index 844e5aeddb3..97734300f23 100644
--- a/htdocs/langs/ru_RU/salaries.lang
+++ b/htdocs/langs/ru_RU/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Новая зарплата
 AddSalary=Добавить зарплату
 NewSalaryPayment=Новая зарплатная карта
 AddSalaryPayment=Добавить выплату зарплаты
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Выплата зарплаты
 SalariesPayments=Выплата зарплат
 SalariesPaymentsOf=Выплата заработной платы %s
@@ -27,7 +29,7 @@ FillFieldFirst=Сначала заполните поле сотрудника
 UpdateAmountWithLastSalary=Установить количество последних зарплата
 MakeTransferRequest=Сделайте запрос перевод
 VirementOrder=Кредитный запрос перевод
-BankTransferAmount=Сумма кредита перевод
 WithdrawalReceipt=Кредит перевод заказ
 OrderWaiting=Ожидается заказ
 FillEndOfMonth=Заполнить до конца месяца
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
index 9d66e18d5c1..b71032167ca 100644
--- a/htdocs/langs/ru_RU/website.lang
+++ b/htdocs/langs/ru_RU/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Используйте здесь список других
 WEBSITE_CSS_URL=URL внешнего файла CSS
 WEBSITE_CSS_INLINE=Содержимое файла CSS (общее для всех страниц)
 WEBSITE_JS_INLINE=Содержимое JavaScript файл (общее для всех страниц)
-WEBSITE_HTML_HEADER=Добавление внизу заголовка HTML (общее для всех страниц)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Файл робота (robots.txt)
 WEBSITE_HTACCESS=Файл .htaccess веб-сайта
 WEBSITE_MANIFEST_JSON=Файл manifest.json веб-сайта
@@ -56,16 +56,17 @@ ReadPerm=Читать
 WritePerm=Писать
 TestDeployOnWeb=Тестирование/развертывание в Интернете
 PreviewSiteServedByWebServer=<u>Предварительный просмотр %s в новой вкладке.</u><br><br>%s будет обслуживаться внешним веб-сервером (например, Apache, Nginx, IIS). Вы должны установить и настроить этот сервер, прежде чем указывать на каталог:<br><strong>%s</strong><br>URL-адрес, обслуживаемый внешним сервером:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Предварительный просмотр %s в новой вкладке.</u><br><br>%s будет обслуживаться сервером Dolibarr, поэтому для него не требуется установка какого-либо дополнительного веб-сервера (например, Apache, Nginx, IIS). <br> Неудобство в том, что URL-адреса страниц не удобны для пользователя и начинаются с пути вашего Dolibarr.<br>URL обслуживается Dolibarr:<br><strong>%s</strong><br><br>Чтобы использовать собственный внешний веб-сервер для обслуживания данного веб-сайта, создать виртуальный хост на вашем веб-сервере, который указывает на каталог<br><strong>%s</strong><br>введите имя этого виртуального сервера в свойствах этого веб-сайта и щелкните ссылку «Проверить/Развернуть в Интернете».
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL-адрес виртуального хоста, обслуживаемого внешним веб-сервером, не определен
 NoPageYet=Страниц пока нет
 YouCanCreatePageOrImportTemplate=Вы можете создать новую страницу или импортировать полный шаблон сайта.
 SyntaxHelp=Справка по конкретным советам по синтаксису
 YouCanEditHtmlSourceckeditor=Вы можете редактировать исходный код HTML с помощью кнопки «Источник» в редакторе.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Для изображения, к которому предоставлен общий доступ по ссылке общего доступа (открытый доступ с использованием хеш-ключа общего доступа к файлу), синтаксис следующий:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Клонировать страницу/контейнер
 CloneSite=Клонировать сайт
@@ -87,15 +88,15 @@ WebsiteAccount=Аккаунт на сайте
 WebsiteAccounts=Аккаунты сайта
 AddWebsiteAccount=Создать учетную запись веб-сайта
 BackToListForThirdParty=Назад к списку для третьих лиц
-DisableSiteFirst=Сначала отключите веб-сайт
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Заголовок моего веб-сайта
 AnotherContainer=Вот как включить содержимое другой страницы/контейнера (здесь может возникнуть ошибка, если вы включите динамический код, потому что встроенный подконтейнер может не существовать)
 SorryWebsiteIsCurrentlyOffLine=Извините, этот веб-сайт в настоящее время отключен. Пожалуйста, вернитесь позже ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Включите таблицу для хранения учетных записей веб-сайтов (логин/пароль) для каждого веб-сайта / третьей стороны
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Вы должны сначала определить домашнюю страницу по умолчанию
-OnlyEditionOfSourceForGrabbedContentFuture=Предупреждение. Создание веб-страницы путем импорта внешней веб-страницы предназначено для опытных пользователей. В зависимости от сложности исходной страницы результат импорта может отличаться от оригинала. Кроме того, если исходная страница использует общие стили CSS или конфликтующий JavaScript, это может нарушить внешний вид или функции редактора веб-сайт при работе с этой страницей. Этот метод — более быстрый способ создать создать страницу, но рекомендуется создать создать новую страницу с нуля или с предложенной страницы. template.<br>Обратите также внимание, что встроенный редактор может работать неправильно при использовании на захваченной внешней странице.
-OnlyEditionOfSourceForGrabbedContent=Только редактирование исходного кода HTML возможно, если контент был получен с внешнего сайта.
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Также возьмите изображения, найденные в css и page.
 ImagesShouldBeSavedInto=Изображения должны быть сохранены в каталог
 WebsiteRootOfImages=Корневой каталог для изображений веб-сайтов
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Удалить фильтр
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Категории
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index bd31d1905b6..80d144769d1 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Kontrola integrity súborov prešla, boli vš
 FileIntegritySomeFilesWereRemovedOrModified=Kontrola integrity súborov zlyhala. Niektoré súbory boli upravené, odstránené alebo pridané.
 GlobalChecksum=Globálny kontrolný súčet
 MakeIntegrityAnalysisFrom=Vykonajte analýzu integrity súborov aplikácie z
-LocalSignature=Vložený lokálny podpis (menej spoľahlivý)
-RemoteSignature=Vzdialený vzdialený podpis (spoľahlivejší)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Chýbajúce súbory
 FilesUpdated=Aktualizované súbory
 FilesModified=Upravené súbory
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Používa sa len pri niektorých možnostiach programu
 Security=Zabezpečenie
 Passwords=Heslá
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Zašifrovať heslo databázy uložené v conf.php. Dôrazne sa odporúča aktivovať túto možnosť.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Chráňte vygenerované súbory PDF. Toto sa NEODPORÚČA, pretože to prerušuje hromadné generovanie PDF.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Vypočítané pole
-ComputedFormulaDesc=Tu môžete zadať vzorec pomocou iných vlastností objektu alebo akéhokoľvek PHP kódovania, aby ste získali dynamickú vypočítanú hodnotu. Môžete použiť akékoľvek vzorce kompatibilné s PHP vrátane "?" operátor podmienky a nasledujúci globálny objekt: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>UPOZORNENIE</strong>: Ak potrebujete vlastnosti objektu nenačítané, jednoducho si načítajte objekt do svojho vzorca ako v druhom príklade.<br>Používanie vypočítaného poľa znamená, že nemôžete zadať žiadnu hodnotu z rozhrania. Ak sa vyskytne chyba syntaxe, vzorec nemusí vrátiť nič.<br><br>Príklad vzorca:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Príklad opätovného načítania objektu<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldedobkey'] * $re >capital / 5: '-1')<br><br>Ďalší príklad vzorca na vynútenie zaťaženia objektu a jeho nadradeného objektu: <br>(($reloadedobj = nová úloha($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = nový projekt( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Nadradený projekt sa nenašiel'
+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'
 Computedpersistent=Uložiť vypočítané pole
 ComputedpersistentDesc=Vypočítané nadbytočné polia sa uložia do databázy, avšak hodnota sa prepočíta len pri zmene objektu tohto poľa. Ak vypočítané pole závisí od iných objektov alebo globálnych údajov, táto hodnota môže byť nesprávna!!
 ExtrafieldParamHelpPassword=Ak toto pole ponecháte prázdne, znamená to, že táto hodnota bude uložená BEZ šifrovania (pole je na obrazovke iba skryté hviezdičkami).<br><br>Zadajte hodnota 'dolcrypt' na zakódovanie hodnoty pomocou reverzibilného šifrovacieho algoritmu. Jasné údaje možno stále poznať a upravovať, ale sú zašifrované do databázy.<br><br>Zadajte 'auto' (alebo 'md5', 'sha256', 'password_hash', ...) na použitie predvoleného algoritmu šifrovania hesla (alebo md5, sha256, password_hash...) na uloženie nevratného hashovaného hesla do databázy (žiadny spôsob, ako získať pôvodnú hodnotu)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Použitie SMTP servera vášho vlastného poskytovateľa e-mailových služieb na odosielanie e-mailov je tiež zaujímavé, takže všetky e-maily odoslané z aplikácie sa tiež uložia do vášho adresára "Odoslané" vašej poštovej schránky.
 WarningPHPMailD=Preto sa odporúča zmeniť spôsob odosielania e-mailov na hodnotu „SMTP“.
 WarningPHPMailDbis=Ak naozaj chcete ponechať predvolenú metódu „PHP“ na odosielanie e-mailov, jednoducho toto upozornenie ignorujte alebo ho odstráňte %skliknutím sem%s.
-WarningPHPMail2=Ak váš poskytovateľ e-mailového SMTP potrebuje obmedziť e-mailového klienta na niektoré IP adresy (veľmi zriedkavé), toto je IP adresa poštového používateľského agenta (MUA) pre vašu aplikáciu ERP CRM: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=účtovníctvo (zjednodušene)
 Module10Desc=Jednoduché účtovné výkazy (časopisy, obraty) na základe obsahu databázy. Nepoužíva žiadnu účtovnú tabuľku.
 Module20Name=Návrhy
 Module20Desc=Komerčné návrh riadenia
-Module22Name=Hromadné zasielanie e-mailov
-Module22Desc=Spravujte hromadné e-maily
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energia
 Module23Desc=Sledovanie spotreby energií
 Module25Name=Predajné objednávky
@@ -847,10 +848,10 @@ Permission212=Objednávacie
 Permission213=Aktivácia linku
 Permission214=Nastavenie telefónia
 Permission215=Nastavenia poskytovateľa
-Permission221=Prečítajte si emailings
-Permission222=Vytvoriť / upraviť emailings (téma, príjemcovia ...)
-Permission223=Overiť emailings (umožňuje odosielanie)
-Permission229=Odstrániť emailings
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Zobraziť príjemcov a informácie
 Permission238=Ručné odoslanie zásielky
 Permission239=Zmažte zásielky po validácii alebo zaslať
@@ -1105,6 +1106,7 @@ DictionaryStaff=Počet zamestnancov
 DictionaryAvailability=Oneskorenie doručenia
 DictionaryOrderMethods=Spôsoby objednávky
 DictionarySource=Pôvod ponuky / objednávky
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Personalizované skupiny pre prehľady
 DictionaryAccountancysystem=Modely účtovných osnov
 DictionaryAccountancyJournal=Účtovné denníky
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Späť na zoznam slovníkov
 TypeOfRevenueStamp=Typ daňovej známky
 VATManagement=Správa dane z obratu
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=V predvolenom nastavení je navrhovaná daň z obratu 0, ktorú možno použiť v prípadoch, ako sú združenia, jednotlivci alebo malé spoločnosti.
 VATIsUsedExampleFR=Vo Francúzsku to znamená spoločnosti alebo organizácie, ktoré majú skutočný fiškálny systém (zjednodušený skutočný alebo normálny skutočný). Systém, v ktorom sa priznáva DPH.
 VATIsNotUsedExampleFR=Vo Francúzsku to znamená združenia, ktoré nemajú priznanú daň z obratu, alebo spoločnosti, organizácie alebo slobodné povolania, ktoré si zvolili fiškálny systém mikropodnikov (daň z predaja vo franšíze) a zaplatili franšízu Daň z obratu bez akéhokoľvek priznania k dani z obratu. Touto voľbou sa na faktúrach zobrazí odkaz „Neuplatňuje sa daň z obratu – článok 293B CGI“.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Druh dane z obratu
 LTRate=Rate
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Podľa nastavenia daní (pozri %s - %s - %s) , vaša k
 LabelUsedByDefault=Label používa v predvolenom nastavení, pokiaľ nie je preklad možno nájsť kód
 LabelOnDocuments=Štítok na dokumenty
 LabelOrTranslationKey=Štítok alebo prekladový kľúč
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=Zobrazte IČ DPH zákazníka/dodávateľa do kombinovaných zoznamo
 AddAdressInList=Zobrazte adresu zákazníka/dodávateľa v kombinovaných zoznamoch.<br>Tretie strany sa zobrazia s formátom názvu "The Big Company corp. - 21 jump street 123456 Big town - USA" namiesto " The Big Company corp“.
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Požiadajte o preferovaný spôsob dopravy pre tretie strany.
-FieldEdition=Vydanie poľných %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Príklad: +2 ( vyplňte iba ak sú predpokladané problémy s časovým posunom )
 GetBarCode=Získať čiarový kód
 NumberingModules=Číslovanie modelov
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Force faktúry dátum Dátum overenia
 SuggestedPaymentModesIfNotDefinedInInvoice=Predvolený režim navrhovaných platieb na faktúre, ak nie je definovaný na faktúre
 SuggestPaymentByRIBOnAccount=Navrhnite platbu výberom na účet
 SuggestPaymentByChequeToAddress=Navrhnite platbu šekom na
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Voľný text na faktúrach
 WatermarkOnDraftInvoices=Vodoznak k návrhom faktúr (ak žiadny prázdny)
 PaymentsNumberingModule=Model číslovania platieb
@@ -1718,6 +1723,7 @@ CompressionOfResources=Kompresia odpovedí HTTP
 CompressionOfResourcesDesc=Napríklad pomocou direktívy Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=So súčasnými prehliadačmi taká automatická detekcia nie je možná
 DefaultValuesDesc=Tu môžete definovať predvolenú hodnotu, ktorú chcete použiť pri vytváraní nového záznamu, a/alebo predvolené filtre alebo poradie triedenia pri uvádzaní záznamov.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Predvolené hodnoty (na použitie vo formulároch)
 DefaultSearchFilters=Predvolené filtre vyhľadávania
 DefaultSortOrder=Predvolené poradie triedenia
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Sendings číslovanie moduly
 SendingsAbility=Podpora prepravných listov pre dodávky zákazníkom
 NoNeedForDeliveryReceipts=Vo väčšine prípadov sa prepravné listy používajú ako listy pre dodávky zákazníkom (zoznam produktov na odoslanie), ako aj listy, ktoré prijíma a podpisuje zákazník. Potvrdenie o doručení produktu je preto duplicitná funkcia a je zriedka aktivovaná.
 FreeLegalTextOnShippings=Pozámka pre doručovateľa
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produkty dodávky príjem číslovanie modul
 DeliveryOrderModel=Produkty dodávky prijatie modelu
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Voľný text na potvrdenie o doručení
 ##### FCKeditor #####
 AdvancedEditor=Rozšírené editor
 ActivateFCKeditor=Aktivácia pokročilé editor pre:
-FCKeditorForNotePublic=WYSIWYG vytvorenie/edícia poľa „verejné poznámky“ prvkov
-FCKeditorForNotePrivate=WYSIWYG vytvorenie/edícia poľa "privátne poznámky" prvkov
-FCKeditorForCompany=WYSIWYG vytvorenie/edícia poľa popisu prvkov (okrem produktov/služieb)
-FCKeditorForProductDetails=WYSIWYG vytváranie/edícia popisu produktov alebo riadkov pre objekty (riadky ponúk, objednávok, faktúr, atď...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Upozornenie: Použitie tejto možnosti v tomto prípade sa vážne neodporúča, pretože môže spôsobiť problémy so špeciálnymi znakmi a formátovaním stránky pri vytváraní súborov PDF.
-FCKeditorForMailing= WYSIWYG vytváranie/edícia pre hromadné e-maily (Nástroje->e-maily)
-FCKeditorForUserSignature=WYSIWYG vytvorenie/edícia užívateľského podpisu
-FCKeditorForMail=Vytvorenie/edícia WYSIWYG pre všetku poštu (okrem Nástroje->e-maily)
-FCKeditorForTicket=Vytvorenie/edícia WYSIWYG pre vstupenky
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Nastavenie skladového modulu
 IfYouUsePointOfSaleCheckModule=Ak používate štandardne dodávaný modul miesta predaja (POS) alebo externý modul, váš modul POS môže toto nastavenie ignorovať. Väčšina modulov POS je štandardne navrhnutá tak, aby okamžite vytvorila faktúru a znížila zásoby bez ohľadu na tu uvedené možnosti. Ak teda potrebujete alebo nechcete mať úbytok zásob pri registrácii predaja z vášho POS, skontrolujte si aj nastavenie vášho POS modulu.
@@ -1867,7 +1874,6 @@ Buy=Kúpiť
 Sell=Predávať
 InvoiceDateUsed=Faktúra použitá dáta
 YourCompanyDoesNotUseVAT=Vaša spoločnosť bola definovaná tak, aby nepoužívala DPH (Domov - Nastavenie - Spoločnosť/Organizácia), takže neexistujú žiadne možnosti nastavenia DPH.
-AccountancyCode=Účtovný kód
 AccountancyCodeSell=Predaj účtu. kód
 AccountancyCodeBuy=Nákup účet. kód
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Pri vytváraní novej dane ponechajte začiarkavacie políčko „Automaticky vytvoriť platbu“ predvolene prázdne
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Ktoré zobrazenie chcete predvolene otvoriť pri výbere p
 AGENDA_EVENT_PAST_COLOR = Farba minulej udalosti
 AGENDA_EVENT_CURRENT_COLOR = Farba aktuálnej udalosti
 AGENDA_EVENT_FUTURE_COLOR = Farba budúcej udalosti
-AGENDA_REMINDER_BROWSER = Povoliť pripomenutie udalosti <b>v prehliadači používateľa</b> (Po dosiahnutí dátumu pripomenutia sa v prehliadači zobrazí kontextové okno. Každý používateľ môže zakázať takéto upozornenia v nastavení upozornení prehliadača).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Povoliť zvukové upozornenie
-AGENDA_REMINDER_EMAIL = Povoliť pripomenutie udalosti <b>e-mailom</b> (možnosť pripomenutia/oneskorenie možno definovať pri každej udalosti).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Poznámka: Frekvencia naplánovanej úlohy %s musí byť dostatočná na to, aby sa pripomenutie odoslalo v správnom čase.
 AGENDA_SHOW_LINKED_OBJECT = Zobraziť prepojený objekt v zobrazení agendy
 AGENDA_USE_EVENT_TYPE = Používať typy udalostí (spravované v menu Nastavenie -> Slovníky -> Typ udalostí programu)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Automaticky nastaviť túto predvolenú hodnotu pre typ udalosti vo formulári na vytvorenie udalosti
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Kľúč povoliť export odkaz
 PastDelayVCalExport=Neexportovať udalosti staršie ako
 SecurityKey = Bezpečnostný kľúč
@@ -2006,7 +2017,7 @@ BackupZipWizard=Sprievodca vytvorením adresára archívu dokumentov
 SomethingMakeInstallFromWebNotPossible=Inštalácia externého modulu z webu nie je možná kôli :
 SomethingMakeInstallFromWebNotPossible2=Z tohto dôvodu je proces aktualizácie popísaný tu manuálnym procesom, ktorý môže vykonať iba privilegovaný používateľ.
 InstallModuleFromWebHasBeenDisabledContactUs=Inštalácia alebo vývoj externých modulov alebo dynamických webových stránok z aplikácie je momentálne z bezpečnostných dôvodov uzamknutý. Ak potrebujete povoliť túto funkciu, kontaktujte nás.
-InstallModuleFromWebHasBeenDisabledByFile=Inštaláciu externého modulu z aplikácie zakázal váš administrátor. Ak to chcete povoliť, musíte ho požiadať o odstránenie súboru <strong>%s</strong> vlastnosť.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Zvýrazniť riadok pre prechode kurzora
 HighlightLinesColor=Zvýrazniť farbu čiary pri prechode myšou (použite „ffffff“ pre žiadne zvýraznenie)
@@ -2036,6 +2047,7 @@ Enter0or1=Zadajte 0 alebo 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Tu zadajte medzi zložené zátvorky, zoznam čísel bajtov, ktoré predstavujú symbol meny. Napríklad: pre $ zadajte [36] - pre Brazíliu skutočný R$ [82,36] - pre EUR zadajte [8364]
 ColorFormat=Farba RGB je v HEX formáte, napr.: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Názov ikony vo formáte:<br>- image.png pre súbor obrázka do aktuálneho adresára témy<br>- image.png@module ak je súbor v adresári /img/ modulu<br>- fa-xxx pre FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size pre obrázok FontAwesome fa-xxx (s nastavenou predponou, farbou a veľkosťou)
 PositionIntoComboList=Pozícia riadku v kombinovaných zoznamoch
 SellTaxRate=Sadzba dane z obratu
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Skryť okraje v rámci adresy odosielateľa
 MAIN_PDF_NO_RECIPENT_FRAME=Skryť okraje v rámci adresy príjemcu
 MAIN_PDF_HIDE_CUSTOMER_CODE=Skryť zákaznícky kód
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Skryť názov odosielateľa/spoločnosti v bloku adresy
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Skryť platobné podmienky
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Skryť režim platby
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=Neodporúčané
 ARestrictedPath=Nejaká obmedzená cesta pre dátové súbory
 CheckForModuleUpdate=Skontrolujte aktualizácie externých modulov
 CheckForModuleUpdateHelp=Táto akcia sa pripojí k editorom externých modulov, aby skontrolovali, či je k dispozícii nová verzia.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=K dispozícii je aktualizácia
 NoExternalModuleWithUpdate=Nenašli sa žiadne aktualizácie pre externé moduly
 SwaggerDescriptionFile=Swagger API popisný súbor (napríklad na použitie s redoc)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Zobraziť dodaciu adresu
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Povinná indikácia v niektorých krajinách (Francúzsko, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=URL odkaz sociálnej siete. Pre premennú časť, ktorá obsahuje ID sociálnej siete, použite {socialid}.
 IfThisCategoryIsChildOfAnother=Ak je táto kategória potomkom inej kategórie
 DarkThemeMode=Režim tmavého motívu
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Upozornenie: Modul %s nastavil
 WarningModuleHasChangedSecurityCsrfParameter=Upozornenie: Modul %s deaktivoval zabezpečenie CSRF vašej inštancie. Táto akcia je podozrivá a vaša inštalácia už nemusí byť zabezpečená. Pre vysvetlenie kontaktujte autora modulu.
 EMailsInGoingDesc=Prichádzajúce e-maily spravuje modul %s. Ak potrebujete podporovať prichádzajúce e-maily, musíte ho povoliť a nakonfigurovať.
 MAIN_IMAP_USE_PHPIMAP=Použite knižnicu PHP-IMAP pre IMAP namiesto natívneho PHP IMAP. To tiež umožňuje použitie pripojenia OAuth2 pre IMAP (musí byť aktivovaný aj modul OAuth).
-MAIN_CHECKBOX_LEFT_COLUMN=Zobraziť stĺpec pre výber polí a riadkov vľavo (predvolene vpravo)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Predvolene nie je vytvorený. Vytvorené iba pri aktivácii modulu.
 CSSPage=CSS štýl
 Defaultfortype=Štandardné
@@ -2489,7 +2510,7 @@ AiDescription=Funkcie AI (umelá inteligencia).
 AiDescriptionLong=Poskytuje funkcie AI (Artificial Intelligence) v rôznych častiach aplikácie. Potrebujete externé rozhranie AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=Nastavenie modulu AI
 AiCustomPrompt=Vlastná výzva AI
 AI_CONFIGURATIONS_PROMPT=Vlastná výzva
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=Vlastné výzvy AI na funkcie
 EnterAnIP=Zadajte IP adresu
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang
index 16315a5ff1c..bfc1110765f 100644
--- a/htdocs/langs/sk_SK/banks.lang
+++ b/htdocs/langs/sk_SK/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Koniec zostatok
 CurrentBalance=Bežný zostatok
 FutureBalance=Budúce rovnováha
 ShowAllTimeBalance=Zobraziť rovnováhy od začiatku
-AllTime=Od začiatku
 Reconciliation=Zmierenie
 RIB=Číslo bankového účtu
 IBAN=IBAN
@@ -133,7 +132,7 @@ DeleteTransaction=Odstrániť záznam
 ConfirmDeleteTransaction=Naozaj chcete odstrániť tento záznam?
 ThisWillAlsoDeleteBankRecord=Tým sa odstráni aj vygenerovaný bankový záznam
 BankMovements=Pohyby
-PlannedTransactions=Plánované vstupy
+PlannedTransactions=Upcoming entries
 Graph=Grafy
 ExportDataset_banque_1=Bankové záznamy a výpis z účtu
 ExportDataset_banque_2=Doklad o vklade
@@ -151,7 +150,7 @@ FutureTransaction=Budúca transakcia. Nedá sa zosúladiť.
 SelectChequeTransactionAndGenerate=Vyberte/filtrujte šeky, ktoré sa majú zahrnúť do potvrdenia o vklade šeku. Potom kliknite na „Vytvoriť“.
 SelectPaymentTransactionAndGenerate=Vyberte/filtrujte dokumenty, ktoré sa majú zahrnúť do potvrdenia o vklade %s. Potom kliknite na „Vytvoriť“.
 InputReceiptNumber=Vyberte bankový výpis súvisiaci so zmierovacím konaním. Použite číselnú hodnotu, ktorú možno zoradiť
-InputReceiptNumberBis=RRRRMM alebo RRRRMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Na zlúčenie ?
 ThenCheckLinesAndConciliate=Potom skontrolujte, či riadky, ktoré sú vo výpise z účtu a potom kliknite na tlačidlo
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Ak je táto funkcia povolená, môžete si vybrať špe
 BankColorizeMovementName1=Farba pozadia pre debetný pohyb
 BankColorizeMovementName2=Farba pozadia pre pohyb kreditu
 IfYouDontReconcileDisableProperty=Ak na niektorých bankových účtoch nevykonáte bankové vyrovnania, deaktivujte na nich vlastnosť „%s“, aby ste odstránili toto varovanie.
-NoBankAccountDefined=Nie je definovaný žiadny bankový účet
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Na bankovom účte sa nenašiel žiadny záznam. Bežne k tomu dochádza, keď bol záznam manuálne vymazaný zo zoznamu transakcií na bankovom účte (napríklad pri odsúhlasovaní bankového účtu). Ďalším dôvodom je, že platba bola zaznamenaná pri deaktivácii modulu "%s".
 AlreadyOneBankAccount=Jeden bankový účet je už definovaný
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Variant súboru SEPA
diff --git a/htdocs/langs/sk_SK/blockedlog.lang b/htdocs/langs/sk_SK/blockedlog.lang
index 0d25776ad7e..0369a2697e4 100644
--- a/htdocs/langs/sk_SK/blockedlog.lang
+++ b/htdocs/langs/sk_SK/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Nemenné protokoly
 ShowAllFingerPrintsMightBeTooLong=Zobraziť všetky archivované denníky (môžu byť dlhé)
 ShowAllFingerPrintsErrorsMightBeTooLong=Zobraziť všetky neplatné archívne denníky (môžu byť dlhé)
 DownloadBlockChain=Stiahnite si odtlačky prstov
-KoCheckFingerprintValidity=Archivovaný záznam denníka nie je platný. Znamená to, že niekto (hacker?) upravil niektoré údaje tohto záznamu po jeho zaznamenaní, alebo vymazal predchádzajúci archivovaný záznam (skontrolujte, či existuje riadok s predchádzajúcim #) alebo upravil kontrolný súčet predchádzajúceho záznamu.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Archivovaný záznam denníka je platný. Údaje na tomto riadku neboli upravené a zápis nadväzuje na predchádzajúci.
 OkCheckFingerprintValidityButChainIsKo=Archivovaný protokol sa zdá byť platný v porovnaní s predchádzajúcim, ale reťaz bol predtým poškodený.
 AddedByAuthority=Uložené do vzdialeného orgánu
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Podrobnosti denníka
 ListOfTrackedEvents=Zoznam sledovaných udalostí
 Fingerprint=Odtlačok prsta
 DownloadLogCSV=Exportovať archivované denníky (CSV)
-DataOfArchivedEvent=Úplné údaje archivovanej udalosti
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Pôvodný objekt (typ %s, id %s) nie je prepojený (pozrite si stĺpec „Úplné údaje“ a získajte nezmeniteľné uložené údaje)
 BlockedLogAreRequiredByYourCountryLegislation=Legislatíva vašej krajiny môže vyžadovať modul Unalterable Logs. Vypnutie tohto modulu môže spôsobiť neplatnosť akýchkoľvek budúcich transakcií s ohľadom na zákon a používanie legálneho softvéru, pretože ich nemožno overiť daňovou kontrolou.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Modul Unalterable Logs bol aktivovaný z dôvodu legislatívy vašej krajiny. Deaktivácia tohto modulu môže spôsobiť neplatnosť akýchkoľvek budúcich transakcií s ohľadom na zákon a používanie legálneho softvéru, pretože ich nemožno overiť daňovou kontrolou.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Bol povolený systém sledovania udalostí do nezmeniteľných
 BlockedLogDisabled=Systém na sledovanie udalostí do nezmeniteľných protokolov bol po vykonaní určitého záznamu deaktivovaný. Uložili sme špeciálny odtlačok prsta na sledovanie reťaze ako prerušenej
 BlockedLogDisabledBis=Systém sledovania udalostí do nezmeniteľných protokolov bol zakázaný. Je to možné, pretože ešte nebol urobený žiadny záznam.
 LinkHasBeenDisabledForPerformancePurpose=Na účely výkonu sa za 100. riadkom nezobrazuje priamy odkaz na dokument.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Odberateľská faktúra logicky vymazaná
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Logické vymazanie platby zákazníka
 logPAYMENT_VARIOUS_CREATE=Platba (nepriradená k faktúre) bola vytvorená
 logPAYMENT_VARIOUS_DELETE=Platba (nepriradená k faktúre) logické vymazanie
 logPAYMENT_VARIOUS_MODIFY=Platba (nepriradená k faktúre) upravená
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/sk_SK/categories.lang b/htdocs/langs/sk_SK/categories.lang
index 6483c2e1abd..40e8a0a7693 100644
--- a/htdocs/langs/sk_SK/categories.lang
+++ b/htdocs/langs/sk_SK/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Oblasť značiek/kategórií kontaktu
 AccountsCategoriesArea=Oblasť značiek/kategórií bankových účtov
 ProjectsCategoriesArea=Oblasť značiek/kategórií projektu
 UsersCategoriesArea=Oblasť používateľských značiek/kategórií
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Podkategórie
 CatList=Zoznam značiek/kategórií
 CatListAll=Zoznam značiek/kategórií (všetky typy)
@@ -90,9 +91,10 @@ CategoriesSetup=Nastavenie značiek/kategórií
 CategorieRecursiv=Automaticky prepojiť s nadradenou značkou/kategóriou
 CategorieRecursivHelp=Ak je voľba zapnutá, pri pridávaní objektu do podkategórie sa objekt pridá aj do nadradených kategórií.
 AddProductServiceIntoCategory=Priraďte k produktu/službe kategóriu
-AddCustomerIntoCategory=Priraďte kategóriu zákazníkovi
-AddSupplierIntoCategory=Priraďte kategóriu dodávateľovi
-AssignCategoryTo=Priradiť kategóriu k
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Zobraziť značku/kategóriu
 ByDefaultInList=Štandardne v zozname
 ChooseCategory=Vyberte kategóriu
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Kategórie kontajnerov stránok
 KnowledgemanagementsCategoriesArea=Kategórie článku KM
 UseOrOperatorForCategories=Pre kategórie použite operátor OR
 AddObjectIntoCategory=Priradiť do kategórie
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index 35ab4f8250d..c9e73cfd26f 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -33,7 +33,7 @@ CountryIsInEEC=Krajina je v rámci Európskeho hospodárskeho spoločenstva
 PriceFormatInCurrentLanguage=Formát zobrazenia ceny v aktuálnom jazyku a mene
 ThirdPartyName=Názov tretej strany
 ThirdPartyEmail=E-mail tretej strany
-ThirdParty=Tretia strana
+ThirdParty=Treťou stranou
 ThirdParties=Tretie strany
 ThirdPartyProspects=Vyhliadky
 ThirdPartyProspectsStats=Vyhliadky
@@ -65,6 +65,7 @@ State=Štát / Provincia
 StateId=ID štátu
 StateCode=Kód štátu/provincie
 StateShort=Štát
+DepartmentBuyer=Buyer's state/province
 Region=Kraj
 Region-State=Región – Štát
 Country=Krajina
@@ -78,7 +79,7 @@ Chat=Chat
 PhonePro=Autobus. telefón
 PhonePerso=Os. telefón
 PhoneMobile=Mobilné
-No_Email=Odmietnuť hromadné e-maily
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=Poštové smerovacie číslo
 Town=Mesto
@@ -382,11 +383,12 @@ ExportCardToFormat=Export do formátu karty
 ContactNotLinkedToCompany=Kontaktu, ktorý nie je spojený s akoukoľvek treťou stranou
 DolibarrLogin=Dolibarr prihlásenie
 NoDolibarrAccess=Žiadny prístup Dolibarr
-ExportDataset_company_1=Tretie strany (firmy/nadácie/fyzické osoby) a ich majetok
-ExportDataset_company_2=Kontakty a ich vlastnosti
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Tretie strany a ich vlastnosti
 ImportDataset_company_2=Ďalšie kontakty/adresy a atribúty tretích strán
-ImportDataset_company_3=Bankové účty tretích strán
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Tretie strany Obchodní zástupcovia (priraďte obchodných zástupcov/používateľov spoločnostiam)
 PriceLevel=Cenová hladina
 PriceLevelLabels=Štítky cenovej hladiny
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Meno manažéra (výkonný riaditeľ, riaditeľ, prezident...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Zlúčiť tretie strany
-ConfirmMergeThirdparties=Naozaj chcete zlúčiť vybratú tretiu stranu s aktuálnou? Všetky prepojené objekty (faktúry, objednávky, ...) budú presunuté na aktuálnu tretiu stranu, po čom bude zvolená tretia strana vymazaná.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Tretie strany boli zlúčené
 SaleRepresentativeLogin=Prihlásenie obchodného zástupcu
 SaleRepresentativeFirstname=Krstné meno obchodného zástupcu
@@ -460,3 +462,6 @@ ExternalSystemID=ID externého systému
 IDOfPaymentInAnExternalSystem=ID platobného režimu do externého systému (ako Stripe, Paypal, ...)
 AADEWebserviceCredentials=Poverenia webovej služby AADE
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Tretia strana musí byť zákazníkom, aby povolila vytvorenie svojich bankových informácií na strane Stripe
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index e4d7a987de4..3d8f07dfaaf 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Zákazník faktúru
 PaymentSupplierInvoice=úhrada faktúry dodávateľa
 PaymentSocialContribution=Platba sociálnej/fiškálnej dane
 PaymentVat=DPH platba
-AutomaticCreationPayment=Automaticky zaznamenajte platbu
+AutomaticCreationPayment=Also record the payment
 ListPayment=Zoznam platieb
 ListOfCustomerPayments=Zoznam zákazníckych platieb
 ListOfSupplierPayments=Zoznam platieb dodávateľa
@@ -118,10 +118,14 @@ SocialContributionsPayments=Platby sociálnych/fiškálnych daní
 ShowVatPayment=Zobraziť DPH platbu
 TotalToPay=Celkom k zaplateniu
 BalanceVisibilityDependsOnSortAndFilters=Zostatok je v tomto zozname viditeľný iba vtedy, ak je tabuľka zoradená podľa %s a filtrovaná na 1 bankovom účte (bez ďalších filtrov)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Účtovný kód zákazníka
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Účtovný kód dodávateľa
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Cust. účtu. kód
 SupplierAccountancyCodeShort=Súp. účtu. kód
+UserAccountancyCodeShort=User account. code
 AccountNumber=Číslo účtu
 NewAccountingAccount=Nový účet
 Turnover=Fakturovaný obrat
@@ -129,7 +133,9 @@ TurnoverCollected=Zhromaždený obrat
 SalesTurnoverMinimum=Minimálny obrat
 ByExpenseIncome=Podľa výdavkov a príjmov
 ByThirdParties=Tretími stranami
+ByProjects=By projects
 ByUserAuthorOfInvoice=Faktúrou autorovi
+DetailedListLowercase=detailed list
 CheckReceipt=Doklad o vklade
 CheckReceiptShort=Doklad o vklade
 LastCheckReceiptShort=Najnovšie vkladové listy %s
diff --git a/htdocs/langs/sk_SK/datapolicy.lang b/htdocs/langs/sk_SK/datapolicy.lang
index a6a6432f2ab..7a24266a4d7 100644
--- a/htdocs/langs/sk_SK/datapolicy.lang
+++ b/htdocs/langs/sk_SK/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Zásady ochrany osobných údajov
 Module4100Desc = Modul na správu ochrany osobných údajov (v súlade s GDPR)
 # Administration page
 datapolicySetup = Nastavenie zásad ochrany osobných údajov modulu
-Deletion = Vymazanie údajov
-datapolicySetupPage = V závislosti od zákonov vašich krajín (príklad <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">článok 5</a> GDPR) musia byť osobné údaje uchovávané po dobu nepresahuje dobu, po ktorú sú údaje potrebné na účel, na ktorý boli zhromaždené, s výnimkou archívnych účelov.<br>Vymazanie sa vykoná automaticky po určitom čase bez udalostí (trvanie ktoré uvediete nižšie).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s mesiacov
 ONE_YEAR = 1 rok
 NB_YEARS = %s rokov
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Záujemca/zákazník
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Ani potenciálny zákazník/ani zákazník
 DATAPOLICY_CONTACT_FOURNISSEUR = Dodávateľ
 DATAPOLICY_ADHERENT = Člen
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Všetkým svojim relevantným kontaktom (ktorým ešte e-mail neprišiel a u ktorých ste nezaregistrovali nič o ich dohode s GDPR) môžete poslať GDPR email. Ak to chcete urobiť, použite nasledujúce tlačidlo.
 SendAgreement = Pošli e-maily
 AllAgreementSend = Všetky e-maily boli odoslané
 TXTLINKDATAPOLICYACCEPT = Text pre odkaz "dohoda"
 TXTLINKDATAPOLICYREFUSE = Text pre odkaz "nesúhlas"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR : Spracúvanie osobných údajov
 DATAPOLICY_consentement = Získaný súhlas so spracovaním osobných údajov
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 028a9c8b4f1..16f8f619946 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Nepodarilo sa vytvoriť adresár. Uistite sa, že webový server má užívateľ oprávnenie na zápis do adresára dokumentov Dolibarr. Ak je parameter <b>safe_mode</b> je povolené na tomto PHP, skontrolujte, či Dolibarr php súbory, vlastné pre užívateľa webového servera (alebo skupina).
 ErrorNoMailDefinedForThisUser=Žiadna pošta definované pre tohto používateľa
 ErrorSetupOfEmailsNotComplete=Nastavenie e-mailov nie je dokončené
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Aby táto funkcia fungovala, musí byť aktivovaný JavaScript. Zmeňte to v nastavení - zobrazenie.
 ErrorTopMenuMustHaveAParentWithId0=Ponuka typu &quot;top&quot; nemôže mať rodič menu. Dajte 0 do nadradenej ponuky alebo zvoliť ponuku typu &quot;vľavo&quot;.
 ErrorLeftMenuMustHaveAParentId=Ponuka typu &quot;ľavica&quot;, musí mať rodič id.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Pridať zablokovaný PHP / Apache pluginu.
 ErrorFileSizeTooLarge=Veľkosť súboru je príliš veľká alebo súbor nebol poskytnutý.
 ErrorFieldTooLong=Pole %s je príliš dlhé.
 ErrorSizeTooLongForIntType=Veľkosť príliš dlhá pre typ int (%s číslice maximum)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Veľkosť príliš dlho typu string (%s znakov maximum)
 ErrorNoValueForSelectType=Vyplňte, prosím, hodnotu zoznamu vyberte
 ErrorNoValueForCheckBoxType=Vyplňte, prosím, hodnotu checkbox zoznamu
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Bad hodnota bezpečnostného kódu. Skúste to znova s ​
 ErrorBothFieldCantBeNegative=Polia %s a %s nemôžu byť negatívna
 ErrorFieldCantBeNegativeOnInvoice=Pole <strong>%s</strong> nemôže byť na tomto type faktúry záporné. Ak potrebujete pridať zľavový riadok, najskôr vytvorte zľavu (z poľa '%s' na karte tretej strany) a aplikujte ju na faktúru.
 ErrorLinesCantBeNegativeForOneVATRate=Súčet riadkov (bez dane) nemôže byť záporný pre danú, nie nulovú sadzbu DPH (našiel sa záporný súčet pre sadzbu DPH <b>%s </b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Čiary vo vklade nemôžu byť záporné. Budete čeliť problémom, keď budete musieť spotrebovať zálohu v konečnej faktúre, ak tak urobíte.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Množstvo pre riadok do zákazníckych faktúr nemôže byť záporné
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Užívateľský účet <b>%s</b> použiť na spustenie webový server nemá oprávnenie pre ktoré
 ErrorNoActivatedBarcode=Žiaden čiarový kód aktivovaný typ
 ErrUnzipFails=Nepodarilo sa rozbaliť %s s ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Váš parameter PHP upload_max_filesize (%s) je vyšší ako parameter PHP post_max_size (%s). Toto nie je konzistentné nastavenie.
 WarningPasswordSetWithNoAccount=Pre tohto člena bolo nastavené heslo. Nebol však vytvorený žiadny používateľský účet. Takže toto heslo je uložené, ale nedá sa použiť na prihlásenie do Dolibarr. Môže byť použitý externým modulom/rozhraním, ale ak nepotrebujete definovať žiadne prihlasovacie meno ani heslo pre člena, môžete vypnúť možnosť „Spravovať prihlásenie pre každého člena“ v nastaveniach modulu člena. Ak potrebujete spravovať prihlásenie, ale nepotrebujete žiadne heslo, môžete toto pole ponechať prázdne, aby ste sa vyhli tomuto varovaniu. Poznámka: E-mail možno použiť aj ako prihlasovacie meno, ak je člen prepojený s používateľom.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = Faktúru SwissQR je možné pridať iba na faktúry nastavené na úhradu prevodom.
 SwissQrCreditorAddressInvalid = Adresa veriteľa je neplatná (je nastavené PSČ a mesto? (%s)
 SwissQrCreditorInformationInvalid = Informácie o veriteľovi sú neplatné pre IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s je už definovaný ako kontakt pr
 ErrorThisGroupIsAlreadyDefinedAsThisType=Kontakty s touto skupinou sú už definované ako kontakt pre tento typ.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/sk_SK/exports.lang b/htdocs/langs/sk_SK/exports.lang
index a071e076d18..9da2ceb0be9 100644
--- a/htdocs/langs/sk_SK/exports.lang
+++ b/htdocs/langs/sk_SK/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Názov riadka
 LineDescription=Popis linky
 LineUnitPrice=Jednotková cena linky
 LineVATRate=Sadzba DPH linky
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Množstvo pre linku
 LineTotalHT=Suma bez daň za riadok
 LineTotalTTC=Čiastka s DPH za riadok
 LineTotalVAT=Suma DPH za riadok
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Použitý typ linky (0 = produkt, 1 = služba)
 FileWithDataToImport=Súbor s dátami pre import
 FileToImport=Zdrojový súbor na import
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=Vyberte formát súboru, ktorý chcete použiť ako f
 ChooseFileToImport=Nahrajte súbor a potom kliknite na ikonu %s a vyberte súbor ako zdrojový importný súbor...
 SourceFileFormat=Zdrojový súbor
 FieldsInSourceFile=Polia v zdrojovom súbore
-FieldsInTargetDatabase=Cieľové pole v Dolibarr databáze (tučne = povinná)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Žiadne položky
 MoveField=Presuňte pole %s číslo stĺpca
 ExampleOfImportFile=Example_of_import_file
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Skontrolujte, či sa formát súboru (oddeľovače polí
 RunSimulateImportFile=Spustite simuláciu importu
 FieldNeedSource=Toto pole vyžaduje údaje zo zdrojového dokumentu
 SomeMandatoryFieldHaveNoSource=Niektoré povinné polia nemajú zdroje z dátového súboru
-InformationOnSourceFile=Informácie o zdrojovom súbore
-InformationOnTargetTables=Informácie o cieľových oblastiach,
+InformationOnSourceFile=Zdrojový súbor
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Prepnutie aspoň jeden zdrojový poľa v stĺpci polí pre export
 SelectFormat=Zvoľte túto importu súboru vo formáte
 RunImportFile=Importovať údaje
diff --git a/htdocs/langs/sk_SK/hrm.lang b/htdocs/langs/sk_SK/hrm.lang
index 05581494b65..3001fb05708 100644
--- a/htdocs/langs/sk_SK/hrm.lang
+++ b/htdocs/langs/sk_SK/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=Požadovaná hodnosť pre pracovný profil
-RequiredRankShort=Požadovaná hodnosť
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Pozície s týmto pracovným profilom
-EmployeeRank=Hodnosť zamestnanca za túto zručnosť
-EmployeeRankShort=Zamestnanecká hodnosť
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Zamestnanecká pozícia
 EmployeePositions=Zamestnanecké pozície
 EmployeesInThisPosition=Zamestnanci na tejto pozícii
@@ -72,6 +72,9 @@ AddSkill=Pridajte zručnosti do pracovného profilu
 RequiredSkills=Požadované zručnosti pre tento pracovný profil
 UserRank=Hodnotenie používateľa
 SkillList=Zoznam zručností
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Uložiť hodnosť
 TypeKnowHow=Know-how
 TypeHowToBe=Ako byť
@@ -95,3 +98,5 @@ NeedBusinessTravels=Potrebujete služobné cesty
 NoDescription=žiadny popis
 TheJobProfileHasNoSkillsDefinedFixBefore=Hodnotený pracovný profil tohto zamestnanca nemá definovanú žiadnu zručnosť. Pridajte zručnosti, potom odstráňte a reštartujte hodnotenie.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index 5f9622e0017..d9b3778768f 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=E-mailom
 EMailing=E-mailom
-EMailings=EMailings
+EMailings=Mass EMails
 SMSings=SMS správy
-AllEMailings=Všetky eMailings
+AllEMailings=All mass eMails
 MailCard=E-mailom kartu
 MailRecipients=Príjemcovia
 MailRecipient=Príjemca
@@ -26,19 +26,19 @@ MailFile=Priložené súbory
 MailMessage=E-mail telo
 SubjectNotIn=Nie v Predmete
 BodyNotIn=Nie v tele
-ShowEMailing=Zobraziť e-mailom
-ListOfEMailings=Zoznam emailings
-NewMailing=Nové posielanie e-mailov
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Nová sms
-EditMailing=Upraviť e-mailom
-ResetMailing=Znova e-mailom
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Odstránenie e-mailom
-PreviewMailing=Náhľad posielanie e-mailov
-CreateMailing=Vytvorenie e-mailom
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=Platné posielanie e-mailov
+ValidMailing=Valid mass Email
 MailingStatusDraft=Návrh
 MailingStatusValidated=Overené
 MailingStatusSent=Odoslané
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Všetky filtre sa musia zhodovať, aby sa e-mail zhroma
 LineInFile=Linka %s v súbore
 RecipientSelectionModules=Definované požiadavky na výber príjemcov
 MailSelectedRecipients=Vybrané príjemcovi
-MailingArea=EMailings oblasť
-LastMailings=Najnovšie e-maily %s
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Ciele štatistiky
 NbOfCompaniesContacts=Unikátny kontakty / adresy
 MailNoChangePossible=Príjemcovia pre validované rozosielanie nemožno zmeniť
-SearchAMailing=Hľadať mailing
-SendMailing=Poslať e-mailom
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Odosielateľ:
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Odoslanie e-mailu je možné vykonať z príkazového riadku. Požiadajte správcu servera, aby spustil nasledujúci príkaz na odoslanie e-mailu všetkým príjemcom:
 MailingNeedCommand2=Však môžete zaslať on-line pridaním parametra MAILING_LIMIT_SENDBYWEB s hodnotou max počet e-mailov, ktoré chcete poslať zasadnutí. K tomu, prejdite na doma - Nastavenie - Ostatné.
 ConfirmSendingEmailing=Ak chcete posielať e-maily priamo z tejto obrazovky, potvrďte, že naozaj chcete posielať e-maily teraz z vášho prehliadača?
-LimitSendingEmailing=Poznámka: Odosielanie e-mailov z webového rozhrania sa z dôvodu bezpečnosti a časového limitu vykonáva niekoľkokrát, <b>%s</b> príjemcov naraz pre každú reláciu odosielania.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Vymazať zoznam
 ToClearAllRecipientsClickHere=Kliknite tu pre vymazanie zoznamu príjemcov tohto rozosielanie
 ToAddRecipientsChooseHere=Pridajte príjemcu výberom zo zoznamu
-NbOfEMailingsReceived=Hromadné emailings obdržal
-NbOfEMailingsSend=Hromadne odoslané emaily
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID záznamu
 DeliveryReceipt=Potvrdenie doručenia.
 YouCanUseCommaSeparatorForSeveralRecipients=Môžete použiť <b>čiarový</b> oddeľovač zadať viac príjemcov.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Pre tento typ udalosti a spoločnosť nie sú plánova
 ANotificationsWillBeSent=1 automatické upozornenie bude odoslané e-mailom
 SomeNotificationsWillBeSent=%s automatické upozornenia sa budú odosielať e-mailom
 AddNewNotification=Prihláste sa na odber nového automatického e-mailového upozornenia (cieľ/udalosť)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Konfigurácia odosielania e-mailov bola nastavená na '%s'. Tento režim nie je možné použiť na odosielanie hromadných e-mailov.
 MailSendSetupIs2=Najprv musíte prejsť s účtom správcu do ponuky %sDomov - Nastavenie - E-maily%s a zmeniť parameter <strong>'%s'</strong>, aby ste mohli použiť režim '7translateb2cf2z' </span>'. V tomto režime môžete zadať nastavenie servera SMTP poskytnutého poskytovateľom internetových služieb a použiť funkciu hromadného odosielania e-mailov.
 MailSendSetupIs3=Ak máte nejaké otázky týkajúce sa nastavenia vášho SMTP servera, môžete sa spýtať na %s.
@@ -183,7 +185,7 @@ Information=Informácie
 ContactsWithThirdpartyFilter=Kontakty s filtrom tretej strany
 Unanswered=Nezodpovedané
 Answered=Odpovedané
-IsNotAnAnswer=Neodpovedá (úvodný e-mail)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Je odpoveďou na prvý e-mail
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Predvolená hodnota pre pole '%s' pri vytváraní nového kontaktu
@@ -199,6 +201,6 @@ ModelTemplate=Šablóna e-mailu
 YouCanChooseAModelForYouMailContent= Môžete si vybrať jeden z modelov šablón alebo vygenerovať model pomocou AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 687bea2f420..57a732128e0 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -37,6 +37,7 @@ Translation=Preklad
 Translations=Preklady
 CurrentTimeZone=Časové pásmo PHP (server)
 EmptySearchString=Zadajte neprázdne kritériá vyhľadávania
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Zadajte kritériá dátumu
 NoRecordFound=Nebol nájdený žiadny záznam
 NoRecordDeleted=Žiadny záznam nebol odstránený
@@ -45,6 +46,7 @@ NoError=Žiadna chyba
 Error=Chyba
 Errors=Chyby
 ErrorFieldRequired=Pole '%s 'je povinné
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Pole &quot;%s&quot; má nesprávnu hodnotu
 ErrorFileDoesNotExists=Súbor %s neexistuje
 ErrorFailedToOpenFile=Nepodarilo sa otvoriť súbor %s
@@ -308,6 +310,7 @@ DateBuild=Správa dátum zostavenia
 DatePayment=Dátum platby
 DateApprove=Dátum schválenia
 DateApprove2=Dátum schválenia (druhé schválenie)
+PendingSince=Pending since
 RegistrationDate=Dátum registrácie
 UserCreation=Používateľ stvorenia
 UserModification=Používateľ modifikácie
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Ak chcete začať
 ActionRunningShort=Prebieha
 ActionDoneShort=Hotový
 ActionUncomplete=Neúplné
-LatestLinkedEvents=Najnovšie prepojené udalosti %s
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Spoločnosť/organizácia
 Accountant=účtovník
 ContactsForCompany=Kontakty pre túto tretiu stranu
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=E-mail telo
 SendAcknowledgementByMail=Odoslať potvrdzujúci e-mail
 SendMail=Odoslať e-mail
 Email=E-mail
+EMail=E-mail
+EMails=Emails
 NoEMail=Žiadny e-mail
 AlreadyRead=Už prečítané
 NotRead=Neprečítané
@@ -793,7 +798,7 @@ Notes=Poznámky
 AddNewLine=Pridať nový riadok
 AddFile=Pridať súbor
 FreeZone=Produkt s voľným textom
-FreeLineOfType=Položka s voľným textom, zadajte:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Clone objekt s jeho hlavnými atribútmi
 ReGeneratePDF=Znovu vygenerujte PDF
 PDFMerge=PDF Merge
@@ -879,12 +884,14 @@ toward=k
 Access=Prístup
 SelectAction=Vyberte akciu
 SelectTargetUser=Vyberte cieľového používateľa/zamestnanca
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Použite Ctrl + C skopírujte do schránky
 SaveUploadedFileWithMask=Uloženie súboru na serveri s názvom <strong>&quot;%s&quot;</strong> (inak &quot;%s&quot;)
 OriginFileName=Pôvodný názov súboru
 SetDemandReason=Určiť zdroj
 SetBankAccount=Definovať bankový účet
 AccountCurrency=Mena účtu
+AccountancyCode=Accounting Code
 ViewPrivateNote=Zobraziť poznámky
 XMoreLines=%s riadk(y/ov) skrytých
 ShowMoreLines=Zobraziť viac/menej riadkov
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Naozaj chcete odstrániť %s vybraté záznamy?
 ConfirmMassClone=Hromadné potvrdenie klonovania
 ConfirmMassCloneQuestion=Vyberte projekt na klonovanie
 ConfirmMassCloneToOneProject=Klonovať do projektu %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Súvisiace objekty
 ClassifyBilled=Klasifikovať fakturované
 ClassifyUnbilled=Klasifikovať nevyúčtované
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Musíte byť prihlásený a potrebujete povolenia na zob
 Download=Stiahnuť ▼
 DownloadDocument=Stiahnite si dokument
 DownloadSignedDocument=Stiahnite si podpísaný dokument
-ActualizeCurrency=Aktualizujte kurz meny
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Fiškálny rok
 ModuleBuilder=Tvorca modulov a aplikácií
 SetMultiCurrencyCode=Nastavte menu
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Hromadné akcie
 ClickToShowHelp=Kliknutím zobrazíte pomocníka s popisom
 WebSite=webové stránky
@@ -1104,6 +1113,7 @@ PayedBy=Zaplatené
 PayedTo=Zaplatené komu
 Monthly=Mesačne
 Quarterly=Štvrťročne
+Quarter=Quarter
 Annual=Výročný
 Local=Miestne
 Remote=Diaľkové ovládanie
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Úloha
 ContactDefault_propal=Návrh
 ContactDefault_supplier_proposal=Návrh dodávateľa
 ContactDefault_ticket=Lístok
+ContactDefault_societe=Treťou stranou
 ContactAddedAutomatically=Kontakt bol pridaný z rol kontaktu tretích strán
 More=Viac
 ShowDetails=Zobraziť podrobnosti
@@ -1242,6 +1253,7 @@ CommercialAffected=Pridelený obchodný zástupca
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=Správa
+Emailing=Emailing
 Progression=Pokrok
 YourMessage=Tvoja správa
 YourMessageHasBeenReceived=Vaša správa bola prijatá. Čo najskôr vám odpovieme alebo vás budeme kontaktovať.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Pridať
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Od začiatku
+Transferred=Transferred
diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index dede567e4e5..47fb6a1f13e 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Ak sa vyžaduje predplatné, musí sa zaznamenať predp
 DeleteType=Odstrániť
 VoteAllowed=Hlasovať povolená
 Physical=Individuálne
-Moral=Corporation
-MorAndPhy=Korporácia a jednotlivec
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Znova povoliť
 ExcludeMember=Vylúčiť člena
 Exclude=Vylúčiť
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Štatistiky užívateľov podľa regiónu
 NbOfMembers=Celkový počet členov
 NbOfActiveMembers=Celkový počet aktuálnych aktívnych členov
 NoValidatedMemberYet=Žiadne overené členmi nájdených
-MembersByCountryDesc=Táto obrazovka zobrazuje štatistiky členov podľa krajín. Grafy a grafy závisia od dostupnosti služby online grafov Google, ako aj od dostupnosti funkčného internetového pripojenia.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Táto obrazovka zobrazuje štatistiky členov podľa štátu/provincií/kantónu.
 MembersByTownDesc=Táto obrazovka zobrazuje štatistiky členov podľa mesta.
 MembersByNature=Táto obrazovka zobrazuje štatistiky členov podľa povahy.
@@ -208,25 +209,25 @@ NewMemberbyWeb=Nový užívateľ pridaný. Čaká na schválenie
 NewMemberForm=Nový člen forma
 SubscriptionsStatistics=Štatistika príspevkov
 NbOfSubscriptions=Počet príspevkov
-AmountOfSubscriptions=Suma vybraná z príspevkov
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=Obrat (pre firmu), alebo rozpočet (pre nadáciu)
-DefaultAmount=Predvolená výška príspevku (používa sa len vtedy, ak nie je na úrovni typu člena definovaná žiadna suma)
-MinimumAmount=Minimálna suma (používa sa len vtedy, keď je výška príspevku voľná)
-CanEditAmount=Výšku predplatného môže určiť člen
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=Návštevník si môže vybrať/upraviť výšku svojho príspevku bez ohľadu na typ člena
 AmountIsLowerToMinimumNotice=Suma je nižšia ako minimálna suma %s
 MEMBER_NEWFORM_PAYONLINE=Po online registrácii sa automaticky prepnite na stránku online platby
 ByProperties=Od prírody
 MembersStatisticsByProperties=Štatistiky členov podľa povahy
-VATToUseForSubscriptions=Sadzba DPH, ktorá sa má použiť na príspevky
-NoVatOnSubscription=Bez DPH za príspevky
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt použitý ako riadok príspevku do faktúry: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=Meno alebo spoločnosť
 SubscriptionRecorded=Príspevok zaznamenaný
 NoEmailSentToMember=Členovi nebol odoslaný žiadny e-mail
 EmailSentToMember=E-mail odoslaný členovi na adresu %s
-SendReminderForExpiredSubscriptionTitle=Odoslať upomienku e-mailom na príspevky s vypršanou platnosťou
-SendReminderForExpiredSubscription=Poslať upomienku e-mailom členom, keď sa blíži koniec platnosti príspevku (parameter je počet dní pred koncom členstva na odoslanie upomienky. Môže to byť zoznam dní oddelených bodkočiarkou, napríklad '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Členstvo zaplatené za aktuálne obdobie (do %s)
 YouMayFindYourInvoiceInThisEmail=Faktúru nájdete v prílohe tohto e-mailu
 XMembersClosed=%s členovia zatvorení
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Tretia strana je právnická osoba, ktorá bude pou
 MemberFirstname=Meno člena
 MemberLastname=Priezvisko člena
 MemberCodeDesc=Členský kód, jedinečný pre všetkých členov
-MemberSubscriptionStartFirstDayOf=Dátum začiatku členstva zodpovedá prvému dňu a
-MemberSubscriptionStartAfter=Minimálne obdobie pred nadobudnutím platnosti dátumu začiatku predplatného s výnimkou obnovení (príklad +3 m = +3 mesiace, -5d = -5 dní, +1R = +1 rok)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Členstvo je spojené s dohodou, takže táto úprava nie je povolená.
 ConfirmMassSubsriptionCreation=Potvrďte vytvorenie predplatného
 ConfirmMassSubsriptionCreationQuestion=Naozaj chcete vytvoriť %s vybraté odbery?
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index a3740707c37..a09925e0526 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -97,7 +97,6 @@ ShowService=Zobraziť servis
 ProductsAndServicesArea=Produkty a služby oblasti
 ProductsArea=Produkt oblasť
 ServicesArea=Poskytovanie služieb v oblasti
-ListOfStockMovements=Zoznam skladových pohybov
 BuyingPrice=Nákup cenu
 PriceForEachProduct=Produkty so špecifickou cenou
 SupplierCard=Karta predajcu
@@ -145,6 +144,7 @@ WithoutDiscount=Bez zľavy
 VATRateForSupplierProduct=Tax Rate (for this vendor/product)
 DiscountQtyMin=Zľava na toto množstvo.
 NoPriceDefinedForThisSupplier=Pre tohto predajcu/produkt nie je definovaná žiadna cena/množstvo
+NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
 NoSupplierPriceDefinedForThisProduct=Pre tento produkt nie je definovaná žiadna predajná cena/množstvo
 PredefinedItem=Preddefinovaná položka
 PredefinedProducts=Predefined Product
@@ -171,7 +171,7 @@ BuyingPrices=Nákupné ceny
 CustomerPrices=Zákaznícka cena
 SuppliersPrices=Ceny predajcov
 SuppliersPricesOfProductsOrServices=Ceny dodávateľov (produktov alebo služieb)
-CustomCode=Clo|Tovar|Kód HS
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Krajina pôvodu
 RegionStateOrigin=Oblasť pôvodu
 StateOrigin=Štát|Provincia pôvodu
@@ -209,6 +209,7 @@ unitL=Litr
 unitT=ton
 unitKG=kg
 unitG=Gram
+unitGAL=galón
 unitMG=mg
 unitLB=libra
 unitOZ=unca
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Formát žiadosti je {"URL": "http://example.co
 UpdateInterval=Upraviť interval (minúty)
 LastUpdated=Najnovšia aktualizácia
 CorrectlyUpdated=Správne upravené
-PropalMergePdfProductActualFile=Súbor na pridanie do PDF Azur sú/je
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=Vybrať PDF súbory
 IncludingProductWithTag=Vrátane produktov/služieb so značkou
 DefaultPriceRealPriceMayDependOnCustomer=Základná cena, skutočná cena môže záležať podľa zákazníka
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=Množstvo linky bolo prepočítané podľa dodávat
 
 #Attributes
 Attributes=Atribúty
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Variantné atribúty
 ProductAttributes=Variantné atribúty produktov
 ProductAttributeName=Atribút variantu %s
@@ -395,6 +400,8 @@ ErrorDestinationProductNotFound=Cieľový produkt sa nenašiel
 ErrorProductCombinationNotFound=Variant produktu sa nenašiel
 ActionAvailableOnVariantProductOnly=Akcia dostupná len na variant produktu
 ProductsPricePerCustomer=Ceny produktov podľa zákazníkov
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Ďalšie atribúty (ceny dodávateľa)
 DeleteLinkedProduct=Odstráňte podriadený produkt prepojený s kombináciou
 AmountUsedToUpdateWAP=Množstvo jednotky, ktoré sa má použiť na aktualizáciu váženej priemernej ceny
@@ -403,7 +410,8 @@ PMPValueShort=WAP
 mandatoryperiod=Povinné lehoty
 mandatoryPeriodNeedTobeSet=Poznámka: Obdobie (dátum začiatku a konca) musí byť definované
 mandatoryPeriodNeedTobeSetMsgValidate=Služba vyžaduje začiatok a koniec obdobia
-mandatoryHelper=Toto začiarknite, ak chcete, aby sa pri vytváraní / overovaní faktúry, obchodnej ponuky, predajnej objednávky zobrazovala správa používateľovi bez zadania počiatočného a koncového dátumu v riadkoch s touto službou.<br>Upozorňujeme, že správa je varovaním a nie chybou blokovania.
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
+mandatoryHelper2=Note that the message is a warning and not a blocking error.
 DefaultBOM=Predvolený kusovník
 DefaultBOMDesc=Na výrobu tohto produktu sa odporúča použiť predvolený kusovník. Toto pole je možné nastaviť iba vtedy, ak je povaha produktu '%s'.
 Rank=Poradie
@@ -435,3 +443,6 @@ AllowStockMovementVariantParentHelp=V predvolenom nastavení je rodič variantu
 ConfirmSetToDraftInventory=Naozaj sa chcete vrátiť do stavu konceptu?<br>Množstvá aktuálne nastavené v inventári budú resetované.
 WarningLineProductNotToSell=Produkt alebo služba „%s“ nie je na predaj a bola klonovaná
 PriceLabel=Price label
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/sk_SK/salaries.lang b/htdocs/langs/sk_SK/salaries.lang
index 6e75051c39e..12c035f2d74 100644
--- a/htdocs/langs/sk_SK/salaries.lang
+++ b/htdocs/langs/sk_SK/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Nový plat
 AddSalary=Pridajte plat
 NewSalaryPayment=Nová platová karta
 AddSalaryPayment=Pridajte výplatu mzdy
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Výplata mzdy
 SalariesPayments=Výplaty miezd
 SalariesPaymentsOf=Platby vo výške %s
@@ -27,7 +29,7 @@ FillFieldFirst=Najprv vyplňte pole zamestnanca
 UpdateAmountWithLastSalary=Stanovte výšku posledného platu
 MakeTransferRequest=Požiadajte o prevod
 VirementOrder=Žiadosť o prevod kreditu
-BankTransferAmount=Výška kreditného prevodu
 WithdrawalReceipt=Príkaz na prevod kreditu
 OrderWaiting=Čaká na objednávku
 FillEndOfMonth=Vyplňte koniec mesiaca
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
index 56cb9c65f31..ec4589badfe 100644
--- a/htdocs/langs/sk_SK/website.lang
+++ b/htdocs/langs/sk_SK/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Tu použite zoznam iných mien/aliasov, aby sa na stránku
 WEBSITE_CSS_URL=URL alebo externý CSS dokument
 WEBSITE_CSS_INLINE=Obsah súboru CSS (spoločný pre všetky stránky)
 WEBSITE_JS_INLINE=Obsah súboru JavaScript (spoločný pre všetky stránky)
-WEBSITE_HTML_HEADER=Pridanie v spodnej časti hlavičky HTML (spoločné pre všetky stránky)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Súbor robota (robots.txt)
 WEBSITE_HTACCESS=Súbor .htaccess webovej stránky
 WEBSITE_MANIFEST_JSON=Súbor manifest.json webových stránok
@@ -56,16 +56,17 @@ ReadPerm=Čítať
 WritePerm=Napíšte
 TestDeployOnWeb=Testovať/nasadiť na webe
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Ukážka %s na novej karte.</u><br><br>%s bude obsluhovať server Dolibarr, takže nepotrebuje žiadny ďalší webový server (ako Apache, Nginx, IIS) na inštaláciu.<br>Nevhodné je, že adresy URL stránok nie sú užívateľsky prívetivé a začínajú cestou vášho Dolibarru.<br>Adresa URL poskytovaná spoločnosťou Dolibarr:<br><strong><spante'9292ec<07fecla /span></strong><br><br>Ak chcete použiť svoj vlastný externý webový server obsluhujte túto webovú stránku, vytvorte si na svojom webovom serveri virtuálneho hostiteľa, ktorý ukazuje na adresár<br><strong>%s</strong><br>potom zadajte názov tohto virtuálneho servera vo vlastnostiach tohto webu a kliknite na odkaz „Testovať/nasadiť na webe“.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=Adresa URL virtuálneho hostiteľa obsluhovaného externým webovým serverom nie je definovaná
 NoPageYet=Zatiaľ žiadne stránky
 YouCanCreatePageOrImportTemplate=Môžete vytvoriť novú stránku alebo importovať úplnú šablónu webovej lokality
 SyntaxHelp=Pomoc s konkrétnymi tipmi pre syntax
 YouCanEditHtmlSourceckeditor=Zdrojový kód HTML môžete upraviť pomocou tlačidla „Zdroj“ v editore.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Pre obrázok zdieľaný s odkazom na zdieľanie (otvorený prístup pomocou hash kľúča zdieľania súboru) je syntax:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;<span class='0906170dfb> </span><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Klonovanie stránky/kontajnera
 CloneSite=Klonovacia stránka
@@ -87,15 +88,15 @@ WebsiteAccount=Webový účet
 WebsiteAccounts=Účty webových stránok
 AddWebsiteAccount=Vytvorte si účet na webovej stránke
 BackToListForThirdParty=Späť na zoznam pre tretie strany
-DisableSiteFirst=Najprv deaktivujte webovú stránku
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Názov mojej webovej stránky
 AnotherContainer=Takto zahrniete obsah inej stránky/kontajnera (ak povolíte dynamický kód, môže sa tu vyskytnúť chyba, pretože vložený subkontajner nemusí existovať)
 SorryWebsiteIsCurrentlyOffLine=Ľutujeme, táto stránka je momentálne offline. Prosím, vráťte sa neskôr...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Povoľte tabuľku na ukladanie účtov webových stránok (prihlásenie/prihlásenie) pre každú webovú stránku / tretiu stranu
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Najprv musíte definovať predvolenú domovskú stránku
-OnlyEditionOfSourceForGrabbedContentFuture=Upozornenie: Vytvorenie webovej stránky importovaním externej webovej stránky je vyhradené pre skúsených používateľov. V závislosti od zložitosti zdrojovej stránky sa môže výsledok importu líšiť od originálu. Ak zdrojová stránka používa bežné štýly CSS alebo konfliktný JavaScript, môže to pri práci na tejto stránke poškodiť vzhľad alebo funkcie editora webových stránok. Táto metóda predstavuje rýchlejší spôsob vytvorenia stránky, ale odporúča sa vytvoriť novú stránku od začiatku alebo z navrhovanej šablóny stránky.<br>Upozorňujeme tiež, že vložený editor nemusí fungovať správnosť pri použití na prevzatej externej stránke.
-OnlyEditionOfSourceForGrabbedContent=Iba vydanie zdrojového kódu HTML je možné, ak bol obsah stiahnutý z externej lokality
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Uchopte aj nájdené obrázky do css a stránky.
 ImagesShouldBeSavedInto=Obrázky by sa mali uložiť do adresára
 WebsiteRootOfImages=Koreňový adresár pre obrázky webových stránok
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Vyberte filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Kategórie
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index a2c69f142e4..50a7218ae74 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Preverjanje celovitosti datotek je bilo uspe
 FileIntegritySomeFilesWereRemovedOrModified=Preverjanje celovitosti datotek ni uspelo. Nekatere datoteke so bile spremenjene, odstranjene ali dodane.
 GlobalChecksum=Globalna kontrolna vsota
 MakeIntegrityAnalysisFrom=Naredite analizo integritete aplikacijskih datotek iz
-LocalSignature=Vdelan lokalni podpis (manj zanesljiv)
-RemoteSignature=Oddaljeni oddaljeni podpis (bolj zanesljiv)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Manjkajoče datoteke
 FilesUpdated=Posodobljene datoteke
 FilesModified=Spremenjene datoteke
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Uporablja se samo pri nekaterih ocijah agende
 Security=Varnost
 Passwords=Gesla
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Šifrirajte geslo baze podatkov, shranjeno v conf.php. Močno priporočamo, da aktivirate to možnost.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=Za kodiranje gesla v datoteki <b>conf.php</b>, zamenjajte vrstico <br><b>$dolibarr_main_db_pass="...";</b><br>z<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Za dekodiranje gesla (izbris) v datoteki <b>conf.php</b>, zamenjajte vrstico <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>z<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Zaščitite ustvarjene datoteke PDF. To NI priporočljivo, ker prekine množično ustvarjanje PDF.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Računalniško polje
-ComputedFormulaDesc=Tukaj lahko vnesete formulo z uporabo drugih lastnosti predmeta ali katerega koli kodiranja PHP, da dobite dinamično izračunano vrednost. Uporabite lahko katero koli formulo, združljivo s PHP, vključno z "?" operator pogoja in naslednji globalni objekt: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>OPOZORILO</strong>: Če potrebujete lastnosti predmeta ni naloženo, sami prinesite predmet v svojo formulo, kot v drugem primeru.<br>Uporaba izračunanega polja pomeni, da si ne morete vnesti nobene vrednosti iz vmesnika. Če pride do sintaksne napake, formula morda ne vrne ničesar.<br><br>Primer formule:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Primer za ponovno nalaganje predmeta<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj- >velika črka / 5: '-1')<br><br>Drug primer formule za prisilno nalaganje predmeta in njegovega nadrejenega predmeta: <br>(($reloadedobj = novo opravilo($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = nov projekt( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0))? $secondloadedobj->ref: 'Nadrejeni projekt ni bil najden'
+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'
 Computedpersistent=Shranite izračunano polje
 ComputedpersistentDesc=Izračunana dodatna polja bodo shranjena v zbirki podatkov, vendar bo vrednost ponovno izračunana šele, ko bo predmet tega polja spremenjen. Če je izračunano polje odvisno od drugih objektov ali globalnih podatkov, je ta vrednost morda napačna!!
 ExtrafieldParamHelpPassword=Če pustite to polje prazno, pomeni, da bo ta vrednost shranjena BREZ šifriranja (polje je samo skrito z zvezdicami na zaslonu).<br><br>Vnesite vrednost 'dolcrypt' za kodiranje vrednosti z reverzibilnim algoritmom šifriranja. Čiste podatke je še vedno mogoče poznati in urejati, vendar so šifrirani v zbirki podatkov.<br><br>Vnesite 'auto' (ali 'md5', 'sha256', 'password_hash', ...) za uporabo privzetega algoritma za šifriranje gesla (ali md5, sha256, password_hash ...) za shranjevanje nepovratnega zgoščenega gesla v bazo podatkov (ni možnosti za pridobitev izvirne vrednosti)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Zanimiva je tudi uporaba strežnika SMTP vašega ponudnika e-poštnih storitev za pošiljanje e-pošte, tako da bodo vsa e-poštna sporočila, poslana iz aplikacije, shranjena tudi v vaš imenik »Poslano« v vašem nabiralniku.
 WarningPHPMailD=Priporočljiv protokol za pošiljanje sporočil je "SMTP".
 WarningPHPMailDbis=Če res želite ohraniti privzeto metodo »PHP« za pošiljanje e-pošte, preprosto prezrite to opozorilo ali pa jo odstranite tako, da %skliknete tukaj%s.
-WarningPHPMail2=Če mora vaš ponudnik e-pošte SMTP omejiti e-poštnega odjemalca na nekatere naslove IP (zelo redko), je to naslov IP poštnega uporabniškega agenta (MUA) za vašo aplikacijo ERP CRM: <strong> %s </strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Računovodstvo (poenostavljeno)
 Module10Desc=Enostavna računovodska poročila (dnevniki, promet) na podlagi vsebine baze podatkov. Ne uporablja nobene glavne knjige.
 Module20Name=Ponudbe
 Module20Desc=Upravljanje komercialnih ponudb
-Module22Name=Množično pošiljanje e-pošte
-Module22Desc=Upravljajte množično pošiljanje e-pošte
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energija
 Module23Desc=Nadzor porabe energije
 Module25Name=Naročila
@@ -847,10 +848,10 @@ Permission212=Naročanje linij
 Permission213=Aktiviranje linij
 Permission214=Nastavitve telefonije
 Permission215=Nastavitev ponudnikov
-Permission221=Branje e-pošiljanja
-Permission222=Kreiranje/spreminjanje e-pošiljanja (predmet, prejemnik...)
-Permission223=Potrjevanje e-pošiljanja (dovoljuje pošiljanje)
-Permission229=Brisanje e-pošiljanja
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Ogled prejemnikov in informacij
 Permission238=Ročno pošiljanje pošte
 Permission239=Izbriši pošto po potrditvi ali pošiljanju
@@ -1105,6 +1106,7 @@ DictionaryStaff=Število zaposlenih
 DictionaryAvailability=Zakasnitev dobave
 DictionaryOrderMethods=Metode naročila
 DictionarySource=Izvor ponudb/naročil
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Prilagojene skupine za poročila
 DictionaryAccountancysystem=Modeli kontnih planov
 DictionaryAccountancyJournal=Računovodski dnevniki
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Nazaj na seznam slovarjev
 TypeOfRevenueStamp=Vrsta davčne znamke
 VATManagement=Upravljanje prometnega davka
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Privzeto je predlagani prometni davek 0, kar se lahko uporablja za primere, kot so združenja, posamezniki ali mala podjetja.
 VATIsUsedExampleFR=V Franciji pomeni podjetja ali organizacije, ki imajo pravi davčni sistem (poenostavljeno real ali normal real). Sistem, v katerem se DDV prijavi.
 VATIsNotUsedExampleFR=V Franciji pomeni združenja, ki niso prijavila prometnega davka, ali podjetja, organizacije ali svobodne poklice, ki so izbrali davčni sistem mikro podjetij (prometni davek v franšizi) in plačali franšizni prometni davek brez kakršne koli napovedi prometnega davka. Ta izbira bo na računih prikazala sklic »Prometni davek se ne uporablja – art-293B CGI«.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Vrsta prometnega davka
 LTRate=Stopnja
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Glede na nastavitev davkov (glejte %s - %s - %s) vaši
 LabelUsedByDefault=Privzet naziv, če za kodo ne obstaja prevod
 LabelOnDocuments=Naslov na dokumentu
 LabelOrTranslationKey=Oznaka ali prevodni ključ
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=Prikaži številko DDV stranke/prodajalca v kombiniranih seznamih.
 AddAdressInList=Prikažite naslov stranke/prodajalca v kombiniranih seznamih.<br>Tretje osebe bodo prikazane z obliko imena »The Big Company corp. - 21 jump street 123456 Big town - USA« namesto » The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Vprašajte partnerja za željeni način pošiljanja.
-FieldEdition=%s premenjenih polj
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Primer: +2 (uporabite samo, če se pojavijo težave s časovno cono)
 GetBarCode=Pridobi črtno kodo
 NumberingModules=Modeli oštevilčenja
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Vsili datum računa kot datum potrditve
 SuggestedPaymentModesIfNotDefinedInInvoice=Privzeto predlagan način plačila na računu, če ni določen na računu
 SuggestPaymentByRIBOnAccount=Predlagajte plačilo z dvigom na račun
 SuggestPaymentByChequeToAddress=Predlagajte plačilo s čekom na
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Poljubno besedilo na računu
 WatermarkOnDraftInvoices=Vodni žig na osnutku računa (nič, če je prazno)
 PaymentsNumberingModule=Model številčenja plačil
@@ -1718,6 +1723,7 @@ CompressionOfResources=Kompresija HTTP odgovorov
 CompressionOfResourcesDesc=Na primer z uporabo direktive Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Taka avtomatska zaznava ni možna v trenutnem brskalniku
 DefaultValuesDesc=Tukaj lahko določite privzeto vrednost, ki jo želite uporabiti pri ustvarjanju novega zapisa, in/ali privzete filtre ali vrstni red razvrščanja, ko navajate zapise.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Privzete vrednosti (za uporabo na obrazcih)
 DefaultSearchFilters=Privzeti iskalni filtri
 DefaultSortOrder=Privzeti vrstni redi
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Moduli za številčenje pošiljk
 SendingsAbility=Podpora poslanih dokumentov za dobavo kupcem
 NoNeedForDeliveryReceipts=V večini primerov se odpremni listi uporabljajo tako kot listi za dostavo strank (seznam izdelkov za pošiljanje) kot listi, ki jih stranka prejme in podpiše. Zato je potrdilo o dostavi izdelka podvojena funkcija in se redko aktivira.
 FreeLegalTextOnShippings=Prosti tekst na pošiljkah
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Modul za številčenje dobavnic
 DeliveryOrderModel=Obrazci dobavnic
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Poljubno besedilo na odpremnici
 ##### FCKeditor #####
 AdvancedEditor=Napredni urejevalnik
 ActivateFCKeditor=Aktiviranje FCKeditor za:
-FCKeditorForNotePublic=WYSIWYG izdelava/izdaja polja "javne opombe" elementov
-FCKeditorForNotePrivate=WYSIWYG izdelava/izdaja polja "zasebne opombe" elementov
-FCKeditorForCompany=WYSIWYG izdelava/izdaja polja opis elementov (razen izdelkov/storitev)
-FCKeditorForProductDetails=WYSIWYG izdelava/izdaja opisa izdelkov ali vrstic za objekte (vrstice predlogov, naročil, računov, itd...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Opozorilo: uporaba te možnosti v tem primeru resno ni priporočljiva, saj lahko povzroči težave s posebnimi znaki in oblikovanjem strani pri ustvarjanju datotek PDF.
-FCKeditorForMailing= Ustvarjanje/izdaja WYSIWYG za množično pošiljanje e-pošte (Orodja->e-poštno pošiljanje)
-FCKeditorForUserSignature=WYSIWYG ustvarjanje/izdaja uporabniškega podpisa
-FCKeditorForMail=Ustvarjanje/izdaja WYSIWYG za vso pošto (razen Orodja->e-pošta)
-FCKeditorForTicket=Ustvarjanje/izdaja WYSIWYG za vstopnice
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Nastavitev zalog modula
 IfYouUsePointOfSaleCheckModule=Če uporabljate privzeti modul prodajnega mesta (POS) ali zunanji modul, bo vaš modul POS to nastavitev morda prezrl. Večina POS modulov je privzeto zasnovanih tako, da takoj ustvarijo račun in zmanjšajo zalogo ne glede na možnosti tukaj. Torej, če želite ali ne želite imeti zmanjšanja zalog pri registraciji prodaje iz vašega POS-a, preverite tudi nastavitev svojega POS modula.
@@ -1867,7 +1874,6 @@ Buy=Nakup
 Sell=Prodaja
 InvoiceDateUsed=Uporabljen datum računa
 YourCompanyDoesNotUseVAT=Za vaše podjetje je bilo določeno, da ne uporablja DDV (Domača stran - Nastavitev - Podjetje/organizacija), zato ni možnosti DDV za nastavitev.
-AccountancyCode=Računovodski kodeks
 AccountancyCodeSell=Računovodska koda prodaje
 AccountancyCodeBuy=Računovodska koda nabave
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Pri ustvarjanju novega davka naj bo potrditveno polje »Samodejno ustvari plačilo« privzeto prazno
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Kateri pogled želite privzeto odpreti, ko izberete meni D
 AGENDA_EVENT_PAST_COLOR = Barva preteklih dogodkov
 AGENDA_EVENT_CURRENT_COLOR = Barva trenutnega dogodka
 AGENDA_EVENT_FUTURE_COLOR = Barva prihodnjega dogodka
-AGENDA_REMINDER_BROWSER = Omogoči opomnik dogodka <b> v brskalniku uporabnika </b> (Ko je dosežen datum opomnika, brskalnik prikaže pojavno okno. Vsak uporabnik lahko onemogoči takšna obvestila v nastavitvi obvestil brskalnika).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Omogoči zvočno obvestilo
-AGENDA_REMINDER_EMAIL = Omogoči opomnik za dogodek <b> po e-pošti </b> (možnost opomnika/zakasnitve je mogoče določiti za vsak dogodek).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Opomba: Pogostost načrtovanega opravila %s mora biti zadostna, da zagotovite, da so opomini poslani v pravem trenutku.
 AGENDA_SHOW_LINKED_OBJECT = Prikaži povezani predmet v pogledu dnevnega reda
 AGENDA_USE_EVENT_TYPE = Uporaba vrst dogodkov (upravlja se v meniju Nastavitve -> Slovarji -> Vrsta dogodkov dnevnega reda)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Samodejno nastavi to privzeto vrednost za vrsto dogodka v obrazcu za ustvarjanje dogodka
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Ključ za avtorizacijo izvoznega linka
 PastDelayVCalExport=Ne izvažaj dogodekov, starejših od
 SecurityKey = Varnostni ključ
@@ -2006,7 +2017,7 @@ BackupZipWizard=Čarovnik za izdelavo imenika arhiva dokumentov
 SomethingMakeInstallFromWebNotPossible=Instalacija eksternega modula s spletnega vmesnika ni možna zaradi naslednjega razloga:
 SomethingMakeInstallFromWebNotPossible2=Iz tega razloga je postopek nadgradnje, opisan tukaj, ročni postopek, ki ga lahko izvede samo privilegirani uporabnik.
 InstallModuleFromWebHasBeenDisabledContactUs=Namestitev ali razvoj zunanjih modulov ali dinamičnih spletnih mest iz aplikacije je trenutno zaklenjena zaradi varnosti. Prosimo, kontaktirajte nas, če želite omogočiti to funkcijo.
-InstallModuleFromWebHasBeenDisabledByFile=Instalacijo zunanjega modula iz aplikacije je onemogočil vaš administrator. Prositi ga morate, naj odstrani datoteko <strong>%s</strong>, da bi omogočil to funkcijo.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Če želite namestiti ali zgraditi zunanji modul iz aplikacije, morate datoteke modula shraniti v imenik <strong> %s </strong>. Če želite, da ta imenik obdela Dolibarr, morate nastaviti svoj <strong> conf/conf.php </strong>, da dodate 2 vrstici direktive: <br> <strong> $dolibarr_main_url_root_alt='/custom'; </strong> <br> <strong> $dolibarr_main_document_root_alt='%s/custom'; </strong>
 HighlightLinesOnMouseHover=Osvetli vrstice tabele, preko katerih je šla miška
 HighlightLinesColor=Označite barvo črte, ko gre miška čez (uporabite 'ffffff', če ne označite)
@@ -2036,6 +2047,7 @@ Enter0or1=Vnesite 0 ali 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Tukaj med oklepaji vnesite seznam številk bajtov, ki predstavljajo simbol valute. Na primer: za $ vnesite [36] - za brazilske realne R$ [82,36] - za € vnesite [8364]
 ColorFormat=Barva RGB je v formatu HEX, npr.: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Ime ikone v obliki zapisa:<br>- image.png za slikovno datoteko v trenutni imenik tem<br>- image.png@module če je datoteka v imeniku /img/ modula<br>- fa-xxx za sliko FontAwesome fa-xxx<br>- fontawesome_xxx_fa_color_size za sliko FontAwesome fa-xxx (z nastavljeno predpono, barvo in velikostjo)
 PositionIntoComboList=Položaj vrstice v kombiniranih seznamih
 SellTaxRate=Stopnja prometnega davka
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Skrij obrobe okvirja naslova pošiljatelja
 MAIN_PDF_NO_RECIPENT_FRAME=Skrij obrobe okvirja naslova prejemnika
 MAIN_PDF_HIDE_CUSTOMER_CODE=Skrij kodo stranke
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Skrij ime pošiljatelja/podjetja v naslovnem bloku
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Skrij plačilne pogoje
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Skrij način plačila
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=Ni priporočljivo
 ARestrictedPath=Neka omejena pot za podatkovne datoteke
 CheckForModuleUpdate=Preverite posodobitve zunanjih modulov
 CheckForModuleUpdateHelp=To dejanje bo vzpostavilo povezavo z urejevalniki zunanjih modulov in preverilo, ali je na voljo nova različica.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Na voljo je posodobitev
 NoExternalModuleWithUpdate=Za zunanje module ni bilo najdenih posodobitev
 SwaggerDescriptionFile=Opisna datoteka Swagger API (na primer za uporabo z redoc)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Pokaži naslov za dostavo
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Obvezna navedba v nekaterih državah (Francija, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=URL povezava družbenega omrežja. Uporabite {socialid} za spremenljivko, ki vsebuje ID družbenega omrežja.
 IfThisCategoryIsChildOfAnother=Če je ta kategorija podrejena drugi
 DarkThemeMode=Način temne teme
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Opozorilo: modul %s je nastavil
 WarningModuleHasChangedSecurityCsrfParameter=Opozorilo: modul %s je onemogočil varnost CSRF vašega primerka. To dejanje je sumljivo in vaša namestitev morda ne bo več zavarovana. Za pojasnilo se obrnite na avtorja modula.
 EMailsInGoingDesc=Dohodno elektronsko pošto upravlja modul %s. Če morate podpirati dohodna e-poštna sporočila, ga morate omogočiti in konfigurirati.
 MAIN_IMAP_USE_PHPIMAP=Uporabite knjižnico PHP-IMAP za IMAP namesto izvornega PHP IMAP. To omogoča tudi uporabo povezave OAuth2 za IMAP (aktiviran mora biti tudi modul OAuth).
-MAIN_CHECKBOX_LEFT_COLUMN=Pokaži stolpec za izbiro polja in vrstice na levi (privzeto na desni)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Ni ustvarjeno privzeto. Ustvarjeno samo ob aktivaciji modula.
 CSSPage=Slog CSS
 Defaultfortype=Privzeto
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang
index df02e128e3b..f49e13fea2b 100644
--- a/htdocs/langs/sl_SI/banks.lang
+++ b/htdocs/langs/sl_SI/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Končno stanje
 CurrentBalance=Trenutno stanje
 FutureBalance=Bodoče stanje
 ShowAllTimeBalance=Prikaži stanje od začetka
-AllTime=Od začetka
 Reconciliation=Usklajevanje
 RIB=Transakcijski račun
 IBAN=IBAN številka
@@ -133,7 +132,7 @@ DeleteTransaction=Izbriši vnos
 ConfirmDeleteTransaction=Ali ste prepričani, da želite izbrisati ta vnos?
 ThisWillAlsoDeleteBankRecord=S tem boste izbrisali tudi ustvarjeni bančni vnos
 BankMovements=Prenosi
-PlannedTransactions=Načrtovani vpisi
+PlannedTransactions=Upcoming entries
 Graph=Grafi
 ExportDataset_banque_1=Bančni vnosi in izpisek računa
 ExportDataset_banque_2=Potrdilo o avansu
@@ -151,7 +150,7 @@ FutureTransaction=Prihodnja transakcija. Ne morem se uskladiti.
 SelectChequeTransactionAndGenerate=Izberite/filtrirajte čeke, ki naj bodo vključeni v potrdilo o pologu čeka. Nato kliknite »Ustvari«.
 SelectPaymentTransactionAndGenerate=Izberite/filtrirajte dokumente, ki naj bodo vključeni v potrdilo o pologu %s. Nato kliknite »Ustvari«.
 InputReceiptNumber=Izberite bančni izpisek, povezan s poravnavo. Uporabite številčno vrednost, ki jo je mogoče razvrstiti
-InputReceiptNumberBis=LLLLMM ali LLLLMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Da se pobota?
 ThenCheckLinesAndConciliate=Nato preveri vrstice na bančnem izpisku in klikni
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Če je ta funkcija omogočena, lahko izberete posebno b
 BankColorizeMovementName1=Barva ozadja za debetno gibanje
 BankColorizeMovementName2=Barva ozadja za gibanje kredita
 IfYouDontReconcileDisableProperty=Če za nekatere bančne račune ne izvedete bančne uskladitve, na njih onemogočite lastnost »%s«, da odstranite to opozorilo.
-NoBankAccountDefined=Bančni račun ni določen
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Na bančnem računu ni najdenega zapisa. Običajno se to zgodi, ko je bil zapis ročno izbrisan s seznama transakcij na bančnem računu (na primer med usklajevanjem bančnega računa). Drugi razlog je, da je bilo plačilo zabeleženo, ko je bil modul "%s" onemogočen.
 AlreadyOneBankAccount=En bančni račun je že določen
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Različica datoteke SEPA
diff --git a/htdocs/langs/sl_SI/blockedlog.lang b/htdocs/langs/sl_SI/blockedlog.lang
index 7a37237ba3e..e583d9794cc 100644
--- a/htdocs/langs/sl_SI/blockedlog.lang
+++ b/htdocs/langs/sl_SI/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Nespremenljivi dnevniki
 ShowAllFingerPrintsMightBeTooLong=Prikaži vse arhivirane dnevnike (morda so dolgi)
 ShowAllFingerPrintsErrorsMightBeTooLong=Prikaži vse neveljavne arhivske dnevnike (morda so dolgi)
 DownloadBlockChain=Prenesite prstne odtise
-KoCheckFingerprintValidity=Arhiviran vnos v dnevnik ni veljaven. To pomeni, da je nekdo (heker?) spremenil nekatere podatke tega zapisa, potem ko je bil posnet, ali je izbrisal prejšnji arhivirani zapis (preverite, ali obstaja ta vrstica s prejšnjim #) ali je spremenil kontrolno vsoto prejšnjega zapisa.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Arhiviran dnevniški zapis je veljaven. Podatki v tej vrstici niso bili spremenjeni in vnos sledi prejšnjemu.
 OkCheckFingerprintValidityButChainIsKo=Arhiviran dnevnik se zdi veljaven v primerjavi s prejšnjim, vendar je bila veriga prej poškodovana.
 AddedByAuthority=Shranjeno v oddaljenem organu
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Podrobnosti dnevnika
 ListOfTrackedEvents=Seznam spremljanih dogodkov
 Fingerprint=Prstni odtis
 DownloadLogCSV=Izvozi arhivirane dnevnike (CSV)
-DataOfArchivedEvent=Celotni podatki arhiviranega dogodka
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Izvirni predmet (tip %s, id %s) ni povezan (glejte stolpec »Celotni podatki«, da dobite nespremenljive shranjene podatke)
 BlockedLogAreRequiredByYourCountryLegislation=Zakonodaja vaše države morda zahteva modul Unalterable Logs. Če onemogočite ta modul, lahko morebitne prihodnje transakcije postanejo neveljavne glede na zakonodajo in uporabo zakonite programske opreme, saj jih ne more potrditi davčna revizija.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Modul Unalterable Logs je bil aktiviran zaradi zakonodaje vaše države. Če onemogočite ta modul, lahko postanejo morebitne prihodnje transakcije neveljavne glede na zakonodajo in uporabo zakonite programske opreme, saj jih davčna revizija ne more potrditi.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Sistem za sledenje dogodkov v nespremenljive dnevnike je bil o
 BlockedLogDisabled=Sistem za sledenje dogodkov v nespremenljive dnevnike je bil onemogočen, potem ko je bilo opravljeno nekaj snemanja. Shranili smo poseben prstni odtis za sledenje verigi kot zlomljeni
 BlockedLogDisabledBis=Sistem za sledenje dogodkov v nespremenljive dnevnike je onemogočen. To je mogoče, ker še ni bil narejen noben zapis.
 LinkHasBeenDisabledForPerformancePurpose=Zaradi zmogljivosti neposredna povezava do dokumenta ni prikazana po 100. vrstici.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Račun stranke logično izbrisan
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Logično brisanje plačila stranke
 logPAYMENT_VARIOUS_CREATE=Plačilo (ni dodeljeno računu) ustvarjeno
 logPAYMENT_VARIOUS_DELETE=Plačilo (ni dodeljeno računu) logično brisanje
 logPAYMENT_VARIOUS_MODIFY=Plačilo (ni dodeljeno računu) spremenjeno
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang
index 3708b595625..ad15cfb213f 100644
--- a/htdocs/langs/sl_SI/categories.lang
+++ b/htdocs/langs/sl_SI/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Področje kontaktnih oznak/kategorij
 AccountsCategoriesArea=Območje oznak/kategorij bančnih računov
 ProjectsCategoriesArea=Območje oznak/kategorij projekta
 UsersCategoriesArea=Področje uporabniških oznak/kategorij
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Podkategorije
 CatList=Seznam značk/kategorij
 CatListAll=Seznam oznak/kategorij (vse vrste)
@@ -90,9 +91,10 @@ CategoriesSetup=Nastavitev značk/kategorij
 CategorieRecursiv=Avtomatsko poveži z nadrejeno značko/kategorijo
 CategorieRecursivHelp=Če je možnost vklopljena, ko dodate predmet v podkategorijo, bo predmet dodan tudi v nadrejene kategorije.
 AddProductServiceIntoCategory=Izdelku/storitvi dodelite kategorijo
-AddCustomerIntoCategory=Dodelite kategorijo stranki
-AddSupplierIntoCategory=Dodelite kategorijo dobavitelju
-AssignCategoryTo=Dodelite kategorijo
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Pokaži značko/kategorijo
 ByDefaultInList=Privzeto na seznamu
 ChooseCategory=Izberite kategorijo
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Kategorije vsebnika strani
 KnowledgemanagementsCategoriesArea=KM članek Kategorije
 UseOrOperatorForCategories=Za kategorije uporabite operator 'ALI'
 AddObjectIntoCategory=Dodeli kategoriji
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index 5bf6aab35b6..a94ba1bbedb 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -65,6 +65,7 @@ State=Dežela/Provinca
 StateId=Osebna izkaznica
 StateCode=Koda države
 StateShort=Država
+DepartmentBuyer=Buyer's state/province
 Region=Regija
 Region-State=Regija - Država
 Country=Država
@@ -78,7 +79,7 @@ Chat=Klepetaj
 PhonePro=Poslovni telefon
 PhonePerso=Osebni telefon
 PhoneMobile=Mobilni telefon
-No_Email=Zavrnite množično pošiljanje e-pošte
+No_Email=Refuse mass emails
 Fax=Faks
 Zip=Poštna številka
 Town=Mesto
@@ -382,12 +383,12 @@ ExportCardToFormat=Izvoz podatkov v formatu
 ContactNotLinkedToCompany=Kontakt ni povezan z nobenim partnerjem
 DolibarrLogin=Uporabniško ime
 NoDolibarrAccess=Nima dostopa
-ExportDataset_company_1=Partnerji (podjetja/fundacije/fizične osebe) in njihova lastnina
-ExportDataset_company_2=Stiki in njihove lastnosti
-ExportDataset_company_3=Bančni računi partnerjev
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Dodatni stiki/naslovi in atributi partnerjev
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Partnerji in njihove lastnosti
 ImportDataset_company_2=Dodatni stiki/naslovi in atributi partnerjev
-ImportDataset_company_3=Bančni računi partnerjev
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Prodajni zastopniki partnerjev (dodelite prodajne zastopnike/uporabnike podjetjem)
 PriceLevel=Raven cene
 PriceLevelLabels=Oznake ravni cen
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Ime direktorja(ev) (CEO, direktor, predsednik...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Združi partnerje
-ConfirmMergeThirdparties=Ali ste prepričani, da želite združiti izbranega partnerja s trenutno? Vsi povezani objekti (računi, naročila, ...) bodo prestavljeni na trenutnega partnerja, nato pa bo izbrana partner izbrisan.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Partnerji so bili združeni
 SaleRepresentativeLogin=Prijava prodajnega predstavnika
 SaleRepresentativeFirstname=Ime prodajnega predstavnika
@@ -461,3 +462,6 @@ ExternalSystemID=ID zunanjega sistema
 IDOfPaymentInAnExternalSystem=ID načina plačila v zunanji sistem (kot je Stripe, Paypal, ...)
 AADEWebserviceCredentials=Poverilnice spletne storitve AADE
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Tretja oseba mora biti stranka, da dovoli ustvarjanje svojih bančnih podatkov na strani Stripe
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index 237b7903d62..01fbb54ab3b 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Plačilo računa kupca
 PaymentSupplierInvoice=plačilo prejetega računa
 PaymentSocialContribution=Plačilo socialnega/fiskalnega davka
 PaymentVat=Plačilo DDV
-AutomaticCreationPayment=Samodejno zabeleži plačilo
+AutomaticCreationPayment=Also record the payment
 ListPayment=Seznam plačil
 ListOfCustomerPayments=Seznam plačil kupcev
 ListOfSupplierPayments=Seznam plačil prodajalca
@@ -118,10 +118,14 @@ SocialContributionsPayments=Plačila socialnih/davčnih davkov
 ShowVatPayment=Prikaži plačilo DDV
 TotalToPay=Skupaj za plačilo
 BalanceVisibilityDependsOnSortAndFilters=Stanje je vidno na tem seznamu samo, če je tabela razvrščena na %s in filtrirana na 1 bančnem računu (brez drugih filtrov)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Računovodska šifra stranke
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Računovodska oznaka dobavitelja
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Cust. račun. Koda
 SupplierAccountancyCodeShort=Sup. račun. Koda
+UserAccountancyCodeShort=User account. code
 AccountNumber=Številka konta
 NewAccountingAccount=Nov konto
 Turnover=Promet fakturiran
@@ -129,7 +133,9 @@ TurnoverCollected=Zbrani promet
 SalesTurnoverMinimum=Minimalni promet
 ByExpenseIncome=Po odhodkih in prihodkih
 ByThirdParties=Po partnerjih
+ByProjects=By projects
 ByUserAuthorOfInvoice=Po avtorjih računov
+DetailedListLowercase=detailed list
 CheckReceipt=Potrdilo o avansu
 CheckReceiptShort=Potrdilo o avansu
 LastCheckReceiptShort=Najnovejša potrdila o pologu %s
diff --git a/htdocs/langs/sl_SI/datapolicy.lang b/htdocs/langs/sl_SI/datapolicy.lang
index 34b6f8ffe36..e158a33f9bd 100644
--- a/htdocs/langs/sl_SI/datapolicy.lang
+++ b/htdocs/langs/sl_SI/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Politika zasebnosti podatkov
 Module4100Desc = Modul za upravljanje zasebnosti podatkov (skladnost z GDPR)
 # Administration page
 datapolicySetup = Nastavitev pravilnika o zasebnosti podatkov modula
-Deletion = Izbris podatkov
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+DataDeletion=Izbris podatkov
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s mesecev
 ONE_YEAR = 1 leto
 NB_YEARS = %s let
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Potencialni kupec/kupec
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Niti potencialna stranka/niti stranka
 DATAPOLICY_CONTACT_FOURNISSEUR = Dobavitelj
 DATAPOLICY_ADHERENT = Član
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = E-pošto GDPR lahko pošljete vsem svojim relevantnim kontaktom (ki še niso prejeli e-pošte in za katere niste registrirali ničesar o njihovi pogodbi GDPR). Če želite to narediti, uporabite naslednji gumb.
 SendAgreement = Pošlji e-pošto
 AllAgreementSend = Vsa e-poštna sporočila so bila poslana
 TXTLINKDATAPOLICYACCEPT = Besedilo za povezavo "pogodba"
 TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR : Obdelava osebnih podatkov
 DATAPOLICY_consentement = Pridobljena privolitev za obdelavo osebnih podatkov
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index c43ab3f7af7..2ec710e81f7 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Kreiranje mape ni uspelo. Preverite, če ima uporabnik internetne strani dovoljenje za pisanje v mapo z Dolibarr dokumenti. Če je parameter <b>safe_mode</b> v tem PHP omogočen, preverite če je lastnik Dolibarr php datotek uporabnik web strežnika (ali skupina).
 ErrorNoMailDefinedForThisUser=Ta uporabnik nima določenega Email naslova
 ErrorSetupOfEmailsNotComplete=Nastavitev e-pošte ni dokončana
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Za delovanje te funkcije potrebujete aktiviran JavaScript. To spremenite v nastavitvah - zaslon.
 ErrorTopMenuMustHaveAParentWithId0='Zgoernji' meni ne more imeti nadrejenega menija. Vnesite 0 v nadrejeni meni ali izberite vrsto menija 'Levi'.
 ErrorLeftMenuMustHaveAParentId='Levi' meni mora imeti Nadrejeni ID.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=PHP/Apache vtičnik je blokiral nalaganje.
 ErrorFileSizeTooLarge=Velikost datoteke je prevelika ali datoteka ni na voljo.
 ErrorFieldTooLong=Polje %s je predolgo.
 ErrorSizeTooLongForIntType=Velikost predolgo int tip (%s številke največ)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Velikost predolgo za tip za nize (%s znakov največ)
 ErrorNoValueForSelectType=Izpolnite vrednost za izbrani seznam
 ErrorNoValueForCheckBoxType=Izpolnite vrednost za seznam potrditvenih polj
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Neveljavna varnostna koda. Poskusite znova...
 ErrorBothFieldCantBeNegative=Polja %s in %s ne more biti tako negativna
 ErrorFieldCantBeNegativeOnInvoice=Polje <strong>%s</strong> na tej vrsti računa ne more biti negativno. Če morate dodati vrstico za popust, najprej ustvarite popust (iz polja '%s' na kartici tretje osebe) in ga uporabite na računu.
 ErrorLinesCantBeNegativeForOneVATRate=Skupni znesek vrstic (brez davka) ne more biti negativen za dano stopnjo DDV, ki ni ničelna (Najdeno je negativno skupno število za stopnjo DDV <b> %s </b> %%).
-ErrorLinesCantBeNegativeOnDeposits=Vrstice v depozitu ne smejo biti negativne. Če boste to storili, se boste srečali s težavami, ko boste morali porabiti polog v končnem računu.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Količina za vrstico v računih strank ne sme biti negativna
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Uporabniški račun <b>%s</b> uporablja za izvedbo spletni strežnik nima dovoljenja za to
 ErrorNoActivatedBarcode=Noben tip črtne kode ni aktiviran
 ErrUnzipFails=Razpakiranje %s z ZipArchive ni uspelo
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Vaš PHP parameter upload_max_filesize (%s) je višji od PHP parametra post_max_size (%s). To ni dosledna nastavitev.
 WarningPasswordSetWithNoAccount=Za tega člana je bilo nastavljeno geslo. Vendar ni bil ustvarjen noben uporabniški račun. To geslo je torej shranjeno, vendar ga ni mogoče uporabiti za prijavo v Dolibarr. Lahko ga uporablja zunanji modul/vmesnik, vendar če vam ni treba določiti prijave ali gesla za člana, lahko onemogočite možnost »Upravljanje prijave za vsakega člana« v nastavitvah modula Član. Če morate upravljati prijavo, vendar ne potrebujete gesla, lahko to polje pustite prazno, da se izognete temu opozorilu. Opomba: E-pošta se lahko uporablja tudi kot prijava, če je član povezan z uporabnikom.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = Račun SwissQR je mogoče dodati samo na račune, ki so nastavljeni za plačilo s plačili s kreditnim nakazilom.
 SwissQrCreditorAddressInvalid = Naslov upnika ni veljaven (sta nastavljena poštna številka in mesto? (%s)
 SwissQrCreditorInformationInvalid = Podatki o upniku niso veljavni za IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/sl_SI/exports.lang b/htdocs/langs/sl_SI/exports.lang
index 6a9727a57e2..0b9dc6ccb16 100644
--- a/htdocs/langs/sl_SI/exports.lang
+++ b/htdocs/langs/sl_SI/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Naziv vrstice
 LineDescription=Opis vrstice
 LineUnitPrice=Cena enote v vrstici
 LineVATRate=Stopnja DDV v vrstici
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Količina za vrstico
 LineTotalHT=Znesek brez davek za vrstico
 LineTotalTTC=Znesek z davkom za vrstico
 LineTotalVAT=Znesek DDV za vrstico
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Tip vrstice (0=proizvod, 1=storitev)
 FileWithDataToImport=Datoteka s podatki za uvoz
 FileToImport=Izvorna datoteka za uvoz
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=Izberite obliko datoteke, ki jo želite uporabiti kot
 ChooseFileToImport=Naložite datoteko in kliknite ikono %s, da izberete datoteko kot izvorno uvozno datoteko ...
 SourceFileFormat=Format izvorne datoteke
 FieldsInSourceFile=Polja v izvorni datoteki
-FieldsInTargetDatabase=Ciljna polja v Dolibarr bazi podatkov (krepko=obvezno)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Ni polj
 MoveField=Premaknite kolono s polji številka %s
 ExampleOfImportFile=Primer uvozne datoteke
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Preverite, ali se format datoteke (ločila polj in nizov
 RunSimulateImportFile=Zaženite simulacijo uvoza
 FieldNeedSource=To polje zahteva podatek iz izvorne datoteke
 SomeMandatoryFieldHaveNoSource=Nekatera uvozna polja nimajo izvora v podatkovni datoteki
-InformationOnSourceFile=Informacije o izvorni datoteki
-InformationOnTargetTables=Informacije o ciljnih poljih
+InformationOnSourceFile=Izvorna datoteka
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Vklopite vsaj eno izvorno polje v koloni polj za izvoz
 SelectFormat=Izberite ta format uvozne datoteke
 RunImportFile=Uvoz podatkov
diff --git a/htdocs/langs/sl_SI/hrm.lang b/htdocs/langs/sl_SI/hrm.lang
index 51f1233531b..6a91d165f90 100644
--- a/htdocs/langs/sl_SI/hrm.lang
+++ b/htdocs/langs/sl_SI/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=Zahtevan čin za profil delovnega mesta
-RequiredRankShort=Zahtevan čin
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Položaji s temi profili delovnih mest
-EmployeeRank=Uvrstitev zaposlenega za to veščino
-EmployeeRankShort=Čin zaposlenega
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Položaj zaposlenega
 EmployeePositions=Položaji zaposlenih
 EmployeesInThisPosition=Zaposleni na tem položaju
@@ -72,6 +72,9 @@ AddSkill=Dodajte spretnosti v profil delovnega mesta
 RequiredSkills=Zahtevane veščine za ta delovni profil
 UserRank=Uporabniški rang
 SkillList=Seznam spretnosti
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Shrani uvrstitev
 TypeKnowHow=Znanje in izkušnje
 TypeHowToBe=Kako biti
@@ -95,3 +98,5 @@ NeedBusinessTravels=Potrebujete poslovna potovanja
 NoDescription=brez opisa
 TheJobProfileHasNoSkillsDefinedFixBefore=V ovrednotenem profilu delovnega mesta tega zaposlenega ni opredeljenih veščin. Dodajte veščine, nato izbrišite in znova zaženite ocenjevanje.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index 574ddbec172..83d17802680 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=E-pošta
 EMailing=E-pošta
-EMailings=E-pošta
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=Vsa e-pošta
+AllEMailings=All mass eMails
 MailCard=Kartica e-pošte
 MailRecipients=Prejemniki
 MailRecipient=Prejemnik
@@ -26,19 +26,19 @@ MailFile=Priloge
 MailMessage=Vsebina Email-a
 SubjectNotIn=Ni v temi
 BodyNotIn=Ne v telesu
-ShowEMailing=Prikaži e-sporočila
-ListOfEMailings=Seznam e-sporočil
-NewMailing=Novo e-sporočilo
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=Urejanje e-pošte
-ResetMailing=Ponovno pošiljanje e-pošte
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Brisanje e-pošte
-PreviewMailing=Predogled e-pošte
-CreateMailing=Kreiraj e-pošto
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=Potrjena e-pošta
+ValidMailing=Valid mass Email
 MailingStatusDraft=Osnutek
 MailingStatusValidated=Potrjeno
 MailingStatusSent=Poslano
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Vsi filtri se morajo ujemati, da se e-poštno sporočil
 LineInFile=%s vrstica v datoteki
 RecipientSelectionModules=Določitev zahtev za izbiro prejemnikov
 MailSelectedRecipients=Izbrani prejemniki
-MailingArea=Področje e-pošte
-LastMailings=Najnovejša e-poštna sporočila %s
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Ciljna statistika
 NbOfCompaniesContacts=Enolični kontakti podjetij
 MailNoChangePossible=Prejemnikov za potrjeno e-sporočilo ne morete spremeniti
-SearchAMailing=Iskanje e-pošte
-SendMailing=Pošiljanje e-pošte
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Poslal
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Pošiljanje elektronske pošte lahko izvedete iz ukazne vrstice. Prosite skrbnika strežnika, da zažene naslednji ukaz za pošiljanje e-pošte vsem prejemnikom:
 MailingNeedCommand2=Lahko jih seveda pošljete tudi »online«, če dodate parameter MAILING_LIMIT_SENDBYWEB z največjim številom e-sporočil, ki jih želite poslati v eni seji.
 ConfirmSendingEmailing=Če želite poslati e-pošto neposredno s tega zaslona, potrdite, da ste prepričani, da želite poslati e-pošto zdaj iz vašega brskalnika?
-LimitSendingEmailing=Opomba: Pošiljanje e-pošte preko spletnega vmesnika je večkrat izvršeno zaradi varnostnih razlogov in časovnih omejitev, <b>%s</b> prejemnikov naenkrat za vsako pošiljanje.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Prekliči seznam
 ToClearAllRecipientsClickHere=Kliknite tukaj za preklic seznama prejemnikov te e-pošte
 ToAddRecipientsChooseHere=Dodajanje prejemnikov z izbiro s seznamov
-NbOfEMailingsReceived=Število prejetih masovnih e-sporočil
-NbOfEMailingsSend=Masovno pošiljanje je izvršeno
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID zapis
 DeliveryReceipt=Dostava Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Lahko uporabite <b>vejico</b> kot ločilo pri naštevanju več prejemnikov.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Za to vrsto dogodka in podjetje ni načrtovanih samode
 ANotificationsWillBeSent=1 samodejno obvestilo bo poslano po e-pošti
 SomeNotificationsWillBeSent=%s samodejna obvestila bodo poslana po e-pošti
 AddNewNotification=Naročite se na novo samodejno e-poštno obvestilo (cilj/dogodek)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Konfiguracij pošiljanja e-pošte je bila nastavljena na '%s'. Ta način ne more biti uporabljen za masovno pošiljanje.
 MailSendSetupIs2=Najprej morate kot administrator preko menija %sDomov - Nastavitve - E-pošta%s spremeniti parameter <strong>'%s'</strong> za uporabo načina '%s'. V tem načinu lahko odprete nastavitve SMTP strežnika, ki vam jih omogoča vaš spletni oprerater in uporabite masovno pošiljanje.
 MailSendSetupIs3=Če imate vprašanja o nastavitvi SMTP strežnika, lahko vprašate %s.
@@ -183,7 +185,7 @@ Information=Informacija
 ContactsWithThirdpartyFilter=Stiki s filtrom tretjih oseb
 Unanswered=Brez odgovora
 Answered=Odgovoril
-IsNotAnAnswer=Ni odgovora (začetni e-poštni naslov)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Je odgovor na prvotno e-pošto
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Privzeta vrednost za polje '%s' pri ustvarjanju novega stika
@@ -199,6 +201,6 @@ ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 145f8cff09c..dafd65c771b 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -37,6 +37,7 @@ Translation=Prevod
 Translations=Prevodi
 CurrentTimeZone=Časovni pas PHP strežnika
 EmptySearchString=Vnesite iskalne kriterije, ki niso prazni
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Vnesite merilo za datum
 NoRecordFound=Ni najden zapis
 NoRecordDeleted=Noben zapis ni izbrisan
@@ -45,6 +46,7 @@ NoError=Ni napake
 Error=Napaka
 Errors=Napake
 ErrorFieldRequired=Polje '%s' je obvezno
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Vrednost v polju '%s' je napačna
 ErrorFileDoesNotExists=Datoteka %s ne obstaja
 ErrorFailedToOpenFile=Napaka pri odpiranju datoteke %s
@@ -308,6 +310,7 @@ DateBuild=Datum izdelave poročila
 DatePayment=Datum plačila
 DateApprove=Datum odobritve
 DateApprove2=Datum odobritve (drugi nivo)
+PendingSince=Pending since
 RegistrationDate=Datum registracije
 UserCreation=Uporabnik ustvarjanja
 UserModification=Uporabnik spremembe
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Nezačete
 ActionRunningShort=V postopku
 ActionDoneShort=Končane
 ActionUncomplete=Nepopolna
-LatestLinkedEvents=Najnovejši dogodki, povezani z %s
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Podjetje/organizacija
 Accountant=Računovodja
 ContactsForCompany=Stiki za partnerja
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=Vsebina Email-a
 SendAcknowledgementByMail=Pošlji potrditveno e-pošto
 SendMail=Pošlji e-pošto
 Email=E-pošta
+EMail=E-pošta
+EMails=E-poštna sporočila
 NoEMail=Ni email-a
 AlreadyRead=Že prebrano
 NotRead=Neprebrano
@@ -793,7 +798,7 @@ Notes=Opombe
 AddNewLine=Dodaj novo vrstico
 AddFile=Dodaj datoteko
 FreeZone=Izdelek s prostim besedilom
-FreeLineOfType=Element poljubnega besedila, tip:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Kloniraj objekt z osnovnimi atributi
 ReGeneratePDF=Znova ustvari PDF
 PDFMerge=Spoji PDF
@@ -879,12 +884,14 @@ toward=proti
 Access=Dostop
 SelectAction=Izberi akcijo
 SelectTargetUser=Izberite ciljnega uporabnika/zaposlenega
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Uporabi Ctrl+C za kopiranje na odložišče
 SaveUploadedFileWithMask=Shrani datoteko na strežnik z imenom "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Originalno ime datoteke
 SetDemandReason=Nastavi vir
 SetBankAccount=Določi bančni račun
 AccountCurrency=Valuta računa
+AccountancyCode=Računovodski kodeks
 ViewPrivateNote=Glej opombe
 XMoreLines=%s zasenčena(ih) vrstic
 ShowMoreLines=Prikaži več/manj vrstic
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Ali ste prepričani, da želite izbrisati izbrane za
 ConfirmMassClone=Potrditev množičnega kloniranja
 ConfirmMassCloneQuestion=Izberite projekt za kloniranje
 ConfirmMassCloneToOneProject=Kloniraj v projekt %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Sorodni predmeti
 ClassifyBilled=Razvrsti zaračunano
 ClassifyUnbilled=Razvrsti Nezaračunano
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Za ogled ali prenos datoteke morate biti prijavljeni in
 Download=Prenesi
 DownloadDocument=Prenesi dokument
 DownloadSignedDocument=Prenesite podpisani dokument
-ActualizeCurrency=Posodobi tečaj valute
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Fiskalno leto
 ModuleBuilder=Graditelj modulov in aplikacij
 SetMultiCurrencyCode=Nastavite valuto
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Množična dejanja
 ClickToShowHelp=Kliknite za prikaz pomoči za orodne namige
 WebSite=Spletna stran
@@ -1104,6 +1113,7 @@ PayedBy=Plačano s strani
 PayedTo=Plačano
 Monthly=Mesečno
 Quarterly=Četrtletnik
+Quarter=Quarter
 Annual=Letna
 Local=Lokalno
 Remote=Daljinsko
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Naloga
 ContactDefault_propal=Ponudba
 ContactDefault_supplier_proposal=Ponudba dobavitelja
 ContactDefault_ticket=Vstopnica
+ContactDefault_societe=Partner
 ContactAddedAutomatically=Stik je dodan iz vlog stikov tretjih oseb
 More=več
 ShowDetails=Pokaži podrobnosti
@@ -1242,6 +1253,7 @@ CommercialAffected=Dodeljen prodajni zastopnik
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=Sporočilo
+Emailing=Emailing
 Progression=Napredek
 YourMessage=Tvoje sporočilo
 YourMessageHasBeenReceived=Vaše sporočilo je bilo prejeto. Odgovorili vam bomo ali vas kontaktirali v najkrajšem možnem času.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Dodaj
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Od začetka
+Transferred=Transferred
diff --git a/htdocs/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang
index 42028233b7d..dd51c517b84 100644
--- a/htdocs/langs/sl_SI/members.lang
+++ b/htdocs/langs/sl_SI/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Če je potrebna naročnina, je treba zabeležiti naroč
 DeleteType=Izbriši
 VoteAllowed=Dovoljeno glasovanje
 Physical=Posameznik
-Moral=Corporation
-MorAndPhy=Korporacija in posameznik
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Ponovno omogoči
 ExcludeMember=Izključi člana
 Exclude=Izključi
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Statistika članov po regijah
 NbOfMembers=Skupno število članov
 NbOfActiveMembers=Skupno število trenutno aktivnih članov
 NoValidatedMemberYet=Najdeni so nepotrjeni člani
-MembersByCountryDesc=Ta zaslon prikazuje statistiko članov po državah. Grafi in diagrami so odvisni od razpoložljivosti Googlove spletne storitve grafov ter od razpoložljivosti delujoče internetne povezave.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Ta zaslon vam prikazuje statistiko članov po državi/provincah/kantonu.
 MembersByTownDesc=Ta zaslon prikazuje statistiko članov po mestih.
 MembersByNature=Ta zaslon prikazuje statistiko članov po naravi.
@@ -208,25 +209,25 @@ NewMemberbyWeb=Dodan je nov član. Čaka potrditev.
 NewMemberForm=Obrazec za nove člane
 SubscriptionsStatistics=Statistika prispevkov
 NbOfSubscriptions=Število prispevkov
-AmountOfSubscriptions=Znesek, zbran s prispevki
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=Obseg prodaje (za podjetje) ali proračun (za fundacijo)
-DefaultAmount=Privzeti znesek prispevka (uporablja se le, če na ravni vrste člana ni določen znesek)
-MinimumAmount=Najmanjši znesek (uporablja se le, če je znesek prispevka brezplačen)
-CanEditAmount=Višino članarine določi član sam
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=Obiskovalec lahko izbere/uredi višino svojega prispevka ne glede na vrsto člana
 AmountIsLowerToMinimumNotice=Znesek je nižji od minimalnega %s
 MEMBER_NEWFORM_PAYONLINE=Po spletni registraciji samodejno preklopite na stran za spletno plačilo
 ByProperties=Po naravi
 MembersStatisticsByProperties=Statistika članov po naravi
-VATToUseForSubscriptions=Stopnja DDV, ki se uporablja za prispevke
-NoVatOnSubscription=Brez DDV za prispevke
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Izdelek, ki se uporablja za vrstico prispevka na računu: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=Ime ali podjetje
 SubscriptionRecorded=Prispevek zabeležen
 NoEmailSentToMember=Članu ni bilo poslano nobeno e-poštno sporočilo
 EmailSentToMember=E-pošta je bila poslana članu na %s
-SendReminderForExpiredSubscriptionTitle=Pošlji opomnik po e-pošti za potekle prispevke
-SendReminderForExpiredSubscription=Pošlji opomnik po e-pošti članom, ko bo prispevek kmalu potekel (parameter je število dni pred koncem članstva za pošiljanje opomnika. Lahko je seznam dni, ločenih s podpičjem, na primer '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Članarina plačana za tekoče obdobje (do %s)
 YouMayFindYourInvoiceInThisEmail=Račun lahko najdete v prilogi tega e-poštnega sporočila
 XMembersClosed=%s član(-i) zaprt
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Tretja oseba je pravna oseba, ki bo navedena na ra
 MemberFirstname=Ime člana
 MemberLastname=Priimek člana
 MemberCodeDesc=Članska koda, edinstvena za vse člane
-MemberSubscriptionStartFirstDayOf=Datum začetka članstva ustreza prvemu dnevu a
-MemberSubscriptionStartAfter=Minimalno obdobje pred začetkom veljavnosti začetnega datuma naročnine, razen podaljšanj (primer +3m = +3 mesece, -5d = -5 dni, +1Y = +1 leto)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 374d97c8ea8..f4dc5a9d829 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -97,7 +97,6 @@ ShowService=Prikaži storitev
 ProductsAndServicesArea=Področje proizvodov in storitev
 ProductsArea=Področje proizvodov
 ServicesArea=Področje storitev
-ListOfStockMovements=Seznam gibanja zalog
 BuyingPrice=Nabavna cena
 PriceForEachProduct=Izdelki s posebnimi cenami
 SupplierCard=Kartica dobavitelja
@@ -145,6 +144,7 @@ WithoutDiscount=Brez popusta
 VATRateForSupplierProduct=Tax Rate (for this vendor/product)
 DiscountQtyMin=Popust za to količino.
 NoPriceDefinedForThisSupplier=Cena/količina ni določena za dobavitelja/izdelek
+NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
 NoSupplierPriceDefinedForThisProduct=Za izdelek dobavitelj ni določil cene/količino
 PredefinedItem=Vnaprej določen element
 PredefinedProducts=Vnaprej določen izdelek
@@ -171,7 +171,7 @@ BuyingPrices=Odkupne cene
 CustomerPrices=Cene za kupce
 SuppliersPrices=Dobaviteljeve cene
 SuppliersPricesOfProductsOrServices=Dobaviteljeve cene (izdelkov ali storitev)
-CustomCode=Carina|Blago |Oznaka HS
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Država izvora
 RegionStateOrigin=Regija izvora
 StateOrigin=Država|Pokrajina izvora
@@ -209,6 +209,7 @@ unitL=Liter
 unitT=ton
 unitKG=kg
 unitG=gram
+unitGAL=galona
 unitMG=mg
 unitLB=funt
 unitOZ=unča
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Format za zahtevo je {"URL": "http://example.co
 UpdateInterval=Interval posodobitve (minute)
 LastUpdated=Najnovejša posodobitev
 CorrectlyUpdated=Pravilno posodobljeno
-PropalMergePdfProductActualFile=Datoteke za dodatek k PDF Azur so/je
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=Izberi PDF datoteke
 IncludingProductWithTag=Vključno z izdelki/storitvami z oznako
 DefaultPriceRealPriceMayDependOnCustomer=Privzeta cena, dejanska cena je odvisna od kupca
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=Količina linije je bila preračunana glede na emba
 
 #Attributes
 Attributes=Atributi
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Variantni atributi
 ProductAttributes=Različni atributi za izdelke
 ProductAttributeName=Atribut različice %s
@@ -395,6 +400,8 @@ ErrorDestinationProductNotFound=Ciljni izdelek ni bil najden
 ErrorProductCombinationNotFound=Različica izdelka ni bila najdena
 ActionAvailableOnVariantProductOnly=Akcija je na voljo samo za različico izdelka
 ProductsPricePerCustomer=Cene izdelkov na stranko
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Dodatni atributi (cene dobaviteljev)
 DeleteLinkedProduct=Izbrišite podrejeni izdelek, povezan s kombinacijo
 AmountUsedToUpdateWAP=Znesek enote za posodobitev tehtane povprečne cene
@@ -403,7 +410,8 @@ PMPValueShort=UPC
 mandatoryperiod=Obvezna obdobja
 mandatoryPeriodNeedTobeSet=Opomba: Določiti je treba obdobje (začetni in končni datum).
 mandatoryPeriodNeedTobeSetMsgValidate=Storitev zahteva začetno in končno obdobje
-mandatoryHelper=Označite to, če želite sporočilo uporabniku pri ustvarjanju/potrjevanju računa, komercialnega predloga, prodajnega naročila brez vnosa začetnega in končnega datuma v vrsticah s to storitvijo. <br> Upoštevajte, da je sporočilo opozorilo in ne napaka pri blokiranju.
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
+mandatoryHelper2=Note that the message is a warning and not a blocking error.
 DefaultBOM=Privzeta kosovnica
 DefaultBOMDesc=Privzeta kosovnica, ki se priporoča za izdelavo tega izdelka. To polje je mogoče nastaviti le, če je narava izdelka '%s'.
 Rank=Rank
@@ -435,3 +443,6 @@ AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtu
 ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
 WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned
 PriceLabel=Price label
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/sl_SI/salaries.lang b/htdocs/langs/sl_SI/salaries.lang
index 568403dce25..5d456536677 100644
--- a/htdocs/langs/sl_SI/salaries.lang
+++ b/htdocs/langs/sl_SI/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Nova plača
 AddSalary=Dodajte plačo
 NewSalaryPayment=Nova plačna kartica
 AddSalaryPayment=Dodajte izplačilo plače
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Izplačilo plače
 SalariesPayments=Izplačila plač
 SalariesPaymentsOf=Izplačila plač %s
@@ -27,7 +29,7 @@ FillFieldFirst=Najprej izpolnite polje zaposlenega
 UpdateAmountWithLastSalary=Določite znesek zadnje plače
 MakeTransferRequest=Vložite zahtevo za prenos
 VirementOrder=Zahteva za prenos kredita
-BankTransferAmount=Znesek kreditnega nakazila
 WithdrawalReceipt=Nalog za nakazilo
 OrderWaiting=Čakajoče naročilo
 FillEndOfMonth=Izpolnite s koncem meseca
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang
index 50388aae013..734f150371d 100644
--- a/htdocs/langs/sl_SI/website.lang
+++ b/htdocs/langs/sl_SI/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Tukaj uporabite seznam drugih imen/vzdevkov, tako da je mog
 WEBSITE_CSS_URL=URL zunanje datoteke CSS
 WEBSITE_CSS_INLINE=Vsebina datoteke CSS (skupna vsem stranem)
 WEBSITE_JS_INLINE=Vsebina datoteke JavaScript (skupna vsem stranem)
-WEBSITE_HTML_HEADER=Dodatek na dnu glave HTML (skupno vsem stranem)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot datoteka (robots.txt)
 WEBSITE_HTACCESS=Datoteka .htaccess spletne strani
 WEBSITE_MANIFEST_JSON=Datoteka manifest.json spletnega mesta
@@ -56,16 +56,17 @@ ReadPerm=Preberite
 WritePerm=Pišite
 TestDeployOnWeb=Test/uvedba v spletu
 PreviewSiteServedByWebServer= <u> Predogled %s v novem zavihku. </u> <br> <br> %s bo stregel zunanji spletni strežnik (kot je Apache, Nginx, IIS). You must install and setup this server before to point to directory: <br>  <strong> %s </strong>  <br> URL served by external server: <br>  <strong> %s </strong>
-PreviewSiteServedByDolibarr= <u> Predogled %s v novem zavihku. </u> <br> <br> %s bo stregel strežnik Dolibarr, tako da ne potrebuje dodatnega spletnega strežnika (kot je Apache, Nginx, IIS), ki ga je treba namestiti. <br> Neprijetno je, da URL-ji strani niso uporabniku prijazni in se začnejo s potjo vašega Dolibarrja. <br> URL served by Dolibarr: <br>  <strong> %s </strong>  <br>  <br> To use your own external web server to serve this web site, create a virtual host on your web server that points on directory <br>  <strong> %s </strong>  <br> then enter the name of this virtual server v lastnostih tega spletnega mesta in kliknite na povezavo "Preizkusi/Uvedi v spletu".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL virtualnega gostitelja, ki ga streže zunanji spletni strežnik, ni definiran
 NoPageYet=Ni še nobene strani
 YouCanCreatePageOrImportTemplate=Ustvarite lahko novo stran ali uvozite celotno predlogo spletnega mesta
 SyntaxHelp=Pomoč pri posebnih nasvetih glede sintakse
 YouCanEditHtmlSourceckeditor=Izvorno kodo HTML lahko urejate z gumbom "Vir" v urejevalniku.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Za sliko, ki je v skupni rabi s povezavo za skupno rabo (odprt dostop z uporabo zgoščenega ključa za skupno rabo datoteke), je sintaksa: <br> <strong> &lt;img src="/viewimage.php?hashp=12345679012..."a0012c7dcbe087fcc0 a0a6f0fda39z071f
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Kloniraj stran/vsebnik
 CloneSite=Kloniraj spletno mesto
@@ -87,15 +88,15 @@ WebsiteAccount=Račun spletnega mesta
 WebsiteAccounts=Računi spletnih mest
 AddWebsiteAccount=Ustvari račun spletnega mesta
 BackToListForThirdParty=Nazaj na seznam za tretje osebe
-DisableSiteFirst=Najprej onemogočite spletno mesto
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Naslov moje spletne strani
 AnotherContainer=Tako vključite vsebino druge strani/vsebnika (tu lahko pride do napake, če omogočite dinamično kodo, ker vdelani podvsebnik morda ne obstaja)
 SorryWebsiteIsCurrentlyOffLine=Oprostite, to spletno mesto trenutno ni na spletu. Prosim, vrni se kasneje ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Omogoči tabelo računov spletnega mesta
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Omogočite tabelo za shranjevanje računov spletnega mesta (prijava/geslo) za vsako spletno mesto/tretjo osebo
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Najprej morate določiti privzeto domačo stran
-OnlyEditionOfSourceForGrabbedContentFuture=Opozorilo: Ustvarjanje spletne strani z uvozom zunanje spletne strani je rezervirano za izkušene uporabnike. Odvisno od kompleksnosti izvorne strani se lahko rezultat uvoza razlikuje od izvirnika. Tudi če izvorna stran uporablja običajne sloge CSS ali JavaScript v nasprotju, lahko pokvari videz ali funkcije urejevalnika spletnega mesta pri delu na tej strani. Ta metoda je hitrejši način za ustvarjanje strani, vendar je priporočljivo, da svojo novo stran ustvarite od začetka ali iz predlagane predloge strani.<br>Upoštevajte tudi, da vgrajeni urejevalnik morda ne bo deloval pravilnost pri uporabi na prejeti zunanji strani.
-OnlyEditionOfSourceForGrabbedContent=Možna je le izdaja vira HTML, če je bila vsebina povzeta z zunanjega mesta
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Zgrabite tudi slike, ki jih najdete v css in strani.
 ImagesShouldBeSavedInto=Slike je treba shraniti v imenik
 WebsiteRootOfImages=Korenski imenik za slike spletnih mest
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Odstrani filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Kategorije
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 291be875f0c..ca0c1bc7427 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Kontrolli i integritetit të skedarëve ka ka
 FileIntegritySomeFilesWereRemovedOrModified=Kontrolli i integritetit të skedarëve dështoi. Disa skedarë janë modifikuar, hequr ose shtuar.
 GlobalChecksum=Shuma kontrolluese globale
 MakeIntegrityAnalysisFrom=Bëni analizën e integritetit të skedarëve të aplikacionit nga
-LocalSignature=Nënshkrimi lokal i ngulitur (më pak i besueshëm)
-RemoteSignature=Nënshkrimi i largët (më i besueshëm)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Mungojnë skedarët
 FilesUpdated=Skedarët e përditësuar
 FilesModified=Skedarët e modifikuar
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Përdoret vetëm nga disa opsione të rendit të ditës
 Security=Siguria
 Passwords=Fjalëkalimet
 DoNotStoreClearPassword=Enkriptoni fjalëkalimet e ruajtura në bazën e të dhënave.
-MainDbPasswordFileConfEncrypted=Enkriptoni fjalëkalimin e bazës së të dhënave të ruajtur në conf.php. Rekomandohet fuqimisht të aktivizoni këtë opsion.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Mbroni skedarët PDF të krijuar. Kjo NUK rekomandohet pasi prish gjenerimin e PDF-ve në masë.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Pika gjeometrike
 ExtrafieldMultiPointGeo=Shumë Pika Gjeometrike
 ExtrafieldLinestringGeo=Linstring gjeometrik
 ExtrafieldPolygonGeo=Shumëkëndëshi gjeometrik
+ExtrafieldStars=Stars
 ComputedFormula=Fusha e llogaritur
-ComputedFormulaDesc=Këtu mund të futni një formulë duke përdorur vetitë e tjera të objektit ose ndonjë kodim PHP për të marrë një vlerë të llogaritur dinamike. Ju mund të përdorni çdo formula të pajtueshme me PHP duke përfshirë "?" operatori i gjendjes dhe objekti global vijues: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>PARALAJMËRIM</strong> nëse keni nevojë për vetitë e një objekti: nuk është ngarkuar, thjesht merre vetë objektin në formulën tënde, si në shembullin e dytë.<br>Përdorimi i një fushe të llogaritur do të thotë që nuk mund të futësh ndonjë vlerë nga ndërfaqja. Gjithashtu, nëse ka një gabim sintaksor, formula nuk mund të kthejë asgjë.<br><br>Shembull i formulës:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Shembull për të ringarkuar objektin<br>(($reloadedobj = Shoqëria e re($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->opsionet_array['options_extrafieldobj'] >kapitale / 5: '-1')<br><br>Shembull tjetër i formulës për të detyruar ngarkesën e objektit dhe objektit të tij prind: <br>(($reloadedobj = detyrë e re($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = projekt i ri( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Projekti prind nuk u gjet'
+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'
 Computedpersistent=Ruaj fushën e llogaritur
 ComputedpersistentDesc=Fushat shtesë të llogaritura do të ruhen në bazën e të dhënave, megjithatë, vlera do të rillogaritet vetëm kur objekti i kësaj fushe ndryshohet. Nëse fusha e llogaritur varet nga objekte të tjera ose të dhëna globale, kjo vlerë mund të jetë e gabuar!!
 ExtrafieldParamHelpPassword=Lënia e kësaj fushe bosh do të thotë se kjo vlerë do të ruhet PA enkriptim (fusha thjesht është fshehur me yje në ekran).<br><br>Enter vlera 'dolcrypt' për të koduar vlerën me një algoritëm të kthyeshëm enkriptimi. Të dhënat e pastra ende mund të njihen dhe modifikohen, por janë të koduara në bazën e të dhënave.<br><br>Fut 'auto' (ose 'md5', 'sha256', 'password_hash', ...) për të përdorur algoritmin e parazgjedhur të enkriptimit të fjalëkalimit (ose md5, sha256, password_hash...) për të ruajtur fjalëkalimin e hashuar jo të kthyeshëm në bazën e të dhënave (nuk ka asnjë mënyrë për të marrë vlerën origjinale)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Përdorimi i serverit SMTP të Ofruesit tuaj të Shërbimit të Email-it për të dërguar email është gjithashtu interesant, kështu që të gjitha emailet e dërguara nga aplikacioni do të ruhen gjithashtu në drejtorinë tuaj "Dërguar" të kutisë tuaj postare.
 WarningPHPMailD=Prandaj rekomandohet ndryshimi i mënyrës së dërgimit të e-maileve në vlerën "SMTP".
 WarningPHPMailDbis=Nëse vërtet dëshironi të mbani metodën e paracaktuar "PHP" për të dërguar email, thjesht shpërfilleni këtë paralajmërim ose hiqeni atë duke %sduke klikuar këtu%s.
-WarningPHPMail2=Nëse ofruesi juaj i emailit SMTP duhet të kufizojë klientin e emailit në disa adresa IP (shumë e rrallë), kjo është adresa IP e agjentit të përdoruesit të postës (MUA) për aplikacionin tuaj ERP CRM: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Kontabiliteti (i thjeshtuar)
 Module10Desc=Raporte të thjeshta kontabël (revista, qarkullim) bazuar në përmbajtjen e bazës së të dhënave. Nuk përdor asnjë tabelë të librit.
 Module20Name=Propozimet
 Module20Desc=Menaxhimi i propozimit komercial
-Module22Name=Dërgesat masive me email
-Module22Desc=Menaxhoni dërgimin me email me shumicë
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energjisë
 Module23Desc=Monitorimi i konsumit të energjisë
 Module25Name=Urdhërat e shitjes
@@ -847,10 +848,10 @@ Permission212=Linjat e porosive
 Permission213=Aktivizoni linjën
 Permission214=Vendosja e telefonisë
 Permission215=Konfigurimi i ofruesve
-Permission221=Lexoni emailet
-Permission222=Krijo/modifiko postimet elektronike (tema, marrësit...)
-Permission223=Verifikoni emailet (lejon dërgimin)
-Permission229=Fshini emailet
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Shikoni marrësit dhe informacionin
 Permission238=Dërgoni mesazhe me dorë
 Permission239=Fshini postimet pas vërtetimit ose dërgimit
@@ -1105,6 +1106,7 @@ DictionaryStaff=Numri i punonjesve
 DictionaryAvailability=Vonesa e dorëzimit
 DictionaryOrderMethods=Metodat e porositjes
 DictionarySource=Origjina e propozimeve/urdhrave
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Grupe të personalizuara për raporte
 DictionaryAccountancysystem=Modele për planin e llogarive
 DictionaryAccountancyJournal=revista të kontabilitetit
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Kthehu te lista e fjalorëve
 TypeOfRevenueStamp=Lloji i pullës tatimore
 VATManagement=Menaxhimi i Tatimit mbi Shitjet
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Si parazgjedhje, taksa e propozuar e shitjeve është 0, e cila mund të përdoret për raste si shoqata, individë ose kompani të vogla.
 VATIsUsedExampleFR=Në Francë, do të thotë kompani ose organizata që kanë një sistem fiskal të vërtetë (real i thjeshtuar ose real normal). Një sistem në të cilin deklarohet TVSH.
 VATIsNotUsedExampleFR=Në Francë, do të thotë shoqata që nuk janë deklaruar për tatimin mbi shitjen ose kompani, organizata ose profesione liberale që kanë zgjedhur sistemin fiskal të mikrondërmarrjes (Taksa e shitjes në ekskluzivitet) dhe kanë paguar një taksë të shitjes ekskluzive pa asnjë deklaratë tatimore mbi shitjen. Kjo zgjedhje do të shfaqë referencën "Taksa e papranueshme e shitjeve - art-293B e CGI" në fatura.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Lloji i taksës së shitjes
 LTRate=Vlerësoni
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), yo
 LabelUsedByDefault=Etiketa përdoret si parazgjedhje nëse nuk mund të gjendet përkthim për kodin
 LabelOnDocuments=Etiketa në dokumente
 LabelOrTranslationKey=Etiketa ose çelësi i përkthimit
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=Shfaqni numrin e TVSH-së së klientit/shitësit në listat e kombi
 AddAdressInList=Shfaq adresën e klientit/shitësit në lista të kombinuara.<br>Palët e treta do të shfaqen me një format emri të "The Big Company Corp. - 21 jump street 123456 Big town - USA" në vend të " Korporata e Kompanisë së Madhe".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Kërkoni metodën e preferuar të transportit për palët e treta.
-FieldEdition=Edicioni i fushës %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Shembull: +2 (mbushni vetëm nëse hasen probleme të kompensimit të zonës kohore)
 GetBarCode=Merrni barkodin
 NumberingModules=Modelet e numërimit
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Detyrojeni datën e faturës deri në datën e vërtetimit
 SuggestedPaymentModesIfNotDefinedInInvoice=Mënyra e sugjeruar e pagesave në faturë si parazgjedhje nëse nuk përcaktohet në faturë
 SuggestPaymentByRIBOnAccount=Sugjeroni pagesën me tërheqje në llogari
 SuggestPaymentByChequeToAddress=Sugjeroni pagesën me çek në
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Tekst falas në fatura
 WatermarkOnDraftInvoices=Filigram në draft faturat (asnjë nëse është bosh)
 PaymentsNumberingModule=Modeli i numërimit të pagesave
@@ -1718,6 +1723,7 @@ CompressionOfResources=Kompresimi i përgjigjeve HTTP
 CompressionOfResourcesDesc=Për shembull duke përdorur direktivën Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Një zbulim i tillë automatik nuk është i mundur me shfletuesit aktualë
 DefaultValuesDesc=Këtu mund të përcaktoni vlerën e paracaktuar që dëshironi të përdorni kur krijoni një rekord të ri, dhe/ose filtrat e paracaktuar ose renditjen e renditjes kur listoni të dhënat.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Vlerat e parazgjedhura (për t'u përdorur në forma)
 DefaultSearchFilters=Filtrat e parazgjedhur të kërkimit
 DefaultSortOrder=Urdhërat e parazgjedhura të renditjes
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Dërgon modulet e numërimit
 SendingsAbility=Mbështet fletët e transportit për dërgesat e klientëve
 NoNeedForDeliveryReceipts=Në shumicën e rasteve, fletët e transportit përdoren si fletë për dërgesat e klientëve (lista e produkteve për të dërguar) dhe fletët që merren dhe nënshkruhen nga klienti. Prandaj, fatura e dërgesave të produktit është një veçori e dyfishtë dhe aktivizohet rrallë.
 FreeLegalTextOnShippings=Tekst falas në dërgesat
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Moduli i numërimit të faturave të dërgesave të produkteve
 DeliveryOrderModel=Modeli i faturës së dërgesave të produkteve
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Tekst falas në faturat e dorëzimit
 ##### FCKeditor #####
 AdvancedEditor=Redaktues i avancuar
 ActivateFCKeditor=Aktivizo redaktorin e avancuar për:
-FCKeditorForNotePublic=WYSIWYG krijimi/botim i fushës "shënime publike" të elementeve
-FCKeditorForNotePrivate=WYSIWYG krijimi/edicion i fushës "shënime private" të elementeve
-FCKeditorForCompany=Krijimi/edicimi i WYSIWYG i përshkrimit të fushës së elementeve (përveç produkteve/shërbimeve)
-FCKeditorForProductDetails=Krijimi/editimi i WYSIWYG i përshkrimit të produkteve ose linjave për objektet (linjat e propozimeve, porositë, faturat, etj...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Paralajmërim: Përdorimi i këtij opsioni për këtë rast nuk rekomandohet seriozisht pasi mund të krijojë probleme me karaktere speciale dhe formatimin e faqeve gjatë ndërtimit të skedarëve PDF.
-FCKeditorForMailing= Krijimi/edicimi i WYSIWYG për emailet masive (Vegla->Email)
-FCKeditorForUserSignature=Krijimi/edicimi i WYSIWYG i nënshkrimit të përdoruesit
-FCKeditorForMail=Krijimi/edicimi i WYSIWYG për të gjitha postat (përveç Veglave->Emailing)
-FCKeditorForTicket=Krijimi/edicion i WYSIWYG për bileta
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Vendosja e modulit të aksioneve
 IfYouUsePointOfSaleCheckModule=Nëse përdorni modulin e pikës së shitjes (POS) të ofruar si parazgjedhje ose një modul të jashtëm, ky konfigurim mund të shpërfillet nga moduli juaj POS. Shumica e moduleve POS janë krijuar si parazgjedhje për të krijuar një faturë menjëherë dhe për të ulur stokun pavarësisht nga opsionet këtu. Pra, nëse keni nevojë ose jo të keni një ulje të stokut kur regjistroni një shitje nga POS-i juaj, kontrolloni gjithashtu konfigurimin e modulit tuaj POS.
@@ -1867,7 +1874,6 @@ Buy=Blej
 Sell=Shitet
 InvoiceDateUsed=Data e faturës së përdorur
 YourCompanyDoesNotUseVAT=Kompania juaj është përcaktuar të mos përdorë TVSH-në (Home - Setup - Company/Organization), kështu që nuk ka opsione të TVSH-së për konfigurim.
-AccountancyCode=Kodi i Kontabilitetit
 AccountancyCodeSell=Llogaria e shitjes. kodi
 AccountancyCodeBuy=Blini llogari. kodi
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mbajeni kutinë e zgjedhjes "Krijoni automatikisht pagesën" bosh si parazgjedhje kur krijoni një taksë të re
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Cilin pamje dëshironi të hapni si parazgjedhje kur zgjid
 AGENDA_EVENT_PAST_COLOR = Ngjyra e ngjarjes së kaluar
 AGENDA_EVENT_CURRENT_COLOR = Ngjyra aktuale e ngjarjes
 AGENDA_EVENT_FUTURE_COLOR = Ngjyra e ngjarjes së ardhshme
-AGENDA_REMINDER_BROWSER = Aktivizo rikujtuesin e ngjarjeve <b>në shfletuesin e përdoruesit</b> (Kur të arrihet data kujtese, një dritare kërcyese shfaqet nga shfletuesi. Çdo përdorues mund të çaktivizoni njoftime të tilla nga konfigurimi i njoftimeve të shfletuesit të tij).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Aktivizo njoftimin e zërit
-AGENDA_REMINDER_EMAIL = Aktivizo rikujtuesin e ngjarjeve <b>me email</b> (opsioni/vonesa e rikujtimit mund të përcaktohet në çdo ngjarje).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Shënim: Frekuenca e punës së planifikuar %s duhet të jetë e mjaftueshme për t'u siguruar që kujtimet të dërgohen në momentin e duhur.
 AGENDA_SHOW_LINKED_OBJECT = Shfaq objektin e lidhur në pamjen e rendit të ditës
 AGENDA_USE_EVENT_TYPE = Përdorni llojet e ngjarjeve (të menaxhuara në menunë Konfigurimi -> Fjalorët -> Lloji i ngjarjeve të agjendës)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Vendos automatikisht këtë vlerë të paracaktuar për llojin e ngjarjes në formën e krijimit të ngjarjes
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Çelësi për të autorizuar lidhjen e eksportit
 PastDelayVCalExport=Mos e eksportoni ngjarje më të vjetër se
 SecurityKey = Çelësi i sigurisë
@@ -2006,7 +2017,7 @@ BackupZipWizard=Wizard për të ndërtuar dosjen e arkivit të dokumenteve
 SomethingMakeInstallFromWebNotPossible=Instalimi i modulit të jashtëm nuk është i mundur nga ndërfaqja e internetit për arsyet e mëposhtme:
 SomethingMakeInstallFromWebNotPossible2=Për këtë arsye, procesi i përmirësimit i përshkruar këtu është një proces manual që mund të kryejë vetëm një përdorues i privilegjuar.
 InstallModuleFromWebHasBeenDisabledContactUs=Instalimi ose zhvillimi i moduleve të jashtme ose uebsajteve dinamike, nga aplikacioni, aktualisht është i bllokuar për qëllime sigurie. Ju lutemi na kontaktoni nëse duhet ta aktivizoni këtë veçori.
-InstallModuleFromWebHasBeenDisabledByFile=Instalimi i modulit të jashtëm nga aplikacioni është çaktivizuar nga administratori juaj. Duhet t'i kërkoni atij të heqë skedarin <strong>%s</strong> veçori.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Theksoni linjat e tabelës kur lëvizja e miut kalon
 HighlightLinesColor=Theksoni ngjyrën e rreshtit kur miu kalon sipër (përdorni 'ffffff' për të mos theksuar)
@@ -2036,6 +2047,7 @@ Enter0or1=Futni 0 ose 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Vendosni këtu midis kllapave, listën e numrit të bajtit që përfaqësojnë simbolin e monedhës. Për shembull: për $, shkruani [36] - për R$ reale të Brazilit [82,36] - për €, shkruani [8364]
 ColorFormat=Ngjyra RGB është në formatin HEX, p.sh.: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Emri i ikonës në format:<br>- image.png për një skedar imazhi në drejtorinë aktuale të temës<br>- image.png@module nëse skedari është në direktorinë /img/ të një moduli<br>- fa-xxx për një picto FontAwesome fa-xxx<br>- fontawesome_xxx_fa_color_size për një foto FontAwesome fa-xxx (me parashtesë, ngjyra dhe madhësi)
 PositionIntoComboList=Pozicioni i rreshtit në listat e kombinuara
 SellTaxRate=Norma e tatimit mbi shitjet
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Fshih kufijtë në kornizën e adresës së dërguesit
 MAIN_PDF_NO_RECIPENT_FRAME=Fshih kufijtë në kornizën e adresës së marrësit
 MAIN_PDF_HIDE_CUSTOMER_CODE=Fshih kodin e klientit
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Fshih emrin e dërguesit/kompanisë në bllokun e adresave
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Fshih kushtet e pagesave
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Fshih mënyrën e pagesës
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=Nuk rekomandohet
 ARestrictedPath=Disa shtigje të kufizuara për skedarët e të dhënave
 CheckForModuleUpdate=Kontrolloni për përditësime të moduleve të jashtme
 CheckForModuleUpdateHelp=Ky veprim do të lidhet me redaktuesit e moduleve të jashtme për të kontrolluar nëse disponohet një version i ri.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Ekziston një përditësim
 NoExternalModuleWithUpdate=Nuk u gjetën përditësime për modulet e jashtme
 SwaggerDescriptionFile=Skedari i përshkrimit të Swagger API (për shembull për përdorim me redoc)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Trego adresën e transportit
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Tregimi i detyrueshëm në disa vende (Francë, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Lidhja URL e rrjetit social. Përdorni {socialid} për pjesën e ndryshueshme që përmban ID-në e rrjetit social.
 IfThisCategoryIsChildOfAnother=Nëse kjo kategori është fëmijë i një tjetër
 DarkThemeMode=Modaliteti i temës së errët
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Paralajmërim: moduli %s ka ven
 WarningModuleHasChangedSecurityCsrfParameter=Paralajmërim: moduli %s ka çaktivizuar sigurinë CSRF të shembullit tuaj. Ky veprim është i dyshimtë dhe instalimi juaj mund të mos jetë më i siguruar. Ju lutemi kontaktoni autorin e modulit për shpjegim.
 EMailsInGoingDesc=Email-et hyrëse menaxhohen nga moduli %s. Duhet ta aktivizoni dhe konfiguroni nëse keni nevojë të mbështesni emailet hyrëse.
 MAIN_IMAP_USE_PHPIMAP=Përdorni bibliotekën PHP-IMAP për IMAP në vend të PHP IMAP amtare. Kjo gjithashtu lejon përdorimin e një lidhjeje OAuth2 për IMAP (duhet të aktivizohet gjithashtu edhe moduli OAuth).
-MAIN_CHECKBOX_LEFT_COLUMN=Trego kolonën për zgjedhjen e fushave dhe rreshtave në të majtë (në të djathtë si parazgjedhje)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Nuk është krijuar si parazgjedhje. Krijuar vetëm me aktivizimin e modulit.
 CSSPage=Stili CSS
 Defaultfortype=E paracaktuar
@@ -2489,7 +2510,7 @@ AiDescription=Karakteristikat e AI (Inteligjencës Artificiale).
 AiDescriptionLong=Ofron veçori të AI (Inteligjencës Artificiale) në pjesë të ndryshme të aplikacionit. Nevojë për API të jashtme të AI.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=Konfigurimi i modulit AI
 AiCustomPrompt=Kërkesa e personalizuar e AI
 AI_CONFIGURATIONS_PROMPT=Prompt i personalizuar
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=Kërkesat me porosi të AI për veçori
 EnterAnIP=Futni një adresë IP
 ConvertInto=Konverto në
 YouAreHere=Ti je ketu
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
index 112824ae187..75a79179714 100644
--- a/htdocs/langs/sq_AL/banks.lang
+++ b/htdocs/langs/sq_AL/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Bilanci përfundimtar
 CurrentBalance=Bilanci aktual
 FutureBalance=Bilanci i ardhshëm
 ShowAllTimeBalance=Trego balancën që në fillim
-AllTime=Që nga fillimi
 Reconciliation=Pajtimi
 RIB=Numri i llogarisë bankare
 IBAN=Numri IBAN
@@ -133,7 +132,7 @@ DeleteTransaction=Fshi hyrjen
 ConfirmDeleteTransaction=Jeni i sigurt që dëshironi ta fshini këtë hyrje?
 ThisWillAlsoDeleteBankRecord=Kjo do të fshijë gjithashtu hyrjen bankare të krijuar
 BankMovements=Lëvizjet
-PlannedTransactions=Regjistrimet e planifikuara
+PlannedTransactions=Upcoming entries
 Graph=Grafikët
 ExportDataset_banque_1=Regjistrimet bankare dhe pasqyra e llogarisë
 ExportDataset_banque_2=Mandat depozitimi
@@ -151,7 +150,7 @@ FutureTransaction=Transaksioni i ardhshëm. Në pamundësi për t'u pajtuar.
 SelectChequeTransactionAndGenerate=Zgjidh/filtro çeqet që do të përfshihen në faturën e depozitës së çekut. Pastaj, klikoni në "Krijo".
 SelectPaymentTransactionAndGenerate=Zgjidh/filtro dokumentet që do të përfshihen në faturën e depozitës %s. Pastaj, klikoni në "Krijo".
 InputReceiptNumber=Zgjidhni deklaratën bankare në lidhje me pajtimin. Përdorni një vlerë numerike të klasifikueshme
-InputReceiptNumberBis=YYYYMM ose YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Të pajtohen?
 ThenCheckLinesAndConciliate=Pastaj, kontrolloni linjat e pranishme në deklaratën bankare dhe klikoni
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Nëse ky funksion aktivizohet, mund të zgjidhni ngjyr
 BankColorizeMovementName1=Ngjyra e sfondit për lëvizjen e debitit
 BankColorizeMovementName2=Ngjyra e sfondit për lëvizjen e kredisë
 IfYouDontReconcileDisableProperty=Nëse nuk i bëni rakordimet bankare në disa llogari bankare, çaktivizoni veçorinë "%s" në to për të hequr këtë paralajmërim.
-NoBankAccountDefined=Nuk është përcaktuar asnjë llogari bankare
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Nuk u gjet asnjë regjistrim në llogarinë bankare. Zakonisht, kjo ndodh kur një regjistrim është fshirë manualisht nga lista e transaksioneve në llogarinë bankare (për shembull gjatë një rakordimi të llogarisë bankare). Një arsye tjetër është se pagesa u regjistrua kur moduli "%s" u çaktivizua.
 AlreadyOneBankAccount=Tashmë është përcaktuar një llogari bankare
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Varianti i skedarit SEPA
diff --git a/htdocs/langs/sq_AL/blockedlog.lang b/htdocs/langs/sq_AL/blockedlog.lang
index 7e070d20f1a..367a9b824e6 100644
--- a/htdocs/langs/sq_AL/blockedlog.lang
+++ b/htdocs/langs/sq_AL/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Shkrime të pandryshueshme
 ShowAllFingerPrintsMightBeTooLong=Shfaq të gjitha regjistrat e arkivuar (mund të jenë të gjata)
 ShowAllFingerPrintsErrorsMightBeTooLong=Shfaq të gjitha regjistrat e arkivave jo të vlefshme (mund të jenë të gjata)
 DownloadBlockChain=Shkarkoni gjurmët e gishtërinjve
-KoCheckFingerprintValidity=Regjistrimi i arkivuar i regjistrit nuk është i vlefshëm. Do të thotë që dikush (një haker?) ka modifikuar disa të dhëna të këtij rekord pasi është regjistruar, ose ka fshirë regjistrimin e mëparshëm të arkivuar (kontrolloni që linja me # e mëparshme ekziston) ose ka modifikuar shumën e kontrollit të regjistrimit të mëparshëm.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Regjistrimi i regjistrit të arkivuar është i vlefshëm. Të dhënat në këtë linjë nuk u modifikuan dhe hyrja ndjek atë të mëparshme.
 OkCheckFingerprintValidityButChainIsKo=Regjistri i arkivuar duket i vlefshëm në krahasim me atë të mëparshëm, por zinxhiri ishte i korruptuar më parë.
 AddedByAuthority=Ruhet në autoritet të largët
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Detajet e regjistrit
 ListOfTrackedEvents=Lista e ngjarjeve të gjurmuara
 Fingerprint=Gjurmë gishtash
 DownloadLogCSV=Eksporto regjistrat e arkivuar (CSV)
-DataOfArchivedEvent=Të dhënat e plota të ngjarjes së arkivuar
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Objekti origjinal (lloji %s, id %s) i palidhur (shih kolonën 'Të dhënat e plota' për të marrë të dhëna të ruajtura të pandryshueshme)
 BlockedLogAreRequiredByYourCountryLegislation=Moduli i Regjistrimeve të Pandryshueshme mund të kërkohet nga legjislacioni i vendit tuaj. Çaktivizimi i këtij moduli mund të bëjë të pavlefshme çdo transaksion të ardhshëm në lidhje me ligjin dhe përdorimin e softuerit ligjor pasi ato nuk mund të vërtetohen nga një kontroll tatimor.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Moduli i Regjistrimeve të Pandryshueshme u aktivizua për shkak të legjislacionit të vendit tuaj. Çaktivizimi i këtij moduli mund të bëjë të pavlefshme çdo transaksion të ardhshëm në lidhje me ligjin dhe përdorimin e softuerit ligjor pasi ato nuk mund të vërtetohen nga një kontroll tatimor.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Sistemi për të gjurmuar ngjarjet në regjistrat e pandryshue
 BlockedLogDisabled=Sistemi për të gjurmuar ngjarjet në regjistrat e pandryshueshëm është çaktivizuar pasi janë bërë disa regjistrime. Kemi ruajtur një gjurmë gishti të veçantë për të gjurmuar zinxhirin si të prishur
 BlockedLogDisabledBis=Sistemi për të gjurmuar ngjarjet në regjistrat e pandryshueshëm është çaktivizuar. Kjo është e mundur sepse ende nuk është bërë asnjë regjistrim.
 LinkHasBeenDisabledForPerformancePurpose=Për qëllime të performancës, lidhja e drejtpërdrejtë me dokumentin nuk shfaqet pas rreshtit të 100-të.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Fatura e klientit është fshirë logjikisht
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Fshirje logjike e pagesës së klientit
 logPAYMENT_VARIOUS_CREATE=Pagesa (nuk caktohet në një faturë) u krijua
 logPAYMENT_VARIOUS_DELETE=Pagesa (nuk është caktuar në një faturë) fshirje logjike
 logPAYMENT_VARIOUS_MODIFY=Pagesa (nuk është caktuar në një faturë) është modifikuar
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang
index f9be75bdd60..f449518d26f 100644
--- a/htdocs/langs/sq_AL/categories.lang
+++ b/htdocs/langs/sq_AL/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Zona e etiketave/kategorive të kontaktit
 AccountsCategoriesArea=Zona e etiketave/kategorive të llogarisë bankare
 ProjectsCategoriesArea=Zona e etiketave/kategorive të projektit
 UsersCategoriesArea=Zona e etiketave/kategorive të përdoruesve
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Nënkategoritë
 CatList=Lista e etiketave/kategorive
 CatListAll=Lista e etiketave/kategorive (të gjitha llojet)
@@ -90,9 +91,10 @@ CategoriesSetup=Konfigurimi i etiketave/kategorive
 CategorieRecursiv=Lidh automatikisht me etiketën/kategorinë prind
 CategorieRecursivHelp=Nëse opsioni është aktiv, kur shtoni një objekt në një nënkategori, objekti do të shtohet gjithashtu në kategoritë mëmë.
 AddProductServiceIntoCategory=Caktoni kategori produktit/shërbimit
-AddCustomerIntoCategory=Cakto kategori klientit
-AddSupplierIntoCategory=Caktoni kategori furnizuesit
-AssignCategoryTo=Caktoni kategori për
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Shfaq etiketën/kategorinë
 ByDefaultInList=Si parazgjedhje në listë
 ChooseCategory=Zgjidhni kategorinë
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Faqe-Kategoritë e kontejnerëve
 KnowledgemanagementsCategoriesArea=Kategoritë e artikujve KM
 UseOrOperatorForCategories=Përdorni operatorin 'OR' për kategoritë
 AddObjectIntoCategory=Cakto për kategorinë
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index 20afc7ad3f8..9854d494dd9 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Vendi është brenda Komunitetit Ekonomik Evropian
 PriceFormatInCurrentLanguage=Formati i shfaqjes së çmimeve në gjuhën dhe monedhën aktuale
 ThirdPartyName=Emri i palës së tretë
 ThirdPartyEmail=Email i palës së tretë
-ThirdParty=palë e tretë
-ThirdParties=Palëve të treta
+ThirdParty=Third party
+ThirdParties=Third parties
 ThirdPartyProspects=Perspektivat
 ThirdPartyProspectsStats=Perspektivat
 ThirdPartyCustomers=Klientët
@@ -65,6 +65,7 @@ State=Shteti/Provinca
 StateId=ID e shtetit
 StateCode=Kodi i shtetit/krahinës
 StateShort=Shtetit
+DepartmentBuyer=Buyer's state/province
 Region=Rajon
 Region-State=Rajoni - Shteti
 Country=Vendi
@@ -78,7 +79,7 @@ Chat=Biseda
 PhonePro=Autobus. telefon
 PhonePerso=Pers. telefon
 PhoneMobile=Celular
-No_Email=Refuzoni emailet me shumicë
+No_Email=Refuse mass emails
 Fax=Faks
 Zip=Kodi Postal
 Town=Qyteti
@@ -382,11 +383,12 @@ ExportCardToFormat=Eksporto kartën në format
 ContactNotLinkedToCompany=Kontakti nuk është i lidhur me asnjë palë të tretë
 DolibarrLogin=Dolibarr hyrje
 NoDolibarrAccess=Nuk ka qasje në Dolibarr
-ExportDataset_company_1=Palët e treta (kompani / fondacione / persona fizikë) dhe pronat e tyre
-ExportDataset_company_2=Kontaktet dhe vetitë e tyre
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Palët e treta dhe pronat e tyre
 ImportDataset_company_2=Kontakte/adresa dhe atribute shtesë të palëve të treta
-ImportDataset_company_3=Llogaritë bankare të palëve të treta
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Përfaqësuesit e shitjeve të palëve të treta (caktoni përfaqësues/përdorues shitjesh për kompanitë)
 PriceLevel=Niveli i çmimeve
 PriceLevelLabels=Etiketat e nivelit të çmimeve
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Emri i menaxherit (CEO, drejtor, president...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Bashkoni palët e treta
-ConfirmMergeThirdparties=Jeni i sigurt që dëshironi të bashkoni palën e tretë të zgjedhur me atë aktuale? Të gjitha objektet e lidhura (faturat, porositë, ...) do të zhvendosen te pala e tretë aktuale, pas së cilës pala e tretë e zgjedhur do të fshihet.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Palët e treta janë bashkuar
 SaleRepresentativeLogin=Hyrja e përfaqësuesit të shitjeve
 SaleRepresentativeFirstname=Emri i përfaqësuesit të shitjeve
@@ -460,3 +462,6 @@ ExternalSystemID=ID e sistemit të jashtëm
 IDOfPaymentInAnExternalSystem=ID e mënyrës së pagesës në një sistem të jashtëm (si Stripe, Paypal, ...)
 AADEWebserviceCredentials=Kredencialet e shërbimit të AADE-së
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Pala e tretë duhet të jetë klient për të lejuar krijimin e informacionit të saj bankar në anën e Stripe
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index fcfabfd72d2..cc6f44a0ede 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Pagesa e faturës së klientit
 PaymentSupplierInvoice=pagesa e faturës së shitësit
 PaymentSocialContribution=Pagesa e taksës sociale/fiskale
 PaymentVat=Pagesa e TVSH-së
-AutomaticCreationPayment=Regjistroni automatikisht pagesën
+AutomaticCreationPayment=Also record the payment
 ListPayment=Lista e pagesave
 ListOfCustomerPayments=Lista e pagesave të klientëve
 ListOfSupplierPayments=Lista e pagesave të shitësve
@@ -118,10 +118,14 @@ SocialContributionsPayments=Pagesat e taksave sociale/fiskale
 ShowVatPayment=Shfaq pagesën e TVSH-së
 TotalToPay=Totali për të paguar
 BalanceVisibilityDependsOnSortAndFilters=Gjendja është e dukshme në këtë listë vetëm nëse tabela është renditur në %s dhe filtrohet në 1 llogari bankare (pa filtra të tjerë)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Kodi i kontabilitetit të klientit
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Kodi i kontabilitetit të shitësit
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Cust. llogari. kodi
 SupplierAccountancyCodeShort=Sup. llogari. kodi
+UserAccountancyCodeShort=User account. code
 AccountNumber=Numri i llogarisë
 NewAccountingAccount=Llogari e re
 Turnover=Qarkullimi i faturuar
@@ -129,7 +133,9 @@ TurnoverCollected=Qarkullimi i mbledhur
 SalesTurnoverMinimum=Qarkullimi minimal
 ByExpenseIncome=Sipas shpenzimeve dhe të ardhurave
 ByThirdParties=Nga palët e treta
+ByProjects=By projects
 ByUserAuthorOfInvoice=Nga autori i faturës
+DetailedListLowercase=detailed list
 CheckReceipt=Mandat depozitimi
 CheckReceiptShort=Mandat depozitimi
 LastCheckReceiptShort=Fletët e depozitave të fundit %s
diff --git a/htdocs/langs/sq_AL/datapolicy.lang b/htdocs/langs/sq_AL/datapolicy.lang
index a5413521b45..6295590543a 100644
--- a/htdocs/langs/sq_AL/datapolicy.lang
+++ b/htdocs/langs/sq_AL/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Politika e privatësisë së të dhënave
 Module4100Desc = Moduli për menaxhimin e privatësisë së të dhënave (përputhje me GDPR)
 # Administration page
 datapolicySetup = Konfigurimi i politikës së privatësisë së të dhënave të modulit
-Deletion = Fshirja e të dhënave
-datapolicySetupPage = Në varësi të ligjeve të vendeve tuaja (Shembull <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Neni 5</a> i GDPR), të dhënat personale duhet të mbahen për një periudhë duke mos e tejkaluar kohëzgjatjen, të dhënat nevojiten për qëllimin për të cilin janë mbledhur, përveç për qëllime arkivore.<br>Fshirja do të bëhet automatikisht pas një kohëzgjatjeje të caktuar pa ngjarje (kohëzgjatja të cilat do t'i keni treguar më poshtë).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s muaj
 ONE_YEAR = 1 vit
 NB_YEARS = %s vjet
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Perspektiva/Klient
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = As perspektivë/As klient
 DATAPOLICY_CONTACT_FOURNISSEUR = Furnizuesi
 DATAPOLICY_ADHERENT = Anëtar
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Ju mund t'u dërgoni një email GDPR të gjithë kontakteve tuaja përkatëse (të cilët nuk kanë marrë ende një email dhe për të cilët nuk keni regjistruar asgjë në lidhje me marrëveshjen e tyre GDPR). Për ta bërë këtë, përdorni butonin e mëposhtëm.
 SendAgreement = Dërgo email
 AllAgreementSend = Të gjitha emailet janë dërguar
 TXTLINKDATAPOLICYACCEPT = Teksti për lidhjen "marrëveshje"
 TXTLINKDATAPOLICYREFUSE = Teksti për lidhjen "mosmarrëveshje"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: Përpunimi i të dhënave personale
 DATAPOLICY_consentement = Pëlqimi i marrë për përpunimin e të dhënave personale
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index e2967fc3790..f9b6a9378ac 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Gabim në krijimin e skedarëve të imaz
 ErrorFailedToCreateDir=Dështoi në krijimin e një drejtorie. Kontrolloni që përdoruesi i serverit të uebit ka leje për të shkruar në dosjen e dokumenteve Dolibarr. Nëse parametri <b>safe_mode</b> është i aktivizuar në këtë PHP, kontrolloni që skedarët Dolibarr php janë në pronësi të përdoruesit të serverit të uebit.
 ErrorNoMailDefinedForThisUser=Asnjë postë nuk është përcaktuar për këtë përdorues
 ErrorSetupOfEmailsNotComplete=Konfigurimi i emaileve nuk është i plotë
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Ky funksion ka nevojë për JavaScript që të aktivizohet për të funksionuar. Ndryshojeni këtë në konfigurim - ekran.
 ErrorTopMenuMustHaveAParentWithId0=Një meny e tipit "Top" nuk mund të ketë një meny prind. Vendosni 0 në menynë prind ose zgjidhni një meny të tipit 'Left'.
 ErrorLeftMenuMustHaveAParentId=Një meny e tipit "Majtas" duhet të ketë një ID prindi.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Ngarkimi u bllokua nga një shtojcë PHP/Apache.
 ErrorFileSizeTooLarge=Madhësia e skedarit është shumë e madhe ose skedari nuk ofrohet.
 ErrorFieldTooLong=Fusha %s është shumë e gjatë.
 ErrorSizeTooLongForIntType=Madhësia shumë e gjatë për llojin int (%s maksimumi i shifrave)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Madhësia shumë e gjatë për llojin e vargut (%s maksimumi i karaktereve)
 ErrorNoValueForSelectType=Ju lutemi plotësoni vlerën për listën e përzgjedhur
 ErrorNoValueForCheckBoxType=Ju lutemi plotësoni vlerën për listën e kutisë së kontrollit
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Vlera e keqe për kodin e sigurisë. Provo sërish me vler
 ErrorBothFieldCantBeNegative=Fushat %s dhe %s nuk mund të jenë të dyja negative
 ErrorFieldCantBeNegativeOnInvoice=Fusha <strong>%s</strong> nuk mund të jetë negative në këtë lloj. Nëse duhet të shtoni një linjë zbritjeje, thjesht krijoni zbritjen në fillim (nga fusha '%s' në kartën e palës së tretë) dhe zbatojeni atë në faturë.
 ErrorLinesCantBeNegativeForOneVATRate=Totali i linjave (pa taksën) nuk mund të jetë negativ për një normë të caktuar TVSH-je jo nule (U gjet një total negativ për normën e TVSH-së <b>%s </b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Linjat nuk mund të jenë negative në një depozitë. Do të përballeni me probleme kur do t'ju duhet të konsumoni depozitën në faturën përfundimtare nëse e bëni këtë.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Sasia për linjë në faturat e klientëve nuk mund të jetë negative
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Llogaria e përdoruesit <b>%s</b> nuk është përdorur për të ekzekutuar serverin në ueb se
 ErrorNoActivatedBarcode=Asnjë lloj barkodi nuk është aktivizuar
 ErrUnzipFails=Zhzipja e %s me ZipArchive dështoi
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Parametri juaj PHP upload_max_filesize (%s) është më i lartë se parametri PHP post_max_size (%s). Ky nuk është një konfigurim i qëndrueshëm.
 WarningPasswordSetWithNoAccount=Për këtë anëtar u vendos një fjalëkalim. Megjithatë, nuk u krijua asnjë llogari përdoruesi. Pra, ky fjalëkalim është i ruajtur, por nuk mund të përdoret për t'u identifikuar në Dolibarr. Mund të përdoret nga një modul/ndërfaqe e jashtme, por nëse nuk keni nevojë të përcaktoni ndonjë hyrje apo fjalëkalim për një anëtar, mund të çaktivizoni opsionin "Menaxho një hyrje për çdo anëtar" nga konfigurimi i modulit të Anëtarit. Nëse ju duhet të menaxhoni një hyrje, por nuk keni nevojë për ndonjë fjalëkalim, mund ta mbani këtë fushë bosh për të shmangur këtë paralajmërim. Shënim: Email-i mund të përdoret gjithashtu si hyrje nëse anëtari është i lidhur me një përdorues.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = Fatura SwissQR mund të shtohet vetëm në faturat e vendosura për t'u paguar me pagesa të transfertave të kreditit.
 SwissQrCreditorAddressInvalid = Adresa e kreditorit është e pavlefshme (a janë caktuar ZIP dhe qyteti? (%s)
 SwissQrCreditorInformationInvalid = Informacioni i kreditorit është i pavlefshëm për IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s është përcaktuar tashmë si ko
 ErrorThisGroupIsAlreadyDefinedAsThisType=Kontaktet me këtë grup janë përcaktuar tashmë si kontakt për këtë lloj.
 EmptyMessageNotAllowedError=Mesazhi bosh nuk lejohet
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/sq_AL/exports.lang b/htdocs/langs/sq_AL/exports.lang
index 71996f7040b..be46ec69abe 100644
--- a/htdocs/langs/sq_AL/exports.lang
+++ b/htdocs/langs/sq_AL/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Etiketa e linjës
 LineDescription=Përshkrimi i linjës
 LineUnitPrice=Çmimi për njësi i linjës
 LineVATRate=Norma e TVSH-së e linjës
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Sasia për linjë
 LineTotalHT=Shuma përjashtuar. taksa për linjë
 LineTotalTTC=Shuma me taksë për linjë
 LineTotalVAT=Shuma e TVSH-së për linjën
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Lloji i linjës (0=produkt, 1=shërbim)
 FileWithDataToImport=Skedar me të dhëna për import
 FileToImport=Skedari burim për import
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=Zgjidhni formatin e skedarit për t'u përdorur si fo
 ChooseFileToImport=Ngarkoni skedarin më pas klikoni në ikonën %s për të zgjedhur skedarin si skedar importi burimor...
 SourceFileFormat=Formati i skedarit burim
 FieldsInSourceFile=Fushat në skedarin burimor
-FieldsInTargetDatabase=Fushat e synuara në bazën e të dhënave Dolibarr (e theksuar=e detyrueshme)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Nuk ka fusha
 MoveField=Zhvendos numrin e kolonës së fushës %s
 ExampleOfImportFile=Shembull_i_import_file
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Check that the file format (field and string delimiters)
 RunSimulateImportFile=Ekzekutoni simulimin e importit
 FieldNeedSource=Kjo fushë kërkon të dhëna nga skedari burimor
 SomeMandatoryFieldHaveNoSource=Disa fusha të detyrueshme nuk kanë burim nga skedari i të dhënave
-InformationOnSourceFile=Informacion mbi skedarin burimor
-InformationOnTargetTables=Informacion mbi fushat e synuara
+InformationOnSourceFile=Source file
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Ndryshoni të paktën një fushë burimi në kolonën e fushave për të eksportuar
 SelectFormat=Zgjidhni këtë format skedari të importit
 RunImportFile=Të dhënat e importit
diff --git a/htdocs/langs/sq_AL/hrm.lang b/htdocs/langs/sq_AL/hrm.lang
index 8fcdf3da194..e32fda3297f 100644
--- a/htdocs/langs/sq_AL/hrm.lang
+++ b/htdocs/langs/sq_AL/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=Grada e kërkuar për profilin e punës
-RequiredRankShort=Grada e kërkuar
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Pozicionet me këto profile pune
-EmployeeRank=Renditja e punonjësve për këtë aftësi
-EmployeeRankShort=Grada e punonjësve
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Pozicioni i punonjësit
 EmployeePositions=Pozicionet e punonjësve
 EmployeesInThisPosition=Punonjësit në këtë pozicion
@@ -72,6 +72,9 @@ AddSkill=Shtoni aftësi në profilin e punës
 RequiredSkills=Aftësitë e nevojshme për këtë profil pune
 UserRank=Renditja e përdoruesit
 SkillList=Lista e aftësive
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Ruaj rangun
 TypeKnowHow=njohuritë
 TypeHowToBe=Si të jesh
@@ -95,3 +98,5 @@ NeedBusinessTravels=Keni nevojë për udhëtime biznesi
 NoDescription=pa pershkrim
 TheJobProfileHasNoSkillsDefinedFixBefore=Profili i vlerësuar i punës i këtij punonjësi nuk ka asnjë aftësi të përcaktuar në të. Ju lutemi shtoni aftësitë, më pas fshini dhe rinisni vlerësimin.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index cb3921ad196..2fed43dcf0b 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Dërgimi me email
 EMailing=Dërgimi me email
-EMailings=Emailet
+EMailings=Mass EMails
 SMSings=SMS
-AllEMailings=Të gjitha emailet
+AllEMailings=All mass eMails
 MailCard=Karta e postës elektronike
 MailRecipients=Marrësit
 MailRecipient=Marrësi
@@ -26,19 +26,19 @@ MailFile=Skedarët e bashkangjitur
 MailMessage=Trupi i emailit
 SubjectNotIn=Jo në Subjekt
 BodyNotIn=Jo në trup
-ShowEMailing=Shfaq dërgimin me email
-ListOfEMailings=Lista e postimeve elektronike
-NewMailing=E-mail i ri
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=SMS i ri
-EditMailing=Redakto dërgimin me email
-ResetMailing=Ridërgo email
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Fshi email-in
-PreviewMailing=Shiko paraprakisht dërgimin me email
-CreateMailing=Krijo email
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=Dërgimi i vlefshëm me email
+ValidMailing=Valid mass Email
 MailingStatusDraft=Draft
 MailingStatusValidated=E vërtetuar
 MailingStatusSent=Dërguar
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Të gjithë filtrat duhet të përputhen që të mblidh
 LineInFile=Rreshti %s në skedar
 RecipientSelectionModules=Kërkesat e përcaktuara për zgjedhjen e marrësit
 MailSelectedRecipients=Marrësit e zgjedhur
-MailingArea=Zona e postimeve elektronike
-LastMailings=Dërgesat më të fundit të emailit %s
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Synon statistikat
 NbOfCompaniesContacts=Kontaktet/adresat unike
 MailNoChangePossible=Marrësit për email-et e vërtetuara nuk mund të ndryshohen
-SearchAMailing=Kërko postime
-SendMailing=Dërgo email
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Dërguar nga
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Dërgimi i një emaili mund të kryhet nga linja e komandës. Kërkojini administratorit të serverit tuaj të nisë komandën e mëposhtme për të dërguar email tek të gjithë marrësit:
 MailingNeedCommand2=Sidoqoftë, mund t'i dërgoni ato në internet duke shtuar parametrin MAILING_LIMIT_SENDBYWEB me vlerën e numrit maksimal të emaileve që dëshironi të dërgoni me sesion. Për këtë, shkoni në Home - Setup - Tjetër.
 ConfirmSendingEmailing=Nëse dëshironi të dërgoni email direkt nga ky ekran, ju lutemi konfirmoni se jeni të sigurt që dëshironi të dërgoni email tani nga shfletuesi juaj?
-LimitSendingEmailing=Shënim: Dërgimi i emaileve nga ndërfaqja e uebit bëhet disa herë për arsye sigurie dhe skadimi, <b>%s</b> marrësit në një kohë për çdo seancë dërgimi.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Liste e qarte
 ToClearAllRecipientsClickHere=Klikoni këtu për të pastruar listën e marrësve për këtë email
 ToAddRecipientsChooseHere=Shtoni marrësit duke zgjedhur nga listat
-NbOfEMailingsReceived=Marrë emaile masive
-NbOfEMailingsSend=U dërguan emaile masive
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=Regjistrimi i identitetit
 DeliveryReceipt=Dorëzimi Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Ju mund të përdorni ndarësin <b>presje</b> për të specifikuar disa marrës.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Asnjë njoftim automatik me email nuk është planifik
 ANotificationsWillBeSent=1 njoftim automatik do të dërgohet me email
 SomeNotificationsWillBeSent=%s njoftimet automatike do të dërgohen me email
 AddNewNotification=Abonohu në një njoftim të ri automatik me email (objektiv/ngjarje)
-ListOfActiveNotifications=Abonimet aktive (objektivat/ngjarjet) për njoftimin automatik me email
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=U dërguan njoftime automatike me email
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Konfigurimi i dërgimit të emailit është konfiguruar në '%s'. Ky modalitet nuk mund të përdoret për të dërguar emaile masive.
 MailSendSetupIs2=Së pari duhet të shkoni, me një llogari administratori, në menynë %sHome - Konfigurimi - Emails%s për të ndryshuar parametrin <strong>'%s'</strong> për të përdorur modalitetin 'nof2ec87' </span>'. Me këtë modalitet, mund të futni konfigurimin e serverit SMTP të ofruar nga Ofruesi juaj i Shërbimit të Internetit dhe të përdorni veçorinë e dërgimit të emailit masiv.
 MailSendSetupIs3=Nëse keni ndonjë pyetje se si të konfiguroni serverin tuaj SMTP, mund t'i kërkoni %s.
@@ -183,7 +185,7 @@ Information=Informacion
 ContactsWithThirdpartyFilter=Kontaktet me filtër të palëve të treta
 Unanswered=Pa përgjigje
 Answered=U përgjigj
-IsNotAnAnswer=Nuk përgjigjet (email fillestar)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Është një përgjigje e një emaili fillestar
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Vlera e parazgjedhur për fushën '%s' kur krijoni një kontakt të ri
@@ -199,6 +201,6 @@ ModelTemplate=Modeli i postës elektronike
 YouCanChooseAModelForYouMailContent= Ju mund të zgjidhni një nga modelet shabllone ose të krijoni një me AI
 TitleOfMailHolder=Titulli i e-mail-it shkon këtu
 ContentOfMailHolder=Përmbajtja e emailit shkon këtu...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index 6a5b0726524..4ead393f1b1 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -37,6 +37,7 @@ Translation=Përkthimi
 Translations=Përkthime
 CurrentTimeZone=Zona kohore PHP (server)
 EmptySearchString=Futni kriteret e kërkimit jo bosh
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Vendos kriteret e datës
 NoRecordFound=Nuk u gjet asnjë regjistrim
 NoRecordDeleted=Asnjë regjistrim nuk u fshi
@@ -45,6 +46,7 @@ NoError=Asnjë gabim
 Error=Gabim
 Errors=Gabimet
 ErrorFieldRequired=Kërkohet fusha '%s'
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Fusha '%s' ka një vlerë të keqe
 ErrorFileDoesNotExists=Skedari %s nuk ekziston
 ErrorFailedToOpenFile=Hapja e skedarit dështoi %s
@@ -308,6 +310,7 @@ DateBuild=Raportoni datën e ndërtimit
 DatePayment=Data e pageses
 DateApprove=Data e miratimit
 DateApprove2=Data e miratimit (miratimi i dytë)
+PendingSince=Pending since
 RegistrationDate=Data e regjistrimit
 UserCreation=Përdorues i krijimit
 UserModification=Përdoruesi i modifikimit
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Të fillosh
 ActionRunningShort=Në vazhdim
 ActionDoneShort=Përfunduar
 ActionUncomplete=E paplotë
-LatestLinkedEvents=Ngjarjet më të fundit të lidhura %s
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Kompania/Organizata
 Accountant=Kontabilist
 ContactsForCompany=Kontaktet për këtë palë të tretë
@@ -503,6 +506,7 @@ ContactsAddressesForCompany=Kontaktet/adresat për këtë palë të tretë
 AddressesForCompany=Adresat për këtë palë të tretë
 ActionsOnCompany=Ngjarjet për këtë palë të tretë
 ActionsOnContact=Ngjarjet për këtë kontakt/adresë
+ActionsOnUser=Events for this user
 ActionsOnContract=Ngjarjet për këtë kontratë
 ActionsOnMember=Ngjarjet rreth këtij anëtari
 ActionsOnProduct=Ngjarjet rreth këtij produkti
@@ -720,6 +724,8 @@ TextUsedInTheMessageBody=Trupi i emailit
 SendAcknowledgementByMail=Dërgo email konfirmimi
 SendMail=Dërgoni një email
 Email=Email
+EMail=Email
+EMails=Emails
 NoEMail=Asnjë email
 AlreadyRead=Lexuar tashmë
 NotRead=Të palexuara
@@ -792,7 +798,7 @@ Notes=Shënime
 AddNewLine=Shto linjë të re
 AddFile=Shto skedar
 FreeZone=Produkt me tekst të lirë
-FreeLineOfType=Artikull me tekst të lirë, shkruani:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Klononi objektin me atributet e tij kryesore
 ReGeneratePDF=Rigjeneroni PDF
 PDFMerge=Bashkim PDF
@@ -878,12 +884,14 @@ toward=drejt
 Access=Qasja
 SelectAction=Zgjidhni veprimin
 SelectTargetUser=Zgjidhni përdoruesin/punonjësin e synuar
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Përdorni Ctrl+C për të kopjuar në kujtesën e fragmenteve
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Emri origjinal i skedarit
 SetDemandReason=Cakto burimin
 SetBankAccount=Përcaktoni llogarinë bankare
 AccountCurrency=Monedha e llogarisë
+AccountancyCode=Accounting Code
 ViewPrivateNote=Shiko shënimet
 XMoreLines=%s rreshta të fshehura
 ShowMoreLines=Shfaq më shumë/më pak rreshta
@@ -924,6 +932,7 @@ ConfirmMassDeletionQuestion=Jeni i sigurt që dëshironi të fshini %s rekordet
 ConfirmMassClone=Konfirmimi i klonit në masë
 ConfirmMassCloneQuestion=Zgjidhni projektin për të klonuar
 ConfirmMassCloneToOneProject=Klononi në projektin %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Objekte të ngjashme
 ClassifyBilled=Klasifikimi i faturuar
 ClassifyUnbilled=Klasifiko të pafaturuara
@@ -960,10 +969,11 @@ PrivateDownloadLinkDesc=Ju duhet të regjistroheni dhe keni nevojë për leje p
 Download=Shkarko
 DownloadDocument=Shkarko dokumentin
 DownloadSignedDocument=Shkarkoni dokumentin e nënshkruar
-ActualizeCurrency=Përditëso kursin e monedhës
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Viti fiskal
 ModuleBuilder=Ndërtues i modulit dhe aplikacionit
 SetMultiCurrencyCode=Cakto monedhën
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Veprime me shumicë
 ClickToShowHelp=Klikoni për të shfaqur ndihmën e këshillave të veglave
 WebSite=Faqja e internetit
@@ -1103,6 +1113,7 @@ PayedBy=E paguar nga
 PayedTo=Paguhet për
 Monthly=Mujore
 Quarterly=Tremujor
+Quarter=Quarter
 Annual=Vjetore
 Local=Lokal
 Remote=Telekomanda
@@ -1145,6 +1156,7 @@ ContactDefault_project_task=Detyrë
 ContactDefault_propal=Propozim
 ContactDefault_supplier_proposal=Propozimi i Furnizuesit
 ContactDefault_ticket=Biletë
+ContactDefault_societe=Third party
 ContactAddedAutomatically=Kontakti u shtua nga rolet e kontaktit të palëve të treta
 More=Më shumë
 ShowDetails=Trego detajet
@@ -1187,6 +1199,8 @@ SetSupervisor=Vendosni mbikëqyrësin
 CreateExternalUser=Krijo përdorues të jashtëm
 ConfirmAffectTag=Caktimi i etiketës në masë
 ConfirmAffectUser=Caktimi i përdoruesve në masë
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=Roli i caktuar për çdo projekt/mundësi
 TasksRole=Roli i caktuar në secilën detyrë (nëse përdoret)
 ConfirmSetSupervisor=Grupi i Mbikëqyrësit në masë
@@ -1238,6 +1252,9 @@ CommercialsAffected=Përfaqësuesit e shitjeve të caktuar
 CommercialAffected=Përfaqësuesi i shitjeve i caktuar
 CommercialsDisaffected=Përfaqësuesit e shitjeve janë shkëputur
 CommercialDisaffected=Përfaqësuesi i shitjeve është shkëputur
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=Mesazhi juaj
 YourMessageHasBeenReceived=Mesazhi juaj është marrë. Ne do t'ju përgjigjemi ose do t'ju kontaktojmë sa më shpejt të jetë e mundur.
 UrlToCheck=Url për të kontrolluar
@@ -1280,6 +1297,7 @@ AmountSalary=Shuma e pagës
 InvoiceSubtype=Nëntipi i faturës
 ConfirmMassReverse=Konfirmim i kundërt me shumicë
 ConfirmMassReverseQuestion=Jeni i sigurt që dëshironi të ktheni mbrapsht rekordet e zgjedhura %s?
+ConfirmActionXxx=Confirm action %s
 ElementType=Lloji i elementit
 ElementId=Id i elementit
 Encrypted=E koduar
@@ -1299,3 +1317,35 @@ AllEntities=Të gjitha subjektet
 TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
+auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
index 2af758983e4..957f1d46902 100644
--- a/htdocs/langs/sq_AL/members.lang
+++ b/htdocs/langs/sq_AL/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Nëse kërkohet abonim, duhet të regjistrohet një abo
 DeleteType=Fshi
 VoteAllowed=Vota e lejuar
 Physical=Individual
-Moral=Korporata
-MorAndPhy=Korporata dhe Individi
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Ri-aktivizo
 ExcludeMember=Përjashtoni një anëtar
 Exclude=Përjashtoni
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Statistikat e anëtarëve sipas rajonit
 NbOfMembers=Numri total i anëtarëve
 NbOfActiveMembers=Numri total i anëtarëve aktualë aktivë
 NoValidatedMemberYet=Nuk u gjetën anëtarë të vërtetuar
-MembersByCountryDesc=Ky ekran ju tregon statistikat e anëtarëve sipas vendeve. Grafikët dhe grafikët varen nga disponueshmëria e shërbimit të grafikëve në internet të Google, si dhe nga disponueshmëria e një lidhjeje interneti që funksionon.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Ky ekran ju tregon statistikat e anëtarëve sipas shteteve/provincave/kantonit.
 MembersByTownDesc=Ky ekran ju tregon statistikat e anëtarëve sipas qytetit.
 MembersByNature=Ky ekran ju tregon statistikat e anëtarëve për nga natyra.
@@ -208,25 +209,25 @@ NewMemberbyWeb=U shtua një anëtar i ri. Në pritje të miratimit
 NewMemberForm=Formulari i ri i anëtarësimit
 SubscriptionsStatistics=Statistikat e kontributeve
 NbOfSubscriptions=Numri i kontributeve
-AmountOfSubscriptions=Shuma e mbledhur nga kontributet
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=Qarkullimi (për një kompani) ose buxheti (për një fondacion)
-DefaultAmount=Shuma e paracaktuar e kontributit (përdoret vetëm nëse asnjë shumë nuk është përcaktuar në nivel të llojit të anëtarit)
-MinimumAmount=Shuma minimale (përdoret vetëm kur shuma e kontributit është falas)
-CanEditAmount=Shuma e abonimit mund të përcaktohet nga anëtari
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=Vizitori mund të zgjedhë/të modifikojë shumën e kontributit të tij pavarësisht nga lloji i anëtarit
 AmountIsLowerToMinimumNotice=Shuma është më e ulët se minimumi %s
 MEMBER_NEWFORM_PAYONLINE=Pas regjistrimit online, kaloni automatikisht në faqen e pagesës online
 ByProperties=Nga natyra
 MembersStatisticsByProperties=Statistikat e anëtarëve për nga natyra
-VATToUseForSubscriptions=Norma e TVSH-së për t'u përdorur për kontributet
-NoVatOnSubscription=Nuk ka TVSH për kontributet
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkti i përdorur për linjën e kontributit në faturë: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=Emri ose kompania
 SubscriptionRecorded=Kontributi i regjistruar
 NoEmailSentToMember=Asnjë email nuk i është dërguar anëtarit
 EmailSentToMember=Email i dërguar anëtarit në %s
-SendReminderForExpiredSubscriptionTitle=Dërgo kujtesë me email për kontributet e skaduara
-SendReminderForExpiredSubscription=Dërgo rikujtues me email anëtarëve kur kontributi është gati të skadojë (parametri është numri i ditëve para përfundimit të anëtarësimit për të dërguar rikujtuesin. Mund të jetë një listë ditësh të ndara me një pikëpresje, për shembull '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Anëtarësia e paguar për periudhën aktuale (deri në %s)
 YouMayFindYourInvoiceInThisEmail=Ju mund ta gjeni faturën tuaj bashkangjitur këtij emaili
 XMembersClosed=%s anëtarë të mbyllur
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Një palë e tretë është personi juridik që do
 MemberFirstname=Emri i anëtarit
 MemberLastname=Mbiemri i anëtarit
 MemberCodeDesc=Kodi i Anëtarit, unik për të gjithë anëtarët
-MemberSubscriptionStartFirstDayOf=Data e fillimit të anëtarësimit korrespondon me ditën e parë të a
-MemberSubscriptionStartAfter=Periudha minimale para hyrjes në fuqi të datës së fillimit të një abonimi, përveç rinovimeve (shembull +3m = +3 muaj, -5d = -5 ditë, +1Y = +1 vit)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Anëtarësimi është i lidhur me një transaksion të pajtimit, kështu që ky modifikim nuk lejohet.
 ConfirmMassSubsriptionCreation=Konfirmo krijimin e abonimit
 ConfirmMassSubsriptionCreationQuestion=Jeni i sigurt që dëshironi të krijoni abonimin(et) e zgjedhura %s?
diff --git a/htdocs/langs/sq_AL/salaries.lang b/htdocs/langs/sq_AL/salaries.lang
index 6a1dfb3327e..67f9993cb3d 100644
--- a/htdocs/langs/sq_AL/salaries.lang
+++ b/htdocs/langs/sq_AL/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Rrogë e re
 AddSalary=Shto rrogë
 NewSalaryPayment=Karta e re e pagave
 AddSalaryPayment=Shto pagesën e pagës
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Pagesë rroge
 SalariesPayments=Pagesat e rrogave
 SalariesPaymentsOf=Pagesat e pagave të %s
@@ -27,7 +29,7 @@ FillFieldFirst=Plotësoni fillimisht fushën e punonjësve
 UpdateAmountWithLastSalary=Përcaktoni shumën e pagës së fundit
 MakeTransferRequest=Bëni kërkesë për transferim
 VirementOrder=Kërkesa për transferim kredie
-BankTransferAmount=Shuma e transferimit të kredisë
 WithdrawalReceipt=Urdhër transferimi i kredisë
 OrderWaiting=Porosia në pritje
 FillEndOfMonth=Plotësoni me fund të muajit
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index f856d020a3e..f754ff9aef9 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Përdorni këtu listën e emrave / pseudonimeve të tjera n
 WEBSITE_CSS_URL=URL-ja e skedarit të jashtëm CSS
 WEBSITE_CSS_INLINE=Përmbajtja e skedarit CSS (e zakonshme për të gjitha faqet)
 WEBSITE_JS_INLINE=Përmbajtja e skedarit JavaScript (e zakonshme për të gjitha faqet)
-WEBSITE_HTML_HEADER=Shtesa në fund të kokës HTML (e zakonshme për të gjitha faqet)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Skedari i robotit (robots.txt)
 WEBSITE_HTACCESS=Skedari .htaccess i faqes në internet
 WEBSITE_MANIFEST_JSON=Skedari i faqes manifest.json
@@ -56,16 +56,17 @@ ReadPerm=Lexoni
 WritePerm=Shkruaj
 TestDeployOnWeb=Testoni/shpërndani në ueb
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL-ja e hostit virtual të shërbyer nga serveri i jashtëm i uebit nuk është i përcaktuar
 NoPageYet=Ende nuk ka faqe
 YouCanCreatePageOrImportTemplate=Mund të krijoni një faqe të re ose të importoni një shabllon të plotë të faqes në internet
 SyntaxHelp=Ndihmë për këshilla specifike sintaksore
 YouCanEditHtmlSourceckeditor=Ju mund të modifikoni kodin burimor HTML duke përdorur butonin "Burimi" në redaktues.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Për një imazh të ndarë me një lidhje të përbashkët (hapja e qasjes duke përdorur çelësin hash të ndarjes së skedarit), sintaksa është:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;<span class='70f600000665 class='0012c7dcbe087z0 </span><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Klonimi i faqes/kontejnerit
 CloneSite=Faqja e klonimit
@@ -87,15 +88,15 @@ WebsiteAccount=Llogaria e faqes në internet
 WebsiteAccounts=Llogaritë e faqes në internet
 AddWebsiteAccount=Krijo një llogari të faqes në internet
 BackToListForThirdParty=Kthehu në listë për palët e treta
-DisableSiteFirst=Çaktivizo fillimisht faqen e internetit
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Titulli i faqes time të internetit
 AnotherContainer=Kjo është mënyra se si të përfshini përmbajtjen e një faqeje/konteineri tjetër (mund të keni një gabim këtu nëse aktivizoni kodin dinamik sepse nënkontejneri i integruar mund të mos ekzistojë)
 SorryWebsiteIsCurrentlyOffLine=Na vjen keq, kjo faqe interneti është aktualisht jashtë linje. Ju lutemi kthehuni më vonë ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktivizo tabelën për të ruajtur llogaritë e faqeve të internetit (hyrje/kalim) për çdo faqe interneti / palë të tretë
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Së pari duhet të përcaktoni faqen kryesore të paracaktuar
-OnlyEditionOfSourceForGrabbedContentFuture=Paralajmërim: Krijimi i një faqe interneti duke importuar një faqe interneti të jashtme është i rezervuar për përdoruesit me përvojë. Në varësi të kompleksitetit të faqes burimore, rezultati i importimit mund të ndryshojë nga origjinali. Gjithashtu, nëse faqja burimore përdor stile të zakonshme CSS ose JavaScript konfliktuale, mund të prishë pamjen ose veçoritë e redaktuesit të faqes së internetit kur punon në këtë faqe. Kjo metodë është një mënyrë më e shpejtë për të krijuar një faqe, por rekomandohet të krijoni faqen tuaj të re nga e para ose nga një shabllon i sugjeruar i faqes.<br>Vini re gjithashtu se redaktori i brendshëm mund të mos funksionojë korrektësi kur përdoret në një faqe të jashtme të rrëmbyer.
-OnlyEditionOfSourceForGrabbedContent=Vetëm botimi i burimit HTML është i mundur kur përmbajtja është rrëmbyer nga një sajt i jashtëm
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Merrni gjithashtu imazhe që gjenden në css dhe faqe.
 ImagesShouldBeSavedInto=Imazhet duhet të ruhen në direktori
 WebsiteRootOfImages=Drejtoria rrënjësore për imazhet e faqes në internet
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Remove filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Categories
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 86a0af367b4..cccf286f6f9 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however som
 FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
 FilesModified=Modified Files
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Bezbednost
 Passwords=Šifra
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Šifra kriptovane baze podataka sačuvana u conf.php. Strogo se preporučuje da se aktivira ova opcija.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=Da bi se šifra kodirala u <b>conf.php</b> fajl, zameniti liniju  <br><b>$dolibarr_main_db_pass="...";</b><br>sa<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Da bi se šifra dekodirala (čisto) u <b>conf.php</b> fajlu, zamenite liniju <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>sa<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Zaštita generisanih PDF fajlova. Ovo NIJE preporučeno jer zaustavlja grupno generisanje PDF fajlova.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Computed field
-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=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'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored WITHOUT encryption (field is just hidden with stars on screen).<br><br>Enter value 'dolcrypt' to encode value with a reversible encryption algorithm. Clear data can still be known and edited but is encrypted into database.<br><br>Enter 'auto' (or 'md5', 'sha256', 'password_hash', ...) to use the default password encryption algorithm (or md5, sha256, password_hash...) to save the non reversible hashed password into database (no way to retrieve original value)
@@ -475,7 +476,6 @@ ExtrafieldParamHelpselect=List of values must be lines with format key,value (wh
 ExtrafieldParamHelpcheckbox=Lista vrednosti moraju biti linije sa formatom ključ,vrednost (gde ključ ne može biti '0')<br><br>na primer: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Lista vrednosti moraju biti linije sa formatom ključ,vrednost (gde ključ ne može biti '0')<br><br>na primer: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarily a primary int key<br>- filtersql is a condition. It must use the USF syntax. Example: (active:=:1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>If you want to filter on extrafields use syntax  extra.fieldcode=... (where fieldcode is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1 to display only active value)<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Biblioteka koja se koristi za generisanje PDF
@@ -520,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
 WarningPHPMailD=It is therefore recommended to change the sending method of e-mails to the value "SMTP".
 WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
-WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -568,8 +568,8 @@ Module10Name=Knjigovodstvo (pojednostavljeno)
 Module10Desc=Jednostavni knjigovodstveni izveštaji (dnevnik, promet) zasnovano na sadržaju baze. Ne koristi nikakve knjgovodstvene knjige
 Module20Name=Ponude
 Module20Desc=Menadžment trgovačkih ponuda
-Module22Name=Masovni email
-Module22Desc=Menadžment grupnog slanja email-ova
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energija
 Module23Desc=Monitoring potrošnje energije
 Module25Name=Potvrda narudžbina
@@ -848,10 +848,10 @@ Permission212=Order lines
 Permission213=Activate line
 Permission214=Setup Telephony
 Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=View recipients and info
 Permission238=Manually send mailings
 Permission239=Delete mailings after validation or sent
@@ -1106,6 +1106,7 @@ DictionaryStaff=Number of Employees
 DictionaryAvailability=Delivery delay
 DictionaryOrderMethods=Order methods
 DictionarySource=Origin of proposals/orders
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Personalized groups for reports
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryAccountancyJournal=Accounting journals
@@ -1135,11 +1136,11 @@ BackToDictionaryList=Back to Dictionaries list
 TypeOfRevenueStamp=Type of tax stamp
 VATManagement=Sales Tax Management
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
 VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
 VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Type of sales tax
 LTRate=Rate
@@ -1175,6 +1176,7 @@ NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), yo
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1432,7 +1434,7 @@ AddVatInList=Display Customer/Vendor VAT number into combo lists.
 AddAdressInList=Display Customer/Vendor address into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
-FieldEdition=Edition of field %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
 GetBarCode=Get barcode
 NumberingModules=Numbering models
@@ -1487,6 +1489,8 @@ ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
 SuggestPaymentByChequeToAddress=Suggest payment by check to
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Free text on invoices
 WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
 PaymentsNumberingModule=Model numerisanja uplata
@@ -1719,6 +1723,7 @@ CompressionOfResources=Compression of HTTP responses
 CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Default values (to use on forms)
 DefaultSearchFilters=Default search filters
 DefaultSortOrder=Default sort orders
@@ -1801,6 +1806,7 @@ SendingsNumberingModules=Sendings numbering modules
 SendingsAbility=Podrška za listove isporuke za isporuke klijentima.
 NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
 DeliveryOrderModel=Products deliveries receipt model
@@ -1809,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
 ##### FCKeditor #####
 AdvancedEditor=Advanced editor
 ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForNotePublic=WYSIWYG creation/edition of the field "public notes" of elements
-FCKeditorForNotePrivate=WYSIWYG creation/edition of the field "private notes" of elements
-FCKeditorForCompany=WYSIWYG creation/edition of the field description of elements (except products/services)
-FCKeditorForProductDetails=WYSIWYG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, 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.
-FCKeditorForMailing= WYSIWYG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWYG creation/edition of user signature
-FCKeditorForMail=WYSIWYG creation/edition for all mail (except Tools->eMailing)
-FCKeditorForTicket=WYSIWYG creation/edition for tickets
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
@@ -1868,7 +1874,6 @@ Buy=Buy
 Sell=Sell
 InvoiceDateUsed=Invoice date used
 YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
-AccountancyCode=Accounting Code
 AccountancyCodeSell=Sale account. code
 AccountancyCodeBuy=Purchase account. code
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
@@ -1880,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Which view do you want to open by default when selecting m
 AGENDA_EVENT_PAST_COLOR = Past event color
 AGENDA_EVENT_CURRENT_COLOR = Current event color
 AGENDA_EVENT_FUTURE_COLOR = Future event color
-AGENDA_REMINDER_BROWSER = Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Enable sound notification
-AGENDA_REMINDER_EMAIL = Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
 AGENDA_SHOW_LINKED_OBJECT = Show linked object into agenda view
 AGENDA_USE_EVENT_TYPE = Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Automatically set this default value for type of event in event create form
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Key to authorize export link
 PastDelayVCalExport=Do not export event older than
 SecurityKey = Security Key
@@ -2007,7 +2017,7 @@ BackupZipWizard=Wizard to build the archive of documents directory
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
 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.
-InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
@@ -2037,6 +2047,7 @@ Enter0or1=Enter 0 or 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Icon name in format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sales tax rate
@@ -2132,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
 MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipient address frame
 MAIN_PDF_HIDE_CUSTOMER_CODE=Hide customer code
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Hide sender/company name in address block
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Hide payments conditions
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Hide payment mode
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2147,7 +2163,7 @@ COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLE
 DuplicateForbidden=Duplicate forbidden
 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
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
+GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact, ...)
 GDPRContactDesc=If you store personal data in your Information System, you can name the contact who is responsible for the General Data Protection Regulation here
 HelpOnTooltip=Help text to show on tooltip
 HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
@@ -2290,7 +2306,7 @@ THIRDPARTY_ALIAS=Third-party name - Third-party alias
 ALIAS_THIRDPARTY=Third-party alias - Third-party name
 PDFIn2Languages=Show labels in the PDF in 2 different languages (this feature may not work for some couple of languages)
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
-PDF_USE_A=Generate PDF documents with format PDF/A instead of default format PDF
+PDF_USE_A=PDF documents format
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
@@ -2325,6 +2341,8 @@ NotRecommended=Not recommended
 ARestrictedPath=Some restricted path for data files
 CheckForModuleUpdate=Check for external modules updates
 CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=An update is available
 NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
@@ -2398,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Show shipping address
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
 DarkThemeMode=Dark theme mode
@@ -2451,7 +2471,7 @@ 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)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Not created by default. Created on module activation only.
 CSSPage=CSS Style
 Defaultfortype=Default
@@ -2490,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2502,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2540,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2554,3 +2579,31 @@ MenuDict=Dictionary
 AddMoreParams=Add more parameters for connection (cookies, tokens, ...)<br> Example: token : value token
 ParamName=Name of parameter
 ParamValue=Value of parameter
+ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
+HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
+Captcha=Captcha
+CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
+DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang
index c8b5aac284b..7d9c87b989a 100644
--- a/htdocs/langs/sr_RS/banks.lang
+++ b/htdocs/langs/sr_RS/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Kranje stanje
 CurrentBalance=Trenutno stanje
 FutureBalance=Buduće stanje
 ShowAllTimeBalance=Prikaži stanje od početka
-AllTime=Od početka
 Reconciliation=Poravnanje
 RIB=Broj bankovnog računa
 IBAN=IBAN broj
@@ -133,7 +132,7 @@ DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Promene
-PlannedTransactions=Planned entries
+PlannedTransactions=Upcoming entries
 Graph=Graphs
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Depozitni isečak
@@ -151,7 +150,7 @@ FutureTransaction=Future transaction. Unable to reconcile.
 SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
 SelectPaymentTransactionAndGenerate=Select/filter the documents which are to be included in the %s deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value
-InputReceiptNumberBis=YYYYMM or YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=To reconcile?
 ThenCheckLinesAndConciliate=Potom, označite prikazane linije u izvodu i klinkite
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=If this function is enable, you can choose specific bac
 BankColorizeMovementName1=Background color for debit movement
 BankColorizeMovementName2=Background color for credit movement
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
-NoBankAccountDefined=No bank account defined
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
 AlreadyOneBankAccount=Already one bank account defined
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA file variant
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index 5ceb9aa5891..169177f1e9a 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Zemlja je unutar Evropske unije
 PriceFormatInCurrentLanguage=Zadržati format cene u trenutnom jeziku
 ThirdPartyName=Ime Nezavisne kompanije
 ThirdPartyEmail=Email Nezavisne kompanije
-ThirdParty=Nezavisna kompanija
-ThirdParties=Nezavisne kompanije
+ThirdParty=Subjekt
+ThirdParties=Subjekti
 ThirdPartyProspects=Kandidati
 ThirdPartyProspectsStats=Kandidati
 ThirdPartyCustomers=Klijenti
@@ -65,6 +65,7 @@ State=Država/Provincija
 StateId=ID Države/Provincije
 StateCode=Kod Države/Provincije
 StateShort=Stanje
+DepartmentBuyer=Buyer's state/province
 Region=Regija
 Region-State=Regija – Država
 Country=Zemlja
@@ -78,7 +79,7 @@ Chat=Chat
 PhonePro=Poslovni telefon
 PhonePerso=Lični telefon
 PhoneMobile=Mobilni
-No_Email=Odbija grupne emailove
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=Poštanski broj
 Town=Grad
@@ -382,11 +383,12 @@ ExportCardToFormat=Izvozna kartica za formatiranje
 ContactNotLinkedToCompany=Kontakt nije povezan ni sa jednim subjektom
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=Nemoguć pristup Dolibarr-u
-ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
-ExportDataset_company_2=Contacts and their properties
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Third-parties and their properties
 ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
-ImportDataset_company_3=Third-parties Bank accounts
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
 PriceLevel=Nivo cena
 PriceLevelLabels=Oznake nivoa cena
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Ime menadžera (CEO, direktor, predsednik...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Spoji subjekte
-ConfirmMergeThirdparties=Da li ste sigurni da želite da spojite odabranu Nezavisnu kompaniju sa trenutnom? Svi povezani objekti (računi, porudžbine i sl) će biti pomereni u trenutnu Nezavisnu kompaniju, nakon čega će odabrana Nezavisna kompanija biti obrisana.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Nezavisne kompanije su uspešno spojena
 SaleRepresentativeLogin=Login predstavnika prodaje
 SaleRepresentativeFirstname=Ime predstavnika prodaje
@@ -460,3 +462,6 @@ ExternalSystemID=External system ID
 IDOfPaymentInAnExternalSystem=ID of the payment mode into an external system (like Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE Webservice Credentials
 ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/sr_RS/exports.lang b/htdocs/langs/sr_RS/exports.lang
index 7ad0406fb1e..78c555f8ce4 100644
--- a/htdocs/langs/sr_RS/exports.lang
+++ b/htdocs/langs/sr_RS/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Naziv linije
 LineDescription=Opis linije
 LineUnitPrice=Jedinična cena linije
 LineVATRate=PDV linije
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Količina za liniju
 LineTotalHT=Amount excl. tax for line
 LineTotalTTC=Bruto svota za liniju
 LineTotalVAT=PDV svota za liniju
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Tip linije (0=proizvod, 1=usluga)
 FileWithDataToImport=Fajl sa podacima za import
 FileToImport=Izvorni fajl za import
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=Choose the file format to use as import file format b
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Format izvornog fajla
 FieldsInSourceFile=Polja u izvornom fajlu
-FieldsInTargetDatabase=Ciljana polja u Dolibarr bazi (bold=obavezna)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Nema polja
 MoveField=Pomeri polje broj %s
 ExampleOfImportFile=Example_of_import_file
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Check that the file format (field and string delimiters)
 RunSimulateImportFile=Run Import Simulation
 FieldNeedSource=Ovo polje zahteva podatke iz izvornog fajla
 SomeMandatoryFieldHaveNoSource=Neka obavezna polja nisu prisutna u izvornom fajlu
-InformationOnSourceFile=Informacije o izvornom fajlu
-InformationOnTargetTables=Informacije o ciljanim poljima
+InformationOnSourceFile=Izvorni fajl
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Uključite makar jedno izvorno polje u koloni polja za eksport
 SelectFormat=Izaberi ovaj format import fajla
 RunImportFile=Import Data
diff --git a/htdocs/langs/sr_RS/mails.lang b/htdocs/langs/sr_RS/mails.lang
index ba947d7abbb..a9ec858566b 100644
--- a/htdocs/langs/sr_RS/mails.lang
+++ b/htdocs/langs/sr_RS/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=EMailing
 EMailing=EMailing
-EMailings=EMailings
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=Svi eMailings
+AllEMailings=All mass eMails
 MailCard=Emailing kartica
 MailRecipients=Primaoci
 MailRecipient=Primalac
@@ -26,17 +26,19 @@ MailFile=Prilozi
 MailMessage=Sadržaj maila
 SubjectNotIn=Not in Subject
 BodyNotIn=Not in Body
-ShowEMailing=Prikaži emailing
-ListOfEMailings=Lista emailings
-NewMailing=Novi emailing
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=Izmeni emailing
-ResetMailing=Ponovo pošalji emailing
-DeleteMailing=Obriši emailing
-PreviewMailing=Pregled emailinga
-CreateMailing=Kreiraj emailing
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=Validni emailing
+ValidMailing=Valid mass Email
 MailingStatusDraft=Draft
 MailingStatusValidated=Odobren
 MailingStatusSent=Poslat
@@ -53,6 +55,7 @@ ErrorMailRecipientIsEmpty=Primalac nije unet
 WarningNoEMailsAdded=Nema novih mail-ova za dodavanje listi primalaca
 ConfirmValidMailing=Are you sure you want to validate this emailing?
 ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
+ConfirmResetMailingTargetMassactionQuestion=Are you sure you want to reset the status of the selected recipients (this may means that email will be resent if you use the Send email feature of the emailing) ?
 ConfirmDeleteMailing=Are you sure you want to delete this emailing?
 NbOfUniqueEMails=No. of unique emails
 NbOfUniquePhones=No. of unique phones
@@ -105,24 +108,24 @@ EmailCollectorFilterDesc=All filters must match to have an email being collected
 LineInFile=Linija %s u fajlu
 RecipientSelectionModules=Definisani zahtevi za selekciju primalaca
 MailSelectedRecipients=Selektirani primaoci
-MailingArea=Oblast Emailinga
-LastMailings=Latest %s emailings
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Statistike targeta
 NbOfCompaniesContacts=Jedinstveni kontakti/adrese
 MailNoChangePossible=Primaoci za odobrene emailinge ne mogu biti izmenjeni
-SearchAMailing=Pretraži emailing
-SendMailing=Pošalji emailing
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Poslao
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Možete ih poslati i online, dodavanjem parametra MAILING_LIMIT_SENDBYWEB sa vrednošću maksimalnog broja mailova koje želite da pošaljete u jednoj sesiji. Pogledajte Home - Podešavanja - Ostalo.
 ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Napomena: Slanje mailova putem web interfejsa se radi iz više puta iz bezbednosnih razloga, <b>%s</b> primalaca od jednom za svaku sesiju slanja.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Očisti listu
 ToClearAllRecipientsClickHere=Kliknite ovde da biste očistili listu primalaca za ovaj emailing
 ToAddRecipientsChooseHere=Dodaj primaoce selekcijom u listi
-NbOfEMailingsReceived=Masovni emailing primljen
-NbOfEMailingsSend=Masovni mail poslat
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID linije
 DeliveryReceipt=Delivery Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Možete koristiti <b>zarez</b> da biste naveli više primalaca
@@ -139,8 +142,10 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Konfiguracija slanja mailova je podešena na "%s". Ovaj mod ne može slati masovne mailove.
 MailSendSetupIs2=Prvo morate sa admin nalogom otvoriti meni %sHome - Setup - EMails%s da biste promenili parametar <strong>'%s'</strong> i prešli u mod '%s'. U ovom modu, možete uneti podešavanja SMTP servera Vašeg provajdera i koristiti funkcionalnost masovnog emailinga.
 MailSendSetupIs3=Ukoliko imate pitanja oko podešavanja SMTP servera, možete pitati %s.
@@ -174,15 +179,15 @@ NoContactWithCategoryFound=No category found linked to some contacts/addresses
 NoContactLinkedToThirdpartieWithCategoryFound=No category found linked to some thirdparties
 OutGoingEmailSetup=Outgoing emails
 InGoingEmailSetup=Incoming emails
-OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+OutGoingEmailSetupForEmailing=Outgoing emails (%s)
 DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informacija
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Odgovoreno
-IsNotAnAnswer=Is not answer (initial email)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Is an answer of an initial email
-RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+RecordCreatedByEmailCollector=Record created by the Email Collector %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.
@@ -190,9 +195,12 @@ NoMoreRecipientToSendTo=No more recipient to send the email to
 EmailOptedOut=Email owner has requested to not contact him with this email anymore
 EvenUnsubscribe=Include opt-out emails
 EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Useful for mandatory service emails for example.
-XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s operations done)
 YouCanMakeSomeInstructionForEmail=You can make some instructions for your Email (Example: generate image in email template...)
 ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
+LastNews=Latest News
+ListProducts= List of products
+PasswordReset=Password reset
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index 0f72d3b7b6e..4c11060621f 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -37,6 +37,7 @@ Translation=Prevod
 Translations=Translations
 CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criteria
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Enter a date criteria
 NoRecordFound=Nema rezultata
 NoRecordDeleted=No record deleted
@@ -45,6 +46,7 @@ NoError=Nema greške
 Error=Greška
 Errors=Greške
 ErrorFieldRequired=Polje '%s' je obavezno
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Polje '%s' sadrži pogrešnu vrednost
 ErrorFileDoesNotExists=Fajl %s ne postoji
 ErrorFailedToOpenFile=Greška prilikom otvaranja fajla %s
@@ -308,6 +310,7 @@ DateBuild=Datum generisanja izveštaja
 DatePayment=Datum uplate
 DateApprove=Vreme odobravanja
 DateApprove2=Vreme odobravanja (drugo odobrenje)
+PendingSince=Pending since
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Započeti
 ActionRunningShort=U toku
 ActionDoneShort=Završeno
 ActionUncomplete=Incomplete
-LatestLinkedEvents=Latest %s linked events
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Company/Organization
 Accountant=Accountant
 ContactsForCompany=Kontakti za ovaj subjekat
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=Sadržaj maila
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Pošalji email
 Email=Email
+EMail=Email
+EMails=Email
 NoEMail=Nema maila
 AlreadyRead=Already read
 NotRead=Nepročitano
@@ -793,7 +798,7 @@ Notes=Beleške
 AddNewLine=Dodaj liniju
 AddFile=Dodaj fajl
 FreeZone=Free-text product
-FreeLineOfType=Free-text item, type:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Dupliraj objekat sa glavnim atributima
 ReGeneratePDF=Re-generate PDF
 PDFMerge=PDF Merge
@@ -879,12 +884,14 @@ toward=ka
 Access=Pristup
 SelectAction=Selektiraj akciju
 SelectTargetUser=Select target user/employee
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Ctrl+C za kopiranje
 SaveUploadedFileWithMask=Sačuvaj fajl na serveru sa nazivom "<strong>%s</strong>" (ili "%s")
 OriginFileName=Originalno ime fajla
 SetDemandReason=Postavi izvor
 SetBankAccount=Definiši bankovni nalog
 AccountCurrency=Account currency
+AccountancyCode=Accounting Code
 ViewPrivateNote=Pogledaj beleške
 XMoreLines=%s linija skrivena(o)
 ShowMoreLines=Show more/less lines
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected reco
 ConfirmMassClone=Bulk clone confirmation
 ConfirmMassCloneQuestion=Select project to clone to
 ConfirmMassCloneToOneProject=Clone to project %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Related Objects
 ClassifyBilled=Classify Billed
 ClassifyUnbilled=Classify Unbilled
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=You need to be logged and you need permissions to view o
 Download=Download
 DownloadDocument=Download document
 DownloadSignedDocument=Download signed document
-ActualizeCurrency=Update currency rate
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Fiscal year
 ModuleBuilder=Module and Application Builder
 SetMultiCurrencyCode=Set currency
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
 WebSite=Website
@@ -1104,6 +1113,7 @@ PayedBy=Platio
 PayedTo=Paid to
 Monthly=Monthly
 Quarterly=Quarterly
+Quarter=Quarter
 Annual=Annual
 Local=Local
 Remote=Remote
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Zadatak
 ContactDefault_propal=Ponuda
 ContactDefault_supplier_proposal=Supplier Proposal
 ContactDefault_ticket=Tiket
+ContactDefault_societe=Subjekt
 ContactAddedAutomatically=Contact added from third-party contact roles
 More=More
 ShowDetails=Show details
@@ -1242,6 +1253,7 @@ CommercialAffected=Sales representative assigned
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=Poruka
+Emailing=Emailing
 Progression=Napredovanje
 YourMessage=Your message
 YourMessageHasBeenReceived=Your message has been received. We will answer or contact you as soon as possible.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Dodaj
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Od početka
+Transferred=Transferred
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index 6f1173b0308..e885900919b 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -97,7 +97,6 @@ ShowService=Pokaži uslugu
 ProductsAndServicesArea=Oblast proizvoda i usluga
 ProductsArea=Oblast proizvoda
 ServicesArea=Oblast usluga
-ListOfStockMovements=Lista promena stanja
 BuyingPrice=Kupovna cena
 PriceForEachProduct=Proizvodi sa posebnim cenama
 SupplierCard=Vendor card
@@ -145,6 +144,7 @@ WithoutDiscount=Without discount
 VATRateForSupplierProduct=Tax Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
+NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
 PredefinedItem=Predefined item
 PredefinedProducts=Predefined Product
@@ -171,7 +171,7 @@ BuyingPrices=Kupovne cene
 CustomerPrices=Cene klijenta
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs|Commodity|HS code
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Country of origin
 RegionStateOrigin=Region of origin
 StateOrigin=State|Province of origin
@@ -209,6 +209,7 @@ unitL=Liter
 unitT=ton
 unitKG=kg
 unitG=Gram
+unitGAL=galon
 unitMG=mg
 unitLB=funta
 unitOZ=unca
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.c
 UpdateInterval=Interval ažuriranja (minuti)
 LastUpdated=Latest update
 CorrectlyUpdated=Uspešno ažurirano
-PropalMergePdfProductActualFile=Fajlovi za dodavanje u PDF Azur su
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=Selektiraj PDF fajlove
 IncludingProductWithTag=Including products/services with the tag
 DefaultPriceRealPriceMayDependOnCustomer=Default cena, realna cena može zavisiti od klijenta
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=The quantity of the line were recalculated accordin
 
 #Attributes
 Attributes=Atributi
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Variant attributes
 ProductAttributes=Variant attributes for products
 ProductAttributeName=Variant attribute %s
@@ -395,6 +400,8 @@ ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
 ProductsPricePerCustomer=Product prices per customers
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
 AmountUsedToUpdateWAP=Unit amount to use to update the Weighted Average Price
@@ -403,7 +410,8 @@ PMPValueShort=PC
 mandatoryperiod=Mandatory periods
 mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
+mandatoryHelper2=Note that the message is a warning and not a blocking error.
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
@@ -435,3 +443,6 @@ AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtu
 ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
 WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned
 PriceLabel=Price label
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 8aac314ab4e..3d924e404f8 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Filens integritetskontroll har klarats, men v
 FileIntegritySomeFilesWereRemovedOrModified=Kontroll av filintegritet har misslyckats. Vissa filer har ändrats, tagits bort eller lagts till.
 GlobalChecksum=Global kontrollsumma
 MakeIntegrityAnalysisFrom=Gör integritetsanalys av applikationsfiler från
-LocalSignature=Inbäddad lokal signatur (mindre tillförlitlig)
-RemoteSignature=Fjärrsignatur (mer tillförlitlig)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Saknade filer
 FilesUpdated=Uppdaterade filer
 FilesModified=Ändrade filer
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Används av vissa dagordningsalernativ enbart
 Security=Säkerhet
 Passwords=Lösenord
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Kryptera databaslösenord som lagras i conf.php. Det rekommenderas starkt att aktivera det här alternativet.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=Att ha lösenord kodad i <b>conf.php</b> filen, ersätt raden <br> <b>$dolibarr_main_db_pass = "...";</b> <br>med<br> <b>$dolibarr_main_db_pass = "crypted:%s";</b>
 InstrucToClearPass=För att ha lösenord avkodade (läsbara) i <b>conf.php</b>-filen ersätter du raden <br> <b>$dolibarr_main_db_pass = "crypted: ...";</b> <br>med<br> <b>$dolibarr_main_db_pass = "%s";</b>
 ProtectAndEncryptPdfFiles=Skydda genererade PDF-filer. Detta rekommenderas INTE eftersom det bryter bulkhantering av PDF:er.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Beräknat fält
-ComputedFormulaDesc=Du kan här ange en formel med hjälp av andra egenskaper hos objektet eller någon PHP-kodning för att få ett dynamiskt beräknat värde. Du kan använda alla PHP-kompatibla formler inklusive "?" condition operator och följande globala objekt: <strong> $db, $conf, $langs, $mysoc, $user, $objectoffield </strong> . <br> <strong> VARNING </strong> : Om du behöver egenskaper för ett objekt som inte är laddat, hämta bara objektet till din formel som i det andra exemplet. <br> Att använda ett beräknat fält innebär att du inte kan ange något värde från gränssnittet. Dessutom, om det finns ett syntaxfel kan formeln inte returnera något. <br> <br> Exempel på formel: <br> $objectoffield->id < 10 ? round($objectoffield-> id / 2, 2): ($objectoffield->id + 2 * $user-> sub, 2, 2, 2 * $ (int)-> sub ) <br> <br> Exempel på att ladda om objektet <br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffields_do) *' >loadedobjettions_exemplar-> id-> $arbjreoptionsfältet->id) ->capital / 5: '-1') <br> <br> Annat exempel på formel för att tvinga fram laddning av objekt och dess överordnade objekt: <br> (($reloadedobj = new Task($db)) && ($reload($reload) ->id) > 0) && ($secondloadedobj = new project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Föräldraprojekt hittades inte'
+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'
 Computedpersistent=Lagra beräknat fält
 ComputedpersistentDesc=Beräknade extrafält kommer att lagras i databasen, men värdet beräknas bara om objektet för detta fält ändras. Om det beräknade fältet beror på andra objekt eller globala data kan detta värde vara fel!!
 ExtrafieldParamHelpPassword=Om du lämnar detta fält tomt betyder det att detta värde kommer att lagras UTAN kryptering (fältet är bara dolt med stjärnor på skärmen).<br><br>Enter värde 'dolcrypt' för att koda värde med en reversibel krypteringsalgoritm. Rensa data kan fortfarande vara kända och redigerade men krypteras i databasen.<br><br>Ange 'auto' (eller 'md5', 'sha256', 'password_hash', ...) för att använda standardlösenordskrypteringsalgoritmen (eller md5, sha256, password_hash...) för att spara det icke reversibla hashade lösenordet i databasen (inget sätt att hämta det ursprungliga värdet)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Att använda din egen leverantörs SMTP-server för att skicka e-post gör också att alla meddelanden som skickas också sparas i din skickat-mapp.
 WarningPHPMailD=Det rekommenderas därför att ändra sändningsmetoden för e-post till värdet "SMTP".
 WarningPHPMailDbis=Om du verkligen vill behålla standardmetoden "PHP" för att skicka e-post, ignorera bara denna varning eller ta bort den genom att %sklicka här%s.
-WarningPHPMail2=Om din leverantör behöver begränsa epostklienten till vissa IP-adresser (mycket sällsynt), är detta IP-adressen för ditt ERP/CRM: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Redovisning (förenklad)
 Module10Desc=Enkla redovisningsrapporter (loggböcker, omsättning) baserat på databasinnehåll. Använder inte huvudbok.
 Module20Name=Offerter
 Module20Desc=Hantering av offerter
-Module22Name=E-postutskick
-Module22Desc=Hantera e-postutskick
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energi
 Module23Desc=Övervakning av energiförbrukning
 Module25Name=Order
@@ -847,10 +848,10 @@ Permission212=Orderrader
 Permission213=Aktivera rad
 Permission214=Inställningar för telefoni
 Permission215=Inställningar för leverantörer
-Permission221=Se e-postutskick
-Permission222=Skapa/ändra e-postutskick (ämne, mottagare ...)
-Permission223=Bekräfta e-postutskick (sändning tillåts)
-Permission229=Radera e-postutskick
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Visa mottagare och info
 Permission238=Skicka meddelanden manuellt
 Permission239=Radera utskick efter bekräftande eller när markerad som skickad
@@ -1105,6 +1106,7 @@ DictionaryStaff=Antal anställda
 DictionaryAvailability=Leveransförsening
 DictionaryOrderMethods=Beställningssätt
 DictionarySource=Ursprung för offert/order
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Personliga grupper för rapporter
 DictionaryAccountancysystem=Modeller för kontoplan
 DictionaryAccountancyJournal=Bokföringsloggbok
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Tillbaka till ordboken
 TypeOfRevenueStamp=Typ av skattestämpel
 VATManagement=Hantera moms
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Den föreslagna momsen är som standard 0, men som kan användas för fall som föreningar, individer eller småföretagare.
 VATIsUsedExampleFR=I Frankrike betyder det att företag eller organisationer har ett riktigt system som påminner om företag (förenklad verklig eller normal verklig). Ett system där momsen deklareras.
 VATIsNotUsedExampleFR=I Frankrike betyder det föreningar som inte är momsskyldiga, eller företag, organisationer eller liberala yrken som har valt mikroföretagets skattesystem (försäljningsskatt i franchise) och betalat en franchise moms utan någon momsdeklaration. Detta val kommer att visa referensen "Ej tillämplig Försäljningsskatt - art-293B av CGI" på fakturor.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Typ av moms
 LTRate=Taxa
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Enligt skatteupplägget (se %s - %s - %s) behöver dit
 LabelUsedByDefault=Etikett att använda som standard om ingen översättning kan hittas för kod
 LabelOnDocuments=Etikett på dokument
 LabelOrTranslationKey=Etikett eller översättningsnyckel
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=Visa kunds/leverantörs momsnummer i kombolistor
 AddAdressInList=Visa kund-/leverantörsadress i kombinationslistor.<br>Tredje parter kommer att visas med namnformatet "The Big Company corp. - 21 jump street 123456 Big town - USA" istället för " The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Be om det föredragna leveranssättet för tredjeparter.
-FieldEdition=Ändring av fält %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Exempel: +2 (ange endast om problem med tidszon offset upplevs)
 GetBarCode=Få streckkod
 NumberingModules=Numreringsmodeller
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Tvinga fakturadatum till giltighetsdatum
 SuggestedPaymentModesIfNotDefinedInInvoice=Föreslaget betalningsläge på faktura som standard om det inte anges på fakturan
 SuggestPaymentByRIBOnAccount=Föreslå betalning genom uttag på konto
 SuggestPaymentByChequeToAddress=Föreslå betalning med check till
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Fritext på fakturor
 WatermarkOnDraftInvoices=Vattenstämpel på fakturautkast (tomt om ingen)
 PaymentsNumberingModule=Numreringsmodell för betalningar
@@ -1718,6 +1723,7 @@ CompressionOfResources=Komprimering av HTTP-svar
 CompressionOfResourcesDesc=Till exempel använder du Apache-direktivet "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=En sådan automatisk detektering är inte möjligt med nuvarande webbläsare
 DefaultValuesDesc=Här kan du definiera det standardvärde du vill använda när du skapar en ny post och / eller standardfiltrer eller sorteringsordningen när du listar poster.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Standardvärden (för att använda på formulär)
 DefaultSearchFilters=Standard sökfilter
 DefaultSortOrder=Standard sorteringsorder
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Sänts numrering moduler
 SendingsAbility=Support fraktsark för kundleveranser
 NoNeedForDeliveryReceipts=I de flesta fall används fraktskivor både som ark för kundleveranser (lista över produkter att skicka) och ark som mottas och signeras av kunden. Därför är leverans kvittot en duplicerad funktion och är sällan aktiverad.
 FreeLegalTextOnShippings=Fritext på fraktsedlar
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produkter leveranser kvitto numrering modul
 DeliveryOrderModel=Produkter leveranser kvitto modell
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Fri text om leverans kvitton
 ##### FCKeditor #####
 AdvancedEditor=Avancerad redaktör
 ActivateFCKeditor=Aktivera FCKeditor för:
-FCKeditorForNotePublic=WYSIWYG skapande/utgåva av fältet "publika noteringar" av element
-FCKeditorForNotePrivate=WYSIWYG skapande/utgåva av fältet "privata anteckningar" av element
-FCKeditorForCompany=WYSIWYG skapande/utgåva av fältbeskrivningen av element (förutom produkter/tjänster)
-FCKeditorForProductDetails=WYSIWYG skapande/utgåva av produktbeskrivning eller rader för objekt (rader av förslag, order, fakturor, etc...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Varning: Att använda det här alternativet för det här fallet rekommenderas verkligen inte eftersom det kan skapa problem med specialtecken och sidformatering när du bygger PDF-filer.
-FCKeditorForMailing= WYSIWYG skapande/utgåva för massutskick (Verktyg->e-post)
-FCKeditorForUserSignature=WYSIWYG skapande/utgåva av användarsignatur
-FCKeditorForMail=WYSIWYG skapande/utgåva för all post (förutom Verktyg->e-post)
-FCKeditorForTicket=WYSIWYG skapande/utgåva för biljetter
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Inställning av lagermodul
 IfYouUsePointOfSaleCheckModule=Om du använder modulen Point of Sale (POS) som standard eller en extern modul, kan denna inställning ignoreras av din POS-modul. De flesta POS-moduler är utformade som standard för att skapa en faktura omedelbart och minska lageret oberoende av alternativen här. Så om du behöver eller inte har en lagerminskning när du registrerar en försäljning från din POS, kolla även din POS-moduluppsättning.
@@ -1867,7 +1874,6 @@ Buy=Köp
 Sell=Sälj
 InvoiceDateUsed=Fakturadatum används
 YourCompanyDoesNotUseVAT=Ditt företag har definierats för att inte använda moms (Hem - Inställning - Företag / Organisation), så det finns inga momsalternativ att installera.
-AccountancyCode=Redovisningskod
 AccountancyCodeSell=Försäljning konto. kod
 AccountancyCodeBuy=Köpa konto. kod
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Håll kryssrutan "Skapa automatiskt betalningen" tom som standard när du skapar en ny skatt
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Vilken vy vill du öppna som standard när du väljer meny
 AGENDA_EVENT_PAST_COLOR = Tidigare händelsefärg
 AGENDA_EVENT_CURRENT_COLOR = Aktuell händelsefärg
 AGENDA_EVENT_FUTURE_COLOR = Framtida händelsefärg
-AGENDA_REMINDER_BROWSER = Aktivera händelsepåminnelse <b> i användarens webbläsare </b> (När påminnelsedatum har uppnåtts visas en popup i webbläsaren. Varje användare kan inaktivera sådana aviseringar från sin webbläsarinställning).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Aktivera ljudanmälan
-AGENDA_REMINDER_EMAIL = Aktivera händelsepåminnelse <b> via e-post </b> (påminnelsealternativ / fördröjning kan definieras för varje händelse).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Obs! Frekvensen för det schemalagda jobbet %s måste vara tillräckligt för att vara säker på att påminnelsen skickas i rätt ögonblick.
 AGENDA_SHOW_LINKED_OBJECT = Visa länkat objekt i agendan
 AGENDA_USE_EVENT_TYPE = Använd händelsetyper (hanteras i menyn Inställningar -> Ordböcker -> Typ av kalenderhändelser)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Ställ in det här standardvärdet för typ av händelse automatiskt i händelse skapa formulär
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Viktiga att tillåta export länk
 PastDelayVCalExport=Inte exporterar fall äldre än
 SecurityKey = Säkerhetsnyckel
@@ -2006,7 +2017,7 @@ BackupZipWizard=Guiden för att bygga arkivet med dokumentkatalogen
 SomethingMakeInstallFromWebNotPossible=Installation av extern modul är inte möjligt från webbgränssnittet av följande skäl:
 SomethingMakeInstallFromWebNotPossible2=Av den anledningen är processen att uppgradera som beskrivs här en manuell process endast en privilegierad användare kan utföra.
 InstallModuleFromWebHasBeenDisabledContactUs=Installation eller utveckling av externa moduler eller dynamiska webbplatser, från applikationen, är för närvarande låst av säkerhetsskäl. Kontakta oss om du behöver aktivera den här funktionen.
-InstallModuleFromWebHasBeenDisabledByFile=Installation av extern modul från ansökan har inaktiverats av administratören. Du måste be honom att ta bort <strong>filen% s</strong> för att tillåta denna funktion.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installera eller bygga en extern modul från programmet måste spara modulfilerna i katalogen <strong> %s </strong>. För att få den här katalogen bearbetad av Dolibarr måste du konfigurera <strong> conf / conf.php </strong> för att lägga till 2 direktivlinjer: <br> <strong> $ dolibarr_main_url_root_alt = '/ custom'; </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s / custom'; </strong>
 HighlightLinesOnMouseHover=Markera tabelllinjer när musen flytta passerar över
 HighlightLinesColor=Markera färg på linjen när musen passerar över (använd 'ffffff' för ingen höjdpunkt)
@@ -2036,6 +2047,7 @@ Enter0or1=Ange 0 eller 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Ange här mellan hållare, lista med byte nummer som representerar valutasymbolen. Till exempel: för $, skriv [36] - för brazil real R $ [82,36] - för €, skriv [8364]
 ColorFormat=RGB-färgen är i HEX-format, t.ex.: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Ikonnamn i format:<br>- image.png för en bildfil till den aktuella temakatalogen<br>- image.png@module om filen finns i katalogen /img/ för en modul<br>- fa-xxx för en FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size för en FontAwesome fa-xxx picto (med prefix, färg och storleksuppsättning)
 PositionIntoComboList=Position of line i kombinationslistor
 SellTaxRate=Försäljningsmomssats
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Dölj kanter på avsändarens adressram
 MAIN_PDF_NO_RECIPENT_FRAME=Dölj kanter på mottagarens adressram
 MAIN_PDF_HIDE_CUSTOMER_CODE=Dölj kundnummer
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Dölj avsändarens/företagets namn i adressblocket
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Dölj betalningsvillkor
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Dölj betalningsläge
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=Rekommenderas inte
 ARestrictedPath=Begränsad sökväg för datafiler
 CheckForModuleUpdate=Sök efter uppdateringar av externa moduler
 CheckForModuleUpdateHelp=Denna åtgärd kommer att ansluta till utgivare av externa moduler för att kontrollera om en ny version är tillgänglig.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=En uppdatering är tillgänglig
 NoExternalModuleWithUpdate=Inga uppdateringar hittades för externa moduler
 SwaggerDescriptionFile=Swagger API beskrivningsfil (för exempelvis användning med redoc)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Visa leveransadress
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Obligatorisk indikation i vissa länder (Frankrike, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Url-länk till socialt nätverk. Använd {socialid} för den variabla delen som innehåller det sociala nätverkets ID.
 IfThisCategoryIsChildOfAnother=Om denna kategori är en underkategori till en annan
 DarkThemeMode=Mörkt läge
@@ -2450,7 +2471,7 @@ 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)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Inte skapad som standard. Skapat endast vid modulaktivering.
 CSSPage=CSS-stil
 Defaultfortype=Standard
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) funktioner
 AiDescriptionLong=Ger AI (Artificial Intelligence) funktioner i olika delar av applikationen. Behöver extern AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI-modulinställning
 AiCustomPrompt=AI anpassad prompt
 AI_CONFIGURATIONS_PROMPT=Anpassad uppmaning
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI anpassade uppmaningar om funktioner
 EnterAnIP=Ange en IP-adress
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Visa leveransadress
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Obligatorisk indikation i vissa länder (Frankrike, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index aea7f0040db..ddbb37810bb 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Slutbalans
 CurrentBalance=Aktuell balans
 FutureBalance=Framtida balans
 ShowAllTimeBalance=Visa balans från start
-AllTime=Från början
 Reconciliation=Avstämning
 RIB=Bankkontonummer
 IBAN=IBAN-nummer
@@ -133,7 +132,7 @@ DeleteTransaction=Ta bort post
 ConfirmDeleteTransaction=Är du säker på att du vill radera den här posten?
 ThisWillAlsoDeleteBankRecord=Detta kommer även att ta bort genererad bankpost
 BankMovements=Förflyttningar
-PlannedTransactions=Planerade poster
+PlannedTransactions=Upcoming entries
 Graph=Grafer
 ExportDataset_banque_1=Bankposter och kontoutdrag
 ExportDataset_banque_2=Insättningsblankett
@@ -151,7 +150,7 @@ FutureTransaction=Framtida transaktion. Det gick inte att stämma av.
 SelectChequeTransactionAndGenerate=Välj/filtrera de checkar som ska ingå i kvittot på check. Klicka sedan på "Skapa".
 SelectPaymentTransactionAndGenerate=Välj/filtrera de dokument som ska inkluderas i %s insättningskvitto. Klicka sedan på "Skapa".
 InputReceiptNumber=Välj det kontoutdrag som är relaterat till förlikningen. Använd ett sorterbart numeriskt värde
-InputReceiptNumberBis=ÅÅÅÅMM eller ÅÅÅÅMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Att avstämma?
 ThenCheckLinesAndConciliate=Kontrollera sedan raderna som finns i kontoutdraget och klicka
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Om den här funktionen är aktiverad kan du välja en s
 BankColorizeMovementName1=Bakgrundsfärg för debitförflyttning
 BankColorizeMovementName2=Bakgrundsfärg för kreditförflyttning
 IfYouDontReconcileDisableProperty=Om du inte gör någon bankavstämning på vissa bankkonton, inaktivera "%s" på dem för att ta bort denna varning
-NoBankAccountDefined=Inget bankkonto definerat
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Ingen post hittades på bankkontot. Vanligtvis inträffar detta när en post har raderats manuellt från transaktionslistan på bankkontot (till exempel under en avstämning av bankkontot). En annan anledning är att betalningen registrerades när modulen "%s" inaktiverades.
 AlreadyOneBankAccount=Ett bankkonto har redan definierats
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA-filvariant
diff --git a/htdocs/langs/sv_SE/blockedlog.lang b/htdocs/langs/sv_SE/blockedlog.lang
index 607fe972d70..3d9da855e12 100644
--- a/htdocs/langs/sv_SE/blockedlog.lang
+++ b/htdocs/langs/sv_SE/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Oföränderliga loggar
 ShowAllFingerPrintsMightBeTooLong=Visa alla arkiverade loggar (kan vara långa)
 ShowAllFingerPrintsErrorsMightBeTooLong=Visa alla icke-giltiga arkivloggar (kan vara långa)
 DownloadBlockChain=Ladda ner fingeravtryck
-KoCheckFingerprintValidity=Arkiverad loggpost är inte giltig. Det betyder att någon (en hacker?) Har modifierat en del data från denna post efter att den spelats in, eller har raderat den tidigare arkiverade posten (kontrollera att raden med föregående # finns) eller har ändrat kontrollsumman för den tidigare posten.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Arkiverad loggpost är giltig. Uppgifterna på den här raden ändrades inte och posten följer den föregående.
 OkCheckFingerprintValidityButChainIsKo=Arkiverad logg verkar giltig jämfört med tidigare men kedjan förstördes tidigare.
 AddedByAuthority=Lagras i fjärrmyndighet
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Logguppgifter
 ListOfTrackedEvents=Lista över spårade händelser
 Fingerprint=Fingeravtryck
 DownloadLogCSV=Exportera arkiverade loggar (CSV)
-DataOfArchivedEvent=Fullständig information om arkiverad händelse
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Originalobjekt (typ %s, id %s) inte länkat (se kolumnen Fullständig datasökning för att få oförändrad sparade data)
 BlockedLogAreRequiredByYourCountryLegislation=Modifierad loggmodul kan krävas enligt ditt lands lagstiftning. Inaktivera den här modulen kan göra eventuella framtida transaktioner ogiltiga med avseende på lagen och användningen av laglig programvara eftersom de inte kan bekräftas av en skatterevision.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Modifierad loggmodul aktiverades på grund av lagstiftningen i ditt land. Inaktivera den här modulen kan göra eventuella framtida transaktioner ogiltiga med avseende på lagen och användningen av laglig programvara eftersom de inte kan bekräftas av en skatterevision.
@@ -30,6 +32,7 @@ BlockedLogEnabled=System för att spåra händelser i oföränderliga loggar har
 BlockedLogDisabled=Systemet för att spåra händelser i oföränderliga loggar har inaktiverats efter att vissa kontroller gjorts. Vi sparade ett speciellt fingeravtryck för att spåra kedjan som trasig
 BlockedLogDisabledBis=Systemet för att spåra händelser i oföränderliga loggar har inaktiverats. Detta är möjligt eftersom ingen registrering har gjorts ännu.
 LinkHasBeenDisabledForPerformancePurpose=För prestationsändamål visas inte direktlänk till dokumentet efter den 100:e raden.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Faltira raderas logiskt
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Kundbetalning logisk borttagning
 logPAYMENT_VARIOUS_CREATE=Betalning (ej tilldelad till faktura) skapad
 logPAYMENT_VARIOUS_DELETE=Betalning (ej tilldelad till faktura) logisk borttagning
 logPAYMENT_VARIOUS_MODIFY=Betalning (ej tilldelad till faktura) modifierad
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang
index 3778ad5aaf6..668c350aac5 100644
--- a/htdocs/langs/sv_SE/categories.lang
+++ b/htdocs/langs/sv_SE/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Kontakter tagg/kategori
 AccountsCategoriesArea=Bankkonto tagg/kategori
 ProjectsCategoriesArea=Projekt tagg/kategori
 UsersCategoriesArea=Användare tagg/kategori
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Underkategorier
 CatList=Lista taggar/kategorier
 CatListAll=Visa alla taggar/kategorier
@@ -90,9 +91,10 @@ CategoriesSetup=Inställningar taggar/kategorier
 CategorieRecursiv=Länka med överordnad tagg/kategori automatiskt
 CategorieRecursivHelp=Om alternativet är aktiverat kommer objektet också att läggas till i de överordnade kategorierna när du lägger till ett objekt i en underkategori.
 AddProductServiceIntoCategory=Tilldela kategori till produkten/tjänsten
-AddCustomerIntoCategory=Tilldela kategori till kund
-AddSupplierIntoCategory=Tilldela kategori till leverantör
-AssignCategoryTo=Tilldela kategori till
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Visa tagg/kategori
 ByDefaultInList=Som standard i listan
 ChooseCategory=Välj kategori
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Innehållskategorier
 KnowledgemanagementsCategoriesArea=KM artikel kategorier
 UseOrOperatorForCategories=Använd operatören 'ELLER' för kategorier
 AddObjectIntoCategory=Tilldela kategorin
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 726c8e39ff4..2557ebab123 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -34,7 +34,7 @@ PriceFormatInCurrentLanguage=Prisvisningsformat på aktuellt språk och valuta
 ThirdPartyName=Namn på tredjepart
 ThirdPartyEmail=E-post till tredjepart
 ThirdParty=Tredjepart
-ThirdParties=Utomstående
+ThirdParties=Tredjepart
 ThirdPartyProspects=Prospekt
 ThirdPartyProspectsStats=Prospekt
 ThirdPartyCustomers=Kunder
@@ -65,6 +65,7 @@ State=Delstat / provins
 StateId=Regions-ID
 StateCode=Länskod
 StateShort=Ö'm
+DepartmentBuyer=Buyer's state/province
 Region=Region
 Region-State=Region - Län
 Country=Land
@@ -78,7 +79,7 @@ Chat=Chatta
 PhonePro=Företagstelefon
 PhonePerso=Pers. telefon
 PhoneMobile=Mobil
-No_Email=Nekat e-postutskick
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=Postnummer
 Town=Stad
@@ -382,12 +383,12 @@ ExportCardToFormat=Exportera kort till format
 ContactNotLinkedToCompany=Kontakt inte länkad till någon tredjepart
 DolibarrLogin=Dolibarr inloggning
 NoDolibarrAccess=Dolibarr ej nåbar
-ExportDataset_company_1=Tredjeparter (företag/stiftelser/fysiska personer) och deras egenskaper
-ExportDataset_company_2=Kontakter och deras egenskaper
-ExportDataset_company_3=Tredjeparts bankkonton
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Tredjepartens ytterligare kontakter/adresser och attribut
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Tredjeparter och deras egenskaper
 ImportDataset_company_2=Tredjepartens ytterligare kontakter/adresser och attribut
-ImportDataset_company_3=Tredjeparts bankkonton
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Tredjepartens säljare (tilldela säljare/användare till företag)
 PriceLevel=Prisnivå
 PriceLevelLabels=Prisnivåetiketter
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Företagledares namn (VD, ordförande ...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Sammanfoga tredjepart
-ConfirmMergeThirdparties=Är du säker på att du vill slå samman den valda tredjeparten med den nuvarande? Alla länkade objekt (fakturor, beställningar, ...) flyttas till den aktuella tredjeparten, varefter den valda tredjeparten raderas.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Tredjepart har blivit sammanfogad
 SaleRepresentativeLogin=Inloggning för säljare
 SaleRepresentativeFirstname=Förnamn på säljare
@@ -461,3 +462,6 @@ ExternalSystemID=Externt system-ID
 IDOfPaymentInAnExternalSystem=ID för betalningsläget till ett externt system (som Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE Webservice-uppgifter
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Tredje parten måste vara en kund för att tillåta skapandet av sin bankinformation på Stripe-sidan
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index 891263c9807..6d3e72a3356 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Kundfaktura betalning
 PaymentSupplierInvoice=leverantörsfaktura betalning
 PaymentSocialContribution=Sociala och skattemässiga betalningar
 PaymentVat=Moms betalning
-AutomaticCreationPayment=Registrera automatiskt betalningen
+AutomaticCreationPayment=Also record the payment
 ListPayment=Lista över betalningar
 ListOfCustomerPayments=Förteckning över kundbetalningar
 ListOfSupplierPayments=Lista över leverantörsbetalningar
@@ -118,10 +118,14 @@ SocialContributionsPayments=Betalning av sociala / skattemässiga skatter
 ShowVatPayment=Visa mervärdesskatteskäl
 TotalToPay=Totalt att betala
 BalanceVisibilityDependsOnSortAndFilters=Balans är endast synlig i den här listan om tabellen sorteras på %s och filtreras på 1 bankkonto (utan andra filter)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Kundbokföringskod
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Kod för leverantörsredovisning
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Cust. konto. koda
 SupplierAccountancyCodeShort=Sup. konto. koda
+UserAccountancyCodeShort=User account. code
 AccountNumber=Kontonummer
 NewAccountingAccount=Nytt konto
 Turnover=Omsättning fakturerad
@@ -129,7 +133,9 @@ TurnoverCollected=Omsättning samlad
 SalesTurnoverMinimum=Minsta omsättning
 ByExpenseIncome=Av kostnader och inkomster
 ByThirdParties=Av tredje part
+ByProjects=By projects
 ByUserAuthorOfInvoice=Mot faktura författare
+DetailedListLowercase=detailed list
 CheckReceipt=Insättningsblankett
 CheckReceiptShort=Insättningsblankett
 LastCheckReceiptShort=Senaste %s insättningsbevis
diff --git a/htdocs/langs/sv_SE/datapolicy.lang b/htdocs/langs/sv_SE/datapolicy.lang
index 80f31d84029..2ccb93c3fc2 100644
--- a/htdocs/langs/sv_SE/datapolicy.lang
+++ b/htdocs/langs/sv_SE/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Sekretesspolicy
 Module4100Desc = Modul för att hantera sekretess (i enlighet med GDPR)
 # Administration page
 datapolicySetup = Inställning av sekretesspolicy
-Deletion = Radering av data
-datapolicySetupPage = Beroende på lagarna i dina länder (exempel <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Artikel 5</a> i GDPR) måste personuppgifter sparas under en period inte överstiger den varaktighet som uppgifterna behövs för ändamålet för vilka de samlades in, förutom för arkiveringsändamål.<br>Raderingen kommer att göras automatiskt efter en viss varaktighet utan händelser (varaktigheten som du kommer att ha angett nedan).
+DataDeletion=Radering av data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s månader
 ONE_YEAR = 1 år
 NB_YEARS = %s år
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Prospekt/kund
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Inte prospekt eller kund
 DATAPOLICY_CONTACT_FOURNISSEUR = Leverantör
 DATAPOLICY_ADHERENT = Medlem
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Du kan skicka e-post angående GDPR till alla dina relevanta kontakter (som ännu inte har fått ett mejl och som du inte har registrerat något för om deras GDPR-avtal). För att göra detta, använd följande knapp.
 SendAgreement = Skicka e-post
 AllAgreementSend = All e-post har skickats
 TXTLINKDATAPOLICYACCEPT = Text för länken "godkänn"
 TXTLINKDATAPOLICYREFUSE = Text för länken "oenighet"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: hantering av personuppgifter
 DATAPOLICY_consentement = Samtycke inhämtat för behandling av personuppgifter
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index b27a05bf592..215de568fe4 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Misslyckades med att skapa en katalog. Kontrollera att webbservern användaren har rättigheter att skriva till Dolibarr dokument katalogen. Om parametern <b>safe_mode</b> är aktiv på PHP, kontrollera att Dolibarr php-filer äger till webbserver användare (eller grupp).
 ErrorNoMailDefinedForThisUser=Ingen post definierats för denna användare
 ErrorSetupOfEmailsNotComplete=Installationen av e-postmeddelanden är inte klar
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Den här funktionen behöver JavaScript för att vara aktiverad för att fungera. Ändra detta i setup - display.
 ErrorTopMenuMustHaveAParentWithId0=En meny av typen &quot;Top&quot; kan inte ha en förälder meny. Sätt 0 i överordnade menyn eller välja en meny av typen &quot;Vänster&quot;.
 ErrorLeftMenuMustHaveAParentId=En meny av typen &quot;Vänster&quot; måste ha en förälder id.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Ladda upp blockeras av en PHP / Apache plugin.
 ErrorFileSizeTooLarge=Filstorleken är för stor eller filen tillhandahålls inte.
 ErrorFieldTooLong=Fältet %s är för långt.
 ErrorSizeTooLongForIntType=Storlek för lång för int typ (%s siffror max)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Storlek för lång för sträng typ (%s tecken max)
 ErrorNoValueForSelectType=Vänligen fyll i värde för utvald lista
 ErrorNoValueForCheckBoxType=Vänligen fyll i värde för krysslista
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Dåligt värde typer för kod. Försök igen med ett nytt v
 ErrorBothFieldCantBeNegative=Fält %s och %s kan inte vara både negativt
 ErrorFieldCantBeNegativeOnInvoice=Fältet <strong>%s</strong> kan inte vara negativt på den här typen av faktura. Om du behöver lägga till en rabattrad, skapa bara rabatten först (från fältet '%s' på tredje parts kort) och tillämpa den på fakturan.
 ErrorLinesCantBeNegativeForOneVATRate=Totalt antal rader (netto efter skatt) kan inte vara negativt för en given icke-null mervärdesskattesats (Hittade en negativ summa för mervärdesskattesats <b> %s </b> %%).
-ErrorLinesCantBeNegativeOnDeposits=Linjer kan inte vara negativa vid insättning. Du kommer att stöta på problem när du behöver konsumera depositionen i slutfakturan om du gör det.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Kvantitet för linje i kundfakturor kan inte vara negativt
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Användarkonto <b>%s</b> användas för att exekvera webbserver har ingen behörighet för den
 ErrorNoActivatedBarcode=Ingen streckkod typ aktiveras
 ErrUnzipFails=Det gick inte att packa upp %s med ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # 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.
 WarningPasswordSetWithNoAccount=Ett lösenord har ställts för den här medlemmen. Men inget användarkonto skapades. Så det här lösenordet är lagrat men kan inte användas för att logga in till Dolibarr. Den kan användas av en extern modul / gränssnitt men om du inte behöver definiera någon inloggning eller ett lösenord för en medlem kan du inaktivera alternativet "Hantera en inloggning för varje medlem" från inställningen av medlemsmodulen. Om du behöver hantera en inloggning men inte behöver något lösenord, kan du hålla fältet tomt för att undvika denna varning. Obs! Email kan också användas som inloggning om medlemmen är länkad till en användare.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR-faktura kan endast läggas till på fakturor som är inställda på att betalas med kreditöverföringsbetalningar.
 SwissQrCreditorAddressInvalid = Kreditgivarens adress är ogiltig (är postnummer och stad inställda? (%s)
 SwissQrCreditorInformationInvalid = Borgenärsinformationen är ogiltig för IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s är redan definierad som kontakt
 ErrorThisGroupIsAlreadyDefinedAsThisType=Kontakterna med den här gruppen är redan definierade som kontakt för den här typen.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/sv_SE/exports.lang b/htdocs/langs/sv_SE/exports.lang
index ec45adb28a9..94a789c0f70 100644
--- a/htdocs/langs/sv_SE/exports.lang
+++ b/htdocs/langs/sv_SE/exports.lang
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Kontrollera att filformat (fält- och strängavgränsare
 RunSimulateImportFile=Kör importsimulering
 FieldNeedSource=Detta fält kräver data från källfilen
 SomeMandatoryFieldHaveNoSource=Vissa obligatoriska fält inte har någon källa från datafil
-InformationOnSourceFile=Information om källfil
-InformationOnTargetTables=Information om mål fält
+InformationOnSourceFile=Källfil
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Byt minst en källa fält i kolumnen i fält att exportera
 SelectFormat=Välj denna import filformat
 RunImportFile=Importera datan
diff --git a/htdocs/langs/sv_SE/hrm.lang b/htdocs/langs/sv_SE/hrm.lang
index 7ee9643ddb5..c6ddf66676c 100644
--- a/htdocs/langs/sv_SE/hrm.lang
+++ b/htdocs/langs/sv_SE/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=Erforderlig rang för jobbprofilen
-RequiredRankShort=Erforderlig rang
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Positioner med denna jobbprofil
-EmployeeRank=Anställd rang för denna kompetens
-EmployeeRankShort=Anställd rang
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Anställd befattning
 EmployeePositions=Anställda befattningar
 EmployeesInThisPosition=Anställda i denna befattning
@@ -72,6 +72,9 @@ AddSkill=Lägg till kompetens till jobbprofilen
 RequiredSkills=Erforderliga färdigheter för denna jobbprofil
 UserRank=Användarrankning
 SkillList=Kompetenslista
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Spara rang
 TypeKnowHow=Veta hur
 TypeHowToBe=Hur man är
@@ -95,3 +98,5 @@ NeedBusinessTravels=Behöver affärsresor
 NoDescription=Ingen beskrivning
 TheJobProfileHasNoSkillsDefinedFixBefore=Den utvärderade jobbprofilen för denna anställd har ingen färdighet definierad. Vänligen lägg till färdigheter, ta bort och starta om utvärderingen.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index afd8d244584..c43dd242171 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=E-post
 EMailing=E-post
-EMailings=E-post
+EMailings=Mass EMails
 SMSings=SMS
-AllEMailings=Alla e-post
+AllEMailings=All mass eMails
 MailCard=E-post kort
 MailRecipients=Mottagare
 MailRecipient=Mottagare
@@ -26,19 +26,19 @@ MailFile=Bifogade filer
 MailMessage=E-organ
 SubjectNotIn=Inte i ämne
 BodyNotIn=Inte i kroppen
-ShowEMailing=Visa e-post
-ListOfEMailings=Lista över emailings
-NewMailing=Ny e-post
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Nytt sms
-EditMailing=Redigera e-post
-ResetMailing=Skicka om e-post
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Radera e-post
-PreviewMailing=Förhandsgranska e-post
-CreateMailing=Skapa e-post
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=Gäller e-post
+ValidMailing=Valid mass Email
 MailingStatusDraft=Förslag
 MailingStatusValidated=Bekräftat
 MailingStatusSent=Skickat
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Alla filter måste matcha för att ett e-postmeddelande
 LineInFile=Line %s i filen
 RecipientSelectionModules=Definierade krav på mottagarens val
 MailSelectedRecipients=Valda mottagare
-MailingArea=EMailings område
-LastMailings=Senaste %s e-postmeddelanden
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Mål statistik
 NbOfCompaniesContacts=Unika kontakter av företag
 MailNoChangePossible=Mottagare för bekräftades e-post kan inte ändras
-SearchAMailing=Sök utskick
-SendMailing=Skicka e-post
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Skickat av
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Skicka en e-post kan utföras från kommandoraden. Be din serveradministratör att starta följande kommando för att skicka e-postmeddelandet till alla mottagare:
 MailingNeedCommand2=Du kan dock skicka dem online genom att lägga till parametern MAILING_LIMIT_SENDBYWEB med värde av maximalt antal e-postmeddelanden du vill skicka genom sessionen. För detta, gå hem - Setup - Annat.
 ConfirmSendingEmailing=Om du vill skicka e-post direkt från den här skärmen, vänligen bekräfta att du är säker på att du vill skicka e-post nu från din webbläsare?
-LimitSendingEmailing=Obs: Sänder av email från webbgränssnitt sker i flera gånger för säkerhets- och timeout <b>skäl,% s</b> mottagare i taget för varje sändning session.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Rensa lista
 ToClearAllRecipientsClickHere=Klicka här för att rensa listor över mottagare av detta e-post
 ToAddRecipientsChooseHere=Lägg till mottagare genom att välja från listorna
-NbOfEMailingsReceived=Massa emailings fått
-NbOfEMailingsSend=Massemail skickas
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID rekord
 DeliveryReceipt=Leverans Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Du kan använda <b>kommateckenavgränsare</b> att ange flera mottagare.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Inga automatiska e-postmeddelanden planeras för den h
 ANotificationsWillBeSent=En automatisk avisering skickas via e-post
 SomeNotificationsWillBeSent=%s automatiska meddelanden skickas via e-post
 AddNewNotification=Prenumerera på ett nytt automatiskt e-postmeddelande (mål / händelse)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Konfiguration av e-post att skicka har ställts in till "% s". Detta läge kan inte användas för att skicka massutskick.
 MailSendSetupIs2=Du måste först gå, med ett administratörskonto, i meny% Shome - Setup - e-post% s för att ändra parameter <strong>'% s'</strong> för att använda läget "% s". Med det här läget kan du ange inställningar för SMTP-servern från din internetleverantör och använda Mass mejla funktionen.
 MailSendSetupIs3=Om du har några frågor om hur man ställer in din SMTP-server, kan du be att% s.
@@ -183,7 +185,7 @@ Information=Information
 ContactsWithThirdpartyFilter=Kontakter med filter från tredje part
 Unanswered=Obesvarad
 Answered=Besvarade
-IsNotAnAnswer=Är inte svaret (första e-postmeddelandet)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Är ett svar på ett första e-postmeddelande
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Standardvärde för fältet '%s' när en ny kontakt skapas
@@ -199,6 +201,6 @@ ModelTemplate=E-postmall
 YouCanChooseAModelForYouMailContent= Du kan välja en av mallmodellerna eller generera en med AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 5e56a70c1d0..bfa925bf37b 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -37,6 +37,7 @@ Translation=Översättning
 Translations=Översättningar
 CurrentTimeZone=Tidszon PHP (server)
 EmptySearchString=Ange icke tomma sökkriterier
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Ange ett datumkriterium
 NoRecordFound=Ingen post funnen
 NoRecordDeleted=Ingen post raderad
@@ -45,6 +46,7 @@ NoError=Inget fel
 Error=Fel
 Errors=Fel
 ErrorFieldRequired=Fältet '%s' är obligatoriskt
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Fältet '%s' har ett felaktigt värde
 ErrorFileDoesNotExists=Filen %s finns inte
 ErrorFailedToOpenFile=Kunde inte öppna filen %s
@@ -308,6 +310,7 @@ DateBuild=Rapportera byggdatum
 DatePayment=Datum för betalning
 DateApprove=Godkännandedatum
 DateApprove2=Godkännandedatum (andra godkännande)
+PendingSince=Pending since
 RegistrationDate=Registreringsdatum
 UserCreation=Skapade användare
 UserModification=Ändrade användare
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Inte påbörjats
 ActionRunningShort=Pågående
 ActionDoneShort=Färdiga
 ActionUncomplete=Ofullständig
-LatestLinkedEvents=Senaste %s länkade händelserna
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Företag/organisation
 Accountant=Revisor
 ContactsForCompany=Kontakter till denna tredjepart
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=Sidkropp e-post
 SendAcknowledgementByMail=Skicka bekräftelsemail
 SendMail=Skicka e-post
 Email=E-post
+EMail=E-post
+EMails=E-post
 NoEMail=Ingen e-post
 AlreadyRead=Redan läst
 NotRead=Oläst
@@ -793,7 +798,7 @@ Notes=Anteckningar
 AddNewLine=Lägg till ny rad
 AddFile=Lägg till fil
 FreeZone=Fritextprodukt
-FreeLineOfType=Fritext objekt, typ:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Klona objekt med dess huvudattribut
 ReGeneratePDF=Återskapa PDF
 PDFMerge=Sammanfoga PDF
@@ -879,12 +884,14 @@ toward=mot
 Access=Åtkomst
 SelectAction=Välj åtgärd
 SelectTargetUser=Välj målanvändare/anställd
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Använd Ctrl+C för att kopiera till urklipp
 SaveUploadedFileWithMask=Spara filen på servern med namnet <strong>%s</strong> (eller %s)
 OriginFileName=Ursprungligt filnamn
 SetDemandReason=Ange källa
 SetBankAccount=Ange bankkonto
 AccountCurrency=Kontovaluta
+AccountancyCode=Accounting Code
 ViewPrivateNote=Se anteckningar
 XMoreLines=%s rader dolda
 ShowMoreLines=Visa fler/färre rader
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Är du säker på att du vill ta bort %s markerade p
 ConfirmMassClone=Bekräftelse av kloning i bulk
 ConfirmMassCloneQuestion=Välj projekt att klona till
 ConfirmMassCloneToOneProject=Klona till projekt %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Relaterade objekt
 ClassifyBilled=Klassificera fakturerad
 ClassifyUnbilled=Klassificera Ofakturerat
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Du måste vara loggad och du behöver behörighet för a
 Download=Ladda ner
 DownloadDocument=Hämta dokument
 DownloadSignedDocument=Hämta signerat dokument
-ActualizeCurrency=Uppdatera valutakurs
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Räkenskapsår
 ModuleBuilder=Modul- och applikationsbyggare
 SetMultiCurrencyCode=Ange valuta
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Bulkåtgärder
 ClickToShowHelp=Klicka för att visa verktygstipshjälp
 WebSite=Webbplats
@@ -1104,6 +1113,7 @@ PayedBy=Betalad av
 PayedTo=Betalad till
 Monthly=Månatligen
 Quarterly=Kvartalsvis
+Quarter=Quarter
 Annual=Årligen
 Local=Lokal
 Remote=Fjärr
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Uppgift
 ContactDefault_propal=Offert
 ContactDefault_supplier_proposal=Leverantörsoffert
 ContactDefault_ticket=Ärende
+ContactDefault_societe=Tredjepart
 ContactAddedAutomatically=Kontakt har lagts till från tredje parts kontaktroller
 More=Mer
 ShowDetails=Visa detaljer
@@ -1242,6 +1253,7 @@ CommercialAffected=Säljare tilldelad
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=Meddelande
+Emailing=Emailing
 Progression=Framsteg
 YourMessage=Ditt meddelande
 YourMessageHasBeenReceived=Ditt meddelande har tagits emot. Vi kommer återkomma till dig snarast möjligt.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Lägg till
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Från början
+Transferred=Transferred
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index e749b316add..ec11f0b1bc6 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Om prenumeration krävs måste en prenumeration med sta
 DeleteType=Ta bort
 VoteAllowed=Röstning tillåten
 Physical=Enskild
-Moral=Företag
-MorAndPhy=Corporation och individ
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Återaktivera
 ExcludeMember=Uteslut en medlem
 Exclude=Uteslut
@@ -166,7 +166,7 @@ DescADHERENT_CARD_HEADER_TEXT=Text trycks högst upp på medlemskort
 DescADHERENT_CARD_TEXT=Text tryckt på medlemskort (Anpassning till vänster)
 DescADHERENT_CARD_TEXT_RIGHT=Text tryckt på medlemskort (Anpassning till höger)
 DescADHERENT_CARD_FOOTER_TEXT=Text tryckt längst ner på medlemskort
-ShowTypeCard=Visa typ '%'
+ShowTypeCard=Visa typ '%s'
 HTPasswordExport=htpassword-fil skapas
 NoThirdPartyAssociatedToMember=Ingen tredje part associerad med denna medlem
 MembersAndSubscriptions=Medlemmar och bidrag
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Medlemsstatistik på region
 NbOfMembers=Totalt antal medlemmar
 NbOfActiveMembers=Totalt antal nuvarande aktiva medlemmar
 NoValidatedMemberYet=Inga bekräftada medlemmar hittades
-MembersByCountryDesc=Den här skärmen visar statistik över medlemmar efter länder. Diagram och diagram beror på tillgången på Googles onlinetabelltjänst samt på tillgängligheten av en fungerande internetanslutning.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Den här skärmen visar statistik över medlemmar efter stat / provinser / kanton.
 MembersByTownDesc=Den här skärmen visar statistik över medlemmar efter stad.
 MembersByNature=Den här skärmen visar statistik över medlemmar av naturen.
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index db70ac28059..40cf995cc66 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -39,7 +39,7 @@ ProductsNotOnSell=Produkter som inte är till salu och inte för köp
 ProductsOnSellAndOnBuy=Produkter till försäljning och inköp
 ServicesOnSale=Tjänster till salu
 ServicesOnPurchase=Tjänster för köp
-ServicesOnSaleOnly=Endast tjänster till salu 
+ServicesOnSaleOnly=Endast tjänster till salu
 ServicesOnPurchaseOnly=Endast tjänster för inköp
 ServicesNotOnSell=Tjänster som inte är till salu och inte för köp
 ServicesOnSellAndOnBuy=Tjänster till försäljning och inköp
@@ -97,7 +97,6 @@ ShowService=Visa tjänst
 ProductsAndServicesArea=Produkter och Tjänster område
 ProductsArea=Produktområde
 ServicesArea=Tjänster område
-ListOfStockMovements=Lista över lageromsättningen
 BuyingPrice=BETALKURS
 PriceForEachProduct=Produkter med specifika priser
 SupplierCard=Leverantörskort
@@ -172,7 +171,7 @@ BuyingPrices=Köpa priser
 CustomerPrices=Kundpriser
 SuppliersPrices=Leverantörspriser
 SuppliersPricesOfProductsOrServices=Leverantörspriser (av produkter eller tjänster)
-CustomCode=Tull | Råvara | HS-kod
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Ursprungsland
 RegionStateOrigin=Ursprungsregion
 StateOrigin=Stat | Ursprungsprovins
@@ -210,6 +209,7 @@ unitL=Liter
 unitT=ton
 unitKG=kg
 unitG=Gram
+unitGAL=gallon
 unitMG=mg
 unitLB=pund
 unitOZ=uns
@@ -312,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Format för begäran är {"URL": "http://exampl
 UpdateInterval=Uppdateringsintervall (minuter)
 LastUpdated=Senaste uppdatering
 CorrectlyUpdated=Korrekt uppdaterad
-PropalMergePdfProductActualFile=Filer använder för att lägga till i PDF Azur är / är
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=Välj PDF-filer
 IncludingProductWithTag=Inkludera produkt/service med etiketten
 DefaultPriceRealPriceMayDependOnCustomer=Standardpris, realt pris kan bero på kund
@@ -349,6 +349,10 @@ QtyRecalculatedWithPackaging=Mängden av linjen beräknades om enligt leverantö
 
 #Attributes
 Attributes=Egenskaper
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Variant attribut
 ProductAttributes=Varianter för produkter
 ProductAttributeName=Variantattribut %s
@@ -396,6 +400,8 @@ ErrorDestinationProductNotFound=Destination produkt hittades inte
 ErrorProductCombinationNotFound=Produktvariant inte hittat
 ActionAvailableOnVariantProductOnly=Åtgärd endast tillgänglig på varianter av produkt
 ProductsPricePerCustomer=Produktpriser per kund
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Ytterligare attribut (leverantörspriser)
 DeleteLinkedProduct=Ta bort den underordnade produkten som är länkad till kombinationen
 AmountUsedToUpdateWAP=Enhetsbelopp som ska användas för att uppdatera det vägda genomsnittspriset
@@ -437,3 +443,6 @@ AllowStockMovementVariantParentHelp=Som standard är en förälder till en varia
 ConfirmSetToDraftInventory=Är du säker på att du vill gå tillbaka till utkaststatus?<br>De kvantiteter som för närvarande är inställda i inventeringen kommer att återställas.
 WarningLineProductNotToSell=Produkten eller tjänsten "%s" ska inte säljas och klonades
 PriceLabel=Price label
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/sv_SE/salaries.lang b/htdocs/langs/sv_SE/salaries.lang
index 393f04a8e2a..140749a3b17 100644
--- a/htdocs/langs/sv_SE/salaries.lang
+++ b/htdocs/langs/sv_SE/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Ny lön
 AddSalary=Lägg till lön
 NewSalaryPayment=Nytt lönekort
 AddSalaryPayment=Lägg till lönbetalning
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Lönebetalning
 SalariesPayments=Löneutbetalningar
 SalariesPaymentsOf=Lönerutbetalningar av %s
@@ -27,7 +29,7 @@ FillFieldFirst=Fyll i fällt om den anställda först
 UpdateAmountWithLastSalary=Fastställt belopp för senaste lön
 MakeTransferRequest=Gör överföringsbegäran
 VirementOrder=Begäran om kreditöverföring
-BankTransferAmount=Kreditöverföringsbelopp
 WithdrawalReceipt=Kreditöverföringsorder
 OrderWaiting=Väntande beställning
 FillEndOfMonth=Fyll med slutet av månaden
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
index a366b1c2281..35f1b8dba9c 100644
--- a/htdocs/langs/sv_SE/website.lang
+++ b/htdocs/langs/sv_SE/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Använd här listan över andra namn / alias så att sidan
 WEBSITE_CSS_URL=URL för extern CSS-fil
 WEBSITE_CSS_INLINE=CSS-filinnehåll (vanligt för alla sidor)
 WEBSITE_JS_INLINE=JavaScript-filinnehåll (gemensamt för alla sidor)
-WEBSITE_HTML_HEADER=Tillägg längst ner i HTML-rubrik (vanligt för alla sidor)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Robotfil (robots.txt)
 WEBSITE_HTACCESS=Webbsida. Htaccess-fil
 WEBSITE_MANIFEST_JSON=Webbplats manifest.json-fil
@@ -56,16 +56,17 @@ ReadPerm=Läsa
 WritePerm=Skriva
 TestDeployOnWeb=Test / distribuera på webben
 PreviewSiteServedByWebServer=<u> Förhandsgranska %s i en ny flik. </u> <br> <br> %s kommer att serveras av en extern webbserver (som Apache, Nginx, IIS). Du måste installera och konfigurera den här servern innan du pekar på katalogen: <br> <strong> %s </strong> <br> URL betjänad av extern server: <br> <strong> %s </strong>
-PreviewSiteServedByDolibarr= <u> Förhandsgranska %s i en ny flik. </u> <br> <br> %s kommer att serveras av Dolibarr-servern så det behöver inte installeras någon extra webbserver (som Apache, Nginx, IIS). <br> Det obekväma är att sidornas webbadresser inte är användarvänliga och börjar med sökvägen till din Dolibarr. <br> URL betjänas av Dolibarr: <br> <strong> %s </strong> <br> <br> Om du vill använda din egen extern webbserver för att tjäna denna webbplats, skapa en virtuell värd på din webbserver som pekar på katalogen <br> <strong> %s </strong> <br> sedan ange namnet på denna virtuella server i egenskaperna för denna webbplats och klicka på länken "Test / Distribuera på webben".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL för den virtuella värd som serveras av extern webbserver som inte definierats
 NoPageYet=Inga sidor ännu
 YouCanCreatePageOrImportTemplate=Du kan skapa en ny sida eller importera en fullständig webbplatsmall
 SyntaxHelp=Hjälp med specifika syntaxtips
 YouCanEditHtmlSourceckeditor=Du kan redigera HTML-källkod med knappen "Källa" i redigeraren.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Att inkludera en  <strong>image</strong> lagrad i <strong>dokumenten065'dcspanz0f 90f90fc07b0f , använd omslaget <strong>viewimage.php</strong>.<br>,Example,</span> en bild i dokument/media (öppen katalog för allmän tillgång), syntax är:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"<span class='be012c7bc7bcdc </span></strong><br>
-YouCanEditHtmlSource2=För en bild som delas med en delningslänk (öppen åtkomst med hjälp av fildelnings-hash-nyckeln), är syntaxen: <br> <strong> &lt;img src="/viewimage.php?hashp=120142567...accad09accdf0000142677acccf0001425677acccf0001425677accdf0001426770001426670001426770001256770001256770000000000000000002000
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Klona sida / behållare
 CloneSite=Klona webbplatsen
@@ -87,15 +88,15 @@ WebsiteAccount=Webbsida konto
 WebsiteAccounts=Webbsida konton
 AddWebsiteAccount=Skapa webbplatskonto
 BackToListForThirdParty=Tillbaka till listan för tredje part
-DisableSiteFirst=Inaktivera webbplats först
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Min webbplatstitel
 AnotherContainer=Så här inkluderar du innehåll från en annan sida / behållare (du kan ha ett fel här om du aktiverar dynamisk kod eftersom den inbäddade underbehållaren kanske inte finns)
 SorryWebsiteIsCurrentlyOffLine=Tyvärr, den här webbplatsen är för närvarande offline. Kom tillbaka senare ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktivera tabellen för att lagra webbplatskonton (inloggning / överföring) för varje webbplats / tredje part
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Du måste först definiera standard startsida
-OnlyEditionOfSourceForGrabbedContentFuture=Varning: Att skapa en webbsida genom att importera en extern webbsida är reserverat för erfarna användare. Beroende på källsidans komplexitet kan resultatet av importen skilja sig från originalet. Om källsidan använder vanliga CSS-stilar eller motstridiga JavaScript, kan det även bryta utseendet eller funktionerna hos webbplatsredigeraren när du arbetar på den här sidan. Den här metoden är ett snabbare sätt att skapa en sida men det rekommenderas att skapa din nya sida från början eller från en föreslagen sidmall.<br>Observera också att inline-redigeraren kanske inte fungerar korrekthet när den används på en gripen extern sida.
-OnlyEditionOfSourceForGrabbedContent=Endast upplagan av HTML-källan är möjlig när innehållet greppades från en extern webbplats
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Ta även bilder som finns i css och sidan.
 ImagesShouldBeSavedInto=Bilder ska sparas i katalogen
 WebsiteRootOfImages=Root-katalog för webbplatsbilder
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Ta bort filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Kategorier
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index 8cad214e029..de02c7e83cd 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Ukaguzi wa uadilifu wa faili umepita, hata hi
 FileIntegritySomeFilesWereRemovedOrModified=Ukaguzi wa uadilifu wa faili umeshindwa. Baadhi ya faili zilirekebishwa, kuondolewa au kuongezwa.
 GlobalChecksum=Hundi ya kimataifa
 MakeIntegrityAnalysisFrom=Fanya uchambuzi wa uadilifu wa faili za programu kutoka
-LocalSignature=Sahihi iliyopachikwa ya ndani (inayoaminika sana)
-RemoteSignature=Sahihi ya mbali (inayoaminika zaidi)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Faili zinazokosekana
 FilesUpdated=Faili Zilizosasishwa
 FilesModified=Faili Zilizobadilishwa
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Inatumiwa na chaguo fulani la ajenda pekee
 Security=Usalama
 Passwords=Nywila
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Encrypt database password kuhifadhiwa katika conf.php. Inashauriwa sana kuamsha chaguo hili.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=Ili nenosiri lisimbwe kwenye <b> conf.php </b>  faili, badilisha mstari <br>  <b> $ dolibarr_main_db_pass="..."; </b>  <br> na <br>  <b> $dolibarr_main_db_pass="crypted:%s"; </b>
 InstrucToClearPass=Ili nenosiri lisimbuliwe (wazi) katika <b> conf.php </b>  faili, badilisha mstari <br>  <b> $dolibarr_main_db_pass="iliyofichwa:..."; </b>  <br> na <br>  <b> $dolibarr_main_db_pass="%s"; </b>
 ProtectAndEncryptPdfFiles=Linda faili za PDF zinazozalishwa. Hii haipendekezwi kwani inavunja uundaji wa PDF kwa wingi.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Sehemu iliyokokotwa
-ComputedFormulaDesc=Unaweza kuingiza hapa fomula ukitumia sifa zingine za kitu au usimbaji wowote wa PHP ili kupata thamani inayotumika iliyokokotwa. Unaweza kutumia fomula zozote zinazooana na PHP ikijumuisha "?" opereta wa hali, na kitu kinachofuata kimataifa: <strong> $db, $conf, $langs, $mysoc, $user, $objectoffield </strong> . <br>  <strong> ONYO </strong> : Ikiwa unahitaji sifa za kitu ambacho hakijapakiwa, jiletee tu kitu hicho kwenye fomula yako kama katika mfano wa pili. <br> Kutumia sehemu iliyokokotwa inamaanisha huwezi kujiwekea thamani yoyote kutoka kwa kiolesura. Pia, ikiwa kuna kosa la syntax, fomula inaweza kurudisha chochote. <br>  <br> Mfano wa fomula: <br> $objectoffield->id < 10 ? round($objectoffield-> id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2) <br>  <br> Mfano wa kupakia upya kitu <br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital='2'af span / 5: 9bz0</span>\n  <br> Mfano mwingine wa fomula ya kulazimisha upakiaji wa kitu na kitu chake kikuu: <br> (($reloadedobj = Task mpya($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($seconndloadedobj = Mradi mpya($db)) && ($seconndloadedobj->fetchNoCompute0project) >reloadkproject($f)> $seconloadeddobj->ref: 'Mradi wa mzazi haujapatikana'
+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'
 Computedpersistent=Hifadhi sehemu iliyokokotwa
 ComputedpersistentDesc=Sehemu za ziada zilizokokotwa zitahifadhiwa kwenye hifadhidata, hata hivyo, thamani itahesabiwa upya tu wakati kitu cha uga huu kinabadilishwa. Ikiwa uga uliokokotwa unategemea vitu vingine au data ya kimataifa thamani hii inaweza kuwa si sahihi!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored WITHOUT encryption (field is just hidden with stars on screen).<br><br>Enter value 'dolcrypt' to encode value with a reversible encryption algorithm. Clear data can still be known and edited but is encrypted into database.<br><br>Enter 'auto' (or 'md5', 'sha256', 'password_hash', ...) to use the default password encryption algorithm (or md5, sha256, password_hash...) to save the non reversible hashed password into database (no way to retrieve original value)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Kutumia seva ya SMTP ya Mtoa Huduma yako ya Barua pepe kutuma barua pepe pia inavutia kwa hivyo barua pepe zote zinazotumwa kutoka kwa programu pia zitahifadhiwa kwenye saraka yako ya "Iliyotumwa" ya kisanduku chako cha barua.
 WarningPHPMailD=Kwa hiyo inashauriwa kubadili njia ya kutuma barua pepe kwa thamani "SMTP".
 WarningPHPMailDbis=Ikiwa unataka kabisa kuweka mbinu chaguomsingi ya "PHP" ya kutuma barua pepe, puuza tu onyo hili, au uliondoe kwa %skubofya hapa%s.
-WarningPHPMail2=Iwapo mtoa huduma wako wa barua pepe wa SMTP anahitaji kuzuia mteja wa barua pepe kwa baadhi ya anwani za IP (nadra sana), hii ni anwani ya IP ya wakala wa barua pepe (MUA) ya programu yako ya ERP CRM: <strong> %s </strong> .
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Uhasibu (kilichorahisishwa)
 Module10Desc=Ripoti rahisi za uhasibu (majarida, mauzo) kulingana na yaliyomo kwenye hifadhidata. Haitumii jedwali lolote la leja.
 Module20Name=Mapendekezo
 Module20Desc=Usimamizi wa pendekezo la kibiashara
-Module22Name=Barua pepe nyingi
-Module22Desc=Dhibiti utumaji barua pepe nyingi
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Nishati
 Module23Desc=Ufuatiliaji wa matumizi ya nishati
 Module25Name=Maagizo ya Uuzaji
@@ -847,10 +848,10 @@ Permission212=Mistari ya kuagiza
 Permission213=Amilisha laini
 Permission214=Sanidi Simu
 Permission215=Weka watoa huduma
-Permission221=Soma barua pepe
-Permission222=Unda/rekebisha barua pepe (mada, wapokeaji...)
-Permission223=Thibitisha barua pepe (huruhusu kutuma)
-Permission229=Futa barua pepe
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Tazama wapokeaji na maelezo
 Permission238=Tuma barua pepe wewe mwenyewe
 Permission239=Futa barua pepe baada ya kuthibitishwa au kutumwa
@@ -1105,6 +1106,7 @@ DictionaryStaff=Idadi ya Wafanyakazi
 DictionaryAvailability=Ucheleweshaji wa utoaji
 DictionaryOrderMethods=Njia za kuagiza
 DictionarySource=Asili ya mapendekezo/maagizo
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Vikundi vilivyobinafsishwa kwa ripoti
 DictionaryAccountancysystem=Mifano ya chati ya hesabu
 DictionaryAccountancyJournal=Majarida ya uhasibu
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Rudi kwenye orodha ya Kamusi
 TypeOfRevenueStamp=Aina ya muhuri wa ushuru
 VATManagement=Usimamizi wa Kodi ya Mauzo
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Kwa chaguomsingi kodi ya Mauzo inayopendekezwa ni 0 ambayo inaweza kutumika kwa kesi kama vile vyama, watu binafsi au makampuni madogo.
 VATIsUsedExampleFR=Nchini Ufaransa, ina maana ya makampuni au mashirika kuwa na mfumo halisi wa fedha (Kilichorahisishwa halisi au halisi ya kawaida). Mfumo ambao VAT inatangazwa.
 VATIsNotUsedExampleFR=Nchini Ufaransa, ina maana ya vyama ambavyo havina kodi ya Mauzo vilivyotangazwa au makampuni, mashirika au taaluma huria ambazo zimechagua mfumo wa fedha wa biashara ndogo ndogo (Kodi ya mauzo katika franchise) na kulipa kodi ya mauzo bila tamko lolote la kodi ya Mauzo. Chaguo hili litaonyesha rejeleo "Kodi ya Mauzo Isiyotumika - art-293B of CGI" kwenye ankara.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Aina ya ushuru wa mauzo
 LTRate=Kiwango
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Kulingana na uwekaji wa kodi (Angalia %s - %s - %s), n
 LabelUsedByDefault=Lebo inayotumiwa kwa chaguomsingi ikiwa hakuna tafsiri inayoweza kupatikana kwa msimbo
 LabelOnDocuments=Weka lebo kwenye hati
 LabelOrTranslationKey=Ufunguo wa lebo au tafsiri
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=Onyesha nambari ya VAT ya Mteja/Muuzaji katika orodha za mchanganyi
 AddAdressInList=Display Customer/Vendor address into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Omba njia ya usafirishaji inayopendelewa kwa Watu Wengine.
-FieldEdition=Toleo la uga %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Mfano: +2 (jaza ikiwa tu matatizo ya urekebishaji wa saa za eneo yanatokea)
 GetBarCode=Pata msimbo upau
 NumberingModules=Mifano ya nambari
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Lazimisha tarehe ya ankara hadi tarehe ya uthibitishaji
 SuggestedPaymentModesIfNotDefinedInInvoice=Hali ya malipo iliyopendekezwa kwenye ankara kwa chaguomsingi ikiwa haijafafanuliwa kwenye ankara
 SuggestPaymentByRIBOnAccount=Pendekeza malipo kwa kutoa kwenye akaunti
 SuggestPaymentByChequeToAddress=Pendekeza malipo kwa hundi kwa
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Maandishi ya bure kwenye ankara
 WatermarkOnDraftInvoices=Alama kwenye rasimu ya ankara (hakuna ikiwa tupu)
 PaymentsNumberingModule=Muundo wa nambari za malipo
@@ -1718,6 +1723,7 @@ CompressionOfResources=Mfinyazo wa majibu ya HTTP
 CompressionOfResourcesDesc=Kwa mfano kutumia maagizo ya Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Utambuzi kama huo wa kiotomati hauwezekani na vivinjari vya sasa
 DefaultValuesDesc=Hapa unaweza kufafanua thamani chaguo-msingi unayotaka kutumia wakati wa kuunda rekodi mpya, na/au vichujio chaguo-msingi au mpangilio wa kupanga unapoorodhesha rekodi.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Thamani chaguo-msingi (kutumia kwenye fomu)
 DefaultSearchFilters=Vichujio chaguomsingi vya utafutaji
 DefaultSortOrder=Maagizo chaguomsingi ya kupanga
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Inatuma moduli za nambari
 SendingsAbility=Msaada laha za usafirishaji kwa usafirishaji wa wateja
 NoNeedForDeliveryReceipts=Katika hali nyingi, laha za usafirishaji hutumika kama laha za usafirishaji wa wateja (orodha ya bidhaa za kutuma) na laha zinazopokelewa na kusainiwa na mteja. Kwa hivyo, risiti ya bidhaa ni kipengele kilichorudiwa na huwashwa mara chache.
 FreeLegalTextOnShippings=Nakala ya bure juu ya usafirishaji
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Moduli ya nambari za risiti za bidhaa zinazowasilishwa
 DeliveryOrderModel=Muundo wa risiti ya uwasilishaji wa bidhaa
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Nakala ya bure kwenye risiti za uwasilishaji
 ##### FCKeditor #####
 AdvancedEditor=Mhariri wa hali ya juu
 ActivateFCKeditor=Washa kihariri cha hali ya juu cha:
-FCKeditorForNotePublic=WYSIWYG creation/edition of the field "public notes" of elements
-FCKeditorForNotePrivate=WYSIWYG creation/edition of the field "private notes" of elements
-FCKeditorForCompany=WYSIWYG creation/edition of the field description of elements (except products/services)
-FCKeditorForProductDetails=WYSIWYG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Onyo: Kutumia chaguo hili kwa kesi hii haipendekezwi kwa uzito kwani inaweza kusababisha shida na herufi maalum na umbizo la ukurasa wakati wa kuunda faili za PDF.
-FCKeditorForMailing= WYSIWYG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWYG creation/edition of user signature
-FCKeditorForMail=WYSIWYG creation/edition for all mail (except Tools->eMailing)
-FCKeditorForTicket=WYSIWYG creation/edition for tickets
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Mpangilio wa moduli ya hisa
 IfYouUsePointOfSaleCheckModule=Ukitumia sehemu ya Pointi ya Uuzaji (POS) iliyotolewa kwa chaguomsingi au sehemu ya nje, usanidi huu unaweza kupuuzwa na moduli yako ya POS. Moduli nyingi za POS zimeundwa kwa chaguomsingi ili kuunda ankara mara moja na kupunguza hisa bila kujali chaguo hapa. Kwa hivyo ikiwa unahitaji au la kuwa na kupungua kwa hisa wakati wa kusajili ofa kutoka kwa POS yako, angalia pia usanidi wa moduli yako ya POS.
@@ -1867,7 +1874,6 @@ Buy=Nunua
 Sell=Uza
 InvoiceDateUsed=Tarehe ya ankara iliyotumika
 YourCompanyDoesNotUseVAT=Kampuni yako imefafanuliwa kutotumia VAT (Nyumbani - Mipangilio - Kampuni/Shirika), kwa hivyo hakuna chaguo za VAT za kusanidi.
-AccountancyCode=Kanuni ya Uhasibu
 AccountancyCodeSell=Akaunti ya mauzo. kanuni
 AccountancyCodeBuy=Nunua akaunti. kanuni
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Weka kisanduku cha kuteua "Unda malipo kiotomatiki" bila chaguomsingi wakati wa kuunda kodi mpya
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Je, ni mwonekano gani ungependa kufungua kwa chaguo-msingi
 AGENDA_EVENT_PAST_COLOR = Rangi ya tukio lililopita
 AGENDA_EVENT_CURRENT_COLOR = Rangi ya tukio la sasa
 AGENDA_EVENT_FUTURE_COLOR = Rangi ya tukio la siku zijazo
-AGENDA_REMINDER_BROWSER = Washa kikumbusho cha tukio <b> kwenye kivinjari cha mtumiaji </b>  (Tarehe ya ukumbusho inapofikiwa, ibukizi huonyeshwa na kivinjari. Kila mtumiaji anaweza kuzima arifa kama hizo kutoka kwa usanidi wa arifa ya kivinjari).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Washa arifa ya sauti
-AGENDA_REMINDER_EMAIL = Washa kikumbusho cha tukio <b> kwa barua pepe </b>  (Kumbusha chaguo/kucheleweshwa kunaweza kufafanuliwa kwa kila tukio).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Kumbuka: Mara kwa mara ya kazi iliyoratibiwa %s lazima iwe ya kutosha ili kuhakikisha kuwa kikumbusho kinatumwa kwa wakati unaofaa.
 AGENDA_SHOW_LINKED_OBJECT = Onyesha kitu kilichounganishwa kwenye mwonekano wa ajenda
 AGENDA_USE_EVENT_TYPE = Tumia aina za matukio (zinazodhibitiwa katika Usanidi wa menyu -> Kamusi -> Aina ya matukio ya ajenda)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Weka kiotomatiki thamani hii chaguomsingi ya aina ya tukio katika fomu ya kuunda tukio
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Ufunguo wa kuidhinisha kiungo cha kuhamisha
 PastDelayVCalExport=Usihamishe tukio la zamani kuliko
 SecurityKey = Ufunguo wa Usalama
@@ -2006,7 +2017,7 @@ BackupZipWizard=Mchawi wa kujenga kumbukumbu ya saraka ya hati
 SomethingMakeInstallFromWebNotPossible=Ufungaji wa moduli ya nje hauwezekani kutoka kwa kiolesura cha wavuti kwa sababu zifuatazo:
 SomethingMakeInstallFromWebNotPossible2=Kwa sababu hii, mchakato wa kuboresha uliofafanuliwa hapa ni mchakato wa mwongozo tu mtumiaji aliyebahatika anaweza kufanya.
 InstallModuleFromWebHasBeenDisabledContactUs=Kusakinisha au kutengeneza moduli za nje au tovuti zinazobadilika, kutoka kwa programu, imefungwa kwa sasa kwa madhumuni ya usalama. Tafadhali wasiliana nasi ikiwa unahitaji kuwezesha kipengele hiki.
-InstallModuleFromWebHasBeenDisabledByFile=Usakinishaji wa sehemu ya nje kutoka kwa programu umezimwa na msimamizi wako. Lazima umwombe aondoe faili <strong> %s </strong>  kuruhusu kipengele hiki.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Kusakinisha au kujenga sehemu ya nje kutoka kwa programu kunahitaji kuhifadhi faili za sehemu kwenye saraka <strong> %s </strong> . Ili saraka hii ichakatwa na Dolibarr, lazima usanidi <strong> conf/conf.php </strong>  ili kuongeza mistari 2 ya maagizo: <br>  <strong> $dolibarr_main_url_root_alt='/custom'; </strong>  <br>  <strong> $dolibarr_main_document_root_alt='%s/desturi'; </strong>
 HighlightLinesOnMouseHover=Angazia mistari ya jedwali wakati uhamishaji wa kipanya unapita
 HighlightLinesColor=Angazia rangi ya mstari wakati kipanya kinapita (tumia 'ffffff' bila kuangazia)
@@ -2036,6 +2047,7 @@ Enter0or1=Ingiza 0 au 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Ingiza hapa kati ya viunga, orodha ya nambari ya baiti inayowakilisha ishara ya sarafu. Kwa mfano: kwa $, weka [36] - kwa brazil R$ halisi [82,36] - kwa €, weka [8364]
 ColorFormat=Rangi ya RGB iko katika umbizo la HEX, kwa mfano: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Icon name in format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
 PositionIntoComboList=Nafasi ya mstari katika orodha za mchanganyiko
 SellTaxRate=Kiwango cha ushuru wa mauzo
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Ficha mipaka kwenye fremu ya anwani ya mtumaji
 MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipient address frame
 MAIN_PDF_HIDE_CUSTOMER_CODE=Ficha nambari ya mteja
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Ficha jina la mtumaji/kampuni kwenye kizuizi cha anwani
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Ficha masharti ya malipo
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Ficha hali ya malipo
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=Haipendekezwi
 ARestrictedPath=Baadhi ya njia zilizozuiliwa za faili za data
 CheckForModuleUpdate=Angalia masasisho ya moduli za nje
 CheckForModuleUpdateHelp=Kitendo hiki kitaunganishwa na wahariri wa moduli za nje ili kuangalia kama toleo jipya linapatikana.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Sasisho linapatikana
 NoExternalModuleWithUpdate=Hakuna masasisho yaliyopatikana kwa moduli za nje
 SwaggerDescriptionFile=Faili ya maelezo ya API ya Swagger (ya kutumia na redoc kwa mfano)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Onyesha anwani ya usafirishaji
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Url kiungo cha mtandao wa kijamii. Tumia {socialid} kwa sehemu inayobadilika ambayo ina kitambulisho cha mtandao wa kijamii.
 IfThisCategoryIsChildOfAnother=Ikiwa kitengo hiki ni mtoto wa mtu mwingine
 DarkThemeMode=Hali ya mandhari meusi
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Onyo: sehemu ya %s imeweka kige
 WarningModuleHasChangedSecurityCsrfParameter=Onyo: sehemu ya %s imezima usalama wa CSRF wa mfano wako. Kitendo hiki kinashukiwa na usakinishaji wako hauwezi kulindwa tena. Tafadhali wasiliana na mwandishi wa moduli kwa maelezo.
 EMailsInGoingDesc=Barua pepe zinazoingia hudhibitiwa na sehemu ya %s. Ni lazima uiwashe na uisanidi ikiwa unahitaji kuauni barua pepe zinazoingia.
 MAIN_IMAP_USE_PHPIMAP=Tumia maktaba ya PHP-IMAP kwa IMAP badala ya PHP IMAP asili. Hii pia inaruhusu matumizi ya muunganisho wa OAuth2 kwa IMAP (moduli ya OAuth lazima pia iwashwe).
-MAIN_CHECKBOX_LEFT_COLUMN=Onyesha safu wima ya uga na uteuzi wa mstari upande wa kushoto (upande wa kulia kwa chaguo-msingi)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Haijaundwa na chaguo-msingi. Imeundwa kwenye kuwezesha moduli pekee.
 CSSPage=Mtindo wa CSS
 Defaultfortype=Chaguomsingi
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang
index 0a1c6da31cc..73177e8e153 100644
--- a/htdocs/langs/sw_SW/banks.lang
+++ b/htdocs/langs/sw_SW/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Maliza usawa
 CurrentBalance=Usawa wa sasa
 FutureBalance=Usawa wa baadaye
 ShowAllTimeBalance=Onyesha usawa kutoka mwanzo
-AllTime=Tangu mwanzo
 Reconciliation=Upatanisho
 RIB=Nambari ya Akaunti ya Benki
 IBAN=Nambari ya IBAN
@@ -133,7 +132,7 @@ DeleteTransaction=Futa ingizo
 ConfirmDeleteTransaction=Je, una uhakika unataka kufuta ingizo hili?
 ThisWillAlsoDeleteBankRecord=Hii pia itafuta ingizo la benki linalozalishwa
 BankMovements=Harakati
-PlannedTransactions=Maingizo yaliyopangwa
+PlannedTransactions=Upcoming entries
 Graph=Grafu
 ExportDataset_banque_1=Maingizo ya benki na taarifa ya akaunti
 ExportDataset_banque_2=Hati ya amana
@@ -151,7 +150,7 @@ FutureTransaction=Shughuli ya baadaye. Haiwezi kupatanisha.
 SelectChequeTransactionAndGenerate=Chagua/chuja hundi ambazo zitajumuishwa kwenye risiti ya amana ya hundi. Kisha, bofya "Unda".
 SelectPaymentTransactionAndGenerate=Chagua/chuja hati ambazo zitajumuishwa katika %s risiti ya amana. Kisha, bofya "Unda".
 InputReceiptNumber=Chagua taarifa ya benki inayohusiana na upatanisho. Tumia thamani ya nambari inayoweza kupangwa
-InputReceiptNumberBis=YYYYMM au YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Ili kupatanisha?
 ThenCheckLinesAndConciliate=Kisha, angalia mistari iliyopo kwenye taarifa ya benki na ubofye
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Chaguo hili la kukokotoa likiwashwa, unaweza kuchagua r
 BankColorizeMovementName1=Rangi ya mandharinyuma kwa harakati za malipo
 BankColorizeMovementName2=Rangi ya usuli kwa harakati za mkopo
 IfYouDontReconcileDisableProperty=Ikiwa hutafanya usuluhishi wa benki kwenye baadhi ya akaunti za benki, zima kipengele "%s" juu yao kuondoa onyo hili.
-NoBankAccountDefined=Hakuna akaunti ya benki iliyofafanuliwa
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Hakuna rekodi iliyopatikana katika akaunti ya benki. Kawaida, hii hutokea wakati rekodi imefutwa kwa manually kutoka kwenye orodha ya shughuli katika akaunti ya benki (kwa mfano wakati wa upatanisho wa akaunti ya benki). Sababu nyingine ni kwamba malipo yalirekodiwa wakati sehemu "%s"alikuwa mlemavu.
 AlreadyOneBankAccount=Tayari akaunti moja ya benki imefafanuliwa
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA file variant
diff --git a/htdocs/langs/sw_SW/blockedlog.lang b/htdocs/langs/sw_SW/blockedlog.lang
index a51e4bd8afb..7285cee2a6a 100644
--- a/htdocs/langs/sw_SW/blockedlog.lang
+++ b/htdocs/langs/sw_SW/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Kumbukumbu zisizoweza kubadilishwa
 ShowAllFingerPrintsMightBeTooLong=Onyesha kumbukumbu zote zilizohifadhiwa (zinaweza kuwa ndefu)
 ShowAllFingerPrintsErrorsMightBeTooLong=Onyesha kumbukumbu zote za kumbukumbu zisizo sahihi (zinaweza kuwa ndefu)
 DownloadBlockChain=Pakua alama za vidole
-KoCheckFingerprintValidity=Ingizo la kumbukumbu lililowekwa kwenye kumbukumbu si sahihi. Inamaanisha kuwa mtu fulani (mdukuzi?) amerekebisha baadhi ya data ya rekodi hii baada ya kurekodiwa, au amefuta rekodi ya awali iliyohifadhiwa (angalia kuwa laini iliyo na # iliyotangulia ipo) au amebadilisha hundi ya rekodi ya awali.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Rekodi ya kumbukumbu iliyohifadhiwa ni halali. Data kwenye mstari huu haikurekebishwa na ingizo linafuata lililotangulia.
 OkCheckFingerprintValidityButChainIsKo=Kumbukumbu iliyohifadhiwa inaonekana kuwa halali ikilinganishwa na ya awali lakini mlolongo uliharibika hapo awali.
 AddedByAuthority=Imehifadhiwa katika mamlaka ya mbali
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Maelezo ya logi
 ListOfTrackedEvents=Orodha ya matukio yanayofuatiliwa
 Fingerprint=Alama ya vidole
 DownloadLogCSV=Hamisha kumbukumbu zilizohifadhiwa (CSV)
-DataOfArchivedEvent=Full data of archived event
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Kitu asili (aina %s, id %s) haijaunganishwa (angalia safu wima ya 'data kamili' ili kupata data iliyohifadhiwa isiyoweza kubadilishwa)
 BlockedLogAreRequiredByYourCountryLegislation=Moduli ya Kumbukumbu Zisizoweza kubadilishwa inaweza kuhitajika na sheria ya nchi yako. Kuzima sehemu hii kunaweza kufanya miamala yoyote ya siku zijazo kuwa batili kwa heshima na sheria na matumizi ya programu za kisheria kwa kuwa haiwezi kuthibitishwa na ukaguzi wa kodi.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Moduli ya Kumbukumbu Zisizoweza Kubadilishwa imewezeshwa kwa sababu ya sheria ya nchi yako. Kuzima sehemu hii kunaweza kufanya miamala yoyote ya siku zijazo kuwa batili kwa heshima na sheria na matumizi ya programu za kisheria kwani haiwezi kuthibitishwa na ukaguzi wa kodi.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Mfumo wa kufuatilia matukio katika kumbukumbu zisizoweza kubad
 BlockedLogDisabled=Mfumo wa kufuatilia matukio katika kumbukumbu zisizoweza kubadilishwa umezimwa baada ya baadhi ya kurekodi kufanywa. Tulihifadhi Alama maalum ya Kidole ili kufuatilia mnyororo kama umekatika
 BlockedLogDisabledBis=Mfumo wa kufuatilia matukio katika kumbukumbu zisizobadilika umezimwa. Hili linawezekana kwa sababu hakuna rekodi iliyofanywa bado.
 LinkHasBeenDisabledForPerformancePurpose=For performance purpose, direct link to the document is not shown after the 100th line.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Ankara ya mteja imefutwa kimantiki
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Ufutaji wa kimantiki wa malipo ya mteja
 logPAYMENT_VARIOUS_CREATE=Malipo (hayajatumwa kwa ankara) yameundwa
 logPAYMENT_VARIOUS_DELETE=Malipo (hayajatumwa kwa ankara) ufutaji wa kimantiki
 logPAYMENT_VARIOUS_MODIFY=Malipo (hayajatumwa kwa ankara) yamebadilishwa
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/sw_SW/categories.lang b/htdocs/langs/sw_SW/categories.lang
index ff0449c2c9e..fba42d10a34 100644
--- a/htdocs/langs/sw_SW/categories.lang
+++ b/htdocs/langs/sw_SW/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Sehemu za vitambulisho/kategoria za mawasiliano
 AccountsCategoriesArea=Lebo za akaunti ya benki/eneo la kategoria
 ProjectsCategoriesArea=Lebo za mradi/maeneo ya kategoria
 UsersCategoriesArea=Eneo la vitambulisho vya mtumiaji/kategoria
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Vitengo vidogo
 CatList=Orodha ya lebo/kategoria
 CatListAll=Orodha ya vitambulisho/kategoria (aina zote)
@@ -90,9 +91,10 @@ CategoriesSetup=Usanidi wa lebo/kategoria
 CategorieRecursiv=Unganisha na lebo/kitengo cha mzazi kiotomatiki
 CategorieRecursivHelp=Ikiwa chaguo limewashwa, unapoongeza kitu katika kategoria ndogo, kitu hicho pia kitaongezwa katika kategoria kuu.
 AddProductServiceIntoCategory=Agiza aina kwa bidhaa/huduma
-AddCustomerIntoCategory=Mpe mteja kategoria
-AddSupplierIntoCategory=Mpe muuzaji kategoria
-AssignCategoryTo=Peana kategoria
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Onyesha lebo/kitengo
 ByDefaultInList=Kwa chaguo-msingi katika orodha
 ChooseCategory=Chagua kategoria
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Vitengo vya Vyombo vya Ukurasa
 KnowledgemanagementsCategoriesArea=Makala ya KM Jamii
 UseOrOperatorForCategories=Tumia opereta 'OR' kwa kategoria
 AddObjectIntoCategory=Wape kategoria
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index 287f14b4340..fa71dbdc87b 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Nchi iko ndani ya Jumuiya ya Kiuchumi ya Ulaya
 PriceFormatInCurrentLanguage=Umbizo la onyesho la bei katika lugha ya sasa na sarafu
 ThirdPartyName=Jina la mtu wa tatu
 ThirdPartyEmail=Barua pepe ya mtu wa tatu
-ThirdParty=Mhusika wa tatu
-ThirdParties=Vyama vya tatu
+ThirdParty=Third party
+ThirdParties=Third parties
 ThirdPartyProspects=Matarajio
 ThirdPartyProspectsStats=Matarajio
 ThirdPartyCustomers=Wateja
@@ -65,6 +65,7 @@ State=Jimbo/Mkoa
 StateId=Kitambulisho cha Jimbo
 StateCode=Msimbo wa Jimbo/Mkoa
 StateShort=Jimbo
+DepartmentBuyer=Buyer's state/province
 Region=Mkoa
 Region-State=Mkoa - Jimbo
 Country=Nchi
@@ -78,7 +79,7 @@ Chat=Soga
 PhonePro=Basi. simu
 PhonePerso=Pers. simu
 PhoneMobile=Rununu
-No_Email=Kataa barua pepe nyingi
+No_Email=Refuse mass emails
 Fax=Faksi
 Zip=Namba ya Posta
 Town=Jiji
@@ -155,13 +156,13 @@ ProfId4CH=Prof Id 2 (Nambari ya Rekodi ya Biashara)
 ProfId5CH=Nambari ya EORI
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId1CM=Kitambulisho. Prof. 1 (Daftari la Biashara)
-ProfId2CM=Kitambulisho. Prof. 2 (Nambari ya Mlipakodi)
+ProfId2CM=Id. prof. 2 (Unique Tax Identification Number)
 ProfId3CM=Kitambulisho. Prof. 3 (Nambari ya amri ya Uumbaji)
 ProfId4CM=Kitambulisho. Prof. 4 (Nambari ya cheti cha Amana)
 ProfId5CM=Kitambulisho. Prof. 5 (Nyingine)
 ProfId1CN=USCI
 ProfId1ShortCM=Daftari la Biashara
-ProfId2ShortCM=Mlipakodi Na.
+ProfId2ShortCM=UIN
 ProfId3ShortCM=Nambari ya amri ya Uumbaji
 ProfId4ShortCM=Nambari ya cheti cha Amana
 ProfId5ShortCM=Wengine
@@ -255,7 +256,7 @@ CustomerRelativeDiscount=Punguzo la jamaa kwa wateja
 SupplierRelativeDiscount=Punguzo la jamaa la muuzaji
 CustomerRelativeDiscountShort=Punguzo la jamaa
 CustomerAbsoluteDiscountShort=Punguzo kabisa
-CompanyHasRelativeDiscount=Mteja huyu ana punguzo chaguomsingi la <b> %s%% </b> 
+CompanyHasRelativeDiscount=Mteja huyu ana punguzo chaguomsingi la <b> %s%% </b>
 CompanyHasNoRelativeDiscount=Mteja huyu hana punguzo la jamaa kwa chaguomsingi
 HasRelativeDiscountFromSupplier=Una punguzo chaguomsingi la <b> %s%% </b>  na muuzaji huyu
 HasNoRelativeDiscountFromSupplier=Hakuna punguzo chaguo-msingi la jamaa na mchuuzi huyu
@@ -288,7 +289,7 @@ ContactEvents=Events/Agenda
 ContactId=Kitambulisho cha mawasiliano
 ContactsAddresses=Anwani/Anwani
 ContactsAddressesExt=Shared Contacts/Addresses
-FromContactName=Jina:
+FromContactName=Name
 NoContactDefinedForThirdParty=Hakuna anwani iliyofafanuliwa kwa wahusika wengine
 NoContactDefined=Hakuna anwani iliyofafanuliwa
 DefaultContact=Anwani/anwani chaguo-msingi
@@ -337,7 +338,7 @@ VATIntraCheck=Angalia
 VATIntraCheckDesc=Kitambulisho cha VAT lazima kijumuishe kiambishi awali cha nchi. Kiungo <b> %s </b>  hutumia huduma ya Ulaya ya kukagua VAT (VIES) ambayo inahitaji ufikiaji wa mtandao kutoka kwa seva ya Dolibarr.
 VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
 VATIntraCheckableOnEUSite=Angalia Kitambulisho cha VAT ya ndani ya Jumuiya kwenye tovuti ya Tume ya Ulaya
-VATIntraManualCheck=Unaweza pia kuangalia mwenyewe kwenye tovuti ya Tume ya Ulaya <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> 
+VATIntraManualCheck=Unaweza pia kuangalia mwenyewe kwenye tovuti ya Tume ya Ulaya <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Angalia haiwezekani. Huduma ya hundi haitolewi na nchi mwanachama (%s)
 NorProspectNorCustomer=Si matarajio, wala mteja
 JuridicalStatus=Aina ya chombo cha biashara
@@ -382,11 +383,12 @@ ExportCardToFormat=Hamisha kadi kwa umbizo
 ContactNotLinkedToCompany=Anwani haijaunganishwa na wahusika wengine
 DolibarrLogin=Dolibarr kuingia
 NoDolibarrAccess=Hakuna ufikiaji wa Dolibarr
-ExportDataset_company_1=Watu wa tatu (makampuni / misingi / watu wa kimwili) na mali zao
-ExportDataset_company_2=Mawasiliano na mali zao
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Vyama vya tatu na mali zao
 ImportDataset_company_2=Watu wengine anwani/anwani na sifa za ziada
-ImportDataset_company_3=Akaunti za benki za watu wa tatu
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Wawakilishi wa Wahusika wa Uuzaji (wape wawakilishi wa mauzo/watumiaji kwa kampuni)
 PriceLevel=Kiwango cha Bei
 PriceLevelLabels=Lebo za Kiwango cha Bei
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Jina la meneja (Mkurugenzi Mtendaji, mkurugenzi, rais...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Unganisha vyama vya tatu
-ConfirmMergeThirdparties=Je, una uhakika unataka kuunganisha mhusika mwingine aliyechaguliwa na wa sasa? Vitu vyote vilivyounganishwa (ankara, maagizo, ...) vitahamishwa kwa mtu wa tatu wa sasa, baada ya hapo mtu wa tatu aliyechaguliwa atafutwa.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Vyama vya tatu vimeunganishwa
 SaleRepresentativeLogin=Kuingia kwa mwakilishi wa mauzo
 SaleRepresentativeFirstname=Jina la kwanza mwakilishi wa mauzo
@@ -460,3 +462,6 @@ ExternalSystemID=Kitambulisho cha mfumo wa nje
 IDOfPaymentInAnExternalSystem=Kitambulisho cha hali ya malipo katika mfumo wa nje (kama Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE Webservice Credentials
 ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index 7c28a211731..8de15d3ad0b 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Malipo ya ankara ya mteja
 PaymentSupplierInvoice=malipo ya ankara ya muuzaji
 PaymentSocialContribution=Malipo ya kodi ya kijamii/fedha
 PaymentVat=malipo ya VAT
-AutomaticCreationPayment=Rekodi malipo kiotomatiki
+AutomaticCreationPayment=Also record the payment
 ListPayment=Orodha ya malipo
 ListOfCustomerPayments=Orodha ya malipo ya wateja
 ListOfSupplierPayments=Orodha ya malipo ya wauzaji
@@ -118,10 +118,14 @@ SocialContributionsPayments=Malipo ya ushuru wa kijamii/fedha
 ShowVatPayment=Onyesha malipo ya VAT
 TotalToPay=Jumla ya kulipa
 BalanceVisibilityDependsOnSortAndFilters=Salio linaonekana katika orodha hii tu ikiwa jedwali limepangwa kwenye %s na kuchujwa kwenye akaunti 1 ya benki (bila vichungi vingine)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Msimbo wa hesabu wa mteja
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Nambari ya hesabu ya muuzaji
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Cust. akaunti. kanuni
 SupplierAccountancyCodeShort=Sup. akaunti. kanuni
+UserAccountancyCodeShort=User account. code
 AccountNumber=Nambari ya akaunti
 NewAccountingAccount=Akaunti mpya
 Turnover=Ankara ya mauzo
@@ -129,7 +133,9 @@ TurnoverCollected=Mauzo yaliyokusanywa
 SalesTurnoverMinimum=Kiwango cha chini cha mauzo
 ByExpenseIncome=Kwa gharama na mapato
 ByThirdParties=Na watu wa tatu
+ByProjects=By projects
 ByUserAuthorOfInvoice=Na mwandishi wa ankara
+DetailedListLowercase=detailed list
 CheckReceipt=Hati ya amana
 CheckReceiptShort=Hati ya amana
 LastCheckReceiptShort=Hivi karibuni %s hati za amana
@@ -164,12 +170,12 @@ CalcModeEngagement=Uchambuzi wa malipo yaliyorekodiwa yanayojulikana
 CalcModePayment=Analysis of known recorded payments
 CalcModeBookkeeping=Uchambuzi wa data iliyoandikwa katika jedwali la Leja ya Utunzaji.
 CalcModeNoBookKeeping=Hata kama bado hawajahesabiwa kwenye Leja
-CalcModeLT1= Hali <b> %sRE kwenye ankara za wateja - ankara za wasambazaji%s </b> 
-CalcModeLT1Debt=Hali <b> %sRE kwenye ankara za mteja%s </b> 
-CalcModeLT1Rec= Hali <b> %sRE kuhusu ankara za wasambazaji%s </b> 
-CalcModeLT2= Hali <b> %sIRPF kwenye ankara za wateja - ankara za wasambazaji%s </b> 
-CalcModeLT2Debt=Hali <b> %sIRPF kwenye ankara za mteja%s </b> 
-CalcModeLT2Rec= Hali <b> %sIRPF kwenye ankara za wasambazaji%s </b> 
+CalcModeLT1= Hali <b> %sRE kwenye ankara za wateja - ankara za wasambazaji%s </b>
+CalcModeLT1Debt=Hali <b> %sRE kwenye ankara za mteja%s </b>
+CalcModeLT1Rec= Hali <b> %sRE kuhusu ankara za wasambazaji%s </b>
+CalcModeLT2= Hali <b> %sIRPF kwenye ankara za wateja - ankara za wasambazaji%s </b>
+CalcModeLT2Debt=Hali <b> %sIRPF kwenye ankara za mteja%s </b>
+CalcModeLT2Rec= Hali <b> %sIRPF kwenye ankara za wasambazaji%s </b>
 AnnualSummaryDueDebtMode=Usawa wa mapato na gharama, muhtasari wa kila mwaka
 AnnualSummaryInputOutputMode=Usawa wa mapato na matumizi, muhtasari wa kila mwaka
 AnnualByCompanies=Salio la mapato na matumizi, na vikundi vilivyoainishwa vya akaunti
@@ -182,13 +188,13 @@ RulesAmountWithTaxIncluded=- Kiasi kilichoonyeshwa kinajumuisha ushuru wote
 RulesAmountWithTaxExcluded=- Kiasi cha ankara kilichoonyeshwa hakijumuishwi kodi zote
 RulesResultDue=- Inajumuisha ankara zote, gharama, VAT, michango, mishahara, iwe inalipwa au la. <br> - Inategemea tarehe ya bili ya ankara na tarehe ya kukamilisha ya gharama au malipo ya kodi. Kwa mishahara, tarehe ya mwisho wa kipindi hutumiwa.
 RulesResultInOut=- Inajumuisha malipo halisi yaliyotolewa kwenye ankara, gharama, VAT na mishahara. <br> - Inategemea tarehe za malipo ya ankara, gharama, VAT, michango na mishahara.
-RulesCADue=- Inajumuisha ankara za mteja kama wanalipwa au la. <br> - Inategemea tarehe ya bili ya ankara hizi. <br> 
-RulesCAIn=- Inajumuisha malipo yote ya ufanisi ya ankara zilizopokelewa kutoka kwa wateja. <br> - Inatokana na tarehe ya malipo ya ankara hizi <br> 
+RulesCADue=- Inajumuisha ankara za mteja kama wanalipwa au la. <br> - Inategemea tarehe ya bili ya ankara hizi. <br>
+RulesCAIn=- Inajumuisha malipo yote ya ufanisi ya ankara zilizopokelewa kutoka kwa wateja. <br> - Inatokana na tarehe ya malipo ya ankara hizi <br>
 RulesCATotalSaleJournal=Inajumuisha njia zote za mkopo kutoka kwa jarida la Uuzaji.
 RulesSalesTurnoverOfIncomeAccounts=Inajumuisha (mkopo - debit) ya laini za akaunti za bidhaa katika MAPATO ya kikundi
 RulesAmountOnInOutBookkeepingRecord=Inajumuisha rekodi katika Leja yako na akaunti za uhasibu ambazo zina kikundi "GHARAMA" au "KIPATO"
 RulesResultBookkeepingPredefined=Inajumuisha rekodi katika Leja yako na akaunti za uhasibu ambazo zina kikundi "GHARAMA" au "KIPATO"
-RulesResultBookkeepingPersonalized=Inaonyesha rekodi kwenye Leja yako na akaunti za uhasibu <b> imepangwa kulingana na vikundi vilivyobinafsishwa </b> 
+RulesResultBookkeepingPersonalized=Inaonyesha rekodi kwenye Leja yako na akaunti za uhasibu <b> imepangwa kulingana na vikundi vilivyobinafsishwa </b>
 SeePageForSetup=Angalia menyu <a href="%s"> %s </a>  kwa kuanzisha
 DepositsAreNotIncluded=- Ankara za malipo ya chini hazijajumuishwa
 DepositsAreIncluded=- Ankara za malipo ya chini zimejumuishwa
@@ -292,8 +298,8 @@ PurchasebyVatrate=Ununuzi kwa kiwango cha kodi ya mauzo
 LabelToShow=Lebo fupi
 PurchaseTurnover=Kununua mauzo
 PurchaseTurnoverCollected=Mauzo ya ununuzi yamekusanywa
-RulesPurchaseTurnoverDue=- Inajumuisha ankara za mtoa huduma kama zimelipwa au la. <br> - Inatokana na tarehe ya ankara ya ankara hizi. <br> 
-RulesPurchaseTurnoverIn=- Inajumuisha malipo yote yenye ufanisi ya ankara zinazofanywa kwa wauzaji. <br> - Inatokana na tarehe ya malipo ya ankara hizi <br> 
+RulesPurchaseTurnoverDue=- Inajumuisha ankara za mtoa huduma kama zimelipwa au la. <br> - Inatokana na tarehe ya ankara ya ankara hizi. <br>
+RulesPurchaseTurnoverIn=- Inajumuisha malipo yote yenye ufanisi ya ankara zinazofanywa kwa wauzaji. <br> - Inatokana na tarehe ya malipo ya ankara hizi <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Inajumuisha njia zote za malipo kutoka kwa jarida la ununuzi.
 RulesPurchaseTurnoverOfExpenseAccounts=Inajumuisha (debit - credit) ya laini za akaunti za bidhaa katika kikundi GHARAMA
 ReportPurchaseTurnover=Ankara ya mauzo ya ununuzi
diff --git a/htdocs/langs/sw_SW/datapolicy.lang b/htdocs/langs/sw_SW/datapolicy.lang
index 68583537fcb..df6432b6d78 100644
--- a/htdocs/langs/sw_SW/datapolicy.lang
+++ b/htdocs/langs/sw_SW/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Sera ya Faragha ya Data
 Module4100Desc = Moduli ya kudhibiti Faragha ya Data (Kulingana na GDPR)
 # Administration page
 datapolicySetup = Usanidi wa Sera ya Faragha ya Data ya Moduli
-Deletion = Ufutaji wa data
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s miezi
 ONE_YEAR = 1 mwaka
 NB_YEARS = %s miaka
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Mtarajiwa/Mteja
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Wala mtarajiwa/Wala mteja
 DATAPOLICY_CONTACT_FOURNISSEUR = Msambazaji
 DATAPOLICY_ADHERENT = Mwanachama
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Unaweza kutuma barua pepe ya GDPR kwa watu unaowasiliana nao wote husika (ambao bado hawajapokea barua pepe na ambao haujasajili chochote kuhusu makubaliano yao ya GDPR). Ili kufanya hivyo, tumia kifungo kifuatacho.
 SendAgreement = Tuma barua pepe
 AllAgreementSend = Barua pepe zote zimetumwa
 TXTLINKDATAPOLICYACCEPT = Maandishi ya kiungo "makubaliano"
 TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR : Usindikaji wa data ya kibinafsi
 DATAPOLICY_consentement = Idhini iliyopatikana kwa usindikaji wa data ya kibinafsi
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index c04d1137177..e07e7d1b5f3 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Imeshindwa kuunda saraka. Angalia kuwa mtumiaji wa seva ya Wavuti ana ruhusa ya kuandika kwenye saraka ya hati ya Dolibarr. Ikiwa kigezo <b> safe_mode </b>  imewashwa kwenye PHP hii, angalia kuwa faili za Dolibarr php zinamiliki mtumiaji wa seva ya wavuti (au kikundi).
 ErrorNoMailDefinedForThisUser=Hakuna barua iliyofafanuliwa kwa mtumiaji huyu
 ErrorSetupOfEmailsNotComplete=Usanidi wa barua pepe haujakamilika
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=This feature needs JavaScript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=Menyu ya aina ya 'Juu' haiwezi kuwa na menyu kuu. Weka 0 kwenye menyu ya mzazi au uchague menyu ya aina ya 'Kushoto'.
 ErrorLeftMenuMustHaveAParentId=Menyu ya aina ya 'Kushoto' lazima iwe na kitambulisho cha mzazi.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Upakiaji umezuiwa na programu-jalizi ya PHP/Apache.
 ErrorFileSizeTooLarge=Ukubwa wa faili ni mkubwa sana au faili haijatolewa.
 ErrorFieldTooLong=Sehemu %s ni ndefu sana.
 ErrorSizeTooLongForIntType=Ukubwa ni mrefu sana kwa aina ya int (%s idadi ya juu zaidi)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Ukubwa ni mrefu sana kwa aina ya mfuatano (%s chars upeo)
 ErrorNoValueForSelectType=Tafadhali jaza thamani ya orodha iliyochaguliwa
 ErrorNoValueForCheckBoxType=Tafadhali jaza thamani kwa orodha ya kisanduku cha kuteua
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Thamani mbaya kwa nambari ya usalama. Jaribu tena ukitumia
 ErrorBothFieldCantBeNegative=Sehemu %s na %s haziwezi kuwa zote mbili hasi
 ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in third-party card) and apply it to the invoice.
 ErrorLinesCantBeNegativeForOneVATRate=Jumla ya mistari (hali ya kodi) haiwezi kuwa hasi kwa kiwango fulani cha VAT kilichotolewa (Imepata jumla hasi ya kiwango cha VAT <b> %s </b> %%)
-ErrorLinesCantBeNegativeOnDeposits=Mistari haiwezi kuwa hasi katika amana. Utakumbana na matatizo wakati utahitaji kutumia amana katika ankara ya mwisho ikiwa utafanya hivyo.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Kiasi cha laini kwenye ankara za wateja hakiwezi kuwa hasi
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Akaunti ya mtumiaji <b> %s </b>  inayotumika kutekeleza seva ya wavuti haina ruhusa kwa hiyo
 ErrorNoActivatedBarcode=Hakuna aina ya msimbopau iliyowezeshwa
 ErrUnzipFails=Imeshindwa kufungua %s na ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Kigezo chako cha PHP upload_max_filesize (%s) ni kubwa kuliko kigezo cha PHP post_max_size (%s) Huu sio usanidi thabiti.
 WarningPasswordSetWithNoAccount=Nenosiri limewekwa kwa mwanachama huyu. Hata hivyo, hakuna akaunti ya mtumiaji iliyoundwa. Kwa hivyo nenosiri hili limehifadhiwa lakini haliwezi kutumiwa kuingia kwenye Dolibarr. Inaweza kutumiwa na moduli/kiolesura cha nje lakini ikiwa huhitaji kufafanua kuingia wala nenosiri lolote kwa mwanachama, unaweza kulemaza chaguo la "Dhibiti kuingia kwa kila mwanachama" kutoka kwa usanidi wa moduli ya Mwanachama. Ikiwa unahitaji kudhibiti kuingia lakini huhitaji nenosiri lolote, unaweza kuweka sehemu hii tupu ili kuepuka onyo hili. Kumbuka: Barua pepe inaweza pia kutumika kama njia ya kuingia ikiwa mwanachama ameunganishwa na mtumiaji.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR invoice can only be added on invoices set to be paid with credit transfer payments.
 SwissQrCreditorAddressInvalid = Anwani ya mkopeshaji si sahihi (Je, ZIP na jiji zimewekwa? (%s)
 SwissQrCreditorInformationInvalid = Maelezo ya mkopeshaji si sahihi kwa IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/sw_SW/exports.lang b/htdocs/langs/sw_SW/exports.lang
index 911e8c95d1a..8e5bce2bade 100644
--- a/htdocs/langs/sw_SW/exports.lang
+++ b/htdocs/langs/sw_SW/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Lebo ya mstari
 LineDescription=Maelezo ya mstari
 LineUnitPrice=Bei ya kitengo cha mstari
 LineVATRate=Kiwango cha VAT cha mstari
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Kiasi kwa mstari
 LineTotalHT=Kiasi isipokuwa. ushuru kwa mstari
 LineTotalTTC=Kiasi kilicho na ushuru wa laini
 LineTotalVAT=Kiasi cha VAT kwa laini
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Aina ya laini (0=bidhaa, 1=huduma)
 FileWithDataToImport=Faili iliyo na data ya kuingiza
 FileToImport=Chanzo faili ya kuagiza
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=Chagua umbizo la faili la kutumia kama umbizo la kule
 ChooseFileToImport=Pakia faili kisha ubofye %s ikoni ya kuchagua faili kama faili ya kuingiza chanzo...
 SourceFileFormat=Fomati ya faili ya chanzo
 FieldsInSourceFile=Sehemu katika faili ya chanzo
-FieldsInTargetDatabase=Sehemu lengwa katika hifadhidata ya Dolibarr (bold=lazima)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Hakuna mashamba
 MoveField=Sogeza nambari ya safu wima ya sehemu %s
 ExampleOfImportFile=Mfano_wa_faili_la_kuagiza
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Hakikisha kuwa umbizo la faili (uga na vitenganishi vya
 RunSimulateImportFile=Endesha Uigaji wa Kuingiza
 FieldNeedSource=Sehemu hii inahitaji data kutoka kwa faili chanzo
 SomeMandatoryFieldHaveNoSource=Sehemu zingine za lazima hazina chanzo kutoka kwa faili ya data
-InformationOnSourceFile=Habari juu ya faili ya chanzo
-InformationOnTargetTables=Taarifa juu ya maeneo lengwa
+InformationOnSourceFile=Source file
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Badili angalau sehemu moja ya chanzo katika safu wima ili uhamishe
 SelectFormat=Chagua umbizo hili la faili la kuleta
 RunImportFile=Ingiza Data
@@ -101,8 +107,8 @@ DataIDSourceIsInsertedInto=Kitambulisho cha kitu kikuu, ambacho kilipatikana kwa
 DataCodeIDSourceIsInsertedInto=Kitambulisho cha mstari mzazi, ambacho kilipatikana kutoka kwa msimbo, kitaingizwa kwenye sehemu ifuatayo:
 SourceRequired=Thamani ya data ni ya lazima
 SourceExample=Mfano wa thamani ya data inayowezekana
-ExampleAnyRefFoundIntoElement=Rejea yoyote ya kipengele <b> %s </b> 
-ExampleAnyCodeOrIdFoundIntoDictionary=Msimbo wowote (au kitambulisho) kilichopatikana kwenye kamusi <b> %s </b> 
+ExampleAnyRefFoundIntoElement=Rejea yoyote ya kipengele <b> %s </b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Msimbo wowote (au kitambulisho) kilichopatikana kwenye kamusi <b> %s </b>
 CSVFormatDesc= <b> Thamani Iliyotenganishwa na Koma </b>  umbizo la faili (.csv). <br> Huu ni umbizo la faili ya maandishi ambapo sehemu zinatenganishwa na kitenganishi [ %s ]. Ikiwa kitenganishi kitapatikana ndani ya maudhui ya sehemu, uga huzungushwa kwa herufi duara [ %s ]. Herufi ya Escape to avoid herufi duara ni [ %s ].
 Excel95FormatDesc= <b> Excel </b>  umbizo la faili (.xls) <br> Huu ndio umbizo asilia la Excel 95 (BIFF5).
 Excel2007FormatDesc= <b> Excel </b>  umbizo la faili (.xlsx) <br> Huu ni umbizo asilia la Excel 2007 (SpreadsheetML).
diff --git a/htdocs/langs/sw_SW/hrm.lang b/htdocs/langs/sw_SW/hrm.lang
index edc7c67d2cd..cfa9899d755 100644
--- a/htdocs/langs/sw_SW/hrm.lang
+++ b/htdocs/langs/sw_SW/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=Cheo kinachohitajika kwa wasifu wa kazi
-RequiredRankShort=Required rank
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Positions with this job profiles
-EmployeeRank=Kiwango cha mfanyakazi kwa ujuzi huu
-EmployeeRankShort=Employee rank
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Nafasi ya mfanyakazi
 EmployeePositions=Nafasi za wafanyikazi
 EmployeesInThisPosition=Wafanyakazi katika nafasi hii
@@ -72,6 +72,9 @@ AddSkill=Add skills to job profile
 RequiredSkills=Required skills for this job profile
 UserRank=Cheo cha Mtumiaji
 SkillList=Orodha ya ujuzi
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Hifadhi cheo
 TypeKnowHow=Know-how
 TypeHowToBe=Jinsi ya kuwa
@@ -95,3 +98,5 @@ NeedBusinessTravels=Haja ya safari za biashara
 NoDescription=Hakuna maelezo
 TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/sw_SW/mails.lang b/htdocs/langs/sw_SW/mails.lang
index 87fb01e75a7..6e60bc75cbb 100644
--- a/htdocs/langs/sw_SW/mails.lang
+++ b/htdocs/langs/sw_SW/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Barua pepe
 EMailing=Barua pepe
-EMailings=Barua pepe
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=Barua pepe zote
+AllEMailings=All mass eMails
 MailCard=Kadi ya barua pepe
 MailRecipients=Wapokeaji
 MailRecipient=Mpokeaji
@@ -26,19 +26,19 @@ MailFile=Faili zilizoambatishwa
 MailMessage=Mwili wa barua pepe
 SubjectNotIn=Sio katika Mada
 BodyNotIn=Sio katika Mwili
-ShowEMailing=Onyesha utumaji barua pepe
-ListOfEMailings=Orodha ya barua pepe
-NewMailing=Utumaji barua pepe mpya
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=Badilisha utumaji barua pepe
-ResetMailing=Tuma barua pepe tena
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Futa barua pepe
-PreviewMailing=Hakiki utumaji barua pepe
-CreateMailing=Unda barua pepe
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=Barua pepe halali
+ValidMailing=Valid mass Email
 MailingStatusDraft=Rasimu
 MailingStatusValidated=Imethibitishwa
 MailingStatusSent=Imetumwa
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Vichujio vyote lazima vilingane ili kuwa na barua pepe
 LineInFile=Mstari %s katika faili
 RecipientSelectionModules=Maombi yaliyofafanuliwa ya uteuzi wa mpokeaji
 MailSelectedRecipients=Wapokeaji waliochaguliwa
-MailingArea=Eneo la barua pepe
-LastMailings=Hivi karibuni %s barua pepe
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Takwimu za malengo
 NbOfCompaniesContacts=Anwani/anwani za kipekee
 MailNoChangePossible=Wapokeaji wa barua pepe zilizoidhinishwa hawawezi kubadilishwa
-SearchAMailing=Tafuta barua
-SendMailing=Tuma barua pepe
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Imetumwa na
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Kutuma barua pepe kunaweza kufanywa kutoka kwa mstari wa amri. Uliza msimamizi wa seva yako kuzindua amri ifuatayo ili kutuma barua pepe kwa wapokeaji wote:
 MailingNeedCommand2=Hata hivyo unaweza kuzituma mtandaoni kwa kuongeza kigezo MAILING_LIMIT_SENDBYWEB chenye thamani ya idadi ya juu zaidi ya barua pepe unazotaka kutuma kwa kipindi. Kwa hili, nenda kwenye Nyumbani - Mipangilio - Nyingine.
 ConfirmSendingEmailing=Ikiwa ungependa kutuma barua pepe moja kwa moja kutoka skrini hii, tafadhali thibitisha kuwa una uhakika unataka kutuma barua pepe sasa kutoka kwa kivinjari chako ?
-LimitSendingEmailing=Kumbuka: Utumaji barua pepe kutoka kwa kiolesura cha wavuti hufanyika mara kadhaa kwa sababu za usalama na muda kuisha, <b> %s </b>  wapokeaji kwa wakati mmoja kwa kila kipindi cha kutuma.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Futa orodha
 ToClearAllRecipientsClickHere=Bofya hapa ili kufuta orodha ya wapokeaji wa barua pepe hii
 ToAddRecipientsChooseHere=Ongeza wapokeaji kwa kuchagua kutoka kwenye orodha
-NbOfEMailingsReceived=Barua pepe nyingi zimepokelewa
-NbOfEMailingsSend=Barua pepe nyingi zimetumwa
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=Rekodi ya kitambulisho
 DeliveryReceipt=Utoaji Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Unaweza kutumia <b> koma </b>  kitenganishi kubainisha wapokeaji kadhaa.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Hakuna arifa za barua pepe za kiotomatiki zilizopangwa
 ANotificationsWillBeSent=Arifa 1 ya kiotomatiki itatumwa kwa barua pepe
 SomeNotificationsWillBeSent=%s arifa za kiotomatiki zitatumwa kwa barua pepe
 AddNewNotification=Jisajili kwa arifa mpya ya kiotomatiki ya barua pepe (lengo/tukio)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Mipangilio ya utumaji barua pepe imesanidiwa kuwa '%s'. Hali hii haiwezi kutumika kutuma barua pepe nyingi.
 MailSendSetupIs2=Ni lazima kwanza uingie, ukiwa na akaunti ya msimamizi, kwenye menyu %sNyumbani - Mipangilio - Barua pepe%s ili kubadilisha kigezo <strong> '%s' </strong>  kutumia hali ya '%s'. Ukiwa na hali hii, unaweza kuingiza usanidi wa seva ya SMTP iliyotolewa na Mtoa Huduma wako wa Mtandao na utumie kipengele cha kutuma barua pepe kwa wingi.
 MailSendSetupIs3=Ikiwa una maswali yoyote kuhusu jinsi ya kusanidi seva yako ya SMTP, unaweza kuuliza %s.
@@ -183,7 +185,7 @@ Information=Habari
 ContactsWithThirdpartyFilter=Anwani zilizo na kichujio cha wahusika wengine
 Unanswered=Haijajibiwa
 Answered=Akajibu
-IsNotAnAnswer=Sio jibu (barua pepe ya awali)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Ni jibu la barua pepe ya awali
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Thamani chaguomsingi ya sehemu '%s' wakati wa kuunda anwani mpya
@@ -199,6 +201,6 @@ ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index 10af871dbf1..bba0348da38 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -37,6 +37,7 @@ Translation=Tafsiri
 Translations=Tafsiri
 CurrentTimeZone=TimeZone PHP (seva)
 EmptySearchString=Enter non empty search criteria
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Weka kigezo cha tarehe
 NoRecordFound=Hakuna rekodi iliyopatikana
 NoRecordDeleted=Hakuna rekodi iliyofutwa
@@ -45,6 +46,7 @@ NoError=Hakuna hitilafu
 Error=Hitilafu
 Errors=Makosa
 ErrorFieldRequired=Sehemu '%s' inahitajika
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Sehemu '%s' ina thamani mbaya
 ErrorFileDoesNotExists=Faili %s haipo
 ErrorFailedToOpenFile=Imeshindwa kufungua faili %s
@@ -267,7 +269,7 @@ Numero=Nambari
 Limit=Kikomo
 Limits=Mipaka
 Logout=Ondoka
-NoLogoutProcessWithAuthMode=Hakuna kipengele kinachotumika cha kukata muunganisho chenye modi ya uthibitishaji <b> %s </b> 
+NoLogoutProcessWithAuthMode=Hakuna kipengele kinachotumika cha kukata muunganisho chenye modi ya uthibitishaji <b> %s </b>
 Connection=Ingia
 Setup=Sanidi
 Alert=Tahadhari
@@ -308,6 +310,7 @@ DateBuild=Tarehe ya ujenzi wa ripoti
 DatePayment=Tarehe ya malipo
 DateApprove=Tarehe ya kuidhinisha
 DateApprove2=Tarehe ya kuidhinisha (idhini ya pili)
+PendingSince=Pending since
 RegistrationDate=Tarehe ya usajili
 UserCreation=Mtumiaji wa uumbaji
 UserModification=Mtumiaji wa marekebisho
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Kuanza
 ActionRunningShort=Inaendelea
 ActionDoneShort=Imekamilika
 ActionUncomplete=Haijakamilika
-LatestLinkedEvents=Hivi karibuni %s matukio yaliyounganishwa
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Kampuni/Shirika
 Accountant=Mhasibu
 ContactsForCompany=Anwani za wahusika wengine
@@ -503,6 +506,7 @@ ContactsAddressesForCompany=Anwani/anwani za wahusika wengine
 AddressesForCompany=Anwani za mtu huyu wa tatu
 ActionsOnCompany=Matukio kwa wahusika wengine
 ActionsOnContact=Matukio ya mwasiliani/anwani hii
+ActionsOnUser=Events for this user
 ActionsOnContract=Matukio ya mkataba huu
 ActionsOnMember=Matukio kuhusu mwanachama huyu
 ActionsOnProduct=Matukio kuhusu bidhaa hii
@@ -720,6 +724,8 @@ TextUsedInTheMessageBody=Mwili wa barua pepe
 SendAcknowledgementByMail=Tuma barua pepe ya uthibitisho
 SendMail=Kutuma barua pepe
 Email=Barua pepe
+EMail=Email
+EMails=Emails
 NoEMail=Hakuna barua pepe
 AlreadyRead=Tayari kusoma
 NotRead=Haijasomwa
@@ -792,7 +798,7 @@ Notes=Vidokezo
 AddNewLine=Ongeza mstari mpya
 AddFile=Ongeza faili
 FreeZone=Bidhaa ya maandishi ya bure
-FreeLineOfType=Kipengee cha maandishi bila malipo, chapa:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Kitu cha Clone na sifa zake kuu
 ReGeneratePDF=Tengeneza upya PDF
 PDFMerge=Unganisha PDF
@@ -878,12 +884,14 @@ toward=kuelekea
 Access=Ufikiaji
 SelectAction=Chagua kitendo
 SelectTargetUser=Chagua mtumiaji/mfanyikazi lengwa
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Tumia Ctrl+C kunakili kwenye ubao wa kunakili
 SaveUploadedFileWithMask=Hifadhi faili kwenye seva yenye jina " <strong> %s </strong> " (vinginevyo "%s")
 OriginFileName=Jina la faili asili
 SetDemandReason=Weka chanzo
 SetBankAccount=Fafanua Akaunti ya Benki
 AccountCurrency=Sarafu ya akaunti
+AccountancyCode=Accounting Code
 ViewPrivateNote=Tazama maelezo
 XMoreLines=%s mistari iliyofichwa
 ShowMoreLines=Onyesha mistari zaidi/chini
@@ -924,6 +932,7 @@ ConfirmMassDeletionQuestion=Je, una uhakika unataka kufuta %s rekodi zilizochagu
 ConfirmMassClone=Uthibitishaji wa clone nyingi
 ConfirmMassCloneQuestion=Chagua mradi wa kuiga
 ConfirmMassCloneToOneProject=Fuata mradi %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Vipengee Vinavyohusiana
 ClassifyBilled=Kuainisha Kutozwa
 ClassifyUnbilled=Panga Bila Kutozwa
@@ -960,10 +969,11 @@ PrivateDownloadLinkDesc=Unahitaji kuingia na unahitaji ruhusa ili kutazama au ku
 Download=Pakua
 DownloadDocument=Pakua hati
 DownloadSignedDocument=Pakua hati iliyosainiwa
-ActualizeCurrency=Sasisha kiwango cha sarafu
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Mwaka wa fedha
 ModuleBuilder=Moduli na Mjenzi wa Maombi
 SetMultiCurrencyCode=Weka sarafu
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Vitendo vingi
 ClickToShowHelp=Bofya ili kuonyesha usaidizi wa kidokezo
 WebSite=Tovuti
@@ -1063,7 +1073,7 @@ Select2NotFound=Hakuna matokeo yaliyopatikana
 Select2Enter=Ingiza
 Select2MoreCharacter=au tabia zaidi
 Select2MoreCharacters=au wahusika zaidi
-Select2MoreCharactersMore= <strong> Sintaksia ya utafutaji: </strong>  <br>  <kbd>  <strong>  | </strong>  </kbd>  <kbd>  AU </kbd>  (a|b) <br>  <kbd>  <strong> * </strong>  </kbd>  <kbd>  Herufi yoyote </kbd>  (a*b) <br>  <kbd>  <strong> ^ </strong>  </kbd>  <kbd>  Anza na </kbd>  (^ab) <br>  <kbd>  <strong> $ </strong>  </kbd>  <kbd>  Malizia kwa </kbd>  (ab$) <br> 
+Select2MoreCharactersMore= <strong> Sintaksia ya utafutaji: </strong>  <br>  <kbd>  <strong>  | </strong>  </kbd>  <kbd>  AU </kbd>  (a|b) <br>  <kbd>  <strong> * </strong>  </kbd>  <kbd>  Herufi yoyote </kbd>  (a*b) <br>  <kbd>  <strong> ^ </strong>  </kbd>  <kbd>  Anza na </kbd>  (^ab) <br>  <kbd>  <strong> $ </strong>  </kbd>  <kbd>  Malizia kwa </kbd>  (ab$) <br>
 Select2LoadingMoreResults=Inapakia matokeo zaidi...
 Select2SearchInProgress=Utafutaji unaendelea...
 SearchIntoThirdparties=Vyama vya tatu
@@ -1103,6 +1113,7 @@ PayedBy=Imelipwa na
 PayedTo=Kulipwa kwa
 Monthly=Kila mwezi
 Quarterly=Kila robo
+Quarter=Quarter
 Annual=Mwaka
 Local=Ndani
 Remote=Mbali
@@ -1145,6 +1156,7 @@ ContactDefault_project_task=Kazi
 ContactDefault_propal=Pendekezo
 ContactDefault_supplier_proposal=Pendekezo la Mgavi
 ContactDefault_ticket=Tikiti
+ContactDefault_societe=Third party
 ContactAddedAutomatically=Contact added from third-party contact roles
 More=Zaidi
 ShowDetails=Onyesha maelezo
@@ -1187,6 +1199,8 @@ SetSupervisor=Weka msimamizi
 CreateExternalUser=Unda mtumiaji wa nje
 ConfirmAffectTag=Bulk Tag Assignment
 ConfirmAffectUser=Bulk User Assignment
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=Jukumu lililotolewa kwa kila mradi/fursa
 TasksRole=Jukumu lililotolewa kwa kila kazi (ikiwa linatumika)
 ConfirmSetSupervisor=Wingi Msimamizi Set
@@ -1238,6 +1252,9 @@ CommercialsAffected=Wawakilishi wa mauzo wamepewa
 CommercialAffected=Mwakilishi wa mauzo amepewa
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=Ujumbe wako
 YourMessageHasBeenReceived=Ujumbe wako umepokelewa. Tutakujibu au kuwasiliana nawe haraka iwezekanavyo.
 UrlToCheck=Url ya kuangalia
@@ -1280,6 +1297,7 @@ AmountSalary=Salary amount
 InvoiceSubtype=Invoice subtype
 ConfirmMassReverse=Bulk Reverse confirmation
 ConfirmMassReverseQuestion=Are you sure you want to reverse the %s selected record(s)?
+ConfirmActionXxx=Confirm action %s
 ElementType=Element type
 ElementId=Element Id
 Encrypted=Encrypted
@@ -1299,3 +1317,35 @@ AllEntities=All entities
 TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
+auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/sw_SW/members.lang b/htdocs/langs/sw_SW/members.lang
index 2166fcf0e61..4b0d77c6ed4 100644
--- a/htdocs/langs/sw_SW/members.lang
+++ b/htdocs/langs/sw_SW/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Iwapo usajili unahitajika, usajili ulio na tarehe ya ku
 DeleteType=Futa
 VoteAllowed=Kura inaruhusiwa
 Physical=Mtu binafsi
-Moral=Shirika
-MorAndPhy=Shirika na Mtu binafsi
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Re-enable
 ExcludeMember=Ondoa mwanachama
 Exclude=Ondoa
@@ -144,11 +144,11 @@ SubscriptionReminderEmail=ukumbusho wa mchango
 YourMembershipWasCanceled=Uanachama wako umeghairiwa
 CardContent=Maudhui ya kadi yako ya mwanachama
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=Tunataka kukufahamisha kuwa ombi lako la uanachama limepokelewa. <br>  <br> 
-ThisIsContentOfYourMembershipWasValidated=Tunataka kukufahamisha kuwa uanachama wako uliidhinishwa kwa maelezo yafuatayo: <br>  <br> 
-ThisIsContentOfYourSubscriptionWasRecorded=Tunataka kukufahamisha kuwa usajili wako mpya ulirekodiwa. Tafadhali tafuta ankara yako iliyoambatanishwa hapa. <br>  <br> 
-ThisIsContentOfSubscriptionReminderEmail=Tunataka kukufahamisha kuwa muda wa usajili wako unakaribia kuisha au tayari muda wake umeisha (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Tunatumai utaisasisha. <br>  <br> 
-ThisIsContentOfYourCard=Huu ni muhtasari wa maelezo tuliyo nayo kukuhusu. Tafadhali wasiliana nasi ikiwa chochote si sahihi. <br>  <br> 
+ThisIsContentOfYourMembershipRequestWasReceived=Tunataka kukufahamisha kuwa ombi lako la uanachama limepokelewa. <br>  <br>
+ThisIsContentOfYourMembershipWasValidated=Tunataka kukufahamisha kuwa uanachama wako uliidhinishwa kwa maelezo yafuatayo: <br>  <br>
+ThisIsContentOfYourSubscriptionWasRecorded=Tunataka kukufahamisha kuwa usajili wako mpya ulirekodiwa. Tafadhali tafuta ankara yako iliyoambatanishwa hapa. <br>  <br>
+ThisIsContentOfSubscriptionReminderEmail=Tunataka kukufahamisha kuwa muda wa usajili wako unakaribia kuisha au tayari muda wake umeisha (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Tunatumai utaisasisha. <br>  <br>
+ThisIsContentOfYourCard=Huu ni muhtasari wa maelezo tuliyo nayo kukuhusu. Tafadhali wasiliana nasi ikiwa chochote si sahihi. <br>  <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Mada ya barua pepe ya arifa iliyopokelewa iwapo mgeni ataandikishwa kiotomatiki
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Maudhui ya barua pepe ya arifa iliyopokelewa iwapo mgeni ataandikishwa kiotomatiki
 DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Kiolezo cha barua pepe cha kutumia kutuma barua pepe kwa mwanachama kuhusu usajili wa kiotomatiki wa mwanachama
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Takwimu za wanachama kwa eneo
 NbOfMembers=Jumla ya idadi ya wanachama
 NbOfActiveMembers=Jumla ya idadi ya wanachama wanaoendelea sasa
 NoValidatedMemberYet=Hakuna wanachama walioidhinishwa waliopatikana
-MembersByCountryDesc=Skrini hii inakuonyesha takwimu za wanachama kulingana na nchi. Grafu na chati hutegemea upatikanaji wa huduma ya grafu mtandaoni ya Google na pia upatikanaji wa muunganisho wa intaneti unaofanya kazi.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Skrini hii inakuonyesha takwimu za wanachama kulingana na jimbo/mikoa/kantoni.
 MembersByTownDesc=Skrini hii inakuonyesha takwimu za wanachama kulingana na mji.
 MembersByNature=Skrini hii inakuonyesha takwimu za wanachama kwa asili.
@@ -202,31 +203,31 @@ LastMemberDate=Tarehe ya hivi punde ya uanachama
 LatestSubscriptionDate=Tarehe ya hivi karibuni ya mchango
 MemberNature=Nature of member
 MembersNature=Nature of members
-Public=%s ninaweza kuchapisha uanachama wangu katika <a target="_blank" href="%s"> sajili ya umma </a> 
+Public=%s ninaweza kuchapisha uanachama wangu katika <a target="_blank" href="%s"> sajili ya umma </a>
 MembershipPublic=Public membership
 NewMemberbyWeb=Mwanachama mpya ameongezwa. Inasubiri idhini
 NewMemberForm=Fomu mpya ya mwanachama
 SubscriptionsStatistics=Takwimu za michango
 NbOfSubscriptions=Idadi ya michango
-AmountOfSubscriptions=Kiasi kilichokusanywa kutoka kwa michango
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=Mauzo (ya kampuni) au Bajeti (ya msingi)
-DefaultAmount=Kiasi chaguo-msingi cha mchango (hutumika tu ikiwa hakuna kiasi kilichobainishwa katika kiwango cha aina ya mwanachama)
-MinimumAmount=Kiasi cha chini (hutumika tu wakati kiasi cha mchango ni bure)
-CanEditAmount=Kiasi cha usajili kinaweza kufafanuliwa na mwanachama
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=Mgeni anaweza kuchagua/kuhariri kiasi cha mchango wake bila kujali aina ya mwanachama
 AmountIsLowerToMinimumNotice=The amount is lower than the minimum %s
 MEMBER_NEWFORM_PAYONLINE=After the online registration, switch automatically to the online payment page
 ByProperties=Kwa asili
 MembersStatisticsByProperties=Takwimu za wanachama kwa asili
-VATToUseForSubscriptions=VAT rate to use for contributions
-NoVatOnSubscription=Hakuna VAT kwa michango
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Bidhaa inayotumika kwa mstari wa mchango katika ankara: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=Jina au kampuni
 SubscriptionRecorded=Mchango umerekodiwa
 NoEmailSentToMember=Hakuna barua pepe iliyotumwa kwa mwanachama
 EmailSentToMember=Barua pepe ilitumwa kwa mwanachama katika %s
-SendReminderForExpiredSubscriptionTitle=Tuma kikumbusho kwa barua pepe kwa michango ambayo muda wake umeisha
-SendReminderForExpiredSubscription=Send reminder by email to members when contribution is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Uanachama umelipwa kwa kipindi cha sasa (hadi %s)
 YouMayFindYourInvoiceInThisEmail=Unaweza kupata ankara yako iliyoambatishwa kwa barua pepe hii
 XMembersClosed=%s wanachama wamefungwa
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=A third party is the legal entity that will be used
 MemberFirstname=Mwanachama jina la kwanza
 MemberLastname=Jina la mwisho la mwanachama
 MemberCodeDesc=Msimbo wa Mwanachama, wa kipekee kwa wanachama wote
-MemberSubscriptionStartFirstDayOf=The start date of a membership corresponds to the first day of a
-MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a subscription except renewals (example +3m = +3 months, -5d = -5 days, +1Y = +1 year)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/sw_SW/website.lang b/htdocs/langs/sw_SW/website.lang
index 376fa124309..cc862254222 100644
--- a/htdocs/langs/sw_SW/website.lang
+++ b/htdocs/langs/sw_SW/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Tumia hapa orodha ya majina/lahaka zingine ili ukurasa pia
 WEBSITE_CSS_URL=URL ya faili ya CSS ya nje
 WEBSITE_CSS_INLINE=Maudhui ya faili ya CSS (ya kawaida kwa kurasa zote)
 WEBSITE_JS_INLINE=JavaScript file content (common to all pages)
-WEBSITE_HTML_HEADER=Nyongeza chini ya Kichwa cha HTML (kinachojulikana kwa kurasa zote)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Faili ya roboti (robots.txt)
 WEBSITE_HTACCESS=Faili ya .htaccess ya tovuti
 WEBSITE_MANIFEST_JSON=Faili ya manifest.json ya tovuti
@@ -56,16 +56,17 @@ ReadPerm=Soma
 WritePerm=Andika
 TestDeployOnWeb=Jaribu/tuma kwenye wavuti
 PreviewSiteServedByWebServer= <u> Hakiki %s katika kichupo kipya. </u>  <br>  <br> %s itahudumiwa na seva ya wavuti ya nje (kama Apache, Nginx, IIS). Lazima usakinishe na usanidi seva hii kabla ili kuelekeza kwenye saraka: <br>  <strong> %s </strong>  <br> URL inatolewa na seva ya nje: <br>  <strong> %s </strong>
-PreviewSiteServedByDolibarr= <u> Hakiki %s katika kichupo kipya. </u>  <br>  <br> %s itahudumiwa na seva ya Dolibarr kwa hivyo haihitaji seva yoyote ya ziada ya wavuti (kama Apache, Nginx, IIS) kusakinishwa. <br> Usumbufu ni kwamba URL za kurasa sio rafiki kwa watumiaji na huanza na njia ya Dolibarr yako. <br> URL inayotolewa na Dolibarr: <br>  <strong> %s </strong>  <br>  <br> Ili kutumia seva yako ya nje ya wavuti kuhudumia tovuti hii, tengeneza seva pangishi pepe kwenye seva yako ya wavuti inayoelekeza kwenye saraka <br>  <strong> %s </strong>  <br> kisha ingiza jina la seva hii pepe katika sifa za tovuti hii na ubofye kiungo "Jaribio/Weka kwenye wavuti".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL ya seva pangishi pepe inayotolewa na seva ya wavuti ya nje haijafafanuliwa
 NoPageYet=Bado hakuna kurasa
 YouCanCreatePageOrImportTemplate=Unaweza kuunda ukurasa mpya au kuleta kiolezo kamili cha tovuti
 SyntaxHelp=Msaada juu ya vidokezo maalum vya sintaksia
 YouCanEditHtmlSourceckeditor=Unaweza kuhariri msimbo wa chanzo wa HTML kwa kutumia kitufe cha "Chanzo" kwenye kihariri.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Kwa picha iliyoshirikiwa na kiungo cha kushiriki (ufikiaji wazi kwa kutumia ufunguo wa hashi wa kushiriki), syntax ni: <br>  <strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt; </strong>  <br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Sambaza ukurasa/chombo
 CloneSite=Tovuti ya Clone
@@ -87,15 +88,15 @@ WebsiteAccount=Akaunti ya tovuti
 WebsiteAccounts=Akaunti za tovuti
 AddWebsiteAccount=Unda akaunti ya wavuti
 BackToListForThirdParty=Rudi kwenye orodha ya wahusika wengine
-DisableSiteFirst=Zima tovuti kwanza
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Jina la tovuti yangu
 AnotherContainer=Hivi ndivyo jinsi ya kujumuisha maudhui ya ukurasa/chombo kingine (unaweza kuwa na hitilafu hapa ikiwa utawasha msimbo unaobadilika kwa sababu kontena ndogo iliyopachikwa inaweza kuwa haipo)
 SorryWebsiteIsCurrentlyOffLine=Samahani, tovuti hii iko nje ya mtandao kwa sasa. Tafadhali rudi baadaye...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Washa jedwali ili kuhifadhi akaunti za tovuti (kuingia/kupitisha) kwa kila tovuti/watu wengine
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Lazima kwanza ubainishe ukurasa wa Nyumbani chaguomsingi
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correctty when used on a grabbed external page.
-OnlyEditionOfSourceForGrabbedContent=Toleo pekee la chanzo cha HTML linawezekana wakati maudhui yaliporwa kutoka kwa tovuti ya nje
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Kunyakua pia picha kupatikana katika css na ukurasa.
 ImagesShouldBeSavedInto=Picha zinapaswa kuhifadhiwa kwenye saraka
 WebsiteRootOfImages=Saraka ya mizizi kwa picha za tovuti
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Remove filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Categories
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/ta_IN/admin.lang b/htdocs/langs/ta_IN/admin.lang
index 6613fac7972..0185c75ab38 100644
--- a/htdocs/langs/ta_IN/admin.lang
+++ b/htdocs/langs/ta_IN/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=கோப்புகளின் ஒரு
 FileIntegritySomeFilesWereRemovedOrModified=கோப்புகளின் நேர்மை சரிபார்ப்பு தோல்வியடைந்தது. சில கோப்புகள் மாற்றப்பட்டன, அகற்றப்பட்டன அல்லது சேர்க்கப்பட்டன.
 GlobalChecksum=உலகளாவிய செக்சம்
 MakeIntegrityAnalysisFrom=இதிலிருந்து பயன்பாட்டுக் கோப்புகளின் ஒருமைப்பாடு பகுப்பாய்வு செய்யுங்கள்
-LocalSignature=உட்பொதிக்கப்பட்ட உள்ளூர் கையொப்பம் (குறைவான நம்பகத்தன்மை)
-RemoteSignature=தொலைதூர கையொப்பம் (மிகவும் நம்பகமானது)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=கோப்புகள் காணவில்லை
 FilesUpdated=புதுப்பிக்கப்பட்ட கோப்புகள்
 FilesModified=மாற்றியமைக்கப்பட்ட கோப்புகள்
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=சில நிகழ்ச்சி நிரல் வ
 Security=பாதுகாப்பு
 Passwords=கடவுச்சொற்கள்
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=conf.php இல் சேமிக்கப்பட்ட தரவுத்தள கடவுச்சொல்லை குறியாக்கம் செய்யவும். இந்த விருப்பத்தை செயல்படுத்த கடுமையாக பரிந்துரைக்கப்படுகிறது.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=<b> conf.php </b> கோப்பில் கடவுச்சொல்லை குறியிட, <br> <b> $dolibarr_main_db_pass="..."; </b> <br> by <br> <b> $dolibarr_main_db_pass="crypted:%s"; </b>
 InstrucToClearPass=<b> conf.php </b> கோப்பில் கடவுச்சொல்லை டிகோட் செய்ய (தெளிவாக) இருக்க, <br> <b> $dolibarr_main_db_pass:="cryptedb_pass; </b> <br> by <br> <b> $dolibarr_main_db_pass="%s"; </b>
 ProtectAndEncryptPdfFiles=உருவாக்கப்பட்ட PDF கோப்புகளைப் பாதுகாக்கவும். மொத்த PDF உருவாக்கத்தை உடைப்பதால் இது பரிந்துரைக்கப்படவில்லை.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=கணக்கிடப்பட்ட புலம்
-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=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'
 Computedpersistent=கணக்கிடப்பட்ட புலத்தை சேமிக்கவும்
 ComputedpersistentDesc=கணக்கிடப்பட்ட கூடுதல் புலங்கள் தரவுத்தளத்தில் சேமிக்கப்படும், இருப்பினும், இந்த புலத்தின் பொருள் மாற்றப்படும் போது மட்டுமே மதிப்பு மீண்டும் கணக்கிடப்படும். கணக்கிடப்பட்ட புலம் மற்ற பொருள்கள் அல்லது உலகளாவிய தரவு சார்ந்து இருந்தால் இந்த மதிப்பு தவறாக இருக்கலாம்!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored WITHOUT encryption (field is just hidden with stars on screen).<br><br>Enter value 'dolcrypt' to encode value with a reversible encryption algorithm. Clear data can still be known and edited but is encrypted into database.<br><br>Enter 'auto' (or 'md5', 'sha256', 'password_hash', ...) to use the default password encryption algorithm (or md5, sha256, password_hash...) to save the non reversible hashed password into database (no way to retrieve original value)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- மின்னஞ்சல்களை அனுப்ப உங்கள் சொந்த மின்னஞ்சல் சேவை வழங்குநரின் SMTP சேவையகத்தைப் பயன்படுத்துவதும் சுவாரஸ்யமானது, எனவே பயன்பாட்டிலிருந்து அனுப்பப்படும் அனைத்து மின்னஞ்சல்களும் உங்கள் அஞ்சல் பெட்டியின் "அனுப்பப்பட்ட" கோப்பகத்தில் சேமிக்கப்படும்.
 WarningPHPMailD=It is therefore recommended to change the sending method of e-mails to the value "SMTP".
 WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
-WarningPHPMail2=உங்கள் மின்னஞ்சல் SMTP வழங்குநர் மின்னஞ்சல் கிளையண்ட்டை சில IP முகவரிகளுக்கு (மிகவும் அரிதான) கட்டுப்படுத்த வேண்டும் என்றால், இது உங்கள் ERP CRM பயன்பாட்டிற்கான அஞ்சல் பயனர் முகவரின் (MUA) ஐபி முகவரி: <strong> %s a0a65d071f6f6f6fc9
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=கணக்கியல் (எளிமைப்படுத்
 Module10Desc=தரவுத்தள உள்ளடக்கத்தின் அடிப்படையில் எளிய கணக்கியல் அறிக்கைகள் (பத்திரிகைகள், வருவாய்). எந்த லெட்ஜர் அட்டவணையையும் பயன்படுத்துவதில்லை.
 Module20Name=முன்மொழிவுகள்
 Module20Desc=வணிக முன்மொழிவு மேலாண்மை
-Module22Name=வெகுஜன மின்னஞ்சல்கள்
-Module22Desc=மொத்த மின்னஞ்சலை நிர்வகிக்கவும்
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=ஆற்றல்
 Module23Desc=ஆற்றல் நுகர்வு கண்காணிப்பு
 Module25Name=விற்பனை ஆணைகள்
@@ -847,10 +848,10 @@ Permission212=வரிகளை ஆர்டர் செய்யுங்க
 Permission213=வரியை செயல்படுத்தவும்
 Permission214=டெலிபோனியை அமைக்கவும்
 Permission215=அமைவு வழங்குநர்கள்
-Permission221=மின்னஞ்சல்களைப் படிக்கவும்
-Permission222=மின்னஞ்சல்களை உருவாக்கவும்/மாற்றவும் (தலைப்பு, பெறுநர்கள்...)
-Permission223=மின்னஞ்சல்களை சரிபார்க்கவும் (அனுப்ப அனுமதிக்கிறது)
-Permission229=மின்னஞ்சல்களை நீக்கவும்
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=பெறுநர்கள் மற்றும் தகவலைப் பார்க்கவும்
 Permission238=கைமுறையாக அஞ்சல்களை அனுப்பவும்
 Permission239=சரிபார்ப்பு அல்லது அனுப்பப்பட்ட பிறகு அஞ்சல்களை நீக்கவும்
@@ -1105,6 +1106,7 @@ DictionaryStaff=தொழிலாளிகளின் எண்ணிக்
 DictionaryAvailability=டெலிவரி தாமதம்
 DictionaryOrderMethods=ஆர்டர் முறைகள்
 DictionarySource=முன்மொழிவுகள்/ஆர்டர்களின் தோற்றம்
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=அறிக்கைகளுக்கான தனிப்பயனாக்கப்பட்ட குழுக்கள்
 DictionaryAccountancysystem=கணக்குகளின் விளக்கப்படத்திற்கான மாதிரிகள்
 DictionaryAccountancyJournal=கணக்கியல் இதழ்கள்
@@ -1134,11 +1136,11 @@ BackToDictionaryList=அகராதிகளின் பட்டியலு
 TypeOfRevenueStamp=வரி முத்திரையின் வகை
 VATManagement=விற்பனை வரி மேலாண்மை
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=முன்னிருப்பாக முன்மொழியப்பட்ட விற்பனை வரி 0 ஆகும், இது சங்கங்கள், தனிநபர்கள் அல்லது சிறிய நிறுவனங்கள் போன்ற நிகழ்வுகளுக்குப் பயன்படுத்தப்படலாம்.
 VATIsUsedExampleFR=பிரான்சில், உண்மையான நிதி அமைப்பைக் கொண்ட நிறுவனங்கள் அல்லது நிறுவனங்கள் (எளிமைப்படுத்தப்பட்ட உண்மையான அல்லது சாதாரண உண்மையான) என்று பொருள். VAT அறிவிக்கப்படும் ஒரு அமைப்பு.
 VATIsNotUsedExampleFR=பிரான்சில், விற்பனை வரி அறிவிக்கப்படாத சங்கங்கள் அல்லது நிறுவனங்கள், நிறுவனங்கள் அல்லது தாராளவாத தொழில்கள், மைக்ரோ நிறுவன நிதி முறையை (உரிமையில் விற்பனை வரி) தேர்வு செய்து விற்பனை வரி அறிவிப்பு இல்லாமல் உரிமையாளர் விற்பனை வரியை செலுத்துகிறது. இந்த தேர்வு "பொருந்தாத விற்பனை வரி - ஆர்ட்-293B of CGI" என்ற குறிப்பை இன்வாய்ஸ்களில் காண்பிக்கும்.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=விற்பனை வரி வகை
 LTRate=மதிப்பிடவும்
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=வரிகளின் அமைப்பின் 
 LabelUsedByDefault=குறியீட்டிற்கான மொழிபெயர்ப்பு எதுவும் கண்டறியப்படவில்லை எனில், லேபிள் இயல்பாகப் பயன்படுத்தப்படும்
 LabelOnDocuments=ஆவணங்களில் லேபிள்
 LabelOrTranslationKey=லேபிள் அல்லது மொழிபெயர்ப்பு விசை
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=வாடிக்கையாளர்/விற்பனையா
 AddAdressInList=Display Customer/Vendor address into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=மூன்றாம் தரப்பினருக்கு விருப்பமான ஷிப்பிங் முறையைக் கேளுங்கள்.
-FieldEdition=%s புலத்தின் பதிப்பு
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=எடுத்துக்காட்டு: +2 (நேர மண்டல ஆஃப்செட் சிக்கல்கள் ஏற்பட்டால் மட்டுமே நிரப்பவும்)
 GetBarCode=பார்கோடு பெறவும்
 NumberingModules=எண் மாதிரிகள்
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=இன்வாய்ஸ் தேதியை சரிபா
 SuggestedPaymentModesIfNotDefinedInInvoice=விலைப்பட்டியலில் வரையறுக்கப்படவில்லை எனில், இயல்புநிலையாக விலைப்பட்டியலில் கட்டண முறை பரிந்துரைக்கப்படுகிறது
 SuggestPaymentByRIBOnAccount=கணக்கில் திரும்பப் பெறுவதன் மூலம் பணம் செலுத்த பரிந்துரைக்கவும்
 SuggestPaymentByChequeToAddress=காசோலை மூலம் பணம் செலுத்த பரிந்துரைக்கவும்
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=விலைப்பட்டியல்களில் இலவச உரை
 WatermarkOnDraftInvoices=வரைவு விலைப்பட்டியல்களில் வாட்டர்மார்க் (காலியாக இருந்தால் எதுவும் இல்லை)
 PaymentsNumberingModule=கட்டண எண் மாதிரி
@@ -1718,6 +1723,7 @@ CompressionOfResources=HTTP பதில்களின் சுருக்க
 CompressionOfResourcesDesc=உதாரணமாக "AddOutputFilterByType DEFLATE" என்ற Apache கட்டளையைப் பயன்படுத்துதல்
 TestNotPossibleWithCurrentBrowsers=தற்போதைய உலாவிகளில் இத்தகைய தானியங்கி கண்டறிதல் சாத்தியமில்லை
 DefaultValuesDesc=புதிய பதிவை உருவாக்கும் போது நீங்கள் பயன்படுத்த விரும்பும் இயல்புநிலை மதிப்பை, மற்றும்/அல்லது இயல்புநிலை வடிப்பான்கள் அல்லது பதிவுகளை பட்டியலிடும்போது வரிசைப்படுத்தும் வரிசையை இங்கே நீங்கள் வரையறுக்கலாம்.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=இயல்புநிலை மதிப்புகள் (படிவங்களில் பயன்படுத்த)
 DefaultSearchFilters=இயல்புநிலை தேடல் வடிப்பான்கள்
 DefaultSortOrder=இயல்புநிலை வரிசை ஆர்டர்கள்
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=எண் தொகுதிகளை அனுப்
 SendingsAbility=வாடிக்கையாளர் விநியோகத்திற்கான ஆதரவு ஷிப்பிங் தாள்கள்
 NoNeedForDeliveryReceipts=பெரும்பாலான சந்தர்ப்பங்களில், ஷிப்பிங் தாள்கள் வாடிக்கையாளர் விநியோகத்திற்கான தாள்களாகவும் (அனுப்ப வேண்டிய தயாரிப்புகளின் பட்டியல்) மற்றும் வாடிக்கையாளரால் பெறப்பட்டு கையொப்பமிடப்பட்ட தாள்களாகவும் பயன்படுத்தப்படுகின்றன. எனவே தயாரிப்பு டெலிவரி ரசீது நகல் அம்சம் மற்றும் அரிதாகவே செயல்படுத்தப்படுகிறது.
 FreeLegalTextOnShippings=ஏற்றுமதியில் இலவச உரை
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=தயாரிப்புகள் டெலிவரி ரசீது எண் தொகுதி
 DeliveryOrderModel=தயாரிப்பு விநியோக ரசீது மாதிரி
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=டெலிவரி ரசீதுகளி
 ##### FCKeditor #####
 AdvancedEditor=மேம்பட்ட ஆசிரியர்
 ActivateFCKeditor=மேம்பட்ட எடிட்டரைச் செயல்படுத்தவும்:
-FCKeditorForNotePublic=WYSIWYG creation/edition of the field "public notes" of elements
-FCKeditorForNotePrivate=WYSIWYG creation/edition of the field "private notes" of elements
-FCKeditorForCompany=WYSIWYG creation/edition of the field description of elements (except products/services)
-FCKeditorForProductDetails=WYSIWYG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, 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.
-FCKeditorForMailing= WYSIWYG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWYG creation/edition of user signature
-FCKeditorForMail=WYSIWYG creation/edition for all mail (except Tools->eMailing)
-FCKeditorForTicket=WYSIWYG creation/edition for tickets
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=பங்கு தொகுதி அமைப்பு
 IfYouUsePointOfSaleCheckModule=இயல்புநிலையாக அல்லது வெளிப்புறத் தொகுதியாக வழங்கப்பட்ட Point of Sale தொகுதியை (POS) நீங்கள் பயன்படுத்தினால், இந்த அமைப்பு உங்கள் POS தொகுதியால் புறக்கணிக்கப்படலாம். பெரும்பாலான பிஓஎஸ் மாட்யூல்கள் இங்கே உள்ள விருப்பங்களைப் பொருட்படுத்தாமல் உடனடியாக விலைப்பட்டியல் உருவாக்கவும் பங்குகளைக் குறைக்கவும் இயல்பாகவே வடிவமைக்கப்பட்டுள்ளன. எனவே, உங்கள் பிஓஎஸ்ஸில் இருந்து விற்பனையைப் பதிவு செய்யும் போது பங்கு குறைய வேண்டும் அல்லது இல்லை என்றால், உங்கள் பிஓஎஸ் தொகுதி அமைப்பையும் சரிபார்க்கவும்.
@@ -1867,7 +1874,6 @@ Buy=வாங்க
 Sell=விற்க
 InvoiceDateUsed=விலைப்பட்டியல் தேதி பயன்படுத்தப்பட்டது
 YourCompanyDoesNotUseVAT=உங்கள் நிறுவனம் VAT (முகப்பு - அமைவு - நிறுவனம்/நிறுவனம்) பயன்படுத்த வேண்டாம் என வரையறுக்கப்பட்டுள்ளது, எனவே அமைப்பதற்கு VAT விருப்பங்கள் எதுவும் இல்லை.
-AccountancyCode=கணக்கியல் குறியீடு
 AccountancyCodeSell=விற்பனை கணக்கு. குறியீடு
 AccountancyCodeBuy=கொள்முதல் கணக்கு. குறியீடு
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=புதிய வரியை உருவாக்கும் போது இயல்பாகவே "கட்டணத்தை தானாக உருவாக்கு" என்ற தேர்வுப்பெட்டியை காலியாக வைக்கவும்
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = மெனு நிகழ்ச்சி நிரலை
 AGENDA_EVENT_PAST_COLOR = Past event color
 AGENDA_EVENT_CURRENT_COLOR = Current event color
 AGENDA_EVENT_FUTURE_COLOR = Future event color
-AGENDA_REMINDER_BROWSER = பயனரின் உலாவி </b> இல் நிகழ்வு நினைவூட்டல் <b> ஐ இயக்கவும் (நினைவூட்டல் தேதியை அடைந்ததும், உலாவியால் ஒரு பாப்அப் காண்பிக்கப்படும். ஒவ்வொரு பயனரும் அதன் உலாவி அறிவிப்பு அமைப்பிலிருந்து அத்தகைய அறிவிப்புகளை முடக்கலாம்).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = ஒலி அறிவிப்பை இயக்கவும்
-AGENDA_REMINDER_EMAIL = </b> மின்னஞ்சல்கள் மூலம் நிகழ்வு நினைவூட்டல் <b> ஐ இயக்கவும் (ஒவ்வொரு நிகழ்விலும் நினைவூட்டல் விருப்பம்/தாமதத்தை வரையறுக்கலாம்).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = குறிப்பு: நினைவூட்டல் சரியான நேரத்தில் அனுப்பப்படுவதை உறுதிசெய்ய, திட்டமிடப்பட்ட வேலையின் அதிர்வெண் %s போதுமானதாக இருக்க வேண்டும்.
 AGENDA_SHOW_LINKED_OBJECT = இணைக்கப்பட்ட பொருளை நிகழ்ச்சி நிரல் பார்வையில் காட்டு
 AGENDA_USE_EVENT_TYPE = நிகழ்வுகளின் வகைகளைப் பயன்படுத்தவும் (மெனுவில் நிர்வகிக்கப்படும் அமைவு -> அகராதிகள் -> நிகழ்ச்சி நிரல் நிகழ்வுகளின் வகை)
 AGENDA_USE_EVENT_TYPE_DEFAULT = நிகழ்வு உருவாக்கும் படிவத்தில் நிகழ்வின் வகைக்கு இந்த இயல்புநிலை மதிப்பை தானாக அமைக்கவும்
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = ஏற்றுமதி இணைப்பை அங்கீகரிக்க விசை
 PastDelayVCalExport=அதை விட பழைய நிகழ்வை ஏற்றுமதி செய்ய வேண்டாம்
 SecurityKey = இரகசிய இலக்கம்
@@ -2006,7 +2017,7 @@ BackupZipWizard=ஆவணங்கள் கோப்பகத்தின் 
 SomethingMakeInstallFromWebNotPossible=பின்வரும் காரணத்திற்காக இணைய இடைமுகத்திலிருந்து வெளிப்புற தொகுதியை நிறுவுவது சாத்தியமில்லை:
 SomethingMakeInstallFromWebNotPossible2=இந்த காரணத்திற்காக, இங்கு விவரிக்கப்பட்டுள்ள மேம்படுத்தல் செயல்முறையானது ஒரு சிறப்புரிமை பெற்ற பயனர் மட்டுமே செய்யக்கூடிய ஒரு கைமுறை செயல்முறையாகும்.
 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.
-InstallModuleFromWebHasBeenDisabledByFile=பயன்பாட்டிலிருந்து வெளிப்புற தொகுதியை நிறுவுவது உங்கள் நிர்வாகியால் முடக்கப்பட்டுள்ளது. இந்த அம்சத்தை அனுமதிக்க, <strong> %s </strong> கோப்பை அகற்றும்படி அவரிடம் கேட்க வேண்டும்.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=பயன்பாட்டிலிருந்து வெளிப்புற தொகுதியை நிறுவுதல் அல்லது உருவாக்குதல் தொகுதி கோப்புகளை <strong> %s </strong> கோப்பகத்தில் சேமிக்க வேண்டும். இந்த கோப்பகத்தை Dolibarr ஆல் செயல்படுத்த, 2 வழிகாட்டுதல் வரிகளைச் சேர்க்க, <strong> conf/conf.php </strong> ஐ அமைக்க வேண்டும்: <br> a0e7843947cli'rto_in_barz0 $d06bz </strong> <br> <strong> $dolibarr_main_document_root_alt='%s/custom'; </strong>
 HighlightLinesOnMouseHover=மவுஸ் நகர்த்தும்போது அட்டவணை வரிகளை முன்னிலைப்படுத்தவும்
 HighlightLinesColor=மவுஸ் கடந்து செல்லும் போது கோட்டின் நிறத்தை முன்னிலைப்படுத்தவும் (சிறப்பம்சமாக இல்லாமல் 'ffffff' ஐப் பயன்படுத்தவும்)
@@ -2036,6 +2047,7 @@ Enter0or1=0 அல்லது 1 ஐ உள்ளிடவும்
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=பிரேஸ்களுக்கு இடையில் இங்கே உள்ளிடவும், நாணயக் குறியீட்டைக் குறிக்கும் பைட் எண்ணின் பட்டியல். எடுத்துக்காட்டாக: $க்கு, [36] உள்ளிடவும் - பிரேசிலுக்கு உண்மையான R$ [82,36] - €க்கு, உள்ளிடவும் [8364]
 ColorFormat=RGB வண்ணம் HEX வடிவத்தில் உள்ளது, எ.கா: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Icon name in format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
 PositionIntoComboList=சேர்க்கை பட்டியல்களில் வரியின் நிலை
 SellTaxRate=விற்பனை வரி விகிதம்
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=அனுப்புநர் முகவரி சட்டத்தில் எல்லைகளை மறை
 MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipient address frame
 MAIN_PDF_HIDE_CUSTOMER_CODE=வாடிக்கையாளர் குறியீட்டை மறை
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=முகவரித் தொகுதியில் அனுப்புநர்/நிறுவனத்தின் பெயரை மறை
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=கட்டண நிபந்தனைகளை மறை
 PROPOSAL_PDF_HIDE_PAYMENTMODE=கட்டண முறையை மறை
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=பரிந்துரைக்கப்படவில்ல
 ARestrictedPath=Some restricted path for data files
 CheckForModuleUpdate=வெளிப்புற தொகுதிகள் புதுப்பிப்புகளைச் சரிபார்க்கவும்
 CheckForModuleUpdateHelp=புதிய பதிப்பு உள்ளதா என்பதைச் சரிபார்க்க, இந்தச் செயல் வெளிப்புற தொகுதிகளின் எடிட்டர்களுடன் இணைக்கப்படும்.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=ஒரு புதுப்பிப்பு கிடைக்கிறது
 NoExternalModuleWithUpdate=வெளிப்புற தொகுதிகளுக்கான புதுப்பிப்புகள் எதுவும் இல்லை
 SwaggerDescriptionFile=Swagger API விளக்கக் கோப்பு (உதாரணமாக redoc உடன் பயன்படுத்த)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Show shipping address
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
 DarkThemeMode=Dark theme mode
@@ -2450,7 +2471,7 @@ 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)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Not created by default. Created on module activation only.
 CSSPage=CSS Style
 Defaultfortype=Default
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/ta_IN/banks.lang b/htdocs/langs/ta_IN/banks.lang
index 23fbb94b670..0d87276ce9d 100644
--- a/htdocs/langs/ta_IN/banks.lang
+++ b/htdocs/langs/ta_IN/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=இறுதி இருப்பு
 CurrentBalance=தற்போதைய இருப்பு
 FutureBalance=எதிர்கால இருப்பு
 ShowAllTimeBalance=தொடக்கத்தில் இருந்து இருப்பைக் காட்டு
-AllTime=தொடக்கத்தில் இருந்து
 Reconciliation=சமரசம்
 RIB=வங்கி கணக்கு எண்
 IBAN=IBAN எண்
@@ -133,7 +132,7 @@ DeleteTransaction=உள்ளீட்டை நீக்கு
 ConfirmDeleteTransaction=இந்த பதிவை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
 ThisWillAlsoDeleteBankRecord=இது உருவாக்கப்பட்ட வங்கி உள்ளீட்டையும் நீக்கும்
 BankMovements=இயக்கங்கள்
-PlannedTransactions=திட்டமிட்ட உள்ளீடுகள்
+PlannedTransactions=Upcoming entries
 Graph=வரைபடங்கள்
 ExportDataset_banque_1=வங்கி உள்ளீடுகள் மற்றும் கணக்கு அறிக்கை
 ExportDataset_banque_2=வைப்பு சீட்டு
@@ -151,7 +150,7 @@ FutureTransaction=எதிர்கால பரிவர்த்தனை. 
 SelectChequeTransactionAndGenerate=காசோலை வைப்பு ரசீதில் சேர்க்கப்பட வேண்டிய காசோலைகளைத் தேர்ந்தெடுக்கவும்/வடிகட்டவும். பின்னர், "உருவாக்கு" என்பதைக் கிளிக் செய்யவும்.
 SelectPaymentTransactionAndGenerate=Select/filter the documents which are to be included in the %s deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value
-InputReceiptNumberBis=YYYYMM or YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=சமரசம் செய்யவா?
 ThenCheckLinesAndConciliate=பின்னர், வங்கி அறிக்கையில் உள்ள வரிகளை சரிபார்த்து கிளிக் செய்யவும்
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=இந்த செயல்பாடு இயக்
 BankColorizeMovementName1=டெபிட் இயக்கத்திற்கான பின்னணி நிறம்
 BankColorizeMovementName2=கடன் இயக்கத்திற்கான பின்னணி நிறம்
 IfYouDontReconcileDisableProperty=சில வங்கிக் கணக்குகளில் நீங்கள் வங்கி சமரசம் செய்யவில்லை எனில், இந்த எச்சரிக்கையை அகற்ற, அவற்றில் உள்ள "%s" சொத்தை முடக்கவும்.
-NoBankAccountDefined=வங்கிக் கணக்கு எதுவும் வரையறுக்கப்படவில்லை
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=வங்கிக் கணக்கில் பதிவு எதுவும் இல்லை. பொதுவாக, வங்கிக் கணக்கில் உள்ள பரிவர்த்தனை பட்டியலிலிருந்து ஒரு பதிவு கைமுறையாக நீக்கப்படும்போது இது நிகழ்கிறது (எடுத்துக்காட்டாக, வங்கிக் கணக்கின் சமரசத்தின் போது). மற்றொரு காரணம், "%s" தொகுதி முடக்கப்பட்டபோது கட்டணம் பதிவு செய்யப்பட்டது.
 AlreadyOneBankAccount=ஏற்கனவே ஒரு வங்கி கணக்கு வரையறுக்கப்பட்டுள்ளது
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA file variant
diff --git a/htdocs/langs/ta_IN/blockedlog.lang b/htdocs/langs/ta_IN/blockedlog.lang
index 8a2d00abe57..e6e3f3cd7ae 100644
--- a/htdocs/langs/ta_IN/blockedlog.lang
+++ b/htdocs/langs/ta_IN/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=மாற்ற முடியாத பதிவுகள்
 ShowAllFingerPrintsMightBeTooLong=காப்பகப்படுத்தப்பட்ட அனைத்து பதிவுகளையும் காட்டு (நீண்டதாக இருக்கலாம்)
 ShowAllFingerPrintsErrorsMightBeTooLong=செல்லுபடியாகாத அனைத்து காப்பகப் பதிவுகளையும் காட்டு (நீண்டதாக இருக்கலாம்)
 DownloadBlockChain=கைரேகைகளைப் பதிவிறக்கவும்
-KoCheckFingerprintValidity=காப்பகப்படுத்தப்பட்ட பதிவு உள்ளீடு தவறானது. யாரோ ஒருவர் (ஹேக்கர்?) இந்தப் பதிவின் சில தரவைப் பதிவுசெய்த பிறகு மாற்றியிருக்கிறார் அல்லது முந்தைய காப்பகப் பதிவை அழித்துவிட்டார் (முந்தைய # உள்ளதைச் சரிபார்க்கவும்) அல்லது முந்தைய பதிவின் செக்ஸத்தை மாற்றியமைத்துள்ளார்.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=காப்பகப்படுத்தப்பட்ட பதிவு பதிவு செல்லுபடியாகும். இந்த வரியில் உள்ள தரவு மாற்றப்படவில்லை மற்றும் உள்ளீடு முந்தையதைப் பின்பற்றுகிறது.
 OkCheckFingerprintValidityButChainIsKo=காப்பகப்படுத்தப்பட்ட பதிவு முந்தையதை ஒப்பிடும்போது சரியானதாகத் தெரிகிறது ஆனால் சங்கிலி முன்பு சிதைந்துவிட்டது.
 AddedByAuthority=தொலைநிலை அதிகாரத்தில் சேமிக்கப்பட்டது
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=பதிவு விவரங்கள்
 ListOfTrackedEvents=கண்காணிக்கப்பட்ட நிகழ்வுகளின் பட்டியல்
 Fingerprint=கைரேகை
 DownloadLogCSV=காப்பகப்படுத்தப்பட்ட பதிவுகளை ஏற்றுமதி செய் (CSV)
-DataOfArchivedEvent=Full data of archived event
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=அசல் பொருள் (வகை %s, ஐடி %s) இணைக்கப்படவில்லை (மாற்ற முடியாத சேமித்த தரவைப் பெற 'முழு தரவு' நெடுவரிசையைப் பார்க்கவும்)
 BlockedLogAreRequiredByYourCountryLegislation=உங்கள் நாட்டின் சட்டத்தின்படி மாற்ற முடியாத பதிவுகள் தொகுதி தேவைப்படலாம். இந்தத் தொகுதியை முடக்கினால், எதிர்காலத்தில் நடக்கும் பரிவர்த்தனைகள், சட்டப்பூர்வ மென்பொருளின் பயன்பாடு மற்றும் வரித் தணிக்கை மூலம் சரிபார்க்க முடியாததால் அவை செல்லுபடியாகாது.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=உங்கள் நாட்டின் சட்டத்தின் காரணமாக மாற்ற முடியாத பதிவுகள் தொகுதி செயல்படுத்தப்பட்டது. இந்தத் தொகுதியை முடக்கினால், எதிர்காலத்தில் நடக்கும் பரிவர்த்தனைகள் சட்டத்தின்படியும் சட்டப்பூர்வ மென்பொருளைப் பயன்படுத்தும்போதும் அவை செல்லுபடியாகாது.
@@ -30,6 +32,7 @@ BlockedLogEnabled=System to track events into unalterable logs has been enabled
 BlockedLogDisabled=System to track events into unalterable logs has been disabled after some recording were done. We saved a special Fingerprint to track the chain as broken
 BlockedLogDisabledBis=System to track events into unalterable logs has been disabled. This is possible because no record were done yet.
 LinkHasBeenDisabledForPerformancePurpose=For performance purpose, direct link to the document is not shown after the 100th line.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=வாடிக்கையாளர் விலைப்பட்டியல் தர்க்கரீதியாக நீக்கப்பட்டது
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=வாடிக்கையாளர் கட்ட
 logPAYMENT_VARIOUS_CREATE=கட்டணம் (இன்வாய்ஸுக்கு ஒதுக்கப்படவில்லை) உருவாக்கப்பட்டது
 logPAYMENT_VARIOUS_DELETE=பணம் செலுத்துதல் (விலைப்பட்டியலுக்கு ஒதுக்கப்படவில்லை) தருக்க நீக்கம்
 logPAYMENT_VARIOUS_MODIFY=கட்டணம் (விலைப்பட்டியலுக்கு ஒதுக்கப்படவில்லை) மாற்றப்பட்டது
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/ta_IN/categories.lang b/htdocs/langs/ta_IN/categories.lang
index ecda91975b3..531cec22bce 100644
--- a/htdocs/langs/ta_IN/categories.lang
+++ b/htdocs/langs/ta_IN/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=தொடர்பு குறிச்சொற்க
 AccountsCategoriesArea=வங்கி கணக்கு குறிச்சொற்கள்/வகைகள் பகுதி
 ProjectsCategoriesArea=திட்ட குறிச்சொற்கள்/வகைகள் பகுதி
 UsersCategoriesArea=பயனர் குறிச்சொற்கள்/வகைகள் பகுதி
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=துணை வகைகள்
 CatList=குறிச்சொற்கள்/வகைகளின் பட்டியல்
 CatListAll=குறிச்சொற்கள்/வகைகளின் பட்டியல் (அனைத்து வகைகளும்)
@@ -90,9 +91,10 @@ CategoriesSetup=குறிச்சொற்கள்/வகைகள் அ
 CategorieRecursiv=தானாக பெற்றோர் குறிச்சொல்/வகையுடன் இணைக்கவும்
 CategorieRecursivHelp=If option is on, when you add an object into a subcategory, the object will also be added into the parent categories.
 AddProductServiceIntoCategory=Assign category to the product/service
-AddCustomerIntoCategory=வாடிக்கையாளருக்கு வகையை ஒதுக்கவும்
-AddSupplierIntoCategory=சப்ளையருக்கு வகையை ஒதுக்கவும்
-AssignCategoryTo=Assign category to
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=குறிச்சொல்/வகையைக் காட்டு
 ByDefaultInList=பட்டியலில் இயல்பாக
 ChooseCategory=வகையைத் தேர்ந்தெடுக்கவும்
@@ -102,4 +104,5 @@ ActionCommCategoriesArea=நிகழ்வு வகைகள்
 WebsitePagesCategoriesArea=பக்கம்-கொள்கலன் வகைகள்
 KnowledgemanagementsCategoriesArea=KM கட்டுரை வகைகள்
 UseOrOperatorForCategories=வகைகளுக்கு 'OR' ஆபரேட்டரைப் பயன்படுத்தவும்
-AddObjectIntoCategory=Assign the category
+AddObjectIntoCategory=Assign to the category
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/ta_IN/companies.lang b/htdocs/langs/ta_IN/companies.lang
index 8942b9eaa81..217452c96c4 100644
--- a/htdocs/langs/ta_IN/companies.lang
+++ b/htdocs/langs/ta_IN/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=நாடு ஐரோப்பிய பொருளாதார
 PriceFormatInCurrentLanguage=தற்போதைய மொழி மற்றும் நாணயத்தில் விலைக் காட்சி வடிவம்
 ThirdPartyName=மூன்றாம் தரப்பு பெயர்
 ThirdPartyEmail=மூன்றாம் தரப்பு மின்னஞ்சல்
-ThirdParty=மூன்றாம் தரப்பு
-ThirdParties=மூன்றாம் தரப்பினர்
+ThirdParty=Third party
+ThirdParties=Third parties
 ThirdPartyProspects=வாய்ப்புகள்
 ThirdPartyProspectsStats=வாய்ப்புகள்
 ThirdPartyCustomers=வாடிக்கையாளர்கள்
@@ -65,6 +65,7 @@ State=மாநிலம்/மாகாணம்
 StateId=State ID
 StateCode=மாநிலம்/ மாகாண குறியீடு
 StateShort=நிலை
+DepartmentBuyer=Buyer's state/province
 Region=பிராந்தியம்
 Region-State=பகுதி - மாநிலம்
 Country=நாடு
@@ -78,7 +79,7 @@ Chat=அரட்டை
 PhonePro=பேருந்து. தொலைபேசி
 PhonePerso=பெர்ஸ். தொலைபேசி
 PhoneMobile=கைபேசி
-No_Email=மொத்த மின்னஞ்சல்களை மறுக்கவும்
+No_Email=Refuse mass emails
 Fax=தொலைநகல்
 Zip=அஞ்சல் குறியீடு
 Town=நகரம்
@@ -382,11 +383,12 @@ ExportCardToFormat=அட்டையை வடிவமைப்பிற்க
 ContactNotLinkedToCompany=எந்த மூன்றாம் தரப்பினருடனும் தொடர்பு இணைக்கப்படவில்லை
 DolibarrLogin=டோலிபார் உள்நுழைவு
 NoDolibarrAccess=டோலிபார் அணுகல் இல்லை
-ExportDataset_company_1=மூன்றாம் தரப்பினர் (நிறுவனங்கள்/அடிப்படைகள்/உடல் சார்ந்த நபர்கள்) மற்றும் அவற்றின் பண்புகள்
-ExportDataset_company_2=தொடர்புகள் மற்றும் அவற்றின் பண்புகள்
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=மூன்றாம் தரப்பினர் மற்றும் அவற்றின் பண்புகள்
 ImportDataset_company_2=மூன்றாம் தரப்பினரின் கூடுதல் தொடர்புகள்/முகவரிகள் மற்றும் பண்புக்கூறுகள்
-ImportDataset_company_3=மூன்றாம் தரப்பு வங்கி கணக்குகள்
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=மூன்றாம் தரப்பு விற்பனை பிரதிநிதிகள் (நிறுவனங்களுக்கு விற்பனை பிரதிநிதிகள்/பயனர்களை நியமிக்கவும்)
 PriceLevel=விலை நிலை
 PriceLevelLabels=விலை நிலை லேபிள்கள்
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=மேலாளர்(கள்) பெயர் (தலைமை நிர்வாக அதிகாரி, இயக்குனர், தலைவர்...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=மூன்றாம் தரப்பினரை இணைக்கவும்
-ConfirmMergeThirdparties=தேர்ந்தெடுக்கப்பட்ட மூன்றாம் தரப்பினரை தற்போதைய ஒருவருடன் நிச்சயமாக இணைக்க விரும்புகிறீர்களா? இணைக்கப்பட்ட அனைத்து பொருட்களும் (இன்வாய்ஸ்கள், ஆர்டர்கள், ...) தற்போதைய மூன்றாம் தரப்பினருக்கு நகர்த்தப்படும், அதன் பிறகு தேர்ந்தெடுக்கப்பட்ட மூன்றாம் தரப்பு நீக்கப்படும்.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=மூன்றாவது கட்சிகள் இணைக்கப்பட்டுள்ளன
 SaleRepresentativeLogin=விற்பனை பிரதிநிதியின் உள்நுழைவு
 SaleRepresentativeFirstname=விற்பனை பிரதிநிதியின் முதல் பெயர்
@@ -460,3 +462,6 @@ ExternalSystemID=External system ID
 IDOfPaymentInAnExternalSystem=ID of the payment mode into an external system (like Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE Webservice Credentials
 ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/ta_IN/compta.lang b/htdocs/langs/ta_IN/compta.lang
index d0f1003f3c9..88a3463bd49 100644
--- a/htdocs/langs/ta_IN/compta.lang
+++ b/htdocs/langs/ta_IN/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=வாடிக்கையாளர் விலைப
 PaymentSupplierInvoice=விற்பனையாளர் விலைப்பட்டியல் கட்டணம்
 PaymentSocialContribution=சமூக/நிதி வரி செலுத்துதல்
 PaymentVat=VAT செலுத்துதல்
-AutomaticCreationPayment=கட்டணத்தை தானாக பதிவு செய்யவும்
+AutomaticCreationPayment=Also record the payment
 ListPayment=கொடுப்பனவுகளின் பட்டியல்
 ListOfCustomerPayments=வாடிக்கையாளர் கொடுப்பனவுகளின் பட்டியல்
 ListOfSupplierPayments=விற்பனையாளர் கொடுப்பனவுகளின் பட்டியல்
@@ -118,10 +118,14 @@ SocialContributionsPayments=சமூக/நிதி வரி செலுத
 ShowVatPayment=VAT கட்டணத்தைக் காட்டு
 TotalToPay=செலுத்த வேண்டிய மொத்தம்
 BalanceVisibilityDependsOnSortAndFilters=அட்டவணை %s இல் வரிசைப்படுத்தப்பட்டு 1 வங்கிக் கணக்கில் வடிகட்டப்பட்டால் மட்டுமே இந்த பட்டியலில் இருப்பு தெரியும் (வேறு வடிப்பான்கள் இல்லாமல்)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=வாடிக்கையாளர் கணக்கியல் குறியீடு
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=விற்பனையாளர் கணக்கியல் குறியீடு
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=கஸ்ட். கணக்கு. குறியீடு
 SupplierAccountancyCodeShort=சுப். கணக்கு. குறியீடு
+UserAccountancyCodeShort=User account. code
 AccountNumber=கணக்கு எண்
 NewAccountingAccount=புதிய கணக்கு
 Turnover=விற்றுமுதல் விலைப்பட்டியல்
@@ -129,7 +133,9 @@ TurnoverCollected=விற்றுமுதல் சேகரிக்கப
 SalesTurnoverMinimum=குறைந்தபட்ச வருவாய்
 ByExpenseIncome=செலவுகள் மற்றும் வருமானம் மூலம்
 ByThirdParties=மூன்றாம் தரப்பினரால்
+ByProjects=By projects
 ByUserAuthorOfInvoice=விலைப்பட்டியல் ஆசிரியர் மூலம்
+DetailedListLowercase=detailed list
 CheckReceipt=Deposit slip
 CheckReceiptShort=Deposit slip
 LastCheckReceiptShort=Latest %s deposit slips
diff --git a/htdocs/langs/ta_IN/errors.lang b/htdocs/langs/ta_IN/errors.lang
index 0eee8d3f996..f16a361eb86 100644
--- a/htdocs/langs/ta_IN/errors.lang
+++ b/htdocs/langs/ta_IN/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=கோப்பகத்தை உருவாக்குவதில் தோல்வி. Dolibarr ஆவணங்கள் கோப்பகத்தில் எழுத இணைய சேவையக பயனருக்கு அனுமதி உள்ளதா என சரிபார்க்கவும். இந்த PHP இல் அளவுரு <b> safe_mode </b> இயக்கப்பட்டிருந்தால், Dolibarr php கோப்புகள் இணைய சேவையக பயனருக்கு (அல்லது குழுவிற்கு) சொந்தமானதா என சரிபார்க்கவும்.
 ErrorNoMailDefinedForThisUser=இந்தப் பயனருக்கு அஞ்சல் எதுவும் வரையறுக்கப்படவில்லை
 ErrorSetupOfEmailsNotComplete=மின்னஞ்சல்களின் அமைவு முழுமையடையவில்லை
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=This feature needs JavaScript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0='டாப்' வகை மெனுவில் பெற்றோர் மெனு இருக்கக்கூடாது. பெற்றோர் மெனுவில் 0 ஐ வைக்கவும் அல்லது 'இடது' வகை மெனுவைத் தேர்ந்தெடுக்கவும்.
 ErrorLeftMenuMustHaveAParentId='இடது' வகை மெனுவில் பெற்றோர் ஐடி இருக்க வேண்டும்.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=PHP/Apache செருகுநிரலால் ப
 ErrorFileSizeTooLarge=File size is too large or file not provided.
 ErrorFieldTooLong=புலம் %s மிக நீளமாக உள்ளது.
 ErrorSizeTooLongForIntType=முழு எண்ணாக அளவு மிக நீளமானது (அதிகபட்சம் %s இலக்கங்கள்)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=சரம் வகைக்கு மிக நீளமான அளவு (%s எழுத்துகள் அதிகபட்சம்)
 ErrorNoValueForSelectType=தேர்ந்தெடுக்கப்பட்ட பட்டியலுக்கான மதிப்பை நிரப்பவும்
 ErrorNoValueForCheckBoxType=தேர்வுப்பெட்டி பட்டியலுக்கு மதிப்பை நிரப்பவும்
@@ -138,8 +140,9 @@ ErrorBadValueForCode=பாதுகாப்பு குறியீட்ட
 ErrorBothFieldCantBeNegative=புலங்கள் %s மற்றும் %s இரண்டும் எதிர்மறையாக இருக்க முடியாது
 ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in third-party card) and apply it to the invoice.
 ErrorLinesCantBeNegativeForOneVATRate=கொடுக்கப்பட்ட பூஜ்ய அல்லாத VAT விகிதத்திற்கு மொத்த வரிகள் (வரியின் நிகரம்) எதிர்மறையாக இருக்க முடியாது (VAT விகிதம் <b> %s </b> %% க்கு எதிர்மறை மொத்தம் உள்ளது).
-ErrorLinesCantBeNegativeOnDeposits=டெபாசிட்டில் கோடுகள் எதிர்மறையாக இருக்கக்கூடாது. நீங்கள் அவ்வாறு செய்தால், இறுதி விலைப்பட்டியலில் வைப்புத்தொகையை உட்கொள்ள வேண்டியிருக்கும் போது நீங்கள் சிக்கல்களைச் சந்திக்க நேரிடும்.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=வாடிக்கையாளர் இன்வாய்ஸில் உள்ள வரியின் அளவு எதிர்மறையாக இருக்கக்கூடாது
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=இணையச் சேவையகத்தை இயக்கப் பயன்படுத்தப்படும் <b> %s </b> என்ற கணக்கிற்கு அதற்கான அனுமதி இல்லை
 ErrorNoActivatedBarcode=பார்கோடு வகை எதுவும் செயல்படுத்தப்படவில்லை
 ErrUnzipFails=ZipArchive மூலம் %s ஐ அன்சிப் செய்ய முடியவில்லை
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=உங்கள் PHP அளவுரு upload_max_filesize (%s) PHP அளவுரு post_max_size (%s) ஐ விட அதிகமாக உள்ளது. இது ஒரு நிலையான அமைப்பு அல்ல.
 WarningPasswordSetWithNoAccount=இந்த உறுப்பினருக்கு கடவுச்சொல் அமைக்கப்பட்டது. இருப்பினும், பயனர் கணக்கு எதுவும் உருவாக்கப்படவில்லை. எனவே இந்த கடவுச்சொல் சேமிக்கப்பட்டுள்ளது ஆனால் Dolibarr இல் உள்நுழைய பயன்படுத்த முடியாது. இது ஒரு வெளிப்புற தொகுதி/இடைமுகத்தால் பயன்படுத்தப்படலாம், ஆனால் ஒரு உறுப்பினருக்கான உள்நுழைவு அல்லது கடவுச்சொல்லை நீங்கள் வரையறுக்கத் தேவையில்லை என்றால், உறுப்பினர் தொகுதி அமைப்பிலிருந்து "ஒவ்வொரு உறுப்பினருக்கும் ஒரு உள்நுழைவை நிர்வகி" விருப்பத்தை நீங்கள் முடக்கலாம். நீங்கள் உள்நுழைவை நிர்வகிக்க வேண்டும் ஆனால் கடவுச்சொல் எதுவும் தேவையில்லை என்றால், இந்த எச்சரிக்கையைத் தவிர்க்க இந்தப் புலத்தை காலியாக வைத்திருக்கலாம். குறிப்பு: உறுப்பினர் ஒரு பயனருடன் இணைக்கப்பட்டிருந்தால், மின்னஞ்சலை உள்நுழைவாகவும் பயன்படுத்தலாம்.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR invoice can only be added on invoices set to be paid with credit transfer payments.
 SwissQrCreditorAddressInvalid = Creditor address is invalid (are ZIP and city set? (%s)
 SwissQrCreditorInformationInvalid = Creditor information is invalid for IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/ta_IN/exports.lang b/htdocs/langs/ta_IN/exports.lang
index 6adb51331b1..5def1560476 100644
--- a/htdocs/langs/ta_IN/exports.lang
+++ b/htdocs/langs/ta_IN/exports.lang
@@ -46,10 +46,16 @@ LineLabel=வரியின் லேபிள்
 LineDescription=வரியின் விளக்கம்
 LineUnitPrice=வரியின் அலகு விலை
 LineVATRate=வரியின் VAT விகிதம்
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=வரிக்கான அளவு
 LineTotalHT=தவிர தொகை. வரிக்கான வரி
 LineTotalTTC=வரியுடன் கூடிய தொகை
 LineTotalVAT=வரிக்கான VAT தொகை
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=வரி வகை (0=தயாரிப்பு, 1=சேவை)
 FileWithDataToImport=இறக்குமதி செய்ய தரவு கொண்ட கோப்பு
 FileToImport=இறக்குமதி செய்வதற்கான மூலக் கோப்பு
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=இறக்குமதி கோப்பு வட
 ChooseFileToImport=கோப்பைப் பதிவேற்றவும், பின்னர் கோப்பை மூல இறக்குமதி கோப்பாக தேர்ந்தெடுக்க %s ஐகானைக் கிளிக் செய்யவும்...
 SourceFileFormat=மூல கோப்பு வடிவம்
 FieldsInSourceFile=மூலக் கோப்பில் உள்ள புலங்கள்
-FieldsInTargetDatabase=டோலிபார் தரவுத்தளத்தில் இலக்கு புலங்கள் (தடித்த = கட்டாயம்)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=புலங்கள் இல்லை
 MoveField=புல நெடுவரிசை எண் %s ஐ நகர்த்தவும்
 ExampleOfImportFile=இறக்குமதி_கோப்பின்_எடுத்துக்காட்டு
@@ -76,8 +82,8 @@ NowClickToTestTheImport=உங்கள் கோப்பின் கோப்
 RunSimulateImportFile=இறக்குமதி உருவகப்படுத்துதலை இயக்கவும்
 FieldNeedSource=இந்தப் புலத்திற்கு மூலக் கோப்பிலிருந்து தரவு தேவை
 SomeMandatoryFieldHaveNoSource=சில கட்டாயப் புலங்களில் தரவுக் கோப்பிலிருந்து எந்த ஆதாரமும் இல்லை
-InformationOnSourceFile=மூல கோப்பு பற்றிய தகவல்
-InformationOnTargetTables=இலக்கு புலங்கள் பற்றிய தகவல்
+InformationOnSourceFile=Source file
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=ஏற்றுமதி செய்ய புலங்களின் நெடுவரிசையில் குறைந்தபட்சம் ஒரு மூலப் புலத்தை மாற்றவும்
 SelectFormat=இந்த இறக்குமதி கோப்பு வடிவமைப்பைத் தேர்ந்தெடுக்கவும்
 RunImportFile=தரவு இறக்குமதி
diff --git a/htdocs/langs/ta_IN/hrm.lang b/htdocs/langs/ta_IN/hrm.lang
index 43464780b36..174af9135c3 100644
--- a/htdocs/langs/ta_IN/hrm.lang
+++ b/htdocs/langs/ta_IN/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=Required rank for the job profile
-RequiredRankShort=Required rank
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Positions with this job profiles
-EmployeeRank=இந்த திறமைக்கான பணியாளர் தரவரிசை
-EmployeeRankShort=Employee rank
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=பணியாளர் நிலை
 EmployeePositions=பணியாளர் பதவிகள்
 EmployeesInThisPosition=இந்த நிலையில் உள்ள ஊழியர்கள்
@@ -72,6 +72,9 @@ AddSkill=Add skills to job profile
 RequiredSkills=Required skills for this job profile
 UserRank=பயனர் தரவரிசை
 SkillList=திறன் பட்டியல்
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=தரத்தை சேமிக்கவும்
 TypeKnowHow=Know-how
 TypeHowToBe=How to be
@@ -95,3 +98,5 @@ NeedBusinessTravels=Need business travels
 NoDescription=No description
 TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/ta_IN/mails.lang b/htdocs/langs/ta_IN/mails.lang
index 7e99b291c0a..287ac94b273 100644
--- a/htdocs/langs/ta_IN/mails.lang
+++ b/htdocs/langs/ta_IN/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=மின்னஞ்சல் அனுப்புதல்
 EMailing=மின்னஞ்சல் அனுப்புதல்
-EMailings=மின்னஞ்சல்கள்
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=அனைத்து மின்னஞ்சல்களும்
+AllEMailings=All mass eMails
 MailCard=மின்னஞ்சல் அட்டை
 MailRecipients=பெற்றவர்கள்
 MailRecipient=பெறுபவர்
@@ -26,17 +26,19 @@ MailFile=இணைக்கப்பட்ட கோப்புகள்
 MailMessage=மின்னஞ்சல் உடல்
 SubjectNotIn=பாடத்தில் இல்லை
 BodyNotIn=உடலில் இல்லை
-ShowEMailing=மின்னஞ்சலைக் காட்டு
-ListOfEMailings=மின்னஞ்சல்களின் பட்டியல்
-NewMailing=புதிய மின்னஞ்சல்
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=மின்னஞ்சலைத் திருத்தவும்
-ResetMailing=மின்னஞ்சலை மீண்டும் அனுப்பவும்
-DeleteMailing=மின்னஞ்சலை நீக்கு
-PreviewMailing=மின்னஞ்சலின் முன்னோட்டம்
-CreateMailing=மின்னஞ்சலை உருவாக்கவும்
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=சரியான மின்னஞ்சல்
+ValidMailing=Valid mass Email
 MailingStatusDraft=வரைவு
 MailingStatusValidated=சரிபார்க்கப்பட்டது
 MailingStatusSent=அனுப்பப்பட்டது
@@ -53,6 +55,7 @@ ErrorMailRecipientIsEmpty=மின்னஞ்சல் பெறுநர் 
 WarningNoEMailsAdded=பெறுநரின் பட்டியலில் சேர்க்க புதிய மின்னஞ்சல் எதுவும் இல்லை.
 ConfirmValidMailing=இந்த மின்னஞ்சலை நிச்சயமாக சரிபார்க்க விரும்புகிறீர்களா?
 ConfirmResetMailing=எச்சரிக்கை, <b> %s </b> மின்னஞ்சலை மீண்டும் தொடங்குவதன் மூலம், இந்த மின்னஞ்சலை மொத்தமாக அஞ்சல் மூலம் மீண்டும் அனுப்ப அனுமதிப்பீர்கள். நிச்சயமாக இதைச் செய்ய விரும்புகிறீர்களா?
+ConfirmResetMailingTargetMassactionQuestion=Are you sure you want to reset the status of the selected recipients (this may means that email will be resent if you use the Send email feature of the emailing) ?
 ConfirmDeleteMailing=இந்த மின்னஞ்சலை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
 NbOfUniqueEMails=தனிப்பட்ட மின்னஞ்சல்களின் எண்ணிக்கை
 NbOfUniquePhones=No. of unique phones
@@ -105,24 +108,24 @@ EmailCollectorFilterDesc=All filters must match to have an email being collected
 LineInFile=கோப்பில் %s வரி
 RecipientSelectionModules=பெறுநரின் தேர்வுக்கான வரையறுக்கப்பட்ட கோரிக்கைகள்
 MailSelectedRecipients=தேர்ந்தெடுக்கப்பட்ட பெறுநர்கள்
-MailingArea=மின்னஞ்சல்கள் பகுதி
-LastMailings=சமீபத்திய %s மின்னஞ்சல்கள்
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=இலக்கு புள்ளிவிவரங்கள்
 NbOfCompaniesContacts=தனிப்பட்ட தொடர்புகள்/முகவரிகள்
 MailNoChangePossible=சரிபார்க்கப்பட்ட மின்னஞ்சலுக்கான பெறுநர்களை மாற்ற முடியாது
-SearchAMailing=அஞ்சல் தேடு
-SendMailing=மின்னஞ்சல் அனுப்பவும்
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=மூலம் அனுப்பப்பட்டது
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=மின்னஞ்சலை அனுப்புவது கட்டளை வரியிலிருந்து செய்யப்படலாம். அனைத்து பெறுநர்களுக்கும் மின்னஞ்சலை அனுப்ப பின்வரும் கட்டளையைத் தொடங்க உங்கள் சேவையக நிர்வாகியிடம் கேளுங்கள்:
 MailingNeedCommand2=இருப்பினும் MAILING_LIMIT_SENDBYWEB என்ற அளவுருவை சேர்ப்பதன் மூலம் அவற்றை ஆன்லைனில் அனுப்பலாம். இதற்கு, Home - Setup - Other என்பதற்குச் செல்லவும்.
 ConfirmSendingEmailing=இந்தத் திரையில் இருந்து நேரடியாக மின்னஞ்சலை அனுப்ப விரும்பினால், உங்கள் உலாவியில் இருந்து இப்போது மின்னஞ்சல் அனுப்ப விரும்புகிறீர்களா?
-LimitSendingEmailing=குறிப்பு: இணைய இடைமுகத்திலிருந்து மின்னஞ்சல்களை அனுப்புவது பாதுகாப்பு மற்றும் காலாவதியான காரணங்களுக்காக பல முறை செய்யப்படுகிறது, ஒவ்வொரு அனுப்பும் அமர்வுக்கும் ஒரு நேரத்தில் <b> %s </b> பெறுநர்கள்.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=பட்டியலை அழிக்க
 ToClearAllRecipientsClickHere=இந்த மின்னஞ்சலுக்கான பெறுநர் பட்டியலை அழிக்க இங்கே கிளிக் செய்யவும்
 ToAddRecipientsChooseHere=பட்டியல்களில் இருந்து தேர்ந்தெடுப்பதன் மூலம் பெறுநர்களைச் சேர்க்கவும்
-NbOfEMailingsReceived=பெருமளவில் மின்னஞ்சல்கள் வந்தன
-NbOfEMailingsSend=வெகுஜன மின்னஞ்சல்கள் அனுப்பப்பட்டன
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=அடையாள பதிவு
 DeliveryReceipt=டெலிவரி அக்.
 YouCanUseCommaSeparatorForSeveralRecipients=பல பெறுநர்களைக் குறிப்பிட <b> காற்புள்ளி </b> பிரிப்பானைப் பயன்படுத்தலாம்.
@@ -139,8 +142,10 @@ NoNotificationsWillBeSent=இந்த நிகழ்வு வகை மற்
 ANotificationsWillBeSent=1 தானியங்கி அறிவிப்பு மின்னஞ்சல் மூலம் அனுப்பப்படும்
 SomeNotificationsWillBeSent=%s தானியங்கி அறிவிப்புகள் மின்னஞ்சல் மூலம் அனுப்பப்படும்
 AddNewNotification=புதிய தானியங்கி மின்னஞ்சல் அறிவிப்புக்கு குழுசேரவும் (இலக்கு/நிகழ்வு)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=மின்னஞ்சல் அனுப்புவதற்கான உள்ளமைவு '%s' க்கு அமைக்கப்பட்டுள்ளது. வெகுஜன மின்னஞ்சலை அனுப்ப இந்தப் பயன்முறையைப் பயன்படுத்த முடியாது.
 MailSendSetupIs2=<strong> '%s' <strong>' a0a65fz0' a0a65fc070 இந்த பயன்முறையில், உங்கள் இணைய சேவை வழங்குநரால் வழங்கப்பட்ட SMTP சேவையகத்தின் அமைப்பை உள்ளிடலாம் மற்றும் மாஸ் மின்னஞ்சல் அம்சத்தைப் பயன்படுத்தலாம்.
 MailSendSetupIs3=உங்கள் SMTP சேவையகத்தை எவ்வாறு அமைப்பது என்பது குறித்து ஏதேனும் கேள்விகள் இருந்தால், நீங்கள் %s ஐக் கேட்கலாம்.
@@ -180,7 +185,7 @@ Information=தகவல்
 ContactsWithThirdpartyFilter=மூன்றாம் தரப்பு வடிப்பானுடன் தொடர்புகள்
 Unanswered=பதில் இல்லை
 Answered=பதிலளித்தார்
-IsNotAnAnswer=பதில் இல்லை (ஆரம்ப மின்னஞ்சல்)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=ஆரம்ப மின்னஞ்சலின் பதில்
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=புதிய தொடர்பை உருவாக்கும் போது '%s' புலத்திற்கான இயல்பு மதிப்பு
@@ -190,11 +195,12 @@ NoMoreRecipientToSendTo=No more recipient to send the email to
 EmailOptedOut=Email owner has requested to not contact him with this email anymore
 EvenUnsubscribe=Include opt-out emails
 EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Useful for mandatory service emails for example.
-XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s operations done)
 YouCanMakeSomeInstructionForEmail=You can make some instructions for your Email (Example: generate image in email template...)
 ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
+ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/ta_IN/main.lang b/htdocs/langs/ta_IN/main.lang
index ec1573e9e95..cc7eaed8529 100644
--- a/htdocs/langs/ta_IN/main.lang
+++ b/htdocs/langs/ta_IN/main.lang
@@ -37,6 +37,7 @@ Translation=மொழிபெயர்ப்பு
 Translations=Translations
 CurrentTimeZone=நேர மண்டல PHP (சர்வர்)
 EmptySearchString=Enter non empty search criteria
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=தேதி அளவுகோலை உள்ளிடவும்
 NoRecordFound=பதிவு எதுவும் கிடைக்கவில்லை
 NoRecordDeleted=பதிவு எதுவும் நீக்கப்படவில்லை
@@ -45,6 +46,7 @@ NoError=பிழை இல்லை
 Error=பிழை
 Errors=பிழைகள்
 ErrorFieldRequired=புலம் '%s' தேவை
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=புலம் '%s' மோசமான மதிப்பைக் கொண்டுள்ளது
 ErrorFileDoesNotExists=கோப்பு %s இல்லை
 ErrorFailedToOpenFile=%s கோப்பைத் திறக்க முடியவில்லை
@@ -308,6 +310,7 @@ DateBuild=உருவாக்க தேதியை தெரிவிக்
 DatePayment=பணம் செலுத்தும் தேதி
 DateApprove=அங்கீகரிக்கும் தேதி
 DateApprove2=ஒப்புதல் தேதி (இரண்டாவது ஒப்புதல்)
+PendingSince=Pending since
 RegistrationDate=பதிவு தேதி
 UserCreation=உருவாக்கும் பயனர்
 UserModification=மாற்றியமைக்கும் பயனர்
@@ -495,7 +498,7 @@ ActionRunningNotStarted=தொடங்க
 ActionRunningShort=நடந்து கொண்டிருக்கிறது
 ActionDoneShort=முடிந்தது
 ActionUncomplete=முழுமையற்றது
-LatestLinkedEvents=சமீபத்திய %s இணைக்கப்பட்ட நிகழ்வுகள்
+LatestLinkedEvents=The last %s events
 CompanyFoundation=நிறுவனம்/நிறுவனம்
 Accountant=கணக்காளர்
 ContactsForCompany=இந்த மூன்றாம் தரப்பினருக்கான தொடர்புகள்
@@ -503,6 +506,7 @@ ContactsAddressesForCompany=இந்த மூன்றாம் தரப்
 AddressesForCompany=இந்த மூன்றாம் தரப்பினருக்கான முகவரிகள்
 ActionsOnCompany=இந்த மூன்றாம் தரப்பினருக்கான நிகழ்வுகள்
 ActionsOnContact=இந்த தொடர்பு/முகவரிக்கான நிகழ்வுகள்
+ActionsOnUser=Events for this user
 ActionsOnContract=இந்த ஒப்பந்தத்திற்கான நிகழ்வுகள்
 ActionsOnMember=இந்த உறுப்பினரைப் பற்றிய நிகழ்வுகள்
 ActionsOnProduct=இந்த தயாரிப்பு பற்றிய நிகழ்வுகள்
@@ -720,6 +724,8 @@ TextUsedInTheMessageBody=மின்னஞ்சல் உடல்
 SendAcknowledgementByMail=உறுதிப்படுத்தல் மின்னஞ்சலை அனுப்பவும்
 SendMail=மின்னஞ்சல் அனுப்பு
 Email=மின்னஞ்சல்
+EMail=Email
+EMails=Emails
 NoEMail=மின்னஞ்சல் இல்லை
 AlreadyRead=ஏற்கனவே படித்தது
 NotRead=படிக்காதது
@@ -792,7 +798,7 @@ Notes=குறிப்புகள்
 AddNewLine=புதிய வரியைச் சேர்க்கவும்
 AddFile=கோப்பைச் சேர்க்கவும்
 FreeZone=இலவச உரை தயாரிப்பு
-FreeLineOfType=இலவச உரை உருப்படி, வகை:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=பொருளை அதன் முக்கிய பண்புகளுடன் குளோன் செய்யவும்
 ReGeneratePDF=PDF ஐ மீண்டும் உருவாக்கவும்
 PDFMerge=PDF இணைத்தல்
@@ -878,12 +884,14 @@ toward=நோக்கி
 Access=அணுகல்
 SelectAction=செயலைத் தேர்ந்தெடுக்கவும்
 SelectTargetUser=இலக்கு பயனர்/பணியாளரைத் தேர்ந்தெடுக்கவும்
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=கிளிப்போர்டுக்கு நகலெடுக்க Ctrl+C ஐப் பயன்படுத்தவும்
 SaveUploadedFileWithMask=" <strong> %s </strong> " (இல்லையெனில் "%s") என்ற பெயரில் கோப்பை சர்வரில் சேமிக்கவும்
 OriginFileName=அசல் கோப்பு பெயர்
 SetDemandReason=மூலத்தை அமைக்கவும்
 SetBankAccount=வங்கிக் கணக்கை வரையறுக்கவும்
 AccountCurrency=கணக்கு நாணயம்
+AccountancyCode=Accounting Code
 ViewPrivateNote=குறிப்புகளைப் பார்க்கவும்
 XMoreLines=%s வரி(கள்) மறைக்கப்பட்டுள்ளது
 ShowMoreLines=அதிக/குறைவான வரிகளைக் காட்டு
@@ -924,6 +932,7 @@ ConfirmMassDeletionQuestion=தேர்ந்தெடுத்த %s பதி
 ConfirmMassClone=Bulk clone confirmation
 ConfirmMassCloneQuestion=Select project to clone to
 ConfirmMassCloneToOneProject=Clone to project %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=தொடர்புடைய பொருள்கள்
 ClassifyBilled=Classify Billed
 ClassifyUnbilled=Classify Unbilled
@@ -960,10 +969,11 @@ PrivateDownloadLinkDesc=நீங்கள் உள்நுழைந்தி
 Download=பதிவிறக்க Tamil
 DownloadDocument=ஆவணத்தைப் பதிவிறக்கவும்
 DownloadSignedDocument=Download signed document
-ActualizeCurrency=நாணய விகிதத்தைப் புதுப்பிக்கவும்
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=நிதியாண்டு
 ModuleBuilder=தொகுதி மற்றும் பயன்பாட்டு பில்டர்
 SetMultiCurrencyCode=நாணயத்தை அமைக்கவும்
+SetMultiCurrencyRate=Set currency rate
 BulkActions=மொத்த செயல்பாடுகள்
 ClickToShowHelp=உதவிக்குறிப்பு உதவியைக் காட்ட கிளிக் செய்யவும்
 WebSite=இணையதளம்
@@ -1103,6 +1113,7 @@ PayedBy=மூலம் செலுத்தப்பட்டது
 PayedTo=செலுத்தப்பட்டது
 Monthly=மாதாந்திர
 Quarterly=காலாண்டு
+Quarter=Quarter
 Annual=ஆண்டு
 Local=உள்ளூர்
 Remote=ரிமோட்
@@ -1145,6 +1156,7 @@ ContactDefault_project_task=பணி
 ContactDefault_propal=முன்மொழிவு
 ContactDefault_supplier_proposal=சப்ளையர் முன்மொழிவு
 ContactDefault_ticket=டிக்கெட்
+ContactDefault_societe=Third party
 ContactAddedAutomatically=Contact added from third-party contact roles
 More=மேலும்
 ShowDetails=விவரங்களை காட்டு
@@ -1187,6 +1199,8 @@ SetSupervisor=Set the supervisor
 CreateExternalUser=வெளிப்புற பயனரை உருவாக்கவும்
 ConfirmAffectTag=Bulk Tag Assignment
 ConfirmAffectUser=Bulk User Assignment
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=Role assigned on each project/opportunity
 TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
@@ -1238,6 +1252,9 @@ CommercialsAffected=Sales representatives assigned
 CommercialAffected=Sales representative assigned
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=Your message
 YourMessageHasBeenReceived=Your message has been received. We will answer or contact you as soon as possible.
 UrlToCheck=Url to check
@@ -1280,6 +1297,7 @@ AmountSalary=Salary amount
 InvoiceSubtype=Invoice subtype
 ConfirmMassReverse=Bulk Reverse confirmation
 ConfirmMassReverseQuestion=Are you sure you want to reverse the %s selected record(s)?
+ConfirmActionXxx=Confirm action %s
 ElementType=Element type
 ElementId=Element Id
 Encrypted=Encrypted
@@ -1299,3 +1317,35 @@ AllEntities=All entities
 TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
+auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/ta_IN/members.lang b/htdocs/langs/ta_IN/members.lang
index 698a6d2affb..639a8095ca5 100644
--- a/htdocs/langs/ta_IN/members.lang
+++ b/htdocs/langs/ta_IN/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=If subscription is required, a subscription with a star
 DeleteType=அழி
 VoteAllowed=வாக்களிக்க அனுமதிக்கப்படுகிறது
 Physical=தனிப்பட்ட
-Moral=கழகம்
-MorAndPhy=நிறுவனம் மற்றும் தனிநபர்
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Re-enable
 ExcludeMember=ஒரு உறுப்பினரை விலக்கு
 Exclude=விலக்கு
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=பகுதி வாரியாக உறுப்
 NbOfMembers=மொத்த உறுப்பினர்களின் எண்ணிக்கை
 NbOfActiveMembers=தற்போதைய செயலில் உள்ள உறுப்பினர்களின் மொத்த எண்ணிக்கை
 NoValidatedMemberYet=சரிபார்க்கப்பட்ட உறுப்பினர்கள் இல்லை
-MembersByCountryDesc=இந்தத் திரையானது நாடுகளின் உறுப்பினர்களின் புள்ளிவிவரங்களைக் காட்டுகிறது. வரைபடங்கள் மற்றும் விளக்கப்படங்கள் Google ஆன்லைன் கிராஃப் சேவையின் கிடைக்கும் தன்மை மற்றும் வேலை செய்யும் இணைய இணைப்பின் கிடைக்கும் தன்மையைப் பொறுத்தது.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=இந்தத் திரை மாநிலம்/ மாகாணங்கள்/கண்டன் வாரியாக உறுப்பினர்களின் புள்ளிவிவரங்களைக் காட்டுகிறது.
 MembersByTownDesc=இந்தத் திரை நகர வாரியாக உறுப்பினர்களின் புள்ளிவிவரங்களைக் காட்டுகிறது.
 MembersByNature=இந்தத் திரையானது இயல்பிலேயே உறுப்பினர்களின் புள்ளிவிவரங்களைக் காட்டுகிறது.
@@ -208,25 +209,25 @@ NewMemberbyWeb=புதிய உறுப்பினர் சேர்க்
 NewMemberForm=புதிய உறுப்பினர் படிவம்
 SubscriptionsStatistics=பங்களிப்புகளின் புள்ளிவிவரங்கள்
 NbOfSubscriptions=பங்களிப்புகளின் எண்ணிக்கை
-AmountOfSubscriptions=பங்களிப்புகளிலிருந்து சேகரிக்கப்பட்ட தொகை
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=விற்றுமுதல் (ஒரு நிறுவனத்திற்கு) அல்லது பட்ஜெட் (ஒரு அடித்தளத்திற்கு)
-DefaultAmount=Default amount of contribution (used only if no amount is defined at member type level)
-MinimumAmount=Minimum amount (used only when contribution amount is free)
-CanEditAmount=Subscription amount can be defined by the member
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=Visitor can choose/edit amount of its contribution regardless of the member type
 AmountIsLowerToMinimumNotice=The amount is lower than the minimum %s
 MEMBER_NEWFORM_PAYONLINE=After the online registration, switch automatically to the online payment page
 ByProperties=இயற்கையாகவே
 MembersStatisticsByProperties=இயல்பிலேயே உறுப்பினர்களின் புள்ளிவிவரங்கள்
-VATToUseForSubscriptions=VAT rate to use for contributions
-NoVatOnSubscription=பங்களிப்புகளுக்கு VAT இல்லை
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=விலைப்பட்டியலில் பங்களிப்பு வரிசையில் பயன்படுத்தப்படும் தயாரிப்பு: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=பெயர் அல்லது நிறுவனம்
 SubscriptionRecorded=பங்களிப்பு பதிவு செய்யப்பட்டது
 NoEmailSentToMember=உறுப்பினருக்கு மின்னஞ்சல் அனுப்பப்படவில்லை
 EmailSentToMember=%s இல் உறுப்பினருக்கு மின்னஞ்சல் அனுப்பப்பட்டது
-SendReminderForExpiredSubscriptionTitle=காலாவதியான பங்களிப்புகளுக்கு மின்னஞ்சல் மூலம் நினைவூட்டல் அனுப்பவும்
-SendReminderForExpiredSubscription=Send reminder by email to members when contribution is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=தற்போதைய காலத்திற்கு (%s வரை) உறுப்பினர் செலுத்தப்பட்டது
 YouMayFindYourInvoiceInThisEmail=இந்த மின்னஞ்சலுடன் உங்கள் விலைப்பட்டியல் இணைக்கப்பட்டிருப்பதை நீங்கள் காணலாம்
 XMembersClosed=%s உறுப்பினர்(கள்) மூடப்பட்டது
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=A third party is the legal entity that will be used
 MemberFirstname=Member firstname
 MemberLastname=Member lastname
 MemberCodeDesc=Member Code, unique for all members
-MemberSubscriptionStartFirstDayOf=The start date of a membership corresponds to the first day of a
-MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a subscription except renewals (example +3m = +3 months, -5d = -5 days, +1Y = +1 year)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/ta_IN/website.lang b/htdocs/langs/ta_IN/website.lang
index ef34746ab85..a16b40949cd 100644
--- a/htdocs/langs/ta_IN/website.lang
+++ b/htdocs/langs/ta_IN/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=மற்ற பெயர்கள்/மாற்றுப
 WEBSITE_CSS_URL=வெளிப்புற CSS கோப்பின் URL
 WEBSITE_CSS_INLINE=CSS கோப்பு உள்ளடக்கம் (அனைத்து பக்கங்களுக்கும் பொதுவானது)
 WEBSITE_JS_INLINE=JavaScript file content (common to all pages)
-WEBSITE_HTML_HEADER=HTML தலைப்பின் கீழே சேர்த்தல் (அனைத்து பக்கங்களுக்கும் பொதுவானது)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=ரோபோ கோப்பு (robots.txt)
 WEBSITE_HTACCESS=வலைத்தளம் .htaccess கோப்பு
 WEBSITE_MANIFEST_JSON=இணையதளம் manifest.json கோப்பு
@@ -56,16 +56,17 @@ ReadPerm=படி
 WritePerm=எழுது
 TestDeployOnWeb=இணையத்தில் சோதனை/வரிசைப்படுத்து
 PreviewSiteServedByWebServer= <u> ஒரு புதிய தாவலில் %s முன்னோட்டம். </u> <br> <br> %s ஆனது வெளிப்புற இணைய சேவையகத்தால் (Apache, Nginx, IIS போன்றவை) வழங்கப்படும். டைரக்டரியில் புள்ளி முன்னர் இந்தப் சர்வர் நிறுவ வேண்டும் மற்றும் அமைப்பு: <br> <strong> %s </strong> <br> URL ஐ வெளி சர்வரில் சேவையாற்றி: <br> <strong> %s </strong>
-PreviewSiteServedByDolibarr= <u> %s ஐ புதிய தாவலில் முன்னோட்டமிடவும். </u> <br> <br> %s ஆனது Dolibarr சேவையகத்தால் வழங்கப்படும், எனவே இதற்கு எந்த கூடுதல் இணைய சேவையகமும் (Apache, Nginx, IIS போன்றவை) நிறுவப்பட வேண்டியதில்லை. <br> பக்கங்களின் URLகள் பயனர்களுக்கு ஏற்றதாக இல்லை மற்றும் உங்கள் Dolibarrன் பாதையில் தொடங்குவது சிரமமானது. <br> URL ஐ Dolibarr சேவையாற்றி: <br> <strong> %s </strong> <br> <br>, இந்த வலை தளத்தில் பணியாற்ற உங்கள் வலை சர்வரில் ஒரு மெய்நிகர் ஹோஸ்ட் உருவாக்க உங்கள் சொந்த வெளிப்புற வலை சர்வர் பயன்படுத்த என்று அடைவு புள்ளிகள் <br> <strong> %s </strong> <br> பின்னர் இந்த மெய்நிகர் சர்வர் பெயரை உள்ளிடவும் இந்த வலைத்தளத்தின் பண்புகளில் "சோதனை/இணையத்தில் வரிசைப்படுத்து" என்ற இணைப்பைக் கிளிக் செய்யவும்.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=வெளிப்புற வலை சேவையகத்தால் வழங்கப்படும் மெய்நிகர் ஹோஸ்டின் URL வரையறுக்கப்படவில்லை
 NoPageYet=இன்னும் பக்கங்கள் இல்லை
 YouCanCreatePageOrImportTemplate=நீங்கள் ஒரு புதிய பக்கத்தை உருவாக்கலாம் அல்லது முழு இணையதள டெம்ப்ளேட்டை இறக்குமதி செய்யலாம்
 SyntaxHelp=குறிப்பிட்ட தொடரியல் உதவிக்குறிப்புகளில் உதவி
 YouCanEditHtmlSourceckeditor=எடிட்டரில் உள்ள "மூல" பொத்தானைப் பயன்படுத்தி HTML மூலக் குறியீட்டைத் திருத்தலாம்.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=<br> <strong> &lt;img மூல = "? / viewimage.php hashp = 12345679012 ..." &gt; </strong> <br>: (கோப்பு பகிர்வு ஹாஷ் முக்கிய பயன்படுத்தி திறந்தவெளி அணுகல்) ஒரு பங்கு இணைப்புடன் பகிர்ந்துள்ளார் ஒரு படத்திற்கு, தொடரியலாகும்
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=குளோன் பக்கம்/கன்டெய்னர்
 CloneSite=குளோன் தளம்
@@ -87,15 +88,15 @@ WebsiteAccount=இணையதள கணக்கு
 WebsiteAccounts=இணையதள கணக்குகள்
 AddWebsiteAccount=இணைய தள கணக்கை உருவாக்கவும்
 BackToListForThirdParty=Back to list for the third parties
-DisableSiteFirst=முதலில் இணையதளத்தை முடக்கவும்
+DisableSiteFirst=Put website offline first
 MyContainerTitle=எனது வலைதள தலைப்பு
 AnotherContainer=மற்றொரு பக்கம்/கன்டெய்னரின் உள்ளடக்கத்தைச் சேர்ப்பது இப்படித்தான் (உட்பொதிக்கப்பட்ட துணைக் கொள்கலன் இல்லாததால், டைனமிக் குறியீட்டை இயக்கினால், இங்கே பிழை ஏற்படலாம்)
 SorryWebsiteIsCurrentlyOffLine=மன்னிக்கவும், இந்த இணையதளம் தற்போது ஆஃப்லைனில் உள்ளது. தயவுசெய்து பிறகு வாருங்கள்...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=ஒவ்வொரு இணையதளம் / மூன்றாம் தரப்பினருக்கும் இணைய தள கணக்குகளை (உள்நுழைவு/பாஸ்) சேமிக்க அட்டவணையை இயக்கவும்
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=நீங்கள் முதலில் இயல்புநிலை முகப்புப் பக்கத்தை வரையறுக்க வேண்டும்
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correctty when used on a grabbed external page.
-OnlyEditionOfSourceForGrabbedContent=வெளிப்புற தளத்தில் இருந்து உள்ளடக்கம் கைப்பற்றப்பட்டால் HTML மூலத்தின் பதிப்பு மட்டுமே சாத்தியமாகும்
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=css மற்றும் பக்கத்தில் காணப்படும் படங்களையும் கைப்பற்றவும்.
 ImagesShouldBeSavedInto=படங்கள் கோப்பகத்தில் சேமிக்கப்பட வேண்டும்
 WebsiteRootOfImages=இணையதளப் படங்களுக்கான ரூட் டைரக்டரி
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Remove filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Categories
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/tg_TJ/admin.lang b/htdocs/langs/tg_TJ/admin.lang
index ed58b40c9d5..e015de02c6f 100644
--- a/htdocs/langs/tg_TJ/admin.lang
+++ b/htdocs/langs/tg_TJ/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Санҷиши ягонагии файлҳо
 FileIntegritySomeFilesWereRemovedOrModified=Санҷиши ягонагии файлҳо ноком шуд. Баъзе файлҳо тағир дода шуданд, хориҷ карда шуданд ё илова карда шуданд.
 GlobalChecksum=Маблағи умумии глобалӣ
 MakeIntegrityAnalysisFrom=Таҳлили беайбии файлҳои барномаро аз
-LocalSignature=Имзои дохилии маҳаллӣ (камтар боэътимод)
-RemoteSignature=Имзои дурдаст (боэътимодтар)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Файлҳои гумшуда
 FilesUpdated=Файлҳои навшуда
 FilesModified=Файлҳои тағирёфта
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Танҳо аз ҷониби баъзе вариантҳ
 Security=Амният
 Passwords=Рамзҳо
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Рамзи махзани маълумотро, ки дар conf.php захира шудааст, рамзгузорӣ кунед. Тавсия дода мешавад, ки ин хосият фаъол карда шавад.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=Барои доштани рамз ба файли <b> conf.php </b>, хати <br> <b> $ dolibarr_main_db_pass = "..." иваз кунед </b> <br> аз ҷониби <br> <b> $ dolibarr_main_db_pass = "рамзгузорӣ: %s"; </b>
 InstrucToClearPass=Барои рамзкушоӣ кардани парол ба файли <b> conf.php </b>, хати <br> <b> $ dolibarr_main_db_pass = "рамзгузорӣ шудааст: ..."; </b> <br> аз ҷониби <br> <b> $ dolibarr_main_db_pass = "%s"; </b>
 ProtectAndEncryptPdfFiles=Файлҳои PDF -и тавлидшударо ҳифз кунед. Ин тавсия дода намешавад, зеро он насли PDF -ро вайрон мекунад.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Майдони ҳисобшуда
-ComputedFormulaDesc=Шумо метавонед дар ин ҷо формуларо бо истифода аз дигар хосиятҳои объект ё ягон рамзгузории PHP ворид кунед, то арзиши ҳисобшудаи динамикӣ гиред. Шумо метавонед ҳама гуна формулаҳои мувофиқи PHP-ро истифода баред, аз ҷумла "?" оператори шарт ва объекти глобалии зерин: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>Огоҳӣ</strong> аз: Агар ба шумо хосиятҳои объект лозим бошад бор карда нашудааст, танҳо объектро ба формулаи худ ба мисли мисоли дуюм ворид кунед.<br>Истифодаи майдони ҳисобшуда маънои онро дорад, ки шумо наметавонед ба худ ягон арзишро аз интерфейс ворид кунед. Инчунин, агар хатогии синтаксис мавҷуд бошад, формула наметавонад чизе баргардонад.<br><br>Намунаи формула:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Мисол барои аз нав боркунии объект<br>(($reloadedobj = New Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey']j $- >capital / 5: '-1')<br><br>Дигар намунаи формула барои маҷбур кардани сарбории объект ва объекти волидайни он: <br>(($reloadedobj = Вазифаи нав($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = Лоиҳаи нав( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Лоиҳаи волидайн ёфт нашуд'
+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'
 Computedpersistent=Майдони ҳисобшударо захира кунед
 ComputedpersistentDesc=Майдонҳои иловагии ҳисобшуда дар пойгоҳи додаҳо нигоҳ дошта мешаванд, аммо арзиши он танҳо ҳангоми тағир додани объекти ин майдон аз нав ҳисоб карда мешавад. Агар майдони ҳисобшуда аз дигар объектҳо ё маълумоти глобалӣ вобаста бошад, ин арзиш метавонад хато бошад !!
 ExtrafieldParamHelpPassword=Хол мондани ин майдон маънои онро дорад, ки ин арзиш БЕ рамзгузорӣ нигоҳ дошта мешавад (майдон танҳо бо ситораҳо дар экран пинҳон аст).<br><br>Ворид кунед арзиши 'dolcrypt' барои рамзгузории арзиш бо алгоритми рамзгузории баръакс. Маълумоти тозаро ҳоло ҳам метавон маълум ва таҳрир кард, аммо дар базаи маълумот рамзгузорӣ карда мешавад.<br><br>Ворид кунед 'auto' (ё 'md5', 'sha256', 'password_hash', ...) барои истифода аз алгоритми рамзгузории пешфарз парол (ё md5, sha256, password_hash...) барои захира кардани пароли ҳашеии бебозгашт дар пойгоҳи додаҳо (ҳеҷ роҳе барои дарёфти арзиши аслӣ вуҷуд надорад)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Истифодаи сервери SMTP -и провайдери хидматрасони почтаи электронии худ барои фиристодани мактубҳо низ ҷолиб аст, аз ин рӯ ҳамаи мактубҳои аз барнома фиристодашуда низ дар феҳристи "Ирсолшуда" -и қуттии почтаи шумо сабт карда мешаванд.
 WarningPHPMailD=Аз ин рӯ, тавсия дода мешавад, ки усули фиристодани паёмҳои электронӣ ба арзиши "SMTP" иваз карда шавад.
 WarningPHPMailDbis=Агар шумо дар ҳақиқат хоҳед, ки усули пешфарзии "PHP"-ро барои ирсоли паёмҳо нигоҳ доред, танҳо ин огоҳиро сарфи назар кунед ё онро бо %s клик кардани ин ҷо%s.
-WarningPHPMail2=Агар провайдери SMTP -и почтаи электронии шумо бояд муштарии почтаи электрониро бо баъзе суроғаҳои IP маҳдуд кунад (хеле кам), ин суроғаи IP -и агенти корбари почта (MUA) барои барномаи ERP CRM -и шумост: <strong> %s </strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Баҳисобгирии муҳосибӣ (соддакардашу
 Module10Desc=Ҳисоботи оддии баҳисобгирӣ (маҷаллаҳо, гардиш) дар асоси мундариҷаи пойгоҳи додаҳо. Ягон мизи дафтарро истифода намебарад.
 Module20Name=Пешниҳодҳо
 Module20Desc=Идоракунии пешниҳоди тиҷоратӣ
-Module22Name=Паёмҳои оммавӣ
-Module22Desc=Почтаи электронии калонро идора кунед
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Энергетика
 Module23Desc=Мониторинги истеъмоли энергия
 Module25Name=Фармоишҳои фурӯш
@@ -847,10 +848,10 @@ Permission212=Хатҳои фармоиш
 Permission213=Хати фаъол кунед
 Permission214=Танзими телефония
 Permission215=Таъминкунандагони танзим
-Permission221=Паёмҳои электрониро хонед
-Permission222=Эҷод/тағир додани почтаи электронӣ (мавзӯъ, гирандагон ...)
-Permission223=Почтаи электрониро тасдиқ кунед (фиристоданро иҷозат медиҳад)
-Permission229=Почтаи электрониро нест кунед
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Дидани гирандагон ва маълумот
 Permission238=Паёмҳоро ба таври дастӣ фиристед
 Permission239=Паёмҳоро пас аз тасдиқ ё нест кардан нест кунед
@@ -1105,6 +1106,7 @@ DictionaryStaff=Шумораи кормандон
 DictionaryAvailability=Таъхир
 DictionaryOrderMethods=Усулҳои фармоиш
 DictionarySource=Пайдоиши пешниҳодҳо/фармоишҳо
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Гурӯҳҳои инфиродӣ барои гузоришҳо
 DictionaryAccountancysystem=Моделҳо барои нақшаи ҳисобҳо
 DictionaryAccountancyJournal=Маҷаллаҳои баҳисобгирӣ
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Бозгашт ба рӯйхати луғатҳо
 TypeOfRevenueStamp=Навъи мӯҳри андоз
 VATManagement=Идоракунии андози фурӯш
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Бо нобаёнӣ андози пешниҳодшудаи фурӯш 0 аст, ки онро барои парвандаҳо ба мисли ассотсиатсияҳо, шахсони воқеӣ ё ширкатҳои хурд истифода бурдан мумкин аст.
 VATIsUsedExampleFR=Дар Фаронса, ин маънои ширкатҳо ё ташкилотҳоро дорад, ки системаи фискалии воқеӣ доранд (воқеии содда ё воқеӣ). Системае, ки дар он андоз аз арзиши иловашуда эълом карда мешавад.
 VATIsNotUsedExampleFR=Дар Фаронса, ин маънои ассотсиатсияҳое мебошад, ки андоз аз фурӯш эълон нашудаанд ё ширкатҳо, ташкилотҳо ё касбҳои либералӣ, ки системаи молиявии корхонаи хурдро интихоб кардаанд (андози фурӯш дар франшиза) ва бидуни эъломияи андози фурӯш франшиза андози фурӯшро пардохт кардаанд. Ин интихоб истинодро "Андози фурӯши татбиқнашаванда - арт -293B CGI" дар ҳисобнома -фактураҳо нишон медиҳад.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Навъи андоз аз фурӯш
 LTRate=Нарх
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Мувофиқи танзимоти андозҳо (Б
 LabelUsedByDefault=Нишон бо нобаёнӣ истифода мешавад, агар тарҷумаи код пайдо нашавад
 LabelOnDocuments=Нишон додани ҳуҷҷатҳо
 LabelOrTranslationKey=Тугмаи тамғакоғаз ё тарҷума
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=Намоиши рақами ААИ муштарӣ/фурӯшанд
 AddAdressInList=Нишон додани суроғаи муштарӣ/фурӯшанда дар рӯйхатҳои омехта.<br>Тарафҳои сеюм бо формати номи "The Big Company corp. - 21 jump street 123456 Шаҳри калон - ИМА" ба ҷои " Big Company Corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Усули афзалиятноки интиқолро барои шахсони сеюм дархост кунед.
-FieldEdition=Нашри майдони %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Мисол: +2 (пур кардан танҳо дар сурате ки агар мушкилоти ҷуброни минтақаи вақт аз сар гузаранд)
 GetBarCode=Баркодро гиред
 NumberingModules=Моделҳои рақамгузорӣ
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Санаи ҳисобнома -фактураро то сана
 SuggestedPaymentModesIfNotDefinedInInvoice=Ҳолати пардохтҳои пешниҳодшуда дар фактура бо нобаёнӣ, агар дар фактура муайян нашуда бошад
 SuggestPaymentByRIBOnAccount=Пешниҳод кардани пардохт тавассути гирифтани суратҳисоб
 SuggestPaymentByChequeToAddress=Пешниҳод кардани пардохт тавассути чек ба
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Матни ройгон дар суратҳисобҳо
 WatermarkOnDraftInvoices=Нишонаи обӣ дар лоиҳаи ҳисобнома -фактураҳо (агар холӣ набошад)
 PaymentsNumberingModule=Модели рақамгузории пардохт
@@ -1718,6 +1723,7 @@ CompressionOfResources=Фишурдани ҷавобҳои HTTP
 CompressionOfResourcesDesc=Масалан, бо истифода аз директиваи Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Бо браузерҳои ҷорӣ чунин ошкоркунии автоматӣ имконнопазир аст
 DefaultValuesDesc=Дар ин ҷо шумо метавонед арзиши пешфарзеро, ки мехоҳед ҳангоми эҷоди сабти нав истифода баред ва/ё филтрҳои пешфарз ё тартиби номбар кардани рӯйхатҳоро муайян кунед.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Арзишҳои пешфарз (барои истифода дар шаклҳо)
 DefaultSearchFilters=Филтрҳои муқаррарии ҷустуҷӯ
 DefaultSortOrder=Фармоишҳои навъҳои муқаррарӣ
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Модулҳои рақамгузории ирсолҳ
 SendingsAbility=Варақаҳои интиқолро барои таҳвили муштариён дастгирӣ кунед
 NoNeedForDeliveryReceipts=Дар аксари ҳолатҳо, варақаҳои интиқол ҳам ҳамчун варақаҳо барои таҳвили муштариён (рӯйхати маҳсулоти фиристоданӣ) ва варақаҳое, ки аз ҷониби муштарӣ гирифта ва имзо шудаанд, истифода мешаванд. Аз ин рӯ, квитансияи таҳвили маҳсулот хусусияти такрорӣ аст ва хеле кам фаъол карда мешавад.
 FreeLegalTextOnShippings=Матни ройгон дар бораи интиқол
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Модули рақамгузории квитансияи маҳсулот
 DeliveryOrderModel=Модели гирифтани маҳсулот
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Матни ройгон дар бораи кви
 ##### FCKeditor #####
 AdvancedEditor=Муҳаррири пешрафта
 ActivateFCKeditor=Муҳаррири пешрафтаро фаъол созед:
-FCKeditorForNotePublic=WYSIWYG эҷод / нашри майдони "қайдҳои ҷамъиятӣ" -и элементҳо
-FCKeditorForNotePrivate=WYSIWYG эҷод/нашри майдони "қайдҳои хусусӣ" -и элементҳо
-FCKeditorForCompany=WYSIWYG эҷод / нашри тавсифи майдони унсурҳо (ба истиснои маҳсулот/хизматҳо)
-FCKeditorForProductDetails=WYSIWYG эҷод / нашри тавсифи маҳсулот ё сатрҳо барои объектҳо (сатрҳои пешниҳодҳо, фармоишҳо, фактураҳо ва ғайра).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Огоҳӣ: Истифодаи ин хосият барои ин ҳолат ба таври ҷиддӣ тавсия дода намешавад, зеро он метавонад ҳангоми сохтани файлҳои PDF бо аломатҳои махсус ва форматкунии саҳифа мушкилот эҷод кунад.
-FCKeditorForMailing= Эҷод / нашри WYSIWYG барои паёмҳои оммавӣ (Асбобҳо-> почтаи электронӣ)
-FCKeditorForUserSignature=WYSIWYG эҷод / нашри имзои корбар
-FCKeditorForMail=Эҷод/нашри WYSIWYG барои ҳама почта (ба истиснои Tools->eMailing)
-FCKeditorForTicket=Эҷод / нашри WYSIWYG барои чиптаҳо
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Танзими модули саҳҳомӣ
 IfYouUsePointOfSaleCheckModule=Агар шумо модули Нуқтаи Фурӯшро (POS), ки бо нобаёнӣ пешниҳод шудааст ё модули беруна истифода баред, модули POS -и шумо ин танзимро нодида гирифта метавонад. Аксар модулҳои POS бо нобаёнӣ тарҳрезӣ шудаанд, то фавран ҳисобнома -фактура созанд ва сарфи назар аз имконоти ин ҷо кам кардани саҳмия. Ҳамин тавр, агар шумо ҳангоми бақайдгирии фурӯш аз POS -и худ камшавии саҳмияро талаб кунед ё накунед, инчунин танзимоти модули POS -и худро тафтиш кунед.
@@ -1867,7 +1874,6 @@ Buy=Харидан
 Sell=Фурӯш
 InvoiceDateUsed=Санаи ҳисобнома -фактура истифода шудааст
 YourCompanyDoesNotUseVAT=Ширкати шумо муайян карда шудааст, ки андоз аз арзиши иловашударо истифода набарад (Home - Setup - Company/Organization), аз ин рӯ барои танзим имконоти ААИ вуҷуд надорад.
-AccountancyCode=Кодекси баҳисобгирӣ
 AccountancyCodeSell=Ҳисоби фурӯш. рамз
 AccountancyCodeBuy=Ҳисоби харид. рамз
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Ҳангоми эҷоди андози нав қуттии қайдкуниро "Ба таври худкор эҷод кардани пардохт" холӣ нигоҳ доред
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Ҳангоми интихоби меню Agenda кадом
 AGENDA_EVENT_PAST_COLOR = Ранги рӯйдодҳои гузашта
 AGENDA_EVENT_CURRENT_COLOR = Ранги воқеаи ҷорӣ
 AGENDA_EVENT_FUTURE_COLOR = Ранги рӯйдодҳои оянда
-AGENDA_REMINDER_BROWSER = Ёддошти ҳодиса <b> -ро дар браузери корбар фаъол созед </b> (Вақте ки ба санаи хотиррасон расида мешавад, браузер поп -апро нишон медиҳад. Ҳар як корбар метавонад чунин огоҳиҳоро аз танзимоти огоҳиномаи браузери худ хомӯш кунад).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Огоҳии овозиро фаъол созед
-AGENDA_REMINDER_EMAIL = Ёдраскунии рӯйдодҳоро <b> тавассути почтаи электронии </b> фаъол созед (хосият ё таъхирро дар ҳар як ҳодиса муайян кардан мумкин аст).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Эзоҳ: Басомади кори ба нақша гирифташуда %s бояд кофӣ бошад, то боварӣ ҳосил кунед, ки ёдраскунӣ дар лаҳзаи дуруст фиристода мешавад.
 AGENDA_SHOW_LINKED_OBJECT = Нишон додани объекти алоқаманд ба намуди рӯзнома
 AGENDA_USE_EVENT_TYPE = Навъҳои рӯйдодҳоро истифода баред (дар менюи Setup -> Луғатҳо -> Намуди рӯйдодҳои рӯзнома идора карда мешавад)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Ба таври худкор ин арзиши пешфарзро барои намуди ҳодиса дар шакли эҷоди ҳодиса таъин кунед
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Калиди иҷозат барои истинод ба содирот
 PastDelayVCalExport=Чорабиниҳои аз калонтар содиршударо содир накунед
 SecurityKey = Калиди амният
@@ -2006,7 +2017,7 @@ BackupZipWizard=Ёвар барои сохтани бойгонии феҳрис
 SomethingMakeInstallFromWebNotPossible=Насби модули беруна аз сабаби зерин имконнопазир аст:
 SomethingMakeInstallFromWebNotPossible2=Аз ин сабаб, раванди навсозӣ дар ин ҷо тавсифшуда раванди дастӣ аст, ки танҳо корбари имтиёзнок иҷро карда метавонад.
 InstallModuleFromWebHasBeenDisabledContactUs=Насб ё таҳияи модулҳои беруна ё вебсайтҳои динамикӣ аз барнома, айни замон бо мақсади амният баста шудааст. Лутфан бо мо тамос гиред, агар ба шумо лозим бошад, ки ин хусусиятро фаъол созед.
-InstallModuleFromWebHasBeenDisabledByFile=Аз ҷониби мудири шумо насб кардани модули беруна аз барнома хомӯш карда шудааст. Шумо бояд аз ӯ хоҳиш кунед, ки файли <strong> %s </strong> хориҷ кунад, то ин хусусият иҷозат дода шавад.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Насб кардан ё сохтани модули беруна аз барнома бояд файлҳои модулро дар феҳристи <strong> %s </strong> захира кунад. Барои коркарди ин феҳрист аз ҷониби Dolibarr, шумо бояд <strong> conf/conf.php </strong> -ро насб кунед, то 2 хати директивиро илова кунед: <br> <strong> $ dolibarr_main_; </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s/custom'; </strong>
 HighlightLinesOnMouseHover=Ҳангоми гузаштан аз болои муш хатҳои ҷадвалро равшан кунед
 HighlightLinesColor=Ҳангоми гузаштани муш ранги сатрро равшан кунед ('ffffff' -ро истифода баред, то равшан набошад)
@@ -2036,6 +2047,7 @@ Enter0or1=0 ё 1 ворид кунед
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Дар ин ҷо байни қавсҳо, рӯйхати рақами байт, ки рамзи асъорро ифода мекунад, ворид кунед. Масалан: барои $, ворид кунед [36] - барои воқеии бразилӣ R $ [82,36] - барои €, ворид кунед [8364]
 ColorFormat=Ранги RGB дар формати HEX аст, масалан: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Номи нишона дар формат:<br>- image.png барои файли тасвир ба директорияи мавзӯи ҷорӣ<br>- image.png@module агар файл дар директорияи /img/ модул бошад<br>- fa-xxx барои FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size барои тасвири FontAwesome fa-xxx (бо префикс, ранг ва андоза маҷмӯи)
 PositionIntoComboList=Мавқеи сатр дар рӯйхати омехта
 SellTaxRate=Меъёри андоз аз фурӯш
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Сарҳадҳоро дар чаҳорчӯбаи суроғаи ирсолкунанда пинҳон кунед
 MAIN_PDF_NO_RECIPENT_FRAME=Сарҳадҳоро дар чаҳорчӯбаи суроғаи қабулкунанда пинҳон кунед
 MAIN_PDF_HIDE_CUSTOMER_CODE=Рамзи муштариро пинҳон кунед
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Номи ирсолкунанда/ширкатро дар блоки суроғаҳо пинҳон кунед
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Пинҳон кардани шартҳои пардохт
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Пинҳон кардани ҳолати пардохт
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=Тавсия дода намешавад
 ARestrictedPath=Баъзе роҳи маҳдуд барои файлҳои додаҳо
 CheckForModuleUpdate=Навсозии модулҳои беруниро тафтиш кунед
 CheckForModuleUpdateHelp=Ин амал ба муҳаррирони модулҳои беруна пайваст мешавад, то дастрасии версияи навро тафтиш кунад.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Навсозӣ дастрас аст
 NoExternalModuleWithUpdate=Барои модулҳои беруна ягон навсозӣ ёфт нашуд
 SwaggerDescriptionFile=Файли тавсифи API Swagger (барои истифода бо redoc масалан)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Нишон додани суроғаи интиқ
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Нишондиҳии ҳатмӣ дар баъзе кишварҳо (Фаронса, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Истиноди URL-и шабакаи иҷтимоӣ. Барои қисми тағирёбанда, ки ID-и шабакаи иҷтимоиро дар бар мегирад, {socialid}-ро истифода баред.
 IfThisCategoryIsChildOfAnother=Агар ин категория фарзанди дигар бошад
 DarkThemeMode=Ҳолати мавзӯи торик
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Огоҳӣ: модули %s п
 WarningModuleHasChangedSecurityCsrfParameter=Огоҳӣ: модули %s амнияти CSRF-и мисоли шуморо ғайрифаъол кардааст. Ин амал шубҳанок аст ва насби шумо дигар муҳофизат карда намешавад. Лутфан барои шарҳ бо муаллифи модул тамос гиред.
 EMailsInGoingDesc=Паёмҳои воридотӣ аз ҷониби модули %s идора карда мешаванд. Шумо бояд онро фаъол созед ва танзим кунед, агар ба шумо паёмҳои воридшавандаро дастгирӣ кунед.
 MAIN_IMAP_USE_PHPIMAP=Китобхонаи PHP-IMAP-ро барои IMAP ба ҷои PHP IMAP-и аслӣ истифода баред. Ин инчунин имкон медиҳад, ки пайвасти OAuth2 барои IMAP истифода шавад (модули OAuth низ фаъол карда шавад).
-MAIN_CHECKBOX_LEFT_COLUMN=Сутуни интихоби майдон ва сатрро дар чап нишон диҳед (аз тарафи рост ба таври нобаёнӣ)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Бо нобаёнӣ сохта нашудааст. Танҳо дар фаъолсозии модул сохта шудааст.
 CSSPage=Услуби CSS
 Defaultfortype=Пешфарз
@@ -2489,7 +2510,7 @@ AiDescription=Хусусиятҳои AI (Intelligence Artificial).
 AiDescriptionLong=Хусусиятҳои AI (зеҳни сунъӣ) -ро дар қисмҳои гуногуни барнома таъмин мекунад. API-и берунаи AI лозим аст.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=Танзими модули AI
 AiCustomPrompt=Саволи фармоишии AI
 AI_CONFIGURATIONS_PROMPT=Пешниҳоди фармоишӣ
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI фармоишгари хусусиятҳоро пешн
 EnterAnIP=Суроғаи IP ворид кунед
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/tg_TJ/banks.lang b/htdocs/langs/tg_TJ/banks.lang
index 8b491fa1166..8e72a1d76b6 100644
--- a/htdocs/langs/tg_TJ/banks.lang
+++ b/htdocs/langs/tg_TJ/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Тавозунро хотима диҳед
 CurrentBalance=Тавозуни ҷорӣ
 FutureBalance=Тавозуни оянда
 ShowAllTimeBalance=Тавозунро аз аввал нишон диҳед
-AllTime=Аз аввал
 Reconciliation=Оштӣ
 RIB=Рақами суратҳисоби бонкӣ
 IBAN=Рақами IBAN
@@ -133,7 +132,7 @@ DeleteTransaction=Нест кардани вуруд
 ConfirmDeleteTransaction=Шумо мутмаин ҳастед, ки мехоҳед ин вурудро нест кунед?
 ThisWillAlsoDeleteBankRecord=Ин инчунин вуруди бонкии тавлидшударо нест мекунад
 BankMovements=Ҳаракатҳо
-PlannedTransactions=Сабтҳои ба нақша гирифташуда
+PlannedTransactions=Upcoming entries
 Graph=Графикҳо
 ExportDataset_banque_1=Сабтҳои бонкӣ ва изҳороти суратҳисоб
 ExportDataset_banque_2=Варақаи пасандоз
@@ -151,7 +150,7 @@ FutureTransaction=Транзаксияи оянда. Муносибат кард
 SelectChequeTransactionAndGenerate=Интихоб/филтр кардани чекҳое, ки бояд ба квитансияи пасандози чек дохил карда шаванд. Пас, клик кунед "Эҷод".
 SelectPaymentTransactionAndGenerate=Ҳуҷҷатҳоеро, ки бояд ба квитансияи амонатии %s дохил карда шаванд, интихоб/филтр кунед. Сипас, "Эҷод" -ро клик кунед.
 InputReceiptNumber=Ҳисоботи бонкии марбут ба созишро интихоб кунед. Қимати ададии мураттабшавандаро истифода баред
-InputReceiptNumberBis=САА ё САА
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Барои оштӣ кардан?
 ThenCheckLinesAndConciliate=Сипас, сатрҳои дар изҳороти бонк мавҷудбударо тафтиш кунед ва клик кунед
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Агар ин функсия фаъол бошад, ш
 BankColorizeMovementName1=Ранги пасзамина барои ҳаракати дебетӣ
 BankColorizeMovementName2=Ранги замина барои ҳаракати кредитӣ
 IfYouDontReconcileDisableProperty=Агар шумо дар баъзе суратҳисобҳои бонкӣ созишҳои бонкиро анҷом надиҳед, амволи "%s" -и онҳоро ғайрифаъол кунед, то ин огоҳиро нест кунед.
-NoBankAccountDefined=Ҳеҷ суратҳисоби бонкӣ муайян карда нашудааст
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Дар суратҳисоби бонкӣ сабт ёфт нашуд. Одатан, ин вақте рух медиҳад, ки сабт дастӣ аз рӯйхати амалиётҳои суратҳисоби бонкӣ нест карда мешавад (масалан, ҳангоми муқоисаи ҳисоби бонкӣ). Сабаби дигар ин аст, ки пардохт ҳангоми хомӯш кардани модули "%s" сабт карда шуд.
 AlreadyOneBankAccount=Аллакай як ҳисоби бонкӣ муайян карда шудааст
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Варианти файли SEPA
diff --git a/htdocs/langs/tg_TJ/blockedlog.lang b/htdocs/langs/tg_TJ/blockedlog.lang
index d297250177c..8e201eb45b7 100644
--- a/htdocs/langs/tg_TJ/blockedlog.lang
+++ b/htdocs/langs/tg_TJ/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Сабтҳои тағирнопазир
 ShowAllFingerPrintsMightBeTooLong=Ҳама сабтҳои бойгониро нишон диҳед (шояд дароз бошад)
 ShowAllFingerPrintsErrorsMightBeTooLong=Ҳама гузоришҳои бойгонии беэътиборро нишон диҳед (шояд дароз бошад)
 DownloadBlockChain=Зеркашӣ кардани изҳои ангушт
-KoCheckFingerprintValidity=Сабти бойгонии сабтшуда эътибор надорад. Ин маънои онро дорад, ки касе (ҳакер?) Баъзе маълумотҳои ин сабтро пас аз сабт тағир додааст ё сабти бойгонии қаблиро нест кардааст (санҷед, ки ин сатр бо # пешина мавҷуд аст) ё маблағи санҷиши сабти қаблиро тағир додааст.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Сабти бойгонии архив эътибор дорад. Маълумот дар ин сатр тағир дода нашудааст ва вуруд ба хати пешина пайравӣ мекунад.
 OkCheckFingerprintValidityButChainIsKo=Журнали бойгонӣ дар муқоиса бо сабти қаблӣ дуруст ба назар мерасад, аммо занҷир қаблан вайрон шуда буд.
 AddedByAuthority=Дар идораи дурдаст нигоҳ дошта мешавад
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Тафсилоти гузориш
 ListOfTrackedEvents=Рӯйхати рӯйдодҳои пайгирӣ
 Fingerprint=Изи ангушт
 DownloadLogCSV=Содироти сабтҳои бойгонӣ (CSV)
-DataOfArchivedEvent=Маълумоти пурраи чорабинии бойгонӣ
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Объекти аслӣ (навъи %s, id %s) пайванд нест (ба сутуни 'Маълумоти пурра' барои гирифтани маълумоти тағирнашудаи захирашуда нигаред)
 BlockedLogAreRequiredByYourCountryLegislation=Модули сабтҳои тағирнопазир метавонад тибқи қонунгузории кишвари шумо талаб карда шавад. Хомӯш кардани ин модул метавонад ҳама гуна муомилоти ояндаро нисбати қонун ва истифодаи нармафзори ҳуқуқӣ беэътибор гардонад, зеро онҳо наметавонанд аз ҷониби санҷиши андоз тасдиқ карда шаванд.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Модули сабтҳои тағирнопазир бо сабаби қонунгузории кишвари шумо фаъол карда шуд. Хомӯш кардани ин модул метавонад ҳама гуна муомилоти ояндаро нисбати қонун ва истифодаи нармафзори ҳуқуқӣ беэътибор гардонад, зеро онҳо наметавонанд аз ҷониби санҷиши андоз тасдиқ карда шаванд.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Система барои пайгирии рӯйдодҳо д
 BlockedLogDisabled=Система барои пайгирии рӯйдодҳо дар гузоришҳои тағирнашаванда пас аз анҷоми баъзе сабтҳо ғайрифаъол карда шуд. Мо як изи ангушти махсусро захира кардем, то занҷирро ҳамчун шикаста пайгирӣ кунем
 BlockedLogDisabledBis=Система барои пайгирии рӯйдодҳо дар гузоришҳои тағирнашаванда ғайрифаъол карда шудааст. Ин имконпазир аст, зеро то ҳол сабти ном нашудааст.
 LinkHasBeenDisabledForPerformancePurpose=Бо мақсади иҷроиш, истиноди мустақим ба ҳуҷҷат пас аз сатри 100 нишон дода намешавад.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Ҳисобнома -фактураи муштарӣ мантиқан нест карда мешавад
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Нобудкунии мантиқии пардохт
 logPAYMENT_VARIOUS_CREATE=Пардохт (ба ҳисобнома -фактура таъин нашудааст) офарида шудааст
 logPAYMENT_VARIOUS_DELETE=Пардохт (ба фактура таъин нашудааст) несткунии мантиқӣ
 logPAYMENT_VARIOUS_MODIFY=Пардохт (ба фактура таъин нашудааст) тағир дода шудааст
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/tg_TJ/categories.lang b/htdocs/langs/tg_TJ/categories.lang
index 360097eef28..e6e07a9633d 100644
--- a/htdocs/langs/tg_TJ/categories.lang
+++ b/htdocs/langs/tg_TJ/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Минтақаи барчаспҳо/категорияҳ
 AccountsCategoriesArea=Минтақаи барчаспҳо/категорияҳои суратҳисоби бонкӣ
 ProjectsCategoriesArea=Минтақаи барчаспҳо/категорияҳо
 UsersCategoriesArea=Минтақаи барчаспҳо/категорияҳо
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Категорияҳо
 CatList=Рӯйхати барчаспҳо/категорияҳо
 CatListAll=Рӯйхати барчаспҳо/категорияҳо (ҳама намудҳо)
@@ -90,9 +91,10 @@ CategoriesSetup=Танзимоти барчаспҳо/категорияҳо
 CategorieRecursiv=Ба таври худкор бо тег/категорияи волидайн пайванд кунед
 CategorieRecursivHelp=Агар параметр фаъол бошад, вақте ки шумо объектро ба зеркатегория илова мекунед, объект инчунин ба категорияҳои волидайн илова карда мешавад.
 AddProductServiceIntoCategory=Ба маҳсулот/хизмат категория таъин кунед
-AddCustomerIntoCategory=Ба муштарӣ категория таъин кунед
-AddSupplierIntoCategory=Ба таъминкунанда категория таъин кунед
-AssignCategoryTo=Ба категория таъин кунед
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Нишон додани тег/категория
 ByDefaultInList=Бо нобаёнӣ дар рӯйхат
 ChooseCategory=Категорияро интихоб кунед
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Категорияҳои саҳифа-контейн
 KnowledgemanagementsCategoriesArea=Категорияҳои мақолаи КМ
 UseOrOperatorForCategories=Барои категорияҳо оператори 'Ё' -ро истифода баред
 AddObjectIntoCategory=Ба категория таъин кунед
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/tg_TJ/companies.lang b/htdocs/langs/tg_TJ/companies.lang
index 7d60c09eff0..f732a644a45 100644
--- a/htdocs/langs/tg_TJ/companies.lang
+++ b/htdocs/langs/tg_TJ/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Кишвар дар дохили Иттиҳоди иқтисод
 PriceFormatInCurrentLanguage=Формати намоиши нархҳо бо забон ва асъори ҷорӣ
 ThirdPartyName=Номи шахси сеюм
 ThirdPartyEmail=Почтаи электронии тарафи сеюм
-ThirdParty=Тарафи сеюм
-ThirdParties=Шахсони сеюм
+ThirdParty=Third party
+ThirdParties=Third parties
 ThirdPartyProspects=Дурнамо
 ThirdPartyProspectsStats=Дурнамо
 ThirdPartyCustomers=Мизоҷон
@@ -65,6 +65,7 @@ State=Давлат/вилоят
 StateId=ID давлатӣ
 StateCode=Рамзи иёлот/вилоят
 StateShort=Давлат
+DepartmentBuyer=Buyer's state/province
 Region=Минтақа
 Region-State=Минтақа - Давлат
 Country=Кишвар
@@ -78,7 +79,7 @@ Chat=Чат
 PhonePro=Автобус. телефон
 PhonePerso=Pers. телефон
 PhoneMobile=Мобилӣ
-No_Email=Паёмҳои почтаи электрониро рад кунед
+No_Email=Refuse mass emails
 Fax=Факс
 Zip=Индекси почта
 Town=Шаҳр
@@ -382,11 +383,12 @@ ExportCardToFormat=Корти содиротӣ ба формат
 ContactNotLinkedToCompany=Тамос бо ягон шахси сеюм алоқаманд нест
 DolibarrLogin=Воридшавӣ Dolibarr
 NoDolibarrAccess=Дастрасии Dolibarr нест
-ExportDataset_company_1=Шахсони сеюм (ширкатҳо/бунёдҳо/шахсони воқеӣ) ва хосиятҳои онҳо
-ExportDataset_company_2=Алоқаҳо ва хосиятҳои онҳо
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Шахсони сеюм ва хосиятҳои онҳо
 ImportDataset_company_2=Тамосҳои иловагӣ/суроғаҳо ва атрибутҳои шахсони сеюм
-ImportDataset_company_3=Ҳисобҳои бонкии шахсони сеюм
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Намояндагони фурӯшҳои шахсони сеюм (ба ширкатҳо намояндагони фурӯш/корбаронро таъин кунед)
 PriceLevel=Сатҳи нархҳо
 PriceLevelLabels=Нишондиҳандаҳои сатҳи нарх
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Номи мудир (ҳо) (CEO, директор, президент ...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Шахсони сеюмро якҷоя кунед
-ConfirmMergeThirdparties=Шумо мутмаин ҳастед, ки мехоҳед шахси сеюми интихобшударо бо шахси кунунӣ муттаҳид кунед? Ҳама объектҳои алоқаманд (фактураҳо, фармоишҳо, ...) ба тарафи сеюми ҷорӣ интиқол дода мешаванд, ки пас аз он шахси сеюми интихобшуда нест карда мешавад.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Шахсони сеюм муттаҳид карда шуданд
 SaleRepresentativeLogin=Вуруд ба намояндаи фурӯш
 SaleRepresentativeFirstname=Номи намояндаи фурӯш
@@ -460,3 +462,6 @@ ExternalSystemID=ID системаи беруна
 IDOfPaymentInAnExternalSystem=ID-и режими пардохт ба системаи беруна (ба монанди Stripe, Paypal, ...)
 AADEWebserviceCredentials=Маълумотномаҳои хидматрасонии AADE
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Шахси сеюм бояд муштарӣ бошад, то барои эҷоди маълумоти бонкии худ дар тарафи Stripe иҷозат диҳад
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/tg_TJ/compta.lang b/htdocs/langs/tg_TJ/compta.lang
index 0a9e324464c..44c84e34dbb 100644
--- a/htdocs/langs/tg_TJ/compta.lang
+++ b/htdocs/langs/tg_TJ/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Пардохти фактураи муштарӣ
 PaymentSupplierInvoice=пардохти фактураи фурӯшанда
 PaymentSocialContribution=Пардохти андози иҷтимоӣ/фискалӣ
 PaymentVat=Пардохти ААИ
-AutomaticCreationPayment=Ба таври худкор пардохтро сабт кунед
+AutomaticCreationPayment=Also record the payment
 ListPayment=Рӯйхати пардохтҳо
 ListOfCustomerPayments=Рӯйхати пардохтҳои муштариён
 ListOfSupplierPayments=Рӯйхати пардохтҳои фурӯшанда
@@ -118,10 +118,14 @@ SocialContributionsPayments=Пардохтҳои андози иҷтимоӣ/ф
 ShowVatPayment=Нишон додани пардохти ААИ
 TotalToPay=Ҳаҷми пардохт
 BalanceVisibilityDependsOnSortAndFilters=Бақия дар ин рӯйхат танҳо дар сурате намоён мешавад, ки агар ҷадвал дар %s мураттаб карда шуда, дар 1 суратҳисоби бонкӣ филтр карда шавад (бе филтрҳои дигар)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Рамзи баҳисобгирии мизоҷон
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Рамзи баҳисобгирии фурӯшанда
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Каст. ҳисоб. рамз
 SupplierAccountancyCodeShort=Суп. ҳисоб. рамз
+UserAccountancyCodeShort=User account. code
 AccountNumber=Рақами ҳисобӣ
 NewAccountingAccount=Ҳисоби нав
 Turnover=Муомилот ҳисоб карда мешавад
@@ -129,7 +133,9 @@ TurnoverCollected=Муомилот ҷамъоварӣ карда шуд
 SalesTurnoverMinimum=Ҳадди ақали гардиши мол
 ByExpenseIncome=Аз рӯи хароҷот ва даромад
 ByThirdParties=Аз ҷониби шахсони сеюм
+ByProjects=By projects
 ByUserAuthorOfInvoice=Аз ҷониби муаллифи ҳисобнома -фактура
+DetailedListLowercase=detailed list
 CheckReceipt=Варақаи амонатӣ
 CheckReceiptShort=Варақаи амонатӣ
 LastCheckReceiptShort=Варақаҳои охирини %s
diff --git a/htdocs/langs/tg_TJ/datapolicy.lang b/htdocs/langs/tg_TJ/datapolicy.lang
index e53df132dce..088c4c4aec6 100644
--- a/htdocs/langs/tg_TJ/datapolicy.lang
+++ b/htdocs/langs/tg_TJ/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Сиёсати махфияти маълумот
 Module4100Desc = Модули идоракунии махфияти маълумот (Мутобиқат бо GDPR)
 # Administration page
 datapolicySetup = Танзими сиёсати махфияти модули маълумот
-Deletion = Нест кардани маълумот
-datapolicySetupPage = Вобаста ба қонунҳои кишварҳои шумо (Мисол <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Моддаи 5</a>-и GDPR), маълумоти шахсӣ бояд барои муддате нигоҳ дошта шавад. на бештар аз мўњлате, ки маълумот барои маќсади љамъоварии он зарур аст, ба истиснои маќсадњои бойгонї.<br>Нест кардан ба таври худкор пас аз як муддати муайян бидуни њодисањо (давомнокї) сурат мегирад. ки шумо дар зер нишон медихед).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s моҳ
 ONE_YEAR = 1 сол
 NB_YEARS = %s сол
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Имконият / муштарӣ
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = На перспектива / на муштарӣ
 DATAPOLICY_CONTACT_FOURNISSEUR = Таъминкунанда
 DATAPOLICY_ADHERENT = аъзо
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Шумо метавонед почтаи электронии GDPR-ро ба ҳамаи тамосҳои дахлдори худ фиристед (онҳо то ҳол почтаи электронӣ нагирифтаанд ва шумо дар бораи созишномаи GDPR-и онҳо чизе сабт накардаед). Барои ин, тугмаи зеринро истифода баред.
 SendAgreement = Ирсоли почтаи электронӣ
 AllAgreementSend = Ҳама мактубҳо фиристода шуданд
 TXTLINKDATAPOLICYACCEPT = Матн барои истиноди "созишнома"
 TXTLINKDATAPOLICYREFUSE = Матн барои истинод "ихтилоф"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: Коркарди маълумоти шахсӣ
 DATAPOLICY_consentement = Ризоият барои коркарди маълумоти шахсӣ гирифта шудааст
diff --git a/htdocs/langs/tg_TJ/errors.lang b/htdocs/langs/tg_TJ/errors.lang
index 249788c6620..c3f6a0f9a37 100644
--- a/htdocs/langs/tg_TJ/errors.lang
+++ b/htdocs/langs/tg_TJ/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Эҷод кардани директория ноком шуд. Санҷед, ки корбари веб -сервер барои навиштан ба феҳристи ҳуҷҷатҳои Dolibarr иҷозат дорад. Агар параметри <b> safe_mode </b> дар ин PHP фаъол бошад, санҷед, ки файлҳои php Dolibarr ба корбари веб -сервер (ё гурӯҳ) тааллуқ доранд.
 ErrorNoMailDefinedForThisUser=Барои ин корбар почта муайян нашудааст
 ErrorSetupOfEmailsNotComplete=Танзимоти почтаи электронӣ ба анҷом нарасидааст
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Барои фаъол кардани ин хусусият JavaScript барои кор кардан лозим аст. Инро дар танзимот - намоиш тағир диҳед.
 ErrorTopMenuMustHaveAParentWithId0=Менюи навъи 'Top' наметавонад менюи волидайн дошта бошад. Ба менюи волидайн 0 гузоред ё менюи навъи 'Чап' -ро интихоб кунед.
 ErrorLeftMenuMustHaveAParentId=Менюи навъи "Чап" бояд ID -и волидайн дошта бошад.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Боркунӣ аз ҷониби плагини PHP/Ap
 ErrorFileSizeTooLarge=Андозаи файл хеле калон аст ё файл дода нашудааст.
 ErrorFieldTooLong=Майдони %s хеле дароз аст.
 ErrorSizeTooLongForIntType=Андоза барои намуди int хеле дароз аст (%s рақамҳои ҳадди аксар)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Андоза барои навъи сатр хеле дароз аст (%s аломатҳои ҳадди аксар)
 ErrorNoValueForSelectType=Лутфан арзиши рӯйхати интихобшударо пур кунед
 ErrorNoValueForCheckBoxType=Лутфан арзиши рӯйхати қуттиҳои қайдшударо пур кунед
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Арзиши бад барои рамзи амният. Б
 ErrorBothFieldCantBeNegative=Майдонҳои %s ва %s наметавонанд ҳарду манфӣ бошанд
 ErrorFieldCantBeNegativeOnInvoice=Майдони <strong>%s</strong> дар ин навъи invo манфӣ буда наметавонад. Агар ба шумо лозим аст, ки хати тахфиф илова кунед, аввал тахфиф эҷод кунед (аз майдони '%s' дар корти тарафи сеюм) ва онро ба ҳисобнома-фактура татбиқ кунед.
 ErrorLinesCantBeNegativeForOneVATRate=Ҳаҷми сатрҳо (бо назардошти андоз) барои меъёри андоз аз арзиши иловашуда манфӣ буда наметавонад (Ҷамъи манфӣ барои меъёри андоз аз арзиши иловашуда <b> %s </b> %% ёфт нашуд).
-ErrorLinesCantBeNegativeOnDeposits=Дар амонат сатрҳо манфӣ буда наметавонанд. Вақте ки шумо ин корро анҷом медиҳед, пасандозро дар ҳисобномаи ниҳоӣ истеъмол кардан лозим меояд, шумо бо мушкилот дучор хоҳед шуд.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Миқдори сатр ба фактураҳои муштарӣ манфӣ буда наметавонад
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Ҳисоби корбар <b> %s </b>, ки барои иҷрои веб -сервер истифода мешавад, барои ин иҷозат надорад
 ErrorNoActivatedBarcode=Ягон намуди штрих -код фаъол карда нашудааст
 ErrUnzipFails=%s -ро бо ZipArchive кушодан натавонист
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Параметри PHP -и шумо upload_max_filesize (%s) аз параметрҳои PHP post_max_size (%s) баландтар аст. Ин танзимоти пайдарпай нест.
 WarningPasswordSetWithNoAccount=Барои ин аъзо парол таъин карда шуд. Бо вуҷуди ин, ягон ҳисоби корбарӣ таъсис дода нашудааст. Ҳамин тавр, ин парол нигоҳ дошта мешавад, аммо барои ворид шудан ба Dolibarr наметавонад истифода шавад. Он метавонад аз ҷониби модул/интерфейси беруна истифода шавад, аммо агар ба шумо ягон узвият ё паролро муайян кардан лозим набошад, шумо метавонед имконоти "Идоракунии вуруд барои ҳар як аъзо" -ро аз танзимоти модули аъзо ғайрифаъол кунед. Агар ба шумо лозим аст, ки воридшавиро идора кунед, аммо ба парол ниёз надоред, шумо метавонед ин майдонро холӣ нигоҳ доред, то ин огоҳӣ пешгирӣ карда шавад. Эзоҳ: Почтаи электронӣ инчунин метавонад ҳамчун логин истифода шавад, агар аъзо ба корбар пайванд бошад.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = Ҳисобнома-фактураи SwissQR метавонад танҳо ба ҳисобнома-фактураҳое илова карда шавад, ки бо пардохти интиқоли кредит пардохт карда мешаванд.
 SwissQrCreditorAddressInvalid = Суроғаи кредитор нодуруст аст (Оё ZIP ва шаҳр муқаррар карда шудаанд? (%s)
 SwissQrCreditorInformationInvalid = Маълумоти кредитор барои IBAN нодуруст аст (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s аллакай ҳамчун та
 ErrorThisGroupIsAlreadyDefinedAsThisType=Алоқаҳо бо ин гурӯҳ аллакай ҳамчун алоқа барои ин намуд муайян шудаанд.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/tg_TJ/exports.lang b/htdocs/langs/tg_TJ/exports.lang
index 7a8ad17d60d..7258a58def1 100644
--- a/htdocs/langs/tg_TJ/exports.lang
+++ b/htdocs/langs/tg_TJ/exports.lang
@@ -67,7 +67,7 @@ ChooseFormatOfFileToImport=Формати файлро, ки ҳамчун фор
 ChooseFileToImport=Файлро бор кунед ва пас тасвири %s -ро клик кунед, то файлро ҳамчун файли воридоти манбаъ интихоб кунед ...
 SourceFileFormat=Формати файли манбаъ
 FieldsInSourceFile=Майдонҳо дар файли манбаъ
-FieldsInTargetDatabase=Майдонҳои ҳадаф дар пойгоҳи додаҳои Dolibarr (ғафс = ҳатмӣ)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Майдон нест
 MoveField=Рақами сутуни майдони %s -ро кӯчонед
 ExampleOfImportFile=Example_of_import_file
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Тафтиш кунед, ки формати файл (
 RunSimulateImportFile=Симулясияи воридотро иҷро кунед
 FieldNeedSource=Ин майдон маълумотро аз файли манбаъ талаб мекунад
 SomeMandatoryFieldHaveNoSource=Баъзе майдонҳои ҳатмӣ аз файли маълумот манбаъ надоранд
-InformationOnSourceFile=Маълумот дар бораи файли манбаъ
-InformationOnTargetTables=Маълумот дар бораи соҳаҳои мақсаднок
+InformationOnSourceFile=Source file
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Ҳадди ақал як майдони манбаъро дар сутуни майдонҳо барои содирот иваз кунед
 SelectFormat=Ин формати файли воридотро интихоб кунед
 RunImportFile=Маълумотро ворид кунед
diff --git a/htdocs/langs/tg_TJ/hrm.lang b/htdocs/langs/tg_TJ/hrm.lang
index cf61dd0282a..b00313b7919 100644
--- a/htdocs/langs/tg_TJ/hrm.lang
+++ b/htdocs/langs/tg_TJ/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=Дараҷаи зарурӣ барои профили кор
-RequiredRankShort=Рутбаи зарурӣ
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Вазифаҳо бо ин профилҳои кор
-EmployeeRank=Дараҷаи кормандон барои ин маҳорат
-EmployeeRankShort=Рутбаи корманд
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Мавқеи корманд
 EmployeePositions=Вазифаҳои кормандон
 EmployeesInThisPosition=Кормандони ин вазифа
@@ -72,6 +72,9 @@ AddSkill=Ба профили кор малакаҳо илова кунед
 RequiredSkills=Малакаҳои зарурӣ барои ин профили кор
 UserRank=Дараҷаи корбар
 SkillList=Рӯйхати малакаҳо
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Рақамро захира кунед
 TypeKnowHow=Роҳкор
 TypeHowToBe=Чӣ тавр будан
@@ -95,3 +98,5 @@ NeedBusinessTravels=Ба сафарҳои корӣ лозим аст
 NoDescription=Тавсиф нест
 TheJobProfileHasNoSkillsDefinedFixBefore=Профили кори баҳоёфтаи ин корманд дорои малакаи дар он муайяншуда нест. Лутфан маҳорат(ҳо)-ро илова кунед, сипас онро нест кунед ва арзёбӣро аз нав оғоз кунед.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/tg_TJ/mails.lang b/htdocs/langs/tg_TJ/mails.lang
index 55a1162e4ca..9c3344bc595 100644
--- a/htdocs/langs/tg_TJ/mails.lang
+++ b/htdocs/langs/tg_TJ/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Почтаи электронӣ
 EMailing=Почтаи электронӣ
-EMailings=Паёмҳои почтаи электронӣ
+EMailings=Mass EMails
 SMSings=SMS
-AllEMailings=Ҳама паёмҳои электронӣ
+AllEMailings=All mass eMails
 MailCard=Корти почтаи электронӣ
 MailRecipients=Қабулкунандагон
 MailRecipient=Гиранда
@@ -26,19 +26,19 @@ MailFile=Файлҳои замима
 MailMessage=Мақоми почтаи электронӣ
 SubjectNotIn=Дар мавзӯъ нест
 BodyNotIn=Дар бадан нест
-ShowEMailing=Нишон додани почтаи электронӣ
-ListOfEMailings=Рӯйхати мактубҳои электронӣ
-NewMailing=Паёми нави электронӣ
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=SMS-и нав
-EditMailing=Таҳрири почтаи электронӣ
-ResetMailing=Почтаи электрониро дубора фиристед
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Почтаи электрониро нест кунед
-PreviewMailing=Пешнамоиши почтаи электронӣ
-CreateMailing=Эҷоди почтаи электронӣ
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Санҷиш
-ValidMailing=Почтаи электронӣ эътибор дорад
+ValidMailing=Valid mass Email
 MailingStatusDraft=Лоиҳа
 MailingStatusValidated=Санҷида шуд
 MailingStatusSent=Фиристода шуд
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Барои ҷамъоварӣ кардани паёми
 LineInFile=Хати %s дар файл
 RecipientSelectionModules=Дархостҳо барои интихоби гиранда муайян карда шудаанд
 MailSelectedRecipients=Қабулкунандагони интихобшуда
-MailingArea=Минтақаи почтаи электронӣ
-LastMailings=Паёмҳои охирини %s
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Ҳадафҳои омор
 NbOfCompaniesContacts=Алоқаҳо/суроғаҳои беназир
 MailNoChangePossible=Қабулкунандагони почтаи электронии тасдиқшударо тағир додан мумкин нест
-SearchAMailing=Почтаи ҷустуҷӯ
-SendMailing=Паёми электронӣ фиристед
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Аз ҷониби фиристода
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Фиристодани почтаи электронӣ метавонад аз сатри фармон иҷро карда шавад. Аз администратори сервери худ хоҳиш кунед, ки фармони зеринро барои фиристодани почтаи электронӣ ба ҳама гирандагон оғоз кунад:
 MailingNeedCommand2=Бо вуҷуди ин, шумо метавонед онҳоро онлайн бо илова кардани параметри MAILING_LIMIT_SENDBYWEB бо арзиши шумораи максималии мактубҳое, ки мехоҳед тавассути сессия фиристед, фиристед. Барои ин ба Home - Setup - Other гузаред.
 ConfirmSendingEmailing=Агар шумо хоҳед, ки почтаи электрониро мустақиман аз ин экран ирсол кунед, лутфан тасдиқ кунед, ки мутмаин ҳастед, ки ҳоло мехоҳед браузери худро фиристед?
-LimitSendingEmailing=Эзоҳ: Фиристодани мактубҳои электронӣ аз интерфейси веб бо сабабҳои амният ва танаффус чанд маротиба анҷом дода мешавад, <b> %s </b> дар як вақт барои ҳар як ҷаласаи ирсолкунанда.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Рӯйхати тоза
 ToClearAllRecipientsClickHere=Барои тоза кардани рӯйхати гирандагони ин паём, ин ҷо клик кунед
 ToAddRecipientsChooseHere=Бо интихоб аз рӯйхат гирандагон қабул кунед
-NbOfEMailingsReceived=Паёмҳои оммавӣ қабул карда шуданд
-NbOfEMailingsSend=Паёмҳои оммавӣ фиристода шуданд
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=Сабти ID
 DeliveryReceipt=Расонидани Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Шумо метавонед ҷудосози <b> вергулро </b> барои муайян кардани чанд гиранда истифода баред.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Барои ин намуди чорабинӣ ва ш
 ANotificationsWillBeSent=1 огоҳиномаи автоматӣ тавассути почтаи электронӣ фиристода мешавад
 SomeNotificationsWillBeSent=%s огоҳиҳои автоматӣ тавассути почтаи электронӣ фиристода мешаванд
 AddNewNotification=Ба огоҳиномаи нави худкори почтаи электронӣ обуна шавед (ҳадаф/ҳодиса)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Танзимоти фиристодани почтаи электронӣ ба '%s' танзим шудааст. Ин режимро барои фиристодани паёми электронии оммавӣ истифода бурдан мумкин нест.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=Агар шумо оид ба чӣ гуна насб кардани сервери SMTP -и худ саволе дошта бошед, метавонед аз %s пурсед.
@@ -183,7 +185,7 @@ Information=Маълумот
 ContactsWithThirdpartyFilter=Тамос бо филтри тарафи сеюм
 Unanswered=Беҷавоб
 Answered=Ҷавоб дод
-IsNotAnAnswer=Ҷавоб нест (почтаи аввал)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Ҷавоби почтаи аввал аст
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Арзиши пешфарз барои майдони '%s' ҳангоми эҷоди алоқаи нав
@@ -199,6 +201,6 @@ ModelTemplate=Шаблони почтаи электронӣ
 YouCanChooseAModelForYouMailContent= Шумо метавонед яке аз моделҳои қолабиро интихоб кунед ё якеро бо AI тавлид кунед
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/tg_TJ/main.lang b/htdocs/langs/tg_TJ/main.lang
index 0b30b036325..b6e4c9b5912 100644
--- a/htdocs/langs/tg_TJ/main.lang
+++ b/htdocs/langs/tg_TJ/main.lang
@@ -37,6 +37,7 @@ Translation=Тарҷума
 Translations=Тарҷумаҳо
 CurrentTimeZone=TimeZone PHP (сервер)
 EmptySearchString=Меъёрҳои ҷустуҷӯии холиро ворид кунед
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Меъёрҳои сана ворид кунед
 NoRecordFound=Ҳеҷ сабт ёфт нашуд
 NoRecordDeleted=Ҳеҷ сабт нест карда нашудааст
@@ -45,6 +46,7 @@ NoError=Хато нест
 Error=Хатогӣ
 Errors=Хатогиҳо
 ErrorFieldRequired=Майдони '%s' ҳатмист
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Майдони '%s' арзиши бад дорад
 ErrorFileDoesNotExists=Файли %s вуҷуд надорад
 ErrorFailedToOpenFile=Файли %s кушода нашуд
@@ -308,6 +310,7 @@ DateBuild=Санаи сохтани гузориш
 DatePayment=Санаи пардохт
 DateApprove=Санаи тасдиқ
 DateApprove2=Санаи тасдиқ (тасдиқи дуюм)
+PendingSince=Pending since
 RegistrationDate=Санаи бақайдгирӣ
 UserCreation=Истифодабарандаи офариниш
 UserModification=Истифодабарандаи тағирёбанда
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Сар кардан
 ActionRunningShort=Дар ҷараён
 ActionDoneShort=Анҷом ёфт
 ActionUncomplete=Нопурра
-LatestLinkedEvents=Охирин рӯйдодҳои алоқаманд %s
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Ширкат/Ташкилот
 Accountant=Муҳосиб
 ContactsForCompany=Тамос барои ин шахси сеюм
@@ -503,6 +506,7 @@ ContactsAddressesForCompany=Тамосҳо/суроғаҳо барои ин ша
 AddressesForCompany=Суроғаҳо барои ин шахси сеюм
 ActionsOnCompany=Чорабиниҳо барои ин шахси сеюм
 ActionsOnContact=Чорабиниҳо барои ин тамос/суроға
+ActionsOnUser=Events for this user
 ActionsOnContract=Чорабиниҳо барои ин шартнома
 ActionsOnMember=Ҳодисаҳо дар бораи ин аъзо
 ActionsOnProduct=Ҳодисаҳо дар бораи ин маҳсулот
@@ -720,6 +724,8 @@ TextUsedInTheMessageBody=Мақоми почтаи электронӣ
 SendAcknowledgementByMail=Почтаи электронии тасдиқкуниро фиристед
 SendMail=Почтаи электронӣ фиристед
 Email=Почтаи электронӣ
+EMail=Email
+EMails=Emails
 NoEMail=Почтаи электронӣ нест
 AlreadyRead=Аллакай хондаед
 NotRead=Нохонда
@@ -792,7 +798,7 @@ Notes=Эзоҳҳо
 AddNewLine=Иловаи хати нав
 AddFile=Файл илова кунед
 FreeZone=Маҳсулоти матнии ройгон
-FreeLineOfType=Унсури матни ройгон, нависед:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Объекти клон бо хусусиятҳои асосии он
 ReGeneratePDF=PDF-ро дубора эҷод кунед
 PDFMerge=PDF -ро якҷоя кунед
@@ -878,12 +884,14 @@ toward=ба сӯи
 Access=Дастрасӣ
 SelectAction=Амалро интихоб кунед
 SelectTargetUser=Истифодабарандаи мақсаднок/кормандро интихоб кунед
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Ctrl+C -ро барои нусхабардорӣ ба буфер истифода баред
 SaveUploadedFileWithMask=Файлро дар сервер бо номи "<strong> %s </strong>" захира кунед (вагарна "%s")
 OriginFileName=Номи аслии файл
 SetDemandReason=Манбаъро таъин кунед
 SetBankAccount=Ҳисоби бонкиро муайян кунед
 AccountCurrency=Асъори ҳисоб
+AccountancyCode=Accounting Code
 ViewPrivateNote=Дидани қайдҳо
 XMoreLines=хати %s пинҳон карда шудааст
 ShowMoreLines=Хати бештар/камтар нишон диҳед
@@ -924,6 +932,7 @@ ConfirmMassDeletionQuestion=Шумо мутмаин ҳастед, ки сабт
 ConfirmMassClone=Тасдиқи клони оммавӣ
 ConfirmMassCloneQuestion=Лоиҳаеро интихоб кунед, то клон кунед
 ConfirmMassCloneToOneProject=Клон ба лоиҳаи %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Объектҳои марбут
 ClassifyBilled=Тасниф кардани ҳисоб
 ClassifyUnbilled=Тасниф карданашуда
@@ -960,10 +969,11 @@ PrivateDownloadLinkDesc=Шумо бояд вориди систем шавед 
 Download=Зеркашӣ кунед
 DownloadDocument=Ҳуҷҷатро зеркашӣ кунед
 DownloadSignedDocument=Ҳуҷҷати имзошударо зеркашӣ кунед
-ActualizeCurrency=Навсозии қурби асъор
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Соли молиявӣ
 ModuleBuilder=Модул ва созандаи барнома
 SetMultiCurrencyCode=Танзими асъор
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Амалҳои оммавӣ
 ClickToShowHelp=Барои нишон додани ёрии асбобҳо клик кунед
 WebSite=Вебсайт
@@ -1103,6 +1113,7 @@ PayedBy=Аз ҷониби пардохт
 PayedTo=Ба пардохт
 Monthly=Ҳармоҳа
 Quarterly=Ҳар семоҳа
+Quarter=Quarter
 Annual=Солона
 Local=Маҳаллӣ
 Remote=Дурдаст
@@ -1145,6 +1156,7 @@ ContactDefault_project_task=Вазифа
 ContactDefault_propal=Пешниҳод
 ContactDefault_supplier_proposal=Пешниҳоди таъминкунанда
 ContactDefault_ticket=Билет
+ContactDefault_societe=Third party
 ContactAddedAutomatically=Тамос аз нақшҳои тамоси шахсони сеюм илова карда шуд
 More=Бештар
 ShowDetails=Тафсилотро нишон диҳед
@@ -1187,6 +1199,8 @@ SetSupervisor=Нозирро таъин кунед
 CreateExternalUser=Эҷоди корбари беруна
 ConfirmAffectTag=Таъиноти барчасп
 ConfirmAffectUser=Таъиноти оммавии корбар
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=Нақше, ки дар ҳар як лоиҳа/имконият таъин шудааст
 TasksRole=Нақши дар ҳар як вазифа таъиншуда (агар истифода шавад)
 ConfirmSetSupervisor=Маҷмӯи супервайзер
@@ -1238,6 +1252,9 @@ CommercialsAffected=Намояндагони фурӯш таъин карда ш
 CommercialAffected=Намояндаи фурӯш таъин шудааст
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=Паёми шумо
 YourMessageHasBeenReceived=Паёми шумо қабул карда шуд. Мо ҳарчи зудтар ҷавоб медиҳем ё бо шумо тамос хоҳем гирифт.
 UrlToCheck=URL барои тафтиш
@@ -1280,6 +1297,7 @@ AmountSalary=Маблағи музди меҳнат
 InvoiceSubtype=Зернавъи ҳисобнома-фактура
 ConfirmMassReverse=Тасдиқи баръакси оммавӣ
 ConfirmMassReverseQuestion=Оё мутмаин ҳастед, ки мехоҳед сабт(ҳо)-и интихобшударо %s баргардонед?
+ConfirmActionXxx=Confirm action %s
 ElementType=Навъи элемент
 ElementId=ID элемент
 Encrypted=Шифршуда
@@ -1299,3 +1317,35 @@ AllEntities=All entities
 TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
+auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/tg_TJ/members.lang b/htdocs/langs/tg_TJ/members.lang
index 4f47b15c67b..05702311753 100644
--- a/htdocs/langs/tg_TJ/members.lang
+++ b/htdocs/langs/tg_TJ/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Агар обуна талаб карда шавад, 
 DeleteType=Нест кардан
 VoteAllowed=Овоз беришга рухсат берилди
 Physical=Индивидуалӣ
-Moral=Корпоратсия
-MorAndPhy=Корпоратсия ва инфиродӣ
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Аз нав фаъол кунед
 ExcludeMember=Аъзоро хориҷ кунед
 Exclude=Истисно кардан
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Омори аъзоён аз рӯи минтақа
 NbOfMembers=Шумораи умумии аъзоён
 NbOfActiveMembers=Шумораи умумии аъзоёни фаъоли ҳозира
 NoValidatedMemberYet=Ягон аъзои тасдиқшуда ёфт нашуд
-MembersByCountryDesc=Ин экран ба шумо омори аъзои кишварҳоро нишон медиҳад. Графикҳо ва диаграммаҳо аз мавҷудияти хидмати графикаи онлайнии Google ва инчунин аз мавҷудияти пайвасти кории интернет вобаста аст.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Ин экран ба шумо омори аъзоёнро аз рӯи иёлот/вилоятҳо/кантон нишон медиҳад.
 MembersByTownDesc=Ин экран ба шумо омори аъзоёни шаҳрро нишон медиҳад.
 MembersByNature=Ин экран ба шумо омори аъзои табиатро нишон медиҳад.
@@ -208,25 +209,25 @@ NewMemberbyWeb=Янги аъзо қўшилди. Интизори тасдиқ
 NewMemberForm=Шакли нави аъзо
 SubscriptionsStatistics=Омори саҳмҳо
 NbOfSubscriptions=Шумораи саҳмҳо
-AmountOfSubscriptions=Маблағи аз саҳм гирифташуда
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=Гардиш (барои ширкат) ё буҷет (барои таҳкурсӣ)
-DefaultAmount=Маблағи пешфарзи саҳм (танҳо дар ҳолате истифода мешавад, ки дар сатҳи намуди аъзо ягон маблағ муайян нашуда бошад)
-MinimumAmount=Маблағи ҳадди ақал (танҳо ҳангоми озод будани маблағи саҳм истифода мешавад)
-CanEditAmount=Маблағи обунаро аъзо метавонад муайян кунад
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=Меҳмон метавонад новобаста аз намуди аъзоён маблағи саҳми худро интихоб/таҳрир кунад
 AmountIsLowerToMinimumNotice=Маблағ аз ҳадди ақали %s камтар аст
 MEMBER_NEWFORM_PAYONLINE=Пас аз бақайдгирии онлайн, ба таври худкор ба саҳифаи пардохти онлайн гузаред
 ByProperties=Аз рӯи табиат
 MembersStatisticsByProperties=Аъзоёни омор аз рӯи табиат
-VATToUseForSubscriptions=Меъёри андоз аз арзиши иловашуда барои саҳмҳо
-NoVatOnSubscription=ААИ барои саҳмҳо вуҷуд надорад
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Маҳсулоте, ки барои хати саҳм дар ҳисобнома истифода мешавад: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=Ном ё ширкат
 SubscriptionRecorded=Саҳм сабт шудааст
 NoEmailSentToMember=Ба аъзо почтаи электронӣ фиристода нашудааст
 EmailSentToMember=Паёми электронӣ ба аъзо дар %s фиристода шудааст
-SendReminderForExpiredSubscriptionTitle=Ёдраскуниро тавассути почтаи электронӣ барои саҳмҳои мӯҳлаташон гузашта фиристед
-SendReminderForExpiredSubscription=Ҳангоми ба охир расидани мӯҳлати саҳм ба аъзоён ёдраскуниро тавассути почтаи электронӣ фиристед (параметр шумораи рӯзҳо пеш аз анҷоми узвият барои фиристодани ёдраскуниҳо мебошад. Он метавонад рӯйхати рӯзҳо бошад, ки бо аломати вергул ҷудо карда шудаанд, масалан '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Узвият дар давраи ҷорӣ пардохт карда мешавад (то %s)
 YouMayFindYourInvoiceInThisEmail=Шумо метавонед фактураи худро ба ин почта замима кунед
 XMembersClosed=Аъзои %s баста шуданд
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Шахси сеюм шахси ҳуқуқӣ меб
 MemberFirstname=Номи аъзои
 MemberLastname=Фамилия аъзо
 MemberCodeDesc=Кодекси аъзо, барои ҳамаи аъзоён беназир
-MemberSubscriptionStartFirstDayOf=Санаи оғози узвият ба рӯзи аввали а
-MemberSubscriptionStartAfter=Мӯҳлати ҳадди ақал то эътибор пайдо кардани санаи оғози обуна ба истиснои тамдид (мисол +3м = +3 моҳ, -5д = -5 рӯз, +1Y = +1 сол)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Узвият бо муомилоти мувофиқашуда алоқаманд аст, бинобар ин, ин тағирот иҷозат дода намешавад.
 ConfirmMassSubsriptionCreation=Эҷоди обунаро тасдиқ кунед
 ConfirmMassSubsriptionCreationQuestion=Оё мутмаин ҳастед, ки мехоҳед обуна(ҳо)-и интихобшударо %s эҷод кунед?
diff --git a/htdocs/langs/tg_TJ/salaries.lang b/htdocs/langs/tg_TJ/salaries.lang
index 61d2dd9f084..047692b440f 100644
--- a/htdocs/langs/tg_TJ/salaries.lang
+++ b/htdocs/langs/tg_TJ/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Музди нав
 AddSalary=Илова кардани музди меҳнат
 NewSalaryPayment=Корти нави маош
 AddSalaryPayment=Иловаи пардохти музди меҳнат
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Пардохти музди меҳнат
 SalariesPayments=Пардохтҳои музди меҳнат
 SalariesPaymentsOf=Пардохти маоши %s
@@ -27,7 +29,7 @@ FillFieldFirst=Аввал майдони кормандро пур кунед
 UpdateAmountWithLastSalary=Маблағи музди охиринро муқаррар кунед
 MakeTransferRequest=Дархости интиқол
 VirementOrder=Дархост барои интиқоли қарз
-BankTransferAmount=Маблағи интиқоли кредит
 WithdrawalReceipt=Тартиби интиқоли кредит
 OrderWaiting=Фармоиш интизор аст
 FillEndOfMonth=Бо охири моҳ пур кунед
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/tg_TJ/website.lang b/htdocs/langs/tg_TJ/website.lang
index e5ea49743d1..7f6453c5b54 100644
--- a/htdocs/langs/tg_TJ/website.lang
+++ b/htdocs/langs/tg_TJ/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Дар ин ҷо рӯйхати номҳо/тахаллус
 WEBSITE_CSS_URL=URL -и файли берунии CSS
 WEBSITE_CSS_INLINE=Мундариҷаи файли CSS (барои ҳамаи саҳифаҳо маъмул аст)
 WEBSITE_JS_INLINE=Мундариҷаи файли JavaScript (барои ҳама саҳифаҳо умумӣ)
-WEBSITE_HTML_HEADER=Илова дар поёни сарлавҳаи HTML (умумӣ барои ҳама саҳифаҳо)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Файли роботӣ (robots.txt)
 WEBSITE_HTACCESS=Файли вебсайт .htaccess
 WEBSITE_MANIFEST_JSON=Файли вебсайти manifest.json
@@ -56,16 +56,17 @@ ReadPerm=Хондан
 WritePerm=Нависед
 TestDeployOnWeb=Санҷиш/густариш дар веб
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr= <u> Пешнамоиши %s дар ҷадвали нав. </u> <br> <br> %s аз ҷониби сервери Dolibarr хидмат карда мешавад, аз ин рӯ барои насб кардан ягон сервери иловагии веб (ба монанди Apache, Nginx, IIS) лозим нест. <br> Хеле нороҳаткунанда дар он аст, ки URL -и саҳифаҳо барои корбарон қулай нестанд ва аз роҳи Dolibarr -и худ оғоз мекунанд. <br> URL хизмат аз тарафи Dolibarr: <br> <strong> %s </strong> <br> <br> Барои истифодаи худ веб беруна сервери Шумо ба хизмат дар ин сомона, эҷод мизбон виртуалӣ дар веб-сервер аз шумо, ки нуқтаҳои оид ба феҳрист <br> <strong> %s </strong> <br> он гоҳ номи ин сервер виртуалӣ дохил дар хосиятҳои ин вебсайт ва истиноди "Санҷиш/Ҷойгиркунӣ дар веб" -ро клик кунед.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL -и мизбони маҷозӣ, ки аз ҷониби веб -сервери беруна хидмат мекунад, муайян нашудааст
 NoPageYet=Ҳоло ягон саҳифа нест
 YouCanCreatePageOrImportTemplate=Шумо метавонед як саҳифаи нав эҷод кунед ё як қолаби пурраи вебсайтро ворид кунед
 SyntaxHelp=Кӯмак дар маслиҳатҳои мушаххаси синтаксис
 YouCanEditHtmlSourceckeditor=Шумо метавонед рамзи сарчашмаи HTML -ро бо истифода аз тугмаи "Манбаъ" дар муҳаррир таҳрир кунед.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Барои тасвире, ки бо истиноди мубодила мубодила карда мешавад (дастрасии кушод бо калиди мубодилаи ҳеши файл), синтаксис ин аст: <br> <strong> &lt;img src = "/viewimage.php? Hashp = 12345679012z00f01d0f0d0fd09d09d0fd09d0f0f0e9
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Саҳифа/контейнерро клон кунед
 CloneSite=Сайти клон
@@ -87,15 +88,15 @@ WebsiteAccount=Ҳисоби вебсайт
 WebsiteAccounts=Ҳисобҳои вебсайт
 AddWebsiteAccount=Ҳисоби вебсайтро эҷод кунед
 BackToListForThirdParty=Бозгашт ба рӯйхат барои шахсони сеюм
-DisableSiteFirst=Аввал вебсайтро хомӯш кунед
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Унвони вебсайти ман
 AnotherContainer=Ин аст, ки мундариҷаи саҳифа/контейнери дигарро чӣ гуна дохил кардан мумкин аст (агар шумо рамзи динамикиро фаъол созед, зеро зерконтейнери дарунсохт мавҷуд набошад, шумо дар ин ҷо хато карда метавонед)
 SorryWebsiteIsCurrentlyOffLine=Бубахшед, ин вебсайт дар ҳоли ҳозир хомӯш аст. Лутфан дертар баргардед ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ҷадвалро барои нигоҳ доштани ҳисобҳои вебсайт (вуруд / гузар) барои ҳар як вебсайт / шахси сеюм фаъол созед
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Шумо аввал бояд саҳифаи хонагии пешфарзро муайян кунед
-OnlyEditionOfSourceForGrabbedContentFuture=Огоҳӣ: Сохтани саҳифаи интернетӣ тавассути ворид кардани веб саҳифаи берунӣ барои корбарони ботаҷриба маҳфуз аст. Вобаста аз мураккабии саҳифаи сарчашма, натиҷаи воридот метавонад аз асл фарқ кунад. Инчунин, агар саҳифаи манбаъ услубҳои маъмули CSS ё JavaScript-и ба ҳам мухолифро истифода барад, он метавонад ҳангоми кор дар ин саҳифа намуд ё хусусиятҳои муҳаррири вебсайтро вайрон кунад. Ин усул роҳи зудтари сохтани саҳифа аст, аммо тавсия дода мешавад, ки саҳифаи нави худро аз сифр ё аз қолаби саҳифаи пешниҳодшуда созед.<br>Инчунин дар хотир доред, ки муҳаррири сатрӣ кор намекунад. дурустӣ ҳангоми истифода дар саҳифаи берунаи дастгиршуда.
-OnlyEditionOfSourceForGrabbedContent=Танҳо нашри манбаи HTML имконпазир аст, агар мундариҷа аз сайти беруна гирифта шавад
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Ҳамчунин тасвирҳои дар CSS ва саҳифа мавҷудбударо гиред.
 ImagesShouldBeSavedInto=Тасвирҳо бояд дар феҳрист сабт карда шаванд
 WebsiteRootOfImages=Феҳристи решавӣ барои тасвирҳои вебсайт
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Remove filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Categories
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 6ecc4374ee6..694c083bddc 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=ผ่านการตรวจสอบค
 FileIntegritySomeFilesWereRemovedOrModified=การตรวจสอบความสมบูรณ์ของไฟล์ล้มเหลว ไฟล์บางไฟล์ถูกแก้ไข ลบ หรือเพิ่ม
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=ทำการวิเคราะห์ความสมบูรณ์ของไฟล์แอปพลิเคชันจาก
-LocalSignature=Embedded local signature (ความน่าเชื่อถือน้อยกว่า)
-RemoteSignature=Remote distant signature (เชื่อถือได้มากขึ้น)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=ไฟล์ที่ขาดหายไป
 FilesUpdated=ไฟล์ล่าสุด
 FilesModified=ไฟล์ที่มีการแก้ไข
@@ -69,7 +69,7 @@ SecuritySetup=การตั้งค่าการรักษาความ
 PHPSetup=การตั้งค่า PHP
 OSSetup=การตั้งค่า OS
 SecurityFilesDesc=กำหนดตัวเลือกที่เกี่ยวข้องกับความปลอดภัยในการอัปโหลดไฟล์ที่นี่
-ErrorModuleRequirePHPVersion=ข้อผิดพลาดนี้ต้องใช้โมดูล PHP รุ่น% s หรือสูงกว่า
+ErrorModuleRequirePHPVersion=ข้อผิดพลาดนี้ต้องใช้โมดูล PHP รุ่น %s หรือสูงกว่า
 ErrorModuleRequireDolibarrVersion=ข้อผิดพลาดในโมดูลนี้ต้อง s Dolibarr รุ่น% หรือสูงกว่า
 ErrorDecimalLargerThanAreForbidden=ข้อผิดพลาด, ความแม่นยำสูงกว่า <b>%s</b> ไม่ได้รับการสนับสนุน
 DictionarySetup=การติดตั้งพจนานุกรม
@@ -185,8 +185,8 @@ ImportMethod=วิธีนำเข้า
 ToBuildBackupFileClickHere=เพื่อสร้างแฟ้มสำรองข้อมูลคลิก <a href="%s">ที่นี่</a>
 ImportMySqlDesc=ในการนำเข้าไฟล์สำรอง MySQL คุณสามารถใช้ phpMyAdmin ผ่านทางโฮสติ้งของคุณหรือใช้คำสั่ง mysql จากบรรทัดคำสั่ง<br>ตัวอย่างเช่น:
 ImportPostgreSqlDesc=ที่จะนำเข้าแฟ้มสำรองข้อมูลคุณต้องใช้คำสั่ง pg_restore จากบรรทัดคำสั่ง:
-ImportMySqlCommand=% s% s <mybackupfile.sql
-ImportPostgreSqlCommand=% s% s mybackupfile.sql
+ImportMySqlCommand=%s %s < mybackupfile.sql
+ImportPostgreSqlCommand=%s %s mybackupfile.sql
 FileNameToGenerate=ชื่อไฟล์สำหรับการสำรองข้อมูล:
 Compression=การบีบอัด
 CommandsToDisableForeignKeysForImport=คำสั่งปิดการใช้งานปุ่มต่างประเทศในการนำเข้า
@@ -251,9 +251,9 @@ UsedOnlyWithTypeOption=ตัวเลือกที่ใช้โดยวา
 Security=ความปลอดภัย
 Passwords=รหัสผ่าน
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=เข้ารหัสรหัสผ่านฐานข้อมูลที่จัดเก็บไว้ใน conf.php ขอแนะนำให้เปิดใช้งานตัวเลือกนี้
-InstrucToEncodePass=จะมีรหัสผ่านที่เข้ารหัสเป็นไฟล์ <b>conf.php</b> เปลี่ยนสาย <br> <b>$ dolibarr_main_db_pass = "... ";</b> <br> โดย <br> <b>$ dolibarr_main_db_pass = "crypted:% s";</b>
-InstrucToClearPass=จะมีรหัสผ่านถอดรหัส (ชัดเจน) เป็นไฟล์ <b>conf.php</b> เปลี่ยนสาย <br> <b>$ dolibarr_main_db_pass = "crypted ... ";</b> <br> โดย <br> <b>$ dolibarr_main_db_pass = "% s";</b>
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
+InstrucToEncodePass=จะมีรหัสผ่านที่เข้ารหัสเป็นไฟล์ <b>conf.php</b> เปลี่ยนสาย <br> <b>$ dolibarr_main_db_pass = "... ";</b> <br> โดย <br> <b>$ dolibarr_main_db_pass = "crypted: %s";</b>
+InstrucToClearPass=จะมีรหัสผ่านถอดรหัส (ชัดเจน) เป็นไฟล์ <b>conf.php</b> เปลี่ยนสาย <br> <b>$ dolibarr_main_db_pass = "crypted ... ";</b> <br> โดย <br> <b>$ dolibarr_main_db_pass = "%s";</b>
 ProtectAndEncryptPdfFiles=ป้องกันไฟล์ PDF ที่สร้างขึ้น ไม่แนะนำเนื่องจากเป็นการหยุดการสร้าง PDF จำนวนมาก
 ProtectAndEncryptPdfFilesDesc=การป้องกันเอกสาร PDF ทำให้สามารถอ่านและพิมพ์ด้วยเบราว์เซอร์ PDF ใดก็ได้ อย่างไรก็ตาม ไม่สามารถแก้ไขและคัดลอกได้อีกต่อไป โปรดทราบว่าการใช้คุณลักษณะนี้ทำให้การสร้าง PDF ที่ผสานรวมทั้งหมดไม่ทำงาน
 Feature=ความสามารถ
@@ -376,8 +376,8 @@ GenericMaskCodes5b=<b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> i
 GenericNumRefModelDesc=ส่งกลับจำนวนที่ปรับแต่งได้ตามที่กำหนดไว้หน้ากาก
 DateStartThatModel=Disable use of this numbering rule for all thirdparties created before
 DateStartThatModelHelp=You can disable elephant numbering rule for thirdparties created before a date (for example, because they were imported by a migration, from another software using a different rule). Let that field empty to have the rule applied on all thirdparties.
-ServerAvailableOnIPOrPort=<b>เซิร์ฟเวอร์ที่มีอยู่ในที่อยู่% s พอร์ต% s</b>
-ServerNotAvailableOnIPOrPort=<b>เซิร์ฟเวอร์ที่ไม่สามารถใช้ได้ตามที่อยู่% s พอร์ต% s</b>
+ServerAvailableOnIPOrPort=<b>เซิร์ฟเวอร์ที่มีอยู่ในที่อยู่ %s พอร์ต %s</b>
+ServerNotAvailableOnIPOrPort=<b>เซิร์ฟเวอร์ที่ไม่สามารถใช้ได้ตามที่อยู่ %s พอร์ต %s</b>
 DoTestServerAvailability=ทดสอบการเชื่อมต่อเซิร์ฟเวอร์
 DoTestSend=ทดสอบการส่ง
 DoTestSendHTML=ทดสอบการส่ง HTM​​L
@@ -429,7 +429,7 @@ PlaceCustomerAddressToIsoLocation=ใช้ตำแหน่งมาตรฐ
 Library=ห้องสมุด
 UrlGenerationParameters=พารามิเตอร์ URL ที่การรักษาความปลอดภัย
 SecurityTokenIsUnique=ใช้พารามิเตอร์ SecureKey ไม่ซ้ำกันสำหรับแต่ละ URL
-EnterRefToBuildUrl=ป้อนการอ้างอิงสำหรับวัตถุ% s
+EnterRefToBuildUrl=ป้อนการอ้างอิงสำหรับวัตถุ %s
 GetSecuredUrl=รับ URL คำนวณ
 ButtonHideUnauthorized=ซ่อนปุ่มการกระทำที่ไม่ได้รับอนุญาตสำหรับผู้ใช้ภายในด้วย (เพียงเป็นสีเทาเท่านั้น)
 OldVATRates=อัตราภาษีมูลค่าเพิ่มเก่า
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=สนามคำนวณ
-ComputedFormulaDesc=คุณสามารถป้อนสูตรที่นี่โดยใช้คุณสมบัติอื่นๆ ของวัตถุหรือการเข้ารหัส PHP ใดๆ เพื่อรับค่าที่คำนวณแบบไดนามิก คุณสามารถใช้สูตรที่เข้ากันได้กับ PHP รวมถึงเครื่องหมาย "?" ตัวดำเนินการเงื่อนไขและอ็อบเจ็กต์โกลบอลต่อไปนี้: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>คำเตือน</strong>: หากคุณต้องการคุณสมบัติของวัตถุ ไม่ได้โหลด เพียงดึงออบเจ็กต์ให้กับตัวเองลงในสูตรเหมือนในตัวอย่างที่สอง<br>การใช้ฟิลด์ที่คำนวณแล้วหมายความว่าคุณไม่สามารถป้อนค่าใดๆ ให้กับตัวเองจากอินเทอร์เฟซได้ นอกจากนี้ หากมีข้อผิดพลาดทางไวยากรณ์ สูตรอาจไม่ส่งคืนอะไรเลย<br><br>ตัวอย่างของสูตร:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>ตัวอย่างในการรีโหลดอ็อบเจ็กต์<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj- >ทุน / 5: '-1')<br><br>ตัวอย่างอื่นๆ ของสูตรเพื่อบังคับโหลดวัตถุและวัตถุแม่: <br>(($reloadedobj = งานใหม่($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = โครงการใหม่( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'ไม่พบโครงการหลัก'
+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'
 Computedpersistent=เก็บสนามคำนวณ
 ComputedpersistentDesc=ฟิลด์พิเศษที่คำนวณแล้วจะถูกจัดเก็บไว้ในฐานข้อมูล อย่างไรก็ตาม ค่าจะถูกคำนวณใหม่เมื่อมีการเปลี่ยนแปลงออบเจ็กต์ของฟิลด์นี้เท่านั้น หากสนามที่คำนวณขึ้นอยู่กับวัตถุอื่นหรือข้อมูลทั่วโลก ค่านี้อาจผิด!!
 ExtrafieldParamHelpPassword=การเว้นช่องนี้ว่างไว้หมายความว่าค่านี้จะถูกจัดเก็บโดยไม่มีการเข้ารหัส (ช่องนี้ซ่อนไว้โดยมีดาวอยู่บนหน้าจอ)<br><br>Enter ค่า 'dolcrypt' เพื่อเข้ารหัสค่าด้วยอัลกอริธึมการเข้ารหัสแบบย้อนกลับ ข้อมูลที่ชัดเจนยังคงสามารถทราบและแก้ไขได้ แต่ถูกเข้ารหัสไว้ในฐานข้อมูล<br><br>ป้อน 'auto' (หรือ 'md5', 'sha256', 'password_hash', ...) เพื่อใช้อัลกอริธึมการเข้ารหัสรหัสผ่านเริ่มต้น (หรือ md5, sha256,password_hash...) เพื่อบันทึกรหัสผ่านที่แฮชแบบย้อนกลับไม่ได้ลงในฐานข้อมูล (ไม่มีวิธีการดึงค่าดั้งเดิม)
@@ -480,9 +481,9 @@ ExtrafieldParamHelpSeparator=เว้นว่างไว้สำหรับ
 LibraryToBuildPDF=ไลบรารีที่ใช้สำหรับการสร้าง PDF
 LocalTaxDesc=บางประเทศอาจใช้ภาษีสองหรือสามภาษีในแต่ละบรรทัดใบแจ้งหนี้ ในกรณีนี้ ให้เลือกประเภทภาษีที่สองและสามและอัตราภาษี ประเภทที่เป็นไปได้คือ<br>1: จะมีการเรียกเก็บภาษีท้องถิ่นสำหรับผลิตภัณฑ์และบริการที่ไม่มีภาษีมูลค่าเพิ่ม (localtax จะคำนวณจากจำนวนเงินที่ไม่รวมภาษี)<br> 2: ภาษีท้องถิ่นมีผลกับผลิตภัณฑ์และบริการที่รวมภาษีมูลค่าเพิ่ม (localtax คำนวณจากจำนวนเงิน + ภาษีหลัก)<br>3: ภาษีท้องถิ่นมีผลกับผลิตภัณฑ์ที่ไม่มีภาษีมูลค่าเพิ่ม (localtax คำนวณจากจำนวนเงินที่ไม่มี ภาษี)<br>4: จะมีการเรียกเก็บภาษีท้องถิ่นสำหรับผลิตภัณฑ์ที่รวมภาษีมูลค่าเพิ่ม (localtax คำนวณจากจำนวนเงิน + vat หลัก)<br>5: ท้องถิ่น จะมีการคิดภาษีสำหรับบริการที่ไม่มีภาษีมูลค่าเพิ่ม (localtax คำนวณจากจำนวนเงินที่ไม่รวมภาษี)<br>6: ภาษีท้องถิ่นมีผลกับบริการที่รวมภาษีมูลค่าเพิ่ม (localtax คำนวณจากจำนวนเงิน + ภาษี)
 SMS=SMS
-LinkToTestClickToDial=ป้อนหมายเลขโทรศัพท์เพื่อโทรไปที่จะแสดงการเชื่อมโยงเพื่อทดสอบสมาชิก ClickToDial <strong>สำหรับผู้ใช้% s</strong>
+LinkToTestClickToDial=ป้อนหมายเลขโทรศัพท์เพื่อโทรไปที่จะแสดงการเชื่อมโยงเพื่อทดสอบสมาชิก ClickToDial <strong>สำหรับผู้ใช้ %s</strong>
 RefreshPhoneLink=การเชื่อมโยงการฟื้นฟู
-LinkToTest=<strong>ลิงค์ที่สร้างขึ้นสำหรับผู้ใช้% s</strong> (คลิกหมายเลขโทรศัพท์เพื่อทดสอบ)
+LinkToTest=<strong>ลิงค์ที่สร้างขึ้นสำหรับผู้ใช้ %s</strong> (คลิกหมายเลขโทรศัพท์เพื่อทดสอบ)
 KeepEmptyToUseDefault=ให้ว่างเพื่อใช้ค่าเริ่มต้น
 KeepThisEmptyInMostCases=ในกรณีส่วนใหญ่ คุณสามารถเว้นฟิลด์นี้ว่างไว้ได้
 DefaultLink=เริ่มต้นการเชื่อมโยง
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- การใช้เซิร์ฟเวอร์ SMTP ของผู้ให้บริการอีเมลของคุณเองในการส่งอีเมลก็น่าสนใจเช่นกัน ดังนั้นอีเมลทั้งหมดที่ส่งจากแอปพลิเคชันจะถูกบันทึกลงในไดเร็กทอรี "ส่ง" ของกล่องจดหมายของคุณด้วย
 WarningPHPMailD=ดังนั้นจึงแนะนำให้เปลี่ยนวิธีการส่งอีเมลเป็นค่า "SMTP"
 WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
-WarningPHPMail2=หากผู้ให้บริการอีเมล SMTP ของคุณจำเป็นต้องจำกัดโปรแกรมรับส่งอีเมลไว้เฉพาะที่อยู่ IP บางส่วน (ซึ่งพบได้ยากมาก) นี่คือที่อยู่ IP ของตัวแทนผู้ใช้อีเมล (MUA) สำหรับแอปพลิเคชัน ERP CRM ของคุณ: <strong>%s</strong>
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=การบัญชี (แบบง่าย)
 Module10Desc=รายงานการบัญชีอย่างง่าย (วารสาร ผลประกอบการ) ตามเนื้อหาฐานข้อมูล ไม่ใช้ตารางบัญชีแยกประเภทใดๆ
 Module20Name=ข้อเสนอ
 Module20Desc=การจัดการข้อเสนอในเชิงพาณิชย์
-Module22Name=การส่งอีเมลจำนวนมาก
-Module22Desc=จัดการการส่งอีเมลจำนวนมาก
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=พลังงาน
 Module23Desc=การตรวจสอบการใช้พลังงาน
 Module25Name=ใบสั่งขาย
@@ -847,10 +848,10 @@ Permission212=สายการสั่งซื้อสินค้า
 Permission213=เปิดใช้งานสาย
 Permission214=การติดตั้งโทรศัพท์
 Permission215=ผู้ให้บริการติดตั้ง
-Permission221=อ่าน emailings
-Permission222=สร้าง / แก้ไข emailings (หัวข้อผู้รับ ... )
-Permission223=ตรวจสอบ emailings (ช่วยให้การส่ง)
-Permission229=ลบ emailings
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=ดูผู้รับและข้อมูล
 Permission238=ด้วยตนเองส่งจดหมาย
 Permission239=ลบหลังจากการตรวจสอบการส่งจดหมายหรือส่ง
@@ -1105,6 +1106,7 @@ DictionaryStaff=จำนวนพนักงาน
 DictionaryAvailability=ความล่าช้าในการจัดส่งสินค้า
 DictionaryOrderMethods=วิธีการสั่งซื้อ
 DictionarySource=แหล่งที่มาของข้อเสนอ / การสั่งซื้อ
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=กลุ่มส่วนบุคคลสำหรับรายงาน
 DictionaryAccountancysystem=รุ่นสำหรับผังบัญชี
 DictionaryAccountancyJournal=วารสารการบัญชี
@@ -1134,11 +1136,11 @@ BackToDictionaryList=กลับไปที่รายการพจนา
 TypeOfRevenueStamp=ประเภทของอากรแสตมป์
 VATManagement=การจัดการภาษีการขาย
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=ตามค่าเริ่มต้น ภาษีขายที่เสนอจะเป็น 0 ซึ่งสามารถใช้สำหรับกรณีต่างๆ เช่น สมาคม บุคคล หรือบริษัทขนาดเล็ก
 VATIsUsedExampleFR=ในฝรั่งเศส หมายถึงบริษัทหรือองค์กรที่มีระบบการเงินที่แท้จริง (จริงแบบง่ายหรือเรียลปกติ) ระบบการประกาศภาษีมูลค่าเพิ่ม
 VATIsNotUsedExampleFR=ในฝรั่งเศส หมายถึงสมาคมที่ไม่ได้รับการประกาศภาษีการขาย หรือบริษัท องค์กร หรือวิชาชีพเสรีที่ได้เลือกระบบการเงินขององค์กรขนาดเล็ก (ภาษีการขายในแฟรนไชส์) และชำระภาษีการขายของแฟรนไชส์โดยไม่มีการประกาศภาษีการขายใดๆ ตัวเลือกนี้จะแสดงการอ้างอิง "ภาษีขายที่ไม่เกี่ยวข้อง - art-293B ของ CGI" บนใบแจ้งหนี้
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=ประเภทของภาษีการขาย
 LTRate=เรท
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=ตามการตั้งค่าภาษี (
 LabelUsedByDefault=ฉลากใช้โดยเริ่มต้นถ้าแปลไม่สามารถพบได้สำหรับรหัส
 LabelOnDocuments=ป้ายเกี่ยวกับเอกสาร
 LabelOrTranslationKey=ป้ายกำกับหรือคีย์การแปล
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1243,7 +1246,7 @@ LogoSquarred=โลโก้ (สี่เหลี่ยม)
 LogoSquarredDesc=ต้องเป็นไอคอนสี่เหลี่ยม (กว้าง = สูง) โลโก้นี้จะใช้เป็นไอคอนรายการโปรดหรือความต้องการอื่นๆ สำหรับแถบเมนูด้านบน (หากไม่ได้ปิดใช้งานในการตั้งค่าการแสดงผล)
 DoNotSuggestPaymentMode=อย่าแนะนำ
 NoActiveBankAccountDefined=ไม่มีบัญชีธนาคารที่ใช้งานที่กำหนดไว้
-OwnerOfBankAccount=เจ้าของบัญชีธนาคารของ% s
+OwnerOfBankAccount=เจ้าของบัญชีธนาคารของ %s
 BankModuleNotActive=โมดูลบัญชีธนาคารไม่ได้เปิดใช้
 ShowBugTrackLink=แสดงลิงก์ "<strong>%s</strong>"
 ShowBugTrackLinkDesc=เว้นว่างไว้หากไม่ต้องการแสดงลิงก์นี้ ใช้ค่า 'github' สำหรับลิงก์ไปยังโครงการ Dolibarr หรือกำหนด URL โดยตรง 'https://...'
@@ -1310,7 +1313,7 @@ TriggersDesc=ทริกเกอร์คือไฟล์ที่จะป
 TriggerDisabledByName=ทริกเกอร์ในแฟ้มนี้มีการปิดใช้งานโดยต่อท้าย <b>-NORUN</b> ในชื่อของพวกเขา
 TriggerDisabledAsModuleDisabled=<b>ทริกเกอร์ในแฟ้มนี้ถูกปิดใช้งานเป็นของโมดูล%</b> ถูกปิดใช้งาน
 TriggerAlwaysActive=ทริกเกอร์ในแฟ้มนี้มีการใช้งานอยู่เสมอสิ่งที่มีการเปิดใช้งานโมดูล Dolibarr
-TriggerActiveAsModuleActive=<b>ทริกเกอร์ในแฟ้มนี้มีการใช้งานเป็นโมดูล% s</b> ถูกเปิดใช้งาน
+TriggerActiveAsModuleActive=<b>ทริกเกอร์ในแฟ้มนี้มีการใช้งานเป็นโมดูล %s</b> ถูกเปิดใช้งาน
 GeneratedPasswordDesc=เลือกวิธีการที่จะใช้สำหรับรหัสผ่านที่สร้างอัตโนมัติ
 DictionaryDesc=ใส่ข้อมูลอ้างอิงทั้งหมด คุณสามารถเพิ่มค่าของคุณเป็นค่าเริ่มต้นได้
 ConstDesc=หน้านี้ช่วยให้คุณสามารถแก้ไข (แทนที่) พารามิเตอร์ที่ไม่มีอยู่ในหน้าอื่นได้ ส่วนใหญ่เป็นพารามิเตอร์ที่สงวนไว้สำหรับนักพัฒนา/การแก้ไขปัญหาขั้นสูงเท่านั้น
@@ -1344,7 +1347,7 @@ PreviousDumpFiles=ไฟล์สำรองที่มีอยู่
 PreviousArchiveFiles=ไฟล์เก็บถาวรที่มีอยู่
 WeekStartOnDay=วันแรกของสัปดาห์
 RunningUpdateProcessMayBeRequired=ดูเหมือนว่าจำเป็นต้องเรียกใช้กระบวนการอัปเกรด (เวอร์ชันของโปรแกรม %s แตกต่างจากเวอร์ชันฐานข้อมูล %s)
-YouMustRunCommandFromCommandLineAfterLoginToUser=<b>คุณต้องเรียกใช้คำสั่งจากบรรทัดคำสั่งนี้หลังจากที่เข้าสู่ระบบไปยังเปลือกกับผู้ใช้% s</b> หรือคุณต้องเพิ่มตัวเลือก -W <b>ที่ท้ายบรรทัดคำสั่งที่จะให้รหัสผ่าน% s</b>
+YouMustRunCommandFromCommandLineAfterLoginToUser=<b>คุณต้องเรียกใช้คำสั่งจากบรรทัดคำสั่งนี้หลังจากที่เข้าสู่ระบบไปยังเปลือกกับผู้ใช้ %s</b> หรือคุณต้องเพิ่มตัวเลือก -W <b>ที่ท้ายบรรทัดคำสั่งที่จะให้รหัสผ่าน %s</b>
 YourPHPDoesNotHaveSSLSupport=ฟังก์ชั่น SSL ไม่สามารถใช้ได้ใน PHP ของคุณ
 DownloadMoreSkins=กินมากขึ้นในการดาวน์โหลด
 SimpleNumRefModelDesc=ส่งกลับหมายเลขอ้างอิงในรูปแบบ %syymm-nnnn โดยที่ yy คือปี mm คือเดือน และ nnnn คือตัวเลขที่เพิ่มขึ้นตามลำดับอัตโนมัติโดยไม่มีการรีเซ็ต
@@ -1412,7 +1415,7 @@ ClassNotFoundIntoPathWarning=ไม่พบคลาส %s ในเส้น
 YesInSummer=ใช่ในช่วงฤดู​​ร้อน
 OnlyFollowingModulesAreOpenedToExternalUsers=โปรดทราบว่าเฉพาะโมดูลต่อไปนี้เท่านั้นที่พร้อมใช้งานสำหรับผู้ใช้ภายนอก (โดยไม่คำนึงถึงสิทธิ์ของผู้ใช้ดังกล่าว) และเฉพาะเมื่อมีการให้สิทธิ์:<br>
 SuhosinSessionEncrypt=เซสชั่นการจัดเก็บข้อมูลที่มีการเข้ารหัสโดย Suhosin
-ConditionIsCurrently=สภาพปัจจุบันคือ% s
+ConditionIsCurrently=สภาพปัจจุบันคือ %s
 YouUseBestDriver=คุณใช้ไดรเวอร์ %s ซึ่งเป็นไดรเวอร์ที่ดีที่สุดในปัจจุบัน
 YouDoNotUseBestDriver=คุณใช้ไดรเวอร์ %s แต่แนะนำให้ใช้ไดรเวอร์ %s
 NbOfObjectIsLowerThanNoPb=คุณมีเฉพาะ %s %s ในฐานข้อมูล ไม่จำเป็นต้องมีการเพิ่มประสิทธิภาพใดๆ เป็นพิเศษ
@@ -1431,7 +1434,7 @@ AddVatInList=แสดงหมายเลข VAT ของลูกค้า/
 AddAdressInList=แสดงที่อยู่ของลูกค้า/ผู้ขายในรายการคำสั่งผสม<br>บุคคลที่สามจะปรากฏพร้อมกับรูปแบบชื่อ "The Big Company corp. - 21 jump street 123456 Big town - USA" แทน " บริษัทเดอะบิ๊กคอมพานี"
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=สอบถามวิธีการจัดส่งที่ต้องการสำหรับบุคคลที่สาม
-FieldEdition=ฉบับของสนาม% s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=ตัวอย่าง: 2 (กรอกข้อมูลเฉพาะในกรณีที่เขตเวลาชดเชยปัญหาที่มีประสบการณ์)
 GetBarCode=รับบาร์โค้ด
 NumberingModules=การกำหนดหมายเลขรุ่น
@@ -1475,7 +1478,7 @@ TechnicalServicesProvided=ให้บริการด้านเทคนิ
 WebDAVSetupDesc=นี่คือลิงค์สำหรับเข้าถึงไดเร็กทอรี WebDAV ประกอบด้วย dir "สาธารณะ" ที่เปิดให้ผู้ใช้ทราบ URL (หากอนุญาตให้เข้าถึงไดเร็กทอรีสาธารณะ) และไดเร็กทอรี "ส่วนตัว" ที่จำเป็นต้องมีบัญชีเข้าสู่ระบบ/รหัสผ่านที่มีอยู่เพื่อการเข้าถึง
 WebDavServer=URL รากของเซิร์ฟเวอร์ %s: %s
 ##### WebCAL setup #####
-WebCalUrlForVCalExport=<b>การเชื่อมโยงการส่งออกไปยังรูปแบบ% s</b> สามารถดูได้ที่ลิงค์ต่อไปนี้:% s
+WebCalUrlForVCalExport=<b>การเชื่อมโยงการส่งออกไปยังรูปแบบ %s</b> สามารถดูได้ที่ลิงค์ต่อไปนี้: %s
 ##### Invoices #####
 BillsSetup=ใบแจ้งหนี้การติดตั้งโมดูล
 BillsNumberingModule=ใบแจ้งหนี้และบันทึกหมายเลขบัตรเครดิตรูปแบบ
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=วันที่ใบแจ้งหนี้กองทั
 SuggestedPaymentModesIfNotDefinedInInvoice=โหมดการชำระเงินที่แนะนำในใบแจ้งหนี้ตามค่าเริ่มต้น หากไม่ได้กำหนดไว้ในใบแจ้งหนี้
 SuggestPaymentByRIBOnAccount=แนะนำให้ชำระเงินโดยการถอนเงินเข้าบัญชี
 SuggestPaymentByChequeToAddress=แนะนำให้ชำระเงินด้วยเช็คไปที่
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=ข้อความฟรีในใบแจ้งหนี้
 WatermarkOnDraftInvoices=ลายน้ำบนร่างใบแจ้งหนี้ (ไม่มีถ้าว่างเปล่า)
 PaymentsNumberingModule=รูปแบบการกำหนดหมายเลขการชำระเงิน
@@ -1622,8 +1627,8 @@ LDAPTestSearch= ทดสอบค้นหา LDAP
 LDAPSynchroOK=การประสานข้อมูลการทดสอบที่ประสบความสำเร็จ
 LDAPSynchroKO=การทดสอบการประสานล้มเหลว
 LDAPSynchroKOMayBePermissions=การทดสอบการซิงโครไนซ์ล้มเหลว ตรวจสอบว่าการเชื่อมต่อกับเซิร์ฟเวอร์ได้รับการกำหนดค่าอย่างถูกต้องและอนุญาตการอัปเดต LDAP
-LDAPTCPConnectOK=TCP เชื่อมต่อกับเซิร์ฟเวอร์ LDAP ที่ประสบความสำเร็จ (เซิร์ฟเวอร์ =% s พอร์ต =% s)
-LDAPTCPConnectKO=TCP เชื่อมต่อกับเซิร์ฟเวอร์ LDAP ล้มเหลว (เซิร์ฟเวอร์ =% s พอร์ต =% s)
+LDAPTCPConnectOK=TCP เชื่อมต่อกับเซิร์ฟเวอร์ LDAP ที่ประสบความสำเร็จ (เซิร์ฟเวอร์ = %s พอร์ต = %s)
+LDAPTCPConnectKO=TCP เชื่อมต่อกับเซิร์ฟเวอร์ LDAP ล้มเหลว (เซิร์ฟเวอร์ = %s พอร์ต = %s)
 LDAPBindOK=เชื่อมต่อ/รับรองความถูกต้องกับเซิร์ฟเวอร์ LDAP สำเร็จ (Server=%s, Port=%s, Admin= %s, รหัสผ่าน=%s)
 LDAPBindKO=เชื่อมต่อ/รับรองความถูกต้องกับเซิร์ฟเวอร์ LDAP ล้มเหลว (เซิร์ฟเวอร์=%s, พอร์ต=%s, Admin= %s, รหัสผ่าน=%s)
 LDAPSetupForVersion3=การกำหนดค่าเซิร์ฟเวอร์ LDAP สำหรับรุ่นที่ 3
@@ -1709,7 +1714,7 @@ NoOPCodeCacheFound=ไม่พบแคช OPCode บางทีคุณอ
 HTTPCacheStaticResources=แคช HTTP สำหรับทรัพยากรคงที่ (css, img, JavaScript)
 FilesOfTypeCached=แฟ้ม s พิมพ์% จะถูกเก็บไว้โดยเซิร์ฟเวอร์ HTTP
 FilesOfTypeNotCached=แฟ้ม s พิมพ์% ไม่ได้เก็บไว้โดยเซิร์ฟเวอร์ HTTP
-FilesOfTypeCompressed=ไฟล์ประเภท% s จะถูกบีบอัดโดยเซิร์ฟเวอร์ HTTP
+FilesOfTypeCompressed=ไฟล์ประเภท %s จะถูกบีบอัดโดยเซิร์ฟเวอร์ HTTP
 FilesOfTypeNotCompressed=แฟ้ม s พิมพ์% ไม่ได้บีบอัดโดยเซิร์ฟเวอร์ HTTP
 CacheByServer=แคชโดยเซิร์ฟเวอร์
 CacheByServerDesc=ตัวอย่างเช่น การใช้คำสั่ง Apache "ExpiresByType image/gif A2592000"
@@ -1718,6 +1723,7 @@ CompressionOfResources=การบีบอัดของการตอบส
 CompressionOfResourcesDesc=ตัวอย่างเช่นการใช้คำสั่ง Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=ดังกล่าวตรวจสอบโดยอัตโนมัติเป็นไปไม่ได้กับเบราว์เซอร์ในปัจจุบัน
 DefaultValuesDesc=ที่นี่คุณสามารถกำหนดค่าเริ่มต้นที่คุณต้องการใช้เมื่อสร้างบันทึกใหม่ และ/หรือตัวกรองเริ่มต้นหรือลำดับการจัดเรียงเมื่อคุณแสดงรายการบันทึก
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=ค่าเริ่มต้น (เพื่อใช้บนแบบฟอร์ม)
 DefaultSearchFilters=ตัวกรองการค้นหาเริ่มต้น
 DefaultSortOrder=ลำดับการจัดเรียงเริ่มต้น
@@ -1750,7 +1756,7 @@ SyslogFacility=สิ่งอำนวยความสะดวก
 SyslogLevel=ชั้น
 SyslogFilename=ชื่อแฟ้มและเส้นทาง
 YouCanUseDOL_DATA_ROOT=คุณสามารถใช้ DOL_DATA_ROOT / dolibarr.log สำหรับล็อกไฟล์ใน Dolibarr "เอกสาร" ไดเรกทอรี คุณสามารถตั้งค่าเส้นทางที่แตกต่างกันในการจัดเก็บไฟล์นี้
-ErrorUnknownSyslogConstant=% s คงไม่ได้เป็นที่รู้จักกันอย่างต่อเนื่อง Syslog
+ErrorUnknownSyslogConstant=%s คงไม่ได้เป็นที่รู้จักกันอย่างต่อเนื่อง Syslog
 OnlyWindowsLOG_USER=บน Windows ระบบจะรองรับเฉพาะเครื่องมืออำนวยความสะดวก LOG_USER เท่านั้น
 CompressSyslogs=การบีบอัดและการสำรองไฟล์บันทึกการดีบัก (สร้างโดยโมดูล Log สำหรับการดีบัก)
 SyslogFileNumberOfSaves=จำนวนบันทึกการสำรองข้อมูลที่จะเก็บไว้
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=sendings โมดูลจำนวน
 SendingsAbility=สนับสนุนเอกสารการจัดส่งสำหรับการส่งมอบของลูกค้า
 NoNeedForDeliveryReceipts=ในกรณีส่วนใหญ่ เอกสารการจัดส่งจะใช้ทั้งเป็นแผ่นงานสำหรับการส่งมอบของลูกค้า (รายการผลิตภัณฑ์ที่จะส่ง) และแผ่นงานที่ได้รับและลงนามโดยลูกค้า ดังนั้นใบเสร็จรับเงินการส่งมอบผลิตภัณฑ์จึงเป็นคุณลักษณะที่ซ้ำกันและไม่ค่อยมีการเปิดใช้งาน
 FreeLegalTextOnShippings=ข้อความฟรีในการจัดส่ง
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=สินค้าที่ได้รับการส่งมอบโมดูลหมายเลข
 DeliveryOrderModel=ผลิตภัณฑ์รุ่นได้รับการส่งมอบ
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=ข้อความฟรีในการจ
 ##### FCKeditor #####
 AdvancedEditor=ตกแต่ง
 ActivateFCKeditor=เปิดใช้งานขั้นสูงสำหรับบรรณาธิการ:
-FCKeditorForNotePublic=การสร้าง/ฉบับ WYSIWYG ของฟิลด์ "บันทึกสาธารณะ" ขององค์ประกอบ
-FCKeditorForNotePrivate=การสร้าง/การแก้ไขแบบ WYSIWYG ของฟิลด์ "บันทึกส่วนตัว" ขององค์ประกอบ
-FCKeditorForCompany=การสร้าง/แก้ไขคำอธิบายฟิลด์ขององค์ประกอบแบบ WYSIWYG (ยกเว้นผลิตภัณฑ์/บริการ)
-FCKeditorForProductDetails=การสร้าง/การแก้ไขแบบ WYSIWYG ของคำอธิบายผลิตภัณฑ์หรือบรรทัดสำหรับออบเจ็กต์ (บรรทัดข้อเสนอ คำสั่งซื้อ ใบแจ้งหนี้ ฯลฯ...)
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=คำเตือน: ไม่แนะนำให้ใช้ตัวเลือกนี้สำหรับกรณีนี้อย่างจริงจัง เนื่องจากอาจทำให้เกิดปัญหากับอักขระพิเศษและการจัดรูปแบบหน้าเมื่อสร้างไฟล์ PDF
-FCKeditorForMailing= การสร้าง/ฉบับ WYSIWYG สำหรับอีเมลจำนวนมาก (เครื่องมือ -> อีเมล)
-FCKeditorForUserSignature=การสร้าง/การแก้ไขลายเซ็นผู้ใช้แบบ WYSIWYG
-FCKeditorForMail=การสร้าง/การแก้ไขแบบ WYSIWYG สำหรับเมลทั้งหมด (ยกเว้นเครื่องมือ -> อีเมล)
-FCKeditorForTicket=การสร้าง/ฉบับ WYSIWYG สำหรับตั๋ว
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=การตั้งค่าโมดูลสต็อค
 IfYouUsePointOfSaleCheckModule=หากคุณใช้โมดูลระบบขายหน้าร้าน (POS) ที่ให้ไว้ตามค่าเริ่มต้นหรือโมดูลภายนอก การตั้งค่านี้อาจถูกละเว้นโดยโมดูล POS ของคุณ โมดูล POS ส่วนใหญ่ได้รับการออกแบบตามค่าเริ่มต้นเพื่อสร้างใบแจ้งหนี้ทันทีและลดสต็อกโดยไม่คำนึงถึงตัวเลือกที่นี่ ดังนั้น หากคุณต้องการหรือไม่ต้องการลดสต็อกเมื่อลงทะเบียนการขายจาก POS ของคุณ ให้ตรวจสอบการตั้งค่าโมดูล POS ของคุณด้วย
@@ -1867,7 +1874,6 @@ Buy=ซื้อ
 Sell=ขาย
 InvoiceDateUsed=วันที่ใบแจ้งหนี้ที่ใช้
 YourCompanyDoesNotUseVAT=บริษัทของคุณถูกกำหนดให้ไม่ใช้ VAT (หน้าแรก - การตั้งค่า - บริษัท/องค์กร) ดังนั้นจึงไม่มีตัวเลือก VAT ในการตั้งค่า
-AccountancyCode=รหัสบัญชี
 AccountancyCodeSell=บัญชีการขาย รหัส
 AccountancyCodeBuy=บัญชีซื้อ รหัส
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=คงช่องทำเครื่องหมาย "สร้างการชำระเงินโดยอัตโนมัติ" ว่างไว้ตามค่าเริ่มต้นเมื่อสร้างภาษีใหม่
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = มุมมองใดที่คุณต้องก
 AGENDA_EVENT_PAST_COLOR = สีงานที่ผ่านมา
 AGENDA_EVENT_CURRENT_COLOR = สีเหตุการณ์ปัจจุบัน
 AGENDA_EVENT_FUTURE_COLOR = สีเหตุการณ์ในอนาคต
-AGENDA_REMINDER_BROWSER = เปิดใช้งานการแจ้งเตือนกิจกรรม <b>บนเบราว์เซอร์ของผู้ใช้</b> (เมื่อถึงวันที่เตือน เบราว์เซอร์จะแสดงป๊อปอัป ผู้ใช้แต่ละคนสามารถ ปิดการแจ้งเตือนดังกล่าวจากการตั้งค่าการแจ้งเตือนของเบราว์เซอร์)
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = เปิดใช้งานการแจ้งเตือนด้วยเสียง
-AGENDA_REMINDER_EMAIL = เปิดใช้งานการแจ้งเตือนกิจกรรม <b>ทางอีเมล</b> (สามารถกำหนดตัวเลือกการแจ้งเตือน/ความล่าช้าได้ในแต่ละเหตุการณ์)
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = หมายเหตุ: ความถี่ของงานที่กำหนดเวลาไว้ %s จะต้องเพียงพอเพื่อให้แน่ใจว่าการแจ้งเตือนจะถูกส่งในช่วงเวลาที่ถูกต้อง
 AGENDA_SHOW_LINKED_OBJECT = แสดงวัตถุที่เชื่อมโยงในมุมมองวาระการประชุม
 AGENDA_USE_EVENT_TYPE = ใช้ประเภทเหตุการณ์ (จัดการในเมนูการตั้งค่า -> พจนานุกรม -> ประเภทของเหตุการณ์วาระ)
 AGENDA_USE_EVENT_TYPE_DEFAULT = ตั้งค่าเริ่มต้นนี้โดยอัตโนมัติสำหรับประเภทของเหตุการณ์ในแบบฟอร์มการสร้างเหตุการณ์
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = กุญแจสำคัญในการอนุญาตการเชื่อมโยงการส่งออก
 PastDelayVCalExport=อย่าส่งออกเหตุการณ์ที่มีอายุมากกว่า
 SecurityKey = กุญแจสำคัญในการรักษาความปลอดภัย
@@ -1953,8 +1964,8 @@ IfSetToYesDontForgetPermission=หากตั้งค่าเป็นค่
 GeoIPMaxmindSetup=GeoIP Maxmind การติดตั้งโมดูล
 PathToGeoIPMaxmindCountryDataFile=เส้นทางไปยังไฟล์ที่มี Maxmind ip เป็นการแปลภาษาประเทศ
 NoteOnPathLocation=โปรดทราบว่าทรัพย์สินทางปัญญาไปยังแฟ้มข้อมูลประเทศของคุณจะต้องอยู่ภายในไดเรกทอรี PHP คุณสามารถอ่าน (ตรวจสอบการติดตั้ง PHP open_basedir ของคุณและสิทธิ์ระบบแฟ้ม)
-YouCanDownloadFreeDatFileTo=<b>คุณสามารถดาวน์โหลดรุ่นสาธิตฟรีของแฟ้ม</b> Maxmind GeoIP ประเทศที่% s
-YouCanDownloadAdvancedDatFileTo=<b>นอกจากนี้คุณยังสามารถดาวน์โหลดรุ่นที่สมบูรณ์มากขึ้นมีการปรับปรุงของ</b> Maxmind GeoIP ประเทศที่ไฟล์% s
+YouCanDownloadFreeDatFileTo=<b>คุณสามารถดาวน์โหลดรุ่นสาธิตฟรีของแฟ้ม</b> Maxmind GeoIP ประเทศที่ %s
+YouCanDownloadAdvancedDatFileTo=<b>นอกจากนี้คุณยังสามารถดาวน์โหลดรุ่นที่สมบูรณ์มากขึ้นมีการปรับปรุงของ</b> Maxmind GeoIP ประเทศที่ไฟล์ %s
 TestGeoIPResult=ทดสอบการแปลง IP -> ประเทศ
 ##### Projects #####
 ProjectsNumberingModules=โมดูลการรันเลขโปรเจค
@@ -1986,7 +1997,7 @@ SalariesSetup=การติดตั้งโมดูลของเงิน
 SortOrder=การเรียงลำดับการสั่งซื้อ
 Format=รูป
 TypePaymentDesc=0:ประเภทการชำระเงินของลูกค้า 1:ประเภทการชำระเงินของผู้จัดจำหน่าย 2:ประเภทการชำระเงินทั้งลูกค้าและซัพพลายเออร์
-IncludePath=รวมถึงเส้นทาง (ตามที่กำหนดลงในตัวแปร s%)
+IncludePath=รวมถึงเส้นทาง (ตามที่กำหนดลงในตัวแปร %s)
 ##### Expense reports #####
 ExpenseReportsSetup=การติดตั้งโมดูลรายงานค่าใช้จ่าย
 TemplatePDFExpenseReports=เอกสารแม่แบบในการสร้างเอกสารรายงานค่าใช้จ่าย
@@ -2006,7 +2017,7 @@ BackupZipWizard=ตัวช่วยสร้างการสร้างไ
 SomethingMakeInstallFromWebNotPossible=การติดตั้งโมดูลภายนอกเป็นไปไม่ได้จากอินเตอร์เฟซเว็บด้วยเหตุผลต่อไปนี้:
 SomethingMakeInstallFromWebNotPossible2=ด้วยเหตุนี้ กระบวนการอัปเกรดที่อธิบายไว้ที่นี่จึงเป็นกระบวนการที่ต้องดำเนินการด้วยตนเองซึ่งผู้ใช้ที่มีสิทธิ์เท่านั้นที่สามารถทำได้
 InstallModuleFromWebHasBeenDisabledContactUs=ขณะนี้การติดตั้งหรือการพัฒนาโมดูลภายนอกหรือเว็บไซต์ไดนามิกจากแอปพลิเคชันถูกล็อคเพื่อความปลอดภัย โปรดติดต่อเราหากคุณต้องการเปิดใช้งานคุณสมบัตินี้
-InstallModuleFromWebHasBeenDisabledByFile=ติดตั้งโมดูลภายนอกจากโปรแกรมที่ได้รับการปิดใช้งานโดยผู้ดูแลระบบ <strong>คุณต้องขอให้เขาลบไฟล์% s</strong> เพื่อให้คุณลักษณะนี้
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=เน้นเส้นตารางเมื่อเลื่อนเมาส์ผ่านไป
 HighlightLinesColor=เน้นสีของเส้นเมื่อเมาส์ผ่าน (ใช้ 'ffffff' เพื่อไม่เน้น)
@@ -2036,6 +2047,7 @@ Enter0or1=ป้อน 0 หรือ 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=ป้อนที่นี่ระหว่างเครื่องหมายปีกกา รายการหมายเลขไบต์ที่แสดงสัญลักษณ์สกุลเงิน ตัวอย่างเช่น: สำหรับ $ ให้ป้อน [36] - สำหรับบราซิลเรียล R$ [82,36] - สำหรับ € ให้ป้อน [8364]
 ColorFormat=สี RGB อยู่ในรูปแบบ HEX เช่น FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=ชื่อไอคอนในรูปแบบ:<br>- image.png สำหรับไฟล์ภาพลงในไดเร็กทอรีธีมปัจจุบัน<br>- image.png@module หากไฟล์อยู่ในไดเรกทอรี /img/ ของโมดูล<br>- fa-xxx สำหรับ FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size สำหรับ FontAwesome fa-xxx picto (พร้อมคำนำหน้า ชุดสี และขนาด)
 PositionIntoComboList=ตำแหน่งของเส้นเป็นรายการคำสั่งผสม
 SellTaxRate=อัตราภาษีการขาย
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=ซ่อนเส้นขอบในกรอบที่อยู่ผู้ส่ง
 MAIN_PDF_NO_RECIPENT_FRAME=ซ่อนเส้นขอบในกรอบที่อยู่ผู้รับ
 MAIN_PDF_HIDE_CUSTOMER_CODE=ซ่อนรหัสลูกค้า
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=ซ่อนชื่อผู้ส่ง/บริษัทในช่องที่อยู่
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=ซ่อนเงื่อนไขการชำระเงิน
 PROPOSAL_PDF_HIDE_PAYMENTMODE=ซ่อนโหมดการชำระเงิน
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=ไม่แนะนำ
 ARestrictedPath=เส้นทางที่จำกัดสำหรับไฟล์ข้อมูล
 CheckForModuleUpdate=ตรวจสอบการอัพเดตโมดูลภายนอก
 CheckForModuleUpdateHelp=การดำเนินการนี้จะเชื่อมต่อกับบรรณาธิการของโมดูลภายนอกเพื่อตรวจสอบว่ามีเวอร์ชันใหม่หรือไม่
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=มีการอัปเดตให้ใช้งาน
 NoExternalModuleWithUpdate=ไม่พบการอัปเดตสำหรับโมดูลภายนอก
 SwaggerDescriptionFile=ไฟล์คำอธิบาย Swagger API (สำหรับใช้กับ redoc เป็นต้น)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=แสดงที่อยู่ในการ
 INVOICE_SHOW_SHIPPING_ADDRESSMore=ข้อบ่งชี้ภาคบังคับในบางประเทศ (ฝรั่งเศส, ... )
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=ลิงก์ URL ของเครือข่ายโซเชียล ใช้ {socialid} สำหรับส่วนของตัวแปรที่มีรหัสเครือข่ายโซเชียล
 IfThisCategoryIsChildOfAnother=หากหมวดนี้เป็นลูกของอีกประเภทหนึ่ง
 DarkThemeMode=โหมดธีมสีเข้ม
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=คำเตือน: โม
 WarningModuleHasChangedSecurityCsrfParameter=คำเตือน: โมดูล %s ได้ปิดใช้งานการรักษาความปลอดภัย CSRF สำหรับอินสแตนซ์ของคุณ การกระทำนี้น่าสงสัยและการติดตั้งของคุณอาจไม่ปลอดภัยอีกต่อไป โปรดติดต่อผู้เขียนโมดูลเพื่อขอคำอธิบาย
 EMailsInGoingDesc=อีเมลขาเข้าได้รับการจัดการโดยโมดูล %s คุณต้องเปิดใช้งานและกำหนดค่าหากคุณต้องการรองรับอีเมลขาเข้า
 MAIN_IMAP_USE_PHPIMAP=ใช้ไลบรารี PHP-IMAP สำหรับ IMAP แทน PHP IMAP ดั้งเดิม นอกจากนี้ยังอนุญาตให้ใช้การเชื่อมต่อ OAuth2 สำหรับ IMAP (ต้องเปิดใช้งานโมดูล OAuth ด้วย)
-MAIN_CHECKBOX_LEFT_COLUMN=แสดงคอลัมน์สำหรับการเลือกฟิลด์และบรรทัดทางด้านซ้าย (ทางขวาตามค่าเริ่มต้น)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=ไม่ได้สร้างขึ้นโดยค่าเริ่มต้น สร้างเมื่อเปิดใช้งานโมดูลเท่านั้น
 CSSPage=สไตล์ CSS
 Defaultfortype=ผิดนัด
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang
index 08f7c7de872..1fd1327f9d7 100644
--- a/htdocs/langs/th_TH/banks.lang
+++ b/htdocs/langs/th_TH/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=สมดุลสิ้นสุด
 CurrentBalance=ยอดเงินปัจจุบัน
 FutureBalance=ความสมดุลในอนาคต
 ShowAllTimeBalance=แสดงความสมดุลจากจุดเริ่มต้น
-AllTime=จากจุดเริ่มต้น
 Reconciliation=การประนีประนอม
 RIB=หมายเลขบัญชีธนาคาร
 IBAN=IBAN จำนวน
@@ -133,7 +132,7 @@ DeleteTransaction=ลบรายการ
 ConfirmDeleteTransaction=คุณแน่ใจหรือไม่ว่าต้องการลบรายการนี้
 ThisWillAlsoDeleteBankRecord=การดำเนินการนี้จะลบรายการธนาคารที่สร้างขึ้นด้วย
 BankMovements=การเคลื่อนไหว
-PlannedTransactions=รายการที่วางแผนไว้
+PlannedTransactions=Upcoming entries
 Graph=กราฟ
 ExportDataset_banque_1=รายการธนาคารและใบแจ้งยอดบัญชี
 ExportDataset_banque_2=ใบนำฝากเงิน
@@ -151,7 +150,7 @@ FutureTransaction=การทำธุรกรรมในอนาคต ไ
 SelectChequeTransactionAndGenerate=เลือก/กรองเช็คที่จะรวมไว้ในใบรับฝากเช็ค จากนั้นคลิกที่ "สร้าง"
 SelectPaymentTransactionAndGenerate=เลือก/กรองเอกสารที่จะรวมอยู่ในใบเสร็จรับเงิน %s จากนั้นคลิกที่ "สร้าง"
 InputReceiptNumber=เลือกใบแจ้งยอดจากธนาคารที่เกี่ยวข้องกับการกระทบยอด ใช้ค่าตัวเลขที่จัดเรียงได้
-InputReceiptNumberBis=ปปปปปป หรือ ปปปปปปดด
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=เพื่อประนีประนอม?
 ThenCheckLinesAndConciliate=จากนั้นให้ตรวจสอบสายที่มีอยู่ในบัญชีเงินฝากธนาคารและคลิก
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=หากเปิดใช้งานฟังก์
 BankColorizeMovementName1=สีพื้นหลังสำหรับการเคลื่อนไหวของเดบิต
 BankColorizeMovementName2=สีพื้นหลังสำหรับการเคลื่อนไหวของเครดิต
 IfYouDontReconcileDisableProperty=หากคุณไม่ได้ทำการกระทบยอดธนาคารในบัญชีธนาคารบางบัญชี ให้ปิดการใช้งานคุณสมบัติ "%s" ในบัญชีธนาคารเหล่านั้นเพื่อลบคำเตือนนี้
-NoBankAccountDefined=ไม่มีการกำหนดบัญชีธนาคาร
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=ไม่พบบันทึกในบัญชีธนาคาร โดยทั่วไป เหตุการณ์นี้เกิดขึ้นเมื่อบันทึกถูกลบด้วยตนเองจากรายการธุรกรรมในบัญชีธนาคาร (เช่น ระหว่างการกระทบยอดบัญชีธนาคาร) อีกเหตุผลหนึ่งคือการชำระเงินถูกบันทึกเมื่อโมดูล "%s" ถูกปิดใช้งาน
 AlreadyOneBankAccount=กำหนดบัญชีธนาคารหนึ่งบัญชีแล้ว
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=รูปแบบไฟล์ SEPA
diff --git a/htdocs/langs/th_TH/blockedlog.lang b/htdocs/langs/th_TH/blockedlog.lang
index 095e0fc5dfc..37b3e88267e 100644
--- a/htdocs/langs/th_TH/blockedlog.lang
+++ b/htdocs/langs/th_TH/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=บันทึกที่ไม่สามารถเปล
 ShowAllFingerPrintsMightBeTooLong=แสดงบันทึกที่เก็บถาวรทั้งหมด (อาจยาว)
 ShowAllFingerPrintsErrorsMightBeTooLong=แสดงบันทึกการเก็บถาวรที่ไม่ถูกต้องทั้งหมด (อาจยาว)
 DownloadBlockChain=ดาวน์โหลดลายนิ้วมือ
-KoCheckFingerprintValidity=รายการบันทึกที่เก็บไว้ไม่ถูกต้อง หมายความว่ามีใครบางคน (แฮ็กเกอร์?) ได้แก้ไขข้อมูลบางส่วนของบันทึกนี้หลังจากที่บันทึกแล้ว หรือได้ลบบันทึกที่เก็บถาวรก่อนหน้านี้ (ตรวจสอบว่าบรรทัดนั้นมี # ก่อนหน้าอยู่) หรือได้แก้ไขผลรวมตรวจสอบของบันทึกก่อนหน้า
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=บันทึกบันทึกที่เก็บถาวรนั้นถูกต้อง ข้อมูลในบรรทัดนี้ไม่ได้รับการแก้ไขและรายการเป็นไปตามรายการก่อนหน้า
 OkCheckFingerprintValidityButChainIsKo=บันทึกที่เก็บถาวรดูเหมือนว่าถูกต้องเมื่อเทียบกับบันทึกก่อนหน้า แต่ห่วงโซ่เสียหายก่อนหน้านี้
 AddedByAuthority=เก็บไว้ในหน่วยงานระยะไกล
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=รายละเอียดบันทึก
 ListOfTrackedEvents=รายการเหตุการณ์ที่ติดตาม
 Fingerprint=ลายนิ้วมือ
 DownloadLogCSV=ส่งออกบันทึกที่เก็บถาวร (CSV)
-DataOfArchivedEvent=ข้อมูลทั้งหมดของเหตุการณ์ที่เก็บถาวร
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=ออบเจ็กต์ต้นฉบับ (ประเภท %s, id %s) ไม่ได้เชื่อมโยง (ดูคอลัมน์ 'ข้อมูลทั้งหมด' เพื่อรับข้อมูลที่บันทึกไว้ซึ่งไม่สามารถเปลี่ยนแปลงได้)
 BlockedLogAreRequiredByYourCountryLegislation=โมดูลบันทึกที่ไม่สามารถเปลี่ยนแปลงได้อาจจำเป็นตามกฎหมายของประเทศของคุณ การปิดใช้งานโมดูลนี้อาจทำให้ธุรกรรมใดๆ ในอนาคตไม่ถูกต้องตามกฎหมายและการใช้ซอฟต์แวร์ทางกฎหมาย เนื่องจากไม่สามารถตรวจสอบได้โดยการตรวจสอบภาษี
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=โมดูลบันทึกที่ไม่สามารถเปลี่ยนแปลงได้ถูกเปิดใช้งานเนื่องจากกฎหมายในประเทศของคุณ การปิดใช้งานโมดูลนี้อาจทำให้ธุรกรรมใดๆ ในอนาคตไม่ถูกต้องตามกฎหมายและการใช้ซอฟต์แวร์ทางกฎหมาย เนื่องจากไม่สามารถตรวจสอบได้โดยการตรวจสอบภาษี
@@ -30,6 +32,7 @@ BlockedLogEnabled=เปิดใช้งานระบบติดตาม
 BlockedLogDisabled=ระบบในการติดตามเหตุการณ์ในบันทึกที่ไม่สามารถเปลี่ยนแปลงได้ถูกปิดใช้งานหลังจากการบันทึกบางส่วนเสร็จสิ้น เราได้บันทึกลายนิ้วมือพิเศษไว้เพื่อติดตามว่าโซ่ขาด
 BlockedLogDisabledBis=ระบบติดตามเหตุการณ์ในบันทึกที่ไม่สามารถเปลี่ยนแปลงได้ถูกปิดใช้งาน เป็นไปได้เพราะว่ายังไม่มีการทำบันทึกใดๆ
 LinkHasBeenDisabledForPerformancePurpose=เพื่อวัตถุประสงค์ด้านประสิทธิภาพ ลิงก์โดยตรงไปยังเอกสารจะไม่แสดงหลังบรรทัดที่ 100
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=ลบใบแจ้งหนี้ของลูกค้าตามตรรกะ
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=การลบตรรกะการชำระ
 logPAYMENT_VARIOUS_CREATE=สร้างการชำระเงิน (ไม่ได้กำหนดให้กับใบแจ้งหนี้) แล้ว
 logPAYMENT_VARIOUS_DELETE=การชำระเงิน (ไม่ได้กำหนดให้กับใบแจ้งหนี้) การลบแบบลอจิคัล
 logPAYMENT_VARIOUS_MODIFY=การชำระเงิน (ไม่ได้กำหนดให้กับใบแจ้งหนี้) มีการปรับเปลี่ยน
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang
index 35f055209cb..91c7297c22c 100644
--- a/htdocs/langs/th_TH/categories.lang
+++ b/htdocs/langs/th_TH/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=แท็กติดต่อ/พื้นที่ห
 AccountsCategoriesArea=แท็กบัญชีธนาคาร/หมวดหมู่พื้นที่
 ProjectsCategoriesArea=แท็กโครงการ/พื้นที่หมวดหมู่
 UsersCategoriesArea=แท็กผู้ใช้/พื้นที่หมวดหมู่
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=หมวดหมู่ย่อย
 CatList=รายการของแท็ก / ประเภท
 CatListAll=รายการแท็ก/หมวดหมู่ (ทุกประเภท)
@@ -90,9 +91,10 @@ CategoriesSetup=แท็ก / ประเภทการติดตั้ง
 CategorieRecursiv=การเชื่อมโยงที่มีแท็กแม่ / หมวดหมู่โดยอัตโนมัติ
 CategorieRecursivHelp=หากเปิดตัวเลือกไว้ เมื่อคุณเพิ่มออบเจ็กต์ลงในหมวดหมู่ย่อย ออบเจ็กต์นั้นจะถูกเพิ่มลงในหมวดหมู่หลักด้วย
 AddProductServiceIntoCategory=กำหนดหมวดหมู่ให้กับสินค้า/บริการ
-AddCustomerIntoCategory=กำหนดหมวดหมู่ให้กับลูกค้า
-AddSupplierIntoCategory=กำหนดหมวดหมู่ให้กับซัพพลายเออร์
-AssignCategoryTo=กำหนดหมวดหมู่ให้กับ
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=แสดงแท็ก / หมวดหมู่
 ByDefaultInList=โดยค่าเริ่มต้นในรายการ
 ChooseCategory=เลือกหมวดหมู่
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=หมวดหมู่เพจคอนเทน
 KnowledgemanagementsCategoriesArea=หมวดหมู่บทความ KM
 UseOrOperatorForCategories=ใช้ตัวดำเนินการ 'OR' สำหรับหมวดหมู่
 AddObjectIntoCategory=กำหนดให้กับหมวดหมู่
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/th_TH/commercial.lang b/htdocs/langs/th_TH/commercial.lang
index a6d4fcf254a..5e918362cff 100644
--- a/htdocs/langs/th_TH/commercial.lang
+++ b/htdocs/langs/th_TH/commercial.lang
@@ -15,7 +15,7 @@ CardAction=บัตรเหตุการณ์
 ActionOnCompany=บริษัทที่เกี่ยวข้อง
 ActionOnContact=ติดต่อที่เกี่ยวข้อง
 ActionOnUser=Related user
-TaskRDVWith=การประชุมกับ% s
+TaskRDVWith=การประชุมกับ %s
 ShowTask=แสดงงาน
 ShowAction=เหตุการณ์ที่แสดง
 ActionsReport=รายงานเหตุการณ์
@@ -35,8 +35,8 @@ LastActionsToDo=%s ที่เก่าที่สุดยังไม่ด
 DoneAndToDoActions=เสร็จสมบูรณ์และการทำเช่นเหตุการณ์ที่เกิดขึ้น
 DoneActions=เหตุการณ์ที่เสร็จสมบูรณ์
 ToDoActions=เหตุการณ์ที่ไม่สมบูรณ์
-SendPropalRef=ส่งข้อเสนอของ% s เชิงพาณิชย์
-SendOrderRef=การส่งคำสั่ง% s
+SendPropalRef=ส่งข้อเสนอของ %s เชิงพาณิชย์
+SendOrderRef=การส่งคำสั่ง %s
 StatusNotApplicable=ไม่สามารถใช้งาน
 StatusActionToDo=ที่จะทำ
 StatusActionDone=สมบูรณ์
@@ -75,15 +75,15 @@ DraftPropals=ข้อเสนอในเชิงพาณิชย์ร่
 NoLimit=ไม่มีขีด จำกัด
 ToOfferALinkForOnlineSignature=ลิงค์สำหรับลายเซ็นออนไลน์
 WelcomeOnOnlineSignaturePageProposal=ยินดีต้อนรับสู่เพจเพื่อยอมรับข้อเสนอเชิงพาณิชย์จาก %s
-WelcomeOnOnlineSignaturePageContract=ยินดีต้อนรับสู่ %s หน้าลงนามสัญญา PDF
-WelcomeOnOnlineSignaturePageFichinter=ยินดีต้อนรับสู่ %s หน้าการลงนาม PDF การแทรกแซง
-WelcomeOnOnlineSignaturePageSociete_rib=ยินดีต้อนรับสู่ %s หน้าลงนามในคำสั่ง PDF ของ SEPA
-WelcomeOnOnlineSignaturePageExpedition=Welcome to %s Shipment PDF Signing Page
+WelcomeOnOnlineSignaturePageContract=Welcome to %s contract signature page
+WelcomeOnOnlineSignaturePageFichinter=Welcome to %s intervention signature page
+WelcomeOnOnlineSignaturePageSociete_rib=Welcome to %s SEPA mandate signature page
+WelcomeOnOnlineSignaturePageExpedition=Welcome to %s shipment signature page
 ThisScreenAllowsYouToSignDocFromProposal=หน้าจอนี้อนุญาตให้คุณยอมรับและลงนามหรือปฏิเสธข้อเสนอใบเสนอราคา/เชิงพาณิชย์
-ThisScreenAllowsYouToSignDocFromContract=หน้าจอนี้ช่วยให้คุณสามารถเซ็นสัญญาในรูปแบบ PDF ออนไลน์ได้
-ThisScreenAllowsYouToSignDocFromFichinter=หน้าจอนี้อนุญาตให้คุณลงนามการแทรกแซงในรูปแบบ PDF ออนไลน์
-ThisScreenAllowsYouToSignDocFromSociete_rib=หน้าจอนี้อนุญาตให้คุณลงนามในหนังสือมอบอำนาจ SEPA ในรูปแบบ PDF ทางออนไลน์
-ThisScreenAllowsYouToSignDocFromExpedition=This screen allow you to sign shipment on PDF format online.
+ThisScreenAllowsYouToSignDocFromContract=This screen allow you to sign online a contract.
+ThisScreenAllowsYouToSignDocFromFichinter=This screen allow you to sign online an intervention.
+ThisScreenAllowsYouToSignDocFromSociete_rib=This screen allow you to sign online a SEPA Mandate.
+ThisScreenAllowsYouToSignDocFromExpedition=This screen allow you to sign online a shipment.
 ThisIsInformationOnDocumentToSignProposal=นี่คือข้อมูลในเอกสารที่จะยอมรับหรือปฏิเสธ
 ThisIsInformationOnDocumentToSignContract=นี่คือข้อมูลเกี่ยวกับสัญญาที่จะลงนาม
 ThisIsInformationOnDocumentToSignFichinter=นี่คือข้อมูลเกี่ยวกับการแทรกแซงที่จะลงนาม
@@ -95,8 +95,10 @@ SignatureFichinterRef=ลายเซ็นของการแทรกแซ
 SignatureSociete_ribRef=ลายเซ็นของอาณัติ SEPA %s
 FeatureOnlineSignDisabled=คุณลักษณะสำหรับการลงนามแบบออนไลน์ถูกปิดใช้งานหรือเอกสารที่สร้างขึ้นก่อนที่จะเปิดใช้งานคุณลักษณะนี้
 NoSignature=ไม่ได้ลงนาม
+UnsignedInDolibarr=Document unsigned
 SignedSender=Signed internally
 SignedReceiver=Signed by third party
 SignedReceiverOnline=Signed by third party online
 SignedAll=Signed by all parties
 SignStatus=Signature status
+DocumentSigned=Document signed
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index 43399030326..9d4820136fa 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -65,6 +65,7 @@ State=รัฐ / จังหวัด
 StateId=บัตรประจำตัวของรัฐ
 StateCode=รหัสรัฐ/จังหวัด
 StateShort=สถานะ
+DepartmentBuyer=Buyer's state/province
 Region=ภูมิภาค
 Region-State=ภูมิภาค - รัฐ
 Country=ประเทศ
@@ -78,7 +79,7 @@ Chat=พูดคุย
 PhonePro=รสบัส. โทรศัพท์
 PhonePerso=Pers โทรศัพท์
 PhoneMobile=มือถือ
-No_Email=ปฏิเสธการส่งอีเมลจำนวนมาก
+No_Email=Refuse mass emails
 Fax=แฟกซ์
 Zip=รหัสไปรษณีย์
 Town=เมือง
@@ -255,7 +256,7 @@ CustomerRelativeDiscount=ส่วนลดลูกค้าญาติ
 SupplierRelativeDiscount=ส่วนลดผู้ขายที่เกี่ยวข้อง
 CustomerRelativeDiscountShort=ส่วนลดญาติ
 CustomerAbsoluteDiscountShort=ส่วนลดแอบโซลูท
-CompanyHasRelativeDiscount=<b>ลูกค้ารายนี้มีส่วนลดเริ่มต้นของ% s %%</b>
+CompanyHasRelativeDiscount=<b>ลูกค้ารายนี้มีส่วนลดเริ่มต้นของ %s %%</b>
 CompanyHasNoRelativeDiscount=ลูกค้ารายนี้ไม่เคยมีใครส่วนลดญาติโดยค่าเริ่มต้น
 HasRelativeDiscountFromSupplier=คุณมีส่วนลดเริ่มต้นเป็น <b>%s%%</b> กับผู้ขายรายนี้
 HasNoRelativeDiscountFromSupplier=ไม่มีส่วนลดสัมพันธ์เริ่มต้นกับผู้ขายรายนี้
@@ -308,7 +309,7 @@ RequiredIfSupplier=จำเป็นหากบุคคลที่สาม
 ValidityControledByModule=ความถูกต้องควบคุมโดยโมดูล
 ThisIsModuleRules=กฎเกณฑ์สำหรับโมดูลนี้
 ProspectToContact=Prospect ที่จะติดต่อ
-CompanyDeleted=บริษัท "% s" ลบออกจากฐานข้อมูล
+CompanyDeleted=บริษัท "%s" ลบออกจากฐานข้อมูล
 ListOfContacts=รายชื่อผู้ติดต่อ / ที่อยู่
 ListOfContactsAddresses=รายชื่อผู้ติดต่อ / ที่อยู่
 ListOfThirdParties=รายชื่อบุคคลที่สาม
@@ -330,7 +331,7 @@ NewContact=รายชื่อใหม่
 NewContactAddress=ที่อยู่ติดต่อ/ที่อยู่ใหม่
 MyContacts=รายชื่อของฉัน
 Capital=เมืองหลวง
-CapitalOf=เมืองหลวงของ% s
+CapitalOf=เมืองหลวงของ %s
 EditCompany=แก้ไข บริษัท
 ThisUserIsNot=ผู้ใช้รายนี้ไม่ใช่ผู้มีโอกาสเป็นลูกค้า ลูกค้า หรือผู้ขาย
 VATIntraCheck=ตรวจสอบ
@@ -338,7 +339,7 @@ VATIntraCheckDesc=รหัส VAT ต้องมีคำนำหน้าป
 VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
 VATIntraCheckableOnEUSite=ตรวจสอบหมายเลขประจำตัวผู้เสียภาษีมูลค่าเพิ่มภายในชุมชนบนเว็บไซต์คณะกรรมาธิการยุโรป
 VATIntraManualCheck=คุณสามารถตรวจสอบด้วยตนเองได้ที่เว็บไซต์คณะกรรมาธิการยุโรป <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
-ErrorVATCheckMS_UNAVAILABLE=ตรวจสอบไม่ได้ บริการตรวจสอบไม่ได้ให้โดยรัฐสมาชิก (% s)
+ErrorVATCheckMS_UNAVAILABLE=ตรวจสอบไม่ได้ บริการตรวจสอบไม่ได้ให้โดยรัฐสมาชิก (%s)
 NorProspectNorCustomer=ไม่ใช่ผู้มีโอกาสเป็นลูกค้าหรือลูกค้า
 JuridicalStatus=ประเภทองค์กรธุรกิจ
 Workforce=แรงงาน
@@ -382,11 +383,12 @@ ExportCardToFormat=การ์ดส่งออกไปยังรูปแ
 ContactNotLinkedToCompany=ติดต่อไม่ได้เชื่อมโยงกับบุคคลที่สาม
 DolibarrLogin=เข้าสู่ระบบ Dolibarr
 NoDolibarrAccess=ไม่สามารถเข้าถึง Dolibarr
-ExportDataset_company_1=บุคคลที่สาม (บริษัท/มูลนิธิ/บุคคล) และทรัพย์สินของพวกเขา
-ExportDataset_company_2=ผู้ติดต่อและคุณสมบัติของพวกเขา
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=บุคคลที่สามและทรัพย์สินของพวกเขา
 ImportDataset_company_2=ผู้ติดต่อ/ที่อยู่และคุณลักษณะเพิ่มเติมของบุคคลที่สาม
-ImportDataset_company_3=บัญชีธนาคารบุคคลที่สาม
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=ตัวแทนฝ่ายขายบุคคลที่สาม (มอบหมายตัวแทนฝ่ายขาย/ผู้ใช้ให้กับบริษัท)
 PriceLevel=ระดับราคา
 PriceLevelLabels=ป้ายระดับราคา
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=ผู้จัดการ (s) ชื่อ (ซีอีโอผู้อำนวยการประธาน ... )
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=ผสานบุคคลที่สาม
-ConfirmMergeThirdparties=คุณแน่ใจหรือไม่ว่าต้องการรวมบุคคลที่สามที่เลือกเข้ากับบุคคลที่สามปัจจุบัน ออบเจ็กต์ที่เชื่อมโยงทั้งหมด (ใบแจ้งหนี้ คำสั่งซื้อ ...) จะถูกย้ายไปยังบุคคลที่สามในปัจจุบัน หลังจากนั้นบุคคลที่สามที่เลือกจะถูกลบ
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=บุคคลที่สามถูกรวมเข้าด้วยกัน
 SaleRepresentativeLogin=เข้าสู่ระบบของตัวแทนฝ่ายขาย
 SaleRepresentativeFirstname=ชื่อตัวแทนฝ่ายขาย
@@ -460,3 +462,6 @@ ExternalSystemID=รหัสระบบภายนอก
 IDOfPaymentInAnExternalSystem=ID ของโหมดการชำระเงินเข้าสู่ระบบภายนอก (เช่น Stripe, Paypal, ... )
 AADEWebserviceCredentials=ข้อมูลประจำตัวบริการเว็บของ AADE
 ThirdPartyMustBeACustomerToCreateBANOnStripe=บุคคลที่สามจะต้องเป็นลูกค้าจึงจะอนุญาตให้สร้างข้อมูลธนาคารทางฝั่ง Stripe
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index 3db222a293f..afe3d171700 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=การชำระเงินตามใบแจ้
 PaymentSupplierInvoice=การชำระเงินตามใบแจ้งหนี้ของผู้ขาย
 PaymentSocialContribution=สังคม / ชำระภาษีการคลัง
 PaymentVat=การชำระเงินภาษีมูลค่าเพิ่ม
-AutomaticCreationPayment=บันทึกการชำระเงินอัตโนมัติ
+AutomaticCreationPayment=Also record the payment
 ListPayment=รายชื่อของการชำระเงิน
 ListOfCustomerPayments=รายการชำระเงินของลูกค้า
 ListOfSupplierPayments=รายการชำระเงินของผู้ขาย
@@ -118,10 +118,14 @@ SocialContributionsPayments=สังคม / การชำระเงิน
 ShowVatPayment=แสดงการชำระเงินภาษีมูลค่าเพิ่ม
 TotalToPay=ทั้งหมดที่จะต้องจ่าย
 BalanceVisibilityDependsOnSortAndFilters=ยอดคงเหลือจะปรากฏในรายการนี้เฉพาะเมื่อมีการจัดเรียงตารางใน %s และกรองในบัญชีธนาคาร 1 บัญชี (โดยไม่มีตัวกรองอื่น ๆ )
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=รหัสบัญชีลูกค้า
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=รหัสบัญชีผู้ขาย
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=คัสตอม บัญชี. รหัส
 SupplierAccountancyCodeShort=จีบ. บัญชี. รหัส
+UserAccountancyCodeShort=User account. code
 AccountNumber=เลขที่บัญชี
 NewAccountingAccount=บัญชีใหม่
 Turnover=มูลค่าการซื้อขายออกใบแจ้งหนี้แล้ว
@@ -129,14 +133,16 @@ TurnoverCollected=มูลค่าการซื้อขายที่ร
 SalesTurnoverMinimum=มูลค่าการซื้อขายขั้นต่ำ
 ByExpenseIncome=โดยค่าใช้จ่ายและรายได้
 ByThirdParties=โดยบุคคลที่สาม
+ByProjects=By projects
 ByUserAuthorOfInvoice=โดยผู้เขียนใบแจ้งหนี้
+DetailedListLowercase=detailed list
 CheckReceipt=ใบนำฝากเงิน
 CheckReceiptShort=ใบนำฝากเงิน
 LastCheckReceiptShort=สลิปการฝากเงิน %s ล่าสุด
 LastPaymentForDepositShort=%s %s สลิปการฝากเงินล่าสุด
 NewCheckReceipt=ใหม่ส่วนลด
 NewCheckDeposit=สลิปการฝากเงินใหม่
-NewCheckDepositOn=สร้างใบเสร็จรับเงินสำหรับการฝากเงินในบัญชี:% s
+NewCheckDepositOn=สร้างใบเสร็จรับเงินสำหรับการฝากเงินในบัญชี: %s
 NoWaitingChecks=ไม่มีเช็ครอการฝาก
 NoWaitingPaymentForDeposit=ไม่มีการชำระเงิน %s ที่รอการฝากเงิน
 DateChequeReceived=ตรวจสอบวันรับของ
@@ -157,19 +163,19 @@ ConfirmDeleteVAT=คุณแน่ใจหรือไม่ว่าต้อ
 ConfirmDeleteSalary=คุณแน่ใจหรือไม่ว่าต้องการลบเงินเดือนนี้
 ConfirmDeleteVariousPayment=คุณแน่ใจหรือไม่ว่าต้องการลบการชำระเงินต่างๆ นี้
 ExportDataset_tax_1=ภาษีสังคมและการคลังและการชำระเงิน
-CalcModeVATDebt=<b>โหมด% sVAT ความมุ่งมั่นบัญชี%</b> s
+CalcModeVATDebt=<b>โหมด %s VAT ความมุ่งมั่นบัญชี%</b> s
 CalcModeVATEngagement=โหมด <b>sVAT% รายได้ค่าใช้จ่าย-%</b> s
 CalcModeDebt=การวิเคราะห์เอกสารที่บันทึกไว้ที่ทราบ
 CalcModeEngagement=การวิเคราะห์การชำระเงินที่บันทึกไว้ที่ทราบ
 CalcModePayment=Analysis of known recorded payments
 CalcModeBookkeeping=การวิเคราะห์ข้อมูลที่บันทึกในตารางบัญชีแยกประเภทการทำบัญชี
 CalcModeNoBookKeeping=แม้ว่าพวกเขาจะยังไม่ได้ถูกบันทึกในบัญชีแยกประเภทก็ตาม
-CalcModeLT1= <b>โหมด% Sre ในใบแจ้งหนี้ของลูกค้า - ซัพพลายเออร์ใบแจ้งหนี้% s</b>
-CalcModeLT1Debt=<b>โหมด% Sre ในใบแจ้งหนี้ของลูกค้า% s</b>
-CalcModeLT1Rec= <b>โหมด% Sre ซัพพลายเออร์ในใบแจ้งหนี้% s</b>
-CalcModeLT2= <b>โหมด% sIRPF ในใบแจ้งหนี้ของลูกค้า - ใบแจ้งหนี้ซัพพลายเออร์% s</b>
-CalcModeLT2Debt=<b>โหมด% sIRPF ในใบแจ้งหนี้ของลูกค้า% s</b>
-CalcModeLT2Rec= <b>โหมด% sIRPF ในใบแจ้งหนี้ซัพพลายเออร์% s</b>
+CalcModeLT1= โหมด <b>%sเกี่ยวกับใบแจ้งหนี้ลูกค้า - ใบแจ้งหนี้ซัพพลายเออร์%s</b>
+CalcModeLT1Debt=โหมด <b>%sRE ในใบแจ้งหนี้ของลูกค้า%s</b>
+CalcModeLT1Rec= โหมด <b>%sRE ในใบแจ้งหนี้ของซัพพลายเออร์%s</b>
+CalcModeLT2= โหมด <b>%sIRPF ในใบแจ้งหนี้ของลูกค้า - ใบแจ้งหนี้ของซัพพลายเออร์%s</b>
+CalcModeLT2Debt=โหมด <b>%sIRPF ในใบแจ้งหนี้ของลูกค้า%s</b>
+CalcModeLT2Rec= โหมด <b>%sIRPF ในใบแจ้งหนี้ของซัพพลายเออร์%s</b>
 AnnualSummaryDueDebtMode=ความสมดุลของรายได้และค่าใช้จ่ายประจำปีสรุป
 AnnualSummaryInputOutputMode=ความสมดุลของรายได้และค่าใช้จ่ายประจำปีสรุป
 AnnualByCompanies=ยอดคงเหลือของรายได้และค่าใช้จ่ายตามกลุ่มบัญชีที่กำหนดไว้ล่วงหน้า
diff --git a/htdocs/langs/th_TH/contracts.lang b/htdocs/langs/th_TH/contracts.lang
index b2ce1bfb5d7..3cda5360d6b 100644
--- a/htdocs/langs/th_TH/contracts.lang
+++ b/htdocs/langs/th_TH/contracts.lang
@@ -14,14 +14,14 @@ ServiceStatusNotLateShort=ไม่หมดอายุ
 ServiceStatusLate=ทำงานหมดอายุ
 ServiceStatusLateShort=หมดอายุ
 ServiceStatusClosed=ปิด
-ShowContractOfService=Show contract of service
+ShowContractOfService=แสดงสัญญาการให้บริการ
 Contracts=สัญญา
 ContractsSubscriptions=สัญญา / สมัครสมาชิก
 ContractsAndLine=สัญญาและสายของสัญญา
 Contract=สัญญา
-ContractLine=Contract line
-ContractLines=Contract lines
-Closing=Closing
+ContractLine=เส้นสัญญา
+ContractLines=เส้นสัญญา
+Closing=ปิด
 NoContracts=ไม่มีสัญญา
 MenuServices=บริการ
 MenuInactiveServices=บริการไม่ได้ใช้งาน
@@ -29,32 +29,41 @@ MenuRunningServices=วิ่งบริการ
 MenuExpiredServices=บริการหมดอายุ
 MenuClosedServices=ปิดบริการ
 NewContract=สัญญาฉบับใหม่
-NewContractSubscription=New contract or subscription
+NewContractSubscription=สัญญาใหม่หรือการสมัครสมาชิก
 AddContract=สร้างสัญญา
 DeleteAContract=ลบสัญญา
-ActivateAllOnContract=Activate all services
+ActivateAllOnContract=เปิดใช้งานบริการทั้งหมด
 CloseAContract=ปิดสัญญา
-ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
-ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
-ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
-ConfirmCloseContract=This will close all services (expired or not). Are you sure you want to close this contract?
-ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
+ConfirmDeleteAContract=คุณแน่ใจหรือไม่ว่าต้องการลบสัญญานี้และบริการทั้งหมด
+ConfirmValidateContract=คุณแน่ใจหรือไม่ว่าต้องการตรวจสอบสัญญานี้ภายใต้ชื่อ <b>%s</b> ?
+ConfirmSignContract=Are you sure you want to set this contract as signed ?
+ConfirmUnsignContract=Are you sure you want to set this contract as unsigned ?
+ConfirmActivateAllOnContract=นี่จะเป็นการเปิดบริการทั้งหมด (ยังไม่เปิดใช้งาน) คุณแน่ใจหรือไม่ว่าต้องการเปิดบริการทั้งหมด?
+ConfirmCloseContract=การดำเนินการนี้จะปิดบริการทั้งหมด (หมดอายุหรือไม่) คุณแน่ใจหรือไม่ว่าต้องการปิดสัญญานี้
+ConfirmCloseService=คุณแน่ใจหรือไม่ว่าต้องการปิดบริการนี้ด้วยวันที่ <b>%s</b> ?
 ValidateAContract=ตรวจสอบสัญญา
+UnsignContract=Unsign contract
+ContractSign=Set Signed
+ContractUnsign=Set Unsigned
+ContractSignedInDolibarr=Contract signed
+ContractSignedOnline=Contract signed online
+ContractUnsignedInDolibarr=Contract unsigned
 ActivateService=เปิดใช้งานบริการ
-ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
+ConfirmActivateService=คุณแน่ใจหรือไม่ว่าต้องการเปิดใช้งานบริการนี้ด้วยวันที่ <b>%s</b> ?
 RefContract=อ้างอิงตามสัญญา
 DateContract=วันทำสัญญา
 DateServiceActivate=บริการวันที่เปิดใช้งาน
 ListOfServices=รายการของการบริการ
 ListOfInactiveServices=รายชื่อของบริการที่ใช้งานไม่ได้
+ListOfNotExpiredServices=List of unexpired active services
 ListOfExpiredServices=รายชื่อของบริการที่ใช้งานหมดอายุ
 ListOfClosedServices=รายการของการบริการปิด
 ListOfRunningServices=รายการของการทำงาน
 NotActivatedServices=บริการไม่ได้ใช้งาน (ในสัญญาการตรวจสอบ)
 BoardNotActivatedServices=บริการเพื่อเปิดใช้งานในกลุ่มการตรวจสอบสัญญา
-BoardNotActivatedServicesShort=Services to activate
-LastContracts=Latest %s contracts
-LastModifiedServices=Latest %s modified services
+BoardNotActivatedServicesShort=บริการที่จะเปิดใช้งาน
+LastContracts=สัญญา %s ล่าสุด
+LastModifiedServices=%s บริการที่แก้ไขล่าสุด
 ContractStartDate=วันที่เริ่มต้น
 ContractEndDate=วันที่สิ้นสุด
 DateStartPlanned=วันที่เริ่มต้นการวางแผน
@@ -66,42 +75,42 @@ DateStartRealShort=วันที่เริ่มต้นจริง
 DateEndReal=วันที่สิ้นสุดจริง
 DateEndRealShort=วันที่สิ้นสุดจริง
 CloseService=ปิดบริการ
-BoardRunningServices=Services running
-BoardRunningServicesShort=Services running
-BoardExpiredServices=Services expired
-BoardExpiredServicesShort=Services expired
+BoardRunningServices=บริการกำลังทำงานอยู่
+BoardRunningServicesShort=บริการกำลังทำงานอยู่
+BoardExpiredServices=บริการหมดอายุแล้ว
+BoardExpiredServicesShort=บริการหมดอายุแล้ว
 ServiceStatus=สถานะของการบริการ
 DraftContracts=ร่างสัญญา
-CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
-ActivateAllContracts=Activate all contract lines
+CloseRefusedBecauseOneServiceActive=ไม่สามารถปิดสัญญาได้เนื่องจากมีบริการที่เปิดอยู่อย่างน้อยหนึ่งรายการ
+ActivateAllContracts=เปิดใช้งานรายละเอียดการให้บริการตามสัญญาทั้งหมด
 CloseAllContracts=ปิดทุกสายสัญญา
 DeleteContractLine=ลบบรรทัดสัญญา
-ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
+ConfirmDeleteContractLine=คุณแน่ใจหรือไม่ว่าต้องการลบบรรทัดสัญญานี้
 MoveToAnotherContract=ย้ายบริการทำสัญญาอีก
-ConfirmMoveToAnotherContract=ฉันเลือกสัญญาเป้าหมายใหม่และยืนยันที่ฉันต้องการที่จะย้ายบริการนี​​้ในสัญญานี้
-ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
-PaymentRenewContractId=Renew contract %s (service %s)
+ConfirmMoveToAnotherContract=ฉันเลือกสัญญาเป้าหมายใหม่และยืนยันว่าฉันต้องการย้ายบริการนี้ไปไว้ในสัญญานี้
+ConfirmMoveToAnotherContractQuestion=เลือกสัญญาที่มีอยู่ (ของบุคคลที่สามเดียวกัน) ที่คุณต้องการย้ายบริการนี้ไปที่
+PaymentRenewContractId=ต่ออายุสัญญา %s (บริการ %s)
 ExpiredSince=วันหมดอายุ
 NoExpiredServices=ไม่มีบริการที่ใช้งานหมดอายุ
-ListOfServicesToExpireWithDuration=รายชื่อของบริการที่จะหมดอายุในวันที่% s
-ListOfServicesToExpireWithDurationNeg=รายชื่อบริการหมดอายุจากกว่า% s วัน
+ListOfServicesToExpireWithDuration=รายชื่อของบริการที่จะหมดอายุในวันที่ %s
+ListOfServicesToExpireWithDurationNeg=รายชื่อบริการหมดอายุจากกว่า %s วัน
 ListOfServicesToExpire=รายชื่อของบริการจะหมดอายุ
 NoteListOfYourExpiredServices=รายการนี​​้มีเฉพาะบริการของสัญญาสำหรับบุคคลที่สามคุณจะเชื่อมโยงกับการเป็นตัวแทนขาย
 StandardContractsTemplate=แม่แบบสัญญามาตรฐาน
-ContactNameAndSignature=สำหรับ% s, ชื่อและลายเซ็น:
+ContactNameAndSignature=สำหรับ %s, ชื่อและลายเซ็น:
 OnlyLinesWithTypeServiceAreUsed=สายเท่านั้นที่มีประเภท "บริการ" จะถูกโคลน
-ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
-LowerDateEndPlannedShort=Lower planned end date of active services
-SendContractRef=Contract information __REF__
-OtherContracts=Other contracts
+ConfirmCloneContract=คุณแน่ใจหรือไม่ว่าต้องการโคลนสัญญา <b>%s</b>
+LowerDateEndPlannedShort=วันที่สิ้นสุดตามแผนของบริการที่ใช้งานอยู่ต่ำกว่า
+SendContractRef=ข้อมูลสัญญา __REF__
+OtherContracts=สัญญาอื่นๆ
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=ขายสัญญาลงนามตัวแทน
 TypeContact_contrat_internal_SALESREPFOLL=ตัวแทนขายสัญญาต่อไปนี้ขึ้น
 TypeContact_contrat_external_BILLING=การเรียกเก็บเงินการติดต่อกับลูกค้า
 TypeContact_contrat_external_CUSTOMER=ติดตามการติดต่อกับลูกค้า
 TypeContact_contrat_external_SALESREPSIGN=ลงนามในสัญญาการติดต่อกับลูกค้า
-HideClosedServiceByDefault=Hide closed services by default
-ShowClosedServices=Show Closed Services
-HideClosedServices=Hide Closed Services
-UserStartingService=User starting service
-UserClosingService=User closing service
+HideClosedServiceByDefault=ซ่อนบริการแบบปิดตามค่าเริ่มต้น
+ShowClosedServices=แสดงบริการแบบปิด
+HideClosedServices=ซ่อนบริการแบบปิด
+UserStartingService=ผู้ใช้บริการเริ่มต้น
+UserClosingService=บริการปิดผู้ใช้บริการ
diff --git a/htdocs/langs/th_TH/cron.lang b/htdocs/langs/th_TH/cron.lang
index 7d07319d1a4..ece48a60fa4 100644
--- a/htdocs/langs/th_TH/cron.lang
+++ b/htdocs/langs/th_TH/cron.lang
@@ -55,7 +55,7 @@ CronObject=อินสแตนซ์ / วัตถุที่จะสร้
 CronArgs=พารามิเตอร์
 CronSaveSucess=บันทึกสำเร็จ
 CronNote=ความเห็น
-CronFieldMandatory=ทุ่ง% s มีผลบังคับใช้
+CronFieldMandatory=ทุ่ง %s มีผลบังคับใช้
 CronErrEndDateStartDt=วันที่สิ้นสุดไม่สามารถก่อนวันเริ่มต้น
 StatusAtInstall=สถานะในการติดตั้งโมดูล
 CronStatusActiveBtn=เปิดใช้งานการกำหนดเวลา
diff --git a/htdocs/langs/th_TH/datapolicy.lang b/htdocs/langs/th_TH/datapolicy.lang
index 97237e17180..415f73f6f3b 100644
--- a/htdocs/langs/th_TH/datapolicy.lang
+++ b/htdocs/langs/th_TH/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = นโยบายความเป็นส่วนตัว
 Module4100Desc = โมดูลในการจัดการความเป็นส่วนตัวของข้อมูล (สอดคล้องกับ GDPR)
 # Administration page
 datapolicySetup = การตั้งค่านโยบายความเป็นส่วนตัวของข้อมูลโมดูล
-Deletion = การลบข้อมูล
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s เดือน
 ONE_YEAR = 1 ปี
 NB_YEARS = %s ปี
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = ผู้มีแนวโน้มจะ
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = หรือผู้มีโอกาสเป็นลูกค้า/หรือลูกค้า
 DATAPOLICY_CONTACT_FOURNISSEUR = ผู้ผลิต
 DATAPOLICY_ADHERENT = สมาชิก
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = คุณสามารถส่งอีเมล GDPR ไปยังผู้ติดต่อที่เกี่ยวข้องทั้งหมดของคุณ (ผู้ที่ยังไม่ได้รับอีเมลและคุณยังไม่ได้ลงทะเบียนอะไรเกี่ยวกับข้อตกลง GDPR ของพวกเขา) เมื่อต้องการทำเช่นนี้ ใช้ปุ่มต่อไปนี้
 SendAgreement = ส่งอีเมลล์
 AllAgreementSend = ส่งอีเมลทั้งหมดแล้ว
 TXTLINKDATAPOLICYACCEPT = ข้อความสำหรับลิงก์ "ข้อตกลง"
 TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR : การประมวลผลข้อมูลส่วนบุคคล
 DATAPOLICY_consentement = ได้รับความยินยอมในการประมวลผลข้อมูลส่วนบุคคล
diff --git a/htdocs/langs/th_TH/donations.lang b/htdocs/langs/th_TH/donations.lang
index 67ad3709fbd..ecfa4edf520 100644
--- a/htdocs/langs/th_TH/donations.lang
+++ b/htdocs/langs/th_TH/donations.lang
@@ -6,7 +6,7 @@ Donor=ผู้บริจาค
 AddDonation=สร้างการบริจาค
 NewDonation=บริจาคใหม่
 DeleteADonation=ลบบริจาค
-ConfirmDeleteADonation=Are you sure you want to delete this donation?
+ConfirmDeleteADonation=คุณแน่ใจหรือไม่ว่าต้องการลบการบริจาคนี้
 PublicDonation=เงินบริจาคของประชาชน
 DonationsArea=พื้นที่บริจาค
 DonationStatusPromiseNotValidated=ร่างสัญญา
@@ -16,20 +16,23 @@ DonationStatusPromiseNotValidatedShort=ร่าง
 DonationStatusPromiseValidatedShort=ผ่านการตรวจสอบ
 DonationStatusPaidShort=ที่ได้รับ
 DonationTitle=ใบเสร็จรับเงินบริจาค
-DonationDate=Donation date
+DonationDate=วันที่บริจาค
 DonationDatePayment=วันที่ชำระเงิน
 ValidPromess=ตรวจสอบสัญญา
 DonationReceipt=ใบเสร็จรับเงินบริจาค
 DonationsModels=รูปแบบเอกสารใบเสร็จรับเงินบริจาค
-LastModifiedDonations=Latest %s modified donations
+LastModifiedDonations=การบริจาคที่แก้ไข %s ล่าสุด
 DonationRecipient=ผู้รับบริจาค
 IConfirmDonationReception=ผู้รับประกาศรับบริจาคเป็นของจำนวนเงินดังต่อไปนี้
-MinimumAmount=จำนวนเงินขั้นต่ำเป็น% s
+MinimumAmount=จำนวนเงินขั้นต่ำเป็น %s
 FreeTextOnDonations=ข้อความฟรีที่จะแสดงในส่วนท้าย
 FrenchOptions=ตัวเลือกสำหรับฝรั่งเศส
 DONATION_ART200=แสดงบทความจาก 200 CGI ถ้าคุณมีความกังวล
 DONATION_ART238=แสดงบทความจาก 238 CGI ถ้าคุณมีความกังวล
-DONATION_ART978=Show article 978 from CGI if you are concerned
+DONATION_ART978=แสดงบทความ 978 จาก CGI หากคุณกังวล
 DonationPayment=การชำระเงินที่บริจาค
-DonationValidated=Donation %s validated
-DonationUseThirdparties=Use an existing thirdparty as coordinates of donators
+DonationPayments=Donation payments
+DonationValidated=การบริจาค %s ได้รับการตรวจสอบแล้ว
+DonationUseThirdparties=ใช้ที่อยู่ของบุคคลที่สามที่มีอยู่เป็นที่อยู่ของผู้บริจาค
+DonationsStatistics=Donation's statistics
+NbOfDonations=Number of donations
diff --git a/htdocs/langs/th_TH/ecm.lang b/htdocs/langs/th_TH/ecm.lang
index 89ecb607881..1df194ef801 100644
--- a/htdocs/langs/th_TH/ecm.lang
+++ b/htdocs/langs/th_TH/ecm.lang
@@ -20,7 +20,7 @@ ECMAreaDesc=พื้นที่ DMS/ECM (ระบบการจัดกา
 ECMAreaDesc2a=* ไดเร็กทอรีแบบแมนนวลสามารถใช้เพื่อบันทึกเอกสารด้วยการจัดระเบียบโครงสร้างแบบต้นไม้ฟรี
 ECMAreaDesc2b=* ไดเร็กทอรีอัตโนมัติจะถูกกรอกโดยอัตโนมัติเมื่อมีการเพิ่มเอกสารจากหน้าขององค์ประกอบ
 ECMAreaDesc3=* Public directories are files into the subdirectory <b>/medias</b> of the documents directory, readable by everybody on internet with no need to be logged and no need to have the file shared explicitly. It is used to store image files for the emailing or website module for example.
-ECMSectionWasRemoved=<b>สารบบ% s</b> ได้ถูกลบออก
+ECMSectionWasRemoved=<b>สารบบ %s</b> ได้ถูกลบออก
 ECMSectionWasCreated=สร้างไดเรกทอรี <b>%s</b> ถูกสร้างขึ้นแล้ว
 ECMSearchByKeywords=ค้นหาตามคำหลัก
 ECMSearchByEntity=ค้นหาตามวัตถุ
@@ -54,3 +54,7 @@ SucessConvertImgWebp=ทำซ้ำรูปภาพสำเร็จแล
 SucessConvertChosenImgWebp=คัดลอกรูปภาพที่เลือกเรียบร้อยแล้ว
 ECMDirName=ชื่อไดร์
 ECMParentDirectory=ไดเรกทอรีหลัก
+ShowFile=Show file
+FullPathOrig=Full path origin
+GenOrUpload=File origin
+FileHasAnIndexedTextContent=File has an indexed text content
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index ad4ed27d515..f895bad4009 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -10,19 +10,19 @@ ErrorBadUrl=URL %s ไม่ถูกต้อง
 ErrorBadValueForParamNotAString=ค่าพารามิเตอร์ของคุณไม่ถูกต้อง โดยทั่วไปจะต่อท้ายเมื่อคำแปลหายไป
 ErrorRefAlreadyExists=Reference <b>%s</b> used for creation already exists.
 ErrorTitleAlreadyExists=มีชื่อ <b>%s</b> มีอยู่แล้ว
-ErrorLoginAlreadyExists=เข้าสู่ระบบ% s อยู่แล้ว
+ErrorLoginAlreadyExists=เข้าสู่ระบบ %s อยู่แล้ว
 ErrorGroupAlreadyExists=s% กลุ่มที่มีอยู่แล้ว
 ErrorEmailAlreadyExists=มีอีเมล %s อยู่แล้ว
 ErrorRecordNotFound=บันทึกไม่พบ
 ErrorRecordNotFoundShort=ไม่พบ
-ErrorFailToCopyFile=ไม่สามารถคัดลอกแฟ้ม <b>'% s'</b> เป็น <b>'% s'</b>
+ErrorFailToCopyFile=ไม่สามารถคัดลอกแฟ้ม <b>'%s'</b> เป็น <b>'%s'</b>
 ErrorFailToCopyDir=ไม่สามารถคัดลอกไดเรกทอรี '<b>%s</b>' ลงใน '<b>%s</b>'
-ErrorFailToRenameFile=ไม่สามารถเปลี่ยนชื่อไฟล์ <b>'% s'</b> เป็น <b>'% s'</b>
-ErrorFailToDeleteFile=ไม่สามารถลบไฟล์ที่ <b>'% s'</b>
-ErrorFailToCreateFile=ล้มเหลวในการสร้างแฟ้ม <b>'% s'</b>
-ErrorFailToRenameDir=ไม่สามารถเปลี่ยนชื่อไดเรกทอรี <b>'% s'</b> เป็น <b>'% s'</b>
-ErrorFailToCreateDir=ล้มเหลวในการสร้างไดเรกทอรี <b>'% s'</b>
-ErrorFailToDeleteDir=ไม่สามารถลบไดเรกทอรี <b>'% s'</b>
+ErrorFailToRenameFile=ไม่สามารถเปลี่ยนชื่อไฟล์ <b>'%s'</b> เป็น <b>'%s'</b>
+ErrorFailToDeleteFile=ไม่สามารถลบไฟล์ที่ <b>'%s'</b>
+ErrorFailToCreateFile=ล้มเหลวในการสร้างแฟ้ม <b>'%s'</b>
+ErrorFailToRenameDir=ไม่สามารถเปลี่ยนชื่อไดเรกทอรี <b>'%s'</b> เป็น <b>'%s'</b>
+ErrorFailToCreateDir=ล้มเหลวในการสร้างไดเรกทอรี <b>'%s'</b>
+ErrorFailToDeleteDir=ไม่สามารถลบไดเรกทอรี <b>'%s'</b>
 ErrorFailToMakeReplacementInto=ไม่สามารถทำการแทนที่ลงในไฟล์ '<b>%s</b>'
 ErrorFailToGenerateFile=ไม่สามารถสร้างไฟล์ '<b>%s</b>'
 ErrorThisContactIsAlreadyDefinedAsThisType=ติดต่อนี้ถูกกำหนดไว้แล้วเป็นผู้ติดต่อสำหรับประเภทนี้
@@ -30,7 +30,7 @@ ErrorCashAccountAcceptsOnlyCashMoney=บัญชีธนาคารนี้
 ErrorFromToAccountsMustDiffers=แหล่งที่มาและเป้าหมายบัญชีธนาคารจะต้องแตกต่าง
 ErrorBadThirdPartyName=ค่าไม่ถูกต้องสำหรับชื่อบุคคลที่สาม
 ForbiddenBySetupRules=ห้ามตามกฎการตั้งค่า
-ErrorProdIdIsMandatory=% s มีผลบังคับใช้
+ErrorProdIdIsMandatory=%s มีผลบังคับใช้
 ErrorAccountancyCodeCustomerIsMandatory=ต้องระบุรหัสการบัญชีของลูกค้า %s
 ErrorAccountancyCodeSupplierIsMandatory=ต้องระบุรหัสการบัญชีของซัพพลายเออร์ %s
 ErrorBadCustomerCodeSyntax=ไวยากรณ์ร้ายสำหรับรหัสลูกค้า
@@ -47,11 +47,11 @@ ErrorBadParameters=พารามิเตอร์ที่ไม่ดี
 ErrorWrongParameters=พารามิเตอร์ไม่ถูกต้องหรือหายไป
 ErrorBadValueForParameter=ค่าไม่ถูกต้อง '%s' สำหรับพารามิเตอร์ '%s'
 ErrorBadImageFormat=ไฟล์ภาพไม่ได้เป็นรูปแบบที่ได้รับการสนับสนุน (PHP ของคุณไม่สนับสนุนฟังก์ชั่นการแปลงภาพของรูปแบบนี้)
-ErrorBadDateFormat=ค่า '% s' มีรูปแบบวันที่ไม่ถูกต้อง
+ErrorBadDateFormat=ค่า '%s' มีรูปแบบวันที่ไม่ถูกต้อง
 ErrorWrongDate=วันที่ไม่ถูกต้อง!
-ErrorFailedToWriteInDir=ไม่สามารถเขียนในไดเรกทอรี% s
+ErrorFailedToWriteInDir=ไม่สามารถเขียนในไดเรกทอรี %s
 ErrorFailedToBuildArchive=ไม่สามารถสร้างไฟล์เก็บถาวร %s
-ErrorFoundBadEmailInFile=พบไวยากรณ์อีเมลไม่ถูกต้องสำหรับ% s บรรทัดในไฟล์ (เช่นสาย% s ด้วยอีเมล =% s)
+ErrorFoundBadEmailInFile=พบไวยากรณ์อีเมลไม่ถูกต้องสำหรับ %s บรรทัดในไฟล์ (เช่นสาย% s ด้วยอีเมล = %s)
 ErrorUserCannotBeDelete=ผู้ใช้ไม่สามารถลบได้ บางทีมันอาจจะเกี่ยวข้องกับเอนทิตี Dolibarr
 ErrorFieldsRequired=ช่องที่ต้องกรอกบางช่องเว้นว่างไว้
 ErrorSubjectIsRequired=ต้องระบุหัวเรื่องอีเมล
@@ -60,12 +60,13 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=ล้มเหลวในการสร้างไดเรกทอรี ตรวจสอบการใช้เว็บเซิร์ฟเวอร์ที่มีสิทธิ์ในการเขียนลงในไดเรกทอรีเอกสาร Dolibarr หาก <b>safe_mode</b> พารามิเตอร์เปิดใช้งานบน PHP นี้ตรวจสอบว่า php ไฟล์ Dolibarr เป็นเจ้าของให้กับผู้ใช้เว็บเซิร์ฟเวอร์ (หรือกลุ่ม)
 ErrorNoMailDefinedForThisUser=จดหมายไม่มีกำหนดไว้สำหรับผู้ใช้นี้
 ErrorSetupOfEmailsNotComplete=การตั้งค่าอีเมลไม่สมบูรณ์
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=คุณลักษณะนี้จำเป็นต้องเปิดใช้งาน JavaScript จึงจะทำงานได้ เปลี่ยนสิ่งนี้ในการตั้งค่า - จอแสดงผล
 ErrorTopMenuMustHaveAParentWithId0=เมนูประเภทยอด 'ไม่สามารถมีเมนูปกครอง ใส่ 0 ในเมนูปกครองหรือเลือกเมนูประเภท 'ซ้าย'
 ErrorLeftMenuMustHaveAParentId=เมนูชนิด 'ซ้าย' ต้องมีรหัสผู้ปกครอง
-ErrorFileNotFound=<b>ไฟล์% s</b> ไม่พบ (เส้นทาง Bad สิทธิ์ที่ไม่ถูกต้องหรือปฏิเสธการเข้าถึงทุก openbasedir หรือ safe_mode พารามิเตอร์)
-ErrorDirNotFound=<b>สารบบ% s</b> ไม่พบ (เส้นทาง Bad สิทธิ์ที่ไม่ถูกต้องหรือปฏิเสธการเข้าถึงทุก openbasedir หรือ safe_mode พารามิเตอร์)
-ErrorFunctionNotAvailableInPHP=<b>% s</b> ฟังก์ชั่นที่จำเป็นสำหรับคุณลักษณะนี้ แต่ไม่สามารถใช้ได้ในรุ่น / การตั้งค่าของ PHP นี้
+ErrorFileNotFound=<b>ไฟล์ %s</b> ไม่พบ (เส้นทาง Bad สิทธิ์ที่ไม่ถูกต้องหรือปฏิเสธการเข้าถึงทุก openbasedir หรือ safe_mode พารามิเตอร์)
+ErrorDirNotFound=<b>สารบบ %s</b> ไม่พบ (เส้นทาง Bad สิทธิ์ที่ไม่ถูกต้องหรือปฏิเสธการเข้าถึงทุก openbasedir หรือ safe_mode พารามิเตอร์)
+ErrorFunctionNotAvailableInPHP=<b>%s</b> ฟังก์ชั่นที่จำเป็นสำหรับคุณลักษณะนี้ แต่ไม่สามารถใช้ได้ในรุ่น / การตั้งค่าของ PHP นี้
 ErrorDirAlreadyExists=ไดเรกทอรีที่มีชื่อนี้อยู่แล้ว
 ErrorDirNotWritable=ไดเรกทอรี <b>%s</b> ไม่สามารถเขียนได้
 ErrorFileAlreadyExists=ไฟล์ที่มีชื่อนี้อยู่แล้ว
@@ -76,7 +77,8 @@ ErrorUploadBlockedByAddon=อัพโหลดบล็อกโดย PHP / 
 ErrorFileSizeTooLarge=ขนาดไฟล์ใหญ่เกินไปหรือไม่ได้ระบุไฟล์ไว้
 ErrorFieldTooLong=ฟิลด์ %s ยาวเกินไป
 ErrorSizeTooLongForIntType=ขนาดยาวเกินไปสำหรับประเภท int (s% ตัวเลขสูงสุด)
-ErrorSizeTooLongForVarcharType=ขนาดยาวเกินไปสำหรับประเภทสตริง (% s ตัวอักษรสูงสุด)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
+ErrorSizeTooLongForVarcharType=ขนาดยาวเกินไปสำหรับประเภทสตริง (%s ตัวอักษรสูงสุด)
 ErrorNoValueForSelectType=กรุณากรอกค่าส​​ำหรับรายการเลือก
 ErrorNoValueForCheckBoxType=กรุณากรอกค่าส​​ำหรับรายการช่อง
 ErrorNoValueForRadioType=กรุณากรอกค่าส​​ำหรับรายการวิทยุ
@@ -87,7 +89,7 @@ ErrorFieldMustHaveXChar=ฟิลด์ <b>%s</b> ต้องมีอย่า
 ErrorNoAccountancyModuleLoaded=ไม่มีการเปิดใช้งานโมดูลบัญชี
 ErrorExportDuplicateProfil=ชื่อโปรไฟล์นี้มีอยู่แล้วสำหรับการตั้งค่าการส่งออกนี้
 ErrorLDAPSetupNotComplete=การจับคู่ Dolibarr-LDAP ไม่สมบูรณ์
-ErrorLDAPMakeManualTest=ไฟล์ .ldif ได้รับการสร้างขึ้นในไดเรกทอรี% s พยายามที่จะโหลดได้ด้วยตนเองจากบรรทัดคำสั่งที่จะมีข้อมูลเพิ่มเติมเกี่ยวกับข้อผิดพลาด
+ErrorLDAPMakeManualTest=ไฟล์ .ldif ได้รับการสร้างขึ้นในไดเรกทอรี %s พยายามที่จะโหลดได้ด้วยตนเองจากบรรทัดคำสั่งที่จะมีข้อมูลเพิ่มเติมเกี่ยวกับข้อผิดพลาด
 ErrorCantSaveADoneUserWithZeroPercentage=ไม่สามารถบันทึกการดำเนินการด้วย "สถานะไม่ได้เริ่มต้น" หากกรอกข้อมูลในฟิลด์ "เสร็จสิ้นโดย" แล้ว
 ErrorPleaseTypeBankTransactionReportName=โปรดป้อนชื่อใบแจ้งยอดธนาคารที่ต้องรายงานรายการ (รูปแบบ YYYYMM หรือ YYYYMMDD)
 ErrorRecordHasChildren=ลบบันทึกไม่สำเร็จเนื่องจากมีบันทึกย่อยอยู่บ้าง
@@ -104,7 +106,7 @@ ErrorMultipleRecordFoundFromRef=พบหลายบันทึกเมื่
 ErrorsOnXLines=พบข้อผิดพลาด %s
 ErrorFileIsInfectedWithAVirus=โปรแกรมป้องกันไวรัสที่ไม่สามารถที่จะตรวจสอบไฟล์ (ไฟล์อาจจะมีการติดเชื้อไวรัส)
 ErrorFileIsAnInfectedPDFWithJSInside=The file is a PDF infected by some Javascript inside
-ErrorNumRefModel=การอ้างอิงที่มีอยู่ในฐานข้อมูล (% s) และไม่ได้เข้ากันได้กับกฎหมายเลขนี้ ลบบันทึกการอ้างอิงหรือเปลี่ยนชื่อเพื่อเปิดใช้งานโมดูลนี้
+ErrorNumRefModel=การอ้างอิงที่มีอยู่ในฐานข้อมูล (%s) และไม่ได้เข้ากันได้กับกฎหมายเลขนี้ ลบบันทึกการอ้างอิงหรือเปลี่ยนชื่อเพื่อเปิดใช้งานโมดูลนี้
 ErrorQtyTooLowForThisSupplier=ปริมาณต่ำเกินไปสำหรับผู้ขายรายนี้ หรือไม่มีการกำหนดราคาในผลิตภัณฑ์นี้สำหรับผู้ขายรายนี้
 ErrorOrdersNotCreatedQtyTooLow=ไม่ได้สร้างคำสั่งซื้อบางรายการเนื่องจากมีปริมาณน้อยเกินไป
 ErrorOrderStatusCantBeSetToDelivered=ไม่สามารถตั้งค่าสถานะคำสั่งซื้อเป็นจัดส่งได้
@@ -116,18 +118,18 @@ ErrorMaxNumberReachForThisMask=ถึงจำนวนสูงสุดสำ
 ErrorCounterMustHaveMoreThan3Digits=เคาน์เตอร์จะต้องมีมากกว่า 3 หลัก
 ErrorSelectAtLeastOne=เกิดข้อผิดพลาด เลือกอย่างน้อยหนึ่งรายการ
 ErrorDeleteNotPossibleLineIsConsolidated=ไม่สามารถลบได้เนื่องจากมีการเชื่อมโยงเรกคอร์ดกับธุรกรรมธนาคารที่มีการกระทบยอด
-ErrorProdIdAlreadyExist=% s ได้รับมอบหมายให้สามอีก
+ErrorProdIdAlreadyExist=%s ได้รับมอบหมายให้สามอีก
 ErrorFailedToSendPassword=ล้มเหลวในการส่งรหัสผ่าน
 ErrorFailedToLoadRSSFile=ล้มเหลวที่จะได้รับฟีด RSS พยายามที่จะเพิ่ม MAIN_SIMPLEXMLLOAD_DEBUG คงถ้าข้อความผิดพลาดที่ไม่ได้ให้ข้อมูลที่เพียงพอ
 ErrorForbidden=ปฏิเสธการเข้าใช้ <br> คุณพยายามที่จะเข้าถึงพื้นที่หน้าหรือคุณสมบัติของโมดูลพิการหรือไม่มีอยู่ในเซสชั่นหรือรับรองความถูกต้องที่ไม่ได้รับอนุญาตให้ผู้ใช้ของคุณ
-ErrorForbidden2=การอนุญาตให้เข้าสู่ระบบนี้สามารถกำหนดได้โดยผู้ดูแลระบบ Dolibarr ของคุณจากเมนู% s ->% s
+ErrorForbidden2=การอนุญาตให้เข้าสู่ระบบนี้สามารถกำหนดได้โดยผู้ดูแลระบบ Dolibarr ของคุณจากเมนู %s -> %s
 ErrorForbidden3=ดูเหมือนว่า Dolibarr ไม่ได้ใช้ผ่านเซสชั่นการตรวจสอบสิทธิ์ ลองดูที่เอกสารการติดตั้ง Dolibarr จะทราบวิธีการจัดการ authentications (htaccess, mod_auth หรืออื่น ๆ ... )
 ErrorForbidden4=หมายเหตุ: ล้างคุกกี้เบราว์เซอร์ของคุณเพื่อทำลายเซสชันที่มีอยู่สำหรับการเข้าสู่ระบบนี้
 ErrorNoImagickReadimage=ระดับ Imagick ไม่พบใน PHP นี้ ไม่มีตัวอย่างสามารถใช้ได้ ผู้ดูแลระบบสามารถปิดการใช้งานแท็บนี้จากการตั้งค่าเมนู - จอแสดงผล
 ErrorRecordAlreadyExists=บันทึกที่มีอยู่แล้ว
 ErrorLabelAlreadyExists=มีป้ายกำกับนี้อยู่แล้ว
-ErrorCantReadFile=ไม่สามารถอ่านไฟล์ '% s'
-ErrorCantReadDir=ไม่สามารถอ่านไดเรกทอรี '% s'
+ErrorCantReadFile=ไม่สามารถอ่านไฟล์ '%s'
+ErrorCantReadDir=ไม่สามารถอ่านไดเรกทอรี '%s'
 ErrorBadLoginPassword=ค่าที่ไม่ดีเพื่อเข้าสู่ระบบหรือรหัสผ่าน
 ErrorLoginDisabled=บัญชีของคุณถูกปิดการใช้งาน
 ErrorFailedToRunExternalCommand=ล้มเหลวในการรันคำสั่งภายนอก ตรวจสอบว่าผู้ใช้เซิร์ฟเวอร์ PHP ของคุณพร้อมใช้งานและรันได้ ตรวจสอบด้วยว่าคำสั่งไม่ได้รับการป้องกันในระดับเชลล์โดยชั้นความปลอดภัยเช่น apparmor
@@ -135,20 +137,21 @@ ErrorFailedToChangePassword=ไม่สามารถเปลี่ยนร
 ErrorLoginDoesNotExists=ผู้ใช้ที่มี <b>s%</b> เข้าสู่ระบบไม่พบ
 ErrorLoginHasNoEmail=ผู้ใช้นี้ไม่มีที่อยู่อีเมล ขั้นตอนการยกเลิก
 ErrorBadValueForCode=ค่าร้ายสำหรับรหัสรักษาความปลอดภัย ลองอีกครั้งด้วยค่าใหม่ ...
-ErrorBothFieldCantBeNegative=ทุ่ง% s% และไม่สามารถเป็นได้ทั้งในเชิงลบ
+ErrorBothFieldCantBeNegative=ฟิลด์ %s และ %s ไม่สามารถเป็นค่าลบทั้งคู่ได้
 ErrorFieldCantBeNegativeOnInvoice=ฟิลด์ <strong>%s</strong> ไม่สามารถเป็นค่าลบในใบแจ้งหนี้ประเภทนี้ หากคุณต้องการเพิ่มบรรทัดส่วนลด เพียงสร้างส่วนลดก่อน (จากฟิลด์ '%s' ในบัตรบุคคลที่สาม) และนำไปใช้กับใบแจ้งหนี้
 ErrorLinesCantBeNegativeForOneVATRate=ผลรวมของบรรทัด (สุทธิจากภาษี) ไม่สามารถเป็นค่าลบสำหรับอัตรา VAT ที่ระบุไม่เป็นโมฆะ (พบผลรวมติดลบสำหรับอัตรา VAT <b>%s </b>%%)
-ErrorLinesCantBeNegativeOnDeposits=เส้นต้องไม่เป็นลบในการฝากเงิน คุณจะประสบปัญหาเมื่อคุณจะต้องใช้เงินมัดจำในใบแจ้งหนี้สุดท้ายหากคุณทำเช่นนั้น
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=จำนวนบรรทัดลงในใบแจ้งหนี้ของลูกค้าที่ไม่สามารถเป็นเชิงลบ
-ErrorWebServerUserHasNotPermission=<b>บัญชีผู้ใช้% s</b> ใช้ในการดำเนินการเว็บเซิร์ฟเวอร์มีสิทธิ์ในการที่ไม่มี
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
+ErrorWebServerUserHasNotPermission=<b>บัญชีผู้ใช้ %s</b> ใช้ในการดำเนินการเว็บเซิร์ฟเวอร์มีสิทธิ์ในการที่ไม่มี
 ErrorNoActivatedBarcode=ประเภทไม่มีการเปิดใช้งานบาร์โค้ด
-ErrUnzipFails=ไม่สามารถเปิดเครื่องรูด% s กับ ZipArchive
+ErrUnzipFails=ไม่สามารถเปิดเครื่องรูด %s กับ ZipArchive
 ErrNoZipEngine=ไม่มีกลไกในการ zip/unzip ไฟล์ %s ใน PHP นี้
-ErrorFileMustBeADolibarrPackage=ไฟล์% s จะต้องเป็นแพคเกจซิป Dolibarr
+ErrorFileMustBeADolibarrPackage=ไฟล์ %s จะต้องเป็นแพคเกจซิป Dolibarr
 ErrorModuleFileRequired=คุณต้องเลือกไฟล์แพ็กเกจโมดูล Dolibarr
 ErrorPhpCurlNotInstalled=PHP CURL ไม่ได้ติดตั้งนี้เป็นสิ่งสำคัญที่จะพูดคุยกับ Paypal
-ErrorFailedToAddToMailmanList=ไม่สามารถเพิ่มบันทึก% s% s รายการบุรุษไปรษณีย์หรือฐานหลักสูตรนานาชาติ
-ErrorFailedToRemoveToMailmanList=ล้มเหลวในการลบบันทึก% s% s รายการบุรุษไปรษณีย์หรือฐานหลักสูตรนานาชาติ
+ErrorFailedToAddToMailmanList=ไม่สามารถเพิ่มบันทึก %s ไปยังรายการ Mailman %s หรือฐาน SPIP ได้
+ErrorFailedToRemoveToMailmanList=ไม่สามารถลบระเบียน %s ไปยังรายการ Mailman %s หรือฐาน SPIP ได้
 ErrorNewValueCantMatchOldValue=ค่าใหม่ไม่สามารถจะเท่ากับเก่า
 ErrorFailedToValidatePasswordReset=ล้มเหลวในการ reinit รหัสผ่าน อาจจะ reinit ถูกทำมาแล้ว (ลิงค์นี้สามารถใช้เพียงครั้งเดียว) ถ้าไม่ได้พยายามที่จะเริ่มต้นกระบวนการ reinit
 ErrorToConnectToMysqlCheckInstance=การเชื่อมต่อกับฐานข้อมูลล้มเหลว ตรวจสอบว่าเซิร์ฟเวอร์ฐานข้อมูลกำลังทำงานอยู่ (เช่น ด้วย mysql/mariadb คุณสามารถเปิดใช้งานได้จากบรรทัดคำสั่งด้วย 'sudo service mysql start')
@@ -156,8 +159,8 @@ ErrorFailedToAddContact=ล้มเหลวในการเพิ่มร
 ErrorDateMustBeBeforeToday=วันที่จะต้องต่ำกว่าวันนี้
 ErrorDateMustBeInFuture=วันที่จะต้องมากกว่าวันนี้
 ErrorStartDateGreaterEnd=The start date is greater than the end date
-ErrorPaymentModeDefinedToWithoutSetup=โหมดการชำระเงินถูกกำหนดให้พิมพ์% s แต่การตั้งค่าของโมดูลใบแจ้งหนี้ที่ยังไม่เสร็จสมบูรณ์เพื่อกำหนดข้อมูลที่จะแสดงโหมดการชำระเงินนี้
-ErrorPHPNeedModule=ข้อผิดพลาด, PHP <b>ของคุณต้องมีโมดูล% s</b> ที่ติดตั้งเพื่อใช้คุณลักษณะนี้
+ErrorPaymentModeDefinedToWithoutSetup=โหมดการชำระเงินถูกตั้งค่าเป็นประเภท %s แต่การตั้งค่าโมดูลใบแจ้งหนี้ยังไม่เสร็จสมบูรณ์เพื่อกำหนดข้อมูลที่จะแสดงสำหรับโหมดการชำระเงินนี้
+ErrorPHPNeedModule=ข้อผิดพลาด PHP ของคุณต้องมีโมดูล <b>%s</b> ติดตั้งไว้เพื่อใช้ฟีเจอร์นี้
 ErrorOpenIDSetupNotComplete=คุณติดตั้ง Dolibarr ไฟล์ config ที่จะช่วยให้การตรวจสอบ OpenID แต่ URL ของ OpenID บริการไม่ได้ถูกกำหนดลงไปใน s% คงที่
 ErrorWarehouseMustDiffers=แหล่งที่มาและคลังสินค้าเป้าหมายต้องแตกต่าง
 ErrorBadFormat=รูปแบบที่ไม่ดี!
@@ -165,35 +168,35 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=เกิดข้อผิด
 ErrorThereIsSomeDeliveries=ข้อผิดพลาดที่มีการส่งมอบบางอย่างที่เชื่อมโยงกับการจัดส่งนี้ ลบปฏิเสธ
 ErrorCantDeletePaymentReconciliated=ไม่สามารถลบการชำระเงินที่สร้างรายการธนาคารที่ได้รับการกระทบยอดแล้ว
 ErrorCantDeletePaymentSharedWithPayedInvoice=ไม่สามารถลบการชำระเงินที่ใช้ร่วมกันโดยใบแจ้งหนี้ที่มีสถานะชำระเงินอย่างน้อยหนึ่งรายการ
-ErrorPriceExpression1=ไม่สามารถกำหนดให้คงที่ '% s'
-ErrorPriceExpression2=ไม่สามารถกำหนดฟังก์ชั่น '% s'
-ErrorPriceExpression3=ตัวแปรที่ไม่ได้กำหนด '% s' ในความหมายฟังก์ชั่น
-ErrorPriceExpression4=ตัวอักษรที่ผิดกฎหมาย '% s'
-ErrorPriceExpression5=ที่ไม่คาดคิด '% s'
-ErrorPriceExpression6=จำนวนที่ไม่ถูกต้องของการขัดแย้ง (% s ได้รับคาดว่า% s)
-ErrorPriceExpression8=ผู้ประกอบการที่ไม่คาดคิด '% s'
+ErrorPriceExpression1=ไม่สามารถกำหนดค่าคงที่ '%s' ได้
+ErrorPriceExpression2=ไม่สามารถกำหนดฟังก์ชั่น '%s'
+ErrorPriceExpression3=ตัวแปรที่ไม่ได้กำหนด '%s' ในความหมายฟังก์ชั่น
+ErrorPriceExpression4=ตัวอักษรที่ผิดกฎหมาย '%s'
+ErrorPriceExpression5=ที่ไม่คาดคิด '%s'
+ErrorPriceExpression6=จำนวนที่ไม่ถูกต้องของการขัดแย้ง (%s ได้รับคาดว่า %s)
+ErrorPriceExpression8=ผู้ประกอบการที่ไม่คาดคิด '%s'
 ErrorPriceExpression9=เกิดความผิดพลาดอย่างไม่ได้คาดคิด
 ErrorPriceExpression10=ตัวดำเนินการ '%s' ขาดตัวถูกดำเนินการ
-ErrorPriceExpression11=คาดหวังว่า '% s'
+ErrorPriceExpression11=คาดหวังว่า '%s'
 ErrorPriceExpression14=หารด้วยศูนย์
-ErrorPriceExpression17=ไม่ได้กำหนดตัวแปร '% s'
+ErrorPriceExpression17=ไม่ได้กำหนดตัวแปร '%s'
 ErrorPriceExpression19=ไม่พบการแสดงออก
 ErrorPriceExpression20=การแสดงออกที่ว่างเปล่า
-ErrorPriceExpression21=ผลที่ว่างเปล่า '% s'
-ErrorPriceExpression22=ผลเชิงลบ '% s'
+ErrorPriceExpression21=ผลที่ว่างเปล่า '%s'
+ErrorPriceExpression22=ผลเชิงลบ '%s'
 ErrorPriceExpression23=ตัวแปรที่ไม่รู้จักหรือไม่ได้ตั้งค่า '%s' ใน %s
 ErrorPriceExpression24=มีตัวแปร '%s' อยู่ แต่ไม่มีค่า
-ErrorPriceExpressionInternal=ข้อผิดพลาดภายใน '% s'
-ErrorPriceExpressionUnknown=ข้อผิดพลาดที่ไม่รู้จัก '% s'
+ErrorPriceExpressionInternal=ข้อผิดพลาดภายใน '%s'
+ErrorPriceExpressionUnknown=ข้อผิดพลาดที่ไม่รู้จัก '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=แหล่งที่มาและคลังสินค้าเป้าหมายต้องแตกต่าง
 ErrorTryToMakeMoveOnProductRequiringBatchData=เกิดข้อผิดพลาด กำลังพยายามเคลื่อนไหวสต็อคโดยไม่มีข้อมูลล็อต/ซีเรียล บนผลิตภัณฑ์ '%s' ที่ต้องการข้อมูลล็อต/ซีเรียล
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=ลูกเต้าที่บันทึกไว้ทั้งหมดจะต้องได้รับการตรวจสอบแล้ว (ได้รับการอนุมัติหรือปฏิเสธ) ก่อนที่จะได้รับอนุญาตให้ทำการกระทำนี้
 ErrorCantSetReceptionToTotalDoneWithReceptionDenied=ลูกเต้าที่บันทึกไว้ทั้งหมดจะต้องได้รับการตรวจสอบแล้ว (ได้รับการอนุมัติ) ก่อนที่จะได้รับอนุญาตให้ทำการกระทำนี้
-ErrorGlobalVariableUpdater0=การร้องขอ HTTP ล้มเหลวด้วยข้อผิดพลาด '% s'
-ErrorGlobalVariableUpdater1=รูปแบบ JSON ไม่ถูกต้อง '% s'
-ErrorGlobalVariableUpdater2=ที่ขาดหายไปพารามิเตอร์ '% s'
+ErrorGlobalVariableUpdater0=การร้องขอ HTTP ล้มเหลวด้วยข้อผิดพลาด '%s'
+ErrorGlobalVariableUpdater1=รูปแบบ JSON ไม่ถูกต้อง '%s'
+ErrorGlobalVariableUpdater2=ที่ขาดหายไปพารามิเตอร์ '%s'
 ErrorGlobalVariableUpdater3=ข้อมูลที่ร้องขอไม่พบในผล
-ErrorGlobalVariableUpdater4=ลูกค้า SOAP ล​​้มเหลวด้วยข้อผิดพลาด '% s'
+ErrorGlobalVariableUpdater4=ลูกค้า SOAP ล​​้มเหลวด้วยข้อผิดพลาด '%s'
 ErrorGlobalVariableUpdater5=ไม่มีตัวแปรทั่วโลกที่เลือก
 ErrorFieldMustBeANumeric=<b>s สนาม%</b> จะต้องเป็นค่าตัวเลข
 ErrorMandatoryParametersNotProvided=พารามิเตอร์บังคับ (s) ไม่ได้ให้
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=พารามิเตอร์ PHP upload_max_filesize ของคุณ (%s) สูงกว่าพารามิเตอร์ PHP post_max_size (%s) นี่ไม่ใช่การตั้งค่าที่สอดคล้องกัน
 WarningPasswordSetWithNoAccount=มีการตั้งรหัสผ่านสำหรับสมาชิกรายนี้ อย่างไรก็ตาม ไม่มีการสร้างบัญชีผู้ใช้ ดังนั้นรหัสผ่านนี้จึงถูกเก็บไว้แต่ไม่สามารถใช้เข้าสู่ระบบ Dolibarr ได้ อาจถูกใช้โดยโมดูล/อินเทอร์เฟซภายนอก แต่หากคุณไม่จำเป็นต้องกำหนดการเข้าสู่ระบบหรือรหัสผ่านสำหรับสมาชิก คุณสามารถปิดใช้งานตัวเลือก "จัดการการเข้าสู่ระบบสำหรับสมาชิกแต่ละคน" จากการตั้งค่าโมดูลสมาชิกได้ หากคุณต้องการจัดการการเข้าสู่ระบบแต่ไม่ต้องการรหัสผ่าน คุณสามารถเว้นช่องนี้ว่างไว้เพื่อหลีกเลี่ยงคำเตือนนี้ หมายเหตุ: อีเมลยังสามารถใช้เป็นข้อมูลเข้าสู่ระบบได้หากสมาชิกเชื่อมโยงกับผู้ใช้
@@ -349,7 +359,7 @@ WarningSafeModeOnCheckExecDir=เตือนตัวเลือก PHP <b>saf
 WarningBookmarkAlreadyExists=บุ๊คมาร์คที่มีชื่อนี้หรือเป้าหมาย (URL) นี้อยู่แล้ว
 WarningPassIsEmpty=คำเตือนรหัสผ่านฐานข้อมูลเป็นที่ว่างเปล่า นี่คือหลุมการรักษาความปลอดภัย คุณควรเพิ่มรหัสผ่านไปยังฐานข้อมูลของคุณและเปลี่ยนไฟล์ conf.php ของคุณเพื่อสะท้อนถึงนี้
 WarningConfFileMustBeReadOnly=เตือนไฟล์ config ของคุณ <b>(htdocs / conf / conf.php)</b> สามารถเขียนทับโดยเว็บเซิร์ฟเวอร์ นี่คือหลุมด้านความปลอดภัยร้ายแรง ปรับเปลี่ยนสิทธิ์ในแฟ้มที่จะอยู่ในโหมดอ่านอย่างเดียวสำหรับผู้ใช้ระบบปฏิบัติการที่ใช้โดยเว็บเซิร์ฟเวอร์ หากคุณใช้รูปแบบ Windows และ FAT ดิสก์ของคุณคุณจะต้องรู้ว่าระบบไฟล์นี้จะไม่อนุญาตให้มีการเพิ่มสิทธิ์ในแฟ้มจึงไม่สามารถมีความปลอดภัยอย่างสมบูรณ์
-WarningsOnXLines=<b>คำเตือนในการบันทึกแหล่ง% s</b> (s)
+WarningsOnXLines=<b>คำเตือนในการบันทึกแหล่ง %s</b> (s)
 WarningNoDocumentModelActivated=ไม่มีการเปิดใช้งานโมเดลสำหรับการสร้างเอกสาร โมเดลจะถูกเลือกตามค่าเริ่มต้นจนกว่าคุณจะตรวจสอบการตั้งค่าโมดูลของคุณ
 WarningLockFileDoesNotExists=คำเตือน เมื่อการตั้งค่าเสร็จสิ้น คุณต้องปิดใช้งานเครื่องมือการติดตั้ง/การย้ายข้อมูลโดยการเพิ่มไฟล์ <b>install.lock</b> ลงในไดเร็กทอรี <b>%s</b> การละเว้นการสร้างไฟล์นี้ถือเป็นความเสี่ยงด้านความปลอดภัยร้ายแรง
 WarningUpgradeHasBeenUnlocked=Warning, upgrade process has been unlocked for everybody
@@ -358,7 +368,7 @@ WarningCloseAlways=คำเตือนปิดจะทำแม้ว่า
 WarningUsingThisBoxSlowDown=คำเตือนการใช้ช่องนี้ชะลอตัวลงอย่างจริงจังทุกหน้าแสดงกล่อง
 WarningClickToDialUserSetupNotComplete=การตั้งค่าข้อมูล ClickToDial สำหรับผู้ใช้ของคุณจะไม่สมบูรณ์ (ดู ClickToDial แท็บลงบนบัตรผู้ใช้ของคุณ)
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=คุณสมบัติปิดการใช้งานการตั้งค่าการแสดงผลเมื่อเป็นที่เหมาะสำหรับคนตาบอดหรือข้อความเบราว์เซอร์
-WarningPaymentDateLowerThanInvoiceDate=วันที่ชำระเงิน (% s) ก่อนวันที่ใบแจ้งหนี้ (% s) สำหรับใบแจ้งหนี้% s
+WarningPaymentDateLowerThanInvoiceDate=วันที่ชำระเงิน (%s) มาก่อนวันที่ออกใบแจ้งหนี้ (%s) สำหรับใบแจ้งหนี้ %s
 WarningTooManyDataPleaseUseMoreFilters=มีข้อมูลมากเกินไป (มากกว่า %s บรรทัด) โปรดใช้ตัวกรองเพิ่มเติมหรือตั้งค่าคงที่ %s เป็นขีดจำกัดที่สูงขึ้น
 WarningSomeLinesWithNullHourlyRate=ผู้ใช้บางคนบันทึกบางครั้งในขณะที่ไม่ได้กำหนดอัตรารายชั่วโมง มีการใช้ค่า 0 %s ต่อชั่วโมง แต่อาจส่งผลให้การประเมินค่าเวลาที่ใช้ไปไม่ถูกต้อง
 WarningYourLoginWasModifiedPleaseLogin=ข้อมูลเข้าสู่ระบบของคุณได้รับการแก้ไข เพื่อความปลอดภัย คุณจะต้องเข้าสู่ระบบด้วยการเข้าสู่ระบบใหม่ก่อนที่จะดำเนินการต่อไป
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = สามารถเพิ่มใบแจ้งหนี้ SwissQR ได้เฉพาะกับใบแจ้งหนี้ที่ตั้งค่าให้ชำระด้วยการโอนเครดิตเท่านั้น
 SwissQrCreditorAddressInvalid = ที่อยู่เจ้าหนี้ไม่ถูกต้อง (ตั้งค่า ZIP และเมืองไว้แล้วหรือไม่ (%s)
 SwissQrCreditorInformationInvalid = ข้อมูลเจ้าหนี้ไม่ถูกต้องสำหรับ IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/th_TH/exports.lang b/htdocs/langs/th_TH/exports.lang
index 52750e65642..50d32a73858 100644
--- a/htdocs/langs/th_TH/exports.lang
+++ b/htdocs/langs/th_TH/exports.lang
@@ -46,10 +46,16 @@ LineLabel=ป้ายของเส้น
 LineDescription=คำอธิบายของสาย
 LineUnitPrice=ราคาต่อหน่วยของสาย
 LineVATRate=ภาษีมูลค่าเพิ่มอัตราสาย
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=จำนวนสาย
 LineTotalHT=จำนวนเงินไม่รวม ภาษีสำหรับสาย
 LineTotalTTC=จำนวนเงินที่มีภาษีสำหรับสาย
 LineTotalVAT=จำนวนเงินภาษีมูลค่าเพิ่มสำหรับสาย
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=ประเภทของสาย (0 = ผลิตภัณฑ์ 1 = บริการแล้ว)
 FileWithDataToImport=ไฟล์ที่มีข้อมูลที่จะนำเข้า
 FileToImport=แหล่งที่มาของไฟล์ที่จะนำเข้า
@@ -61,9 +67,9 @@ ChooseFormatOfFileToImport=เลือกรูปแบบไฟล์ที
 ChooseFileToImport=อัปโหลดไฟล์ จากนั้นคลิกที่ไอคอน %s เพื่อเลือกไฟล์เป็นไฟล์นำเข้าต้นฉบับ...
 SourceFileFormat=แหล่งที่มาของรูปแบบไฟล์
 FieldsInSourceFile=เขตข้อมูลในแฟ้มแหล่งที่มา
-FieldsInTargetDatabase=สาขาเป้าหมายในฐานข้อมูล Dolibarr (ตัวหนา = บังคับ)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=ไม่มีสาขา
-MoveField=คอลัมน์ย้ายสนามจำนวน% s
+MoveField=ย้ายหมายเลขคอลัมน์ฟิลด์ %s
 ExampleOfImportFile=Example_of_import_file
 SaveImportProfile=บันทึกรายละเอียดการนำเข้านี้
 ErrorImportDuplicateProfil=ไม่สามารถบันทึกรายละเอียดการนำเข้านี้กับชื่อนี้ โปรไฟล์ที่มีอยู่แล้วกับชื่อนี้
@@ -76,8 +82,8 @@ NowClickToTestTheImport=ตรวจสอบว่ารูปแบบไฟ
 RunSimulateImportFile=เรียกใช้การจำลองการนำเข้า
 FieldNeedSource=สนามนี้ต้องใช้ข้อมูลจากแฟ้มแหล่งที่มา
 SomeMandatoryFieldHaveNoSource=บางสาขาบังคับมีแหล่งที่มาจากแฟ้มข้อมูลไม่มี
-InformationOnSourceFile=ข้อมูลเกี่ยวกับแฟ้มแหล่งที่มา
-InformationOnTargetTables=ข้อมูลเกี่ยวกับสาขาเป้าหมาย
+InformationOnSourceFile=แฟ้มแหล่งที่มา
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=สวิทช์ด้านแหล่งที่มาอย่างน้อยหนึ่งในคอลัมน์ของเขตข้อมูลที่จะส่งออก
 SelectFormat=เลือกรูปแบบไฟล์นำเข้านี้
 RunImportFile=นำเข้าข้อมูล
@@ -101,8 +107,8 @@ DataIDSourceIsInsertedInto=รหัสของออบเจ็กต์ห
 DataCodeIDSourceIsInsertedInto=รหัสของบรรทัดหลักที่พบจากโค้ดจะถูกแทรกลงในฟิลด์ต่อไปนี้:
 SourceRequired=ค่าข้อมูลมีผลบังคับใช้
 SourceExample=ตัวอย่างของค่าข้อมูลที่เป็นไปได้
-ExampleAnyRefFoundIntoElement=อ้างอิงใด ๆ <b>ที่พบองค์ประกอบ% s</b>
-ExampleAnyCodeOrIdFoundIntoDictionary=รหัสใด ๆ (หรือรหัส) <b>ที่พบลงในพจนานุกรม% s</b>
+ExampleAnyRefFoundIntoElement=พบการอ้างอิงใด ๆ สำหรับองค์ประกอบ <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=รหัสใดๆ (หรือ id) ที่พบในพจนานุกรม <b>%s</b>
 CSVFormatDesc=<b>ค่าที่คั่นด้วยเครื่องหมายจุลภาค</b> รูปแบบไฟล์ (.csv)<br>สิ่งนี้ เป็นรูปแบบไฟล์ข้อความที่ช่องต่างๆ ถูกคั่นด้วยตัวคั่น [ %s ] หากพบตัวคั่นภายในเนื้อหาฟิลด์ ฟิลด์จะถูกปัดเศษด้วยอักขระกลม [ %s ] อักขระหลีกที่จะหลีกเลี่ยงอักขระกลมคือ [ %s ]
 Excel95FormatDesc=<b>Excel</b> รูปแบบไฟล์ (.xls)<br>นี่คือรูปแบบดั้งเดิม รูปแบบ Excel 95 (BIFF5)
 Excel2007FormatDesc=<b>Excel</b> รูปแบบไฟล์ (.xlsx)<br>นี่คือรูปแบบดั้งเดิม รูปแบบ Excel 2007 (SpreadsheetML)
diff --git a/htdocs/langs/th_TH/holiday.lang b/htdocs/langs/th_TH/holiday.lang
index 3a0b673008e..dea52a70844 100644
--- a/htdocs/langs/th_TH/holiday.lang
+++ b/htdocs/langs/th_TH/holiday.lang
@@ -27,7 +27,7 @@ UserForApprovalLastname=นามสกุลของผู้ใช้ที
 UserForApprovalLogin=เข้าสู่ระบบของผู้ใช้ที่ได้รับการอนุมัติ
 DescCP=ลักษณะ
 SendRequestCP=สร้างการร้องขอลา
-DelayToRequestCP=<b>ออกจากการร้องขอจะต้องทำอย่างน้อย% s วัน (s)</b> ก่อนหน้าพวกเขา
+DelayToRequestCP=คำร้องขอลาจะต้องทำล่วงหน้าอย่างน้อย <b>%s วัน</b> วัน
 MenuConfCP=ยอดคงเหลือของการลา
 SoldeCPUser=ออกจากยอดคงเหลือ (เป็นวัน) : <b>%s</b>
 ErrorEndDateCP=คุณต้องเลือกวันที่สิ้นสุดมากกว่าวันที่เริ่มต้น
@@ -41,8 +41,8 @@ TitreRequestCP=คำขอฝาก
 TypeOfLeaveId=ประเภทของรหัสการลา
 TypeOfLeaveCode=ประเภทของรหัสการลา
 TypeOfLeaveLabel=ประเภทของฉลากการลา
-NbUseDaysCP=จำนวนวันลาที่ใช้
-NbUseDaysCPHelp=การคำนวณจะคำนึงถึงวันที่ไม่ทำงานและวันหยุดที่กำหนดไว้ในพจนานุกรม
+NbUseDaysCP=Number of days
+NbUseDaysCPHelp=The calculation of the number of vacation days used takes into account the non-working days and public holidays defined in the dictionary.
 NbUseDaysCPShort=วันลา
 NbUseDaysCPShortInMonth=วันลาในเดือน
 DayIsANonWorkingDay=%s เป็นวันที่ไม่ทำงาน
@@ -101,6 +101,9 @@ AutoValidationOnCreate=การตรวจสอบอัตโนมัติ
 FirstDayOfHoliday=วันเริ่มต้นของการขอลา
 LastDayOfHoliday=วันสิ้นสุดการขอลา
 HolidaysMonthlyUpdate=การปรับปรุงรายเดือน
+HolidayMonthlyCredit=Monthly credit
+HolidayConsumption=Consumption
+HolidayCreditAfterCancellation=Credit after cancellation
 ManualUpdate=การปรับปรุงคู่มือการใช้งาน
 HolidaysCancelation=ยกเลิกการขอลาออก
 EmployeeLastname=นามสกุลพนักงาน
@@ -109,7 +112,6 @@ TypeWasDisabledOrRemoved=ประเภทการลา (id %s) ถูกป
 LastHolidays=คำขอออก %s ล่าสุด
 AllHolidays=คำร้องขอลาทั้งหมด
 HalfDay=ครึ่งวัน
-NotTheAssignedApprover=คุณไม่ใช่ผู้อนุมัติที่ได้รับมอบหมาย
 LEAVE_PAID=จ่ายวันหยุด
 LEAVE_SICK=ลาป่วย
 LEAVE_OTHER=ลาอื่นๆ
@@ -125,14 +127,14 @@ NoticePeriod=ระยะเวลาการแจ้งให้ทราบ
 #Messages
 HolidaysToValidate=ตรวจสอบการร้องขอลา
 HolidaysToValidateBody=ด้านล่างคำขอลาในการตรวจสอบคือ
-HolidaysToValidateDelay=คำขอลานี้จะเกิดขึ้นภายในระยะเวลาน้อยกว่า% s วัน
+HolidaysToValidateDelay=คำขอลานี้จะเกิดขึ้นภายในระยะเวลาน้อยกว่า %s วัน
 HolidaysToValidateAlertSolde=ผู้ใช้ที่ทำการร้องขอการลานี้มีจำนวนวันที่ว่างไม่เพียงพอ
 HolidaysValidated=การตรวจสอบการร้องขอลา
-HolidaysValidatedBody=คำขอลาสำหรับ% s% s ได้รับการตรวจสอบ
+HolidaysValidatedBody=คำขอลาของคุณจาก %s เป็น %s ได้รับการตรวจสอบแล้ว
 HolidaysRefused=ขอปฏิเสธ
 HolidaysRefusedBody=คำร้องขอลาของคุณสำหรับ %s ถึง %s ถูกปฏิเสธด้วยเหตุผลต่อไปนี้:
 HolidaysCanceled=ยกเลิกคำขอใบ
-HolidaysCanceledBody=คำขอลาสำหรับ% s% s ได้ถูกยกเลิก
+HolidaysCanceledBody=คำขอลาออกจากงาน %s เป็น %s ถูกยกเลิกแล้ว
 FollowedByACounter=1: การลาประเภทนี้ต้องมีเคาน์เตอร์ตาม ตัวนับจะเพิ่มขึ้นด้วยตนเองหรือโดยอัตโนมัติ และเมื่อมีการตรวจสอบคำขอลา ตัวนับจะลดลง<br>0: ไม่ตามด้วยตัวนับ
 NoLeaveWithCounterDefined=ไม่มีการกำหนดประเภทการลางานที่ต้องตามด้วยตัวนับ
 GoIntoDictionaryHolidayTypes=ไปที่ <strong>หน้าแรก - การตั้งค่า - พจนานุกรม - ประเภทการลา</strong> เพื่อตั้งค่าการลาประเภทต่างๆ
@@ -155,3 +157,4 @@ ConfirmMassIncreaseHoliday=ยอดการลาจำนวนมากเ
 NumberDayAddMass=จำนวนวันที่จะเพิ่มลงในส่วนที่เลือก
 ConfirmMassIncreaseHolidayQuestion=คุณแน่ใจหรือไม่ว่าต้องการเพิ่มวันหยุดของระเบียนที่เลือก %s
 HolidayQtyNotModified=ยอดคงเหลือของวันที่เหลือสำหรับ %s ไม่มีการเปลี่ยนแปลง
+ConsumeHolidaysAtTheEndOfTheMonthTheyAreTakenAt=Consume holidays at the end of the month they are taken at
diff --git a/htdocs/langs/th_TH/hrm.lang b/htdocs/langs/th_TH/hrm.lang
index 22a3331eadc..cba1c8ec3fe 100644
--- a/htdocs/langs/th_TH/hrm.lang
+++ b/htdocs/langs/th_TH/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=ตำแหน่งที่ต้องการสำหรับโปรไฟล์งาน
-RequiredRankShort=อันดับที่ต้องการ
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=ตำแหน่งที่มีประวัติงานนี้
-EmployeeRank=อันดับพนักงานสำหรับทักษะนี้
-EmployeeRankShort=อันดับพนักงาน
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=ตำแหน่งพนักงาน
 EmployeePositions=ตำแหน่งพนักงาน
 EmployeesInThisPosition=พนักงานในตำแหน่งนี้
@@ -72,6 +72,9 @@ AddSkill=เพิ่มทักษะให้กับโปรไฟล์
 RequiredSkills=ทักษะที่จำเป็นสำหรับโปรไฟล์งานนี้
 UserRank=อันดับผู้ใช้
 SkillList=รายการทักษะ
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=บันทึกอันดับ
 TypeKnowHow=ความรู้
 TypeHowToBe=จะเป็นเช่นไร
@@ -95,3 +98,5 @@ NeedBusinessTravels=ต้องการการเดินทางเพื
 NoDescription=ไม่มีคำอธิบาย
 TheJobProfileHasNoSkillsDefinedFixBefore=ประวัติงานที่ประเมินของพนักงานคนนี้ไม่มีทักษะที่กำหนดไว้ โปรดเพิ่มทักษะ จากนั้นลบและเริ่มการประเมินใหม่
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/th_TH/install.lang b/htdocs/langs/th_TH/install.lang
index 64a1765145a..290c43bc21c 100644
--- a/htdocs/langs/th_TH/install.lang
+++ b/htdocs/langs/th_TH/install.lang
@@ -65,8 +65,8 @@ DatabaseCreation=การสร้างฐานข้อมูล
 CreateDatabaseObjects=ฐานข้อมูลการสร้างวัตถุ
 ReferenceDataLoading=การโหลดข้อมูลอ้างอิง
 TablesAndPrimaryKeysCreation=ตารางและคีย์หลักในการสร้าง
-CreateTableAndPrimaryKey=สร้างตาราง% s
-CreateOtherKeysForTable=สร้างปุ่มต่างประเทศและดัชนีสำหรับตาราง% s
+CreateTableAndPrimaryKey=สร้างตาราง %s
+CreateOtherKeysForTable=สร้างปุ่มต่างประเทศและดัชนีสำหรับตาราง %s
 OtherKeysCreation=คีย์ต่างประเทศและการสร้างดัชนี
 FunctionsCreation=ฟังก์ชั่นการสร้าง
 AdminAccountCreation=ผู้ดูแลระบบเข้าสู่ระบบการสร้าง
@@ -101,7 +101,7 @@ Upgrade=อัพเกรด
 UpgradeDesc=ใช้โหมดนี้ถ้าคุณได้เปลี่ยนไฟล์ Dolibarr กับไฟล์จากเวอร์ชันที่ใหม่กว่า นี้จะอัพเกรดฐานข้อมูลและข้อมูลของคุณ
 Start=เริ่มต้น
 InstallNotAllowed=ติดตั้งไม่ได้รับอนุญาตตามสิทธิ์ <b>conf.php</b>
-YouMustCreateWithPermission=คุณต้องสร้างแฟ้ม% s และกำหนดสิทธิ์ในการเขียนเกี่ยวกับมันสำหรับเว็บเซิร์ฟเวอร์ในระหว่างขั้นตอนการติดตั้ง
+YouMustCreateWithPermission=คุณต้องสร้างแฟ้ม %s และกำหนดสิทธิ์ในการเขียนเกี่ยวกับมันสำหรับเว็บเซิร์ฟเวอร์ในระหว่างขั้นตอนการติดตั้ง
 CorrectProblemAndReloadPage=โปรดแก้ไขปัญหาแล้วกด F5 เพื่อโหลดหน้าซ้ำ
 AlreadyDone=อพยพแล้ว
 DatabaseVersion=รุ่นฐานข้อมูล
@@ -111,12 +111,12 @@ DBSortingCollation=เรียงลำดับตัวอักษร
 YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
 YouAskLoginCreationSoDolibarrNeedToConnect=คุณเลือกสร้างผู้ใช้ฐานข้อมูล <b>%s</b> แต่สำหรับสิ่งนี้ Dolibarr จำเป็นต้องเชื่อมต่อกับเซิร์ฟเวอร์ <b>%s</b> ด้วยผู้ใช้ระดับสูง <b>%s</b> สิทธิ์
 BecauseConnectionFailedParametersMayBeWrong=การเชื่อมต่อฐานข้อมูลล้มเหลว: โฮสต์หรือพารามิเตอร์ผู้ใช้ขั้นสูงต้องผิด
-OrphelinsPaymentsDetectedByMethod=การชำระเงินเด็กกำพร้าที่ตรวจพบโดยวิธี% s
+OrphelinsPaymentsDetectedByMethod=การชำระเงินเด็กกำพร้าที่ตรวจพบโดยวิธี %s
 RemoveItManuallyAndPressF5ToContinue=ลบออกด้วยตนเองและกด F5 เพื่อดำเนินการต่อไป
 FieldRenamed=เปลี่ยนชื่อสนาม
 IfLoginDoesNotExistsCheckCreateUser=หากยังไม่มีผู้ใช้ คุณต้องกาเครื่องหมายที่ตัวเลือก "สร้างผู้ใช้"
 ErrorConnection=เซิร์ฟเวอร์ "<b>%s</b>" ชื่อฐานข้อมูล "<b>%s</b>", เข้าสู่ระบบ "<b> span>%s</b>" หรือรหัสผ่านฐานข้อมูลอาจผิดหรือเวอร์ชันไคลเอ็นต์ PHP อาจเก่าเกินไปเมื่อเทียบกับเวอร์ชันฐานข้อมูล .
-InstallChoiceRecommanded=<b>ทางเลือกที่แนะนำในการติดตั้งเวอร์ชั่น% s จากรุ่นปัจจุบันของคุณ% s</b>
+InstallChoiceRecommanded=ขอแนะนำให้เลือกติดตั้งเวอร์ชัน <b>%s</b> จากเวอร์ชันปัจจุบันของคุณ <b>%s</b>
 InstallChoiceSuggested=<b>ติดตั้งทางเลือกที่แนะนำโดยการติดตั้ง</b>
 MigrateIsDoneStepByStep=เวอร์ชันเป้าหมาย (%s) มีช่องว่างหลายเวอร์ชัน วิซาร์ดการติดตั้งจะกลับมาเพื่อแนะนำการย้ายข้อมูลเพิ่มเติมเมื่อการดำเนินการนี้เสร็จสมบูรณ์
 CheckThatDatabasenameIsCorrect=ตรวจสอบว่าชื่อฐานข้อมูล "<b>%s</b>" ถูกต้อง
@@ -130,7 +130,7 @@ MigrationShippingDelivery=เพิ่มระดับการจัดเก
 MigrationShippingDelivery2=เพิ่มระดับการจัดเก็บข้อมูลในการจัดส่ง 2
 MigrationFinished=การโยกย้ายเสร็จ
 LastStepDesc=<strong>ขั้นตอนสุดท้าย</strong>: กำหนดข้อมูลเข้าสู่ระบบและรหัสผ่านที่คุณต้องการใช้เชื่อมต่อกับ Dolibarr ที่นี่ <b>อย่าสูญเสียสิ่งนี้ เนื่องจากเป็นบัญชีหลักในการดูแลบัญชีผู้ใช้อื่นๆ/เพิ่มเติมทั้งหมด</b>
-ActivateModule=เปิดใช้งานโมดูล% s
+ActivateModule=เปิดใช้งานโมดูล %s
 ShowEditTechnicalParameters=คลิกที่นี่เพื่อแสดง / แก้ไขพารามิเตอร์ขั้นสูง (โหมดผู้เชี่ยวชาญ)
 WarningUpgrade=คำเตือน:\nคุณได้ทำการสำรองฐานข้อมูลก่อนหรือไม่?\nขอแนะนำอย่างยิ่ง ข้อมูลสูญหาย (เนื่องจากข้อบกพร่องต่างๆ ใน mysql เวอร์ชัน 5.5.40/41/42/43) อาจเกิดขึ้นได้ในระหว่างกระบวนการนี้ ดังนั้นจึงจำเป็นอย่างยิ่งที่จะต้องดัมพ์ฐานข้อมูลของคุณให้สมบูรณ์ก่อนที่จะเริ่มการย้ายข้อมูลใดๆ\n\nคลิกตกลงเพื่อเริ่มกระบวนการย้าย...
 ErrorDatabaseVersionForbiddenForMigration=เวอร์ชันฐานข้อมูลของคุณคือ %s มีจุดบกพร่องร้ายแรง ซึ่งทำให้ข้อมูลสูญหายได้หากคุณทำการเปลี่ยนแปลงโครงสร้างในฐานข้อมูล เช่น จำเป็นต่อกระบวนการย้าย ด้วยเหตุผลของเขา การโยกย้ายจะไม่ได้รับอนุญาตจนกว่าคุณจะอัปเกรดฐานข้อมูลของคุณเป็นเวอร์ชันเลเยอร์ (แพตช์) (รายการเวอร์ชัน buggy ที่รู้จัก: %s)
@@ -152,15 +152,15 @@ MigrationInvoice=การโยกย้ายข้อมูลสำหรั
 MigrationContract=การโยกย้ายข้อมูลในการทำสัญญา
 MigrationSuccessfullUpdate=การปรับรุ่นที่ประสบความสำเร็จ
 MigrationUpdateFailed=การอัพเกรดล้มเหลว
-MigrationRelationshipTables=การโยกย้ายข้อมูลสำหรับตารางความสัมพันธ์ (% s)
+MigrationRelationshipTables=การโยกย้ายข้อมูลสำหรับตารางความสัมพันธ์ (%s)
 MigrationPaymentsUpdate=แก้ไขข้อมูลการชำระเงิน
-MigrationPaymentsNumberToUpdate=% s การชำระเงิน (s) เพื่อปรับปรุง
-MigrationProcessPaymentUpdate=ปรับปรุงการชำระเงิน (s)% s
+MigrationPaymentsNumberToUpdate=%s การชำระเงิน (s) เพื่อปรับปรุง
+MigrationProcessPaymentUpdate=ปรับปรุงการชำระเงิน (s) %s
 MigrationPaymentsNothingToUpdate=ไม่มีสิ่งที่ต้องทำ
 MigrationPaymentsNothingUpdatable=ไม่มีการชำระเงินอื่น ๆ ที่สามารถได้รับการแก้ไข
 MigrationContractsUpdate=สัญญาแก้ไขข้อมูล
-MigrationContractsNumberToUpdate=สัญญา% s (s) เพื่อปรับปรุง
-MigrationContractsLineCreation=สร้างสายสัญญาสำหรับการอ้างอิงสัญญา% s
+MigrationContractsNumberToUpdate=สัญญา %s (s) เพื่อปรับปรุง
+MigrationContractsLineCreation=สร้างสายสัญญาสำหรับการอ้างอิงสัญญา %s
 MigrationContractsNothingToUpdate=ไม่มีสิ่งที่ต้องทำ
 MigrationContractsFieldDontExist=ไม่มีฟิลด์ fk_facture อีกต่อไป ไม่มีอะไรทำ.
 MigrationContractsEmptyDatesUpdate=การแก้ไขสัญญาวันที่ว่างเปล่า
@@ -168,15 +168,15 @@ MigrationContractsEmptyDatesUpdateSuccess=แก้ไขวันที่ว
 MigrationContractsEmptyDatesNothingToUpdate=ไม่มีวันที่ทำสัญญาที่ว่างเปล่าที่จะแก้ไข
 MigrationContractsEmptyCreationDatesNothingToUpdate=วันที่สร้างสัญญายังไม่ได้แก้ไข
 MigrationContractsInvalidDatesUpdate=วันที่คิดมูลค่าการแก้ไขสัญญาที่ไม่ดี
-MigrationContractsInvalidDateFix=สัญญาที่ถูกต้อง% s (วันที่สัญญา =% s เริ่มต้นบริการวันที่นาที =% s)
-MigrationContractsInvalidDatesNumber=สัญญา% s การแก้ไข
+MigrationContractsInvalidDateFix=สัญญาที่ถูกต้อง %s (วันที่ของสัญญา=%s, วันที่เริ่มต้นบริการ min=%s)
+MigrationContractsInvalidDatesNumber=สัญญา %s การแก้ไข
 MigrationContractsInvalidDatesNothingToUpdate=ไม่มีวันที่มีมูลค่าที่ดีที่จะแก้ไข
 MigrationContractsIncoherentCreationDateUpdate=การสร้างมูลค่าสัญญาที่ไม่ดีแก้ไขวันที่
 MigrationContractsIncoherentCreationDateUpdateSuccess=แก้ไขวันที่สร้างสัญญามูลค่าไม่ถูกต้องสำเร็จแล้ว
 MigrationContractsIncoherentCreationDateNothingToUpdate=ไม่มีค่าที่ไม่ดีสำหรับวันที่สร้างสัญญาที่จะแก้ไข
 MigrationReopeningContracts=สัญญาเปิดปิดโดยข้อผิดพลาด
-MigrationReopenThisContract=เปิดสัญญา% s
-MigrationReopenedContractsNumber=สัญญา% s การแก้ไข
+MigrationReopenThisContract=เปิดสัญญา %s
+MigrationReopenedContractsNumber=สัญญา %s การแก้ไข
 MigrationReopeningContractsNothingToUpdate=ไม่มีการทำสัญญาในการเปิดปิด
 MigrationBankTransfertsUpdate=อัปเดตลิงก์ระหว่างรายการธนาคารและการโอนเงินผ่านธนาคาร
 MigrationBankTransfertsNothingToUpdate=การเชื่อมโยงทั้งหมดมีถึงวันที่
@@ -217,3 +217,4 @@ FunctionTest=การทดสอบฟังก์ชัน
 NodoUpgradeAfterDB=ไม่มีการดำเนินการที่ร้องขอโดยโมดูลภายนอกหลังจากอัปเกรดฐานข้อมูล
 NodoUpgradeAfterFiles=ไม่มีการดำเนินการใดที่ร้องขอโดยโมดูลภายนอกหลังจากอัปเกรดไฟล์หรือไดเร็กทอรี
 MigrationContractLineRank=โยกย้าย Contract Line เพื่อใช้อันดับ (และเปิดใช้งานการจัดลำดับใหม่)
+MigrationProductLotPath=Migrate Product Batch files path
diff --git a/htdocs/langs/th_TH/interventions.lang b/htdocs/langs/th_TH/interventions.lang
index e26bf5aeb35..3f5364e2068 100644
--- a/htdocs/langs/th_TH/interventions.lang
+++ b/htdocs/langs/th_TH/interventions.lang
@@ -13,11 +13,15 @@ CreateDraftIntervention=สร้างร่าง
 InterventionContact=ติดต่อแทรกแซง
 DeleteIntervention=ลบแทรกแซง
 ValidateIntervention=การแทรกแซงการตรวจสอบ
+SignIntervention=Sign intervention
+UnsignIntervention=Unsign intervention
 ModifyIntervention=การแทรกแซงการปรับเปลี่ยน
 CloseIntervention=การแทรกแซงอย่างใกล้ชิด
 DeleteInterventionLine=ลบเส้นแทรกแซง
 ConfirmDeleteIntervention=คุณแน่ใจหรือไม่ว่าต้องการลบการแทรกแซงนี้
 ConfirmValidateIntervention=คุณแน่ใจหรือไม่ว่าต้องการตรวจสอบการแทรกแซงนี้ภายใต้ชื่อ <b>%s</b> ?
+ConfirmSignIntervention=Are you sure you want to set this intervention as signed ?
+ConfirmUnsignIntervention=Are you sure you want to set this intervention as unsigned ?
 ConfirmModifyIntervention=คุณแน่ใจหรือไม่ว่าต้องการแก้ไขการแทรกแซงนี้
 ConfirmCloseIntervention=คุณแน่ใจหรือไม่ว่าต้องการปิดการแทรกแซงนี้
 ConfirmDeleteInterventionLine=คุณแน่ใจหรือไม่ว่าต้องการลบบรรทัดการแทรกแซงนี้
@@ -29,13 +33,18 @@ InterventionCardsAndInterventionLines=การแทรกแซงและเ
 InterventionClassifyBilled=จำแนก "เรียกเก็บเงิน"
 InterventionClassifyUnBilled=แยกประเภท "ยังไม่เรียกเก็บ"
 InterventionClassifyDone=จำแนกประเภท "เสร็จสิ้น"
-SendInterventionRef=การส่งของการแทรกแซง% s
+InterventionSign=Set Signed
+InterventionUnsign=Set Unsigned
+SendInterventionRef=การส่งของการแทรกแซง %s
 SendInterventionByMail=ส่งการแทรกแซงทางอีเมล
 InterventionCreatedInDolibarr=s แทรกแซง% สร้าง
 InterventionValidatedInDolibarr=s% แทรกแซงการตรวจสอบ
+InterventionSignedInDolibarr=Intervention signed
+InterventionSignedOnline=Intervention signed online
+InterventionUnsignedInDolibarr=Intervention unsigned
 InterventionModifiedInDolibarr=s% แทรกแซงการแก้ไข
-InterventionClassifiedBilledInDolibarr=ชุดแทรกแซง% s เป็นการเรียกเก็บเงิน
-InterventionClassifiedUnbilledInDolibarr=การแทรกแซง% s เป็นชุดยังไม่เรียกเก็บ
+InterventionClassifiedBilledInDolibarr=ชุดแทรกแซง %s เป็นการเรียกเก็บเงิน
+InterventionClassifiedUnbilledInDolibarr=การแทรกแซง %s เป็นชุดยังไม่เรียกเก็บ
 InterventionSentByEMail=การแทรกแซง %s ส่งทางอีเมล
 InterventionClosedInDolibarr= การแทรกแซง %s ปิดแล้ว
 InterventionDeletedInDolibarr=s แทรกแซง% ลบ
@@ -76,3 +85,4 @@ TypeContact_fichinter_internal_INTERVENING=Intervenant
 TypeContact_fichinter_external_BILLING=Customer contact of intervention billing
 TypeContact_fichinter_external_CUSTOMER=Customer contact of intervention follow-up
 NotARecurringInterventionalTemplate=Not a recurring intervention template
+ShowInterventionModel=Show intervention model
diff --git a/htdocs/langs/th_TH/ldap.lang b/htdocs/langs/th_TH/ldap.lang
index d262844ef47..5ed94950366 100644
--- a/htdocs/langs/th_TH/ldap.lang
+++ b/htdocs/langs/th_TH/ldap.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - ldap
-YouMustChangePassNextLogon=<b>รหัสผ่านสำหรับผู้ใช้% s% s</b> ในโดเมนต้องมีการเปลี่ยนแปลง
-UserMustChangePassNextLogon=ผู้ใช้ต้องเปลี่ยนรหัสผ่านในโดเมน% s
+YouMustChangePassNextLogon=รหัสผ่านสำหรับผู้ใช้ <b>%s</b> บนโดเมน <b>%s</b> ต้องมีการเปลี่ยนแปลง
+UserMustChangePassNextLogon=ผู้ใช้จะต้องเปลี่ยนรหัสผ่านบนโดเมน %s
 LDAPInformationsForThisContact=ข้อมูลในฐานข้อมูล LDAP สำหรับการติดต่อนี้
 LDAPInformationsForThisUser=ข้อมูลในฐานข้อมูล LDAP สำหรับผู้ใช้นี้
 LDAPInformationsForThisGroup=ข้อมูลในฐานข้อมูล LDAP สำหรับกลุ่มนี้
 LDAPInformationsForThisMember=ข้อมูลในฐานข้อมูล LDAP ของสมาชิกนี้
-LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPInformationsForThisMemberType=ข้อมูลในฐานข้อมูล LDAP สำหรับสมาชิกประเภทนี้
 LDAPAttributes=คุณลักษณะ LDAP
 LDAPCard=บัตร LDAP
 LDAPRecordNotFound=บันทึกไม่พบในฐานข้อมูล LDAP
@@ -13,15 +13,21 @@ LDAPUsers=ผู้ใช้ในฐานข้อมูล LDAP
 LDAPFieldStatus=สถานะ
 LDAPFieldFirstSubscriptionDate=วันที่สมัครสมาชิกครั้งแรก
 LDAPFieldFirstSubscriptionAmount=จำนวนการสมัครสมาชิกครั้งแรก
-LDAPFieldLastSubscriptionDate=Latest subscription date
-LDAPFieldLastSubscriptionAmount=Latest subscription amount
-LDAPFieldSkype=Skype id
-LDAPFieldSkypeExample=Example : skypeName
+LDAPFieldLastSubscriptionDate=วันที่สมัครสมาชิกล่าสุด
+LDAPFieldLastSubscriptionAmount=จำนวนการสมัครสมาชิกล่าสุด
+LDAPFieldSkype=ไอดีสไกป์
+LDAPFieldSkypeExample=ตัวอย่าง: skypeName
 UserSynchronized=ผู้ใช้ตรงกัน
 GroupSynchronized=กลุ่มตรงกัน
 MemberSynchronized=สมาชิกตรงกัน
-MemberTypeSynchronized=Member type synchronized
+MemberTypeSynchronized=ประเภทสมาชิกซิงโครไนซ์
 ContactSynchronized=ติดต่อตรง
 ForceSynchronize=กองทัพตรงกัน Dolibarr -> LDAP
 ErrorFailedToReadLDAP=ไม่สามารถอ่านฐานข้อมูล LDAP ตรวจสอบการติดตั้งโมดูล LDAP และการเข้าถึงฐานข้อมูล
-PasswordOfUserInLDAP=Password of user in LDAP
+PasswordOfUserInLDAP=รหัสผ่านของผู้ใช้ใน LDAP
+LDAPPasswordHashType=ประเภทแฮชรหัสผ่าน
+LDAPPasswordHashTypeExample=ประเภทของแฮชรหัสผ่านที่ใช้บนเซิร์ฟเวอร์
+SupportedForLDAPExportScriptOnly=รองรับโดยสคริปต์ส่งออก ldap เท่านั้น
+SupportedForLDAPImportScriptOnly=รองรับโดยสคริปต์นำเข้า ldap เท่านั้น
+LDAPUserAccountControl = userAccountControl ในการสร้าง (ไดเรกทอรีที่ใช้งานอยู่)
+LDAPUserAccountControlExample = 512 บัญชีปกติ / 546 บัญชีปกติ + ไม่มีรหัสผ่าน + ปิดการใช้งาน (ดู: https://fr.wikipedia.org/wiki/Active_Directory)
diff --git a/htdocs/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
index aa2719033e5..35b1fd524f0 100644
--- a/htdocs/langs/th_TH/mails.lang
+++ b/htdocs/langs/th_TH/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=การส่งอีเมล
 EMailing=การส่งอีเมล
-EMailings=EMailings
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=eMailings ทั้งหมด
+AllEMailings=All mass eMails
 MailCard=บัตรการส่งอีเมล
 MailRecipients=ผู้รับ
 MailRecipient=ผู้รับ
@@ -26,19 +26,19 @@ MailFile=ไฟล์ที่แนบมา
 MailMessage=ร่างกายอีเมล์
 SubjectNotIn=ไม่อยู่ในหัวเรื่อง
 BodyNotIn=ไม่ได้อยู่ในร่างกาย
-ShowEMailing=แสดงการส่งอีเมล
-ListOfEMailings=รายการ emailings
-NewMailing=ส่งอีเมลใหม่
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=แก้ไขการส่งอีเมล
-ResetMailing=ส่งการส่งอีเมล
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=ลบการส่งอีเมล
-PreviewMailing=ส่งอีเมลตัวอย่าง
-CreateMailing=สร้างการส่งอีเมล
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=ทดสอบ
-ValidMailing=การส่งอีเมลที่ถูกต้อง
+ValidMailing=Valid mass Email
 MailingStatusDraft=ร่าง
 MailingStatusValidated=ผ่านการตรวจสอบ
 MailingStatusSent=ส่ง
@@ -75,13 +75,13 @@ CloneContent=ข้อความโคลน
 CloneReceivers=Cloner ผู้รับ
 DateLastSend=วันที่ส่งล่าสุด
 DateSending=วันที่ส่ง
-SentTo=<b>ส่งไปยัง% s</b>
+SentTo=ส่งไปที่ <b>%s</b>
 MailingStatusRead=อ่าน
 YourMailUnsubcribeOK=อีเมล <b>%s</b> ยกเลิกการสมัครรับอีเมลอย่างถูกต้องแล้ว
 ActivateCheckReadKey=คีย์ที่ใช้ในการเข้ารหัส URL ที่ใช้สำหรับคุณสมบัติ "อ่านใบเสร็จรับเงิน" และ "ยกเลิกการสมัคร"
 EMailSentToNRecipients=ส่งอีเมลถึงผู้รับ %s
 EMailSentForNElements=ส่งอีเมลสำหรับองค์ประกอบ %s
-XTargetsAdded=<b>ผู้รับ% s</b> เพิ่มเข้าไปในรายชื่อเป้าหมาย
+XTargetsAdded=<b>%s</b> ผู้รับถูกเพิ่มเข้าในรายการเป้าหมายแล้ว
 OnlyPDFattachmentSupported=หากเอกสาร PDF ถูกสร้างขึ้นสำหรับออบเจ็กต์ที่จะส่งแล้ว เอกสารเหล่านั้นจะถูกแนบไปกับอีเมล ถ้าไม่เช่นนั้น จะไม่มีการส่งอีเมล (โปรดทราบว่าเวอร์ชันนี้รองรับเฉพาะเอกสาร PDF เป็นไฟล์แนบในการส่งจำนวนมาก)
 AllRecipientSelected=ผู้รับบันทึก %s ที่เลือก (หากทราบอีเมล)
 GroupEmails=อีเมลกลุ่ม
@@ -105,27 +105,27 @@ SendingFromWebInterfaceIsNotAllowed=ไม่อนุญาตให้ส่
 EmailCollectorFilterDesc=ตัวกรองทั้งหมดต้องตรงกันจึงจะรวบรวมอีเมลได้<br>คุณสามารถใช้อักขระ "!" ได้ ก่อนค่าสตริงการค้นหา หากคุณต้องการการทดสอบเชิงลบ
 
 # Libelle des modules de liste de destinataires mailing
-LineInFile=สาย% s ในแฟ้ม
+LineInFile=บรรทัด %s ในไฟล์
 RecipientSelectionModules=การร้องขอที่กำหนดไว้สำหรับการเลือกผู้รับ
 MailSelectedRecipients=เลือกผู้รับ
-MailingArea=พื้นที่ EMailings
-LastMailings=การส่งอีเมล %s ล่าสุด
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=สถิติเป้าหมาย
 NbOfCompaniesContacts=รายชื่อที่ไม่ซ้ำกัน / ที่อยู่
 MailNoChangePossible=ผู้รับการตรวจสอบสำหรับการส่งอีเมลที่ไม่สามารถเปลี่ยนแปลงได้
-SearchAMailing=ค้นหาทางไปรษณีย์
-SendMailing=ส่งการส่งอีเมล
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=ที่ส่งมาจาก
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=การส่งอีเมลสามารถทำได้จากบรรทัดคำสั่ง ขอให้ผู้ดูแลระบบเซิร์ฟเวอร์ของคุณเปิดใช้คำสั่งต่อไปนี้เพื่อส่งอีเมลไปยังผู้รับทั้งหมด:
 MailingNeedCommand2=แต่คุณสามารถส่งพวกเขาออนไลน์ด้วยการเพิ่ม MAILING_LIMIT_SENDBYWEB พารามิเตอร์ที่มีค่าจำนวนสูงสุดของอีเมลที่คุณต้องการส่งโดยเซสชั่น สำหรับเรื่องนี้ไปในหน้าแรก - การติดตั้ง - อื่น ๆ
 ConfirmSendingEmailing=หากคุณต้องการส่งอีเมลโดยตรงจากหน้าจอนี้ โปรดยืนยันว่าคุณแน่ใจหรือไม่ว่าต้องการส่งอีเมลตอนนี้จากเบราว์เซอร์ของคุณ
-LimitSendingEmailing=หมายเหตุ: การส่งของ emailings จากอินเตอร์เฟซเว็บที่จะทำในหลาย ๆ <b>ครั้งเพื่อความปลอดภัยและเหตุผลหมดเวลาผู้รับ% s</b> ในเวลาสำหรับแต่ละเซสชั่นการส่ง
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=รายชื่อที่ชัดเจน
 ToClearAllRecipientsClickHere=คลิกที่นี่เพื่อล้างรายชื่อผู้รับสำหรับการส่งอีเมลนี้
 ToAddRecipientsChooseHere=เพิ่มผู้รับโดยเลือกจากรายการ
-NbOfEMailingsReceived=emailings มวลที่ได้รับ
-NbOfEMailingsSend=emailings มวลส่ง
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=บันทึก ID
 DeliveryReceipt=การจัดส่งสินค้า
 YouCanUseCommaSeparatorForSeveralRecipients=<b>คุณสามารถใช้คั่นด้วยเครื่องหมายจุลภาคเพื่อระบุผู้รับหลาย</b>
@@ -142,11 +142,13 @@ NoNotificationsWillBeSent=ไม่มีการวางแผนการแ
 ANotificationsWillBeSent=การแจ้งเตือนอัตโนมัติ 1 รายการจะถูกส่งทางอีเมล
 SomeNotificationsWillBeSent=%s การแจ้งเตือนอัตโนมัติจะถูกส่งทางอีเมล
 AddNewNotification=สมัครรับการแจ้งเตือนทางอีเมลอัตโนมัติใหม่ (เป้าหมาย/เหตุการณ์)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
-MailSendSetupIs=การกำหนดค่าของการส่งอีเมล์ที่ได้รับการติดตั้งเพื่อ '% s' โหมดนี้ไม่สามารถใช้ในการส่งการส่งอีเมลมวล
-MailSendSetupIs2=ก่อนอื่นคุณต้องไปกับบัญชีผู้ดูแลระบบลงไปในเมนู% sHome - การติดตั้ง - อีเมล์% s จะเปลี่ยนพารามิเตอร์ <strong>'% s'</strong> เพื่อใช้โหมด '% s' ด้วยโหมดนี้คุณสามารถเข้าสู่การตั้งค่าของเซิร์ฟเวอร์ที่ให้บริการโดยผู้ให้บริการอินเทอร์เน็ตของคุณและใช้คุณลักษณะการส่งอีเมลมวล
-MailSendSetupIs3=หากคุณมีคำถามใด ๆ เกี่ยวกับวิธีการติดตั้งเซิร์ฟเวอร์ของคุณคุณสามารถขอให้% s
+ListOfNotificationsDoneHelp=List of past email notifications sent
+MailSendSetupIs=การกำหนดค่าการส่งอีเมลได้รับการตั้งค่าเป็น '%s' โหมดนี้ไม่สามารถใช้ส่งอีเมลจำนวนมากได้
+MailSendSetupIs2=ก่อนอื่นคุณต้องไปที่เมนู %sหน้าแรก - การตั้งค่า - อีเมล%s เพื่อเปลี่ยนพารามิเตอร์ <strong>'%s'</strong> เพื่อใช้โหมด '%s' ด้วยโหมดนี้ คุณสามารถเข้าสู่การตั้งค่าเซิร์ฟเวอร์ SMTP ที่ผู้ให้บริการอินเทอร์เน็ตของคุณจัดเตรียมไว้ และใช้คุณสมบัติการส่งอีเมลจำนวนมาก
+MailSendSetupIs3=หากคุณมีคำถามเกี่ยวกับวิธีการตั้งค่าเซิร์ฟเวอร์ SMTP คุณสามารถถามได้ที่ %s
 YouCanAlsoUseSupervisorKeyword=นอกจากนี้คุณยังสามารถเพิ่ม <strong>__SUPERVISOREMAIL__</strong> คำหลักที่จะมีอีเมลถูกส่งไปยังผู้บังคับบัญชาของผู้ใช้ (ใช้งานได้เฉพาะในกรณีที่อีเมลถูกกำหนดไว้สำหรับหัวหน้างานนี้)
 NbOfTargetedContacts=ปัจจุบันจำนวนของอีเมลที่ติดต่อการกำหนดเป้​​าหมาย
 UseFormatFileEmailToTarget=ไฟล์ที่นำเข้าต้องมีรูปแบบ <strong>email;name;firstname;other</strong>
@@ -183,7 +185,7 @@ Information=ข้อมูล
 ContactsWithThirdpartyFilter=ผู้ติดต่อที่มีตัวกรองบุคคลที่สาม
 Unanswered=ยังไม่ได้ตอบ
 Answered=ตอบแล้ว
-IsNotAnAnswer=ไม่รับสาย (อีเมลเริ่มต้น)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=เป็นการตอบอีเมล์เบื้องต้น
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=ค่าเริ่มต้นสำหรับฟิลด์ '%s' เมื่อสร้างผู้ติดต่อใหม่
@@ -199,6 +201,6 @@ ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 86a43504b52..03301cfabac 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -37,6 +37,7 @@ Translation=การแปล
 Translations=การแปล
 CurrentTimeZone=เขต PHP (เซิร์ฟเวอร์)
 EmptySearchString=ป้อนเกณฑ์การค้นหาที่ไม่ว่างเปล่า
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=ป้อนเกณฑ์วันที่
 NoRecordFound=บันทึกไม่พบ
 NoRecordDeleted=ไม่มีการลบบันทึก
@@ -44,34 +45,35 @@ NotEnoughDataYet=ข้อมูลไม่เพียงพอ
 NoError=ไม่มีข้อผิดพลาด
 Error=ความผิดพลาด
 Errors=ข้อผิดพลาด
-ErrorFieldRequired=สนาม '% s' จะต้อง
-ErrorFieldFormat=สนาม '% s' มีค่าที่ไม่ดี
-ErrorFileDoesNotExists=ไฟล์% s ไม่ได้อยู่
-ErrorFailedToOpenFile=ไม่สามารถเปิดไฟล์% s
+ErrorFieldRequired=จำเป็นต้องระบุฟิลด์ '%s'
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
+ErrorFieldFormat=ฟิลด์ '%s' มีค่าไม่ถูกต้อง
+ErrorFileDoesNotExists=ไฟล์ %s ไม่ได้มีอยู่
+ErrorFailedToOpenFile=ไม่สามารถเปิดไฟล์ %s
 ErrorCanNotCreateDir=ไม่สามารถสร้างโฟลเดอร์ %s
 ErrorCanNotReadDir=ไม่สามารถอ่านโฟลเดอร์ %s
-ErrorConstantNotDefined=พารามิเตอร์% s ไม่ได้กำหนดไว้
+ErrorConstantNotDefined=พารามิเตอร์ %s ไม่ได้ถูกกำหนด
 ErrorUnknown=ข้อผิดพลาดที่ไม่รู้จัก
 ErrorSQL=ข้อผิดพลาด SQL
-ErrorLogoFileNotFound=ไฟล์โลโก้ '% s' ไม่พบ
+ErrorLogoFileNotFound=ไม่พบไฟล์โลโก้ '%s'
 ErrorGoToGlobalSetup=ไปที่การตั้งค่า 'บริษัท/องค์กร' เพื่อแก้ไขปัญหานี้
 ErrorGoToModuleSetup=ไปยังโมดูลการติดตั้งการแก้ไขปัญหานี้
-ErrorFailedToSendMail=ล้มเหลวในการส่งอีเมล (ส่ง =% s รับ =% s)
+ErrorFailedToSendMail=ไม่สามารถส่งเมล์ได้ (ผู้ส่ง=%s, ผู้รับ=%s)
 ErrorFileNotUploaded=ไฟล์ที่อัปโหลดไม่ได้ ตรวจสอบขนาดที่ไม่เกินสูงสุดที่อนุญาตที่พื้นที่ว่างที่มีอยู่บนดิสก์และนั่นก็คือไม่ได้อยู่แล้วไฟล์ที่มีชื่อเดียวกันในไดเรกทอรีนี้
 ErrorInternalErrorDetected=ข้อผิดพลาดที่ตรวจพบ
 ErrorWrongHostParameter=โฮสต์พารามิเตอร์ที่ไม่ถูกต้อง
 ErrorYourCountryIsNotDefined=ไม่ได้กำหนดประเทศของคุณ ไปที่ Home-Setup-Company/Foundation แล้วโพสต์แบบฟอร์มอีกครั้ง
 ErrorRecordIsUsedByChild=ไม่สามารถลบบันทึกนี้ เรกคอร์ดนี้ถูกใช้โดยเรกคอร์ดลูกอย่างน้อยหนึ่งรายการ
 ErrorWrongValue=ค่าที่ไม่ถูกต้อง
-ErrorWrongValueForParameterX=ค่าที่ไม่ถูกต้องสำหรับพารามิเตอร์% s
+ErrorWrongValueForParameterX=ค่าพารามิเตอร์ไม่ถูกต้อง %s
 ErrorNoRequestInError=คำขอในไม่มีข้อผิดพลาด
 ErrorServiceUnavailableTryLater=ไม่สามารถให้บริการได้ในขณะนี้ ลองอีกครั้งในภายหลัง
 ErrorDuplicateField=ค่าที่ซ้ำกันในสนามที่ไม่ซ้ำกัน
 ErrorSomeErrorWereFoundRollbackIsDone=พบข้อผิดพลาดบางประการ การเปลี่ยนแปลงถูกย้อนกลับแล้ว
 ErrorConfigParameterNotDefined=พารามิเตอร์ <b>%s</b> ไม่ได้ถูกกำหนดไว้ในไฟล์กำหนดค่า Dolibarr <b>conf.php</b>.
-ErrorCantLoadUserFromDolibarrDatabase=<b>ไม่พบผู้ใช้% s</b> ในฐานข้อมูล Dolibarr
-ErrorNoVATRateDefinedForSellerCountry=ข้อผิดพลาดอัตราภาษีมูลค่าเพิ่มไม่มีกำหนดสำหรับประเทศ '% s'
-ErrorNoSocialContributionForSellerCountry=ข้อผิดพลาดที่ไม่มีทางสังคม / ประเภทภาษีทางการคลังที่กำหนดไว้สำหรับประเทศ '% s'
+ErrorCantLoadUserFromDolibarrDatabase=ล้มเหลวในการค้นหาผู้ใช้ <b>%s</b> ในฐานข้อมูล Dolibarr
+ErrorNoVATRateDefinedForSellerCountry=ข้อผิดพลาด ไม่มีการกำหนดอัตราภาษีมูลค่าเพิ่มสำหรับประเทศ '%s'
+ErrorNoSocialContributionForSellerCountry=ข้อผิดพลาด ไม่มีการกำหนดประเภทภาษีสังคม/ภาษีสำหรับประเทศ '%s'
 ErrorFailedToSaveFile=ข้อผิดพลาดล้มเหลวที่จะบันทึกไฟล์
 ErrorCannotAddThisParentWarehouse=คุณกำลังพยายามเพิ่มคลังสินค้าหลักซึ่งเป็นรายการย่อยของคลังสินค้าที่มีอยู่แล้ว
 ErrorInvalidSubtype=ไม่อนุญาตให้ใช้ประเภทย่อยที่เลือก
@@ -80,7 +82,7 @@ MaxNbOfRecordPerPage=สูงสุด จำนวนบันทึกต่
 NotAuthorized=คุณไม่ได้รับอนุญาตให้ทำเช่นนั้น
 SetDate=วันที่ตั้ง
 SelectDate=เลือกวันที่
-SeeAlso=ดูยัง% s
+SeeAlso=ดูเพิ่มเติมที่ %s
 SeeHere=ดูที่นี่
 ClickHere=คลิกที่นี่
 Here=ที่นี่
@@ -131,7 +133,7 @@ TechnicalID=รหัสทางเทคนิค
 LineID=ไลน์ไอดี
 NotePublic=หมายเหตุ (มหาชน)
 NotePrivate=หมายเหตุ (เอกชน)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr ถูกติดตั้งเพื่อ จำกัด <b>แม่นยำของราคาต่อหน่วย% s</b> ทศนิยม
+PrecisionUnitIsLimitedToXDecimals=Dolibarr ก่อตั้งขึ้นเพื่อจำกัดความแม่นยำของราคาหน่วยเป็นทศนิยม <b>%s</b>
 DoTest=ทดสอบ
 ToFilter=กรอง
 NoFilter=ไม่มีตัวกรอง
@@ -308,6 +310,7 @@ DateBuild=รายงานวันที่สร้าง
 DatePayment=วันที่ชำระเงิน
 DateApprove=วันที่อนุมัติ
 DateApprove2=วันที่อนุมัติ (ที่สองได้รับการอนุมัติ)
+PendingSince=Pending since
 RegistrationDate=วันที่ลงทะเบียน
 UserCreation=ผู้ใช้ที่สร้าง
 UserModification=ผู้ใช้การแก้ไข
@@ -495,7 +498,7 @@ ActionRunningNotStarted=ในการเริ่มต้น
 ActionRunningShort=กำลังดำเนินการ
 ActionDoneShort=เสร็จสิ้น
 ActionUncomplete=ไม่สมบูรณ์
-LatestLinkedEvents=%s เหตุการณ์ที่เชื่อมโยงล่าสุด
+LatestLinkedEvents=The last %s events
 CompanyFoundation=บริษัท/องค์กร
 Accountant=นักบัญชี
 ContactsForCompany=สำหรับรายชื่อของบุคคลที่สามนี้
@@ -508,7 +511,7 @@ ActionsOnContract=เหตุการณ์สำหรับสัญญา
 ActionsOnMember=เหตุการณ์ที่เกิดขึ้นเกี่ยวกับสมาชิกในนี้
 ActionsOnProduct=กิจกรรมเกี่ยวกับผลิตภัณฑ์นี้
 ActionsOnAsset=เหตุการณ์สำหรับสินทรัพย์ถาวรนี้
-NActionsLate=% s ปลาย
+NActionsLate=%s สายแล้ว
 ToDo=ที่จะทำ
 Completed=สมบูรณ์
 Running=กำลังดำเนินการ
@@ -518,7 +521,7 @@ FilterOnInto=เกณฑ์การค้นหา '<strong>%s</strong>' ล
 RemoveFilter=ลบฟิลเตอร์
 ChartGenerated=สร้างแผนภูมิ
 ChartNotGenerated=ผังไม่ได้สร้างขึ้น
-GeneratedOn=สร้าง% s
+GeneratedOn=สร้างบน %s
 Generate=ผลิต
 Duration=ระยะเวลา
 TotalDuration=ระยะเวลารวม
@@ -671,7 +674,7 @@ File=ไฟล์
 Files=ไฟล์
 NotAllowed=ไม่อนุญาตให้
 ReadPermissionNotAllowed=ได้รับอนุญาตอ่านไม่ได้รับอนุญาต
-AmountInCurrency=จำนวนเงินในสกุลเงิน% s
+AmountInCurrency=จำนวนเงินเป็นสกุลเงิน %s
 Example=ตัวอย่าง
 Examples=ตัวอย่าง
 NoExample=ตัวอย่างเช่นไม่มี
@@ -682,9 +685,9 @@ NbOfObjects=จำนวนของวัตถุ
 NbOfObjectReferers=จำนวนรายการที่เกี่ยวข้อง
 Referers=รายการที่เกี่ยวข้อง
 TotalQuantity=ปริมาณรวม
-DateFromTo=จาก% s% s
-DateFrom=จาก% s
-DateUntil=จนกระทั่ง% s
+DateFromTo=จาก %s ถึง %s
+DateFrom=จาก %s
+DateUntil=จนกระทั่ง %s
 Check=ตรวจสอบ
 Uncheck=ยกเลิกการเลือก
 Internal=ภายใน
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=ร่างกายอีเมล์
 SendAcknowledgementByMail=ส่งอีเมลยืนยัน
 SendMail=ส่งอีเมล
 Email=อีเมล์
+EMail=อีเมล
+EMails=อีเมล
 NoEMail=ไม่มีอีเมล
 AlreadyRead=อ่านแล้ว
 NotRead=ยังไม่ได้อ่าน
@@ -770,7 +775,7 @@ MenuAWStats=AWStats
 MenuMembers=สมาชิก
 MenuAgendaGoogle=วาระการประชุมของ Google
 MenuTaxesAndSpecialExpenses=ภาษี | ค่าใช้จ่ายพิเศษ
-ThisLimitIsDefinedInSetup=Dolibarr ขีด จำกัด (เมนูที่บ้านการตั้งค่าการรักษาความปลอดภัย):% s Kb, PHP ขีด จำกัด :% s Kb
+ThisLimitIsDefinedInSetup=ขีดจำกัด Dolibarr (เมนู home-setup-security): %s Kb, ขีดจำกัด PHP: %s Kb
 ThisLimitIsDefinedInSetupAt=ขีดจำกัด Dolibarr (เมนู %s): %s Kb, ขีดจำกัด PHP (พารามิเตอร์ %s): %s Kb
 NoFileFound=ไม่มีการอัปโหลดเอกสาร
 CurrentUserLanguage=ภาษาปัจจุบัน
@@ -793,7 +798,7 @@ Notes=หมายเหตุ
 AddNewLine=เพิ่มบรรทัดใหม่
 AddFile=เพิ่มไฟล์
 FreeZone=ผลิตภัณฑ์ข้อความอิสระ
-FreeLineOfType=รายการข้อความอิสระ ประเภท:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=วัตถุโคลนที่มีคุณลักษณะหลัก
 ReGeneratePDF=สร้าง PDF อีกครั้ง
 PDFMerge=ผสานรูปแบบไฟล์ PDF
@@ -879,12 +884,14 @@ toward=ไปทาง
 Access=การเข้าถึง
 SelectAction=เลือกการกระทำ
 SelectTargetUser=เลือกผู้ใช้/พนักงานเป้าหมาย
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=ใช้ Ctrl + C เพื่อคัดลอกไปที่คลิปบอร์ด
 SaveUploadedFileWithMask=บันทึกไฟล์บนเซิร์ฟเวอร์ที่มีชื่อ "<strong>%s</strong>" (มิฉะนั้น "%s")
 OriginFileName=ชื่อไฟล์ต้นฉบับ
 SetDemandReason=แหล่งที่มาของการตั้งค่า
 SetBankAccount=กำหนดบัญชีธนาคาร
 AccountCurrency=สกุลเงินในบัญชี
+AccountancyCode=Accounting Code
 ViewPrivateNote=ดูบันทึก
 XMoreLines=% s สาย (s) ซ่อน
 ShowMoreLines=แสดงบรรทัดมากขึ้น/น้อยลง
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=คุณแน่ใจหรือไม่ว่
 ConfirmMassClone=การยืนยันการโคลนจำนวนมาก
 ConfirmMassCloneQuestion=เลือกโปรเจ็กต์ที่จะโคลน
 ConfirmMassCloneToOneProject=โคลนไปยังโปรเจ็กต์ %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=วัตถุที่เกี่ยวข้อง
 ClassifyBilled=จำแนกประเภทการเรียกเก็บเงิน
 ClassifyUnbilled=จำแนกประเภทที่ยังไม่ได้เรียกเก็บเงิน
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=คุณต้องเข้าสู่ระบบ
 Download=ดาวน์โหลด
 DownloadDocument=ดาวน์โหลดเอกสาร
 DownloadSignedDocument=ดาวน์โหลดเอกสารที่ลงนามแล้ว
-ActualizeCurrency=อัพเดตอัตราสกุลเงิน
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=ปีงบประมาณ
 ModuleBuilder=ตัวสร้างโมดูลและแอปพลิเคชัน
 SetMultiCurrencyCode=ตั้งค่าสกุลเงิน
+SetMultiCurrencyRate=Set currency rate
 BulkActions=การดำเนินการเป็นกลุ่ม
 ClickToShowHelp=คลิกเพื่อแสดงคำแนะนำเครื่องมือช่วยเหลือ
 WebSite=เว็บไซต์
@@ -1104,6 +1113,7 @@ PayedBy=จ่ายโดย
 PayedTo=จ่ายให้กับ
 Monthly=รายเดือน
 Quarterly=รายไตรมาส
+Quarter=Quarter
 Annual=ประจำปี
 Local=ท้องถิ่น
 Remote=ระยะไกล
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=งาน
 ContactDefault_propal=ข้อเสนอ
 ContactDefault_supplier_proposal=ข้อเสนอของซัพพลายเออร์
 ContactDefault_ticket=ตั๋ว
+ContactDefault_societe=บุคคลที่สาม
 ContactAddedAutomatically=ผู้ติดต่อที่เพิ่มจากบทบาทผู้ติดต่อบุคคลที่สาม
 More=มากกว่า
 ShowDetails=แสดงรายละเอียด
@@ -1242,6 +1253,7 @@ CommercialAffected=ตัวแทนฝ่ายขายที่ได้ร
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=ข่าวสาร
+Emailing=Emailing
 Progression=ความคืบหน้า
 YourMessage=ข้อความของคุณ
 YourMessageHasBeenReceived=ได้รับข้อความของคุณแล้ว เราจะตอบหรือติดต่อคุณโดยเร็วที่สุด
@@ -1276,9 +1288,9 @@ LinkedFiles=แฟ้มที่เชื่อมโยงและเอก
 NoLinkFound=ไม่มีการเชื่อมโยงลงทะเบียน
 LinkComplete=ไฟล์ที่ได้รับการประสบความสำเร็จในการเชื่อมโยง
 ErrorFileNotLinked=ไฟล์ไม่สามารถเชื่อมโยง
-LinkRemoved=การเชื่อมโยง% s ได้ถูกลบออก
-ErrorFailedToDeleteLink= ล้มเหลวในการลบการเชื่อมโยง <b>'% s'</b>
-ErrorFailedToUpdateLink= ล้มเหลวในการปรับปรุงการเชื่อมโยง <b>'% s'</b>
+LinkRemoved=ลิงก์ %s ได้ถูกลบออกไปแล้ว
+ErrorFailedToDeleteLink= ไม่สามารถลบลิงก์ '<b>%s</b>' ได้
+ErrorFailedToUpdateLink= ไม่สามารถอัปเดตลิงก์ '<b>%s</b>'
 URLToLink=URL ที่จะเชื่อมโยง
 OverwriteIfExists=เขียนทับหากมีไฟล์อยู่
 AmountSalary=จำนวนเงินเดือน
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=เพิ่ม
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=จากจุดเริ่มต้น
+Transferred=Transferred
diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang
index 97e3b122889..464f82b6f9d 100644
--- a/htdocs/langs/th_TH/members.lang
+++ b/htdocs/langs/th_TH/members.lang
@@ -13,7 +13,7 @@ MembersTickets=เอกสารที่อยู่สมาชิก
 FundationMembers=สมาชิกมูลนิธิ
 ListOfValidatedPublicMembers=ตรวจสอบรายชื่อของสมาชิกในที่สาธารณะ
 ErrorThisMemberIsNotPublic=สมาชิกคนนี้ไม่ได้เป็นของประชาชน
-ErrorMemberIsAlreadyLinkedToThisThirdParty=สมาชิกอีกคนหนึ่ง <b>(ชื่อ:% s, เข้าสู่ระบบ:% s) จะเชื่อมโยงกับบุคคลที่สาม%</b> s ลบลิงค์นี้ก่อนเพราะบุคคลที่สามไม่สามารถเชื่อมโยงไปยังสมาชิกเท่านั้น (และในทางกลับกัน)
+ErrorMemberIsAlreadyLinkedToThisThirdParty=สมาชิกรายอื่น (ชื่อ: <b>%s</b>, เข้าสู่ระบบ: <b>%s</b>) เชื่อมโยงกับบุคคลที่สามแล้ว <b>%s</b> ลบลิงก์นี้ออกก่อนเนื่องจากบุคคลที่สามไม่สามารถเชื่อมโยงกับสมาชิกได้เท่านั้น (และในทางกลับกัน)
 ErrorUserPermissionAllowsToLinksToItselfOnly=ด้วยเหตุผลด้านความปลอดภัยคุณต้องได้รับสิทธิ์ในการแก้ไขผู้ใช้ทุกคนที่จะสามารถที่จะเชื่อมโยงสมาชิกให้กับผู้ใช้ที่ไม่ได้เป็นของคุณ
 SetLinkToUser=เชื่อมโยงไปยังผู้ใช้ Dolibarr
 SetLinkToThirdParty=เชื่อมโยงไปยัง Dolibarr ของบุคคลที่สาม
@@ -77,7 +77,7 @@ ConfirmDeleteMemberType=คุณแน่ใจหรือไม่ว่า
 MemberTypeDeleted=ลบประเภทสมาชิกแล้ว
 MemberTypeCanNotBeDeleted=ประเภทสมาชิกไม่สามารถลบได้
 NewSubscription=ผลงานใหม่
-NewSubscriptionDesc=รูปแบบนี้จะช่วยให้คุณสามารถบันทึกการสมัครสมาชิกของคุณเป็นสมาชิกใหม่ของมูลนิธิ หากคุณต้องการที่จะต่ออายุการเป็นสมาชิกของคุณ (ถ้าเป็นสมาชิกอยู่แล้ว) กรุณาติดต่อคณะกรรมการมูลนิธิแทนโดยการส่งอีเมล์% s
+NewSubscriptionDesc=แบบฟอร์มนี้ช่วยให้คุณบันทึกการสมัครสมาชิกในฐานะสมาชิกใหม่ของมูลนิธิได้ หากคุณต้องการต่ออายุการสมัครสมาชิก (หากเป็นสมาชิกอยู่แล้ว) โปรดติดต่อคณะกรรมการมูลนิธิทางอีเมล %s
 Subscription=ผลงาน
 AnyAmountWithAdvisedAmount=จำนวนเท่าใดก็ได้ตามต้องการ ขอแนะนำให้ใช้ %s
 AnyAmountWithoutAdvisedAmount=จำนวนเงินที่คุณเลือก
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=หากจำเป็นต้องมีการ
 DeleteType=ลบ
 VoteAllowed=โหวตที่ได้รับอนุญาต
 Physical=รายบุคคล
-Moral=บริษัท
-MorAndPhy=บริษัทและบุคคล
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=เปิดใช้งานอีกครั้ง
 ExcludeMember=ไม่รวมสมาชิก
 Exclude=ไม่รวม
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=สถิติสมาชิกตามภูมิ
 NbOfMembers=จำนวนสมาชิกทั้งหมด
 NbOfActiveMembers=จำนวนสมาชิกที่ใช้งานอยู่ทั้งหมดในปัจจุบัน
 NoValidatedMemberYet=ไม่มีสมาชิกตรวจสอบพบว่า
-MembersByCountryDesc=หน้าจอนี้จะแสดงสถิติสมาชิกแยกตามประเทศ กราฟและแผนภูมิขึ้นอยู่กับความพร้อมใช้งานของบริการกราฟออนไลน์ของ Google รวมถึงความพร้อมใช้งานของการเชื่อมต่ออินเทอร์เน็ตที่ใช้งานได้
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=หน้าจอนี้แสดงสถิติสมาชิกแยกตามรัฐ/จังหวัด/ตำบล
 MembersByTownDesc=หน้าจอนี้จะแสดงสถิติสมาชิกตามเมือง
 MembersByNature=หน้าจอนี้จะแสดงสถิติของสมาชิกตามลักษณะ
@@ -208,25 +209,25 @@ NewMemberbyWeb=สมาชิกใหม่ที่เพิ่ม รอก
 NewMemberForm=แบบฟอร์มการสมัครสมาชิกใหม่
 SubscriptionsStatistics=สถิติการมีส่วนร่วม
 NbOfSubscriptions=จำนวนการบริจาค
-AmountOfSubscriptions=จำนวนเงินที่รวบรวมจากการบริจาค
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=มูลค่าการซื้อขาย (สำหรับ บริษัท ) หรืองบประมาณ (มูลนิธิ)
-DefaultAmount=จำนวนเงินเริ่มต้นของการสนับสนุน (ใช้เฉพาะในกรณีที่ไม่มีการกำหนดจำนวนเงินในระดับประเภทสมาชิก)
-MinimumAmount=จำนวนเงินขั้นต่ำ (ใช้เฉพาะเมื่อจำนวนเงินสมทบฟรี)
-CanEditAmount=สมาชิกสามารถกำหนดจำนวนการสมัครสมาชิกได้
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=ผู้เข้าชมสามารถเลือก/แก้ไขจำนวนเงินที่บริจาคได้โดยไม่คำนึงถึงประเภทสมาชิก
 AmountIsLowerToMinimumNotice=จำนวนเงินต่ำกว่า %s ขั้นต่ำ
 MEMBER_NEWFORM_PAYONLINE=หลังจากลงทะเบียนออนไลน์แล้ว ให้สลับไปที่หน้าชำระเงินออนไลน์โดยอัตโนมัติ
 ByProperties=โดยธรรมชาติ
 MembersStatisticsByProperties=สถิติสมาชิกโดยธรรมชาติ
-VATToUseForSubscriptions=อัตราภาษีมูลค่าเพิ่มเพื่อใช้สำหรับการสมทบ
-NoVatOnSubscription=ไม่มีภาษีมูลค่าเพิ่มสำหรับการบริจาค
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=ผลิตภัณฑ์ที่ใช้สำหรับรายการสนับสนุนในใบแจ้งหนี้: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=ชื่อหรือบริษัท
 SubscriptionRecorded=บันทึกการมีส่วนร่วมแล้ว
 NoEmailSentToMember=ไม่มีอีเมล์ส่งถึงสมาชิก
 EmailSentToMember=ส่งอีเมลถึงสมาชิกที่ %s
-SendReminderForExpiredSubscriptionTitle=ส่งการแจ้งเตือนทางอีเมลสำหรับการสนับสนุนที่หมดอายุ
-SendReminderForExpiredSubscription=ส่งการแจ้งเตือนทางอีเมลถึงสมาชิกเมื่อการบริจาคกำลังจะหมดอายุ (พารามิเตอร์คือจำนวนวันก่อนสิ้นสุดการเป็นสมาชิกเพื่อส่งการแจ้งเตือน โดยอาจเป็นรายการวันที่คั่นด้วยเครื่องหมายอัฒภาค เช่น '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=การเป็นสมาชิกที่ชำระในช่วงเวลาปัจจุบัน (จนถึง %s)
 YouMayFindYourInvoiceInThisEmail=คุณอาจพบใบแจ้งหนี้ของคุณแนบมากับอีเมลนี้
 XMembersClosed=สมาชิก %s ปิดแล้ว
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=บุคคลที่สามคือนิต
 MemberFirstname=ชื่อสมาชิก
 MemberLastname=นามสกุลสมาชิก
 MemberCodeDesc=รหัสสมาชิก เฉพาะสมาชิกทุกคน
-MemberSubscriptionStartFirstDayOf=วันที่เริ่มต้นของการเป็นสมาชิกสอดคล้องกับวันแรกของ
-MemberSubscriptionStartAfter=ระยะเวลาขั้นต่ำก่อนวันที่เริ่มต้นของการสมัครสมาชิกจะมีผลใช้บังคับ ยกเว้นการต่ออายุ (ตัวอย่าง +3m = +3 เดือน, -5d = -5 วัน, +1Y = +1 ปี)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index 8da144d0332..2c2b91ae586 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -70,11 +70,14 @@ Notify_BILL_SUPPLIER_VALIDATE=ตรวจสอบใบแจ้งหนี
 Notify_BILL_SUPPLIER_PAYED=ใบแจ้งหนี้ของผู้ขายที่ชำระแล้ว
 Notify_BILL_SUPPLIER_SENTBYMAIL=ใบแจ้งหนี้ของผู้ขายส่งทางไปรษณีย์
 Notify_BILL_SUPPLIER_CANCELED=ใบแจ้งหนี้ของผู้จัดจำหน่ายถูกยกเลิก
+Notify_CONTRACT_MODIFY=Contract modified
 Notify_CONTRACT_VALIDATE=การตรวจสอบสัญญา
 Notify_FICHINTER_VALIDATE=การแทรกแซงการตรวจสอบ
+Notify_FICHINTER_MODIFY=Intervention modified
 Notify_FICHINTER_CLOSE=ปิดการแทรกแซงแล้ว
 Notify_FICHINTER_ADD_CONTACT=เพิ่มการติดต่อในการแทรกแซง
 Notify_FICHINTER_SENTBYMAIL=การแทรกแซงส่งทางไปรษณีย์
+Notify_SHIPPING_MODIFY=Shipping modified
 Notify_SHIPPING_VALIDATE=การจัดส่งสินค้าผ่านการตรวจสอบ
 Notify_SHIPPING_SENTBYMAIL=การจัดส่งสินค้าส่งทางไปรษณีย์
 Notify_MEMBER_VALIDATE=สมาชิกผ่านการตรวจสอบ
@@ -91,7 +94,7 @@ Notify_EXPENSE_REPORT_APPROVE=อนุมัติรายงานค่า
 Notify_HOLIDAY_VALIDATE=ตรวจสอบคำขอลาแล้ว (ต้องได้รับการอนุมัติ)
 Notify_HOLIDAY_APPROVE=อนุมัติคำขอลาแล้ว
 Notify_ACTION_CREATE=เพิ่มการดำเนินการในวาระการประชุม
-SeeModuleSetup=ดูการตั้งค่าของโมดูล% s
+SeeModuleSetup=ดูการตั้งค่าของโมดูล %s
 NbOfAttachedFiles=จำนวนแนบไฟล์ / เอกสาร
 TotalSizeOfAttachedFiles=ขนาดของไฟล์ที่แนบมา / เอกสาร
 MaxSize=ขนาดสูงสุด
@@ -123,11 +126,11 @@ DemoCompanyShopWithCashDesk=บริหารจัดการร้านค
 DemoCompanyProductAndStocks=ร้านค้าขายสินค้ากับจุดขาย
 DemoCompanyManufacturing=บริษัทผลิตสินค้า
 DemoCompanyAll=บริษัทที่มีกิจกรรมหลากหลาย (โมดูลหลักทั้งหมด)
-CreatedBy=สร้างโดย% s
-ModifiedBy=ดัดแปลงโดย% s
-ValidatedBy=การตรวจสอบโดย% s
+CreatedBy=สร้างโดย %s
+ModifiedBy=ปรับปรุงแก้ไขโดย %s
+ValidatedBy=ตรวจสอบโดย %s
 SignedBy=ลงนามโดย %s
-ClosedBy=ปิดโดย% s
+ClosedBy=ปิดโดย %s
 CreatedById=รหัสผู้ใช้ที่สร้าง
 ModifiedById=รหัสผู้ใช้ที่ทำการเปลี่ยนแปลงล่าสุด
 ValidatedById=รหัสผู้ใช้ที่ผ่านการตรวจสอบ
@@ -138,8 +141,8 @@ ModifiedByLogin=ข้อมูลเข้าสู่ระบบของผ
 ValidatedByLogin=เข้าสู่ระบบผู้ใช้ที่ผ่านการตรวจสอบ
 CanceledByLogin=เข้าสู่ระบบที่ผู้ใช้ยกเลิก
 ClosedByLogin=ผู้ใช้ที่เข้าสู่ระบบปิด
-FileWasRemoved=ไฟล์% s จะถูกลบออก
-DirWasRemoved=สารบบ% s จะถูกลบออก
+FileWasRemoved=ไฟล์ %s ถูกลบไปแล้ว
+DirWasRemoved=ไดเรกทอรี %s ถูกลบไปแล้ว
 FeatureNotYetAvailable=คุณลักษณะยังไม่มีให้บริการในเวอร์ชันปัจจุบัน
 FeatureNotAvailableOnDevicesWithoutMouse=คุณสมบัติไม่พร้อมใช้งานบนอุปกรณ์ที่ไม่มีเมาส์
 FeaturesSupported=คุณสมบัติที่รองรับ
@@ -194,7 +197,7 @@ EnterNewPasswordHere=ป้อนรหัสผ่านใหม่ของ
 BackToLoginPage=กลับไปหน้าเข้าสู่ระบบ
 AuthenticationDoesNotAllowSendNewPassword=<b>โหมดการตรวจสอบเป็น%</b> s <br> ในโหมดนี้ Dolibarr ไม่สามารถรู้หรือเปลี่ยนรหัสผ่านของคุณ <br> ติดต่อผู้ดูแลระบบของคุณถ้าคุณต้องการที่จะเปลี่ยนรหัสผ่านของคุณ
 EnableGDLibraryDesc=ติดตั้งหรือเปิดใช้งานไลบรารี GD ในการติดตั้ง PHP ของคุณเพื่อใช้ตัวเลือกนี้
-ProfIdShortDesc=<b>ศ Id% s</b> ข้อมูลขึ้นอยู่กับประเทศของบุคคลที่สาม <br> <b>ตัวอย่างเช่นสำหรับประเทศ% s ก็รหัส%</b> s
+ProfIdShortDesc=<b>Prof Id %s</b> เป็นข้อมูลที่ขึ้นอยู่กับประเทศของบุคคลที่สาม<br>ตัวอย่างเช่น สำหรับประเทศ <b>%s</b> จะเป็นรหัส <b>%s</b>
 DolibarrDemo=Dolibarr ERP / CRM สาธิต
 StatsByAmount=สถิติจำนวนสินค้า/บริการ
 StatsByAmountProducts=สถิติจำนวนสินค้า
@@ -209,6 +212,7 @@ AmountIn=จำนวนเงินใน %s
 NumberOfUnitsMos=จำนวนหน่วยที่ผลิตในใบสั่งผลิต
 EMailTextInterventionAddedContact=การแทรกแซงใหม่ %s ได้รับการมอบหมายให้กับคุณแล้ว
 EMailTextInterventionValidated=การแทรกแซง% s ได้รับการตรวจสอบ
+EMailTextInterventionModified=The intervention %s has been modified. %s
 EMailTextInterventionClosed=การแทรกแซง %s ถูกปิดแล้ว
 EMailTextInvoiceValidated=ใบแจ้งหนี้ %s ได้รับการตรวจสอบแล้ว
 EMailTextInvoicePayed=ชำระใบแจ้งหนี้ %s แล้ว
@@ -226,12 +230,14 @@ EMailTextSupplierOrderCanceledBy=Purchase order %s has been canceled by %s.
 EMailTextSupplierOrderValidatedBy=ใบสั่งซื้อ %s ได้รับการบันทึกโดย %s
 EMailTextSupplierOrderSubmittedBy=ใบสั่งซื้อ %s ถูกส่งโดย %s
 EMailTextSupplierOrderRefusedBy=ใบสั่งซื้อ %s ถูกปฏิเสธโดย %s
+EMailTextExpeditionModified=Shipping %s has been validated. %s
 EMailTextExpeditionValidated=การจัดส่ง %s ได้รับการตรวจสอบแล้ว
 EMailTextExpenseReportValidated=รายงานค่าใช้จ่าย %s ได้รับการตรวจสอบแล้ว
 EMailTextExpenseReportApproved=รายงานค่าใช้จ่าย %s ได้รับการอนุมัติแล้ว
 EMailTextHolidayValidated=คำขอออก %s ได้รับการตรวจสอบแล้ว
 EMailTextHolidayApproved=คำขอออก %s ได้รับการอนุมัติแล้ว
 EMailTextActionAdded=เพิ่มการดำเนินการ %s ลงในวาระแล้ว
+EMailTextContractModified=The contract %s has been modified. %s
 ImportedWithSet=การนำเข้าข้อมูลที่ตั้ง
 DolibarrNotification=การแจ้งเตือนอัตโนมัติ
 ResizeDesc=<b>ป้อนความกว้างใหม่หรือสูงใหม่</b> อัตราส่วนจะถูกเก็บไว้ในช่วงการปรับขนาด ...
@@ -241,7 +247,7 @@ NewSizeAfterCropping=ขนาดใหม่หลังจากการป
 DefineNewAreaToPick=กำหนดพื้นที่ใหม่ที่ภาพเพื่อเลือก (ซ้ายคลิกที่ภาพแล้วลากจนกว่าจะถึงมุมตรงข้าม)
 CurrentInformationOnImage=เครื่องมือนี้ออกแบบมาเพื่อช่วยคุณปรับขนาดหรือครอบตัดรูปภาพ นี่คือข้อมูลเกี่ยวกับภาพที่แก้ไขในปัจจุบัน
 ImageEditor=โปรแกรมแก้ไขภาพ
-YouReceiveMailBecauseOfNotification=คุณได้รับข้อความนี้เนื่องจากอีเมลของคุณได้รับการเพิ่มรายชื่อของเป้าหมายที่จะได้รับทราบถึงเหตุการณ์ที่เกิดขึ้นโดยเฉพาะอย่างยิ่งเข้าไปในซอฟต์แวร์% ของ% s
+YouReceiveMailBecauseOfNotification=คุณได้รับข้อความนี้เนื่องจากอีเมลของคุณถูกเพิ่มในรายการเป้าหมายที่จะรับแจ้งเกี่ยวกับเหตุการณ์เฉพาะในซอฟต์แวร์ %s ของ %s
 YouReceiveMailBecauseOfNotification2=เหตุการณ์นี้เป็นดังต่อไปนี้:
 ThisIsListOfModules=นี่คือรายชื่อของโมดูลไว้ล่วงหน้าโดยรายละเอียดการสาธิตนี้ (โมดูลเฉพาะที่พบมากที่สุดที่สามารถมองเห็นในการสาธิตนี้) แก้ไขนี้จะมีการสาธิตส่วนบุคคลมากขึ้นและคลิกที่ "เริ่มต้น"
 UseAdvancedPerms=ใช้สิทธิ์ขั้นสูงของโมดูลบาง
@@ -257,7 +263,7 @@ ResetPassword=รีเซ็ตรหัสผ่าน
 RequestToResetPasswordReceived=ได้รับการร้องขอให้เปลี่ยนรหัสผ่านของคุณแล้ว
 NewKeyIs=นี่คือกุญแจใหม่ของคุณเข้าสู่ระบบ
 NewKeyWillBe=คีย์ใหม่ของคุณที่จะเข้าสู่ระบบซอฟแวร์จะเป็น
-ClickHereToGoTo=คลิกที่นี่เพื่อไปยัง% s
+ClickHereToGoTo=คลิกที่นี่เพื่อไปที่ %s
 YouMustClickToChange=คุณต้อง แต่แรกคลิกที่ลิงค์ต่อไปนี้ในการตรวจสอบการเปลี่ยนแปลงรหัสผ่านนี้
 ConfirmPasswordChange=ยืนยันการเปลี่ยนรหัสผ่าน
 ForgetIfNothing=หากคุณไม่ได้ขอเปลี่ยนแปลงนี้เพียงแค่ลืมอีเมล์นี้ ข้อมูลประจำตัวของคุณจะถูกเก็บไว้ที่ปลอดภัย
diff --git a/htdocs/langs/th_TH/paypal.lang b/htdocs/langs/th_TH/paypal.lang
index 4a5335eec9a..4182a351ad2 100644
--- a/htdocs/langs/th_TH/paypal.lang
+++ b/htdocs/langs/th_TH/paypal.lang
@@ -1,36 +1,37 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal การติดตั้งโมดูล
-PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
-PaypalDoPayment=Pay with PayPal
+PaypalDesc=โมดูลนี้อนุญาตให้ลูกค้าชำระเงินผ่าน <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external">PayPal</a> สามารถใช้สำหรับการชำระเงินเฉพาะกิจหรือการชำระเงินที่เกี่ยวข้องกับออบเจ็กต์ Dolibarr (ใบแจ้งหนี้ คำสั่งซื้อ ...)
+PaypalOrCBDoPayment=ชำระเงินด้วย PayPal (บัตรหรือ PayPal)
+PaypalDoPayment=ชำระเงินด้วยเพย์พาล
 PAYPAL_API_SANDBOX=การทดสอบ Mode / ทราย
 PAYPAL_API_USER=ชื่อผู้ใช้ API
 PAYPAL_API_PASSWORD=รหัสผ่าน API
 PAYPAL_API_SIGNATURE=ลายเซ็น API
-PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
+PAYPAL_SSLVERSION=เวอร์ชัน Curl SSL
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=เสนอการชำระเงินแบบ "รวม" (บัตรเครดิต + PayPal) หรือ "PayPal" เท่านั้น
 PaypalModeIntegral=สำคัญ
 PaypalModeOnlyPaypal=PayPal เท่านั้น
-ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
-ThisIsTransactionId=<b>นี่คือรหัสของรายการ:% s</b>
-PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
-NewOnlinePaymentReceived=New online payment received
-NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
+ONLINE_PAYMENT_CSS_URL=URL ตัวเลือกของสไตล์ชีต CSS บนหน้าการชำระเงินออนไลน์
+ThisIsTransactionId=นี่คือรหัสธุรกรรม: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=รวม URL การชำระเงินของ PayPal เมื่อคุณส่งเอกสารทางอีเมล
+NewOnlinePaymentReceived=ได้รับการชำระเงินออนไลน์ใหม่แล้ว
+NewOnlinePaymentFailed=พยายามชำระเงินออนไลน์ใหม่แต่ล้มเหลว
+ONLINE_PAYMENT_SENDEMAIL=ที่อยู่อีเมลสำหรับการแจ้งเตือนหลังจากพยายามชำระเงินแต่ละครั้ง (เพื่อความสำเร็จและล้มเหลว)
 ReturnURLAfterPayment=URL ที่กลับมาหลังจากการชำระเงิน
-ValidationOfOnlinePaymentFailed=Validation of online payment failed
-PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
-SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
-DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
-DetailedErrorMessage=Detailed Error Message
-ShortErrorMessage=Short Error Message
-ErrorCode=Error Code
-ErrorSeverityCode=Error Severity Code
-OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import PayPal payments
-PostActionAfterPayment=Post actions after payments
-ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
-ValidationOfPaymentFailed=Validation of payment has failed
-CardOwner=Card holder
-PayPalBalance=Paypal credit
+ValidationOfOnlinePaymentFailed=การตรวจสอบการชำระเงินออนไลน์ล้มเหลว
+PaymentSystemConfirmPaymentPageWasCalledButFailed=หน้ายืนยันการชำระเงินถูกเรียกโดยระบบการชำระเงินส่งคืนข้อผิดพลาด
+SetExpressCheckoutAPICallFailed=การเรียก SetExpressCheckout API ล้มเหลว
+DoExpressCheckoutPaymentAPICallFailed=การเรียก DoExpressCheckoutPayment API ล้มเหลว
+DetailedErrorMessage=ข้อความแสดงข้อผิดพลาดโดยละเอียด
+ShortErrorMessage=ข้อความแสดงข้อผิดพลาดสั้นๆ
+ErrorCode=รหัสข้อผิดพลาด
+ErrorSeverityCode=รหัสความรุนแรงของข้อผิดพลาด
+OnlinePaymentSystem=ระบบการชำระเงินออนไลน์
+PaypalLiveEnabled=เปิดใช้งานโหมด "สด" ของ PayPal (ไม่เช่นนั้นโหมดทดสอบ/แซนด์บ็อกซ์)
+PaypalImportPayment=นำเข้าการชำระเงิน PayPal
+PostActionAfterPayment=โพสต์การดำเนินการหลังการชำระเงิน
+ARollbackWasPerformedOnPostActions=มีการย้อนกลับกับการดำเนินการโพสต์ทั้งหมด คุณต้องดำเนินการโพสต์ด้วยตนเองหากจำเป็น
+ValidationOfPaymentFailed=การตรวจสอบการชำระเงินล้มเหลว
+CardOwner=ผู้ถือบัตร
+PayPalBalance=เครดิตเพย์พาล
+OnlineSubscriptionPaymentLine=การสมัครสมาชิกออนไลน์ที่บันทึกเมื่อ %s<br>ชำระเงินผ่าน %s<br>ที่อยู่ IP ต้นทาง: %s<br>รหัสธุรกรรม: %s
diff --git a/htdocs/langs/th_TH/printing.lang b/htdocs/langs/th_TH/printing.lang
index a419017d62a..7a00c8b5e8e 100644
--- a/htdocs/langs/th_TH/printing.lang
+++ b/htdocs/langs/th_TH/printing.lang
@@ -1,25 +1,25 @@
 # Dolibarr language file - Source file is en_US - printing
-Module64000Name=One click Printing
-Module64000Desc=Enable One click Printing System
-PrintingSetup=Setup of One click Printing System
-PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer with no need to open the document into another application.
-MenuDirectPrinting=One click Printing jobs
-DirectPrint=One click Print
+Module64000Name=การพิมพ์เพียงคลิกเดียว
+Module64000Desc=เปิดใช้งานระบบการพิมพ์ด้วยคลิกเดียว
+PrintingSetup=การตั้งค่าระบบการพิมพ์ด้วยคลิกเดียว
+PrintingDesc=โมดูลนี้เพิ่มปุ่มพิมพ์ให้กับโมดูลต่างๆ เพื่อให้สามารถพิมพ์เอกสารไปยังเครื่องพิมพ์ได้โดยตรง โดยไม่จำเป็นต้องเปิดเอกสารในแอปพลิเคชันอื่น
+MenuDirectPrinting=งานพิมพ์เพียงคลิกเดียว
+DirectPrint=คลิกเพียงครั้งเดียวพิมพ์
 PrintingDriverDesc=ตัวแปรการกำหนดค่าสำหรับโปรแกรมควบคุมการพิมพ์
 ListDrivers=รายชื่อของผู้ขับขี่
 PrintTestDesc=รายชื่อของเครื่องพิมพ์
-FileWasSentToPrinter=ไฟล์% s ถู​​กส่งไปยังเครื่องพิมพ์
-ViaModule=via the module
-NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
+FileWasSentToPrinter=ไฟล์ %s ถูกส่งไปยังเครื่องพิมพ์แล้ว
+ViaModule=ผ่านโมดูล
+NoActivePrintingModuleFound=ไม่มีไดรเวอร์ที่ใช้งานอยู่เพื่อพิมพ์เอกสาร ตรวจสอบการตั้งค่าโมดูล %s
 PleaseSelectaDriverfromList=กรุณาเลือกขับจากรายการ
-PleaseConfigureDriverfromList=Please configure the selected driver from list.
+PleaseConfigureDriverfromList=โปรดกำหนดค่าไดรเวอร์ที่เลือกจากรายการ
 SetupDriver=การติดตั้งไดร์เวอร์
 TargetedPrinter=เครื่องพิมพ์กำหนดเป้​​าหมาย
 UserConf=การติดตั้งต่อผู้ใช้
-PRINTGCP_INFO=Google OAuth API setup
-PRINTGCP_AUTHLINK=Authentication
-PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PrintGCPDesc=This driver allows sending documents directly to a printer using Google Cloud Print.
+PRINTGCP_INFO=การตั้งค่า Google OAuth API
+PRINTGCP_AUTHLINK=การรับรองความถูกต้อง
+PRINTGCP_TOKEN_ACCESS=โทเค็น OAuth ของ Google Cloud Print
+PrintGCPDesc=ไดรเวอร์นี้อนุญาตให้ส่งเอกสารไปยังเครื่องพิมพ์โดยตรงโดยใช้ Google Cloud Print
 GCP_Name=ชื่อ
 GCP_displayName=ชื่อที่ใช้แสดง
 GCP_Id=Id เครื่องพิมพ์
@@ -27,11 +27,12 @@ GCP_OwnerName=ชื่อเจ้าของ
 GCP_State=เครื่องพิมพ์รัฐ
 GCP_connectionStatus=รัฐออนไลน์
 GCP_Type=ชนิดของเครื่องพิมพ์
-PrintIPPDesc=This driver allows sending of documents directly to a printer. It requires a Linux system with CUPS installed.
+PrintIPPDesc=ไดรเวอร์นี้ช่วยให้สามารถส่งเอกสารไปยังเครื่องพิมพ์ได้โดยตรง ต้องใช้ระบบ Linux ที่ติดตั้ง CUPS
 PRINTIPP_HOST=เซิร์ฟเวอร์การพิมพ์
 PRINTIPP_PORT=พอร์ต
 PRINTIPP_USER=เข้าสู่ระบบ
 PRINTIPP_PASSWORD=รหัสผ่าน
+PRINTIPP_SSL=Use SSL
 NoDefaultPrinterDefined=ไม่มีเครื่องพิมพ์เริ่มต้นที่กำหนดไว้
 DefaultPrinter=เครื่องพิมพ์เริ่มต้น
 Printer=เครื่องพิมพ์
@@ -45,10 +46,11 @@ IPP_Color=สี
 IPP_Device=เครื่อง
 IPP_Media=สื่อเครื่องพิมพ์
 IPP_Supported=ประเภทของสื่อ
-DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
-GoogleAuthNotConfigured=Google OAuth has not been setup. Enable module OAuth and set a Google ID/Secret.
-GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
+DirectPrintingJobsDesc=หน้านี้แสดงรายการงานพิมพ์ที่พบสำหรับเครื่องพิมพ์ที่มีจำหน่าย
+GoogleAuthNotConfigured=ยังไม่ได้ตั้งค่า Google OAuth เปิดใช้งานโมดูล OAuth และตั้งค่า Google ID/Secret
+GoogleAuthConfigured=พบข้อมูลรับรอง Google OAuth ในการตั้งค่าโมดูล OAuth
 PrintingDriverDescprintgcp=ตัวแปรการกำหนดค่าสำหรับการพิมพ์คนขับของ Google Cloud Print
-PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
+PrintingDriverDescprintipp=ตัวแปรการกำหนดค่าสำหรับการพิมพ์ถ้วยไดรเวอร์
 PrintTestDescprintgcp=รายการสำหรับเครื่องพิมพ์ของ Google Cloud Print
-PrintTestDescprintipp=List of Printers for Cups.
+PrintTestDescprintipp=รายชื่อเครื่องพิมพ์สำหรับถ้วย
+Testbbbb
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index 596d27c7faa..0178bef6145 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -86,7 +86,7 @@ EditSellingPriceLabel=แก้ไขป้ายราคาขาย
 CantBeLessThanMinPrice=ราคาขายต้องไม่ต่ำกว่าขั้นต่ำที่อนุญาตสำหรับผลิตภัณฑ์นี้ (%s ไม่รวมภาษี) ข้อความนี้อาจปรากฏขึ้นหากคุณพิมพ์ส่วนลดจำนวนมาก
 CantBeLessThanMinPriceInclTax=ราคาขายต้องไม่ต่ำกว่าขั้นต่ำที่อนุญาตสำหรับผลิตภัณฑ์นี้ (%s รวมภาษีแล้ว) ข้อความนี้อาจปรากฏขึ้นหากคุณพิมพ์ส่วนลดที่สำคัญเกินไป
 ContractStatusClosed=ปิด
-ErrorProductAlreadyExists=ผลิตภัณฑ์ที่มีการอ้างอิง% s อยู่แล้ว
+ErrorProductAlreadyExists=ผลิตภัณฑ์ที่มีการอ้างอิง %s มีอยู่แล้ว
 ErrorProductBadRefOrLabel=ค่าที่ไม่ถูกต้องสำหรับการอ้างอิงหรือฉลาก
 ErrorProductClone=มีปัญหาในขณะที่พยายามจะโคลนสินค้าหรือบริการ
 ErrorPriceCantBeLowerThanMinPrice=ข้อผิดพลาดราคาไม่สามารถจะต่ำกว่าราคาขั้นต่ำ
@@ -97,7 +97,6 @@ ShowService=แสดงบริการ
 ProductsAndServicesArea=สินค้าและพื้นที่บริการ
 ProductsArea=พื้นที่สินค้า
 ServicesArea=พื้นที่บริการ
-ListOfStockMovements=รายการเคลื่อนไหวของหุ้น
 BuyingPrice=ราคาที่ซื้อ
 PriceForEachProduct=สินค้าที่มีราคาเฉพาะ
 SupplierCard=บัตรผู้ขาย
@@ -130,7 +129,7 @@ ProductParentList=รายการชุดอุปกรณ์ที่ม
 ErrorAssociationIsFatherOfThis=หนึ่งในผลิตภัณฑ์ที่เลือกเป็นผู้ปกครองกับผลิตภัณฑ์ในปัจจุบัน
 DeleteProduct=ลบสินค้า / บริการ
 ConfirmDeleteProduct=คุณแน่ใจหรือว่าต้องการลบสินค้า / บริการนี​​้
-ProductDeleted=สินค้า / บริการ "% s" ลบออกจากฐานข้อมูล
+ProductDeleted=สินค้า/บริการ "%s" ถูกลบออกจากฐานข้อมูล
 ExportDataset_produit_1=ผลิตภัณฑ์
 ExportDataset_service_1=บริการ
 ImportDataset_produit_1=ผลิตภัณฑ์
@@ -145,6 +144,7 @@ WithoutDiscount=โดยไม่มีส่วนลด
 VATRateForSupplierProduct=Tax Rate (for this vendor/product)
 DiscountQtyMin=ส่วนลดสำหรับจำนวนนี้
 NoPriceDefinedForThisSupplier=ไม่มีการกำหนดราคา/จำนวนสำหรับผู้ขาย/ผลิตภัณฑ์นี้
+NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
 NoSupplierPriceDefinedForThisProduct=ไม่มีการกำหนดราคา/จำนวนผู้ขายสำหรับผลิตภัณฑ์นี้
 PredefinedItem=รายการที่กำหนดไว้ล่วงหน้า
 PredefinedProducts=Predefined Product
@@ -152,7 +152,7 @@ PredefinedServices=Predefined Service
 PredefinedProductsAndServices=Predefined products/services
 NotPredefinedProducts=ไม่ใช่ผลิตภัณฑ์/บริการที่กำหนดไว้ล่วงหน้า
 GenerateThumb=สร้างหัวแม่มือ
-ServiceNb=บริการ #% s
+ServiceNb=บริการ #%s
 ListProductServiceByPopularity=รายการผลิตภัณฑ์ / บริการตามความนิยม
 ListProductByPopularity=รายการของผลิตภัณฑ์ตามความนิยม
 ListServiceByPopularity=รายการของการบริการตามความนิยม
@@ -171,7 +171,7 @@ BuyingPrices=ราคารับซื้อ
 CustomerPrices=ราคาของลูกค้า
 SuppliersPrices=ราคาผู้ขาย
 SuppliersPricesOfProductsOrServices=ราคาผู้ขาย (ของผลิตภัณฑ์หรือบริการ)
-CustomCode=ศุลกากร | สินค้าโภคภัณฑ์ | รหัส HS
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=ประเทศต้นกำเนิด
 RegionStateOrigin=ภูมิภาคต้นทาง
 StateOrigin=รัฐ|จังหวัดต้นทาง
@@ -209,6 +209,7 @@ unitL=ลิตร
 unitT=ตัน
 unitKG=กก.
 unitG=กรัม
+unitGAL=แกลลอน
 unitMG=มก.
 unitLB=ปอนด์
 unitOZ=ออนซ์
@@ -277,7 +278,7 @@ PricingRule=กฎเกณฑ์สำหรับราคาขาย
 AddCustomerPrice=เพิ่มราคาโดยลูกค้า
 ForceUpdateChildPriceSoc=กำหนดราคาเดียวกันกับบริษัทในเครือของลูกค้า
 PriceByCustomerLog=บันทึกราคาของลูกค้าก่อนหน้านี้
-MinimumPriceLimit=ราคาขั้นต่ำไม่สามารถจะลดลงแล้ว% s
+MinimumPriceLimit=ราคาขั้นต่ำไม่สามารถต่ำกว่า %s
 MinimumRecommendedPrice=ราคาแนะนำขั้นต่ำคือ: %s
 PriceExpressionEditor=บรรณาธิการแสดงออกราคา
 PriceExpressionSelected=การแสดงออกของราคาที่เลือกไว้
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=รูปแบบของคำขอคื
 UpdateInterval=ช่วงเวลาการปรับปรุง (นาที)
 LastUpdated=ปรับปรุงล่าสุด
 CorrectlyUpdated=ปรับปรุงอย่างถูกต้อง
-PropalMergePdfProductActualFile=ไฟล์ที่ใช้ในการเพิ่มเป็น PDF ดาซูร์มี / เป็น
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=ไฟล์ PDF เลือก
 IncludingProductWithTag=รวมถึงสินค้า/บริการที่มีแท็ก
 DefaultPriceRealPriceMayDependOnCustomer=ราคาเริ่มต้นราคาที่แท้จริงอาจขึ้นอยู่กับลูกค้า
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=ปริมาณของรายการถู
 
 #Attributes
 Attributes=คุณลักษณะ
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=คุณลักษณะตัวแปร
 ProductAttributes=แอตทริบิวต์รายละเอียดปลีกย่อยสำหรับผลิตภัณฑ์
 ProductAttributeName=แอตทริบิวต์ตัวแปร %s
@@ -395,6 +400,8 @@ ErrorDestinationProductNotFound=ไม่พบสินค้าปลายท
 ErrorProductCombinationNotFound=ไม่พบตัวเลือกสินค้า
 ActionAvailableOnVariantProductOnly=การดำเนินการมีเฉพาะกับตัวเลือกสินค้าเท่านั้น
 ProductsPricePerCustomer=ราคาสินค้าต่อลูกค้า
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=คุณสมบัติเพิ่มเติม (ราคาซัพพลายเออร์)
 DeleteLinkedProduct=ลบผลิตภัณฑ์ย่อยที่เชื่อมโยงกับชุดค่าผสม
 AmountUsedToUpdateWAP=จำนวนหน่วยที่จะใช้ในการอัปเดตราคาถัวเฉลี่ยถ่วงน้ำหนัก
@@ -403,7 +410,8 @@ PMPValueShort=WAP
 mandatoryperiod=ระยะเวลาบังคับ
 mandatoryPeriodNeedTobeSet=หมายเหตุ: ต้องกำหนดช่วงเวลา (วันที่เริ่มต้นและสิ้นสุด)
 mandatoryPeriodNeedTobeSetMsgValidate=บริการต้องมีระยะเวลาเริ่มต้นและสิ้นสุด
-mandatoryHelper=เลือกตัวเลือกนี้หากคุณต้องการส่งข้อความถึงผู้ใช้เมื่อสร้าง/ตรวจสอบใบแจ้งหนี้ ข้อเสนอเชิงพาณิชย์ ใบสั่งขายโดยไม่ต้องป้อนวันที่เริ่มต้นและสิ้นสุดในบรรทัดด้วยบริการนี้<br>โปรดทราบว่า ข้อความดังกล่าวเป็นการเตือนไม่ใช่ข้อผิดพลาดในการบล็อก
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
+mandatoryHelper2=Note that the message is a warning and not a blocking error.
 DefaultBOM=BOM เริ่มต้น
 DefaultBOMDesc=BOM เริ่มต้นที่แนะนำเพื่อใช้ในการผลิตผลิตภัณฑ์นี้ ช่องนี้สามารถตั้งค่าได้เฉพาะในกรณีที่ลักษณะของผลิตภัณฑ์คือ '%s'
 Rank=อันดับ
@@ -435,3 +443,6 @@ AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtu
 ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
 WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned
 PriceLabel=Price label
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index f5a08541416..e059017e281 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -132,6 +132,7 @@ AlsoCloseAProjectTooltip=เปิดไว้หากคุณยังต้
 ReOpenAProject=เปิดโครงการ
 ConfirmReOpenAProject=คุณแน่ใจหรือไม่ว่าต้องการเปิดโปรเจ็กต์นี้อีกครั้ง
 ProjectContact=รายชื่อของโครงการ
+ProjectContactTypeManager=Assign me as contact with the type
 TaskContact=ผู้ติดต่องาน
 ActionsOnProject=เหตุการณ์ที่เกิดขึ้นในโครงการ
 YouAreNotContactOfProject=คุณยังไม่ได้ติดต่อส่วนตัวของโครงการนี​​้
@@ -148,7 +149,7 @@ LinkedToAnotherCompany=เชื่อมโยงไปยังบุคคล
 TaskIsNotAssignedToUser=ไม่ได้มอบหมายงานให้กับผู้ใช้ ใช้ปุ่ม '<strong>%s</strong>' เพื่อมอบหมายงานทันที
 ErrorTimeSpentIsEmpty=เวลาที่ใช้เป็นที่ว่างเปล่า
 TimeRecordingRestrictedToNMonthsBack=การบันทึกเวลาถูกจำกัดไว้ที่ %s หลายเดือนก่อน
-ThisWillAlsoRemoveTasks=การดำเนินการนี้จะลบงานทั้งหมดของโครงการ <b>(% s</b> งานในขณะนี้) และปัจจัยการผลิตทั้งหมดของเวลาที่ใช้
+ThisWillAlsoRemoveTasks=การดำเนินการนี้จะลบงานทั้งหมดของโครงการ (งาน <b>%s</b> ในขณะนี้) และอินพุตเวลาที่ใช้ทั้งหมดด้วย
 IfNeedToUseOtherObjectKeepEmpty=หากวัตถ​​ุบางอย่าง (ใบแจ้งหนี้การสั่งซื้อ ... ) เป็นของอีกบุคคลที่สามจะต้องเชื่อมโยงกับโครงการที่จะสร้างให้ที่ว่างเปล่านี้จะมีโครงการที่เป็นบุคคลที่สามหลาย
 CloneTasks=งานโคลน
 CloneContacts=รายชื่อโคลน
@@ -160,12 +161,12 @@ ConfirmCloneProject=คุณแน่ใจหรือว่าโคลนโ
 ProjectReportDate=เปลี่ยนวันที่งานตามวันที่เริ่มต้นโครงการใหม่
 ErrorShiftTaskDate=เป็นไปไม่ได้ที่จะเปลี่ยนวันงานตามโครงการใหม่วันที่เริ่มต้น
 ProjectsAndTasksLines=โครงการและงาน
-ProjectCreatedInDolibarr=โครงการสร้าง% s
+ProjectCreatedInDolibarr=สร้างโครงการ %s แล้ว
 ProjectValidatedInDolibarr=ตรวจสอบโปรเจ็กต์ %s แล้ว
 ProjectModifiedInDolibarr=แก้ไขโปรเจ็กต์ %s แล้ว
-TaskCreatedInDolibarr=งาน% s สร้าง
-TaskModifiedInDolibarr=งาน% s การแก้ไข
-TaskDeletedInDolibarr=งาน% s ลบ
+TaskCreatedInDolibarr=งาน %s สร้าง
+TaskModifiedInDolibarr=งาน %s การแก้ไข
+TaskDeletedInDolibarr=งาน %s ลบ
 OpportunityStatus=สถานะโอกาสในการขาย
 OpportunityStatusShort=สถานะโอกาสในการขาย
 OpportunityProbability=ความน่าจะเป็นของตะกั่ว
@@ -311,3 +312,7 @@ TaskMergeSuccess=Tasks have been merged
 ErrorTaskIdIsMandatory=Error: Task id is mandatory
 ErrorsTaskMerge=An error occurred while merging tasks
 Billable = Billable
+ConfirmCloseTask=Are you sure you want to close this task ?
+ConfirmClosed=Confirm task closed
+TaskStatus=Task status
+TaskReopened=Task reopened
diff --git a/htdocs/langs/th_TH/propal.lang b/htdocs/langs/th_TH/propal.lang
index 4d26b533347..fae4d9371a8 100644
--- a/htdocs/langs/th_TH/propal.lang
+++ b/htdocs/langs/th_TH/propal.lang
@@ -52,7 +52,7 @@ DatePropal=วันของข้อเสนอ
 DateEndPropal=ตั้งแต่วันที่วันที่สิ้นสุด
 ValidityDuration=ระยะเวลาตั้งแต่วันที่
 SetAcceptedRefused=กำหนดให้ยอมรับ/ปฏิเสธ
-ErrorPropalNotFound=Propal% s ไม่พบ
+ErrorPropalNotFound=Propal %s ไม่พบ
 AddToDraftProposals=เพิ่มลงในร่างข้อเสนอ
 NoDraftProposals=ไม่มีร่างข้อเสนอ
 CopyPropalFrom=สร้างข้อเสนอในเชิงพาณิชย์โดยการคัดลอกข้อเสนอที่มีอยู่
@@ -77,13 +77,11 @@ AvailabilityTypeAV_1W=1 สัปดาห์
 AvailabilityTypeAV_2W=2 สัปดาห์ที่ผ่านมา
 AvailabilityTypeAV_3W=3 สัปดาห์ที่ผ่านมา
 AvailabilityTypeAV_1M=1 เดือน
-
 ##### Types ofe contacts #####
 TypeContact_propal_internal_SALESREPFOLL=แทนข้อเสนอดังต่อไปนี้ขึ้น
 TypeContact_propal_external_BILLING=ติดต่อใบแจ้งหนี้ของลูกค้า
 TypeContact_propal_external_CUSTOMER=การติดต่อกับลูกค้าข้อเสนอดังต่อไปนี้ขึ้น
 TypeContact_propal_external_SHIPPING=ลูกค้าติดต่อเพื่อจัดส่ง
-
 # Document models
 CantBeNoSign=ไม่สามารถตั้งค่าไม่ได้ลงนาม
 CaseFollowedBy=กรณีตามมา.
@@ -122,3 +120,5 @@ SignSociete_rib=Sign mandate
 SignPropal=ยอมรับข้อเสนอ
 Signed=ลงนาม
 SignedOnly=ลงนามเท่านั้น
+ExpeditionSigned=Shipment signed
+SignExpedition=Sign shipment
diff --git a/htdocs/langs/th_TH/salaries.lang b/htdocs/langs/th_TH/salaries.lang
index 59ea531925e..4631f3b21a5 100644
--- a/htdocs/langs/th_TH/salaries.lang
+++ b/htdocs/langs/th_TH/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=เงินเดือนใหม่
 AddSalary=เพิ่มเงินเดือน
 NewSalaryPayment=บัตรเงินเดือนใหม่
 AddSalaryPayment=เพิ่มการจ่ายเงินเดือน
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=การชำระเงินเงินเดือน
 SalariesPayments=การชำระเงินเงินเดือน
 SalariesPaymentsOf=การจ่ายเงินเดือนของ %s
@@ -27,7 +29,7 @@ FillFieldFirst=กรอกช่องพนักงานก่อน
 UpdateAmountWithLastSalary=กำหนดจำนวนเงินเดือนสุดท้าย
 MakeTransferRequest=แจ้งขอโอน
 VirementOrder=ขอโอนเครดิต
-BankTransferAmount=จำนวนเงินโอนเครดิต
 WithdrawalReceipt=คำสั่งโอนเครดิต
 OrderWaiting=คำสั่งซื้อที่รอดำเนินการ
 FillEndOfMonth=เติมสิ้นเดือน.
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/th_TH/sendings.lang b/htdocs/langs/th_TH/sendings.lang
index a88a0dd977f..8a0c19a0da5 100644
--- a/htdocs/langs/th_TH/sendings.lang
+++ b/htdocs/langs/th_TH/sendings.lang
@@ -8,13 +8,12 @@ Shipments=การจัดส่ง
 ShowSending=แสดงการจัดส่ง
 Receivings=ใบเสร็จรับเงินการจัดส่ง
 SendingsArea=พื้นที่การจัดส่ง
-ListOfSendings=รายชื่อของการจัดส่ง
 SendingMethod=วิธีการจัดส่งสินค้า
 LastSendings=การจัดส่ง %s ล่าสุด
 StatisticsOfSendings=สถิติสำหรับการจัดส่ง
 NbOfSendings=จำนวนการจัดส่ง
 NumberOfShipmentsByMonth=จำนวนการจัดส่งโดย
-SendingCard=การจัดส่งบัตร
+SendingCard=การส่งสินค้า
 NewSending=การจัดส่งใหม่
 CreateShipment=สร้างการจัดส่ง
 QtyShipped=จำนวนการจัดส่ง
@@ -44,13 +43,14 @@ ConfirmCancelSending=คุณแน่ใจหรือไม่ว่าต
 DocumentModelMerou=Merou A5 รูปแบบ
 WarningNoQtyLeftToSend=คำเตือนผลิตภัณฑ์ไม่มีการรอคอยที่จะส่ง
 StatsOnShipmentsOnlyValidated=สถิติมีไว้สำหรับการจัดส่งที่ผ่านการตรวจสอบแล้วเท่านั้น วันที่ที่ใช้คือวันที่ตรวจสอบความถูกต้องของการจัดส่ง (วันที่จัดส่งตามแผนไม่เป็นที่รู้จักเสมอไป)
+DateShipping=Sending date
 DateDeliveryPlanned=วันที่มีการวางแผนในการส่งสินค้า
 RefDeliveryReceipt=อ้างอิงใบเสร็จรับเงินการจัดส่ง
 StatusReceipt=ใบเสร็จรับเงินการจัดส่งสถานะ
 DateReceived=วันที่ได้รับการส่งมอบ
 ClassifyReception=จำแนกประเภทที่ได้รับ
 SendShippingByEMail=ส่งของทางอีเมล์ครับ
-SendShippingRef=การส่งของการขนส่ง% s
+SendShippingRef=การส่งของการขนส่ง %s
 ActionsOnShipping=เหตุการณ์ที่เกิดขึ้นในการจัดส่ง
 LinkToTrackYourPackage=เชื่อมโยงไปยังติดตามแพคเกจของคุณ
 ShipmentCreationIsDoneFromOrder=ในขณะนี้ การสร้างการจัดส่งใหม่เสร็จสิ้นจากบันทึกใบสั่งขาย
@@ -63,6 +63,9 @@ NoProductToShipFoundIntoStock=ไม่พบผลิตภัณฑ์ที
 WeightVolShort=น้ำหนัก/ปริมาตร
 ValidateOrderFirstBeforeShipment=คุณต้องตรวจสอบความถูกต้องของคำสั่งซื้อก่อนจึงจะสามารถดำเนินการจัดส่งได้
 NoLineGoOnTabToAddSome=ไม่มีบรรทัด ไปที่แท็บ "%s" เพื่อเพิ่ม
+CreateInvoiceForThisCustomerFromSendings=Create Bills
+IfValidateInvoiceIsNoSendingStayUnbilled=If invoice validation is 'No', the sending will remain to status 'Unbilled' until the invoice is validated.
+OptionToSetSendingBilledNotEnabled=Option from module Workflow, to set sending to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of sendings to 'Billed' manually after the invoice has been generated.
 
 # Sending methods
 # ModelDocument
@@ -71,16 +74,12 @@ DocumentModelStorm=แบบจำลองเอกสารที่สมบ
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER คงที่ไม่ได้กำหนดไว้
 SumOfProductVolumes=ผลรวมของปริมาณสินค้า
 SumOfProductWeights=ผลรวมของน้ำหนักสินค้า
-
 # warehouse details
 DetailWarehouseNumber= รายละเอียดคลังสินค้า
 DetailWarehouseFormat= W:%s (จำนวน: %d)
 SHIPPING_DISPLAY_STOCK_ENTRY_DATE=แสดงวันที่ล่าสุดของสินค้าในสต็อกระหว่างการสร้างการจัดส่งสำหรับหมายเลขซีเรียลหรือชุดงาน
 CreationOptions=ตัวเลือกที่มีให้ระหว่างการสร้างการจัดส่ง
-
 ShipmentDistribution=การกระจายสินค้า
-
 ErrorTooManyCombinationBatchcode=ไม่มีการจัดส่งสำหรับบรรทัด %s เนื่องจากพบคลังสินค้า ผลิตภัณฑ์ รหัสชุดงานมากเกินไป (%s)
 ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
-
 ErrorTooMuchShipped=ปริมาณที่จัดส่งไม่ควรมากกว่าปริมาณที่สั่งซื้อสำหรับบรรทัด %s
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index e80e6755945..2bcf0ffbb93 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -27,9 +27,6 @@ LotSerialList=รายการล็อต/ซีเรียล
 SubjectToLotSerialOnly=สินค้าขึ้นอยู่กับล็อต/ซีเรียลเท่านั้น
 Movements=การเคลื่อนไหว
 ErrorWarehouseRefRequired=ชื่ออ้างอิงคลังสินค้าจะต้อง
-ListOfWarehouses=รายชื่อของคลังสินค้า
-ListOfStockMovements=รายการเคลื่อนไหวของหุ้น
-ListOfInventories=รายการสินค้าคงคลัง
 MovementId=รหัสการเคลื่อนไหว
 StockMovementForId=รหัสการเคลื่อนไหว %d
 ListMouvementStockProject=รายการความเคลื่อนไหวของสต็อกที่เกี่ยวข้องกับโครงการ
@@ -116,8 +113,8 @@ EstimatedStockValueShort=ป้อนข้อมูลมูลค่าหุ
 EstimatedStockValue=ป้อนข้อมูลมูลค่าหุ้น
 DeleteAWarehouse=ลบคลังสินค้า
 ConfirmDeleteWarehouse=คุณแน่ใจหรือไม่ว่าต้องการลบคลังสินค้า <b>%s</b>
-PersonalStock=ส่วนตัวหุ้น% s
-ThisWarehouseIsPersonalStock=คลังสินค้านี้เป็นหุ้นส่วนบุคคล% s% s
+PersonalStock=ส่วนตัวหุ้น %s
+ThisWarehouseIsPersonalStock=คลังสินค้านี้เป็นหุ้นส่วนบุคคล %s %s
 SelectWarehouseForStockDecrease=เลือกคลังสินค้าที่จะใช้สำหรับการลดลงของหุ้น
 SelectWarehouseForStockIncrease=เลือกคลังสินค้าที่จะใช้สำหรับการเพิ่มขึ้นของหุ้น
 RevertProductsToStock=คืนสินค้าเข้าสต๊อก ?
@@ -140,14 +137,14 @@ SelectProductWithNotNullQty=เลือกอย่างน้อยหนึ
 AlertOnly= การแจ้งเตือนเท่านั้น
 IncludeProductWithUndefinedAlerts = รวมสต็อกติดลบสำหรับผลิตภัณฑ์ที่ไม่มีการกำหนดปริมาณที่ต้องการด้วย เพื่อคืนค่าเป็น 0
 WarehouseForStockDecrease=<b>s คลังสินค้า%</b> จะใช้สำหรับการลดลงของหุ้น
-WarehouseForStockIncrease=<b>คลังสินค้า% s</b> จะใช้สำหรับการเพิ่มขึ้นของหุ้น
+WarehouseForStockIncrease=<b>คลังสินค้า %s</b> จะใช้สำหรับการเพิ่มขึ้นของหุ้น
 ForThisWarehouse=สำหรับคลังสินค้านี้
 ReplenishmentStatusDesc=นี่คือรายการผลิตภัณฑ์ทั้งหมดที่มีสต็อกต่ำกว่าสต็อกที่ต้องการ (หรือต่ำกว่าค่าการแจ้งเตือนหากเลือกช่องทำเครื่องหมาย "แจ้งเตือนเท่านั้น") เมื่อใช้ช่องทำเครื่องหมาย คุณสามารถสร้างใบสั่งซื้อเพื่อเติมส่วนต่างได้
 ReplenishmentStatusDescPerWarehouse=หากคุณต้องการการเติมสินค้าตามปริมาณที่ต้องการซึ่งกำหนดไว้ต่อคลังสินค้า คุณต้องเพิ่มตัวกรองในคลังสินค้า
 ReplenishmentOrdersDesc=นี่คือรายการคำสั่งซื้อที่เปิดอยู่ทั้งหมดรวมถึงผลิตภัณฑ์ที่กำหนดไว้ล่วงหน้า เฉพาะคำสั่งซื้อที่เปิดอยู่กับผลิตภัณฑ์ที่กำหนดไว้ล่วงหน้าเท่านั้น ดังนั้นจึงสามารถดูคำสั่งซื้อที่อาจส่งผลกระทบต่อสต็อกได้ที่นี่
 Replenishments=replenishments
-NbOfProductBeforePeriod=ปริมาณของ% s สินค้าในสต็อกก่อนระยะเวลาที่เลือก (<% s)
-NbOfProductAfterPeriod=จำนวนของผลิตภัณฑ์% s ในสต็อกหลังจากระยะเวลาที่เลือก (>% s)
+NbOfProductBeforePeriod=ปริมาณของ %s สินค้าในสต็อกก่อนระยะเวลาที่เลือก (< %s)
+NbOfProductAfterPeriod=จำนวนของผลิตภัณฑ์ %s ในสต็อกหลังจากระยะเวลาที่เลือก (> %s)
 MassMovement=การเคลื่อนไหวมวลชน
 SelectProductInAndOutWareHouse=เลือกคลังสินค้าต้นทาง (ไม่บังคับ) คลังสินค้าเป้าหมาย ผลิตภัณฑ์ และปริมาณ จากนั้นคลิก "%s" เมื่อเสร็จสิ้นสำหรับการเคลื่อนไหวที่จำเป็นทั้งหมดแล้ว ให้คลิกที่ "%s"
 RecordMovement=บันทึกการโอน
@@ -167,12 +164,12 @@ WarehouseAllowNegativeTransfer=หุ้นอาจเป็นลบ
 qtyToTranferIsNotEnough=คุณมีสต็อกไม่เพียงพอจากคลังสินค้าต้นทาง และการตั้งค่าของคุณไม่อนุญาตให้มีสต็อกติดลบ
 qtyToTranferLotIsNotEnough=คุณมีสต็อกไม่เพียงพอสำหรับหมายเลขล็อตนี้จากคลังสินค้าต้นทางของคุณและการตั้งค่าของคุณไม่อนุญาตให้มีสต็อกติดลบ (จำนวนสำหรับผลิตภัณฑ์ '%s' พร้อมล็อต '%s' คือ %s ในคลังสินค้า '%s')
 ShowWarehouse=แสดงคลังสินค้า
-MovementCorrectStock=แก้ไขหุ้นสำหรับผลิตภัณฑ์% s
-MovementTransferStock=การโอนหุ้นของผลิตภัณฑ์% s เข้าไปในโกดังอีก
+MovementCorrectStock=แก้ไขหุ้นสำหรับผลิตภัณฑ์ %s
+MovementTransferStock=การโอนหุ้นของผลิตภัณฑ์ %s เข้าไปในโกดังอีก
 BatchStockMouvementAddInGlobal=สต็อกแบทช์ย้ายเข้าสู่สต็อกทั่วโลก (ผลิตภัณฑ์ไม่ใช้แบทช์อีกต่อไป)
 InventoryCodeShort=Inv. / Mov รหัส
 NoPendingReceptionOnSupplierOrder=ไม่มีการรับที่รอดำเนินการเนื่องจากเปิดคำสั่งซื้อ
-ThisSerialAlreadyExistWithDifferentDate=จำนวนมากนี้ / หมายเลขประจำเครื่อง <strong>(% s)</strong> อยู่แล้ว แต่ด้วยความแตกต่างกันหรือ eatby วัน sellby <strong>(ที่พบ% s แต่คุณป้อน% s)</strong>
+ThisSerialAlreadyExistWithDifferentDate=ล็อต/หมายเลขซีเรียลนี้ (<strong>%s</strong>) มีอยู่แล้วแต่มีวันหมดอายุหรือวันขายต่างกัน (พบ <strong>%s</strong> แต่คุณป้อน <strong>%s</strong>)
 OpenAnyMovement=เปิด (ทุกการเคลื่อนไหว)
 OpenInternal=เปิด (เฉพาะการเคลื่อนไหวภายใน)
 UseDispatchStatus=ใช้สถานะการจัดส่ง (อนุมัติ/ปฏิเสธ) สำหรับรายการผลิตภัณฑ์ในการรับใบสั่งซื้อ
@@ -227,7 +224,7 @@ ApplyPMP=สมัครพีเอ็มพี
 FlushInventory=ล้างสินค้าคงคลัง
 ConfirmFlushInventory=คุณยืนยันการกระทำนี้หรือไม่?
 InventoryFlushed=ล้างสินค้าคงคลังแล้ว
-ExitEditMode=ออกจากฉบับ
+ExitEditMode=Exit edit mode
 inventoryDeleteLine=ลบบรรทัด
 RegulateStock=ควบคุมสต็อก
 ListInventory=รายการ
@@ -337,3 +334,15 @@ LatestModifiedWarehouses=Latest %s modified warehouses
 LatestStockMovements=Latest %s stock movements
 QtyCurrentlyKnownInStock=System estimated quantity you have in stock. As long as the inventory is not closed, this is a realtime value and it may change if you continue to make stock movement during the inventory (not recommended).
 QtyInStockWhenInventoryWasValidated=System estimated quantity you had in stock when the inventory was validated (before the stock correction)
+InventoryId=Inventory id
+DateInventory=Inventory date
+InventoryStatus=Inventory status
+InventoryTitle=Inventory name
+InventoryLine=Inventory line
+InventoryLineId=Inventory line ID
+InventoryRef=Inventory ref
+QtyViewed=Quantity viewed
+QtyStock=Quantity on stock
+QtyRegulated=Quantity on stock correction
+InventoryEntrepot=Warehouse identity
+SelectedWarehouse=Select a warehouse
diff --git a/htdocs/langs/th_TH/stripe.lang b/htdocs/langs/th_TH/stripe.lang
index 8a8aec1b48e..6aaedfc45a3 100644
--- a/htdocs/langs/th_TH/stripe.lang
+++ b/htdocs/langs/th_TH/stripe.lang
@@ -5,17 +5,18 @@ StripeOrCBDoPayment=ชำระเงินด้วยบัตรเครด
 FollowingUrlAreAvailableToMakePayments=URL ต่อไปนี้จะพร้อมที่จะให้หน้าให้กับลูกค้าที่จะทำให้การชำระเงินบนวัตถุ Dolibarr
 PaymentForm=รูปแบบการชำระเงิน
 WelcomeOnPaymentPage=ยินดีต้อนรับสู่บริการชำระเงินออนไลน์ของเรา
-ThisScreenAllowsYouToPay=หน้าจอนี้จะช่วยให้คุณสามารถชำระเงินออนไลน์ไปยัง% s
+ThisScreenAllowsYouToPay=หน้าจอนี้ช่วยให้คุณชำระเงินออนไลน์ให้กับ %s
 ThisIsInformationOnPayment=นี้เป็นข้อมูลเกี่ยวกับการชำระเงินที่จะทำ
 ToComplete=ให้เสร็จสมบูรณ์
 YourEMail=ส่งอีเมล์ถึงจะได้รับการยืนยันการชำระเงิน
 STRIPE_PAYONLINE_SENDEMAIL=การแจ้งเตือนทางอีเมลหลังจากพยายามชำระเงิน (สำเร็จหรือล้มเหลว)
 Creditor=เจ้าหนี้
 PaymentCode=รหัสการชำระเงิน
+StripeAutoRecordPayout=Enable the auto recording of payout (when Stripe do a payout and call the webhook IPN payout.create/payout.paid)
 StripeDoPayment=ชำระเงินด้วยลาย
 YouWillBeRedirectedOnStripe=คุณจะถูกเปลี่ยนเส้นทางไปที่หน้า Stripe ที่ปลอดภัยเพื่อป้อนข้อมูลบัตรเครดิตของคุณ
 Continue=ถัดไป
-ToOfferALinkForOnlinePayment=สำหรับการชำระเงิน URL% s
+ToOfferALinkForOnlinePayment=URL สำหรับการชำระเงิน %s
 ToOfferALinkForOnlinePaymentOnOrder=URL ที่จะเสนอ %s หน้าการชำระเงินออนไลน์สำหรับใบสั่งขาย
 ToOfferALinkForOnlinePaymentOnInvoice=URL ที่จะเสนอ %s หน้าการชำระเงินออนไลน์สำหรับใบแจ้งหนี้ของลูกค้า
 ToOfferALinkForOnlinePaymentOnContractLine=URL ที่จะเสนอหน้าการชำระเงินออนไลน์ %s สำหรับรายละเอียดสัญญา
@@ -33,6 +34,7 @@ CSSUrlForPaymentForm=รูปแบบ CSS url ของแผ่นสำห
 NewStripePaymentReceived=ได้รับการชำระเงินแถบใหม่แล้ว
 NewStripePaymentFailed=พยายามชำระเงิน New Stripe แล้ว แต่ล้มเหลว
 FailedToChargeCard=เรียกเก็บเงินจากบัตรไม่สำเร็จ
+FailedToChargeSEPA=Failed to charge SEPA
 STRIPE_TEST_SECRET_KEY=รหัสทดสอบความลับ
 STRIPE_TEST_PUBLISHABLE_KEY=คีย์ทดสอบที่เผยแพร่ได้
 STRIPE_TEST_WEBHOOK_KEY=รหัสทดสอบ Webhook
diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang
index 69be3818451..93c6735315d 100644
--- a/htdocs/langs/th_TH/website.lang
+++ b/htdocs/langs/th_TH/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=ใช้รายชื่อ/นามแฝงอื่
 WEBSITE_CSS_URL=URL ของไฟล์ CSS ภายนอก
 WEBSITE_CSS_INLINE=เนื้อหาไฟล์ CSS (ทั่วไปสำหรับทุกหน้า)
 WEBSITE_JS_INLINE=เนื้อหาไฟล์ JavaScript (ทั่วไปสำหรับทุกหน้า)
-WEBSITE_HTML_HEADER=นอกจากนี้ที่ด้านล่างของส่วนหัว HTML (ทั่วไปสำหรับทุกหน้า)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=ไฟล์โรบ็อต (robots.txt)
 WEBSITE_HTACCESS=ไฟล์เว็บไซต์ .htaccess
 WEBSITE_MANIFEST_JSON=ไฟล์ manifest.json ของเว็บไซต์
@@ -56,16 +56,17 @@ ReadPerm=อ่าน
 WritePerm=เขียน
 TestDeployOnWeb=ทดสอบ/ปรับใช้บนเว็บ
 PreviewSiteServedByWebServer=<u>ดูตัวอย่าง %s ในแท็บใหม่</u><br><br>%s จะถูกให้บริการโดยเว็บเซิร์ฟเวอร์ภายนอก (เช่น Apache, Nginx, IIS ). คุณต้องติดตั้งและตั้งค่าเซิร์ฟเวอร์นี้ก่อนที่จะชี้ไปที่ไดเรกทอรี:<br><strong>%s%s</strong><br>URL ที่ให้บริการโดยเซิร์ฟเวอร์ภายนอก:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>ดูตัวอย่าง %s ในแท็บใหม่</u><br><br>%s จะถูกให้บริการโดยเซิร์ฟเวอร์ Dolibarr ดังนั้นจึงไม่จำเป็นต้องมีเว็บเซิร์ฟเวอร์เพิ่มเติมใดๆ (เช่น Apache, Nginx, IIS) ที่จะติดตั้ง<br>ข้อเสียคือ URL ของหน้าเว็บไม่เป็นมิตรกับผู้ใช้และเริ่มต้นด้วยเส้นทางของ Dolibarr ของคุณ<br>URL ที่ให้บริการโดย Dolibarr:<br><strong>%s</strong><br><br>หากต้องการใช้เว็บเซิร์ฟเวอร์ภายนอกของคุณเองเพื่อ ให้บริการเว็บไซต์นี้ สร้างโฮสต์เสมือนบนเว็บเซิร์ฟเวอร์ของคุณที่ชี้ไปที่ไดเรกทอรี<br><strong>%s</strong><br>จากนั้นป้อนชื่อของเซิร์ฟเวอร์เสมือนนี้ในคุณสมบัติของเว็บไซต์นี้ และคลิกที่ ลิงค์ "ทดสอบ/ปรับใช้บนเว็บ"
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL ของโฮสต์เสมือนที่ให้บริการโดยเว็บเซิร์ฟเวอร์ภายนอกไม่ได้กำหนดไว้
 NoPageYet=ยังไม่มีหน้า
 YouCanCreatePageOrImportTemplate=คุณสามารถสร้างหน้าใหม่หรือนำเข้าเทมเพลตเว็บไซต์แบบเต็มได้
 SyntaxHelp=ความช่วยเหลือเกี่ยวกับเคล็ดลับไวยากรณ์เฉพาะ
 YouCanEditHtmlSourceckeditor=คุณสามารถแก้ไขซอร์สโค้ด HTML ได้โดยใช้ปุ่ม "แหล่งที่มา" ในตัวแก้ไข
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=สำหรับรูปภาพที่แชร์ด้วยลิงก์แชร์ (เปิดการเข้าถึงโดยใช้คีย์แฮชการแชร์ของไฟล์) ไวยากรณ์คือ:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong> <br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=โคลนเพจ/คอนเทนเนอร์
 CloneSite=ไซต์โคลน
@@ -87,15 +88,15 @@ WebsiteAccount=บัญชีเว็บไซต์
 WebsiteAccounts=บัญชีเว็บไซต์
 AddWebsiteAccount=สร้างบัญชีเว็บไซต์
 BackToListForThirdParty=กลับไปที่รายการสำหรับบุคคลที่สาม
-DisableSiteFirst=ปิดการใช้งานเว็บไซต์ก่อน
+DisableSiteFirst=Put website offline first
 MyContainerTitle=ชื่อเว็บไซต์ของฉัน
 AnotherContainer=นี่คือวิธีการรวมเนื้อหาของเพจ/คอนเทนเนอร์อื่น (คุณอาจมีข้อผิดพลาดที่นี่หากคุณเปิดใช้งานโค้ดไดนามิกเนื่องจากคอนเทนเนอร์ย่อยที่ฝังอยู่อาจไม่มีอยู่)
 SorryWebsiteIsCurrentlyOffLine=ขออภัย เว็บไซต์นี้อยู่ในสถานะออฟไลน์ กรุณากลับมาทีหลัง...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=เปิดใช้งานตารางเพื่อจัดเก็บบัญชีเว็บไซต์ (เข้าสู่ระบบ/ผ่าน) สำหรับแต่ละเว็บไซต์/บุคคลที่สาม
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=คุณต้องกำหนดโฮมเพจเริ่มต้นก่อน
-OnlyEditionOfSourceForGrabbedContentFuture=คำเตือน: การสร้างเว็บเพจโดยการนำเข้าเว็บเพจภายนอกนั้นสงวนไว้สำหรับผู้ใช้ที่มีประสบการณ์ ผลลัพธ์ของการนำเข้าอาจแตกต่างไปจากต้นฉบับ ขึ้นอยู่กับความซับซ้อนของเพจต้นฉบับ นอกจากนี้ หากหน้าต้นฉบับใช้สไตล์ CSS ทั่วไปหรือ JavaScript ที่ขัดแย้งกัน อาจทำให้รูปลักษณ์หรือคุณสมบัติของตัวแก้ไขเว็บไซต์เสียหายเมื่อทำงานในหน้านี้ วิธีนี้เป็นวิธีที่รวดเร็วกว่าในการสร้างเพจ แต่ขอแนะนำให้สร้างเพจใหม่ตั้งแต่ต้นหรือจากเทมเพลตเพจที่แนะนำ<br>โปรดทราบด้วยว่าโปรแกรมแก้ไขแบบอินไลน์อาจไม่ทำงาน ความถูกต้องเมื่อใช้กับหน้าภายนอกที่คว้ามา
-OnlyEditionOfSourceForGrabbedContent=แหล่งที่มา HTML รุ่นเดียวเท่านั้นที่สามารถทำได้เมื่อมีการดึงเนื้อหาจากไซต์ภายนอก
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=คว้ารูปภาพที่พบใน css และหน้าด้วย
 ImagesShouldBeSavedInto=รูปภาพควรถูกบันทึกลงในไดเร็กทอรี
 WebsiteRootOfImages=ไดเร็กทอรีรากสำหรับรูปภาพของเว็บไซต์
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=ลบฟิลเตอร์
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Categories
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang
index 5d648c63f00..2a6df82f90d 100644
--- a/htdocs/langs/th_TH/withdrawals.lang
+++ b/htdocs/langs/th_TH/withdrawals.lang
@@ -40,9 +40,9 @@ CreditTransferSetup=การตั้งค่าการโอนเครด
 WithdrawStatistics=สถิติการชำระแบบหักบัญชีเงินฝากอัตโนมัติ
 CreditTransferStatistics=สถิติการโอนเครดิต
 LastWithdrawalReceipt=ใบเสร็จรับเงินแบบหักบัญชีธนาคาร %s ล่าสุด
-MakeWithdrawRequest=ทำการร้องขอการหักบัญชีเงินฝากอัตโนมัติ
+MakeWithdrawRequest=Prepare a direct debit payment
 MakeWithdrawRequestStripe=ทำการร้องขอการหักบัญชีธนาคารผ่าน Stripe
-MakeBankTransferOrder=ทำการขอโอนเครดิต
+MakeBankTransferOrder=Prepare a credit transfer payment
 WithdrawRequestsDone=%s บันทึกคำขอชำระเงินแบบหักบัญชีธนาคาร
 BankTransferRequestsDone=บันทึกคำขอโอนเครดิต %s แล้ว
 ThirdPartyBankCode=รหัสธนาคารบุคคลที่สาม
@@ -100,7 +100,7 @@ WithBankUsingBANBIC=สำหรับบัญชีเงินฝากธน
 BankToReceiveWithdraw=การรับบัญชีธนาคาร
 BankToPayCreditTransfer=บัญชีธนาคารที่ใช้เป็นแหล่งชำระเงิน
 CreditDate=เกี่ยวกับบัตรเครดิต
-WithdrawalFileNotCapable=ไม่สามารถสร้างไฟล์ใบเสร็จรับเงินการถอนเงินสำหรับประเทศ% s ของคุณ (ประเทศของคุณไม่ได้รับการสนับสนุน)
+WithdrawalFileNotCapable=ไม่สามารถสร้างไฟล์ใบเสร็จการถอนสำหรับประเทศของคุณได้ %s (ประเทศของคุณไม่ได้รับการรองรับ)
 ShowWithdraw=แสดงคำสั่งหักบัญชีธนาคาร
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=อย่างไรก็ตาม หากใบแจ้งหนี้มีใบสั่งการชำระเงินแบบหักบัญชีเงินฝากอัตโนมัติอย่างน้อยหนึ่งรายการที่ยังไม่ได้ประมวลผล จะไม่ถูกตั้งค่าเป็นการชำระเงินเพื่อให้สามารถจัดการการถอนเงินล่วงหน้าได้
 DoStandingOrdersBeforePayments=แท็บนี้ช่วยให้คุณสามารถขอคำสั่งการชำระเงินแบบหักบัญชีธนาคารได้ เมื่อเสร็จแล้ว คุณสามารถไปที่เมนู "ธนาคาร->การชำระเงินด้วยการหักบัญชีธนาคาร" เพื่อสร้างและจัดการไฟล์คำสั่งหักบัญชีเงินฝากอัตโนมัติ
@@ -118,8 +118,8 @@ DateRUM=วันที่ลงนามอาณัติ
 RUMLong=การอ้างอิงอาณัติที่ไม่ซ้ำ
 RUMWillBeGenerated=หากว่างเปล่า UMR (การอ้างอิงอาณัติที่ไม่ซ้ำกัน) จะถูกสร้างขึ้นเมื่อข้อมูลบัญชีธนาคารถูกบันทึก
 WithdrawMode=โหมดเดบิตโดยตรง (FRST หรือ RCUR)
-WithdrawRequestAmount=จำนวนคำขอหักบัญชีธนาคาร:
-BankTransferAmount=จำนวนเงินที่ขอโอนเครดิต:
+WithdrawRequestAmount=Amount of Direct debit request
+BankTransferAmount=Amount of Credit Transfer request
 WithdrawRequestErrorNilAmount=ไม่สามารถสร้างคำขอหักบัญชีเงินฝากอัตโนมัติสำหรับจำนวนเงินที่ว่างเปล่า
 SepaMandate=ข้อบังคับการหักบัญชีเงินฝากอัตโนมัติของ SEPA
 SepaMandateShort=อาณัติ SEPA
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index edeea95d81f..ea61ea23cbe 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -56,6 +56,8 @@ ExportAccountancy=İhracat muhasebesi
 WarningDataDisappearsWhenDataIsExported=Uyarı, bu liste yalnızca henüz dışa aktarılmamış muhasebe girişlerini içerir (Dışa aktarma tarihi boş). Halihazırda dışa aktarılan muhasebe girişlerini dahil etmek istiyorsanız yukarıdaki butona tıklayın.
 VueByAccountAccounting=Muhasebe hesabına göre görüntüle
 VueBySubAccountAccounting=Muhasebe alt hesabına göre görüntüle
+AccountingAccountByDefault=Muhasebe varsayılan hesabı
+AccountingAccountByDefaultShort=Varsayılan hesap
 
 MainAccountForCustomersNotDefined=Kurulumda tanımlanmayan müşteriler için ana hesap (Hesap Planından)
 MainAccountForSuppliersNotDefined=Kurulumda tanımlanmayan satıcılar için ana hesap (Hesap Planından)
@@ -166,6 +168,7 @@ ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Günlükte taslak dışa aktarmayı etkin
 ACCOUNTANCY_COMBO_FOR_AUX=Yan hesap için birleşik listeyi etkinleştirin (çok sayıda üçüncü tarafınız varsa yavaş olabilir, değerin bir kısmında arama yapma yeteneği bozulur)
 ACCOUNTING_DATE_START_BINDING=Tarih bu tarihin altında olduğunda muhasebede bağlama ve aktarımı devre dışı bırakın (bu tarihten önceki işlemler varsayılan olarak hariç tutulacaktır)
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Verilerin muhasebeye aktarılacağı sayfada varsayılan olarak seçilen dönem nedir?
+ACCOUNTING_LABEL_OPERATION_ON_TRANSFER=Muhasebe üretildiğinde, varsayılan işlem etiketi
 ACCOUNTING_SELL_JOURNAL=Satış günlüğü - satış ve iadeler
 ACCOUNTING_PURCHASE_JOURNAL=Satın alma günlüğü - satın alma ve iadeler
 ACCOUNTING_BANK_JOURNAL=Nakit günlüğü - makbuzlar ve ödemeler
@@ -177,8 +180,10 @@ ACCOUNTING_SOCIAL_JOURNAL=Sosyal günlük
 ACCOUNTING_RESULT_PROFIT=Sonuç muhasebesi hesabı (Kar)
 ACCOUNTING_RESULT_LOSS=Sonuç muhasebesi hesabı (Zarar)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Kapanış günlüğü
-ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Bilanço hesabı için kullanılan muhasebe grupları (virgülle ayrılmış)
-ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Gelir tablosunda kullanılan muhasebe grupları (virgülle ayrılmış)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Bilançonun hesaplanmasında kullanılan muhasebe grupları
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNTHelp=Bilanço hesaplamak için tüm hesapları bulmak üzere kullanılması gereken muhasebe gruplarının listesini (hesap planında tanımlanmıştır) burada ayarlayın. Her değeri ayırmak için virgül kullanın.<br>Örnek: CAPIT,IMMO,STOCK,FINAN,THIRDPARTY
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Muhasebe gelir tablosunun hesaplanmasında kullanılan gruplar
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENTHelp=Gelir tablosunu hesaplamak için tüm hesapları bulmak için kullanılması gereken muhasebe gruplarının listesini (hesap planında tanımlanmıştır) burada ayarlayın. Her değeri ayırmak için virgül kullanın.<br>Örnek: GELİR,GİDER
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Geçici banka transferlerinde hesap olarak kullanılacak hesap (Hesap Planı'ndan)
 TransitionalAccount=Geçici banka havalesi hesabı
 ACCOUNTING_ACCOUNT_SUSPENSE=Alınan veya ödenen tahsis edilmemiş fonlar, yani "beklemede" bekleyen fonlar için hesap olarak kullanılacak hesap (Hesap Planı'ndan).
@@ -214,14 +219,18 @@ Codejournal=Günlük
 JournalLabel=Günlük etiketi
 NumPiece=Parça sayısı
 TransactionNumShort=Sayı. işlem
+AccountingReport=Özel raporlar
 AccountingCategory=Özel hesap grubu
 AccountingCategories=Özel hesap grupları
 GroupByAccountAccounting=Genel muhasebe hesabına göre gruplandırma
 GroupBySubAccountAccounting=Yardımcı defter hesabına göre gruplandır
+AccountingAccountReportsDesc=Burada muhasebe hesabının bazı raporlarını tanımlayabilirsiniz. Bunlar kişiselleştirilmiş muhasebe raporları için kullanılacaktır.
 AccountingAccountGroupsDesc=Burada bazı muhasebe hesabı gruplarını tanımlayabilirsiniz. Kişiselleştirilmiş muhasebe raporları için kullanılacaklardır.
 ByAccounts=Hesaplara göre
 ByPredefinedAccountGroups=Önceden tanımlanmış gruplar tarafından
 ByPersonalizedAccountGroups=Kişiselleştirilmiş gruplar tarafından
+Personalized=Kişiselleştirilmiş
+NoReportDefined=Hiç bir kişiselleştirilmiş rapor tanımlanmadı
 NotMatch=Ayarlanmamış
 DeleteMvt=Muhasebeden bazı satırları sil
 DelMonth=Silinecek ay
@@ -253,6 +262,7 @@ UnknownAccountForThirdparty=Bilinmeyen üçüncü parti hesabı. %s kullanacağ
 UnknownAccountForThirdpartyBlocking=Bilinmeyen üçüncü parti hesabı. Engelleme hatası
 ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Yardımcı defter hesabı tanımlanmamış veya üçüncü taraf ya da kullanıcı bilinmiyor. %s kullanacağız
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Üçüncü taraf bilinmiyor ve ödemede yardımcı defter tanımlanmamış. Yardımcı defter hesap değerini boş tutacağız.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored2=Subledger account not defined or third party or user unknown. We will keep the subledger account value empty.
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Yardımcı defter hesabı tanımlanmamış veya üçüncü taraf ya da kullanıcı bilinmiyor. Engelleme hatası.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Bilinmeyen üçüncü taraf hesabı ve bekleyen hesap tanımlanmadı. Engelleme hatası
 PaymentsNotLinkedToProduct=Ödemenin herhangi bir ürün/hizmetle bağlantılı olmaması
@@ -270,7 +280,7 @@ DescVentilCustomer=Hesap planından bir ürün hesabına bağlı (veya bağlı o
 DescVentilMore=In most cases, if you use predefined products or services and you set the account (from chart of account) on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneCustomer=Müşterilerin fatura satırları listesine ve hesap planındaki ürün hesaplarına buradan bakın
 DescVentilTodoCustomer=Hesap planından bir ürün hesabına henüz bağlanmamış fatura satırlarını bağlayın
-ChangeAccount=Seçilen satırların ürün/hizmet hesabını (hesap planından) aşağıdaki hesapla değiştirin:
+ChangeAccount=Seçili satırlar için ürün/hizmet hesabını (hesap planından) şu şekilde değiştirin:
 Vide=-
 DescVentilSupplier=Hesap planından bir ürün hesabına bağlanmış veya henüz bağlanmamış satıcı faturası satırlarının listesine buradan bakın (yalnızca muhasebede henüz aktarılmamış kayıtlar görünür)
 DescVentilDoneSupplier=Satıcı faturası satırlarının ve muhasebe hesaplarının listesine buradan bakın
@@ -280,7 +290,7 @@ DescVentilExpenseReportMore=If you setup accounting account on type of expense r
 DescVentilDoneExpenseReport=Gider satırları raporlarının listesine ve bunların ücret muhasebe hesabına buradan bakın
 Closure=Yıllık kapanış
 AccountancyClosureStep1Desc=Henüz doğrulanmamış ve kilitlenmemiş aya göre hareket sayısına buradan bakın
-OverviewOfMovementsNotValidated=Doğrulanmayan ve kilitlenmeyen hareketlere genel bakış
+OverviewOfMovementsNotValidated=Henüz doğrulanmamış ve kilitlenmemiş hareketlerin genel görünümü
 AllMovementsWereRecordedAsValidated=Tüm hareketler doğrulanmış ve kilitli olarak kaydedildi
 NotAllMovementsCouldBeRecordedAsValidated=Tüm hareketler doğrulanmış ve kilitli olarak kaydedilemedi
 ValidateMovements=Hareketleri doğrulayın ve kilitleyin
@@ -304,6 +314,7 @@ ClickOnUseTutorialForHelp=Muhasebenizi oluşturacağınız bölüme hoş geldini
 NotReconciled=Uzlaştırılmadı
 WarningRecordWithoutSubledgerAreExcluded=Uyarı, yardımcı defter hesabı tanımlanmayan tüm satırlar filtrelendi ve bu görünümden çıkarıldı
 AccountRemovedFromCurrentChartOfAccount=Mevcut hesap planında bulunmayan muhasebe hesabı
+WarningThisPageContainsOnlyEntriesTransferredInAccounting=Warning, this page only contains entries transferred to the accounting system.
 ## Admin
 BindingOptions=Muhasebede transfer seçenekleri
 ApplyMassCategories=Toplu kategori uygula
@@ -338,6 +349,8 @@ ACCOUNTING_LETTERING_NBLETTERS_DESC=Bazı muhasebe yazılımları yalnızca iki
 OptionsAdvanced=Gelişmiş seçenekler
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Tedarikçi alımlarında KDV ters ücreti yönetiminin etkinleştirilmesi
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_ENABLE_TABONTHIRDPARTY=Activate a tab on third-party cards to view the subsidiary ledger
+ACCOUNTING_ENABLE_TABONTHIRDPARTY_DESC=When this option is enabled, a new tab is showing in third-party cards to view and manage accounting for the third-party as to reconcile, print & more
 ## Export
 NotExportLettering=Dosyayı oluştururken harfleri dışa aktarmayın
 NotifiedExportDate=Henüz dışa aktarılmamış satırları Dışa Aktarıldı olarak işaretle <span class="warning">(dışa aktarılmış olarak işaretlenmiş bir satırı değiştirmek için tüm işlemi silmeniz ve muhasebeye yeniden aktarmanız gerekir)</span>
@@ -402,6 +415,7 @@ SaleEECWithoutVATNumber=AET'de KDV'siz satış ancak üçüncü tarafın KDV num
 ForbiddenTransactionAlreadyExported=Yasak: İşlem doğrulandı ve/veya dışa aktarıldı.
 ForbiddenTransactionAlreadyValidated=Yasak: İşlem doğrulandı.
 DataMustHaveBeenTransferredInAccounting=Muhasebe içindeki veri aktarımı tamamlanmış olmalıdır
+IfTransactionHasDueDate=Ödeme gerektiren belgelerle ilgili işlemler için
 ## Dictionary
 Range=Muhasebe hesabı aralığı
 Calculated=Hesaplanmış
@@ -409,7 +423,7 @@ Formula=Formül
 ## Reconcile
 LetteringAuto=Otomatik uzlaştırma
 LetteringManual=Kılavuzu uzlaştır
-LetteringPartial=Reconcile partial
+LetteringPartial=Kısmi mutabakat
 Unlettering=Uzlaşmayı boz
 UnletteringAuto=Otomatik uzlaşmayı kaldır
 UnletteringManual=Kılavuzun mutabakatını boz
@@ -420,9 +434,9 @@ AccountancyNoUnletteringModified=Değiştirilen uzlaşma yok
 AccountancyOneUnletteringModifiedSuccessfully=Bir uzlaşmazlık başarıyla değiştirildi
 AccountancyUnletteringModifiedSuccessfully=%s uzlaşmayı bozma başarıyla değiştirildi
 ## Closure
-AccountancyClosureStep1=Adım 1: Hareketleri doğrulayın ve kilitleyin
-AccountancyClosureStep2=Adım 2: Mali dönemi kapatın
-AccountancyClosureStep3=3. Adım: Girişleri çıkarın (İsteğe bağlı)
+AccountancyClosureStep1=Hareketleri doğrulayın ve kilitleyin
+AccountancyClosureStep2=Mali dönemi kapatın
+AccountancyClosureStep3=Girişleri ayıkla (İsteğe bağlı)
 AccountancyClosureClose=Mali dönemi kapat
 AccountancyClosureAccountingReversal="Birikmiş karlar" girişlerini çıkarın ve kaydedin
 AccountancyClosureStep3NewFiscalPeriod=Sonraki mali dönem
@@ -455,7 +469,7 @@ AccountancyErrorMismatchBalanceAmount=Bakiye (%s) 0'a eşit değil
 AccountancyErrorLetteringBookkeeping=İşlemlerle ilgili hatalar oluştu: %s
 ErrorAccountNumberAlreadyExists=%s hesap numarası zaten mevcut
 ErrorArchiveAddFile="%s" dosyası arşive yerleştirilemiyor
-ErrorNoFiscalPeriodActiveFound=No active fiscal period found. You can create one from menu %s - %s - %s.
+ErrorNoFiscalPeriodActiveFound=Hiç bir etkin bir mali dönem (başlangıç ve bitiş tarihi tanımlanmış) bulunamadı. %s - %s - %s Menüsünden bir tane oluşturabilirsiniz.
 ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=Defter tutma belgesi tarihi etkin mali dönem içinde değil
 ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=Defter tutma belgesi tarihi kapalı bir mali dönem içindedir
 ## Import
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 3f44091dca3..0d0b1f249c8 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Dosya bütünlüğü kontrolü denetimden ge
 FileIntegritySomeFilesWereRemovedOrModified=Dosya bütünlüğü denetimi başarısız oldu. Bazı dosyalar değiştirilmiş, kaldırılmış veya eklenmiş.
 GlobalChecksum=Genel sağlama toplamı
 MakeIntegrityAnalysisFrom=Uygulama dosyalarının bütünlük analizini yapın
-LocalSignature=Gömülü yerel imza (daha az güvenilir)
-RemoteSignature=Uzaktan imza (daha güvenilir)
+LocalSignature=Gömülü yerel imza
+RemoteSignature=Uzak mesafeden imza
 FilesMissing=Eksik Dosyalar
 FilesUpdated=Güncellenmiş Dosyalar
 FilesModified=Değiştirilmiş Dosyalar
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Bazı gündem seçeneği tarafından kullanılan
 Security=Güvenlik
 Passwords=Parolalar
 DoNotStoreClearPassword=Veritabanında saklanan parolaları şifreleyin.
-MainDbPasswordFileConfEncrypted=conf.php içinde depolanan veritabanı parolasını şifreleyin. Bu seçeneği aktif hale getirmeniz şiddetle tavsiye edilir.
+MainDbPasswordFileConfEncrypted=conf.php'de saklanan veritabanı parolasını gizleyin. Bu seçeneği etkinleştirmeniz önerilir.
 InstrucToEncodePass=Parolayı <b>conf.php</b> dosyasına kodlamak için <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b> satırını değiştirin
 InstrucToClearPass=Parolayı <b>conf.php</b> dosyasına kodlamak (temiz) için <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b> satırını değiştirin
 ProtectAndEncryptPdfFiles=Oluşturulan PDF dosyalarını koruyun. Toplu PDF oluşturulmasını bozduğu için bu ÖNERİLMEZ.
@@ -365,17 +365,17 @@ UpdateServerOffline=Güncelleme sunucusu çevrimdışı
 WithCounter=Bir sayacı yönet
 GenericMaskCodes=Herhangi bir numaralandırma maskesi girebilirsiniz. Bu maskede, aşağıdaki etiketler kullanılabilir:<br><b> {000000} </b>, her %s'de artırılacak bir sayıya karşılık gelir. Sayacın istenen uzunluğu kadar sıfır girin. Sayaç, maske kadar sıfıra sahip olmak için soldan sıfırlarla tamamlanacaktır.<br><b> {000000 + 000} </b> öncekiyle aynı, ancak + işaretinin sağındaki sayıya karşılık gelen ofset ilk %s'den başlayarak uygulandı.<br><b> {000000 @ x} </b> öncekiyle aynı ancak x ayına ulaşıldığında sayaç sıfırlanır (x 1 ile 12 arasında veya tanımlanan mali yılın ilk aylarını kullanmak için 0) yapılandırmanızda veya her ay sıfıra sıfırlamak için 99). Bu seçenek kullanılırsa ve x 2 veya daha yüksekse, {yy} {aa} veya {yyyy} {aa} dizisi de gereklidir.<br><b> {gg} </b> gün (01 - 31).<br><b> {aa} </b> ay (01 - 12).<br><b> {yy} </b>, <b> {yyyy} </b> veya <b> {y} </b> 2, 4 veya 1 sayıdan fazla. <br>
 GenericMaskCodes2=<b> {cccc} </b> n karakterli müşteri kodu<br><b> {cccc000} </b> n karakterdeki müşteri kodunu müşteriye ayrılmış bir sayaç takip ediyor. Müşteriye ayrılan bu sayaç, genel sayaçla aynı anda sıfırlanır.<br><b> {tttt} </b> N karakterdeki cari türünün kodu (Giriş - Ayarlar - Tanımlar - Cari türleri menüsüne bakın ). Bu etiketi eklerseniz, sayaç her cari türü için farklı olacaktır. <br>
-GenericMaskCodes2b=<b>{uuuu}</b> the n first characters of the lastname of the user that creates the object (n is number of "u").
+GenericMaskCodes2b=<b>{uuuu}</b> nesneyi oluşturan kullanıcının soyadının ilk n karakteri (n, "u" sayısıdır).
 GenericMaskCodes3=Maskede diğer tüm karakterler olduğu gibi kalır.<br>Boşluklara izin verilmez.<br>
 GenericMaskCodes3EAN=Maskedeki diğer tüm karakterler bozulmadan kalacaktır (EAN13'te 13. konumda * veya? Dışında).<br>Boşluklara izin verilmez.<br>EAN13'te, 13. konumdaki son} 'dan sonraki son karakter * veya? . Hesaplanan anahtarla değiştirilecektir. <br>
 GenericMaskCodes4a=<u>Üçüncü taraf TheCompany'nin 99. %s örneği, 2023-01-31 tarihli:</u><br>
 GenericMaskCodes4b=<u>31.01.2023'te oluşturulan üçüncü tarafa örnek:</u><br>
 GenericMaskCodes4c=<u>31.01.2023'te oluşturulan ürüne örnek:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericMaskCodes5b=<b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> şu sonucu verecektir: <b>ABC2301-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> <b>0199-ZZZ/31/XXX</b> değerini verecektir
+GenericMaskCodes5b=<b>IN{yy}{mm}-{0000}-{t}</b> <b>IN2301-0099-A</b> değerini verecektir şirket türü 'Responsable Inscripto'dur ve tür kodu 'A_RI'dır
 GenericNumRefModelDesc=Tanımlı bir maskeye göre özelleştirilebilir bir sayı verir.
-DateStartThatModel=Disable use of this numbering rule for all thirdparties created before
-DateStartThatModelHelp=You can disable elephant numbering rule for thirdparties created before a date (for example, because they were imported by a migration, from another software using a different rule). Let that field empty to have the rule applied on all thirdparties.
+DateStartThatModel=Bu numaralandırma kuralının, daha önce oluşturulan tüm üçüncü taraflar için kullanımını devre dışı bırakın
+DateStartThatModelHelp=Belirli bir tarihten önce oluşturulan üçüncü taraflar için fil numaralandırma kuralını devre dışı bırakabilirsiniz (örneğin, farklı bir kural kullanan başka bir yazılımdan bir taşıma ile içe aktarıldıkları için). Kuralın tüm üçüncü taraflara uygulanması için bu alanı boş bırakın.
 ServerAvailableOnIPOrPort=Sunucu <b>%s</b> portundaki <b>%s</b> adresinde bulunur.
 ServerNotAvailableOnIPOrPort=Sunucu <b>%s</b> portundaki <b>%s</b> adresinde yoktur.
 DoTestServerAvailability=Test sunucusu bağlanabilirliği
@@ -458,16 +458,17 @@ ExtrafieldSelect=Liste seç
 ExtrafieldSelectList=Tablodan seç
 ExtrafieldSeparator=Ayırıcı (bir alan değil)
 ExtrafieldPassword=Parola
-ExtrafieldRadio=Radio buttons (1 choice only)
+ExtrafieldRadio=Radyo düğmeleri (sadece 1 seçenek)
 ExtrafieldCheckBox=Seçim listesi (seçeneklerde)
-ExtrafieldCheckBoxFromList=Select from table (n choices)
+ExtrafieldCheckBoxFromList=Tablodan seç (n seçenek)
 ExtrafieldLink=Bir nesneye bağlantı
 ExtrafieldPointGeo=Geometrik Nokta
 ExtrafieldMultiPointGeo=Geometrik Çok Noktalı
 ExtrafieldLinestringGeo=Geometrik Çizgi Dizi
 ExtrafieldPolygonGeo=Geometrik Çokgen
+ExtrafieldStars=Yıldızlar
 ComputedFormula=Hesaplanmış alan
-ComputedFormulaDesc=Dinamik bir hesaplanan değer elde etmek için buraya nesnenin diğer özelliklerini veya herhangi bir PHP kodunu kullanarak bir formül girebilirsiniz. "?" dahil olmak üzere PHP uyumlu herhangi bir formülü kullanabilirsiniz. koşul operatörü ve aşağıdaki global nesne: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>UYARI</strong>: Bir nesnenin özelliklerine ihtiyacınız varsa yüklenmediyse, ikinci örnekte olduğu gibi nesneyi formülünüze kendiniz getirin.<br>Hesaplanan alan kullanmak, arayüzden kendinize herhangi bir değer giremeyeceğiniz anlamına gelir. Ayrıca sözdizimi hatası varsa formül hiçbir şey döndürmeyebilir.<br><br>Formül örneği:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Nesneyi yeniden yükleme örneği<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj- >capital / 5: '-1')<br><br>Nesnenin ve onun üst nesnesinin yükünü zorlamaya yönelik diğer formül örneği: <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Project( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Ana proje bulunamadı'
+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'
 Computedpersistent=Hesaplanan alanı sakla
 ComputedpersistentDesc=Hesaplanan fazladan alanlar veritabanında saklanacaktır, ancak değer yalnızca bu alanın nesnesi değiştirildiğinde yeniden hesaplanacaktır. Hesaplanan alan diğer nesnelere veya genel verilere bağlıysa, bu değer yanlış olabilir !!
 ExtrafieldParamHelpPassword=Bu alanı boş bırakmak, bu değerin şifreleme OLMADAN saklanacağı anlamına gelir (alan yalnızca ekranda yıldızlarla gizlenmiştir).<br><br>Giriş Değeri tersine çevrilebilir bir şifreleme algoritmasıyla kodlamak için 'dolcrypt' değerini kullanın. Temiz veriler hâlâ bilinebilir ve düzenlenebilir ancak veritabanında şifrelenir.<br><br>'Auto' (veya 'md5', Geri alınamayan karma şifreyi veritabanına kaydetmek için varsayılan şifre şifreleme algoritmasını (veya md5, sha256, şifre_hash...) kullanmak için 'sha256', 'password_hash', ...) (orijinal değeri almanın yolu yoktur)
@@ -519,11 +520,11 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- E-posta göndermek için kendi E-posta Servis Sağlayıcınızın SMTP sunucusunu kullanmak da ilginçtir, bu nedenle uygulamadan gönderilen tüm e-postalar ayrıca posta kutunuzun "Gönderilen" dizinine kaydedilecektir.
 WarningPHPMailD=Bu nedenle e-postaların gönderim yönteminin "SMTP" değerine değiştirilmesi tavsiye edilir.
 WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
-WarningPHPMail2=E-posta SMTP sağlayıcınızın e-posta istemcisini bazı IP adresleriyle kısıtlaması gerekiyorsa (çok nadir), bu, ERP CRM uygulamanız için posta kullanıcı aracısının (MUA) IP adresidir: <strong>%s</strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
-SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
-ActualMailDNSRecordFound=Actual %s record found (for email %s) : %s
+SPFAndDMARCInformation=Ana e-posta adresleri için SPF ve DMARC DNS kaydı
+ActualMailDNSRecordFound=Gerçek %s kaydı bulundu (e-posta %s için): %s
 ClickToShowDescription=Açıklamayı görmek için tıkla
 DependsOn=Bu modülün gerektirdiği modül(ler)
 RequiredBy=Bu modül, modül(ler) için zorunludur
@@ -567,8 +568,8 @@ Module10Name=Muhasebe (basitleştirilmiş)
 Module10Desc=Veritabanı içeriğine dayalı basit muhasebe raporları (günlükler, ciro). Herhangi defter tablosunu kullanmaz.
 Module20Name=Teklifler
 Module20Desc=Teklif yönetimi
-Module22Name=Toplu E-Postalamalar
-Module22Desc=Toplu e-postaları yönet
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Enerji
 Module23Desc=Enerji tüketimlerinin izlenmesi
 Module25Name=Müşteri Siparişleri
@@ -847,10 +848,10 @@ Permission212=Hat sipariş et
 Permission213=Hat etkinleştir
 Permission214=Telefon kurulumu
 Permission215=Sağlayıcı kur
-Permission221=E-postaları oku
-Permission222=E-posta oluştur/değiştir (konu, alıcı ...)
-Permission223=E-posta doğrula (göndermeye izin verir)
-Permission229=E-postaları sil
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Alıcı ve bilgilerini göster
 Permission238=Postaları elle gönder
 Permission239=Doğrulandıktan ya da gönderildikten sonra postaları sil
@@ -945,7 +946,7 @@ Permission776=Ödeme gider raporu
 Permission777=Tüm gider raporlarını okuyun (ast olmayan kullanıcılara ait olanlar bile)
 Permission778=Herkesin gider raporlarını oluşturun/değiştirin
 Permission779=Gider raporlarını dışa aktar
-Permission1001=Read warehouses and stocks
+Permission1001=Depoları ve stokları okuyun
 Permission1002=Depo oluştur/değiştir
 Permission1003=Depo sil
 Permission1004=Stok hareketlerini oku
@@ -1105,6 +1106,7 @@ DictionaryStaff=Çalışan Sayısı
 DictionaryAvailability=Teslimat süresi
 DictionaryOrderMethods=Sipariş yöntemleri
 DictionarySource=Teklifin/siparişin kökeni
+DictionaryAccountancyReport=Kişiselleştirilmiş muhasebe raporları
 DictionaryAccountancyCategory=Raporlar için kişiselleştirilmiş gruplar
 DictionaryAccountancysystem=Hesap planı modelleri
 DictionaryAccountancyJournal=Muhasebe günlükleri
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Sözlük listesine dön
 TypeOfRevenueStamp=Damga pulu türü
 VATManagement=Satış Vergisi Yönetimi
 VATIsUsedStandard=Belgeleri (teklifler, faturalar, siparişler...) oluştururken, varsayılan Satış Vergisi oranı standart kurallara göre ayarlanır (satıcı ve alıcı ülkelerine bağlı olarak)
-VATIsUsedDesc=Teklifler, faturalar, siparişler vb. oluşturulurken Satış Vergisi oranı varsayılan olarak etkin standart kurala uyar:<br>Eğer satıcı Satış vergisine tabi değilse, Satış vergisi varsayılan olarak 0 olur. Kuralın sonu.<br>Eğer (satıcının ülkesi = alıcının ülkesi) ise, Satış vergisi varsayılan olarak satıcının ülkesindeki ürünün satış vergisine eşittir. Kuralın sonu.<br>Hem satıcı hem de alıcı Avrupa Topluluğu'ndaysa ve mallar taşımacılıkla ilgili ürünlerse (karayolu, denizyolu, havayolu), varsayılan KDV 0'dır. Bu kural satıcının ülkesine bağlıdır; lütfen muhasebecinize danışın. KDV, alıcı tarafından satıcıya değil, kendi ülkesindeki gümrük idaresine ödenmelidir. Kuralın sonu.<br>Satıcı ve alıcının her ikisi de Avrupa Topluluğu'ndaysa ve alıcı bir şirket değilse (Topluluk içi KDV numarasına kayıtlıysa) KDV varsayılan olarak şu şekilde olur: Satıcının ülkesindeki KDV oranı. Kuralın sonu.<br>Satıcı ve alıcının her ikisi de Avrupa Topluluğu'ndaysa ve alıcı bir şirketse (Topluluk içi KDV numarasına kayıtlıysa), KDV 0'dır. varsayılan olarak. Kuralın sonu.<br>Diğer durumlarda önerilen varsayılan Satış vergisi=0'dır. Kuralın sonu.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Dernekler, şahıslar veya küçük şirketler söz konusu olduğunda varsayılan olarak önerilen KDV oranı 0 olacaktır.
 VATIsUsedExampleFR=Fransa'da gerçek mali sisteme sahip şirketler veya kuruluşlar (Basitleştirilmiş gerçek veya normal gerçek) anlamına gelir. KDV'nin beyan edildiği bir sistem.
 VATIsNotUsedExampleFR=Fransa'da bu, Satış vergisi beyan edilmeyen dernekler veya mikro işletme mali sistemini seçen (franchise satış vergisi) ve herhangi bir Satış vergisi beyannamesi olmaksızın bir franchise Satış vergisi ödeyen şirketler, kuruluşlar veya serbest meslekler anlamına gelir. Bu seçim, faturalarda "Geçerli olmayan Satış vergisi - art-293B CGI" referansını gösterecektir.
-VATType=Vergi türü
+VATType=Vergi kullanımı
 ##### Local Taxes #####
 TypeOfSaleTaxes=Satış vergisi türü
 LTRate=Oran
@@ -1174,8 +1176,9 @@ NoLocalTaxXForThisCountry=Vergi ayarlarına göre (Bkz. %s - %s - %s), ülkenizi
 LabelUsedByDefault=Hiçbir çeviri kodu bulunmuyorsa varsayılan olarak kullanılan etiket
 LabelOnDocuments=Belgeler üzerindeki etiket
 LabelOrTranslationKey=Etiket veya çeviri anahtarı
-TranslationFound=Translation found
-TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
+LabelTranslatedInCurrentLanguage=Etiket geçerli dile çevrildi
+TranslationFound=Çeviri bulundu
+TheTranslationIsSearchedFromKey=Çeviri, çeviri anahtarından aranır: <b>%s</b>
 TranslationKey=Çeviri anahtarı
 ValueOfConstantKey=Bir konfigürasyon sabitinin değeri
 ConstantIsOn=%s seçeneği açık
@@ -1431,7 +1434,7 @@ AddVatInList=Müşteri/Satıcı KDV numarasını birleşik listelerde görüntü
 AddAdressInList=Müşteri/Satıcı adresini birleşik listelerde görüntüleyin.<br>Üçüncü Taraflar, " yerine "The Big Company corp. - 21 jump street 123456 Big Town - ABD" ad biçimiyle görünecektir. Büyük Şirket şirketi".
 AddEmailPhoneTownInContactList=Kişi e-postasını (veya tanımlanmamışsa telefonlarını) ve şehri birleşik listelerde görüntüleyin.<br>Kişiler "Dupond Durand - dupond.durand@example.com - Paris" ad biçiminde görünecektir. " veya "Dupond Durand - 06 07 59 65 66 - Paris" yerine "Dupond Durand".
 AskForPreferredShippingMethod=Cariler için tercih edilen gönderme yöntemini isteyin.
-FieldEdition=%s Alanının düzenlenmesi
+FieldEdition=%s Alanının değiştirilmesi
 FillThisOnlyIfRequired=Örnek: +2 (saat dilimi farkını yalnız zaman farkı sorunları yaşıyorsanız kullanın)
 GetBarCode=Barkovizyon al
 NumberingModules=Numaralandırma modelleri
@@ -1458,7 +1461,7 @@ HRMSetup=İK modülü ayarları
 CompanySetup=Firmalar modülü kurulumu
 CompanyCodeChecker=Müşteri/tedarikçi kodlarının otomatik olarak üretilmesi için seçenekler
 AccountCodeManager=Müşteri/tedarikçi muhasebe kodlarının otomatik olarak üretilmesi için seçenekler
-NotificationsDesc=Email notifications can be sent automatically on certain events.<br>Recipients of notifications can be defined:
+NotificationsDesc=Belirli olaylarda e-posta bildirimleri otomatik olarak gönderilebilir.<br>Bildirimlerin alıcıları tanımlanabilir:
 NotificationsDescUser=* kullanıcı başına (bir kullanıcının "Bildirimleri" sekmesinde)
 NotificationsDescContact=* üçüncü taraf kişiler başına (üçüncü tarafın "Bildirimleri" sekmesinde)
 NotificationsDescGlobal=* veya genel e-posta adreslerini ayarlayarak (modülün kurulum sayfasında).
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Fatura tarihini fatura doğrulama tarihine zorla
 SuggestedPaymentModesIfNotDefinedInInvoice=Faturada tanımlanmamışsa, fatura için varsayılan olarak önerilen ödeme biçimi
 SuggestPaymentByRIBOnAccount=Hesaptan para çekerek ödeme öner
 SuggestPaymentByChequeToAddress=Çekle ödeme öner
+InvoicePaymentManageStructuredCommunication=Fatura ödemesi için yapılandırılmış iletişim oluşturun
+InvoicePaymentManageStructuredCommunicationHelp=Bazı ülkelerde, ödemeleri ve bunların mutabakatını kolaylaştırmak için yapılandırılmış bir referans gösterilmesi gerekmektedir
 FreeLegalTextOnInvoices=Faturada serbest metin
 WatermarkOnDraftInvoices=Taslak faturalarda filigran (boşsa yoktur)
 PaymentsNumberingModule=Ödeme numaralandırma modeli
@@ -1497,16 +1502,16 @@ InvoiceOptionCategoryOfOperations=Faturada "işlem kategorisi" ifadesini görün
 InvoiceOptionCategoryOfOperationsHelp=Duruma bağlı olarak, söz şu şekilde görünecektir:<br>- Operasyon kategorisi: Mal teslimatı<br>- Kategori operasyonlar: Hizmet tedariği<br>- Faaliyet kategorisi: Karma - Mal teslimatı ve hizmet tedariği
 InvoiceOptionCategoryOfOperationsYes1=Evet, adres bloğunun altında
 InvoiceOptionCategoryOfOperationsYes2=Evet, sol alt köşede
-InvoiceClassifyBilledSupplierOrderWithoutInvoice=Disallow the classification of an order as billed without invoice.
-InvoiceClassifyBilledSupplierOrderWithoutInvoiceHelp=An order can be classified as billed by default. If this conf is set to true, it will be not.
+InvoiceClassifyBilledSupplierOrderWithoutInvoice=Bir siparişin faturasız olarak faturalandırılmış olarak sınıflandırılmasına izin vermeyin.
+InvoiceClassifyBilledSupplierOrderWithoutInvoiceHelp=Bir sipariş varsayılan olarak faturalandırılmış olarak sınıflandırılabilir. Bu ayar doğru olarak ayarlanırsa, faturalandırılmayacaktır.
 ##### Supplier Orders #####
-SupplierOrderClassifyBilledWithoutInvoice=Disallow the classification of a purchase order as billed without invoice.
-SupplierOrderClassifyBilledWithoutInvoiceHelp=A supplier order can be classified as billed by default. If this conf is set to true, it will be not.
+SupplierOrderClassifyBilledWithoutInvoice=Bir satın alma siparişinin faturasız olarak faturalandırılmış olarak sınıflandırılmasına izin vermeyin.
+SupplierOrderClassifyBilledWithoutInvoiceHelp=Bir tedarikçi siparişi varsayılan olarak faturalandırılmış olarak sınıflandırılabilir. Bu ayar doğru olarak ayarlanırsa, faturalandırılmayacaktır.
 ##### Proposals #####
 PropalSetup=Teklif modülü kurulumu
 ProposalsNumberingModules=Teklif numaralandırma modülü
 ProposalsPDFModules=Teklif belge modelleri
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payment mode by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Teklifte ödeme şekli tanımlanmamışsa varsayılan olarak önerilen ödeme şekli
 FreeLegalTextOnProposal=Teklifler üzerinde serbest metin
 WatermarkOnDraftProposal=Taslak tekliflerde filigran (boşsa yoktur)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Teklif için banka hesabı iste
@@ -1548,8 +1553,8 @@ MemberCodeChecker=Üye kodlarının otomatik oluşturulmasına yönelik seçenek
 AdherentLoginRequired=Her üye için bir kullanıcı adını/şifreyi yönetin
 AdherentLoginRequiredDesc=Üye dosyasına kullanıcı adı ve parola için bir değer ekleyin. Üyenin bir kullanıcıya bağlı olması durumunda, üye kullanıcı adı ve şifresinin güncellenmesi, kullanıcı adı ve şifresinin de güncellenmesine neden olacaktır.
 AdherentMailRequired=Yeni bir üye oluşturmak için e-posta gereklidir
-MemberSendInformationByMailByDefault=The checkbox to send an email confirmation to members (validation or new subscription) is on by default
-MemberCreateAnExternalUserForSubscriptionValidated=Create automatically an external user (with a login to connect to the application) after an online payment of a membership subscription
+MemberSendInformationByMailByDefault=Üyelere e-posta onayı gönderme onay kutusu (doğrulama veya yeni abonelik) varsayılan olarak açıktır
+MemberCreateAnExternalUserForSubscriptionValidated=Üyelik aboneliğinin çevrimiçi ödenmesinden sonra otomatik olarak harici bir kullanıcı oluşturun (Uygulama'ya bağlanmak için bir oturum açma bilgisi ile)
 VisitorCanChooseItsPaymentMode=Ziyaretçi mevcut ödeme modlarından herhangi birini seçebilir
 MEMBER_REMINDER_EMAIL=Süresi dolmuş abonelikler için <b>mail yoluyla</b> otomatik hatırlatıcıyı etkinleştir. Not: Hatırlatıcıyı gönderebilmek için <strong>%s</strong> modülü etkinleştirilmiş ve doğru bir şekilde yapılandırılmış olmalıdır.
 MembersDocModules=Üye kaydından oluşturulan belgeler için belge şablonları
@@ -1718,6 +1723,7 @@ CompressionOfResources=HTTP yanıtlarının sıkıştırılması
 CompressionOfResourcesDesc=Örneğin Apache yönergesi "AddOutputFilterByType DEFLATE" kullanılarak
 TestNotPossibleWithCurrentBrowsers=Böyle bir otomatik algılama mevcut tarayıcılar için olası değildir
 DefaultValuesDesc=Burada, yeni bir kayıt oluştururken kullanmak istediğiniz varsayılan değeri ve/veya kayıtlarınızı listelediğinizde varsayılan filtreleme veya sıralama düzenini tanımlayabilirsiniz.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Varsayılan değerler (formlarda kullanmak için)
 DefaultSearchFilters=Varsayılan arama filtreleri
 DefaultSortOrder=Varsayılan sıralama düzenleri
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Gönderi numaralandırma modülü
 SendingsAbility=Müşteri teslimatlarında sevkiyat tablolarını destekler
 NoNeedForDeliveryReceipts=Çoğu durumda, gönderi formları hem müşteri teslimatları (gönderilecek ürünlerin listesi) hem de müşteri tarafından alınan ve imzalanan sayfalar olarak kullanılır. Bu nedenle, ürün teslimatı fişi yinelenen bir özelliktir ve nadiren etkinleştirilir.
 FreeLegalTextOnShippings=Sevkiyatlarda serbest metin
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Ürün teslimat fişlerinde numaralandırma modülü
 DeliveryOrderModel=Ürün teslimat fişleri modeli
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Teslimat fişlerinde serbest metin
 ##### FCKeditor #####
 AdvancedEditor=Gelişmiş editör
 ActivateFCKeditor=Gelişmiş düzenleyiciyi şunun için etkinleştir:
-FCKeditorForNotePublic=WYSIWYG öğelerin "genel notları" alanının oluşturulması/basılması
-FCKeditorForNotePrivate=WYSIWYG öğelerin "özel notları" alanının oluşturulması/basılması
-FCKeditorForCompany=WYSIWYG öğelerinin alan açıklamasının oluşturulması/düzenlenmesi (ürünler/hizmetler hariç)
-FCKeditorForProductDetails=WYSIWYG ürün açıklamalarının veya nesnelere ilişkin satırların (teklif satırları, siparişler, faturalar vb.) oluşturulması/düzenlenmesi.
+FCKeditorForNotePublic=Öğelerin "genel notlar" alanının WYSIWYG oluşturulması/değiştirilmesi
+FCKeditorForNotePrivate=Öğelerin "özel notlar" alanının WYSIWYG oluşturulması/değiştirilmesi
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Uyarı: Bu durumda bu seçeneğin kullanılması, PDF dosyaları oluşturulurken özel karakterlerde ve sayfa biçimlendirmesinde sorun yaratabileceğinden kesinlikle önerilmez.
-FCKeditorForMailing= Toplu e-Postalar için WYSIWYG oluşturma/basımı (Araçlar->e-Posta Gönderme)
-FCKeditorForUserSignature=WYSIWYG kullanıcı imzasının oluşturulması/düzenlenmesi
-FCKeditorForMail=Tüm postalar için WYSIWYG oluşturma/basımı (Araçlar->e-Postalama hariç)
-FCKeditorForTicket=Biletler için WYSIWYG oluşturma/basma
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Stok modülü kurulumu
 IfYouUsePointOfSaleCheckModule=Varsayılan olarak sağlanan Satış Noktası modülünü (POS) veya harici bir modülü kullanırsanız, bu kurulum POS modülünüz tarafından göz ardı edilebilir. Çoğu POS modülü, varsayılan olarak, hemen bir fatura oluşturmak ve buradaki seçeneklerden bağımsız olarak stoğu azaltmak için tasarlanmıştır. Bu nedenle, POS'unuzdan satış kaydederken bir stok düşüşüne ihtiyacınız varsa veya olmamak istiyorsanız, POS modülü kurulumunuzu da kontrol edin.
@@ -1867,7 +1874,6 @@ Buy=Satınal
 Sell=Satış
 InvoiceDateUsed=Kullanılan fatura tarihi
 YourCompanyDoesNotUseVAT=Firmanız KDV kullanmayacak şekilde tanımlanmış (Giriş - Ayarlar - Firma/Kuruluş), bu nedenle ayarlanacak KDV seçenekleri yoktur.
-AccountancyCode=Muhasebe Kodu
 AccountancyCodeSell=Satış hesap. kodu
 AccountancyCodeBuy=Alış hesap. kodu
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Yeni bir vergi oluştururken "Ödemeyi otomatik olarak oluştur" onay kutusunu varsayılan olarak boş bırakın
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Ajanda menüsünü seçerken varsayılan olarak hangi gör
 AGENDA_EVENT_PAST_COLOR = Geçmiş etkinlik rengi
 AGENDA_EVENT_CURRENT_COLOR = Mevcut etkinlik rengi
 AGENDA_EVENT_FUTURE_COLOR = Gelecekteki etkinlik rengi
-AGENDA_REMINDER_BROWSER = Etkinlik hatırlatıcıyı <b> kullanıcının tarayıcısında </b> etkinleştirin (Hatırlatma tarihine ulaşıldığında, tarayıcı tarafından bir açılır pencere gösterilir. Her kullanıcı, bu tür bildirimleri kendi tarayıcı bildirim ayarlarından devre dışı bırakabilir).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Sesli bildirimi etkinleştir
-AGENDA_REMINDER_EMAIL = Etkinlik hatırlatıcıyı <b> e-postalarla </b> etkinleştirin (hatırlatma seçeneği/gecikme her olayda tanımlanabilir).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Not: Planlanan işin sıklığı %s, hatırlatmanın doğru zamanda gönderildiğinden emin olmak için yeterli olmalıdır.
 AGENDA_SHOW_LINKED_OBJECT = Bağlantılı nesneyi gündem görünümünde göster
 AGENDA_USE_EVENT_TYPE = Etkinlik türleri kullanın (Ayarlar -> Sözlükler -> Gündem etkinlik türleri menüsünden yönetilir)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Olay oluşturma formundaki olay türü için varsayılan değeri otomatik olarak ayarlayın
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Dışa aktarma bağlantısını yetkilendirme anahtarı
 PastDelayVCalExport=Bundan daha eski etkinliği dışa aktarma
 SecurityKey = Güvenlik anahtarı
@@ -2006,7 +2017,7 @@ BackupZipWizard=Belgeler dizini arşivini oluşturma sihirbazı
 SomethingMakeInstallFromWebNotPossible=Web arayüzünden dış modül kurulumu aşağıdaki nedenden ötürü olanaksızdır:
 SomethingMakeInstallFromWebNotPossible2=Bu nedenle, burada açıklanan yükseltme işlemi, yalnızca ayrıcalıklı bir kullanıcının gerçekleştirebileceği manuel bir işlemdir.
 InstallModuleFromWebHasBeenDisabledContactUs=Uygulamadan harici modüllerin veya dinamik web sitelerinin kurulumu veya geliştirilmesi şu anda güvenlik nedeniyle kilitlidir. Bu özelliği etkinleştirmeniz gerekiyorsa lütfen bizimle iletişime geçin.
-InstallModuleFromWebHasBeenDisabledByFile=Dış modülün uygulama içerisinden kurulumu yöneticiniz tarafından engellenmiştir. Bu özelliğe izin verilmesi için ondan <strong>%s</strong> dosyasını kaldırmasını istemelisiniz.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Uygulamadan harici bir modül kurmak veya oluşturmak, modül dosyalarını <strong>%s</strong> dizinine kaydetmelidir. Bu dizinin Dolibarr tarafından işlenmesi için, <strong>conf/conf.php</strong> dosyanızı 2 yönerge satırını ekleyecek şekilde ayarlamalısınız: <br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt ='%s/özel';</strong>
 HighlightLinesOnMouseHover=Tablo satırlarını fare üzerine geldiğinde vurgula
 HighlightLinesColor=Fare üzerinden geçerken satırı vurgulama rengi (vurgulama rengi istemiyorsanız 'ffffff' kullanın)
@@ -2036,6 +2047,7 @@ Enter0or1=0 veya 1 girin
 EnterYesOrNo=Evet veya Hayır girin
 UnicodeCurrency=Buraya parantezlerin arasına para birimi sembolünü temsil eden bayt numaralarının listesini girin. Örneğin: $ için [36] girin - Türk Lirası TL [84,76] - € için [8364] girin
 ColorFormat=RGB rengi HEX formatındadır, örn: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Şu biçimde simge adı:<br>- geçerli tema dizinindeki bir resim dosyası için image.png<br>- image.png@module dosya bir modülün /img/ dizinindeyse<br>- FontAwesome fa-xxx picto için fa-xxx<br>- FontAwesome fa-xxx resmi için fontawesome_xxx_fa_color_size (ön ek, renk ve boyut ayarlı)
 PositionIntoComboList=Satırın kombo listesindeki konumu
 SellTaxRate=Satış vergisi oranı
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Satınalma siparişl
 MAIN_PDF_NO_SENDER_FRAME=Gönderen adresi çerçevesindeki sınırları gizle
 MAIN_PDF_NO_RECIPENT_FRAME=Alıcı adres çerçevesindeki kenarlıkları gizle
 MAIN_PDF_HIDE_CUSTOMER_CODE=Müşteri kodunu gizle
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Müşteri muhasebe kodunu gizle
 MAIN_PDF_HIDE_SENDER_NAME=Adres bloğunda gönderenin/şirket adını gizle
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Ödeme koşullarını gizle
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Ödeme modunu gizle
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Elektronik imza aracının imza alanını yeniden kullanmasına izin vermek için imza alanına gizli bir işaretleme ekleyin. Harici araçlarla veya gelecekte çevrimiçi imza özelliğiyle kullanılabilir.
@@ -2146,7 +2163,7 @@ COMPANY_DIGITARIA_CLEAN_REGEX=Değeri temizlemek için normal ifade filtresi (CO
 DuplicateForbidden=Kopyalanması yasaktır
 RemoveSpecialWords=Müşteriler veya tedarikçiler için alt hesaplar oluştururken belirli kelimeleri temizleyin
 RemoveSpecialWordsHelp=Müşteri veya tedarikçi hesabını hesaplamadan önce temizlenmesi gereken kelimeleri belirtin. Kullanın ";" her kelimenin arasında
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact, ...)
+GDPRContact=Veri Koruma Görevlisi (DPO, Veri Gizliliği veya GDPR iletişim kişisi, ...)
 GDPRContactDesc=Kişisel verilerinizi Bilgi Sisteminizde saklıyorsanız, Genel Veri Koruma Yönetmeliği'nden sorumlu olan kişinin adını buradan verebilirsiniz.
 HelpOnTooltip=Araç ipucunda gösterilecek yardım metni
 HelpOnTooltipDesc=Bu alan bir formda göründüğünde metnin bir araç ipucunda gösterilmesi için buraya metin veya çeviri anahtarı koyun
@@ -2273,14 +2290,14 @@ ConfirmDeleteEmailCollector=Bu e-posta toplayıcıyı silmek istediğinizden emi
 RecipientEmailsWillBeReplacedWithThisValue=Alıcı e-postaları her zaman bu değerle değiştirilecektir
 AtLeastOneDefaultBankAccountMandatory=En az 1 varsayılan banka hesabı tanımlanmalıdır
 RESTRICT_ON_IP=Yalnızca belirli istemci IP'lerine API erişimine izin verin (joker karaktere izin verilmez, değerler arasında boşluk kullanın). Boş, her istemcinin erişebileceği anlamına gelir.
-StaticIPsOfUsers=If applicable, list of all static IPs of users
+StaticIPsOfUsers=Uygunsa, kullanıcıların tüm statik IP'lerinin listesi
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Kütüphane SabreDAV versiyonuna göre
 NotAPublicIp=Herkese açık bir IP değil
 MakeAnonymousPing=Vakfın Dolibarr kurulumunu saymasına izin vermek için Dolibarr vakıf sunucusuna anonim bir Ping '+1' yapın (kurulumdan sonra sadece 1 kez yapılır).
 FeatureNotAvailableWithReceptionModule=Alış modül etkinleştirildiğinde özellik kullanılamaz
 EmailTemplate=E-posta şablonu
-EmailTemplateHelp=You can create emails templates from menu %s - %s
+EmailTemplateHelp=%s - %s Menüsünden e-posta şablonları oluşturabilirsiniz
 EMailsWillHaveMessageID=E-postalarda bu sözdizimiyle eşleşen bir 'Mesaj ID' başlığı bulunur
 PDF_SHOW_PROJECT=Belgede projeyi göster
 ShowProjectLabel=Proje Etiketi
@@ -2289,7 +2306,7 @@ THIRDPARTY_ALIAS=Üçüncü taraf adı - Üçüncü taraf takma adı
 ALIAS_THIRDPARTY=Üçüncü taraf takma adı - Üçüncü taraf adı
 PDFIn2Languages=PDF'deki etiketleri 2 farklı dilde göster (bu özellik bazı dillerde çalışmayabilir)
 PDF_USE_ALSO_LANGUAGE_CODE=PDF'nizdeki bazı metinlerin aynı oluşturulan PDF'de 2 farklı dilde çoğaltılmasını istiyorsanız, burada bu ikinci dili ayarlamanız gerekir, böylece oluşturulan PDF aynı sayfada 2 farklı dil içerir, biri PDF oluşturulurken seçilir ve bu ( yalnızca birkaç PDF şablonu bunu destekler). PDF başına 1 dil için boş bırakın.
-PDF_USE_A=PDF documents format
+PDF_USE_A=PDF belge formatı
 FafaIconSocialNetworksDesc=Buraya FontAwesome simgesinin kodunu girin. FontAwesome'ın ne olduğunu bilmiyorsanız, fa-address-book genel değerini kullanabilirsiniz.
 RssNote=Not: Her RSS akışı tanımı, gösterge tablosunda mevcut olması için etkinleştirmeniz gereken bir pencere öğesi sağlar.
 JumpToBoxes=Kuruluma Atla -> Widget'lar
@@ -2324,6 +2341,8 @@ NotRecommended=Tavsiye edilmez
 ARestrictedPath=Veri dosyaları için bazı kısıtlı yollar
 CheckForModuleUpdate=Harici modül güncellemelerini kontrol edin
 CheckForModuleUpdateHelp=Bu eylem, yeni bir sürümün mevcut olup olmadığını kontrol etmek için harici modüllerin editörlerine bağlanacaktır.
+CheckForModuleUpdateHelp2=Ayrıca, harici modüllerinizden bazılarının topluluk tarafından kötü amaçlı yazılım olarak bildirilip bildirilmediğini kontrol etmek için %s adresine de bağlantı kurulur.
+YourIPWillBeRevealedToThisExternalProviders=IP adresiniz tüm bu dış sağlayıcılara açıklanacaktır.
 ModuleUpdateAvailable=Bir güncelleme mevcut
 NoExternalModuleWithUpdate=Harici modüller için güncelleme bulunamadı
 SwaggerDescriptionFile=Swagger API açıklama dosyası (örneğin redoc ile kullanım için)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Teslimat adresini göster
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Bazı ülkelerde zorunlu gösterge (Fransa, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Teklifte fatura ilgilisini göster
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=Varsayılan olarak ilgili kişi yalnızca faturalandırma için görünür
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Sosyal ağın URL bağlantısı. Sosyal ağ kimliğini içeren değişken kısmı için {socialid} kullanın.
 IfThisCategoryIsChildOfAnother=Bu kategori başka bir kategorinin çocuğu ise
 DarkThemeMode=Koyu tema modu
@@ -2430,7 +2451,7 @@ CssOnEdit=Düzenleme sayfalarında CSS
 CssOnView=Görünüm sayfalarında CSS
 CssOnList=Listelerde CSS
 HelpCssOnEditDesc=Alanı düzenlerken kullanılan CSS.<br>Örnek: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The CSS used when viewing the field.<br>Example: "longmessagecut"
+HelpCssOnViewDesc=Alanı görüntülerken kullanılan CSS.<br>Örnek: "longmessagecut"
 HelpCssOnListDesc=Alan bir liste tablosunun içinde olduğunda kullanılan CSS.<br>Örnek: "tdoverflowmax200"
 RECEPTION_PDF_HIDE_ORDERED=Alımlar için oluşturulan belgelerde sipariş edilen miktarı gizleyin
 MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Resepsiyonlar için oluşturulan belgelerde fiyatı gösterin
@@ -2442,7 +2463,7 @@ DesktopsAndSmartphones=Masaüstü bilgisayarlar ve akıllı telefonlar
 AllowOnlineSign=Çevrimiçi imzalamaya izin ver
 AllowExternalDownload=Harici indirmeye izin ver (oturum açmadan, paylaşılan bir bağlantı kullanarak)
 DeadlineDayVATSubmission=Gelecek ay KDV teslimi için son gün
-MaxNumberOfAttachementOnForms=Max number of joined files in a form
+MaxNumberOfAttachementOnForms=Bir formda birleştirilen dosyaların maksimum sayısı
 IfDefinedUseAValueBeetween=Tanımlanmışsa, %s ve %s arasında bir değer kullanın
 Reload=Tekrar yükle
 ConfirmReload=Modülün yeniden yüklenmesini onaylayın
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Uyarı: %s modülü, her sayfa
 WarningModuleHasChangedSecurityCsrfParameter=Uyarı: %s modülü, örneğinizin CSRF güvenliğini devre dışı bıraktı. Bu eylem şüphelidir ve kurulumunuz artık güvenli olmayabilir. Açıklama için lütfen modülün yazarıyla iletişime geçin.
 EMailsInGoingDesc=Gelen e-postalar %s modülü tarafından yönetilir. Gelen e-postaları desteklemeniz gerekiyorsa bunu etkinleştirmeniz ve yapılandırmanız gerekir.
 MAIN_IMAP_USE_PHPIMAP=IMAP için yerel PHP IMAP yerine PHP-IMAP kitaplığını kullanın. Bu aynı zamanda IMAP için OAuth2 bağlantısının kullanılmasına da olanak tanır (OAuth modülünün de etkinleştirilmesi gerekir).
-MAIN_CHECKBOX_LEFT_COLUMN=Alan ve satır seçimine ilişkin sütunu solda göster (varsayılan olarak sağda)
+MAIN_CHECKBOX_LEFT_COLUMN=Alan ve satır seçimi için sütunu solda göster (sağda devre dışı)
 NotAvailableByDefaultEnabledOnModuleActivation=Varsayılan olarak oluşturulmamıştır. Yalnızca modül etkinleştirildiğinde oluşturulur.
 CSSPage=CSS Stili
 Defaultfortype=Varsayılan
@@ -2488,19 +2509,20 @@ CustomPrompt=Özel istemler
 AiDescription=AI (Yapay Zeka) özellikleri
 AiDescriptionLong=Uygulamanın farklı bölümlerinde AI (Yapay Zeka) özellikleri sağlar. Harici AI API'sine ihtiyacınız var.
 AI_API_KEY=Yapay Zeka API'nin anahtarı
-AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Yapay zeka özellikleri için kullanılacak hizmet
+AI_API_URL=AI API için uç nokta URL'si
+AI_API_SERVICE=AI service to use
 AiSetup=AI modülü kurulumu
 AiCustomPrompt=AI özel istemi
 AI_CONFIGURATIONS_PROMPT=Özel istem
 TextGeneration=Metin oluşturma
 ImageGeneration=Görüntü oluşturma
 VideoGeneration=Video oluşturma
-AudioGeneration=Audio generation
+AudioGeneration=Ses oluşturma
 AIPromptForFeatures=Özellikler için AI özel istemleri
 EnterAnIP=Bir IP adresi girin
 ConvertInto=Dönüştürmek
 YouAreHere=Buradasınız
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Sevk PDF belgesinde barkod değerini gösterin
 BARCODE_ON_RECEPTION_PDF=Alım PDF belgesinde barkodu göster
 BARCODE_ON_STOCKTRANSFER_PDF=Stok transferi PDF belgesinde barkodu gösterin
@@ -2511,14 +2533,14 @@ ZapierForDolibarrSetup=Dolibarr için Zapier ayarları
 ZapierDescription=Zapier ile arayüz
 ZapierAbout=Zapier modülü hakkında
 ZapierSetupPage=Zapier'i kullanmak için Dolibarr tarafında bir kurulum yapılmasına gerek yoktur. Ancak Zapier'i Dolibarr ile kullanabilmek için zapier üzerinde bir paket oluşturup yayınlamanız gerekir. <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">bu wiki sayfasındaki</a> ile ilgili belgelere bakın.
-TestWebhookTarget=Test WebHook
+TestWebhookTarget=WebHook'u test edin
 DataToSendTrigger=Url'ye gönderilen veri
 SendToUrl=URL'ye gönder
 WebsiteTemplateWasCopied=Bu modül tarafından sağlanan "%s" web sitesi şablonu/şablonları, web sitesi şablonları dizinine (/doctemplates/websites) kaydedildi ve yeni bir web olarak içe aktarılmaya hazır alan.
 EnabledByDefaultAtInstall=Kurulum sırasında varsayılan olarak etkindir
 VulnerableToRCEAttack=Özel dol_json_decode işlevini kullandığınızda RCE saldırılarına karşı savunmasızsınız
-OpenIDconnectSetup=Configuration of the OpenID Connect module
-MainAuthenticationOidcClientIdName=Client ID
+OpenIDconnectSetup=OpenID Connect modülünün yapılandırması
+MainAuthenticationOidcClientIdName=Kullanıcı Kimliği
 MainAuthenticationOidcClientIdDesc=OpenID Connect Client ID
 MainAuthenticationOidcClientSecretName=Client secret
 MainAuthenticationOidcClientSecretDesc=OpenID Connect Client Secret
@@ -2536,9 +2558,13 @@ MainAuthenticationOidcRedirectUrlName=yönlendirme bağlantısı
 MainAuthenticationOidcRedirectUrlDesc=Redirect URL to authorize on the OpenID provider side
 MainAuthenticationOidcLogoutRedirectUrlName=Dolibarr oturum kapatma URL'si
 MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on the OpenID provider side
-MainAuthenticationOidcLoginClaimName=Login claim
+MainAuthenticationOidcLoginClaimName=Giriş talebi
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Kelime kara listesi
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Kara listeye ekle
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Teslimat adresini göster
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Bazı ülkelerde zorunlu gösterge (Fransa, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang
index d9af7f2478d..930626aefd2 100644
--- a/htdocs/langs/tr_TR/agenda.lang
+++ b/htdocs/langs/tr_TR/agenda.lang
@@ -44,6 +44,7 @@ PropalClosedRefusedInDolibarr=%s referans no'lu teklif reddedildi
 PropalValidatedInDolibarr=%s referans no'lu teklif doğrulandı
 PropalBackToDraftInDolibarr=Teklif %s taslak durumuna geri döner
 PropalClassifiedBilledInDolibarr=%s referans no'lu teklif faturalandı olarak sınıflandırıldı
+InvoiceCreatedInDolibarr=Fatura %s oluşturuldu
 InvoiceValidatedInDolibarr=%s referans no'lu fatura doğrulandı
 InvoiceValidatedInDolibarrFromPos=%s referans no'lu fatura POS'dan doğrulandı
 InvoiceBackToDraftInDolibarr=%s referans no'lu fatura taslak durumuna geri döndürüldü
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index eb55a99678d..d1ed33d4f68 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Kapanış bakiyesi
 CurrentBalance=Güncel bakiye
 FutureBalance=Gelecek bakiye
 ShowAllTimeBalance=Bakiyeyi başlangıçtan göster
-AllTime=Başlangıçtan
 Reconciliation=Uzlaştırma
 RIB=Banka Hesap Numarası
 IBAN=IBAN numarası
@@ -133,7 +132,7 @@ DeleteTransaction=Kaydı sil
 ConfirmDeleteTransaction=Bu kaydı silmek istediğinizden emin misiniz?
 ThisWillAlsoDeleteBankRecord=Bu, oluşturulan banka kaydını da silecektir
 BankMovements=Hareketler
-PlannedTransactions=Planlanmış girişler
+PlannedTransactions=Yaklaşan girişler
 Graph=Grafikler
 ExportDataset_banque_1=Banka kayıtları ve hesap ekstresi
 ExportDataset_banque_2=Banka cüzdanı
@@ -151,8 +150,8 @@ FutureTransaction=Gelecekteki işlem. Uzlaştırılamıyor.
 SelectChequeTransactionAndGenerate=Çek mevduatı makbuzuna dahil edilecek çekleri seçin/filtreleyin. Daha sonra "Oluştur"a tıklayın.
 SelectPaymentTransactionAndGenerate=%s ödeme makbuzuna dahil edilecek belgeleri seçin/filtreleyin. Daha sonra "Oluştur"a tıklayın.
 InputReceiptNumber=Uzlaşmayla ilgili banka hesap özeti'ı seçin. Sıralanabilir bir sayısal değer kullanın
-InputReceiptNumberBis=YYYYMM veya YYYYAAGG
-EventualyAddCategory=Optionally, a category in which to classify the operations
+InputReceiptNumberBis=YYYYAA
+EventualyAddCategory=İsteğe bağlı olarak, işlemlerin sınıflandırılacağı bir kategori
 ToConciliate=Uzlaştırılsın mı?
 ThenCheckLinesAndConciliate=Sonra, banka hesap özetindeki satırları işaretleyin ve tıklayın
 DefaultRIB=Varsayılan BAN
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Bu işlev etkinleştirilirse, borçlandırma veya kredi
 BankColorizeMovementName1=Borç hareketi için arka plan rengi
 BankColorizeMovementName2=Kredi hareketi için arka plan rengi
 IfYouDontReconcileDisableProperty=Bazı banka hesaplarında banka mutabakatı yapmıyorsanız bu uyarıyı kaldırmak için hesaplarda "%s" özelliğini devre dışı bırakın.
-NoBankAccountDefined=Tanımlanmış banka hesabı yok
+NoBankAccountDefined=Banka hesabı bulunamadı
 NoRecordFoundIBankcAccount=Banka hesabında kayıt bulunamadı. Genellikle bu durum, banka hesabındaki işlem listesinden bir kaydın manuel olarak silinmesi durumunda meydana gelir (örneğin, banka hesabı mutabakatı sırasında). Diğer bir neden ise ödemenin "%s" modülü devre dışı bırakıldığında kaydedilmiş olmasıdır.
 AlreadyOneBankAccount=Zaten bir banka hesabı tanımlanmış
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA dosya çeşidi
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index cbaec2bc07c..12ee6f8ab7a 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -51,7 +51,7 @@ CardBill=Fatura kartı
 PredefinedInvoices=Öntanımlı faturalar
 Invoice=Fatura
 PdfInvoiceTitle=Fatura
-PdfInvoiceSituationTitle=Invoice situation
+PdfInvoiceSituationTitle=Fatura durumu
 Invoices=Faturalar
 InvoiceLine=Fatura satırı
 InvoiceCustomer=Müşteri faturası
@@ -169,6 +169,7 @@ BillTo=Kime
 ShippingTo=Nakliye
 ActionsOnBill=Fatura üzerindeki eylemler
 ActionsOnBillRec=Yinelenen faturaya ilişkin işlemler
+InvoicesGeneratedFromRec=Oluşturulan faturalar
 RecurringInvoiceTemplate=Şablon/Yinelenen fatura
 NoQualifiedRecurringInvoiceTemplateFound=Oluşturmak için gerekli nitelikte yinelenen fatura şablonu yok.
 FoundXQualifiedRecurringInvoiceTemplate=%s yinelenen şablon faturalar oluşturulmaya uygun.
@@ -178,10 +179,11 @@ LastBills=En son %s fatura
 LatestTemplateInvoices=En son %s şablon fatura
 LatestCustomerTemplateInvoices=En son %s müşteri şablon faturası
 LatestSupplierTemplateInvoices=En son %s tedarikçi şablon faturası
-LastCustomersBills=En yeni %s müşteri faturaları 
+LastCustomersBills=En yeni %s müşteri faturaları
 LastSuppliersBills=En son %s tedarikçi faturası
 AllBills=Tüm faturalar
 AllCustomerTemplateInvoices=Tüm şablon faturaları
+AllSupplierTemplateInvoices=Tüm şablon faturaları
 OtherBills=Diğer faturalar
 DraftBills=Taslak faturalar
 CustomersDraftInvoices=Müşteri taslak faturaları
@@ -189,7 +191,7 @@ SuppliersDraftInvoices=Tedarikçi taslak faturaları
 Unpaid=Ödenmemiş
 ErrorNoPaymentDefined=Hata Ödeme tanımlanmadı
 ConfirmDeleteBill=Bu faturayı silmek istediğinizden emin misiniz?
-ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
+ConfirmValidateBill=Bu faturayı <b>%s</b> referans numarasıyla doğrulamak istediğinizden emin misiniz?
 ConfirmUnvalidateBill=<b>%s</b> faturasını taslak durumuna değiştirmek istediğinizden emin misiniz?
 ConfirmClassifyPaidBill=<b>%s</b> faturasının durumunu ödenmiş olarak değiştirmek istediğinizden emin misiniz?
 ConfirmCancelBill=<b>%s</b> faturasını iptal etmek istediğinizden emin misiniz?
@@ -230,7 +232,7 @@ AmountOfBillsByMonthHT=Aylık fatura tutarı (vergisiz net)
 UseSituationInvoices=Durum faturasına izin ver
 UseSituationInvoicesCreditNote=Durum faturası kredi notuna izin ver
 RetainedWarranty=Korunan garanti
-RetainedWarrantyShort=Ret. warranty
+RetainedWarrantyShort=Geri ödeme garantisi
 AllowedInvoiceForRetainedWarranty=Aşağıdaki fatura türlerinde kullanılabilen korunan garanti
 RetainedWarrantyDefaultPercent=Tutulan garanti varsayılan yüzdesi
 RetainedWarrantyOnlyForSituation="Garantiyi muhafaza etme" seçeneğini yalnızca durum faturaları için kullanılabilir hale getirin
@@ -419,6 +421,7 @@ InvoiceAutoValidate=Faturaları otomatik olarak doğrula
 GeneratedFromRecurringInvoice=Şablondan oluşturulan yinelenen fatura %s
 DateIsNotEnough=Henüz tarihe ulaşılmadı
 InvoiceGeneratedFromTemplate=Fatura %s yinelenen fatura şablonundan %s oluşturuldu
+InvoiceGeneratedFromTemplateError=Error Invoice %s generated from recurring template invoice %s : %s
 GeneratedFromTemplate=Şablon faturadan oluşturuldu %s
 WarningInvoiceDateInFuture=Uyarı: fatura tarihi şu anki tarihten daha yüksek
 WarningInvoiceDateTooFarInFuture=Uyarı, fatura tarihi şu anki tarihten çok uzak
@@ -495,6 +498,8 @@ IBANNumber=IBAN numarası
 IBAN=IBAN
 CustomerIBAN=Müşterinin IBAN'ı
 SupplierIBAN=Satıcının IBAN'ı
+DebitBankAccount = Otomatik banka hesabı
+SetDebitBankAccount = Otomatik banka hesabı tanımlayın
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT kodu
 ExtraInfos=Ek bilgiler
@@ -513,10 +518,12 @@ PrettyLittleSentence=Maliye İdaresi tarafından onaylı bir muhasebe kurumu üy
 IntracommunityVATNumber=Topluluk İçi Vergi Numarası
 PaymentByChequeOrderedTo=Çek ödemeleri (vergi dahil) %s adresine ödenecek, şuraya gönder:
 PaymentByChequeOrderedToShort=Çek ödemeleri (vergi dahil) şu adrese ödenecektir:
+StructuredCommunication=Yapılandırılmış iletişim
 SendTo=kime
 PaymentByTransferOnThisBankAccount=Havale/EFT yapılacak banka hesabı
 VATIsNotUsedForInvoice=* KDV uygulanmaz madde-293B CGI
 VATIsNotUsedForInvoiceAsso=* Uygulanmayan KDV md-261-7 CGI
+VATIsNotUsedReverseChargeProcedure=* Non applicable VAT art-259-1 of CGI
 LawApplicationPart1=12/05/80 tarihli 80.335 yasasının uygulanması ile
 LawApplicationPart2=mallar şunun mülkiyetinde kalır
 LawApplicationPart3=Satıcı, bedelin tamamı ödenene kadar
@@ -537,7 +544,7 @@ ChequeDeposits=Mevduat makbuzları
 Cheques=Çekler
 DepositId=Depozit Kimliği
 NbCheque=Çek sayısı
-CreditNoteConvertedIntoDiscount=%s converted into %s
+CreditNoteConvertedIntoDiscount=%s %s'a dönüştürüldü
 UsBillingContactAsIncoiveRecipientIfExist=Faturalar için alıcı olarak üçüncü taraf adresi yerine 'faturalandırma ilgili kişisi' tipinde iletişim kişisi/adresi kullanın
 ShowUnpaidAll=Tüm ödenmemiş faturaları göster
 ShowUnpaidLateOnly=Ödenmemiş bütün faturaları göster
@@ -569,7 +576,7 @@ YouMustCreateInvoiceFromSupplierThird=Bu seçenek yalnızca üçüncü partinin
 YouMustCreateStandardInvoiceFirstDesc=Yeni bir fatura şablonu oluşturmak için önce bir standart fatura oluşturmalı ve onu "şablona" dönüştürmelisiniz
 PDFCrabeDescription=Fatura PDF şablonu Crabe. Eksiksiz bir fatura şablonu (Sünger şablonunun eski uygulaması)
 PDFSpongeDescription=Fatura PDF şablonu Sünger. Eksiksiz bir fatura şablonu
-PDFOctopusDescription=Invoice PDF template Octopus. A complete invoice template for situation invoices
+PDFOctopusDescription=Fatura PDF şablonu Octopus. Durum faturaları için eksiksiz bir fatura şablonu
 TerreNumRefModelDesc1=Standart faturalar için %syymm-nnnn biçiminde ve yy'nin yıl, mm olduğu kredi notları için %syymm-nnnn biçiminde dönüş numarası aydır ve nnnn, ara vermeden ve 0'a dönüş olmadan otomatik olarak artan sıralı bir sayıdır
 MarsNumRefModelDesc1=Standart faturalar için %syymm-nnnn biçiminde dönüş numarası, değiştirme faturaları için %syymm-nnnn, %syymm-nnnn ve kredi notları için %syymm-nnnn; burada yy yıl, mm ay ve nnnn sıralı bir otomatiktir. sayıyı ara vermeden ve 0'a dönmeden artırma
 TerreNumRefModelError=$syymm ile başlayan bir fatura hali hazırda vardır ve bu sıra dizisi için uygun değildir. Bu modülü etkinleştirmek için onu kaldırın ya da adını değiştirin.
@@ -586,7 +593,7 @@ TypeContact_invoice_supplier_external_BILLING=Tedarikçi faturası kişisi
 TypeContact_invoice_supplier_external_SHIPPING=Tedarikçi sevkiyat yetkilisi
 TypeContact_invoice_supplier_external_SERVICE=Satıcı servis iletişim bilgileri
 # Situation invoices
-WarningsObjectIsNotASituation=Warning, this invoice is not a situation
+WarningsObjectIsNotASituation=Uyarı, bu fatura bir durum değildir
 InvoiceFirstSituationAsk=İlk hakediş faturası
 InvoiceFirstSituationDesc=<b>Hakediş faturaları</b> işin ilerleme durumuyla ilgili faturalardır, örneğin; bir inşaatın ilerleyişi. Her durum bir faturaya bağlanır.
 InvoiceSituation=Hakediş faturası
@@ -610,10 +617,10 @@ NoSituations=Açık pozisyon yok
 InvoiceSituationLast=Son ve genel fatura
 SituationInvoiceAmountColTitle=Tutar (net)
 SituationInvoiceProgressColTitle=İlerleme
-SituationInvoiceDate=Date invoice situation
-SituationInvoiceTotalProposal=Proposal of invoice situation
-SituationInvoiceOldCumulation=Old cumulation
-SituationInvoiceNewCumulation=New cumulation
+SituationInvoiceDate=Tarih fatura durumu
+SituationInvoiceTotalProposal=Fatura durumu teklifi
+SituationInvoiceOldCumulation=Eski birikim
+SituationInvoiceNewCumulation=Yeni birikim
 SituationInvoiceMainTask=Ana görev
 SituationInvoiceAdditionalTask=Ek görev
 PDFOctopusSituationNumber=Hakediş No%s
@@ -621,7 +628,7 @@ PDFOctopusSituationInvoiceLineDecompte=Hakediş faturası - SAYI
 PDFOctopusSituationInvoiceTitle=Hakediş faturası
 PDFOctopusSituationInvoiceLine=Durum N°%s: Env. %s üzerinde N°%s
 TotalSituationInvoice=Toplam hakediş
-TotalSituationInvoiceWithRetainedWarranty=Total (incl. tax) with retained warranty
+TotalSituationInvoiceWithRetainedWarranty=Toplam (vergi dahil) saklı garanti ile
 invoiceLineProgressError=Fatura satırı ilerleyişi sonraki fatura satırından büyük ya da eşit olamaz
 updatePriceNextInvoiceErrorUpdateline=Hata: Fatura satırında fiyatı güncelleyin: %s
 ToCreateARecurringInvoice=Bu sözleşme için yinelenen fattura oluşturmak için önce bu taslak faturayı oluşturun sonra onu bir fatura şablonuna dönüştürün ve sonraki faturaların oluşması için süre tanımlayın.
@@ -645,7 +652,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Tedarikçi fatura silindi
 UnitPriceXQtyLessDiscount=Birim fiyatı x Adet - İndirim
 CustomersInvoicesArea=Müşteri faturalandırma alanı
 SupplierInvoicesArea=Tedarikçi faturalandırma alanı
-SituationTotalRayToRest=Remainder to pay without tax
+SituationTotalRayToRest=Geriye kalan vergi hariç ödeme anımsatması
 PDFSituationTitle=Durum numarası %d
 SituationTotalProgress=Toplam ilerleme %d %%
 SearchUnpaidInvoicesWithDueDate=Son ödeme tarihi olan ödenmemiş faturaları arayın = %s
@@ -661,6 +668,7 @@ MentionCategoryOfOperations0=Malların teslimi
 MentionCategoryOfOperations1=Hizmetlerin sağlanması
 MentionCategoryOfOperations2=Karma - Malların teslimi ve hizmetlerin sağlanması
 Salaries=Maaşlar
+InvoiceSubtype=Invoice Subtype
 SalaryInvoice=Maaş
 BillsAndSalaries=Faturalar ve Maaşlar
 CreateCreditNoteWhenClientInvoiceExists=Bu seçenek yalnızca bir müşteri için doğrulanmış fatura(lar) mevcut olduğunda veya sabit INVOICE_CREDIT_NOTE_STANDALONE kullanıldığında etkinleştirilir (bazı ülkeler için kullanışlıdır)
@@ -668,5 +676,5 @@ SearchUnpaidSupplierInvoicesWithDueDate=Son tarihi olan ödenmemiş tedarikçi f
 SearchValidatedSupplierInvoicesWithDate=Doğrulama tarihi = %s olan ödenmemiş tedarikçi faturalarını arayın
 SendEmailsRemindersOnSupplierInvoiceDueDate=Doğrulanmış ve ödenmemiş tedarikçi faturaları için e-postayla hatırlatma gönder
 PaymentMadeForSeveralInvoices=Birden fazla fatura için ödeme yapıldı
-SituationInvoiceProgressCurrent=Invoice progress
+SituationInvoiceProgressCurrent=Fatura ilerlemesi
 INVOICE_ADD_EPC_QR_CODEPay=EPC QR koduyla ödemeyi destekleyen bir akıllı telefonla ödeme yapmak için bu QR kodunu tarayın.
diff --git a/htdocs/langs/tr_TR/blockedlog.lang b/htdocs/langs/tr_TR/blockedlog.lang
index 16ea8fb69df..ec12e9d3d18 100644
--- a/htdocs/langs/tr_TR/blockedlog.lang
+++ b/htdocs/langs/tr_TR/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Değiştirilemez günlükler
 ShowAllFingerPrintsMightBeTooLong=Arşivlenen tüm günlükleri göster (uzun olabilir)
 ShowAllFingerPrintsErrorsMightBeTooLong=Geçerli olmayan tüm arşiv günlüklerini göster (uzun olabilir)
 DownloadBlockChain=Parmak izlerini indirin
-KoCheckFingerprintValidity=Arşivlenmiş günlük girişi geçerli değil. Bu, birisinin (bilgisayar korsanı mı?) bu kayıt kaydedildikten sonra bu kaydın bazı verilerini değiştirdiği veya önceki arşivlenmiş kaydı sildiği (önceki # ile satırın mevcut olduğunu kontrol edin) veya önceki kaydın sağlama toplamını değiştirdiği anlamına gelir.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Arşivlenen günlük kaydı geçerlidir. Bu satırdaki veriler değiştirilmemiştir ve giriş öncekini takip etmektedir.
 OkCheckFingerprintValidityButChainIsKo=Arşivlenen log öncekine göre geçerli görünüyor ancak zincir daha önce bozulmuştu.
 AddedByAuthority=Uzak otoriteye depolandı
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Günlük Ayrıntıları
 ListOfTrackedEvents=Takip edilen etkinliklerin listesi
 Fingerprint=Parmak izi
 DownloadLogCSV=Arşivlenmiş günlükleri dışa aktar (CSV)
-DataOfArchivedEvent=Arşivlenen etkinliğin tam verileri
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Orijinal nesne (%s yazın, kimlik %s) bağlı değil (değiştirilemeyen kayıtlı verileri almak için 'Tam veriler' sütununa bakın)
 BlockedLogAreRequiredByYourCountryLegislation=Değiştirilemez Kayıtlar modülü ülkenizin mevzuatı gereği gerekli olabilir. Bu modülün devre dışı bırakılması, vergi denetimiyle doğrulanamayacağı için gelecekte yapılacak işlemleri hukuk ve yasal yazılım kullanımı açısından geçersiz kılabilir.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Ülkenizin mevzuatı gereği Değiştirilemez Loglar modülü aktif edilmiştir. Bu modülün devre dışı bırakılması, vergi denetimiyle doğrulanamayacağından gelecekte yapılacak işlemleri hukuk ve yasal yazılım kullanımı açısından geçersiz kılabilir.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Olayları değiştirilemez günlükler halinde takip etme sist
 BlockedLogDisabled=Bazı kayıtlar yapıldıktan sonra, olayları değiştirilemez günlükler halinde takip etme sistemi devre dışı bırakıldı. Zincirin kırık olduğunu takip etmek için özel bir Parmak İzi kaydettik
 BlockedLogDisabledBis=Olayları değiştirilemez günlükler halinde takip etme sistemi devre dışı bırakıldı. Henüz kayıt yapılmadığı için bu mümkün.
 LinkHasBeenDisabledForPerformancePurpose=Performans amacıyla 100. satırdan sonra belgeye doğrudan bağlantı gösterilmemiştir.
+SavedOnLine=Satırda kaydedildi
 
 ## logTypes
 logBILL_DELETE=Müşteri faturası mantıksal olarak silindi
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Müşteri ödemesinin mantıksal silinmesi
 logPAYMENT_VARIOUS_CREATE=Ödeme (bir faturaya atanmamış) oluşturuldu
 logPAYMENT_VARIOUS_DELETE=Ödeme (bir faturaya atanmamış) mantıksal silme
 logPAYMENT_VARIOUS_MODIFY=Ödeme (bir faturaya atanmamış) değiştirildi
+logBLOCKEDLOG_EXPORT=Değiştirilemeyen günlüklerin bir dosyaya aktarılması
diff --git a/htdocs/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang
index 6de2c24e48a..7ffca5e5cf2 100644
--- a/htdocs/langs/tr_TR/boxes.lang
+++ b/htdocs/langs/tr_TR/boxes.lang
@@ -65,23 +65,24 @@ FailedToRefreshDataInfoNotUpToDate=RSS akışı yenilenemedi. Son başarılı ye
 LastRefreshDate=Son yenileme tarihi
 NoRecordedBookmarks=Tanımlanmış yerimi yok.
 ClickToAdd=Eklemek için buraya tıklayın.
-NoRecordedCustomers=Kayıtlı müşteri yok
-NoRecordedContacts=Kayıtlı kişi yok
+NoRecordedCustomers=Hiçbir müşteri kaydedilmedi
+NoRecordedContacts=Hiçbir iletişim kaydedilmedi
 NoActionsToDo=Yapılacak eylem yok
-NoRecordedOrders=Kayıtlı müşteri siparişi yok
-NoRecordedProposals=Kayıtlı teklif yok
-NoRecordedInvoices=Kayıtlı müşteri faturası yok
+NoRecordedOrders=Hiçbir satış siparişi kaydedilmedi
+NoRecordedProposals=Hiçbir teklif kaydedilmedi
+NoRecordedInvoices=Hiç bir müşteri faturası kaydedilmedi
 NoUnpaidCustomerBills=Ödenmemiş müşteri faturası yok
 NoUnpaidSupplierBills=Ödenmemiş tedarikçi faturası yok
-NoModifiedSupplierBills=Kayıtlı tedarikçi faturası yok
-NoRecordedProducts=Kayıtlı ürün/hizmet yok
-NoRecordedProspects=Kayıtlı aday yok
+NoModifiedSupplierBills=Hiçbir satıcı faturası kaydedilmedi
+NoRecordedProducts=Hiçbir ürün/hizmet kaydedilmedi
+NoRecordedProspects=Hiçbir beklenti kaydedilmedi
 NoContractedProducts=Sözleşmeli ürün/hizmet yok
-NoRecordedContracts=Kayıtlı sözleşme yok
-NoRecordedInterventions=Kayıtlı müdahale yok
+NoRecordedContracts=Kaydedilen sözleşme yok
+NoRecordedInterventions=Hiçbir müdahale kaydedilmedi
+NoRecordedBankAccounts=Hiçbir finansal hesap kaydedilmedi
+NoSupplierOrder=Hiç bir satınalma siparişi kaydedilmedi
 BoxLatestSupplierOrders=En son tedarikçi siparişleri
 BoxLatestSupplierOrdersAwaitingReception=En Son Satın Alma Siparişleri (kabul bekleyen)
-NoSupplierOrder=Kayıtlı tedarikçi siparişi yok
 BoxCustomersInvoicesPerMonth=Aylık müşteri faturaları
 BoxSuppliersInvoicesPerMonth=Aylık tedarikçi faturaları
 BoxCustomersOrdersPerMonth=Aylık müşteri siparişleri
@@ -116,6 +117,11 @@ BoxTitleLastCustomerShipments=En son %s değiştirilmiş müşteri gönderisi
 BoxTitleLastLeaveRequests=Değiştirilen son %s izin isteği
 NoRecordedShipments=Kayıtlı müşteri gönderimi yok
 BoxCustomersOutstandingBillReached=Ödenmemiş limite ulaşan müşteriler
+BoxTitleLastFediverseInfos=%s 'den son %s gönderi
+BoxLastFediverseInfos=En Son Fediverse Güncellemeleri: Haberler ve Trendler
+NoOpenedProjectsOpportunities=Açık fırsat yok
+NoOpenedProjects=Açık proje yok
+NoScheduledJobs=Planlanmış iş yok
 # Pages
 UsersHome=Ev kullanıcıları ve grupları
 MembersHome=Ana Sayfa Üyelik
diff --git a/htdocs/langs/tr_TR/cashdesk.lang b/htdocs/langs/tr_TR/cashdesk.lang
index da952ad6f5e..69fee3036fa 100644
--- a/htdocs/langs/tr_TR/cashdesk.lang
+++ b/htdocs/langs/tr_TR/cashdesk.lang
@@ -60,7 +60,7 @@ Numberspad=Sayısal Tuş Takımı
 BillsCoinsPad=Madeni paralar ve banknotlar Pad
 DolistorePosCategory=Dolibarr için TakePOS modülleri ve diğer POS çözümleri
 TakeposNeedsCategories=TakePOS'un çalışması için en az bir ürün kategorisine ihtiyacı var
-TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS'un, <b>%s</b> kategorisi altında en az 1 ürün kategorisine ihtiyacı vardır. iş
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS'un çalışması için <b>%s</b> ürün kategorisi altında en az 1 alt kategoriye gereksinim var
 OrderNotes=Sipariş edilen her öğeye bazı notlar ekleyebilir
 CashDeskBankAccountFor=Ödemeler için kullanılacak varsayılan hesap
 NoPaimementModesDefined=TakePOS konfigürasyonunda tanımlanmış ödeme modu yok
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index bfb3c9bb631..7f2477c6de7 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Kişi etiketleri/kategoriler alanı
 AccountsCategoriesArea=Banka hesabı etiketleri/kategorileri alanı
 ProjectsCategoriesArea=Proje etiketleri/kategoriler alanı
 UsersCategoriesArea=Kullanıcı etiketleri/kategorileri alanı
+Bank_linesCategoriesArea==Banka satırı etiketleri/kategorileri alanı
 SubCats=Alt kategoriler
 CatList= Etiketler/kategoriler listesi
 CatListAll=Etiketlerin/kategorilerin listesi (tüm türler)
@@ -90,9 +91,10 @@ CategoriesSetup=Etiket/kategori ayarları
 CategorieRecursiv=Otomatik ana etiketli/kategorili bağlantı
 CategorieRecursivHelp=Seçenek açık ise alt kategoriye bir nesne eklediğinizde üst kategoriye de eklenecektir.
 AddProductServiceIntoCategory=Ürüne/hizmete kategori atayın
-AddCustomerIntoCategory=Kategoriyi müşteriye atayın
-AddSupplierIntoCategory=Kategoriyi tedarikçiye atayın
-AssignCategoryTo=Kategoriyi şuna ata:
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Etiketi/kategoriyi göster
 ByDefaultInList=B listede varsayılana göre
 ChooseCategory=Kategori seç
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Sayfa Kapsayıcı Kategorileri
 KnowledgemanagementsCategoriesArea=KM makale Kategorileri
 UseOrOperatorForCategories=Kategoriler için 'OR' operatörünü kullanın
 AddObjectIntoCategory=Kategoriye ata
+FichintersCategoriesArea=Müdahale Kategorileri
diff --git a/htdocs/langs/tr_TR/commercial.lang b/htdocs/langs/tr_TR/commercial.lang
index 68e713b631b..b9c2305a8f7 100644
--- a/htdocs/langs/tr_TR/commercial.lang
+++ b/htdocs/langs/tr_TR/commercial.lang
@@ -14,7 +14,7 @@ ConfirmDeleteAction=Bu etkinliği silmek istediğinizden emin misiniz?
 CardAction=Etkinlik kartı
 ActionOnCompany=İlgili firma
 ActionOnContact=İlgili kişi
-ActionOnUser=Related user
+ActionOnUser=İlgili kullanıcı
 TaskRDVWith=%s ile toplantı
 ShowTask=Görev göster
 ShowAction=Etkinlik göster
@@ -75,15 +75,15 @@ DraftPropals=Taslak teklifler
 NoLimit=Sınır yok
 ToOfferALinkForOnlineSignature=Online imza için link
 WelcomeOnOnlineSignaturePageProposal=%s şirketinin ticari tekliflerini kabul etme sayfasına hoş geldiniz.
-WelcomeOnOnlineSignaturePageContract=%s Sözleşme PDF İmzalama Sayfasına Hoş Geldiniz
-WelcomeOnOnlineSignaturePageFichinter=%s Müdahale PDF İmzalama Sayfasına Hoş Geldiniz
-WelcomeOnOnlineSignaturePageSociete_rib=%s SEPA talimat PDF İmzalama Sayfasına hoş geldiniz
-WelcomeOnOnlineSignaturePageExpedition=%s Gönderi PDF İmzalama Sayfasına Hoş Geldiniz
+WelcomeOnOnlineSignaturePageContract=%s sözleşme imza sayfasına hoş geldiniz
+WelcomeOnOnlineSignaturePageFichinter=%s müdahale imza sayfasına hoş geldiniz
+WelcomeOnOnlineSignaturePageSociete_rib=%s SEPA yetki belgesi imza sayfasına hoş geldiniz
+WelcomeOnOnlineSignaturePageExpedition=%s gönderi imza sayfasına hoş geldiniz
 ThisScreenAllowsYouToSignDocFromProposal=Bu ekran, bir teklifi kabul etmenize ve imzalamanıza veya reddetmenize olanak sağlar.
-ThisScreenAllowsYouToSignDocFromContract=Bu ekran, çevrimiçi olarak PDF formatında sözleşme imzalamanıza olanak tanır.
-ThisScreenAllowsYouToSignDocFromFichinter=Bu ekran, müdahaleyi çevrimiçi olarak PDF formatında imzalamanıza olanak tanır.
-ThisScreenAllowsYouToSignDocFromSociete_rib=Bu ekran, SEPA Talimatını çevrimiçi olarak PDF formatında imzalamanıza olanak tanır.
-ThisScreenAllowsYouToSignDocFromExpedition=Bu ekran gönderiyi çevrimiçi olarak PDF formatında imzalamanıza olanak tanır.
+ThisScreenAllowsYouToSignDocFromContract=Bu ekran online sözleşme imzalamanızı sağlar.
+ThisScreenAllowsYouToSignDocFromFichinter=Bu ekran, çevrimiçi bir müdahaleyi imzalamanızı sağlar.
+ThisScreenAllowsYouToSignDocFromSociete_rib=Bu ekran SEPA Yetki Belgesi'ni çevrimiçi olarak imzalamanızı sağlar.
+ThisScreenAllowsYouToSignDocFromExpedition=Bu ekran, bir gönderiyi çevrimiçi olarak imzalamanızı sağlar.
 ThisIsInformationOnDocumentToSignProposal=Kabul edilecek veya reddedilecek belge hakkında bilgidir
 ThisIsInformationOnDocumentToSignContract=Bu imzalanacak sözleşmeye ilişkin bilgidir
 ThisIsInformationOnDocumentToSignFichinter=Bu, imzalanacak müdahaleye ilişkin bilgidir
@@ -95,8 +95,10 @@ SignatureFichinterRef=Müdahalenin imzası %s
 SignatureSociete_ribRef=SEPA Yetkisi İmzası %s
 FeatureOnlineSignDisabled=Çevrimiçi imzalama özelliği devre dışı bırakıldı veya belge bu özellik etkinleştirilmeden önce oluşturuldu
 NoSignature=İmzalanmamış
-SignedSender=Signed internally
-SignedReceiver=Signed by third party
-SignedReceiverOnline=Signed by third party online
-SignedAll=Signed by all parties
-SignStatus=Signature status
+UnsignedInDolibarr=Belge imzalanmamış
+SignedSender=Dahili olarak imzalandı
+SignedReceiver=Üçüncü tarafça imzalandı
+SignedReceiverOnline=Üçüncü tarafça çevrimiçi olarak imzalandı
+SignedAll=Tüm taraflarca imzalandı
+SignStatus=İmza durumu
+DocumentSigned=Belge imzalandı
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 2cd9e87e0c6..2d4f2afeef7 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Ülke, Avrupa Ekonomik Topluluğu içindedir
 PriceFormatInCurrentLanguage=Kullanılan dil ve para biriminde fiyat görüntüleme biçimi
 ThirdPartyName=Üçüncü parti adı
 ThirdPartyEmail=Üçüncü parti e-postası
-ThirdParty=Üçüncü Parti
-ThirdParties=Üçüncü Partiler
+ThirdParty=Üçüncü parti
+ThirdParties=Cariler
 ThirdPartyProspects=Adaylar
 ThirdPartyProspectsStats=Adaylar
 ThirdPartyCustomers=Müşteriler
@@ -65,6 +65,7 @@ State=Eyaleti/İli
 StateId=Durum Kimliği
 StateCode=Eyalet/il kodu
 StateShort=Durum
+DepartmentBuyer=Alıcının eyaleti/ilçesi
 Region=Bölgesi
 Region-State=Bölge - Eyalet
 Country=Ülkesi
@@ -78,7 +79,7 @@ Chat=Sohbet
 PhonePro=İş telefonu
 PhonePerso=Dahili numarası
 PhoneMobile=Cep Telefonu
-No_Email=Toplu e-postaları reddet
+No_Email=Refuse mass emails
 Fax=Faks
 Zip=Posta Kodu
 Town=İlçesi
@@ -155,7 +156,7 @@ ProfId4CH=Prof No 2 (Ticaret Kayıt numarası)
 ProfId5CH=EORI numarası
 ProfId1CL=Prof Id 1 (RUT)
 ProfId1CM=İD. prof. 1 (Ticaret Sicili)
-ProfId2CM=Id. prof. 2 (Unique Tax Identification Number)
+ProfId2CM=Id. prof. 2 (Benzersiz Vergi Kimlik Numarası)
 ProfId3CM=İD. prof. 3 (Yaratılış Kararnamesi Sayısı)
 ProfId4CM=İD. prof. 4 (Depozito Sertifikası No.)
 ProfId5CM=İD. prof. 5 (Diğerleri)
@@ -382,12 +383,12 @@ ExportCardToFormat=Biçimlendirilecek dışa aktarma kartı
 ContactNotLinkedToCompany=Kişi herhangi bir üçüncü partiye bağlı değil
 DolibarrLogin=Dolibarr kullanıcı adı
 NoDolibarrAccess=Dolibarr erişimi yok
-ExportDataset_company_1=Üçüncü Partiler (şirketler/dernekler/şahıslar) ve özellikleri
-ExportDataset_company_2=Kişiler ve özellikleri
-ExportDataset_company_3=Üçüncü Partilerin Banka hesapları
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Üçücü parti ilave kişileri/adresleri ve nitelikleri
+ExportDataset_company_3=Üçüncü taraf ödeme yöntemleri (banka hesapları)
 ImportDataset_company_1=Üçüncü Partiler ve özellikleri
 ImportDataset_company_2=Üçücü parti ilave kişileri/adresleri ve nitelikleri
-ImportDataset_company_3=Üçüncü Partilerin Banka hesapları
+ImportDataset_company_3=Üçüncü taraf ödeme yöntemleri (banka hesapları)
 ImportDataset_company_4=Üçücü parti satış temsilcileri (satış temsilcilerini/kullanıcıları şirketlere atayın)
 PriceLevel=Fiyat Seviyesi
 PriceLevelLabels=Fiyat Seviyesi Etiketleri
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Doğrulama olmadan ücretsiz kod.
 ManagingDirectors=Yönetici(lerin) adı (CEO, müdür, başkan...)
 MergeOriginThirdparty=Çoğaltılmış üçüncü taraf (silmek istediğiniz üçüncü taraf)
 MergeThirdparties=Üçüncü partileri birleştir
-ConfirmMergeThirdparties=Seçilen üçüncü tarafı mevcut tarafla birleştirmek istediğinizden emin misiniz? Bağlantılı tüm nesneler (faturalar, siparişler, ...) mevcut üçüncü tarafa taşınacak ve ardından seçilen üçüncü taraf silinecektir.
+ConfirmMergeThirdparties=Seçilen üçüncü tarafı geçerli olanla birleştirmek istediğinizden emin misiniz? Tüm bağlantılı nesneler (faturalar, siparişler, ...) geçerli üçüncü tarafa taşınacak, ardından seçilen üçüncü taraf silinecektir.
 ThirdpartiesMergeSuccess=Üçüncü partiler birleştirildi
 SaleRepresentativeLogin=Satış temsilcisinin kullanıcı adı
 SaleRepresentativeFirstname=Satış temsilcisinin adı
@@ -461,3 +462,6 @@ ExternalSystemID=Harici sistem kimliği
 IDOfPaymentInAnExternalSystem=Ödeme modunun harici bir sisteme kimliği (Stripe, Paypal, ... gibi)
 AADEWebserviceCredentials=AADE Web Hizmeti Kimlik Bilgileri
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Stripe tarafında banka bilgilerinin oluşturulmasına izin vermek için üçüncü tarafın müşteri olması gerekir
+NewSocNameForClone=Yeni şirket adı
+ConfirmCloneThirdparties=<b>%s</b> Şirketini klonlamak istediğinizden emin misiniz?
+SocialNetworksBusiness=Şirket için sosyal ağlar
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index f5ffea4bfbe..eacfd614a78 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Müşteri fatura ödemesi
 PaymentSupplierInvoice=Tedarikçi faturası ödemesi
 PaymentSocialContribution=Sosyal/mali vergi ödemesi
 PaymentVat=KDV ödeme
-AutomaticCreationPayment=Ödemeyi otomatik olarak kaydet
+AutomaticCreationPayment=Also record the payment
 ListPayment=Ödemeler listesi
 ListOfCustomerPayments=Müşteri ödemeleri listesi
 ListOfSupplierPayments=Tedarikçi ödemelerinin listesi
@@ -118,10 +118,14 @@ SocialContributionsPayments=Sosyal/mali vergi ödemeleri
 ShowVatPayment=KDV ödemesi göster
 TotalToPay=Ödenecek toplam
 BalanceVisibilityDependsOnSortAndFilters=Bakiye bu listede yalnızca tablo %s'da sıralanmışsa ve 1 banka hesabında filtrelenmişse (başka filtre olmadan) görünür
+CustomerAccountancyCodeGeneral=Genel muhasebe kodu
 CustomerAccountancyCode=Müşteri muhasebe kodu
+SupplierAccountancyCodeGeneral=Genel hesap kodu
 SupplierAccountancyCode=Satıcı muhasebe kodu
+UserAccountancyCodeGeneral=Genel hesap kodu
 CustomerAccountancyCodeShort=Müşt. hesap kodu
 SupplierAccountancyCodeShort=Ted. hesap kodu
+UserAccountancyCodeShort=Kullanıcı hesabı kodu
 AccountNumber=Hesap numarası
 NewAccountingAccount=Yeni hesap
 Turnover=Faturalanan ciro
@@ -129,7 +133,9 @@ TurnoverCollected=Toplanan ciro
 SalesTurnoverMinimum=Minimum ciro
 ByExpenseIncome=Giderler ve gelirlere göre
 ByThirdParties=Üçüncü partiye göre
+ByProjects=Projelere göre
 ByUserAuthorOfInvoice=Faturayı yazana göre
+DetailedListLowercase=ayrıntılı liste
 CheckReceipt=Banka cüzdanı
 CheckReceiptShort=Banka cüzdanı
 LastCheckReceiptShort=En son %s ödeme makbuzları
diff --git a/htdocs/langs/tr_TR/contracts.lang b/htdocs/langs/tr_TR/contracts.lang
index 9a2900d2e14..4c69ad2b2cf 100644
--- a/htdocs/langs/tr_TR/contracts.lang
+++ b/htdocs/langs/tr_TR/contracts.lang
@@ -36,10 +36,18 @@ ActivateAllOnContract=Tüm hizmetleri etkinleştir
 CloseAContract=Bir sözleşme kapat
 ConfirmDeleteAContract=Bu sözleşmeyi ve tüm hizmetlerini silmek istediğinizden emin misiniz?
 ConfirmValidateContract=Bu sözleşmeyi <b>%s</b> adıyla doğrulamak istediğinizden emin misiniz?
+ConfirmSignContract=Bu sözleşmeyi imzalanmış olarak ayarlamak için istediğinizden emin misiniz?
+ConfirmUnsignContract=Bu sözleşmeyi imzalanmamış olarak ayarlamak için istediğinizden emin misiniz ?
 ConfirmActivateAllOnContract=Bu, tüm hizmetleri açacaktır (henüz aktif olmayan). Tüm hizmetleri açmak istediğinizden emin misiniz?
 ConfirmCloseContract=Bu, tüm hizmetleri kapatacaktır (süresi dolmuş olsun olmasın). Bu sözleşmeyi kapatmak istediğinizden emin misiniz?
 ConfirmCloseService=Bu hizmeti <b>%s</b> tarihli olarak kapatmak istediğinizden emin misiniz?
 ValidateAContract=Bir sözleşme doğrula
+UnsignContract=Sözleşmeyi imzalama
+ContractSign=İmzalı olarak ayarlı
+ContractUnsign=İmzalanmamış olarak ayarlı
+ContractSignedInDolibarr=Sözleşme imzalandı
+ContractSignedOnline=Sözleşme çevrimiçi imzalandı
+ContractUnsignedInDolibarr=Sözleşme imzalanmamış
 ActivateService=Hizmet etkinleştir
 ConfirmActivateService=Bu hizmeti <b>%s</b>tarihli olarak etkinleştirmek istediğinizden emin misiniz?
 RefContract=Sözleşme referansı
diff --git a/htdocs/langs/tr_TR/datapolicy.lang b/htdocs/langs/tr_TR/datapolicy.lang
index a23c189c255..3df5d4793a5 100644
--- a/htdocs/langs/tr_TR/datapolicy.lang
+++ b/htdocs/langs/tr_TR/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Veri Gizliliği Politikası
 Module4100Desc = Veri Gizliliğini yönetme modülü (GDPR'ye uygunluk)
 # Administration page
 datapolicySetup = Modül Veri Gizliliği Politikası Kurulumu
-Deletion = Verilerin silinmesi
-datapolicySetupPage = Ülkelerinizin yasalarına bağlı olarak (Örnek <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">GDPR'nin 5. Maddesi</a>) kişisel verilerin belirli bir süre saklanması gerekir verilerin, arşivleme amaçları dışında, toplanma amacı için gerekli olduğu süreyi aşmayacak şekilde.<br>Silme işlemi, olaysız belirli bir sürenin (süre) ardından otomatik olarak gerçekleştirilecektir. aşağıda belirtmiş olacaksınız).
+DataDeletion=Verilerin silinmesi
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s ay
 ONE_YEAR = 1 yıl
 NB_YEARS = %s yıl
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Potansiyel Müşteri/Müşteri
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Ne potansiyel müşteri ne de müşteri
 DATAPOLICY_CONTACT_FOURNISSEUR = Tedarikçi
 DATAPOLICY_ADHERENT = Üye
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = İlgili tüm kişilerinize (henüz bir e-posta almamış olan ve GDPR sözleşmesi hakkında hiçbir şey kaydetmediğiniz) bir GDPR e-postası gönderebilirsiniz. Bunu yapmak için aşağıdaki düğmeyi kullanın.
 SendAgreement = Mailleri gönder
 AllAgreementSend = Tüm e-postalar gönderildi
 TXTLINKDATAPOLICYACCEPT = "Anlaşma" bağlantısı metni
 TXTLINKDATAPOLICYREFUSE = "Anlaşmazlık" bağlantısı metni
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR : Kişisel verilerin işlenmesi
 DATAPOLICY_consentement = Kişisel verilerin işlenmesine ilişkin alınan onay
diff --git a/htdocs/langs/tr_TR/deliveries.lang b/htdocs/langs/tr_TR/deliveries.lang
index a0954f93652..740a13e3ae3 100644
--- a/htdocs/langs/tr_TR/deliveries.lang
+++ b/htdocs/langs/tr_TR/deliveries.lang
@@ -6,7 +6,8 @@ DeliveryOrder=Teslimat Makbuzu
 DeliveryDate=Teslim tarihi
 CreateDeliveryOrder=Teslimat makbuzu oluştur
 DeliveryStateSaved=Teslimat durumu kaydedildi
-SetDeliveryDate=Nakliye tarihini ayarla
+SetDeliveryDate=Tahmini teslimat tarihini ayarlayın
+SetShippingDate=Nakliye tarihini ayarla
 ValidateDeliveryReceipt=Teslimat fişini doğrula
 ValidateDeliveryReceiptConfirm=Bu teslimat makbuzunu doğrulamak istediğinizden emin misiniz?
 DeleteDeliveryReceipt=Teslimat fişi sil
diff --git a/htdocs/langs/tr_TR/ecm.lang b/htdocs/langs/tr_TR/ecm.lang
index e1e5f2045d6..3bf8eb6a0b6 100644
--- a/htdocs/langs/tr_TR/ecm.lang
+++ b/htdocs/langs/tr_TR/ecm.lang
@@ -2,10 +2,10 @@
 ECMNbOfDocs=Dizindeki belge sayısı
 ECMSection=Dizin
 ECMSectionManual=Manuel dizin
-ECMSectionAuto=Object directory
-ECMSectionsManual=Manual directories
-ECMSectionsAuto=Object directories
-ECMSectionsMedias=Public medias directories
+ECMSectionAuto=Nesne dizini
+ECMSectionsManual=Manuel dizinler
+ECMSectionsAuto=Nesne dizinleri
+ECMSectionsMedias=Genel medya dizinleri
 ECMSections=Dizinler
 ECMRoot=ECM Kökü
 ECMNewSection=Yeni dizin
@@ -19,7 +19,7 @@ ECMArea=DMS/ECM alanı
 ECMAreaDesc=DMS/ECM (Belge Yönetim Sistemi / Elektronik İçerik Yönetimi) alanı, Dolibarr'daki her türlü belgenin hızlı bir şekilde kaydedilmesine, paylaşılmasına ve aranmasına imkan sağlar.
 ECMAreaDesc2a=* Ağaç yapısının serbest organizasyonu ile belgeleri kaydetmek için manuel dizinler kullanılabilir.
 ECMAreaDesc2b=* Otomatik dizinler, bir öğenin sayfasından belge eklenirken otomatik olarak doldurulur.
-ECMAreaDesc3=* Public directories are files into the subdirectory <b>/medias</b> of the documents directory, readable by everybody on internet with no need to be logged and no need to have the file shared explicitly. It is used to store image files for the emailing or website module for example.
+ECMAreaDesc3=* Genel dizinler, belgeler dizininin <b>/medias</b> alt dizinindeki dosyalardır, internetteki herkes tarafından okunabilir, kayıt tutulmasına veya dosyanın açıkça paylaşılmasına gerek yoktur. Örneğin e-posta veya web sitesi modülü için resim dosyalarını depolamak için kullanılır.
 ECMSectionWasRemoved=<b>%s</b>Dizini silindi.
 ECMSectionWasCreated=<b>%s</b> dizini oluşturuldu.
 ECMSearchByKeywords=Anahtar kelimelere göre ara
@@ -54,3 +54,7 @@ SucessConvertImgWebp=Resimler başarıyla kopyalandı
 SucessConvertChosenImgWebp=Seçilen resim başarıyla kopyalandı
 ECMDirName=Dizin adı
 ECMParentDirectory=Ana Dizin
+ShowFile=Dosyayı göster
+FullPathOrig=Tam yol kökeni
+GenOrUpload=Dosya kökeni
+FileHasAnIndexedTextContent=Dosyanın indekslenmiş bir metin içeriği var
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 3ecd43d9f23..0b4a5fb62cc 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Ek için geçici dizine resim dosyaları
 ErrorFailedToCreateDir=Dizin oluşturulamadı. Web sunucusu kullanıcısının Dolibarr belgeleri dizinine yazma izinlerini denetleyin. Eğer bu parametre <b>guvenli_mod</b> bu PHP üzerinde etkinleştirilmişse, Dolibarr php dosyalarının web sunucusu kullanıcısına (ya da grubuna) sahip olduğunu denetleyin.
 ErrorNoMailDefinedForThisUser=Bu kullanıcı için tanımlı posta yok
 ErrorSetupOfEmailsNotComplete=E-posta kurulumu tamamlanmadı
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Bu özelliğin çalışması için JavaScript'in etkinleştirilmesi gerekiyor. Bunu kurulum - ekranda değiştirin.
 ErrorTopMenuMustHaveAParentWithId0='Üst' menü tipi menünün bir ana menüsü olamaz. Ana menüye 0 koyun ya da 'Sol' menü türünü seçin.
 ErrorLeftMenuMustHaveAParentId='Sol' tipli bir menünün bir üst tanımı olmalıdır.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Dosya gönderme PHP/Apache eklentisi tarafından bloke
 ErrorFileSizeTooLarge=Dosya boyutu çok büyük veya dosya sağlanmadı.
 ErrorFieldTooLong=%s alanı çok uzun.
 ErrorSizeTooLongForIntType=Tam sayı türü için boyut çok uzun (ençok %s ondalık)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Dize türü için boyut çok uzun (ençok %s karakter)
 ErrorNoValueForSelectType=Değer gir ya da liste seç
 ErrorNoValueForCheckBoxType=Lütfen onay kutusu listesi için değer girin
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Güvenlik kodu için hatalı değer. Yeni değer ile tekrar
 ErrorBothFieldCantBeNegative=%s ve %s alanlarının ikisi birden eksi olamaz
 ErrorFieldCantBeNegativeOnInvoice=<strong>%s</strong> alanı bu fatura türünde negatif olamaz. Bir indirim satırı eklemeniz gerekiyorsa, önce indirimi oluşturun (üçüncü taraf kartındaki '%s' alanından) ve bunu faturaya uygulayın.
 ErrorLinesCantBeNegativeForOneVATRate=Satırların toplamı (vergi hariç), boş olmayan belirli bir KDV oranı için negatif olamaz (KDV oranı için negatif bir toplam bulundu <b>%s </b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Bir depozitoda satırlar negatif olamaz. Bunu yaptığınız takdirde son faturadaki depozitoyu tüketmeniz gerektiğinde sorunlarla karşılaşacaksınız.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Müşteri faturasındaki kalem miktarı eksi olamaz
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Web sunucusunu çalıştırmak için kullanılan <b>%s</b> kullanıcı hesabnın bunun için izni yok
 ErrorNoActivatedBarcode=Etkinleştirilmiş barkod türü yok
 ErrUnzipFails=% ZipArchive ile sıkıştırılamıyor
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=İşlenecek çok fazla satır var. Lütfen daha seçici bir filtre kullanın.
 ErrorEmptyValueForQty=Miktar sıfır olamaz.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP'nizdeki upload_max_filesize (%s) parametresi, post_max_size (%s) PHP parametresinden daha yüksek. Bu tutarlı bir kurulum değil.
 WarningPasswordSetWithNoAccount=Bu üye için bir parola ayarlıdır. Ancak, hiçbir kullanıcı hesabı oluşturulmamıştır. Yani bu şifre saklanır ama Dolibarr'a giriş için kullanılamaz. Dış bir modül/arayüz tarafından kullanılıyor olabilir, ama bir üye için ne bir kullanıcı adı ne de parola tanımlamanız gerekmiyorsa "Her üye için bir kullanıcı adı yönet" seçeneğini devre dışı bırakabilirsiniz. Bir kullanıcı adı yönetmeniz gerekiyorsa ama herhangi bir parolaya gereksinim duymuyorsanız bu uyarıyı engellemek için bu alanı boş bırakabilirsiniz. Not: Eğer bir üye bir kullanıcıya bağlıysa kullanıcı adı olarak e-posta adresi de kullanılabilir.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=Bu ebeveyn kimliği artık mevcut değil
 WarningReadBankAlsoAllowedIfUserHasPermission=Uyarı, hesap planını yönetme izniyle banka hesabının okunmasına da izin verilir
 WarningNoDataTransferedInAccountancyYet=Muhasebe tablosunda veri bulunmadığını lütfen not alın. Lütfen uygulamada kayıtlı verilerinizi muhasebe bölümüne aktarın veya muhasebe bölümü dışında kaydedilen verileri analiz etmek için hesaplama modunu değiştirin.
 WarningChangingThisMayBreakStopTaskScheduler=Uyarı, bu değerin değiştirilmesi zamanlayıcıyı devre dışı bırakabilir
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR faturası yalnızca kredi transferi ödemeleriyle ödenecek şekilde ayarlanmış faturalara eklenebilir.
 SwissQrCreditorAddressInvalid = Alacaklı adresi geçersiz (ZIP ve şehir ayarlanmış mı? (%s)
 SwissQrCreditorInformationInvalid = Alacaklı bilgileri IBAN için geçersiz (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s zaten bu tür için ilgili kişi
 ErrorThisGroupIsAlreadyDefinedAsThisType=Bu gruptaki kişiler zaten bu tür için ilgili kişi olarak tanımlandı.
 EmptyMessageNotAllowedError=Boş mesaja izin verilmiyor
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/tr_TR/eventorganization.lang b/htdocs/langs/tr_TR/eventorganization.lang
index 7103982cb8c..08261e04dcf 100644
--- a/htdocs/langs/tr_TR/eventorganization.lang
+++ b/htdocs/langs/tr_TR/eventorganization.lang
@@ -41,7 +41,7 @@ EVENTORGANIZATION_FILTERATTENDEES_TYPE = Katılımcı oluşturma/ekleme formunda
 # Object
 OrganizedEvent=Organize edilen etkinlik
 EventOrganizationConfOrBooth= Konferans Veya Stand
-EventOrganizationConfOrBoothes=Conferences or Booths
+EventOrganizationConfOrBoothes=Konferanslar veya Fuarlar
 ManageOrganizeEvent = Bir etkinliğin organizasyonunu yönetme
 ConferenceOrBooth = Konferans Veya Stand
 ConferenceOrBoothTab = Konferans Veya Stand
@@ -78,7 +78,7 @@ ConferenceOrBoothFormatCode=Konferans veya stand modunun kodu
 ConferenceOrBoothFormatLabel=Konferans veya stand modunun etiketi
 Attendees=Katılımcılar
 ListOfAttendeesOfEvent=Etkinlik projelerine katılanların listesi
-ListOfConfOrBoothOfEvent=List of conferences or booths of event projects
+ListOfConfOrBoothOfEvent=Etkinlik projelerinin konferans veya fuar listesi
 DownloadICSLink = ICS bağlantısını indirin
 EVENTORGANIZATION_SECUREKEY = Bir konferans önermek üzere genel kayıt sayfasının anahtarını güvence altına almak için Seed
 SERVICE_BOOTH_LOCATION = Bir stand konumuyla ilgili fatura satırı için kullanılan hizmet
@@ -114,7 +114,7 @@ EventType = Etkinlik türü
 LabelOfBooth=Stand etiketi
 LabelOfconference=Konferans etiketi
 ConferenceIsNotConfirmed=Kayıt yapılamıyor, konferans henüz onaylanmadı
-EventRegistrationAreClosed=Event registrations are closed
+EventRegistrationAreClosed=Etkinlik kayıtları kapandı
 DateMustBeBeforeThan=%s, %s'dan önce olmalıdır
 DateMustBeAfterThan=%s, %s'dan sonra olmalıdır
 MaxNbOfAttendeesReached=Maksimum katılımcı sayısına ulaşıldı
diff --git a/htdocs/langs/tr_TR/exports.lang b/htdocs/langs/tr_TR/exports.lang
index 7e60a9fac25..ee95722ac41 100644
--- a/htdocs/langs/tr_TR/exports.lang
+++ b/htdocs/langs/tr_TR/exports.lang
@@ -67,7 +67,7 @@ ChooseFormatOfFileToImport=Kullanmak istediğiniz içe aktarma dosya biçimini,
 ChooseFileToImport=Dosyayı yükleyin ve daha sonra bu dosyayı kaynak içe aktarma dosyası olarak seçmek için %s simgesine tıklayın...
 SourceFileFormat=Kaynak dosya biçimi
 FieldsInSourceFile=Kaynak dosyadaki alanlar
-FieldsInTargetDatabase=Dolibarr veritabanındaki hedef alanlar (koyu=zorunlu)
+FieldsInTargetDatabase=Dolibarr veritabanındaki hedef alanlar
 NoFields=Alan sayısı
 MoveField=%s numaralı alan sütununu taşıyın
 ExampleOfImportFile=Iceaktarma_dosya_ornegi
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Check that the file format (field and string delimiters)
 RunSimulateImportFile=İçe Aktarma Simülasyonunu Çalıştır
 FieldNeedSource=Bu alanlar kaynak dosyadan bir veri gerektirir
 SomeMandatoryFieldHaveNoSource=Veri dosyasında, bazı zorunlu alanların kaynağı yok
-InformationOnSourceFile=Kaynak dosya bilgileri
-InformationOnTargetTables=Hedef alan bilgileri
+InformationOnSourceFile=Kaynak dosyası
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=En az bir kaynak alanı dışa aktarılacak alanlar bölümüne koyun
 SelectFormat=Bu içeaktarma dosya biçimini seçin
 RunImportFile=Verileri İçe Aktar
diff --git a/htdocs/langs/tr_TR/holiday.lang b/htdocs/langs/tr_TR/holiday.lang
index cdcc7efbef5..f090ee94708 100644
--- a/htdocs/langs/tr_TR/holiday.lang
+++ b/htdocs/langs/tr_TR/holiday.lang
@@ -41,8 +41,8 @@ TitreRequestCP=İzin isteği
 TypeOfLeaveId=İzin Kimlik türü
 TypeOfLeaveCode=İzin kod türü
 TypeOfLeaveLabel=İzin etiketi türü
-NbUseDaysCP=Kullanılan izin gün sayısı
-NbUseDaysCPHelp=Hesaplamada, sözlükte tanımlanan çalışma dışı günler ve tatiller dikkate alınır.
+NbUseDaysCP=Gün sayısı
+NbUseDaysCPHelp=Kullanılan tatil günü sayısının hesaplanmasında sözlükte tanımlanan çalışılmayan günler ve resmi tatiller dikkate alınmaktadır.
 NbUseDaysCPShort=İzin günleri
 NbUseDaysCPShortInMonth=Aylık izin günleri
 DayIsANonWorkingDay=%s çalışma dışı bir gündür
@@ -101,6 +101,9 @@ AutoValidationOnCreate=Otomatik doğrulama
 FirstDayOfHoliday=İzin talebinin başlangıç günü
 LastDayOfHoliday=İzin talebinin bitiş günü
 HolidaysMonthlyUpdate=Aylık güncelleme
+HolidayMonthlyCredit=Aylık kredi
+HolidayConsumption=Tüketim
+HolidayCreditAfterCancellation=İptalden sonra kredi
 ManualUpdate=Elle güncelleme
 HolidaysCancelation=İzin isteğinin iptali
 EmployeeLastname=Çalışanın soyadı
@@ -154,3 +157,4 @@ ConfirmMassIncreaseHoliday=Toplu izin bakiyesi artışı
 NumberDayAddMass=Seçime eklenecek gün sayısı
 ConfirmMassIncreaseHolidayQuestion=%s seçilen kayıtların tatilini artırmak istediğinizden emin misiniz?
 HolidayQtyNotModified=%s için kalan günlerin bakiyesi değişmedi
+ConsumeHolidaysAtTheEndOfTheMonthTheyAreTakenAt=Tatilleri alındıkları ayın sonunda tüketin
diff --git a/htdocs/langs/tr_TR/hrm.lang b/htdocs/langs/tr_TR/hrm.lang
index f1a44d2a15a..3ae934db2d1 100644
--- a/htdocs/langs/tr_TR/hrm.lang
+++ b/htdocs/langs/tr_TR/hrm.lang
@@ -46,11 +46,11 @@ NewEval=Yeni yeterlilik değerlendirmesi
 ValidateEvaluation=Yetkinlik değerlendirmesini doğrulayın
 ConfirmValidateEvaluation=<b>%s</b> Referanslı yetkinlik değerlendirmesini doğrulamak istediğinizden emin misiniz?
 EvaluationCard=Yetkinlik değerlendirmesi
-RequiredRank=İş profili için gerekli rütbe
-RequiredRankShort=Gerekli rütbe
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Bu iş profillerine sahip pozisyonlar
-EmployeeRank=Bu yetenek için çalışan sıralaması
-EmployeeRankShort=Çalışan sıralaması
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Çalışan pozisyonu
 EmployeePositions=Çalışan pozisyonları
 EmployeesInThisPosition=Bu pozisyondaki çalışanlar
@@ -72,6 +72,9 @@ AddSkill=İş profiline beceri ekleyin
 RequiredSkills=Bu iş profili için gerekli beceriler
 UserRank=Kullanıcı Sıralaması
 SkillList=Beceri listesi
+SkillCreated=%s becerileri oluşturuldu
+SkillRank=Beceri sıralaması
+ShowSkillRank=Beceri sıralamasını göster
 SaveRank=Sıralamayı kaydet
 TypeKnowHow=Bilgi birikimi
 TypeHowToBe=Nasıl olunur
@@ -95,3 +98,5 @@ NeedBusinessTravels=İş seyahatlerine ihtiyacım var
 NoDescription=Açıklama yok
 TheJobProfileHasNoSkillsDefinedFixBefore=Bu çalışanın değerlendirilen iş profilinde tanımlanmış bir beceri yoktur. Lütfen beceri(ler) ekleyin, ardından silin ve değerlendirmeyi yeniden başlatın.
 PDFStandardHrmEvaluation=Yetkinlik değerlendirmesi için PDF belgesi oluşturmaya yönelik standart şablon
+SkillNotRequired=Beceri gerektirmiyor
+LinkToUserCreated=Başvuru sahibi işe alınmış ve kullanıcıya dönüştürülmüşse bir çalışana bağlantı verin.
diff --git a/htdocs/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang
index 8c9c120cbc4..bd04fe4d505 100644
--- a/htdocs/langs/tr_TR/install.lang
+++ b/htdocs/langs/tr_TR/install.lang
@@ -217,3 +217,4 @@ FunctionTest=Fonksiyon testi
 NodoUpgradeAfterDB=Veritabanının yükseltilmesinden sonra harici modüller tarafından herhangi bir işlem talep edilmedi
 NodoUpgradeAfterFiles=Dosya veya dizinlerin yükseltilmesinden sonra harici modüller tarafından herhangi bir işlem istenmiyor
 MigrationContractLineRank=Sıralamayı kullanmak için Sözleşme Satırını Taşıyın (ve Yeniden Sıralamayı etkinleştirin)
+MigrationProductLotPath=Ürün Toplu Dosyaları yolunu taşı
diff --git a/htdocs/langs/tr_TR/interventions.lang b/htdocs/langs/tr_TR/interventions.lang
index f20cc36baff..31eff69cfca 100644
--- a/htdocs/langs/tr_TR/interventions.lang
+++ b/htdocs/langs/tr_TR/interventions.lang
@@ -13,15 +13,15 @@ CreateDraftIntervention=Taslak oluştur
 InterventionContact=Müdahale ilgilisi
 DeleteIntervention=Müdahale sil
 ValidateIntervention=Müdahale doğrula
-SignIntervention=Müdahale işareti
-UnsignIntervention=Unsign intervention
+SignIntervention=Müdahaleyi imzala
+UnsignIntervention=İmzalanmamış müdahale
 ModifyIntervention=Müdahale değiştir
 CloseIntervention=Yakın müdahale
 DeleteInterventionLine=Müdahale satırı sil
 ConfirmDeleteIntervention=Bu müdahaleyi silmek istediğinizden emin misiniz?
 ConfirmValidateIntervention=Bu müdahaleyi <b>%s</b> adıyla doğrulamak istediğinizden emin misiniz?
-ConfirmSignIntervention=Are you sure you want to set this intervention as signed ?
-ConfirmUnsignIntervention=Are you sure you want to set this intervention as unsigned ?
+ConfirmSignIntervention=Bu müdahaleyi imzalanmış olarak ayarlamak için istediğinizden emin misiniz?
+ConfirmUnsignIntervention=Bu müdahaleyi imzalanmamış olarak ayarlamak için istediğinizden emin misiniz ?
 ConfirmModifyIntervention=Bu müdahaleyi değiştirmek istediğinizden emin misiniz?
 ConfirmCloseIntervention=Bu müdahaleyi kapatmak istediğinizden emin misiniz?
 ConfirmDeleteInterventionLine=Bu müdahale satırını silmek istediğinizden emin misiniz?
@@ -33,15 +33,15 @@ InterventionCardsAndInterventionLines=Müdahalelere ait müdahaleler ve satırla
 InterventionClassifyBilled="Faturalandı" olarak sınıflandır
 InterventionClassifyUnBilled="Faturalanmadı" olarak sınıflandır
 InterventionClassifyDone="Tamamlandı" olarak sınıflandır
-InterventionSign=Set Signed
-InterventionUnsign=Set Unsigned
+InterventionSign=İmzalı olarak ayarlı
+InterventionUnsign=İmzalanmamış olarak ayarlı
 SendInterventionRef=%s müdahalesinin sunulması
 SendInterventionByMail=Müdahaleyi e-posta ile gönder
 InterventionCreatedInDolibarr=Oluşturulan müdahale %s
 InterventionValidatedInDolibarr=Doğrulanan müdahale %s
 InterventionSignedInDolibarr=Müdahale imzalandı
-InterventionSignedOnline=Intervention signed online
-InterventionUnsignedInDolibarr=Intervention unsigned
+InterventionSignedOnline=Müdahale çevrimiçi imzalandı
+InterventionUnsignedInDolibarr=Müdahale imzasız
 InterventionModifiedInDolibarr=Değiştirilen müdahale %s
 InterventionClassifiedBilledInDolibarr=Faturalandı olarak ayarlanan müdahale %s
 InterventionClassifiedUnbilledInDolibarr=Faturalanmadı olarak ayarlanan müdahale %s
@@ -85,3 +85,4 @@ TypeContact_fichinter_internal_INTERVENING=Müdahaleci
 TypeContact_fichinter_external_BILLING=Müdahale faturalandırmasında müşteri iletişim bilgileri
 TypeContact_fichinter_external_CUSTOMER=Müşteri iletişim müdahale takibi
 NotARecurringInterventionalTemplate=Tekrarlanan bir müdahale şablonu değil
+ShowInterventionModel=Müdahale modelini göster
diff --git a/htdocs/langs/tr_TR/intracommreport.lang b/htdocs/langs/tr_TR/intracommreport.lang
index ac5480f3a97..22a25e04a11 100644
--- a/htdocs/langs/tr_TR/intracommreport.lang
+++ b/htdocs/langs/tr_TR/intracommreport.lang
@@ -1,5 +1,5 @@
 IntraCommReport=Dahili iletişim raporu
-IntraCommReports=Intracomm reports
+IntraCommReports=Intracomm raporları
 
 Module68000Name = Dahili iletişim raporu
 Module68000Desc = Dahili iletişim raporu yönetimi (Fransız DEB/DES formatı desteği)
@@ -35,4 +35,4 @@ IntracommReportTypeDeclaration=Beyan türü
 IntracommReportDownload=XML dosyasını indir
 # Invoice
 IntracommReportTransportMode=Taşıma modu
-DeleteIntraCommReport=Delete IntraComm report
+DeleteIntraCommReport=IntraComm raporunu sil
diff --git a/htdocs/langs/tr_TR/languages.lang b/htdocs/langs/tr_TR/languages.lang
index b07e6267d0f..fa362b167da 100644
--- a/htdocs/langs/tr_TR/languages.lang
+++ b/htdocs/langs/tr_TR/languages.lang
@@ -1,10 +1,12 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_am_ET=Etiyopyaca
 Language_af_ZA=Afrikanca (Güney Afrika)
+Language_ar_AE=Arapça (Arap Emirlikleri)
 Language_ar_AR=Arapça
 Language_ar_DZ=Arapça (Cezayir)
 Language_ar_EG=Arabça (Mısır)
 Language_ar_JO=Arapça (Ürdün)
+Language_ar_LB=Arapça (Lübnan)
 Language_ar_MA=Arapça (Fas)
 Language_ar_SA=Arapça (Suudi Arabistan)
 Language_ar_TN=Arapça (Tunus)
@@ -70,6 +72,7 @@ Language_fr_FR=Fransızca
 Language_fr_GA=Fransızca (Gabon)
 Language_fr_NC=Fransızca (Yeni Kaledonya)
 Language_fr_SN=Fransızca (Senegal)
+Language_fr_TN=Fransızca (Tunus)
 Language_fy_NL=Frizyanca
 Language_gl_ES=Galiçyaca
 Language_he_IL=İbranice
@@ -122,6 +125,7 @@ Language_uk_UA=Ukraynaca
 Language_ur_PK=Urduca
 Language_uz_UZ=Özbekçe
 Language_vi_VN=Vietnamca
+Language_wo_SN=Wolof
 Language_zh_CN=Çince
 Language_zh_TW=Çince (Tayvan)
 Language_zh_HK=Çince (Hong Kong)
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index c53c038ab01..7ca2857d1d3 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=E-postalama
 EMailing=E-postalama
-EMailings=E-postalamalar
+EMailings=Mass EMails
 SMSings=SMS'ler
-AllEMailings=Tüm e-postalar
+AllEMailings=All mass eMails
 MailCard=E-posta kartı
 MailRecipients=Alıcılar
 MailRecipient=Alıcı
@@ -26,19 +26,19 @@ MailFile=Ekli dosyalar
 MailMessage=E-posta gövdesi
 SubjectNotIn=Konuda Değil
 BodyNotIn=Vücutta Değil
-ShowEMailing=E-posta göster
-ListOfEMailings=E-posta listesi
-NewMailing=Yeni e-posta
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Yeni SMS
-EditMailing=E-posta düzenle
-ResetMailing=E-postayı yeniden gönder
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=E-posta sil
-PreviewMailing=E-posta önizlemesi
-CreateMailing=E-posta oluştur
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=E-posta doğrula
+ValidMailing=Valid mass Email
 MailingStatusDraft=Taslak
 MailingStatusValidated=Doğrulanmış
 MailingStatusSent=Gönderildi
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Bir e-postanın toplanması için tüm filtrelerin eşl
 LineInFile=Satır %s dosyası
 RecipientSelectionModules=Alıcıların seçimine göre tanımlanmış istekler
 MailSelectedRecipients=Seçilen alıcılar
-MailingArea=E-postalama alanı
-LastMailings=En son %s e-posta
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Hedef istatistikleri
 NbOfCompaniesContacts=Benzersiz kişiler/adresler
 MailNoChangePossible=Doğrulanmış e-postaların alıcıları değiştirilemez
-SearchAMailing=Eposta ara
-SendMailing=E-posta gönder
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Gönderen
 AdvancedAlternative=Gelişmiş alternatif
 MailingNeedCommand=Bir e-posta gönderimi komut satırından gerçekleştirilebilir. E-postayı tüm alıcılara göndermek için sunucu yöneticinizden aşağıdaki komutu başlatmasını isteyin:
 MailingNeedCommand2=Bunula birlikte, oturum tarafından gönderilecek ençok e-posta sayılı MAILING_LIMIT_SENDBYWEB parametresini ekleyerek çevrim içi olarak gönderebilirsiniz. Bunu için Giriş-Kurulum-Diğer menüsüne gidin.
 ConfirmSendingEmailing=Direkt olarak bu ekrandan e-posta göndermek istiyorsanız, lütfen e-postayı tarayıcınızdan şimdi göndermek istediğinizden emin olduğunuzu onaylayın.
-LimitSendingEmailing=Not: Web arayüzünden e-posta gönderimi, güvenlik ve süre aşımı nedenlerinden dolayı birkaç defada gerçekleştirilir, her gönderim girişiminde tek seferde <b>%s</b> alıcıya gönderim yapılır.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Listeyi temizle
 ToClearAllRecipientsClickHere=Bu e-posta alıcı listesini temizlemek için burayı tıkla
 ToAddRecipientsChooseHere=Listeden seçerek alıcıları ekle
-NbOfEMailingsReceived=Alınan toplu e-postalar
-NbOfEMailingsSend=Gönderilen toplu e-postalar
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=Kimlik kayıtı
 DeliveryReceipt=Teslimat Onayı
 YouCanUseCommaSeparatorForSeveralRecipients=Birçok alıcı belirtmek için <b>virgül</b> ayırıcısını kullanabilirsiniz.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Bu etkinlik türü ve şirket için otomatik e-posta b
 ANotificationsWillBeSent=1 otomatik bildirim e-postayla gönderilecek
 SomeNotificationsWillBeSent=%s otomatik bildirimler e-postayla gönderilecek
 AddNewNotification=Yeni bir otomatik e-posta bildirimine abone olun (hedef/etkinlik)
-ListOfActiveNotifications=Otomatik e-posta bildirimi için aktif abonelikler (hedefler/olaylar)
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Otomatik e-posta bildirimleri gönderildi
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=E-posta gönderme yapılandırması '%s'ye ayarlandı. Bu mod toplu e-postalama için kullanılamaz.
 MailSendSetupIs2='%s' Modunu kullanmak için <strong>'%s'</strong> parametresini değiştirecekseniz, önce yönetici hesabı ile %sGiriş - Ayarlar - E-postalar%s menüsüne gitmelisiniz. Bu mod ile İnternet Servis Sağlayıcınız tarafından sağlanan SMTP sunucusu ayarlarını girebilir ve Toplu e-posta özelliğini kullanabilirsiniz.
 MailSendSetupIs3=SMTP sunucusunun nasıl yapılandırılacağı konusunda sorunuz varsa, %s e sorabilirsiniz.
@@ -183,7 +185,7 @@ Information=Bilgi
 ContactsWithThirdpartyFilter=Üçüncü parti filtreli kişiler
 Unanswered=Cevapsız
 Answered=Cevaplandı
-IsNotAnAnswer=Cevap yok (ilk e-posta)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=İlk e-postanın yanıtıdır
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Yeni bir kişi oluştururken '%s' alanı için varsayılan değer
@@ -199,6 +201,6 @@ ModelTemplate=E-posta şablonu
 YouCanChooseAModelForYouMailContent= Şablon modellerinden birini seçebilir veya AI ile bir tane oluşturabilirsiniz.
 TitleOfMailHolder=E-postanın başlığı buraya gelecek
 ContentOfMailHolder=E-postanın içeriği buraya gelecek...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index e9bfbb51989..40d86bc8a16 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -37,6 +37,7 @@ Translation=Çeviri
 Translations=Çeviriler
 CurrentTimeZone=PHP Saat Dilimi (sunucu)
 EmptySearchString=Boş olmayan arama kriterlerini girin
+EnterNonEmptyLinesFirst=önce boş olmayan satırları girin
 EnterADateCriteria=Bir tarih kriteri girin
 NoRecordFound=Kayıt bulunamadı
 NoRecordDeleted=Hiç kayıt silinmedi
@@ -45,6 +46,7 @@ NoError=Hata yok
 Error=Hata
 Errors=Hatalar
 ErrorFieldRequired='%s' Alanı gereklidir.
+CustomMandatoryFieldRule=Özel "Zorunlu alan" kuralı
 ErrorFieldFormat=%s' Alanı değeri hatalı.
 ErrorFileDoesNotExists='%s' Dosyası yok
 ErrorFailedToOpenFile='%s' Dosyası açılamadı
@@ -308,6 +310,7 @@ DateBuild=Oluşturma tarihi raporu
 DatePayment=Ödeme tarihi
 DateApprove=Onaylama tarihi
 DateApprove2=Onaylama tarihi (ikinci onaylama)
+PendingSince=Buradan beri beklemede olan
 RegistrationDate=Kayıt tarihi
 UserCreation=Oluşturan kullanıcı
 UserModification=Değiştiren kullanıcı
@@ -354,7 +357,7 @@ MinuteShort=ay
 SecondShort=saniye
 DayShort=g
 MonthShort=Metre
-YearShort=y
+YearShort=ve
 Rate=Oran
 CurrencyRate=Para birimi çevirme oranı
 UseLocalTax=Vergi dahil
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Başlayacak
 ActionRunningShort=Devam etmekte
 ActionDoneShort=Bitti
 ActionUncomplete=Tamamlanmamış
-LatestLinkedEvents=Bununla bağlantılı son %s etkinlik
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Firma/Kuruluş
 Accountant=Muhasebeci
 ContactsForCompany=Bu üçüncü partinin kişileri
@@ -503,7 +506,7 @@ ContactsAddressesForCompany=Bu üçüncü partinin kişleri/adresleri
 AddressesForCompany=Bu üçüncü partinin adresleri
 ActionsOnCompany=Bu üçüncü taraf için etkinlikler
 ActionsOnContact=Bu kişi/adres için etkinlikler
-ActionsOnUser=Events for this user
+ActionsOnUser=Bu kullanıcı için etkinlikler
 ActionsOnContract=Bu sözleşme için etkinlikler
 ActionsOnMember=Bu üye hakkındaki etkinlikler
 ActionsOnProduct=Bu ürünle ilgili etkinlikler
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=E-posta gövdesi
 SendAcknowledgementByMail=Onay e-postası gönder
 SendMail=E-posta gönder
 Email=E-posta
+EMail=E-posta
+EMails=E-postalar
 NoEMail=E-posta yok
 AlreadyRead=Zaten okundu
 NotRead=Okunmamış
@@ -793,7 +798,7 @@ Notes=Notlar
 AddNewLine=Yeni satır ekle
 AddFile=Dosya ekle
 FreeZone=Serbest metin ürünü
-FreeLineOfType=Serbest metin öğesi, tür:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Ana öznitelikleri ile birlikte nesnenin kopyasını oluştur.
 ReGeneratePDF=PDF'yi yeniden oluştur
 PDFMerge=PDF Birleştir
@@ -879,12 +884,14 @@ toward=yönünde
 Access=Erişim
 SelectAction=Eylem seç
 SelectTargetUser=Hedef kullanıcı/çalışan seçin
+ClickToCopyToClipboard=Panoya kopyalamak için tıklayın
 HelpCopyToClipboard=Panoya kopyalamak için Crtl+C
 SaveUploadedFileWithMask=Dosyayı sunucuya "<strong>%s</strong>" adıyla kaydedin (aksi takdirde "%s" kullanılacaktır)
 OriginFileName=Özgün dosya adı
 SetDemandReason=Kaynağı ayarlayın
 SetBankAccount=Banka Hesabı Tanımla
 AccountCurrency=Hesap para birimi
+AccountancyCode=Muhasebe Kodu
 ViewPrivateNote=Notları izle
 XMoreLines=%s gizli satır
 ShowMoreLines=Daha fazla/az satır göster
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Seçilen %s kaydı silmek istediğinizden emin misin
 ConfirmMassClone=Toplu klon onayı
 ConfirmMassCloneQuestion=Klonlanacak projeyi seçin
 ConfirmMassCloneToOneProject=%s projesine kopyala
+ObjectClonedSuccessfuly=Nesne başarıyla klonlandı
 RelatedObjects=İlgili Nesneler
 ClassifyBilled=Faturalandırılanları Sınıflandır
 ClassifyUnbilled=Faturalandırılmayanları Sınıflandır
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Dosyayı görüntülemek veya indirmek için oturum açm
 Download=İndir
 DownloadDocument=Belgeyi indir
 DownloadSignedDocument=İmzalı belgeyi indir
-ActualizeCurrency=Para birimini güncelle
+ActualizeCurrency=Para biriminin bilinen son kurunu kullanın
 Fiscalyear=Mali yıl
 ModuleBuilder=Modül ve Uygulama Oluşturucu
 SetMultiCurrencyCode=Para birimini ayarla
+SetMultiCurrencyRate=Döviz kurunu ayarlayın
 BulkActions=Toplu eylemler
 ClickToShowHelp=Araç ipucu yardımını göstermek için tıklayın
 WebSite=Web sitesi
@@ -1104,6 +1113,7 @@ PayedBy=Ödeyen
 PayedTo=Ödenen
 Monthly=Aylık
 Quarterly=Üç aylık
+Quarter=Çeyrek
 Annual=Yıllık
 Local=Yerel
 Remote=Uzak
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Görev
 ContactDefault_propal=Teklif
 ContactDefault_supplier_proposal=Tedarikçi Teklifi
 ContactDefault_ticket=Destek Bildirimi
+ContactDefault_societe=Üçüncü parti
 ContactAddedAutomatically=Üçüncü taraf kişi rollerinden eklenen kişi
 More=Daha
 ShowDetails=Detayları göster
@@ -1189,7 +1200,7 @@ CreateExternalUser=Harici kullanıcı oluştur
 ConfirmAffectTag=Toplu etiket Ödevi
 ConfirmAffectUser=Toplu Kullanıcı Ataması
 ContactRole=İlgili kişi rolü
-ContactRoles=Contact roles
+ContactRoles=İletişim rolleri
 ProjectRole=Her projeye/fırsata atanan rol
 TasksRole=Her göreve atanan rol (kullanılıyorsa)
 ConfirmSetSupervisor=Toplu Denetleyici Seti
@@ -1242,6 +1253,7 @@ CommercialAffected=Satış temsilcisi atandı
 CommercialsDisaffected=Satış temsilcilerinin bağlantısı kaldırıldı
 CommercialDisaffected=Satış temsilcisinin bağlantısı kaldırıldı
 Message=Mesaj
+Emailing=Emailing
 Progression=İlerleme
 YourMessage=Mesajın
 YourMessageHasBeenReceived=Mesajınız alındı. En kısa sürede size cevap vereceğiz veya sizinle iletişime geçeceğiz.
@@ -1285,7 +1297,7 @@ AmountSalary=Maaş tutarı
 InvoiceSubtype=Fatura alt türü
 ConfirmMassReverse=Toplu Ters onay
 ConfirmMassReverseQuestion=%s seçili kayıtları tersine çevirmek istediğinizden emin misiniz?
-ConfirmActionXxx=Confirm action %s
+ConfirmActionXxx=İşlemi onaylayın %s
 ElementType=Eleman türü
 ElementId=Öğe Kimliği
 Encrypted=Şifreli
@@ -1305,4 +1317,35 @@ AllEntities=Tüm varlıklar
 TranslationOfKey=AnyTranslationKey anahtarının çevirisi
 SignedStatus=İmza durumu
 NbRecordQualified=Nitelikli kayıt sayısı
-auto=auto
+auto=otomatik
+UploadFile=Belgenin doğrudan içe aktarılması
+OrClickToSelectAFile=veya diskteki bir dosyayı seçmek için tıklayın
+NetTotal=Net toplam
+VATAmount=KDV tutarı
+TotalDiscount=Toplam indirim
+TotalHTBeforeDiscount=İndirimden önce net toplam
+Contains=İçerir
+DoesNotContain=İçermez
+Is=Doğru
+IsNot=Değil
+StartsWith=Bununla başlar
+EndsWith=Bununla biter
+IsBefore=Önce mi
+IsAfter=Sonra mı
+IsOnOrBefore=Önce veya eşit
+IsOnOrAfter=Sonra mı yoksa eşit mi?
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Ekle
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Başlangıçtan
+Transferred=Transferred
diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
index 85719072744..92a5ca9c6eb 100644
--- a/htdocs/langs/tr_TR/members.lang
+++ b/htdocs/langs/tr_TR/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Abonelik gerekiyorsa, üyenin güncel bilgileri alabilm
 DeleteType=Sil
 VoteAllowed=Oylamaya izin verildi
 Physical=Bireysel
-Moral=şirket
-MorAndPhy=Kurumsal ve Bireysel
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Yeniden etkinleştir
 ExcludeMember=Bir üyeyi hariç tut
 Exclude=Hariç tutmak
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Bölgeye göre üye istatistikleri
 NbOfMembers=Toplam üye sayısı
 NbOfActiveMembers=Mevcut aktif üyelerin toplam sayısı
 NoValidatedMemberYet=Doğrulanmamış üye bulunmadı
-MembersByCountryDesc=Bu ekran size ülkelere göre üyelerin istatistiklerini gösterir. Grafikler ve çizelgeler, çalışan bir internet bağlantısının yanı sıra Google çevrimiçi grafik hizmetinin kullanılabilirliğine de bağlıdır.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Bu ekran size eyalet/il/kanton bazında üyelerin istatistiklerini gösterir.
 MembersByTownDesc=Bu ekran size şehirlere göre üyelerin istatistiklerini gösterir.
 MembersByNature=Bu ekran size üyelerin niteliklerine göre istatistiklerini gösterir.
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index 27e41bff8d1..4c53ac54c0a 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -97,7 +97,6 @@ ShowService=Hizmet göster
 ProductsAndServicesArea=Ürün ve Hizmet alanı
 ProductsArea=Ürün alanı
 ServicesArea=Hizmet alanı
-ListOfStockMovements=Stok hareketleri listesi
 BuyingPrice=Alış fiyatı
 PriceForEachProduct=Özel fiyatlı ürünler
 SupplierCard=Tedarikçi kartı
@@ -172,7 +171,7 @@ BuyingPrices=Alış fiyatları
 CustomerPrices=Müşteri fiyatları
 SuppliersPrices=Tedarikçi fiyatları
 SuppliersPricesOfProductsOrServices=Tedarikçi fiyatları (ürün veya hizmetlerin)
-CustomCode=Gümrük|Emtia|HS kodu
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Menşei ülke
 RegionStateOrigin=Menşei Bölge
 StateOrigin=Eyalet|Menşe ili
@@ -210,6 +209,7 @@ unitL=Litre
 unitT=ton
 unitKG=kg
 unitG=Gram
+unitGAL=galon
 unitMG=miligram
 unitLB=pound
 unitOZ=ons
@@ -312,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=İstek için format {"URL": "http://example.com
 UpdateInterval=Güncelleme aralığı (dakika)
 LastUpdated=Son güncelleme
 CorrectlyUpdated=Doru olarak güncellendi
-PropalMergePdfProductActualFile=PDF Azur'a eklenmek için kullanılacak dosya/lar
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=PDF dosyası seç
 IncludingProductWithTag=etiket içeren ürünler/hizmetler dahil
 DefaultPriceRealPriceMayDependOnCustomer=Varsayılan fiyat, gerçek fiyat müşteriye bağlı olabilir
@@ -349,6 +349,10 @@ QtyRecalculatedWithPackaging=Tedarikçi ambalajına göre hat miktarı yeniden h
 
 #Attributes
 Attributes=Öznitelikleri
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Değişken öznitelikleri
 ProductAttributes=Ürünler için değişken öznitelikleri
 ProductAttributeName=Değişken özniteliği %s
@@ -396,6 +400,8 @@ ErrorDestinationProductNotFound=Hedef ürün bulunamadı
 ErrorProductCombinationNotFound=Ürün değişkeni bulunamadı
 ActionAvailableOnVariantProductOnly=Eylem yalnızca ürün değişkeninde mevcuttur
 ProductsPricePerCustomer=Müşteri başına ürün fiyatları
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Ek Nitelikler (Tedarikçi Fiyatları)
 DeleteLinkedProduct=Kombinasyonla bağlantılı alt ürünü silin
 AmountUsedToUpdateWAP=Ağırlıklı Ortalama Fiyatı güncellemek için kullanılacak birim tutar
@@ -437,3 +443,6 @@ AllowStockMovementVariantParentHelp=Varsayılan olarak bir varyantın üst öğe
 ConfirmSetToDraftInventory=Taslak durumuna geri dönmek istediğinizden emin misiniz?<br>Envanterde halihazırda ayarlanmış olan miktarlar sıfırlanacak.
 WarningLineProductNotToSell="%s" ürünü veya hizmeti satılmayacaktır ve kopyalanmıştır
 PriceLabel=Fiyat etiketi
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/tr_TR/salaries.lang b/htdocs/langs/tr_TR/salaries.lang
index caff35e9e5c..56df445f2b4 100644
--- a/htdocs/langs/tr_TR/salaries.lang
+++ b/htdocs/langs/tr_TR/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Yeni maaş
 AddSalary=Maaş ekle
 NewSalaryPayment=Yeni maaş kartı
 AddSalaryPayment=Maaş ödemesi ekle
+SalaryID=Salary ID
+SalaryAmount=Maaş tutarı
 SalaryPayment=Maaş ödemesi
 SalariesPayments=Maaş ödemeleri
 SalariesPaymentsOf=%s'nin maaş ödemeleri
@@ -27,7 +29,7 @@ FillFieldFirst=Önce çalışan alanını doldurun
 UpdateAmountWithLastSalary=Son maaş tutarını belirleyin
 MakeTransferRequest=Aktarım talebinde bulunun
 VirementOrder=Kredi transferi talebi
-BankTransferAmount=Kredi transferi tutarı
 WithdrawalReceipt=Kredi transferi talimatı
 OrderWaiting=Bekleyen sipariş
 FillEndOfMonth=Ay sonu ile doldurun
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang
index 0570e64714e..39b78f28140 100644
--- a/htdocs/langs/tr_TR/website.lang
+++ b/htdocs/langs/tr_TR/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Buradaki diğer ad/takma ad listesini kullanın, böylece s
 WEBSITE_CSS_URL=Dış CSS dosyası URL si
 WEBSITE_CSS_INLINE=CSS dosya içeriği (tüm sayfalarda ortak)
 WEBSITE_JS_INLINE=JavaScript dosya içeriği (tüm sayfalarda ortak)
-WEBSITE_HTML_HEADER=HTML Başlığının alt kısmına ekleme (tüm sayfalarda ortak)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot dosyası (robots.txt)
 WEBSITE_HTACCESS=Web sitesinin .htaccess dosyası
 WEBSITE_MANIFEST_JSON=Web sitesi manifest.json dosyası
@@ -56,16 +56,17 @@ ReadPerm=Okundu
 WritePerm=Yaz
 TestDeployOnWeb=Web'de dene/yayınla
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=Harici web sunucusu tarafından sunulan sanal host URL'si tanımlanmamış
 NoPageYet=Henüz hiç sayfa yok
 YouCanCreatePageOrImportTemplate=Yeni bir sayfa oluşturabilir veya tam bir web sitesi şablonunu içe aktarabilirsiniz
 SyntaxHelp=Belirli sözdizimi ipuçları hakkında yardım
 YouCanEditHtmlSourceckeditor=Düzenleyicideki "Kaynak" düğmesini kullanarak HTML kaynak kodunu düzenleyebilirsiniz
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Bir  eklemek için <strong>resim</strong>, <strong>belgeler</strong> dizininde depolanır , <strong>viewimage.php</strong> sarmalayıcısını kullanın.<br>Örnek, şunun için: belgelere/medyalara bir resim (genel erişim için açık dizin), sözdizimi şöyledir:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt; </strong><br>
-YouCanEditHtmlSource2=Bir paylaşım bağlantısıyla paylaşılan bir resim için (dosyanın paylaşım karma anahtarını kullanarak açık erişim), söz dizimi şöyledir:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong> <br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=Bir PHP nesnesinin görüntüsünün URL'sini almak için, <br><strong>&lt;&lt;&lt;&lt;<strong>&lt;&lt;&lt; komutunu kullanın. span>img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Daha fazla HTML veya dinamik kod örneğini <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">wiki belgelerinde</a> bulabilirsiniz >.<br>
 ClonePage=Sayfa/kapsayıcı kopyasını oluştur
 CloneSite=Sitenin kopyasını oluştur
@@ -87,15 +88,15 @@ WebsiteAccount=Web sitesi hesabı
 WebsiteAccounts=Web sitesi hesapları
 AddWebsiteAccount=Web sitesi hesabı oluştur
 BackToListForThirdParty=Üçüncü şahıslar için listeye geri dön
-DisableSiteFirst=Önce web sitesini devre dışı bırak
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Web sitemin başlığı
 AnotherContainer=Bu, başka bir sayfanın/kapsayıcının içeriğini nasıl ekleyeceğinizdir (katıştırılmış alt kapsayıcı mevcut olmayabileceğinden dinamik kodu etkinleştirirseniz burada bir hatayla karşılaşabilirsiniz)
 SorryWebsiteIsCurrentlyOffLine=Üzgünüz, bu web sitesi şu anda çevrimdışı. Lütfen daha sonra tekrar gelin...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Web sitesi hesap tablosunu etkinleştir
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Her web sitesi/üçüncü taraf için web sitesi hesaplarını (oturum açma/şifre) depolamak üzere tabloyu etkinleştirin
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Öncelikle varsayılan Giriş sayfasını tanımlamanız gerekir
-OnlyEditionOfSourceForGrabbedContentFuture=Uyarı: Harici bir web sayfasını içe aktararak web sayfası oluşturmak deneyimli kullanıcılara ayrılmıştır. Kaynak sayfanın karmaşıklığına bağlı olarak içe aktarmanın sonucu orijinalden farklı olabilir. Ayrıca kaynak sayfada ortak CSS stilleri veya çakışan JavaScript kullanılıyorsa, bu sayfada çalışırken Web Sitesi düzenleyicisinin görünümü veya özellikleri bozulabilir. Bu yöntem, sayfa oluşturmanın daha hızlı bir yoludur ancak yeni sayfanızı sıfırdan veya önerilen sayfa şablonundan oluşturmanız önerilir.<br>Satır içi düzenleyicinin çalışmayabileceğini de unutmayın. Yakalanan harici bir sayfada kullanıldığında doğruluk.
-OnlyEditionOfSourceForGrabbedContent=İçerik harici bir siteden alındığında yalnızca HTML kaynağının sürümü mümkündür
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Ayrıca css ve sayfada bulunan görselleri de alın.
 ImagesShouldBeSavedInto=Görüntüler dizine kaydedilmelidir
 WebsiteRootOfImages=Web sitesi görüntü dosyaları için kök dizin
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Müşteri hesabınızdan çıkış yapın
 filteredByVersion=Sürüme göre filtrelendi
 removeFilter=Süzgeç kaldır
 viewMyCart=Alışveriş sepetimi görüntüle
+Shipping=Shipping
 freeShipping=Ücretsiz kargo!
 noProducts=Hiç ürün yok
 nbrItemsInCart=Sepetinizde <span class="ajax_cart_quantity">0</span> ürün var.
@@ -284,12 +286,13 @@ productNameAToZ=Ürün Adı: A'dan Z'ye
 productNameZToA=Ürün Adı: Z'den A'ya
 referenceLowestFirst=Referans: Önce en düşük
 referenceHighestFirst=Referans: Önce en yüksek
+productPerPage=products per page
 perPage=Sayfa başına
 showAll=Hepsini Göster
 showing= Gösterilen
 nbrOfProducts= %s ürün var.
 noResultsHaveBeenFound=0 sonuç bulundu.
-noResultsWereFound= Hiçbir sonuç bulunamadı.
+noResultsWereFound=Hiçbir sonuç bulunamadı.
 addToCart=Sepete ekle
 backHome=Başa Dön
 priceDrop=Fiyat indirimi
@@ -302,10 +305,11 @@ lastUpdate=Son Güncelleme
 contactSupport=Destek ekibiyle nasıl iletişime geçilir?
 noProductToDisplay=Hata, Görüntülenecek ürün yok
 yourCompanyInformation=Şirket bilgileriniz
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=Bu e-posta zaten kayıtlı.
 firstnameContainsLettersOnly=<b>Ad</b> yalnızca harf ve boşluk içermelidir
 lastnameContainsLettersOnly=<b>Soyadı</b> yalnızca harf ve boşluk içermelidir
-passwordCriteria=<b>Parola</b> aşağıdaki kriterleri karşılamalıdır:<br>- 12 karakter<br>- 1 büyük harf<br>- 1 rakam<br>- Özel karakter yok<br>- Karakterleri 3 defadan fazla tekrarlamaktan kaçının<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=Bir hata oluştu.
 accountCreation=Bir hesap oluştur
 errorsOccurred=%s Hata var%s
@@ -357,3 +361,7 @@ subtract=Çıkar
 LoginCheckout=Giriş Yapın ve Ödemeyi sürdürün
 paymentSuccessProcessed=Ödemeniz başarıyla işlendi.
 youWillBeRedirectedToOrderPage=Kısa süre içinde sipariş ayrıntıları sayfasına yönlendirileceksiniz.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 04bed7ced27..6c56939f187 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Файли пройшли перевірку,
 FileIntegritySomeFilesWereRemovedOrModified=Перевірка цілісності провалена! Деякі файли було змінено, видалено або додано.
 GlobalChecksum=Загальна контрольна сума
 MakeIntegrityAnalysisFrom=Виконати перевірку цілісності файлів програми з
-LocalSignature=Вбудовані локальні сигнатури (менш надійно)
-RemoteSignature=Віддалені сигнатури (більш надійно)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Втрачені файли
 FilesUpdated=Оновлені файли
 FilesModified=Змінені файли
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Використовується лише для деяк
 Security=Безпека
 Passwords=Паролі
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Зашифрувати пароль бази даних, що зберігається в conf.php. Наполегливо рекомендується активувати цю опцію.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=Щоб пароль був закодований у файл <b> conf.php </b>, замініть рядок <br> <b> $ dolibarr_main_db_pass = "..."; </b> <br> на <br> <b> $ dolibarr_main_db_pass = "crypted: %s"; </b>
 InstrucToClearPass=Щоб пароль у файлі <b> conf.php </b> був декодований (очистився), замініть рядок <br> <b> $ dolibarr_main_db_pass = "crypted: ..."; </b> <br> на <br> <b> $ dolibarr_main_db_pass = "%s"; </b>
 ProtectAndEncryptPdfFiles=Захистіть створені файли PDF. Це НЕ рекомендується, оскільки це порушує масову генерацію PDF.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Обчислюване поле
-ComputedFormulaDesc=Ви можете ввести тут формулу, використовуючи інші властивості об’єкта або будь-який код PHP, щоб отримати динамічне обчислене значення. Ви можете використовувати будь-які PHP-сумісні формули, включаючи "?" оператор умови та наступний глобальний об’єкт: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>УВАГА</strong>: якщо вам потрібні властивості об’єкта не завантажено, просто виберіть собі об’єкт у свою формулу, як у другому прикладі.<br>Використання обчислюваного поля означає, що ви не можете самостійно ввести будь-яке значення з інтерфейсу. Крім того, якщо є синтаксична помилка, формула може нічого не повернути.<br><br>Приклад формули:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Приклад перезавантаження об'єкта<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj- >capital / 5: '-1')<br><br>Інший приклад формули для примусового завантаження об’єкта та його батьківського об’єкта: <br>(($reloadedobj = нове завдання($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = новий проект( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: "Батьківський проект не знайдено"
+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'
 Computedpersistent=Зберегти обчислюване поле
 ComputedpersistentDesc=Обчислювальні поля будуть збережені в базі, тому значення буде перераховане лише тоді, коли об'єкт з цим полем буде змінено. Якщо обчислюване поле залежить від інших об'єктів, або глобальних даних - це значення може бути не правильним!
 ExtrafieldParamHelpPassword=Якщо залишити це поле пустим, це означає, що це значення зберігатиметься БЕЗ шифрування (поле просто приховано зірочками на екрані).<br><br>Введіть значення 'dolcrypt' для кодування значення за допомогою оборотного алгоритму шифрування. Очищені дані можна переглядати та редагувати, але вони зашифровані в базі даних.<br><br>Введіть "auto" (або "md5", 'sha256', 'password_hash', ...), щоб використовувати алгоритм шифрування пароля за замовчуванням (або md5, sha256, password_hash...), щоб зберегти необоротний хешований пароль у базі даних (неможливо отримати початкове значення)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Використання SMTP-сервера вашого власного постачальника послуг електронної пошти для надсилання електронних листів також є цікавим, тому всі листи, надіслані з програми, також будуть збережені у вашому каталозі «Відправлені» вашої поштової скриньки.
 WarningPHPMailD=Тому рекомендується змінити метод надсилання електронних листів на значення "SMTP".
 WarningPHPMailDbis=Якщо ви справді хочете зберегти стандартний метод "PHP" для надсилання електронних листів, просто проігноруйте це попередження або видаліть його, %sклацнувши тут%s.
-WarningPHPMail2=Якщо вашому постачальнику послуг електронної пошти SMTP потрібно обмежити клієнта електронної пошти деякими IP-адресами (дуже рідко), це IP-адреса поштового агента користувача (MUA) для вашої програми ERP CRM: <strong> %s </strong> .
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Бухгалтерський облік (спрощений)
 Module10Desc=Прості бухгалтерські звіти (журнали, обороти) на основі вмісту бази даних. Не використовує таблицю книги.
 Module20Name=Пропозиції
 Module20Desc=Управління комерційними пропозиціями
-Module22Name=Масові розсилки електронною поштою
-Module22Desc=Керуйте масовою розсилкою електронної пошти
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Енергія
 Module23Desc=Контроль споживання енергії
 Module25Name=Замовлення на продаж
@@ -847,10 +848,10 @@ Permission212=Лінії замовлення
 Permission213=Активувати лінію
 Permission214=Налаштування телефонії
 Permission215=Постачальники налаштування
-Permission221=Читайте електронні листи
-Permission222=Створення/змінювання електронних листів (тема, одержувачі...)
-Permission223=Перевірка електронних листів (дозволяє надсилати)
-Permission229=Видалити електронні листи
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Переглянути одержувачів та інформацію
 Permission238=Розсилка вручну
 Permission239=Видаліть листи після підтвердження або відправлення
@@ -1105,6 +1106,7 @@ DictionaryStaff=Кількість працівників
 DictionaryAvailability=Затримка доставки
 DictionaryOrderMethods=Методи замовлення
 DictionarySource=Походження пропозицій/замовлень
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Персоналізовані групи для звітів
 DictionaryAccountancysystem=Моделі для плану рахунків
 DictionaryAccountancyJournal=Бухгалтерські журнали
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Повернутися до списку словників
 TypeOfRevenueStamp=Вид податкової марки
 VATManagement=Управління податку з продажу
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=За замовчуванням запропонований податок з продажу дорівнює 0, який можна використовувати для таких випадків, як асоціації, фізичні особи чи невеликі компанії.
 VATIsUsedExampleFR=У Франції це означає компанії або організації, що мають реальну фіскальну систему (спрощена реальна або звичайна реальна). Система, в якій декларується ПДВ.
 VATIsNotUsedExampleFR=У Франції це означає асоціації, які не оголошено податку з продажів, або компанії, організації чи вільні професії, які вибрали фіскальну систему мікропідприємств (податок з продажів у франшизі) і сплатили податок з продажів франшизи без будь-якої декларації з податку з продажів. У цьому випадку в рахунках-фактурах відображатиметься посилання «Податковий податок із продажів, який не застосовується – арт-293B CGI».
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Вид податку з продажу
 LTRate=Оцінити
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Відповідно до налаштування п
 LabelUsedByDefault=Мітка використовується за замовчуванням, якщо не вдається знайти переклад для коду
 LabelOnDocuments=Етикетка на документах
 LabelOrTranslationKey=Мітка або ключ перекладу
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=Відображати номер платника ПДВ кліє
 AddAdressInList=Відображати адресу клієнта/постачальника в комбінованих списках.<br>Треті сторони відображатимуться з форматом назви "The Big Company corp. - 21 jump street 123456 Big town - USA" замість " The Big Company corp».
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Запитуйте бажаний спосіб доставки для третіх сторін.
-FieldEdition=Видання поля %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Приклад: +2 (заповнювати, лише якщо виникають проблеми зі зміщенням часового поясу)
 GetBarCode=Отримати штрих-код
 NumberingModules=Нумерація моделей
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Змусити дату рахунка-фактури до да
 SuggestedPaymentModesIfNotDefinedInInvoice=Пропонований режим оплати в рахунку-фактурі за замовчуванням, якщо не визначено в рахунку-фактурі
 SuggestPaymentByRIBOnAccount=Запропонуйте оплату шляхом зняття на рахунок
 SuggestPaymentByChequeToAddress=Запропонуйте оплату чеком до
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Безкоштовний текст на рахунках-фактурах
 WatermarkOnDraftInvoices=Водяний знак на чернетках рахунків-фактур (немає, якщо порожній)
 PaymentsNumberingModule=Модель нумерації платежів
@@ -1718,6 +1723,7 @@ CompressionOfResources=Стиснення HTTP-відповідей
 CompressionOfResourcesDesc=Наприклад, використовуючи директиву Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Таке автоматичне виявлення неможливе з поточними браузерами
 DefaultValuesDesc=Тут ви можете визначити значення за замовчуванням, яке ви бажаєте використовувати під час створення нового запису, та/або фільтри за замовчуванням або порядок сортування при переліку записів.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Значення за замовчуванням (для використання у формах)
 DefaultSearchFilters=Пошукові фільтри за замовчуванням
 DefaultSortOrder=Порядок сортування за замовчуванням
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Модулі нумерації відправок
 SendingsAbility=Підтримка транспортних листів для доставки клієнтам
 NoNeedForDeliveryReceipts=У більшості випадків транспортні аркуші використовуються як аркуші для поставок клієнтам (перелік продуктів для відправки), так і аркуші, які отримує та підписує клієнт. Тому квитанція про доставку продукції є дубльованою функцією і рідко активується.
 FreeLegalTextOnShippings=Безкоштовний текст про відправлення
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Модуль нумерації чеків поставки продукції
 DeliveryOrderModel=Модель квитанції про поставку продукції
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Безкоштовний текст на кви
 ##### FCKeditor #####
 AdvancedEditor=Розширений редактор
 ActivateFCKeditor=Активувати розширений редактор для:
-FCKeditorForNotePublic=WYSIWYG створення/редакція поля «публічні нотатки» елементів
-FCKeditorForNotePrivate=WYSIWYG створення/редакція поля "приватні нотатки" елементів
-FCKeditorForCompany=WYSIWYG створення/редакція поля опису елементів (крім товарів/послуг)
-FCKeditorForProductDetails=WYSIWYG створення/редакція опису продуктів або рядків для об'єктів (рядки пропозицій, замовлень, рахунків-фактур тощо).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Попередження: використання цього параметра в цьому випадку вкрай не рекомендується, оскільки це може створити проблеми зі спеціальними символами та форматуванням сторінки під час створення файлів PDF.
-FCKeditorForMailing= Створення/редакція WYSIWYG для масових електронних розсилок (Інструменти->Електронна розсилка)
-FCKeditorForUserSignature=WYSIWYG створення/редакція підпису користувача
-FCKeditorForMail=Створення/редакція WYSIWYG для всієї пошти (окрім Інструменти->Електронна розсилка)
-FCKeditorForTicket=Створення/редакція WYSIWYG для квитків
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Налаштування стандартного модуля
 IfYouUsePointOfSaleCheckModule=Якщо ви використовуєте модуль точки продажу (POS), наданий за замовчуванням, або зовнішній модуль, це налаштування може ігноруватися вашим POS-модулем. Більшість POS-модулів розроблені за замовчуванням для негайного створення рахунка-фактури та зменшення запасів, незалежно від наведених тут опцій. Тому, якщо вам потрібно чи ні, щоб зменшити запаси під час реєстрації продажу з вашого POS, перевірте також налаштування вашого POS-модуля.
@@ -1867,7 +1874,6 @@ Buy=Купуйте
 Sell=Продати
 InvoiceDateUsed=Використана дата рахунка-фактури
 YourCompanyDoesNotUseVAT=Ваша компанія не використовує ПДВ (Домашня сторінка - Налаштування - Компанія/Організація), тому параметрів ПДВ для налаштування немає.
-AccountancyCode=Кодекс бухгалтерського обліку
 AccountancyCodeSell=Рахунок продажу. код
 AccountancyCodeBuy=Придбати обліковий запис. код
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Під час створення нового податку за замовчуванням залишайте прапорець «Автоматично створювати платіж» порожнім
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Який перегляд ви хочете відкрит
 AGENDA_EVENT_PAST_COLOR = Колір минулої події
 AGENDA_EVENT_CURRENT_COLOR = Колір поточної події
 AGENDA_EVENT_FUTURE_COLOR = Колір майбутньої події
-AGENDA_REMINDER_BROWSER = Увімкнути нагадування про подію <b> у браузері користувача </b> (Коли досягнуто дати нагадування, браузер відображає спливаюче вікно. Кожен користувач може вимкнути такі сповіщення в налаштуваннях сповіщень браузера).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Увімкнути звукові сповіщення
-AGENDA_REMINDER_EMAIL = Увімкнути нагадування про подію <b> електронною поштою </b> (опція нагадування/відстрочка може бути визначена для кожної події).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Примітка. Частота виконання запланованого завдання %s має бути достатньою, щоб бути впевненим, що нагадування надсилаються в правильний момент.
 AGENDA_SHOW_LINKED_OBJECT = Показати пов’язаний об’єкт у режимі перегляду порядку денного
 AGENDA_USE_EVENT_TYPE = Використовувати типи подій (керовані в меню Налаштування -> Словники -> Тип подій порядку денного)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Автоматично встановлювати це значення за замовчуванням для типу події у формі створення події
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Ключ для авторизації посилання на експорт
 PastDelayVCalExport=Не експортуйте подію старше ніж
 SecurityKey = Ключ захисту
@@ -2006,7 +2017,7 @@ BackupZipWizard=Майстер для створення архіву докум
 SomethingMakeInstallFromWebNotPossible=Установка зовнішнього модуля з веб-інтерфейсу неможлива з наступних причин:
 SomethingMakeInstallFromWebNotPossible2=З цієї причини описаний тут процес оновлення є ручним процесом, який може виконувати лише привілейований користувач.
 InstallModuleFromWebHasBeenDisabledContactUs=Встановлення або розробка зовнішніх модулів або динамічних веб-сайтів із програми наразі заблоковано з метою безпеки. Будь ласка, зв'яжіться з нами, якщо вам потрібно ввімкнути цю функцію.
-InstallModuleFromWebHasBeenDisabledByFile=Встановлення зовнішнього модуля з програми було вимкнено вашим адміністратором. Ви повинні попросити його видалити файл <strong> %s </strong>, щоб дозволити цю функцію.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Для встановлення або створення зовнішнього модуля з програми необхідно зберегти файли модуля в каталозі <strong> %s </strong> . Щоб цей каталог обробив Dolibarr, ви повинні налаштувати ваш <strong> conf/conf.php </strong>, щоб додати 2 рядки директиви: <br> a0e7843947c06brl'/mainro_doli_bz0'; </strong> <br> <strong> $dolibarr_main_document_root_alt='%s/custom'; </strong>
 HighlightLinesOnMouseHover=Підсвічуйте рядки таблиці, коли курсор миші проходить
 HighlightLinesColor=Колір виділення лінії, коли курсор миші проходить (використовуйте "ffffff", щоб не виділяти)
@@ -2036,6 +2047,7 @@ Enter0or1=Введіть 0 або 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Введіть сюди між дужками список номерів байтів, які представляють символ валюти. Наприклад: для $ введіть [36] - для бразильських реалів R$ [82,36] - для € введіть [8364]
 ColorFormat=Колір RGB у форматі HEX, наприклад: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Назва значка у форматі:<br>- image.png для файлу зображення в поточному каталозі теми<br>- image.png@module якщо файл знаходиться в каталозі /img/ модуля<br>- fa-xxx для зображення FontAwesome fa-xxx<br>- fontawesome_xxx_fa_color_size для зображення FontAwesome fa-xxx (з префіксом, набором кольорів і розмірів)
 PositionIntoComboList=Розташування рядка в комбінованих списках
 SellTaxRate=Ставка податку з продажу
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Приховати межі в рамці адреси відправника
 MAIN_PDF_NO_RECIPENT_FRAME=Приховати межі рамки адреси одержувача
 MAIN_PDF_HIDE_CUSTOMER_CODE=Приховати код клієнта
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Приховати назву відправника/компанію в адресному блоці
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Приховати умови оплати
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Приховати режим оплати
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=Не рекомендовано
 ARestrictedPath=Деякі обмежені шляхи для файлів даних
 CheckForModuleUpdate=Перевірте наявність оновлень зовнішніх модулів
 CheckForModuleUpdateHelp=Ця дія підключить редактори зовнішніх модулів, щоб перевірити, чи доступна нова версія.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Доступне оновлення
 NoExternalModuleWithUpdate=Не знайдено оновлень для зовнішніх модулів
 SwaggerDescriptionFile=Файл опису API Swagger (наприклад, для використання з redoc)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Показати адресу доставки
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Обов'язкове зазначення в деяких країнах (Франція, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=URL-посилання соціальної мережі. Використовуйте {socialid} для змінної частини, яка містить ідентифікатор соціальної мережі.
 IfThisCategoryIsChildOfAnother=Якщо ця категорія є дочірньою для іншої
 DarkThemeMode=Режим темної теми
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Попередження: мо
 WarningModuleHasChangedSecurityCsrfParameter=Попередження: модуль %s вимкнув захист CSRF вашого екземпляра. Ця дія є підозрілою, тому ваша інсталяція більше не захищена. Будь ласка, зверніться до автора модуля для пояснення.
 EMailsInGoingDesc=Вхідними листами керує модуль %s. Ви повинні ввімкнути та налаштувати його, якщо вам потрібно підтримувати вхідні електронні листи.
 MAIN_IMAP_USE_PHPIMAP=Використовуйте бібліотеку PHP-IMAP для IMAP замість рідного PHP IMAP. Це також дозволяє використовувати підключення OAuth2 для IMAP (модуль OAuth також має бути активовано).
-MAIN_CHECKBOX_LEFT_COLUMN=Показати стовпець для вибору полів і рядків ліворуч (за умовчанням праворуч)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Не створюється за замовчуванням. Створюється тільки при активації модуля.
 CSSPage=Стиль CSS
 Defaultfortype=За замовчуванням
@@ -2489,7 +2510,7 @@ AiDescription=Функції ШІ (штучного інтелекту).
 AiDescriptionLong=Надає функції AI (штучного інтелекту) у різних частинах програми. Потрібен зовнішній API AI.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=Налаштування модуля ШІ
 AiCustomPrompt=Спеціальна підказка AI
 AI_CONFIGURATIONS_PROMPT=Спеціальна підказка
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=Спеціальні підказки AI для функці
 EnterAnIP=Введіть IP-адресу
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang
index e342a025bed..38527d4a2bf 100644
--- a/htdocs/langs/uk_UA/banks.lang
+++ b/htdocs/langs/uk_UA/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Кінцевий баланс
 CurrentBalance=Поточний баланс
 FutureBalance=Майбутній баланс
 ShowAllTimeBalance=Показати баланс із самого початку
-AllTime=З початку
 Reconciliation=Примирення
 RIB=Номер рахунку в банку
 IBAN=Номер IBAN
@@ -133,7 +132,7 @@ DeleteTransaction=Видалити запис
 ConfirmDeleteTransaction=Ви впевнені, що хочете видалити цей запис?
 ThisWillAlsoDeleteBankRecord=Це також видалить згенерований запис банку
 BankMovements=Рухи
-PlannedTransactions=Заплановані вступи
+PlannedTransactions=Upcoming entries
 Graph=Графіки
 ExportDataset_banque_1=Банківські записи та виписка з рахунку
 ExportDataset_banque_2=Депозитарна розписка
@@ -151,7 +150,7 @@ FutureTransaction=Майбутня транзакція. Не вдається 
 SelectChequeTransactionAndGenerate=Виберіть/відфільтруйте чеки, які будуть включені в квитанцію про внесення чека. Потім натисніть «Створити».
 SelectPaymentTransactionAndGenerate=Виберіть/відфільтруйте документи, які потрібно включити в квитанцію про депозит %s. Потім натисніть «Створити».
 InputReceiptNumber=Виберіть виписку з банківського рахунку, пов’язану з узгодженням. Використовуйте числове значення, яке можна сортувати
-InputReceiptNumberBis=РРРРММ або РРРРММДД
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Помиритися?
 ThenCheckLinesAndConciliate=Потім перевірте рядки у виписці з банку та натисніть
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Якщо цю функцію ввімкнено, ви 
 BankColorizeMovementName1=Колір тла для руху дебету
 BankColorizeMovementName2=Колір фону для кредитного руху
 IfYouDontReconcileDisableProperty=Якщо ви не проводите звірку банків для деяких банківських рахунків, вимкніть для них властивість «%s», щоб видалити це попередження.
-NoBankAccountDefined=Банківський рахунок не визначено
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=На банківському рахунку не знайдено жодного запису. Зазвичай це відбувається, коли запис було видалено вручну зі списку транзакцій на банківському рахунку (наприклад, під час звірки банківського рахунку). Інша причина полягає в тому, що платіж був зафіксований, коли був відключений модуль «%s».
 AlreadyOneBankAccount=Вже визначено один банківський рахунок
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Варіант файлу SEPA
diff --git a/htdocs/langs/uk_UA/blockedlog.lang b/htdocs/langs/uk_UA/blockedlog.lang
index a45469bb082..53fd0b22fac 100644
--- a/htdocs/langs/uk_UA/blockedlog.lang
+++ b/htdocs/langs/uk_UA/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Незмінні журнали
 ShowAllFingerPrintsMightBeTooLong=Показати всі архівні журнали (може бути довгими)
 ShowAllFingerPrintsErrorsMightBeTooLong=Показати всі недійсні журнали архіву (може бути довгими)
 DownloadBlockChain=Завантажити відбитки пальців
-KoCheckFingerprintValidity=Архівний запис журналу недійсний. Це означає, що хтось (хакер?) змінив деякі дані цього запису після його запису, або стер попередній архівований запис (перевірте, чи існує рядок із попереднім #), або змінив контрольну суму попереднього запису.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Архівний запис журналу дійсний. Дані в цьому рядку не були змінені, і запис слідує за попереднім.
 OkCheckFingerprintValidityButChainIsKo=Архівний журнал виглядає дійсним порівняно з попереднім, але ланцюжок раніше був пошкоджений.
 AddedByAuthority=Зберігається у віддаленому центрі
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Деталі журналу
 ListOfTrackedEvents=Список відстежуваних подій
 Fingerprint=Відбиток пальця
 DownloadLogCSV=Експортувати архівні журнали (CSV)
-DataOfArchivedEvent=Повні дані заархівованої події
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Оригінальний об’єкт (тип %s, id %s) не пов’язаний (перегляньте стовпець «Повні дані», щоб отримати незмінні збережені дані)
 BlockedLogAreRequiredByYourCountryLegislation=Законодавством вашої країни може знадобитися модуль Unalterable Logs. Вимкнення цього модуля може зробити будь-які майбутні операції недійсними відповідно до законодавства та використання легального програмного забезпечення, оскільки вони не можуть бути підтверджені податковою перевіркою.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Модуль Unalterable Logs активовано через законодавство вашої країни. Вимкнення цього модуля може зробити будь-які майбутні операції недійсними відповідно до законодавства та використання легального програмного забезпечення, оскільки вони не можуть бути підтверджені податковою перевіркою.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Увімкнено систему відстеження по
 BlockedLogDisabled=Систему відстеження подій у журналах без змін було вимкнено після того, як було зроблено певний запис. Ми зберегли спеціальний відбиток пальця, щоб відстежити ланцюг як зламаний
 BlockedLogDisabledBis=Систему відстеження подій у журналах без змін вимкнено. Це можливо, тому що записів ще не було.
 LinkHasBeenDisabledForPerformancePurpose=З метою підвищення продуктивності пряме посилання на документ не відображається після 100-го рядка.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Рахунок-фактура клієнта логічно видалено
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Логічне видалення оплати клі
 logPAYMENT_VARIOUS_CREATE=Створено платіж (не пов’язаний із рахунком-фактурою).
 logPAYMENT_VARIOUS_DELETE=Логічне видалення платежу (не присвоєно рахунку-фактурі).
 logPAYMENT_VARIOUS_MODIFY=Платіж (не пов’язаний з рахунком-фактурою) змінено
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang
index b0f3bae6cb5..3b2c060ded5 100644
--- a/htdocs/langs/uk_UA/categories.lang
+++ b/htdocs/langs/uk_UA/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Область контактних тегів/катег
 AccountsCategoriesArea=Область тегів/категорій банківського рахунку
 ProjectsCategoriesArea=Область тегів/категорій проекту
 UsersCategoriesArea=Область тегів/категорій користувачів
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Підкатегорії
 CatList=Список тегів/категорій
 CatListAll=Список тегів/категорій (усі типи)
@@ -90,9 +91,10 @@ CategoriesSetup=Налаштування тегів/категорій
 CategorieRecursiv=Посилання з батьківським тегом/категорією автоматично
 CategorieRecursivHelp=Якщо цей параметр увімкнено, коли ви додаєте об’єкт до підкатегорії, об’єкт також буде додано до батьківських категорій.
 AddProductServiceIntoCategory=Призначте категорію товару/послуги
-AddCustomerIntoCategory=Призначте категорію клієнту
-AddSupplierIntoCategory=Призначте категорію постачальнику
-AssignCategoryTo=Призначити категорію до
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Показати тег/категорію
 ByDefaultInList=За замовчуванням у списку
 ChooseCategory=Виберіть категорію
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Категорії контейнерів сторі
 KnowledgemanagementsCategoriesArea=Категорії статті КМ
 UseOrOperatorForCategories=Використовуйте оператор «АБО» для категорій
 AddObjectIntoCategory=Призначити до категорії
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index f9c24e5c841..231e4732778 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Держава знаходиться в Європейській
 PriceFormatInCurrentLanguage=Формат відображення ціни в поточній мові та поточній валюті
 ThirdPartyName=Назва контрагента
 ThirdPartyEmail=email контрагента
-ThirdParty=Контрагент
-ThirdParties=Контрагенти
+ThirdParty=Third party
+ThirdParties=Third parties
 ThirdPartyProspects=Потенційні клієнти
 ThirdPartyProspectsStats=Потенційні клієнти
 ThirdPartyCustomers=Покупці
@@ -65,6 +65,7 @@ State=Штат/провінція/область
 StateId=Державний ідентифікатор
 StateCode=Код штату
 StateShort=Штат/область
+DepartmentBuyer=Buyer's state/province
 Region=Регіон
 Region-State=Регіон - держава
 Country=Країна
@@ -78,7 +79,7 @@ Chat=Чат
 PhonePro=Автобус. телефон
 PhonePerso=Особистий телефон
 PhoneMobile=Мобільний телефон
-No_Email=Скасувати автоматичну розсилку
+No_Email=Refuse mass emails
 Fax=Факс
 Zip=Індекс
 Town=Місто
@@ -382,11 +383,12 @@ ExportCardToFormat=Експортувати картку у формат
 ContactNotLinkedToCompany=Контакт не пов’язаний з третьою стороною
 DolibarrLogin=Вхід в систему Dolibarr
 NoDolibarrAccess=Немає доступу Dolibarr
-ExportDataset_company_1=Треті сторони (компанії/фонди/фізичні особи) та їх власність
-ExportDataset_company_2=Контакти та їх властивості
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Треті особи та їх властивості
 ImportDataset_company_2=Додаткові контакти/адреси та атрибути сторонніх розробників
-ImportDataset_company_3=Банківські рахунки третіх осіб
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Торгові представники третіх сторін (призначити торгових представників/користувачів компаніям)
 PriceLevel=Рівень цін
 PriceLevelLabels=Етикетки рівня цін
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Ім'я менеджера (генеральний директор, директор, президент...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Об’єднати треті сторони
-ConfirmMergeThirdparties=Ви впевнені, що хочете об’єднати вибрану третю сторону з поточною? Усі пов’язані об’єкти (рахунки-фактури, замовлення, ...) будуть переміщені до поточної третьої сторони, після чого вибрана третя сторона буде видалена.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Треті сторони об’єднані
 SaleRepresentativeLogin=Вхід торгового представника
 SaleRepresentativeFirstname=Ім'я торгового представника
@@ -460,3 +462,6 @@ ExternalSystemID=Ідентифікатор зовнішньої системи
 IDOfPaymentInAnExternalSystem=Ідентифікатор способу оплати в зовнішню систему (наприклад, Stripe, Paypal, ...)
 AADEWebserviceCredentials=Облікові дані AADE Webservice
 ThirdPartyMustBeACustomerToCreateBANOnStripe=контрагент має бути клієнтом, щоб дозволити створення своєї банківської інформації на стороні Stripe
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index 3edcd0de549..c14c76ee007 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Оплата рахунку клієнта
 PaymentSupplierInvoice=оплата рахунку постачальника
 PaymentSocialContribution=Сплата соціального/фіскального податку
 PaymentVat=сплата ПДВ
-AutomaticCreationPayment=Автоматично записувати платіж
+AutomaticCreationPayment=Also record the payment
 ListPayment=Список платежів
 ListOfCustomerPayments=Список платежів клієнтів
 ListOfSupplierPayments=Список платежів постачальників
@@ -118,10 +118,14 @@ SocialContributionsPayments=Соціальні/податкові платежі
 ShowVatPayment=Показати сплату ПДВ
 TotalToPay=Всього до оплати
 BalanceVisibilityDependsOnSortAndFilters=Баланс видно в цьому списку, лише якщо таблиця відсортована за %s та відфільтрована за 1 банківським рахунком (без інших фільтрів)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Код обліку клієнта
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Обліковий код постачальника
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Cust. рахунок. код
 SupplierAccountancyCodeShort=Sup. рахунок. код
+UserAccountancyCodeShort=User account. code
 AccountNumber=Номер рахунка
 NewAccountingAccount=Новий акаунт
 Turnover=Оборот виставлений в рахунок
@@ -129,7 +133,9 @@ TurnoverCollected=Зібраний оборот
 SalesTurnoverMinimum=Мінімальний оборот
 ByExpenseIncome=За витратами та доходами
 ByThirdParties=Третіми особами
+ByProjects=By projects
 ByUserAuthorOfInvoice=За автором рахунка
+DetailedListLowercase=detailed list
 CheckReceipt=Депозитарна розписка
 CheckReceiptShort=Депозитарна розписка
 LastCheckReceiptShort=Останні %s депозитні квитанції
diff --git a/htdocs/langs/uk_UA/datapolicy.lang b/htdocs/langs/uk_UA/datapolicy.lang
index 69af5188fb8..de3f37b7a02 100644
--- a/htdocs/langs/uk_UA/datapolicy.lang
+++ b/htdocs/langs/uk_UA/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Політика конфіденційності даних
 Module4100Desc = Модуль для керування конфіденційністю даних (відповідність GDPR)
 # Administration page
 datapolicySetup = Налаштування політики конфіденційності даних модуля
-Deletion = Видалення даних
-datapolicySetupPage = Залежно від законодавства вашої країни (приклад <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">стаття 5</a> GDPR), персональні дані повинні зберігатися певний період не перевищуючи періоду, протягом якого дані потрібні для мети, для якої вони були зібрані, за винятком цілей архівування.<br>Видалення буде виконано автоматично через певний час без подій (тривалість які ви вкажете нижче).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s місяців
 ONE_YEAR = 1 рік
 NB_YEARS = %s років
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Потенційний клієнт
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Ні перспектива/Ні клієнт
 DATAPOLICY_CONTACT_FOURNISSEUR = Постачальник
 DATAPOLICY_ADHERENT = Член
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Ви можете надіслати електронний лист GDPR усім своїм відповідним контактам (які ще не отримали електронний лист і для яких ви нічого не зареєстрували щодо їх угоди GDPR). Для цього скористайтеся наступною кнопкою.
 SendAgreement = Надсилайте електронні листи
 AllAgreementSend = Усі листи надіслано
 TXTLINKDATAPOLICYACCEPT = Текст для посилання "договір"
 TXTLINKDATAPOLICYREFUSE = Текст для посилання "незгода"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: Обробка персональних даних
 DATAPOLICY_consentement = Отримана згода на обробку персональних даних
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index c4e2016971f..1c1b575e150 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Не вдалося створити каталог. Перевірте, чи має користувач веб-сервера права запису в каталог документів Dolibarr. Якщо параметр <b> safe_mode </b> увімкнено на цьому PHP, переконайтеся, що файли Dolibarr php належать користувачеві (або групі) веб-сервера.
 ErrorNoMailDefinedForThisUser=Для цього користувача не визначено пошту
 ErrorSetupOfEmailsNotComplete=Налаштування електронних листів не завершено
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Для роботи цієї функції потрібно активувати JavaScript. Змініть це в налаштуваннях - дисплей.
 ErrorTopMenuMustHaveAParentWithId0=Меню типу "Верхнє" не може мати батьківського меню. Поставте 0 у батьківському меню або виберіть меню типу «Ліво».
 ErrorLeftMenuMustHaveAParentId=Меню типу "Ліво" повинно мати батьківський ідентифікатор.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Завантаження заблоковано пла
 ErrorFileSizeTooLarge=Розмір файлу завеликий або файл не надано.
 ErrorFieldTooLong=Поле %s задовге.
 ErrorSizeTooLongForIntType=Розмір задовгий для типу int (максимум %s цифр)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Розмір задовгий для типу рядка (максимум %s символів)
 ErrorNoValueForSelectType=Будь ласка, заповніть значення для вибраного списку
 ErrorNoValueForCheckBoxType=Будь ласка, заповніть значення для списку прапорців
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Погане значення для коду безпек
 ErrorBothFieldCantBeNegative=Поля %s і %s не можуть бути від’ємними
 ErrorFieldCantBeNegativeOnInvoice=Поле <strong>%s</strong> не може бути від’ємним у цьому типі рахунку-фактури. Якщо вам потрібно додати рядок знижки, просто спочатку створіть знижку (з поля "%s" у картці контрагент) і застосуйте це до рахунку-фактури.
 ErrorLinesCantBeNegativeForOneVATRate=Загальна кількість рядків (за вирахуванням податку) не може бути від’ємною для даної ненульової ставки ПДВ (Знайдено від’ємну суму для ставки ПДВ <b> %s </b> %%).
-ErrorLinesCantBeNegativeOnDeposits=У депозиті рядки не можуть бути від’ємними. Ви зіткнетеся з проблемами, коли вам потрібно буде витратити заставу в остаточному рахунку-фактурі, якщо ви це зробите.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Кількість для рядка в рахунках-фактурах клієнта не може бути від’ємною
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Обліковий запис користувача <b> %s </b>, який використовується для запуску веб-сервера, не має дозволу на це
 ErrorNoActivatedBarcode=Тип штрих-коду не активовано
 ErrUnzipFails=Не вдалося розпакувати %s за допомогою ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ваш параметр PHP upload_max_filesize (%s) вищий за параметр PHP post_max_size (%s). Це не послідовне налаштування.
 WarningPasswordSetWithNoAccount=Для цього учасника встановлено пароль. Однак обліковий запис користувача не створено. Таким чином, цей пароль зберігається, але його не можна використовувати для входу в Dolibarr. Він може використовуватися зовнішнім модулем/інтерфейсом, але якщо вам не потрібно вказувати логін чи пароль для учасника, ви можете вимкнути опцію «Керувати логіном для кожного члена» у налаштуваннях модуля Member. Якщо вам потрібно керувати логіном, але не потрібен пароль, ви можете залишити це поле порожнім, щоб уникнути цього попередження. Примітка: електронну пошту також можна використовувати як логін, якщо учасник пов’язаний з користувачем.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = Рахунок-фактуру SwissQR можна додати лише до рахунків-фактур, налаштованих на оплату за допомогою кредитних переказів.
 SwissQrCreditorAddressInvalid = Адреса кредитора недійсна (чи вказано поштовий індекс і місто? (%s)
 SwissQrCreditorInformationInvalid = Інформація про кредитора недійсна для IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s уже визначено як к
 ErrorThisGroupIsAlreadyDefinedAsThisType=Контакти з цією групою вже визначені як контакти для цього типу.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/uk_UA/exports.lang b/htdocs/langs/uk_UA/exports.lang
index 971342ea5a9..c9eb919b771 100644
--- a/htdocs/langs/uk_UA/exports.lang
+++ b/htdocs/langs/uk_UA/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Етикетка лінії
 LineDescription=Опис лінії
 LineUnitPrice=Ціна одиниці лінії
 LineVATRate=Ставка ПДВ рядка
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Кількість для лінії
 LineTotalHT=Сума без урахування податок за лінію
 LineTotalTTC=Сума з податком за лінію
 LineTotalVAT=Розмір ПДВ за лінію
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Тип лінії (0=продукт, 1=послуга)
 FileWithDataToImport=Файл із даними для імпорту
 FileToImport=Вихідний файл для імпорту
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=Виберіть формат файлу для ви
 ChooseFileToImport=Завантажте файл, а потім натисніть на піктограму %s, щоб вибрати файл як вихідний файл імпорту...
 SourceFileFormat=Формат вихідного файлу
 FieldsInSourceFile=Поля у вихідному файлі
-FieldsInTargetDatabase=Цільові поля в базі даних Dolibarr (жирний = обов'язковий)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Немає полів
 MoveField=Перемістити номер стовпця поля %s
 ExampleOfImportFile=Приклад_файлу_імпорту
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Переконайтеся, що формат файлу
 RunSimulateImportFile=Запустіть моделювання імпорту
 FieldNeedSource=У цьому полі потрібні дані з вихідного файлу
 SomeMandatoryFieldHaveNoSource=Деякі обов'язкові поля не мають джерела з файлу даних
-InformationOnSourceFile=Інформація про вихідний файл
-InformationOnTargetTables=Інформація про цільові поля
+InformationOnSourceFile=Вихідний файл
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Змініть принаймні одне вихідне поле в стовпці полів для експорту
 SelectFormat=Виберіть цей формат файлу імпорту
 RunImportFile=Імпорт даних
diff --git a/htdocs/langs/uk_UA/hrm.lang b/htdocs/langs/uk_UA/hrm.lang
index d1a4909f1fd..10439b60c3f 100644
--- a/htdocs/langs/uk_UA/hrm.lang
+++ b/htdocs/langs/uk_UA/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=Обов'язковий ранг за професією
-RequiredRankShort=Необхідний ранг
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Посади з цими профілями вакансій
-EmployeeRank=Ранг співробітника за цю навичку
-EmployeeRankShort=Ранг працівника
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Посада співробітника
 EmployeePositions=Посади співробітників
 EmployeesInThisPosition=Співробітники на цій посаді
@@ -72,6 +72,9 @@ AddSkill=Додайте навички до профілю роботи
 RequiredSkills=Необхідні навички для даного профілю роботи
 UserRank=Ранг користувача
 SkillList=Список навичок
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Збережіть звання
 TypeKnowHow=Ноу-хау
 TypeHowToBe=Як бути
@@ -95,3 +98,5 @@ NeedBusinessTravels=Потрібні відрядження
 NoDescription=без опису
 TheJobProfileHasNoSkillsDefinedFixBefore=Оцінений профіль роботи цього працівника не містить навичок. Будь ласка, додайте навички, потім видаліть і перезапустіть оцінювання.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index bf3641b53b9..7c2dd11acdc 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Розсилка електронною поштою
 EMailing=Розсилка електронною поштою
-EMailings=Розсилки електронною поштою
+EMailings=Mass EMails
 SMSings=SMS-повідомлення
-AllEMailings=Усі електронні листи
+AllEMailings=All mass eMails
 MailCard=Картка електронної пошти
 MailRecipients=Одержувачі
 MailRecipient=одержувач
@@ -26,19 +26,19 @@ MailFile=Прикріплені файли
 MailMessage=Тіло електронної пошти
 SubjectNotIn=Не в темі
 BodyNotIn=Не в тілі
-ShowEMailing=Показати електронну пошту
-ListOfEMailings=Список електронних листів
-NewMailing=Нове листування
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Нові смс
-EditMailing=Редагувати електронну пошту
-ResetMailing=Повторно надіслати електронний лист
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Видалити електронні листи
-PreviewMailing=Попередній перегляд електронної пошти
-CreateMailing=Створити електронну пошту
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Тест
-ValidMailing=Дійсний електронний лист
+ValidMailing=Valid mass Email
 MailingStatusDraft=Проект
 MailingStatusValidated=Підтверджений
 MailingStatusSent=Надісланий
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Щоб отримати електронний лист
 LineInFile=Рядок %s у файлі
 RecipientSelectionModules=Визначені запити на вибір одержувача
 MailSelectedRecipients=Вибрані одержувачі
-MailingArea=Зона розсилки електронної пошти
-LastMailings=Останні електронні листи %s
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Статистика цілей
 NbOfCompaniesContacts=Унікальні контакти/адреси
 MailNoChangePossible=Одержувачів для підтверджених електронних листів змінити не можна
-SearchAMailing=Пошук розсилки
-SendMailing=Надіслати електронною поштою
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Надіслано
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Надсилання електронного листа можна виконати з командного рядка. Попросіть адміністратора сервера запустити таку команду, щоб надіслати електронний лист усім одержувачам:
 MailingNeedCommand2=Однак ви можете надіслати їх онлайн, додавши параметр MAILING_LIMIT_SENDBYWEB зі значенням максимальної кількості електронних листів, які ви хочете надіслати за сеанс. Для цього перейдіть до Головна - Налаштування - Інше.
 ConfirmSendingEmailing=Якщо ви хочете надсилати електронні листи безпосередньо з цього екрана, підтвердьте, що ви впевнені, що хочете надсилати електронні листи зараз зі свого браузера?
-LimitSendingEmailing=Примітка: надсилання електронних листів з веб-інтерфейсу виконується кілька разів з міркувань безпеки та тайм-ауту, <b> %s </b> одержувачів за раз для кожного сеансу надсилання.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Чистий список
 ToClearAllRecipientsClickHere=Натисніть тут, щоб очистити список одержувачів для цього листа
 ToAddRecipientsChooseHere=Додайте одержувачів, вибравши зі списків
-NbOfEMailingsReceived=Отримано масову електронну пошту
-NbOfEMailingsSend=Масова розсилка електронних листів
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=Ідентифікаційний запис
 DeliveryReceipt=Акт доставки.
 YouCanUseCommaSeparatorForSeveralRecipients=Ви можете використовувати роздільник коми <b> </b>, щоб вказати кількох одержувачів.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Автоматичні сповіщення елект
 ANotificationsWillBeSent=1 автоматичне сповіщення буде надіслано електронною поштою
 SomeNotificationsWillBeSent=%s автоматичні сповіщення буде надіслано електронною поштою
 AddNewNotification=Підпишіться на нове автоматичне сповіщення електронною поштою (ціль/подія)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Конфігурацію надсилання електронної пошти встановлено на «%s». Цей режим не можна використовувати для масової розсилки електронної пошти.
 MailSendSetupIs2=Ви повинні спочатку перейти з обліковим записом адміністратора в меню %sHome - Setup - EMails%s, щоб змінити параметр <strong> '%s' a0a65dc9az0' a0a65dc9az0' a0a65dc9az08f4f49fz0' a0a65d071078f65d071078f49fz071071071 У цьому режимі ви можете ввійти в налаштування SMTP-сервера, наданого вашим Інтернет-провайдером, і використовувати функцію масової розсилки електронною поштою.
 MailSendSetupIs3=Якщо у вас виникли запитання щодо налаштування вашого SMTP-сервера, ви можете звернутися за адресою %s.
@@ -183,7 +185,7 @@ Information=Інформація
 ContactsWithThirdpartyFilter=Контакти із стороннім фільтром
 Unanswered=Без відповіді
 Answered=Відповів
-IsNotAnAnswer=Не відповідає (початкова електронна адреса)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Це відповідь на початковий електронний лист
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Значення за замовчуванням для поля '%s' під час створення нового контакту
@@ -199,6 +201,6 @@ ModelTemplate=Шаблон електронної пошти
 YouCanChooseAModelForYouMailContent= Ви можете вибрати одну з моделей шаблонів або створити її за допомогою ШІ
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 444db5e2468..337d76d9da1 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -37,6 +37,7 @@ Translation=Переклад
 Translations=Переклади
 CurrentTimeZone=PHP TimeZone (сервер)
 EmptySearchString=Введіть непорожні критерії пошуку
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Введіть критерії дати
 NoRecordFound=Записів не знайдено
 NoRecordDeleted=Жодного запису не видалено
@@ -45,6 +46,7 @@ NoError=Немає помилок
 Error=Помилка
 Errors=Помилки
 ErrorFieldRequired=Поле '%s' є обов'язковим
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Поле '%s' містить помилкове значення
 ErrorFileDoesNotExists=Файл %s не існує
 ErrorFailedToOpenFile=Неможливо відкрити файл %s
@@ -308,6 +310,7 @@ DateBuild=Дата створення звіту
 DatePayment=Дата оплати
 DateApprove=Дата затвердження
 DateApprove2=Дата затвердження (друге затвердження)
+PendingSince=Pending since
 RegistrationDate=Дата Реєстрації
 UserCreation=Користувач створення
 UserModification=Користувач модифікації
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Починати
 ActionRunningShort=В процесі
 ActionDoneShort=Готово
 ActionUncomplete=Неповна
-LatestLinkedEvents=Останні пов’язані події %s
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Компанія/Організація
 Accountant=Бухгалтер
 ContactsForCompany=Контакти цієї третьої сторони
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=Тіло електронної пошти
 SendAcknowledgementByMail=Надіслати підтвердження електронною поштою
 SendMail=Відправити лист
 Email=Email
+EMail=Email
+EMails=Emails
 NoEMail=Немає електронної пошти
 AlreadyRead=Вже прочитав
 NotRead=Непрочитані
@@ -793,7 +798,7 @@ Notes=Примітки
 AddNewLine=Додати новий рядок
 AddFile=Додати файл
 FreeZone=Продукт із вільним текстом
-FreeLineOfType=Елемент вільного тексту, тип:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Клонування об’єкта з його основними атрибутами
 ReGeneratePDF=Повторне створення PDF
 PDFMerge=Об'єднання PDF
@@ -879,12 +884,14 @@ toward=до
 Access=Доступ
 SelectAction=Виберіть дію
 SelectTargetUser=Виберіть цільового користувача/співробітника
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Використовуйте Ctrl+C, щоб скопіювати в буфер обміну
 SaveUploadedFileWithMask=Збережіть файл на сервері з іменем " <strong> %s </strong> " (інакше "%s")
 OriginFileName=Оригінальна назва файлу
 SetDemandReason=Встановити джерело
 SetBankAccount=Визначте банківський рахунок
 AccountCurrency=Валюта рахунку
+AccountancyCode=Accounting Code
 ViewPrivateNote=Переглянути нотатки
 XMoreLines=%s рядок(и) приховано
 ShowMoreLines=Показати більше/менше рядків
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Ви впевнені, що хочете видал
 ConfirmMassClone=Підтвердження масового клонування
 ConfirmMassCloneQuestion=Виберіть проект для клонування
 ConfirmMassCloneToOneProject=Клонувати до проекту %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Пов'язані об'єкти
 ClassifyBilled=Класифікувати рахунок
 ClassifyUnbilled=Класифікувати Unbilled
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Ви повинні увійти в систему та
 Download=Завантажити
 DownloadDocument=Завантажити документ
 DownloadSignedDocument=Завантажити підписаний документ
-ActualizeCurrency=Оновити курс валюти
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Фіскальний рік
 ModuleBuilder=Конструктор модулів і додатків
 SetMultiCurrencyCode=Встановити валюту
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Масові дії
 ClickToShowHelp=Натисніть, щоб показати підказку
 WebSite=Веб-сайт
@@ -1104,6 +1113,7 @@ PayedBy=Оплачено
 PayedTo=Оплачено до
 Monthly=Щомісячно
 Quarterly=Щоквартально
+Quarter=Quarter
 Annual=Річний
 Local=Місцеві
 Remote=Дистанційно
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Завдання
 ContactDefault_propal=Пропозиція
 ContactDefault_supplier_proposal=Пропозиція постачальника
 ContactDefault_ticket=Квиток
+ContactDefault_societe=Third party
 ContactAddedAutomatically=Контакт додано з ролей контактів контрагент
 More=Більше
 ShowDetails=Показати деталі
@@ -1242,6 +1253,7 @@ CommercialAffected=Призначений торговий представни
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=Message
+Emailing=Emailing
 Progression=Прогрес
 YourMessage=Ваше повідомлення
 YourMessageHasBeenReceived=Ваше повідомлення отримано. Ми відповімо або зв'яжемося з вами якомога швидше.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang
index fb66c170367..fb3372d2838 100644
--- a/htdocs/langs/uk_UA/members.lang
+++ b/htdocs/langs/uk_UA/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Якщо потрібна підписка, необх
 DeleteType=Видалити
 VoteAllowed=Голосування дозволено
 Physical=Індивідуальний
-Moral=корпорація
-MorAndPhy=Корпорація та фізична особа
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Увімкнути знову
 ExcludeMember=Виключити учасника
 Exclude=Виключити
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Статистика учасників за регі
 NbOfMembers=Загальна кількість членів
 NbOfActiveMembers=Загальна кількість поточних активних членів
 NoValidatedMemberYet=Перевірених учасників не знайдено
-MembersByCountryDesc=На цьому екрані відображається статистика учасників за країнами. Графіки та діаграми залежать від наявності онлайн-служби графіків Google, а також від наявності робочого інтернет-з’єднання.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Цей екран показує вам статистику членів за штатами/провінціями/кантоном.
 MembersByTownDesc=На цьому екрані відображається статистика учасників за містами.
 MembersByNature=На цьому екрані відображається статистика учасників за характером.
@@ -208,25 +209,25 @@ NewMemberbyWeb=Додано нового учасника. Очікує Схва
 NewMemberForm=Нова форма члена
 SubscriptionsStatistics=Статистика внесків
 NbOfSubscriptions=Кількість внесків
-AmountOfSubscriptions=Сума, зібрана з внесків
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=Оборот (для компанії) або бюджет (для фонду)
-DefaultAmount=Сума внеску за умовчанням (використовується, лише якщо сума не визначена на рівні типу учасника)
-MinimumAmount=Мінімальна сума (використовується лише тоді, коли сума внеску вільна)
-CanEditAmount=Розмір передплати може визначити учасник
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=Відвідувач може вибрати/редагувати суму свого внеску незалежно від типу учасника
 AmountIsLowerToMinimumNotice=Сума менша за мінімальну %s
 MEMBER_NEWFORM_PAYONLINE=Після онлайн-реєстрації автоматично перейдіть на сторінку онлайн-платежів
 ByProperties=Від природи
 MembersStatisticsByProperties=Статистика учасників за характером
-VATToUseForSubscriptions=Ставка ПДВ для внесків
-NoVatOnSubscription=Без ПДВ для внесків
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Продукт, що використовується для рядка внесків у рахунок-фактуру: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=Ім'я або компанія
 SubscriptionRecorded=Внесок записано
 NoEmailSentToMember=Учаснику не надіслано електронну пошту
 EmailSentToMember=Електронний лист надіслано учаснику за адресою %s
-SendReminderForExpiredSubscriptionTitle=Надішліть нагадування електронною поштою щодо прострочених внесків
-SendReminderForExpiredSubscription=Надіслати нагадування електронною поштою учасникам, коли термін дії внеску скоро закінчиться (параметр — це кількість днів до завершення членства, щоб надіслати нагадування. Це може бути список днів, розділених крапкою з комою, наприклад, '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Членство оплачено за поточний період (до %s)
 YouMayFindYourInvoiceInThisEmail=Ви можете знайти свій рахунок-фактуру до цього електронного листа
 XMembersClosed=%s член(ів) закрито
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Третя сторона – це юридична
 MemberFirstname=Ім'я учасника
 MemberLastname=Прізвище учасника
 MemberCodeDesc=Код учасника, унікальний для всіх учасників
-MemberSubscriptionStartFirstDayOf=Дата початку членства відповідає першому дню а
-MemberSubscriptionStartAfter=Мінімальний період перед набуттям чинності дати початку підписки, за винятком поновлення (приклад: +3m = +3 місяці, -5d = -5 днів, +1Y = +1 рік)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Членство пов’язане з узгодженою транзакцією, тому ця зміна не дозволяється.
 ConfirmMassSubsriptionCreation=Підтвердити створення підписки
 ConfirmMassSubsriptionCreationQuestion=Ви впевнені, що хочете створити %s вибрану(і) підписку(и)?
diff --git a/htdocs/langs/uk_UA/salaries.lang b/htdocs/langs/uk_UA/salaries.lang
index 43f8bac6c1f..4e36818a9e2 100644
--- a/htdocs/langs/uk_UA/salaries.lang
+++ b/htdocs/langs/uk_UA/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Нова зарплата
 AddSalary=Додати зарплату
 NewSalaryPayment=Нова зарплатна картка
 AddSalaryPayment=Додати зарплату
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Виплата заробітної плати
 SalariesPayments=Виплати заробітної плати
 SalariesPaymentsOf=Виплати заробітної плати %s
@@ -27,7 +29,7 @@ FillFieldFirst=Спочатку заповніть поле співробітн
 UpdateAmountWithLastSalary=Встановити розмір останньої зарплати
 MakeTransferRequest=Зробіть запит на переказ
 VirementOrder=Запит на переказ кредиту
-BankTransferAmount=Сума кредитного переказу
 WithdrawalReceipt=Кредитне розпорядження
 OrderWaiting=Відкладене замовлення
 FillEndOfMonth=Заповнити на кінець місяця
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
index 65808be8914..b1b18338ae6 100644
--- a/htdocs/langs/uk_UA/website.lang
+++ b/htdocs/langs/uk_UA/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Використовуйте тут список інших
 WEBSITE_CSS_URL=URL-адреса зовнішнього файлу CSS
 WEBSITE_CSS_INLINE=Вміст файлу CSS (загальний для всіх сторінок)
 WEBSITE_JS_INLINE=Вміст файлу JavaScript (загальний для всіх сторінок)
-WEBSITE_HTML_HEADER=Додавання внизу заголовка HTML (загальне для всіх сторінок)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Файл робота (robots.txt)
 WEBSITE_HTACCESS=Файл веб-сайту .htaccess
 WEBSITE_MANIFEST_JSON=Файл manifest.json веб-сайту
@@ -56,16 +56,17 @@ ReadPerm=Читати
 WritePerm=Пишіть
 TestDeployOnWeb=Тестування/розгортання в Інтернеті
 PreviewSiteServedByWebServer= <u> Попередній перегляд %s у новій вкладці. </u> <br> <br> %s буде обслуговуватися зовнішнім веб-сервером (наприклад, Apache, Nginx, IIS). You must install and setup this server before to point to directory: <br>  <strong> %s </strong>  <br> URL served by external server: <br>  <strong> %s </strong>
-PreviewSiteServedByDolibarr= <u> Попередній перегляд %s у новій вкладці. </u> <br> <br> %s буде обслуговуватися сервером Dolibarr, тому йому не потрібен додатковий веб-сервер (наприклад, Apache, Nginx, IIS). <br> Незручним є те, що URL-адреси сторінок не є зручними для користувачів і починаються зі шляху вашого Dolibarr. <br> URL served by Dolibarr: <br>  <strong> %s </strong>  <br>  <br> To use your own external web server to serve this web site, create a virtual host on your web server that points on directory <br>  <strong> %s </strong>  <br> then enter the name of this virtual server у властивостях цього веб-сайту та натисніть посилання «Тестувати/розгорнути в Інтернеті».
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL-адреса віртуального хосту, що обслуговується зовнішнім веб-сервером, не визначена
 NoPageYet=Ще немає сторінок
 YouCanCreatePageOrImportTemplate=Ви можете створити нову сторінку або імпортувати повний шаблон веб-сайту
 SyntaxHelp=Довідка щодо конкретних порад щодо синтаксису
 YouCanEditHtmlSourceckeditor=Ви можете редагувати вихідний код HTML за допомогою кнопки «Джерело» в редакторі.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Додати  <strong>зображення</strong> зберігається в каталозі <strong>documents</strong> , використовуйте оболонку <strong>viewimage.php</strong>.<br>Наприклад, для зображення в документи/медіа (відкритий каталог для загального доступу), синтаксис такий:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt; </strong><br>
-YouCanEditHtmlSource2=Синтаксис зображення, надано за допомогою посилання для спільного доступу (відкритий доступ, використовуючи хеш-ключ спільного доступу до файлу), такий: <br> <strong> &lt;img src="/viewimage.php?hashp=123425cf0707cf07c07c07c070fc077cd07cf077c07cd07cf07cb07cb07c07cb07cdcb07cb07cb07cb07cb07cb07cb07cdc07cbc
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=Щоб отримати URL-адресу зображення об’єкта PHP, використовуйте<br><strong>&lt; span>img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Більше прикладів HTML або динамічного коду доступно в <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">документації вікі</a>.<br>
 ClonePage=Клонувати сторінку/контейнер
 CloneSite=Клонувати сайт
@@ -87,15 +88,15 @@ WebsiteAccount=Обліковий запис веб-сайту
 WebsiteAccounts=Облікові записи веб-сайтів
 AddWebsiteAccount=Створити обліковий запис веб-сайту
 BackToListForThirdParty=Повернутися до списку для третіх сторін
-DisableSiteFirst=Спочатку вимкніть веб-сайт
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Назва мого сайту
 AnotherContainer=Ось як включити вміст іншої сторінки/контейнера (тут може виникнути помилка, якщо ви ввімкнете динамічний код, оскільки вбудований підконтейнер може не існувати)
 SorryWebsiteIsCurrentlyOffLine=На жаль, цей веб-сайт наразі не працює. Будь ласка, поверніться пізніше...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Увімкніть таблицю для зберігання облікових записів веб-сайтів (логін/пропуск) для кожного веб-сайту / третьої сторони
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Спочатку потрібно визначити домашню сторінку за замовчуванням
-OnlyEditionOfSourceForGrabbedContentFuture=Попередження: створення веб-сторінки шляхом імпорту зовнішньої веб-сторінки зарезервовано для досвідчених користувачів. Залежно від складності вихідної сторінки результат імпортування може відрізнятися від оригіналу. Крім того, якщо вихідна сторінка використовує загальні стилі CSS або конфліктний JavaScript, це може порушити вигляд або функції редактора веб-сайту під час роботи на цій сторінці. Цей спосіб є швидшим способом створення сторінки, але рекомендується створити нову сторінку з нуля або за запропонованим шаблоном сторінки.<br>Також зауважте, що вбудований редактор може не працювати коректність при використанні на захопленій зовнішній сторінці.
-OnlyEditionOfSourceForGrabbedContent=Лише видання джерела HTML можливе, якщо вміст було захоплено із зовнішнього сайту
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Візьміть також зображення, знайдені в css та на сторінці.
 ImagesShouldBeSavedInto=Зображення слід зберегти в каталозі
 WebsiteRootOfImages=Кореневий каталог для зображень веб-сайту
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Remove filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Categories
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/ur_PK/admin.lang b/htdocs/langs/ur_PK/admin.lang
index 41c6dcdaf07..82baeaf5766 100644
--- a/htdocs/langs/ur_PK/admin.lang
+++ b/htdocs/langs/ur_PK/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=فائلوں کی سالمیت کی جانچ
 FileIntegritySomeFilesWereRemovedOrModified=فائلوں کی سالمیت کی جانچ ناکام ہوگئی ہے۔ کچھ فائلوں میں ترمیم، ہٹایا یا شامل کیا گیا تھا۔
 GlobalChecksum=عالمی چیکسم
 MakeIntegrityAnalysisFrom=سے درخواست فائلوں کی سالمیت کا تجزیہ کریں۔
-LocalSignature=ایمبیڈڈ مقامی دستخط (کم قابل اعتماد)
-RemoteSignature=دور دراز کے دستخط (زیادہ قابل اعتماد)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=مسنگ فائلز
 FilesUpdated=اپ ڈیٹ شدہ فائلیں۔
 FilesModified=ترمیم شدہ فائلیں۔
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=صرف کچھ ایجنڈا آپشن کے ذریعہ اس
 Security=سیکورٹی
 Passwords=پاس ورڈز
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=conf.php میں محفوظ ڈیٹا بیس پاس ورڈ کو خفیہ کریں۔ اس آپشن کو فعال کرنے کی سختی سے سفارش کی جاتی ہے۔
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=<b> conf.php </b> فائل میں پاس ورڈ کو انکوڈ کرنے کے لیے، لائن کو تبدیل کریں <br> <b> $dolibarr_main_db_pass="..."؛ </b> <br> by <br> <b> $dolibarr_main_db_pass="crypted:%s"؛ </b>
 InstrucToClearPass=<b> conf.php </b> فائل میں پاس ورڈ کو ڈی کوڈ (صاف) کرنے کے لیے، لائن <br> <b> $dolibarr_main_db_pass:"c... </b> <br> by <br> <b> $dolibarr_main_db_pass="%s"؛ </b>
 ProtectAndEncryptPdfFiles=تیار کردہ پی ڈی ایف فائلوں کی حفاظت کریں۔ اس کی سفارش نہیں کی جاتی ہے کیونکہ یہ پی ڈی ایف کی بڑی تعداد کو توڑ دیتا ہے۔
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=شمار شدہ فیلڈ
-ComputedFormulaDesc=ڈائنامک کمپیوٹیڈ ویلیو حاصل کرنے کے لیے آپ یہاں آبجیکٹ کی دیگر خصوصیات یا کسی بھی پی ایچ پی کوڈنگ کا استعمال کرتے ہوئے ایک فارمولا درج کر سکتے ہیں۔ آپ کسی بھی پی ایچ پی کے موافق فارمولے استعمال کر سکتے ہیں بشمول "؟" حالت آپریٹر، اور مندرجہ ذیل عالمی آبجیکٹ: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong> >.<br><strong>وارننگ</strong>: اگر آپ کو کسی چیز کی خصوصیات کی ضرورت ہو لوڈ نہیں ہے، بس اپنے آپ کو اپنے فارمولے میں آبجیکٹ لائیں جیسا کہ دوسری مثال میں ہے۔<br>کمپیوٹیڈ فیلڈ استعمال کرنے کا مطلب ہے کہ آپ انٹرفیس سے اپنی کوئی قدر درج نہیں کر سکتے۔ نیز، اگر نحو کی خرابی ہے تو، فارمولہ کچھ نہیں لوٹا سکتا۔<br><br>فارمولے کی مثال:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>آجیکٹ کو دوبارہ لوڈ کرنے کی مثال<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldreloadedkey'*-j >capital / 5: '-1')<br><br>آجیکٹ اور اس کے بنیادی آبجیکٹ کو زبردستی لوڈ کرنے کے فارمولے کی دوسری مثال: <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Project( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ؟ $secondloadedobj->ref: 'پیرنٹ پروجیکٹ نہیں ملا'
+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'
 Computedpersistent=حسابی فیلڈ اسٹور کریں۔
 ComputedpersistentDesc=کمپیوٹ شدہ اضافی فیلڈز کو ڈیٹا بیس میں اسٹور کیا جائے گا، تاہم، اس فیلڈ کی آبجیکٹ کو تبدیل کرنے پر ہی قدر کی دوبارہ گنتی کی جائے گی۔ اگر کمپیوٹنگ فیلڈ دیگر اشیاء یا عالمی ڈیٹا پر منحصر ہے تو یہ قدر غلط ہو سکتی ہے!!
 ExtrafieldParamHelpPassword=اس فیلڈ کو خالی چھوڑنے کا مطلب ہے کہ یہ قدر بغیر خفیہ کاری کے محفوظ ہو جائے گی (فیلڈ صرف اسکرین پر ستاروں کے ساتھ چھپی ہوئی ہے)۔<br><br>درج کریں قدر 'ڈول کریپٹ' کو ایک الٹ ایبل انکرپشن الگورتھم کے ساتھ قدر کو انکوڈ کرنے کے لیے۔ صاف ڈیٹا اب بھی جانا اور اس میں ترمیم کیا جا سکتا ہے لیکن ڈیٹا بیس میں انکرپٹ کیا جاتا ہے۔<br><br>'auto' (یا 'md5' درج کریں، 'sha256', 'password_hash', ...) ڈیفالٹ پاس ورڈ انکرپشن الگورتھم (یا md5, sha256, password_hash...) استعمال کرنے کے لیے نان ریورسیبل ہیشڈ پاس ورڈ کو ڈیٹا بیس میں محفوظ کرنے کے لیے (اصل قدر بازیافت کرنے کا کوئی طریقہ نہیں)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- ای میلز بھیجنے کے لیے آپ کے اپنے ای میل سروس پرووائیڈر کے SMTP سرور کا استعمال کرنا بھی دلچسپ ہے اس لیے ایپلی کیشن سے بھیجی گئی تمام ای میلز آپ کے میل باکس کی "بھیجی گئی" ڈائرکٹری میں بھی محفوظ ہو جائیں گی۔
 WarningPHPMailD=اس لیے ای میل بھیجنے کے طریقے کو "SMTP" کی قدر میں تبدیل کرنے کی سفارش کی جاتی ہے۔
 WarningPHPMailDbis=اگر آپ واقعی ای میلز بھیجنے کے لیے پہلے سے طے شدہ "PHP" طریقہ کو برقرار رکھنا چاہتے ہیں، تو صرف اس انتباہ کو نظر انداز کریں، یا اسے %sیہاں کلک کرکے ہٹا دیں%s۔
-WarningPHPMail2=اگر آپ کے ای میل SMTP فراہم کنندہ کو ای میل کلائنٹ کو کچھ IP پتوں تک محدود کرنے کی ضرورت ہے (بہت کم)، یہ آپ کی ERP CRM درخواست کے لیے میل صارف ایجنٹ (MUA) کا IP پتہ ہے: <strong> %s </strong>۔
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=اکاؤنٹنگ (آسان)
 Module10Desc=ڈیٹا بیس کے مواد پر مبنی سادہ اکاؤنٹنگ رپورٹس (جرائد، کاروبار)۔ کوئی لیجر ٹیبل استعمال نہیں کرتا ہے۔
 Module20Name=تجاویز
 Module20Desc=تجارتی تجویز کا انتظام
-Module22Name=بڑے پیمانے پر ای میلز
-Module22Desc=بلک ای میل کا نظم کریں۔
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=توانائی
 Module23Desc=توانائی کی کھپت کی نگرانی
 Module25Name=سیلز آرڈرز
@@ -847,10 +848,10 @@ Permission212=آرڈر لائنز
 Permission213=لائن کو چالو کریں۔
 Permission214=ٹیلی فونی سیٹ اپ کریں۔
 Permission215=سیٹ اپ فراہم کنندگان
-Permission221=ای میلز پڑھیں
-Permission222=ای میلز بنائیں/ترمیم کریں (موضوع، وصول کنندگان...)
-Permission223=ای میل کی توثیق کریں (بھیجنے کی اجازت دیتا ہے)
-Permission229=ای میلز کو حذف کریں۔
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=وصول کنندگان اور معلومات دیکھیں
 Permission238=دستی طور پر میل بھیجیں۔
 Permission239=توثیق یا بھیجے جانے کے بعد میلنگ کو حذف کریں۔
@@ -1105,6 +1106,7 @@ DictionaryStaff=ملازمین کی تعداد
 DictionaryAvailability=ترسیل میں تاخیر
 DictionaryOrderMethods=آرڈر کے طریقے
 DictionarySource=تجاویز / احکامات کی اصل
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=رپورٹس کے لیے ذاتی نوعیت کے گروپس
 DictionaryAccountancysystem=اکاؤنٹس کے چارٹ کے لیے ماڈل
 DictionaryAccountancyJournal=اکاؤنٹنگ جرائد
@@ -1134,11 +1136,11 @@ BackToDictionaryList=لغت کی فہرست پر واپس جائیں۔
 TypeOfRevenueStamp=ٹیکس سٹیمپ کی قسم
 VATManagement=سیلز ٹیکس مینجمنٹ
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=پہلے سے طے شدہ طور پر مجوزہ سیلز ٹیکس 0 ہے جسے ایسوسی ایشنز، افراد یا چھوٹی کمپنیوں جیسے معاملات کے لیے استعمال کیا جا سکتا ہے۔
 VATIsUsedExampleFR=فرانس میں، اس کا مطلب ہے حقیقی مالیاتی نظام رکھنے والی کمپنیاں یا تنظیمیں (آسان اصلی یا نارمل اصلی)۔ ایک ایسا نظام جس میں VAT کا اعلان کیا جاتا ہے۔
 VATIsNotUsedExampleFR=فرانس میں، اس سے مراد ایسی انجمنیں ہیں جو کہ غیر سیلز ٹیکس کا اعلان کر رہی ہیں یا ایسی کمپنیاں، تنظیمیں یا لبرل پیشے جنہوں نے مائیکرو انٹرپرائز مالیاتی نظام (فرنچائز میں سیلز ٹیکس) کا انتخاب کیا ہے اور بغیر کسی سیلز ٹیکس کے اعلان کے فرنچائز سیلز ٹیکس ادا کیا ہے۔ یہ انتخاب رسیدوں پر حوالہ "غیر قابل اطلاق سیلز ٹیکس - آرٹ -293B آف CGI" ظاہر کرے گا۔
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=سیلز ٹیکس کی قسم
 LTRate=شرح
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=ٹیکسوں کے سیٹ اپ کے مطابق (دیک
 LabelUsedByDefault=کوڈ کے لیے کوئی ترجمہ نہ ملنے کی صورت میں بطور ڈیفالٹ استعمال شدہ لیبل
 LabelOnDocuments=دستاویزات پر لیبل لگائیں۔
 LabelOrTranslationKey=لیبل یا ترجمہ کلید
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=کسٹمر/وینڈر VAT نمبر کومبو لسٹوں میں د
 AddAdressInList=کامبو فہرستوں میں کسٹمر/وینڈر کا پتہ دکھائیں۔<br>تیسرے فریق "The Big Company corp. - 21 jump street 123456 Big town - USA" کے نام کی شکل کے ساتھ ظاہر ہوں گے۔ دی بگ کمپنی کارپوریشن"۔
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=فریق ثالث کے لیے ترسیل کا ترجیحی طریقہ پوچھیں۔
-FieldEdition=فیلڈ کا ایڈیشن %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=مثال: +2 (صرف اس صورت میں بھریں جب ٹائم زون آفسیٹ کے مسائل کا سامنا ہو)
 GetBarCode=بارکوڈ حاصل کریں۔
 NumberingModules=نمبر دینے والے ماڈل
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=انوائس کی تاریخ کو توثیق کی تاریخ پ
 SuggestedPaymentModesIfNotDefinedInInvoice=انوائس پر تجویز کردہ ادائیگیوں کا موڈ بطور ڈیفالٹ اگر انوائس پر بیان نہیں کیا گیا ہے۔
 SuggestPaymentByRIBOnAccount=اکاؤنٹ پر رقم نکال کر ادائیگی کی تجویز کریں۔
 SuggestPaymentByChequeToAddress=چیک کے ذریعے ادائیگی کی تجویز کریں۔
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=رسیدوں پر مفت متن
 WatermarkOnDraftInvoices=ڈرافٹ رسیدوں پر واٹر مارک (اگر خالی نہ ہو)
 PaymentsNumberingModule=ادائیگیوں کا نمبر دینے والا ماڈل
@@ -1718,6 +1723,7 @@ CompressionOfResources=HTTP ردعمل کا کمپریشن
 CompressionOfResourcesDesc=مثال کے طور پر اپاچی ہدایت کا استعمال کرتے ہوئے "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=موجودہ براؤزرز کے ساتھ اس طرح کا خودکار پتہ لگانا ممکن نہیں ہے۔
 DefaultValuesDesc=یہاں آپ ڈیفالٹ ویلیو کی وضاحت کر سکتے ہیں جسے آپ نیا ریکارڈ بناتے وقت استعمال کرنا چاہتے ہیں، اور/یا ڈیفالٹ فلٹرز یا ترتیب کی ترتیب جب آپ ریکارڈ کی فہرست بناتے ہیں۔
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=پہلے سے طے شدہ اقدار (فارم پر استعمال کرنے کے لیے)
 DefaultSearchFilters=پہلے سے طے شدہ تلاش کے فلٹرز
 DefaultSortOrder=پہلے سے طے شدہ ترتیب کے احکامات
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=نمبرنگ ماڈیول بھیج رہا ہے۔
 SendingsAbility=کسٹمر کی ترسیل کے لیے شپنگ شیٹس کی حمایت کریں۔
 NoNeedForDeliveryReceipts=زیادہ تر معاملات میں، شپنگ شیٹس کو کسٹمر کی ڈیلیوری کے لیے شیٹ کے طور پر استعمال کیا جاتا ہے (بھیجنے کے لیے پروڈکٹس کی فہرست) اور وہ شیٹس جو گاہک کے ذریعے موصول ہوتی ہیں اور ان پر دستخط کیے جاتے ہیں۔ لہذا مصنوعات کی ترسیل کی رسید ایک نقل شدہ خصوصیت ہے اور شاذ و نادر ہی چالو ہوتی ہے۔
 FreeLegalTextOnShippings=ترسیل پر مفت متن
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=پروڈکٹس کی ترسیل کی رسید نمبرنگ ماڈیول
 DeliveryOrderModel=مصنوعات کی ترسیل کی رسید کا ماڈل
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=ترسیل کی رسیدوں پر مفت متن
 ##### FCKeditor #####
 AdvancedEditor=ایڈوانس ایڈیٹر
 ActivateFCKeditor=اعلی درجے کے ایڈیٹر کو فعال کریں:
-FCKeditorForNotePublic=WYSIWYG عناصر کی فیلڈ "عوامی نوٹس" کی تخلیق/ایڈیشن
-FCKeditorForNotePrivate=عناصر کے "نجی نوٹ" فیلڈ کا WYSIWYG تخلیق/ایڈیشن
-FCKeditorForCompany=WYSIWYG عناصر کی فیلڈ تفصیل کا تخلیق/ایڈیشن (سوائے پروڈکٹس/سروسز)
-FCKeditorForProductDetails=WYSIWYG کی تخلیق/ایڈیشن کی مصنوعات کی تفصیل یا اشیاء کے لیے لائنیں (تجاویز، آرڈرز، انوائسز وغیرہ...)۔
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=انتباہ: اس کیس کے لیے اس اختیار کو استعمال کرنے کی سنجیدگی سے سفارش نہیں کی جاتی ہے کیونکہ یہ پی ڈی ایف فائلز بناتے وقت خصوصی حروف اور صفحہ کی فارمیٹنگ میں مسائل پیدا کر سکتا ہے۔
-FCKeditorForMailing= بڑے پیمانے پر ای میلنگ کے لیے WYSIWYG تخلیق/ایڈیشن (ٹولز-> ای میلنگ)
-FCKeditorForUserSignature=WYSIWYG تخلیق/صارف کے دستخط کا ایڈیشن
-FCKeditorForMail=تمام میل کے لیے WYSIWYG تخلیق/ایڈیشن (سوائے ٹولز-> ای میلنگ)
-FCKeditorForTicket=ٹکٹوں کے لیے WYSIWYG تخلیق/ایڈیشن
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=اسٹاک ماڈیول سیٹ اپ
 IfYouUsePointOfSaleCheckModule=اگر آپ ڈیفالٹ کے ذریعہ فراہم کردہ پوائنٹ آف سیل ماڈیول (POS) یا کسی بیرونی ماڈیول کا استعمال کرتے ہیں، تو اس سیٹ اپ کو آپ کے POS ماڈیول کے ذریعے نظر انداز کیا جا سکتا ہے۔ زیادہ تر POS ماڈیولز کو بطور ڈیفالٹ فوری طور پر انوائس بنانے اور یہاں کے اختیارات سے قطع نظر اسٹاک کو کم کرنے کے لیے ڈیزائن کیا گیا ہے۔ لہذا اگر آپ کو اپنے POS سے سیل رجسٹر کرتے وقت اسٹاک میں کمی کی ضرورت ہے یا نہیں، تو اپنے POS ماڈیول سیٹ اپ کو بھی چیک کریں۔
@@ -1867,7 +1874,6 @@ Buy=خریدنے
 Sell=بیچنا
 InvoiceDateUsed=انوائس کی تاریخ استعمال کی گئی۔
 YourCompanyDoesNotUseVAT=آپ کی کمپنی کو VAT (ہوم - سیٹ اپ - کمپنی/تنظیم) استعمال نہ کرنے کی تعریف کی گئی ہے، لہذا سیٹ اپ کے لیے کوئی VAT اختیارات نہیں ہیں۔
-AccountancyCode=اکاؤنٹنگ کوڈ
 AccountancyCodeSell=سیل اکاؤنٹ۔ کوڈ
 AccountancyCodeBuy=خریداری اکاؤنٹ۔ کوڈ
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=نیا ٹیکس بناتے وقت چیک باکس "خودکار طور پر ادائیگی بنائیں" کو بطور ڈیفالٹ خالی رکھیں
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = مینو ایجنڈا کو منتخب کرتے وقت آپ
 AGENDA_EVENT_PAST_COLOR = گزشتہ واقعہ کا رنگ
 AGENDA_EVENT_CURRENT_COLOR = موجودہ واقعہ کا رنگ
 AGENDA_EVENT_FUTURE_COLOR = مستقبل کے ایونٹ کا رنگ
-AGENDA_REMINDER_BROWSER = صارف کے براؤزر </b> پر ایونٹ کی یاد دہانی کو فعال کریں
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = آواز کی اطلاع کو فعال کریں۔
-AGENDA_REMINDER_EMAIL = ای میلز </b> کے ذریعے ایونٹ کی یاد دہانی کو فعال کریں
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = نوٹ: طے شدہ کام %s کی فریکوئنسی اس بات کا یقین کرنے کے لیے کافی ہونی چاہیے کہ یاد دہانی صحیح وقت پر بھیجی گئی ہے۔
 AGENDA_SHOW_LINKED_OBJECT = ایجنڈا ویو میں منسلک آبجیکٹ دکھائیں۔
 AGENDA_USE_EVENT_TYPE = واقعات کی اقسام کا استعمال کریں (مینو سیٹ اپ میں منظم -> ڈکشنری -> ایجنڈا کے واقعات کی قسم)
 AGENDA_USE_EVENT_TYPE_DEFAULT = ایونٹ تخلیق فارم میں ایونٹ کی قسم کے لیے اس ڈیفالٹ ویلیو کو خودکار طور پر سیٹ کریں۔
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = ایکسپورٹ لنک کو اجازت دینے کی کلید
 PastDelayVCalExport=سے پرانا واقعہ برآمد نہ کریں۔
 SecurityKey = سیکیورٹی کلید
@@ -2006,7 +2017,7 @@ BackupZipWizard=دستاویزات کی ڈائرکٹری کے آرکائیو ب
 SomethingMakeInstallFromWebNotPossible=مندرجہ ذیل وجہ سے ویب انٹرفیس سے بیرونی ماڈیول کی تنصیب ممکن نہیں ہے۔
 SomethingMakeInstallFromWebNotPossible2=اس وجہ سے، یہاں بیان کردہ اپ گریڈ کرنے کا عمل ایک دستی عمل ہے جو صرف ایک مراعات یافتہ صارف انجام دے سکتا ہے۔
 InstallModuleFromWebHasBeenDisabledContactUs=ایپلیکیشن سے بیرونی ماڈیولز یا ڈائنامک ویب سائٹس کو انسٹال یا ڈیولپ کرنا فی الحال سیکیورٹی کے مقصد کے لیے بند ہے۔ اگر آپ کو اس خصوصیت کو فعال کرنے کی ضرورت ہے تو براہ کرم ہم سے رابطہ کریں۔
-InstallModuleFromWebHasBeenDisabledByFile=آپ کے منتظم کے ذریعہ ایپلیکیشن سے بیرونی ماڈیول کی تنصیب کو غیر فعال کر دیا گیا ہے۔ اس خصوصیت کی اجازت دینے کے لیے آپ کو اس سے فائل <strong> %s </strong> کو ہٹانے کے لیے کہنا چاہیے۔
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=ایپلیکیشن سے کسی بیرونی ماڈیول کو انسٹال کرنے یا بنانے کے لیے ماڈیول فائلوں کو ڈائرکٹری میں محفوظ کرنے کی ضرورت ہے <strong> %s </strong> ۔ اس ڈائرکٹری کو Dolibarr کے ذریعے پروسیس کرنے کے لیے، آپ کو اپنا <strong> conf/conf.php </strong> سیٹ اپ کرنا چاہیے تاکہ 2 ڈائرکٹیو لائنیں شامل کی جا سکیں: <br> <strong>_c06bz0. </strong> <br> <strong> $dolibarr_main_document_root_alt='%s/custom'; </strong>
 HighlightLinesOnMouseHover=جب ماؤس کی حرکت گزر جاتی ہے تو ٹیبل لائنوں کو نمایاں کریں۔
 HighlightLinesColor=ماؤس کے اوپر سے گزرنے پر لائن کا رنگ نمایاں کریں (کسی ہائی لائٹ کے لیے 'ffffff' استعمال کریں)
@@ -2036,6 +2047,7 @@ Enter0or1=0 یا 1 درج کریں۔
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=یہاں منحنی خطوط وحدانی کے درمیان درج کریں، بائٹ نمبر کی فہرست جو کرنسی کی علامت کی نمائندگی کرتی ہے۔ مثال کے طور پر: $ کے لیے، درج کریں [36] - برازیل اصلی R$ [82,36] کے لیے - € کے لیے، [8364] درج کریں
 ColorFormat=RGB رنگ HEX فارمیٹ میں ہے، جیسے: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=شکل میں آئیکن کا نام:<br>- موجودہ تھیم ڈائرکٹری میں تصویری فائل کے لیے image.png<br>- image.png@module اگر فائل کسی ماڈیول کی ڈائرکٹری /img/ میں ہے<br>- fa-xxx ایک FontAwesome fa-xxx تصویر کے لیے<br>- ایک FontAwesome fa-xxx تصویر کے لیے fontawesome_xxx_fa_color_size (سابقہ، رنگ اور سائز سیٹ کے ساتھ)
 PositionIntoComboList=کومبو فہرستوں میں لائن کی پوزیشن
 SellTaxRate=سیلز ٹیکس کی شرح
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=مرسل ایڈریس فریم پر بارڈرز چھپائیں۔
 MAIN_PDF_NO_RECIPENT_FRAME=وصول کنندہ کے ایڈریس فریم پر بارڈرز چھپائیں۔
 MAIN_PDF_HIDE_CUSTOMER_CODE=کسٹمر کوڈ چھپائیں۔
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=ایڈریس بلاک میں بھیجنے والے/کمپنی کا نام چھپائیں۔
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=ادائیگی کی شرائط چھپائیں۔
 PROPOSAL_PDF_HIDE_PAYMENTMODE=ادائیگی کا موڈ چھپائیں۔
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=تجویز کردہ نہیں
 ARestrictedPath=ڈیٹا فائلوں کے لیے کچھ محدود راستہ
 CheckForModuleUpdate=بیرونی ماڈیولز کی تازہ کاریوں کی جانچ کریں۔
 CheckForModuleUpdateHelp=یہ عمل بیرونی ماڈیولز کے ایڈیٹرز سے رابطہ کرے گا تاکہ یہ چیک کیا جا سکے کہ آیا کوئی نیا ورژن دستیاب ہے۔
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=ایک اپ ڈیٹ دستیاب ہے۔
 NoExternalModuleWithUpdate=بیرونی ماڈیولز کے لیے کوئی اپ ڈیٹ نہیں ملا
 SwaggerDescriptionFile=سویگر API تفصیل فائل (مثال کے طور پر redoc کے ساتھ استعمال کے لیے)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=شپنگ ایڈریس دکھائیں۔
 INVOICE_SHOW_SHIPPING_ADDRESSMore=کچھ ممالک میں لازمی اشارہ (فرانس، ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=سوشل نیٹ ورک کا یو آر ایل لنک۔ سوشل نیٹ ورک ID پر مشتمل متغیر حصے کے لیے {socialid} استعمال کریں۔
 IfThisCategoryIsChildOfAnother=اگر یہ زمرہ کسی دوسرے کا بچہ ہے۔
 DarkThemeMode=ڈارک تھیم موڈ
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=انتباہ: ماڈیول %s 
 WarningModuleHasChangedSecurityCsrfParameter=انتباہ: ماڈیول %s نے آپ کی مثال کی CSRF سیکیورٹی کو غیر فعال کر دیا ہے۔ یہ کارروائی مشتبہ ہے اور آپ کی تنصیب مزید محفوظ نہیں رہ سکتی ہے۔ براہ کرم وضاحت کے لیے ماڈیول کے مصنف سے رابطہ کریں۔
 EMailsInGoingDesc=آنے والی ای میلز کا نظم ماڈیول %s کے ذریعے کیا جاتا ہے۔ اگر آپ کو آنے والی ای میلز کو سپورٹ کرنے کی ضرورت ہو تو آپ کو اسے فعال اور کنفیگر کرنا ہوگا۔
 MAIN_IMAP_USE_PHPIMAP=مقامی PHP IMAP کے بجائے IMAP کے لیے PHP-IMAP لائبریری کا استعمال کریں۔ یہ IMAP کے لیے OAuth2 کنکشن کے استعمال کی بھی اجازت دیتا ہے (ماڈیول OAuth کو بھی چالو کیا جانا چاہیے)۔
-MAIN_CHECKBOX_LEFT_COLUMN=بائیں طرف فیلڈ اور لائن کے انتخاب کے لیے کالم دکھائیں (بطور ڈیفالٹ دائیں طرف)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=ڈیفالٹ کے ذریعہ نہیں بنایا گیا ہے۔ صرف ماڈیول ایکٹیویشن پر بنایا گیا۔
 CSSPage=سی ایس ایس اسٹائل
 Defaultfortype=طے شدہ
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/ur_PK/banks.lang b/htdocs/langs/ur_PK/banks.lang
index 9333a2d6490..63ee7c4bcb0 100644
--- a/htdocs/langs/ur_PK/banks.lang
+++ b/htdocs/langs/ur_PK/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=بیلنس ختم کریں۔
 CurrentBalance=موجودہ توازن
 FutureBalance=مستقبل کا توازن
 ShowAllTimeBalance=شروع سے توازن دکھائیں۔
-AllTime=شروع سے
 Reconciliation=مفاہمت
 RIB=بینک اکاؤنٹ نمبر
 IBAN=IBAN نمبر
@@ -133,7 +132,7 @@ DeleteTransaction=اندراج کو حذف کریں۔
 ConfirmDeleteTransaction=کیا آپ واقعی اس اندراج کو حذف کرنا چاہتے ہیں؟
 ThisWillAlsoDeleteBankRecord=یہ جنریٹڈ بینک انٹری کو بھی حذف کر دے گا۔
 BankMovements=حرکتیں
-PlannedTransactions=منصوبہ بند اندراجات
+PlannedTransactions=Upcoming entries
 Graph=گرافس
 ExportDataset_banque_1=بینک اندراجات اور اکاؤنٹ اسٹیٹمنٹ
 ExportDataset_banque_2=رقم جمع کروانے کی رسید
@@ -151,7 +150,7 @@ FutureTransaction=مستقبل کا لین دین۔ مصالحت سے قاصر۔
 SelectChequeTransactionAndGenerate=ان چیکوں کو منتخب/فلٹر کریں جنہیں چیک ڈپازٹ کی رسید میں شامل کیا جانا ہے۔ پھر، "تخلیق" پر کلک کریں.
 SelectPaymentTransactionAndGenerate=ان دستاویزات کو منتخب/فلٹر کریں جنہیں %s جمع کرنے کی رسید میں شامل کیا جانا ہے۔ پھر، "تخلیق" پر کلک کریں.
 InputReceiptNumber=مفاہمت سے متعلق بینک اسٹیٹمنٹ کا انتخاب کریں۔ ترتیب دینے والی عددی قدر کا استعمال کریں۔
-InputReceiptNumberBis=YYYYMM یا YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=صلح کرنے کے لیے؟
 ThenCheckLinesAndConciliate=پھر، بینک اسٹیٹمنٹ میں موجود لائنوں کو چیک کریں اور کلک کریں۔
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=اگر یہ فنکشن فعال ہے، تو آپ ڈیب
 BankColorizeMovementName1=ڈیبٹ حرکت کے لیے پس منظر کا رنگ
 BankColorizeMovementName2=کریڈٹ موومنٹ کے لیے پس منظر کا رنگ
 IfYouDontReconcileDisableProperty=اگر آپ کچھ بینک اکاؤنٹس پر بینک مفاہمت نہیں کرتے ہیں، تو اس وارننگ کو ہٹانے کے لیے ان پر موجود پراپرٹی "%s" کو غیر فعال کر دیں۔
-NoBankAccountDefined=کوئی بینک اکاؤنٹ متعین نہیں ہے۔
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=بینک اکاؤنٹ میں کوئی ریکارڈ نہیں ملا۔ عام طور پر، ایسا اس وقت ہوتا ہے جب بینک اکاؤنٹ میں لین دین کی فہرست سے ریکارڈ کو دستی طور پر حذف کر دیا جاتا ہے (مثال کے طور پر بینک اکاؤنٹ کی مصالحت کے دوران)۔ دوسری وجہ یہ ہے کہ ادائیگی اس وقت ریکارڈ کی گئی تھی جب ماڈیول "%s" غیر فعال تھا۔
 AlreadyOneBankAccount=پہلے ہی ایک بینک اکاؤنٹ کی وضاحت کی گئی ہے۔
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA فائل کا مختلف قسم
diff --git a/htdocs/langs/ur_PK/blockedlog.lang b/htdocs/langs/ur_PK/blockedlog.lang
index 56f5cd185bb..a74771047b1 100644
--- a/htdocs/langs/ur_PK/blockedlog.lang
+++ b/htdocs/langs/ur_PK/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=ناقابل تغیر نوشتہ جات
 ShowAllFingerPrintsMightBeTooLong=تمام محفوظ شدہ لاگز دکھائیں (لمبا ہو سکتا ہے)
 ShowAllFingerPrintsErrorsMightBeTooLong=تمام غیر درست آرکائیو لاگز دکھائیں (لمبا ہو سکتا ہے)
 DownloadBlockChain=فنگر پرنٹس ڈاؤن لوڈ کریں۔
-KoCheckFingerprintValidity=محفوظ شدہ لاگ انٹری درست نہیں ہے۔ اس کا مطلب ہے کہ کسی نے (ایک ہیکر؟) اس ریکارڈ کے کچھ ڈیٹا کو ریکارڈ کرنے کے بعد اس میں ترمیم کی ہے، یا پچھلے محفوظ شدہ ریکارڈ کو مٹا دیا ہے (پچھلے # موجود کے ساتھ اس لائن کو چیک کریں) یا پچھلے ریکارڈ کے چیک سم میں ترمیم کی ہے۔
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=محفوظ شدہ لاگ ریکارڈ درست ہے۔ اس لائن کے ڈیٹا میں ترمیم نہیں کی گئی تھی اور اندراج پچھلے ایک کی پیروی کرتا ہے۔
 OkCheckFingerprintValidityButChainIsKo=محفوظ شدہ لاگ پچھلے ایک کے مقابلے میں درست معلوم ہوتا ہے لیکن سلسلہ پہلے خراب ہو گیا تھا۔
 AddedByAuthority=ریموٹ اتھارٹی میں محفوظ
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=لاگ تفصیلات
 ListOfTrackedEvents=ٹریک کردہ واقعات کی فہرست
 Fingerprint=فنگر پرنٹ
 DownloadLogCSV=آرکائیو شدہ لاگز (CSV) برآمد کریں
-DataOfArchivedEvent=محفوظ شدہ واقعہ کا مکمل ڈیٹا
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=اصل آبجیکٹ (قسم %s، id %s) منسلک نہیں (غیر تبدیل شدہ محفوظ کردہ ڈیٹا حاصل کرنے کے لیے 'مکمل ڈیٹا' کالم دیکھیں)
 BlockedLogAreRequiredByYourCountryLegislation=آپ کے ملک کی قانون سازی کے ذریعہ ناقابل تبدیلی لاگس ماڈیول کی ضرورت ہوسکتی ہے۔ اس ماڈیول کو غیر فعال کرنے سے مستقبل کے کسی بھی لین دین کو قانون اور قانونی سافٹ ویئر کے استعمال کے حوالے سے غلط قرار دیا جا سکتا ہے کیونکہ ٹیکس آڈٹ کے ذریعے ان کی توثیق نہیں کی جا سکتی ہے۔
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=آپ کے ملک کی قانون سازی کی وجہ سے ناقابل تبدیلی لاگز ماڈیول کو چالو کیا گیا تھا۔ اس ماڈیول کو غیر فعال کرنے سے مستقبل کے کسی بھی لین دین کو قانون اور قانونی سافٹ ویئر کے استعمال کے حوالے سے غلط قرار دیا جا سکتا ہے کیونکہ ٹیکس آڈٹ کے ذریعے ان کی توثیق نہیں کی جا سکتی ہے۔
@@ -30,6 +32,7 @@ BlockedLogEnabled=واقعات کو غیر تبدیل شدہ لاگز میں ٹ
 BlockedLogDisabled=غیر تبدیل شدہ لاگز میں واقعات کو ٹریک کرنے کے نظام کو کچھ ریکارڈنگ کے بعد غیر فعال کر دیا گیا ہے۔ ہم نے ٹوٹی ہوئی زنجیر کو ٹریک کرنے کے لیے ایک خاص فنگر پرنٹ محفوظ کیا۔
 BlockedLogDisabledBis=غیر تبدیل شدہ لاگز میں واقعات کو ٹریک کرنے کا نظام غیر فعال کر دیا گیا ہے۔ یہ ممکن ہے کیونکہ ابھی تک کوئی ریکارڈ نہیں بنایا گیا تھا۔
 LinkHasBeenDisabledForPerformancePurpose=کارکردگی کے مقصد کے لیے، 100ویں لائن کے بعد دستاویز کا براہ راست لنک نہیں دکھایا گیا ہے۔
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=کسٹمر انوائس کو منطقی طور پر حذف کر دیا گیا۔
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=کسٹمر ادائیگی منطقی حذف
 logPAYMENT_VARIOUS_CREATE=ادائیگی (انوائس کو تفویض نہیں کی گئی) بنائی گئی۔
 logPAYMENT_VARIOUS_DELETE=ادائیگی (انوائس کو تفویض نہیں کیا گیا) منطقی حذف
 logPAYMENT_VARIOUS_MODIFY=ادائیگی (انوائس کو تفویض نہیں کی گئی) میں ترمیم کی گئی۔
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/ur_PK/categories.lang b/htdocs/langs/ur_PK/categories.lang
index 2ae07707f21..28c354cd119 100644
--- a/htdocs/langs/ur_PK/categories.lang
+++ b/htdocs/langs/ur_PK/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=ٹیگ / زمرہ جات کے علاقے سے رابطہ
 AccountsCategoriesArea=بینک اکاؤنٹ ٹیگز/کیٹیگریز کا علاقہ
 ProjectsCategoriesArea=پروجیکٹ ٹیگز/زمرے کا علاقہ
 UsersCategoriesArea=صارف کے ٹیگ / زمرہ جات کا علاقہ
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=ذیلی زمرے
 CatList=ٹیگز/ زمرہ جات کی فہرست
 CatListAll=ٹیگز/زمرے کی فہرست (تمام اقسام)
@@ -42,7 +43,7 @@ MemberHasNoCategory=یہ ممبر کسی ٹیگ/کیٹیگری میں نہیں 
 ContactHasNoCategory=یہ رابطہ کسی ٹیگ/کیٹیگری میں نہیں ہے۔
 ProjectHasNoCategory=یہ منصوبہ کسی بھی ٹیگ/زمرے میں نہیں ہے۔
 ClassifyInCategory=ٹیگ/زمرہ میں شامل کریں۔
-RemoveCategory=Remove category
+RemoveCategory=زمرہ ہٹا دیں۔
 NotCategorized=ٹیگ/زمرہ کے بغیر
 CategoryExistsAtSameLevel=یہ زمرہ اس حوالہ کے ساتھ پہلے سے موجود ہے۔
 ContentsVisibleByAllShort=مواد سب کو نظر آتا ہے۔
@@ -68,7 +69,7 @@ StockCategoriesShort=گودام کے ٹیگ/زمرے
 ThisCategoryHasNoItems=اس زمرے میں کوئی آئٹم نہیں ہے۔
 CategId=ٹیگ/زمرہ کی شناخت
 ParentCategory=پیرنٹ ٹیگ/زمرہ
-ParentCategoryID=ID of parent tag/category
+ParentCategoryID=پیرنٹ ٹیگ/زمرہ کی ID
 ParentCategoryLabel=پیرنٹ ٹیگ/زمرہ کا لیبل
 CatSupList=دکانداروں کے ٹیگ/زمرے کی فہرست
 CatCusList=صارفین/ممکنہ ٹیگز/زمرے کی فہرست
@@ -88,18 +89,20 @@ DeleteFromCat=ٹیگز/زمرہ سے ہٹا دیں۔
 ExtraFieldsCategories=تکمیلی صفات
 CategoriesSetup=ٹیگز/کیٹیگریز سیٹ اپ
 CategorieRecursiv=پیرنٹ ٹیگ/زمرہ کے ساتھ خود بخود لنک کریں۔
-CategorieRecursivHelp=If option is on, when you add an object into a subcategory, the object will also be added into the parent categories.
-AddProductServiceIntoCategory=Assign category to the product/service
-AddCustomerIntoCategory=گاہک کو زمرہ تفویض کریں۔
-AddSupplierIntoCategory=سپلائر کو زمرہ تفویض کریں۔
-AssignCategoryTo=Assign category to
+CategorieRecursivHelp=اگر آپشن آن ہے، جب آپ کسی آبجیکٹ کو ذیلی زمرہ میں شامل کرتے ہیں، تو آبجیکٹ کو بھی پیرنٹ کیٹیگریز میں شامل کر دیا جائے گا۔
+AddProductServiceIntoCategory=پروڈکٹ/سروس کو زمرہ تفویض کریں۔
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=ٹیگ/زمرہ دکھائیں۔
 ByDefaultInList=فہرست میں بطور ڈیفالٹ
 ChooseCategory=زمرہ منتخب کریں۔
 StocksCategoriesArea=گودام کے زمرے
-TicketsCategoriesArea=Tickets Categories
+TicketsCategoriesArea=ٹکٹ کے زمرے
 ActionCommCategoriesArea=ایونٹ کے زمرے
 WebsitePagesCategoriesArea=صفحہ کنٹینر زمرہ جات
 KnowledgemanagementsCategoriesArea=KM مضمون کے زمرے
 UseOrOperatorForCategories=زمرہ جات کے لیے 'OR' آپریٹر استعمال کریں۔
-AddObjectIntoCategory=Assign the category
+AddObjectIntoCategory=زمرے کو تفویض کریں۔
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/ur_PK/companies.lang b/htdocs/langs/ur_PK/companies.lang
index 1f77dc5279c..0a09a5e647c 100644
--- a/htdocs/langs/ur_PK/companies.lang
+++ b/htdocs/langs/ur_PK/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=ملک یورپی اقتصادی برادری کے اندر ہے
 PriceFormatInCurrentLanguage=موجودہ زبان اور کرنسی میں قیمت ڈسپلے فارمیٹ
 ThirdPartyName=فریق ثالث کا نام
 ThirdPartyEmail=تھرڈ پارٹی ای میل
-ThirdParty=تیسری پارٹی
-ThirdParties=تیسرے فریقوں
+ThirdParty=Third party
+ThirdParties=Third parties
 ThirdPartyProspects=امکانات
 ThirdPartyProspectsStats=امکانات
 ThirdPartyCustomers=گاہکوں
@@ -65,6 +65,7 @@ State=ریاست/صوبہ
 StateId=ریاستی شناخت
 StateCode=ریاست/صوبائی کوڈ
 StateShort=حالت
+DepartmentBuyer=Buyer's state/province
 Region=علاقہ
 Region-State=علاقہ - ریاست
 Country=ملک
@@ -78,7 +79,7 @@ Chat=گپ شپ
 PhonePro=بس. فون
 PhonePerso=Pers فون
 PhoneMobile=موبائل
-No_Email=بلک ای میلز سے انکار کریں۔
+No_Email=Refuse mass emails
 Fax=فیکس
 Zip=زپ کوڈ
 Town=شہر
@@ -382,11 +383,12 @@ ExportCardToFormat=فارمیٹ میں کارڈ برآمد کریں۔
 ContactNotLinkedToCompany=رابطہ کسی تیسرے فریق سے منسلک نہیں ہے۔
 DolibarrLogin=Dolibarr لاگ ان
 NoDolibarrAccess=Dolibarr تک رسائی نہیں ہے۔
-ExportDataset_company_1=فریق ثالث (کمپنیاں/فاؤنڈیشنز/جسمانی لوگ) اور ان کی خصوصیات
-ExportDataset_company_2=رابطے اور ان کی خصوصیات
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=فریق ثالث اور ان کی خصوصیات
 ImportDataset_company_2=فریق ثالث کے اضافی رابطے/پتے اور صفات
-ImportDataset_company_3=فریق ثالث کے بینک اکاؤنٹس
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=فریق ثالث کے سیلز نمائندے (کمپنیوں کو سیلز کے نمائندے/صارفین تفویض کریں)
 PriceLevel=قیمت کی سطح
 PriceLevelLabels=قیمت کی سطح کے لیبلز
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=مینیجر کا نام (سی ای او، ڈائریکٹر، صدر...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=تیسرے فریق کو ضم کریں۔
-ConfirmMergeThirdparties=کیا آپ واقعی منتخب تیسرے فریق کو موجودہ کے ساتھ ضم کرنا چاہتے ہیں؟ تمام منسلک اشیاء (انوائسز، آرڈرز، ...) کو موجودہ تھرڈ پارٹی میں منتقل کر دیا جائے گا، جس کے بعد منتخب تھرڈ پارٹی کو حذف کر دیا جائے گا۔
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=تیسرے فریق کو ضم کر دیا گیا ہے۔
 SaleRepresentativeLogin=سیلز کے نمائندے کا لاگ ان
 SaleRepresentativeFirstname=سیلز کے نمائندے کا پہلا نام
@@ -460,3 +462,6 @@ ExternalSystemID=بیرونی سسٹم ID
 IDOfPaymentInAnExternalSystem=بیرونی نظام میں ادائیگی کے موڈ کی ID (جیسے پٹی، پے پال، ...)
 AADEWebserviceCredentials=AADE ویب سروس کی اسناد
 ThirdPartyMustBeACustomerToCreateBANOnStripe=فریق ثالث کو سٹرائپ سائیڈ پر اپنی بینک کی معلومات بنانے کی اجازت دینے کے لیے ایک صارف ہونا چاہیے۔
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/ur_PK/compta.lang b/htdocs/langs/ur_PK/compta.lang
index 1a871159446..66a3c8e83f7 100644
--- a/htdocs/langs/ur_PK/compta.lang
+++ b/htdocs/langs/ur_PK/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=کسٹمر انوائس کی ادائیگی
 PaymentSupplierInvoice=وینڈر انوائس کی ادائیگی
 PaymentSocialContribution=سماجی/مالیاتی ٹیکس کی ادائیگی
 PaymentVat=VAT ادائیگی
-AutomaticCreationPayment=ادائیگی کو خود بخود ریکارڈ کریں۔
+AutomaticCreationPayment=Also record the payment
 ListPayment=ادائیگیوں کی فہرست
 ListOfCustomerPayments=صارفین کی ادائیگیوں کی فہرست
 ListOfSupplierPayments=وینڈر کی ادائیگیوں کی فہرست
@@ -118,10 +118,14 @@ SocialContributionsPayments=سماجی/مالیاتی ٹیکس کی ادائیگ
 ShowVatPayment=VAT ادائیگی دکھائیں۔
 TotalToPay=ادا کرنے کے لیے کل
 BalanceVisibilityDependsOnSortAndFilters=اس فہرست میں بیلنس صرف اس صورت میں نظر آتا ہے جب ٹیبل کو %s پر ترتیب دیا گیا ہو اور 1 بینک اکاؤنٹ پر فلٹر کیا گیا ہو (کسی دوسرے فلٹر کے بغیر)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=کسٹمر اکاؤنٹنگ کوڈ
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=وینڈر اکاؤنٹنگ کوڈ
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=کسٹم. کھاتہ. کوڈ
 SupplierAccountancyCodeShort=سڑکنا. کھاتہ. کوڈ
+UserAccountancyCodeShort=User account. code
 AccountNumber=اکاؤنٹ نمبر
 NewAccountingAccount=نیا کھاتہ
 Turnover=ٹرن اوور رسید
@@ -129,7 +133,9 @@ TurnoverCollected=ٹرن اوور جمع ہوا۔
 SalesTurnoverMinimum=کم سے کم کاروبار
 ByExpenseIncome=اخراجات اور آمدنی سے
 ByThirdParties=تیسرے فریق کے ذریعہ
+ByProjects=By projects
 ByUserAuthorOfInvoice=انوائس مصنف کے ذریعہ
+DetailedListLowercase=detailed list
 CheckReceipt=رقم جمع کروانے کی رسید
 CheckReceiptShort=رقم جمع کروانے کی رسید
 LastCheckReceiptShort=تازہ ترین %s ڈپازٹ سلپس
diff --git a/htdocs/langs/ur_PK/datapolicy.lang b/htdocs/langs/ur_PK/datapolicy.lang
index 03933eaf9af..c7a8bbeb444 100644
--- a/htdocs/langs/ur_PK/datapolicy.lang
+++ b/htdocs/langs/ur_PK/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = ڈیٹا پرائیویسی پالیسی
 Module4100Desc = ڈیٹا پرائیویسی کا انتظام کرنے کے لیے ماڈیول (جی ڈی پی آر کے مطابق)
 # Administration page
 datapolicySetup = ماڈیول ڈیٹا پرائیویسی پالیسی سیٹ اپ
-Deletion = ڈیٹا کو حذف کرنا
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s مہینے
 ONE_YEAR = 1 سال
 NB_YEARS = %s سال
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = امکان/کسٹمر
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = نہ ہی امکان/نہ ہی گاہک
 DATAPOLICY_CONTACT_FOURNISSEUR = سپلائر
 DATAPOLICY_ADHERENT = رکن
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = آپ اپنے تمام متعلقہ رابطوں کو ایک GDPR ای میل بھیج سکتے ہیں (جن کو ابھی تک کوئی ای میل موصول نہیں ہوئی ہے اور جس کے لیے آپ نے ان کے GDPR معاہدے کے بارے میں کچھ رجسٹر نہیں کیا ہے)۔ ایسا کرنے کے لیے درج ذیل بٹن کا استعمال کریں۔
 SendAgreement = ای میلز بھیجیں۔
 AllAgreementSend = تمام ای میلز بھیج دی گئی ہیں۔
 TXTLINKDATAPOLICYACCEPT = لنک کے لیے متن "معاہدہ"
 TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = جی ڈی پی آر: ذاتی ڈیٹا کی پروسیسنگ
 DATAPOLICY_consentement = ذاتی ڈیٹا کی پروسیسنگ کے لیے رضامندی حاصل کی گئی۔
diff --git a/htdocs/langs/ur_PK/errors.lang b/htdocs/langs/ur_PK/errors.lang
index d3db79b8d76..62025683916 100644
--- a/htdocs/langs/ur_PK/errors.lang
+++ b/htdocs/langs/ur_PK/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=ڈائریکٹری بنانے میں ناکام۔ چیک کریں کہ ویب سرور صارف کو Dolibarr دستاویزات کی ڈائرکٹری میں لکھنے کی اجازت ہے۔ اگر اس پی ایچ پی پر پیرامیٹر <b> safe_mode </b> فعال ہے تو چیک کریں کہ Dolibarr php فائلیں ویب سرور صارف (یا گروپ) کی ملکیت ہیں۔
 ErrorNoMailDefinedForThisUser=اس صارف کے لیے کوئی میل متعین نہیں ہے۔
 ErrorSetupOfEmailsNotComplete=ای میلز کا سیٹ اپ مکمل نہیں ہے۔
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=اس خصوصیت کو کام کرنے کے لیے جاوا اسکرپٹ کو فعال کرنے کی ضرورت ہے۔ اسے سیٹ اپ - ڈسپلے میں تبدیل کریں۔
 ErrorTopMenuMustHaveAParentWithId0='ٹاپ' قسم کے مینو میں پیرنٹ مینو نہیں ہو سکتا۔ پیرنٹ مینو میں 0 ڈالیں یا 'بائیں' قسم کا مینو منتخب کریں۔
 ErrorLeftMenuMustHaveAParentId='بائیں' قسم کے مینو میں والدین کی شناخت ہونی چاہیے۔
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=اپ لوڈ کو PHP/Apache پلگ ان کے ذریع
 ErrorFileSizeTooLarge=فائل کا سائز بہت بڑا ہے یا فائل فراہم نہیں کی گئی ہے۔
 ErrorFieldTooLong=فیلڈ %s بہت لمبا ہے۔
 ErrorSizeTooLongForIntType=int قسم کے لیے سائز بہت لمبا ہے (%s ہندسے زیادہ سے زیادہ)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=سٹرنگ کی قسم کے لیے سائز بہت لمبا ہے (%s حروف زیادہ سے زیادہ)
 ErrorNoValueForSelectType=براہ کرم منتخب فہرست کے لیے قدر بھریں۔
 ErrorNoValueForCheckBoxType=براہ کرم چیک باکس کی فہرست کے لیے قدر بھریں۔
@@ -138,8 +140,9 @@ ErrorBadValueForCode=سیکیورٹی کوڈ کی خراب قدر۔ نئی قد
 ErrorBothFieldCantBeNegative=فیلڈز %s اور %s دونوں منفی نہیں ہو سکتے
 ErrorFieldCantBeNegativeOnInvoice=فیلڈ <strong>%s</strong> اس قسم کی انوائس پر منفی نہیں ہوسکتی ہے۔ اگر آپ کو ڈسکاؤنٹ لائن شامل کرنے کی ضرورت ہے تو پہلے رعایت بنائیں (تیسرے فریق کارڈ میں '%s' فیلڈ سے) اور اسے انوائس پر لاگو کریں۔
 ErrorLinesCantBeNegativeForOneVATRate=لائنوں کی کل (ٹیکس کا خالص) دی گئی غیر صفر VAT کی شرح کے لیے منفی نہیں ہو سکتا (VAT کی شرح <b> %s </b> %% کے لیے منفی ٹوٹل ملا)۔
-ErrorLinesCantBeNegativeOnDeposits=ڈپازٹ میں لائنیں منفی نہیں ہو سکتیں۔ اگر آپ ایسا کرتے ہیں تو آپ کو اس وقت مسائل کا سامنا کرنا پڑے گا جب آپ کو حتمی انوائس میں ڈپازٹ استعمال کرنے کی ضرورت ہوگی۔
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=کسٹمر انوائس میں لائن کی مقدار منفی نہیں ہو سکتی
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=ویب سرور کو چلانے کے لیے استعمال ہونے والے صارف اکاؤنٹ <b> %s </b> کو اس کی اجازت نہیں ہے۔
 ErrorNoActivatedBarcode=بار کوڈ کی کوئی قسم فعال نہیں ہے۔
 ErrUnzipFails=ZipArchive کے ساتھ %s کو ان زپ کرنے میں ناکام
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=آپ کا پی ایچ پی پیرامیٹر upload_max_filesize (%s) PHP پیرامیٹر post_max_size (%s) سے زیادہ ہے۔ یہ ایک مستقل سیٹ اپ نہیں ہے۔
 WarningPasswordSetWithNoAccount=اس ممبر کے لیے پاس ورڈ سیٹ کیا گیا تھا۔ تاہم، کوئی صارف اکاؤنٹ نہیں بنایا گیا تھا۔ لہذا یہ پاس ورڈ محفوظ ہے لیکن اسے Dolibarr میں لاگ ان کرنے کے لیے استعمال نہیں کیا جا سکتا۔ اسے کسی بیرونی ماڈیول/انٹرفیس کے ذریعے استعمال کیا جا سکتا ہے لیکن اگر آپ کو کسی رکن کے لیے کوئی لاگ ان یا پاس ورڈ متعین کرنے کی ضرورت نہیں ہے، تو آپ ممبر ماڈیول سیٹ اپ سے "ہر ممبر کے لیے لاگ ان کا انتظام کریں" کے آپشن کو غیر فعال کر سکتے ہیں۔ اگر آپ کو لاگ ان کا انتظام کرنے کی ضرورت ہے لیکن کسی پاس ورڈ کی ضرورت نہیں ہے، تو آپ اس انتباہ سے بچنے کے لیے اس فیلڈ کو خالی رکھ سکتے ہیں۔ نوٹ: اگر ممبر کسی صارف سے منسلک ہے تو ای میل کو لاگ ان کے طور پر بھی استعمال کیا جا سکتا ہے۔
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = سوئس کیو آر انوائس کو صرف ان انوائسز پر شامل کیا جا سکتا ہے جن کی ادائیگی کریڈٹ ٹرانسفر ادائیگیوں کے ساتھ کی جائے گی۔
 SwissQrCreditorAddressInvalid = کریڈٹر کا پتہ غلط ہے (کیا زپ اور سٹی سیٹ ہیں؟ (%s)
 SwissQrCreditorInformationInvalid = کریڈٹر کی معلومات IBAN (%s): %s کے لیے غلط ہے
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/ur_PK/exports.lang b/htdocs/langs/ur_PK/exports.lang
index 8247a223aa9..51a30c13b06 100644
--- a/htdocs/langs/ur_PK/exports.lang
+++ b/htdocs/langs/ur_PK/exports.lang
@@ -46,10 +46,16 @@ LineLabel=لائن کا لیبل
 LineDescription=لائن کی تفصیل
 LineUnitPrice=لائن کی یونٹ قیمت
 LineVATRate=لائن کی VAT شرح
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=لائن کے لئے مقدار
 LineTotalHT=رقم کے علاوہ لائن کے لئے ٹیکس
 LineTotalTTC=لائن کے لیے ٹیکس کے ساتھ رقم
 LineTotalVAT=لائن کے لیے VAT کی رقم
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=لائن کی قسم (0=پروڈکٹ، 1=سروس)
 FileWithDataToImport=درآمد کرنے کے لیے ڈیٹا کے ساتھ فائل کریں۔
 FileToImport=درآمد کرنے کے لیے سورس فائل
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=اسے منتخب کرنے کے لیے %s آئیکن
 ChooseFileToImport=فائل اپ لوڈ کریں پھر %s آئیکن پر کلک کریں تاکہ فائل کو سورس امپورٹ فائل کے طور پر منتخب کیا جا سکے۔
 SourceFileFormat=ماخذ فائل کی شکل
 FieldsInSourceFile=سورس فائل میں فیلڈز
-FieldsInTargetDatabase=Dolibarr ڈیٹا بیس میں ٹارگٹ فیلڈز (بولڈ = لازمی)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=کوئی فیلڈز نہیں۔
 MoveField=فیلڈ کالم نمبر %s منتقل کریں۔
 ExampleOfImportFile=امپورٹ_فائل کی_مثال
@@ -76,8 +82,8 @@ NowClickToTestTheImport=چیک کریں کہ آپ کی فائل کا فائل ف
 RunSimulateImportFile=امپورٹ سمولیشن چلائیں۔
 FieldNeedSource=اس فیلڈ کو سورس فائل سے ڈیٹا درکار ہے۔
 SomeMandatoryFieldHaveNoSource=کچھ لازمی فیلڈز کا ڈیٹا فائل کا کوئی ذریعہ نہیں ہے۔
-InformationOnSourceFile=سورس فائل پر معلومات
-InformationOnTargetTables=ٹارگٹ فیلڈز کے بارے میں معلومات
+InformationOnSourceFile=Source file
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=ایکسپورٹ کرنے کے لیے فیلڈز کے کالم میں کم از کم ایک سورس فیلڈ کو سوئچ کریں۔
 SelectFormat=اس امپورٹ فائل فارمیٹ کو منتخب کریں۔
 RunImportFile=ڈیٹا درآمد کریں۔
diff --git a/htdocs/langs/ur_PK/hrm.lang b/htdocs/langs/ur_PK/hrm.lang
index 9fd09e8ce34..a809b512b9c 100644
--- a/htdocs/langs/ur_PK/hrm.lang
+++ b/htdocs/langs/ur_PK/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=جاب پروفائل کے لیے مطلوبہ رینک
-RequiredRankShort=مطلوبہ درجہ
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=اس جاب پروفائلز کے ساتھ عہدے
-EmployeeRank=اس مہارت کے لیے ملازم کا درجہ
-EmployeeRankShort=ملازم کا درجہ
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=ملازم کی پوزیشن
 EmployeePositions=ملازمین کے عہدے
 EmployeesInThisPosition=اس عہدے پر ملازمین
@@ -72,6 +72,9 @@ AddSkill=جاب پروفائل میں مہارتیں شامل کریں۔
 RequiredSkills=اس جاب پروفائل کے لیے درکار ہنر
 UserRank=صارف کی درجہ بندی
 SkillList=ہنر کی فہرست
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=رینک محفوظ کریں۔
 TypeKnowHow=جاننے کا طریقہ
 TypeHowToBe=کیسے بننا ہے۔
@@ -95,3 +98,5 @@ NeedBusinessTravels=کاروباری سفر کی ضرورت ہے۔
 NoDescription=کوئی وضاحت نہیں
 TheJobProfileHasNoSkillsDefinedFixBefore=اس ملازم کی جانچ شدہ جاب پروفائل میں اس پر کوئی ہنر متعین نہیں ہے۔ براہ کرم مہارت (ہنر) شامل کریں، پھر حذف کریں اور تشخیص کو دوبارہ شروع کریں۔
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/ur_PK/mails.lang b/htdocs/langs/ur_PK/mails.lang
index 4a97566f269..63c947534ec 100644
--- a/htdocs/langs/ur_PK/mails.lang
+++ b/htdocs/langs/ur_PK/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=ای میل کرنا
 EMailing=ای میل کرنا
-EMailings=ای میلز
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=تمام ای میلز
+AllEMailings=All mass eMails
 MailCard=ای میل کارڈ
 MailRecipients=وصول کنندگان
 MailRecipient=وصول کنندہ
@@ -26,19 +26,19 @@ MailFile=منسلک فائلوں
 MailMessage=ای میل باڈی
 SubjectNotIn=سبجیکٹ میں نہیں۔
 BodyNotIn=جسم میں نہیں۔
-ShowEMailing=ای میل دکھائیں۔
-ListOfEMailings=ای میلز کی فہرست
-NewMailing=نئی ای میلنگ
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=ای میل میں ترمیم کریں۔
-ResetMailing=ای میل دوبارہ بھیجیں۔
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=ای میل کو حذف کریں۔
-PreviewMailing=ای میل کا پیش نظارہ کریں۔
-CreateMailing=ای میل بنائیں
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Test
-ValidMailing=درست ای میلنگ
+ValidMailing=Valid mass Email
 MailingStatusDraft=مسودہ
 MailingStatusValidated=تصدیق شدہ
 MailingStatusSent=بھیجا
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=ای میل کو جمع کرنے کے لیے تمام 
 LineInFile=فائل میں لائن %s
 RecipientSelectionModules=وصول کنندہ کے انتخاب کے لیے وضاحتی درخواستیں۔
 MailSelectedRecipients=منتخب وصول کنندگان
-MailingArea=ای میلنگ ایریا
-LastMailings=تازہ ترین %s ای میلز
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=اہداف کے اعدادوشمار
 NbOfCompaniesContacts=منفرد رابطے/پتے
 MailNoChangePossible=تصدیق شدہ ای میل کے وصول کنندگان کو تبدیل نہیں کیا جا سکتا
-SearchAMailing=میلنگ تلاش کریں۔
-SendMailing=ای میل بھیجیں۔
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=کی طرف سے بھیجا
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=ای میل بھیجنا کمانڈ لائن سے انجام دیا جاسکتا ہے۔ اپنے سرور کے منتظم سے تمام وصول کنندگان کو ای میل بھیجنے کے لیے درج ذیل کمانڈ شروع کرنے کو کہیں۔
 MailingNeedCommand2=تاہم آپ MAILING_LIMIT_SENDBYWEB پیرامیٹر شامل کرکے انہیں آن لائن بھیج سکتے ہیں جس کی قیمت آپ سیشن کے ذریعے بھیجنا چاہتے ہیں۔ اس کے لیے ہوم - سیٹ اپ - دیگر پر جائیں۔
 ConfirmSendingEmailing=اگر آپ اس اسکرین سے براہ راست ای میل بھیجنا چاہتے ہیں، تو براہ کرم تصدیق کریں کہ آپ کو یقین ہے کہ آپ ابھی اپنے براؤزر سے ای میل بھیجنا چاہتے ہیں؟
-LimitSendingEmailing=نوٹ: ویب انٹرفیس سے ای میل بھیجنا سیکیورٹی اور ٹائم آؤٹ وجوہات کی بناء پر کئی بار کیا جاتا ہے، <b> %s </b> وصول کنندگان ہر بھیجنے والے سیشن کے لیے ایک وقت میں۔
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=فہرست صاف کریں۔
 ToClearAllRecipientsClickHere=اس ای میل کے لیے وصول کنندگان کی فہرست کو صاف کرنے کے لیے یہاں کلک کریں۔
 ToAddRecipientsChooseHere=فہرستوں میں سے انتخاب کرکے وصول کنندگان کو شامل کریں۔
-NbOfEMailingsReceived=بڑے پیمانے پر ای میلز موصول ہوئیں
-NbOfEMailingsSend=بڑے پیمانے پر ای میلز بھیجی گئیں۔
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=شناختی ریکارڈ
 DeliveryReceipt=ڈیلیوری Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=آپ متعدد وصول کنندگان کی وضاحت کرنے کے لیے <b> کوما </b> الگ کرنے والا استعمال کر سکتے ہیں۔
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=اس ایونٹ کی قسم اور کمپنی کے ل
 ANotificationsWillBeSent=1 خودکار اطلاع بذریعہ ای میل بھیجی جائے گی۔
 SomeNotificationsWillBeSent=%s خودکار اطلاعات بذریعہ ای میل بھیجی جائیں گی۔
 AddNewNotification=ایک نئے خودکار ای میل نوٹیفکیشن کو سبسکرائب کریں (ٹارگٹ/ایونٹ)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=ای میل بھیجنے کی ترتیب کو '%s' پر ترتیب دیا گیا ہے۔ یہ موڈ بڑے پیمانے پر ای میل بھیجنے کے لیے استعمال نہیں کیا جا سکتا۔
 MailSendSetupIs2=آپ کو پہلے ایڈمن اکاؤنٹ کے ساتھ مینو میں جانا چاہیے اس موڈ کے ساتھ، آپ اپنے انٹرنیٹ سروس پرووائیڈر کی طرف سے فراہم کردہ SMTP سرور کا سیٹ اپ درج کر سکتے ہیں اور ماس ای میلنگ فیچر استعمال کر سکتے ہیں۔
 MailSendSetupIs3=اگر آپ کے پاس اپنے SMTP سرور کو سیٹ اپ کرنے کے بارے میں کوئی سوال ہے، تو آپ %s سے پوچھ سکتے ہیں۔
@@ -183,7 +185,7 @@ Information=معلومات
 ContactsWithThirdpartyFilter=تھرڈ پارٹی فلٹر کے ساتھ رابطے
 Unanswered=لا جواب
 Answered=جواب دیا۔
-IsNotAnAnswer=جواب نہیں ہے (ابتدائی ای میل)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=ابتدائی ای میل کا جواب ہے۔
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=نیا رابطہ بناتے وقت فیلڈ '%s' کے لیے ڈیفالٹ قدر
@@ -199,6 +201,6 @@ ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/ur_PK/main.lang b/htdocs/langs/ur_PK/main.lang
index 5e46d888fcd..a37d9c6e8eb 100644
--- a/htdocs/langs/ur_PK/main.lang
+++ b/htdocs/langs/ur_PK/main.lang
@@ -37,6 +37,7 @@ Translation=ترجمہ
 Translations=ترجمے
 CurrentTimeZone=ٹائم زون پی ایچ پی (سرور)
 EmptySearchString=غیر خالی تلاش کا معیار درج کریں۔
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=تاریخ کا معیار درج کریں۔
 NoRecordFound=کوئی ریکارڈ نہیں ملا
 NoRecordDeleted=کوئی ریکارڈ حذف نہیں ہوا۔
@@ -45,6 +46,7 @@ NoError=کوئی غلطی نہیں۔
 Error=خرابی
 Errors=غلطیاں
 ErrorFieldRequired=فیلڈ '%s' درکار ہے۔
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=فیلڈ '%s' کی قدر خراب ہے۔
 ErrorFileDoesNotExists=فائل %s موجود نہیں ہے۔
 ErrorFailedToOpenFile=فائل %s کھولنے میں ناکام
@@ -308,6 +310,7 @@ DateBuild=تعمیر کی تاریخ کی اطلاع دیں۔
 DatePayment=ادائیگی کی تاریخ
 DateApprove=منظوری کی تاریخ
 DateApprove2=منظوری کی تاریخ (دوسری منظوری)
+PendingSince=Pending since
 RegistrationDate=رجسٹریشن کی تاریخ
 UserCreation=تخلیق صارف
 UserModification=ترمیم کرنے والا صارف
@@ -495,7 +498,7 @@ ActionRunningNotStarted=شروع کرنے کے لئے
 ActionRunningShort=کام جاری ہے
 ActionDoneShort=ختم
 ActionUncomplete=نامکمل
-LatestLinkedEvents=تازہ ترین %s منسلک واقعات
+LatestLinkedEvents=The last %s events
 CompanyFoundation=کمپنی/تنظیم
 Accountant=اکاؤنٹنٹ
 ContactsForCompany=اس تیسرے فریق کے لیے رابطے
@@ -503,6 +506,7 @@ ContactsAddressesForCompany=اس تیسرے فریق کے لیے رابطے/پت
 AddressesForCompany=اس تیسرے فریق کے لیے پتے
 ActionsOnCompany=اس تیسرے فریق کے واقعات
 ActionsOnContact=اس رابطہ/پتہ کے لیے واقعات
+ActionsOnUser=Events for this user
 ActionsOnContract=اس معاہدے کے لیے تقریبات
 ActionsOnMember=اس رکن کے بارے میں واقعات
 ActionsOnProduct=اس پروڈکٹ کے بارے میں واقعات
@@ -720,6 +724,8 @@ TextUsedInTheMessageBody=ای میل باڈی
 SendAcknowledgementByMail=تصدیقی ای میل بھیجیں۔
 SendMail=ای میل بھیجیں
 Email=ای میل
+EMail=Email
+EMails=Emails
 NoEMail=کوئی ای میل نہیں۔
 AlreadyRead=پہلے ہی پڑھ چکے ہیں۔
 NotRead=ان پڑھ
@@ -792,7 +798,7 @@ Notes=نوٹس
 AddNewLine=نئی لائن شامل کریں۔
 AddFile=فائل شامل کریں
 FreeZone=مفت ٹیکسٹ پروڈکٹ
-FreeLineOfType=مفت ٹیکسٹ آئٹم، قسم:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=کلون آبجیکٹ کو اس کی اہم صفات کے ساتھ
 ReGeneratePDF=پی ڈی ایف دوبارہ بنائیں
 PDFMerge=پی ڈی ایف ضم کریں۔
@@ -878,12 +884,14 @@ toward=کی طرف
 Access=رسائی
 SelectAction=عمل کو منتخب کریں۔
 SelectTargetUser=ہدف صارف/ملازم کو منتخب کریں۔
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=کلپ بورڈ پر کاپی کرنے کے لیے Ctrl+C استعمال کریں۔
 SaveUploadedFileWithMask=سرور پر فائل کو "<strong> %s </strong>" کے ساتھ محفوظ کریں (بصورت دیگر "%s")
 OriginFileName=اصل فائل کا نام
 SetDemandReason=ذریعہ مقرر کریں۔
 SetBankAccount=بینک اکاؤنٹ کی وضاحت کریں۔
 AccountCurrency=اکاؤنٹ کی کرنسی
+AccountancyCode=Accounting Code
 ViewPrivateNote=نوٹس دیکھیں
 XMoreLines=%s لائن (لائنیں) چھپی ہوئی ہیں۔
 ShowMoreLines=زیادہ/کم لائنیں دکھائیں۔
@@ -924,6 +932,7 @@ ConfirmMassDeletionQuestion=کیا آپ واقعی %s منتخب کردہ ریک
 ConfirmMassClone=بلک کلون کی تصدیق
 ConfirmMassCloneQuestion=کلون کرنے کے لیے پروجیکٹ کو منتخب کریں۔
 ConfirmMassCloneToOneProject=پروجیکٹ کے لیے کلون %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=متعلقہ اشیاء
 ClassifyBilled=بل کی درجہ بندی کریں۔
 ClassifyUnbilled=غیر بل کی درجہ بندی کریں۔
@@ -960,10 +969,11 @@ PrivateDownloadLinkDesc=آپ کو لاگ ان ہونے کی ضرورت ہے او
 Download=ڈاؤن لوڈ کریں
 DownloadDocument=دستاویز ڈاؤن لوڈ کریں۔
 DownloadSignedDocument=دستخط شدہ دستاویز ڈاؤن لوڈ کریں۔
-ActualizeCurrency=کرنسی کی شرح کو اپ ڈیٹ کریں۔
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=مالی سال
 ModuleBuilder=ماڈیول اور ایپلیکیشن بلڈر
 SetMultiCurrencyCode=کرنسی سیٹ کریں۔
+SetMultiCurrencyRate=Set currency rate
 BulkActions=بڑی تعداد میں کارروائیاں
 ClickToShowHelp=ٹول ٹپ مدد دکھانے کے لیے کلک کریں۔
 WebSite=ویب سائٹ
@@ -1103,6 +1113,7 @@ PayedBy=کی طرف سے ادا کیا
 PayedTo=کو ادائیگی
 Monthly=ماہانہ
 Quarterly=سہ ماہی
+Quarter=Quarter
 Annual=سالانہ
 Local=مقامی
 Remote=دور دراز
@@ -1145,6 +1156,7 @@ ContactDefault_project_task=کام
 ContactDefault_propal=تجویز
 ContactDefault_supplier_proposal=سپلائر کی تجویز
 ContactDefault_ticket=ٹکٹ
+ContactDefault_societe=Third party
 ContactAddedAutomatically=تیسرے فریق کے رابطے کے کرداروں سے رابطہ شامل کیا گیا۔
 More=مزید
 ShowDetails=تفصیلات دکھائیں
@@ -1187,6 +1199,8 @@ SetSupervisor=سپروائزر مقرر کریں۔
 CreateExternalUser=بیرونی صارف بنائیں
 ConfirmAffectTag=بلک ٹیگ اسائنمنٹ
 ConfirmAffectUser=بلک یوزر اسائنمنٹ
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=ہر پروجیکٹ/موقع پر تفویض کردہ کردار
 TasksRole=ہر کام پر تفویض کردہ کردار (اگر استعمال کیا جائے)
 ConfirmSetSupervisor=بلک سپروائزر سیٹ
@@ -1238,6 +1252,9 @@ CommercialsAffected=سیلز کے نمائندے تفویض کیے گئے۔
 CommercialAffected=سیلز کا نمائندہ تفویض کیا گیا۔
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=آپ کا پیغام
 YourMessageHasBeenReceived=آپ کا پیغام موصول ہو گیا ہے۔ ہم جلد از جلد جواب دیں گے یا آپ سے رابطہ کریں گے۔
 UrlToCheck=چیک کرنے کے لیے یو آر ایل
@@ -1280,6 +1297,7 @@ AmountSalary=تنخواہ کی رقم
 InvoiceSubtype=انوائس ذیلی قسم
 ConfirmMassReverse=بلک ریورس تصدیق
 ConfirmMassReverseQuestion=کیا آپ واقعی %s منتخب ریکارڈ (ریکارڈز) کو ریورس کرنا چاہتے ہیں؟
+ConfirmActionXxx=Confirm action %s
 ElementType=Element type
 ElementId=Element Id
 Encrypted=Encrypted
@@ -1299,3 +1317,35 @@ AllEntities=All entities
 TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
+auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/ur_PK/members.lang b/htdocs/langs/ur_PK/members.lang
index 5d5d4584762..5b8d52f1b97 100644
--- a/htdocs/langs/ur_PK/members.lang
+++ b/htdocs/langs/ur_PK/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=اگر سبسکرپشن کی ضرورت ہو تو، ر
 DeleteType=حذف کریں۔
 VoteAllowed=ووٹ دینے کی اجازت ہے۔
 Physical=انفرادی
-Moral=کارپوریشن
-MorAndPhy=کارپوریشن اور انفرادی
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=دوبارہ فعال کریں۔
 ExcludeMember=ایک ممبر کو خارج کر دیں۔
 Exclude=خارج کرنا
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=علاقے کے لحاظ سے اراکین کے اعد
 NbOfMembers=اراکین کی کل تعداد
 NbOfActiveMembers=موجودہ فعال اراکین کی کل تعداد
 NoValidatedMemberYet=کوئی توثیق شدہ اراکین نہیں ملے
-MembersByCountryDesc=یہ اسکرین آپ کو ممالک کے لحاظ سے اراکین کے اعدادوشمار دکھاتی ہے۔ گراف اور چارٹس گوگل کی آن لائن گراف سروس کی دستیابی کے ساتھ ساتھ کام کرنے والے انٹرنیٹ کنکشن کی دستیابی پر منحصر ہیں۔
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=یہ اسکرین آپ کو ریاست/صوبوں/کینٹن کے لحاظ سے اراکین کے اعدادوشمار دکھاتی ہے۔
 MembersByTownDesc=یہ اسکرین آپ کو شہر کے لحاظ سے اراکین کے اعدادوشمار دکھاتی ہے۔
 MembersByNature=یہ اسکرین آپ کو فطرت کے لحاظ سے اراکین کے اعدادوشمار دکھاتی ہے۔
@@ -208,25 +209,25 @@ NewMemberbyWeb=نیا ممبر شامل کیا گیا۔ منظوری کا انت
 NewMemberForm=نیا ممبر فارم
 SubscriptionsStatistics=شراکت کے اعدادوشمار
 NbOfSubscriptions=تعاون کی تعداد
-AmountOfSubscriptions=عطیات سے جمع کی گئی رقم
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=ٹرن اوور (کمپنی کے لیے) یا بجٹ (فاؤنڈیشن کے لیے)
-DefaultAmount=شراکت کی طے شدہ رقم (صرف اس صورت میں استعمال کیا جاتا ہے جب رکن کی قسم کی سطح پر کوئی رقم کی وضاحت نہ کی گئی ہو)
-MinimumAmount=کم از کم رقم (صرف اس وقت استعمال کیا جاتا ہے جب شراکت کی رقم مفت ہو)
-CanEditAmount=رکنیت کی رقم ممبر کے ذریعہ بیان کی جاسکتی ہے۔
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=وزیٹر ممبر کی قسم سے قطع نظر اپنی شراکت کی رقم کا انتخاب/ترمیم کر سکتا ہے۔
 AmountIsLowerToMinimumNotice=رقم کم از کم %s سے کم ہے
 MEMBER_NEWFORM_PAYONLINE=آن لائن رجسٹریشن کے بعد، خود بخود آن لائن ادائیگی کے صفحے پر جائیں۔
 ByProperties=فطرت سے
 MembersStatisticsByProperties=اراکین کے اعداد و شمار فطرت کے لحاظ سے
-VATToUseForSubscriptions=شراکت کے لیے استعمال کرنے کے لیے VAT کی شرح
-NoVatOnSubscription=شراکت کے لیے کوئی VAT نہیں ہے۔
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=انوائس میں کنٹری بیوشن لائن کے لیے استعمال ہونے والی پروڈکٹ: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=نام یا کمپنی
 SubscriptionRecorded=شراکت ریکارڈ کی گئی۔
 NoEmailSentToMember=ممبر کو کوئی ای میل نہیں بھیجی گئی۔
 EmailSentToMember=رکن کو ای میل %s پر بھیجی گئی۔
-SendReminderForExpiredSubscriptionTitle=میعاد ختم ہونے والے تعاون کے لیے ای میل کے ذریعے یاد دہانی بھیجیں۔
-SendReminderForExpiredSubscription=ممبران کو ای میل کے ذریعے یاد دہانی بھیجیں جب شراکت کی میعاد ختم ہونے والی ہو (پیرامیٹر یاد دہانی بھیجنے کے لیے رکنیت ختم ہونے سے پہلے دنوں کی تعداد ہے۔ یہ سیمی کالون سے الگ کیے گئے دنوں کی فہرست ہو سکتی ہے، مثال کے طور پر '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=موجودہ مدت کے لیے ادا کی گئی رکنیت (%s تک)
 YouMayFindYourInvoiceInThisEmail=آپ کو اس ای میل کے ساتھ اپنی رسید منسلک مل سکتی ہے۔
 XMembersClosed=%s ممبران بند
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=فریق ثالث قانونی ادارہ ہے جو
 MemberFirstname=رکن کا پہلا نام
 MemberLastname=رکن کا آخری نام
 MemberCodeDesc=ممبر کوڈ، تمام اراکین کے لیے منفرد
-MemberSubscriptionStartFirstDayOf=رکنیت کی شروعات کی تاریخ ایک کے پہلے دن سے مساوی ہے۔
-MemberSubscriptionStartAfter=تجدید کے علاوہ سبسکرپشن کے آغاز کی تاریخ کے لاگو ہونے سے پہلے کی کم از کم مدت (مثال +3m = +3 ماہ، -5d = -5 دن، +1Y = +1 سال)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/ur_PK/salaries.lang b/htdocs/langs/ur_PK/salaries.lang
index 5c8fb058a41..8ac4526da10 100644
--- a/htdocs/langs/ur_PK/salaries.lang
+++ b/htdocs/langs/ur_PK/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=نئی تنخواہ
 AddSalary=تنخواہ شامل کریں۔
 NewSalaryPayment=نیا تنخواہ کارڈ
 AddSalaryPayment=تنخواہ کی ادائیگی شامل کریں۔
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=تنخواہ کی ادائیگی
 SalariesPayments=تنخواہوں کی ادائیگی
 SalariesPaymentsOf=%s کی تنخواہوں کی ادائیگی
@@ -27,7 +29,7 @@ FillFieldFirst=پہلے ملازم کی فیلڈ کو بھریں۔
 UpdateAmountWithLastSalary=آخری تنخواہ کی رقم مقرر کریں۔
 MakeTransferRequest=منتقلی کی درخواست کریں۔
 VirementOrder=کریڈٹ ٹرانسفر کی درخواست
-BankTransferAmount=کریڈٹ ٹرانسفر کی رقم
 WithdrawalReceipt=کریڈٹ ٹرانسفر آرڈر
 OrderWaiting=زیر التواء آرڈر
 FillEndOfMonth=مہینے کے آخر میں بھریں۔
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/ur_PK/website.lang b/htdocs/langs/ur_PK/website.lang
index 24561d51b8e..467ddd82aed 100644
--- a/htdocs/langs/ur_PK/website.lang
+++ b/htdocs/langs/ur_PK/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=یہاں دوسرے نام/عرفوں کی فہرست اس
 WEBSITE_CSS_URL=بیرونی CSS فائل کا URL
 WEBSITE_CSS_INLINE=CSS فائل کا مواد (تمام صفحات پر عام)
 WEBSITE_JS_INLINE=JavaScript فائل کا مواد (تمام صفحات پر عام)
-WEBSITE_HTML_HEADER=HTML ہیڈر کے نیچے اضافہ (تمام صفحات پر عام)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=روبوٹ فائل (robots.txt)
 WEBSITE_HTACCESS=ویب سائٹ .htaccess فائل
 WEBSITE_MANIFEST_JSON=ویب سائٹ manifest.json فائل
@@ -56,16 +56,17 @@ ReadPerm=پڑھیں
 WritePerm=لکھیں۔
 TestDeployOnWeb=ویب پر ٹیسٹ/تعینات کریں۔
 PreviewSiteServedByWebServer= <u> ایک نئے ٹیب میں %s کا جائزہ لیں۔ </u> <br> <br> %s ایک بیرونی ویب سرور (جیسے Apache, Nginx, IIS) کے ذریعہ پیش کیا جائے گا۔ آپ کی ڈائریکٹری کی طرف اشارہ کرنے سے پہلے اس سرور انسٹال اور سیٹ اپ کرنا ضروری ہے: <br> <strong> %s </strong> <br> URL بیرونی سرور کی طرف سے خدمات انجام دیں: <br> <strong> %s </strong>
-PreviewSiteServedByDolibarr= <u> ایک نئے ٹیب میں %s کا جائزہ لیں۔ </u> <br> <br> %s Dolibarr سرور کے ذریعہ پیش کیا جائے گا لہذا اسے انسٹال کرنے کے لئے کسی اضافی ویب سرور (جیسے Apache, Nginx, IIS) کی ضرورت نہیں ہے۔ <br> تکلیف یہ ہے کہ صفحات کے یو آر ایل صارف دوست نہیں ہیں اور آپ کے ڈولیبر کے راستے سے شروع ہوتے ہیں۔ <br> URL Dolibarr طرف سے کی خدمت: <br> <strong> %s </strong> <br> اس ویب سائٹ کی خدمت کو اپنے ویب سرور پر ایک مجازی میزبان پیدا کرنے کے لئے آپ کی اپنی بیرونی ویب سرور کا استعمال کرنے کے <br> کہ ڈائریکٹری پر پوائنٹس <br> <strong> %s </strong> <br> پھر اس مجازی سرور کا نام درج کریں اس ویب سائٹ کی خصوصیات میں اور "Test/deploy on the web" کے لنک پر کلک کریں۔
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=بیرونی ویب سرور کے ذریعہ پیش کردہ ورچوئل ہوسٹ کا URL متعین نہیں ہے۔
 NoPageYet=ابھی تک کوئی صفحہ نہیں ہے۔
 YouCanCreatePageOrImportTemplate=آپ ایک نیا صفحہ بنا سکتے ہیں یا مکمل ویب سائٹ ٹیمپلیٹ درآمد کر سکتے ہیں۔
 SyntaxHelp=مخصوص نحوی نکات پر مدد کریں۔
 YouCanEditHtmlSourceckeditor=آپ ایڈیٹر میں "ماخذ" بٹن کا استعمال کرتے ہوئے HTML سورس کوڈ میں ترمیم کر سکتے ہیں۔
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=شیئر لنک کے ساتھ شیئر کردہ تصویر کے لیے (فائل کی شیئرنگ ہیش کلید کا استعمال کرتے ہوئے کھلی رسائی)، نحو یہ ہے: <br> <strong> &lt;img src="/viewimage.php?hashp=1234256a...20120ccd07800d50d50d50d5080cd57800mg
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=کلون صفحہ/کنٹینر
 CloneSite=کلون سائٹ
@@ -87,15 +88,15 @@ WebsiteAccount=ویب سائٹ اکاؤنٹ
 WebsiteAccounts=ویب سائٹ اکاؤنٹس
 AddWebsiteAccount=ویب سائٹ اکاؤنٹ بنائیں
 BackToListForThirdParty=تیسرے فریقوں کی فہرست پر واپس جائیں۔
-DisableSiteFirst=پہلے ویب سائٹ کو غیر فعال کریں۔
+DisableSiteFirst=Put website offline first
 MyContainerTitle=میری ویب سائٹ کا عنوان
 AnotherContainer=دوسرے صفحہ/کنٹینر کے مواد کو شامل کرنے کا طریقہ یہ ہے (اگر آپ ڈائنامک کوڈ کو فعال کرتے ہیں تو آپ کو یہاں غلطی ہو سکتی ہے کیونکہ ایمبیڈڈ سب کنٹینر موجود نہیں ہو سکتا ہے)
 SorryWebsiteIsCurrentlyOffLine=معذرت، یہ ویب سائٹ فی الحال آف لائن ہے۔ براہ کرم بعد میں واپس آئیں...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=ہر ویب سائٹ / تیسرے فریق کے لیے ویب سائٹ اکاؤنٹس (لاگ ان/پاس) ذخیرہ کرنے کے لیے ٹیبل کو فعال کریں۔
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=آپ کو پہلے ڈیفالٹ ہوم پیج کی وضاحت کرنی ہوگی۔
-OnlyEditionOfSourceForGrabbedContentFuture=انتباہ: ایک بیرونی ویب صفحہ درآمد کرکے ویب صفحہ بنانا تجربہ کار صارفین کے لیے مخصوص ہے۔ ماخذ صفحہ کی پیچیدگی پر منحصر ہے، درآمد کا نتیجہ اصل سے مختلف ہو سکتا ہے۔ نیز اگر سورس پیج عام سی ایس ایس اسٹائلز یا متضاد JavaScript استعمال کرتا ہے، تو اس صفحہ پر کام کرتے وقت یہ ویب سائٹ ایڈیٹر کی شکل یا خصوصیات کو توڑ سکتا ہے۔ یہ طریقہ ایک صفحہ بنانے کا ایک تیز طریقہ ہے لیکن یہ تجویز کیا جاتا ہے کہ آپ اپنا نیا صفحہ شروع سے یا تجویز کردہ صفحہ ٹیمپلیٹ سے بنائیں۔<br>یہ بھی نوٹ کریں کہ ان لائن ایڈیٹر کام نہیں کرسکتا ہے۔ درستگی جب پکڑے گئے بیرونی صفحہ پر استعمال کی جائے۔
-OnlyEditionOfSourceForGrabbedContent=HTML ماخذ کا صرف ایڈیشن ہی ممکن ہے جب مواد کسی بیرونی سائٹ سے پکڑا گیا ہو۔
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=سی ایس ایس اور صفحہ میں پائی جانے والی تصاویر کو بھی پکڑو۔
 ImagesShouldBeSavedInto=تصاویر کو ڈائریکٹری میں محفوظ کیا جانا چاہیے۔
 WebsiteRootOfImages=ویب سائٹ کی تصاویر کے لیے روٹ ڈائرکٹری
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Remove filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Categories
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index d46a2edb0e4..8fa6655bfb4 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Fayllarning yaxlitligini tekshirish o'tdi, am
 FileIntegritySomeFilesWereRemovedOrModified=Fayllarning yaxlitligini tekshirib bo'lmadi. Ba'zi fayllar o'zgartirildi, olib tashlandi yoki qo'shildi.
 GlobalChecksum=Global nazorat summasi
 MakeIntegrityAnalysisFrom=Dastur fayllarining yaxlitligini tahlil qiling
-LocalSignature=O'rnatilgan mahalliy imzo (unchalik ishonchli emas)
-RemoteSignature=Masofadagi uzoq imzo (ishonchli)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=Yo'qotilgan fayllar
 FilesUpdated=Yangilangan fayllar
 FilesModified=O'zgartirilgan fayllar
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Faqat ba'zi kun tartibi variantlari tomonidan ishlatiladi
 Security=Xavfsizlik
 Passwords=Parollar
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Conf.php-da saqlangan ma'lumotlar bazasi parolini shifrlash. Ushbu parametrni faollashtirish tavsiya etiladi.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=Parolni <b> conf.php </b> faylida kodlash uchun <br> <b> $ dolibarr_main_db_pass = "..." qatorini almashtiring; </b> <br> tomonidan <br> <b> $ dolibarr_main_db_pass = "crypted: %s"; </b>
 InstrucToClearPass=Parolni <b> conf.php </b> faylida dekodlash (aniq) qilish uchun <br> <b> $ dolibarr_main_db_pass = "crypted: ..." qatorini almashtiring; </b> <br> tomonidan <br> <b> $ dolibarr_main_db_pass = "%s"; </b>
 ProtectAndEncryptPdfFiles=Yaratilgan PDF-fayllarni himoya qilish. Bu tavsiya etilmaydi, chunki u ommaviy ishlab chiqarishni buzadi.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Hisoblangan maydon
-ComputedFormulaDesc=Dinamik hisoblangan qiymatni olish uchun ob'ektning boshqa xususiyatlaridan yoki istalgan PHP kodlashidan foydalanib, bu erga formulani kiritishingiz mumkin. Siz har qanday PHP-ga mos formulalardan foydalanishingiz mumkin, shu jumladan "?" shart operatori va quyidagi global obyekt: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>OGOHLANTIRISH</strong> of ob'ekt xususiyatlari: Agar sizga kerak bo'lsa. yuklanmagan, faqat ikkinchi misoldagi kabi oʻz formulangizga obʼyektni olib keling.<br>Hisoblangan maydondan foydalanish interfeysdan oʻzingizga hech qanday qiymat kirita olmasligingizni anglatadi. Bundan tashqari, sintaksis xatosi bo'lsa, formula hech narsa qaytara olmaydi.<br><br>Formula misoli:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Obyektni qayta yuklash uchun misol<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] $j- >kapital / 5: '-1')<br><br>Obyekt va uning asosiy ob'ektini majburlash uchun formulaning boshqa misoli: <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = yangi loyiha( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Ota loyiha topilmadi'
+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'
 Computedpersistent=Hisoblangan maydonni saqlash
 ComputedpersistentDesc=Hisoblangan qo'shimcha maydonlar ma'lumotlar bazasida saqlanadi, ammo qiymat faqat ushbu maydon ob'ekti o'zgartirilganda qayta hisoblanadi. Agar hisoblangan maydon boshqa ob'ektlarga yoki global ma'lumotlarga bog'liq bo'lsa, bu qiymat noto'g'ri bo'lishi mumkin !!
 ExtrafieldParamHelpPassword=Bu maydonni boʻsh qoldirish, bu qiymat shifrlashSIZ saqlanishini bildiradi (maydon shunchaki yulduzlar bilan ekranda yashiringan).<br><br>Kirish qiymatni teskari shifrlash algoritmi bilan kodlash uchun "dolcrypt" qiymati. Tozalangan maʼlumotlar hali ham maʼlum boʻlishi va tahrirlanishi mumkin, lekin maʼlumotlar bazasiga shifrlangan.<br><br>“auto” (yoki “md5”) kiriting. 'sha256', 'password_hash', ...) standart parolni shifrlash algoritmidan (yoki md5, sha256, password_hash...) foydalanish uchun qaytarilmaydigan xeshlangan parolni maʼlumotlar bazasiga saqlash (asl qiymatni olishning imkoni yoʻq)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Elektron pochta xabarlarini yuborish uchun o'zingizning elektron pochta xizmati provayderingizning SMTP-serveridan foydalanish ham qiziq, shuning uchun dasturdan yuborilgan barcha elektron pochta xabarlari sizning pochta qutingizdagi "Yuborilgan" katalogga saqlanadi.
 WarningPHPMailD=Shuning uchun elektron pochta xabarlarini yuborish usulini "SMTP" qiymatiga o'zgartirish tavsiya etiladi.
 WarningPHPMailDbis=Agar siz haqiqatan ham e-pochta xabarlarini yuborish uchun standart “PHP” usulini saqlab qolmoqchi bo‘lsangiz, bu ogohlantirishga e’tibor bermang yoki %sbu yerga bosing%s.
-WarningPHPMail2=Agar sizning SMTP elektron pochta provayderingiz elektron pochta mijozini ba'zi bir IP-manzillar bilan cheklashi kerak bo'lsa (juda kam), bu sizning ERP CRM-ilovangiz uchun pochta foydalanuvchisi agentining (MUA) IP-manzili: <strong> %s </strong>.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Buxgalteriya hisobi (soddalashtirilgan)
 Module10Desc=Ma'lumotlar bazasi tarkibiga asoslangan oddiy buxgalteriya hisobotlari (jurnallar, oborot). Biron bir jadval jadvalidan foydalanmaydi.
 Module20Name=Takliflar
 Module20Desc=Tijorat takliflarini boshqarish
-Module22Name=Ommaviy elektron pochta xabarlari
-Module22Desc=Ommaviy elektron pochta xabarlarini boshqaring
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Energiya
 Module23Desc=Energiya sarfini kuzatish
 Module25Name=Sotish bo'yicha buyurtmalar
@@ -847,10 +848,10 @@ Permission212=Buyurtma satrlari
 Permission213=Chiziqni yoqing
 Permission214=Telefoniyani o'rnatish
 Permission215=O'rnatish provayderlari
-Permission221=Elektron pochta xabarlarini o'qing
-Permission222=Elektron pochta xabarlarini yaratish / o'zgartirish (mavzu, qabul qiluvchilar ...)
-Permission223=Elektron pochta xabarlarini tasdiqlash (yuborishga imkon beradi)
-Permission229=Elektron pochta xabarlarini o'chirish
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Qabul qiluvchilarni va ma'lumotlarni ko'ring
 Permission238=Pochta xabarlarini qo'lda yuboring
 Permission239=Tasdiqlangandan yoki yuborilgandan so'ng pochta xabarlarini o'chirib tashlang
@@ -1105,6 +1106,7 @@ DictionaryStaff=Xodimlar soni
 DictionaryAvailability=Yetkazib berishning kechikishi
 DictionaryOrderMethods=Buyurtma berish usullari
 DictionarySource=Takliflarning / buyurtmalarning kelib chiqishi
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Hisobotlar uchun moslashtirilgan guruhlar
 DictionaryAccountancysystem=Hisob-kitoblar rejasi uchun modellar
 DictionaryAccountancyJournal=Buxgalteriya jurnallari
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Lug'atlar ro'yxatiga qaytish
 TypeOfRevenueStamp=Soliq markasining turi
 VATManagement=Sotish bo'yicha soliqni boshqarish
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Sukut bo'yicha taklif qilinadigan Soliq solig'i 0 ga teng bo'lib, u assotsiatsiyalar, jismoniy shaxslar yoki kichik kompaniyalar kabi hollarda ishlatilishi mumkin.
 VATIsUsedExampleFR=Frantsiyada bu haqiqiy fiskal tizimga ega bo'lgan kompaniyalar yoki tashkilotlarni anglatadi (Soddalashtirilgan real yoki normal real). QQS e'lon qilingan tizim.
 VATIsNotUsedExampleFR=Frantsiyada bu Sotishdan tashqari deklaratsiyalangan assotsiatsiyalarni yoki mikrofirma fiskal tizimini tanlagan (franchayzadagi savdo solig'i) va franchayzing savdo soliqlarini hech qanday savdo deklaratsiyasisiz to'lagan kompaniyalar, tashkilotlar yoki liberal kasblarni anglatadi. Ushbu tanlovda hisobvaraq-fakturalarda "Amalga oshirilmaydigan savdo solig'i - CGI san'ati-293B" ma'lumotnomasi ko'rsatiladi.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Sotishdan olinadigan soliq turi
 LTRate=Tezlik
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Soliqlarni o'rnatishga muvofiq (Qarang: %s - %s - %s),
 LabelUsedByDefault=Agar kod uchun tarjima topilmasa, sukut bo'yicha ishlatiladigan yorliq
 LabelOnDocuments=Hujjatlardagi yorliq
 LabelOrTranslationKey=Yorliq yoki tarjima kaliti
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=Mijoz/sotuvchi QQS raqamini birlashtirilgan ro'yxatlarda ko'rsatish
 AddAdressInList=Mijoz/sotuvchi manzilini birlashtirilgan roʻyxatlarda koʻrsating.<br>Uchinchi tomonlarda "" oʻrniga "The Big Company corp. - 21 jump street 123456 Big town - USA" nom formati paydo boʻladi. Katta kompaniya korporatsiyasi".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Uchinchi shaxslar uchun jo'natilgan transport usulini so'rang.
-FieldEdition=%s maydonining nashri
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Misol: +2 (faqat vaqt mintaqasini ofset bilan bog'liq muammolar yuzaga kelganda to'ldiring)
 GetBarCode=Shtrixli kodni oling
 NumberingModules=Nomerlash modellari
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Hisob-fakturani tasdiqlash sanasiga majburlang
 SuggestedPaymentModesIfNotDefinedInInvoice=Hisob-fakturada belgilanmagan bo'lsa, sukut bo'yicha hisob-kitob bo'yicha tavsiya etilgan to'lovlar rejimi
 SuggestPaymentByRIBOnAccount=Hisobga pul tushirish orqali to'lovni taklif eting
 SuggestPaymentByChequeToAddress=To'lovni chek orqali taklif eting
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Hisob-fakturalarda bepul matn
 WatermarkOnDraftInvoices=Hisob-fakturalardagi suv belgisi (agar bo'sh bo'lmasa)
 PaymentsNumberingModule=To'lovlarni raqamlash modeli
@@ -1718,6 +1723,7 @@ CompressionOfResources=HTTP javoblarini siqish
 CompressionOfResourcesDesc=Masalan, "AddOutputFilterByType DEFLATE" Apache ko'rsatmasidan foydalanish
 TestNotPossibleWithCurrentBrowsers=Hozirgi brauzerlarda bunday avtomatik aniqlash mumkin emas
 DefaultValuesDesc=Bu erda siz yangi yozuv yaratishda foydalanmoqchi bo'lgan birlamchi qiymatni va / yoki standart filtrlarni yoki yozuvlarni ro'yxatlashda tartiblashtirish tartibini belgilashingiz mumkin.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Standart qiymatlar (shakllarda foydalanish uchun)
 DefaultSearchFilters=Standart qidiruv filtrlari
 DefaultSortOrder=Standart tartiblash buyurtmalari
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Yuborish raqamlash modullari
 SendingsAbility=Mijozlarni etkazib berish uchun jo'natma varaqlarini qo'llab-quvvatlash
 NoNeedForDeliveryReceipts=Ko'pgina hollarda, jo'natma varaqalari ham mijozlarni etkazib berish uchun varaqalar (yuboriladigan mahsulotlar ro'yxati), ham mijoz tomonidan qabul qilingan va imzolangan varaqlar sifatida ishlatiladi. Shuning uchun mahsulotni etkazib berish kvitansiyasi takrorlanadigan xususiyat bo'lib, kamdan-kam hollarda faollashtiriladi.
 FreeLegalTextOnShippings=Yuklarni jo'natishda bepul matn
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Mahsulotlarni etkazib berish kvitansiyasini raqamlash moduli
 DeliveryOrderModel=Mahsulotlarni etkazib berish kvitansiyasi modeli
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Yetkazib berish kvitansiyalari bo'yicha bepul ma
 ##### FCKeditor #####
 AdvancedEditor=Murakkab muharrir
 ActivateFCKeditor=Kengaytirilgan tahrirlovchini faollashtirish:
-FCKeditorForNotePublic=WYSIWYG elementlarning "ommaviy eslatmalar" maydonini yaratish/nashr qilish
-FCKeditorForNotePrivate=WYSIWYG elementlarning "shaxsiy qaydlari" maydonini yaratish/nashr qilish
-FCKeditorForCompany=WYSIWYG elementlarning maydon tavsifini yaratish/nashr qilish (mahsulotlar/xizmatlardan tashqari)
-FCKeditorForProductDetails=WYSIWYG mahsulot tavsifini yoki ob'ektlar uchun satrlarni yaratish/nashr qilish (takliflar qatorlari, buyurtmalar, schyot-fakturalar va boshqalar).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Ogohlantirish: Ushbu holatda ushbu parametrdan foydalanish tavsiya etilmaydi, chunki u PDF-fayllarni yaratishda maxsus belgilar va sahifa formatlash bilan bog'liq muammolarni keltirib chiqarishi mumkin.
-FCKeditorForMailing= Ommaviy elektron pochta jo'natmalari uchun WYSIWYG yaratish/nashr qilish (Asboblar->emailing)
-FCKeditorForUserSignature=WYSIWYG foydalanuvchi imzosini yaratish/nashr qilish
-FCKeditorForMail=Barcha pochta uchun WYSIWYG yaratish/nashr qilish (Asboblar-> Elektron pochtadan tashqari)
-FCKeditorForTicket=Chiptalar uchun WYSIWYG yaratish/nashr
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Birja modulini sozlash
 IfYouUsePointOfSaleCheckModule=Agar siz sukut bo'yicha taqdim etilgan Sotish nuqtasi moduli (POS) yoki tashqi moduldan foydalansangiz, ushbu sozlash POS modulingiz tomonidan e'tiborsiz qoldirilishi mumkin. Ko'pgina POS-modullar sukut bo'yicha darhol hisob-fakturani yaratish va bu erdagi variantlardan qat'iy nazar zaxiralarni kamaytirish uchun ishlab chiqilgan. Shunday qilib, sizning POS-dan savdo-sotiqni ro'yxatdan o'tkazishda sizda aktsiyalar kamayishi kerak bo'lsa yoki kerak bo'lmasa, shuningdek POS modul sozlamalarini tekshiring.
@@ -1867,7 +1874,6 @@ Buy=Sotib oling
 Sell=Sotish
 InvoiceDateUsed=Hisob-faktura sanasi ishlatilgan
 YourCompanyDoesNotUseVAT=Sizning kompaniyangiz QQSdan foydalanmasligi aniqlandi (Uy - O'rnatish - Kompaniya / tashkilot), shuning uchun sozlash uchun QQS variantlari mavjud emas.
-AccountancyCode=Buxgalteriya kodi
 AccountancyCodeSell=Sotish hisobi. kod
 AccountancyCodeBuy=Hisobni sotib olish. kod
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Yangi soliqni yaratishda sukut bo'yicha "To'lovni avtomatik ravishda yaratish" katagiga bo'sh joy qo'ying
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Kun tartibi menyusini tanlashda qaysi ko'rinishni sukut bo
 AGENDA_EVENT_PAST_COLOR = O'tgan voqea rangi
 AGENDA_EVENT_CURRENT_COLOR = Joriy voqea rangi
 AGENDA_EVENT_FUTURE_COLOR = Kelajakdagi voqea rangi
-AGENDA_REMINDER_BROWSER = <b> foydalanuvchi brauzerida voqea eslatmasini yoqish
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Ovozli bildirishnomani yoqish
-AGENDA_REMINDER_EMAIL = <b> hodisasini eslatishni </b> elektron pochta orqali yoqing (har bir tadbirda eslatish opsiyasi / kechikishi aniqlanishi mumkin).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Eslatma: %s ishining chastotasi eslatmaning to'g'ri vaqtda yuborilganligiga ishonch hosil qilish uchun etarli bo'lishi kerak.
 AGENDA_SHOW_LINKED_OBJECT = Bog'langan ob'ektni kun tartibidagi ko'rinishga ko'rsatish
 AGENDA_USE_EVENT_TYPE = Voqealar turlaridan foydalaning (O'rnatish menyusi -> Lug'atlar -> Kun tartibidagi tadbirlar turi)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Voqeani yaratish shaklida voqea turi uchun ushbu standart qiymatni avtomatik ravishda sozlash
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Eksport havolasini tasdiqlash uchun kalit
 PastDelayVCalExport=Eskiroq voqeani eksport qilmang
 SecurityKey = Elektron kalit
@@ -2006,7 +2017,7 @@ BackupZipWizard=Hujjatlar katalogini yaratish uchun sehrgar
 SomethingMakeInstallFromWebNotPossible=Tashqi modulni o'rnatish quyidagi sabablarga ko'ra veb-interfeysdan mumkin emas:
 SomethingMakeInstallFromWebNotPossible2=Shu sababli, bu erda tavsiflangan yangilash jarayoni faqat imtiyozli foydalanuvchi amalga oshirishi mumkin bo'lgan qo'lda bajariladigan jarayondir.
 InstallModuleFromWebHasBeenDisabledContactUs=Ilovadan tashqi modullar yoki dinamik veb-saytlarni o'rnatish yoki ishlab chiqish hozirda xavfsizlik maqsadida bloklangan. Agar siz ushbu xususiyatni yoqishingiz kerak bo'lsa, biz bilan bog'laning.
-InstallModuleFromWebHasBeenDisabledByFile=Ilovadan tashqi modulni o'rnatishni administratoringiz o'chirib qo'ydi. Ushbu funktsiyaga ruxsat berish uchun siz undan <strong> %s </strong> faylini olib tashlashini so'rashingiz kerak.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Tashqi modulni dasturdan o'rnatish yoki yaratish uchun modul fayllarini <strong> %s </strong> katalogiga saqlash kerak. Ushbu katalogni Dolibarr tomonidan qayta ishlash uchun siz ikkita direktiv qatorini qo'shish uchun <strong> conf / conf.php </strong>-ni o'rnatishingiz kerak: <br> <strong> $ dolibarr_main_url_root_; </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s / custom'; </strong>
 HighlightLinesOnMouseHover=Sichqoncha harakati o'tib ketganda jadval satrlarini ajratib ko'rsatish
 HighlightLinesColor=Sichqoncha o'tib ketganda chiziq rangini belgilang (ajratish uchun 'ffffff' dan foydalaning)
@@ -2036,6 +2047,7 @@ Enter0or1=0 yoki 1 kiriting
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Qavslar oralig'iga bu erga kiriting, valyuta belgisini ko'rsatadigan bayt raqamlari ro'yxati. Masalan: $ uchun, [36] kiriting - Braziliya uchun haqiqiy R $ [82,36] - € uchun, [8364] kiriting
 ColorFormat=RGB rangi HEX formatida, masalan: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Belgi nomi formatda:<br>- joriy mavzu katalogiga rasm fayli uchun image.png<br>- image.png@module agar fayl modulning /img/ katalogida bo'lsa<br>- FontAwesome fa-xxx picto uchun fa-xxx<br>- FontAwesome fa-xxx picto uchun fontawesome_xxx_fa_color_size (prefiks, rang va oʻlchamlar toʻplami bilan)
 PositionIntoComboList=Chiziqning kombinatsion ro'yxatlarga joylashishi
 SellTaxRate=Sotishdan olinadigan soliq stavkasi
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Yuboruvchining manzil ramkasidagi chegaralarni yashirish
 MAIN_PDF_NO_RECIPENT_FRAME=Qabul qiluvchining manzil ramkasida chegaralarni yashirish
 MAIN_PDF_HIDE_CUSTOMER_CODE=Mijoz kodini yashirish
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Manzil blokida yuboruvchi/kompaniya nomini yashirish
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=To'lov shartlarini yashirish
 PROPOSAL_PDF_HIDE_PAYMENTMODE=To'lov rejimini yashirish
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=Tavsiya etilmaydi
 ARestrictedPath=Ma'lumotlar fayllari uchun ba'zi cheklangan yo'llar
 CheckForModuleUpdate=Tashqi modullarning yangilanishlarini tekshiring
 CheckForModuleUpdateHelp=Ushbu amal tashqi modullar tahrirlovchilariga yangi versiya mavjudligini tekshirish uchun ulanadi.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Yangilanish mavjud
 NoExternalModuleWithUpdate=Tashqi modullar uchun hech qanday yangilanish topilmadi
 SwaggerDescriptionFile=Swagger API tavsif fayli (masalan, redoc bilan ishlatish uchun)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Yetkazib berish manzilini ko'rsatish
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Ba'zi mamlakatlarda majburiy ko'rsatma (Frantsiya, ...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Ijtimoiy tarmoqning url havolasi. Ijtimoiy tarmoq identifikatorini o'z ichiga olgan o'zgaruvchan qism uchun {socialid} dan foydalaning.
 IfThisCategoryIsChildOfAnother=Agar bu toifa boshqa birining farzandi bo'lsa
 DarkThemeMode=Qorong'i mavzu rejimi
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Ogohlantirish: %s moduli har bi
 WarningModuleHasChangedSecurityCsrfParameter=Ogohlantirish: %s moduli namunangizning CSRF xavfsizligini o‘chirib qo‘ydi. Bu harakat shubhali va oʻrnatishingiz endi xavfsiz boʻlmasligi mumkin. Iltimos, tushuntirish uchun modul muallifiga murojaat qiling.
 EMailsInGoingDesc=Kiruvchi xatlar %s moduli tomonidan boshqariladi. Kiruvchi elektron pochta xabarlarini qo'llab-quvvatlashingiz kerak bo'lsa, uni yoqishingiz va sozlashingiz kerak.
 MAIN_IMAP_USE_PHPIMAP=Mahalliy PHP IMAP o‘rniga IMAP uchun PHP-IMAP kutubxonasidan foydalaning. Bu IMAP uchun OAuth2 ulanishidan foydalanishga ham imkon beradi (OAuth moduli ham faollashtirilgan bo'lishi kerak).
-MAIN_CHECKBOX_LEFT_COLUMN=Chapda maydon va qator tanlash ustunini ko'rsating (sukut bo'yicha o'ngda)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Sukut bo'yicha yaratilmagan. Faqat modul faollashtirilganda yaratilgan.
 CSSPage=CSS uslubi
 Defaultfortype=Standart
@@ -2489,7 +2510,7 @@ AiDescription=AI (sun'iy intellekt) xususiyatlari
 AiDescriptionLong=Ilovaning turli qismlarida AI (sun'iy intellekt) xususiyatlarini taqdim etadi. Tashqi AI API kerak.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI modulini sozlash
 AiCustomPrompt=AI maxsus taklifi
 AI_CONFIGURATIONS_PROMPT=Maxsus taklif
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=Xususiyatlar uchun AI maxsus takliflari
 EnterAnIP=IP manzilini kiriting
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index dabc9f42585..d0b133848c6 100644
--- a/htdocs/langs/uz_UZ/banks.lang
+++ b/htdocs/langs/uz_UZ/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Balansni yakunlash
 CurrentBalance=Joriy balans
 FutureBalance=Kelajakdagi balans
 ShowAllTimeBalance=Balansni boshidanoq ko'rsating
-AllTime=Boshidan
 Reconciliation=Yarashish
 RIB=Bank hisob raqami
 IBAN=IBAN raqami
@@ -133,7 +132,7 @@ DeleteTransaction=Kirishni o'chirish
 ConfirmDeleteTransaction=Ushbu yozuvni o'chirishni xohlaysizmi?
 ThisWillAlsoDeleteBankRecord=Bu shuningdek yaratilgan bank yozuvlarini o'chirib tashlaydi
 BankMovements=Harakatlar
-PlannedTransactions=Rejalashtirilgan yozuvlar
+PlannedTransactions=Upcoming entries
 Graph=Grafiklar
 ExportDataset_banque_1=Bank yozuvlari va hisobvarag'idan ko'chirma
 ExportDataset_banque_2=Depozit taloni
@@ -151,8 +150,8 @@ FutureTransaction=Kelajakdagi operatsiya. Yarashmayapti.
 SelectChequeTransactionAndGenerate=Chek depozit kvitansiyasiga kiritiladigan cheklarni tanlang / filtrlang. Keyin, "Yaratish" tugmasini bosing.
 SelectPaymentTransactionAndGenerate=%s depozit kvitansiyasiga kiritiladigan hujjatlarni tanlang/filtrlang. Keyin, "Yaratish" tugmasini bosing.
 InputReceiptNumber=Kelishuv bilan bog'liq bank ko'chirmasini tanlang. Saralanadigan raqamli qiymatdan foydalaning
-InputReceiptNumberBis=YYYYMM yoki YYYYMM
-EventualyAddCategory=Oxir-oqibat, yozuvlarni tasniflash uchun toifani ko'rsating
+InputReceiptNumberBis=YYYYMM
+EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Yarashish uchunmi?
 ThenCheckLinesAndConciliate=So'ngra, bank ko'chirmasidagi satrlarni tekshiring va bosing
 DefaultRIB=Standart taqiq
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Agar bu funktsiya yoqilgan bo'lsa, siz debet yoki kredi
 BankColorizeMovementName1=Debet harakati uchun fon rangi
 BankColorizeMovementName2=Kredit harakati uchun fon rangi
 IfYouDontReconcileDisableProperty=Agar siz ba'zi bir bank hisobvaraqlari bo'yicha banklarni yarashtirmasangiz, ushbu ogohlantirishni olib tashlash uchun ulardagi "%s" xususiyatini o'chirib qo'ying.
-NoBankAccountDefined=Bank hisob raqami aniqlanmagan
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Bank hisob raqamida yozuv topilmadi. Odatda, bu yozuv bank hisobvarag'idagi operatsiyalar ro'yxatidan qo'lda o'chirilganda sodir bo'ladi (masalan, bank hisobvarag'ini taqqoslash paytida). Yana bir sabab shundaki, to'lov "%s" moduli o'chirilganda qayd etilgan.
 AlreadyOneBankAccount=Allaqachon bitta bank hisobi aniqlangan
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA fayl varianti
diff --git a/htdocs/langs/uz_UZ/blockedlog.lang b/htdocs/langs/uz_UZ/blockedlog.lang
index 88bcdbb442b..838572619db 100644
--- a/htdocs/langs/uz_UZ/blockedlog.lang
+++ b/htdocs/langs/uz_UZ/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=O'zgarishsiz jurnallar
 ShowAllFingerPrintsMightBeTooLong=Barcha arxivlangan jurnallarni ko'rsatish (uzoq bo'lishi mumkin)
 ShowAllFingerPrintsErrorsMightBeTooLong=Barcha yaroqsiz arxiv jurnallarini ko'rsatish (uzoq bo'lishi mumkin)
 DownloadBlockChain=Barmoq izlarini yuklab oling
-KoCheckFingerprintValidity=Arxivlangan jurnal yozuvi haqiqiy emas. Bu shuni anglatadiki, kimdir (xaker?) Ushbu yozuvning ba'zi ma'lumotlarini yozib olingandan keyin o'zgartirgan yoki oldingi arxivlangan yozuvni o'chirib tashlagan (ushbu satrni oldingi # mavjudligini tekshiring) yoki oldingi yozuvning chegara summasini o'zgartirgan.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Arxivlangan jurnal qaydlari haqiqiydir. Ushbu satrdagi ma'lumotlar o'zgartirilmadi va yozuv avvalgisiga amal qiladi.
 OkCheckFingerprintValidityButChainIsKo=Arxivlangan jurnal avvalgisiga nisbatan haqiqiy ko'rinadi, ammo ilgari zanjir buzilgan.
 AddedByAuthority=Masofaviy hokimiyatda saqlanadi
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Jurnal ma'lumotlari
 ListOfTrackedEvents=Kuzatilgan voqealar ro'yxati
 Fingerprint=Barmoq izi
 DownloadLogCSV=Arxivlangan jurnallarni eksport qilish (CSV)
-DataOfArchivedEvent=Arxivlangan hodisaning toʻliq maʼlumotlari
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Asl ob'ekt (%s yozing, id %s) bog'lanmagan (o'zgartirilmaydigan saqlangan ma'lumotlarni olish uchun 'To'liq ma'lumotlar' ustuniga qarang)
 BlockedLogAreRequiredByYourCountryLegislation=O'zgarmas jurnallar moduli mamlakatingiz qonunchiligida talab qilinishi mumkin. Ushbu modulni o'chirib qo'yish kelajakdagi har qanday operatsiyalarni qonun va huquqiy dasturiy ta'minotdan foydalanishga yaroqsiz holga keltirishi mumkin, chunki ularni soliq tekshiruvi tasdiqlashi mumkin emas.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=O'zgarmas jurnallar moduli sizning mamlakatingiz qonunchiligi tufayli faollashtirildi. Ushbu modulni o'chirib qo'yish kelajakdagi har qanday operatsiyalarni qonunchilikka va huquqiy dasturiy ta'minotdan foydalanishga yaroqsiz holga keltirishi mumkin, chunki ular soliq tekshiruvi tomonidan tasdiqlanishi mumkin emas.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Voqealarni o'zgartirib bo'lmaydigan jurnallarda kuzatish tizim
 BlockedLogDisabled=Voqealarni o'zgartirib bo'lmaydigan jurnallarda kuzatish tizimi bir oz yozib olingandan so'ng o'chirib qo'yildi. Biz zanjirning buzilganligini kuzatish uchun maxsus Barmoq izini saqladik
 BlockedLogDisabledBis=Voqealarni oʻzgarmas jurnallarda kuzatish tizimi oʻchirib qoʻyilgan. Bu mumkin, chunki hali hech qanday rekord o'tkazilmagan.
 LinkHasBeenDisabledForPerformancePurpose=Ishlash maqsadida hujjatga to'g'ridan-to'g'ri havola 100-qatordan keyin ko'rsatilmaydi.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Mijozlarning hisob-kitobi mantiqan o'chirildi
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Mijozlar to'lovlarini mantiqiy o'chirish
 logPAYMENT_VARIOUS_CREATE=To'lov (hisob-fakturaga tayinlanmagan) yaratilgan
 logPAYMENT_VARIOUS_DELETE=To'lov (hisob-fakturaga tayinlanmagan) mantiqiy o'chirish
 logPAYMENT_VARIOUS_MODIFY=To'lov o'zgartirildi (hisob-fakturaga tayinlanmagan)
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
index 59196299b3f..aed6e2d72ff 100644
--- a/htdocs/langs/uz_UZ/categories.lang
+++ b/htdocs/langs/uz_UZ/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Aloqa teglari / toifalari maydoni
 AccountsCategoriesArea=Bank hisobvarag'i teglari / toifalari maydoni
 ProjectsCategoriesArea=Loyiha teglari / toifalari maydoni
 UsersCategoriesArea=Foydalanuvchi teglari / toifalari maydoni
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Kichik toifalar
 CatList=Teglar / toifalar ro'yxati
 CatListAll=Teglar / toifalar ro'yxati (barcha turlari)
@@ -90,9 +91,10 @@ CategoriesSetup=Teglar / toifalarni sozlash
 CategorieRecursiv=Ota-ona yorlig'i / toifasi bilan avtomatik ravishda bog'lanish
 CategorieRecursivHelp=Agar parametr yoniq bo'lsa, ob'ektni pastki toifaga qo'shganingizda, ob'ekt asosiy toifalarga ham qo'shiladi.
 AddProductServiceIntoCategory=Mahsulot/xizmatga toifani belgilang
-AddCustomerIntoCategory=Mijozga toifani tayinlang
-AddSupplierIntoCategory=Yetkazib beruvchiga toifani tayinlang
-AssignCategoryTo=Kategoriyani tayinlang
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Teg / toifani ko'rsatish
 ByDefaultInList=Odatiy bo'lib, ro'yxatda
 ChooseCategory=Toifani tanlang
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Sahifa konteynerlari toifalari
 KnowledgemanagementsCategoriesArea=KM maqola toifalari
 UseOrOperatorForCategories=Kategoriyalar uchun 'OR' operatoridan foydalaning
 AddObjectIntoCategory=Kategoriyaga tayinlang
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index 17949b06e91..479477b9abc 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -33,8 +33,8 @@ CountryIsInEEC=Mamlakat Evropa iqtisodiy hamjamiyatiga kiradi
 PriceFormatInCurrentLanguage=Joriy til va valyutada narxlarni ko'rsatish formati
 ThirdPartyName=Uchinchi tomon nomi
 ThirdPartyEmail=Uchinchi tomon elektron pochtasi
-ThirdParty=Uchinchi tomon
-ThirdParties=Uchinchi tomonlar
+ThirdParty=Third party
+ThirdParties=Third parties
 ThirdPartyProspects=Istiqbollari
 ThirdPartyProspectsStats=Istiqbollari
 ThirdPartyCustomers=Xaridorlar
@@ -65,6 +65,7 @@ State=Shtat / viloyat
 StateId=Davlat identifikatori
 StateCode=Shtat / viloyat kodi
 StateShort=Shtat
+DepartmentBuyer=Buyer's state/province
 Region=Mintaqa
 Region-State=Hudud - shtat
 Country=Mamlakat
@@ -78,7 +79,7 @@ Chat=Chat
 PhonePro=Avtobus. telefon
 PhonePerso=Pers. telefon
 PhoneMobile=Mobil
-No_Email=Ommaviy elektron pochta xabarlarini rad eting
+No_Email=Refuse mass emails
 Fax=Faks
 Zip=Pochta indeksi
 Town=Shahar
@@ -382,11 +383,12 @@ ExportCardToFormat=Kartani formatlash uchun eksport qiling
 ContactNotLinkedToCompany=Uchinchi tomon bilan bog'lanmagan aloqa
 DolibarrLogin=Dolibarr tizimiga kirish
 NoDolibarrAccess=Dolibarr-ga kirish taqiqlangan
-ExportDataset_company_1=Uchinchi tomonlar (kompaniyalar / fondlar / jismoniy odamlar) va ularning xususiyatlari
-ExportDataset_company_2=Kontaktlar va ularning xususiyatlari
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Uchinchi shaxslar va ularning xususiyatlari
 ImportDataset_company_2=Uchinchi tomonlar qo'shimcha kontaktlar / manzillar va atributlar
-ImportDataset_company_3=Uchinchi tomonlarning bank hisobvaraqlari
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=Uchinchi tomon savdo vakillari (savdo vakillarini / foydalanuvchilarni kompaniyalarga tayinlash)
 PriceLevel=Narx darajasi
 PriceLevelLabels=Narx darajasi yorliqlari
@@ -430,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=Menejer (lar) ning ismi (bosh direktor, direktor, prezident ...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=Uchinchi tomonlarni birlashtirish
-ConfirmMergeThirdparties=Tanlangan uchinchi tomonni amaldagi bilan birlashtirishni xohlaysizmi? Barcha bog'langan ob'ektlar (hisob-fakturalar, buyurtmalar, ...) joriy uchinchi tomonga ko'chiriladi, shundan so'ng tanlangan uchinchi tomon o'chiriladi.
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=Uchinchi tomonlar birlashtirildi
 SaleRepresentativeLogin=Savdo vakili kirish
 SaleRepresentativeFirstname=Savdo vakilining ismi
@@ -460,3 +462,6 @@ ExternalSystemID=Tashqi tizim identifikatori
 IDOfPaymentInAnExternalSystem=To'lov rejimining tashqi tizimga identifikatori (masalan, Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE veb-xizmati hisob ma'lumotlari
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Stripe tomonida bank ma'lumotlarini yaratishga ruxsat berish uchun uchinchi tomon mijoz bo'lishi kerak
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index d398b7cd728..7316354d237 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Mijozlar uchun hisob-fakturani to'lash
 PaymentSupplierInvoice=sotuvchiga hisob-fakturani to'lash
 PaymentSocialContribution=Ijtimoiy / soliq soliq to'lovi
 PaymentVat=QQS to'lovi
-AutomaticCreationPayment=To'lovni avtomatik ravishda yozib oling
+AutomaticCreationPayment=Also record the payment
 ListPayment=To'lovlar ro'yxati
 ListOfCustomerPayments=Mijozlar uchun to'lovlar ro'yxati
 ListOfSupplierPayments=Sotuvchilarning to'lovlari ro'yxati
@@ -118,10 +118,14 @@ SocialContributionsPayments=Ijtimoiy / soliq soliqlari bo'yicha to'lovlar
 ShowVatPayment=QQS to'lovini ko'rsatish
 TotalToPay=To'lov uchun jami
 BalanceVisibilityDependsOnSortAndFilters=Balans ushbu ro'yxatda faqat jadval %s bo'yicha tartiblangan va 1 ta bank hisobvarag'ida filtrlangan bo'lsa ko'rinadi (boshqa filtrlarsiz)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Mijozlarni hisobga olish kodi
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Sotuvchini hisobga olish kodi
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Himoyalash. hisob qaydnomasi. kod
 SupplierAccountancyCodeShort=Sup. hisob qaydnomasi. kod
+UserAccountancyCodeShort=User account. code
 AccountNumber=Hisob raqami
 NewAccountingAccount=Yangi hisob
 Turnover=Tovar-faktura
@@ -129,7 +133,9 @@ TurnoverCollected=Tovar yig'ildi
 SalesTurnoverMinimum=Minimal oborot
 ByExpenseIncome=Xarajatlar va daromadlar bo'yicha
 ByThirdParties=Uchinchi shaxslar tomonidan
+ByProjects=By projects
 ByUserAuthorOfInvoice=Hisob-faktura muallifi tomonidan
+DetailedListLowercase=detailed list
 CheckReceipt=Depozit slip
 CheckReceiptShort=Depozit slip
 LastCheckReceiptShort=Oxirgi %s depozit sliplari
diff --git a/htdocs/langs/uz_UZ/datapolicy.lang b/htdocs/langs/uz_UZ/datapolicy.lang
index ab75b2728f7..87b7ef053c5 100644
--- a/htdocs/langs/uz_UZ/datapolicy.lang
+++ b/htdocs/langs/uz_UZ/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Ma'lumotlar maxfiyligi siyosati
 Module4100Desc = Ma'lumotlar maxfiyligini boshqarish moduli (GDPRga muvofiqlik)
 # Administration page
 datapolicySetup = Modul maʼlumotlarining maxfiylik siyosatini oʻrnatish
-Deletion = Ma'lumotlarni o'chirish
-datapolicySetupPage = Mamlakatlaringiz qonunlariga qarab (misol <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">GDPRning 5-moddasi</a>), shaxsiy maʼlumotlar bir muddat saqlanishi kerak maʼlumotlar yigʻilgan maqsad uchun zarur boʻlgan muddatdan oshmasligi, arxiv maqsadlari bundan mustasno.<br>Oʻchirish maʼlum bir vaqtdan soʻng hodisalarsiz avtomatik ravishda amalga oshiriladi (davomiylik). Siz quyida ko'rsatgan bo'lasiz).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s oy
 ONE_YEAR = 1 yil
 NB_YEARS = %s yil
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Istiqbolli/mijoz
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Na istiqbolli / na mijoz
 DATAPOLICY_CONTACT_FOURNISSEUR = Yetkazib beruvchi
 DATAPOLICY_ADHERENT = A'zo
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Siz GDPR elektron pochta xabarini barcha tegishli kontaktlaringizga yuborishingiz mumkin (ular hali elektron pochta xabarini olmagan va siz GDPR shartnomasi haqida hech narsa ro'yxatdan o'tmagan). Buning uchun quyidagi tugmani ishlating.
 SendAgreement = Elektron pochta xabarlarini yuboring
 AllAgreementSend = Barcha elektron pochta xabarlari yuborildi
 TXTLINKDATAPOLICYACCEPT = "Shartnoma" havolasi uchun matn
 TXTLINKDATAPOLICYREFUSE = "Ixtilof" havolasi uchun matn
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: Shaxsiy ma'lumotlarni qayta ishlash
 DATAPOLICY_consentement = Shaxsiy ma'lumotlarni qayta ishlash uchun olingan rozilik
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 99faf89e9af..c1d63f5c1fc 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Katalog yaratilmadi. Veb-server foydalanuvchisida Dolibarr hujjatlar katalogiga yozish uchun ruxsat borligini tekshiring. Agar ushbu PHP-da <b> safe_mode </b> parametri yoqilgan bo'lsa, Dolibarr php fayllari veb-server foydalanuvchisiga (yoki guruhiga) tegishli ekanligini tekshiring.
 ErrorNoMailDefinedForThisUser=Ushbu foydalanuvchi uchun hech qanday pochta belgilanmagan
 ErrorSetupOfEmailsNotComplete=Elektron pochta xabarlarini sozlash tugallanmagan
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Bu funksiya ishlashi uchun JavaScript faollashtirilishi kerak. Buni sozlash - displeyda o'zgartiring.
 ErrorTopMenuMustHaveAParentWithId0="Top" turidagi menyuda asosiy menyu bo'lishi mumkin emas. Bosh menyuga 0 qo'ying yoki "Chap" turidagi menyuni tanlang.
 ErrorLeftMenuMustHaveAParentId="Chap" turidagi menyuda ota-ona identifikatori bo'lishi kerak.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Yuklash PHP / Apache plaginlari tomonidan bloklangan.
 ErrorFileSizeTooLarge=Fayl hajmi juda katta yoki fayl taqdim etilmagan.
 ErrorFieldTooLong=%s maydoni juda uzun.
 ErrorSizeTooLongForIntType=Int turi uchun juda uzun (maksimal %s raqam)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Ip turi uchun o'lcham juda uzun (%s belgilar maksimal)
 ErrorNoValueForSelectType=Iltimos, tanlangan ro'yxat uchun qiymatni to'ldiring
 ErrorNoValueForCheckBoxType=Iltimos, katakchalar ro'yxati uchun qiymatni to'ldiring
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Xavfsizlik kodi noto'g'ri. Yangi qiymat bilan qayta urinib
 ErrorBothFieldCantBeNegative=%s va %s maydonlari ikkalasi ham salbiy bo'lishi mumkin emas
 ErrorFieldCantBeNegativeOnInvoice=<strong>%s</strong> maydoni bu turdagi invoda salbiy bo'lishi mumkin emas. Agar chegirma qatorini qo'shishingiz kerak bo'lsa, avval chegirma yarating (uchinchi tomon kartasidagi '%s' maydonidan) va uni hisob-fakturaga qo'llang.
 ErrorLinesCantBeNegativeForOneVATRate=Qatorlar yig'indisi (soliqni olib tashlagan holda) QQSning nol bo'lmagan stavkasi uchun salbiy bo'lishi mumkin emas (QQS stavkasi uchun <b> %s </b> %% uchun salbiy jami topildi).
-ErrorLinesCantBeNegativeOnDeposits=Depozitda chiziqlar salbiy bo'lishi mumkin emas. Agar shunday qilsangiz, siz oxirgi hisob-fakturada depozitni iste'mol qilishingiz kerak bo'lganda siz muammolarga duch kelasiz.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Xaridorlarning schyot-fakturalari qatori salbiy bo'lishi mumkin emas
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Veb-serverni amalga oshirish uchun foydalanilgan <b> %s </b> foydalanuvchi qayd yozuvida bunga ruxsat yo'q
 ErrorNoActivatedBarcode=Shtrixli kod yoqilmagan
 ErrUnzipFails=%s ni ZipArchive bilan ochib bo'lmadi
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP parametringiz upload_max_filesize (%s) PHP post_max_size (%s) parametridan yuqori. Bu izchil o'rnatish emas.
 WarningPasswordSetWithNoAccount=Ushbu a'zo uchun parol o'rnatildi. Biroq, foydalanuvchi hisobi yaratilmagan. Shunday qilib, ushbu parol saqlanadi, ammo Dolibarr-ga kirish uchun foydalanib bo'lmaydi. U tashqi modul / interfeys tomonidan ishlatilishi mumkin, ammo agar siz a'zo uchun hech qanday login va parolni belgilashga hojat bo'lmasa, siz "har bir a'zo uchun kirishni boshqarish" parametrini a'zo modulidan o'chirib qo'yishingiz mumkin. Agar sizga loginni boshqarish kerak bo'lsa, lekin hech qanday parol kerak bo'lmasa, ushbu ogohlantirishni oldini olish uchun ushbu maydonni bo'sh qoldirishingiz mumkin. Izoh: Agar foydalanuvchi bilan bog'langan bo'lsa, elektron pochta orqali kirish sifatida ham foydalanish mumkin.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR hisob-fakturasini faqat kredit o'tkazmalari bilan to'lanadigan hisob-fakturalarga qo'shish mumkin.
 SwissQrCreditorAddressInvalid = Kreditor manzili noto‘g‘ri (zip va shahar o‘rnatilganmi? (%s)
 SwissQrCreditorInformationInvalid = Kreditor ma'lumotlari IBAN uchun yaroqsiz (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s allaqachon ushbu turdagi kontakt
 ErrorThisGroupIsAlreadyDefinedAsThisType=Ushbu guruhdagi kontaktlar allaqachon ushbu turdagi kontakt sifatida belgilangan.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/uz_UZ/exports.lang b/htdocs/langs/uz_UZ/exports.lang
index 49d91338d77..c0828d57474 100644
--- a/htdocs/langs/uz_UZ/exports.lang
+++ b/htdocs/langs/uz_UZ/exports.lang
@@ -67,7 +67,7 @@ ChooseFormatOfFileToImport=Faylni import qilish formati sifatida tanlang, uni ta
 ChooseFileToImport=Faylni yuklang, so'ngra faylni manba import fayli sifatida tanlash uchun %s belgisini bosing ...
 SourceFileFormat=Manba fayl formati
 FieldsInSourceFile=Manba faylidagi maydonlar
-FieldsInTargetDatabase=Dolibarr ma'lumotlar bazasidagi maqsad maydonlari (qalin = majburiy)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Maydonlar yo‘q
 MoveField=%s maydon ustun satrini siljiting
 ExampleOfImportFile=Import_file-ning namunasi
@@ -82,8 +82,8 @@ NowClickToTestTheImport=Faylingiz formati (maydon va satrlarni ajratuvchi) ko'rs
 RunSimulateImportFile=Import simulyatsiyasini ishga tushiring
 FieldNeedSource=Ushbu maydon manba faylidan ma'lumotlarni talab qiladi
 SomeMandatoryFieldHaveNoSource=Ba'zi majburiy maydonlarda ma'lumotlar fayli manbasi yo'q
-InformationOnSourceFile=Dastlabki fayl haqida ma'lumot
-InformationOnTargetTables=Maqsadli maydonlar haqida ma'lumot
+InformationOnSourceFile=Source file
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Eksport qilish uchun maydonlar ustunidagi kamida bitta manba maydonini almashtiring
 SelectFormat=Ushbu import fayl formatini tanlang
 RunImportFile=Ma'lumotlarni import qilish
diff --git a/htdocs/langs/uz_UZ/hrm.lang b/htdocs/langs/uz_UZ/hrm.lang
index 3706ead27c7..6ec93b0b5ce 100644
--- a/htdocs/langs/uz_UZ/hrm.lang
+++ b/htdocs/langs/uz_UZ/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=Ish profili uchun talab qilinadigan daraja
-RequiredRankShort=Majburiy daraja
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Ushbu ish profillari bilan lavozimlar
-EmployeeRank=Ushbu mahorat uchun xodim darajasi
-EmployeeRankShort=Xodimlar darajasi
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Xodimning pozitsiyasi
 EmployeePositions=Xodimlarning lavozimlari
 EmployeesInThisPosition=Ushbu lavozimdagi xodimlar
@@ -72,6 +72,9 @@ AddSkill=Ish profiliga ko'nikmalar qo'shing
 RequiredSkills=Ushbu ish profili uchun talab qilinadigan ko'nikmalar
 UserRank=Foydalanuvchi darajasi
 SkillList=Ko'nikmalar ro'yxati
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Darajani saqlang
 TypeKnowHow=Nou-hau
 TypeHowToBe=Qanday bo'lish kerak
@@ -95,3 +98,5 @@ NeedBusinessTravels=Ish safarlari kerak
 NoDescription=Ta'rif yo'q
 TheJobProfileHasNoSkillsDefinedFixBefore=Ushbu xodimning baholangan ish profili unda aniqlangan malakaga ega emas. Iltimos, malaka(lar)ni qo'shing, keyin o'chiring va baholashni qaytadan boshlang.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index 31d9307488a..22046b9a8ee 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Elektron pochta xabarlari
 EMailing=Elektron pochta xabarlari
-EMailings=Elektron pochta xabarlari
+EMailings=Mass EMails
 SMSings=SMS xabarlar
-AllEMailings=Barcha elektron pochta xabarlari
+AllEMailings=All mass eMails
 MailCard=Elektron pochta kartasi
 MailRecipients=Qabul qiluvchilar
 MailRecipient=Qabul qiluvchi
@@ -26,19 +26,19 @@ MailFile=Biriktirilgan fayllar
 MailMessage=Elektron pochta qutisi
 SubjectNotIn=Mavzuda emas
 BodyNotIn=Tanada emas
-ShowEMailing=Elektron pochta xabarlarini ko'rsatish
-ListOfEMailings=Elektron pochta xabarlari ro'yxati
-NewMailing=Yangi elektron pochta xabarlari
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Yangi sms
-EditMailing=Elektron pochta xabarlarini tahrirlash
-ResetMailing=Elektron pochta xabarlarini qayta yuboring
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Elektron pochta xabarlarini o'chirish
-PreviewMailing=Elektron pochta xabarlarini oldindan ko'rish
-CreateMailing=Elektron pochta xabarlarini yarating
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Sinov
-ValidMailing=Yaroqli elektron pochta xabarlari
+ValidMailing=Valid mass Email
 MailingStatusDraft=Qoralama
 MailingStatusValidated=Tasdiqlangan
 MailingStatusSent=Yuborildi
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Email to‘planishi uchun barcha filtrlar mos kelishi k
 LineInFile=Faylda %s qatori
 RecipientSelectionModules=Qabul qiluvchilarni tanlash bo'yicha aniq talablar
 MailSelectedRecipients=Tanlangan qabul qiluvchilar
-MailingArea=Elektron pochta xabarlari maydoni
-LastMailings=Oxirgi %s elektron pochta xabarlari
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Maqsadlar statistikasi
 NbOfCompaniesContacts=Noyob kontaktlar / manzillar
 MailNoChangePossible=Tasdiqlangan elektron pochta xabarlarini qabul qiluvchilarni o'zgartirish mumkin emas
-SearchAMailing=Pochta orqali qidirish
-SendMailing=Elektron pochta xabarlarini yuboring
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Yubordi
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Elektron pochta xabarlarini yuborish buyruq satridan amalga oshirilishi mumkin. Elektron pochta xabarini barcha qabul qiluvchilarga yuborish uchun server administratoridan quyidagi buyruqni boshlashini so'rang:
 MailingNeedCommand2=Siz ularni MAILING_LIMIT_SENDBYWEB parametrini qo'shish orqali ularni onlayn ravishda yuborishingiz mumkin. Buning uchun Home - Setup - Other-ga o'ting.
 ConfirmSendingEmailing=Agar to'g'ridan-to'g'ri ushbu ekrandan elektron pochta xabarlarini yuborishni istasangiz, iltimos, brauzeringizdan elektron pochta xabarlarini yuborishni xohlaganingizga ishonch hosil qiling?
-LimitSendingEmailing=Eslatma: Veb-interfeysdan elektron pochta xabarlarini yuborish xavfsizlik va vaqt tugashi sababli bir necha marta amalga oshiriladi, <b> %s </b> oluvchilar har bir yuborish seansi uchun bir vaqtning o'zida.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Ro'yxatni tozalash
 ToClearAllRecipientsClickHere=Ushbu elektron pochta xabarlari uchun qabul qiluvchilar ro'yxatini tozalash uchun shu erni bosing
 ToAddRecipientsChooseHere=Ro'yxatlar orasidan tanlab oluvchilarni qo'shing
-NbOfEMailingsReceived=Ommaviy elektron pochta xabarlari qabul qilindi
-NbOfEMailingsSend=Ommaviy elektron pochta xabarlari yuborildi
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID yozuvlari
 DeliveryReceipt=Yetkazib berish.
 YouCanUseCommaSeparatorForSeveralRecipients=Bir nechta qabul qiluvchilarni ko'rsatish uchun <b> vergul </b> ajratgichidan foydalanishingiz mumkin.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Ushbu tadbir turi va kompaniya uchun avtomatik elektro
 ANotificationsWillBeSent=1 ta avtomatik bildirishnoma elektron pochta orqali yuboriladi
 SomeNotificationsWillBeSent=%s avtomatik xabarnomalari elektron pochta orqali yuboriladi
 AddNewNotification=Yangi avtomatik elektron xabarnomaga obuna bo'ling (maqsad / voqea)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Elektron pochta xabarlarini jo'natish konfiguratsiyasi '%s' ga o'rnatildi. Ushbu rejimdan ommaviy elektron pochta xabarlarini yuborish uchun foydalanib bo'lmaydi.
 MailSendSetupIs2=<strong> '%s' parametrini a0a65d091z08'a modec'9780f use'ga o'zgartirish uchun avval administrator hisobi bilan %sHome - O'rnatish - EMails%s menyusiga kirishingiz kerak. Ushbu rejim yordamida siz Internet-provayderingiz tomonidan taqdim etilgan SMTP server sozlamalariga kirishingiz va Ommaviy elektron pochta xabarlarini yuborish funksiyasidan foydalanishingiz mumkin.
 MailSendSetupIs3=SMTP-serveringizni sozlash bo'yicha savollaringiz bo'lsa, %s ga murojaat qilishingiz mumkin.
@@ -183,7 +185,7 @@ Information=Ma `lumot
 ContactsWithThirdpartyFilter=Uchinchi tomon filtri bilan aloqalar
 Unanswered=Javob berilmagan
 Answered=Javob berdi
-IsNotAnAnswer=Javob berilmadi (dastlabki elektron pochta)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Dastlabki elektron pochtaning javobi
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Yangi kontakt yaratishda "%s" maydonining standart qiymati
@@ -199,6 +201,6 @@ ModelTemplate=Elektron pochta shabloni
 YouCanChooseAModelForYouMailContent= Siz shablon modellaridan birini tanlashingiz yoki AI bilan bittasini yaratishingiz mumkin
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index 661f0f5cdcc..8011648fbf4 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -37,6 +37,7 @@ Translation=Tarjima
 Translations=Tarjimalar
 CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Bo'sh bo'lmagan qidiruv mezonlarini kiriting
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Sana mezonlarini kiriting
 NoRecordFound=Hech qanday yozuv topilmadi
 NoRecordDeleted=Hech qanday yozuv o'chirilmagan
@@ -45,6 +46,7 @@ NoError=Xato yo'q
 Error=Xato
 Errors=Xatolar
 ErrorFieldRequired='%s' maydoni kerak
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat='%s' maydonining qiymati yomon
 ErrorFileDoesNotExists=%s fayli mavjud emas
 ErrorFailedToOpenFile=%s faylini ochib bo'lmadi
@@ -308,6 +310,7 @@ DateBuild=Hisobotni tuzish sanasi
 DatePayment=To'lov sanasi
 DateApprove=Tasdiqlangan sana
 DateApprove2=Tasdiqlangan sana (ikkinchi tasdiqlash)
+PendingSince=Pending since
 RegistrationDate=Ro'yxatdan o'tish sanasi
 UserCreation=Yaratilish foydalanuvchisi
 UserModification=O'zgartirish foydalanuvchisi
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Boshlamoq
 ActionRunningShort=Jarayonda
 ActionDoneShort=Tugadi
 ActionUncomplete=Tugallanmagan
-LatestLinkedEvents=%s bilan bog'liq so'nggi voqealar
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Kompaniya / tashkilot
 Accountant=Buxgalter
 ContactsForCompany=Ushbu uchinchi tomon uchun aloqalar
@@ -503,6 +506,7 @@ ContactsAddressesForCompany=Ushbu uchinchi tomon uchun aloqa / manzillar
 AddressesForCompany=Ushbu uchinchi tomon uchun manzillar
 ActionsOnCompany=Ushbu uchinchi tomon uchun tadbirlar
 ActionsOnContact=Ushbu aloqa / manzil uchun tadbirlar
+ActionsOnUser=Events for this user
 ActionsOnContract=Ushbu shartnoma bo'yicha tadbirlar
 ActionsOnMember=Ushbu a'zo haqidagi tadbirlar
 ActionsOnProduct=Ushbu mahsulot haqidagi tadbirlar
@@ -720,6 +724,8 @@ TextUsedInTheMessageBody=Elektron pochta qutisi
 SendAcknowledgementByMail=Tasdiqlovchi elektron pochta xabarini yuboring
 SendMail=Elektron pochta xabarini yuboring
 Email=Elektron pochta
+EMail=Email
+EMails=Emails
 NoEMail=Elektron pochta yo'q
 AlreadyRead=O'qilgan
 NotRead=O'qilmagan
@@ -792,7 +798,7 @@ Notes=Izohlar
 AddNewLine=Yangi qator qo'shing
 AddFile=Fayl qo'shish
 FreeZone=Bepul matnli mahsulot
-FreeLineOfType=Bepul matnli element, turi:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Ob'ektni asosiy atributlari bilan klonlash
 ReGeneratePDF=PDF-ni qayta yarating
 PDFMerge=PDF-ni birlashtirish
@@ -878,12 +884,14 @@ toward=tomonga
 Access=Kirish
 SelectAction=Amalni tanlang
 SelectTargetUser=Maqsadli foydalanuvchini / xodimni tanlang
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Buferga nusxalash uchun Ctrl + C tugmalaridan foydalaning
 SaveUploadedFileWithMask=Faylni "<strong> %s </strong>" nomi bilan saqlang (aks holda "%s")
 OriginFileName=Asl fayl nomi
 SetDemandReason=Manbani o'rnating
 SetBankAccount=Bank hisobini aniqlang
 AccountCurrency=Hisob-kitob valyutasi
+AccountancyCode=Accounting Code
 ViewPrivateNote=Eslatmalarni ko'rish
 XMoreLines=%s qatorlari yashiringan
 ShowMoreLines=Ko'proq / kamroq qatorlarni ko'rsatish
@@ -924,6 +932,7 @@ ConfirmMassDeletionQuestion=Siz tanlagan %s yozuvlarini o'chirishni xohlaysizmi?
 ConfirmMassClone=Ommaviy klonni tasdiqlash
 ConfirmMassCloneQuestion=Klonlash uchun loyihani tanlang
 ConfirmMassCloneToOneProject=%s loyihasiga klonlash
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Tegishli ob'ektlar
 ClassifyBilled=To'lovlarni tasniflash
 ClassifyUnbilled=To'lanmaganlarni tasniflash
@@ -960,10 +969,11 @@ PrivateDownloadLinkDesc=Siz tizimga kirishingiz kerak va faylni ko'rish yoki yuk
 Download=Yuklash
 DownloadDocument=Hujjatni yuklab oling
 DownloadSignedDocument=Imzolangan hujjatni yuklab oling
-ActualizeCurrency=Valyuta kursini yangilang
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Moliyaviy yil
 ModuleBuilder=Modul va dastur yaratuvchisi
 SetMultiCurrencyCode=Valyutani o'rnating
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Ommaviy harakatlar
 ClickToShowHelp=Maslahatlar bo'yicha yordamni ko'rsatish uchun bosing
 WebSite=Veb-sayt
@@ -1103,6 +1113,7 @@ PayedBy=To'langan
 PayedTo=To'langan
 Monthly=Oylik
 Quarterly=Har chorakda
+Quarter=Quarter
 Annual=Yillik
 Local=Mahalliy
 Remote=Masofadan boshqarish pulti
@@ -1145,6 +1156,7 @@ ContactDefault_project_task=Vazifa
 ContactDefault_propal=Taklif
 ContactDefault_supplier_proposal=Ta'minlovchining taklifi
 ContactDefault_ticket=Chipta
+ContactDefault_societe=Third party
 ContactAddedAutomatically=Uchinchi tomon kontakt rollaridan qo‘shilgan kontakt
 More=Ko'proq
 ShowDetails=Tafsilotlarni ko'rsatish
@@ -1187,6 +1199,8 @@ SetSupervisor=Nazoratchini o'rnating
 CreateExternalUser=Tashqi foydalanuvchini yarating
 ConfirmAffectTag=Ommaviy teg tayinlash
 ConfirmAffectUser=Ommaviy foydalanuvchi tayinlash
+ContactRole=Contact role
+ContactRoles=Contact roles
 ProjectRole=Har bir loyiha/imkoniyatda tayinlangan rol
 TasksRole=Har bir vazifaga tayinlangan rol (agar foydalanilsa)
 ConfirmSetSupervisor=Ommaviy nazoratchi to'plami
@@ -1238,6 +1252,9 @@ CommercialsAffected=Savdo vakillari tayinlangan
 CommercialAffected=Savdo vakili tayinlandi
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
+Message=Message
+Emailing=Emailing
+Progression=Progress
 YourMessage=Xabaringiz
 YourMessageHasBeenReceived=Sizning xabaringiz qabul qilindi. Biz imkon qadar tezroq javob beramiz yoki siz bilan bog'lanamiz.
 UrlToCheck=Tekshirish uchun URL
@@ -1280,6 +1297,7 @@ AmountSalary=Ish haqi miqdori
 InvoiceSubtype=Hisob-fakturaning pastki turi
 ConfirmMassReverse=Ommaviy teskari tasdiqlash
 ConfirmMassReverseQuestion=Haqiqatan ham %s tanlangan yozuv(lar)ni oʻzgartirmoqchimisiz?
+ConfirmActionXxx=Confirm action %s
 ElementType=Element turi
 ElementId=Element identifikatori
 Encrypted=Shifrlangan
@@ -1299,3 +1317,35 @@ AllEntities=All entities
 TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
+auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Add
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index 18ffa56c69b..dd5074bdec8 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Agar obuna zarur bo'lsa, a'zo yangilangan bo'lishi uchu
 DeleteType=O'chirish
 VoteAllowed=Ovoz berishga ruxsat berildi
 Physical=Shaxsiy
-Moral=Korporatsiya
-MorAndPhy=Korporatsiya va individual
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Qayta yoqish
 ExcludeMember=A'zoni chiqarib tashlang
 Exclude=Istisno qilish
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=A'zolar statistikasi mintaqalar bo'yicha
 NbOfMembers=A'zolarning umumiy soni
 NbOfActiveMembers=Hozirgi faol a'zolarning umumiy soni
 NoValidatedMemberYet=Tasdiqlangan a'zolar topilmadi
-MembersByCountryDesc=Ushbu ekran sizga mamlakatlar bo'yicha a'zolarning statistikasini ko'rsatadi. Grafik va jadvallar Google-ning onlayn grafik xizmati hamda ishlaydigan internet aloqasi mavjudligiga bog'liq.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Ushbu ekran sizga shtatlar / viloyatlar / kantonlar bo'yicha a'zolarning statistikasini ko'rsatadi.
 MembersByTownDesc=Ushbu ekran sizga shaharlar bo'yicha a'zolarning statistikasini ko'rsatadi.
 MembersByNature=Ushbu ekran sizga a'zolarning statistikasini tabiatan ko'rsatadi.
@@ -208,25 +209,25 @@ NewMemberbyWeb=Yangi a'zo qo'shildi. Tasdiqlash kutilmoqda
 NewMemberForm=Yangi a'zo shakli
 SubscriptionsStatistics=Hisob -kitoblar statistikasi
 NbOfSubscriptions=Hissalar soni
-AmountOfSubscriptions=Hisob -kitoblardan yig'ilgan mablag '
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=Tovar aylanmasi (kompaniya uchun) yoki byudjet (fond uchun)
-DefaultAmount=Birlamchi badal miqdori (agar a'zolar turi darajasida miqdor belgilanmagan bo'lsagina foydalaniladi)
-MinimumAmount=Minimal miqdor (faqat badal miqdori bepul bo'lganda foydalaniladi)
-CanEditAmount=Obuna miqdori a'zo tomonidan belgilanishi mumkin
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=Mehmon a'zo turidan qat'i nazar, o'z hissasi miqdorini tanlashi/tahrirlashi mumkin
 AmountIsLowerToMinimumNotice=Miqdor minimal %sdan past.
 MEMBER_NEWFORM_PAYONLINE=Onlayn ro'yxatdan o'tgandan so'ng, avtomatik ravishda onlayn to'lov sahifasiga o'ting
 ByProperties=Tabiatan
 MembersStatisticsByProperties=A'zolar statistikasi tabiatan
-VATToUseForSubscriptions=Toʻlovlar uchun QQS stavkasi
-NoVatOnSubscription=Hissalar uchun QQS olinmaydi
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Hisob -fakturaga hissa qo'shish uchun ishlatiladigan mahsulot: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=Ism yoki kompaniya
 SubscriptionRecorded=Hissa qo'shildi
 NoEmailSentToMember=Ro'yxatdanga elektron pochta xabarlari yuborilmadi
 EmailSentToMember=%s orqali a'zoga elektron pochta xabarlari yuborildi
-SendReminderForExpiredSubscriptionTitle=Muddati o'tgan hissalar uchun elektron pochta orqali eslatma yuboring
-SendReminderForExpiredSubscription=Hissa muddati tugashi arafasida aʼzolarga eslatmani elektron pochta orqali yuboring (parametr eslatmani yuborish uchun aʼzolik tugashidan bir necha kun oldin. Bu nuqta-vergul bilan ajratilgan kunlar roʻyxati boʻlishi mumkin, masalan, '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Joriy davr uchun to'langan a'zolik (%s gacha)
 YouMayFindYourInvoiceInThisEmail=Sizning hisob-fakturangizni ushbu elektron pochtaga biriktirilgan holda topishingiz mumkin
 XMembersClosed=%s a'zo (lar) yopildi
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Agar siz har bir hissa uchun hisob-faktura yaratish
 MemberFirstname=A'zoning ismi
 MemberLastname=A'zo familiyasi
 MemberCodeDesc=A'zo kodi, barcha a'zolar uchun yagona
-MemberSubscriptionStartFirstDayOf=Aʼzolikning boshlanish sanasi aʼning birinchi kuniga toʻgʻri keladi
-MemberSubscriptionStartAfter=Obunaning boshlanish sanasi kuchga kirishigacha bo‘lgan minimal muddat, yangilashdan tashqari (misol, +3m = +3 oy, -5d = -5 kun, +1Y = +1 yil)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=A'zolik kelishuv bitimi bilan bog'langan, shuning uchun bu o'zgartirishga ruxsat berilmaydi.
 ConfirmMassSubsriptionCreation=Obuna yaratilishini tasdiqlang
 ConfirmMassSubsriptionCreationQuestion=Haqiqatan ham %s tanlangan obuna(lar)ni yaratmoqchimisiz?
diff --git a/htdocs/langs/uz_UZ/salaries.lang b/htdocs/langs/uz_UZ/salaries.lang
index e9f439e6dfe..53834abb93c 100644
--- a/htdocs/langs/uz_UZ/salaries.lang
+++ b/htdocs/langs/uz_UZ/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Yangi ish haqi
 AddSalary=Ish haqini qo'shing
 NewSalaryPayment=Yangi ish haqi kartasi
 AddSalaryPayment=Ish haqini to'lashni qo'shing
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Ish haqi to'lash
 SalariesPayments=Ish haqi bo'yicha to'lovlar
 SalariesPaymentsOf=%s ish haqi to'lovlari
@@ -27,7 +29,7 @@ FillFieldFirst=Avval xodimlar maydonini to'ldiring
 UpdateAmountWithLastSalary=Oxirgi ish haqi miqdorini belgilang
 MakeTransferRequest=Transfer so'rovini yuboring
 VirementOrder=Kredit o'tkazish talabi
-BankTransferAmount=Kredit o'tkazmasining miqdori
 WithdrawalReceipt=Kreditni o'tkazish tartibi
 OrderWaiting=Buyurtma kutilmoqda
 FillEndOfMonth=Oy oxiri bilan to'ldiring
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/uz_UZ/website.lang b/htdocs/langs/uz_UZ/website.lang
index 9ea2b16d2d0..c48693e2cd7 100644
--- a/htdocs/langs/uz_UZ/website.lang
+++ b/htdocs/langs/uz_UZ/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Bu erda boshqa ism / taxalluslar ro'yxatidan foydalaning, s
 WEBSITE_CSS_URL=Tashqi CSS-faylning URL manzili
 WEBSITE_CSS_INLINE=CSS fayli tarkibi (barcha sahifalar uchun umumiy)
 WEBSITE_JS_INLINE=JavaScript fayl tarkibi (barcha sahifalar uchun umumiy)
-WEBSITE_HTML_HEADER=HTML sarlavhasi ostidagi qo'shimchalar (barcha sahifalar uchun umumiy)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot fayli (robots.txt)
 WEBSITE_HTACCESS=Veb-sayt .htaccess fayli
 WEBSITE_MANIFEST_JSON=Veb-sayt manifest.json fayli
@@ -56,16 +56,17 @@ ReadPerm=O'qing
 WritePerm=Yozing
 TestDeployOnWeb=Internetda sinov / tarqatish
 PreviewSiteServedByWebServer= <u> %s ni yangi varaqda ko'rib chiqish. </u> <br> <br> %s tashqi veb -server tomonidan xizmat ko'rsatiladi (Apache, Nginx, IIS kabi). Siz ushbu serverni o'rnatishingiz va sozlashingiz kerak:<br><strong>%s</strong><br>URL serverda yo'rdamchi server:<br><strong>%s</strong>
-PreviewSiteServedByDolibarr= <u> %s-ni yangi varoqda oldindan ko'rib chiqing. </u> <br> <br> %s-ga Dolibarr server tomonidan xizmat ko'rsatiladi, shuning uchun qo'shimcha veb-server (Apache, Nginx, IIS kabi) o'rnatilishi shart emas. <br> Noqulay narsa shundaki, sahifalarning URL manzillari foydalanuvchilar uchun qulay emas va Dolibarr-ning yo'lidan boshlanadi. <br> URL Dolibarr tomonidan xizmat: <br> <strong> %s </strong> <br> <br>, bu veb-sayt xizmat veb-serverda bir virtual mezbon yaratish uchun o'z tashqi veb-server foydalanish uchun, bu katalog ball <br> <strong> %s </strong> <br> keyin bu virtual server nomini kiriting ushbu veb-saytning xususiyatlarida va "Internetda sinash / tarqatish" havolasini bosing.
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=Tashqi veb-server tomonidan xizmat ko'rsatiladigan virtual xost manzili aniqlanmagan
 NoPageYet=Hali sahifalar yo'q
 YouCanCreatePageOrImportTemplate=Siz yangi sahifa yaratishingiz yoki to'liq veb-sayt shablonini import qilishingiz mumkin
 SyntaxHelp=Sintaksis bo'yicha aniq maslahatlar bo'yicha yordam bering
 YouCanEditHtmlSourceckeditor=HTML manba kodini tahrirlashdagi "Manba" tugmasi yordamida tahrirlashingiz mumkin.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=Almashish havolasi bilan birgalikda foydalaniladigan rasm uchun (faylning umumiy xesh tugmachasidan foydalangan holda ochiq kirish) sintaksis quyidagicha: <br> <strong> &lt;img src = "/ viewimage.php? Hashp = 12345679012 ..." a0012c7dff0a0z0z00090f0f08a0f09a0f09a09a09cb08a0a09a03c09a03c09c9c9c9c9c9c08f96f96f9f08f08f0f9fdf9fdfdfdfc7fd
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Sahifani / konteynerni klonlash
 CloneSite=Klon sayti
@@ -87,15 +88,15 @@ WebsiteAccount=Veb-sayt qayd yozuvi
 WebsiteAccounts=Veb-sayt qayd yozuvlari
 AddWebsiteAccount=Veb-sayt qayd yozuvini yarating
 BackToListForThirdParty=Uchinchi shaxslar roʻyxatiga qaytish
-DisableSiteFirst=Avval veb-saytni o'chirib qo'ying
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Mening veb-saytim nomi
 AnotherContainer=Boshqa sahifa / konteyner tarkibini qanday kiritish kerak (agar siz ichki kodni yoqsangiz, dinamik kodni yoqsangiz, bu erda sizda xato bo'lishi mumkin)
 SorryWebsiteIsCurrentlyOffLine=Kechirasiz, ushbu veb-sayt hozirda o'chirilgan. Iltimos, keyinroq qaytib keling ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Har bir veb-sayt / uchinchi tomon uchun veb-sayt qayd yozuvlarini (kirish / o'tish) saqlash uchun jadvalni yoqing
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Avval standart uy sahifasini belgilashingiz kerak
-OnlyEditionOfSourceForGrabbedContentFuture=Ogohlantirish: Tashqi veb-sahifani import qilish orqali veb-sahifa yaratish tajribali foydalanuvchilar uchun ajratilgan. Manba sahifasining murakkabligiga qarab, import natijasi asl nusxadan farq qilishi mumkin. Shuningdek, agar manba sahifa umumiy CSS uslublari yoki ziddiyatli JavaScript-dan foydalansa, bu sahifada ishlashda veb-sayt muharririning ko'rinishi yoki xususiyatlarini buzishi mumkin. Bu usul sahifa yaratishning tezroq usulidir, lekin yangi sahifangizni noldan yoki tavsiya etilgan sahifa shablonidan yaratish tavsiya etiladi.<br>Shuningdek, inline muharriri ishlamasligi mumkinligini ham unutmang. ushlangan tashqi sahifada foydalanilganda to'g'ri.
-OnlyEditionOfSourceForGrabbedContent=Tashqi saytdan tarkib topilganda faqat HTML manbasini nashr qilish mumkin
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=CSS va sahifada joylashgan rasmlarni ham oling.
 ImagesShouldBeSavedInto=Rasmlar katalogga saqlanishi kerak
 WebsiteRootOfImages=Veb-sayt rasmlari uchun ildiz katalogi
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Remove filter
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Categories
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 490665e343b..de7ab957733 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=Kiểm tra tính toàn vẹn của tệp đã
 FileIntegritySomeFilesWereRemovedOrModified=Kiểm tra tính toàn vẹn của tập tin đã thất bại. Một số tập tin đã được sửa đổi, loại bỏ hoặc thêm vào.
 GlobalChecksum=Tổng kiểm tra toàn cục
 MakeIntegrityAnalysisFrom=Phân tích tính toàn vẹn của các tệp ứng dụng từ
-LocalSignature=Chữ ký nhúng cục bộ (ít đáng tin cậy)
-RemoteSignature=Chữ ký từ xa (đáng tin cậy hơn)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=File thất lạc
 FilesUpdated=File đã cập nhật
 FilesModified=Các tệp bị thay đổi
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=Được dùng chỉ bởi một vài tùy chọn chươn
 Security=Bảo mật
 Passwords=Mật khẩu
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=Mã hóa mật khẩu cơ sở dữ liệu được lưu trữ trong conf.php. Rất khuyến khích kích hoạt tùy chọn này.
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=Để có mật khẩu mã hóa vào tập tin <b>conf.php</b>, thay thế dòng <br><b>$dolibarr_main_db_pass="..."</b><br> thành<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
 InstrucToClearPass=Để có mật khẩu được giải mã (trống) vào tập tin <b>conf.php</b>, thay thế dòng <br><b>$dolibarr_main_db_pass="crypted:..."</b><br> thành<br><b>$dolibarr_main_db_pass="%s"</b>
 ProtectAndEncryptPdfFiles=Bảo vệ các tệp PDF được tạo. Điều này KHÔNG được khuyến khích vì nó phá vỡ việc tạo hàng loạt PDF.
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=Trường tính toán
-ComputedFormulaDesc=Bạn có thể nhập vào đây một công thức bằng cách sử dụng các thuộc tính khác của đối tượng hoặc bất kỳ mã PHP nào để nhận giá trị được tính toán động. Bạn có thể sử dụng bất kỳ công thức tương thích PHP nào bao gồm cả dấu "?" toán tử điều kiện và đối tượng chung sau: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>CẢNH BÁO</strong>: Nếu bạn cần các thuộc tính của một đối tượng chưa được tải, bạn chỉ cần tìm nạp đối tượng vào công thức của mình như trong ví dụ thứ hai.<br>Sử dụng trường được tính toán có nghĩa là bạn không thể tự nhập bất kỳ giá trị nào từ giao diện. Ngoài ra, nếu có lỗi cú pháp, công thức có thể không trả về kết quả nào.<br><br>Ví dụ về công thức:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Ví dụ để tải lại đối tượng<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj- >capital / 5: '-1')<br><br>Ví dụ khác về công thức buộc tải đối tượng và đối tượng mẹ của nó: <br>(($reloadedobj = Nhiệm vụ mới($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = Dự án mới( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Không tìm thấy dự án gốc'
+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'
 Computedpersistent=Lưu trữ trường tính toán
 ComputedpersistentDesc=Các trường bổ sung được tính toán sẽ được lưu trữ trong cơ sở dữ liệu, tuy nhiên, giá trị sẽ chỉ được tính toán lại khi đối tượng của trường này bị thay đổi. Nếu trường được tính toán phụ thuộc vào các đối tượng khác hoặc dữ liệu toàn cầu, giá trị này có thể sai !!
 ExtrafieldParamHelpPassword=Để trống trường này có nghĩa là giá trị này sẽ được lưu trữ KHÔNG mã hóa (trường chỉ bị ẩn với các dấu sao trên màn hình).<br><br>Enter giá trị 'dolcrypt' để mã hóa giá trị bằng thuật toán mã hóa có thể đảo ngược. Dữ liệu rõ ràng vẫn có thể được biết và chỉnh sửa nhưng được mã hóa vào cơ sở dữ liệu.<br><br>Nhập 'auto' (hoặc 'md5', 'sha256', 'password_hash', ...) để sử dụng thuật toán mã hóa mật khẩu mặc định (hoặc md5, sha256, pass_hash...) để lưu mật khẩu băm không thể đảo ngược vào cơ sở dữ liệu (không có cách nào lấy lại giá trị ban đầu)
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- Việc sử dụng máy chủ SMTP của Nhà cung cấp dịch vụ Email của chính bạn để gửi email cũng rất thú vị vì tất cả các email được gửi từ ứng dụng cũng sẽ được lưu vào thư mục "Đã gửi" trong hộp thư của bạn.
 WarningPHPMailD=Do đó, nên thay đổi phương thức gửi e-mail thành giá trị "SMTP".
 WarningPHPMailDbis=Nếu bạn thực sự muốn giữ phương thức "PHP" mặc định để gửi email, chỉ cần bỏ qua cảnh báo này hoặc xóa nó bằng cách %snhấp vào đây%s.
-WarningPHPMail2=Nếu nhà cung cấp dịch vụ email email của bạn cần hạn chế ứng dụng email khách đến một số địa chỉ IP (rất hiếm), thì đây là địa chỉ IP của tác nhân người dùng thư (MUA) cho ứng dụng ERP CRM của bạn: <strong>%s</strong> .
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=Kế toán (đơn giản hóa)
 Module10Desc=Báo cáo kế toán đơn giản (nhật ký, doanh thu) dựa trên nội dung cơ sở dữ liệu. Không sử dụng bất kỳ bảng sổ cái nào.
 Module20Name=Đơn hàng đề xuất
 Module20Desc=Quản lý đơn hàng đề xuất
-Module22Name=Email hàng loạt
-Module22Desc=Quản lý gửi email hàng loạt
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=Năng lượng
 Module23Desc=Giám sát việc tiêu thụ năng lượng
 Module25Name=Đơn bán hàng bán
@@ -847,10 +848,10 @@ Permission212=Chi tiết đơn hàng
 Permission213=Kích hoạt dòng chi tiết
 Permission214=Cài đặt Telephony
 Permission215=Thiết lập nhà cung cấp
-Permission221=Xem emailings
-Permission222=Tạo/Chỉnh sửa emailings (tiêu đề, người nhận ...)
-Permission223=Xác nhận emailings (cho phép gửi)
-Permission229=Xóa emailings
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=Xem người nhận và các thông tin
 Permission238=Gửi thư thủ công
 Permission239=Xóa thư sau khi xác nhận hoặc gửi
@@ -1105,6 +1106,7 @@ DictionaryStaff=Số lượng nhân viên
 DictionaryAvailability=Trì hoãn giao hàng
 DictionaryOrderMethods=Phương thức đặt hàng
 DictionarySource=Chứng từ gốc của đơn hàng đề xuất/đơn hàng
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=Các nhóm được cá nhân hóa cho các báo cáo
 DictionaryAccountancysystem=Kiểu biểu đồ tài khoản
 DictionaryAccountancyJournal=Nhật ký kế toán
@@ -1134,11 +1136,11 @@ BackToDictionaryList=Quay lại danh sách Từ điển
 TypeOfRevenueStamp=Loại tem thuế
 VATManagement=Quản lý Thuế bán hàng
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Theo mặc định, thuế Bán hàng được đề xuất là 0 có thể được sử dụng cho các trường hợp như hiệp hội, cá nhân hoặc công ty nhỏ.
 VATIsUsedExampleFR=Ở Pháp, nó có nghĩa là các công ty hoặc tổ chức có một hệ thống tài chính thực sự (Đơn giản hóa thực tế hoặc thực tế bình thường). Một hệ thống trong đó VAT được khai báo.
 VATIsNotUsedExampleFR=Ở Pháp, điều đó có nghĩa là các hiệp hội không khai thuế bán hàng hoặc các công ty, tổ chức hoặc ngành nghề tự do đã chọn hệ thống tài chính doanh nghiệp siêu nhỏ (Thuế bán hàng trong nhượng quyền thương mại) và nộp thuế nhượng quyền Thuế bán hàng mà không cần khai báo thuế Bán hàng. Lựa chọn này sẽ hiển thị tham chiếu "Thuế bán hàng không áp dụng - art-293B của CGI" trên hóa đơn.
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=Loại thuế bán hàng
 LTRate=Tỷ suất
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=Theo cách thiết lập thuế (Xem %s - %s - %s) , n
 LabelUsedByDefault=Nhãn được sử dụng bởi mặc định nếu không có bản dịch có thể được tìm thấy với code đó
 LabelOnDocuments=Nhãn trên các tài liệu
 LabelOrTranslationKey=Nhãn hoặc từ khóa dịch
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=Hiển thị số VAT của Khách hàng/Nhà cung cấp vào danh
 AddAdressInList=Hiển thị địa chỉ Khách hàng/Nhà cung cấp thành danh sách kết hợp.<br>Bên thứ ba sẽ xuất hiện với định dạng tên là "The Big Company corp. - 21 jump street 123456 Big town - USA" thay vì " Tập đoàn Big Company".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Yêu cầu phương thức vận chuyển ưa thích cho bên thứ ba.
-FieldEdition=Biên soạn của trường %s
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
 GetBarCode=Nhận mã vạch
 NumberingModules=Kiểu thiết lập số
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=Buộc ngày hóa đơn là ngày xác nhận
 SuggestedPaymentModesIfNotDefinedInInvoice=Chế độ thanh toán được đề xuất trên hóa đơn theo mặc định nếu không được xác định trên hóa đơn
 SuggestPaymentByRIBOnAccount=Đề nghị thanh toán bằng cách rút tiền trên tài khoản
 SuggestPaymentByChequeToAddress=Đề nghị thanh toán bằng séc
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=Free text on invoices
 WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
 PaymentsNumberingModule=Mô hình đánh số thanh toán
@@ -1718,6 +1723,7 @@ CompressionOfResources=Compression of HTTP responses
 CompressionOfResourcesDesc=Ví dụ: sử dụng chỉ thị Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 DefaultValuesDesc=Tại đây, bạn có thể xác định giá trị mặc định bạn muốn sử dụng khi tạo bản ghi mới và/hoặc bộ lọc mặc định hoặc thứ tự sắp xếp khi bạn liệt kê các bản ghi.
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=Giá trị mặc định (để sử dụng trên biểu mẫu)
 DefaultSearchFilters=Bộ lọc tìm kiếm mặc định
 DefaultSortOrder=Yêu cầu sắp xếp mặc định
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=Module đánh số Gửi
 SendingsAbility=Hỗ trợ vận chuyển cho việc giao hàng của khách hàng
 NoNeedForDeliveryReceipts=Trong hầu hết các trường hợp, các phiếu sheet vận chuyển được sử dụng cả dưới dạng phiếu cho việc giao hàng của khách hàng (danh sách các sản phẩm cần gửi) và các phiếu được nhận và ký bởi khách hàng. Do đó biên nhận giao sản phẩm là một tính năng trùng lặp và hiếm khi được kích hoạt.
 FreeLegalTextOnShippings=Free text trên phiếu vận chuyển
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Module đánh số phiếu giao nhận sản phẩm
 DeliveryOrderModel=Mẫu phiếu giao nhận sản phẩm
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=Free text trên phiếu giao nhận
 ##### FCKeditor #####
 AdvancedEditor=Trình soạn thảo nâng cao
 ActivateFCKeditor=Kích hoạt trình soạn thảo nâng cao cho:
-FCKeditorForNotePublic=Tạo/ấn bản WYSIWYG của trường "ghi chú công khai" của các phần tử
-FCKeditorForNotePrivate=Tạo/ấn bản WYSIWYG của trường "ghi chú riêng" của các phần tử
-FCKeditorForCompany=Tạo/ấn bản WYSIWYG mô tả trường của các thành phần (ngoại trừ sản phẩm/dịch vụ)
-FCKeditorForProductDetails=Tạo/chỉnh sửa WYSIWYG mô tả sản phẩm hoặc dòng cho các đối tượng (dòng đề xuất, đơn đặt hàng, hóa đơn, v.v.).
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Cảnh báo: Thực sự không nên sử dụng tùy chọn này cho trường hợp này vì nó có thể gây ra sự cố với các ký tự đặc biệt và định dạng trang khi xây dựng tệp PDF.
-FCKeditorForMailing= Tạo/phiên bản WYSIWYG cho gửi email hàng loạt (Công cụ->gửi email)
-FCKeditorForUserSignature=Tạo/chỉnh sửa chữ ký người dùng WYSIWYG
-FCKeditorForMail=Tạo/phiên bản WYSIWYG cho tất cả thư (ngoại trừ Công cụ->gửi email)
-FCKeditorForTicket=Tạo/phiên bản WYSIWYG cho vé
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=Thiết lập mô-đun tồn kho
 IfYouUsePointOfSaleCheckModule=Nếu bạn sử dụng mô-đun Điểm bán hàng (POS) được cung cấp theo mặc định hoặc mô-đun bên ngoài, thiết lập này có thể bị bỏ qua bởi mô-đun POS của bạn. Hầu hết các mô-đun POS được thiết kế theo mặc định để tạo hóa đơn ngay lập tức và giảm tồn kho bất kể các tùy chọn ở đây. Vì vậy, nếu bạn cần hoặc không giảm tồn kho khi đăng ký bán hàng từ POS của mình, hãy kiểm tra thiết lập mô-đun POS của bạn.
@@ -1867,7 +1874,6 @@ Buy=Mua
 Sell=Bán
 InvoiceDateUsed=Ngày hóa đơn được dùng
 YourCompanyDoesNotUseVAT=Công ty của bạn đã được xác định không sử dụng VAT (Trang chủ - Cài đặt - Công ty / Tổ chức), do đó không có tùy chọn VAT để thiết lập.
-AccountancyCode=Mã kế toán
 AccountancyCodeSell=Mã kế toán bán hàng
 AccountancyCodeBuy=Mã kế toán mua hàng
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Giữ trống hộp kiểm “Tự động tạo thanh toán” theo mặc định khi tạo thuế mới
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = Bạn muốn mở chế độ xem nào theo mặc định
 AGENDA_EVENT_PAST_COLOR = Màu sự kiện trong quá khứ
 AGENDA_EVENT_CURRENT_COLOR = Màu sự kiện hiện tại
 AGENDA_EVENT_FUTURE_COLOR = Màu sự kiện trong tương lai
-AGENDA_REMINDER_BROWSER = Bật lời nhắc sự kiện <b>trên trình duyệt của người dùng</b> (Khi đến ngày nhắc, trình duyệt sẽ hiển thị một cửa sổ bật lên. Mỗi người dùng có thể tắt các thông báo như vậy khỏi thiết lập thông báo trình duyệt của nó).
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = Bật thông báo âm thanh
-AGENDA_REMINDER_EMAIL = Bật lời nhắc sự kiện <b>qua email</b> (có thể xác định tùy chọn nhắc nhở/độ trễ cho mỗi sự kiện).
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = Lưu ý: Tần suất của công việc đã lên lịch %s phải đủ để đảm bảo rằng lời nhắc được gửi vào đúng thời điểm.
 AGENDA_SHOW_LINKED_OBJECT = Hiển thị đối tượng được liên kết vào chế độ xem chương trình nghị sự
 AGENDA_USE_EVENT_TYPE = Sử dụng các loại sự kiện (được quản lý trong menu Cài đặt -> Từ điển -> Loại sự kiện chương trình nghị sự)
 AGENDA_USE_EVENT_TYPE_DEFAULT = Tự động đặt giá trị mặc định này cho loại sự kiện trong biểu mẫu tạo sự kiện
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = Khóa được phép xuất liên kết
 PastDelayVCalExport=Không xuất dữ liệu sự kiện cũ hơn
 SecurityKey = Chìa khóa bảo mật
@@ -2006,7 +2017,7 @@ BackupZipWizard=Hướng dẫn tạo lưu trữ của thư mục hồ sơ
 SomethingMakeInstallFromWebNotPossible=Cài đặt module bên ngoài là không thể từ giao diện web với các lý do sau:
 SomethingMakeInstallFromWebNotPossible2=Vì lý do này, quá trình nâng cấp được mô tả ở đây là quy trình thủ công chỉ người dùng đặc quyền mới có thể thực hiện.
 InstallModuleFromWebHasBeenDisabledContactUs=Việc cài đặt hoặc phát triển các mô-đun bên ngoài hoặc trang web động từ ứng dụng hiện bị khóa vì mục đích bảo mật. Vui lòng liên hệ với chúng tôi nếu bạn cần kích hoạt tính năng này.
-InstallModuleFromWebHasBeenDisabledByFile=Cài đặt các module bên ngoài từ các ứng dụng đã bị vô hiệu bởi quản trị viên của bạn. Bạn phải yêu cầu ông phải loại bỏ các tập tin <strong>%s</strong> để cho phép tính năng này.
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Cài đặt hoặc xây dựng một mô-đun bên ngoài từ ứng dụng cần lưu các tệp mô-đun vào thư mục <strong>%s</strong>. Để thư mục này được Dolibarr xử lý, bạn phải thiết lập <strong>conf/conf.php của</strong> mình để thêm 2 dòng lệnh: <br> <strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Tô sáng các dòng bảng khi chuột di chuyển qua
 HighlightLinesColor=Tô sáng màu của dòng khi chuột đi qua (sử dụng 'ffffff' để không làm nổi bật)
@@ -2036,6 +2047,7 @@ Enter0or1=Lỗi 0 hoặc 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=Nhập vào đây giữa các dấu ngoặc nhọn, danh sách số byte đại diện cho ký hiệu tiền tệ. Ví dụ: với $, nhập [36] - đối với brazil real R $ [82,36] - với €, nhập [8364]
 ColorFormat=Màu RGB ở định dạng HEX, ví dụ: FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=Tên biểu tượng ở định dạng:<br>- image.png cho tệp hình ảnh vào thư mục chủ đề hiện tại<br>- image.png@module nếu tệp nằm trong thư mục /img/ của mô-đun<br>- fa-xxx cho FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size cho ảnh FontAwesome fa-xxx (có tiền tố, màu sắc và kích thước được đặt)
 PositionIntoComboList=Vị trí của dòng ở trong danh sách kết hợp
 SellTaxRate=Thuế suất bán hàng
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=Ẩn đường viền trên khung địa chỉ người gửi
 MAIN_PDF_NO_RECIPENT_FRAME=Ẩn đường viền khung địa chỉ người nhận
 MAIN_PDF_HIDE_CUSTOMER_CODE=Ẩn mã khách hàng
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=Ẩn tên người gửi/công ty trong khối địa chỉ
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Ẩn điều kiện thanh toán
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Ẩn chế độ thanh toán
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=Không được khuyến khích
 ARestrictedPath=Một số đường dẫn hạn chế cho file dữ liệu
 CheckForModuleUpdate=Kiểm tra các bản cập nhật mô-đun bên ngoài
 CheckForModuleUpdateHelp=Hành động này sẽ kết nối với trình soạn thảo của các mô-đun bên ngoài để kiểm tra xem có phiên bản mới hay không.
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=Đã có bản cập nhật
 NoExternalModuleWithUpdate=Không tìm thấy bản cập nhật nào cho các mô-đun bên ngoài
 SwaggerDescriptionFile=Tệp mô tả API Swagger (để sử dụng với redoc chẳng hạn)
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Hiển thị địa chỉ giao hàng
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Chỉ định bắt buộc ở một số nước (Pháp,...)
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=Liên kết url của mạng xã hội. Sử dụng {socialid} cho phần biến chứa ID mạng xã hội.
 IfThisCategoryIsChildOfAnother=Nếu thể loại này là con của thể loại khác
 DarkThemeMode=Chế độ chủ đề tối
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=Cảnh báo: mô-đun %s đã 
 WarningModuleHasChangedSecurityCsrfParameter=Cảnh báo: mô-đun %s đã vô hiệu hóa bảo mật CSRF cho phiên bản của bạn. Hành động này bị nghi ngờ và cài đặt của bạn có thể không còn được bảo mật nữa. Vui lòng liên hệ với tác giả của mô-đun để được giải thích.
 EMailsInGoingDesc=Email đến được quản lý bởi mô-đun %s. Bạn phải kích hoạt và định cấu hình nó nếu bạn cần hỗ trợ gửi email.
 MAIN_IMAP_USE_PHPIMAP=Sử dụng thư viện PHP-IMAP cho IMAP thay vì IMAP PHP gốc. Điều này cũng cho phép sử dụng kết nối OAuth2 cho IMAP (mô-đun OAuth cũng phải được kích hoạt).
-MAIN_CHECKBOX_LEFT_COLUMN=Hiển thị cột để chọn trường và dòng ở bên trái (theo mặc định ở bên phải)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Không được tạo theo mặc định. Chỉ được tạo khi kích hoạt mô-đun.
 CSSPage=Kiểu CSS
 Defaultfortype=Mặc định
@@ -2489,7 +2510,7 @@ AiDescription=Tính năng AI (Trí tuệ nhân tạo)
 AiDescriptionLong=Cung cấp các tính năng AI (Trí tuệ nhân tạo) trong các phần khác nhau của ứng dụng. Cần API AI bên ngoài.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=Thiết lập mô-đun AI
 AiCustomPrompt=Lời nhắc tùy chỉnh AI
 AI_CONFIGURATIONS_PROMPT=Lời nhắc tùy chỉnh
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=Lời nhắc tùy chỉnh AI cho các tính năng
 EnterAnIP=Nhập địa chỉ IP
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=Show shipping address
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
index 7e04d3f074a..0431b3dc29f 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=Số dư cuối
 CurrentBalance=Số dư hiện tại
 FutureBalance=Số dư trong tương lai
 ShowAllTimeBalance=Hiển thị cân bằng từ đầu
-AllTime=Từ ngày
 Reconciliation=Hòa giải
 RIB=Số tài khoản ngân hàng
 IBAN=Số IBAN
@@ -133,7 +132,7 @@ DeleteTransaction=Xóa mục kê khai
 ConfirmDeleteTransaction=Bạn có muốn xóa kê khai này?
 ThisWillAlsoDeleteBankRecord=Đồng thời còn xóa kê khai ngân hàng đã tạo
 BankMovements=Biến động
-PlannedTransactions=Kê khai theo kế hoạch
+PlannedTransactions=Upcoming entries
 Graph=Đồ thị
 ExportDataset_banque_1=Kê khai ngân hàng và bảng kê tài khoản
 ExportDataset_banque_2=Phiếu nộp tiền
@@ -151,7 +150,7 @@ FutureTransaction=Giao dịch trong tương lai. Không thể đối chiếu
 SelectChequeTransactionAndGenerate=Chọn/lọc các séc sẽ được đưa vào biên lai gửi séc. Sau đó, nhấp vào "Tạo".
 SelectPaymentTransactionAndGenerate=Chọn/lọc các tài liệu sẽ có trong biên lai ký gửi %s. Sau đó, nhấp vào "Tạo".
 InputReceiptNumber=Chọn sao kê ngân hàng liên quan đến việc hòa giải. Sử dụng một giá trị số có thể sắp xếp
-InputReceiptNumberBis=YYYYMM hoặc YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=Cần đối soát?
 ThenCheckLinesAndConciliate=Sau đó, kiểm tra những dòng hiện trong báo cáo ngân hàng và nhấp
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=Nếu chức năng này được bật, bạn có thể
 BankColorizeMovementName1=Màu nền cho kết chuyển ghi nợ
 BankColorizeMovementName2=Màu nền cho kết chuyển ghi có
 IfYouDontReconcileDisableProperty=Nếu bạn không thực hiện đối chiếu ngân hàng trên một số tài khoản ngân hàng, hãy vô hiệu hóa thuộc tính "%s" trên chúng để xóa cảnh báo này.
-NoBankAccountDefined=Không có tài khoản ngân hàng nào được xác định
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=Không tìm thấy hồ sơ trong tài khoản ngân hàng. Thông thường, điều này xảy ra khi một bản ghi đã bị xóa thủ công khỏi danh sách giao dịch trong tài khoản ngân hàng (ví dụ: trong quá trình đối chiếu tài khoản ngân hàng). Một lý do khác là thanh toán đã được ghi lại khi mô-đun "%s" bị tắt.
 AlreadyOneBankAccount=Đã xác định được một tài khoản ngân hàng
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Biến thể tệp SEPA
diff --git a/htdocs/langs/vi_VN/blockedlog.lang b/htdocs/langs/vi_VN/blockedlog.lang
index d91ac998dfc..c4b0ffd8f5c 100644
--- a/htdocs/langs/vi_VN/blockedlog.lang
+++ b/htdocs/langs/vi_VN/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=Nhật ký không thể thay đổi
 ShowAllFingerPrintsMightBeTooLong=Hiển thị tất cả các nhật ký lưu trữ (có thể dài)
 ShowAllFingerPrintsErrorsMightBeTooLong=Hiển thị tất cả các nhật ký lưu trữ không hợp lệ (có thể dài)
 DownloadBlockChain=Tải dấu vân tay
-KoCheckFingerprintValidity=Mục nhật ký được lưu trữ không hợp lệ. Điều đó có nghĩa là ai đó (một hacker?) đã sửa đổi một số dữ liệu của bản ghi này sau khi nó được ghi lại hoặc đã xóa bản ghi lưu trữ trước đó (kiểm tra dòng có # trước đó tồn tại) hoặc đã sửa đổi tổng kiểm tra của bản ghi trước đó.
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=Bản ghi nhật ký lưu trữ là hợp lệ. Dữ liệu trên dòng này không được sửa đổi và mục nhập theo sau.
 OkCheckFingerprintValidityButChainIsKo=Nhật ký lưu trữ có vẻ hợp lệ so với trước đó nhưng chuỗi đã bị hỏng trước đó.
 AddedByAuthority=Lưu trữ vào ủy quyền từ xa
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=Chi tiết nhật ký
 ListOfTrackedEvents=Danh sách các sự kiện được theo dõi
 Fingerprint=Vân tay
 DownloadLogCSV=Xuất nhật ký lưu trữ (CSV)
-DataOfArchivedEvent=Dữ liệu đầy đủ của sự kiện được lưu trữ
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=Đối tượng gốc (loại %s, id %s) không được liên kết (xem cột 'Dữ liệu đầy đủ' để có được dữ liệu đã lưu không thể thay đổi)
 BlockedLogAreRequiredByYourCountryLegislation=Mô-đun Nhật ký không thể thay đổi có thể được yêu cầu theo luật pháp của nước bạn. Việc vô hiệu hóa mô-đun này có thể khiến bất kỳ giao dịch nào trong tương lai không hợp lệ đối với luật pháp và việc sử dụng phần mềm hợp pháp vì chúng không thể được xác nhận bởi kiểm toán thuế.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Mô-đun Nhật ký không thể thay đổi đã được kích hoạt do luật pháp của quốc gia bạn. Vô hiệu hóa mô-đun này có thể khiến bất kỳ giao dịch nào trong tương lai không hợp lệ đối với luật pháp và việc sử dụng phần mềm hợp pháp vì chúng không thể được xác nhận bởi kiểm toán thuế.
@@ -30,6 +32,7 @@ BlockedLogEnabled=Hệ thống theo dõi các sự kiện vào nhật ký không
 BlockedLogDisabled=Hệ thống theo dõi các sự kiện vào nhật ký không thể thay đổi đã bị vô hiệu hóa sau khi thực hiện xong một số bản ghi. Chúng tôi đã lưu Dấu vân tay đặc biệt để theo dõi chuỗi bị hỏng
 BlockedLogDisabledBis=Hệ thống theo dõi các sự kiện vào nhật ký không thể thay đổi đã bị vô hiệu hóa. Điều này có thể thực hiện được vì chưa có bản ghi nào được thực hiện.
 LinkHasBeenDisabledForPerformancePurpose=Vì mục đích hiệu suất, liên kết trực tiếp tới tài liệu không được hiển thị sau dòng thứ 100.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=Hóa đơn khách hàng bị xóa logic
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=Thanh toán của khách hàng xóa logic
 logPAYMENT_VARIOUS_CREATE=Thanh toán (không được chỉ định cho hóa đơn) đã được tạo
 logPAYMENT_VARIOUS_DELETE=Thanh toán (không được chỉ định cho hóa đơn) xóa logic
 logPAYMENT_VARIOUS_MODIFY=Thanh toán (không được chỉ định cho hóa đơn) được sửa đổi
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang
index 0332882a31e..72da3c645af 100644
--- a/htdocs/langs/vi_VN/categories.lang
+++ b/htdocs/langs/vi_VN/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=Khu vực thẻ/danh mục liên hệ
 AccountsCategoriesArea=Khu vực thẻ/danh mục tài khoản ngân hàng
 ProjectsCategoriesArea=Khu vực thẻ/danh mục dự án
 UsersCategoriesArea=Khu vực thẻ/danh mục người dùng
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=Danh mục con
 CatList=Danh sách thẻ/danh mục
 CatListAll=Danh sách thẻ/danh mục (tất cả các loại)
@@ -51,7 +52,7 @@ DeleteCategory=Xóa thẻ/ danh mục
 ConfirmDeleteCategory=Bạn có chắc chắn muốn xóa thẻ/ danh mục này?
 NoCategoriesDefined=Không có thẻ/ danh mục được xác định
 SuppliersCategoryShort=thẻ/ danh mục Nhà cung cấp
-CustomersCategoryShort=thẻ/ danh mục  Khách hàng 
+CustomersCategoryShort=thẻ/ danh mục  Khách hàng
 ProductsCategoryShort=thẻ/ danh mục Sản phẩm
 MembersCategoryShort=thẻ/ danh mục Thành viên
 SuppliersCategoriesShort=thẻ/ danh mục Nhà cung cấp
@@ -90,9 +91,10 @@ CategoriesSetup=Thiết lập thẻ/ danh mục
 CategorieRecursiv=Tự động liên kết với thẻ/ danh mục cha
 CategorieRecursivHelp=Nếu tùy chọn được bật, khi bạn thêm một đối tượng vào danh mục con, đối tượng đó cũng sẽ được thêm vào danh mục chính.
 AddProductServiceIntoCategory=Chỉ định danh mục cho sản phẩm/dịch vụ
-AddCustomerIntoCategory=Gán danh mục cho khách hàng
-AddSupplierIntoCategory=Chỉ định danh mục cho nhà cung cấp
-AssignCategoryTo=Chỉ định danh mục cho
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=Hiển thị thẻ/ danh mục
 ByDefaultInList=Theo mặc định trong danh sách
 ChooseCategory=Chọn danh mục
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=Danh mục vùng chứa trang
 KnowledgemanagementsCategoriesArea=Bài viết KM
 UseOrOperatorForCategories=Sử dụng toán tử 'HOẶC' cho danh mục
 AddObjectIntoCategory=Gán vào danh mục
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index 7064c4bfd5b..3f2641227f1 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -34,7 +34,7 @@ PriceFormatInCurrentLanguage=Định dạng hiển thị giá theo ngôn ngữ v
 ThirdPartyName=Tên của bên thứ ba
 ThirdPartyEmail=Email của bên thứ ba
 ThirdParty=Bên thứ ba
-ThirdParties=Các bên thứ ba
+ThirdParties=Bên thứ ba
 ThirdPartyProspects=KH tiềm năng
 ThirdPartyProspectsStats=Các KH tiềm năng
 ThirdPartyCustomers=Các khách hàng
@@ -79,7 +79,7 @@ Chat=Chat
 PhonePro=Xe buýt. điện thoại
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
-No_Email=Từ chối gửi email hàng loạt
+No_Email=Refuse mass emails
 Fax=Fax
 Zip=Mã Zip
 Town=Thành phố
@@ -254,7 +254,7 @@ CustomerCard=Thẻ khách hàng
 Customer=Khách hàng
 CustomerRelativeDiscount=Giảm giá theo số tiền
 SupplierRelativeDiscount=Chiết khấu của nhà cung cấp tương đối
-CustomerRelativeDiscountShort=Giảm giá theo %
+CustomerRelativeDiscountShort=Chiết khấu tương đối
 CustomerAbsoluteDiscountShort=Giảm giá theo số tiền
 CompanyHasRelativeDiscount=Khách hàng này có giảm giá mặc định là <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Khách hàng này không có mặc định giảm giá theo %
@@ -383,8 +383,8 @@ ExportCardToFormat=Thẻ xuất để định dạng
 ContactNotLinkedToCompany=Liên lạc không liên quan đến bất kỳ bên thứ ba
 DolibarrLogin=Đăng nhập Dolibarr
 NoDolibarrAccess=Không truy cập Dolibarr
-ExportDataset_company_1=Bên thứ ba (công ty / tổ chức / người) và tính chất của họ
-ExportDataset_company_2=Liên lạc và tính chất của họ
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=Các liên lạc/ địa chỉ và thuộc tính bổ sung của bên thứ ba
 ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=Bên thứ ba và tính chất của họ
 ImportDataset_company_2=Các liên lạc/ địa chỉ và thuộc tính bổ sung của bên thứ ba
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index ab44f092e8b..b1430834d2b 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=Thanh toán hóa đơn của khách hàng
 PaymentSupplierInvoice=Thanh toán hóa đơn nhà cung cấp
 PaymentSocialContribution=Thanh toán xã hội/ fiscal tax
 PaymentVat=Nộp thuế GTGT
-AutomaticCreationPayment=Tự động ghi lại thanh toán
+AutomaticCreationPayment=Also record the payment
 ListPayment=Danh sách thanh toán
 ListOfCustomerPayments=Danh sách các khoản thanh toán của khách hàng
 ListOfSupplierPayments=Danh sách thanh toán nhà cung cấp
@@ -118,10 +118,14 @@ SocialContributionsPayments=Thanh toán thuế xã hội / tài chính
 ShowVatPayment=Hiện nộp thuế GTGT
 TotalToPay=Tổng số trả
 BalanceVisibilityDependsOnSortAndFilters=Số dư chỉ hiển thị trong danh sách này nếu bảng được sắp xếp trên %s và được lọc trên 1 tài khoản ngân hàng (không có bộ lọc nào khác)
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=Mã kế toán khách hàng
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=Mã kế toán nhà cung cấp
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=Mã K.toán K.H
 SupplierAccountancyCodeShort=Mã K.toán N.C.C
+UserAccountancyCodeShort=User account. code
 AccountNumber=Số tài khoản
 NewAccountingAccount=Tài khoản mới
 Turnover=Doanh thu được lập hóa đơn
@@ -129,7 +133,9 @@ TurnoverCollected=Doanh thu được thu thập
 SalesTurnoverMinimum=Doanh thu tối thiểu
 ByExpenseIncome=Theo chi phí và thu nhập
 ByThirdParties=Do các bên thứ ba
+ByProjects=By projects
 ByUserAuthorOfInvoice=Của tác giả hóa đơn
+DetailedListLowercase=detailed list
 CheckReceipt=Phiếu nộp tiền
 CheckReceiptShort=Phiếu nộp tiền
 LastCheckReceiptShort=Phiếu gửi tiền %s mới nhất
diff --git a/htdocs/langs/vi_VN/datapolicy.lang b/htdocs/langs/vi_VN/datapolicy.lang
index 11025ffa447..3d56ae703a3 100644
--- a/htdocs/langs/vi_VN/datapolicy.lang
+++ b/htdocs/langs/vi_VN/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = Chính sách bảo mật dữ liệu
 Module4100Desc = Mô-đun quản lý quyền riêng tư dữ liệu (Tuân thủ GDPR)
 # Administration page
 datapolicySetup = Thiết lập chính sách bảo mật dữ liệu mô-đun
-Deletion = Xóa dữ liệu
-datapolicySetupPage = Tùy thuộc vào luật pháp của quốc gia bạn (Ví dụ <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Điều 5</a> của GDPR), dữ liệu cá nhân phải được lưu giữ trong một khoảng thời gian không vượt quá khoảng thời gian dữ liệu cần thiết cho mục đích thu thập dữ liệu, ngoại trừ mục đích lưu trữ.<br>Việc xóa sẽ được thực hiện tự động sau một khoảng thời gian nhất định mà không có sự kiện (khoảng thời gian mà bạn sẽ chỉ ra dưới đây).
+DataDeletion=Deletion of data
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s tháng
 ONE_YEAR = 1 năm
 NB_YEARS = %s năm
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = Khách hàng tiềm năng
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Cũng không phải khách hàng tiềm năng/Cũng không phải khách hàng
 DATAPOLICY_CONTACT_FOURNISSEUR = Nhà cung cấp
 DATAPOLICY_ADHERENT = Thành viên
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = Bạn có thể gửi email GDPR đến tất cả các địa chỉ liên hệ có liên quan của mình (những người chưa nhận được email và bạn chưa đăng ký bất kỳ điều gì về thỏa thuận GDPR của họ). Để thực hiện việc này, hãy sử dụng nút sau.
 SendAgreement = Gửi email
 AllAgreementSend = Tất cả các email đã được gửi
 TXTLINKDATAPOLICYACCEPT = Văn bản cho liên kết "thỏa thuận"
 TXTLINKDATAPOLICYREFUSE = Văn bản cho liên kết "bất đồng"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR: Xử lý dữ liệu cá nhân
 DATAPOLICY_consentement = Đã có sự đồng ý cho việc xử lý dữ liệu cá nhân
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 33a3596e596..e5e08886760 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=Không thể tạo một thư mục. Kiểm tra xem người sử dụng máy chủ web có quyền ghi vào thư mục tài liệu Dolibarr. Nếu tham số <b>safe_mode</b> được kích hoạt trên PHP này, hãy kiểm tra các tập tin php Dolibarr sở hữu cho người sử dụng máy chủ web (hoặc một nhóm).
 ErrorNoMailDefinedForThisUser=Không có thư xác định cho người dùng này
 ErrorSetupOfEmailsNotComplete=Việc thiết lập email chưa hoàn tất
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=Tính năng này cần kích hoạt JavaScript để hoạt động. Thay đổi điều này trong thiết lập - hiển thị.
 ErrorTopMenuMustHaveAParentWithId0=Một thực đơn của loại 'Top' không thể có một trình đơn phụ huynh. Đặt 0 trong trình đơn phụ huynh hoặc chọn một trình đơn của loại 'trái'.
 ErrorLeftMenuMustHaveAParentId=Một thực đơn của loại 'trái' phải có một id cha mẹ.
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=Tải bị chặn bởi một plugin PHP / Apache.
 ErrorFileSizeTooLarge=Kích thước tệp quá lớn hoặc tệp không được cung cấp.
 ErrorFieldTooLong=Kích thước trường %squá lớn.
 ErrorSizeTooLongForIntType=Kích thước quá dài cho kiểu int (tối đa số% s)
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=Kích thước quá dài cho kiểu chuỗi (ký tự tối đa% s)
 ErrorNoValueForSelectType=Xin vui lòng điền giá trị so với danh sách lựa chọn
 ErrorNoValueForCheckBoxType=Xin vui lòng điền giá trị so với danh sách hộp
@@ -138,8 +140,9 @@ ErrorBadValueForCode=Bad giá trị so với mã bảo vệ. Hãy thử lại v
 ErrorBothFieldCantBeNegative=Fields% s và% s không thể được cả hai tiêu cực
 ErrorFieldCantBeNegativeOnInvoice=Trường <strong>%s</strong> không thể âm đối với loại hóa đơn này. Nếu bạn cần thêm dòng giảm giá, trước tiên bạn chỉ cần tạo dòng giảm giá (từ trường '%s' trong thẻ của bên thứ ba) và áp dụng nó vào hóa đơn.
 ErrorLinesCantBeNegativeForOneVATRate=Tổng số dòng (chưa bao gồm thuế) không thể âm đối với thuế suất VAT không rỗng (Đã tìm thấy tổng số âm cho thuế suất VAT <b>%s </b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Các dòng này không thể âm. Bạn sẽ gặp khó khăn khi bạn tổng hợp đặt cọc vào hoá đơn cuối
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=Số lượng cho dòng vào hóa đơn của khách hàng không thể âm
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=Tài khoản người <b>dùng% s</b> được sử dụng để thực hiện các máy chủ web không có sự cho phép cho điều đó
 ErrorNoActivatedBarcode=Không có loại mã vạch kích hoạt
 ErrUnzipFails=Không thể giải nén% s với ZipArchive
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Tham số PHP của bạn upload_max_filesize (%s) cao hơn tham số PHP post_max_size (%s). Đây không phải là một thiết lập phù hợp.
 WarningPasswordSetWithNoAccount=Một mật khẩu đã được đặt cho thành viên này. Tuy nhiên, không có tài khoản người dùng nào được tạo. Vì vậy, mật khẩu này được lưu trữ nhưng không thể được sử dụng để đăng nhập vào Dolibarr. Nó có thể được sử dụng bởi một mô-đun / giao diện bên ngoài nhưng nếu bạn không cần xác định bất kỳ thông tin đăng nhập hay mật khẩu nào cho thành viên, bạn có thể tắt tùy chọn "Quản lý đăng nhập cho từng thành viên" từ thiết lập mô-đun Thành viên. Nếu bạn cần quản lý thông tin đăng nhập nhưng không cần bất kỳ mật khẩu nào, bạn có thể để trống trường này để tránh cảnh báo này. Lưu ý: Email cũng có thể được sử dụng làm thông tin đăng nhập nếu thành viên được liên kết với người dùng.
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = Hóa đơn SwissQR chỉ có thể được thêm vào các hóa đơn được thiết lập để thanh toán bằng thanh toán chuyển khoản tín dụng.
 SwissQrCreditorAddressInvalid = Địa chỉ của bên được chi trả không hợp lệ (ZIP và thành phố có được đặt không? (%s)
 SwissQrCreditorInformationInvalid = Thông tin chủ nợ không hợp lệ đối với IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s đã được xác định là đ
 ErrorThisGroupIsAlreadyDefinedAsThisType=Những người liên hệ với nhóm này đã được xác định là người liên hệ cho loại này.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/vi_VN/exports.lang b/htdocs/langs/vi_VN/exports.lang
index 662b6c8711e..c68dc737c5a 100644
--- a/htdocs/langs/vi_VN/exports.lang
+++ b/htdocs/langs/vi_VN/exports.lang
@@ -46,10 +46,16 @@ LineLabel=Nhãn của dòng
 LineDescription=Mô tả của dòng
 LineUnitPrice=Đơn giá của dòng
 LineVATRate=Thuế suất VAT của dòng
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=Số lượng dòng
 LineTotalHT=Số tiền không gồm thuế cho dòng
 LineTotalTTC=Số tiền có thuế cho dòng
 LineTotalVAT=Số tiền thuế GTGT cho dòng
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=Loại dòng (0 = sản phẩm, dịch vụ = 1)
 FileWithDataToImport=Tập tin với dữ liệu để nhập
 FileToImport=Tập tin nguồn để nhập dữ liệu
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=Chọn định dạng tệp để sử dụng làm đ
 ChooseFileToImport=Tải lên tệp sau đó nhấp vào biểu tượng %s để lựa chọn tệp là tệp nguồn nhập
 SourceFileFormat=Định dạng tệp nguồn
 FieldsInSourceFile=Các trường trong tệp nguồn
-FieldsInTargetDatabase=Các trường mục tiêu trong cơ sở dữ liệu Dolibarr (bold = bắt buộc)
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=Không có trường
 MoveField=Di chuyển số cột trường %s
 ExampleOfImportFile=Example_of_import_file
@@ -76,8 +82,8 @@ NowClickToTestTheImport=Kiểm tra xem định dạng tệp (trường và chu
 RunSimulateImportFile=Chạy mô phỏng nhập dữ liệu
 FieldNeedSource=Trường này yêu cầu dữ liệu từ tập tin nguồn
 SomeMandatoryFieldHaveNoSource=Một số thông tin bắt buộc không có nguồn từ tập tin dữ liệu
-InformationOnSourceFile=Thông tin về các tập tin nguồn
-InformationOnTargetTables=Thông tin về các lĩnh vực mục tiêu
+InformationOnSourceFile=Tập tin nguồn
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=Chuyển ít nhất một lĩnh vực nguồn trong cột của lĩnh vực xuất dữ liệu
 SelectFormat=Chọn định dạng tập tin nhập dữ liệu này
 RunImportFile=Nhập dữ liệu
diff --git a/htdocs/langs/vi_VN/hrm.lang b/htdocs/langs/vi_VN/hrm.lang
index 3c1ef435e81..74ddafbb1a6 100644
--- a/htdocs/langs/vi_VN/hrm.lang
+++ b/htdocs/langs/vi_VN/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=Cấp bậc bắt buộc cho hồ sơ công việc
-RequiredRankShort=Thứ hạng bắt buộc
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Các vị trí có hồ sơ công việc này
-EmployeeRank=Xếp hạng nhân viên cho kỹ năng này
-EmployeeRankShort=Cấp bậc nhân viên
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=Vị trí nhân viên
 EmployeePositions=Vị trí nhân viên
 EmployeesInThisPosition=Nhân viên ở vị trí này
@@ -72,6 +72,9 @@ AddSkill=Thêm kỹ năng vào hồ sơ công việc
 RequiredSkills=Kỹ năng cần thiết cho hồ sơ công việc này
 UserRank=Xếp hạng người dùng
 SkillList=Danh sách kỹ năng
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=Lưu thứ hạng
 TypeKnowHow=Chuyên gia
 TypeHowToBe=Làm sao để
@@ -95,3 +98,5 @@ NeedBusinessTravels=Cần đi công tác
 NoDescription=Không có mô tả
 TheJobProfileHasNoSkillsDefinedFixBefore=Hồ sơ công việc được đánh giá của nhân viên này không có kỹ năng nào được xác định trên đó. Vui lòng thêm (các) kỹ năng, sau đó xóa và bắt đầu lại quá trình đánh giá.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index 870ed8b23a9..c2a74e24f21 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=Gửi Email
 EMailing=Gửi Email
-EMailings=Gửi Email
+EMailings=Mass EMails
 SMSings=tin nhắn SMS
-AllEMailings=Tất cả Gửi Email
+AllEMailings=All mass eMails
 MailCard=Thẻ Gửi Email
 MailRecipients=Người nhận
 MailRecipient=Người nhận
@@ -26,19 +26,19 @@ MailFile=File đính kèm
 MailMessage=Nội dung Email
 SubjectNotIn=Không thuộc Chủ đề
 BodyNotIn=Không có trong Nội dung
-ShowEMailing=Hiển thị Email
-ListOfEMailings=Danh sách Email
-NewMailing=Email mới
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=Tin nhắn mới
-EditMailing=Chỉnh sửa Email
-ResetMailing=Gửi lại Email
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=Xóa email
-PreviewMailing=Xem trước gửi email
-CreateMailing=Tạo email
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=Kiểm tra
-ValidMailing=Gửi email hợp lệ
+ValidMailing=Valid mass Email
 MailingStatusDraft=Dự thảo
 MailingStatusValidated=Xác nhận
 MailingStatusSent=Gửi
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=Tất cả các bộ lọc phải khớp nhau để thu
 LineInFile=Dòng %s trong tập tin
 RecipientSelectionModules=Yêu cầu xác định cho lựa chọn của người nhận
 MailSelectedRecipients=Người nhận lựa chọn
-MailingArea=Khu vực Email
-LastMailings=Email mới nhất %s
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=Mục tiêu thống kê
 NbOfCompaniesContacts=Địa chỉ liên lạc duy nhất / địa chỉ
 MailNoChangePossible=Người nhận các thư điện tử xác nhận không thể thay đổi
-SearchAMailing=Tìm kiếm chỉ gửi thư
-SendMailing=Gửi email
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=Gửi bởi
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=Gửi một email có thể được thực hiện từ dòng lệnh. Yêu cầu quản trị viên máy chủ của bạn khởi chạy lệnh sau để gửi email đến tất cả người nhận:
 MailingNeedCommand2=Tuy nhiên bạn có thể gửi trực tuyến bằng cách thêm tham số MAILING_LIMIT_SENDBYWEB với giá trị của số lượng tối đa của các email mà bạn muốn gửi bởi phiên. Đối với điều này, hãy vào Trang chủ - Cài đặt - Loại khác.
 ConfirmSendingEmailing=Nếu bạn muốn gửi email trực tiếp từ màn hình này, vui lòng xác nhận bạn có chắc chắn muốn gửi email ngay từ trình duyệt của mình không?
-LimitSendingEmailing=Lưu ý: Việc gửi email từ giao diện web được thực hiện nhiều lần vì lý do bảo mật và hết thời gian, người nhận <b>%s</b> tại một thời điểm cho mỗi phiên gửi.
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Xóa danh sách
 ToClearAllRecipientsClickHere=Click vào đây để xóa danh sách người nhận các thư điện tử này
 ToAddRecipientsChooseHere=Thêm người nhận bằng cách chọn từ danh sách
-NbOfEMailingsReceived=Nhận được email hàng loạt
-NbOfEMailingsSend=Gửi email hàng loạt
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=Ghi lại ID
 DeliveryReceipt=Xác nhận chuyển giao
 YouCanUseCommaSeparatorForSeveralRecipients=Bạn có thể sử dụng dấu phân cách <b>nhau bởi dấu phẩy</b> để chỉ định nhiều người nhận.
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=Không có thông báo email tự động nào đượ
 ANotificationsWillBeSent=1 thông báo tự động sẽ được gửi qua email
 SomeNotificationsWillBeSent=%s thông báo tự động sẽ được gửi qua email
 AddNewNotification=Đăng ký nhận thông báo email tự động mới (mục tiêu/sự kiện)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Cấu hình gửi email đã được thiết lập thành '%s'. Chế độ này không thể được sử dụng để gửi email hàng loạt.
 MailSendSetupIs2=Trước tiên, bạn phải đi, với tài khoản quản trị viên, vào menu %sNhà - Cài đặt - EMails %s để thay đổi tham số <strong>'%s'</strong> để sử dụng chế độ '%s' . Với chế độ này, bạn có thể nhập thiết lập máy chủ SMTP do Nhà cung cấp dịch vụ Internet của bạn cung cấp và sử dụng tính năng gửi email hàng loạt.
 MailSendSetupIs3=Nếu bạn có bất kỳ câu hỏi nào về cách thiết lập máy chủ SMTP của mình, bạn có thể hỏi %s.
@@ -183,7 +185,7 @@ Information=Thông tin
 ContactsWithThirdpartyFilter=Danh bạ với bộ lọc của bên thứ ba
 Unanswered=Chưa được trả lời
 Answered=Đã trả lời
-IsNotAnAnswer=Không trả lời (email đầu tiên)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Là câu trả lời của email ban đầu
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Giá trị mặc định cho trường '%s' khi tạo liên hệ mới
@@ -199,6 +201,6 @@ ModelTemplate=Mẫu email
 YouCanChooseAModelForYouMailContent= Bạn có thể chọn một trong các mô hình mẫu hoặc tạo một mô hình bằng AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 9180a1e221a..687f798ccb1 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -37,6 +37,7 @@ Translation=Dịch
 Translations=Bản dịch
 CurrentTimeZone=Mã vùng thời gian PHP (server)
 EmptySearchString=Nhập tiêu chí tìm kiếm không trống
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=Nhập tiêu chí ngày
 NoRecordFound=Không tìm thấy bản ghi
 NoRecordDeleted=Không có bản ghi nào bị xóa
@@ -45,6 +46,7 @@ NoError=Không có lỗi
 Error=Lỗi
 Errors=Lỗi
 ErrorFieldRequired=Cần khai báo trường '%s'
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=Trường '%s' có giá trị sai
 ErrorFileDoesNotExists=Tệp %s không tồn tại
 ErrorFailedToOpenFile=Lỗi mở tệp %s
@@ -308,6 +310,7 @@ DateBuild=Ngày làm báo cáo
 DatePayment=Ngày thanh toán
 DateApprove=Ngày phê duyệt
 DateApprove2=Ngày phê duyệt (phê duyệt lần thứ hai)
+PendingSince=Pending since
 RegistrationDate=Ngày đăng kí
 UserCreation=Tạo người dùng
 UserModification=Sửa đổi thông tin người dùng
@@ -495,7 +498,7 @@ ActionRunningNotStarted=Để bắt đầu
 ActionRunningShort=Trong tiến trình xử lý
 ActionDoneShort=Đã hoàn tất
 ActionUncomplete=Chưa hoàn thành
-LatestLinkedEvents=Các sự kiện được liên kết %s mới nhất
+LatestLinkedEvents=The last %s events
 CompanyFoundation=Thông Tin Công ty/Tổ chức
 Accountant=Kế toán
 ContactsForCompany=Liên lạc cho bên thứ ba này
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=Thân email
 SendAcknowledgementByMail=Gửi email xác nhận
 SendMail=Gửi email
 Email=Email
+EMail=Email
+EMails=Emails
 NoEMail=Không có email
 AlreadyRead=Đã đọc
 NotRead=Chưa đọc
@@ -793,7 +798,7 @@ Notes=Ghi chú
 AddNewLine=Thêm dòng mới
 AddFile=Thêm tập tin
 FreeZone=Sản phẩm văn bản tự do
-FreeLineOfType=Văn bản tự do, loại:
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=Nhân bản đối tượng và các thuộc tính chính của nó
 ReGeneratePDF=Tạo lại PDF
 PDFMerge=PDF Merge
@@ -879,12 +884,14 @@ toward=hướng
 Access=Truy cập
 SelectAction=Chọn hành động
 SelectTargetUser=Chọn người dùng/ nhân viên mục tiêu
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=Sử dụng tổ hợp phím Ctrl + C để copy vào clipboard
 SaveUploadedFileWithMask=Lưu tập tin trên máy chủ với tên <strong>"%s"</strong> (nếu không "%s")
 OriginFileName=Tên tập tin gốc
 SetDemandReason=Thiết lập nguồn
 SetBankAccount=Xác định tài khoản ngân hàng
 AccountCurrency=Tài khoản tiền tệ
+AccountancyCode=Mã kế toán
 ViewPrivateNote=Xem ghi chú
 XMoreLines=%s dòng ẩn
 ShowMoreLines=Hiển thị thêm hơn/ ít dòng
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=Bạn có chắc chắn muốn xóa (các) bản ghi
 ConfirmMassClone=Xác nhận bản sao hàng loạt
 ConfirmMassCloneQuestion=Chọn dự án để sao chép vào
 ConfirmMassCloneToOneProject=Sao chép vào dự án %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=Đối tượng liên quan
 ClassifyBilled=Phân loại hóa đơn
 ClassifyUnbilled=Phân loại chưa lập hóa đơn
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=Bạn cần phải đăng nhập và cần có quyền 
 Download=Tải xuống
 DownloadDocument=Tải tài liệu
 DownloadSignedDocument=Tải xuống tài liệu đã ký
-ActualizeCurrency=Cập nhật tỷ giá tiền tệ
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=Năm tài chính
 ModuleBuilder=Xây dựng mô-đun và ứng dụng
 SetMultiCurrencyCode=Thiết lập tiền tệ
+SetMultiCurrencyRate=Set currency rate
 BulkActions=Hành động hàng loạt
 ClickToShowHelp=Nhấn vào đây để hiển thị trợ giúp tooltip
 WebSite=Trang web
@@ -1104,6 +1113,7 @@ PayedBy=Trả tiền bởi
 PayedTo=Trả tiền cho
 Monthly=Hàng tháng
 Quarterly=Hàng quý
+Quarter=Quarter
 Annual=Hàng năm
 Local=Tại chỗ
 Remote=Từ xa
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=Tác vụ
 ContactDefault_propal=Đơn hàng đề xuất
 ContactDefault_supplier_proposal=Đề xuất nhà cung cấp
 ContactDefault_ticket=Vé
+ContactDefault_societe=Bên thứ ba
 ContactAddedAutomatically=Liên hệ được thêm từ vai trò liên hệ của bên thứ ba
 More=Thêm nữa
 ShowDetails=Xem chi tiết
@@ -1242,6 +1253,7 @@ CommercialAffected=Đại diện bán hàng được phân công
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=Thông điệp
+Emailing=Emailing
 Progression=Tiến trình
 YourMessage=Tin nhắn của bạn
 YourMessageHasBeenReceived=Thông điệp của bạn đã được nhận. Chúng tôi sẽ trả lời hoặc liên hệ với bạn trong thời gian sớm nhất.
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=Thêm
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=Từ ngày
+Transferred=Transferred
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index a22534c9fa9..8ad2c62d1c2 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=Nếu cần đăng ký, đăng ký có ngày bắt đ
 DeleteType=Xóa
 VoteAllowed=Bình chọn cho phép
 Physical=Cá nhân
-Moral=Tập đoàn
-MorAndPhy=Tập đoàn và cá nhân
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Kích hoạt lại
 ExcludeMember=Loại trừ một thành viên
 Exclude=Loại trừ
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=Thống kê thành viên theo khu vực
 NbOfMembers=Tổng số thành viên
 NbOfActiveMembers=Tổng số thành viên đang hoạt động hiện tại
 NoValidatedMemberYet=Không có thành viên đã xác nhận tìm thấy
-MembersByCountryDesc=Màn hình này hiển thị cho bạn số liệu thống kê về thành viên theo quốc gia. Đồ thị và biểu đồ phụ thuộc vào tính khả dụng của dịch vụ biểu đồ trực tuyến của Google cũng như tính khả dụng của kết nối Internet đang hoạt động.
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=Màn hình này hiển thị cho bạn số liệu thống kê về thành viên theo tiểu bang/tỉnh/bang.
 MembersByTownDesc=Màn hình này hiển thị cho bạn số liệu thống kê về thành viên theo thị trấn.
 MembersByNature=Màn hình này hiển thị cho bạn số liệu thống kê về các thành viên theo bản chất.
@@ -208,25 +209,25 @@ NewMemberbyWeb=Thành viên mới được thêm vào. Chờ phê duyệt
 NewMemberForm=Hình thức thành viên mới
 SubscriptionsStatistics=Thống kê đóng góp
 NbOfSubscriptions=Số lượng đóng góp
-AmountOfSubscriptions=Số tiền thu được từ đóng góp
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=Doanh thu (cho một công ty) hoặc Ngân sách (cho một tổ chức)
-DefaultAmount=Số tiền đóng góp mặc định (chỉ được sử dụng nếu không có số tiền nào được xác định ở cấp loại thành viên)
-MinimumAmount=Số tiền tối thiểu (chỉ được sử dụng khi số tiền đóng góp là miễn phí)
-CanEditAmount=Số tiền đăng ký có thể được xác định bởi thành viên
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=Khách truy cập có thể chọn/chỉnh sửa số tiền đóng góp của mình bất kể loại thành viên
 AmountIsLowerToMinimumNotice=Số tiền thấp hơn mức tối thiểu %s
 MEMBER_NEWFORM_PAYONLINE=Sau khi đăng ký trực tuyến, tự động chuyển sang trang thanh toán trực tuyến
 ByProperties=Theo bản chất tự nhiên
 MembersStatisticsByProperties=Thống kê thành viên theo bản chất
-VATToUseForSubscriptions=Thuế suất VAT được sử dụng để đóng góp
-NoVatOnSubscription=Không có VAT cho các khoản đóng góp
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Sản phẩm dùng cho dòng đóng góp vào hóa đơn: %s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=Tên hoặc công ty
 SubscriptionRecorded=Đóng góp được ghi lại
 NoEmailSentToMember=Không có email gửi đến thành viên
 EmailSentToMember=Email được gửi đến thành viên tại %s
-SendReminderForExpiredSubscriptionTitle=Gửi lời nhắc qua email cho những đóng góp đã hết hạn
-SendReminderForExpiredSubscription=Gửi lời nhắc qua email tới các thành viên khi đóng góp sắp hết hạn (tham số là số ngày trước khi kết thúc tư cách thành viên để gửi lời nhắc. Có thể là danh sách các ngày cách nhau bằng dấu chấm phẩy, ví dụ '10;5;0;-5 ')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Tư cách thành viên đã trả tiền cho kỳ hiện tại (cho đến khi %s)
 YouMayFindYourInvoiceInThisEmail=Bạn có thể tìm thấy hóa đơn của bạn được đính kèm với email này
 XMembersClosed=%s (các) thành viên đã đóng
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=Bên thứ ba là pháp nhân sẽ được sử d
 MemberFirstname=Tên thành viên
 MemberLastname=Họ của thành viên
 MemberCodeDesc=Mã thành viên, duy nhất cho tất cả thành viên
-MemberSubscriptionStartFirstDayOf=Ngày bắt đầu tư cách thành viên tương ứng với ngày đầu tiên của
-MemberSubscriptionStartAfter=Khoảng thời gian tối thiểu trước khi ngày bắt đầu đăng ký có hiệu lực, ngoại trừ gia hạn (ví dụ +3 tháng = +3 tháng, -5d = -5 ngày, +1Y = +1 năm)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Tư cách thành viên được liên kết với một giao dịch hòa giải nên việc sửa đổi này không được phép.
 ConfirmMassSubsriptionCreation=Xác nhận việc tạo đăng ký
 ConfirmMassSubsriptionCreationQuestion=Bạn có chắc chắn muốn tạo %s đăng ký đã chọn không?
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index a8785c7e461..45e25c7374d 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -97,7 +97,6 @@ ShowService=Hiện dịch vụ
 ProductsAndServicesArea=Khu vực Sản phẩm và DỊch vụ
 ProductsArea=Khu vực sản phẩm
 ServicesArea=Khu vực dịch vụ
-ListOfStockMovements=Danh sách chuyển tồn kho
 BuyingPrice=Giá mua
 PriceForEachProduct=Sản phẩm với giá cụ thể
 SupplierCard=Thẻ nhà cung cấp
@@ -145,6 +144,7 @@ WithoutDiscount=Không giảm giá
 VATRateForSupplierProduct=Tax Rate (for this vendor/product)
 DiscountQtyMin=Chiết khấu cho s.lượng này
 NoPriceDefinedForThisSupplier=Không có giá/ s.lượng được định rõ cho nhà cung cấp/ sản phẩm này
+NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
 NoSupplierPriceDefinedForThisProduct=Không có giá/ s.lượng của nhà cung cấp được định rõ cho sản phẩm này
 PredefinedItem=Mục được xác định trước
 PredefinedProducts=Sản phẩm định sẵn
@@ -171,7 +171,7 @@ BuyingPrices=Giá mua
 CustomerPrices=Giá khách hàng
 SuppliersPrices=Giá nhà cung cấp
 SuppliersPricesOfProductsOrServices=Giá nhà cung cấp (của sản phẩm hoặc dịch vụ)
-CustomCode=Hải quan|Hàng hóa|Mã HS
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=Nước xuất xứ
 RegionStateOrigin=Khu vực xuất xứ
 StateOrigin=Bang|Tỉnh xuất xứ
@@ -209,6 +209,7 @@ unitL=Lít
 unitT=tấn
 unitKG=kg
 unitG=Gam
+unitGAL=gallon
 unitMG=mg
 unitLB=bảng
 unitOZ=ounce
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.c
 UpdateInterval=Cập nhật khoảng thời gian (phút)
 LastUpdated=Cập nhật mới nhất
 CorrectlyUpdated=Đã cập nhật chính xác
-PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=Chọn file PDF
 IncludingProductWithTag=Bao gồm các sản phẩm/dịch vụ có gắn thẻ
 DefaultPriceRealPriceMayDependOnCustomer=Giá mặc định, giá thực có thể phụ thuộc vào khách hàng
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=Số lượng của dòng được tính toán lạ
 
 #Attributes
 Attributes=Thuộc tính
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=Thuộc tính biến thể
 ProductAttributes=Thuộc tính biến thể cho sản phẩm
 ProductAttributeName=Biến thể thuộc tính %s
@@ -395,6 +400,8 @@ ErrorDestinationProductNotFound=Không thấy sản phẩm đích
 ErrorProductCombinationNotFound=Không thấy biến thể sản phẩm
 ActionAvailableOnVariantProductOnly=Hành động chỉ có hiệu lực trên biến thể sản phẩm
 ProductsPricePerCustomer=Giá sản phẩm mỗi khách hàng
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=Thuộc tính bổ sung (Giá Nhà cung cấp)
 DeleteLinkedProduct=Xóa sản phẩm con được liên kết với sự kết hợp
 AmountUsedToUpdateWAP=Đơn vị số tiền sử dụng để cập nhật Giá bình quân gia quyền
@@ -403,7 +410,8 @@ PMPValueShort=WAP
 mandatoryperiod=Thời gian bắt buộc
 mandatoryPeriodNeedTobeSet=Lưu ý: Khoảng thời gian (ngày bắt đầu và ngày kết thúc) phải được xác định
 mandatoryPeriodNeedTobeSetMsgValidate=Một dịch vụ yêu cầu khoảng thời gian bắt đầu và kết thúc
-mandatoryHelper=Chọn tùy chọn này nếu bạn muốn gửi thông báo tới người dùng khi tạo/xác thực hóa đơn, đề xuất thương mại, đơn đặt hàng mà không cần nhập ngày bắt đầu và ngày kết thúc trên các dòng với dịch vụ này.<br>Lưu ý rằng thông báo là một cảnh báo chứ không phải lỗi chặn.
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
+mandatoryHelper2=Note that the message is a warning and not a blocking error.
 DefaultBOM=BOM mặc định
 DefaultBOMDesc=BOM mặc định được khuyến nghị sử dụng để sản xuất sản phẩm này. Bạn chỉ có thể đặt trường này nếu bản chất của sản phẩm là '%s'.
 Rank=Thứ hạng
@@ -435,3 +443,6 @@ AllowStockMovementVariantParentHelp=Theo mặc định, sản phẩm gốc của
 ConfirmSetToDraftInventory=Bạn có chắc chắn muốn quay lại trạng thái Dự thảo không?<br>Số lượng hiện được đặt trong kho sẽ được đặt lại.
 WarningLineProductNotToSell=Sản phẩm hoặc dịch vụ "%s" không được bán và đã được sao chép
 PriceLabel=Price label
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/vi_VN/salaries.lang b/htdocs/langs/vi_VN/salaries.lang
index 1cd6ab4a651..075d0016f60 100644
--- a/htdocs/langs/vi_VN/salaries.lang
+++ b/htdocs/langs/vi_VN/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=Mức lương mới
 AddSalary=Thêm lương
 NewSalaryPayment=Thẻ lương mới
 AddSalaryPayment=Thêm thanh toán tiền lương
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=Thanh toán tiền lương
 SalariesPayments=Lương thanh toán
 SalariesPaymentsOf=Các khoản thanh toán lương của %s
@@ -27,7 +29,7 @@ FillFieldFirst=Điền vào trường nhân viên trước
 UpdateAmountWithLastSalary=Đặt số tiền lương cuối cùng
 MakeTransferRequest=Thực hiện yêu cầu chuyển
 VirementOrder=Yêu cầu chuyển tín dụng
-BankTransferAmount=Số tiền chuyển khoản tín dụng
 WithdrawalReceipt=Lệnh chuyển tín dụng
 OrderWaiting=Danh sách hàng chờ
 FillEndOfMonth=Điền vào cuối tháng
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index 4ec5f911d4c..0e825d8bfea 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Sử dụng ở đây danh sách các tên / bí danh khác
 WEBSITE_CSS_URL=URL của tệp CSS bên ngoài
 WEBSITE_CSS_INLINE=Nội dung tệp CSS (chung cho tất cả các trang)
 WEBSITE_JS_INLINE=Nội dung tệp JavaScript (chung cho tất cả các trang)
-WEBSITE_HTML_HEADER=Bổ sung ở dưới cùng của Tiêu đề HTML (chung cho tất cả các trang)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Tệp robot (robot.txt)
 WEBSITE_HTACCESS=Trang web tệp .htaccess
 WEBSITE_MANIFEST_JSON=Trang web tệp manifest.json
@@ -56,16 +56,17 @@ ReadPerm=Đọc
 WritePerm=Viết
 TestDeployOnWeb=Kiểm tra / triển khai trên web
 PreviewSiteServedByWebServer=<u>Xem trước %s trong một tab mới.</u> <br><br> %s sẽ được phục vụ bởi một máy chủ web bên ngoài (như Apache, Nginx, IIS). Bạn phải cài đặt và thiết lập máy chủ này trước khi trỏ đến thư mục: <br> <strong>%s</strong> <br> URL được phục vụ bởi máy chủ bên ngoài: <br> <strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Xem trước %s trong tab mới.</u><br><br>%s sẽ được phục vụ bởi máy chủ Dolibarr nên không cần thêm bất kỳ máy chủ web nào (như Apache, Nginx, IIS) phải được cài đặt.<br>Điều bất tiện là URL của các trang không thân thiện với người dùng và bắt đầu bằng đường dẫn Dolibarr của bạn.<br>URL do Dolibarr cung cấp:<br><strong>%s</strong><br><br>Để sử dụng máy chủ web bên ngoài của riêng bạn để phục vụ trang web này, tạo một máy chủ ảo trên máy chủ web của bạn trỏ đến thư mục<br><strong>%s</strong><br>sau đó nhập tên của máy chủ ảo này vào phần thuộc tính của trang web này và nhấp vào liên kết "Thử nghiệm/Triển khai trên web".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=URL của máy chủ ảo được cung cấp bởi máy chủ web bên ngoài không được xác định
 NoPageYet=Chưa có trang nào
 YouCanCreatePageOrImportTemplate=Bạn có thể tạo một trang mới hoặc nhập một mẫu trang web đầy đủ
 SyntaxHelp=Trợ giúp về các mẹo cú pháp cụ thể
 YouCanEditHtmlSourceckeditor=Bạn có thể chỉnh sửa mã nguồn HTML bằng nút "Nguồn" trong trình chỉnh sửa.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Để bao gồm  <strong>hình ảnh</strong> được lưu trữ trong thư mục <strong>tài liệu</strong> , hãy sử dụng trình bao bọc <strong>viewimage.php</strong>.<br>Ví dụ, cho một hình ảnh vào tài liệu/phương tiện (thư mục mở để truy cập công khai), cú pháp là:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt; </strong><br>
-YouCanEditHtmlSource2=Đối với hình ảnh được chia sẻ bằng liên kết chia sẻ (truy cập mở bằng khóa băm chia sẻ của tệp), cú pháp là:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong> <br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=Để lấy URL hình ảnh của một đối tượng PHP, hãy sử dụng<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>Các ví dụ khác về HTML hoặc mã động có sẵn trên <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">tài liệu wiki</a>.<br>
 ClonePage=Nhân bản Trang  / vùng chứa
 CloneSite=Nhân bản trang web
@@ -87,15 +88,15 @@ WebsiteAccount=Tài khoản trang web
 WebsiteAccounts=Tài khoản trang web
 AddWebsiteAccount=Tạo tài khoản trang web
 BackToListForThirdParty=Quay lại danh sách cho bên thứ ba
-DisableSiteFirst=Vô hiệu hóa trang web đầu tiên
+DisableSiteFirst=Put website offline first
 MyContainerTitle=Tiêu đề trang web của tôi
 AnotherContainer=Đây là cách bao gồm nội dung của trang / vùng chứa khác (bạn có thể gặp lỗi ở đây nếu bạn bật mã động vì nhà cung cấp phụ được nhúng có thể không tồn tại)
 SorryWebsiteIsCurrentlyOffLine=Xin lỗi, trang web này hiện đang tắt. Vui lòng quay lại sau ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Kích hoạt bảng tài khoản trang web
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Cho phép bảng để lưu trữ tài khoản trang web (đăng nhập / mật khẩu) cho mỗi trang web / bên thứ ba
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=Trước tiên bạn phải xác định Trang chủ mặc định
-OnlyEditionOfSourceForGrabbedContentFuture=Cảnh báo: Việc tạo trang web bằng cách nhập trang web bên ngoài chỉ dành cho người dùng có kinh nghiệm. Tùy thuộc vào độ phức tạp của trang nguồn, kết quả nhập có thể khác với bản gốc. Ngoài ra, nếu trang nguồn sử dụng các kiểu CSS phổ biến hoặc xung đột với JavaScript, điều đó có thể làm hỏng giao diện hoặc tính năng của Trình chỉnh sửa trang web khi làm việc trên trang này. Phương pháp này là cách tạo trang nhanh hơn nhưng bạn nên tạo trang mới từ đầu hoặc từ mẫu trang được đề xuất.<br>Cũng xin lưu ý rằng trình chỉnh sửa nội tuyến có thể không hoạt động chính xác khi được sử dụng trên một trang bên ngoài được lấy.
-OnlyEditionOfSourceForGrabbedContent=Chỉ có phiên bản nguồn HTML khi nội dung được lấy từ một trang bên ngoài
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=Lấy hình ảnh cũng được tìm thấy trong css và trang.
 ImagesShouldBeSavedInto=Hình ảnh nên được lưu vào thư mục
 WebsiteRootOfImages=Thư mục gốc cho hình ảnh trang web
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=Gỡ bộ lọc
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=Loại
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 69a4ca8b53b..1848418ccf9 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=文件完整性检查已通过，但添加了
 FileIntegritySomeFilesWereRemovedOrModified=文件完整性检查失败。某些文件已被修改、删除或添加。
 GlobalChecksum=全局校验和
 MakeIntegrityAnalysisFrom=对应用程序文件进行完整性分析
-LocalSignature=嵌入式本地签名（不太可靠）
-RemoteSignature=远端签名（更可靠）
+LocalSignature=嵌入式本地签名
+RemoteSignature=远程遥控签名
 FilesMissing=缺少的文件
 FilesUpdated=已更新的文件
 FilesModified=已修改的文件
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=仅供某些日程选项使用
 Security=安全
 Passwords=密码
 DoNotStoreClearPassword=加密存储在数据库中的密码。
-MainDbPasswordFileConfEncrypted=加密存储在 conf.php 中的数据库密码。强烈建议激活此选项。
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=要将 <b>conf.php</b> 文件中的密码加密，替换行 <br><b>$ dolibarr_main_db_pass="..."</b><br> 为 <br><b>$dolibarr_main_db_pass="crypted:%s"</b>
 InstrucToClearPass=要在<b>conf.php</b>文件中使用将明文密码，替换行<br><b>$ dolibarr_main_db_pass="crypted:..."</b><br>为<br><b>$dolibarr_main_db_pass="%s"</b>
 ProtectAndEncryptPdfFiles=保护生成的 PDF 文件。不建议这样做，因为它会阻止批量 PDF 生成。
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=几何点
 ExtrafieldMultiPointGeo=几何多点
 ExtrafieldLinestringGeo=几何线串
 ExtrafieldPolygonGeo=几何多边形
+ExtrafieldStars=Stars
 ComputedFormula=计算出的字段
-ComputedFormulaDesc=您可以在此处输入使用对象的其他属性或任何 PHP 编码的公式，以获得动态计算值。您可以使用任何 PHP 兼容公式，包括“?”条件运算符，以及以下全局对象：<strong> $db、$conf、$langs、$mysoc、$user、$objectoffield </strong> . <br> <strong> 警告 </strong> ：如果您需要未加载对象的属性，只需将对象放入公式中即可，如第二个示例所示。 <br> 使用计算字段意味着您无法从界面输入任何值。此外，如果存在语法错误，公式可能不会返回任何内容。 <br> <br> 公式示例：<br> $objectoffield->id < 10 ? round($objectoffield-> id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2) <br> <br> 重新加载对象的示例 <br> (($reloadedobj = new Societe( $db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1') <br> <br> 强制加载对象及其父对象的公式的其他示例： <br> (( $reloadedobj = 新任务($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = 新项目($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj- >fk_project) > 0)) ？ $secondloadedobj->ref: '未找到父项目'
+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'
 Computedpersistent=存储计算出的域
 ComputedpersistentDesc=计算出的额外字段将存储在数据库中，但是，只有在更改该字段的对象时才会重新计算该值。如果计算域依赖于其他对象或全局数据，这个值可能是错误的！！
 ExtrafieldParamHelpPassword=将该字段留空意味着该值将在不加密的情况下存储(字段在屏幕上用星号隐藏)。<br><br>输入值“dolcrypt ”，用可逆加密算法对值进行编码。明文数据仍然可以被知道和编辑，但在数据库中被加密。<br><br>输入“auto”（或“md5”、“sha256”、“password_hash”等）以使用默认 span> 密码加密算法（或 md5、sha256、password_hash...）将不可逆哈希密码保存到数据库中（无法检索原始值）
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- 使用您自己的电子邮件服务提供商的 SMTP 服务器发送电子邮件也很有趣，因为从应用程序发送的所有电子邮件也将保存到您邮箱的“已发送”目录中。
 WarningPHPMailD=因此，建议将电子邮件的发送方式更改为"SMTP"值。
 WarningPHPMailDbis=如果您确实想保持默认的“PHP”方式发送电子邮件，请忽略此警告，或%s点击这里%s将其移除。
-WarningPHPMail2=如果您的电子邮件SMTP提供商需要将电子邮件客户端限制为某些IP地址（非常罕见），则这是您的ERP CRM应用程序的邮件用户代理（MUA）的IP地址：<strong> %s</strong>。
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=会计（简化）
 Module10Desc=基于数据库内容的简单会计报告（日常报表、营业额）。不使用任何复式账本。
 Module20Name=报价
 Module20Desc=报价单管理
-Module22Name=群发电子邮件
-Module22Desc=群发电子邮件管理
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=能耗
 Module23Desc=监测能源消耗
 Module25Name=销售订单
@@ -847,10 +848,10 @@ Permission212=订购线路
 Permission213=激活线路
 Permission214=安装电话
 Permission215=安装商
-Permission221=查看电子邮件
-Permission222=创建/变更电子邮件(主题，收件人,,,)
-Permission223=验证电子邮件（允许发送）
-Permission229=删除电子邮件
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=查看收件人及信息
 Permission238=手动发送电子邮件
 Permission239=确认或发送后删除电子邮件记录
@@ -1105,6 +1106,7 @@ DictionaryStaff=雇员人数
 DictionaryAvailability=交货延迟
 DictionaryOrderMethods=订购方式
 DictionarySource=报价单/订单的来源
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=个性化的报告组
 DictionaryAccountancysystem=会计科目表
 DictionaryAccountancyJournal=会计日记账
@@ -1134,11 +1136,11 @@ BackToDictionaryList=返回字典列表
 TypeOfRevenueStamp=印花税票种类
 VATManagement=销售税管理
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=默认情况下，建议的销售税为 0，可用于协会、个人或小公司等情况。
 VATIsUsedExampleFR=在法国，这意味着这个公司或机构有一个真正的财政系统（简化实际或正常实际），这个体制会申报增值税。
 VATIsNotUsedExampleFR=在法国，它指的是非增值税申报的协会或选择微型企业财政系统（特许经营增值税）并在没有任何增值税申报的情况下支付特许经营增值税的公司，组织或自由职业。该选项将在发票上显示“Non applicable VAT - art-293B of CGI”的参考。
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=销售税类型
 LTRate=利率
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=根据税收设置（参见 %s - %s - %s），您所
 LabelUsedByDefault=如果代码没有翻译则默认使用以下标签
 LabelOnDocuments=文档中的标签
 LabelOrTranslationKey=标签或翻译键
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=在组合列表中显示客户/供应商增值税号。
 AddAdressInList=Display Customer/Vendor address into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=询问合作方的首选货物运输方式。
-FieldEdition=%s 字段的编辑
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=例如：+2 (请只在时区错误问题出现时填写)
 GetBarCode=获取条码
 NumberingModules=编号模式
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=强制发票中的日期为确认日期
 SuggestedPaymentModesIfNotDefinedInInvoice=如果未在发票上定义，则发票上的默认建议付款方式
 SuggestPaymentByRIBOnAccount=根据账户的提款方式来建议付款方式
 SuggestPaymentByChequeToAddress=建议以支票付款至
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=发票上的附加文本
 WatermarkOnDraftInvoices=发票草稿加水印(无则留空)
 PaymentsNumberingModule=付款编号模式
@@ -1718,6 +1723,7 @@ CompressionOfResources=压缩的HTTP响应
 CompressionOfResourcesDesc=例如使用 Apache 指令“AddOutputFilterByType DEFLATE”
 TestNotPossibleWithCurrentBrowsers=这种自动检测在该浏览器中不适用
 DefaultValuesDesc=在这里，您可以定义创建新记录时希望使用的默认值，和/或列出记录时的默认过滤器或排序顺序。
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=默认值（用于表单）
 DefaultSearchFilters=默认搜索过滤器
 DefaultSortOrder=默认排序顺序
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=运输编号模式
 SendingsAbility=支持货运单用于客户交货
 NoNeedForDeliveryReceipts=在大多数情况下，货运单既用作客户交货单（要发送的产品清单），并且也用作客户收货并签名的单据。因此，产品交货回执是一个重复的功能，并且很少被激活。
 FreeLegalTextOnShippings=发货单上的附加文本
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=产品交货回执编号模块
 DeliveryOrderModel=产品交货回执模板
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=交货回执上的附加文本
 ##### FCKeditor #####
 AdvancedEditor=高级编辑
 ActivateFCKeditor=为以下为功能启用高级编辑器功能:
-FCKeditorForNotePublic=所见即所得地创建/编辑元素的“公共注释”字段
-FCKeditorForNotePrivate=所见即所得地创建/编辑元素的“私人注释”字段
-FCKeditorForCompany=所见即所得地创建/编辑元素字段描述（产品/服务除外）
-FCKeditorForProductDetails=所见即所得地创建/编辑产品描述或对象行（报价行、订单、发票等）。
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=警告。严重不建议在这种情况下使用该选项，因为它在建立PDF文件时可能会创建特殊字符和页面格式的问题。
-FCKeditorForMailing= 所见即所得地创建/编辑群发电子邮件（工具 -> 电子邮件）
-FCKeditorForUserSignature=所见即所得地创建/编辑用户签名
-FCKeditorForMail=所见即所得地创建/编辑所有邮件（工具 -> 电子邮件 除外）
-FCKeditorForTicket=所见即所得地创建/编辑服务工单
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=库存模块设置
 IfYouUsePointOfSaleCheckModule=如果您使用默认提供的销售点模块 (POS) 或外部模块，您的 POS 模块可能会忽略此设置。大多数 POS 模块默认设计为立即创建发票并减少库存，无论此处的选项如何。因此，如果您在从 POS 销售时需要或不需要减少库存，请检查您的 POS 模块设置。
@@ -1867,7 +1874,6 @@ Buy=采购
 Sell=销售
 InvoiceDateUsed=所用账单日期
 YourCompanyDoesNotUseVAT=贵公司已被定义为不含增值税 (主页->设定->公司/机构)，所以没有设置增值税的选项。
-AccountancyCode=科目代码
 AccountancyCodeSell=销售账户代码
 AccountancyCodeBuy=采购账户代码
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=创建新税时，默认将“自动创建付款”复选框保留为空
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = 当从菜单选择日程时默认要打开的视图
 AGENDA_EVENT_PAST_COLOR = 过去事件的颜色
 AGENDA_EVENT_CURRENT_COLOR = 当前事件的颜色
 AGENDA_EVENT_FUTURE_COLOR = 未来事件的颜色
-AGENDA_REMINDER_BROWSER = 在用户的浏览器 </b> 上启用事件提醒 <b>（到达提醒日期时，浏览器会显示一个弹出窗口。每个用户都可以从其浏览器通知设置中禁用此类通知）。
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = 启用声音通知
-AGENDA_REMINDER_EMAIL = 启用<b>通过电子邮件</b>发送事件提醒 （可以在每个事件上定义提醒选项/延迟）。
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = 注意：计划任务的频率 %s 必须足以确保在正确的时间发送提醒。
 AGENDA_SHOW_LINKED_OBJECT = 在日程视图中显示已链接的对象
 AGENDA_USE_EVENT_TYPE = 使用事件类型（在菜单 主页 -> 设置 -> 词典库 -> 日程事件类型中管理）
 AGENDA_USE_EVENT_TYPE_DEFAULT = 在事件创建表单中自动为事件类型设置此默认值
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = 导出链接的授权密钥
 PastDelayVCalExport=不导出早于这个日期的时间
 SecurityKey = 安全密钥
@@ -2006,7 +2017,7 @@ BackupZipWizard=建立documents目录压缩包的向导
 SomethingMakeInstallFromWebNotPossible=由于以下原因，无法从Web界面安装外部模块：
 SomethingMakeInstallFromWebNotPossible2=因此，此处描述的升级过程是只有特权用户才能执行的手动过程。
 InstallModuleFromWebHasBeenDisabledContactUs=出于安全目的，当前已锁定从应用程序安装或开发外部模块或动态网站。如果您需要启用此功能，请联系我们。
-InstallModuleFromWebHasBeenDisabledByFile=管理员已禁用从应用程序安装外部模块。您必须要求他删除文件<strong> %s </strong>以允许此功能。
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=从应用程序安装或构建外部模块需要将模块文件保存到目录<strong> %s</strong>中。要让Dolibarr处理此目录，您必须设置<strong> conf / conf.php </strong>以添加2个指令行：<br> <strong> $ dolibarr_main_url_root_alt ='/ custom'; </strong> <br>的<strong> $ dolibarr_main_document_root_alt = '%s /自定义';</strong>
 HighlightLinesOnMouseHover=当鼠标经过表格明细时高亮显示
 HighlightLinesColor=鼠标经过时突出显示线条的颜色（使用 'ffffff' 不突出显示）
@@ -2036,6 +2047,7 @@ Enter0or1=输入 0 或 1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=在大括号之间输入代表货币符号的字节数列表。例如：对于 $，输入 [36] - 对于巴西雷亚尔 R$ [82,36] - 对于 €，输入 [8364]
 ColorFormat=RGB颜色采用HEX格式，例如：FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=图标名称格式：<br>- image.png 表示图像文件放入当前主题目录<br>- image.png@module 如果文件位于模块<br>- fa-xxx的 /img/ 目录中 表示 FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size 用于 FontAwesome fa-xxx 图片（带有前缀、颜色和大小集）
 PositionIntoComboList=行位置到组合列表中
 SellTaxRate=销售税率
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=隐藏发件人地址框的边框
 MAIN_PDF_NO_RECIPENT_FRAME=隐藏收件人地址框的边框
 MAIN_PDF_HIDE_CUSTOMER_CODE=隐藏客户代码
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=在地址块中隐藏发送人/公司名称
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=隐藏付款条款
 PROPOSAL_PDF_HIDE_PAYMENTMODE=隐藏支付方式
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=在签名区中添加隐藏标记，以允许电子签名工具重复使用它。可供外部工具使用，或将来供在线签名功能使用。
@@ -2324,6 +2341,8 @@ NotRecommended=不建议
 ARestrictedPath=数据文件的一些受限路径
 CheckForModuleUpdate=检查外部模块更新
 CheckForModuleUpdateHelp=此操作将连接到外部模块的编写者以检查是否有新版本可用。
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=有可用的更新
 NoExternalModuleWithUpdate=未找到外部模块的更新
 SwaggerDescriptionFile=Swagger API 描述文件（例如与 redoc 一起使用）
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=显示货运目的地址
 INVOICE_SHOW_SHIPPING_ADDRESSMore=某些国家/地区的强制指示（法国、...）
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=社交网络的 URL 链接。使用 {socialid} 作为包含社交网络 ID 的变量部分。
 IfThisCategoryIsChildOfAnother=如果此类别是另一个类别的子类别
 DarkThemeMode=深色主题模式
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=警告：模块 %s 已设置一
 WarningModuleHasChangedSecurityCsrfParameter=警告：模块 %s 已禁用您实例的 CSRF 安全性。此操作是可疑的，您的安装可能不再受到保护。请联系该模块的作者以获取解释。
 EMailsInGoingDesc=传入电子邮件由模块 %s 管理。如果您需要支持传入电子邮件，则必须启用并配置它。
 MAIN_IMAP_USE_PHPIMAP=使用 IMAP 的 PHP-IMAP 库而不是本机 PHP IMAP。这还允许使用 IMAP 的 OAuth2 连接（还必须激活模块 OAuth）。
-MAIN_CHECKBOX_LEFT_COLUMN=在左侧显示字段和行选择的列（默认在右侧）
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=默认情况下不创建。仅在模块激活时创建。
 CSSPage=CSS 样式
 Defaultfortype=默认
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2532,13 +2554,17 @@ MainAuthenticationOidcUserinfoUrlName=User info URL
 MainAuthenticationOidcUserinfoUrlDesc=(example: https://example.com/oauth2/userinfo)
 MainAuthenticationOidcLogoutUrlName=Logout URL
 MainAuthenticationOidcLogoutUrlDesc=(example: https://example.com/oauth2/logout)
-MainAuthenticationOidcRedirectUrlName=Redirect URL
+MainAuthenticationOidcRedirectUrlName=重定向 URL
 MainAuthenticationOidcRedirectUrlDesc=Redirect URL to authorize on the OpenID provider side
 MainAuthenticationOidcLogoutRedirectUrlName=Dolibarr logout URL
 MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on the OpenID provider side
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=显示货运目的地址
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=某些国家/地区的强制指示（法国、...）
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index 8bf1afae41c..a0707db1582 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=年末余额
 CurrentBalance=当前余额
 FutureBalance=期末平衡
 ShowAllTimeBalance=显示余额开始
-AllTime=从开始
 Reconciliation=和解
 RIB=银行账号
 IBAN=IBAN号码
@@ -133,7 +132,7 @@ DeleteTransaction=删除条目
 ConfirmDeleteTransaction=您确定要删除此条目吗？
 ThisWillAlsoDeleteBankRecord=这也将删除生成的银行条目
 BankMovements=调拨
-PlannedTransactions=计划的条目
+PlannedTransactions=Upcoming entries
 Graph=图表
 ExportDataset_banque_1=银行条目和账户对账单
 ExportDataset_banque_2=存款单
@@ -151,8 +150,8 @@ FutureTransaction=未来交易。无法对账。
 SelectChequeTransactionAndGenerate=选择/过滤要包含在支票存款收据中的支票。然后，单击“创建”。
 SelectPaymentTransactionAndGenerate=选择/过滤要包含在%s存款收据中的文档。然后，单击“创建”。
 InputReceiptNumber=选择与对账相关的银行对账单。使用可排序的数值
-InputReceiptNumberBis=YYYYMM 或 YYYYMMDD
-EventualyAddCategory=最后，指定一个范畴对其中的记录进行分类
+InputReceiptNumberBis=YYYYMM
+EventualyAddCategory= 可选择，对操作进行分类的类别
 ToConciliate=调节？
 ThenCheckLinesAndConciliate=然后按一下，连线检查银行对账单。
 DefaultRIB=默认BAN
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=如果启用此功能，您可以为借记或贷记调
 BankColorizeMovementName1=借方调拨的背景颜色
 BankColorizeMovementName2=贷方调拨的背景颜色
 IfYouDontReconcileDisableProperty=如果您不对某些银行账户进行银行对账，请禁用这些账户的属性“%s”以消除此警告。
-NoBankAccountDefined=未定义银行账户
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=在银行账户中未找到记录。通常，当一条记录从银行账户的交易清单中手动删除时（例如在银行账户对账期间），就会发生这种情况。另一种原因是在禁用了“%s”模块的情况下记录了付款。
 AlreadyOneBankAccount=已定义一个银行账户
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA 文件变量
diff --git a/htdocs/langs/zh_CN/blockedlog.lang b/htdocs/langs/zh_CN/blockedlog.lang
index e1999f06518..3ac63b07a76 100644
--- a/htdocs/langs/zh_CN/blockedlog.lang
+++ b/htdocs/langs/zh_CN/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=防篡改日志
 ShowAllFingerPrintsMightBeTooLong=显示所有的归档日志 (可能很长)
 ShowAllFingerPrintsErrorsMightBeTooLong=显示所有的无效归档日志 (可能很长)
 DownloadBlockChain=下载指纹
-KoCheckFingerprintValidity=已归档的日志条目失效。这意味着有人（黑客？）在记录后修改了该行的某些数据，或者删除了先前的归档记录（检查是否存在前缀“#”的行）或修改了先前记录的校验和。
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=归档日志记录有效。此行的数据没被编辑过，并且该条目跟随在上一个条目之后。
 OkCheckFingerprintValidityButChainIsKo=与之前的日志相比，已归档的日志似乎有效，但之前的链已损坏。
 AddedByAuthority=已存储到远程授权中
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=日志详细信息
 ListOfTrackedEvents=已跟踪事件的清单
 Fingerprint=指纹
 DownloadLogCSV=导出归档日志 (CSV)
-DataOfArchivedEvent=Full data of archived event
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=未链接原始对象（类型 %s，id %s）（请参阅“完整数据”列以获取防篡改的已保存数据）
 BlockedLogAreRequiredByYourCountryLegislation=您所在国家/地区的法律规定可能需要使用防篡改日志模块。禁用此模块可能会使未来的任何交易在法律和合法软件的使用方面无效，因为它们无法通过税务审计进行验证。
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=根据您所在国家/地区的法律规定，防篡改日志模块已被激活。禁用此模块可能会使未来的任何交易在法律和合法软件的使用方面无效，因为它们无法通过税务审计进行验证。
@@ -30,6 +32,7 @@ BlockedLogEnabled=已启用将事件跟踪到防篡改日志中
 BlockedLogDisabled=在已经保存一些记录到防篡改日志之后，已禁用了将事件跟踪到防篡改日志。我们保存了一个特殊的指纹来跟踪区块链是否损坏
 BlockedLogDisabledBis=已禁用将事件跟踪到防篡改日志。这是被允许的，因为尚未有任何记录被保存到防篡改日志中。
 LinkHasBeenDisabledForPerformancePurpose=For performance purpose, direct link to the document is not shown after the 100th line.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=客户发票已逻辑删除
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=客户付款逻辑删除
 logPAYMENT_VARIOUS_CREATE=付款（未分配给发票）已创建
 logPAYMENT_VARIOUS_DELETE=付款（未分配给发票）逻辑删除
 logPAYMENT_VARIOUS_MODIFY=付款（未分配给发票）已修改
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang
index fd26b0a7477..f7df5ade8ce 100644
--- a/htdocs/langs/zh_CN/categories.lang
+++ b/htdocs/langs/zh_CN/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=联系人标签/类别区域
 AccountsCategoriesArea=银行帐户标签/类别区域
 ProjectsCategoriesArea=项目标签/类别区域
 UsersCategoriesArea=用户标签/类别区域
+Bank_linesCategoriesArea==银行行标签/类别区
 SubCats=子类别
 CatList=标签/类别清单
 CatListAll=标签/类别清单（所有类型）
@@ -90,9 +91,10 @@ CategoriesSetup=标签/类别设置
 CategorieRecursiv=自动链接到父标签/类别
 CategorieRecursivHelp=如果启用该选项，当您将一个对象添加到子类别中时，该对象也会被添加到父类别中。
 AddProductServiceIntoCategory=为产品/服务分配类别
-AddCustomerIntoCategory=为客户分配类别
-AddSupplierIntoCategory=为供应商分配类别
-AssignCategoryTo=将类别分配给
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=显示标签/类别
 ByDefaultInList=默认在清单中
 ChooseCategory=选择类别
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=页面容器类别
 KnowledgemanagementsCategoriesArea=KM知识文章类别
 UseOrOperatorForCategories=对类别使用“OR”运算符
 AddObjectIntoCategory=分配给类别
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index 36880cd4003..9a963dbb23f 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -33,13 +33,13 @@ CountryIsInEEC=国家属于欧洲经济共同体
 PriceFormatInCurrentLanguage=当前语言和货币的价格显示格式
 ThirdPartyName=合作方名称
 ThirdPartyEmail=合作方电子邮件
-ThirdParty=合作方
+ThirdParty=合伙人
 ThirdParties=合作方
 ThirdPartyProspects=准客户
 ThirdPartyProspectsStats=准客户
 ThirdPartyCustomers=客户
 ThirdPartyCustomersStats=客户
-ThirdPartyCustomersWithIdProf12=与%s或%客户s
+ThirdPartyCustomersWithIdProf12=客户 与 %s 或 %s
 ThirdPartySuppliers=供应商
 ThirdPartyType=合作方类型
 Individual=私营个体
@@ -65,6 +65,7 @@ State=州/省
 StateId=状态 ID
 StateCode=州/省代码
 StateShort=国家
+DepartmentBuyer=Buyer's state/province
 Region=地区
 Region-State=地区 - 州
 Country=国家
@@ -78,7 +79,7 @@ Chat=对话
 PhonePro=商务电话
 PhonePerso=私人电话
 PhoneMobile=手机
-No_Email=拒绝群发电子邮件
+No_Email=Refuse mass emails
 Fax=传真
 Zip=邮政编码
 Town=城市
@@ -308,7 +309,7 @@ RequiredIfSupplier=如果合作方是供应商，则必需填入
 ValidityControledByModule=有效性由模块控制
 ThisIsModuleRules=该模块的规则
 ProspectToContact=准客户到联系人
-CompanyDeleted=公司“%的”从数据库中删除。
+CompanyDeleted=公司 “%s”已从 数据库 中删除。
 ListOfContacts=联系人列表
 ListOfContactsAddresses=联系人列表
 ListOfThirdParties=合作方清单
@@ -382,12 +383,12 @@ ExportCardToFormat=导出名片格式
 ContactNotLinkedToCompany=联系人未链接到任何合作方
 DolibarrLogin=登陆Dolibarr
 NoDolibarrAccess=没有Dolibarr访问
-ExportDataset_company_1=合作方（公司/基金会/自然人）及其属性特征
-ExportDataset_company_2=联系人及其属性特征
-ExportDataset_company_3=合作方银行账户
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=合作方附加联系人/地址和属性
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=合作方及其属性特征
 ImportDataset_company_2=合作方附加联系人/地址和属性
-ImportDataset_company_3=合作方银行账户
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=合作方销售代表（将销售代表/用户分配给公司）
 PriceLevel=价格水平
 PriceLevelLabels=价格水平标签
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=免费代码无需验证。
 ManagingDirectors=公司高管(s)称呼 (CEO, 董事长, 总裁...)
 MergeOriginThirdparty=重复合作方(合作方要删除)
 MergeThirdparties=合并合作方
-ConfirmMergeThirdparties=您确定要将所选合作方与当前合作方合并吗？所有链接的对象（发票、订单等）都将移动到当前的合作方，之后所选的合作方将被删除。
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=合作方已合并
 SaleRepresentativeLogin=销售代表登陆
 SaleRepresentativeFirstname=销售代表的名字
@@ -461,3 +462,6 @@ ExternalSystemID=外部系统ID
 IDOfPaymentInAnExternalSystem=外部系统中支付模式的 ID（如 Stripe、Paypal...）
 AADEWebserviceCredentials=AADE Web 服务凭证
 ThirdPartyMustBeACustomerToCreateBANOnStripe=为了在Stripe端建立合作方的银行信息，该合作方必须是一位客户。
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index 3ef9847f9fd..895e595632a 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=客户发票付款
 PaymentSupplierInvoice=供应商发票付款
 PaymentSocialContribution=社会/财政税款
 PaymentVat=增值税纳税
-AutomaticCreationPayment=自动记录付款
+AutomaticCreationPayment=Also record the payment
 ListPayment=付款列表
 ListOfCustomerPayments=客户付款列表
 ListOfSupplierPayments=供应商付款清单
@@ -118,10 +118,14 @@ SocialContributionsPayments=社会/财政税款
 ShowVatPayment=显示增值税纳税
 TotalToPay=共支付
 BalanceVisibilityDependsOnSortAndFilters=当表格按照 %s 排序并按照 1 个銀行账户过滤（没有其他过滤器）时，余额才可显示在此列表中
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=客户科目代码
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=供应商科目代码
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=客户账户代码
 SupplierAccountancyCodeShort=供应商账户代码
+UserAccountancyCodeShort=User account. code
 AccountNumber=账号
 NewAccountingAccount=新帐户
 Turnover=结转发票
@@ -129,7 +133,9 @@ TurnoverCollected=营业额收集
 SalesTurnoverMinimum=最低营业额
 ByExpenseIncome=按费用和收入计算
 ByThirdParties=由合作方
+ByProjects=By projects
 ByUserAuthorOfInvoice=按开具发票者
+DetailedListLowercase=detailed list
 CheckReceipt=存款单
 CheckReceiptShort=存款单
 LastCheckReceiptShort=最近新增的 %s 张存款单
diff --git a/htdocs/langs/zh_CN/datapolicy.lang b/htdocs/langs/zh_CN/datapolicy.lang
index 9c5378dee04..5c586e557f3 100644
--- a/htdocs/langs/zh_CN/datapolicy.lang
+++ b/htdocs/langs/zh_CN/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = 数据隐私政策
 Module4100Desc = 管理数据隐私的模块（符合GDPR）
 # Administration page
 datapolicySetup = 数据隐私政策模块设置
-Deletion = 删除数据
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+DataDeletion=删除数据
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s月
 ONE_YEAR = 1年
 NB_YEARS = %s年
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = 准客户/客户
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Nor prospect/Nor customer
 DATAPOLICY_CONTACT_FOURNISSEUR = 供应商
 DATAPOLICY_ADHERENT = 会员
-DATAPOLICY_Tooltip_SETUP = Type of contact - Indicate your choices for each type.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = 您可以向所有相关联系人（尚未收到电子邮件且您尚未为其注册任何有关 GDPR 协议的联系人）发送 GDPR 电子邮件。为此，请使用以下按钮。
 SendAgreement = 发送电子邮件
 AllAgreementSend = 所有电子邮件都已发送
 TXTLINKDATAPOLICYACCEPT = Text for the link "agreement"
 TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR : Processing of personal data
 DATAPOLICY_consentement = Consent obtained for the processing of personal data
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index b4553a2613d..53ba2474480 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -51,7 +51,7 @@ ErrorBadDateFormat=值“%s”有错误的日期格式
 ErrorWrongDate=日期不正确！
 ErrorFailedToWriteInDir=无法写在目录%s
 ErrorFailedToBuildArchive=建立档案文件%s失败
-ErrorFoundBadEmailInFile=找到%S的语法不正确的电子邮件文件中的行（例如行%的电子邮件s =%s）的
+ErrorFoundBadEmailInFile=在 <span 中发现 %s 行 的 电子邮件 语法不正确文件 (举例 行 %s 与电子邮件=%s)
 ErrorUserCannotBeDelete=无法删除用户，也许它与Dolibarr实体相关
 ErrorFieldsRequired=一些必填字段被留空
 ErrorSubjectIsRequired=需要电子邮件主题
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=无法创建一个目录。检查Web服务器的用户有权限写入Dolibarr文件目录。如果参数<b>safe_mode设置</b>为启用这个PHP，检查Dolibarr php文件到Web服务器的用户拥有（或组）。
 ErrorNoMailDefinedForThisUser=没有邮件定义该用户
 ErrorSetupOfEmailsNotComplete=电子邮件设置未完成
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=This feature needs JavaScript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=一个类型'顶'不能有一个父菜单中的菜单。放在父菜单0或选择一个类型为'左'菜单。
 ErrorLeftMenuMustHaveAParentId=一个类型为'左'必须有一个父菜单的ID。
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=PHP / Apache的插件阻止上传
 ErrorFileSizeTooLarge=文件尺寸太大或文件未提供
 ErrorFieldTooLong=字段%s太长
 ErrorSizeTooLongForIntType=对于int类型来说，尺寸太长（%s最大数字）
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=对于字符串类型来说，尺寸太长（%s最大字符数）
 ErrorNoValueForSelectType=请填写选取清单的值
 ErrorNoValueForCheckBoxType=请填写复选框列表值
@@ -138,8 +140,9 @@ ErrorBadValueForCode=代码有错误的值类型。再次尝试以新的价值..
 ErrorBothFieldCantBeNegative=栏位%s和%s不能都为负的
 ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in third-party card) and apply it to the invoice.
 ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=进入客户发票行的数量不能为负数
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=<b>%s</b>用来执行Web服务器用户账户没有该权限
 ErrorNoActivatedBarcode=没有激活的条码类型
 ErrUnzipFails=%s 无法解压缩与解压缩
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=您的PHP参数 upload_max_filesize （%s）比PHP参数 post_max_size（%s）高。这不是一个一致的设置。
 WarningPasswordSetWithNoAccount=已为此会员设置了密码。但是，未创建用户帐户。因此该密码被存储，但不能用于登录 Dolibarr。它可以由外部模块/接口使用，但如果您不需要为会员定义任何登录名或密码，您可以从会员模块设置中禁用“管理每个会员的登录名”选项。如果您需要管理登录但不需要任何密码，则可以将此字段保留为空以避免出现此警告。注意：如果会员链接到用户，电子邮件也可以用作登录名。
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR 发票只能添加到设置为通过银行转账付款付款的发票上。
 SwissQrCreditorAddressInvalid = Creditor address is invalid (are ZIP and city set? (%s)
 SwissQrCreditorInformationInvalid = Creditor information is invalid for IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/zh_CN/exports.lang b/htdocs/langs/zh_CN/exports.lang
index 78dac422c79..44535f6b59b 100644
--- a/htdocs/langs/zh_CN/exports.lang
+++ b/htdocs/langs/zh_CN/exports.lang
@@ -46,10 +46,16 @@ LineLabel=行名称
 LineDescription=行描述
 LineUnitPrice=行单位价格
 LineVATRate=行增值税税率
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=行数量
 LineTotalHT=行不含税金额
 LineTotalTTC=行含税金额
 LineTotalVAT=行增值税金额
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=行类型（0=产品，1=服务）
 FileWithDataToImport=包含要导入的数据的文件
 FileToImport=要导入的源文件
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=通过单击 %s 图标来选择要导入文件的文
 ChooseFileToImport=上传文件，然后单击 %s 图标选择文件作为导入源文件...
 SourceFileFormat=源文件格式
 FieldsInSourceFile=源文件中的字段
-FieldsInTargetDatabase=Dolibarr 数据库中的目标字段（粗体=必填）
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=没有字段
 MoveField=移动字段列号 %s
 ExampleOfImportFile=导入文件的示例
@@ -76,8 +82,8 @@ NowClickToTestTheImport=检查文件的文件格式（字段和字符串分隔
 RunSimulateImportFile=运行导入模拟
 FieldNeedSource=该字段需要源文件中有对应的数据
 SomeMandatoryFieldHaveNoSource=某些必填字段没有来自数据文件的对应值
-InformationOnSourceFile=源文件信息
-InformationOnTargetTables=目标字段信息
+InformationOnSourceFile=来源文件
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=在要导出的字段列中至少切换一个源字段
 SelectFormat=选择此导入文件格式
 RunImportFile=导入数据
diff --git a/htdocs/langs/zh_CN/hrm.lang b/htdocs/langs/zh_CN/hrm.lang
index 6e3b20c6d6d..de615567fbd 100644
--- a/htdocs/langs/zh_CN/hrm.lang
+++ b/htdocs/langs/zh_CN/hrm.lang
@@ -23,9 +23,9 @@ SkillsManagement=技能管理
 HRM_MAXRANK=对技能进行排名的最大级别数
 HRM_DEFAULT_SKILL_DESCRIPTION=创建技能时默认的等级描述
 deplacement=转移
-DateEval=Competency assessment date
+DateEval=能力评估日期
 JobCard=工作卡
-NewJobProfile=New Job Profile
+NewJobProfile=新建职位描述
 JobProfile=职位描述
 JobsProfiles=职位简介
 NewSkill=新技能
@@ -36,21 +36,21 @@ rank=秩
 ErrNoSkillSelected=未选择技能
 ErrSkillAlreadyAdded=该技能已存在清单中
 SkillHasNoLines=没有这个技能行
-Skill=Skill
+Skill=技能
 Skills=技能
 SkillCard=技能
 EmployeeSkillsUpdated=员工技能已更新（参见员工表单视图的“技能”标签页）
-Eval=Competency assessment
-Evals=Competency assessments
-NewEval=New competency assessment
-ValidateEvaluation=Validate competency assessment
-ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
-EvaluationCard=Competency assessment
-RequiredRank=职位描述所需的级别
-RequiredRankShort=Required rank
-PositionsWithThisProfile=Positions with this job profiles
-EmployeeRank=该技能的员工等级
-EmployeeRankShort=Employee rank
+Eval=能力评估
+Evals=能力评估
+NewEval=新的能力评估
+ValidateEvaluation=验证能力评估
+ConfirmValidateEvaluation=您确定要通过参考资料<b>%s</b>验证此能力评估？
+EvaluationCard=能力评估
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
+PositionsWithThisProfile=具有该职位简介的职位
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=员工岗位
 EmployeePositions=员工职位
 EmployeesInThisPosition=担任该职位的员工
@@ -59,21 +59,24 @@ group2ToCompare=用于比较的第二个用户组
 OrJobToCompare=与职位描述的技能要求进行比较
 difference=差异
 CompetenceAcquiredByOneOrMore=一个或多个用户获得但第二个比较者未请求的能力
-MaxlevelGreaterThan=Employee level is greater than the expected level
-MaxLevelEqualTo=Employee level is equals to the expected level
-MaxLevelLowerThan=Employee level is lower than that the expected level
-MaxlevelGreaterThanShort=Level greater than expected
-MaxLevelEqualToShort=Level equal to the expected level
-MaxLevelLowerThanShort=Level lower than expected
+MaxlevelGreaterThan=员工等级高于预期等级
+MaxLevelEqualTo=员工等级等于预期等级
+MaxLevelLowerThan=员工等级低于预期等级
+MaxlevelGreaterThanShort=级别高于预期
+MaxLevelEqualToShort=级别等于预期级别
+MaxLevelLowerThanShort=级别低于预期
 SkillNotAcquired=并非所有用户都获得且第二个比较者要求的技能
 legend=图例
 TypeSkill=技能类型
-AddSkill=Add skills to job profile
-RequiredSkills=Required skills for this job profile
+AddSkill=添加技能到职位描述
+RequiredSkills=此职位描述所需的技能
 UserRank=用户排名
 SkillList=技能清单
+SkillCreated=%s技能已创建
+SkillRank=技能等级
+ShowSkillRank=显示技能等级
 SaveRank=保存排名
-TypeKnowHow=Know-how
+TypeKnowHow=专业知识
 TypeHowToBe=怎样成为
 TypeKnowledge=知识
 AbandonmentComment=放弃评论
@@ -88,10 +91,12 @@ VacantCheckboxHelper=勾选此选项将显示未填补的职位（职位空缺
 SaveAddSkill = 技能(一个或多个)已添加
 SaveLevelSkill = 技能(一个或多个)等级已保存
 DeleteSkill = 技能已移除
-SkillsExtraFields=Complementary attributes (Skills)
-JobsExtraFields=Complementary attributes (Job profiles)
-EvaluationsExtraFields=Complementary attributes (Competency assessments)
+SkillsExtraFields=互补属性 (技能)
+JobsExtraFields=互补属性 (职位描述)
+EvaluationsExtraFields=互补属性 (能力评估)
 NeedBusinessTravels=需要商务出差
 NoDescription=没有描述
-TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
-PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+TheJobProfileHasNoSkillsDefinedFixBefore=该员工的评估职位描述未定义任何技能。请添加技能，然后删除并重新开始评估。
+PDFStandardHrmEvaluation=为能力评估生成 PDF 文档的标准模板
+SkillNotRequired=不需要的技能
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/zh_CN/install.lang b/htdocs/langs/zh_CN/install.lang
index a8175fa2d9a..27f857b326e 100644
--- a/htdocs/langs/zh_CN/install.lang
+++ b/htdocs/langs/zh_CN/install.lang
@@ -154,10 +154,10 @@ MigrationSuccessfullUpdate=升级成功
 MigrationUpdateFailed=升级过程中失败
 MigrationRelationshipTables=关系表 (%s) 的数据迁移
 MigrationPaymentsUpdate=支付数据校正
-MigrationPaymentsNumberToUpdate=%的付款（县）更新
+MigrationPaymentsNumberToUpdate=%s 付款要更新
 MigrationProcessPaymentUpdate=更新费（第）%s的
-MigrationPaymentsNothingToUpdate=没有更多的事情要做
-MigrationPaymentsNothingUpdatable=没有更多的款项可以纠正
+MigrationPaymentsNothingToUpdate=没有更多事情要做
+MigrationPaymentsNothingUpdatable=不再可更正的付款
 MigrationContractsUpdate=合同数据校正
 MigrationContractsNumberToUpdate=%的合同（县）更新
 MigrationContractsLineCreation=创建合同号线中1%的合同
@@ -190,7 +190,7 @@ MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
 MigrationProjectUserResp=数据迁移llx_projet领域fk_user_resp到llx_element_contact
 MigrationProjectTaskTime=更新时间花费在几秒钟内
 MigrationActioncommElement=更新操作数据
-MigrationPaymentMode=Data migration for payment type
+MigrationPaymentMode=付款 类型的数据迁移
 MigrationCategorieAssociation=迁移类别
 MigrationEvents=Migration of events to add event owner into assignment table
 MigrationEventsContact=Migration of events to add event contact into assignment table
@@ -217,3 +217,4 @@ FunctionTest=Function test
 NodoUpgradeAfterDB=数据库升级后外部模块未请求任何操作
 NodoUpgradeAfterFiles=文件或目录升级后外部模块未请求任何操作
 MigrationContractLineRank=Migrate Contract Line to use Rank (and enable Reorder)
+MigrationProductLotPath=Migrate Product Batch files path
diff --git a/htdocs/langs/zh_CN/ldap.lang b/htdocs/langs/zh_CN/ldap.lang
index 477d93552ee..05862076996 100644
--- a/htdocs/langs/zh_CN/ldap.lang
+++ b/htdocs/langs/zh_CN/ldap.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ldap
-YouMustChangePassNextLogon=<b>%</b>用户密码<b>%之S</b>必须改变对域。
+YouMustChangePassNextLogon=必须更改域 <b>%s</b> 上的 用户 <b>%s</b> 的密码。
 UserMustChangePassNextLogon=用户必须更改密码的域%s
 LDAPInformationsForThisContact=在此LDAP数据库信息联系
 LDAPInformationsForThisUser=LDAP数据库中该用户信息
@@ -29,5 +29,5 @@ LDAPPasswordHashType=密码哈希类型
 LDAPPasswordHashTypeExample=服务器上使用的密码哈希类型
 SupportedForLDAPExportScriptOnly=只有 ldap 导出脚本支持
 SupportedForLDAPImportScriptOnly=只有 ldap 导入脚本支持
-LDAPUserAccountControl = userAccountControl on creation (active directory)
-LDAPUserAccountControlExample = 512 Normal Account / 546 Normal Account + No Passwd + Disabled (see : https://fr.wikipedia.org/wiki/Active_Directory)
+LDAPUserAccountControl = 创建时的用户帐户控制 (活动目录)
+LDAPUserAccountControlExample =  512 个普通账户 / 546 个普通账户 + 无密码 + 已禁用 (参见 :https://fr.wikipedia.org/wiki/Active_Directory)
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index 77ec14aa58f..bba4f2d5e8e 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=发送电子邮件
 EMailing=发送电子邮件
-EMailings=电子邮件
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=所有电子邮件
+AllEMailings=All mass eMails
 MailCard=通过电子邮件发送卡
 MailRecipients=收件人
 MailRecipient=收件人
@@ -26,19 +26,19 @@ MailFile=附件
 MailMessage=电子邮件正文
 SubjectNotIn=Not in Subject
 BodyNotIn=Not in Body
-ShowEMailing=显示电子邮件
-ListOfEMailings=邮件列表
-NewMailing=新的电子邮件
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=编辑电子邮件
-ResetMailing=重新发送电子邮件
-ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status
-ResetMailingTargetMassaction=Reset targets status
-DeleteMailing=删除电子邮件
-PreviewMailing=预览电子邮件
-CreateMailing=创建电子邮件
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=测试
-ValidMailing=有效的电子邮件
+ValidMailing=Valid mass Email
 MailingStatusDraft=草稿
 MailingStatusValidated=已验证
 MailingStatusSent=发送
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=All filters must match to have an email being collected
 LineInFile=在文件%s的线
 RecipientSelectionModules=为收件人的选择定义的要求
 MailSelectedRecipients=请选取收件人
-MailingArea=电子邮件区
-LastMailings=最新的%s电子邮件
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=统计指标
 NbOfCompaniesContacts=唯一联系人/地址
 MailNoChangePossible=为验证电子邮件收件人无法改变
-SearchAMailing=搜索邮件
-SendMailing=发送电子邮件
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=发送
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=可以从命令行执行发送电子邮件。请您的服务器管理员启动以下命令以将电子邮件发送给所有收件人：
 MailingNeedCommand2=但是您可以发送到网上，加入与最大的电子邮件数量值参数MAILING_LIMIT_SENDBYWEB你要发送的会议。
 ConfirmSendingEmailing=如果您想直接从此屏幕发送电子邮件，请确认您确定要立即从浏览器发送电子邮件？
-LimitSendingEmailing=注意: 基于安全与超时的原因从web界面发送邮件 <b>%s</b> 收件人在每次发送会话的时间。
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=清除列表
 ToClearAllRecipientsClickHere=点击这里以清除此电子邮件的收件人列表
 ToAddRecipientsChooseHere=从收件人列表中选取并添加收件人
-NbOfEMailingsReceived=批量接收邮件
-NbOfEMailingsSend=群发邮件
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=编号记录
 DeliveryReceipt=交货确认。
 YouCanUseCommaSeparatorForSeveralRecipients=您可以使用<b>逗号</b>分隔符指定多个收件人。
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=No automatic email notifications are planned for this
 ANotificationsWillBeSent=1 automatic notification will be sent by email
 SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
 AddNewNotification=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=Email电子邮箱配置设定 '%s'. 这个模式无法用于邮件群发。
 MailSendSetupIs2=首先您得这么地, 得先有个管理员账号吧 admin , 进入菜单 %s主页 - 设置 - EMails%s 修改参数 <strong>'%s'</strong> 用 '%s'模式。 在此模式下， 您才可输入一个 SMTP 服务器地址 来供您收发邮件。
 MailSendSetupIs3=如果你对 SMTP 服务器的配置方面有疑问, 你可到这里询问 %s.
@@ -183,7 +185,7 @@ Information=信息
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=已回复
-IsNotAnAnswer=Is not answer (initial email)
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=Is an answer of an initial email
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
@@ -199,6 +201,6 @@ ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
 ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index b1c1882a276..0771faa9159 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -37,6 +37,7 @@ Translation=翻译
 Translations=翻译
 CurrentTimeZone=PHP（服务器）的时区
 EmptySearchString=Enter non empty search criteria
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=输入日期条件
 NoRecordFound=没有找到记录
 NoRecordDeleted=未删除记录
@@ -45,6 +46,7 @@ NoError=没有错误
 Error=错误
 Errors=错误
 ErrorFieldRequired=字段 '%s' 必须按要求填写
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=字段 '%s' 参数值有误
 ErrorFileDoesNotExists=文件%s不存在
 ErrorFailedToOpenFile=无法打开文件 %s
@@ -308,6 +310,7 @@ DateBuild=报告生成日期
 DatePayment=付款日期
 DateApprove=批准日期
 DateApprove2=批准日期(二次批准)
+PendingSince=Pending since
 RegistrationDate=注册日期
 UserCreation=创建用户
 UserModification=修改用户
@@ -495,7 +498,7 @@ ActionRunningNotStarted=等待
 ActionRunningShort=进行中
 ActionDoneShort=已完成
 ActionUncomplete=不完整的
-LatestLinkedEvents=最新的%s链接事件
+LatestLinkedEvents=The last %s events
 CompanyFoundation=公司/组织
 Accountant=会计
 ContactsForCompany=合作方联系人
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=电子邮件正文
 SendAcknowledgementByMail=发送确认邮件
 SendMail=发送电子邮件
 Email=电子邮件
+EMail=电子邮件
+EMails=电子邮件
 NoEMail=没有电子邮件
 AlreadyRead=已读取
 NotRead=未读
@@ -793,7 +798,7 @@ Notes=备注
 AddNewLine=添加新行
 AddFile=添加文件
 FreeZone=产品附加文本
-FreeLineOfType=附加文本项，类型：
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=复制项目含主属性
 ReGeneratePDF=重新生成 PDF
 PDFMerge=PDF合并
@@ -879,12 +884,14 @@ toward=往
 Access=访问
 SelectAction=选择操作
 SelectTargetUser=选择目标用户/员工
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=按快捷键 Ctrl+C 复制
 SaveUploadedFileWithMask=将文件保存在服务器上，名称为“<strong> %s </strong>”（否则为“%s”）
 OriginFileName=原始文件名
 SetDemandReason=设置源
 SetBankAccount=定义银行账户
 AccountCurrency=账户币种
+AccountancyCode=科目代码
 ViewPrivateNote=查看备注
 XMoreLines=%s 明细(s) 隐藏
 ShowMoreLines=显示更多/更少的行
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=您确定要删除%s已选记录吗？
 ConfirmMassClone=批量克隆确认
 ConfirmMassCloneQuestion=选择要克隆到的项目
 ConfirmMassCloneToOneProject=克隆到项目 %s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=关联项目
 ClassifyBilled=分类计费
 ClassifyUnbilled=分类未计费
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=您需要登录并且需要查看或下载文件的权
 Download=下载
 DownloadDocument=下载文件
 DownloadSignedDocument=下载签署的文件
-ActualizeCurrency=更新货币汇率
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=财务年度
 ModuleBuilder=模块和应用程序生成器
 SetMultiCurrencyCode=设置货币
+SetMultiCurrencyRate=Set currency rate
 BulkActions=批量操作
 ClickToShowHelp=单击以显示工具提示帮助
 WebSite=网站
@@ -1104,6 +1113,7 @@ PayedBy=付款人
 PayedTo=支付给
 Monthly=月度
 Quarterly=季度
+Quarter=Quarter
 Annual=全年
 Local=本地
 Remote=远程
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=任务
 ContactDefault_propal=报价
 ContactDefault_supplier_proposal=供应商报价
 ContactDefault_ticket=服务工单
+ContactDefault_societe=合伙人
 ContactAddedAutomatically=Contact added from third-party contact roles
 More=更多的
 ShowDetails=显示详细资料
@@ -1242,6 +1253,7 @@ CommercialAffected=指定销售代表
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=内容
+Emailing=Emailing
 Progression=进展
 YourMessage=您的留言
 YourMessageHasBeenReceived=您的留言已收到。我们将尽快答复或联系您。
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=添加
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=从开始
+Transferred=Transferred
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index 9526308355f..f8a29ca0466 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=如果需要订阅，则必须记录订阅的开始日
 DeleteType=删除
 VoteAllowed=允许投票
 Physical=个人
-Moral=法人
-MorAndPhy=法人及个人
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Re-enable
 ExcludeMember=排斥会员
 Exclude=排斥
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=按地区划分的会员统计
 NbOfMembers=会员总数
 NbOfActiveMembers=当前活跃会员总数
 NoValidatedMemberYet=未找到已验证的会员
-MembersByCountryDesc=此屏幕显示按国家/地区划分的会员统计数据。图形和图表取决于 Google 在线图形服务的可用性以及有效的互联网连接的可用性。
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=此屏幕显示按国家/省份/州县划分的会员统计数据。
 MembersByTownDesc=此屏幕显示按城镇划分的会员统计数据。
 MembersByNature=此屏幕显示按性质划分的会员统计数据。
@@ -208,25 +209,25 @@ NewMemberbyWeb=添加了新会员。正在等待批准
 NewMemberForm=新会员表单
 SubscriptionsStatistics=捐献统计
 NbOfSubscriptions=捐献数量
-AmountOfSubscriptions=从捐献中收取的金额
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=营业额（对于公司）或预算（对于基金会）
-DefaultAmount=默认捐献金额（仅在会员类型级别未定义金额时使用）
-MinimumAmount=最低金额（仅在不限捐献金额时使用）
-CanEditAmount=订阅金额可由会员自行定义
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=无论会员类型如何，访问者都可以选择/编辑其捐献金额
 AmountIsLowerToMinimumNotice=The amount is lower than the minimum %s
 MEMBER_NEWFORM_PAYONLINE=After the online registration, switch automatically to the online payment page
 ByProperties=按性质
 MembersStatisticsByProperties=按性质划分的会员统计
-VATToUseForSubscriptions=VAT rate to use for contributions
-NoVatOnSubscription=捐献无需缴纳增值税
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=用于发票上捐献栏的产品：%s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=姓名或公司名称
 SubscriptionRecorded=捐献记录
 NoEmailSentToMember=没有向会员发送电子邮件
 EmailSentToMember=电子邮件已发送至 %s 的会员
-SendReminderForExpiredSubscriptionTitle=通过电子邮件发送捐献过期提醒
-SendReminderForExpiredSubscription=Send reminder by email to members when contribution is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=当前期间（直到 %s）的会员资格费已支付
 YouMayFindYourInvoiceInThisEmail=此电子邮件中可能附有您的发票
 XMembersClosed=%s 会员已关闭
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=A third party is the legal entity that will be used
 MemberFirstname=会员名字
 MemberLastname=会员姓氏
 MemberCodeDesc=会员代码，所有会员唯一
-MemberSubscriptionStartFirstDayOf=The start date of a membership corresponds to the first day of a
-MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a subscription except renewals (example +3m = +3 months, -5d = -5 days, +1Y = +1 year)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index 472aa062f6b..f1f98ac0b43 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -70,11 +70,14 @@ Notify_BILL_SUPPLIER_VALIDATE=供应商发票已验证
 Notify_BILL_SUPPLIER_PAYED=供应商发票已支付
 Notify_BILL_SUPPLIER_SENTBYMAIL=通过邮件发送的供应商发票
 Notify_BILL_SUPPLIER_CANCELED=Vendor invoice canceled
+Notify_CONTRACT_MODIFY=Contract modified
 Notify_CONTRACT_VALIDATE=合同验证
 Notify_FICHINTER_VALIDATE=现场服务已验证
+Notify_FICHINTER_MODIFY=Intervention modified
 Notify_FICHINTER_CLOSE=Intervention closed
 Notify_FICHINTER_ADD_CONTACT=为现场服务添加联系人
 Notify_FICHINTER_SENTBYMAIL=通过邮件发送的现场服务
+Notify_SHIPPING_MODIFY=Shipping modified
 Notify_SHIPPING_VALIDATE=货运单已验证
 Notify_SHIPPING_SENTBYMAIL=通过邮件发送的货运单
 Notify_MEMBER_VALIDATE=会员已验证
@@ -125,9 +128,9 @@ DemoCompanyManufacturing=Company manufacturing products
 DemoCompanyAll=公司有多项活动（所有主要模块）
 CreatedBy=创建者 %s
 ModifiedBy=修改者 %s
-ValidatedBy=由%验证s
+ValidatedBy=已由 %s 验证
 SignedBy=Signed by %s
-ClosedBy=由%闭s
+ClosedBy=由 %s 关闭
 CreatedById=创建的用户ID号
 ModifiedById=最近变更的用户ID号
 ValidatedById=验证的用户ID号
@@ -209,6 +212,7 @@ AmountIn=Amount in %s
 NumberOfUnitsMos=Number of units to produce in manufacturing orders
 EMailTextInterventionAddedContact=已为您分配了新的现场服务 %s。
 EMailTextInterventionValidated=现场服务 %s 已验证。
+EMailTextInterventionModified=The intervention %s has been modified. %s
 EMailTextInterventionClosed=The intervention %s has been closed.
 EMailTextInvoiceValidated=Invoice %s has been validated.
 EMailTextInvoicePayed=Invoice %s has been paid.
@@ -226,12 +230,14 @@ EMailTextSupplierOrderCanceledBy=Purchase order %s has been canceled by %s.
 EMailTextSupplierOrderValidatedBy=采购订单%s已被%s记录。
 EMailTextSupplierOrderSubmittedBy=采购订单%s已被%s提交。
 EMailTextSupplierOrderRefusedBy=采购订单%s已被%s拒绝。
+EMailTextExpeditionModified=Shipping %s has been validated. %s
 EMailTextExpeditionValidated=货运单 %s 已验证。
 EMailTextExpenseReportValidated=Expense report %s has been validated.
 EMailTextExpenseReportApproved=Expense report %s has been approved.
 EMailTextHolidayValidated=Leave request %s has been validated.
 EMailTextHolidayApproved=Leave request %s has been approved.
 EMailTextActionAdded=操作 %s 已添加到日程中。
+EMailTextContractModified=The contract %s has been modified. %s
 ImportedWithSet=输入数据集
 DolibarrNotification=自动通知
 ResizeDesc=输入新的高度新的宽度<b>或</b> 。比率将维持在调整大小...
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index 810e0c4d029..cc70bc0e9c7 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -97,7 +97,6 @@ ShowService=显示服务
 ProductsAndServicesArea=产品和服务区
 ProductsArea=产品区
 ServicesArea=服务区
-ListOfStockMovements=库存调拨清单
 BuyingPrice=买价
 PriceForEachProduct=产品明码标价
 SupplierCard=供应商
@@ -145,6 +144,7 @@ WithoutDiscount=无折扣
 VATRateForSupplierProduct=Tax Rate (for this vendor/product)
 DiscountQtyMin=此数量的折扣。
 NoPriceDefinedForThisSupplier=没有为此供应商/产品定义价格/数量
+NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
 NoSupplierPriceDefinedForThisProduct=没有为此产品定义供应商价格/数量
 PredefinedItem=预定义项
 PredefinedProducts=预定义产品
@@ -171,7 +171,7 @@ BuyingPrices=买价
 CustomerPrices=客户价格
 SuppliersPrices=供应商价格
 SuppliersPricesOfProductsOrServices=供应商价格（产品或服务）
-CustomCode=自定义代码 | 商品代码 | HS代码
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=原产地国家
 RegionStateOrigin=原产地
 StateOrigin=原产地州 | 省
@@ -209,6 +209,7 @@ unitL=升
 unitT=吨
 unitKG=公斤
 unitG=公克
+unitGAL=加仑
 unitMG=毫克
 unitLB=英镑
 unitOZ=盎司
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=请求格式为{“URL”：“http://example.c
 UpdateInterval=升级更新间隔(分钟)
 LastUpdated=最新更新
 CorrectlyUpdated=当前更新
-PropalMergePdfProductActualFile=文件添加到 PDF Azur are/is
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=选择PDF文件
 IncludingProductWithTag=包括带标签的产品/服务
 DefaultPriceRealPriceMayDependOnCustomer=默认价格，实际价格可能取决于客户
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=根据供应商的包装重新计算本行的数量
 
 #Attributes
 Attributes=属性
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=变体属性
 ProductAttributes=产品的变体属性
 ProductAttributeName=变体属性%s
@@ -395,6 +400,8 @@ ErrorDestinationProductNotFound=找不到目的地产品
 ErrorProductCombinationNotFound=未找到产品变体
 ActionAvailableOnVariantProductOnly=操作仅适用于产品变体
 ProductsPricePerCustomer=每个客户的产品价格
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=附加属性（供应商价格）
 DeleteLinkedProduct=删除链接到组合的子产品
 AmountUsedToUpdateWAP=用于更新加权平均价格的单位量
@@ -403,7 +410,8 @@ PMPValueShort=的WAP
 mandatoryperiod=强制期限
 mandatoryPeriodNeedTobeSet=注意：必须定义期间（开始日期和结束日期）
 mandatoryPeriodNeedTobeSetMsgValidate=服务需要有开始时间和结束时间
-mandatoryHelper=选中此项后，当创建/验证发票、报价单、销售订单时，若在此服务所在行上没有输入开始和结束日期，则向用户弹出一条消息。 <br> 请注意，该消息是一个警告而不是一个阻塞后续操作的错误。
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
+mandatoryHelper2=Note that the message is a warning and not a blocking error.
 DefaultBOM=默认物料清单
 DefaultBOMDesc=建议使用默认 BOM 来制造该产品。仅当产品性质为“%s”时才能设置此字段。
 Rank=等级
@@ -435,3 +443,6 @@ AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtu
 ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
 WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned
 PriceLabel=Price label
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/zh_CN/users.lang b/htdocs/langs/zh_CN/users.lang
index 37a07240f84..e7356e14985 100644
--- a/htdocs/langs/zh_CN/users.lang
+++ b/htdocs/langs/zh_CN/users.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - users
 HRMArea=人力资源管理区
-UserCard=用户信息
-GroupCard=群组信息
+UserCard=用户
+GroupCard=群组
 Permission=权限
 Permissions=权限
 EditPassword=修改密码
@@ -32,9 +32,8 @@ CreateUser=创建用户
 LoginNotDefined=未登录
 NameNotDefined=无名称
 ListOfUsers=用户列表
-SuperAdministrator=超级管理员
-SuperAdministratorDesc=管理员的所有权利
-AdministratorDesc=管理员
+SuperAdministrator=多公司管理员
+SuperAdministratorDesc= 多公司系统管理员 (可更改设置和用户)
 DefaultRights=默认权限
 DefaultRightsDesc=在此定义自动授予<u>新</u>用户的<u>默认</u>权限（要变更现有用户的权限，请转到用户标签页）。
 DolibarrUsers=Dolibarr用户
@@ -46,7 +45,7 @@ CreateGroup=创建组
 RemoveFromGroup=从组中删除
 PasswordChangedAndSentTo=密码更改，发送到<b>%s。</b>
 PasswordChangeRequest=请求更改<b> %s </b>的密码
-PasswordChangeRequestSent=要求更改密码<b>的S%</b>发送到<b>%s。</b>
+PasswordChangeRequestSent=请求 更改 <b>%s</b> 的密码，发送至 <b>%s</b>。
 IfLoginExistPasswordRequestSent=如果此登录名是有效帐户（拥有有效电子邮件），则已发送一封用于重置密码的电子邮件。
 IfEmailExistPasswordRequestSent=如果此电子邮件是有效帐户，则已发送一封用于重置密码的电子邮件（如果您没有收到任何邮件，请记得检查您的垃圾邮件文件夹）
 ConfirmPasswordReset=确认密码重置
@@ -66,10 +65,11 @@ LinkedToDolibarrUser=链接到用户
 LinkedToDolibarrThirdParty=链接到合作方
 CreateDolibarrLogin=创建用户
 CreateDolibarrThirdParty=创建合作方
-LoginAccountDisableInDolibarr=帐户已禁用
+LoginAccountDisableInDolibarr=账户已禁用
 PASSWORDInDolibarr=密码已修改
 UsePersonalValue=使用自定义值
 ExportDataset_user_1=用户及属性
+ExportDataset_user_2=安全事件清单
 DomainUser=域用户%s
 Reactivate=重新激活
 CreateInternalUserDesc=此表单允许您在公司/组织中创建内部用户。若要创建外部用户（如客户、供应商等等），请使用该合作方联系人标签页中的“创建用户”链接。
@@ -90,7 +90,7 @@ UserDeleted=用户%s已删除
 NewGroupCreated=组%s已创建
 GroupModified=群组 %s 已变更
 GroupDeleted=群组%s删除
-ConfirmCreateContact=您确定要为此联系人创建Dolibarr帐户吗？
+ConfirmCreateContact=您确定要为此联系人创建Dolibarr账户吗？
 ConfirmCreateLogin=您确定要为此会员创建Dolibarr帐户吗？
 ConfirmCreateThirdParty=您确定要为此会员创建合作方吗？
 LoginToCreate=登陆创建
@@ -112,6 +112,8 @@ DisabledInMonoUserMode=在维护模式下禁用
 UserAccountancyCode=用户科目代码
 UserLogoff=用户注销
 UserLogged=用户登录
+UserLoginFailed=用户登录失败
+UserPasswordChange=用户密码变更
 DateOfEmployment=雇佣日期
 DateEmployment=雇佣期限
 DateEmploymentStart=入职日期
@@ -120,10 +122,10 @@ RangeOfLoginValidity=访问有效期日期范围
 CantDisableYourself=您无法禁用自己的用户记录
 ForceUserExpenseValidator=指定的费用报销单批准人
 ForceUserHolidayValidator=指定的休假申请单批准人
-ValidatorIsSupervisorByDefault=默认情况下，批准人是用户的上级主管。保留空值将使用默认批准人。
+ValidatorIsSupervisorByDefault=默认情况下，验证者是用户的上级。保持为空可保留此行为。
 UserPersonalEmail=私人邮箱
 UserPersonalMobile=私人手机
-WarningNotLangOfInterface=警告，这是用户使用的主要语言，而不是他选择的界面显示语言。要更改该用户可见的界面语言，请前往标签页 %s
+WarningNotLangOfInterface=警告，这是用户使用的主要语言，而不是他选择查看的界面语言。要更改该用户可看到的界面语言，请进入%s选项卡
 DateLastLogin=最后登录日期
 DatePreviousLogin=上次登录日期
 IPLastLogin=最后登录IP
@@ -132,3 +134,13 @@ ShowAllPerms=显示所有权限行
 HideAllPerms=隐藏所有权限行
 UserPublicPageDesc=您可以为此用户启用虚拟名片。将提供一个带有用户描述和条形码的URL，允许任何人使用智能手机扫描并将联系人添加到其通讯簿中。
 EnablePublicVirtualCard=启用用户的虚拟名片
+ExcludedByFilter=无筛选条件，但可显示其层次结构
+UserEnabledDisabled=用户状态变更：%s
+AlternativeEmailForOAuth2= 用于 OAuth2 登录的替代电子邮件
+ErrorUpdateCanceledDueToDuplicatedUniqueValue=错误，更新被取消，因为其中一个应该是唯一的数据已经存在
+NewNameUserClone=Full name of the new user
+CloneUserRights=Clone the user's permissions
+CloneCategoriesUser=Clone the user's categories
+ConfirmUserClone=Are you sure you want to clone the user: <b>%s</b>?
+NewEmailUserClone=Email address of the new user
+SocialNetworksUser=用户社交网络
diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
index d146e183873..bcdede26a01 100644
--- a/htdocs/langs/zh_CN/website.lang
+++ b/htdocs/langs/zh_CN/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=在此处使用其他名称/别名列表，以便也可以
 WEBSITE_CSS_URL=外部CSS文件的URL地址
 WEBSITE_CSS_INLINE=CSS文件内容（所有页面共有）
 WEBSITE_JS_INLINE=JavaScript file content (common to all pages)
-WEBSITE_HTML_HEADER=添加在 HTML 页眉的底部（对所有页面通用）
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=机器人文件（robots.txt）
 WEBSITE_HTACCESS=网站 .htaccess 文件
 WEBSITE_MANIFEST_JSON=网站 manifest.json 文件
@@ -25,11 +25,11 @@ EditTheWebSiteForACommonHeader=注意：如果要为所有页面定义个性化
 MediaFiles=媒体库
 EditCss=编辑网站属性
 EditMenu=编辑菜单
-EditMedias=Edit media
+EditMedias=编辑媒体
 EditPageMeta=编辑页面/容器属性
 EditInLine=编辑内联
 AddWebsite=添加网站
-WebsitePage=Website page
+WebsitePage=网站页面
 Webpage=网页/容器
 AddPage=添加页面/容器
 PageContainer=页面
@@ -56,16 +56,17 @@ ReadPerm=阅读
 WritePerm=写
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>在新标签页中预览%s。</u> <br> <br> %s将由外部Web服务器（如Apache，Nginx，IIS）提供服务。您必须先安装并设置此服务器才能指向目录：<br> <strong> %s </strong> <br>外部服务器提供的URL：<br> <strong> %s </strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=未定义外部Web服务器所服务的虚拟主机的URL
 NoPageYet=还没有页面
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=有关特定语法提示的帮助
 YouCanEditHtmlSourceckeditor=您可以使用编辑器中的“源”按钮编辑HTML源代码。
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=对于通过共享链接共享的图像（使用文件的共享哈希键进行开放访问），语法为： <br> <strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt; </strong>  <br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=克隆页面/容器
 CloneSite=克隆网站
@@ -87,15 +88,15 @@ WebsiteAccount=Website account
 WebsiteAccounts=网站帐号
 AddWebsiteAccount=创建网站帐户
 BackToListForThirdParty=Back to list for the third parties
-DisableSiteFirst=首先停用网站
+DisableSiteFirst=Put website offline first
 MyContainerTitle=我的网站标题
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
 SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=您必须先定义默认主页
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correctty when used on a grabbed external page.
-OnlyEditionOfSourceForGrabbedContent=当从外部站点获取内容时，只能使用HTML源代码
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=抓住发现到css和页面的图像。
 ImagesShouldBeSavedInto=图像应保存到目录中
 WebsiteRootOfImages=网站图像的根目录
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=清除筛选
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=分类
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=您将很快跳转到订单详情页面。
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/zh_HK/admin.lang b/htdocs/langs/zh_HK/admin.lang
index 612f29561cf..1919d6f01c4 100644
--- a/htdocs/langs/zh_HK/admin.lang
+++ b/htdocs/langs/zh_HK/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=檔案完整性檢查已通過，但新增了
 FileIntegritySomeFilesWereRemovedOrModified=檔案完整性檢查失敗。一些檔案被修改、刪除或新增。
 GlobalChecksum=全域校驗值
 MakeIntegrityAnalysisFrom=從中進行應用程式檔案的完整性分析
-LocalSignature=嵌入式本地簽名（較不可靠）
-RemoteSignature=遠程簽名（較可靠）
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=遺失的檔案
 FilesUpdated=已更新的檔案
 FilesModified=已修改的檔案
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=僅由某些日程選項使用
 Security=安全
 Passwords=密碼
 DoNotStoreClearPassword=加密存儲在資料庫中的密碼。
-MainDbPasswordFileConfEncrypted=加密存儲在conf.php中的數據庫密碼。強烈建議激活此選項。
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=將密碼編碼到 <b> conf.php </b>  文件，替換行 <br>  <b> $dolibarr_main_db_pass="..."; </b>  <br> 作者：<br>  <b> $dolibarr_main_db_pass="加密:%s"; </b>
 InstrucToClearPass=將密碼解碼（清除）到 <b> conf.php </b>  文件，替換行 <br>  <b> $dolibarr_main_db_pass="已加密：..."; </b>  <br> 作者：<br>  <b> $dolibarr_main_db_pass="%s"; </b>
 ProtectAndEncryptPdfFiles=保護生成的 PDF 文件。不建議這樣做，因為它會破壞批量 PDF 生成。
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=幾何點
 ExtrafieldMultiPointGeo=幾何多點
 ExtrafieldLinestringGeo=幾何線串
 ExtrafieldPolygonGeo=幾何多邊形
+ExtrafieldStars=Stars
 ComputedFormula=電腦字段
-ComputedFormulaDesc=您可以在此輸入使用物件的其他屬性或任何 PHP 編碼的公式，以獲得動態計算值。您可以使用任何 PHP 相容公式，包括“?”條件運算符，以及下列全域物件：<strong>$db、$conf、$langs、$mysoc、$user、$objectoffield</strong>。\n<br><strong>警告</strong>：如果您需要未載入物件的屬性，只需將物件取得到公式中，就像第二個範例中一樣。\n<br>使用計算欄位表示您無法從介面輸入任何值。此外，如果存在語法錯誤，公式可能不會傳回任何內容。<br><br>公式範例：<br>$objectoffield->id < 10 ？ round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>重新載入物件的範例<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')<br><br>強制載入物件及其父物件的公式的其他範例：<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj-> fetchNoCompute($reloadedobj->fk_project) > 0)) ？ $secondloadedobj->ref: '未找到父項目'
+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'
 Computedpersistent=存儲電腦字段
 ComputedpersistentDesc=計算出的額外欄位將儲存在資料庫中，但是只有當該欄位的物件發生變更時才會重新計算該值。如果計算欄位依賴其他物件或全域數據，則該值可能是錯誤的！
 ExtrafieldParamHelpPassword=將此欄位留空意味著該值將在不加密的情況下儲存（欄位只是在螢幕上用星星隱藏）。<br><br>輸入值“dolcrypt”以使用可逆加密演算法對值進行編碼。清晰的數據仍然可以被了解和編輯，但被加密到資料庫中。<br><br>輸入「auto」（或「md5」、「sha256」、「password_hash」、...）以使用預設密碼加密演算法（或 md5、sha256、password_hash...）來保存不可逆的雜湊密碼進入資料庫（無法檢索原始值）
@@ -519,7 +520,7 @@ WarningPHPMailB=- 如果您的電子郵件網域（mymaildomain.com 到 myname@m
 WarningPHPMailC=- 使用您自己的電子郵件服務提供者的 SMTP 伺服器發送電子郵件也很有趣，因此從應用程式發送的所有電子郵件也將保存到您郵箱的「已發送」目錄中。
 WarningPHPMailD=因此，建議將電子郵件的傳送方式變更為值「SMTP」。
 WarningPHPMailDbis=如果您確實想保留預設的「PHP」方法來傳送電子郵件，只需忽略此警告，或透過%s按一下此處%s將其刪除。
-WarningPHPMail2=如果您的電子郵件SMTP 提供者需要將電子郵件用戶端限制為某些IP 位址（非常罕見），則這是ERP CRM 應用程式的郵件使用者代理(MUA) 的IP 位址：<strong>%s</strong> 。
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=如果您的寄件者電子郵件地址中的網域名稱受SPF 記錄保護（請詢問您的網域註冊商），您必須在您的網域的DNS 的SPF 記錄中新增下列IP 或條目：<strong>%s</strong>。
 WarningPHPMailSPFDMARC=如果寄件者電子郵件地址中的網域名稱受與p=none 不同的DMARC 記錄保護（詢問您的網域註冊商），則必須刪除您的DMARC 記錄，或將其設為p=none，如@gmail. com）或使用發送另一種方法。
 SPFAndDMARCInformation=主要電子郵件地址的 SPF 和 DMARC DNS 記錄
@@ -567,8 +568,8 @@ Module10Name=會計（簡體）
 Module10Desc=基於數據庫內容的簡單會計報告（期刊、營業額）。不使用任何分類帳表。
 Module20Name=報價單
 Module20Desc=報價管理
-Module22Name=群發電子郵件
-Module22Desc=管理批量電子郵件
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=活力
 Module23Desc=監測能源消耗
 Module25Name=銷售訂單
@@ -847,10 +848,10 @@ Permission212=訂單行
 Permission213=激活線路
 Permission214=設置電話
 Permission215=設置提供商
-Permission221=查看電子郵件
-Permission222=創建 / 修改 電子郵件（主題、收件人...）
-Permission223=驗證電子郵件（允許發送）
-Permission229=刪除電子郵件
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=查看收件人和信息
 Permission238=手動發送郵件
 Permission239=驗證或發送後刪除郵件
@@ -1105,6 +1106,7 @@ DictionaryStaff=在職員工人數
 DictionaryAvailability=交貨延遲
 DictionaryOrderMethods=訂購方式
 DictionarySource=原本 報價單 / 訂單 的
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=自訂報告群組
 DictionaryAccountancysystem=會計科目表模型
 DictionaryAccountancyJournal=會計日記賬
@@ -1134,11 +1136,11 @@ BackToDictionaryList=返回詞典列表
 TypeOfRevenueStamp=稅票類型
 VATManagement=銷售稅管理
 VATIsUsedStandard=在創建文件（報價單、發票、訂單等）時，預設的銷售稅率會根據標準規則設置（取決於賣方和買方的國家）
-VATIsUsedDesc=關於創建報價單、發票、訂單等時的銷售稅率默認規則如下：<br>如果賣方不受銷售稅限制，則銷售稅默認為0。規則結束。<br>如果(賣方與買方同一個國家)，那麼銷售稅默認等於賣方國家的產品銷售稅。規則結束。<br>如果賣方和買方都在歐洲共同體內且貨物屬於運輸相關產品（貨運、航運、航空），則默認增值稅為0。這條規則依賴於賣方國家 - 請諮詢您的會計師。增值稅應由買方向其國家海關辦公室繳納，而不是給賣方。規則結束。<br>如果賣方和買方都在歐洲共同體內且買方不是公司（沒有註冊的跨國增值稅號碼），則增值稅默認為賣方國家的增值稅率。規則結束。<br>如果賣方和買方都在歐洲共同體內且買方是一家公司（具有註冊的跨國增值稅號碼），則默認增值稅為0。規則結束。<br>在任何其他情況下，建議的默認值為銷售稅=0。規則結束。
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=默認情況下，建議的銷售稅為 0，可用於協會、個人或小公司等情況。
 VATIsUsedExampleFR=在法國，這意味著擁有真實財政制度（簡化真實或正常真實）的公司或組織。增值稅申報系統。
 VATIsNotUsedExampleFR=在法國，它是指不申報銷售稅的協會或選擇微型企業財政制度（特許經營中的銷售稅）並繳納特許經營銷售稅而無需任何銷售稅申報的公司、組織或自由職業。 此選擇將在發票上顯示參考「不適用的銷售稅 - CGI 的 art-293B」。
-VATType=稅務類型
+VATType=稅收用途
 ##### Local Taxes #####
 TypeOfSaleTaxes=銷售稅類型
 LTRate=速度
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=根據稅收設定（請參閱 %s - %s - %s），您
 LabelUsedByDefault=如果找不到代碼的翻譯，則默認使用標籤
 LabelOnDocuments=文件上的標籤
 LabelOrTranslationKey=標籤或翻譯鍵
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=找到翻譯
 TheTranslationIsSearchedFromKey=從翻譯鍵搜尋翻譯：<b>%s</b>
 TranslationKey=翻譯鍵
@@ -1431,7 +1434,7 @@ AddVatInList=在下拉列表中顯示客戶/供應商的增值稅號碼。
 AddAdressInList=將客戶/供應商地址顯示到組合清單中。<br>第三人將以「The Big Company corp. - 21 Jump street 123456 Big Town - USA」的名稱格式出現，而不是「The Big Company corp」。
 AddEmailPhoneTownInContactList=將聯絡人電子郵件（或電話，如果未定義）和城鎮顯示到組合清單中。<br>聯絡人的姓名格式將顯示為“Dupond Durand - dupond.durand@example.com - Paris”或“Dupond Durand - 06 07 59 65 66 - Paris”，而不是“Dupond Durand”。
 AskForPreferredShippingMethod=詢問第三方的首選運輸方式。
-FieldEdition=字段版本 %s
+FieldEdition=修改%s欗位
 FillThisOnlyIfRequired=示例：+2（僅在遇到時區偏移問題時填寫）
 GetBarCode=獲取條形碼
 NumberingModules=編號模型
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=強制發票日期為驗證日期
 SuggestedPaymentModesIfNotDefinedInInvoice=如果發票上未定義，則默認發票上建議的付款方式
 SuggestPaymentByRIBOnAccount=建議通過賬戶提現付款
 SuggestPaymentByChequeToAddress=建議通過支票付款至
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=發票上的自由文本
 WatermarkOnDraftInvoices=草稿發票上有水印（如果為空則無水印）
 PaymentsNumberingModule=付款編號模型
@@ -1718,6 +1723,7 @@ CompressionOfResources=HTTP 響應的壓縮
 CompressionOfResourcesDesc=例如，使用 Apache 指令 "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=當前的瀏覽器無法實現這種自動檢測
 DefaultValuesDesc=在此您可以定義創建新記錄時希望使用的默認值，和/或列出記錄時的默認過濾器或排序順序。
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=默認值（在表單上使用）
 DefaultSearchFilters=默認搜索篩選器
 DefaultSortOrder=默認排序順序
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=發送編號模塊
 SendingsAbility=支持客戶交貨的裝運單
 NoNeedForDeliveryReceipts=在大多數情況下，發貨單既用作客戶交貨單（要發送的產品列表），也用作客戶接收和簽名的單。因此，產品交貨收據是一個重複的功能，並且很少被激活。
 FreeLegalTextOnShippings=關於發貨的免費文字
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=產品交貨收據編號模塊
 DeliveryOrderModel=產品交貨收據模型
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=交貨收據上的免費文字
 ##### FCKeditor #####
 AdvancedEditor=高級編輯器
 ActivateFCKeditor=激活高級編輯器：
-FCKeditorForNotePublic=元件「公共備註」字段的 WYSIWYG 創建/編輯
-FCKeditorForNotePrivate=部件「私人筆記」欄位的所見即所得創建/編輯
-FCKeditorForCompany=元素欄位描述的所見即所得創建/編輯（產品/服務除外）
-FCKeditorForProductDetails=所見即所得，直接可視資料 " WYSIWYG " 方式創建/編輯產品描述或對象的行（報價單、訂單、發票等的行....）。
+FCKeditorForNotePublic=所見即所得創建/修改元素的“公共註釋”字段
+FCKeditorForNotePrivate=所見即所得創建/修改元素的“私人註釋”字段
+FCKeditorForCompany=所見即所得創建/修改元素的欄位描述（產品/服務除外）
+FCKeditorForProductDetails=所見即所得創建/修改產品描述或物件行（提案行、訂單、發票等）。
 FCKeditorForProductDetails2=警告：此情況下嚴重不建議使用此選項，因為它可能在生成 PDF 文件時造成特殊字符和頁面格式的問題。
-FCKeditorForMailing= WYSIWYG 創建/編輯群發電子郵件（工具->電子郵件）
-FCKeditorForUserSignature=用戶簽名的所見即所得創建/編輯
-FCKeditorForMail=WYSIWYG 創建/編輯所有郵件（不包括工具->電子郵件）
-FCKeditorForTicket=工單的 WYSIWYG 創建/編輯
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=所見即所得創建/修改用戶簽名
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=所見即所得創建/修改門票
 ##### Stock #####
 StockSetup=庫存模塊設置
 IfYouUsePointOfSaleCheckModule=如果您使用預設提供的銷售點模組 (POS) 或外部模組，則您的 POS 模組可能會忽略此設定。大多數 POS 模組預設設計為立即建立發票並減少庫存，無論此處的選項為何。因此，如果您在透過 POS 註冊銷售時需要或不需要減少庫存，請同時檢查您的 POS 模組設定。
@@ -1867,7 +1874,6 @@ Buy=買
 Sell=賣
 InvoiceDateUsed=發票使用日期
 YourCompanyDoesNotUseVAT=您的公司已被定義為不使用增值稅（主頁 - 設置 - 公司/組織），因此沒有可供設置的增值稅選項。
-AccountancyCode=會計準則
 AccountancyCodeSell=銷售賬戶。代碼
 AccountancyCodeBuy=購買帳戶。代碼
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=當創建新稅時，默認情況下保持“自動創建付款”複選框為空
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = 選擇選單議程時默認要打開哪個視圖
 AGENDA_EVENT_PAST_COLOR = 過去事件顏色
 AGENDA_EVENT_CURRENT_COLOR = 當前事件顏色
 AGENDA_EVENT_FUTURE_COLOR = 未來事件顏色
-AGENDA_REMINDER_BROWSER = 啟用事件提醒<b>在使用者的瀏覽器上</b>（到達提醒日期時，瀏覽器會顯示一個彈出視窗。每個使用者都可以從其瀏覽器通知設定中停用此類通知）。
+AGENDA_REMINDER_BROWSER = 允許事件提醒<b>允許事件提醒</b>
+AGENDA_REMINDER_BROWSERHelp = 當到達提醒日期時，瀏覽器會顯示一個彈出視窗）。提醒選項/延遲由使用者在建立事件時定義。
 AGENDA_REMINDER_BROWSER_SOUND = 啟用聲音通知
-AGENDA_REMINDER_EMAIL = 啟用事件提醒<b>透過電子郵件</b>（可以在每個事件上定義提醒選項/延遲）。
+AGENDA_REMINDER_EMAIL = 允許事件提醒<b>透過電子郵件</b>
 AGENDA_REMINDER_EMAIL_NOTE = 注意：排程作業 %s 的頻率必須足以確保在正確的時間發送提醒。
 AGENDA_SHOW_LINKED_OBJECT = 在日程視圖中顯示關聯對象
 AGENDA_USE_EVENT_TYPE = 使用事件類型（在選單設置 -> 詞典 -> 議程事件類型中管理）
 AGENDA_USE_EVENT_TYPE_DEFAULT = 在事件創建表單中自動設定此事件類型的默認值
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = 授權導出連接的密鑰
 PastDelayVCalExport=請勿導出早於
 SecurityKey = 安全密鑰
@@ -2006,7 +2017,7 @@ BackupZipWizard=文件目錄歸檔向導
 SomethingMakeInstallFromWebNotPossible=由於以下原因，無法從網絡界面安裝外部模組：
 SomethingMakeInstallFromWebNotPossible2=因此，此處描述的升級過程是只有特權使用者才能執行的手動過程。
 InstallModuleFromWebHasBeenDisabledContactUs=出於安全考量，目前已鎖定應用程式中的外部模組或動態網站的安裝或開發。如果您需要啟用此功能，請聯絡我們。
-InstallModuleFromWebHasBeenDisabledByFile=您的管理員已禁止從應用程式安裝外部模組。您必須要求他刪除檔案 <strong>%s</strong> 才能允許此功能。
+InstallModuleFromWebHasBeenDisabledByFile=您的管理員已停用從應用程式安裝外部模組以及使用允許在伺服器上執行程式碼的功能。您必須要求他刪除該檔案<strong>%s</strong>才能允許此功能。
 ConfFileMustContainCustom=從應用程式安裝或建置外部模組需要將模組檔案儲存到目錄<strong>%s</strong>中。要讓 Dolibarr 處理此目錄，您必須設定 <strong>conf/conf.php</strong> 以新增 2 行指令：<br><strong>$dolibarr_main_url_root_alt='/custom';</strong>\n<br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=當滑鼠移過時突出顯示表格行
 HighlightLinesColor=滑鼠移過時表格行的突出顯示顏色（不突出顯示使用 'ffffff'）
@@ -2036,6 +2047,7 @@ Enter0or1=輸入0或1
 EnterYesOrNo=輸入是或否
 UnicodeCurrency=在大括號之間輸入代表貨幣符號的位元組數清單。例如：對於 $，輸入 [36] - 對於巴西雷亞爾 R$ [82,36] - 對於 €，輸入 [8364]
 ColorFormat=RGB顏色為HEX格式，例如：FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=圖示名稱格式：<br>- image.png 為圖片檔案放入目前主題目錄<br>- image.png@module 如果檔案位於模組的目錄 /img/ 中<br>- fa-xxx 的 FontAwesome fa-xxx 圖片<br>- FontAwesome fa-xxx 圖片的 fontawesome_xxx_fa_color_size （帶有前綴、顏色和尺寸集）
 PositionIntoComboList=在下拉列表中的行位置
 SellTaxRate=銷售稅率
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=在採購訂單中
 MAIN_PDF_NO_SENDER_FRAME=隱藏發件人地址框的邊框
 MAIN_PDF_NO_RECIPENT_FRAME=隱藏收件人地址框的邊框
 MAIN_PDF_HIDE_CUSTOMER_CODE=隱藏客戶代碼
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=隱藏地址塊中的 發件人 / 公司名稱
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=隱藏付款條件
 PROPOSAL_PDF_HIDE_PAYMENTMODE=隱藏付款方式
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=在簽名區域中新增隱藏標記，以允許電子簽名工具重複使用它。可能由外部工具使用，或將來由線上簽名功能使用。
@@ -2146,7 +2163,7 @@ COMPANY_DIGITARIA_CLEAN_REGEX=用於清理值的正則表達式過濾器（COMPA
 DuplicateForbidden=禁止重複
 RemoveSpecialWords=在為客戶或供應商生成子賬戶時清除某些字詞
 RemoveSpecialWordsHelp=指定在計算客戶或供應商賬戶之前要清除的字詞。每個字詞之間使用“;”。
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact, ...)
+GDPRContact=資料保護官（DPO、資料隱私或 GDPR 聯絡人，...）
 GDPRContactDesc=如果您將個人資料儲存在資訊系統中，您可以在此指定負責一般資料保護規範的聯絡人
 HelpOnTooltip=工具提示顯示的說明文字
 HelpOnTooltipDesc=在此處放入文字或翻譯鍵，以便在此字段出現在表單中時在工具提示中顯示文字。
@@ -2289,7 +2306,7 @@ THIRDPARTY_ALIAS=第三方名稱 - 第三方別名
 ALIAS_THIRDPARTY=第三方別名 - 第三方名稱
 PDFIn2Languages=以 2 種不同語言顯示 PDF 中的標籤（此功能可能不適用於某些語言）
 PDF_USE_ALSO_LANGUAGE_CODE=如果您希望在同一個生成的PDF 中以2 種不同的語言複製PDF 中的某些文本，則必須在此處設定第二種語言，以便生成的PDF 將在同一頁面中包含2 種不同的語言，即生成PDF 時選擇的語言和該語言 (只有少數 PDF 模板支援此功能）。對於每個 PDF 的 1 種語言，請保留為空白。
-PDF_USE_A=PDF documents format
+PDF_USE_A=PDF文件格式
 FafaIconSocialNetworksDesc=在此輸入 FontAwesome 圖標的代碼。如果您不知道 FontAwesome 是什麼，可以使用通用值 fa-address-book。
 RssNote=注意：每個 RSS 來源定義都提供一個小部件，您必須啟用該小部件才能在儀表板中使用它
 JumpToBoxes=跳至設置 -> 小工具
@@ -2324,6 +2341,8 @@ NotRecommended=不推薦
 ARestrictedPath=一些數據文件的受限制路徑
 CheckForModuleUpdate=檢查外部模組更新
 CheckForModuleUpdateHelp=此操作將連接到外部模組的編輯器進行更新檢查。
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=有可用更新
 NoExternalModuleWithUpdate=未找到外部模組的更新
 SwaggerDescriptionFile=Swagger API 描述文件（例如，用於 redoc）
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=顯示送貨地址
 INVOICE_SHOW_SHIPPING_ADDRESSMore=在某些國家（如法國）為強制性指示
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=在提案上顯示帳單聯絡人
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=默認情況下，僅顯示聯絡人在帳單上
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=社交網絡的 URL 連結。使用 {socialid} 作為包含社交網絡 ID 的變量部分。
 IfThisCategoryIsChildOfAnother=如果此分類是另一分類的子類
 DarkThemeMode=暗黑模式
@@ -2450,7 +2471,7 @@ WarningModuleHasChangedLastVersionCheckParameter=警告：模組 %s 已設定一
 WarningModuleHasChangedSecurityCsrfParameter=警告：模組 %s 已停用您執行個體的 CSRF 安全。此操作是可疑的，您的安裝可能不再受到保護。請聯絡該模組的作者以獲取解釋。
 EMailsInGoingDesc=傳入電子郵件由模組 %s 管理。如果您需要支援傳入電子郵件，則必須啟用並設定它。
 MAIN_IMAP_USE_PHPIMAP=使用 IMAP 的 PHP-IMAP 庫而不是本機 PHP IMAP。這也允許使用 IMAP 的 OAuth2 連線（也必須啟動模組 OAuth）。
-MAIN_CHECKBOX_LEFT_COLUMN=在左側顯示欄位和行選擇列（默認在右側）
+MAIN_CHECKBOX_LEFT_COLUMN=在左側顯示欄位和行選擇的列（右側已停用）
 NotAvailableByDefaultEnabledOnModuleActivation=默認情況下不創建。僅在模組啟用時創建。
 CSSPage=CSS 樣式
 Defaultfortype=默認
@@ -2489,7 +2510,7 @@ AiDescription=AI（人工智能）功能
 AiDescriptionLong=在應用程式的不同部分提供AI（人工智能）功能。需要外部AI API。
 AI_API_KEY=AI API的密鑰
 AI_API_URL=人工智慧 API 的端點網址
-AI_API_SERVICE=用於人工智慧功能的服務
+AI_API_SERVICE=AI service to use
 AiSetup=人工智慧模組設置
 AiCustomPrompt=AI自定義提示
 AI_CONFIGURATIONS_PROMPT=自定義提示
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=功能的AI自定義提示
 EnterAnIP=輸入 IP 地址
 ConvertInto=轉換成
 YouAreHere=您在這裡
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=在運輸 PDF 文件上顯示條碼
 BARCODE_ON_RECEPTION_PDF=在接收 PDF 文件上顯示條碼
 BARCODE_ON_STOCKTRANSFER_PDF=在庫存轉移的 PDF 文件上顯示條碼
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr 登出 URL，以便在 Open
 MainAuthenticationOidcLoginClaimName=登入聲明
 MainAuthenticationOidcLoginClaimDesc=與 Dolibarr 用戶登入匹配的 OpenID Connect 聲明。如果未設置或為空，默認為電子郵件。
 BlackListWords=黑名單字
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=新增到黑名單
 FediverseSetup=聯邦宇宙區塊設定
 ConfigImportSocialNetwork=與聯邦宇宙相容的社交網路設定
@@ -2553,8 +2579,31 @@ MenuDict=字典
 AddMoreParams=為連線新增更多參數（cookie、令牌等）<br> 範例： token : value token
 ParamName=參數名稱
 ParamValue=參數值
-ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
+ConfirmDeleteParamOfSocialNetwork=您確定要刪除該參數嗎？
 HelpMariaDBToGetPossibleValues=您可以透過執行下列 SQL 命令來取得可能值的清單：%s
-Captcha=Captcha
-CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
-DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+HelpMariaDBToGetValue=該值是透過命令檢索的 : %s
+PDFBoxFrameRoundedCorners=圓角框架
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
+Captcha=驗證碼
+CaptchaDesc=如果您想使用驗證碼保護您的登入頁面，您可以在此處選擇使用哪一個
+DolibarrStandardCaptcha=Dolibarr 產生的本機驗證碼
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=顯示送貨地址
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=在某些國家（如法國）為強制性指示
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/zh_HK/banks.lang b/htdocs/langs/zh_HK/banks.lang
index 960aff69cab..f3a95b85255 100644
--- a/htdocs/langs/zh_HK/banks.lang
+++ b/htdocs/langs/zh_HK/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=期末結餘
 CurrentBalance=當前結餘
 FutureBalance=未來結餘
 ShowAllTimeBalance=顯示開始結餘
-AllTime=從開始
 Reconciliation=對賬
 RIB=銀行帳號
 IBAN=IBAN號碼
@@ -133,7 +132,7 @@ DeleteTransaction=刪除記項
 ConfirmDeleteTransaction=您確定要刪除此記項嗎？
 ThisWillAlsoDeleteBankRecord=這也將刪除生成的銀行記項
 BankMovements=變動
-PlannedTransactions=已計劃分錄
+PlannedTransactions=Upcoming entries
 Graph=圖表
 ExportDataset_banque_1=銀行分錄和賬戶對賬單
 ExportDataset_banque_2=存款單
@@ -151,7 +150,7 @@ FutureTransaction=未來的交易。無法調和。
 SelectChequeTransactionAndGenerate=選擇 / 過濾 要包含在支票存款收據中的支票。然後，單擊“創建”。
 SelectPaymentTransactionAndGenerate=選擇 / 過濾 要包括在 %s 存款收據中的文件。然後，點擊 "創建"。
 InputReceiptNumber=選擇與調解相關的銀行對賬單。使用可排序的數值
-InputReceiptNumberBis=年月"YYYYMM" 或 年月日"YYYYMMDD"
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=可選，對操作進行類別分類
 ToConciliate=對賬？
 ThenCheckLinesAndConciliate=然後，檢查銀行對賬單中的行列並單擊
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=如果啟用了此功能，您可以為借方或貸方
 BankColorizeMovementName1=借方變動的背景顏色
 BankColorizeMovementName2=貸方變動的背景顏色
 IfYouDontReconcileDisableProperty=如果您不對某些銀行帳戶進行對賬，請停用其上的 " %s" 屬性以消除此警告
-NoBankAccountDefined=未定義銀行帳戶
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=銀行帳戶中未找到記錄。通常，這發生在手動從銀行帳戶的交易列表中刪除記錄時（例如在進行銀行帳戶對賬期間）。另一個原因是付款是在模塊 "%s" 被停用時記錄的。
 AlreadyOneBankAccount=已定義一個銀行帳戶
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA 文件不同
diff --git a/htdocs/langs/zh_HK/blockedlog.lang b/htdocs/langs/zh_HK/blockedlog.lang
index 7fee274c902..91205e8fffe 100644
--- a/htdocs/langs/zh_HK/blockedlog.lang
+++ b/htdocs/langs/zh_HK/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=不可更改的日誌
 ShowAllFingerPrintsMightBeTooLong=顯示所有歸檔的日誌（可能很長）
 ShowAllFingerPrintsErrorsMightBeTooLong=顯示所有未通過驗證的存檔日誌（可能會很長）
 DownloadBlockChain=下載指紋
-KoCheckFingerprintValidity=存檔的日誌條目無效。這意味著有人（駭客？）在記錄後修改了的某些數據，或者刪除了先前的存檔記錄（檢查帶有先前 # 的行是否存在）或修改了先前記錄的校驗和。
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=存檔日誌記錄有效。該行上的數據未被修改且條目緊接前一個。
 OkCheckFingerprintValidityButChainIsKo=與先前的相比，存檔日誌似乎有效，但先前的鏈已損壞。
 AddedByAuthority=遠端權限已經儲存
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=日誌詳情
 ListOfTrackedEvents=追蹤事件列表
 Fingerprint=指紋
 DownloadLogCSV=導出已存檔的日誌 (CSV)
-DataOfArchivedEvent=已存檔活動的完整數據
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=原始對象（類型%s, ID%s）未連接（請參見“完整數據”列以獲取未經更改保存的數據）
 BlockedLogAreRequiredByYourCountryLegislation=根據你所在國家的法律，可能需要使用不可更改日誌模塊。禁用此模塊可能會使未來的交易在法律和合法軟件使用方面無效，因為它們無法通過稅務審計驗證。
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=在根據貴國法規啟用不可更改日誌模組。禁用此模組可能會導致未來的交易在法律和合法軟件使用方面無效，因為它們無法通過稅務審計進行驗證。
@@ -30,6 +32,7 @@ BlockedLogEnabled=已進入不可更改日誌的系統，啟動追蹤"事件"
 BlockedLogDisabled=完成一些記錄後，系統已被禁止在"事件" 的 "不可更改日誌" 追蹤。我們保存了一個特殊的指紋來追蹤鏈條是否損壞。
 BlockedLogDisabledBis=追蹤事件至不可更改日誌的系統已被禁用。這是因為尚未記錄任何數據。
 LinkHasBeenDisabledForPerformancePurpose=為了性能考量，文件的直接連接在第100行之後不顯示。
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=客戶發票已合理地刪除
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=客戶付款合理地刪除
 logPAYMENT_VARIOUS_CREATE=付款（未分配到發票）已經創建
 logPAYMENT_VARIOUS_DELETE=付款（未分配至發票）已合理刪除
 logPAYMENT_VARIOUS_MODIFY=付款（未分配到發票）已經修改
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/zh_HK/categories.lang b/htdocs/langs/zh_HK/categories.lang
index 72f6b8e5971..396426ece79 100644
--- a/htdocs/langs/zh_HK/categories.lang
+++ b/htdocs/langs/zh_HK/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=聯絡人 標式 / 類別 區域
 AccountsCategoriesArea=銀行賬戶 標式 / 類別 區域
 ProjectsCategoriesArea=項目 標式 / 類別 區域
 UsersCategoriesArea=用戶 標式 / 類別 區域
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=子類別
 CatList=標式 / 類別 列表
 CatListAll=標式 / 類別 列表（所有類型）
@@ -90,9 +91,10 @@ CategoriesSetup= 標式 / 類別 設置
 CategorieRecursiv=自動與父 標式 / 類別 連接
 CategorieRecursivHelp=如果啟用該選項，當您將對象添加到子類別中時，該對像也會添加到父類別中。
 AddProductServiceIntoCategory=分配類別給 產品 / 服務
-AddCustomerIntoCategory=分配類別給客戶
-AddSupplierIntoCategory=分配類別給供應商
-AssignCategoryTo=分配類別給
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=顯示 標式 / 類別
 ByDefaultInList=列表中默認
 ChooseCategory=選擇類別
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=頁面 - 容器類別
 KnowledgemanagementsCategoriesArea=知識管理文章類別
 UseOrOperatorForCategories=對類別使用‘或’操作
 AddObjectIntoCategory=分配到類別
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/zh_HK/companies.lang b/htdocs/langs/zh_HK/companies.lang
index 374bf11b181..9f3871cbc49 100644
--- a/htdocs/langs/zh_HK/companies.lang
+++ b/htdocs/langs/zh_HK/companies.lang
@@ -33,7 +33,7 @@ CountryIsInEEC=國家屬於歐洲經濟共同體
 PriceFormatInCurrentLanguage=目前語言和貨幣的價格顯示格式
 ThirdPartyName=第三方名稱
 ThirdPartyEmail=第三方電子郵件
-ThirdParty=第三者
+ThirdParty=Third party
 ThirdParties=第三方
 ThirdPartyProspects=潛在客戶
 ThirdPartyProspectsStats=潛在客戶
@@ -65,6 +65,7 @@ State=州/省
 StateId=州 ID
 StateCode=州/省代碼
 StateShort=州
+DepartmentBuyer=Buyer's state/province
 Region=地區
 Region-State=地區 - 州
 Country=國家
@@ -78,7 +79,7 @@ Chat=聊天
 PhonePro=商業電話
 PhonePerso=個人電話
 PhoneMobile=手提電話
-No_Email=拒絕大量電子郵件
+No_Email=Refuse mass emails
 Fax=傳真
 Zip=郵政編碼
 Town=城市
@@ -382,12 +383,12 @@ ExportCardToFormat=將卡導出為格式
 ContactNotLinkedToCompany=聯絡方式未連接至任何第三方
 DolibarrLogin=Dolibarr 登入
 NoDolibarrAccess=沒有 Dolibarr 訪問權限
-ExportDataset_company_1=第三方（公司/基金會/自然人）及其財產
-ExportDataset_company_2=聯絡人及其屬性
-ExportDataset_company_3=第三方銀行帳戶
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=第三方附加聯絡人/地址和屬性
+ExportDataset_company_3=第三方支付方式（銀行帳戶）
 ImportDataset_company_1=第三方及其財產
 ImportDataset_company_2=第三方附加聯絡人/地址和屬性
-ImportDataset_company_3=第三方銀行賬戶
+ImportDataset_company_3=第三方支付方式（銀行帳戶）
 ImportDataset_company_4=第三方銷售代表（將銷售代表/使用者指派給公司）
 PriceLevel=價格水平
 PriceLevelLabels=價格級別標籤
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=無驗證的免費代碼。
 ManagingDirectors=經理(或多個經理) 姓名 (首席執行官、董事、總裁...)
 MergeOriginThirdparty=重複的第三方（您想要刪除的第三方）
 MergeThirdparties=合併第三方
-ConfirmMergeThirdparties=您確定要將選定的第三方與當前的合併嗎？所有連結的對象（發票、訂單等）將移動到當前第三方，然後選定的第三方將被刪除。
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=第三方已合併
 SaleRepresentativeLogin=銷售代表登錄
 SaleRepresentativeFirstname=銷售代表的名字
@@ -461,3 +462,6 @@ ExternalSystemID=外部系統 ID
 IDOfPaymentInAnExternalSystem=付款模式的識別碼插入外部系統（例如 Stripe, Paypal, ...）
 AADEWebserviceCredentials=AADE 網絡服務憑證
 ThirdPartyMustBeACustomerToCreateBANOnStripe=第三方必須是客戶才能在Stripe端創建其銀行信息
+NewSocNameForClone=新公司名稱
+ConfirmCloneThirdparties=您確定要複製<b>%s</b>公司嗎？
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/zh_HK/compta.lang b/htdocs/langs/zh_HK/compta.lang
index 2c96dc58cf2..e940233e861 100644
--- a/htdocs/langs/zh_HK/compta.lang
+++ b/htdocs/langs/zh_HK/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=客戶發票付款
 PaymentSupplierInvoice=供應商發票付款
 PaymentSocialContribution= 社會 / 財政 稅繳納
 PaymentVat=增值稅繳納
-AutomaticCreationPayment=自動記錄付款
+AutomaticCreationPayment=Also record the payment
 ListPayment=付款清單
 ListOfCustomerPayments=客戶付款清單
 ListOfSupplierPayments=供應商付款列表
@@ -118,10 +118,14 @@ SocialContributionsPayments=社會 / 財政 稅支付
 ShowVatPayment=顯示增值稅支付
 TotalToPay=總共支付
 BalanceVisibilityDependsOnSortAndFilters=僅當表格按 %s 排序並按 1 個銀行帳戶過濾（無其他過濾器）時，結存在此列表中可見
+CustomerAccountancyCodeGeneral=通用會計代碼
 CustomerAccountancyCode=客戶會計代碼
+SupplierAccountancyCodeGeneral=通用會計代碼
 SupplierAccountancyCode=供應商會計代碼
+UserAccountancyCodeGeneral=通用會計代碼
 CustomerAccountancyCodeShort=客戶會計科目代碼
 SupplierAccountancyCodeShort=供應商會計科目代碼
+UserAccountancyCodeShort=User account. code
 AccountNumber=帳號
 NewAccountingAccount=新帳戶
 Turnover=已開立發票的營業額
@@ -129,7 +133,9 @@ TurnoverCollected=已收營業額
 SalesTurnoverMinimum=最低營業額
 ByExpenseIncome=按支出和收入
 ByThirdParties=由第三方
+ByProjects=By projects
 ByUserAuthorOfInvoice=按發票作者
+DetailedListLowercase=detailed list
 CheckReceipt=存款單
 CheckReceiptShort=存款單
 LastCheckReceiptShort=最近的 %s 張存款單
diff --git a/htdocs/langs/zh_HK/datapolicy.lang b/htdocs/langs/zh_HK/datapolicy.lang
index 1247096ca6d..d6340e89ec2 100644
--- a/htdocs/langs/zh_HK/datapolicy.lang
+++ b/htdocs/langs/zh_HK/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = 資料隱私政策
 Module4100Desc = 數據隱私管理的模塊（符合GDPR）
 # Administration page
 datapolicySetup = 模組數據隱私政策設置
-Deletion = 刪除資料
-datapolicySetupPage = 取決於您所在國家/地區的法律（例<a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">GDPR 第 5 條</a>），個人資料的保存期限不得超過收集資料的目的所需的期限，存檔目的除外。<br>在沒有事件發生的一段時間內（您將在下面指定的持續時間），刪除將自動完成。
+DataDeletion=刪除資料
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s 月份
 ONE_YEAR = 1 年
 NB_YEARS = %s 年
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = 潛在客戶 / 客戶
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = 非潛在客戶 / 非顧客
 DATAPOLICY_CONTACT_FOURNISSEUR = 供應商
 DATAPOLICY_ADHERENT = 會員
-DATAPOLICY_Tooltip_SETUP=定義沒有互動的延遲，在此之後您希望自動清除記錄。
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = 您可以向所有相關聯絡人（尚未收到電子郵件且您尚未為其註冊任何有關 GDPR 協議的聯絡人）發送 GDPR 電子郵件。為此，請使用以下按鈕。
 SendAgreement = 發電郵
 AllAgreementSend = 所有電郵已經發送
 TXTLINKDATAPOLICYACCEPT = 連結「同意」的文本
 TXTLINKDATAPOLICYREFUSE = 連結「不同意」的文本
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR：個人資料處理
 DATAPOLICY_consentement = 已獲得同意處理其個人資料
diff --git a/htdocs/langs/zh_HK/errors.lang b/htdocs/langs/zh_HK/errors.lang
index b1efa339900..b811edc99ad 100644
--- a/htdocs/langs/zh_HK/errors.lang
+++ b/htdocs/langs/zh_HK/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=無法創建附件圖像文件 (數據
 ErrorFailedToCreateDir=創建目錄失敗。檢查 Web 服務器用戶是否有權寫入 Dolibarr 文檔目錄。如果參數<b> 安全模式 </b>  在此 PHP 上啟用，請檢查 Dolibarr php 文件是否屬於 Web 服務器用戶（或組）。
 ErrorNoMailDefinedForThisUser=沒有為此用戶定義郵件
 ErrorSetupOfEmailsNotComplete=電子郵件設置尚未完成
+ErrorAccountingClosureSetupNotComplete=關閉帳戶設定未完成
 ErrorFeatureNeedJavascript=此功能需要啟動 JavaScript 才能運作。在設定 - 顯示中變更此設定。
 ErrorTopMenuMustHaveAParentWithId0=“頂部”類型的選單不能有父選單。將 0 放入父選單中或選擇“左”類型的選單。
 ErrorLeftMenuMustHaveAParentId=“Left”類型的選單必須有一個父 ID。
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=上傳被 PHP/Apache 插件阻止。
 ErrorFileSizeTooLarge=文件大小太大或未提供文件。
 ErrorFieldTooLong=字段 %s 太長。
 ErrorSizeTooLongForIntType=對於 int 類型來說，大小太長 ( %s 最大位數）
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=對於字符串類型來說大小太長 (%s 最大字符數）
 ErrorNoValueForSelectType=請填寫選擇列表的值
 ErrorNoValueForCheckBoxType=請填寫複選框列表的值
@@ -138,8 +140,9 @@ ErrorBadValueForCode=安全代碼的價值不佳。使用新值重試...
 ErrorBothFieldCantBeNegative=字段 %s 和 %s 不能同時為負數
 ErrorFieldCantBeNegativeOnInvoice=此類發票上的欄位 <strong>%s</strong> 不能為負。如果您需要新增折扣行，只需先建立折扣（從第三方卡中的欄位 '%s'）並將其應用於發票。
 ErrorLinesCantBeNegativeForOneVATRate=對於給定的非空加值稅率，行總數（扣除稅額）不能為負（發現增值稅稅率 <b>%s</b>%% 的總行數為負數）。
-ErrorLinesCantBeNegativeOnDeposits=存款額度不能為負數。如果您這樣做，當您需要扣除最終發票中的按金時，您將遇到問題。
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=客戶發票中行的數量不能為負數
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=用戶帳戶 <b>%s</b> 用於執行 Web 服務器沒有權限
 ErrorNoActivatedBarcode=未激活條形碼類型
 ErrUnzipFails=無法使用 ZipArchive 解壓縮 %s
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=結束日期字段不能為空
 ErrorStartHourIsNull=開始日期字段不能為空
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=需要處理的行太多。請使用更具選擇性的過濾器。
 ErrorEmptyValueForQty=數量不能為零。
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=您的 PHP 參數 upload_max_filesize (%s) 高於 PHP 參數 post_max_size (%s)。這不是一個一致的設定。
 WarningPasswordSetWithNoAccount=已為此成員設定密碼。但是，沒有建立使用者帳戶。因此該密碼被儲存但不能用於登入 Dolibarr。它可以由外部模組/介面使用，但如果您不需要為成員定義任何登入名稱或密碼，您可以從成員模組設定中停用「管理每個成員的登入」選項。如果您需要管理登入但不需要任何密碼，則可以將此欄位保留為空以避免此警告。注意：如果會員連結到用戶，電子郵件也可以用作登入名稱。
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=此父級 ID 不再存在
 WarningReadBankAlsoAllowedIfUserHasPermission=警告：擁有「管理會計科目表」權限的用户也可以读取銀行帳戶信息
 WarningNoDataTransferedInAccountancyYet=請注意，會計表中沒有數據。請將您在應用程式中記錄的資料轉移到會計部分或更改計算模式以分析會計以外記錄的資料。
 WarningChangingThisMayBreakStopTaskScheduler=警告：更改此值可能會停用排程程序
+WarningAmountOfFileDiffersFromSumOfLines=警告，文件數量 (%s) 與行總和(%s)不同
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR 發票只能添加到設定為以銀行轉帳付款的發票上。
 SwissQrCreditorAddressInvalid = 債權人地址無效（是否已設定郵遞區號和城市？(%s)
 SwissQrCreditorInformationInvalid = 債權人資訊對 IBAN (%s) 無效：%s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s 已被定義為此類型的聯絡
 ErrorThisGroupIsAlreadyDefinedAsThisType=該群組的聯絡人已定義為該類型的聯絡人。
 EmptyMessageNotAllowedError=不允許空白訊息
 ErrorIsNotInError= %s 沒有錯誤
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/zh_HK/exports.lang b/htdocs/langs/zh_HK/exports.lang
index 5f137af63d8..5dc45ad0317 100644
--- a/htdocs/langs/zh_HK/exports.lang
+++ b/htdocs/langs/zh_HK/exports.lang
@@ -82,8 +82,8 @@ NowClickToTestTheImport=檢查文件的文件格式（字段和字符串分隔
 RunSimulateImportFile=運行導入模擬
 FieldNeedSource=該字段需要源文件中的數據
 SomeMandatoryFieldHaveNoSource=某些必填字段沒有來自數據文件的來源
-InformationOnSourceFile=源文件信息
-InformationOnTargetTables=目標字段信息
+InformationOnSourceFile=Source file
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=切換要導出的字段列中的至少一個源字段
 SelectFormat=選擇此導入文件格式
 RunImportFile=導入數據
diff --git a/htdocs/langs/zh_HK/hrm.lang b/htdocs/langs/zh_HK/hrm.lang
index f4175073a77..23af41f2653 100644
--- a/htdocs/langs/zh_HK/hrm.lang
+++ b/htdocs/langs/zh_HK/hrm.lang
@@ -46,11 +46,11 @@ NewEval=新增能力評估
 ValidateEvaluation=確認能力評估
 ConfirmValidateEvaluation=您確定要使用參考編號 <b>%s</b> 確認此能力評估嗎？
 EvaluationCard=能力評估
-RequiredRank=職位說明所需的級別
-RequiredRankShort=所需級別
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=具有此職位簡介的職位
-EmployeeRank=此技能的員工等級
-EmployeeRankShort=員工職級
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=員工職位
 EmployeePositions=員工職位列表
 EmployeesInThisPosition=擔任此職位的員工
@@ -98,3 +98,5 @@ NeedBusinessTravels=需要出差
 NoDescription=沒有描述
 TheJobProfileHasNoSkillsDefinedFixBefore=此員工的評估職位描述未定義任何技能。請添加技能 (或多項技能) 然後刪除並重新開始評估。
 PDFStandardHrmEvaluation=生成能力評估 PDF 文件的標準範本
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/zh_HK/mails.lang b/htdocs/langs/zh_HK/mails.lang
index 6db20235db5..22cd87fafe1 100644
--- a/htdocs/langs/zh_HK/mails.lang
+++ b/htdocs/langs/zh_HK/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=電子郵件
 EMailing=電子郵件
-EMailings=電子郵件
+EMailings=Mass EMails
 SMSings=短信群發
-AllEMailings=所有電子郵件
+AllEMailings=All mass eMails
 MailCard=電子郵件卡
 MailRecipients=收件人
 MailRecipient=接受者
@@ -26,19 +26,19 @@ MailFile=附加的文件
 MailMessage=電子郵件正文
 SubjectNotIn=不在主题中
 BodyNotIn=不在正文中
-ShowEMailing=顯示電子郵件
-ListOfEMailings=電子郵件列表
-NewMailing=新的電子郵件
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=新建短信群發
-EditMailing=編輯電子郵件
-ResetMailing=重新發送電子郵件
-ConfirmResetMailingTargetMassaction=確認目標狀態重置
-ResetMailingTargetMassaction=重置目標狀態
-DeleteMailing=刪除電子郵件
-PreviewMailing=預覽電子郵件發送
-CreateMailing=創建電子郵件
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=測試
-ValidMailing=有效的電子郵件地址
+ValidMailing=Valid mass Email
 MailingStatusDraft=草稿
 MailingStatusValidated=已驗證
 MailingStatusSent=發送
@@ -108,24 +108,24 @@ EmailCollectorFilterDesc=所有過濾器必須匹配才能收集電子郵件。<
 LineInFile=行 %s 在文件中
 RecipientSelectionModules=定義接收者選擇的請求
 MailSelectedRecipients=選定的收件人
-MailingArea=電子郵件區
-LastMailings=最新 %s 電子郵件
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=目標統計
 NbOfCompaniesContacts=唯一的 聯絡 / 地址
 MailNoChangePossible=無法更改已驗證電子郵件的收件人
-SearchAMailing=搜索郵件
-SendMailing=發送電子郵件
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=發送者
 AdvancedAlternative=進階替代方案
 MailingNeedCommand=可以從命令行執行發送電子郵件。請您的服務器管理員啟動以下命令以將電子郵件發送給所有收件人：
 MailingNeedCommand2=但是，您可以通過添加參數 MAILING_LIMIT_SENDBYWEB 以及您要通過會話發送的最大電子郵件數的值來在線發送它們。為此，請繼續“主頁”-“設置”-“其他”。
 ConfirmSendingEmailing=如果您想直接從此屏幕發送電子郵件，請確認您確定要立即從瀏覽器發送電子郵件嗎？
-LimitSendingEmailing=注意：出於安全和超時原因，從網絡界面發送電子郵件會分幾次進行，<b> %s </b>  每個發送會話一次的收件人。
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=清除列表
 ToClearAllRecipientsClickHere=單擊此處清除此電子郵件的收件人列表
 ToAddRecipientsChooseHere=通過從列表中選擇來添加收件人
-NbOfEMailingsReceived=收到大量電子郵件
-NbOfEMailingsSend=已發送大量電子郵件
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID 記錄
 DeliveryReceipt=投遞確認。
 YouCanUseCommaSeparatorForSeveralRecipients=您可以使用<b> 逗號 </b>  分隔符指定多個收件人。
@@ -142,8 +142,10 @@ NoNotificationsWillBeSent=沒有計劃為此事件類型和公司提供自動電
 ANotificationsWillBeSent=1 自動通知將通過電子郵件發送
 SomeNotificationsWillBeSent=%s 自動通知將通過電子郵件發送
 AddNewNotification=訂閱新的自動電子郵件通知（目標 / 事件）
-ListOfActiveNotifications=自動電子郵件通知的有效訂閱（目標 / 活動）
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=自動發送電子郵件通知
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=電子郵件發送配置已設定為“%s”。此模式不能用於傳送群發電子郵件。
 MailSendSetupIs2=您必須先使用管理員帳戶進入選單 %sHome - 設定 - 電子郵件%s 將參數<strong>'%s'</strong>變更為使用模式「%s」。在此模式下，您可以進入網際網路服務供應商提供的 SMTP 伺服器設定並使用群發電子郵件功能。
 MailSendSetupIs3=如果您對如何設定 SMTP 伺服器有任何疑問，可以向 %s 詢問。
@@ -183,7 +185,7 @@ Information=信息
 ContactsWithThirdpartyFilter=使用第三方過濾器的聯絡人
 Unanswered=未回覆
 Answered=已回覆
-IsNotAnAnswer=不是回覆 (初始郵件)
+IsNotAnAnswer=未回覆（是初始電子郵件）
 IsAnAnswer=是初始郵件的回覆
 RecordCreatedByEmailCollector=電子郵件收集器 %s 建立的記錄
 DefaultBlacklistMailingStatus=建立新聯絡人時欄位「%s」的預設值
@@ -199,6 +201,6 @@ ModelTemplate=電子郵件範本
 YouCanChooseAModelForYouMailContent= 您可以選擇一種模板模型或使用 AI 產生一個
 TitleOfMailHolder=電子郵件標題在此處填寫
 ContentOfMailHolder=電子郵件內容在此處填寫...
-LastNews=最新消息
+LastNews=Latest News
 ListProducts= 產品清單
 PasswordReset=密碼重設
diff --git a/htdocs/langs/zh_HK/main.lang b/htdocs/langs/zh_HK/main.lang
index d9ec91bfd13..7371fa5939c 100644
--- a/htdocs/langs/zh_HK/main.lang
+++ b/htdocs/langs/zh_HK/main.lang
@@ -37,6 +37,7 @@ Translation=翻譯
 Translations=翻譯
 CurrentTimeZone=PHP 時區 (伺服器)
 EmptySearchString=輸入非空的搜尋條件
+EnterNonEmptyLinesFirst=首先輸入非空白行
 EnterADateCriteria=輸入日期條件
 NoRecordFound=沒有找到記錄
 NoRecordDeleted=未刪除任何記錄
@@ -309,6 +310,7 @@ DateBuild=報告構建日期
 DatePayment=付款日期
 DateApprove=批准日期
 DateApprove2=批准日期（第二次批准）
+PendingSince=Pending since
 RegistrationDate=註冊日期
 UserCreation=創建用戶
 UserModification=更改用戶
@@ -496,7 +498,7 @@ ActionRunningNotStarted=開始
 ActionRunningShort=進行中
 ActionDoneShort=完成的
 ActionUncomplete=不完整
-LatestLinkedEvents=最新 %s 已連結事件
+LatestLinkedEvents=The last %s events
 CompanyFoundation=公司 / 組織
 Accountant=會計師
 ContactsForCompany=該第三方的聯絡方式
@@ -722,6 +724,8 @@ TextUsedInTheMessageBody=電子郵件正文
 SendAcknowledgementByMail=發送確認電子郵件
 SendMail=發送電郵
 Email=電子郵件
+EMail=電子郵件
+EMails=電子郵件
 NoEMail=沒有電子郵件
 AlreadyRead=已讀
 NotRead=未讀
@@ -794,7 +798,7 @@ Notes=備註
 AddNewLine=增加新行
 AddFile=增加文件
 FreeZone=自行添加產品
-FreeLineOfType=自由文本項，類型：
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=複製對象及其主要屬性
 ReGeneratePDF=重新生成 PDF
 PDFMerge=PDF合併
@@ -880,12 +884,14 @@ toward=往
 Access=使用權
 SelectAction=選擇操作
 SelectTargetUser=選擇目標用戶/員工
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=使用 Ctrl+C 複製到剪貼板
 SaveUploadedFileWithMask=將文件保存在服務器上，名稱為“<strong> %s </strong> ”（否則“%s”）
 OriginFileName=原始文件名
 SetDemandReason=設置來源
 SetBankAccount=定義銀行賬戶
 AccountCurrency=賬戶幣種
+AccountancyCode=Accounting Code
 ViewPrivateNote=查看備註
 XMoreLines=%s 隱藏行( 或多行 )
 ShowMoreLines=顯示 更多 / 更少 行
@@ -926,6 +932,7 @@ ConfirmMassDeletionQuestion=您確定要刪除所選的 %s 條記錄( 或多份
 ConfirmMassClone=大批複製確認
 ConfirmMassCloneQuestion=選擇要複製到的項目
 ConfirmMassCloneToOneProject=複製專案 %s
+ObjectClonedSuccessfuly=對象複製成功
 RelatedObjects=相關對象
 ClassifyBilled=歸類為已開票
 ClassifyUnbilled=歸類為未開票
@@ -962,10 +969,11 @@ PrivateDownloadLinkDesc=您需要登錄並擁有權限才能查看或下載該
 Download=下載
 DownloadDocument=下載文件
 DownloadSignedDocument=下載已簽署的文件
-ActualizeCurrency=更新匯率
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=財政年度
 ModuleBuilder=模組與應用建構器
 SetMultiCurrencyCode=設置貨幣
+SetMultiCurrencyRate=Set currency rate
 BulkActions=批量操作
 ClickToShowHelp=點擊顯示工具提示幫助
 WebSite=網站
@@ -1105,6 +1113,7 @@ PayedBy=付款方式
 PayedTo=支付給
 Monthly=每月
 Quarterly=每季
+Quarter=四分之一
 Annual=年度 
 Local=本地
 Remote=遠程
@@ -1147,6 +1156,7 @@ ContactDefault_project_task=任務
 ContactDefault_propal=報價
 ContactDefault_supplier_proposal=供應商報價
 ContactDefault_ticket=工單
+ContactDefault_societe=Third party
 ContactAddedAutomatically=從第三方聯絡角色添加的聯絡人
 More=更多
 ShowDetails=顯示詳情
@@ -1243,6 +1253,7 @@ CommercialAffected=已指派銷售代表
 CommercialsDisaffected=銷售代表已解除連結
 CommercialDisaffected=銷售代表已解除連結
 Message=訊息
+Emailing=Emailing
 Progression=進度
 YourMessage=您的消息
 YourMessageHasBeenReceived=我們已收到您的消息，我們將盡快回覆或聯絡您。
@@ -1307,3 +1318,34 @@ TranslationOfKey=關鍵字 AnyTranslationKey 的翻譯
 SignedStatus=簽署狀態
 NbRecordQualified=合格記錄的數量
 auto=自動
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=添加
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=From start
+Transferred=Transferred
diff --git a/htdocs/langs/zh_HK/members.lang b/htdocs/langs/zh_HK/members.lang
index 22307d20374..cb2f9ae5c7e 100644
--- a/htdocs/langs/zh_HK/members.lang
+++ b/htdocs/langs/zh_HK/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=如果需要訂閱，則必須記錄訂閱的開始或
 DeleteType=刪除
 VoteAllowed=允許投票
 Physical=個人
-Moral=公司
-MorAndPhy=公司和個人
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=重新啟用
 ExcludeMember=排除會員
 Exclude=排除
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=按地區劃分的會員統計
 NbOfMembers=會員總數
 NbOfActiveMembers=現有有效會員總數
 NoValidatedMemberYet=找不到已驗證的會員
-MembersByCountryDesc=此畫面顯示按國家/地區劃分的會員統計資料。圖形和圖表取決於 Google 線上圖形服務的可用性以及有效的網路連線的可用性。
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=此頁面顯示按州/省/行政區劃分的會員統計數據。
 MembersByTownDesc=此頁面顯示按城市劃分的會員統計數據。
 MembersByNature=此頁面顯示按會員類型劃分的統計數據。
diff --git a/htdocs/langs/zh_HK/products.lang b/htdocs/langs/zh_HK/products.lang
index 2b942575c7c..a821667d5ec 100644
--- a/htdocs/langs/zh_HK/products.lang
+++ b/htdocs/langs/zh_HK/products.lang
@@ -97,7 +97,6 @@ ShowService=演出服務
 ProductsAndServicesArea=產品與服務領域
 ProductsArea=產品領域
 ServicesArea=服務範圍
-ListOfStockMovements=存貨走勢列表
 BuyingPrice=買價
 PriceForEachProduct=具有特定價格的產品
 SupplierCard=供應商卡
@@ -172,7 +171,7 @@ BuyingPrices=採購價格
 CustomerPrices=客戶價格
 SuppliersPrices=供應商價格
 SuppliersPricesOfProductsOrServices=供應商價格（產品或服務）
-CustomCode=海關|商品|HS編碼
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=原產地
 RegionStateOrigin=原產地區
 StateOrigin=原產地 省份 | 州
@@ -210,6 +209,7 @@ unitL=公升
 unitT=噸
 unitKG=公斤
 unitG=克
+unitGAL=加侖
 unitMG=毫克
 unitLB=磅
 unitOZ=盎司
@@ -312,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=請求格式為 {"URL": "http://example.com/url
 UpdateInterval=更新間隔（分鐘）
 LastUpdated=最新更新
 CorrectlyUpdated=已成功更新
-PropalMergePdfProductActualFile=用於添加到 PDF Azur 的文件是
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=選擇 PDF 文件
 IncludingProductWithTag=包含帶有標籤的產品/服務
 DefaultPriceRealPriceMayDependOnCustomer=預設價格，實際價格可能因客戶而異
@@ -349,6 +349,10 @@ QtyRecalculatedWithPackaging=已根據供應商包裝重新計算行數量。
 
 #Attributes
 Attributes=屬性
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=變體屬性
 ProductAttributes=產品的變體屬性
 ProductAttributeName=變體屬性 %s
@@ -396,6 +400,8 @@ ErrorDestinationProductNotFound=找不到目標產品
 ErrorProductCombinationNotFound=找不到產品變體
 ActionAvailableOnVariantProductOnly=僅適用於產品變體的操作
 ProductsPricePerCustomer=每個客戶的產品價格
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=附加屬性（供應商價格）
 DeleteLinkedProduct=刪除連結到組合的子產品
 AmountUsedToUpdateWAP=用於更新加權平均價格的單位數量
@@ -437,3 +443,6 @@ AllowStockMovementVariantParentHelp=默認情況下，變體的父產品是虛
 ConfirmSetToDraftInventory=您確定要將其恢復為草稿狀態嗎？<br>當前庫存中設定的數量將被重置。
 WarningLineProductNotToSell=產品或服務 “%s” 不可銷售且已被複製
 PriceLabel=價格標籤
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/zh_HK/salaries.lang b/htdocs/langs/zh_HK/salaries.lang
index 60107301fcf..afe7ebc7060 100644
--- a/htdocs/langs/zh_HK/salaries.lang
+++ b/htdocs/langs/zh_HK/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=新增薪資
 AddSalary=添加薪資
 NewSalaryPayment=新工資卡
 AddSalaryPayment=添加薪資支付
+SalaryID=Salary ID
+SalaryAmount=薪資金額
 SalaryPayment=工資支付
 SalariesPayments=工資支付
 SalariesPaymentsOf=%s 的薪資支付
@@ -27,7 +29,7 @@ FillFieldFirst=請先填寫員工欄位
 UpdateAmountWithLastSalary=設定上次薪資金額
 MakeTransferRequest=發出轉帳請求
 VirementOrder=貸記轉帳請求
-BankTransferAmount=轉賬金額
 WithdrawalReceipt=扣繳轉賬指令
 OrderWaiting=待處理訂單
 FillEndOfMonth=填寫到月底
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/zh_HK/website.lang b/htdocs/langs/zh_HK/website.lang
index 1bcf42b789a..63467c53251 100644
--- a/htdocs/langs/zh_HK/website.lang
+++ b/htdocs/langs/zh_HK/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=在此使用其他名稱/別名的列表，以便可以使
 WEBSITE_CSS_URL=外部 CSS 檔案的網址
 WEBSITE_CSS_INLINE=CSS 檔案內容 (所有頁面通用)
 WEBSITE_JS_INLINE=JavaScript 檔案內容 (所有頁面通用)
-WEBSITE_HTML_HEADER=HTML 標頭底部添加的內容 (所有頁面通用)
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=機器人文件 (robots.txt)
 WEBSITE_HTACCESS=網站 .htaccess 文件
 WEBSITE_MANIFEST_JSON=網站 manifest.json 文件
@@ -56,16 +56,17 @@ ReadPerm=閱讀
 WritePerm=編寫
 TestDeployOnWeb=測試/部署到線上環境
 PreviewSiteServedByWebServer=<u>在新分頁中預覽 %s。</u><br><br>%s 將由外部網絡伺服器（如 Apache、Nginx、IIS）提供服務。您必須先安裝並設置此伺服器以指向目錄：\n<br><strong>%s</strong><br>外部伺服器提供的網址：<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>在新分頁中預覽 %s。</u><br><br>%s 將由 Dolibarr 伺服器提供服務，因此不需要安裝任何額外的網絡伺服器（如 Apache、Nginx、IIS）。<br>不便之處是頁面的網址對用戶不友好，並且以 Dolibarr 的路徑開頭。<br>\nDolibarr 提供的網址：<br><strong>%s</strong><br><br>要使用您自己的外部網絡伺服器來服務此網站，請在您的網絡伺服器上創建一個指向目錄的虛擬主機<br><strong>%s</strong><br>然後在網站的屬性中輸入此虛擬主機的名稱，並單擊「測試/部署到網站」鏈接。
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=外部網絡服務器提供的虛擬主機的網址未定義
 NoPageYet=尚未建立任何頁面
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=特定語法提示的幫助
 YouCanEditHtmlSourceckeditor=您可以使用編輯器中的「來源」按鈕編輯 HTML 原始碼。
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> 您可以使用標籤 <strong><?php ?></strong> 將 PHP 程式碼包含到此原始程式碼中。可以使用以下全域變數：$conf、$db、$mysoc、$user、$website、$websitepage、$weblangs、$pagelangs。<br><br><span class="fa fa-bug paddingright"></span> 您也可以使用下列語法包含另一個頁面/容器的內容：<br><strong><?phpincludeContainer('alias_of_container_to_include'); ？<br><br><span class="fa fa-bug paddingright"></span> 您可以使用以下語法重定向到另一個頁面/容器（注意：重定向前不要輸出任何內容）：<br><strong><?phpredirectToContainer('alias_of_container_to_redirect_to'); ？<br>您也可以使用 GET 參數進行重定向：<br><strong><?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ？<br><br><span class="fa fa-link paddingright"></span> 要添加到另一個頁面的鏈接，請使用以下語法：<br><strong>&lt;ahref="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> 您可以動態設定頁面標題和<strong>SEO元標記</strong>（標題、關鍵字、描述）。只需定義以下變數：<br> <code>$__PAGE__TITLE__ = "標題值...";</code><br> <code>$__PAGE__KEYWORDS__ = "關鍵字1, 關鍵字2, 關鍵字3 …"; // 逗號分隔</code><br> <code>$__PAGE__DESC__ = "描述...";</code></p><br><span class="fa fa-download paddingright"></span> 包含<strong>下載連結</strong>儲存在 <strong>documents</strong> 目錄中的文件，使用 <strong>document.php</strong> 包裝器：<br>例如，對於一個檔案到documents/ecm（需要被記錄），語法是：<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>對於文件/媒體（供公眾存取的開放目錄）中的文件，語法為：<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>對於透過共享連結共享的文件（使用檔案的共享哈希鍵開放存取），語法為：<br><strong>&lt;a href="/document.php?hashp=publicsharekeyofile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span>\n若要包含儲存在 <strong>documents</strong> 目錄中的<strong>映像</strong>，請使用<strong>viewimage.php</strong> 包裝器。<br>例如，對於將圖像放入文件/媒體（開放目錄以供公共存取），語法為：<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir /]檔名.ext"></strong><br>
-YouCanEditHtmlSource2=對於透過共享連結共享的圖像（使用檔案的共享哈希鍵進行開放存取），語法為：<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> 您可以使用標籤 <strong>&lt;?php ?&gt;</strong>. 將 PHP 程式碼包含到此原始程式碼中。將 PHP 程式碼包含到此原始程式碼中。可使用下列全域變數：$conf、$db、$mysoc、$user、$website、$websitepage、$weblangs、$pagelangs。<br><br><span class="fa fa-bug paddingright"></span> 您也可以使用以下語法包含另一個頁面/容器的內容:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span>您可以使用以下語法重定向到另一個頁面/容器（注意：重定向前不要輸出任何內容）:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>您也可以使用 GET 參數進行重定向:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> 要添加到另一個頁面的鏈接，請使用以下語法:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span>您可以動態設定頁面標題和 <strong>SEO meta tags</strong> (標題、關鍵字、描述). 只需定義以下變數：<br> <code>$__PAGE__TITLE__ = "標題值...";</code><br> <code>$__PAGE__KEYWORDS__ = "關鍵字1、關鍵字2、關鍵字3 ..."; // 逗號分隔</code><br> <code>$__PAGE__DESC__ = "描述…";</code></p><br><span class="fa fa-download paddingright"></span>若要包含儲存在 <strong>documents</strong> 目錄中的檔案的<strong>下載連結</strong>，請使用 <strong>document.php</strong> 包裝器：<br>例如，對於一個檔案到documents/ecm（需要被記錄），語法是:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>對於文件/媒體（供公眾存取的開放目錄）中的文件，語法為:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>\n對於透過共享連結共享的檔案（使用檔案的共享哈希鍵開啟存取），語法為:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=若要取得 PHP 物件圖像的 URL，請使用<br><strong>&lt;img src="&lt;?php printgetImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br><a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">wiki 文件</a>上提供了更多 HTML 或動態程式碼範例。<br>
 ClonePage=複製頁面/容器
 CloneSite=複製網站
@@ -87,15 +88,15 @@ WebsiteAccount=網站帳戶
 WebsiteAccounts=網站帳戶
 AddWebsiteAccount=建立網站帳戶
 BackToListForThirdParty=返回第三方列表
-DisableSiteFirst=請先停用網站
+DisableSiteFirst=Put website offline first
 MyContainerTitle=我的網站標題
 AnotherContainer=這就是如何包含另一個頁面/容器的內容（如果啟用動態程式碼，這裡可能會出現錯誤，因為嵌入的子容器可能不存在）
 SorryWebsiteIsCurrentlyOffLine=抱歉，此網站目前處於離線狀態。請稍後再回來...
-WEBSITE_USE_WEBSITE_ACCOUNTS=啟用網站帳戶表格
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=啟用表格以儲存每個網站/第三方的網站帳戶（登錄名/密碼）
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=您必須先定義預設 ' 首頁 '
-OnlyEditionOfSourceForGrabbedContentFuture=警告：透過匯入外部網頁建立網頁是為有經驗的使用者保留的。根據來源頁面的複雜程度，導入的結果可能與原始結果不同。此外，如果來源頁面使用常見的 CSS 樣式或衝突的 JavaScript，則在處理此頁面時可能會破壞網站編輯器的外觀或功能。此方法是建立頁面的更快方法，但建議從頭開始或從建議的頁面範本建立新頁面。.<br>另請注意，在抓取的外部頁面上使用內聯編輯器可能無法正常運作。
-OnlyEditionOfSourceForGrabbedContent=從外部網站取得內容時，只能編輯 HTML 原始碼
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=同時抓取在 CSS 和頁面中找到的圖片。
 ImagesShouldBeSavedInto=圖像應保存到目錄中
 WebsiteRootOfImages=網站圖片的根目錄
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=登出您的客戶帳戶
 filteredByVersion=按版本篩選
 removeFilter=移除篩選
 viewMyCart=查看我的購物車
+Shipping=Shipping
 freeShipping=免運費！
 noProducts=沒有產品
 nbrItemsInCart=您的購物車有 <span class="ajax_cart_quantity">0</span> 件商品。
@@ -284,12 +286,13 @@ productNameAToZ=產品名稱: A 到 Z
 productNameZToA=產品名稱：Z 到 A
 referenceLowestFirst=參考編號：由低至高
 referenceHighestFirst=參考編號：由高至低
+productPerPage=products per page
 perPage=每頁
 showAll=顯示全部
 showing= 顯示中
 nbrOfProducts= 共有 %s 件商品。
 noResultsHaveBeenFound=找不到任何結果' 0結果'
-noResultsWereFound= 找不到結果。
+noResultsWereFound=找不到結果。
 addToCart=加入購物車
 backHome=返回首頁
 priceDrop=價格下降
@@ -302,10 +305,11 @@ lastUpdate=最後更新
 contactSupport=如何聯絡支援人員
 noProductToDisplay=錯誤，沒有產品可供顯示
 yourCompanyInformation=貴公司資訊
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=此電郵地址已被註冊。
 firstnameContainsLettersOnly=<b>名字</b>只能包含字母和空格
 lastnameContainsLettersOnly=<b>姓氏</b>只能包含字母和空格
-passwordCriteria=<b>密碼</b>必須符合以下條件：<br>- 12 個字元<br>- 1 個大寫字母<br>- 1 個數字<br>- 無特殊字元<br>- 避免重複字元超過3 個次<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=發生錯誤。
 accountCreation=建立帳戶
 errorsOccurred=有 %s 個錯誤 %s
@@ -357,3 +361,7 @@ subtract=減少
 LoginCheckout=登錄並繼續結帳
 paymentSuccessProcessed=您的付款已成功處理
 youWillBeRedirectedToOrderPage=您將於稍後被重新導向至訂單詳情頁面。
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 246d3eb3099..5982af63a8e 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=已通過檔案完整性檢查，但已增加
 FileIntegritySomeFilesWereRemovedOrModified=檔案完整性檢查失敗。有檔案被修改、移除或新增。
 GlobalChecksum=全域校驗
 MakeIntegrityAnalysisFrom=對應用程式檔案進行完整性分析從
-LocalSignature=嵌入式本地簽名（不太可靠）
-RemoteSignature=遠端簽名 (較可靠)
+LocalSignature=Embedded local signature
+RemoteSignature=Remote distant signature
 FilesMissing=遺失檔案
 FilesUpdated=已上傳檔案
 FilesModified=已修改檔案
@@ -251,7 +251,7 @@ UsedOnlyWithTypeOption=只供行程選項使用
 Security=安全
 Passwords=密碼
 DoNotStoreClearPassword=Encrypt passwords stored in database.
-MainDbPasswordFileConfEncrypted=加密儲存在conf.php中的資料庫密碼。強烈建議啟動此選項。
+MainDbPasswordFileConfEncrypted=Obfuscate the database password stored in conf.php. It is recommended to activate this option.
 InstrucToEncodePass=為使已編碼好的密碼放到<b>conf.php</b>檔案中，用<br><b>$dolibarr_main_db_pass="crypted:%s"; </b><br>代替<br><b>$dolibarr_main_db_pass="...";</b>
 InstrucToClearPass=要將密碼解碼（清除）到<b>conf.php</b>檔案中，請用<br><b>$dolibarr_main_db_pass="%s";</b>替換<br> <b>$ dolibarr_main_db_pass =“ crypted：...”;</b> <br>
 ProtectAndEncryptPdfFiles=保護產生的PDF文件。不建議這樣做，因為它會破壞批次PDF的產生。
@@ -466,8 +466,9 @@ ExtrafieldPointGeo=Geometric Point
 ExtrafieldMultiPointGeo=Geometric Multi Point
 ExtrafieldLinestringGeo=Geometric Linestring
 ExtrafieldPolygonGeo=Geometric Polygon
+ExtrafieldStars=Stars
 ComputedFormula=計算欄位
-ComputedFormulaDesc=在這裡，您可以輸入一個使用項目的其他屬性或任何PHP編碼的公式，以獲取動態計算的值。您可以使用任何PHP相容的公式，包括"?"條件運算符，以及以下全局項目：<strong>$db、$conf、$langs、$mysoc、$user、$objectoffield</strong>。<br><strong>警告</strong>：如果您需要未加載的項目的屬性，只需像第二個例子中那樣自己查詢項目。<br>使用計算欄位意味著您無法從界面輸入任何值。此外，如果有語法錯誤，公式可能返回空。<br><br>公式範例<br>：$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)。<br><br>重新加載項目的範例<br>：(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')。<br><br>強制加載項目及其母項目的其他公式範例：<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: '未找到母專案'。
+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'
 Computedpersistent=儲存已計算欄位
 ComputedpersistentDesc=計算出的額外欄位將儲存在資料庫中，但是，僅當更改此欄位的項目時，才會重新計算該值。如果計算欄位依賴於其他項目或全域數據，則該值可能是錯誤的！
 ExtrafieldParamHelpPassword=將欄位保留為空白表示該值將不加密地儲存（欄位只能在畫面上以星號隱藏）。 <br><br>輸入值'dolcrypt'以使用可逆加密算法對值進行編碼。清除的數據仍然可以知道和編輯，但已加密到資料庫中。<br><br>輸入'auto'（或'md5'、'sha256'、'password_hash'等）以使用預設的密碼加密算法（或md5、sha256、password_hash等）將不可逆的雜湊密碼保存到資料庫中（無法查詢原始值）。
@@ -519,7 +520,7 @@ WarningPHPMailB=- If the domain of your email (the part mymaildomain.com into my
 WarningPHPMailC=- 使用您自己的電子郵件服務提供商的 SMTP 伺服器發送電子郵件也很好，因此從應用程式發送的所有電子郵件也將保存到您電子郵件的“已發送”資料夾中。
 WarningPHPMailD=在此建議您可將電子郵件寄送方式變更為“SMTP”。
 WarningPHPMailDbis=如果您確實想使用預設的“PHP”模式寄送電子郵件，請忽略此警告或是%s點我移除%s。
-WarningPHPMail2=如果您的電子郵件SMTP程式需要將電子郵件客戶端限制為某些IP地址（非常罕見），則這是ERP CRM應用程式的郵件用戶代理（MUA）的IP地址： <strong>%s</strong> 。
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for this application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs or entry in the SPF record of the DNS of your domain: <strong>%s</strong>.
 WarningPHPMailSPFDMARC=If the domain name in your sender email address is protected by a DMARC record different than p=none (ask your domain name registar), you must remove your DMARC record, or set it to p=none like do @gmail.com) or use sending another method.
 SPFAndDMARCInformation=SPF and DMARC DNS record for main email addresses
@@ -567,8 +568,8 @@ Module10Name=會計（簡易）
 Module10Desc=基於資料庫內容的簡單會計報告（分類帳，營業額）。不使用任何分類帳表。
 Module20Name=提案/建議書
 Module20Desc=商業提案/建議書管理
-Module22Name=大量電子郵件
-Module22Desc=管理批次電子郵件
+Module22Name=Mass Emails
+Module22Desc=Manage mass/bulk email campaign
 Module23Name=能源
 Module23Desc=監測的能源消耗
 Module25Name=銷售訂單
@@ -847,10 +848,10 @@ Permission212=訂單行
 Permission213=啟動線路
 Permission214=電話設定
 Permission215=供應商設定
-Permission221=讀取電子郵件
-Permission222=建立/修改電子郵件（主題，收件人...）
-Permission223=驗證電子郵件（允許發送）
-Permission229=刪除電子郵件
+Permission221=Read mass emails
+Permission222=Create/modify mass emails (topic, recipients...)
+Permission223=Validate mass emails (allows sending)
+Permission229=Delete mass emails
 Permission237=檢視收件人及資訊
 Permission238=手動傳送郵件
 Permission239=驗證或傳送後刪除郵件
@@ -1105,6 +1106,7 @@ DictionaryStaff=員工人數
 DictionaryAvailability=交貨期
 DictionaryOrderMethods=訂購方式
 DictionarySource=原始提案/建議書/訂單
+DictionaryAccountancyReport=Personalized accounting reports
 DictionaryAccountancyCategory=報告的個人化組別
 DictionaryAccountancysystem=會計科目表模型
 DictionaryAccountancyJournal=會計日記帳
@@ -1134,11 +1136,11 @@ BackToDictionaryList=返回分類清單
 TypeOfRevenueStamp=印花稅類型
 VATManagement=營業稅管理
 VATIsUsedStandard=When creating documents (proposals, invoices, orders...), the default Sales Tax rate is set according to the standard rules (depending on seller and buyer countries)
-VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating proposals, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If buyer state or province has a VAT rule from vat rates dictionary then it's the default VAT rate. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=預設情況下，建議的營業稅為0，可用於諸如協會，個人或小型公司的情況。
 VATIsUsedExampleFR=在法國，這表示擁有真實財務系統（簡化的真實貨幣或正常真實貨幣）的公司或組織。申報營業稅的系統。
 VATIsNotUsedExampleFR=在法國，它表示非宣告營業稅的協會，或者選擇微型企業財務系統（特許經營營業稅）並繳納特許經營營業稅的公司，組織或自由職業者，而無需任何營業稅申報。此選擇將在發票上顯示參考“不適用的營業稅-CGI的art-293B”。
-VATType=Tax type
+VATType=Tax usage
 ##### Local Taxes #####
 TypeOfSaleTaxes=銷售稅類型
 LTRate=稅率
@@ -1174,6 +1176,7 @@ NoLocalTaxXForThisCountry=根據稅收設置（請參閱%s-%s-%s），您所在
 LabelUsedByDefault=若代號沒有找翻譯字句，則使用預設標籤
 LabelOnDocuments=文件標籤
 LabelOrTranslationKey=標籤或翻譯秘鑰
+LabelTranslatedInCurrentLanguage=Label translated in current language
 TranslationFound=Translation found
 TheTranslationIsSearchedFromKey=The translation is searched from the translation key: <b>%s</b>
 TranslationKey=Translation key
@@ -1431,7 +1434,7 @@ AddVatInList=在複合清單中顯示客戶/供應商的統一編號。
 AddAdressInList=將客戶/供應商地址顯示在組合清單中。<br>合作方將以名稱格式「大公司 - 21 號 123456路 大城市 - 美國」顯示，而不是「大公司」。
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town into combo lists.<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=要求合作方使用首選的運輸方式。
-FieldEdition=欗位 %s編輯
+FieldEdition=Modification of field %s
 FillThisOnlyIfRequired=例如： +2 (若遇到時區偏移問題時才填寫)
 GetBarCode=取得條碼
 NumberingModules=編號模型
@@ -1486,6 +1489,8 @@ ForceInvoiceDate=強制使用驗證日期為發票日期
 SuggestedPaymentModesIfNotDefinedInInvoice=未定義付款方式發票的預設付款方式
 SuggestPaymentByRIBOnAccount=建議以帳戶匯款付款
 SuggestPaymentByChequeToAddress=建議以支票付款給
+InvoicePaymentManageStructuredCommunication=Generate structured communication for invoice payment
+InvoicePaymentManageStructuredCommunicationHelp=In some countries, it is necessary to display a structured reference to facilitate payments and their reconciliation
 FreeLegalTextOnInvoices=在發票中加註文字
 WatermarkOnDraftInvoices=在發票草稿上的浮水印(若空白則無)
 PaymentsNumberingModule=付款編號模型
@@ -1718,6 +1723,7 @@ CompressionOfResources=壓縮HTTP 回應
 CompressionOfResourcesDesc=例如，使用Apache指令“ AddOutputFilterByType DEFLATE”
 TestNotPossibleWithCurrentBrowsers=目前的瀏覽器無法自動偵測
 DefaultValuesDesc=您可以在此處定義建立新記錄時希望使用的預設值，和/或列出記錄時要使用的預設過濾器或排列順序。
+DefaultValuesHelpText=You can use a single value or comma-separated values ​​for multiple choices. You can also use substitution tags (see list below).
 DefaultCreateForm=預設值（用於表單）
 DefaultSearchFilters=預設尋找過濾器
 DefaultSortOrder=預設排序訂單
@@ -1800,6 +1806,7 @@ SendingsNumberingModules=出貨單編號模組設定
 SendingsAbility=支援發貨單以供客戶交貨
 NoNeedForDeliveryReceipts=在大多數情況下，發貨單既可以用作客戶出貨單（要寄送的產品清單），也可以用作客戶接收和簽名的單據。因此，產品出貨單是重複的功能，很少啟動。
 FreeLegalTextOnShippings=出貨的加註文字
+DontPrefillShipmentQty = Don't prefill lines quantities at shipment creation
 ##### Deliveries #####
 DeliveryOrderNumberingModules=產品出貨單編號模組
 DeliveryOrderModel=產品出貨單模型
@@ -1808,15 +1815,15 @@ FreeLegalTextOnDeliveryReceipts=出貨單的加註文字
 ##### FCKeditor #####
 AdvancedEditor=進階編輯器
 ActivateFCKeditor=啟用進階編輯器：
-FCKeditorForNotePublic=所見即所得編輯器建立/編輯元件欄位的“公開備註”
-FCKeditorForNotePrivate=所見即所得編輯器建立/編輯元件欄位的“不公開備註”
-FCKeditorForCompany=所見即所得編輯器建立/編輯元件欄位描述（產品/服務除外）
-FCKeditorForProductDetails=所見即所得為所有項目（提案/建議書，訂單，發票等）建立/編輯產品描述行。
+FCKeditorForNotePublic=WYSIWYG creation/modification of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=警告：強烈不建議將此選項用於此情況，因為它可能在建立PDF文件時導致特殊字符和頁面格式的問題。
-FCKeditorForMailing= 以所見即所得建立/編輯批次電子郵件 ( 工具 --> 電子郵件 )
-FCKeditorForUserSignature=以所見即所得建立/編輯用戶簽名檔
-FCKeditorForMail=以所見即所得建立/編輯全部電子郵件( 除了工具 --> 電子郵件)
-FCKeditorForTicket=以所見即所得建立/編輯服務單
+FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails)
+FCKeditorForUserSignature=WYSIWYG creation/modification of user signature
+FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails)
+FCKeditorForTicket=WYSIWYG creation/modification for tickets
 ##### Stock #####
 StockSetup=庫存模組設定
 IfYouUsePointOfSaleCheckModule=如果使用預設提供的銷售點模組（POS）或外部模組，則POS模組可能會忽略此設定。預設情況下，大多數POS模組均設計為可立即建立發票並減少庫存，而與此處的選項無關。因此，如果您在從POS進行銷售註冊時是否需要減少庫存，還請檢查POS模組設定。
@@ -1867,7 +1874,6 @@ Buy=購買
 Sell=出售
 InvoiceDateUsed=使用發票日期
 YourCompanyDoesNotUseVAT=您的公司尚未定義使用營業稅 ( 首頁 - 設定 - 公司/組織 )，所以在設定中沒有營業稅選項。
-AccountancyCode=會計代碼
 AccountancyCodeSell=銷售會計代碼
 AccountancyCodeBuy=採購會計代碼
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=建立新稅額時，預設將“自動建立付款”複選框保留為空
@@ -1879,13 +1885,18 @@ AGENDA_DEFAULT_VIEW = 當選擇應辦事項選單時預設要打開的分頁
 AGENDA_EVENT_PAST_COLOR = 過去事件顏色
 AGENDA_EVENT_CURRENT_COLOR = 目前事件顏色
 AGENDA_EVENT_FUTURE_COLOR = 未來事件顏色
-AGENDA_REMINDER_BROWSER = <b>在用戶的瀏覽器上</b>啟用事件提醒（到達事件日期時，瀏覽器會跳出提醒視窗.每個用戶都可以從瀏覽器提醒設定中停用此提醒）
+AGENDA_REMINDER_BROWSER = Allow event reminders <b>on user's browser</b>
+AGENDA_REMINDER_BROWSERHelp = When remind date is reached, a popup is shown by the browser). Remind option/delay is defined by the user on event creation.
 AGENDA_REMINDER_BROWSER_SOUND = 啟用音效警告
-AGENDA_REMINDER_EMAIL = 啟用以<b>電子郵件</b>事件提醒（可以在每個事件上定義提醒選項/延遲）。
+AGENDA_REMINDER_EMAIL = Allow event reminders <b>by emails</b>
 AGENDA_REMINDER_EMAIL_NOTE = 注意：排程工作%s的頻率必須足夠以確定提醒可以在正確的時刻寄出。
 AGENDA_SHOW_LINKED_OBJECT = 顯示已連結項目到行程的檢視中
 AGENDA_USE_EVENT_TYPE = 使用事件類型（在選單設定->分類->應辦事項類型中管理）
 AGENDA_USE_EVENT_TYPE_DEFAULT = 在事件建立表單中自動為事件類型設定此預設值
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES = Use default reminder on these events
+AGENDA_DEFAULT_REMINDER_EVENT_TYPES_NOTE = The automatic reminder notification form will be filled by default at event creation
+AGENDA_DEFAULT_REMINDER_OFFSET = Default Reminder period before the event
+AGENDA_DEFAULT_REMINDER_EMAIL_MODEL = Email template to use for default reminder
 PasswordTogetVCalExport = 授權匯出連結秘鑰
 PastDelayVCalExport=不要匯出早於以下時間的事件
 SecurityKey = 安全金鑰
@@ -2006,7 +2017,7 @@ BackupZipWizard=建立文件資料夾壓縮檔的小精靈
 SomethingMakeInstallFromWebNotPossible=由於以下原因，無法從 Web 界面安裝外部模組：
 SomethingMakeInstallFromWebNotPossible2=因此，此處描述的升級過程是只有特權用戶才能執行的手動過程。
 InstallModuleFromWebHasBeenDisabledContactUs=由於安全目的，目前在應用程序中安裝或開發外部模組或動態網站已被鎖定。如果您需要啟用此功能，請聯繫我們。
-InstallModuleFromWebHasBeenDisabledByFile=您的管理員已禁止從應用程式安裝外部模組。您必須要求他刪除檔案<strong>%s</strong>才能使用此功能。
+InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application and usage of features that allow to run code on server has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=從應用程式安裝或建構外部模組需要將模組檔案保存到資料夾<strong>%s</strong>中 。要使此資料夾由Dolibarr處理，必須設定新增以下2條指令行到<strong>conf / conf.php</strong>： <br> <strong>$ dolibarr_main_url_root_alt ='/ custom';</strong> <br> <strong>$ dolibarr_main_document_root_alt ='%s / custom';</strong>
 HighlightLinesOnMouseHover=滑鼠經過時會顯示表格行
 HighlightLinesColor=滑鼠經過時突出顯示行的顏色（使用“ ffffff”表示沒有突出顯示）
@@ -2036,6 +2047,7 @@ Enter0or1=輸入0或1
 EnterYesOrNo=Enter Yes or No
 UnicodeCurrency=在括號之間輸入代表貨幣符號的字元數列表。例如：對於$，輸入[36]-對於巴西R $ [82,36]-對於€，輸入[8364]
 ColorFormat=在 HEX 格式中 RGB 顏色，例如： FF0000
+NumberFormatForATotalPrice=Number format for the total price %s
 PictoHelp=圖示名稱的格式：<br>-對於位於目前主題資料夾中的影像檔案：image.png<br>-對於位於模組資料夾/img/資料夾的檔案：image.png@module<br>-對於FontAwesome fa-xxx圖示：fa-xxx<br>-對於FontAwesome fa-xxx圖示（具有前綴、顏色和大小設定）：fontawesome_xxx_fa_color_size
 PositionIntoComboList=行的位置放到組合清單中
 SellTaxRate=銷售稅率
@@ -2131,7 +2143,12 @@ MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price
 MAIN_PDF_NO_SENDER_FRAME=隱藏寄件人地址框的邊框
 MAIN_PDF_NO_RECIPENT_FRAME=隱藏收件人地址框的邊框
 MAIN_PDF_HIDE_CUSTOMER_CODE=隱藏客戶代碼
+MAIN_PDF_HIDE_CUSTOMER_ACCOUNTING_CODE=Hide customer accounting code
 MAIN_PDF_HIDE_SENDER_NAME=在地址區塊中隱藏寄件人/公司名稱
+TERMSOFSALE=Terms and conditions of sale
+MAIN_PDF_ADD_TERMSOFSALE_PROPAL=Add the terms and conditions of sale after the proposal
+MAIN_PDF_ADD_TERMSOFSALE_ORDER=Add the terms and conditions of sale after the order
+MAIN_PDF_ADD_TERMSOFSALE_INVOICE=Add the terms and conditions of sale after the invoice
 PROPOSAL_PDF_HIDE_PAYMENTTERM=隱藏付款條件
 PROPOSAL_PDF_HIDE_PAYMENTMODE=隱藏付款方式
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add a hidden markup into the signature area to allow electronic signature tool to reuse it. May be used by external tools or in the future by the online signature feature.
@@ -2324,6 +2341,8 @@ NotRecommended=不建議
 ARestrictedPath=資料檔案的一些限制路徑
 CheckForModuleUpdate=檢查外部模組更新
 CheckForModuleUpdateHelp=此操作將連接到外部模組的編輯器以檢查是否有新版本。
+CheckForModuleUpdateHelp2=A connection is also done to %s to check if some of your external modules have been reported as malware by the community.
+YourIPWillBeRevealedToThisExternalProviders=Your IP will be revealed to all of this external providers.
 ModuleUpdateAvailable=有可用的更新
 NoExternalModuleWithUpdate=未找到外部模組的更新
 SwaggerDescriptionFile=Swagger API 描述檔案（例如用於 redoc）
@@ -2397,6 +2416,8 @@ INVOICE_SHOW_SHIPPING_ADDRESS=顯示送貨地址
 INVOICE_SHOW_SHIPPING_ADDRESSMore=在一些國家（如法國等），這是強制性的指示
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACT=Show billing contact on proposal
 SUPPLIER_PROPOSAL_ADD_BILLING_CONTACTMore=By default the contact only appears for billing
+INVOICE_HIDE_LINKED_OBJECT=Hide linked object
+INVOICE_HIDE_LINKED_OBJECTMore=This feature prevents linked objects from being displayed on the generated PDF invoice document.
 UrlSocialNetworksDesc=社群網路的網路連結。使用 {socialid} 作為包含社群網路ID的變數部分
 IfThisCategoryIsChildOfAnother=如果此類別是另一個類別的子類別
 DarkThemeMode=深色主題模式
@@ -2450,7 +2471,7 @@ 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)
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right is disabled)
 NotAvailableByDefaultEnabledOnModuleActivation=Not created by default. Created on module activation only.
 CSSPage=CSS Style
 Defaultfortype=預設
@@ -2489,7 +2510,7 @@ AiDescription=AI (Artificial Intelligence) features
 AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
 AI_API_KEY=Key for AI api
 AI_API_URL=Endpoint URL for AI api
-AI_API_SERVICE=Service to use for AI features
+AI_API_SERVICE=AI service to use
 AiSetup=AI module setup
 AiCustomPrompt=AI custom prompt
 AI_CONFIGURATIONS_PROMPT=Custom prompt
@@ -2501,6 +2522,7 @@ AIPromptForFeatures=AI custom prompts for features
 EnterAnIP=Enter an IP address
 ConvertInto=Convert into
 YouAreHere=You are here
+SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
 BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
 BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
 BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
@@ -2539,6 +2561,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
 MainAuthenticationOidcLoginClaimName=Login claim
 MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
 BlackListWords=Black list of words
+BlackListWordsHelp=Words must be separated by a coma (",")
+BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
+Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
+Post-PromptHelp=This text will always be added after the text you enter to make an AI request
 AddBlackList=Add to black list
 FediverseSetup=Configuration of fediverse section
 ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
@@ -2555,6 +2581,29 @@ ParamName=Name of parameter
 ParamValue=Value of parameter
 ConfirmDeleteParamOfSocialNetwork=Are you sure you want to delete this parameter ?
 HelpMariaDBToGetPossibleValues=You can get a list of possible values by running the following SQL command: %s
+HelpMariaDBToGetValue=This value was retrieved with command: %s
+PDFBoxFrameRoundedCorners=Frames with rounded corners
+MAIN_PDF_FRAME_CORNER_RADIUS=Default value for corner radius is 0 so no rounded corners. Choose values between 1-3 to increase corner radius and add rounded corners to frames
 Captcha=Captcha
 CaptchaDesc=If you want to protect your login page with a Captcha, you can choose which one to use here
 DolibarrStandardCaptcha=A native captcha generated by Dolibarr
+SALES_ORDER_SHOW_SHIPPING_ADDRESS=顯示送貨地址
+SALES_ORDER_SHOW_SHIPPING_ADDRESSMore=在一些國家（如法國等），這是強制性的指示
+PDF_INVOICE_SHOW_VAT_ANALYSIS=Show vat analysis per rate
+MaxNbOfRecordOnListIsOk=You have a max size for lists set to <b>%s</b> lines. This is a good value.
+YouHaveALargeAmountOfRecordOnLists=You have a default max size for lists set to <b>%s</b> lines. This is a large value that need scrolling to see all answers. It is better to have a value lower than <b>%s</b> and use pagination to see record over this number. Change this in menu Home - Setup - Display.
+RoundBorders=Round borders
+CheckIfModuleIsNotBlackListed=Block install for modules found into the <b>Remote blacklist</b>
+CheckIfModuleIsNotBlackListedHelp=Some modules may be provided by some companies that do not respect the project's rules of goodwill (non-compliance with GDPR, violation of the rules tof use the Dolibarr brand name, etc.). By checking this box, a request will be made to the project server to see if a report was received about this module, and will protect you by blocking the deployment of flagged modules
+DatabaseEncryption=Encryption in database
+AlgorithmFor=Algorithm for: %s
+SensitiveData=Sensitive data
+ToolToDecryptAString=Tool to decrypt a string
+Decrypt=Decrypt
+FilesIntegrityDesc=If you want to check the integrity of files instead of database, you can do it by using <a href="%s">this tool</a>.
+AttributeCodeHelp=A code of your choice (without special chars and spaces) to identify the property.<br>Note that if an object B is created from an existing object A that has a different type (for example creation of an invoice from an order), the value of the complementary attributes of A are also copied into the complementary attributes of B when the code of the attribute is the same.
+ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
+PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
+WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
+UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestrictionExemple=htm, html, shtml, js, php
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index 36ea551ce04..1b3da130da9 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -27,7 +27,6 @@ EndBankBalance=期末餘額
 CurrentBalance=目前餘額
 FutureBalance=未來餘額
 ShowAllTimeBalance=從一開始顯示餘額
-AllTime=從開始
 Reconciliation=調節
 RIB=銀行帳戶的號碼
 IBAN=IBAN 號碼
@@ -133,7 +132,7 @@ DeleteTransaction=刪除條目
 ConfirmDeleteTransaction=您確定要刪除此筆條目
 ThisWillAlsoDeleteBankRecord=同樣也會刪除已產生的銀行條目
 BankMovements=動作
-PlannedTransactions=已計畫的條目
+PlannedTransactions=Upcoming entries
 Graph=圖表
 ExportDataset_banque_1=銀行條目和帳戶對帳單
 ExportDataset_banque_2=存款單
@@ -151,7 +150,7 @@ FutureTransaction=未來交易。無法調節。
 SelectChequeTransactionAndGenerate=選擇/篩選要包括在支票存款收據中的支票，然後點擊“建立”。
 SelectPaymentTransactionAndGenerate=Select/filter the documents which are to be included in the %s deposit receipt. Then, click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value
-InputReceiptNumberBis=YYYYMM or YYYYMMDD
+InputReceiptNumberBis=YYYYMM
 EventualyAddCategory=Optionally, a category in which to classify the operations
 ToConciliate=對帳嗎？
 ThenCheckLinesAndConciliate=然後，檢查銀行對帳單中的行數，然後單擊
@@ -188,7 +187,7 @@ BankColorizeMovementDesc=如果啟用此功能，則可以為借款方或貸款
 BankColorizeMovementName1=借款方動作的背景顏色
 BankColorizeMovementName2=貸款方動作的背景顏色
 IfYouDontReconcileDisableProperty=如果您不對某些銀行帳戶進行銀行對帳，請在其上停用屬性“ %s”以刪除此警告。
-NoBankAccountDefined=未定義銀行帳戶
+NoBankAccountDefined=No bank account found
 NoRecordFoundIBankcAccount=在銀行帳戶中沒有找到記錄。通常，當一條記錄從銀行帳戶的交易清單中手動刪除時（例如在銀行帳戶對帳期間），就會發生這種情況。另一個原因是在停用模組“%s”時記錄了付款。
 AlreadyOneBankAccount=已定義一個銀行帳戶
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA file variant
diff --git a/htdocs/langs/zh_TW/blockedlog.lang b/htdocs/langs/zh_TW/blockedlog.lang
index d27fd0c3e5c..44b22120be7 100644
--- a/htdocs/langs/zh_TW/blockedlog.lang
+++ b/htdocs/langs/zh_TW/blockedlog.lang
@@ -7,7 +7,7 @@ BrowseBlockedLog=不可更改的日誌
 ShowAllFingerPrintsMightBeTooLong=顯示所有存檔的日誌（可能很長）
 ShowAllFingerPrintsErrorsMightBeTooLong=顯示所有無效的歸檔日誌（可能很長）
 DownloadBlockChain=下載指紋
-KoCheckFingerprintValidity=存檔日誌條目失效。 這意味著有人（駭客？）在記錄後修改了這筆記錄的一些數據，或是已經刪除了之前的存檔記錄（檢查前面#的那行是否存在）或者修改了之前記錄的校驗。
+KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, OR has erased the previous archived record (check that the line with previous # exists) OR has modified the checksum of the previous record.
 OkCheckFingerprintValidity=歸檔日誌記錄有效。此行上的數據未修改，並且該條目位於上一個條目之後。
 OkCheckFingerprintValidityButChainIsKo=與以前的日誌相比，已歸檔的日誌似乎有效，但是先前的鏈已損壞。
 AddedByAuthority=已儲存到遠端授權中
@@ -18,7 +18,9 @@ BlockedlogInfoDialog=日誌詳細訊息
 ListOfTrackedEvents=追蹤事件清單
 Fingerprint=指紋
 DownloadLogCSV=匯出存檔日誌（CSV）
-DataOfArchivedEvent=Full data of archived event
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
 ImpossibleToReloadObject=未連結原始項目（類型為%s，編號為%s）（請參閱“完整數據”列以獲取不可更改的保存數據）
 BlockedLogAreRequiredByYourCountryLegislation=您所在國家/地區的法規可能要求使用不可更改的日誌模組。關閉此模組可能會使任何未來的交易在法律和法律軟件使用方面均無效，因為它們無法通過稅務審核進行驗證。
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=由於您所在國家/地區的法律，“不可更改的日誌”模組已啟用。關閉此模組可能會使任何未來的交易在法律和使用合法軟件方面均無效，因為它們無法通過稅務審核進行驗證。
@@ -30,6 +32,7 @@ BlockedLogEnabled=已啟用將事件追踪到不可更改日誌的系統
 BlockedLogDisabled=某些記錄完成後，將事件追踪到不可更改日誌的系統已被停用。我們保存了一個特殊的指紋來追踪資料鏈是否損壞
 BlockedLogDisabledBis=已停用將事件追踪到不可更改日誌的系統。如果未有任何記錄是有可能可以停用。
 LinkHasBeenDisabledForPerformancePurpose=For performance purpose, direct link to the document is not shown after the 100th line.
+SavedOnLine=Saved on line
 
 ## logTypes
 logBILL_DELETE=已刪除邏輯客戶發票
@@ -56,3 +59,4 @@ logPAYMENT_CUSTOMER_DELETE=客戶付款邏輯刪除
 logPAYMENT_VARIOUS_CREATE=付款（未分配給發票）已建立
 logPAYMENT_VARIOUS_DELETE=付款（未分配給發票）邏輯刪除
 logPAYMENT_VARIOUS_MODIFY=付款（未分配給發票）已修改
+logBLOCKEDLOG_EXPORT=Export of unalterable logs into a file
diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang
index 1ace92e7af3..40edb758d63 100644
--- a/htdocs/langs/zh_TW/categories.lang
+++ b/htdocs/langs/zh_TW/categories.lang
@@ -17,6 +17,7 @@ ContactsCategoriesArea=聯絡人 標籤/類別 區域
 AccountsCategoriesArea=銀行帳戶 標籤/類別 區域
 ProjectsCategoriesArea=專案 標籤/類別 區域
 UsersCategoriesArea=使用者 標籤/類別 區域
+Bank_linesCategoriesArea==Bank lines tags/categories area
 SubCats=子類別
 CatList=標籤/類別清單
 CatListAll=標籤/分類清單（所有類型）
@@ -90,9 +91,10 @@ CategoriesSetup=標籤/類別設定
 CategorieRecursiv=自動連結到母標籤/母類別
 CategorieRecursivHelp=If option is on, when you add an object into a subcategory, the object will also be added into the parent categories.
 AddProductServiceIntoCategory=Assign category to the product/service
-AddCustomerIntoCategory=分配類別給客戶
-AddSupplierIntoCategory=分配類別給供應商
-AssignCategoryTo=將類別分配給
+AddCustomerIntoCategory=Assign the category to the customer
+AddSupplierIntoCategory=Assign the category to the supplier
+AddFichinterIntoCategory=Assign the category to the intervention
+AssignCategoryTo=Assign the category to
 ShowCategory=顯示標籤/類別
 ByDefaultInList=預設在清單中
 ChooseCategory=選擇類別
@@ -103,3 +105,4 @@ WebsitePagesCategoriesArea=頁面容器類別
 KnowledgemanagementsCategoriesArea=知識文章分類
 UseOrOperatorForCategories=分類使用 'OR' 運算符號
 AddObjectIntoCategory=Assign to the category
+FichintersCategoriesArea=Intervention Categories
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 4c6814aa383..096202777aa 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -65,6 +65,7 @@ State=州/省
 StateId=州ID
 StateCode=州/省代碼
 StateShort=州
+DepartmentBuyer=Buyer's state/province
 Region=地區
 Region-State=地區 - 州
 Country=國家
@@ -78,7 +79,7 @@ Chat=對話
 PhonePro=商務電話
 PhonePerso=個人電話號碼
 PhoneMobile=手機號碼
-No_Email=拒絕批次發送電子郵件
+No_Email=Refuse mass emails
 Fax=傳真
 Zip=郵遞區號
 Town=城市
@@ -382,12 +383,12 @@ ExportCardToFormat=匯出格式
 ContactNotLinkedToCompany=連絡人沒有連結到任何合作方
 DolibarrLogin=Dolibarr 登入
 NoDolibarrAccess=無Dolibarr存取
-ExportDataset_company_1=合作方（公司/基金會/自然人）及屬性
-ExportDataset_company_2=聯絡人及其屬性
-ExportDataset_company_3=合作方銀行帳戶
+ExportDataset_company_1=Third-parties (organizations/natural persons) and attributes
+ExportDataset_company_2=合作方其他聯絡人/地址和屬性
+ExportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_1=合作方及其屬性
 ImportDataset_company_2=合作方其他聯絡人/地址和屬性
-ImportDataset_company_3=合作方銀行帳戶
+ImportDataset_company_3=Third-parties payment modes (bank accounts)
 ImportDataset_company_4=合作方銷售代表（將銷售代表/用戶分配給公司）
 PriceLevel=價格水平
 PriceLevelLabels=價格水平標籤
@@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification.
 ManagingDirectors=主管(們)姓名 (執行長, 部門主管, 總裁...)
 MergeOriginThirdparty=Duplicated third party (the third party you want to delete)
 MergeThirdparties=合併客戶/供應商
-ConfirmMergeThirdparties=您確定要合併此合作方到目前的合作方？所有已連結的項目( 發票、訂單...)將會移到目前的合作方，並刪除被合併的合作方。
+ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted.
 ThirdpartiesMergeSuccess=合作方已合併
 SaleRepresentativeLogin=業務代表的登入
 SaleRepresentativeFirstname=業務代表的名字
@@ -461,3 +462,6 @@ ExternalSystemID=外部系統代號
 IDOfPaymentInAnExternalSystem=在外部系統（如Stripe、Paypal等）中的付款方式代號
 AADEWebserviceCredentials=AADE Web服務憑證
 ThirdPartyMustBeACustomerToCreateBANOnStripe=為了在Stripe端建立合作方的銀行資訊，該合作方必須是一位客戶。
+NewSocNameForClone=New company name
+ConfirmCloneThirdparties=Are you sure that you want to clone <b>%s</b> company ?
+SocialNetworksBusiness=Social networks for company
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index 90641da6468..5951575fbd0 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -88,7 +88,7 @@ PaymentCustomerInvoice=客戶發票付款
 PaymentSupplierInvoice=供應商發票付款
 PaymentSocialContribution=社會/財政稅款付款
 PaymentVat=營業稅付款
-AutomaticCreationPayment=自動記錄付款
+AutomaticCreationPayment=Also record the payment
 ListPayment=付款清單
 ListOfCustomerPayments=客戶付款清單
 ListOfSupplierPayments=供應商付款清單
@@ -118,10 +118,14 @@ SocialContributionsPayments=社會/財政稅金
 ShowVatPayment=顯示營業稅稅金
 TotalToPay=支付總額
 BalanceVisibilityDependsOnSortAndFilters=當表格依照 %s 排序並依照 1 個銀行帳戶過濾（沒有其他過濾器）時，餘額才可顯示在此清單中
+CustomerAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCode=客戶會計代碼
+SupplierAccountancyCodeGeneral=General accounting code
 SupplierAccountancyCode=供應商會計代碼
+UserAccountancyCodeGeneral=General accounting code
 CustomerAccountancyCodeShort=客戶帳戶代碼
 SupplierAccountancyCodeShort=供應商帳戶代碼
+UserAccountancyCodeShort=User account. code
 AccountNumber=科目代碼
 NewAccountingAccount=新帳戶
 Turnover=已開發票營業額
@@ -129,7 +133,9 @@ TurnoverCollected=已收取營業額
 SalesTurnoverMinimum=最低交易額
 ByExpenseIncome=依支出和收入
 ByThirdParties=依合作方
+ByProjects=By projects
 ByUserAuthorOfInvoice=依開發票者
+DetailedListLowercase=detailed list
 CheckReceipt=存款單
 CheckReceiptShort=存款單
 LastCheckReceiptShort=最新%s張存款單
diff --git a/htdocs/langs/zh_TW/datapolicy.lang b/htdocs/langs/zh_TW/datapolicy.lang
index 8ac2178051f..bac52f4ffbe 100644
--- a/htdocs/langs/zh_TW/datapolicy.lang
+++ b/htdocs/langs/zh_TW/datapolicy.lang
@@ -17,8 +17,9 @@ Module4100Name = 資料數據隱私政策
 Module4100Desc = 管理資料數據隱私的模組（符合 GDPR）
 # Administration page
 datapolicySetup = 資料數據隱私政策模組設定
-Deletion = 刪除資料
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below).
+DataDeletion=刪除資料
+DataAnonymization=Anonymization of data
+datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s 個月
 ONE_YEAR = 1年
 NB_YEARS = %s 年
@@ -33,12 +34,14 @@ DATAPOLICY_CONTACT_PROSPECT_CLIENT = 潛在方/客戶
 DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = 非潛在方或客戶
 DATAPOLICY_CONTACT_FOURNISSEUR = 供應商
 DATAPOLICY_ADHERENT = 會員
-DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged.
+DATAPOLICY_Tooltip_SETUP=The anonymization is done by the scheduled job "%s" ran by the module "%s", so this module must be enabled and working correctly.
 SendAgreementText = 您可以向所有相關的聯絡人發送 GDPR 電子郵件（尚未收到過電子郵件且您尚未記錄有關其 GDPR 協議的任何信息）。要執行此操作，請使用以下按鈕。
 SendAgreement = 發送電子郵件
 AllAgreementSend = 所有電子郵件已發送
 TXTLINKDATAPOLICYACCEPT = “同意”的超連結文字
 TXTLINKDATAPOLICYREFUSE = Text for the link "disagreement"
+DelayForAnonymization=Delay for anonymization
+DelayForDeletion=Delay for deletion
 # Extrafields
 DATAPOLICY_BLOCKCHECKBOX = GDPR：個人數資料處理
 DATAPOLICY_consentement = 同意個人數據處理
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 94e7e9c51ee..4eb1f57beae 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -60,6 +60,7 @@ ErrorInAddAttachmentsImageBaseIsSrcData=Error in creating image files (found as
 ErrorFailedToCreateDir=無法建立資料夾。檢查網頁伺服器中的用戶有權限寫入Dolibarr檔案資料夾。如果PHP使用了參數<b>safe_mode</b>，檢查網頁伺服器的用戶（或群組）擁有Dolibarr php檔案。
 ErrorNoMailDefinedForThisUser=沒有此用戶的定義郵件
 ErrorSetupOfEmailsNotComplete=電子郵件設定未完成
+ErrorAccountingClosureSetupNotComplete=Setup of closure accounts not complete
 ErrorFeatureNeedJavascript=This feature needs JavaScript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=一個類型'頂部'選單不能有一個母選單。在母選單填入0或選擇一個類型為'左'的選單。
 ErrorLeftMenuMustHaveAParentId=一個類型為'左'的選單必須有一個母選單的ID。
@@ -76,6 +77,7 @@ ErrorUploadBlockedByAddon=PHP / Apache的插件已阻擋上傳。
 ErrorFileSizeTooLarge=檔案過大或未提供檔案。
 ErrorFieldTooLong=欄位%s太長。
 ErrorSizeTooLongForIntType=位數超過int類型（最大位數%s）
+ErrorSizeForStarsType=The star size must be a number between 1 and 10
 ErrorSizeTooLongForVarcharType=位數超過字串類型（最大位數%s）
 ErrorNoValueForSelectType=請填寫所選清單的值
 ErrorNoValueForCheckBoxType=請填寫複選框清單的值
@@ -138,8 +140,9 @@ ErrorBadValueForCode=安全代碼有錯誤的值。請嘗試新的值...
 ErrorBothFieldCantBeNegative=欄位%s和%s不能都為負值
 ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in third-party card) and apply it to the invoice.
 ErrorLinesCantBeNegativeForOneVATRate=對於不為零的營業稅，行總數（稅後淨值）不能為負（找到一個總計為負值的營業稅<b> %s </b> %%）。
-ErrorLinesCantBeNegativeOnDeposits=存款中的行數不能為負。如果您需要在最終發票中消耗定金，會遇到問題。
+ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a down payment. You will face problems when you will need to consume the deposit in final invoice if you do so.
 ErrorQtyForCustomerInvoiceCantBeNegative=客戶發票行的數量不能為負值
+ErrorQtyForSupplierInvoiceCantBeNegative=Quantity for line into supplier invoices can't be negative
 ErrorWebServerUserHasNotPermission=用戶帳戶<b>%s</b>沒有權限用來執行網頁伺服器
 ErrorNoActivatedBarcode=沒有啟動的條碼類型
 ErrUnzipFails=無法使用ZipArchive解壓縮%s
@@ -340,6 +343,13 @@ ErrorEndHourIsNull=End date field cannot be empty
 ErrorStartHourIsNull=Start date field cannot be empty
 ErrorTooManyLinesToProcessPleaseUseAMoreSelectiveFilter=Too many lines to process. Please use a more selective filter.
 ErrorEmptyValueForQty=Quantity cannot be zero.
+ErrorNoCloneWithoutName=The new user must have a name
+ErrorNoCloneWithoutEmail=The new user must have an email
+ErrorUserClone=Error in user clone categories
+ErrorQtyOrderedLessQtyShipped = The quantity ordered cannot be less than the quantity shipped.
+ErrorVariousPaymentOnBankAccountWithADifferentCurrencyNotYetSupported=Error, creating a various payment on a bank account with a currency different than the currency of the company is not yet supported.
+ErrorStreamMustBeEnabled=The PHP stream %s is not available. Check your PHP modules and Dolibarr parameter $dolibarr_main_stream_to_disable.
+ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment=Error, you try to pay different invoices with different currencies in the same payment
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=您的PHP參數upload_max_filesize（%s）高於PHP參數post_max_size（%s）。這不是相同的設定。
 WarningPasswordSetWithNoAccount=為此會員設定了密碼。但是，沒有建立用戶帳戶。因此，雖然密碼已儲存，但不能用於登入Dolibarr。外部模組/界面可以使用它，但是如果您不需要為會員定義任何登入名稱或密碼，則可以從會員模組設定中關閉選項“管理每個會員的登入名稱”。如果您需要管理登入名稱但不需要任何密碼，則可以將此欄位保留為空白以避免此警告。注意：如果會員連結到用戶，電子郵件也可以用作登入名稱。
@@ -388,6 +398,10 @@ WarningParentIDDoesNotExistAnymore=This parent ID does not exists anymore
 WarningReadBankAlsoAllowedIfUserHasPermission=Warning, reading bank account is also allowed with the permission to Manage chart of account
 WarningNoDataTransferedInAccountancyYet=Please note, there is no data in the accounting table. Please transfer your data recorded in the application to the accounting section or change the calculation mode to analyze the data recorded outside of accounting.
 WarningChangingThisMayBreakStopTaskScheduler=Warning, changing this value may disable the scheduler
+WarningAmountOfFileDiffersFromSumOfLines=Warning, amount of file (%s) differs from the sum of lines (%s)
+WarningModuleAffiliatedToAReportedCompany=Warning, this module has been reported to the Dolibarr foundation as being published by a company using illegal practices (non-compliance with the rules for using the Dolibarr brand, collecting your data without your consent or deploying malware).
+WarningModuleAffiliatedToAPiratPlatform=Be careful when getting a module (paid or free) from a suspicious non official platform like %s
+
 SwissQrOnlyVIR = SwissQR invoice can only be added on invoices set to be paid with credit transfer payments.
 SwissQrCreditorAddressInvalid = Creditor address is invalid (are ZIP and city set? (%s)
 SwissQrCreditorInformationInvalid = Creditor information is invalid for IBAN (%s): %s
@@ -423,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
diff --git a/htdocs/langs/zh_TW/exports.lang b/htdocs/langs/zh_TW/exports.lang
index 0c058afb5af..5425e613ef4 100644
--- a/htdocs/langs/zh_TW/exports.lang
+++ b/htdocs/langs/zh_TW/exports.lang
@@ -46,10 +46,16 @@ LineLabel=標籤
 LineDescription=說明
 LineUnitPrice=單價
 LineVATRate=營業稅率
+LineLT1Rate=Tax 2 rate for line
+LineLT2Rate=Tax 3 rate for line
+LineLT1Type=Tax 2 type for line
+LineLT2Type=Tax 3 type for line
 LineQty=數量
 LineTotalHT=不含稅金額
 LineTotalTTC=含稅金額
 LineTotalVAT=營業稅金額
+LineTotalLT1=Amount of tax 2 for line
+LineTotalLT2=Amount of tax 3 for line
 TypeOfLineServiceOrProduct=類型（0 =產品，1 =服務）
 FileWithDataToImport=匯入有資料的檔案
 FileToImport=欲匯入的來源檔案
@@ -61,7 +67,7 @@ ChooseFormatOfFileToImport=通過點選%s圖示選擇要匯入的檔案格式...
 ChooseFileToImport=上傳檔案，然後點擊%s圖示以選擇要匯入的檔案...
 SourceFileFormat=來源檔案格式
 FieldsInSourceFile=來源檔案欄位
-FieldsInTargetDatabase=Dolibarr資料庫中的目標欄位（粗體=必填）
+FieldsInTargetDatabase=Target fields in Dolibarr database
 NoFields=沒有欄位
 MoveField=移動欄位行號 %s
 ExampleOfImportFile=匯入檔案的範例
@@ -76,8 +82,8 @@ NowClickToTestTheImport=檢查檔案的格式（欄位與字串定界符）是
 RunSimulateImportFile=執行匯入模擬
 FieldNeedSource=此欄位需要從來源檔案獲取資料
 SomeMandatoryFieldHaveNoSource=一些必填欄位在資料檔案中沒有來源
-InformationOnSourceFile=來源檔案資訊
-InformationOnTargetTables=目標欄位資訊
+InformationOnSourceFile=來源檔案
+InformationOnTargetTables=Target fields
 SelectAtLeastOneField=在欄位欄中至少切換一個來源欄位以進行匯出
 SelectFormat=選擇匯入檔案格式
 RunImportFile=匯入資料
diff --git a/htdocs/langs/zh_TW/hrm.lang b/htdocs/langs/zh_TW/hrm.lang
index 341cec4aa3b..fac367371a3 100644
--- a/htdocs/langs/zh_TW/hrm.lang
+++ b/htdocs/langs/zh_TW/hrm.lang
@@ -46,11 +46,11 @@ NewEval=New competency assessment
 ValidateEvaluation=Validate competency assessment
 ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
 EvaluationCard=Competency assessment
-RequiredRank=工作簡介所需的等級
-RequiredRankShort=Required rank
+RequiredRank=Required level for the job profile
+RequiredRankShort=Required level
 PositionsWithThisProfile=Positions with this job profiles
-EmployeeRank=此技能的員工等級
-EmployeeRankShort=Employee rank
+EmployeeRank=Employee level for this skill
+EmployeeRankShort=Employee level
 EmployeePosition=員工職位
 EmployeePositions=員工職位
 EmployeesInThisPosition=此職位的員工
@@ -72,6 +72,9 @@ AddSkill=Add skills to job profile
 RequiredSkills=Required skills for this job profile
 UserRank=用戶等級
 SkillList=技能清單
+SkillCreated=%s skills created
+SkillRank=Skill rank
+ShowSkillRank=Show skill rank
 SaveRank=儲存等級
 TypeKnowHow=Know-how
 TypeHowToBe=怎樣成為
@@ -95,3 +98,5 @@ NeedBusinessTravels=需要出差
 NoDescription=沒有說明
 TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
 PDFStandardHrmEvaluation=Standard template to generate a PDF document for a competency assessment
+SkillNotRequired=Skill not required
+LinkToUserCreated=Link to an employee if the applicant has been hired and converted into a user.
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index 359cc9cafb7..eaf50e832b7 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=寄送電子郵件
 EMailing=電子郵件
-EMailings=電子郵件
+EMailings=Mass EMails
 SMSings=SMSings
-AllEMailings=所有電子郵件
+AllEMailings=All mass eMails
 MailCard=電子郵件卡片
 MailRecipients=收件人
 MailRecipient=收件人
@@ -26,17 +26,19 @@ MailFile=附加檔案
 MailMessage=電子郵件內容
 SubjectNotIn=不在主題中
 BodyNotIn=不在內容中
-ShowEMailing=顯示電子郵件
-ListOfEMailings=電子郵件清單
-NewMailing=新電子郵件
+ShowEMailing=Show mass Email
+ListOfEMailings=List of mass Email
+NewMailing=New mass Email
 NewSMSing=New smsing
-EditMailing=編輯電子郵件
-ResetMailing=重新發送電子郵件
-DeleteMailing=刪除電子郵件
-PreviewMailing=預覽電子郵件
-CreateMailing=建立電子郵件
+EditMailing=Edit mass Email
+ResetMailing=Resend mass Email
+ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets status in error
+ResetMailingTargetMassaction=Reset status in error
+DeleteMailing=Delete mass Email
+PreviewMailing=Preview mass Email
+CreateMailing=Create mass Email
 TestMailing=測試
-ValidMailing=有效的電子郵件
+ValidMailing=Valid mass Email
 MailingStatusDraft=草案
 MailingStatusValidated=已驗證
 MailingStatusSent=已寄出
@@ -53,6 +55,7 @@ ErrorMailRecipientIsEmpty=電子郵件收件人是空的
 WarningNoEMailsAdded=沒有新的電子郵件可增加到收件人清單。
 ConfirmValidMailing=您確定要驗證此電子郵件嗎？
 ConfirmResetMailing=警告，通過重新初始化電子郵件<b>%s</b> ，您可以批次發送此電子郵件。你確定要這麼做嗎？
+ConfirmResetMailingTargetMassactionQuestion=Are you sure you want to reset the status of the selected recipients (this may means that email will be resent if you use the Send email feature of the emailing) ?
 ConfirmDeleteMailing=您確定要刪除此電子郵件嗎？
 NbOfUniqueEMails=唯一電子郵件的數量
 NbOfUniquePhones=No. of unique phones
@@ -105,24 +108,24 @@ EmailCollectorFilterDesc=All filters must match to have an email being collected
 LineInFile=在檔案%s的行
 RecipientSelectionModules=已定義收件人的選擇要求
 MailSelectedRecipients=已選擇收件人
-MailingArea=電子郵件區域
-LastMailings=最新%s的電子郵件
+MailingArea=Mass Emails
+LastMailings=Latest %s mass emails
 TargetsStatistics=目標統計
 NbOfCompaniesContacts=獨特的聯絡人/地址
 MailNoChangePossible=已驗證電子郵件的收件人無法更改
-SearchAMailing=搜尋郵件
-SendMailing=發送郵件
+SearchAMailing=Search a mass Email
+SendMailing=Send mass Email
 SentBy=寄件人
 AdvancedAlternative=Advanced alternative
 MailingNeedCommand=可以從命令行發送電子郵件。請您的伺服器管理員啟動以下命令，以將電子郵件發送給所有收件人：
 MailingNeedCommand2=您可以透過增加MAILING_LIMIT_SENDBYWEB參數並設定每次程序中可發送最大電子郵件數量以線上發送。啟動此功能，請前往首頁-設定-其他。
 ConfirmSendingEmailing=如果要直接從此畫面發送電子郵件，請確認您確定要立即從瀏覽器發送電子郵件嗎？
-LimitSendingEmailing=注意：出於安全性和超時的原因，從Web界面多次進行發送電子郵件已完成，每次發送程序皆一個收件人<b>%s</b> 。
+LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=清除清單
 ToClearAllRecipientsClickHere=點擊這裏以清除此電子郵件的收件人清單
 ToAddRecipientsChooseHere=從清單中增加收件人
-NbOfEMailingsReceived=收到大量電子郵件
-NbOfEMailingsSend=已發送批次電子郵件
+NbOfEMailingsReceived=Mass emails received
+NbOfEMailingsSend=Mass emails sent
 IdRecord=ID記錄
 DeliveryReceipt=已讀取回條。
 YouCanUseCommaSeparatorForSeveralRecipients=您可以使用<b>逗號</b>來指定多個收件人。
@@ -139,8 +142,10 @@ NoNotificationsWillBeSent=沒有為此類型事件和公司計畫的自動電子
 ANotificationsWillBeSent=1條自動通知將以電子郵件寄送
 SomeNotificationsWillBeSent=%s的自動通知將以電子郵件寄送
 AddNewNotification=訂閱一個新的自動電子郵件提醒(目標/事件 )
-ListOfActiveNotifications=Active subscriptions (targets/events) for automatic email notification
+ListOfActiveNotifications=Active subscriptions
+ListOfActiveNotificationsHelp=List of couple %s/%s subscribed for automatic email notification
 ListOfNotificationsDone=Automatic email notifications sent
+ListOfNotificationsDoneHelp=List of past email notifications sent
 MailSendSetupIs=電子郵件發送的設定已設定為“ %s”。此模式不能用於發送批次電子郵件。
 MailSendSetupIs2=您必須先使用管理員帳戶進入選單%s首頁-設定-EMails%s以將參數<strong>'%s'</strong>更改為使用模式 '%s'。使用此模式 ，您可以輸入Internet服務供應商提供的SMTP伺服器的設定，並使用批次電子郵件功能。
 MailSendSetupIs3=如果對如何設定SMTP伺服器有任何疑問，可以詢問%s。
@@ -150,7 +155,7 @@ UseFormatFileEmailToTarget=匯入檔案的格式必須為<strong>電子郵件; 
 UseFormatInputEmailToTarget=輸入字串格式為<strong>電子郵件; 姓;名;其他</strong>
 MailAdvTargetRecipients=收件人（進階選項）
 AdvTgtTitle=填寫輸入欄位以預先選擇合作方或聯絡人/地址
-AdvTgtSearchTextHelp=使用%%作為通用字元。例如，要尋找像是<b>jean，joe，jim</b>的所有項目，可以輸入 <b>j%%</b> ，也可以使用;作為數值的分隔字元，並使用！排除此值。例如 <b>%%jean;joe;jim%%;!jimo;!jima%</b> 將會指向所有沒有jimo與所有以jima開始的jean,joe
+AdvTgtSearchTextHelp=使用 %% 作為通配符。例如，要尋找所有類似<b>jean, joe, jim</b> 的項目，您可以輸入<span class='notransnolate' > <b></span>j%%</b>，您也可以使用 ;作為值的分隔符，並使用 !除了這個值。例如<b>jean;joe;jim%%;!jimo;!jima<span class='no637007601b70fnod] ></b> 將定位所有jean、joe、以jim 開頭的內容，但不定位jimo 以及以jima 開頭的所有內容
 AdvTgtSearchIntHelp=使用空格選擇整數或浮點值
 AdvTgtMinVal=最小值
 AdvTgtMaxVal=最大值
@@ -180,7 +185,7 @@ Information=資訊
 ContactsWithThirdpartyFilter=帶有合作方篩選器的聯絡人
 Unanswered=未回應
 Answered=已回覆
-IsNotAnAnswer=未回應（原始電子郵件）
+IsNotAnAnswer=Is not answer (Is an initial email)
 IsAnAnswer=是一封原始電子郵件的回應
 RecordCreatedByEmailCollector=Record created by the Email Collector %s
 DefaultBlacklistMailingStatus=建立新聯絡人時欄位“%s”的預設值
@@ -190,11 +195,12 @@ NoMoreRecipientToSendTo=No more recipient to send the email to
 EmailOptedOut=Email owner has requested to not contact him with this email anymore
 EvenUnsubscribe=Include opt-out emails
 EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Useful for mandatory service emails for example.
-XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s operations done)
 YouCanMakeSomeInstructionForEmail=You can make some instructions for your Email (Example: generate image in email template...)
 ModelTemplate=Email template
 YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI
 TitleOfMailHolder=Title of the e-mail goes here
 ContentOfMailHolder=Content of email goes here...
-LastNews=Last News
+LastNews=Latest News
+ListProducts= List of products
 PasswordReset=Password reset
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index 13912845fc0..f5da432c738 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -37,6 +37,7 @@ Translation=翻譯
 Translations=翻譯
 CurrentTimeZone=PHP (伺服器)時區
 EmptySearchString=Enter non empty search criteria
+EnterNonEmptyLinesFirst=enter non empty lines first
 EnterADateCriteria=輸入日期條件
 NoRecordFound=沒有找到任何紀錄
 NoRecordDeleted=沒有刪除記錄
@@ -45,6 +46,7 @@ NoError=沒有錯誤
 Error=錯誤
 Errors=錯誤
 ErrorFieldRequired=欄位'%s'必須輸入
+CustomMandatoryFieldRule=Custom "Mandatory field" rule
 ErrorFieldFormat=欄位'%s'有一個錯誤值
 ErrorFileDoesNotExists=檔案 %s 不存在
 ErrorFailedToOpenFile=無法打開檔案 : %s
@@ -308,6 +310,7 @@ DateBuild=報表產生日期
 DatePayment=付款日期
 DateApprove=核准日期
 DateApprove2=核准日期(第二次核准)
+PendingSince=Pending since
 RegistrationDate=註冊日期
 UserCreation=用戶建立
 UserModification=用戶修改
@@ -495,7 +498,7 @@ ActionRunningNotStarted=開始
 ActionRunningShort=進行中
 ActionDoneShort=已完成
 ActionUncomplete=不完整
-LatestLinkedEvents=最新 %s 已連結的事件
+LatestLinkedEvents=The last %s events
 CompanyFoundation=公司/組織
 Accountant=會計人員
 ContactsForCompany=合作方通訊錄
@@ -721,6 +724,8 @@ TextUsedInTheMessageBody=電子郵件正文
 SendAcknowledgementByMail=傳送確認電子郵件
 SendMail=傳送電子郵件
 Email=電子郵件
+EMail=電子郵件
+EMails=電子郵件
 NoEMail=沒有電子郵件
 AlreadyRead=已讀
 NotRead=未讀
@@ -793,7 +798,7 @@ Notes=備註
 AddNewLine=新增一行
 AddFile=新增檔案
 FreeZone=自由文字產品
-FreeLineOfType=自由輸入項目，輸入：
+FreeLineOfType=Free-text item, type
 CloneMainAttributes=複製物件時複製主要屬性
 ReGeneratePDF=重新產生PDF
 PDFMerge=合併PDF
@@ -879,12 +884,14 @@ toward=往
 Access=存取
 SelectAction=選擇行動
 SelectTargetUser=選擇目標用戶/員工
+ClickToCopyToClipboard=Click to copy to clipboard
 HelpCopyToClipboard=按 Ctrl+C 複製到剪貼簿
 SaveUploadedFileWithMask=用名稱 "<strong>%s</strong>"儲存檔案到伺服器上 (否則用 "%s")
 OriginFileName=原始檔名
 SetDemandReason=設定來源
 SetBankAccount=定義銀行帳號
 AccountCurrency=帳戶幣別
+AccountancyCode=會計代碼
 ViewPrivateNote=檢視備註
 XMoreLines=%s 行(數)被隱藏
 ShowMoreLines=顯示更多/更少行數
@@ -925,6 +932,7 @@ ConfirmMassDeletionQuestion=您確定要刪除%s已選記錄嗎？
 ConfirmMassClone=批次複製確認
 ConfirmMassCloneQuestion=選取專案複製到
 ConfirmMassCloneToOneProject=複製至專案%s
+ObjectClonedSuccessfuly=Object cloned successfully
 RelatedObjects=相關項目
 ClassifyBilled=Classify Billed
 ClassifyUnbilled=Classify Unbilled
@@ -961,10 +969,11 @@ PrivateDownloadLinkDesc=您需要登錄，並且需要有查看或下載檔案
 Download=下載
 DownloadDocument=下載文件
 DownloadSignedDocument=下載已簽名文件
-ActualizeCurrency=更新匯率
+ActualizeCurrency=Use the last known rate of the currency
 Fiscalyear=會計年度
 ModuleBuilder=模組與應用程式建構器
 SetMultiCurrencyCode=設定幣別
+SetMultiCurrencyRate=Set currency rate
 BulkActions=批次動作
 ClickToShowHelp=點擊顯示工具提示
 WebSite=網站
@@ -1104,6 +1113,7 @@ PayedBy=付款者
 PayedTo=受款人
 Monthly=每月
 Quarterly=每季
+Quarter=Quarter
 Annual=每年
 Local=本地
 Remote=遠端
@@ -1146,6 +1156,7 @@ ContactDefault_project_task=任務
 ContactDefault_propal=提案/建議書
 ContactDefault_supplier_proposal=供應商提案/建議書
 ContactDefault_ticket=服務單
+ContactDefault_societe=合作方
 ContactAddedAutomatically=Contact added from third-party contact roles
 More=更多
 ShowDetails=顯示詳細資料
@@ -1242,6 +1253,7 @@ CommercialAffected=指派業務代表
 CommercialsDisaffected=Sales representatives unlinked
 CommercialDisaffected=Sales representative unlinked
 Message=訊息
+Emailing=Emailing
 Progression=進展
 YourMessage=你的訊息
 YourMessageHasBeenReceived=已收到您的訊息，我們會儘快答覆或聯繫您。
@@ -1306,3 +1318,34 @@ TranslationOfKey=Translation of the key AnyTranslationKey
 SignedStatus=Signed status
 NbRecordQualified=Number of qualified records
 auto=auto
+UploadFile=Direct import of document
+OrClickToSelectAFile=or click to select a file on disk
+NetTotal=Net total
+VATAmount=VAT amount
+TotalDiscount=Total discount
+TotalHTBeforeDiscount=Total net before discount
+Contains=Contains
+DoesNotContain=Does not contain
+Is=Is
+IsNot=Is not
+StartsWith=Starts with
+EndsWith=Ends with
+IsBefore=Is before
+IsAfter=Is after
+IsOnOrBefore=Is before or equal
+IsOnOrAfter=Is after or equal
+IsHigherThan=Is higher than
+IsHigherThanOrEqual=Is higher than or equal
+IsLowerThan=Is lower than
+IsLowerThanOrEqual=Is lower than or equal
+addToFilter=增加
+FilterAssistance=Filter editor
+Operator=Operator
+AllFieldsRequired=All fields are required.
+IsDefined=Is defined
+IsNotDefined=Is not defined
+SpecialLine=Special Line
+EcoTax=Eco-Tax
+GroupingLine=Grouping line
+AllTime=從開始
+Transferred=Transferred
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index 51a84a51f90..e30b3f2341d 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -99,8 +99,8 @@ SubscriptionRequiredDesc=If subscription is required, a subscription with a star
 DeleteType=刪除
 VoteAllowed=允許投票
 Physical=個人
-Moral=公司
-MorAndPhy=公司和個人
+Moral=Legal entity
+MorAndPhy=Legal entity and Individual
 Reenable=Re-enable
 ExcludeMember=不包括會員
 Exclude=不包括
@@ -191,7 +191,8 @@ MembersStatisticsByRegion=會員統計(地區)
 NbOfMembers=會員總數
 NbOfActiveMembers=目前活躍會員數
 NoValidatedMemberYet=無已驗證的會員
-MembersByCountryDesc=此畫面顯示依國家/地區劃分的會員統計資訊。圖形取決於Google線上圖形服務，並且僅可在網路連線正常時可用。
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
+MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=此畫面依州/省顯示有關會員的統計資訊。
 MembersByTownDesc=此畫面顯示依城市劃分的會員統計資訊。
 MembersByNature=此畫面依性質顯示有關會員的統計資訊。
@@ -208,25 +209,25 @@ NewMemberbyWeb=增加了新會員。等待核准
 NewMemberForm=新會員表單
 SubscriptionsStatistics=捐款統計
 NbOfSubscriptions=捐款數量
-AmountOfSubscriptions=從捐款中收取的金額
+AmountOfSubscriptions=Amount collected from membership payments
 TurnoverOrBudget=營業額（對於公司）或預算（對於財團）
-DefaultAmount=Default amount of contribution (used only if no amount is defined at member type level)
-MinimumAmount=Minimum amount (used only when contribution amount is free)
-CanEditAmount=Subscription amount can be defined by the member
+DefaultAmount=Default amount of membership payment (used only if no amount is defined at member type level)
+MinimumAmount=Minimum amount of membership payment (has priority on any default amounts)
+CanEditAmount=Membership amount can be defined by the member
 CanEditAmountDetail=Visitor can choose/edit amount of its contribution regardless of the member type
 AmountIsLowerToMinimumNotice=The amount is lower than the minimum %s
 MEMBER_NEWFORM_PAYONLINE=After the online registration, switch automatically to the online payment page
 ByProperties=依照性質
 MembersStatisticsByProperties=會員性質統計
-VATToUseForSubscriptions=VAT rate to use for contributions
-NoVatOnSubscription=捐款不徵收稅金
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=用於發票的捐款欄的產品：%s
+VATToUseForSubscriptions=VAT rate to use for membership payment
+NoVatOnSubscription=No VAT for membership payment
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for membership line into invoice: %s
 NameOrCompany=姓名或公司名稱
 SubscriptionRecorded=捐款已記錄
 NoEmailSentToMember=沒有發送電子郵件給會員
 EmailSentToMember=使用%s發送給會員的電子郵件
-SendReminderForExpiredSubscriptionTitle=以電子郵件發送過期捐款提醒
-SendReminderForExpiredSubscription=Send reminder by email to members when contribution is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired membership
+SendReminderForExpiredSubscription=Send reminder by email to members when membership is about to expire (parameter is number of days before end of membership to send the reminder. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=本期已支付的會費（直到%s）
 YouMayFindYourInvoiceInThisEmail=您可在此電子郵件中找到發票
 XMembersClosed=%s會員已關閉
@@ -237,8 +238,11 @@ CreateDolibarrThirdPartyDesc=A third party is the legal entity that will be used
 MemberFirstname=會員名字
 MemberLastname=會員姓氏
 MemberCodeDesc=Member Code, unique for all members
-MemberSubscriptionStartFirstDayOf=The start date of a membership corresponds to the first day of a
-MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a subscription except renewals (example +3m = +3 months, -5d = -5 days, +1Y = +1 year)
+MemberSubscriptionStartFirstDayOf=Force the suggested date of a membership to corresponds to the first day of a
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a first membership subscription (excluding renewals)
+NoCorrection=No correction
+MemberSubscriptionStartAfterDesc=Example: +3m = +3 months, -5d = -5 days, +1Y = +1 year
+MemberSubscriptionStartAfterDesc2=This is the suggested date when creating a first membership subscription compared to the current date. For renewal, the date suggested by default will remain the end of the previous membership.
 SubscriptionLinkedToConciliatedTransaction=Membership is linked to a conciliated transaction so this modification is not allowed.
 ConfirmMassSubsriptionCreation=Confirm subscription creation
 ConfirmMassSubsriptionCreationQuestion=Are you sure you want to create the %s selected subscription(s)?
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index a09487b88ea..cd8b0a4d56a 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -97,7 +97,6 @@ ShowService=顯示服務
 ProductsAndServicesArea=產品和服務區域
 ProductsArea=產品資訊區
 ServicesArea=服務資訊區
-ListOfStockMovements=庫存轉讓清單
 BuyingPrice=買價
 PriceForEachProduct=有特定價格的產品
 SupplierCard=供應商卡
@@ -145,6 +144,7 @@ WithoutDiscount=無折扣
 VATRateForSupplierProduct=Tax Rate (for this vendor/product)
 DiscountQtyMin=此數量的折扣。
 NoPriceDefinedForThisSupplier=沒有此供應商/產品定義的價格/數量
+NoProductPriceDefinedForThisSupplier=No product price/qty defined for this vendor
 NoSupplierPriceDefinedForThisProduct=沒有定義此產品供應商價格/數量
 PredefinedItem=預定義項目
 PredefinedProducts=預定義產品
@@ -171,7 +171,7 @@ BuyingPrices=採購價格
 CustomerPrices=客戶價格
 SuppliersPrices=供應商價格
 SuppliersPricesOfProductsOrServices=供應商價格（產品或服務）
-CustomCode=海關|商品| HS碼
+CustomCode=Customs|Commodity|HS|TARIC code
 CountryOrigin=原產地
 RegionStateOrigin=原產地
 StateOrigin=州|原產地
@@ -209,6 +209,7 @@ unitL=公升
 unitT=噸
 unitKG=Kg(公斤)
 unitG=公克
+unitGAL=加侖
 unitMG=mg(毫克)
 unitLB=pound(英鎊)
 unitOZ=ounce(盎司)
@@ -311,7 +312,7 @@ GlobalVariableUpdaterHelpFormat1=請求的格式為 {"URL": "http://example.com/
 UpdateInterval=更新間隔（分鐘）
 LastUpdated=最新更新
 CorrectlyUpdated=更新成功
-PropalMergePdfProductActualFile=用於增加到PDF Azur的文件是
+PropalMergePdfProductActualFile=PDF file to include into the PDF proposals if the product is part of the proposal...
 PropalMergePdfProductChooseFile=選擇PDF文件
 IncludingProductWithTag=包含有標籤的產品/服務
 DefaultPriceRealPriceMayDependOnCustomer=預設價格，實際價格可能取決於客戶
@@ -348,6 +349,10 @@ QtyRecalculatedWithPackaging=根據供應商的包裝重新計算了生產線的
 
 #Attributes
 Attributes=屬性
+ProductAttributeExtrafields=Variant attributes extrafields
+ProductAttributeExtrafieldsSetup=Setup of Variant attributes extrafields
+ProductAttributeValueExtrafields=Variant attributes values extrafields
+ProductAttributeValueExtrafieldsSetup=Setup of Variant attributes values extrafields
 VariantAttributes=變異屬性
 ProductAttributes=產品的變異屬性
 ProductAttributeName=變異屬性%s
@@ -395,6 +400,8 @@ ErrorDestinationProductNotFound=找不到目標產品
 ErrorProductCombinationNotFound=找不到產品變數
 ActionAvailableOnVariantProductOnly=僅對產品的變數提供操作
 ProductsPricePerCustomer=每個客戶的產品價格
+ProductLevelExtraFields=Additional Attributes (Level price)
+ProductCustomerExtraFields=Additional Attributes (Customer price)
 ProductSupplierExtraFields=附加屬性（供應商價格）
 DeleteLinkedProduct=刪除連結到組合的子產品
 AmountUsedToUpdateWAP=用於更新加權平均價格的單位金額。
@@ -403,7 +410,8 @@ PMPValueShort=WAP
 mandatoryperiod=強制期限
 mandatoryPeriodNeedTobeSet=注意：必須定義期間（開始和結束日期）
 mandatoryPeriodNeedTobeSetMsgValidate=服務需要有開始與結束的時間
-mandatoryHelper=如果您希望在建立/驗證發票、商業提案/建議書、銷售訂單時向用戶發送訊息，而無需在此服務的行中輸入開始和結束日期，請選此項。 <br> 請注意，該消息是警告而不是封鎖錯誤。
+mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.
+mandatoryHelper2=Note that the message is a warning and not a blocking error.
 DefaultBOM=預設物料清單
 DefaultBOMDesc=推薦用於製造此產品的預設的物料清單。僅當產品性質為“%s”時才能設定此欄位。
 Rank=等級
@@ -435,3 +443,6 @@ AllowStockMovementVariantParentHelp=By default, a parent of a variant is a virtu
 ConfirmSetToDraftInventory=您確定要返回到草案狀態嗎？<br>目前在庫存中設定的數量將被重置。
 WarningLineProductNotToSell=Product or service "%s" is not to sell and was cloned
 PriceLabel=Price label
+GenerateImage=Generate image
+GenerateWithAI=Generate with AI
+PriceByCustomeAndMultiPricesAbility=Different prices for each customer + Multiple price segments per product/service (each customer is in one price segment)
diff --git a/htdocs/langs/zh_TW/salaries.lang b/htdocs/langs/zh_TW/salaries.lang
index 16d456bbb1e..5ee2cb67d58 100644
--- a/htdocs/langs/zh_TW/salaries.lang
+++ b/htdocs/langs/zh_TW/salaries.lang
@@ -9,6 +9,8 @@ NewSalary=新薪資
 AddSalary=新增薪資
 NewSalaryPayment=新薪資卡
 AddSalaryPayment=新增支付薪資
+SalaryID=Salary ID
+SalaryAmount=Salary amount
 SalaryPayment=支付薪資
 SalariesPayments=支付薪資
 SalariesPaymentsOf=%s 的薪資支付
@@ -27,7 +29,7 @@ FillFieldFirst=先填寫員工欄位
 UpdateAmountWithLastSalary=設定為最新一筆薪資的金額
 MakeTransferRequest=建立匯款請求
 VirementOrder=匯款請求
-BankTransferAmount=匯款金額
 WithdrawalReceipt=貸方轉帳訂單
 OrderWaiting=待處理訂單
 FillEndOfMonth=填寫至月底
+UserPaySlip=Pay Slip
diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index 21242feecda..400a8f205dd 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -32,9 +32,8 @@ CreateUser=建立用戶
 LoginNotDefined=登入沒有定義。
 NameNotDefined=名稱沒有定義。
 ListOfUsers=用戶名單
-SuperAdministrator=超級管理員
-SuperAdministratorDesc=全域管理員
-AdministratorDesc=管理員
+SuperAdministrator=Multicompany Administrator
+SuperAdministratorDesc=Multicompany system administrator (can change setup and users)
 DefaultRights=預設權限
 DefaultRightsDesc=在此定義自動授予<u>新</u>用戶的<u>預設</u>權限（要修改現有用戶的權限，請轉到用戶卡）。
 DolibarrUsers=Dolibarr用戶
@@ -70,6 +69,7 @@ LoginAccountDisableInDolibarr=帳戶已停用
 PASSWORDInDolibarr=已修改密碼
 UsePersonalValue=使用個人設定值
 ExportDataset_user_1=用戶及其屬性
+ExportDataset_user_2=List of security events
 DomainUser=網域用戶%s
 Reactivate=重新啟用
 CreateInternalUserDesc=此表單使您可以在公司/組織中建立內部用戶。要建立外部用戶（客戶，供應商等），請使用該第三方聯絡卡中的“建立Dolibarr用戶”按鈕。
@@ -81,7 +81,7 @@ UserWillBeInternalUser=建立的用戶將是一個內部用戶（因為沒有連
 UserWillBeExternalUser=建立的用戶將是外部用戶（因為連結到一個特定的第三方）
 IdPhoneCaller=手機來電者身份
 NewUserCreated=用戶%s已建立
-NewUserPassword=%變動的密碼
+NewUserPassword=%s 的密碼更改
 NewPasswordValidated=您的新密碼已通過驗證，必須立即用於登錄。
 EventUserModified=用戶%s已修改
 UserDisabled=用戶%s已關閉
@@ -112,6 +112,8 @@ DisabledInMonoUserMode=在維護模式下已關閉
 UserAccountancyCode=用戶帳號
 UserLogoff=用戶登出
 UserLogged=用戶登入
+UserLoginFailed=User login failed
+UserPasswordChange=User password change
 DateOfEmployment=到職日期
 DateEmployment=雇傭期間
 DateEmploymentStart=入職日期
@@ -120,10 +122,10 @@ RangeOfLoginValidity=訪問有效日期範圍
 CantDisableYourself=您不能關閉自己的用戶記錄
 ForceUserExpenseValidator=強制使用費用報表驗證
 ForceUserHolidayValidator=強制使用休假請求驗證
-ValidatorIsSupervisorByDefault=預設情況下，驗證者是用戶的主管。保持空白狀態以保持這種行為。
+ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behavior.
 UserPersonalEmail=私人信箱
 UserPersonalMobile=私人手機
-WarningNotLangOfInterface=警告，這是用戶使用的主要語言，而不是他選擇查看的界面語言。要更改該用戶可見的界面語言，請前往分頁%s
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he chose to see. To change the interface language visible by this user, go on tab %s
 DateLastLogin=上次登入日期
 DatePreviousLogin=以前登入的日期
 IPLastLogin=上次登入的IP
@@ -132,3 +134,13 @@ ShowAllPerms=顯示所有權限行
 HideAllPerms=隱藏所有權限行
 UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
 EnablePublicVirtualCard=Enable the user's virtual business card
+ExcludedByFilter=Non qualified by filters but shown to see its hierarchy
+UserEnabledDisabled=User status changed: %s
+AlternativeEmailForOAuth2=Alternative Email for OAuth2 login
+ErrorUpdateCanceledDueToDuplicatedUniqueValue=Error, The update was canceled because one of the pieces of data, that should be unique, already exists
+NewNameUserClone=Full name of the new user
+CloneUserRights=Clone the user's permissions
+CloneCategoriesUser=Clone the user's categories
+ConfirmUserClone=Are you sure you want to clone the user: <b>%s</b>?
+NewEmailUserClone=Email address of the new user
+SocialNetworksUser=Social networks for user
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index 3f4eda6f3ae..12ccf77c2e4 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=使用此處的其他名稱/別名清單，因此也可以
 WEBSITE_CSS_URL=外部CSS檔案的網址
 WEBSITE_CSS_INLINE=CSS檔案內容（所有頁面共有）
 WEBSITE_JS_INLINE=JavaScript file content (common to all pages)
-WEBSITE_HTML_HEADER=附加在HTML標頭底部（所有頁面共有）
+WEBSITE_HTML_HEADER=HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot檔案（robots.txt）
 WEBSITE_HTACCESS=網站 .htaccess 檔案
 WEBSITE_MANIFEST_JSON=網站 manifest.json 檔案
@@ -56,16 +56,17 @@ ReadPerm=閱讀
 WritePerm=寫入
 TestDeployOnWeb=上線 測試/部署
 PreviewSiteServedByWebServer=<u>在新分頁中預覽%s。 </u> <br> <br> %s將由外部Web伺服器（例如Apache，Nginx，IIS）提供服務。您必須先安裝和設定此伺服器，然後再指向目錄：<br> <strong> %s </strong> <br>外部伺服器提供的網址：<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>在新分頁中預覽%s。 </u> <br> <br> Dolibarr伺服器將為%s提供服務，因此不需要安裝任何其他Web伺服器（例如Apache，Nginx，IIS）。 <br>的不便之處在於頁面的URL不友好，並且以您的Dolibarr路徑開始。 <br> URL由Dolibarr提供：<br> <strong> %s </strong> <br> <br>要使用自己的外部Web伺服器來服務於這個網站，在您的Web伺服器上建立一個虛擬主機其指向目錄<br> <strong> %s </strong> <br>然後輸入該虛伺服器的名稱然後點擊此連結"在此網站測試/佈署"。
+PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To deploy or test using your own external web server (like Apache, Nginx, Lighttp) use the link "%s".
 VirtualHostUrlNotDefined=未定義由外部網站伺服器提供服務的虛擬主機網址
 NoPageYet=暫無頁面
 YouCanCreatePageOrImportTemplate=您可以建立一個新頁面或匯入完整的網站模板
 SyntaxHelp=有關特定語法提示的幫助
 YouCanEditHtmlSourceckeditor=您可以使用編輯器中的“Source”按鈕來編輯HTML源代碼。
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper.<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-YouCanEditHtmlSource2=使用有分享連結的影像 (使用檔案的Hash key開啟), 語法為:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
+YouCanEditHtmlSource4=To get the URL of an image inside a html content of an article, use<br><strong>&lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=複製頁面/容器
 CloneSite=複製網站
@@ -87,15 +88,15 @@ WebsiteAccount=網站帳號
 WebsiteAccounts=網站帳號
 AddWebsiteAccount=建立網站帳號
 BackToListForThirdParty=Back to list for the third parties
-DisableSiteFirst=首先停止網站
+DisableSiteFirst=Put website offline first
 MyContainerTitle=我的網站標題
 AnotherContainer=這是如何包含其他頁面/容器內容的方式（如果啟用動態代碼，則可能會出現錯誤，因為嵌入式子容器可能不存在）
 SorryWebsiteIsCurrentlyOffLine=抱歉，此網站目前離線。請稍後再來訪問...
-WEBSITE_USE_WEBSITE_ACCOUNTS=啟用網站帳戶列表
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=啟用表格以存儲每個網站/合作方的網站帳戶（登入/通過）
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=您必須先定義預設首頁
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correctty when used on a grabbed external page.
-OnlyEditionOfSourceForGrabbedContent=從外部網站獲取內容時，只能使用HTML源代碼版本
+OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
 GrabImagesInto=抓取圖像到css和頁面。
 ImagesShouldBeSavedInto=圖片應儲存到目錄中
 WebsiteRootOfImages=網站圖片的根目錄
@@ -256,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account
 filteredByVersion=Filtered by version
 removeFilter=刪除篩選器
 viewMyCart=View my shopping cart
+Shipping=Shipping
 freeShipping=Free shipping!
 noProducts=No products
 nbrItemsInCart=There are <span class="ajax_cart_quantity">0</span> items in your cart.
@@ -271,7 +273,8 @@ totalTaxIncl=Total (tax incl.)
 clickToClose=Click to close
 sidebarCategories=分類
 noSubCat=NoSubCat
-specialPromo=Specials promotions
+specialPromo=Promotions
+allSpecials=All promotions
 newProducts=New products
 allNewProducts= All new products
 view=View:
@@ -283,12 +286,13 @@ productNameAToZ=Product Name: A to Z
 productNameZToA=Product Name: Z to A
 referenceLowestFirst=Reference: Lowest first
 referenceHighestFirst=Reference: Highest first
+productPerPage=products per page
 perPage=per page
 showAll=Show all
 showing= Showing
 nbrOfProducts= There are %s products.
 noResultsHaveBeenFound=0 results have been found.
-noResultsWereFound= No results were found.
+noResultsWereFound=No results were found.
 addToCart=Add to cart
 backHome=Return to Home
 priceDrop=Price drop
@@ -301,10 +305,11 @@ lastUpdate=Last update
 contactSupport=How to contact support
 noProductToDisplay=Error, No product to display
 yourCompanyInformation=Your company information
+yourBillingInformation=Your billing information
 emailAlreadyRegistered=This email is already registered.
 firstnameContainsLettersOnly=<b>Firstname</b> must contain letters and spaces only
 lastnameContainsLettersOnly=<b>Lastname</b> must contain letters and spaces only
-passwordCriteria=<b>Password</b> must meet the following criteria:<br>- 12 characters<br>- 1 uppercase letter<br>- 1 digit<br>- No special characters<br>- Avoid repeating characters more than 3 times<br>
+passwordCriteria=<b>Password</b> must meet the following criteria:<br>- At least 12 characters<br>- At lest 1 uppercase letter<br>- At least 1 digit<br>- At last 1 special characters<br>- Avoid repeating characters more than 3 times<br>
 errorOccurred=An error has occurred.
 accountCreation=Create an account
 errorsOccurred=There are %s error%s
@@ -356,3 +361,7 @@ subtract=Subtract
 LoginCheckout=Login & Proceed to checkout
 paymentSuccessProcessed=Your payment has been successfully processed.
 youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly.
+WebPortalSetupNotComplete=Web portal setup is not complete
+DeleteWebsiteAccount=Delete website account
+ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account.
+ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible.

From 17d1c279abfcb64b1fda7b88615d6c27f359a2c1 Mon Sep 17 00:00:00 2001
From: tnegre <tnegre@open-dsi.fr>
Date: Tue, 28 Jan 2025 14:44:10 +0100
Subject: [PATCH 286/602] action/list.php : replace comma-joins by INNER JOIN

---
 htdocs/comm/action/list.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index d3d1ecfb833..cbe3f8b94ee 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -442,20 +442,19 @@ if (empty($user->rights->societe->client->voir) && !$socid) {
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
-$sql .= " ,".MAIN_DB_PREFIX."c_actioncomm as c";
+$sql .= " INNER JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action";
 // We must filter on resource table
 if ($resourceid > 0) {
-	$sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
+	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as r ON r.element_type = 'action' AND r.element_id = a.id";
 }
 // We must filter on assignement table
 if ($filtert > 0 || $usergroup > 0) {
-	$sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as ar ON ar.fk_actioncomm = a.id AND ar.element_type='user'";
 }
 if ($usergroup > 0) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
 }
-$sql .= " WHERE c.id = a.fk_action";
-$sql .= ' AND a.entity IN ('.getEntity('agenda').')';
+$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
 // Condition on actioncode
 if (!empty($actioncode)) {
 	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
@@ -486,7 +485,7 @@ if (!empty($actioncode)) {
 	}
 }
 if ($resourceid > 0) {
-	$sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".((int) $resourceid);
+	$sql .= " AND r.resource_id = ".((int) $resourceid);
 }
 if ($pid) {
 	$sql .= " AND a.fk_project=".((int) $pid);
@@ -497,10 +496,6 @@ if (empty($user->rights->societe->client->voir) && !$socid) {
 if ($socid > 0) {
 	$sql .= " AND s.rowid = ".((int) $socid);
 }
-// We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0) {
-	$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
-}
 if ($type) {
 	$sql .= " AND c.id = ".((int) $type);
 }

From bdcd7b5ef399ab26c6774119d28ce7ba572e7012 Mon Sep 17 00:00:00 2001
From: Irvine Fleith <irvine.fleith@atm-consulting.fr>
Date: Tue, 28 Jan 2025 14:47:10 +0100
Subject: [PATCH 287/602] fix(services-list): added missing hook
 printFieldListWhere

---
 htdocs/contrat/services_list.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 7b75c4aa9d3..0b3666a295e 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -348,6 +348,11 @@ if (!empty($filter_opcloture) && $filter_opcloture == ' BETWEEN ') {
 }
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
 $sql .= $db->order($sortfield, $sortorder);
 
 //print $sql;

From d71fe80ed75e366847dbbbe033529f49e9d55463 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 28 Jan 2025 14:49:36 +0100
Subject: [PATCH 288/602] Debug v21

---
 htdocs/product/class/product.class.php | 83 ++++++++------------------
 1 file changed, 25 insertions(+), 58 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index fa3cc2b2d4e..dd3edfcced0 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3304,8 +3304,8 @@ class Product extends CommonObject
 			$sql .= " SUM(mp.qty) as qty";
 			$sql .= " FROM ".$this->db->prefix()."mrp_mo as c";
 			$sql .= " INNER JOIN ".$this->db->prefix()."mrp_production as mp ON mp.fk_mo=c.rowid";
-			if (!$user->hasRight('societe', 'client', 'voir')) {
-				$sql .= " INNER JOIN ".$this->db->prefix()."societe_commerciaux as sc ON sc.fk_soc=c.fk_soc AND sc.fk_user = ".((int) $user->id);
+			if (empty($user->fk_soc) && !$user->hasRight('societe', 'client', 'voir')) {	// For external user, restriction is done on filter on fk_soc directly
+				$sql .= " INNER JOIN ".$this->db->prefix()."societe_commerciaux as sc ON sc.fk_soc = c.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
 			$sql .= " WHERE ";
 			$sql .= " c.entity IN (".getEntity('mo').")";
@@ -3363,7 +3363,7 @@ class Product extends CommonObject
 		$sql = "SELECT COUNT(DISTINCT b.rowid) as nb_toproduce,";
 		$sql .= " SUM(b.qty) as qty_toproduce";
 		$sql .= " FROM ".$this->db->prefix()."bom_bom as b";
-		$sql .= " INNER JOIN ".$this->db->prefix()."bom_bomline as bl ON bl.fk_bom=b.rowid";
+		$sql .= " INNER JOIN ".$this->db->prefix()."bom_bomline as bl ON bl.fk_bom = b.rowid";
 		$sql .= " WHERE ";
 		$sql .= " b.entity IN (".getEntity('bom').")";
 		$sql .= " AND b.fk_product =".((int) $this->id);
@@ -3427,15 +3427,12 @@ class Product extends CommonObject
 		$sql .= " FROM ".$this->db->prefix()."propaldet as pd";
 		$sql .= ", ".$this->db->prefix()."propal as p";
 		$sql .= ", ".$this->db->prefix()."societe as s";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
-			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
-		}
 		$sql .= " WHERE p.rowid = pd.fk_propal";
 		$sql .= " AND p.fk_soc = s.rowid";
 		$sql .= " AND p.entity IN (".getEntity('propal').")";
 		$sql .= " AND pd.fk_product = ".((int) $this->id);
-		if (!$user->hasRight('societe', 'client', 'voir')) {
-			$sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+		if (empty($user->fk_soc) && !$user->hasRight('societe', 'client', 'voir')) {	// For external user, restriction is done on filter on fk_soc directly
+			$sql .= " INNER JOIN ".$this->db->prefix()."societe_commerciaux as sc ON sc.fk_soc = p.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		//$sql.= " AND pr.fk_statut != 0";
 		if ($socid > 0) {
@@ -3502,15 +3499,12 @@ class Product extends CommonObject
 		$sql .= " FROM ".$this->db->prefix()."supplier_proposaldet as pd";
 		$sql .= ", ".$this->db->prefix()."supplier_proposal as p";
 		$sql .= ", ".$this->db->prefix()."societe as s";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
-			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
-		}
 		$sql .= " WHERE p.rowid = pd.fk_supplier_proposal";
 		$sql .= " AND p.fk_soc = s.rowid";
 		$sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
 		$sql .= " AND pd.fk_product = ".((int) $this->id);
-		if (!$user->hasRight('societe', 'client', 'voir')) {
-			$sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+		if (empty($user->fk_soc) && !$user->hasRight('societe', 'client', 'voir')) {	// For external user, restriction is done on filter on fk_soc directly
+			$sql .= " INNER JOIN ".$this->db->prefix()."societe_commerciaux as sc ON sc.fk_soc = p.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		//$sql.= " AND pr.fk_statut != 0";
 		if ($socid > 0) {
@@ -3558,15 +3552,12 @@ class Product extends CommonObject
 		$sql .= " FROM ".$this->db->prefix()."commandedet as cd";
 		$sql .= ", ".$this->db->prefix()."commande as c";
 		$sql .= ", ".$this->db->prefix()."societe as s";
-		if (!$user->hasRight('societe', 'client', 'voir') && !$forVirtualStock) {
-			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
-		}
 		$sql .= " WHERE c.rowid = cd.fk_commande";
 		$sql .= " AND c.fk_soc = s.rowid";
 		$sql .= " AND c.entity IN (".getEntity($forVirtualStock && getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'commande').")";
 		$sql .= " AND cd.fk_product = ".((int) $this->id);
-		if (!$user->hasRight('societe', 'client', 'voir') && !$forVirtualStock) {
-			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+		if (empty($user->fk_soc) && !$user->hasRight('societe', 'client', 'voir') && !$forVirtualStock) {	// For external user, restriction is done on filter on fk_soc directly
+			$sql .= " INNER JOIN ".$this->db->prefix()."societe_commerciaux as sc ON sc.fk_soc = c.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($socid > 0) {
 			$sql .= " AND c.fk_soc = ".((int) $socid);
@@ -3686,15 +3677,12 @@ class Product extends CommonObject
 		$sql .= " FROM ".$this->db->prefix()."commande_fournisseurdet as cd";
 		$sql .= ", ".$this->db->prefix()."commande_fournisseur as c";
 		$sql .= ", ".$this->db->prefix()."societe as s";
-		if (!$user->hasRight('societe', 'client', 'voir') && !$forVirtualStock) {
-			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
-		}
 		$sql .= " WHERE c.rowid = cd.fk_commande";
 		$sql .= " AND c.fk_soc = s.rowid";
 		$sql .= " AND c.entity IN (".getEntity($forVirtualStock && getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'supplier_order').")";
 		$sql .= " AND cd.fk_product = ".((int) $this->id);
-		if (!$user->hasRight('societe', 'client', 'voir') && !$forVirtualStock) {
-			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+		if (empty($user->fk_soc) && !$user->hasRight('societe', 'client', 'voir') && !$forVirtualStock) {	// For external user, restriction is done on filter on fk_soc directly
+			$sql .= " INNER JOIN ".$this->db->prefix()."societe_commerciaux as sc ON sc.fk_soc = c.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($socid > 0) {
 			$sql .= " AND c.fk_soc = ".((int) $socid);
@@ -3749,17 +3737,14 @@ class Product extends CommonObject
 		$sql .= ", ".$this->db->prefix()."commande as c";
 		$sql .= ", ".$this->db->prefix()."expedition as e";
 		$sql .= ", ".$this->db->prefix()."societe as s";
-		if (!$user->hasRight('societe', 'client', 'voir') && !$forVirtualStock) {
-			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
-		}
 		$sql .= " WHERE e.rowid = ed.fk_expedition";
 		$sql .= " AND c.rowid = cd.fk_commande";
 		$sql .= " AND e.fk_soc = s.rowid";
 		$sql .= " AND e.entity IN (".getEntity($forVirtualStock && getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'expedition').")";
 		$sql .= " AND ed.fk_elementdet = cd.rowid";
 		$sql .= " AND cd.fk_product = ".((int) $this->id);
-		if (!$user->hasRight('societe', 'client', 'voir') && !$forVirtualStock) {
-			$sql .= " AND e.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+		if (empty($user->fk_soc) && !$user->hasRight('societe', 'client', 'voir') && !$forVirtualStock) {	// For external user, restriction is done on filter on fk_soc directly
+			$sql .= " INNER JOIN ".$this->db->prefix()."societe_commerciaux as sc ON sc.fk_soc = e.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($socid > 0) {
 			$sql .= " AND e.fk_soc = ".((int) $socid);
@@ -3833,15 +3818,12 @@ class Product extends CommonObject
 		$sql .= " FROM ".$this->db->prefix()."receptiondet_batch as fd";
 		$sql .= ", ".$this->db->prefix()."commande_fournisseur as cf";
 		$sql .= ", ".$this->db->prefix()."societe as s";
-		if (!$user->hasRight('societe', 'client', 'voir') && !$forVirtualStock) {
-			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
-		}
 		$sql .= " WHERE cf.rowid = fd.fk_element";
 		$sql .= " AND cf.fk_soc = s.rowid";
 		$sql .= " AND cf.entity IN (".getEntity($forVirtualStock && getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'supplier_order').")";
 		$sql .= " AND fd.fk_product = ".((int) $this->id);
-		if (!$user->hasRight('societe', 'client', 'voir') && !$forVirtualStock) {
-			$sql .= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+		if (empty($user->fk_soc) && !$user->hasRight('societe', 'client', 'voir') && !$forVirtualStock) {	// For external user, restriction is done on filter on fk_soc directly
+			$sql .= " INNER JOIN ".$this->db->prefix()."societe_commerciaux as sc ON sc.fk_soc = cf.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($socid > 0) {
 			$sql .= " AND cf.fk_soc = ".((int) $socid);
@@ -3897,15 +3879,12 @@ class Product extends CommonObject
 		$sql .= " FROM ".$this->db->prefix()."mrp_production as mp";
 		$sql .= ", ".$this->db->prefix()."mrp_mo as m";
 		$sql .= " LEFT JOIN ".$this->db->prefix()."societe as s ON s.rowid = m.fk_soc";
-		if (!$user->hasRight('societe', 'client', 'voir') && !$forVirtualStock) {
-			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
-		}
 		$sql .= " WHERE m.rowid = mp.fk_mo";
 		$sql .= " AND m.entity IN (".getEntity(($forVirtualStock && getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE')) ? 'stock' : 'mrp').")";
 		$sql .= " AND mp.fk_product = ".((int) $this->id);
 		$sql .= " AND (mp.disable_stock_change IN (0) OR mp.disable_stock_change IS NULL)";
-		if (!$user->hasRight('societe', 'client', 'voir') && !$forVirtualStock) {
-			$sql .= " AND m.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+		if (empty($user->fk_soc) && !$user->hasRight('societe', 'client', 'voir') && !$forVirtualStock) {	// For external user, restriction is done on filter on fk_soc directly
+			$sql .= " INNER JOIN ".$this->db->prefix()."societe_commerciaux as sc ON sc.fk_soc = m.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($socid > 0) {
 			$sql .= " AND m.fk_soc = ".((int) $socid);
@@ -4018,15 +3997,12 @@ class Product extends CommonObject
 		$sql .= " FROM ".$this->db->prefix()."contratdet as cd";
 		$sql .= ", ".$this->db->prefix()."contrat as c";
 		$sql .= ", ".$this->db->prefix()."societe as s";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
-			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
-		}
 		$sql .= " WHERE c.rowid = cd.fk_contrat";
 		$sql .= " AND c.fk_soc = s.rowid";
 		$sql .= " AND c.entity IN (".getEntity('contract').")";
 		$sql .= " AND cd.fk_product = ".((int) $this->id);
-		if (!$user->hasRight('societe', 'client', 'voir')) {
-			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+		if (empty($user->fk_soc) && !$user->hasRight('societe', 'client', 'voir')) {	// For external user, restriction is done on filter on fk_soc directly
+			$sql .= " INNER JOIN ".$this->db->prefix()."societe_commerciaux as sc ON sc.fk_soc = c.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		//$sql.= " AND c.statut != 0";
 		if ($socid > 0) {
@@ -4092,15 +4068,12 @@ class Product extends CommonObject
 		$sql .= " FROM ".$this->db->prefix()."facturedet as fd";
 		$sql .= ", ".$this->db->prefix()."facture as f";
 		$sql .= ", ".$this->db->prefix()."societe as s";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
-			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
-		}
 		$sql .= " WHERE f.rowid = fd.fk_facture";
 		$sql .= " AND f.fk_soc = s.rowid";
 		$sql .= " AND f.entity IN (".getEntity('invoice').")";
 		$sql .= " AND fd.fk_product = ".((int) $this->id);
-		if (!$user->hasRight('societe', 'client', 'voir')) {
-			$sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+		if (empty($user->fk_soc) && !$user->hasRight('societe', 'client', 'voir')) {	// For external user, restriction is done on filter on fk_soc directly
+			$sql .= " INNER JOIN ".$this->db->prefix()."societe_commerciaux as sc ON sc.fk_soc = f.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		//$sql.= " AND f.fk_statut != 0";
 		if ($socid > 0) {
@@ -4167,15 +4140,12 @@ class Product extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."facturedet_rec as fd";
 		$sql .= ", ".MAIN_DB_PREFIX."facture_rec as f";
 		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
-			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		}
 		$sql .= " WHERE f.rowid = fd.fk_facture";
 		$sql .= " AND f.fk_soc = s.rowid";
 		$sql .= " AND f.entity IN (".getEntity('invoice').")";
 		$sql .= " AND fd.fk_product = ".((int) $this->id);
-		if (!$user->hasRight('societe', 'client', 'voir')) {
-			$sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+		if (empty($user->fk_soc) && !$user->hasRight('societe', 'client', 'voir')) {	// For external user, restriction is done on filter on fk_soc directly
+			$sql .= " INNER JOIN ".$this->db->prefix()."societe_commerciaux as sc ON sc.fk_soc = f.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		//$sql.= " AND f.fk_statut != 0";
 		if ($socid > 0) {
@@ -4241,15 +4211,12 @@ class Product extends CommonObject
 		$sql .= " FROM ".$this->db->prefix()."facture_fourn_det as fd";
 		$sql .= ", ".$this->db->prefix()."facture_fourn as f";
 		$sql .= ", ".$this->db->prefix()."societe as s";
-		if (!$user->hasRight('societe', 'client', 'voir')) {
-			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
-		}
 		$sql .= " WHERE f.rowid = fd.fk_facture_fourn";
 		$sql .= " AND f.fk_soc = s.rowid";
 		$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
 		$sql .= " AND fd.fk_product = ".((int) $this->id);
-		if (!$user->hasRight('societe', 'client', 'voir')) {
-			$sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+		if (empty($user->fk_soc) && !$user->hasRight('societe', 'client', 'voir')) {	// For external user, restriction is done on filter on fk_soc directly
+			$sql .= " INNER JOIN ".$this->db->prefix()."societe_commerciaux as sc ON sc.fk_soc = f.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		//$sql.= " AND f.fk_statut != 0";
 		if ($socid > 0) {

From 8d39020f2a0f223ed21d049d19e0de42eefa1a39 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 Jan 2025 14:55:43 +0100
Subject: [PATCH 289/602] Update llx_c_type_contact.sql

---
 htdocs/install/mysql/data/llx_c_type_contact.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql
index 15987bf45ab..d7bbbf77cf2 100644
--- a/htdocs/install/mysql/data/llx_c_type_contact.sql
+++ b/htdocs/install/mysql/data/llx_c_type_contact.sql
@@ -74,10 +74,10 @@ insert into llx_c_type_contact (element, source, code, libelle, active ) values
 insert into llx_c_type_contact (element, source, code, libelle, active ) values ('commande', 'external', 'SHIPPING',      'Contact client livraison commande', 1);
 
 -- Shipment / Expedition
-insert into llx_c_type_contact (element, source, code, libelle, active ) values ('expedition', 'internal', 'SALESREPFOLL',  'Responsable suivi de l\'expédition', 1);
-insert into llx_c_type_contact (element, source, code, libelle, active ) values ('expedition', 'external', 'CUSTOMER',      'Customer shipping contact', 1);
-insert into llx_c_type_contact (element, source, code, libelle, active ) values ('expedition', 'external', 'SHIPPING',      'Loading facility', 1);
-insert into llx_c_type_contact (element, source, code, libelle, active ) values ('expedition', 'external', 'DELIVERY',      'Delivery facility', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('shipping', 'internal', 'SALESREPFOLL',  'Responsable suivi de l''expédition', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('shipping', 'external', 'CUSTOMER',      'Customer shipping contact', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('shipping', 'external', 'SHIPPING',      'Loading facility', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('shipping', 'external', 'DELIVERY',      'Delivery facility', 1);
 
 -- Intervention / Fichinter
 insert into llx_c_type_contact (element, source, code, libelle, active ) values ('fichinter', 'internal', 'INTERREPFOLL',  'Responsable suivi de l''intervention', 1);

From 966d079019c1dda7c3805c02f7926bfccf0563a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Cendrier?= <noe.cendrier@altairis.fr>
Date: Tue, 28 Jan 2025 15:31:08 +0100
Subject: [PATCH 290/602] FIX: implement mdeweerd review

---
 htdocs/comm/propal/class/propaleligne.class.php |  2 +-
 htdocs/commande/class/commande.class.php        |  2 +-
 htdocs/compta/facture/class/facture.class.php   |  2 +-
 htdocs/product/class/product.class.php          |  2 +-
 htdocs/product/price.php                        | 12 ++++++------
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/comm/propal/class/propaleligne.class.php b/htdocs/comm/propal/class/propaleligne.class.php
index c300084d960..67c941e9851 100644
--- a/htdocs/comm/propal/class/propaleligne.class.php
+++ b/htdocs/comm/propal/class/propaleligne.class.php
@@ -343,7 +343,7 @@ class PropaleLigne extends CommonObjectLine
 	 */
 	public $multicurrency_total_ttc;
 
-		/**
+	/**
 	 * @var float
 	 */
 	public $packaging;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 55bc6ff71a1..7afc13938aa 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3185,7 +3185,7 @@ class Commande extends CommonOrder
 				if ($qty < $this->line->packaging) {
 					$qty = $this->line->packaging;
 				} else {
-					if (!empty($this->line->packaging) && ($qty % $this->line->packaging) > 0) {
+					if (!empty($this->line->packaging) && fmod($qty, $this->line->packaging) > 0) {
 						$coeff = intval($qty / $this->line->packaging) + 1;
 						$qty = $this->line->packaging * $coeff;
 						setEventMessage($langs->trans('QtyRecalculatedWithPackaging'), 'mesgs');
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 4964b9d9929..799b0f81835 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4316,7 +4316,7 @@ class Facture extends CommonInvoice
 				if ($qty < $this->line->packaging) {
 					$qty = $this->line->packaging;
 				} else {
-					if (!empty($this->line->packaging) && ($qty % $this->line->packaging) > 0) {
+					if (!empty($this->line->packaging) && fmod($qty, $this->line->packaging) > 0) {
 						$coeff = intval($qty / $this->line->packaging) + 1;
 						$qty = $this->line->packaging * $coeff;
 						setEventMessage($langs->trans('QtyRecalculatedWithPackaging'), 'mesgs');
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 368a44ecd4a..5353e14635c 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1592,7 +1592,7 @@ class Product extends CommonObject
 			$sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id : 'NULL');
 			$sql .= ", mandatory_period = ".($this->mandatory_period);
 			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING') && !empty($this->packaging)) {
-				$sql .= ", packaging = ".($this->packaging);
+				$sql .= ", packaging = " . (int) $this->packaging;
 			}
 			// stock field is not here because it is a denormalized value from product_stock.
 			$sql .= " WHERE rowid = ".((int) $id);
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 1984b661cab..e6aa4101d2f 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -283,7 +283,7 @@ if (empty($reshook)) {
 		$psq = empty($newpsq) ? 0 : $newpsq;
 		$maxpricesupplier = $object->min_recommended_price();
 
-		// Packaging / Conditionnement
+		// Packaging
 		$packaging = getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING') ? GETPOST('packaging') : null;
 
 		if (isModEnabled('dynamicprices')) {
@@ -484,9 +484,9 @@ if (empty($reshook)) {
 		if (!$error) {
 			$db->begin();
 
-			// Packaging / Conditionnement
+			// Packaging
 			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
-				$object->packaging = (double) $packaging;
+				$object->packaging = (float) $packaging;
 			}
 
 			foreach ($pricestoupdate as $key => $val) {
@@ -1429,7 +1429,7 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUS
 	}
 	print '</td></tr>';
 
-	// Packaging / Conditionnement
+	// Packaging
 	if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
 		print '<tr class="field_price_label"><td>'.$form->textwithpicto($langs->trans("PackagingForThisProduct"), $langs->trans("PackagingForThisProductSellDesc")).'</td><td>';
 		print $object->packaging;
@@ -1758,13 +1758,13 @@ if (($action == 'edit_price' || $action == 'edit_level_price') && $object->getRi
 		print '</td>';
 		print '</tr>';
 
-		// Packaging / Conditionnement
+		// Packaging
 		if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
 			print '<tr><td>';
 			print $form->textwithpicto($langs->trans("PackagingForThisProduct"), $langs->trans("PackagingForThisProductSellDesc"));
 			print '</td><td>';
 			$packaging = $object->packaging;
-			print '<input class="flat" name="packaging" size="5" value="'.$packaging.'">';
+			print '<input class="flat" name="packaging" size="5" value="' . price2num($packaging, 2).'">';
 			print '</td>';
 			print '</tr>';
 		}

From 758f1398a896b1d37eb5af7b96a6f226bf7b22a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Cendrier?= <noe.cendrier@altairis.fr>
Date: Tue, 28 Jan 2025 15:37:32 +0100
Subject: [PATCH 291/602] FIX: float is not int

---
 htdocs/install/mysql/migration/21.0.0-22.0.0.sql | 2 +-
 htdocs/install/mysql/tables/llx_product.sql      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/21.0.0-22.0.0.sql b/htdocs/install/mysql/migration/21.0.0-22.0.0.sql
index 0a4b4487eaa..0837bdb61a8 100644
--- a/htdocs/install/mysql/migration/21.0.0-22.0.0.sql
+++ b/htdocs/install/mysql/migration/21.0.0-22.0.0.sql
@@ -49,4 +49,4 @@ ALTER TABLE llx_holiday_config ADD UNIQUE INDEX idx_holiday_config (entity, name
 
 ALTER TABLE llx_societe_account ADD COLUMN ip varchar(250);
 
-ALTER TABLE llx_product ADD COLUMN packaging integer DEFAULT NULL;
\ No newline at end of file
+ALTER TABLE llx_product ADD COLUMN packaging float(24,8) DEFAULT NULL;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index 74e13e24694..83c76684d75 100644
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -111,5 +111,5 @@ create table llx_product
   fk_project                    integer      DEFAULT NULL,           -- Used when product was generated by a project or is specific to a project
   mandatory_period              tinyint      DEFAULT 0,              -- is used to signal to the user that the start and end dates are mandatory for this type of product the fk_product_type == 1 (service) (non-blocking action)
   last_main_doc                 varchar(255),
-  packaging			                integer DEFAULT NULL
+  packaging			                float(24,8) DEFAULT NULL
 )ENGINE=innodb;

From f8ec4c2c91201f87ffeb9f81094f8f9b230b7b15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Cendrier?= <noe.cendrier@altairis.fr>
Date: Tue, 28 Jan 2025 15:46:20 +0100
Subject: [PATCH 292/602] FIX: var type

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 5353e14635c..f3cead94a84 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1592,7 +1592,7 @@ class Product extends CommonObject
 			$sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id : 'NULL');
 			$sql .= ", mandatory_period = ".($this->mandatory_period);
 			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING') && !empty($this->packaging)) {
-				$sql .= ", packaging = " . (int) $this->packaging;
+				$sql .= ", packaging = " . (float) $this->packaging;
 			}
 			// stock field is not here because it is a denormalized value from product_stock.
 			$sql .= " WHERE rowid = ".((int) $id);

From d57de9cc855e3e2a4577fd6195dcf305f29097a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Cendrier?= <noe.cendrier@altairis.fr>
Date: Tue, 28 Jan 2025 15:51:46 +0100
Subject: [PATCH 293/602] FIX: number display format

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

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index e6aa4101d2f..f31469b554e 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1764,7 +1764,7 @@ if (($action == 'edit_price' || $action == 'edit_level_price') && $object->getRi
 			print $form->textwithpicto($langs->trans("PackagingForThisProduct"), $langs->trans("PackagingForThisProductSellDesc"));
 			print '</td><td>';
 			$packaging = $object->packaging;
-			print '<input class="flat" name="packaging" size="5" value="' . price2num($packaging, 2).'">';
+			print '<input class="flat" name="packaging" size="5" value="' . price($packaging, 0, '', 1, -1, 2).'">';
 			print '</td>';
 			print '</tr>';
 		}

From 0dc88fe9ba0f9ab899e2589f49e2c5bef71bb348 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 28 Jan 2025 16:02:23 +0100
Subject: [PATCH 294/602] Fix error management of website module

---
 htdocs/core/lib/website2.lib.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 04a18bc25b3..c52f98d2b91 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -67,8 +67,9 @@ function dolSavePageAlias($filealias, $object, $objectpage)
 	$aliascontent = '<?php'."\n";
 	$aliascontent .= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page\n";
 	$aliascontent .= 'global $dolibarr_main_data_root;'."\n";
-	$aliascontent .= 'if (empty($dolibarr_main_data_root)) require \'./page'.$objectpage->id.'.tpl.php\'; ';
-	$aliascontent .= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
+	$aliascontent .= 'if (empty($dolibarr_main_data_root)) $res=include \'./page'.$objectpage->id.'.tpl.php\'; ';
+	$aliascontent .= 'else $res=include $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
+	$aliascontent .= 'if ($res === false) { http_response_code(500); print \'Failed to make include\'; }'."\n";
 	$aliascontent .= '?>'."\n";
 	$result = file_put_contents($filealias, $aliascontent);
 	if ($result === false) {
@@ -87,8 +88,9 @@ function dolSavePageAlias($filealias, $object, $objectpage)
 		$aliascontent = '<?php'."\n";
 		$aliascontent .= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page\n";
 		$aliascontent .= 'global $dolibarr_main_data_root;'."\n";
-		$aliascontent .= 'if (empty($dolibarr_main_data_root)) require \'../page'.$objectpage->id.'.tpl.php\'; ';
-		$aliascontent .= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
+		$aliascontent .= 'if (empty($dolibarr_main_data_root)) $res=include \'../page'.$objectpage->id.'.tpl.php\'; ';
+		$aliascontent .= 'else $res=include $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
+		$aliascontent .= 'if ($res === false) { http_response_code(500); print \'Failed to make include\'; }'."\n";
 		$aliascontent .= '?>'."\n";
 		$result = file_put_contents($filealiassub, $aliascontent);
 		if ($result === false) {
@@ -110,8 +112,9 @@ function dolSavePageAlias($filealias, $object, $objectpage)
 				$aliascontent = '<?php'."\n";
 				$aliascontent .= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page\n";
 				$aliascontent .= 'global $dolibarr_main_data_root;'."\n";
-				$aliascontent .= 'if (empty($dolibarr_main_data_root)) require \'../page'.$objectpage->id.'.tpl.php\'; ';
-				$aliascontent .= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
+				$aliascontent .= 'if (empty($dolibarr_main_data_root)) $res=include \'../page'.$objectpage->id.'.tpl.php\'; ';
+				$aliascontent .= 'else $res=include $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
+				$aliascontent .= 'if ($res === false) { http_response_code(500); print \'Failed to make include\'; }'."\n";
 				$aliascontent .= '?>'."\n";
 
 				dol_mkdir($dirname.'/'.$sublang);

From bd8b9708cdc0db2bb3a282247d55b09eccb4ccad Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 28 Jan 2025 16:02:30 +0100
Subject: [PATCH 295/602] Doc

---
 htdocs/product/class/product.class.php | 59 ++++++++++++++++++++++++--
 1 file changed, 56 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 7c72797d446..e08295b0b9d 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4156,10 +4156,10 @@ class Product extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Charge tableau des stats facture recurrentes pour le produit/service
+	 *  Load array of statistics for recurring invoice for product/service
 	 *
 	 * @param	int	$socid 	Id societe
-	 * @return	int			Array of stats in $this->stats_facture, <0 if ko or >0 if ok
+	 * @return	int			Array of stats in $this->stats_facturerec, <0 if ko or >0 if ok
 	 */
 	public function load_stats_facturerec($socid = 0)
 	{
@@ -4230,7 +4230,7 @@ class Product extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Charge tableau des stats facture pour le produit/service
+	 *  Load array of statistics for vendor invoice for product/service
 	 *
 	 * @param  int $socid Id societe
 	 * @return int                     Array of stats in $this->stats_facture_fournisseur, <0 if ko or >0 if ok
@@ -4281,6 +4281,59 @@ class Product extends CommonObject
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Load array of statistics for recurring supplier invoice for product/service
+	 *
+	 * 	@param	int	$socid 	Id societe
+	 * 	@return	int			Array of stats in $this->stats_facturefournrec, <0 if ko or >0 if ok
+	 */
+	public function load_stats_facturefournrec($socid = 0)
+	{
+		// phpcs:enable
+		global $user, $hookmanager, $action;
+
+		$sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_suppliers, COUNT(DISTINCT f.rowid) as nb,";
+		$sql .= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det_rec as fd";
+		$sql .= ", ".MAIN_DB_PREFIX."facture_fourn_rec as f";
+		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->hasRight('societe', 'client', 'voir')) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql .= " WHERE f.rowid = fd.fk_facture";
+		$sql .= " AND f.fk_soc = s.rowid";
+		$sql .= " AND f.entity IN (".getEntity('invoice').")";
+		$sql .= " AND fd.fk_product = ".((int) $this->id);
+		if (!$user->hasRight('societe', 'client', 'voir')) {
+			$sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+		}
+		//$sql.= " AND f.fk_statut != 0";
+		if ($socid > 0) {
+			$sql .= " AND f.fk_soc = ".((int) $socid);
+		}
+
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			$this->stats_facturefournrec['suppliers'] = (int) $obj->nb_suppliers;
+			$this->stats_facturefournrec['nb'] = (int) $obj->nb;
+			$this->stats_facturefournrec['rows'] = (int) $obj->nb_rows;
+			$this->stats_facturefournrec['qty'] = $obj->qty ? (float) $obj->qty : 0.0;
+
+			$parameters = array('socid' => $socid);
+			$reshook = $hookmanager->executeHooks('loadStatsSupplierInvoiceRec', $parameters, $this, $action);
+			if ($reshook > 0) {
+				$this->stats_facturefournrec = $hookmanager->resArray['stats_facturefournrec'];
+			}
+
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return an array formatted for showing graphs

From 877b9dc8116ab2f7bddad9af6c9444c0f0de2d95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 28 Jan 2025 18:14:54 +0100
Subject: [PATCH 296/602] fix phpstan

---
 dev/build/phpstan/phpstan-baseline.neon        | 18 ------------------
 .../printsheet/doc/pdf_tcpdflabel.class.php    |  8 ++++----
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index db038b860de..e3836aa28de 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -13758,24 +13758,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
 
-		-
-			message: '#^Parameter \#5 \$x of method pdf_tcpdflabel\:\:writeBarcode\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 3
-			path: ../../../htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
-
-		-
-			message: '#^Parameter \#7 \$w of method pdf_tcpdflabel\:\:writeBarcode\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 6
-			path: ../../../htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
-
-		-
-			message: '#^Parameter \#8 \$h of method pdf_tcpdflabel\:\:writeBarcode\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 6
-			path: ../../../htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
-
 		-
 			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Product given\.$#'
 			identifier: argument.type
diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
index b4c19919715..87ac116b2c3 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
@@ -87,10 +87,10 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 	 * @param string  $code		   code to print
 	 * @param string  $encoding	   type of barcode
 	 * @param boolean $is2d		   true if 2d barcode
-	 * @param int	  $x		   x position in user units
-	 * @param int	  $y		   y position in user units
-	 * @param int	  $w		   width in user units
-	 * @param int	  $h		   height in user units
+	 * @param float	  $x		   x position in user units
+	 * @param float	  $y		   y position in user units
+	 * @param float	  $w		   width in user units
+	 * @param float	  $h		   height in user units
 	 * @return void
 	 */
 	private function writeBarcode(&$pdf, $code, $encoding, $is2d, $x, $y, $w, $h)

From a8d35dc6bb12cb0a56b87a716f0fa7258c7c6cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 28 Jan 2025 18:26:53 +0100
Subject: [PATCH 297/602] fix phpstan

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index e08295b0b9d..78f26ad0c4c 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -14,7 +14,7 @@
  * Copyright (C) 2014		Ion agorria			    <ion@agorria.com>
  * Copyright (C) 2016-2024	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2017		Gustavo Novaro
- * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2019-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023		Benjamin Falière		<benjamin.faliere@altairis.fr>
  * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
  *
@@ -672,6 +672,11 @@ class Product extends CommonObject
 	 */
 	public $stats_facture_fournisseur = array();
 
+	/**
+	 * @var array{}|array{suppliers:int,nb:int,rows:int,qty:float} stats supplier invoices rec
+	 */
+	public $stats_facturefournrec = array();
+
 	/**
 	 * @var int|string Size of image / height
 	 */

From 8ba644340ffbe4a353b0a0f1091afb696fc37a8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 28 Jan 2025 18:33:13 +0100
Subject: [PATCH 298/602] fix phpstan

---
 dev/build/phpstan/phpstan-baseline.neon              | 12 ------------
 htdocs/core/modules/propale/doc/pdf_azur.modules.php |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index e3836aa28de..6c77ede5c0b 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -13920,12 +13920,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
 
-		-
-			message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: ../../../htdocs/core/modules/propale/doc/pdf_azur.modules.php
-
 		-
 			message: '#^Property CommonObject\:\:\$multicurrency_tx \(array\<float\>\|float\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -29988,12 +29982,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/ticket/card.php
 
-		-
-			message: '#^Variable \$limit might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/ticket/card.php
-
 		-
 			message: '#^Variable \$mine might not be defined\.$#'
 			identifier: variable.undefined
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index b443dee4474..8021ef701dc 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -176,7 +176,7 @@ class pdf_azur extends ModelePDFPropales
 	 *  Function to build pdf onto disk
 	 *
 	 *  @param		Propal		$object				Object to generate
-	 *  @param		Translate	$outputlangs		Lang output object
+	 *  @param		?Translate	$outputlangs		Lang output object
 	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *  @param		int<0,1>	$hidedetails		Do not show line details
 	 *  @param		int<0,1>	$hidedesc			Do not show desc

From 23270663dff97324ec0140de89cbec5b950f7271 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 28 Jan 2025 18:43:05 +0100
Subject: [PATCH 299/602] fix phpstan

---
 dev/build/phpstan/phpstan-baseline.neon              | 6 ------
 htdocs/core/modules/propale/doc/pdf_cyan.modules.php | 2 +-
 htdocs/product/class/product.class.php               | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 6c77ede5c0b..2d9c290b25a 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -13932,12 +13932,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/propale/doc/pdf_azur.modules.php
 
-		-
-			message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: ../../../htdocs/core/modules/propale/doc/pdf_cyan.modules.php
-
 		-
 			message: '#^Property CommonObject\:\:\$multicurrency_tx \(array\<float\>\|float\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 4170db78e4b..de8072300ba 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -152,7 +152,7 @@ class pdf_cyan extends ModelePDFPropales
 	 *  Function to build pdf onto disk
 	 *
 	 *  @param		Propal		$object				Object to generate
-	 *  @param		Translate	$outputlangs		Lang output object
+	 *  @param		?Translate	$outputlangs		Lang output object
 	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *  @param		int<0,1>	$hidedetails		Do not show line details
 	 *  @param		int<0,1>	$hidedesc			Do not show desc
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 78f26ad0c4c..91f0458ae68 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -324,7 +324,7 @@ class Product extends CommonObject
 	public $fourn_multicurrency_code;
 
 	/**
-	 * @var float
+	 * @var ?float
 	 */
 	public $packaging;
 

From 06a3e6e9806456e7203fc3b4699e5d9d682737cb Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 28 Jan 2025 19:01:38 +0100
Subject: [PATCH 300/602] Add catch for better error management

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

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index c52f98d2b91..12c80b596da 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -187,6 +187,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 		$tplcontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
 		$tplcontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
 		$tplcontent .= "ob_start();\n";
+		$tplcontent .= "try {\n";
 		$tplcontent .= "// END PHP ?>\n";
 		if (getDolGlobalString('WEBSITE_FORCE_DOCTYPE_HTML5')) {
 			$tplcontent .= "<!DOCTYPE html>\n";
@@ -313,13 +314,14 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 		$tplcontent .= preg_replace('/<\/?html>/ims', '', $objectpage->htmlheader)."\n";
 		$tplcontent .= '</head>'."\n";
 
-		$tplcontent .= '<!-- File generated by Dolibarr website module editor -->'."\n";
+		$tplcontent .= '<!-- File content defined in Dolibarr website module editor -->'."\n";
 		$tplcontent .= '<body id="bodywebsite" class="bodywebsite bodywebpage-'.$objectpage->ref.'">'."\n";
 		$tplcontent .= $objectpage->content."\n";
 		$tplcontent .= '</body>'."\n";
 		$tplcontent .= '</html>'."\n";
 
 		$tplcontent .= '<?php // BEGIN PHP'."\n";
+		$tplcontent .= '} catch(Exception $e) { print $e->getMessages(); }'."\n";
 		$tplcontent .= '$tmp = ob_get_contents(); ob_end_clean();'."\n";	// replace with ob_get_clean ?
 
 		$tplcontent .= "// Now fix the content for SEO or multilanguage\n";

From 632ccfdbf085987748fb24989d601ca6371b6126 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 28 Jan 2025 19:04:24 +0100
Subject: [PATCH 301/602] FIX if $force_entity = 0 ($force_entity != 'default')
 = false

---
 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 31c5c5521ee..ad27dc50266 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2195,7 +2195,7 @@ class Form
 			$sql .= " LEFT JOIN " . $this->db->prefix() . "entity as e ON e.rowid = u.entity";
 		}
 		// Condition here should be the same than into societe->getSalesRepresentatives().
-		if ($userissuperadminentityone && $force_entity != 'default') {
+		if ($userissuperadminentityone && $force_entity !== 'default') {
 			if (!empty($force_entity)) {
 				$sql .= " WHERE u.entity IN (0, " . $this->db->sanitize($force_entity) . ")";
 			} else {

From c7aa6f9c40f014b9159908705ab50e760f3e5d44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 28 Jan 2025 19:07:41 +0100
Subject: [PATCH 302/602] fix phpstan

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 53e533f798b..690866f52c3 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>
  * Copyright (C) 2018		Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018-2024	Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2018-2025  Frédéric France			<frederic.france@free.fr>
  * Copyright (C) 2018-2022	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2021		Josep Lluís Amador		<joseplluis@lliuretic.cat>
  * Copyright (C) 2022		Gauthier VERDOL			<gauthier.verdol@atm-consulting.fr>
@@ -2007,7 +2007,7 @@ class CommandeFournisseur extends CommonOrder
 		dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $fk_prod_fourn_price, $ref_supplier, $remise_percent, $price_base_type, $pu_ttc, $type, $info_bits, $notrigger, $date_start, $date_end, $fk_unit, $pu_ht_devise, $origin, $origin_id");
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-		if ($this->statut == self::STATUS_DRAFT) {
+		if ($this->status == self::STATUS_DRAFT) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 			// Clean parameters
@@ -2130,7 +2130,7 @@ class CommandeFournisseur extends CommonOrder
 					if ($qty < $prod->packaging) {
 						$qty = $prod->packaging;
 					} else {
-						if (!empty($prod->packaging) && (fmod((float) $qty, $prod->packaging)  > 0.000001)) {
+						if (!empty($prod->packaging) && (fmod((float) $qty, (float) $prod->packaging)  > 0.000001)) {
 							$coeff = intval((float) $qty / $prod->packaging) + 1;
 							$qty = (float) $prod->packaging * $coeff;
 							setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');

From 2cf7b43f9efc83b6f82b0bc78eadc063aed4a8ae Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 28 Jan 2025 19:18:06 +0100
Subject: [PATCH 303/602] Fix update manifest json

---
 htdocs/website/index.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index bb683e00854..f4c758417a7 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3936,8 +3936,10 @@ if ($action == 'editcss') {
 		// Clean the manifestjson file to remove php code and get only html part
 		$manifestjsoncontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP( \?>)?\n*/ims', '', $manifestjsoncontent);
 	} else {
-		$manifestjsoncontent = GETPOST('WEBSITE_MANIFEST_JSON', 'restricthtml');
+		$manifestjsoncontent = trim(GETPOST('WEBSITE_MANIFEST_JSON', 'restricthtmlallowunvalid'));
+		$manifestjsoncontent = str_replace('<?=', '<?php', $manifestjsoncontent);
 	}
+
 	//if (!trim($manifestjsoncontent)) {
 	//$manifestjsoncontent.="";
 	//}

From 089a935e1cf9c507b1890827f141194b287af264 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 28 Jan 2025 19:18:06 +0100
Subject: [PATCH 304/602] Fix update manifest json

---
 htdocs/website/index.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index bb683e00854..f4c758417a7 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3936,8 +3936,10 @@ if ($action == 'editcss') {
 		// Clean the manifestjson file to remove php code and get only html part
 		$manifestjsoncontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP( \?>)?\n*/ims', '', $manifestjsoncontent);
 	} else {
-		$manifestjsoncontent = GETPOST('WEBSITE_MANIFEST_JSON', 'restricthtml');
+		$manifestjsoncontent = trim(GETPOST('WEBSITE_MANIFEST_JSON', 'restricthtmlallowunvalid'));
+		$manifestjsoncontent = str_replace('<?=', '<?php', $manifestjsoncontent);
 	}
+
 	//if (!trim($manifestjsoncontent)) {
 	//$manifestjsoncontent.="";
 	//}

From c4a78cab7fffcf066101b3491f73c64c5a2a71f8 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 28 Jan 2025 19:28:41 +0100
Subject: [PATCH 305/602] Fix bad var name

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index a748db69ea2..1852ed06c2b 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -808,7 +808,7 @@ if (!defined('NOLOGIN')) {
 		// If in demo mode, we check we go to home page through the public/demo/index.php page
 		if (!empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php') {  // We ask index page
 			if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/public/', $_SERVER['HTTP_REFERER'])) {
-				dol_syslog("Call index page from another url than demo page (call is done from page ".(empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFER']).")");
+				dol_syslog("Call index page from another url than demo page (call is done from page ".(empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER']).")");
 				$url = '';
 				$url .= ($url ? '&' : '').($dol_hide_topmenu ? 'dol_hide_topmenu='.$dol_hide_topmenu : '');
 				$url .= ($url ? '&' : '').($dol_hide_leftmenu ? 'dol_hide_leftmenu='.$dol_hide_leftmenu : '');

From 353c373361747bfbe01a473e1cd695ee9fe32c91 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 28 Jan 2025 19:31:46 +0100
Subject: [PATCH 306/602] review price update

---
 htdocs/core/actions_massactions.inc.php | 33 ++++++++++++-------------
 htdocs/product/list.php                 |  7 ++++--
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index fb45b57ac7a..3af7a81b909 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1281,23 +1281,8 @@ if (!$error && ($action == 'updateprice' && $confirm == 'yes') && $permissiontoa
 				$result = $object->fetch($toselectid);
 				//var_dump($contcats);exit;
 				if ($result > 0) {
-					if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
-						for ($level = 1; $level <= getDolGlobalInt('PRODUIT_MULTIPRICES_LIMIT'); $level++) {
-							if ($object->price_base_type == 'TTC') {
-								$newprice = $object->multiprices_ttc[$level] * (100 + $pricepercentage) / 100;
-								$minprice = $object->multiprices_min_ttc[$level];
-							} else {
-								$newprice = $object->multiprices[$level] * (100 + $pricepercentage) / 100;
-								$minprice = $object->multiprices_min[$level];
-							}
-							$res = $object->updatePrice($newprice, $object->price_base_type, $user, $object->tva_tx, $minprice, $level, $object->tva_npr, 0, 0, array(), $object->default_vat_code);
-							if ($res > 0) {
-								$nbok++;
-							} else {
-								setEventMessages($object->error, $object->errors, 'errors');
-							}
-						}
-					} else {
+					if (getDolGlobalString('PRODUCT_PRICE_UNIQ')
+							|| getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 						if ($object->price_base_type == 'TTC') {
 							$newprice = $object->price_ttc * (100 + $pricepercentage) / 100;
 							$minprice = $object->price_min_ttc;
@@ -1311,6 +1296,20 @@ if (!$error && ($action == 'updateprice' && $confirm == 'yes') && $permissiontoa
 						} else {
 							setEventMessages($object->error, $object->errors, 'errors');
 						}
+					} elseif (getDolGlobalString('PRODUIT_MULTIPRICES')) {
+						for ($level = 1; $level <= getDolGlobalInt('PRODUIT_MULTIPRICES_LIMIT'); $level++) {
+							if ($object->price_base_type == 'TTC') {
+								$newprice = $object->multiprices_ttc[$level] * (100 + $pricepercentage) / 100;
+								$minprice = $object->multiprices_min_ttc[$level];
+							} else {
+								$newprice = $object->multiprices[$level] * (100 + $pricepercentage) / 100;
+								$minprice = $object->multiprices_min[$level];
+							}
+							$res = $object->updatePrice($newprice, $object->price_base_type, $user, $object->tva_tx, $minprice, $level, $object->tva_npr, 0, 0, array(), $object->default_vat_code);
+							if ($res > 0) {
+								$nbok++;
+							}
+						}
 					}
 				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index cecce963be1..329591ab466 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -829,8 +829,11 @@ $arrayofmassactions = array(
 	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
 if ($user->hasRight($rightskey, 'creer')) {
-	$arrayofmassactions['preupdateprice'] = img_picto('', 'edit', 'class="pictofixedwidth"').$langs->trans("UpdatePrice");
-
+	if (getDolGlobalString('PRODUCT_PRICE_UNIQ')
+		|| getDolGlobalString('PRODUIT_CUSTOMER_PRICES')
+		|| getDolGlobalString('PRODUIT_MULTIPRICES')) {
+		$arrayofmassactions['preupdateprice'] = img_picto('', 'edit', 'class="pictofixedwidth"').$langs->trans("UpdatePrice");
+	}
 
 	$arrayofmassactions['switchonsalestatus'] = img_picto('', 'stop-circle', 'class="pictofixedwidth"').$langs->trans("SwitchOnSaleStatus");
 	$arrayofmassactions['switchonpurchasestatus'] = img_picto('', 'stop-circle', 'class="pictofixedwidth"').$langs->trans("SwitchOnPurchaseStatus");

From ce19d7cdc0ac1942ac6d61d05d3af50ff798c327 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 28 Jan 2025 19:40:52 +0100
Subject: [PATCH 307/602] review price update

---
 htdocs/core/tpl/massactions_pre.tpl.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index bdbcee257f5..78af23d152a 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -98,7 +98,11 @@ if ($massaction == 'preaffecttag' && isModEnabled('category')) {
 	}
 }
 
-if ($massaction == 'preupdateprice') {
+if ($massaction == 'preupdateprice'
+ && (getDolGlobalString('PRODUCT_PRICE_UNIQ')
+		|| getDolGlobalString('PRODUIT_CUSTOMER_PRICES')
+		|| getDolGlobalString('PRODUIT_MULTIPRICES')
+	)) {
 	$formquestion = array();
 
 	$valuefield = '<div style="display: flex; align-items: center; justify-content: flex-end; padding-right: 150px">';

From 5aa9c5f1d383bc96e9d9385af7fd5f92be9b3936 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 28 Jan 2025 20:01:46 +0100
Subject: [PATCH 308/602] Debug v21

---
 htdocs/core/lib/website2.lib.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 04a18bc25b3..0a6885fba3d 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -298,18 +298,23 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 
 		// Add manifest.json. Do we have to add it only on home page ?
 		$tplcontent .= '<?php if ($website->use_manifest) { print \'<link rel="manifest" href="/manifest.json.php" />\'."\n"; } ?>'."\n";
-		$tplcontent .= '<!-- Include link to CSS file -->'."\n";
-		// Add js
-		$tplcontent .= '<link rel="stylesheet" href="/styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />'."\n";
-		$tplcontent .= '<!-- Include link to JS file -->'."\n";
-		$tplcontent .= '<script nonce="'.getNonce().'" async src="/javascript.js.php?website=<?php echo $websitekey; ?>"></script>'."\n";
-		// Add headers
+
+		// Add HTML headers (must be before the Add of the common CSS and js). The common js may content javascript using jquery or a framework loaded by the HTML header.
 		$tplcontent .= '<!-- Include HTML header from common file -->'."\n";
 		$tplcontent .= '<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>'."\n";
 		$tplcontent .= '<!-- Include HTML header from page header block -->'."\n";
 		$tplcontent .= preg_replace('/<\/?html>/ims', '', $objectpage->htmlheader)."\n";
+
+		// Add css
+		$tplcontent .= '<!-- Include link to CSS file -->'."\n";
+		$tplcontent .= '<link rel="stylesheet" href="/styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />'."\n";
+
+		// Add js
+		$tplcontent .= '<!-- Include link to JS file -->'."\n";
+		$tplcontent .= '<script nonce="'.getNonce().'" async src="/javascript.js.php?website=<?php echo $websitekey; ?>"></script>'."\n";
 		$tplcontent .= '</head>'."\n";
 
+		// Page content
 		$tplcontent .= '<!-- File generated by Dolibarr website module editor -->'."\n";
 		$tplcontent .= '<body id="bodywebsite" class="bodywebsite bodywebpage-'.$objectpage->ref.'">'."\n";
 		$tplcontent .= $objectpage->content."\n";

From 579b0918df72c33a1b01c757166ac8b03258e57b Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 28 Jan 2025 20:08:04 +0100
Subject: [PATCH 309/602] Doc

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

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 0a6885fba3d..0f11bd01a63 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -306,11 +306,11 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 		$tplcontent .= preg_replace('/<\/?html>/ims', '', $objectpage->htmlheader)."\n";
 
 		// Add css
-		$tplcontent .= '<!-- Include link to CSS file -->'."\n";
+		$tplcontent .= '<!-- Include link to common CSS file -->'."\n";
 		$tplcontent .= '<link rel="stylesheet" href="/styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />'."\n";
 
 		// Add js
-		$tplcontent .= '<!-- Include link to JS file -->'."\n";
+		$tplcontent .= '<!-- Include link to common JS file -->'."\n";
 		$tplcontent .= '<script nonce="'.getNonce().'" async src="/javascript.js.php?website=<?php echo $websitekey; ?>"></script>'."\n";
 		$tplcontent .= '</head>'."\n";
 

From 4a08b6cfcbdda5a31995ffc5f1a1d5b0a651c8a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 28 Jan 2025 20:32:57 +0100
Subject: [PATCH 310/602] fix phpstan

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 690866f52c3..3186e8d9e74 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2128,7 +2128,7 @@ class CommandeFournisseur extends CommonOrder
 					$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', (empty($this->fk_soc) ? $this->socid : $this->fk_soc));
 
 					if ($qty < $prod->packaging) {
-						$qty = $prod->packaging;
+						$qty = (float) $prod->packaging;
 					} else {
 						if (!empty($prod->packaging) && (fmod((float) $qty, (float) $prod->packaging)  > 0.000001)) {
 							$coeff = intval((float) $qty / $prod->packaging) + 1;

From 612c26c2e023a7c15d3a953677326a3d9e5e9ffb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 28 Jan 2025 20:35:25 +0100
Subject: [PATCH 311/602] fix phpstan

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 3186e8d9e74..7b1500750d1 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2211,8 +2211,9 @@ class CommandeFournisseur extends CommonOrder
 			$this->line->total_localtax2 = (float) $total_localtax2;
 			$this->line->total_ttc = (float) $total_ttc;
 			$this->line->product_type = $type;
-			$this->line->special_code   = (!empty($special_code) ? $special_code : 0);
+			$this->line->special_code = (!empty($special_code) ? $special_code : 0);
 			$this->line->origin = $origin;
+			$this->line->origin_type = $origin;
 			$this->line->origin_id = $origin_id;
 			$this->line->fk_unit = $fk_unit;
 

From 00249c9a90b6206cf7359507fd4163e674ac9cb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 28 Jan 2025 20:46:05 +0100
Subject: [PATCH 312/602] fix phpstan

---
 .../class/fournisseur.commande.class.php      | 55 ++++++++++---------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 7b1500750d1..700be6e45fc 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -553,16 +553,16 @@ class CommandeFournisseur extends CommonOrder
 			$this->user_validation_id = $obj->user_validation_id;
 			$this->user_approve_id = $obj->user_approve_id;
 			$this->user_approve_id2 = $obj->user_approve_id2;
-			$this->total_ht				= $obj->total_ht;
-			$this->total_tva			= $obj->total_tva;
-			$this->total_localtax1		= $obj->localtax1;
-			$this->total_localtax2		= $obj->localtax2;
-			$this->total_ttc			= $obj->total_ttc;
+			$this->total_ht = $obj->total_ht;
+			$this->total_tva = $obj->total_tva;
+			$this->total_localtax1 = $obj->localtax1;
+			$this->total_localtax2 = $obj->localtax2;
+			$this->total_ttc = $obj->total_ttc;
 			$this->date_creation = $this->db->jdate($obj->date_creation);
 			$this->date_valid = $this->db->jdate($obj->date_valid);
-			$this->date_approve			= $this->db->jdate($obj->date_approve);
-			$this->date_approve2		= $this->db->jdate($obj->date_approve2);
-			$this->date_commande		= $this->db->jdate($obj->date_commande); // date we make the order to supplier
+			$this->date_approve = $this->db->jdate($obj->date_approve);
+			$this->date_approve2 = $this->db->jdate($obj->date_approve2);
+			$this->date_commande = $this->db->jdate($obj->date_commande); // date we make the order to supplier
 			if (isset($obj->date_commande)) {
 				$this->date = $this->date_commande;
 			} else {
@@ -1372,9 +1372,11 @@ class CommandeFournisseur extends CommonOrder
 					$this->ref = $this->newref;
 
 					if ($movetoapprovestatus) {
-						$this->statut = self::STATUS_ACCEPTED;
+						$this->statut = self::STATUS_ACCEPTED; // deprecated
+						$this->status = self::STATUS_ACCEPTED;
 					} else {
-						$this->statut = self::STATUS_VALIDATED;
+						$this->statut = self::STATUS_VALIDATED; // deprecated
+						$this->status = self::STATUS_VALIDATED;
 					}
 					if (empty($secondlevel)) {	// standard or first level approval
 						$this->date_approve = $now;
@@ -1531,7 +1533,8 @@ class CommandeFournisseur extends CommonOrder
 
 			dol_syslog(get_class($this)."::commande", LOG_DEBUG);
 			if ($this->db->query($sql)) {
-				$this->statut = self::STATUS_ORDERSENT;
+				$this->statut = self::STATUS_ORDERSENT; // deprecated
+				$this->status = self::STATUS_ORDERSENT;
 				$this->methode_commande_id = $methode;
 				$this->date_commande = $date;
 				$this->context = array('comments' => $comment);
@@ -1827,7 +1830,7 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= " localtax2=".(isset($this->total_localtax2) ? $this->total_localtax2 : "null").",";
 		$sql .= " total_ht=".(isset($this->total_ht) ? $this->total_ht : "null").",";
 		$sql .= " total_ttc=".(isset($this->total_ttc) ? $this->total_ttc : "null").",";
-		$sql .= " fk_statut=".(isset($this->statut) ? $this->statut : "null").",";
+		$sql .= " fk_statut=".(isset($this->status) ? $this->status : "null").",";
 		$sql .= " fk_user_author=".(isset($this->user_author_id) ? $this->user_author_id : "null").",";
 		$sql .= " fk_user_valid=".(isset($this->user_validation_id) && $this->user_validation_id > 0 ? $this->user_validation_id : "null").",";
 		$sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
@@ -1923,7 +1926,8 @@ class CommandeFournisseur extends CommonOrder
 		}
 
 		$this->id = 0;
-		$this->statut = self::STATUS_DRAFT;
+		$this->statut = self::STATUS_DRAFT; // deprecated
+		$this->status = self::STATUS_DRAFT;
 
 		// Clear fields
 		$this->user_author_id     = $user->id;
@@ -2259,8 +2263,7 @@ class CommandeFournisseur extends CommonOrder
 					return -1;
 				}
 			} else {
-				$this->error = $this->line->error;
-				$this->errors = $this->line->errors;
+				$this->setErrorsFromObject($this->line);
 				dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
@@ -2313,7 +2316,7 @@ class CommandeFournisseur extends CommonOrder
 
 		$inventorycode = dol_print_date(dol_now(), 'dayhourlog');
 
-		if (($this->statut == self::STATUS_ORDERSENT || $this->statut == self::STATUS_RECEIVED_PARTIALLY || $this->statut == self::STATUS_RECEIVED_COMPLETELY)) {
+		if (($this->status == self::STATUS_ORDERSENT || $this->status == self::STATUS_RECEIVED_PARTIALLY || $this->status == self::STATUS_RECEIVED_COMPLETELY)) {
 			$this->db->begin();
 
 			$sql = "INSERT INTO ".$this->db->prefix()."receptiondet_batch";
@@ -2387,7 +2390,7 @@ class CommandeFournisseur extends CommonOrder
 	{
 		global $user;
 
-		if ($this->statut == 0) {
+		if ($this->status == 0) {
 			$line = new CommandeFournisseurLigne($this->db);
 
 			if ($line->fetch($idline) <= 0) {
@@ -2680,8 +2683,8 @@ class CommandeFournisseur extends CommonOrder
 				$resql = $this->db->query($sql);
 				if ($resql) {
 					$result = 1;
-					$old_statut = $this->statut;
-					$this->statut = $statut;
+					$old_statut = $this->status;
+					$this->status = $statut;
 					$this->context['actionmsg2'] = $comment;
 
 					// Call trigger
@@ -2694,7 +2697,7 @@ class CommandeFournisseur extends CommonOrder
 					if (empty($error)) {
 						$this->db->commit();
 					} else {
-						$this->statut = $old_statut;
+						$this->status = $old_statut;
 						$this->db->rollback();
 						$this->error = $this->db->lasterror();
 						$result = -1;
@@ -2932,7 +2935,7 @@ class CommandeFournisseur extends CommonOrder
 		}
 
 		if (!$error) {
-			$this->statut = $status;
+			$this->status = $status;
 			$this->db->commit();
 			return 1;
 		} else {
@@ -2972,7 +2975,7 @@ class CommandeFournisseur extends CommonOrder
 
 		$error = 0;
 
-		if ($this->statut == self::STATUS_DRAFT) {
+		if ($this->status == self::STATUS_DRAFT) {
 			// Clean parameters
 			if (empty($qty)) {
 				$qty = 0;
@@ -3193,7 +3196,7 @@ class CommandeFournisseur extends CommonOrder
 		$this->multicurrency_tx = 1;
 		$this->multicurrency_code = $conf->currency;
 
-		$this->statut = 0;
+		$this->statut = 0; // deprecated
 		$this->status = 0;
 
 		// Lines
@@ -3536,7 +3539,7 @@ class CommandeFournisseur extends CommonOrder
 	{
 		global $conf;
 
-		if ($this->statut == self::STATUS_ORDERSENT || $this->statut == self::STATUS_RECEIVED_PARTIALLY) {
+		if ($this->status == self::STATUS_ORDERSENT || $this->status == self::STATUS_RECEIVED_PARTIALLY) {
 			$now = dol_now();
 			if (!empty($this->delivery_date)) {
 				$date_to_test = $this->delivery_date;
@@ -3550,7 +3553,7 @@ class CommandeFournisseur extends CommonOrder
 			$now = dol_now();
 			$date_to_test = $this->date_commande;
 
-			return ($this->statut > 0 && $this->statut < 5) && $date_to_test && $date_to_test < ($now - $conf->commande->fournisseur->warning_delay);
+			return ($this->status > 0 && $this->status < 5) && $date_to_test && $date_to_test < ($now - $conf->commande->fournisseur->warning_delay);
 		}
 	}
 
@@ -3569,7 +3572,7 @@ class CommandeFournisseur extends CommonOrder
 
 		$text = '';
 
-		if ($this->statut == self::STATUS_ORDERSENT || $this->statut == self::STATUS_RECEIVED_PARTIALLY) {
+		if ($this->status == self::STATUS_ORDERSENT || $this->status == self::STATUS_RECEIVED_PARTIALLY) {
 			if (!empty($this->delivery_date)) {
 				$text = $langs->trans("DeliveryDate").' '.dol_print_date($this->delivery_date, 'day');
 			} else {

From bb261ce017b220eb3f30fa17872083dc8929f2a3 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 28 Jan 2025 21:12:55 +0100
Subject: [PATCH 313/602] Fix cache delay param

---
 htdocs/website/samples/wrapper.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index eadc7c68a53..51c6c2500bb 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -129,10 +129,11 @@ if (GETPOSTISSET('type')) {
 $original_file = str_replace("../", "/", $original_file);
 
 // Cache or not
-if (GETPOST("cache", 'aZ09') || image_format_supported($original_file) >= 0) {
+$cachestring = GETPOST("cache", 'aZ09');	// May be 1, or an int, or a hash
+if ($cachestring || image_format_supported($original_file) >= 0) {
 	// Important: Following code is to avoid page request by browser and PHP CPU at
 	// each Dolibarr page access.
-	header('Cache-Control: max-age=3600, public, must-revalidate');
+	header('Cache-Control: max-age='.((is_numeric($cachestring) && (int) $cachestring > 1 && (int) $cachestring < 999999) ? $cachestring : '3600').', public, must-revalidate');
 	header('Pragma: cache'); // This is to avoid having Pragma: no-cache
 }
 

From 64f1d966f13f77c920619518cbba7b14897219b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 28 Jan 2025 21:33:32 +0100
Subject: [PATCH 314/602] fix phpstan

---
 htdocs/fourn/class/fournisseur.class.php          | 9 +++++----
 htdocs/fourn/class/fournisseur.commande.class.php | 7 ++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 2529bce86ec..20eb2ef661b 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -1,9 +1,10 @@
 <?php
-/* Copyright (C) 2004-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006      Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2011	   Juanjo Menent		<jmenent@2byte.es>
+/* Copyright (C) 2004-2007  Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006       Laurent Destailleur  	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009  Regis Houssin        	<regis.houssin@inodbox.com>
+ * Copyright (C) 2011	    Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2025       Frédéric France         <frederic.france@free.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/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 700be6e45fc..9ad00e00bc2 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -14,8 +14,8 @@
  * Copyright (C) 2021		Josep Lluís Amador		<joseplluis@lliuretic.cat>
  * Copyright (C) 2022		Gauthier VERDOL			<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024		Solution Libre SAS		<contact@solution-libre.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024		William Mead		<william.mead@manchenumerique.fr>
+ * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.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
@@ -3358,7 +3358,8 @@ class CommandeFournisseur extends CommonOrder
 			while ($obj = $this->db->fetch_object($resql)) {
 				$commandestatic->delivery_date = $this->db->jdate($obj->delivery_date);
 				$commandestatic->date_commande = $this->db->jdate($obj->date_commande);
-				$commandestatic->statut = $obj->fk_statut;
+				$commandestatic->statut = $obj->fk_statut; // deprecated
+				$commandestatic->status = $obj->fk_statut;
 
 				$response->nbtodo++;
 				$response->total += $obj->total_ht;

From 656a63acdc7d51673b5f9af52cf4d6e8688fb77f Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 28 Jan 2025 22:07:11 +0100
Subject: [PATCH 315/602] Debug v21

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 71031684d57..34623d573df 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -933,9 +933,10 @@ class Form
 	 * @param int<0,1> 		$addspecialentries 		1=Add dedicated entries for group of countries (like 'European Economic Community', ...)
 	 * @param string[] 		$exclude_country_code 	Array of country code (iso2) to exclude
 	 * @param int<0,1>		$hideflags 				Hide flags
+	 * @param int<0,1>		$forcecombo 			Force to load all values and output a standard combobox (with no beautification)
 	 * @return string       	                	HTML string with select
 	 */
-	public function select_country($selected = '', $htmlname = 'country_id', $htmloption = '', $maxlength = 0, $morecss = 'minwidth300', $usecodeaskey = '', $showempty = 1, $disablefavorites = 0, $addspecialentries = 0, $exclude_country_code = array(), $hideflags = 0)
+	public function select_country($selected = '', $htmlname = 'country_id', $htmloption = '', $maxlength = 0, $morecss = 'minwidth300', $usecodeaskey = '', $showempty = 1, $disablefavorites = 0, $addspecialentries = 0, $exclude_country_code = array(), $hideflags = 0, $forcecombo = 0)
 	{
 		// phpcs:enable
 		global $conf, $langs, $mysoc;
@@ -1047,8 +1048,10 @@ class Form
 		}
 
 		// Make select dynamic
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-		$out .= ajax_combobox('select' . $htmlname, array(), 0, 0, 'resolve');
+		if (empty($forcecombo)) {
+			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+			$out .= ajax_combobox('select' . $htmlname, array(), 0, 0, 'resolve');
+		}
 
 		return $out;
 	}
@@ -1076,7 +1079,7 @@ class Form
 		$langs->load("dict");
 
 		$out = '';
-		$moreattrib = '';
+		//$moreattrib = '';
 		$incotermArray = array();
 
 		$sql = "SELECT rowid, code";
@@ -1129,7 +1132,7 @@ class Form
 
 			if ($conf->use_javascript_ajax && empty($disableautocomplete)) {
 				$out .= ajax_multiautocompleter('location_incoterms', array(), DOL_URL_ROOT . '/core/ajax/locationincoterms.php') . "\n";
-				$moreattrib .= ' autocomplete="off"';
+				//$moreattrib .= ' autocomplete="off"';
 			}
 			$out .= '<input id="location_incoterms" class="maxwidthonsmartphone type="text" name="location_incoterms" value="' . $location_incoterms . '">' . "\n";
 

From 995e0792e5872d075059b2aa3f5979512878ba42 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 29 Jan 2025 00:44:39 +0100
Subject: [PATCH 316/602] Fix escaping var

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 0a9b0206f54..0f368838f0f 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1311,12 +1311,12 @@ class Product extends CommonObject
 				$sql .= ", accountancy_code_sell_export= '" . $this->db->escape($this->accountancy_code_sell_export) . "'";
 			}
 			$sql .= ", desiredstock = ".((isset($this->desiredstock) && is_numeric($this->desiredstock)) ? (float) $this->desiredstock : "null");
-			$sql .= ", cost_price = ".($this->cost_price != '' ? $this->db->escape($this->cost_price) : 'null');
+			$sql .= ", cost_price = ".($this->cost_price != '' ? ((float) $this->cost_price) : 'null');
 			$sql .= ", fk_unit= ".(!$this->fk_unit ? 'NULL' : (int) $this->fk_unit);
 			$sql .= ", price_autogen = ".(!$this->price_autogen ? 0 : 1);
 			$sql .= ", fk_price_expression = ".($this->fk_price_expression != 0 ? (int) $this->fk_price_expression : 'NULL');
-			$sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id : 'NULL');
-			$sql .= ", mandatory_period = ".($this->mandatory_period);
+			$sql .= ", fk_user_modif = ".($user->id > 0 ? (int) $user->id : 'NULL');
+			$sql .= ", mandatory_period = ".((int) $this->mandatory_period);
 			// stock field is not here because it is a denormalized value from product_stock.
 			$sql .= " WHERE rowid = ".((int) $id);
 

From 1c7a3a0e73d0379a3d09f21c42beb57cc073b2ad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 29 Jan 2025 01:38:11 +0100
Subject: [PATCH 317/602] More complete fix for #32839

---
 htdocs/core/lib/functions.lib.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 27c1b697b5e..0a8cab279a9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2000-2007	Rodolphe Quiedeville		<rodolphe@quiedeville.org>
  * Copyright (C) 2003		Jean-Louis Bergamo			<jlb@j1b.org>
  * Copyright (C) 2004-2024	Laurent Destailleur			<eldy@users.sourceforge.net>
@@ -2172,7 +2171,7 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 		$tmp = str_ireplace('__DONOTDECODEAPOS', '&apos', $tmp);
 		$tmp = str_ireplace('__DONOTDECODE39', '&#39', $tmp);
 
-		$tmp = str_ireplace('&#39;', '__SIMPLEQUOTE', $tmp);	// HTML 4
+		$tmp = str_ireplace('&#39;', '__SIMPLEQUOTE__', $tmp);	// HTML 4
 	}
 	if (!$keepb) {
 		$tmp = strtr($tmp, array("<b>" => '', '</b>' => '', '<strong>' => '', '</strong>' => ''));
@@ -2213,7 +2212,7 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 					if (preg_match('/<'.preg_quote($tagtoreplace, '/').'(\s+)([^>]+)>/', $tmp, $reg)) {
 						// We want to protect the attribute part ... in '<xxx ...>' to avoid transformation by htmlentities() later
 						$tmpattributes = str_ireplace(array('[', ']'), '_', $reg[2]);	// We must never have [ ] inside the attribute string
-						$tmpattributes = str_ireplace('"', '__DOUBLEQUOTE', $tmpattributes);
+						$tmpattributes = str_ireplace('"', '__DOUBLEQUOTE__', $tmpattributes);
 						$tmpattributes = preg_replace('/[^a-z0-9_%,\/\?\;\s=&\.\-@:\.#\+]/i', '', $tmpattributes);
 						//$tmpattributes = preg_replace("/float:\s*(left|right)/", "", $tmpattributes);	// Disabled: we must not remove content
 						$tmp = str_replace('<'.$tagtoreplace.$reg[1].$reg[2].'>', '__BEGINTAGTOREPLACE'.$tagtoreplace.'['.$tmpattributes.']__', $tmp);
@@ -2223,9 +2222,9 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 				} while ($diff);
 			}
 
-			$tmp = str_ireplace('&quot', '__DOUBLEQUOTE', $tmp);
-			$tmp = str_ireplace('&lt', '__LESSTAN', $tmp);
-			$tmp = str_ireplace('&gt', '__GREATERTHAN', $tmp);
+			$tmp = str_ireplace('&quot', '__DOUBLEQUOTENOSEMICOLON__', $tmp);
+			$tmp = str_ireplace('&lt', '__LESSTHAN__', $tmp);
+			$tmp = str_ireplace('&gt', '__GREATERTHAN__', $tmp);
 		}
 
 		// Warning: htmlentities encode HTML tags like <abc> & into &amp; and more (but not &lt; &gt; &quotes; &apos; &#39; &amp; that remains untouched).
@@ -2243,12 +2242,14 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 				$result = preg_replace('/__BEGINENDTAGTOREPLACE'.$tagtoreplace.'\[([^\]]*)\]__/', '<'.$tagtoreplace.' \1 />', $result);
 			}
 
-			$result = str_ireplace('__DOUBLEQUOTE', '"', $result);
-			$result = str_ireplace('__LESSTAN', '&lt', $result);
-			$result = str_ireplace('__GREATERTHAN', '&gt', $result);
+			$result = str_ireplace('__DOUBLEQUOTE__', '"', $result);
+
+			$result = str_ireplace('__DOUBLEQUOTENOSEMICOLON__', '&quot', $result);
+			$result = str_ireplace('__LESSTHAN__', '&lt', $result);
+			$result = str_ireplace('__GREATERTHAN__', '&gt', $result);
 		}
 
-		$result = str_ireplace('__SIMPLEQUOTE', '&#39;', $result);
+		$result = str_ireplace('__SIMPLEQUOTE__', '&#39;', $result);
 
 		//$result="\n\n\n".var_export($tmp, true)."\n\n\n".var_export($result, true);
 

From 09a282bc38bdd95282fe56871813153430234e6a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 29 Jan 2025 01:38:11 +0100
Subject: [PATCH 318/602] More complete fix for #32839

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 41387eacc26..7ad4d1888ce 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2169,7 +2169,7 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 		$tmp = str_ireplace('__DONOTDECODEAPOS', '&apos', $tmp);
 		$tmp = str_ireplace('__DONOTDECODE39', '&#39', $tmp);
 
-		$tmp = str_ireplace('&#39;', '__SIMPLEQUOTE', $tmp);	// HTML 4
+		$tmp = str_ireplace('&#39;', '__SIMPLEQUOTE__', $tmp);	// HTML 4
 	}
 	if (!$keepb) {
 		$tmp = strtr($tmp, array("<b>" => '', '</b>' => '', '<strong>' => '', '</strong>' => ''));
@@ -2210,7 +2210,7 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 					if (preg_match('/<'.preg_quote($tagtoreplace, '/').'(\s+)([^>]+)>/', $tmp, $reg)) {
 						// We want to protect the attribute part ... in '<xxx ...>' to avoid transformation by htmlentities() later
 						$tmpattributes = str_ireplace(array('[', ']'), '_', $reg[2]);	// We must never have [ ] inside the attribute string
-						$tmpattributes = str_ireplace('"', '__DOUBLEQUOTE', $tmpattributes);
+						$tmpattributes = str_ireplace('"', '__DOUBLEQUOTE__', $tmpattributes);
 						$tmpattributes = preg_replace('/[^a-z0-9_%,\/\?\;\s=&\.\-@:\.#\+]/i', '', $tmpattributes);
 						//$tmpattributes = preg_replace("/float:\s*(left|right)/", "", $tmpattributes);	// Disabled: we must not remove content
 						$tmp = str_replace('<'.$tagtoreplace.$reg[1].$reg[2].'>', '__BEGINTAGTOREPLACE'.$tagtoreplace.'['.$tmpattributes.']__', $tmp);
@@ -2220,9 +2220,9 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 				} while ($diff);
 			}
 
-			$tmp = str_ireplace('&quot', '__DOUBLEQUOTE', $tmp);
-			$tmp = str_ireplace('&lt', '__LESSTAN', $tmp);
-			$tmp = str_ireplace('&gt', '__GREATERTHAN', $tmp);
+			$tmp = str_ireplace('&quot', '__DOUBLEQUOTENOSEMICOLON__', $tmp);
+			$tmp = str_ireplace('&lt', '__LESSTHAN__', $tmp);
+			$tmp = str_ireplace('&gt', '__GREATERTHAN__', $tmp);
 		}
 
 		// Warning: htmlentities encode HTML tags like <abc> & into &amp; and more (but not &lt; &gt; &quotes; &apos; &#39; &amp; that remains untouched).
@@ -2240,12 +2240,14 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 				$result = preg_replace('/__BEGINENDTAGTOREPLACE'.$tagtoreplace.'\[([^\]]*)\]__/', '<'.$tagtoreplace.' \1 />', $result);
 			}
 
-			$result = str_ireplace('__DOUBLEQUOTE', '"', $result);
-			$result = str_ireplace('__LESSTAN', '&lt', $result);
-			$result = str_ireplace('__GREATERTHAN', '&gt', $result);
+			$result = str_ireplace('__DOUBLEQUOTE__', '"', $result);
+
+			$result = str_ireplace('__DOUBLEQUOTENOSEMICOLON__', '&quot', $result);
+			$result = str_ireplace('__LESSTHAN__', '&lt', $result);
+			$result = str_ireplace('__GREATERTHAN__', '&gt', $result);
 		}
 
-		$result = str_ireplace('__SIMPLEQUOTE', '&#39;', $result);
+		$result = str_ireplace('__SIMPLEQUOTE__', '&#39;', $result);
 
 		//$result="\n\n\n".var_export($tmp, true)."\n\n\n".var_export($result, true);
 

From e5c385999d73490e1b0ab68477444178b2984f88 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 19 Jan 2025 02:30:36 +0100
Subject: [PATCH 319/602] Qual: Fix multiple phan notices

# Qual: Fix multiple phan notices

Fix multiple phan notices
---
 htdocs/comm/propal/class/propal.class.php     | 14 +++----
 htdocs/commande/class/commande.class.php      | 38 +++++++++---------
 htdocs/compta/facture/class/facture.class.php |  7 ++--
 htdocs/core/class/html.form.class.php         | 38 +++++++++---------
 htdocs/ecm/dir_card.php                       |  4 +-
 htdocs/ecm/index.php                          | 14 ++++---
 .../conferenceorbooth_card.php                | 10 ++---
 .../conferenceorbooth_list.php                |  7 ++--
 .../conferenceorboothattendee_card.php        | 18 +++++----
 .../conferenceorboothattendee_list.php        | 37 ++++++++---------
 htdocs/expedition/card.php                    | 40 +++++++++----------
 htdocs/expedition/class/expedition.class.php  | 12 +++---
 htdocs/expedition/contact.php                 |  6 ++-
 htdocs/expedition/dispatch.php                | 18 +++++----
 htdocs/expedition/document.php                |  4 +-
 htdocs/expedition/list.php                    | 19 ++++-----
 htdocs/expedition/note.php                    |  4 +-
 htdocs/expedition/shipment.php                | 33 +++++++--------
 htdocs/expensereport/card.php                 | 35 ++++++++--------
 19 files changed, 187 insertions(+), 171 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index eb81c4c084e..ecd6898734c 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -19,7 +19,7 @@
  * Copyright (C) 2022       OpenDSI                 <support@open-dsi.fr>
  * Copyright (C) 2022      	Gauthier VERDOL     	<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2023		William Mead			<william.mead@manchenumerique.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -146,23 +146,23 @@ class Propal extends CommonObject
 
 	/**
 	 * @var int|''
-	 * @deprecated
+	 * @deprecated Use $date_validation
 	 * @see $date_validation
 	 */
 	public $datev;
 
 	/**
-	 * @var integer|'' $date_validation;
+	 * @var int|''
 	 */
 	public $date_validation;
 
 	/**
-	 * @var integer|'' $date_signature;
+	 * @var int|''
 	 */
 	public $date_signature;
 
 	/**
-	 * @var User $user_signature
+	 * @var User
 	 */
 	public $user_signature;
 
@@ -715,7 +715,7 @@ class Propal extends CommonObject
 				if ($qty < $product->packaging) {
 					$qty = $product->packaging;
 				} else {
-					if (!empty($product->packaging) && (fmod((float) $qty, $product->packaging)  > 0.000001)) {
+					if (!empty($product->packaging) && (fmod((float) $qty, (float) $product->packaging)  > 0.000001)) {
 						$coeff = intval((float) $qty / $product->packaging) + 1;
 						$qty = (float) $product->packaging * $coeff;
 						setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');
@@ -772,7 +772,7 @@ class Propal extends CommonObject
 			$this->line->fk_propal = $this->id;
 			$this->line->label = $label;
 			$this->line->desc = $desc;
-			$this->line->qty = $qty;
+			$this->line->qty = (float) $qty;
 
 			$this->line->vat_src_code = $vat_src_code;
 			$this->line->tva_tx = $txtva;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 71e03085f69..6c747d2602b 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -13,7 +13,7 @@
  * Copyright (C) 2016-2022 Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2021-2025  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2022       Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		William Mead		<william.mead@manchenumerique.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1637,10 +1637,10 @@ class Commande extends CommonOrder
 			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
 				$product = new Product($this->db);
 				$result = $product->fetch($fk_product);
-				if ($qty < $product->packaging) {
+				if ($qty < (float) $product->packaging) {
 					$qty = $product->packaging;
 				} else {
-					if (!empty($product->packaging) && (fmod((float) $qty, $product->packaging)  > 0.000001)) {
+					if (!empty($product->packaging) && (fmod((float) $qty, (float) $product->packaging)  > 0.000001)) {
 						$coeff = intval((float) $qty / $product->packaging) + 1;
 						$qty = (float) $product->packaging * $coeff;
 						setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');
@@ -1703,7 +1703,7 @@ class Commande extends CommonOrder
 			$this->line->fk_commande = $this->id;
 			$this->line->label = $label;
 			$this->line->desc = $desc;
-			$this->line->qty = $qty;
+			$this->line->qty = (float) $qty;
 			$this->line->ref_ext = $ref_ext;
 
 			$this->line->vat_src_code = $vat_src_code;
@@ -1863,21 +1863,21 @@ class Commande extends CommonOrder
 			$this->lines[] = $line;
 
 			/** POUR AJOUTER AUTOMATIQUEMENT LES SOUSPRODUITS a LA COMMANDE
-			 if (getDolGlobalString('PRODUIT_SOUSPRODUITS')) {
-			 $prod = new Product($this->db);
-			 $prod->fetch($idproduct);
-			 $prod -> get_sousproduits_arbo();
-			 $prods_arbo = $prod->get_arbo_each_prod();
-			 if(count($prods_arbo) > 0)
-			 {
-				 foreach($prods_arbo as $key => $value)
-				 {
-					 // print "id : ".$value[1].' :qty: '.$value[0].'<br>';
-					 if not in lines {
-						$this->add_product($value[1], $value[0]);
-					 }
-				 }
-			 }
+			 * if (getDolGlobalString('PRODUIT_SOUSPRODUITS')) {
+			 * $prod = new Product($this->db);
+			 * $prod->fetch($idproduct);
+			 * $prod -> get_sousproduits_arbo();
+			 * $prods_arbo = $prod->get_arbo_each_prod();
+			 * if(count($prods_arbo) > 0)
+			 * {
+			 * foreach($prods_arbo as $key => $value)
+			 * {
+			 * // print "id : ".$value[1].' :qty: '.$value[0].'<br>';
+			 * if not in lines {
+			 * $this->add_product($value[1], $value[0]);
+			 * }
+			 * }
+			 * }
 			 **/
 		}
 	}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 09dddafbbd5..88430241586 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -20,7 +20,7 @@
  * Copyright (C) 2022       Sylvain Legrand         <contact@infras.fr>
  * Copyright (C) 2023      	Gauthier VERDOL       	<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2023		Nick Fragoulis
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -174,7 +174,6 @@ class Facture extends CommonInvoice
 	public $resteapayer;
 
 	/**
-	 *
 	 * @var int<0,1> 1 if invoice paid COMPLETELY, 0 otherwise
 	 * @deprecated * Use statut and close_code)
 	 */
@@ -4002,10 +4001,10 @@ class Facture extends CommonInvoice
 			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
 				$product = new Product($this->db);
 				$result = $product->fetch($fk_product);
-				if ($qty < $product->packaging) {
+				if ($qty < (float) $product->packaging) {
 					$qty = $product->packaging;
 				} else {
-					if (!empty($product->packaging) && (fmod((float) $qty, $product->packaging)  > 0.000001)) {
+					if (!empty($product->packaging) && (fmod((float) $qty, (float) $product->packaging)  > 0.000001)) {
 						$coeff = intval((float) $qty / $product->packaging) + 1;
 						$qty = (float) $product->packaging * $coeff;
 						setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e374296cf13..143cc1a07d9 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -107,9 +107,9 @@ class Form
 	 * @param 	object		$object 		Object (on the page we show)
 	 * @param 	int<0,1>	$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.
-	 * @param 	int			$fieldrequired 	1 if we want to show field as mandatory using the "fieldrequired" CSS.
-	 * @param 	int<0,3>	$notabletag 	1=Do not output table tags but output a ':', 2=Do not output table tags and no ':', 3=Do not output table tags but output a ' '
+	 * @param 	string		$moreparam		More param to add on a href URL.
+	 * @param 	int<0,1>	$fieldrequired	1 if we want to show field as mandatory using the "fieldrequired" CSS.
+	 * @param 	int<0,3>	$notabletag		1=Do not output table tags but output a ':', 2=Do not output table tags and no ':', 3=Do not output table tags but output a ' '
 	 * @param 	string		$paramid 		Key of parameter for id ('id', 'socid')
 	 * @param 	string		$help 			Tooltip help
 	 * @return  string						HTML edit field
@@ -624,19 +624,19 @@ class Form
 	 *  Show a text and picto with tooltip on text or picto.
 	 *  Can be called by an instancied $form->textwithtooltip or by a static call Form::textwithtooltip
 	 *
-	 * 	@param 	string 	$text 				Text to show
-	 * 	@param 	string 	$htmltext 			HTML content of tooltip. Must be HTML/UTF8 encoded.
-	 * 	@param 	int 	$tooltipon 			1=tooltip on text, 2=tooltip on image, 3=tooltip on both
-	 * 	@param 	int 	$direction 			-1=image is before, 0=no image, 1=image is after
-	 * 	@param 	string 	$img 				Html code for image (use img_xxx() function to get it)
-	 * 	@param 	string 	$extracss 			Add a CSS style to td tags
-	 * 	@param 	int 	$notabs 			0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
-	 * 	@param 	string 	$incbefore 			Include code before the text
-	 * 	@param 	int 	$noencodehtmltext 	Do not encode into html entity the htmltext
-	 * 	@param 	string 	$tooltiptrigger 	''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
-	 * 	@param 	int 	$forcenowrap 		Force no wrap between text and picto (works with notabs=2 only)
-	 * 	@return string                      Code html du tooltip (texte+picto)
-	 * 	@see    textwithpicto() 			Use textwithpicto() instead of textwithtooltip if you can.
+	 * 	@param 	string		$text 				Text to show
+	 * 	@param 	string	 	$htmltext 			HTML content of tooltip. Must be HTML/UTF8 encoded.
+	 * 	@param 	int<0,3> 	$tooltipon 			1=tooltip on text, 2=tooltip on image, 3=tooltip on both
+	 * 	@param 	int<-1,1> 	$direction 			-1=image is before, 0=no image, 1=image is after
+	 * 	@param 	string	 	$img 				Html code for image (use img_xxx() function to get it)
+	 * 	@param 	string	 	$extracss 			Add a CSS style to td tags
+	 * 	@param 	int<0,3> 	$notabs 			0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
+	 * 	@param 	string		$incbefore 			Include code before the text
+	 * 	@param 	int<0,1>	$noencodehtmltext 	Do not encode into html entity the htmltext
+	 * 	@param 	string		$tooltiptrigger 	''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
+	 * 	@param 	int<0,1>	$forcenowrap 		Force no wrap between text and picto (works with notabs=2 only)
+	 * 	@return string				           Code html du tooltip (texte+picto)
+	 * 	@see    textwithpicto()					Use textwithpicto() instead of textwithtooltip if you can.
 	 */
 	public function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 3, $incbefore = '', $noencodehtmltext = 0, $tooltiptrigger = '', $forcenowrap = 0)
 	{
@@ -5645,9 +5645,9 @@ class Form
 	 * @param string 		$title 				Title
 	 * @param string 		$question 			Question
 	 * @param string 		$action 			Action
-	 * @param array<array{name:string,value:string,values:string[],default:string,label:string,type:string,size:string,morecss:string,moreattr:string,style:string,inputko?:int<0,1>}>|string|null 	$formquestion 		An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , 'size'=>, 'morecss'=>, 'moreattr'=>'autofocus' or 'style=...'))
-	 *                                                                                                                                                                                                                  'type' can be 'text', 'password', 'checkbox', 'radio', 'date', 'datetime', 'select', 'multiselect', 'morecss',
-	 *                                                                                                                                                                                                                  'other', 'onecolumn' or 'hidden'...
+	 * @param array<array{name:string,value:string,values?:string[],default?:string,label:string,type:string,size?:string,morecss?:string,moreattr?:string,style?:string,inputko?:int<0,1>}>|string|null 	$formquestion 		An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , 'size'=>, 'morecss'=>, 'moreattr'=>'autofocus' or 'style=...'))
+	 *                                                                                                                                                                                                                          'type' can be 'text', 'password', 'checkbox', 'radio', 'date', 'datetime', 'select', 'multiselect', 'morecss',
+	 *                                                                                                                                                                                                                          'other', 'onecolumn' or 'hidden'...
 	 * @param int<0,1>|''|'no'|'yes'|'1'|'0'	$selectedchoice 	'' or 'no', or 'yes' or '1', 1, '0' or 0
 	 * @param int<0,2>|string	$useajax 			0=No, 1=Yes use Ajax to show the popup, 2=Yes and also submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx
 	 * @param int|string 	$height 			Force height of box (0 = auto)
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index fcfff57f74a..cf7d8c159c9 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2008-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -85,7 +86,7 @@ $ecmdir = new EcmDirectory($db);
 
 if ($module == 'ecm') {
 	// $section should be an int except if it is dir not yet created into EcmDirectory
-	$result = $ecmdir->fetch($section);
+	$result = preg_match('/^\d+$/', $section) ? $ecmdir->fetch((int) $section) : 0;
 	if ($result > 0) {
 		$relativepath = $ecmdir->getRelativePath();
 		$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
@@ -199,6 +200,7 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes' && $permissiontoupload)
 // Update dirname or description
 if ($action == 'update' && !GETPOST('cancel', 'alpha') && $permissiontoadd) {
 	$error = 0;
+	$oldlabel = '';
 
 	if ($module == 'ecm') {
 		$oldlabel = $ecmdir->label;
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 0f3e5cd7c24..213d60c4a17 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2008-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2008-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -109,10 +110,11 @@ $permissiontodeletedir = $user->hasRight('ecm', 'setup');
 //$backtopage = $_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid;	// used after a confirm_deletefile into actions_linkedfiles.inc.php
 //include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
+$relativepath = '';
+
 // Upload file (code similar but different than actions_linkedfiles.inc.php)
 if (GETPOST("sendit", 'alphanohtml') && getDolGlobalString('MAIN_UPLOAD_DOC') && $permissiontocreate) {
 	// Define relativepath and upload_dir
-	$relativepath = '';
 	if ($ecmdir->id) {
 		$relativepath = $ecmdir->getRelativePath();
 	} else {
@@ -277,11 +279,11 @@ if ($action == 'refreshmanual' && $permissiontoread) {
 				//print $ecmdirtmp->cachenbofdoc."<br>\n";exit;
 				$id = $ecmdirtmp->create($user);
 				if ($id > 0) {
-					$newdirsql = array('id'=>$id,
-									 'id_mere'=>$ecmdirtmp->fk_parent,
-									 'label'=>$ecmdirtmp->label,
-									 'description'=>$ecmdirtmp->description,
-									 'fullrelativename'=>$relativepathmissing);
+					$newdirsql = array('id' => $id,
+									 'id_mere' => $ecmdirtmp->fk_parent,
+									 'label' => $ecmdirtmp->label,
+									 'description' => $ecmdirtmp->description,
+									 'fullrelativename' => $relativepathmissing);
 					$sqltree[] = $newdirsql; // We complete fulltree for following loops
 					//var_dump($sqltree);
 					$adirwascreated = 1;
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index 69162c5fca8..ff6d66b04f3 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2021		Florian Henry				<florian.henry@scopen.fr>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -187,7 +187,7 @@ $help_url = 'EN:Module_Event_Organization';
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-eventorganization page-card');
 
 if ($action == 'create') {
-	$result = $projectstatic->fetch(GETPOST('fk_project'));
+	$result = $projectstatic->fetch(GETPOSTINT('fk_project'));
 } else {
 	$result = $projectstatic->fetch($object->fk_project);
 }
@@ -351,7 +351,7 @@ if (!empty($withproject)) {
 	$htmltext = $langs->trans("AllowUnknownPeopleSuggestConfHelp");
 	print $form->editfieldkey('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '', $projectstatic, 0, $typeofdata, '', 0, 0, 'projectid', $htmltext);
 	print '</td><td class="valuefield">';
-	print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '1', $projectstatic, 0, $typeofdata, '', null, 0, '', 0, '', 'projectid');
+	print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '1', $projectstatic, 0, $typeofdata, '', null, null, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td class="valuefield">';
@@ -359,7 +359,7 @@ if (!empty($withproject)) {
 	$htmltext = $langs->trans("AllowUnknownPeopleSuggestBoothHelp");
 	print $form->editfieldkey('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '', $projectstatic, 0, $typeofdata, '', 0, 0, 'projectid', $htmltext);
 	print '</td><td class="valuefield">';
-	print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '1', $projectstatic, 0, $typeofdata, '', null, 0, '', 0, '', 'projectid');
+	print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '1', $projectstatic, 0, $typeofdata, '', null, null, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td class="valuefield">';
@@ -377,7 +377,7 @@ if (!empty($withproject)) {
 	print '<tr><td class="titlefield">';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', '', $projectstatic, $permissiontoadd, 'integer:3', '', 0, 0, 'projectid');
 	print '</td><td class="valuefield">';
-	print $form->editfieldval($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', $projectstatic->max_attendees, $projectstatic, $permissiontoadd, 'integer:3', '', null, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', $projectstatic->max_attendees, $projectstatic, $permissiontoadd, 'integer:3', '', null, null, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td class="titlefield valignmiddle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 46bb260a6be..dcaecaf7f4e 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2021		Florian Henry				<florian.henry@scopen.fr>
  * Copyright (C) 2023-2024	Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -880,7 +881,7 @@ foreach ($object->fields as $key => $val) {
 		} 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, 'minwidth100imp maxwidth125', 2);
+			print $formadmin->select_language($search[$key], 'search_lang', 0, array(), 1, 0, 0, 'minwidth100imp maxwidth125', 2);
 		} else {
 			print '<input type="text" class="flat maxwidth'.($val['type'] == 'integer' ? '50' : '75').'" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
@@ -1032,7 +1033,7 @@ while ($i < $imaxinloop) {
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
 				print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield) && !is_numeric($object->$key)) {
-					print ' title="'.dol_escape_htmltag($object->$key).'"';
+					print ' title="'.dol_escape_htmltag((string) $object->$key).'"';
 				}
 				print '>';
 				if ($key == 'status') {
@@ -1040,7 +1041,7 @@ while ($i < $imaxinloop) {
 				} elseif ($key == 'ref') {
 					print $object->getNomUrl(1, 0, '', (($projectid > 0) ? 'withproject' : ''));
 				} else {
-					print $object->showOutputField($val, $key, $object->$key, '');
+					print $object->showOutputField($val, $key, (string) $object->$key, '');
 				}
 				print '</td>';
 				if (!$i) {
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index b7010dadaf5..041e671a8f0 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2017		Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -75,6 +75,8 @@ $diroutputmassaction = $conf->eventorganization->dir_output.'/temp/massgeneratio
 $hookmanager->initHooks(array('conferenceorboothattendeecard', 'globalcard')); // Note that conf->hooks_modules contains array
 
 
+$confOrBooth = null;
+
 if ($conf_or_booth_id > 0) {
 	$confOrBooth = new ConferenceOrBooth($db);
 	$result = $confOrBooth->fetch($id > 0 ? $id : $conf_or_booth_id);
@@ -221,7 +223,7 @@ $help_url = 'EN:Module_Event_Organization';
 
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-eventorganization page-attendee-card');
 
-$result = $projectstatic->fetch(empty($confOrBooth->fk_project) ? $fk_project : $confOrBooth->fk_project);
+$result = $projectstatic->fetch(($confOrBooth === null || empty($confOrBooth->fk_project)) ? $fk_project : $confOrBooth->fk_project);
 if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 	$projectstatic->fetchComments();
 }
@@ -357,7 +359,7 @@ if (!empty($withproject)) {
 	$htmltext = $langs->trans("AllowUnknownPeopleSuggestConfHelp");
 	print $form->editfieldkey('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '', $projectstatic, 0, $typeofdata, '', 0, 0, 'projectid', $htmltext);
 	print '</td><td>';
-	print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '1', $projectstatic, 0, $typeofdata, '', null, 0, '', 0, '', 'projectid');
+	print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '1', $projectstatic, 0, $typeofdata, '', null, null, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td>';
@@ -365,7 +367,7 @@ if (!empty($withproject)) {
 	$htmltext = $langs->trans("AllowUnknownPeopleSuggestBoothHelp");
 	print $form->editfieldkey('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '', $projectstatic, 0, $typeofdata, '', 0, 0, 'projectid', $htmltext);
 	print '</td><td>';
-	print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '1', $projectstatic, 0, $typeofdata, '', null, 0, '', 0, '', 'projectid');
+	print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '1', $projectstatic, 0, $typeofdata, '', null, null, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td>';
@@ -377,7 +379,7 @@ if (!empty($withproject)) {
 	print '<tr><td>';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 	print '</td><td>';
-	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', null, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', null, null, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
@@ -439,7 +441,7 @@ if (!empty($withproject)) {
 }
 
 // Part to create
-if ($action == 'create') {
+if ($action == 'create' && $confOrBooth !== null) {
 	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("ConferenceOrBoothAttendee")), '', 'object_'.$object->picto);
 
 
@@ -484,7 +486,7 @@ if ($action == 'create') {
 }
 
 // Part to edit record
-if (($id || $ref) && $action == 'edit') {
+if (($id || $ref) && $action == 'edit' && $confOrBooth !== null) {
 	print load_fiche_titre($langs->trans("ConferenceOrBoothAttendee"), '', 'object_'.$object->picto);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -527,7 +529,7 @@ if (($id || $ref) && $action == 'edit') {
 }
 
 // Part to show record
-if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+if ($confOrBooth !== null && $object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
 	$object->fetch_optionals();
 
 	$moreparam = '';
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index c5934e13ecd..3cabcb13528 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2021		Florian Henry 				<florian.henry@scopen.fr>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -564,7 +565,7 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		$htmltext = $langs->trans("AllowUnknownPeopleSuggestConfHelp");
 		print $form->editfieldkey('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', $projectstatic->accept_conference_suggestions ? 1 : 0, $projectstatic, 0, $typeofdata, '', 0, 0, 'projectid', $htmltext);
 		print '</td><td>';
-		print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', $projectstatic->accept_conference_suggestions ? 1 : 0, $projectstatic, 0, $typeofdata, '', null, 0, '', 0, '', 'projectid');
+		print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', $projectstatic->accept_conference_suggestions ? 1 : 0, $projectstatic, 0, $typeofdata, '', null, null, '', 0, '', 'projectid');
 		print "</td></tr>";
 
 		print '<tr><td>';
@@ -572,39 +573,39 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		$htmltext = $langs->trans("AllowUnknownPeopleSuggestBoothHelp");
 		print $form->editfieldkey('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', $projectstatic->accept_booth_suggestions ? 1 : 0, $projectstatic, 0, $typeofdata, '', 0, 0, 'projectid', $htmltext);
 		print '</td><td>';
-		print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', $projectstatic->accept_booth_suggestions ? 1 : 0, $projectstatic, 0, $typeofdata, '', null, 0, '', 0, '', 'projectid');
+		print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', $projectstatic->accept_booth_suggestions ? 1 : 0, $projectstatic, 0, $typeofdata, '', null, null, '', 0, '', 'projectid');
 		print "</td></tr>";
 
 		print '<tr><td>';
 		print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 		print '</td><td>';
-		print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', null, 0, '', 0, '', 'projectid');
+		print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', null, null, '', 0, '', 'projectid');
 		print "</td></tr>";
 
 		print '<tr><td>';
 		print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 		print '</td><td>';
-		print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', null, 0, '', 0, '', 'projectid');
+		print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', null, null, '', 0, '', 'projectid');
 		print "</td></tr>";
 
 		print '<tr><td class="titlefield">';
 		print $form->editfieldkey($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', '', $projectstatic, $permissiontoadd, 'integer:3', '&withproject=1', 0, 0, 'projectid');
 		print '</td><td class="valuefield">';
-		print $form->editfieldval($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', $projectstatic->max_attendees, $projectstatic, $permissiontoadd, 'integer:3', '', null, 0, '&withproject=1', 0, '', 'projectid');
+		print $form->editfieldval($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', $projectstatic->max_attendees, $projectstatic, $permissiontoadd, 'integer:3', '', null, null, '&withproject=1', 0, '', 'projectid');
 		print "</td></tr>";
 
-			// Link to ICS for the event
-			print '<tr><td class="titlefield valignmiddle">'.$langs->trans("EventOrganizationICSLinkProject").'</td><td class="valuefield">';
+		// Link to ICS for the event
+		print '<tr><td class="titlefield valignmiddle">'.$langs->trans("EventOrganizationICSLinkProject").'</td><td class="valuefield">';
 		// Define $urlwithroot
-			$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-			$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
 
-			// Show message
-			$message = '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
-			$message .= '&exportkey='.urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY', '...'));
-			$message .= "&project=".$projectid.'&module='.urlencode('project@eventorganization').'&output=file">'.$langs->trans('DownloadICSLink').img_picto('', 'download', 'class="paddingleft"').'</a>';
-			print $message;
-			print "</td></tr>";
+		// Show message
+		$message = '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
+		$message .= '&exportkey='.urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY', '...'));
+		$message .= "&project=".$projectid.'&module='.urlencode('project@eventorganization').'&output=file">'.$langs->trans('DownloadICSLink').img_picto('', 'download', 'class="paddingleft"').'</a>';
+		print $message;
+		print "</td></tr>";
 
 		print '<tr><td valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
 		// Define $urlwithroot
@@ -870,7 +871,7 @@ foreach ($object->fields as $key => $val) {
 		} 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, 'minwidth100imp maxwidth125', 2);
+			print $formadmin->select_language($search[$key], 'search_lang', 0, array(), 1, 0, 0, 'minwidth100imp maxwidth125', 2);
 		} else {
 			print '<input type="text" class="flat maxwidth'.($val['type'] == 'integer' ? '50' : '75').'" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
@@ -1021,7 +1022,7 @@ while ($i < $imaxinloop) {
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
 				print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield) && !is_numeric($object->$key)) {
-					print ' title="'.dol_escape_htmltag($object->$key).'"';
+					print ' title="'.dol_escape_htmltag((string) $object->$key).'"';
 				}
 				print '>';
 				if ($key == 'status') {
@@ -1033,7 +1034,7 @@ while ($i < $imaxinloop) {
 					}
 					print $object->getNomUrl(1, $optionLink);
 				} else {
-					print $object->showOutputField($val, $key, $object->$key, '');
+					print $object->showOutputField($val, $key, (string) $object->$key, '');
 				}
 				print '</td>';
 				if (!$i) {
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 1b74583596c..a19523f9d7b 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -14,7 +14,7 @@
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2020       Lenin Rivas         	<lenin@leninrivas.com>
  * Copyright (C) 2022       Josep Lluís Amador      <joseplluis@lliuretic.cat>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -388,7 +388,7 @@ if (empty($reshook)) {
 			}
 
 			// Extrafields
-			$array_options[$i] = $extrafields->getOptionalsFromPost($object->table_element_line, $i);
+			$array_options[$i] = $extrafields->getOptionalsFromPost($object->table_element_line, (string) $i);
 			// Unset extrafield
 			if (isset($extrafields->attributes[$object->table_element_line]['label']) && is_array($extrafields->attributes[$object->table_element_line]['label'])) {
 				// Get extra fields
@@ -528,7 +528,7 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $user->hasRight('expedition', 'supprimer')) {
 		$also_update_stock = (GETPOST('alsoUpdateStock', 'alpha') ? 1 : 0);
-		$result = $object->cancel(0, $also_update_stock);
+		$result = $object->cancel(0, (bool) $also_update_stock);
 		if ($result > 0) {
 			$result = $object->setStatut(-1);
 		} else {
@@ -536,7 +536,7 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('expedition', 'supprimer')) {
 		$also_update_stock = (GETPOST('alsoUpdateStock', 'alpha') ? 1 : 0);
-		$result = $object->delete($user, 0, $also_update_stock);
+		$result = $object->delete($user, 0, (bool) $also_update_stock);
 		if ($result > 0) {
 			header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
 			exit;
@@ -1035,7 +1035,7 @@ if ($action == 'create') {
 				print '<tr>';
 				print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
 				print img_picto('', 'project', 'class="pictofixedwidth"');
-				$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
+				$numprojet = $formproject->select_projects($soc->id, (string) $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>';
 				print '</tr>';
@@ -1081,7 +1081,7 @@ if ($action == 'create') {
 			print '</td><td colspan="3">';
 			print img_picto('', 'fa-balance-scale', 'class="pictofixedwidth"');
 			print '<input name="weight" size="4" value="'.GETPOSTINT('weight').'"> ';
-			$text = $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOSTINT('weight_units'), 0, 2);
+			$text = $formproduct->selectMeasuringUnits("weight_units", "weight", (string) GETPOSTINT('weight_units'), 0, 2);
 			$htmltext = $langs->trans("KeepEmptyForAutoCalculation");
 			print $form->textwithpicto($text, $htmltext);
 			print '</td></tr>';
@@ -1094,7 +1094,7 @@ if ($action == 'create') {
 			print ' x <input name="sizeH" size="4" value="'.GETPOSTINT('sizeH').'">';
 			print ' x <input name="sizeS" size="4" value="'.GETPOSTINT('sizeS').'">';
 			print ' ';
-			$text = $formproduct->selectMeasuringUnits("size_units", "size", GETPOSTINT('size_units'), 0, 2);
+			$text = $formproduct->selectMeasuringUnits("size_units", "size", (string) GETPOSTINT('size_units'), 0, 2);
 			$htmltext = $langs->trans("KeepEmptyForAutoCalculation");
 			print $form->textwithpicto($text, $htmltext);
 			print '</td></tr>';
@@ -1277,7 +1277,7 @@ if ($action == 'create') {
 						$text .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
 						$description = ($showdescinproductdesc ? '' : dol_htmlentitiesbr($line->desc));
 
-						print $form->textwithtooltip($text, $description, 3, 0, '', $i);
+						print $form->textwithtooltip($text, $description, 3, 0, '', (string) $i);
 
 						// Show range
 						print_date_range($db->jdate($line->date_start), $db->jdate($line->date_end));
@@ -1298,7 +1298,7 @@ if ($action == 'create') {
 
 						if (!empty($line->label)) {
 							$text .= ' <strong>'.$line->label.'</strong>';
-							print $form->textwithtooltip($text, $line->desc, 3, 0, '', $i);
+							print $form->textwithtooltip($text, $line->desc, 3, 0, '', (string) $i);
 						} else {
 							print $text.' '.nl2br($line->desc);
 						}
@@ -1856,7 +1856,7 @@ if ($action == 'create') {
 
 						$expLine->array_options = array_merge($expLine->array_options, $srcLine->array_options);
 
-						print $expLine->showOptionals($extrafields, 'edit', array('style' => 'class="drag drop oddeven"', 'colspan' => $colspan), $indiceAsked, '', 1);
+						print $expLine->showOptionals($extrafields, 'edit', array('style' => 'class="drag drop oddeven"', 'colspan' => $colspan), (string) $indiceAsked, '', '1');
 					}
 				}
 
@@ -2003,7 +2003,7 @@ if ($action == 'create') {
 			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, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, (string) $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
@@ -2107,13 +2107,13 @@ if ($action == 'create') {
 		print '<input name="id" value="'.$object->id.'" type="hidden">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input id="trueWeight" name="trueWeight" value="'.$object->trueWeight.'" type="text" class="width50 valignmiddle">';
-		print $formproduct->selectMeasuringUnits("weight_units", "weight", $object->weight_units, 0, 2, 'maxwidth125 valignmiddle');
+		print $formproduct->selectMeasuringUnits("weight_units", "weight", (string) $object->weight_units, 0, 2, 'maxwidth125 valignmiddle');
 		print ' <input class="button smallpaddingimp valignmiddle" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 		print ' <input class="button button-cancel smallpaddingimp valignmiddle" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 		print '</form>';
 	} else {
 		print $object->trueWeight;
-		print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
+		print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", (string) $object->weight_units) : '';
 	}
 
 	// Calculated
@@ -2228,7 +2228,7 @@ if ($action == 'create') {
 	} else {
 		if ($object->shipping_method_id > 0) {
 			// Get code using getLabelFromKey
-			$code = $langs->getLabelFromKey($db, $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
+			$code = $langs->getLabelFromKey($db, (string) $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
 			print $langs->trans("SendingMethod".strtoupper($code));
 		}
 	}
@@ -2462,7 +2462,7 @@ if ($action == 'create') {
 				$text = $product_static->getNomUrl(1);
 				$text .= ' - '.$label;
 				$description = (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE') ? '' : dol_htmlentitiesbr($lines[$i]->description));
-				print $form->textwithtooltip($text, $description, 3, 0, '', $i);
+				print $form->textwithtooltip($text, $description, 3, 0, '', (string) $i);
 				print_date_range(!empty($lines[$i]->date_start) ? $lines[$i]->date_start : '', !empty($lines[$i]->date_end) ? $lines[$i]->date_end : '');
 				if (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE')) {
 					print (!empty($lines[$i]->description) && $lines[$i]->description != $lines[$i]->product) ? '<br>'.dol_htmlentitiesbr($lines[$i]->description) : '';
@@ -2478,7 +2478,7 @@ if ($action == 'create') {
 
 				if (!empty($lines[$i]->label)) {
 					$text .= ' <strong>'.$lines[$i]->label.'</strong>';
-					print $form->textwithtooltip($text, $lines[$i]->description, 3, 0, '', $i);
+					print $form->textwithtooltip($text, $lines[$i]->description, 3, 0, '', (string) $i);
 				} else {
 					print $text.' '.nl2br($lines[$i]->description);
 				}
@@ -2489,7 +2489,7 @@ if ($action == 'create') {
 
 			$unit_order = '';
 			if (getDolGlobalString('PRODUCT_USE_UNITS')) {
-				$unit_order = measuringUnitString($lines[$i]->fk_unit);
+				$unit_order = measuringUnitString((int) $lines[$i]->fk_unit);
 			}
 
 			// Qty ordered
@@ -2529,7 +2529,7 @@ if ($action == 'create') {
 						}
 					}
 				}
-				print $form->textwithpicto($qtyalreadysent, $htmltooltip, 1, 'info', '', 0, 3, 'tooltip'.$lines[$i]->id);
+				print $form->textwithpicto((string) $qtyalreadysent, $htmltooltip, 1, 'info', '', 0, 3, 'tooltip'.$lines[$i]->id);
 				print '</td>';
 			}
 
@@ -2738,9 +2738,9 @@ if ($action == 'create') {
 
 				// TODO Show all in same line by setting $display_type = 'line'
 				if ($action == 'editline' && $line->id == $line_id) {
-					print $lines[$i]->showOptionals($extrafields, 'edit', array('colspan' => $colspan), !empty($indiceAsked) ? $indiceAsked : '', '', 0, 'card');
+					print $lines[$i]->showOptionals($extrafields, 'edit', array('colspan' => $colspan), !empty($indiceAsked) ? $indiceAsked : '', '', '', 'card');
 				} else {
-					print $lines[$i]->showOptionals($extrafields, 'view', array('colspan' => $colspan), !empty($indiceAsked) ? $indiceAsked : '', '', 0, 'card');
+					print $lines[$i]->showOptionals($extrafields, 'view', array('colspan' => $colspan), !empty($indiceAsked) ? $indiceAsked : '', '', '', 'card');
 				}
 			}
 		}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 61e50c14373..d3ecb5adad9 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -13,7 +13,7 @@
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
  * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2020       Lenin Rivas         	<lenin@leninrivas.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -306,7 +306,6 @@ class Expedition extends CommonObject
 	 * Closed status
 	 * -> parcel was received by customer / end of process
 	 * prev status : validated or shipment_in_progress
-	 *
 	 */
 	const STATUS_CLOSED = 2;
 
@@ -1476,10 +1475,10 @@ class Expedition extends CommonObject
 	 * 	Delete shipment.
 	 * 	Warning, do not delete a shipment if a delivery is linked to (with table llx_element_element)
 	 *
-	 *  @param	User	$user					User making the deletion
-	 *  @param  int  	$notrigger 				Disable triggers
-	 *  @param  bool 	$also_update_stock  	true if the stock should be increased back (false by default)
-	 * 	@return	int								>0 if OK, 0 if deletion done but failed to delete files, <0 if KO
+	 *  @param	?User		$user					User making the deletion
+	 *  @param  int<0,1>  	$notrigger 				Disable triggers
+	 *  @param  bool		$also_update_stock  	true if the stock should be increased back (false by default)
+	 * 	@return	int									>0 if OK, 0 if deletion done but failed to delete files, <0 if KO
 	 */
 	public function delete($user = null, $notrigger = 0, $also_update_stock = false)
 	{
@@ -2437,7 +2436,6 @@ class Expedition extends CommonObject
 	 * @param		string	$labelmovement		Label of movement
 	 * @return     	int     					Return integer <0 if KO, >0 if OK
 	 * @throws Exception
-	 *
 	 */
 	private function manageStockMvtOnEvt($user, $labelmovement = 'ShipmentClassifyClosedInDolibarr')
 	{
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 3818847e84e..534515a84f6 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2023      Christian Foellmann  <christian@foellmann.de>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -52,6 +53,7 @@ $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
+$typeobject = null;
 $object = new Expedition($db);
 if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
@@ -85,7 +87,7 @@ $result = restrictedArea($user, 'expedition', $object->id, '');
  * Actions
  */
 
-$parameters = array('id'=>$id);
+$parameters = array('id' => $id);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -172,7 +174,7 @@ if ($id > 0 || !empty($ref)) {
 			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, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, (string) $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/expedition/dispatch.php b/htdocs/expedition/dispatch.php
index e1340a8b0d7..67c30c5ff95 100644
--- a/htdocs/expedition/dispatch.php
+++ b/htdocs/expedition/dispatch.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2017-2022  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2019-2020  Christophe Battarel	    <christophe@altairis.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -141,6 +141,7 @@ if ($action == 'updatelines' && $usercancreate) {
 		$reg = array();
 		if (preg_match('/^product_.*([0-9]+)_([0-9]+)$/i', $key, $reg)) {
 			$pos++;
+			$modebatch = null;
 			if (preg_match('/^product_([0-9]+)_([0-9]+)$/i', $key, $reg)) {
 				$modebatch = "barcode";
 			} elseif (preg_match('/^product_batch_([0-9]+)_([0-9]+)$/i', $key, $reg)) { // With batchmode enabled
@@ -156,7 +157,7 @@ if ($action == 'updatelines' && $usercancreate) {
 			$qty = "qty_".$reg[1].'_'.$reg[2];
 			$ent = "entrepot_".$reg[1].'_'.$reg[2];
 			$fk_commandedet = "fk_commandedet_".$reg[1].'_'.$reg[2];
-			$idline = GETPOST("idline_".$reg[1].'_'.$reg[2]);
+			$idline = GETPOSTINT("idline_".$reg[1].'_'.$reg[2]);
 			$warehouse_id = GETPOSTINT($ent);
 			$prod_id = GETPOSTINT($prod);
 			//$pu = "pu_".$reg[1].'_'.$reg[2]; // This is unit price including discount
@@ -245,6 +246,7 @@ if ($action == 'updatelines' && $usercancreate) {
 									$sqlsearchdet .= " AND batch = '".$db->escape($lot)."'";
 									$resqlsearchdet = $db->query($sqlsearchdet);
 
+									$objsearchdet = null;
 									if ($resqlsearchdet) {
 										$objsearchdet = $db->fetch_object($resqlsearchdet);
 									} else {
@@ -384,6 +386,7 @@ $warehouse_static = new Entrepot($db);
 $title = $object->ref." - ".$langs->trans('ShipmentDistribution');
 $help_url = 'EN:Module_Shipments|FR:Module_Expéditions|ES:M&oacute;dulo_Expediciones|DE:Modul_Lieferungen';
 $morejs = array('/expedition/js/lib_dispatch.js.php');
+$typeobject = null;
 
 llxHeader('', $title, $help_url, '', 0, 0, $morejs, '', '', 'mod-expedition page-card_dispatch');
 
@@ -459,7 +462,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 			if ($action != 'classify' && $permissiontoadd) {
 				$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, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
@@ -546,6 +549,11 @@ if ($object->id > 0 || !empty($object->ref)) {
 		$entrepot = new Entrepot($db);
 		$listwarehouses = $entrepot->list_array(1);
 
+		$nbfreeproduct = 0; // Nb of lines of free products/services
+		$nbproduct = 0; // Nb of predefined product lines to dispatch (already done or not) if SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED is off (default)
+		// or nb of line that remain to dispatch if SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED is on.
+
+
 
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 
@@ -683,10 +691,6 @@ if ($object->id > 0 || !empty($object->ref)) {
 				print "</tr>\n";
 			}
 
-			$nbfreeproduct = 0; // Nb of lines of free products/services
-			$nbproduct = 0; // Nb of predefined product lines to dispatch (already done or not) if SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED is off (default)
-			// or nb of line that remain to dispatch if SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED is on.
-
 			$conf->cache['product'] = array();
 
 			// Loop on each line of origin order
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index f8b1cc3ad85..4dc74e52a72 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
  * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -79,6 +80,7 @@ if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
 	$object->fetch_thirdparty();
 
+	$typeobject = null;
 	if (!empty($object->origin)) {
 		$typeobject = $object->origin;
 		$origin = $object->origin;
@@ -159,7 +161,7 @@ if ($id > 0 || !empty($ref)) {
 				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, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, (string) $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($objectsrc->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index b45450396bc..03a6a11db5d 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -6,7 +6,7 @@
  * 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>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Benjamin Falière	<benjamin.faliere@altairis.fr>
  * Copyright (C) 2024		Vincent Maury		<vmaury@timgroup.fr>
  * Copyright (C) 2024		William Mead		<william.mead@manchenumerique.fr>
@@ -557,9 +557,6 @@ if (empty($reshook)) {
 			if ($search_company) {
 				$param .= "&search_company=".urlencode($search_company);
 			}
-			if ($search_shipping_method_id) {
-				$param .= "&amp;search_shipping_method_id=".urlencode($search_shipping_method_id);
-			}
 			if ($search_tracking) {
 				$param .= "&search_tracking=".urlencode($search_tracking);
 			}
@@ -1089,7 +1086,7 @@ if ($massaction == 'createbills') {
 	print $langs->trans('DateInvoice');
 	print '</td>';
 	print '<td>';
-	print $form->selectDate('', '', '', '', '', '', 1, 1);
+	print $form->selectDate('', '', 0, 0, 0, '', 1, 1);
 	print '</td>';
 	print '</tr>';
 	print '<tr>';
@@ -1106,7 +1103,7 @@ if ($massaction == 'createbills') {
 	print '</td>';
 	print '<td>';
 	if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
-		print $form->selectyesno('validate_invoices', 0, 1, 1);
+		print $form->selectyesno('validate_invoices', 0, 1, true);
 		$langs->load("errors");
 		print ' ('.$langs->trans("WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal").')';
 	} else {
@@ -1152,7 +1149,7 @@ if ($user->hasRight('user', 'user', 'lire')) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('LinkedToSpecificUsers');
 	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"');
-	$moreforfilter .= $form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
+	$moreforfilter .= $form->select_dolusers($search_user, 'search_user', $tmptitle, null, 0, '', '', '0', 0, 0, '', 0, '', 'maxwidth200');
 	$moreforfilter .= '</div>';
 }
 // If the user can view prospects other than his'
@@ -1190,7 +1187,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // @phan-suppress-current-line PhanTypeMismatchArgument
 if ($massactionbutton) {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1); // This also change content of $arrayfields
 }
@@ -1223,7 +1220,7 @@ if (!empty($arrayfields['e.ref_customer']['checked'])) {
 // Thirdparty
 if (!empty($arrayfields['s.nom']['checked'])) {
 	print '<td class="liste_titre left">';
-	print '<input class="flat" type="text" size="8" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
+	print '<input class="flat" type="text" size="8" name="search_company" value="'.dol_escape_htmltag((string) $search_company).'">';
 	print '</td>';
 }
 // Town
@@ -1353,7 +1350,7 @@ if (!empty($arrayfields['e.signed_status']['checked'])) {
 // Status billed
 if (!empty($arrayfields['e.billed']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
-	print $form->selectyesno('search_billed', $search_billed, 1, 0, 1);
+	print $form->selectyesno('search_billed', $search_billed, 1, false, 1);
 	print '</td>';
 }
 // Action column
@@ -1649,7 +1646,7 @@ while ($i < $imaxinloop) {
 		}
 		if (!empty($arrayfields['e.fk_shipping_method']['checked'])) {
 			// Get code using getLabelFromKey
-			$code = $langs->getLabelFromKey($db, $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
+			$code = $langs->getLabelFromKey($db, (string) $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
 			print '<td class="center tdoverflowmax150" title="'.dol_escape_htmltag($langs->trans("SendingMethod".strtoupper($code))).'">';
 			if ($object->shipping_method_id > 0) {
 				print $langs->trans("SendingMethod".strtoupper($code));
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index 862253ba2ce..f2186c1be04 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012  Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2013 	   Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -54,6 +55,7 @@ if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
 	$object->fetch_thirdparty();
 
+	$typeobject = null;
 	if (!empty($object->origin)) {
 		$typeobject = $object->origin;
 		$origin = $object->origin;
@@ -128,7 +130,7 @@ if ($id > 0 || !empty($ref)) {
 			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, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, (string) $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 89930ef944c..e7ecf387ec1 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2012-2015	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2018-2022  Philippe Grand          <philippe.grand@atoo-net.com>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -146,7 +146,7 @@ if (empty($reshook)) {
 
 	if ($action == 'setavailability' && $permissiontoadd) {
 		$object->fetch($id);
-		$result = $object->availability(GETPOST('availability_id'));
+		$result = $object->availability(GETPOSTINT('availability_id'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -154,7 +154,7 @@ if (empty($reshook)) {
 
 	if ($action == 'setdemandreason' && $permissiontoadd) {
 		$object->fetch($id);
-		$result = $object->demand_reason(GETPOST('demand_reason_id'));
+		$result = $object->demand_reason(GETPOSTINT('demand_reason_id'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -301,7 +301,7 @@ if ($id > 0 || !empty($ref)) {
 				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, $objectsrc->socid, $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $objectsrc->socid, (string) $objectsrc->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 					$proj = new Project($db);
@@ -336,8 +336,8 @@ if ($id > 0 || !empty($ref)) {
 
 		print '<tr><td class="titlefield">'.$langs->trans('Discounts').'</td><td colspan="2">';
 
-		$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount);
-		$absolute_creditnote = $soc->getAvailableDiscounts('', $filtercreditnote);
+		$absolute_discount = $soc->getAvailableDiscounts(null, $filterabsolutediscount);
+		$absolute_creditnote = $soc->getAvailableDiscounts(null, $filtercreditnote);
 		$absolute_discount = price2num($absolute_discount, 'MT');
 		$absolute_creditnote = price2num($absolute_creditnote, 'MT');
 
@@ -396,9 +396,9 @@ if ($id > 0 || !empty($ref)) {
 		print '</tr></table>';
 		print '</td><td colspan="2">';
 		if ($action == 'editavailability') {
-			$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'availability_id', 1);
+			$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->availability_id, 'availability_id', 1);
 		} else {
-			$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'none', 1);
+			$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->availability_id, 'none', 1);
 		}
 		print '</td></tr>';
 
@@ -413,9 +413,9 @@ if ($id > 0 || !empty($ref)) {
 		print '</tr></table>';
 		print '</td><td colspan="2">';
 		if ($action == 'editshippingmethod') {
-			$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
+			$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->shipping_method_id, 'shipping_method_id', 1);
 		} else {
-			$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'none');
+			$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->shipping_method_id, 'none');
 		}
 		print '</td>';
 		print '</tr>';
@@ -453,9 +453,9 @@ if ($id > 0 || !empty($ref)) {
 		print '</tr></table>';
 		print '</td><td colspan="2">';
 		if ($action == 'editdemandreason') {
-			$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'demand_reason_id', 1);
+			$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->demand_reason_id, 'demand_reason_id', 1);
 		} else {
-			$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'none');
+			$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->demand_reason_id, 'none');
 		}
 
 		// Terms of payment
@@ -620,6 +620,9 @@ if ($id > 0 || !empty($ref)) {
 		$sql .= " WHERE cd.fk_commande = ".((int) $object->id);
 		$sql .= " ORDER BY cd.rang, cd.rowid";
 
+		$toBeShipped = array();
+		$toBeShippedTotal = 0;
+
 		//print $sql;
 		dol_syslog("shipment.php", LOG_DEBUG);
 		$resql = $db->query($sql);
@@ -643,8 +646,6 @@ if ($id > 0 || !empty($ref)) {
 			print "</tr>\n";
 			print '</thead>';
 
-			$toBeShipped = array();
-			$toBeShippedTotal = 0;
 			while ($i < $num) {
 				$objp = $db->fetch_object($resql);
 
@@ -733,7 +734,7 @@ if ($id > 0 || !empty($ref)) {
 						$text .= ' - '.$label;
 						$description = (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE') ? '' : dol_htmlentitiesbr($objp->description)).'<br>';
 						$description .= $product_static->show_photos('product', $conf->product->multidir_output[$product_static->entity], 1, 1, 0, 0, 0, 80);
-						print $form->textwithtooltip($text, $description, 3, '', '', $i);
+						print $form->textwithtooltip($text, $description, 3, '', 0, (string) $i);
 
 						// Show range
 						print_date_range($db->jdate($objp->date_start), $db->jdate($objp->date_end));
@@ -754,7 +755,7 @@ if ($id > 0 || !empty($ref)) {
 
 						if (!empty($objp->label)) {
 							$text .= ' <strong>'.$objp->label.'</strong>';
-							print $form->textwithtooltip($text, $objp->description, 3, '', '', $i);
+							print $form->textwithtooltip($text, $objp->description, 3, 0, '', (string) $i);
 						} else {
 							print $text.' '.nl2br($objp->description);
 						}
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index e0cd273c028..d931c854afb 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2015-2023  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2017       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -234,6 +234,7 @@ if (empty($reshook)) {
 
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) {
+		// @phan-suppress-next-line PhanPluginBothLiteralsBinaryOp
 		if (1 == 0 && !GETPOST('clone_content', 'alpha') && !GETPOST('clone_receivers', 'alpha')) {
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		} else {
@@ -1358,7 +1359,7 @@ if (empty($reshook)) {
 
 		if (!$error) {
 			// TODO Use update method of ExpenseReportLine
-			$result = $object->updateline($rowid, $type_fees_id, $projet_id, $vatrate, $comments, $qty, $value_unit, $date, $id, $fk_c_exp_tax_cat, $fk_ecm_files);
+			$result = $object->updateline($rowid, $type_fees_id, $projet_id, $vatrate, $comments, (float) $qty, (float) $value_unit, $date, $id, $fk_c_exp_tax_cat, $fk_ecm_files);
 			if ($result >= 0) {
 				if ($result > 0) {
 					// Define output language
@@ -1431,6 +1432,7 @@ $paymentexpensereportstatic = new PaymentExpenseReport($db);
 $bankaccountstatic = new Account($db);
 $ecmfilesstatic = new EcmFiles($db);
 $formexpensereport = new FormExpenseReport($db);
+$remaintopay = 0;
 
 // Create
 if ($action == 'create') {
@@ -1474,7 +1476,7 @@ if ($action == 'create') {
 	if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expensereport', 'writeall_advance')) {
 		$include_users = array();
 	}
-	$s = $form->select_dolusers($defaultselectuser, "fk_user_author", 0, "", 0, $include_users, '', '0,'.$conf->entity);
+	$s = $form->select_dolusers($defaultselectuser, "fk_user_author", 0, null, 0, $include_users, '', '0,'.$conf->entity);
 	print $s;
 	print '</td>';
 	print '</tr>';
@@ -1495,7 +1497,7 @@ if ($action == 'create') {
 		if (GETPOSTINT('fk_user_validator') > 0) {
 			$defaultselectuser = GETPOSTINT('fk_user_validator');
 		}
-		$s = $form->select_dolusers($defaultselectuser, "fk_user_validator", 1, "", ((empty($defaultselectuser) || !getDolGlobalString('EXPENSEREPORT_DEFAULT_VALIDATOR_UNCHANGEABLE')) ? 0 : 1), $include_users);
+		$s = $form->select_dolusers($defaultselectuser, "fk_user_validator", 1, null, ((empty($defaultselectuser) || !getDolGlobalString('EXPENSEREPORT_DEFAULT_VALIDATOR_UNCHANGEABLE')) ? 0 : 1), $include_users);
 		print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
 	}
 	print '</td>';
@@ -1552,6 +1554,7 @@ if ($action == 'create') {
 
 	print '</form>';
 } elseif ($id > 0 || $ref) {
+	$userauthor = null;
 	$result = $object->fetch($id, $ref);
 
 	if ($result > 0) {
@@ -1624,7 +1627,7 @@ if ($action == 'create') {
 				print '<tr>';
 				print '<td>'.$langs->trans("ModePaiement").'</td>';
 				print '<td>';
-				$form->select_types_paiements($object->fk_c_paiement, 'fk_c_paiement');
+				$form->select_types_paiements((string) $object->fk_c_paiement, 'fk_c_paiement');
 				print '</td>';
 				print '</tr>';
 			}
@@ -1634,7 +1637,7 @@ if ($action == 'create') {
 				print '<td>'.$langs->trans("VALIDATOR").'</td>'; // Approbator
 				print '<td>';
 				$include_users = $object->fetch_users_approver_expensereport();
-				$s = $form->select_dolusers($object->fk_user_validator, "fk_user_validator", 1, "", 0, $include_users);
+				$s = $form->select_dolusers($object->fk_user_validator, "fk_user_validator", 1, null, 0, $include_users);
 				print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
 				print '</td>';
 				print '</tr>';
@@ -2225,7 +2228,7 @@ if ($action == 'create') {
 
 						print '<td class="right linecolunitttc">'.price($line->value_unit).'</td>';
 
-						print '<td class="right linecolqty">'.dol_escape_htmltag($line->qty).'</td>';
+						print '<td class="right linecolqty">'.dol_escape_htmltag((string) $line->qty).'</td>';
 
 						if ($action != 'editline') {
 							print '<td class="right linecoltotalht">'.price($line->total_ht).'</td>';
@@ -2400,7 +2403,7 @@ if ($action == 'create') {
 						// Select project
 						if (isModEnabled('project')) {
 							print '<td>';
-							$formproject->select_projects(-1, $line->fk_project, 'fk_project', 0, 0, $projectRequired ? 0 : 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth300');
+							$formproject->select_projects(-1, (string) $line->fk_project, 'fk_project', 0, 0, $projectRequired ? 0 : 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth300');
 							print '</td>';
 						}
 
@@ -2412,7 +2415,7 @@ if ($action == 'create') {
 						if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 							print '<td class="fk_c_exp_tax_cat">';
 							$params = array('fk_expense' => $object->id, 'fk_expense_det' => $line->id, 'date' => $line->date);
-							print $form->selectExpenseCategories($line->fk_c_exp_tax_cat, 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params);
+							print $form->selectExpenseCategories($line->fk_c_exp_tax_cat, 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', (string) $userauthor->default_c_exp_tax_cat, $params);
 							print '</td>';
 						}
 
@@ -2424,7 +2427,7 @@ if ($action == 'create') {
 						// VAT
 						$selectedvat = price2num($line->vatrate).(!empty($line->vat_src_code) ? ' ('.$line->vat_src_code.')' : '');
 						print '<td class="right">';
-						print $form->load_tva('vatrate', (GETPOSTISSET("vatrate") ? GETPOST("vatrate") : $selectedvat), $mysoc, '', 0, 0, '', false, 1, 2);
+						print $form->load_tva('vatrate', (GETPOSTISSET("vatrate") ? GETPOST("vatrate") : $selectedvat), $mysoc, null, 0, 0, '', false, 1, 2);
 						print '</td>';
 
 						// Unit price
@@ -2439,7 +2442,7 @@ if ($action == 'create') {
 
 						// Quantity
 						print '<td class="right">';
-						print '<input type="text" min="0" class="input_qty right maxwidth50"  name="qty" value="'.dol_escape_htmltag($line->qty).'" />';  // We must be able to enter decimal qty
+						print '<input type="text" min="0" class="input_qty right maxwidth50"  name="qty" value="'.dol_escape_htmltag((string) $line->qty).'" />';  // We must be able to enter decimal qty
 						print '</td>';
 
 						//print '<td class="right">'.$langs->trans('AmountHT').'</td>';
@@ -2455,7 +2458,7 @@ if ($action == 'create') {
 
 						print '<td>';
 						print '<input type="hidden" name="rowid" value="'.$line->rowid.'">';
-						print $form->buttonsSaveCancel('Save', 'Cancel', array(), 0, 'small');
+						print $form->buttonsSaveCancel('Save', 'Cancel', array(), false, 'small');
 						print '</td>';
 
 						print '</tr>';
@@ -2582,7 +2585,7 @@ if ($action == 'create') {
 				// Select project
 				if (isModEnabled('project')) {
 					print '<td class="inputproject">';
-					$formproject->select_projects(-1, !empty($fk_project) ? $fk_project : 0, 'fk_project', 0, 0, $projectRequired ? 0 : 1, -1, 0, 0, 0, '', 0, 0, 'maxwidth300');
+					$formproject->select_projects(-1, !empty($fk_project) ? (string) $fk_project : '0', 'fk_project', 0, 0, $projectRequired ? 0 : 1, -1, 0, 0, 0, '', 0, 0, 'maxwidth300');
 					print '</td>';
 				}
 
@@ -2610,7 +2613,7 @@ if ($action == 'create') {
 					// If option to have no default VAT on expense report is on, we force MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS
 					$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
 				}
-				print $form->load_tva('vatrate', (!empty($vatrate) ? $vatrate : $defaultvat), $mysoc, '', 0, 0, '', false, 1);
+				print $form->load_tva('vatrate', (!empty($vatrate) ? $vatrate : $defaultvat), $mysoc, null, 0, 0, '', false, 1);
 				print '</td>';
 
 				// Unit price net
@@ -2638,7 +2641,7 @@ if ($action == 'create') {
 				}
 
 				print '<td class="center inputbuttons">';
-				print $form->buttonsSaveCancel("Add", '', '', 1, 'reposition');
+				print $form->buttonsSaveCancel("Add", '', array(), true, 'reposition');
 				print '</td>';
 
 				print '</tr>';
@@ -2938,7 +2941,7 @@ if ($action != 'presend') {
 	// List of actions on element
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 	$formactions = new FormActions($db);
-	$somethingshown = $formactions->showactions($object, 'expensereport', null);
+	$somethingshown = $formactions->showactions($object, 'expensereport', 0);
 
 	print '</div></div>';
 }

From 0438db7747cbcfd8fca449e3908ba5316b32a4a5 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 29 Jan 2025 07:10:41 +0100
Subject: [PATCH 320/602] FIX wrong table name

---
 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 379e2b802e1..fbbdb35e7a8 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -439,7 +439,7 @@ class AccountancyCategory // extends CommonObject
 	{
 		global $conf;
 		$sql = "SELECT t.rowid, t.account_number, t.label";
-		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
+		$sql .= " FROM ".$this->db->prefix()."accounting_account as t";
 		$sql .= " WHERE t.fk_accounting_category = ".((int) $id);
 		$sql .= " AND t.entity = ".$conf->entity;
 

From c43f74687a6aa19318d09435db5c673d2300e9dc Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 29 Jan 2025 07:32:22 +0100
Subject: [PATCH 321/602] FIX #32843

---
 htdocs/bom/bom_card.php | 2 +-
 htdocs/mrp/mo_card.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index c5456de0a21..0656d9d1e31 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -800,7 +800,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 		$genallowed = $user->hasRight('bom', 'read'); // If you can read, you can build the PDF to read content
 		$delallowed = $user->hasRight('bom', 'write'); // If you can create/edit, you can remove a file on card
-		print $formfile->showdocuments('bom', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+		print $formfile->showdocuments('bom', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang, '', $object);
 
 		// Show links to link elements
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('bom'));
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 17f5aefcb62..7f1ccf1729e 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -853,7 +853,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 		$genallowed = $user->hasRight('mrp', 'read'); // If you can read, you can build the PDF to read content
 		$delallowed = $user->hasRight("mrp", "creer"); // If you can create/edit, you can remove a file on card
-		print $formfile->showdocuments('mrp:mo', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $mysoc->default_lang);
+		print $formfile->showdocuments('mrp:mo', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $mysoc->default_lang, '', $object);
 
 		// Show links to link elements
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('mo'));

From 510da33c338f3f6be53cb9ec90626bcb404aeab7 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 29 Jan 2025 08:35:55 +0100
Subject: [PATCH 322/602] FIX #32840

---
 htdocs/categories/class/categorie.class.php | 35 ++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 330baf65469..b3721d1bee7 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -285,6 +285,38 @@ class Categorie extends CommonObject
 	 */
 	public $imgHeight;
 
+	/**
+	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("MY_SETUP_PARAM")'
+	 *  '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)
+	 *  '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 recommended 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 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  'help' is a string visible as a tooltip on field
+	 *  '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 list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  '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.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
+
+	/**
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields = array(
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'visible' => 1, 'showoncombobox' => 1),
+	);
+
 	/**
 	 *	Constructor
 	 *
@@ -1751,7 +1783,8 @@ class Categorie extends CommonObject
 		}
 
 		// Check contrast with background and correct text color
-		$forced_color = 'categtextwhite';
+		//$forced_color = 'categtextwhite'; // TODO This css class hide the link
+		$forced_color = 'categtextblack';
 		if ($this->color) {
 			if (colorIsLight($this->color)) {
 				$forced_color = 'categtextblack';

From 3f1efcfb53a5d9bb58800aed0f3f27574d0fb3c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 29 Jan 2025 09:01:32 +0100
Subject: [PATCH 323/602] dict type contact

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index c201ca97b73..d96d7ce0e4f 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2011-2024	Alexandre Spangaro		<alexandre@inovea-conseil.com>
  * Copyright (C) 2015		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2019-2024	Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2019-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2020-2022  Open-Dsi                <support@open-dsi.fr>
  * Copyright (C) 2024       Charlene Benke          <charlene@patas-monkey.com>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
@@ -716,6 +716,7 @@ if ($id == DICT_TYPE_CONTACT) {
 		'project_task' => img_picto('', 'projecttask', 'class="pictofixedwidth"').$langs->trans('Task'),
 		'propal' => img_picto('', 'propal', 'class="pictofixedwidth"').$langs->trans('Proposal'),
 		'commande' => img_picto('', 'order', 'class="pictofixedwidth"').$langs->trans('Order'),
+		'shipping' => img_picto('', 'dolly', 'class="pictofixedwidth"') . $langs->trans('Shipment'),
 		'facture' => img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans('Bill'),
 		'fichinter' => img_picto('', 'intervention', 'class="pictofixedwidth"').$langs->trans('InterventionCard'),
 		'contrat' => img_picto('', 'contract', 'class="pictofixedwidth"').$langs->trans('Contract'),

From 40d8bea77e2133335de16b8336e66b074a96e205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 29 Jan 2025 09:14:13 +0100
Subject: [PATCH 324/602] dict type contact

---
 htdocs/commande/class/commande.class.php         | 4 ++--
 htdocs/install/mysql/migration/21.0.0-22.0.0.sql | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 71e03085f69..ccce40846ce 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1638,9 +1638,9 @@ class Commande extends CommonOrder
 				$product = new Product($this->db);
 				$result = $product->fetch($fk_product);
 				if ($qty < $product->packaging) {
-					$qty = $product->packaging;
+					$qty = (float) $product->packaging;
 				} else {
-					if (!empty($product->packaging) && (fmod((float) $qty, $product->packaging)  > 0.000001)) {
+					if (!empty($product->packaging) && (fmod((float) $qty, (float) $product->packaging)  > 0.000001)) {
 						$coeff = intval((float) $qty / $product->packaging) + 1;
 						$qty = (float) $product->packaging * $coeff;
 						setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');
diff --git a/htdocs/install/mysql/migration/21.0.0-22.0.0.sql b/htdocs/install/mysql/migration/21.0.0-22.0.0.sql
index 0837bdb61a8..0aef3f65cc8 100644
--- a/htdocs/install/mysql/migration/21.0.0-22.0.0.sql
+++ b/htdocs/install/mysql/migration/21.0.0-22.0.0.sql
@@ -42,6 +42,13 @@ ALTER TABLE llx_societe_account ADD UNIQUE INDEX uk_societe_account_login_websit
 
 
 -- V22 migration
+-- fix element
+UPDATE llx_c_type_contact set element='shipping' WHERE element='expedition';
+-- Shipment / Expedition
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('shipping', 'internal', 'SALESREPFOLL',  'Responsable suivi de l''expédition', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('shipping', 'external', 'CUSTOMER',      'Customer shipping contact', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('shipping', 'external', 'SHIPPING',      'Loading facility', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('shipping', 'external', 'DELIVERY',      'Delivery facility', 1);
 
 ALTER TABLE llx_holiday_config DROP INDEX idx_holiday_config;
 ALTER TABLE llx_holiday_config ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;
@@ -49,4 +56,4 @@ ALTER TABLE llx_holiday_config ADD UNIQUE INDEX idx_holiday_config (entity, name
 
 ALTER TABLE llx_societe_account ADD COLUMN ip varchar(250);
 
-ALTER TABLE llx_product ADD COLUMN packaging float(24,8) DEFAULT NULL;
\ No newline at end of file
+ALTER TABLE llx_product ADD COLUMN packaging float(24,8) DEFAULT NULL;

From e7088d779415b158720aa3081ca01a44f30ec31c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 29 Jan 2025 09:14:37 +0100
Subject: [PATCH 325/602] FIX add other fields

---
 htdocs/categories/class/categorie.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index b3721d1bee7..305649da4e4 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -314,7 +314,9 @@ class Categorie extends CommonObject
 	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'visible' => 1, 'showoncombobox' => 1),
+		'rowid'		=> array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
+		'entity'	=> array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'default' => '1', 'notnull' => 1, 'index' => 1, 'position' => 5),
+		'label'		=> array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'visible' => 1, 'showoncombobox' => 1, 'position' => 15, 'csslist' => 'tdoverflowmax250'),
 	);
 
 	/**

From 262a07f5fa43a0a6418579d1eb42034583977471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 29 Jan 2025 09:25:23 +0100
Subject: [PATCH 326/602] dict type contact

---
 htdocs/compta/facture/class/facture.class.php    | 4 ++--
 htdocs/install/mysql/migration/21.0.0-22.0.0.sql | 9 +++++----
 htdocs/langs/en_US/propal.lang                   | 2 +-
 htdocs/langs/en_US/sendings.lang                 | 6 ++++++
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 09dddafbbd5..68a019043d5 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4003,9 +4003,9 @@ class Facture extends CommonInvoice
 				$product = new Product($this->db);
 				$result = $product->fetch($fk_product);
 				if ($qty < $product->packaging) {
-					$qty = $product->packaging;
+					$qty = (float) $product->packaging;
 				} else {
-					if (!empty($product->packaging) && (fmod((float) $qty, $product->packaging)  > 0.000001)) {
+					if (!empty($product->packaging) && (fmod((float) $qty, (float) $product->packaging)  > 0.000001)) {
 						$coeff = intval((float) $qty / $product->packaging) + 1;
 						$qty = (float) $product->packaging * $coeff;
 						setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');
diff --git a/htdocs/install/mysql/migration/21.0.0-22.0.0.sql b/htdocs/install/mysql/migration/21.0.0-22.0.0.sql
index 0aef3f65cc8..4cf68ce85ad 100644
--- a/htdocs/install/mysql/migration/21.0.0-22.0.0.sql
+++ b/htdocs/install/mysql/migration/21.0.0-22.0.0.sql
@@ -45,10 +45,11 @@ ALTER TABLE llx_societe_account ADD UNIQUE INDEX uk_societe_account_login_websit
 -- fix element
 UPDATE llx_c_type_contact set element='shipping' WHERE element='expedition';
 -- Shipment / Expedition
-insert into llx_c_type_contact (element, source, code, libelle, active ) values ('shipping', 'internal', 'SALESREPFOLL',  'Responsable suivi de l''expédition', 1);
-insert into llx_c_type_contact (element, source, code, libelle, active ) values ('shipping', 'external', 'CUSTOMER',      'Customer shipping contact', 1);
-insert into llx_c_type_contact (element, source, code, libelle, active ) values ('shipping', 'external', 'SHIPPING',      'Loading facility', 1);
-insert into llx_c_type_contact (element, source, code, libelle, active ) values ('shipping', 'external', 'DELIVERY',      'Delivery facility', 1);
+INSERT INTO llx_c_type_contact (element, source, code, libelle, active ) VALUES ('shipping', 'internal', 'SALESREPFOLL',  'Representative following-up shipping', 1);
+INSERT INTO llx_c_type_contact (element, source, code, libelle, active ) VALUES ('shipping', 'external', 'BILLING',       'Customer invoice contact', 1);
+INSERT INTO llx_c_type_contact (element, source, code, libelle, active ) VALUES ('shipping', 'external', 'CUSTOMER',      'Customer shipping contact', 1);
+INSERT INTO llx_c_type_contact (element, source, code, libelle, active ) VALUES ('shipping', 'external', 'SHIPPING',      'Loading facility', 1);
+INSERT INTO llx_c_type_contact (element, source, code, libelle, active ) VALUES ('shipping', 'external', 'DELIVERY',      'Delivery facility', 1);
 
 ALTER TABLE llx_holiday_config DROP INDEX idx_holiday_config;
 ALTER TABLE llx_holiday_config ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;
diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang
index 1b4f57d49c9..e08c7fbb26d 100644
--- a/htdocs/langs/en_US/propal.lang
+++ b/htdocs/langs/en_US/propal.lang
@@ -77,7 +77,7 @@ AvailabilityTypeAV_1W=1 week
 AvailabilityTypeAV_2W=2 weeks
 AvailabilityTypeAV_3W=3 weeks
 AvailabilityTypeAV_1M=1 month
-##### Types ofe contacts #####
+##### Types of contacts #####
 TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
 TypeContact_propal_external_BILLING=Customer invoice contact
 TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index 95406dcc87e..fe9fdc20532 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -83,3 +83,9 @@ ShipmentDistribution=Shipment distribution
 ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
 ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
 ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
+##### Types of contacts #####
+TypeContact_shipping_internal_SALESREPFOLL=Representative following-up shipping
+TypeContact_shipping_external_BILLING=Customer invoice contact
+TypeContact_shipping_external_CUSTOMER=Customer contact following-up shipping
+TypeContact_shipping_external_SHIPPING=Customer contact for shipping
+TypeContact_shipping_external_DELIVERY=Customer contact for delivery

From 0eb75b7e4fc3004d3cccaf82953becfe10c124dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 29 Jan 2025 09:28:36 +0100
Subject: [PATCH 327/602] dict type contact

---
 htdocs/comm/propal/class/propal.class.php        | 4 ++--
 htdocs/install/mysql/data/llx_c_type_contact.sql | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index eb81c4c084e..070f9914417 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -713,9 +713,9 @@ class Propal extends CommonObject
 				$product = new Product($this->db);
 				$result = $product->fetch($fk_product);
 				if ($qty < $product->packaging) {
-					$qty = $product->packaging;
+					$qty = (float) $product->packaging;
 				} else {
-					if (!empty($product->packaging) && (fmod((float) $qty, $product->packaging)  > 0.000001)) {
+					if (!empty($product->packaging) && (fmod((float) $qty, (float) $product->packaging)  > 0.000001)) {
 						$coeff = intval((float) $qty / $product->packaging) + 1;
 						$qty = (float) $product->packaging * $coeff;
 						setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');
diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql
index d7bbbf77cf2..6611bd3b5aa 100644
--- a/htdocs/install/mysql/data/llx_c_type_contact.sql
+++ b/htdocs/install/mysql/data/llx_c_type_contact.sql
@@ -74,7 +74,8 @@ insert into llx_c_type_contact (element, source, code, libelle, active ) values
 insert into llx_c_type_contact (element, source, code, libelle, active ) values ('commande', 'external', 'SHIPPING',      'Contact client livraison commande', 1);
 
 -- Shipment / Expedition
-insert into llx_c_type_contact (element, source, code, libelle, active ) values ('shipping', 'internal', 'SALESREPFOLL',  'Responsable suivi de l''expédition', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('shipping', 'internal', 'SALESREPFOLL',  'Representative following-up shipping', 1);
+INSERT INTO llx_c_type_contact (element, source, code, libelle, active ) VALUES ('shipping', 'external', 'BILLING',       'Customer invoice contact', 1);
 insert into llx_c_type_contact (element, source, code, libelle, active ) values ('shipping', 'external', 'CUSTOMER',      'Customer shipping contact', 1);
 insert into llx_c_type_contact (element, source, code, libelle, active ) values ('shipping', 'external', 'SHIPPING',      'Loading facility', 1);
 insert into llx_c_type_contact (element, source, code, libelle, active ) values ('shipping', 'external', 'DELIVERY',      'Delivery facility', 1);

From 7bd2bb6efc7071ee2f4f74d1663865df14c04b4d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 29 Jan 2025 09:35:37 +0100
Subject: [PATCH 328/602] FIX DROP INDEX IF EXISTS is not possible !

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 4cfb2fed5db..9b1f5921740 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -749,7 +749,7 @@ class ExtraFields
 						$sql = "ALTER TABLE ".$this->db->prefix().$table." ADD UNIQUE INDEX uk_".$table."_".$this->db->sanitize($attrname)." (".$this->db->sanitize($attrname).")";
 					} else {
 						dol_syslog(get_class($this).'::update_common', LOG_DEBUG);
-						$sql = "ALTER TABLE ".$this->db->prefix().$table." DROP INDEX IF EXISTS uk_".$table."_".$this->db->sanitize($attrname);
+						$sql = "ALTER TABLE ".$this->db->prefix().$table." DROP INDEX uk_".$table."_".$this->db->sanitize($attrname);
 					}
 					dol_syslog(get_class($this).'::update', LOG_DEBUG);
 					$resql = $this->db->query($sql, 1, 'dml');

From f3dc94d3345867b732fcb17a712b043f931a0c44 Mon Sep 17 00:00:00 2001
From: Irvine Fleith <irvine.fleith@atm-consulting.fr>
Date: Wed, 29 Jan 2025 10:14:46 +0100
Subject: [PATCH 329/602] fix(services-list): added missing hook
 printFieldListSearchParam

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

diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 0b3666a295e..70dc312c2be 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -442,6 +442,10 @@ if ($optioncss != '') {
 }
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$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
 $arrayofmassactions = array(

From 3c7327a457738acfe503bf4afad0675c8332ee68 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 29 Jan 2025 12:35:27 +0100
Subject: [PATCH 330/602] Missing notes

---
 htdocs/core/modules/modProjet.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index d58edcf7de2..bed2e414cc6 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -231,6 +231,7 @@ class modProjet extends DolibarrModules
 			'p.rowid'=>"Numeric", 'p.ref'=>"Text", 'p.title'=>"Text",
 			'p.usage_opportunity'=>'Boolean', 'p.usage_task'=>'Boolean', 'p.usage_bill_time'=>'Boolean',
 			'p.datec'=>"Date", 'p.dateo'=>"Date", 'p.datee'=>"Date", 'p.fk_statut'=>'Status', 'cls.code'=>"Text", 'p.opp_percent'=>'Numeric', 'p.opp_amount'=>'Numeric', 'p.description'=>"Text", 'p.entity'=>'Numeric', 'p.budget_amount'=>'Numeric',
+			'p.note_public'=>'Text', 'p.note_private'=>'Text',
 			'pt.rowid'=>'Numeric', 'pt.ref'=>'Text', 'pt.label'=>'Text', 'pt.dateo'=>"Date", 'pt.datee'=>"Date", 'pt.duration_effective'=>"Duree", 'pt.planned_workload'=>"Numeric", 'pt.progress'=>"Numeric", 'pt.description'=>"Text",
 			'ptt.rowid'=>'Numeric', 'ptt.element_date'=>'Date', 'ptt.element_duration'=>"Duree", 'ptt.fk_user'=>"FormSelect:select_dolusers", 'ptt.note'=>"Text"
 		);
@@ -243,7 +244,8 @@ class modProjet extends DolibarrModules
 			's.phone'=>'Phone', 's.email'=>'Email', 's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.code_compta'=>'CustomerAccountancyCode', 's.code_compta_fournisseur'=>'SupplierAccountancyCode',
 			'p.rowid'=>"ProjectId", 'p.ref'=>"RefProject", 'p.title'=>'ProjectLabel',
 			'p.usage_opportunity'=>'ProjectFollowOpportunity', 'p.usage_task'=>'ProjectFollowTasks', 'p.usage_bill_time'=>'BillTime',
-			'p.datec'=>"DateCreation", 'p.dateo'=>"DateStart", 'p.datee'=>"DateEnd", 'p.fk_statut'=>'ProjectStatus', 'cls.code'=>'OpportunityStatus', 'p.opp_percent'=>'OpportunityProbability', 'p.opp_amount'=>'OpportunityAmount', 'p.budget_amount'=>'Budget', 'p.description'=>"Description"
+			'p.datec'=>"DateCreation", 'p.dateo'=>"DateStart", 'p.datee'=>"DateEnd", 'p.fk_statut'=>'ProjectStatus', 'cls.code'=>'OpportunityStatus', 'p.opp_percent'=>'OpportunityProbability', 'p.opp_amount'=>'OpportunityAmount', 'p.description'=>"Description", 'p.budget_amount'=>'Budget',
+			'p.note_public'=>'NotePublic', 'p.note_private'=>'NotePrivate',
 		);
 		// Add multicompany field
 		if (getDolGlobalString('MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED')) {

From f94cfd0d60a80a5f8a2eab641c80330ef8abd489 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 29 Jan 2025 13:29:44 +0100
Subject: [PATCH 331/602] Fix position

---
 htdocs/projet/card.php | 100 ++++++++++++++++++++---------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 4fc99beac08..a62f4437fd6 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -812,31 +812,6 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		print '</td></tr>';
 	}
 
-	// Visibility
-	print '<tr><td>'.$langs->trans("Visibility").'</td><td class="maxwidthonsmartphone">';
-	$array = array();
-	if (!getDolGlobalString('PROJECT_DISABLE_PRIVATE_PROJECT')) {
-		$array[0] = $langs->trans("PrivateProject");
-	}
-	if (!getDolGlobalString('PROJECT_DISABLE_PUBLIC_PROJECT')) {
-		$array[1] = $langs->trans("SharedProject");
-	}
-
-	if (count($array) > 0) {
-		print $form->selectarray('public', $array, GETPOSTINT('public') ? 1 : 0, 0, 0, 0, '', 0, 0, 0, '', '', 1);
-	} else {
-		print '<input type="hidden" name="public" id="public" value="'.(GETPOSTINT('public') ? 1 : 0).'">';
-
-		if (GETPOSTINT('public') == 0) {
-			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
-			print $langs->trans("PrivateProject");
-		} else {
-			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
-			print $langs->trans("SharedProject");
-		}
-	}
-	print '</td></tr>';
-
 	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 		// Opportunity status
 		print '<tr class="classuseopportunity"><td><span class="fieldrequired">'.$langs->trans("OpportunityStatus").'</span></td>';
@@ -901,6 +876,31 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		print "</td></tr>";
 	}
 
+	// Visibility
+	print '<tr><td>'.$langs->trans("Visibility").'</td><td class="maxwidthonsmartphone">';
+	$array = array();
+	if (!getDolGlobalString('PROJECT_DISABLE_PRIVATE_PROJECT')) {
+		$array[0] = $langs->trans("PrivateProject");
+	}
+	if (!getDolGlobalString('PROJECT_DISABLE_PUBLIC_PROJECT')) {
+		$array[1] = $langs->trans("SharedProject");
+	}
+
+	if (count($array) > 0) {
+		print $form->selectarray('public', $array, GETPOSTINT('public') ? 1 : 0, 0, 0, 0, '', 0, 0, 0, '', '', 1);
+	} else {
+		print '<input type="hidden" name="public" id="public" value="'.(GETPOSTINT('public') ? 1 : 0).'">';
+
+		if (GETPOSTINT('public') == 0) {
+			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
+			print $langs->trans("PrivateProject");
+		} else {
+			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
+			print $langs->trans("SharedProject");
+		}
+	}
+	print '</td></tr>';
+
 	// Selection of Owner contact type
 	print '<tr><td class="tdtop">'.$langs->trans("ProjectContactTypeManager").'</td>';
 	print '<td>';
@@ -1210,31 +1210,6 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			print '</td></tr>';
 		}
 
-		// Visibility
-		print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
-		$array = array();
-		if (!getDolGlobalString('PROJECT_DISABLE_PRIVATE_PROJECT')) {
-			$array[0] = $langs->trans("PrivateProject");
-		}
-		if (!getDolGlobalString('PROJECT_DISABLE_PUBLIC_PROJECT')) {
-			$array[1] = $langs->trans("SharedProject");
-		}
-
-		if (count($array) > 0) {
-			print $form->selectarray('public', $array, $object->public, 0, 0, 0, '', 0, 0, 0, '', '', 1);
-		} else {
-			print '<input type="hidden" id="public" name="public" value="'.$object->public.'">';
-
-			if ($object->public == 0) {
-				print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
-				print $langs->trans("PrivateProject");
-			} else {
-				print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
-				print $langs->trans("SharedProject");
-			}
-		}
-		print '</td></tr>';
-
 		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 			$classfortr = ($object->usage_opportunity ? '' : ' hideobject');
 			// Opportunity status
@@ -1322,6 +1297,31 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			print "</td></tr>";
 		}
 
+		// Visibility
+		print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
+		$array = array();
+		if (!getDolGlobalString('PROJECT_DISABLE_PRIVATE_PROJECT')) {
+			$array[0] = $langs->trans("PrivateProject");
+		}
+		if (!getDolGlobalString('PROJECT_DISABLE_PUBLIC_PROJECT')) {
+			$array[1] = $langs->trans("SharedProject");
+		}
+
+		if (count($array) > 0) {
+			print $form->selectarray('public', $array, $object->public, 0, 0, 0, '', 0, 0, 0, '', '', 1);
+		} else {
+			print '<input type="hidden" id="public" name="public" value="'.$object->public.'">';
+
+			if ($object->public == 0) {
+				print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
+				print $langs->trans("PrivateProject");
+			} else {
+				print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
+				print $langs->trans("SharedProject");
+			}
+		}
+		print '</td></tr>';
+
 		// Other options
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

From a121e52d82f62fa4c323069eb362cda8181f6c1d Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 29 Jan 2025 13:29:44 +0100
Subject: [PATCH 332/602] Fix position

---
 htdocs/projet/card.php | 100 ++++++++++++++++++++---------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 0eb947f56a6..6fdd27c568c 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -812,31 +812,6 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		print '</td></tr>';
 	}
 
-	// Visibility
-	print '<tr><td>'.$langs->trans("Visibility").'</td><td class="maxwidthonsmartphone">';
-	$array = array();
-	if (!getDolGlobalString('PROJECT_DISABLE_PRIVATE_PROJECT')) {
-		$array[0] = $langs->trans("PrivateProject");
-	}
-	if (!getDolGlobalString('PROJECT_DISABLE_PUBLIC_PROJECT')) {
-		$array[1] = $langs->trans("SharedProject");
-	}
-
-	if (count($array) > 0) {
-		print $form->selectarray('public', $array, GETPOSTINT('public') ? 1 : 0, 0, 0, 0, '', 0, 0, 0, '', '', 1);
-	} else {
-		print '<input type="hidden" name="public" id="public" value="'.(GETPOSTINT('public') ? 1 : 0).'">';
-
-		if (GETPOSTINT('public') == 0) {
-			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
-			print $langs->trans("PrivateProject");
-		} else {
-			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
-			print $langs->trans("SharedProject");
-		}
-	}
-	print '</td></tr>';
-
 	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 		// Opportunity status
 		print '<tr class="classuseopportunity"><td><span class="fieldrequired">'.$langs->trans("OpportunityStatus").'</span></td>';
@@ -901,6 +876,31 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		print "</td></tr>";
 	}
 
+	// Visibility
+	print '<tr><td>'.$langs->trans("Visibility").'</td><td class="maxwidthonsmartphone">';
+	$array = array();
+	if (!getDolGlobalString('PROJECT_DISABLE_PRIVATE_PROJECT')) {
+		$array[0] = $langs->trans("PrivateProject");
+	}
+	if (!getDolGlobalString('PROJECT_DISABLE_PUBLIC_PROJECT')) {
+		$array[1] = $langs->trans("SharedProject");
+	}
+
+	if (count($array) > 0) {
+		print $form->selectarray('public', $array, GETPOSTINT('public') ? 1 : 0, 0, 0, 0, '', 0, 0, 0, '', '', 1);
+	} else {
+		print '<input type="hidden" name="public" id="public" value="'.(GETPOSTINT('public') ? 1 : 0).'">';
+
+		if (GETPOSTINT('public') == 0) {
+			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
+			print $langs->trans("PrivateProject");
+		} else {
+			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
+			print $langs->trans("SharedProject");
+		}
+	}
+	print '</td></tr>';
+
 	// Selection of Owner contact type
 	print '<tr><td class="tdtop">'.$langs->trans("ProjectContactTypeManager").'</td>';
 	print '<td>';
@@ -1210,31 +1210,6 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			print '</td></tr>';
 		}
 
-		// Visibility
-		print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
-		$array = array();
-		if (!getDolGlobalString('PROJECT_DISABLE_PRIVATE_PROJECT')) {
-			$array[0] = $langs->trans("PrivateProject");
-		}
-		if (!getDolGlobalString('PROJECT_DISABLE_PUBLIC_PROJECT')) {
-			$array[1] = $langs->trans("SharedProject");
-		}
-
-		if (count($array) > 0) {
-			print $form->selectarray('public', $array, $object->public, 0, 0, 0, '', 0, 0, 0, '', '', 1);
-		} else {
-			print '<input type="hidden" id="public" name="public" value="'.$object->public.'">';
-
-			if ($object->public == 0) {
-				print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
-				print $langs->trans("PrivateProject");
-			} else {
-				print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
-				print $langs->trans("SharedProject");
-			}
-		}
-		print '</td></tr>';
-
 		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 			$classfortr = ($object->usage_opportunity ? '' : ' hideobject');
 			// Opportunity status
@@ -1322,6 +1297,31 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			print "</td></tr>";
 		}
 
+		// Visibility
+		print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
+		$array = array();
+		if (!getDolGlobalString('PROJECT_DISABLE_PRIVATE_PROJECT')) {
+			$array[0] = $langs->trans("PrivateProject");
+		}
+		if (!getDolGlobalString('PROJECT_DISABLE_PUBLIC_PROJECT')) {
+			$array[1] = $langs->trans("SharedProject");
+		}
+
+		if (count($array) > 0) {
+			print $form->selectarray('public', $array, $object->public, 0, 0, 0, '', 0, 0, 0, '', '', 1);
+		} else {
+			print '<input type="hidden" id="public" name="public" value="'.$object->public.'">';
+
+			if ($object->public == 0) {
+				print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
+				print $langs->trans("PrivateProject");
+			} else {
+				print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
+				print $langs->trans("SharedProject");
+			}
+		}
+		print '</td></tr>';
+
 		// Other options
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

From 9870069f44f25c6774134aa7dc4ba9099c368bea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 29 Jan 2025 13:56:46 +0100
Subject: [PATCH 333/602] more fields in liste_contacts

---
 htdocs/core/class/commonobject.class.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 3aa18de36e9..02cee9b9716 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1500,14 +1500,14 @@ abstract class CommonObject
 
 		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact"; // This field contains id of llx_socpeople or id of llx_user
 		if ($source == 'internal') {
-			$sql .= ", '-1' as socid, t.statut as statuscontact, t.login, t.photo, t.gender";
+			$sql .= ", '-1' as socid, t.statut as statuscontact, t.login, t.photo, t.gender, t.fk_country as country_id";
 		}
 		if ($source == 'external' || $source == 'thirdparty') {
-			$sql .= ", t.fk_soc as socid, t.statut as statuscontact";
+			$sql .= ", t.fk_soc as socid, t.statut as statuscontact, t.fk_pays as country_id";
 		}
-		$sql .= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
+		$sql .= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email, t.address, t.zip, t.town";
 		if (empty($arrayoftcids)) {
-			$sql .= ", tc.source, tc.element, tc.code, tc.libelle as type_label";
+			$sql .= ", tc.source, tc.element, tc.code, tc.libelle as type_label, co.label as country";
 		}
 		$sql .= " FROM";
 		if (empty($arrayoftcids)) {
@@ -1516,9 +1516,11 @@ abstract class CommonObject
 		$sql .= " ".$this->db->prefix()."element_contact as ec";
 		if ($source == 'internal') {	// internal contact (user)
 			$sql .= " LEFT JOIN ".$this->db->prefix()."user as t on ec.fk_socpeople = t.rowid";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."c_country as co ON co.rowid = t.fk_country";
 		}
 		if ($source == 'external' || $source == 'thirdparty') {	// external contact (socpeople)
 			$sql .= " LEFT JOIN ".$this->db->prefix()."socpeople as t on ec.fk_socpeople = t.rowid";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."c_country as co ON co.rowid = t.fk_pays";
 		}
 		$sql .= " WHERE ec.element_id = ".((int) $this->id);
 		if (empty($arrayoftcids)) {
@@ -1566,6 +1568,11 @@ abstract class CommonObject
 						'lastname' => $obj->lastname,
 						'firstname' => $obj->firstname,
 						'email' => $obj->email,
+						'address' => $obj->address,
+						'zip' => $obj->zip,
+						'town' => $obj->town,
+						'country_id' => $obj->country_id,
+						'country' => $obj->country,
 						'login' => (empty($obj->login) ? '' : $obj->login),
 						'photo' => (empty($obj->photo) ? '' : $obj->photo),
 						'gender' => (empty($obj->gender) ? '' : $obj->gender),

From cad040a96d6953b80889d6336392f6cf5ef4f1fe Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 29 Jan 2025 14:08:48 +0100
Subject: [PATCH 334/602] Debug v21 - print of description

---
 htdocs/projet/card.php           | 39 +++++++++++++++--------------
 htdocs/projet/contact.php        | 37 ++++++++++++++++------------
 htdocs/projet/element.php        | 37 ++++++++++++++++------------
 htdocs/projet/tasks.php          | 37 ++++++++++++++++------------
 htdocs/projet/tasks/contact.php  | 42 +++++++++++++++++++-------------
 htdocs/projet/tasks/document.php | 42 +++++++++++++++++++-------------
 htdocs/projet/tasks/note.php     | 42 +++++++++++++++++++-------------
 htdocs/projet/tasks/task.php     | 42 +++++++++++++++++++-------------
 htdocs/projet/tasks/time.php     | 37 ++++++++++++++++------------
 htdocs/theme/eldy/global.inc.php |  2 +-
 10 files changed, 206 insertions(+), 151 deletions(-)

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 6fdd27c568c..fea8f4ce90e 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -1409,17 +1409,6 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			print '</td></tr>';
 		}
 
-		// Visibility
-		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-		if ($object->public) {
-			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
-			print $langs->trans('SharedProject');
-		} else {
-			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
-			print $langs->trans('PrivateProject');
-		}
-		print '</td></tr>';
-
 		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') && !empty($object->usage_opportunity)) {
 			// Opportunity status
 			print '<tr><td>'.$langs->trans("OpportunityStatus");
@@ -1463,6 +1452,17 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		}
 		print '</td></tr>';
 
+		// Visibility
+		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+		if ($object->public) {
+			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
+			print $langs->trans('SharedProject');
+		} else {
+			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
+			print $langs->trans('PrivateProject');
+		}
+		print '</td></tr>';
+
 		// Other attributes
 		$cols = 2;
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
@@ -1475,13 +1475,6 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 
 		print '<table class="border tableforfield centpercent">';
 
-		// Description
-		print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-		print '<div class="longmessagecut">';
-		print dolPrintHTML($object->description);
-		print '</div>';
-		print '</td></tr>';
-
 		// Categories
 		if (isModEnabled('category')) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
@@ -1489,6 +1482,16 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			print "</td></tr>";
 		}
 
+		// Description
+		print '<tr><td class="titlefield'.($object->description ? ' noborderbottom' : '').'" colspan="2">'.$langs->trans("Description").'</td></tr>';
+		if ($object->description) {
+			print '<tr><td class="nottitleforfield" colspan="2">';
+			print '<div class="longmessagecut">';
+			print dolPrintHTML($object->description);
+			print '</div>';
+			print '</td></tr>';
+		}
+
 		print '</table>';
 
 		print '</div>';
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 4f2dde28a50..f04c1df9ae6 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -424,17 +424,6 @@ if ($id > 0 || !empty($ref)) {
 		print '</td></tr>';
 	}
 
-	// Visibility
-	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-	if ($object->public) {
-		print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
-		print $langs->trans('SharedProject');
-	} else {
-		print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
-		print $langs->trans('PrivateProject');
-	}
-	print '</td></tr>';
-
 	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') && !empty($object->usage_opportunity)) {
 		// Opportunity status
 		print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
@@ -480,6 +469,17 @@ if ($id > 0 || !empty($ref)) {
 	}
 	print '</td></tr>';
 
+	// Visibility
+	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+	if ($object->public) {
+		print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
+		print $langs->trans('SharedProject');
+	} else {
+		print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
+		print $langs->trans('PrivateProject');
+	}
+	print '</td></tr>';
+
 	// Other attributes
 	$cols = 2;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
@@ -492,11 +492,6 @@ if ($id > 0 || !empty($ref)) {
 
 	print '<table class="border tableforfield centpercent">';
 
-	// Description
-	print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-	print dol_htmlentitiesbr($object->description);
-	print '</td></tr>';
-
 	// Categories
 	if (isModEnabled('category')) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
@@ -504,6 +499,16 @@ if ($id > 0 || !empty($ref)) {
 		print "</td></tr>";
 	}
 
+	// Description
+	print '<tr><td class="titlefield'.($object->description ? ' noborderbottom' : '').'" colspan="2">'.$langs->trans("Description").'</td></tr>';
+	if ($object->description) {
+		print '<tr><td class="nottitleforfield" colspan="2">';
+		print '<div class="longmessagecut">';
+		print dolPrintHTML($object->description);
+		print '</div>';
+		print '</td></tr>';
+	}
+
 	print '</table>';
 
 	print '</div>';
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index f4ffea34d18..80af93b7cd0 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -311,17 +311,6 @@ if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJ
 	print '</td></tr>';
 }
 
-// Visibility
-print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-if ($object->public) {
-	print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
-	print $langs->trans('SharedProject');
-} else {
-	print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
-	print $langs->trans('PrivateProject');
-}
-print '</td></tr>';
-
 if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 	// Opportunity status
 	print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
@@ -368,6 +357,17 @@ if ($object->hasDelay()) {
 }
 print '</td></tr>';
 
+// Visibility
+print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+if ($object->public) {
+	print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
+	print $langs->trans('SharedProject');
+} else {
+	print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
+	print $langs->trans('PrivateProject');
+}
+print '</td></tr>';
+
 // Other attributes
 $cols = 2;
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
@@ -380,11 +380,6 @@ print '<div class="underbanner clearboth"></div>';
 
 print '<table class="border tableforfield centpercent">';
 
-// Description
-print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-print dol_htmlentitiesbr($object->description);
-print '</td></tr>';
-
 // Categories
 if (isModEnabled('category')) {
 	print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
@@ -392,6 +387,16 @@ if (isModEnabled('category')) {
 	print "</td></tr>";
 }
 
+// Description
+print '<tr><td class="titlefield'.($object->description ? ' noborderbottom' : '').'" colspan="2">'.$langs->trans("Description").'</td></tr>';
+if ($object->description) {
+	print '<tr><td class="nottitleforfield" colspan="2">';
+	print '<div class="longmessagecut">';
+	print dolPrintHTML($object->description);
+	print '</div>';
+	print '</td></tr>';
+}
+
 print '</table>';
 
 print '</div>';
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 2dde9cf51ed..4cd188910ec 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -660,17 +660,6 @@ if ($id > 0 || !empty($ref)) {
 		print '</td></tr>';
 	}
 
-	// Visibility
-	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-	if ($object->public) {
-		print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
-		print $langs->trans('SharedProject');
-	} else {
-		print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
-		print $langs->trans('PrivateProject');
-	}
-	print '</td></tr>';
-
 	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 	if (!is_null($object->budget_amount) && strcmp($object->budget_amount, '')) {
@@ -690,6 +679,17 @@ if ($id > 0 || !empty($ref)) {
 	}
 	print '</td></tr>';
 
+	// Visibility
+	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+	if ($object->public) {
+		print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
+		print $langs->trans('SharedProject');
+	} else {
+		print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
+		print $langs->trans('PrivateProject');
+	}
+	print '</td></tr>';
+
 	// Other attributes
 	$cols = 2;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
@@ -702,11 +702,6 @@ if ($id > 0 || !empty($ref)) {
 
 	print '<table class="border tableforfield centpercent">';
 
-	// Description
-	print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-	print dol_htmlentitiesbr($object->description);
-	print '</td></tr>';
-
 	// Categories
 	if (isModEnabled('category')) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
@@ -714,6 +709,16 @@ if ($id > 0 || !empty($ref)) {
 		print "</td></tr>";
 	}
 
+	// Description
+	print '<tr><td class="titlefield'.($object->description ? ' noborderbottom' : '').'" colspan="2">'.$langs->trans("Description").'</td></tr>';
+	if ($object->description) {
+		print '<tr><td class="nottitleforfield" colspan="2">';
+		print '<div class="longmessagecut">';
+		print dolPrintHTML($object->description);
+		print '</div>';
+		print '</td></tr>';
+	}
+
 	print '</table>';
 
 	print '</div>';
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index f829533062a..ef379748e77 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -255,17 +255,6 @@ if ($id > 0 || !empty($ref)) {
 				print '</td></tr>';
 			}
 
-			// Visibility
-			print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-			if ($projectstatic->public) {
-				print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
-				print $langs->trans('SharedProject');
-			} else {
-				print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
-				print $langs->trans('PrivateProject');
-			}
-			print '</td></tr>';
-
 			// Budget
 			print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 			if (isset($projectstatic->budget_amount) && strcmp($projectstatic->budget_amount, '')) {
@@ -285,9 +274,23 @@ if ($id > 0 || !empty($ref)) {
 			}
 			print '</td></tr>';
 
+			// Visibility
+			print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+			if ($projectstatic->public) {
+				print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
+				print $langs->trans('SharedProject');
+			} else {
+				print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
+				print $langs->trans('PrivateProject');
+			}
+			print '</td></tr>';
+
 			// Other attributes
 			$cols = 2;
-			//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+			$savobject = $object;
+			$object = $projectstatic;
+			include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+			$object = $savobject;
 
 			print '</table>';
 
@@ -297,11 +300,6 @@ if ($id > 0 || !empty($ref)) {
 
 			print '<table class="border tableforfield centpercent">';
 
-			// Description
-			print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-			print nl2br($projectstatic->description);
-			print '</td></tr>';
-
 			// Categories
 			if (isModEnabled('category')) {
 				print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
@@ -309,6 +307,16 @@ if ($id > 0 || !empty($ref)) {
 				print "</td></tr>";
 			}
 
+			// Description
+			print '<tr><td class="titlefield'.($projectstatic->description ? ' noborderbottom' : '').'" colspan="2">'.$langs->trans("Description").'</td></tr>';
+			if ($projectstatic->description) {
+				print '<tr><td class="nottitleforfield" colspan="2">';
+				print '<div class="longmessagecut">';
+				print dolPrintHTML($projectstatic->description);
+				print '</div>';
+				print '</td></tr>';
+			}
+
 			print '</table>';
 
 			print '</div>';
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 8f091a04a5e..a85d451efa8 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -212,17 +212,6 @@ if ($object->id > 0) {
 			print '</td></tr>';
 		}
 
-		// Visibility
-		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-		if ($projectstatic->public) {
-			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
-			print $langs->trans('SharedProject');
-		} else {
-			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
-			print $langs->trans('PrivateProject');
-		}
-		print '</td></tr>';
-
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 		if (isset($projectstatic->budget_amount) && strcmp($projectstatic->budget_amount, '')) {
@@ -242,9 +231,23 @@ if ($object->id > 0) {
 		}
 		print '</td></tr>';
 
+		// Visibility
+		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+		if ($projectstatic->public) {
+			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
+			print $langs->trans('SharedProject');
+		} else {
+			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
+			print $langs->trans('PrivateProject');
+		}
+		print '</td></tr>';
+
 		// Other attributes
 		$cols = 2;
-		//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		$savobject = $object;
+		$object = $projectstatic;
+		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		$object = $savobject;
 
 		print '</table>';
 
@@ -254,11 +257,6 @@ if ($object->id > 0) {
 
 		print '<table class="border tableforfield centpercent">';
 
-		// Description
-		print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-		print nl2br($projectstatic->description);
-		print '</td></tr>';
-
 		// Categories
 		if (isModEnabled('category')) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
@@ -266,6 +264,16 @@ if ($object->id > 0) {
 			print "</td></tr>";
 		}
 
+		// Description
+		print '<tr><td class="titlefield'.($projectstatic->description ? ' noborderbottom' : '').'" colspan="2">'.$langs->trans("Description").'</td></tr>';
+		if ($projectstatic->description) {
+			print '<tr><td class="nottitleforfield" colspan="2">';
+			print '<div class="longmessagecut">';
+			print dolPrintHTML($projectstatic->description);
+			print '</div>';
+			print '</td></tr>';
+		}
+
 		print '</table>';
 
 		print '</div>';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 673c820368b..c938650cef5 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -202,17 +202,6 @@ if ($object->id > 0) {
 			print '</td></tr>';
 		}
 
-		// Visibility
-		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-		if ($projectstatic->public) {
-			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
-			print $langs->trans('SharedProject');
-		} else {
-			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
-			print $langs->trans('PrivateProject');
-		}
-		print '</td></tr>';
-
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 		if (isset($projectstatic->budget_amount) && strcmp($projectstatic->budget_amount, '')) {
@@ -232,9 +221,23 @@ if ($object->id > 0) {
 		}
 		print '</td></tr>';
 
+		// Visibility
+		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+		if ($projectstatic->public) {
+			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
+			print $langs->trans('SharedProject');
+		} else {
+			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
+			print $langs->trans('PrivateProject');
+		}
+		print '</td></tr>';
+
 		// Other attributes
 		$cols = 2;
-		//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		$savobject = $object;
+		$object = $projectstatic;
+		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		$object = $savobject;
 
 		print '</table>';
 
@@ -244,11 +247,6 @@ if ($object->id > 0) {
 
 		print '<table class="border centpercent tableforfield">';
 
-		// Description
-		print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-		print nl2br($projectstatic->description);
-		print '</td></tr>';
-
 		// Categories
 		if (isModEnabled('category')) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
@@ -256,6 +254,16 @@ if ($object->id > 0) {
 			print "</td></tr>";
 		}
 
+		// Description
+		print '<tr><td class="titlefield'.($projectstatic->description ? ' noborderbottom' : '').'" colspan="2">'.$langs->trans("Description").'</td></tr>';
+		if ($projectstatic->description) {
+			print '<tr><td class="nottitleforfield" colspan="2">';
+			print '<div class="longmessagecut">';
+			print dolPrintHTML($projectstatic->description);
+			print '</div>';
+			print '</td></tr>';
+		}
+
 		print '</table>';
 
 		print '</div>';
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 494e3f20774..8eaa2bb9062 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -361,17 +361,6 @@ if ($id > 0 || !empty($ref)) {
 			print '</td></tr>';
 		}
 
-		// Visibility
-		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-		if ($projectstatic->public) {
-			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
-			print $langs->trans('SharedProject');
-		} else {
-			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
-			print $langs->trans('PrivateProject');
-		}
-		print '</td></tr>';
-
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 		if (isset($projectstatic->budget_amount) && strcmp($projectstatic->budget_amount, '')) {
@@ -391,9 +380,23 @@ if ($id > 0 || !empty($ref)) {
 		}
 		print '</td></tr>';
 
+		// Visibility
+		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+		if ($projectstatic->public) {
+			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
+			print $langs->trans('SharedProject');
+		} else {
+			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
+			print $langs->trans('PrivateProject');
+		}
+		print '</td></tr>';
+
 		// Other attributes
 		$cols = 2;
-		//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		$savobject = $object;
+		$object = $projectstatic;
+		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		$object = $savobject;
 
 		print '</table>';
 
@@ -404,11 +407,6 @@ if ($id > 0 || !empty($ref)) {
 
 		print '<table class="border tableforfield centpercent">';
 
-		// Description
-		print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-		print nl2br($projectstatic->description);
-		print '</td></tr>';
-
 		// Categories
 		if (isModEnabled('category')) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
@@ -416,6 +414,16 @@ if ($id > 0 || !empty($ref)) {
 			print "</td></tr>";
 		}
 
+		// Description
+		print '<tr><td class="titlefield'.($projectstatic->description ? ' noborderbottom' : '').'" colspan="2">'.$langs->trans("Description").'</td></tr>';
+		if ($projectstatic->description) {
+			print '<tr><td class="nottitleforfield" colspan="2">';
+			print '<div class="longmessagecut">';
+			print dolPrintHTML($projectstatic->description);
+			print '</div>';
+			print '</td></tr>';
+		}
+
 		print '</table>';
 
 		print '</div>';
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index e72ccc48706..568cf922cd5 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1002,17 +1002,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				print '</td></tr>';
 			}
 
-			// Visibility
-			print '<tr><td class="titlefield">' . $langs->trans("Visibility") . '</td><td>';
-			if ($projectstatic->public) {
-				print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
-				print $langs->trans('SharedProject');
-			} else {
-				print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
-				print $langs->trans('PrivateProject');
-			}
-			print '</td></tr>';
-
 			// Budget
 			print '<tr><td>' . $langs->trans("Budget") . '</td><td>';
 			if (!is_null($projectstatic->budget_amount) && strcmp($projectstatic->budget_amount, '')) {
@@ -1032,6 +1021,17 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			}
 			print '</td></tr>';
 
+			// Visibility
+			print '<tr><td class="titlefield">' . $langs->trans("Visibility") . '</td><td>';
+			if ($projectstatic->public) {
+				print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
+				print $langs->trans('SharedProject');
+			} else {
+				print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
+				print $langs->trans('PrivateProject');
+			}
+			print '</td></tr>';
+
 			// Other attributes
 			$cols = 2;
 			$savobject = $object;
@@ -1047,11 +1047,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 
 			print '<table class="border tableforfield centpercent">';
 
-			// Description
-			print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-			print dol_htmlentitiesbr($projectstatic->description);
-			print '</td></tr>';
-
 			// Categories
 			if (isModEnabled('category')) {
 				print '<tr><td class="valignmiddle">' . $langs->trans("Categories") . '</td><td>';
@@ -1059,6 +1054,16 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				print "</td></tr>";
 			}
 
+			// Description
+			print '<tr><td class="titlefield'.($projectstatic->description ? ' noborderbottom' : '').'" colspan="2">'.$langs->trans("Description").'</td></tr>';
+			if ($projectstatic->description) {
+				print '<tr><td class="nottitleforfield" colspan="2">';
+				print '<div class="longmessagecut">';
+				print dolPrintHTML($projectstatic->description);
+				print '</div>';
+				print '</td></tr>';
+			}
+
 			print '</table>';
 
 			print '</div>';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index d94ade62111..46f5c1ddf45 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -2313,7 +2313,7 @@ datalist {
 
 .linkobject { cursor: pointer; }
 
-table.tableforfield tr:not(.liste_titre)>td:first-of-type, tr.trforfield:not(.liste_titre)>td:first-of-type, div.tableforfield div.tagtr:not(.liste_titre)>div.tagtd:first-of-type {
+table.tableforfield tr:not(.liste_titre)>td:first-of-type:not(.nottitleforfield), tr.trforfield:not(.liste_titre)>td:first-of-type, div.tableforfield div.tagtr:not(.liste_titre)>div.tagtd:first-of-type {
 	color: var(--tableforfieldcolor);
 }
 

From 710b5d3405c75ac6922821efc34d49380d7d2fa8 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 29 Jan 2025 14:15:08 +0100
Subject: [PATCH 335/602] Debug v21

---
 .../conferenceorbooth_list.php                | 37 +++++++++++--------
 .../conferenceorboothattendee_list.php        | 37 +++++++++++--------
 htdocs/projet/element.php                     |  2 +-
 3 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 46bb260a6be..020aecc753f 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -385,17 +385,6 @@ if ($projectid > 0) {
 		print '</td></tr>';
 	}
 
-	// Visibility
-	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-	if ($project->public == 0) {
-		print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
-		print $langs->trans("PrivateProject");
-	} else {
-		print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
-		print $langs->trans("SharedProject");
-	}
-	print '</td></tr>';
-
 	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 	if (strcmp($project->budget_amount, '')) {
@@ -432,6 +421,17 @@ if ($projectid > 0) {
 	print $project->location;
 	print '</td></tr>';
 
+	// Visibility
+	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+	if ($project->public == 0) {
+		print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
+		print $langs->trans("PrivateProject");
+	} else {
+		print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
+		print $langs->trans("SharedProject");
+	}
+	print '</td></tr>';
+
 	// Other attributes
 	$cols = 2;
 	$objectconf = $object;
@@ -447,11 +447,6 @@ if ($projectid > 0) {
 
 	print '<table class="border tableforfield centpercent">';
 
-	// Description
-	print '<tr><td class="titlefield tdtop">'.$langs->trans("Description").'</td><td class="valuefield">';
-	print dol_htmlentitiesbr($project->description);
-	print '</td></tr>';
-
 	// Categories
 	if (isModEnabled('category')) {
 		print '<tr><td class="titlefield valignmiddle">'.$langs->trans("Categories").'</td><td class="valuefield">';
@@ -459,6 +454,16 @@ if ($projectid > 0) {
 		print "</td></tr>";
 	}
 
+	// Description
+	print '<tr><td class="titlefield'.($project->description ? ' noborderbottom' : '').'" colspan="2">'.$langs->trans("Description").'</td></tr>';
+	if ($project->description) {
+		print '<tr><td class="nottitleforfield" colspan="2">';
+		print '<div class="longmessagecut">';
+		print dolPrintHTML($project->description);
+		print '</div>';
+		print '</td></tr>';
+	}
+
 	print '<tr><td class="titlefield">';
 	$typeofdata = 'checkbox:'.($project->accept_conference_suggestions ? ' checked="checked"' : '');
 	$htmltext = $langs->trans("AllowUnknownPeopleSuggestConfHelp");
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index c5934e13ecd..98ea7f6adf9 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -484,17 +484,6 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 			print '</td></tr>';
 		}
 
-		// Visibility
-		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-		if ($projectstatic->public == 0) {
-			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
-			print $langs->trans("PrivateProject");
-		} else {
-			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
-			print $langs->trans("SharedProject");
-		}
-		print '</td></tr>';
-
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 		if (strcmp($projectstatic->budget_amount, '')) {
@@ -526,6 +515,17 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		}
 		print '</td></tr>';
 
+		// Visibility
+		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+		if ($projectstatic->public == 0) {
+			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
+			print $langs->trans("PrivateProject");
+		} else {
+			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
+			print $langs->trans("SharedProject");
+		}
+		print '</td></tr>';
+
 		// Location event
 		print '<tr><td>'.$langs->trans("Location").'</td><td>';
 		print $projectstatic->location;
@@ -547,11 +547,6 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 
 		print '<table class="border tableforfield centpercent">';
 
-		// Description
-		print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-		print dol_htmlentitiesbr($projectstatic->description);
-		print '</td></tr>';
-
 		// Categories
 		if (isModEnabled('category')) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
@@ -559,6 +554,16 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 			print "</td></tr>";
 		}
 
+		// Description
+		print '<tr><td class="titlefield'.($projectstatic->description ? ' noborderbottom' : '').'" colspan="2">'.$langs->trans("Description").'</td></tr>';
+		if ($projectstatic->description) {
+			print '<tr><td class="nottitleforfield" colspan="2">';
+			print '<div class="longmessagecut">';
+			print dolPrintHTML($projectstatic->description);
+			print '</div>';
+			print '</td></tr>';
+		}
+
 		print '<tr><td class="nowrap">';
 		$typeofdata = 'checkbox:'.($projectstatic->accept_conference_suggestions ? ' checked="checked"' : '');
 		$htmltext = $langs->trans("AllowUnknownPeopleSuggestConfHelp");
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 80af93b7cd0..f416f4fc55d 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -311,7 +311,7 @@ if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJ
 	print '</td></tr>';
 }
 
-if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
+if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') && !empty($object->usage_opportunity)) {
 	// Opportunity status
 	print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
 	$code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');

From 5b1c5397bac1056c6bc58948806495861b9371f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20de=20Grandpr=C3=A9?= <vincent@de-grandpre.quebec>
Date: Wed, 29 Jan 2025 09:34:16 -0500
Subject: [PATCH 336/602] Adding global variables to have more flexibility on
 external calendars location.

---
 htdocs/comm/action/class/ical.class.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index da003149657..3024513dfed 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -96,7 +96,16 @@ class ICal
 		$file_text = '';
 
 		//$tmpresult = getURLContent($file, 'GET', '', 1, [], ['http', 'https'], 2, 0);	// To test with any URL
-		$tmpresult = getURLContent($file, 'GET');
+		$localip = 0;
+		$sslverify = -1;
+		if(getDolGlobalString('AGENDA_EXT_CALENDAR_IP_MODE')) {
+			$localip = intval(getDolGlobalString('AGENDA_EXT_CALENDAR_IP_MODE'));
+		}
+		if(getDolGlobalString('AGENDA_EXT_CALENDAR_SSLVERIFY_MODE')) {
+			$sslverify = intval(getDolGlobalString('AGENDA_EXT_CALENDAR_SSLVERIFY_MODE'));
+		}
+		// See documentation of getURLContent function for $localip and $sslverify possible values
+		$tmpresult = getURLContent($file, 'GET', '', 1, [], ['http', 'https'], $localip, $sslverify);
 		if ($tmpresult['http_code'] != 200) {
 			$file_text = null;
 			$this->error = 'Error: '.$tmpresult['http_code'].' '.$tmpresult['content'];

From 841356613e24a05566e50ecc8d74f16179d75de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20de=20Grandpr=C3=A9?= <vincent@de-grandpre.quebec>
Date: Wed, 29 Jan 2025 09:40:57 -0500
Subject: [PATCH 337/602] code format

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

diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index 3024513dfed..405c84d1046 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -98,10 +98,10 @@ class ICal
 		//$tmpresult = getURLContent($file, 'GET', '', 1, [], ['http', 'https'], 2, 0);	// To test with any URL
 		$localip = 0;
 		$sslverify = -1;
-		if(getDolGlobalString('AGENDA_EXT_CALENDAR_IP_MODE')) {
+		if (getDolGlobalString('AGENDA_EXT_CALENDAR_IP_MODE')) {
 			$localip = intval(getDolGlobalString('AGENDA_EXT_CALENDAR_IP_MODE'));
 		}
-		if(getDolGlobalString('AGENDA_EXT_CALENDAR_SSLVERIFY_MODE')) {
+		if (getDolGlobalString('AGENDA_EXT_CALENDAR_SSLVERIFY_MODE')) {
 			$sslverify = intval(getDolGlobalString('AGENDA_EXT_CALENDAR_SSLVERIFY_MODE'));
 		}
 		// See documentation of getURLContent function for $localip and $sslverify possible values

From 71d13cc77af248fc01148ec32a96fd6bf4fcc632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20de=20Grandpr=C3=A9?= <vincent@de-grandpre.quebec>
Date: Wed, 29 Jan 2025 10:13:01 -0500
Subject: [PATCH 338/602] added cpr

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

diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index 405c84d1046..648f96aba4d 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -4,7 +4,8 @@
  * Copyright (C) 2013-2014 Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012	   Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2019-2024  Frédéric France     <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024		Vincent de Grandpré	<vincent@de-grandpre.quebec>
  *
  * 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 8f3b814aaf2febfa4a4b4b7b65d398d3c42d946a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 29 Jan 2025 17:31:07 +0100
Subject: [PATCH 339/602] Update llx_c_forme_juridique.sql

added new Austrian business entity type FlexKapG #32803
---
 htdocs/install/mysql/data/llx_c_forme_juridique.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
index fd094e387ef..38140954e39 100644
--- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql
+++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
@@ -10,7 +10,7 @@
 -- Copyright (C) 2012 	   Tommaso Basilici     <t.basilici@19.coop>
 -- Copyright (C) 2012	   Ricardo Schluter     <info@ripasch.nl>
 -- Copyright (C) 2013	   Cedric GROSS		    <c.gross@kreiz-it.fr>
--- Copyright (C) 2020-2021 Udo Tamm       	    <dev@dolibit.de>
+-- Copyright (C) 2020-2025 Udo Tamm       	    <dev@dolibit.de>
 -- Copyright (C) 2022      Miro Sertić       	<miro.sertic0606@gmail.com>
 --
 -- This program is free software; you can redistribute it and/or modify
@@ -83,6 +83,7 @@ INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (41, '
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (41, '4112', 'GesbR - Gesellschaft nach bürgerlichem Recht', 1);
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (41, '4113', 'GesnbR - Gesellschaft nach bürgerlichem Recht', 1);
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (41, '4114', 'e.U. - eingetragener Einzelunternehmer', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (41, '4115', 'FlexKapG - Flexible Kapitalgesellschaft', 1);
 
 
 -- Belgium

From 40567ce7f680e422b90f138859dc9a7f5ad0bbca Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 29 Jan 2025 18:13:03 +0100
Subject: [PATCH 340/602] FIX E_STRICT is deprecated since PHP 8.4

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

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index aa03bc81bd9..abba0355be6 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -205,10 +205,19 @@ if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"])) {    // If install not do
 }
 
 // Force PHP error_reporting setup (Dolibarr may report warning without this)
-if (!empty($dolibarr_strict_mode)) {
-	error_reporting(E_ALL | E_STRICT);
+if (version_compare(phpversion(), '8.4', '<')) {
+	if (!empty($dolibarr_strict_mode)) {
+		error_reporting(E_ALL | E_STRICT);
+	} else {
+		error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
+	}
 } else {
-	error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
+	// E_STRICT is deprecated since PHP 8.4
+	if (!empty($dolibarr_strict_mode)) {
+		error_reporting(E_ALL);
+	} else {
+		error_reporting(E_ALL & ~(E_NOTICE | E_DEPRECATED));
+	}
 }
 
 // Disable php display errors

From 9cb16ea555ee945da759107f8b16c229013204d5 Mon Sep 17 00:00:00 2001
From: sonikf <93765174+sonikf@users.noreply.github.com>
Date: Wed, 29 Jan 2025 19:34:18 +0200
Subject: [PATCH 341/602] fix trans

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

diff --git a/htdocs/langs/en_US/datapolicy.lang b/htdocs/langs/en_US/datapolicy.lang
index 38a4f48f39f..3f8e33544fa 100644
--- a/htdocs/langs/en_US/datapolicy.lang
+++ b/htdocs/langs/en_US/datapolicy.lang
@@ -19,7 +19,7 @@ Module4100Desc = Module to manage Data Privacy (Conformity with the GDPR)
 datapolicySetup = Module Data Privacy Policy Setup
 DataDeletion=Deletion of data
 DataAnonymization=Anonymization of data
-datapolicySetupPage = Depending on the laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
+datapolicySetupPage = Depending on the laws of your country (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.<br>This module will make an anonymization automatically after a certain duration without events (the duration which you will have indicated below) and if the object has no existing business object children.
 NB_MONTHS = %s months
 ONE_YEAR = 1 year
 NB_YEARS = %s years

From a4c397a68b723cb4390eef76f2fcb83cd4d4a33e Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 29 Jan 2025 18:35:54 +0100
Subject: [PATCH 342/602] fix: php 8 warning

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

diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index 2e02e7b8808..b789360e3f2 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -95,7 +95,7 @@ if (!getDolGlobalString('EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES')) {
 				}
 				print '<div class="photoref backgroundblank">';
 
-				print $thumbshown ? $thumbshown : img_mime($minifile);
+				print $thumbshown ? $thumbshown : ($minifile ? img_mime($minifile): '');
 
 				print '</div>';
 				if (empty($urlforhref) || empty($thumbshown)) {

From 4d8f28f22bd42202cbd981b0a23d49e3f5bf7dcb Mon Sep 17 00:00:00 2001
From: sonikf <93765174+sonikf@users.noreply.github.com>
Date: Wed, 29 Jan 2025 19:36:31 +0200
Subject: [PATCH 343/602] fix typo

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

diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 212147881ff..892960dc610 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -92,7 +92,7 @@ DisableSiteFirst=Put website offline first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
 SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
+WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account for thirdparties
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
 YouMustDefineTheHomePage=You must first define the default Home page
 OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.

From d66ff94c72f89e5521a63c46ea1ccb9c0315214e Mon Sep 17 00:00:00 2001
From: sonikf <93765174+sonikf@users.noreply.github.com>
Date: Wed, 29 Jan 2025 19:38:49 +0200
Subject: [PATCH 344/602] fix trans

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

diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 4d1c90f9e1b..f730d33d5f4 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -191,7 +191,7 @@ MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Total number of members
 NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen shows you the statistics of members by countries. 
+MembersByCountryDesc=This screen shows you the statistics of members by country. 
 MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
 MembersByTownDesc=This screen show you statistics of members by town.

From 9984652a4502bc47d9472179279577502f6f2230 Mon Sep 17 00:00:00 2001
From: sonikf <93765174+sonikf@users.noreply.github.com>
Date: Wed, 29 Jan 2025 19:43:00 +0200
Subject: [PATCH 345/602] fix 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 a5e14c17cb8..4166884bdf2 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2606,5 +2606,5 @@ AttributeCodeHelp=A code of your choice (without special chars and spaces) to id
 ThereIsMoreThanXAnswers=There is more than %s answers with your filter. Please add more filters...
 PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the bottom of this setup page
 WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
-UploadExtensionRestriction=File exension list forbidden to upload
+UploadExtensionRestriction=List of forbidden file extensions to upload
 UploadExtensionRestrictionExemple=htm, html, shtml, js, php

From 841cd5f570ad44c9fabdc4b30ce73c3bf8e26445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 29 Jan 2025 19:08:08 +0100
Subject: [PATCH 346/602] enhance member types list

---
 htdocs/adherents/type.php       | 45 +++++++++++++++++++++++----------
 htdocs/langs/en_US/members.lang |  4 ++-
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 91f105c48b8..25bdae150a5 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2020		Josep Lluís Amador			<joseplluis@lliuretic.cat>
  * Copyright (C) 2021		Waël Almoman				<info@almoman.com>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024-2025  Frédéric France             <frederic.france@free.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
@@ -136,6 +136,9 @@ $result = restrictedArea($user, 'adherent', $rowid, 'adherent_type');
  */
 $error = 0;
 
+// Selection of new fields
+include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
 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
 	$search_ref = "";
 	$search_lastname = "";
@@ -329,8 +332,14 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 		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="page" value="'.$page.'">';
+		print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 		print '<input type="hidden" name="mode" value="'.$mode.'">';
 
+		$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+		$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+		$selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
+		// $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 		print_barre_liste($langs->trans("MembersTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'members', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -341,11 +350,18 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 
 		print '<tr class="liste_titre">';
 		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-			print '<th>&nbsp;</th>';
+			print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn ');
+			$totalarray['nbfield']++;
+		}
+		if (!empty($arrayfields['t.rowid']['checked'])) {
+			print '<th>'.$langs->trans("Ref").'</th>';
+		}
+		if (!empty($arrayfields['t.libelle']['checked'])) {
+			print '<th>'.$langs->trans($arrayfields['t.libelle']['label']).'</th>';
+		}
+		if (!empty($arrayfields['t.morphy']['checked'])) {
+			print '<th class="center">'.$langs->trans("MembersNature").'</th>';
 		}
-		print '<th>'.$langs->trans("Ref").'</th>';
-		print '<th>'.$langs->trans("Label").'</th>';
-		print '<th class="center">'.$langs->trans("MembersNature").'</th>';
 		print '<th class="center">'.$langs->trans("MembershipDuration").'</th>';
 		print '<th class="center">'.$langs->trans("SubscriptionRequired").'</th>';
 		print '<th class="center">'.$langs->trans("Amount").'</th>';
@@ -353,7 +369,8 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 		print '<th class="center">'.$langs->trans("VoteAllowed").'</th>';
 		print '<th class="center">'.$langs->trans("Status").'</th>';
 		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-			print '<th>&nbsp;</th>';
+			print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
+			$totalarray['nbfield']++;
 		}
 		print "</tr>\n";
 
@@ -397,13 +414,15 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 						print '<td class="center"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
 					}
 				}
-
-				print '<td class="nowraponall">';
-				print $membertype->getNomUrl(1);
-				//<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.'</a>
-				print '</td>';
-
-				print '<td>'.dol_escape_htmltag($objp->label).'</td>';
+				if (!empty($arrayfields['t.rowid']['checked'])) {
+					print '<td class="nowraponall">';
+					print $membertype->getNomUrl(1);
+					//<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.'</a>
+					print '</td>';
+				}
+				if (!empty($arrayfields['t.libelle']['checked'])) {
+					print '<td>'.dol_escape_htmltag($objp->label).'</td>';
+				}
 
 				print '<td class="center">';
 				if ($objp->morphy == 'phy') {
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 4d1c90f9e1b..a4cecf6be82 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -191,7 +191,7 @@ MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Total number of members
 NbOfActiveMembers=Total number of current active members
 NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen shows you the statistics of members by countries. 
+MembersByCountryDesc=This screen shows you the statistics of members by countries.
 MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
 MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
 MembersByTownDesc=This screen show you statistics of members by town.
@@ -251,3 +251,5 @@ XSubsriptionErrors=%s subscription(s) where in error
 CreateSubscription=Create subscription
 WarningNoComplementaryActionDone=No Complementary action on recording will be executed with this massaction
 NewMembership=New membership
+Caneditamount=Can edit amount
+Morphy=Moral or physical

From 0338b5c65851f490b3458113a642b57a43910ddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 29 Jan 2025 19:11:03 +0100
Subject: [PATCH 347/602] enhance member types list

---
 htdocs/adherents/type.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 25bdae150a5..c1584085f12 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -355,12 +355,15 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 		}
 		if (!empty($arrayfields['t.rowid']['checked'])) {
 			print '<th>'.$langs->trans("Ref").'</th>';
+			$totalarray['nbfield']++;
 		}
 		if (!empty($arrayfields['t.libelle']['checked'])) {
 			print '<th>'.$langs->trans($arrayfields['t.libelle']['label']).'</th>';
+			$totalarray['nbfield']++;
 		}
 		if (!empty($arrayfields['t.morphy']['checked'])) {
 			print '<th class="center">'.$langs->trans("MembersNature").'</th>';
+			$totalarray['nbfield']++;
 		}
 		print '<th class="center">'.$langs->trans("MembershipDuration").'</th>';
 		print '<th class="center">'.$langs->trans("SubscriptionRequired").'</th>';
@@ -423,16 +426,17 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 				if (!empty($arrayfields['t.libelle']['checked'])) {
 					print '<td>'.dol_escape_htmltag($objp->label).'</td>';
 				}
-
-				print '<td class="center">';
-				if ($objp->morphy == 'phy') {
-					print $langs->trans("Physical");
-				} elseif ($objp->morphy == 'mor') {
-					print $langs->trans("Moral");
-				} else {
-					print $langs->trans("MorAndPhy");
+				if (!empty($arrayfields['t.morphy']['checked'])) {
+					print '<td class="center">';
+					if ($objp->morphy == 'phy') {
+						print $langs->trans("Physical");
+					} elseif ($objp->morphy == 'mor') {
+						print $langs->trans("Moral");
+					} else {
+						print $langs->trans("MorAndPhy");
+					}
+					print '</td>';
 				}
-				print '</td>';
 
 				print '<td class="center nowrap">';
 				if ($objp->duration) {

From de131d7d8ef262862c7dd18af426a82f4fbc3df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 29 Jan 2025 19:13:23 +0100
Subject: [PATCH 348/602] enhance member types list

---
 htdocs/adherents/type.php | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index c1584085f12..5e0a853eaa8 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -365,7 +365,10 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 			print '<th class="center">'.$langs->trans("MembersNature").'</th>';
 			$totalarray['nbfield']++;
 		}
-		print '<th class="center">'.$langs->trans("MembershipDuration").'</th>';
+		if (!empty($arrayfields['t.duration']['checked'])) {
+			print '<th class="center">'.$langs->trans("MembershipDuration").'</th>';
+			$totalarray['nbfield']++;
+		}
 		print '<th class="center">'.$langs->trans("SubscriptionRequired").'</th>';
 		print '<th class="center">'.$langs->trans("Amount").'</th>';
 		print '<th class="center">'.$langs->trans("CanEditAmountShort").'</th>';
@@ -437,19 +440,20 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 					}
 					print '</td>';
 				}
-
-				print '<td class="center nowrap">';
-				if ($objp->duration) {
-					$duration_value = intval($objp->duration);
-					if ($duration_value > 1) {
-						$dur = array("i" => $langs->trans("Minutes"), "h" => $langs->trans("Hours"), "d" => $langs->trans("Days"), "w" => $langs->trans("Weeks"), "m" => $langs->trans("Months"), "y" => $langs->trans("Years"));
-					} else {
-						$dur = array("i" => $langs->trans("Minute"), "h" => $langs->trans("Hour"), "d" => $langs->trans("Day"), "w" => $langs->trans("Week"), "m" => $langs->trans("Month"), "y" => $langs->trans("Year"));
+				if (!empty($arrayfields['t.duration']['checked'])) {
+					print '<td class="center nowrap">';
+					if ($objp->duration) {
+						$duration_value = intval($objp->duration);
+						if ($duration_value > 1) {
+							$dur = array("i" => $langs->trans("Minutes"), "h" => $langs->trans("Hours"), "d" => $langs->trans("Days"), "w" => $langs->trans("Weeks"), "m" => $langs->trans("Months"), "y" => $langs->trans("Years"));
+						} else {
+							$dur = array("i" => $langs->trans("Minute"), "h" => $langs->trans("Hour"), "d" => $langs->trans("Day"), "w" => $langs->trans("Week"), "m" => $langs->trans("Month"), "y" => $langs->trans("Year"));
+						}
+						$unit = preg_replace("/[^a-zA-Z]+/", "", $objp->duration);
+						print max(1, $duration_value).' '.$dur[$unit];
 					}
-					$unit = preg_replace("/[^a-zA-Z]+/", "", $objp->duration);
-					print max(1, $duration_value).' '.$dur[$unit];
+					print '</td>';
 				}
-				print '</td>';
 
 				print '<td class="center">'.yn($objp->subscription).'</td>';
 

From 0cbedd4ff0a4e8c24b85c7a43eae70ebb37de050 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 29 Jan 2025 19:15:57 +0100
Subject: [PATCH 349/602] Fix warnings

---
 htdocs/comm/propal/class/propal.class.php     | 18 ++++++++--------
 .../comm/propal/class/propaleligne.class.php  |  8 ++-----
 htdocs/commande/class/commande.class.php      | 21 ++++++++-----------
 htdocs/commande/class/orderline.class.php     |  9 ++------
 htdocs/compta/facture/class/facture.class.php | 14 ++++++-------
 .../facture/class/factureligne.class.php      | 10 +++------
 htdocs/product/class/product.class.php        | 15 ++++++-------
 htdocs/product/price.php                      |  6 +++---
 8 files changed, 41 insertions(+), 60 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index eb81c4c084e..2fb35bdcf2f 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -634,7 +634,7 @@ class Propal extends CommonObject
 	 */
 	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $fk_product = 0, $remise_percent = 0.0, $price_base_type = 'HT', $pu_ttc = 0.0, $info_bits = 0, $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $date_start = '', $date_end = '', $array_options = array(), $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $fk_remise_except = 0, $noupdateafterinsertline = 0)
 	{
-		global $mysoc, $conf, $langs;
+		global $mysoc, $langs;
 
 		dol_syslog(get_class($this)."::addline propalid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type, fk_remise_except=".$fk_remise_except);
 
@@ -659,7 +659,7 @@ class Propal extends CommonObject
 			}
 
 			$remise_percent = price2num($remise_percent);
-			$qty = (float) price2num($qty);
+			$qty = (float) price2num($qty, 'MS');
 			$pu_ht = price2num($pu_ht);
 			$pu_ht_devise = price2num($pu_ht_devise);
 			$pu_ttc = price2num($pu_ttc);
@@ -710,14 +710,14 @@ class Propal extends CommonObject
 			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
 			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
-				$product = new Product($this->db);
-				$result = $product->fetch($fk_product);
-				if ($qty < $product->packaging) {
-					$qty = $product->packaging;
+				$tmpproduct = new Product($this->db);
+				$result = $tmpproduct->fetch($fk_product);
+				if (abs($qty) < $tmpproduct->packaging) {
+					$qty = (float) $tmpproduct->packaging;
 				} else {
-					if (!empty($product->packaging) && (fmod((float) $qty, $product->packaging)  > 0.000001)) {
-						$coeff = intval((float) $qty / $product->packaging) + 1;
-						$qty = (float) $product->packaging * $coeff;
+					if (!empty($tmpproduct->packaging) && $qty > $tmpproduct->packaging) {
+						$coeff = intval(abs($qty) / $tmpproduct->packaging) + 1;
+						$qty = price2num((float) $tmpproduct->packaging * $coeff, 'MS');
 						setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');
 					}
 				}
diff --git a/htdocs/comm/propal/class/propaleligne.class.php b/htdocs/comm/propal/class/propaleligne.class.php
index 67c941e9851..b976193a0e1 100644
--- a/htdocs/comm/propal/class/propaleligne.class.php
+++ b/htdocs/comm/propal/class/propaleligne.class.php
@@ -373,10 +373,8 @@ class PropaleLigne extends CommonObjectLine
 		$sql .= ' pd.localtax1_tx, pd.localtax2_tx, pd.total_localtax1, pd.total_localtax2,';
 		$sql .= ' pd.fk_multicurrency, pd.multicurrency_code, pd.multicurrency_subprice, pd.multicurrency_total_ht, pd.multicurrency_total_tva, pd.multicurrency_total_ttc,';
 		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
+		$sql .= ' p.packaging,';
 		$sql .= ' pd.date_start, pd.date_end, pd.product_type';
-		if (getDolGlobalInt('PRODUCT_USE_CUSTOMER_PACKAGING')) {
-			$sql .= ', p.packaging';
-		}
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'propaldet as pd';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pd.fk_product = p.rowid';
 		$sql .= ' WHERE pd.rowid = '.((int) $rowid);
@@ -425,9 +423,7 @@ class PropaleLigne extends CommonObjectLine
 				$this->product_desc		= $objp->product_desc;
 				$this->fk_unit          = $objp->fk_unit;
 
-				if (getDolGlobalInt('PRODUCT_USE_CUSTOMER_PACKAGING')) {
-					$this->packaging      = $objp->packaging;
-				}
+				$this->packaging      	= $objp->packaging;
 
 				$this->date_start       = $this->db->jdate($objp->date_start);
 				$this->date_end         = $this->db->jdate($objp->date_end);
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 71e03085f69..b052263ee7e 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1635,14 +1635,14 @@ class Commande extends CommonOrder
 			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
 			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
-				$product = new Product($this->db);
-				$result = $product->fetch($fk_product);
-				if ($qty < $product->packaging) {
-					$qty = $product->packaging;
+				$tmpproduct = new Product($this->db);
+				$result = $tmpproduct->fetch($fk_product);
+				if (abs($qty) < $tmpproduct->packaging) {
+					$qty = (float) $tmpproduct->packaging;
 				} else {
-					if (!empty($product->packaging) && (fmod((float) $qty, $product->packaging)  > 0.000001)) {
-						$coeff = intval((float) $qty / $product->packaging) + 1;
-						$qty = (float) $product->packaging * $coeff;
+					if (!empty($tmpproduct->packaging) && $qty > $tmpproduct->packaging) {
+						$coeff = intval(abs($qty) / $tmpproduct->packaging) + 1;
+						$qty = price2num((float) $tmpproduct->packaging * $coeff, 'MS');
 						setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');
 					}
 				}
@@ -2130,7 +2130,7 @@ class Commande extends CommonOrder
 		$sql .= ' l.fk_unit,';
 		$sql .= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
 		$sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tosell as product_tosell, p.tobuy as product_tobuy, p.tobatch as product_tobatch, p.barcode as product_barcode,';
-		$sql .= ' p.weight, p.weight_units, p.volume, p.volume_units';
+		$sql .= ' p.weight, p.weight_units, p.volume, p.volume_units, p.packaging';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as l';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)';
 		$sql .= ' WHERE l.fk_commande = '.((int) $this->id);
@@ -2205,10 +2205,7 @@ class Commande extends CommonOrder
 				$line->weight_units     = $objp->weight_units;
 				$line->volume           = $objp->volume;
 				$line->volume_units     = $objp->volume_units;
-
-				if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
-					$line->packaging = $objp->packaging;
-				}
+				$line->packaging 		= $objp->packaging;
 
 				$line->date_start       = $this->db->jdate($objp->date_start);
 				$line->date_end         = $this->db->jdate($objp->date_end);
diff --git a/htdocs/commande/class/orderline.class.php b/htdocs/commande/class/orderline.class.php
index 10519dd0cf2..ec78db8e44d 100644
--- a/htdocs/commande/class/orderline.class.php
+++ b/htdocs/commande/class/orderline.class.php
@@ -174,10 +174,8 @@ class OrderLine extends CommonOrderLine
 		$sql .= ' cd.fk_unit,';
 		$sql .= ' cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc,';
 		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc, p.tobatch as product_tobatch,';
+		$sql .= ' p.packaging,';
 		$sql .= ' cd.date_start, cd.date_end, cd.vat_src_code';
-		if (getDolGlobalInt('PRODUCT_USE_CUSTOMER_PACKAGING')) {
-			$sql .= ', p.packaging';
-		}
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as cd';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
 		$sql .= ' WHERE cd.rowid = '.((int) $rowid);
@@ -231,10 +229,7 @@ class OrderLine extends CommonOrderLine
 			$this->product_desc     = $objp->product_desc;
 			$this->product_tobatch  = $objp->product_tobatch;
 			$this->fk_unit          = $objp->fk_unit;
-
-			if (getDolGlobalInt('PRODUCT_USE_CUSTOMER_PACKAGING')) {
-				$this->packaging      = $objp->packaging;
-			}
+			$this->packaging      	= $objp->packaging;
 
 			$this->date_start       = $this->db->jdate($objp->date_start);
 			$this->date_end         = $this->db->jdate($objp->date_end);
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 09dddafbbd5..8307f205204 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4000,14 +4000,14 @@ class Facture extends CommonInvoice
 			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
 			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
-				$product = new Product($this->db);
-				$result = $product->fetch($fk_product);
-				if ($qty < $product->packaging) {
-					$qty = $product->packaging;
+				$tmpproduct = new Product($this->db);
+				$result = $tmpproduct->fetch($fk_product);
+				if (abs($qty) < $tmpproduct->packaging) {
+					$qty = (float) $tmpproduct->packaging;
 				} else {
-					if (!empty($product->packaging) && (fmod((float) $qty, $product->packaging)  > 0.000001)) {
-						$coeff = intval((float) $qty / $product->packaging) + 1;
-						$qty = (float) $product->packaging * $coeff;
+					if (!empty($tmpproduct->packaging) && $qty > $tmpproduct->packaging) {
+						$coeff = intval(abs($qty) / $tmpproduct->packaging) + 1;
+						$qty = price2num((float) $tmpproduct->packaging * $coeff, 'MS');
 						setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');
 					}
 				}
diff --git a/htdocs/compta/facture/class/factureligne.class.php b/htdocs/compta/facture/class/factureligne.class.php
index c397b5ddf00..c0b69cb14d3 100644
--- a/htdocs/compta/facture/class/factureligne.class.php
+++ b/htdocs/compta/facture/class/factureligne.class.php
@@ -215,10 +215,8 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= ' fd.multicurrency_total_ht,';
 		$sql .= ' fd.multicurrency_total_tva,';
 		$sql .= ' fd.multicurrency_total_ttc,';
-		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc';
-		if (getDolGlobalInt('PRODUCT_USE_CUSTOMER_PACKAGING')) {
-			$sql .= ', p.packaging';
-		}
+		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
+		$sql .= ' p.packaging';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facturedet as fd';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON fd.fk_product = p.rowid';
 		$sql .= ' WHERE fd.rowid = '.((int) $rowid);
@@ -285,9 +283,7 @@ class FactureLigne extends CommonInvoiceLine
 			$this->multicurrency_total_tva = $objp->multicurrency_total_tva;
 			$this->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
 
-			if (getDolGlobalInt('PRODUCT_USE_CUSTOMER_PACKAGING')) {
-				$this->packaging      = $objp->packaging;
-			}
+			$this->packaging      = $objp->packaging;
 
 			$this->fetch_optionals();
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 05d88261d19..46121f12a94 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1596,8 +1596,8 @@ class Product extends CommonObject
 			$sql .= ", fk_price_expression = ".($this->fk_price_expression != 0 ? (int) $this->fk_price_expression : 'NULL');
 			$sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id : 'NULL');
 			$sql .= ", mandatory_period = ".($this->mandatory_period);
-			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING') && !empty($this->packaging)) {
-				$sql .= ", packaging = " . (float) $this->packaging;
+			if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
+				$sql .= ", packaging = ".(float) $this->packaging;
 			}
 			// stock field is not here because it is a denormalized value from product_stock.
 			$sql .= " WHERE rowid = ".((int) $id);
@@ -2893,15 +2893,12 @@ class Product extends CommonObject
 		$sql .= " p.price_min, p.price_min_ttc, p.price_base_type, p.cost_price, p.default_vat_code, p.tva_tx, p.recuperableonly as tva_npr, p.localtax1_tx, p.localtax2_tx, p.localtax1_type, p.localtax2_type, p.tosell,";
 		$sql .= " p.tobuy, p.fk_product_type, p.duration, p.fk_default_warehouse, p.fk_default_workstation, p.seuil_stock_alerte, p.canvas, p.net_measure, p.net_measure_units, p.weight, p.weight_units,";
 		$sql .= " p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.last_main_doc,";
-		$sql .= " p.surface, p.surface_units, p.volume, p.volume_units, p.barcode, p.fk_barcode_type, p.finished, p.fk_default_bom, p.mandatory_period,";
+		$sql .= " p.surface, p.surface_units, p.volume, p.volume_units, p.barcode, p.fk_barcode_type, p.finished, p.fk_default_bom, p.mandatory_period, p.packaging,";
 		if (!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 			$sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export, p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
 		} else {
 			$sql .= " ppe.accountancy_code_buy, ppe.accountancy_code_buy_intra, ppe.accountancy_code_buy_export, ppe.accountancy_code_sell, ppe.accountancy_code_sell_intra, ppe.accountancy_code_sell_export,";
 		}
-		if (getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING')) {
-			$sql .= " p.packaging,";
-		}
 
 		// For MultiCompany
 		// PMP per entity & Stocks Sharings stock_reel includes only stocks shared with this entity
@@ -2959,7 +2956,7 @@ class Product extends CommonObject
 			$sql .= " p.price_min, p.price_min_ttc, p.price_base_type, p.cost_price, p.default_vat_code, p.tva_tx, p.recuperableonly, p.localtax1_tx, p.localtax2_tx, p.localtax1_type, p.localtax2_type, p.tosell,";
 			$sql .= " p.tobuy, p.fk_product_type, p.duration, p.fk_default_warehouse, p.fk_default_workstation, p.seuil_stock_alerte, p.canvas, p.net_measure, p.net_measure_units, p.weight, p.weight_units,";
 			$sql .= " p.length, p.length_units, p.width, p.width_units, p.height, p.height_units,";
-			$sql .= " p.surface, p.surface_units, p.volume, p.volume_units, p.barcode, p.fk_barcode_type, p.finished, p.fk_default_bom, p.mandatory_period,";
+			$sql .= " p.surface, p.surface_units, p.volume, p.volume_units, p.barcode, p.fk_barcode_type, p.finished, p.fk_default_bom, p.mandatory_period, p.packaging,";
 			if (!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 				$sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export, p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
 			} else {
@@ -2971,8 +2968,8 @@ class Product extends CommonObject
 				$sql .= " p.pmp,";
 			}
 			$sql .= " p.datec, p.tms, p.import_key, p.entity, p.desiredstock, p.tobatch, p.sell_or_eat_by_mandatory, p.batch_mask, p.fk_unit,";
-			$sql .= " p.fk_price_expression, p.price_autogen, p.model_pdf";
-			$sql .= " ,p.price_label";
+			$sql .= " p.fk_price_expression, p.price_autogen, p.model_pdf,";
+			$sql .= " p.price_label";
 			if (!$separatedStock) {
 				$sql .= ", p.stock";
 			}
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 2a3dc750d9b..7e455771536 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -279,12 +279,12 @@ if (empty($reshook)) {
 		$error = 0;
 		$pricestoupdate = array();
 
-		$psq = GETPOST('psqflag');
-		$psq = empty($newpsq) ? 0 : $newpsq;
+		$psq = GETPOSTINT('psqflag');
+
 		$maxpricesupplier = $object->min_recommended_price();
 
 		// Packaging
-		$packaging = getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING') ? GETPOST('packaging') : null;
+		$packaging = getDolGlobalString('PRODUCT_USE_CUSTOMER_PACKAGING') ? price2num(GETPOST('packaging', 'alpha'), 'MS') : null;
 
 		if (isModEnabled('dynamicprices')) {
 			$object->fk_price_expression = empty($eid) ? 0 : $eid; //0 discards expression

From d1adfb32a453e3f0b8d272d5657820a1812993db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 29 Jan 2025 19:21:44 +0100
Subject: [PATCH 350/602] enhance member types list

---
 htdocs/adherents/type.php | 51 +++++++++++++++++++++++++++------------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 5e0a853eaa8..221c76c7bfa 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -369,11 +369,26 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 			print '<th class="center">'.$langs->trans("MembershipDuration").'</th>';
 			$totalarray['nbfield']++;
 		}
-		print '<th class="center">'.$langs->trans("SubscriptionRequired").'</th>';
-		print '<th class="center">'.$langs->trans("Amount").'</th>';
-		print '<th class="center">'.$langs->trans("CanEditAmountShort").'</th>';
-		print '<th class="center">'.$langs->trans("VoteAllowed").'</th>';
-		print '<th class="center">'.$langs->trans("Status").'</th>';
+		if (!empty($arrayfields['t.subscription']['checked'])) {
+			print '<th class="center">'.$langs->trans("SubscriptionRequired").'</th>';
+			$totalarray['nbfield']++;
+		}
+		if (!empty($arrayfields['t.amount']['checked'])) {
+			print '<th class="center">'.$langs->trans("Amount").'</th>';
+			$totalarray['nbfield']++;
+		}
+		if (!empty($arrayfields['t.caneditamount']['checked'])) {
+			print '<th class="center">'.$langs->trans("CanEditAmountShort").'</th>';
+			$totalarray['nbfield']++;
+		}
+		if (!empty($arrayfields['t.vote']['checked'])) {
+			print '<th class="center">'.$langs->trans("VoteAllowed").'</th>';
+			$totalarray['nbfield']++;
+		}
+		if (!empty($arrayfields['t.statut']['checked'])) {
+			print '<th class="center">'.$langs->trans("Status").'</th>';
+			$totalarray['nbfield']++;
+		}
 		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
 			$totalarray['nbfield']++;
@@ -454,17 +469,21 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 					}
 					print '</td>';
 				}
-
-				print '<td class="center">'.yn($objp->subscription).'</td>';
-
-				print '<td class="center"><span class="amount">'.(is_null($objp->amount) || $objp->amount === '' ? '' : price($objp->amount)).'</span></td>';
-
-				print '<td class="center">'.yn($objp->caneditamount).'</td>';
-
-				print '<td class="center">'.yn($objp->vote).'</td>';
-
-				print '<td class="center">'.$membertype->getLibStatut(5).'</td>';
-
+				if (!empty($arrayfields['t.subscription']['checked'])) {
+					print '<td class="center">'.yn($objp->subscription).'</td>';
+				}
+				if (!empty($arrayfields['t.amount']['checked'])) {
+					print '<td class="center"><span class="amount">'.(is_null($objp->amount) || $objp->amount === '' ? '' : price($objp->amount)).'</span></td>';
+				}
+				if (!empty($arrayfields['t.caneditamount']['checked'])) {
+					print '<td class="center">'.yn($objp->caneditamount).'</td>';
+				}
+				if (!empty($arrayfields['t.vote']['checked'])) {
+					print '<td class="center">'.yn($objp->vote).'</td>';
+				}
+				if (!empty($arrayfields['t.statut']['checked'])) {
+					print '<td class="center">'.$membertype->getLibStatut(5).'</td>';
+				}
 				if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 					if ($user->hasRight('adherent', 'configurer')) {
 						print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';

From 1c94227320c639e1a6318b2ec89a2ff3636a0e8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 29 Jan 2025 19:24:40 +0100
Subject: [PATCH 351/602] fix phan

---
 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 070f9914417..eb81c4c084e 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -713,9 +713,9 @@ class Propal extends CommonObject
 				$product = new Product($this->db);
 				$result = $product->fetch($fk_product);
 				if ($qty < $product->packaging) {
-					$qty = (float) $product->packaging;
+					$qty = $product->packaging;
 				} else {
-					if (!empty($product->packaging) && (fmod((float) $qty, (float) $product->packaging)  > 0.000001)) {
+					if (!empty($product->packaging) && (fmod((float) $qty, $product->packaging)  > 0.000001)) {
 						$coeff = intval((float) $qty / $product->packaging) + 1;
 						$qty = (float) $product->packaging * $coeff;
 						setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');

From 7a6b650e828c39b0fae8200d87983548c562c757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 29 Jan 2025 19:25:32 +0100
Subject: [PATCH 352/602] fix phan

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index ccce40846ce..71e03085f69 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1638,9 +1638,9 @@ class Commande extends CommonOrder
 				$product = new Product($this->db);
 				$result = $product->fetch($fk_product);
 				if ($qty < $product->packaging) {
-					$qty = (float) $product->packaging;
+					$qty = $product->packaging;
 				} else {
-					if (!empty($product->packaging) && (fmod((float) $qty, (float) $product->packaging)  > 0.000001)) {
+					if (!empty($product->packaging) && (fmod((float) $qty, $product->packaging)  > 0.000001)) {
 						$coeff = intval((float) $qty / $product->packaging) + 1;
 						$qty = (float) $product->packaging * $coeff;
 						setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 68a019043d5..09dddafbbd5 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4003,9 +4003,9 @@ class Facture extends CommonInvoice
 				$product = new Product($this->db);
 				$result = $product->fetch($fk_product);
 				if ($qty < $product->packaging) {
-					$qty = (float) $product->packaging;
+					$qty = $product->packaging;
 				} else {
-					if (!empty($product->packaging) && (fmod((float) $qty, (float) $product->packaging)  > 0.000001)) {
+					if (!empty($product->packaging) && (fmod((float) $qty, $product->packaging)  > 0.000001)) {
 						$coeff = intval((float) $qty / $product->packaging) + 1;
 						$qty = (float) $product->packaging * $coeff;
 						setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');

From 82eb875fabed66fe5554ac528f9e360a196abbbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 29 Jan 2025 19:34:35 +0100
Subject: [PATCH 353/602] enhance member types list

---
 htdocs/adherents/type.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 221c76c7bfa..7db9917b1d2 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -286,6 +286,9 @@ $help_url = 'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_M
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-member page-type');
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
+$totalarray = [
+	'nbfield' => 0,
+];
 
 // List of members type
 if (!$rowid && $action != 'create' && $action != 'edit') {

From 4fc66c6ee16062b44747ce3442e8be307af53570 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 29 Jan 2025 19:44:50 +0100
Subject: [PATCH 354/602] FIX missing quick edit for extrafields

---
 htdocs/core/tpl/extrafields_view.tpl.php |  3 +++
 htdocs/projet/card.php                   | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 10481b4ad10..26c11f099a6 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -159,6 +159,9 @@ if (empty($reshook) && !empty($object->table_element) && isset($extrafields->att
 			if ($object->element == 'product') {
 				$keyforperm = 'produit';
 			}
+			if ($object->element == 'project') {
+				$keyforperm = 'projet';
+			}
 			if (isset($user->rights->$keyforperm)) {
 				$permok = $user->hasRight($keyforperm, 'creer') || $user->hasRight($keyforperm, 'create') || $user->hasRight($keyforperm, 'write');
 			}
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 1b17aff16af..fd6fa35d136 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -553,6 +553,30 @@ if (empty($reshook)) {
 		}
 	}
 
+	// Quick edit for extrafields
+	if ($action == 'update_extras' && $permissiontoadd) {
+		$object->oldcopy = dol_clone($object, 2);
+
+		// Fill array 'array_options' with data from update form
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
+		if ($ret < 0) {
+			$error++;
+		}
+
+		if (!$error) {
+			// Actions on extra fields
+			$result = $object->insertExtraFields('PROJECT_MODIFY');
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+			}
+		}
+
+		if ($error) {
+			$action = 'edit_extras';
+		}
+	}
+
 	// Actions to send emails
 	$triggersendname = 'PROJECT_SENTBYMAIL';
 	$paramname = 'id';

From 65ebb94181d55c268040d50a0292617ee783e21d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Thu, 30 Jan 2025 01:12:50 +0100
Subject: [PATCH 355/602] FIX wrong var name

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index b00bb69b3fb..bc59136f69e 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1578,7 +1578,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			// Vat is used
 			print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td>';
 			print '<td>';
-			print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . (GETPOSTISSET('assujtva_value') ? (GETPOST('assujtva', 'alpha') != '' ? ' checked="checked"' : '') : 'checked="checked"') . ' value="1">'; // Assujeti par default en creation
+			print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . (GETPOSTISSET('assujtva_value') ? (GETPOST('assujtva_value', 'alpha') != '' ? ' checked="checked"' : '') : 'checked="checked"') . ' value="1">'; // Assujeti par default en creation
 			print '</td>';
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';

From d831e30869e1e17edc881458d6b8851376a5c377 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Thu, 30 Jan 2025 08:29:46 +0100
Subject: [PATCH 356/602] FIX multicompany compatibility

---
 htdocs/admin/multicurrency.php              | 6 +++---
 htdocs/multicurrency/multicurrency_rate.php | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index 2a6713ef599..a4b503b3f24 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -130,9 +130,9 @@ if ($action == 'add_currency') {
 	}
 } elseif ($action == 'setapilayer') {
 	if (GETPOSTISSET('modify_apilayer')) {
-		dolibarr_set_const($db, 'MULTICURRENCY_APP_ID', GETPOST('MULTICURRENCY_APP_ID', 'alpha'));
-		dolibarr_set_const($db, 'MULTICURRENCY_APP_SOURCE', GETPOST('MULTICURRENCY_APP_SOURCE', 'alpha'));
-		//dolibarr_set_const($db, 'MULTICURRENCY_ALTERNATE_SOURCE', GETPOST('MULTICURRENCY_ALTERNATE_SOURCE', 'alpha'));
+		dolibarr_set_const($db, 'MULTICURRENCY_APP_ID', GETPOST('MULTICURRENCY_APP_ID', 'alpha'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, 'MULTICURRENCY_APP_SOURCE', GETPOST('MULTICURRENCY_APP_SOURCE', 'alpha'), 'chaine', 0, '', $conf->entity);
+		//dolibarr_set_const($db, 'MULTICURRENCY_ALTERNATE_SOURCE', GETPOST('MULTICURRENCY_ALTERNATE_SOURCE', 'alpha'), 'chaine', 0, '', $conf->entity);
 	} else {
 		$multiurrency = new MultiCurrency($db);
 		$result = $multiurrency->syncRates(getDolGlobalString('MULTICURRENCY_APP_ID'));
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index ef05976018e..7cfe91e5e14 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -354,7 +354,8 @@ if ($search_rate) {
 if ($search_code) {
 	$sql .= natural_search('m.code', $search_code);
 }
-$sql .= " WHERE m.code <> '".$db->escape($conf->currency)."'";
+$sql .= " WHERE cr.entity IN (".getEntity('multicurrency').")";
+$sql .= " AND m.code <> '".$db->escape($conf->currency)."'";
 
 // Add where from hooks
 $parameters = array();

From c07be3dfc39d892e094e07c7967a0212a8b25a9e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 30 Jan 2025 09:30:10 +0100
Subject: [PATCH 357/602] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 136f946a257..607ab21f166 100644
--- a/README.md
+++ b/README.md
@@ -34,12 +34,12 @@ There is a lot of different solutions to install Dolibarr.
 
 ### Using packages 
 
-If you have low technical skills and you're looking to install Dolibarr ERP/CRM with just a few clicks, you can use one of the packaged versions:
+If you have low technical skills and you're looking to install Dolibarr ERP/CRM with just few clicks, you can use one of the packaged versions (see next chapter if you have IT knowledge) :
 
 - [DoliWamp for Windows](https://wiki.dolibarr.org/index.php/Dolibarr_for_Windows_(DoliWamp))
-- [DoliDeb for Debian](https://wiki.dolibarr.org/index.php/Dolibarr_for_Ubuntu_or_Debian)
+- [DoliDeb for Debian, Ubuntu](https://wiki.dolibarr.org/index.php/Dolibarr_for_Ubuntu_or_Debian)
 - DoliRpm for Red Hat, Fedora, OpenSuse, Mandriva or Mageia
-- The Docker image (see next chapter)
+- The Docker image (see chapter "Using Docker")
 
 Releases can be downloaded from [official website](https://www.dolibarr.org/).
 

From 7848d77830373d1881d5f5851f375eb0e6910c49 Mon Sep 17 00:00:00 2001
From: Irvine Fleith <irvine.fleith@atm-consulting.fr>
Date: Thu, 30 Jan 2025 09:58:29 +0100
Subject: [PATCH 358/602] fix(contrat,facture-rec): undefined properties

---
 htdocs/compta/facture/class/facture-rec.class.php | 7 +++++++
 htdocs/contrat/class/contrat.class.php            | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 228badc04dc..a45feec9cdc 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -125,6 +125,13 @@ class FactureRec extends CommonInvoice
 	public $cond_reglement_code; // Code in llx_c_paiement
 	public $mode_reglement_code; // Code in llx_c_paiement
 
+	public $fk_multicurrency;
+	public $multicurrency_code;
+	public $multicurrency_tx;
+	public $multicurrency_total_ht;
+	public $multicurrency_total_tva;
+	public $multicurrency_total_ttc;
+
 	public $suspended; // status
 
 	public $auto_validate; // 0 to create in draft, 1 to create and validate the new invoice
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index a29df83b834..d78c636b0f1 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -3097,7 +3097,7 @@ class ContratLigne extends CommonObjectLine
 		$sql .= " t.label,"; // This field is not used. Only label of product
 		$sql .= " p.ref as product_ref,";
 		$sql .= " p.label as product_label,";
-		$sql .= " p.description as product_desc,";
+		$sql .= " p.description as product_description,";
 		$sql .= " p.fk_product_type as product_type,";
 		$sql .= " t.description,";
 		$sql .= " t.date_commande,";

From 72604763977f4c32d22feed2b834d4bb508740ec Mon Sep 17 00:00:00 2001
From: Pratush Raj <pratushraj0@gmail.com>
Date: Thu, 30 Jan 2025 15:14:07 +0530
Subject: [PATCH 359/602] Bug Fix: #32206

---
 htdocs/core/class/discount.class.php   |  6 ++++--
 htdocs/societe/class/societe.class.php | 24 ++++++++++++++++++------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 29e663f4e27..06929becacc 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -278,13 +278,15 @@ class DiscountAbsolute extends CommonObject
 		$sql .= " (entity, datec, fk_soc, discount_type, fk_user, description,";
 		$sql .= " amount_ht, amount_tva, amount_ttc, tva_tx, vat_src_code,";
 		$sql .= " multicurrency_amount_ht, multicurrency_amount_tva, multicurrency_amount_ttc,";
-		$sql .= " fk_facture_source, fk_invoice_supplier_source";
+		$sql .= " fk_facture_source, fk_invoice_supplier_source, multicurrency_code, multicurrency_tx";
 		$sql .= ")";
 		$sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datec != '' ? $this->datec : dol_now())."', ".((int) $this->socid).", ".(empty($this->discount_type) ? 0 : intval($this->discount_type)).", ".((int) $userid).", '".$this->db->escape($this->description)."',";
 		$sql .= " ".price2num($this->amount_ht).", ".price2num($this->amount_tva).", ".price2num($this->amount_ttc).", ".price2num($this->tva_tx).", '".$this->db->escape($this->vat_src_code)."',";
 		$sql .= " ".price2num($this->multicurrency_amount_ht).", ".price2num($this->multicurrency_amount_tva).", ".price2num($this->multicurrency_amount_ttc).", ";
 		$sql .= " ".($this->fk_facture_source ? ((int) $this->fk_facture_source) : "null").",";
-		$sql .= " ".($this->fk_invoice_supplier_source ? ((int) $this->fk_invoice_supplier_source) : "null");
+		$sql .= " ".($this->fk_invoice_supplier_source ? ((int) $this->fk_invoice_supplier_source) : "null").",";
+		$sql .= " '".($this->multicurrency_code ? $this->multicurrency_code : "null")."',";
+		$sql .= " ".($this->multicurrency_tx ? price2num($this->multicurrency_tx) : "null");
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 1f6e6377ca0..65c0c3e6145 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2505,15 +2505,27 @@ class Societe extends CommonObject
 			$discount->socid = $this->id;
 
 			$discount->discount_type = $discount_type;
+			$discount->multicurrency_code = $this->multicurrency_code;
+			list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+			$discount->multicurrency_tx = $this->multicurrency_tx;
 
 			if ($price_base_type == 'TTC') {
-				$discount->amount_ttc = $discount->multicurrency_amount_ttc = price2num($remise, 'MT');
-				$discount->amount_ht = $discount->multicurrency_amount_ht = price2num((float) $remise / (1 + (float) $vatrate / 100), 'MT');
-				$discount->amount_tva = $discount->multicurrency_amount_tva = price2num((float) $discount->amount_ttc - (float) $discount->amount_ht, 'MT');
+				$discount->multicurrency_amount_ttc = price2num($remise * (float) $discount->multicurrency_tx, 'MT');
+				$discount->multicurrency_amount_ht = price2num(((float) $remise / (1 + (float) $vatrate / 100)) * (float) $discount->multicurrency_tx, 'MT');
+				$discount->multicurrency_amount_tva = price2num(((float) $discount->amount_ttc - (float) $discount->amount_ht) * (float) $discount->multicurrency_tx, 'MT');
+
+				$discount->amount_ttc = price2num($remise, 'MT');
+				$discount->amount_ht = price2num((float) $remise / (1 + (float) $vatrate / 100), 'MT');
+				$discount->amount_tva = price2num((float) $discount->amount_ttc - (float) $discount->amount_ht, 'MT');
+
 			} else {
-				$discount->amount_ht = $discount->multicurrency_amount_ht = price2num($remise, 'MT');
-				$discount->amount_tva = $discount->multicurrency_amount_tva = price2num((float) $remise * (float) $vatrate / 100, 'MT');
-				$discount->amount_ttc = $discount->multicurrency_amount_ttc = price2num((float) $discount->amount_ht + (float) $discount->amount_tva, 'MT');
+				$discount->amount_ht = price2num($remise, 'MT');
+				$discount->amount_tva = price2num((float) $remise * (float) $vatrate / 100, 'MT');
+				$discount->amount_ttc = price2num((float) $discount->amount_ht + (float) $discount->amount_tva, 'MT');
+
+				$discount->multicurrency_amount_ht = price2num($remise * (float)$discount->multicurrency_tx, 'MT');
+				$discount->multicurrency_amount_tva = price2num(((float) $remise * (float) $vatrate / 100) * (float) $discount->multicurrency_tx, 'MT');
+				$discount->multicurrency_amount_ttc= price2num(((float) $discount->amount_ht + (float) $discount->amount_tva) * (float) $discount->multicurrency_tx, 'MT');
 			}
 
 			$discount->tva_tx = (float) price2num($vatrate);

From 1298229345a4a9e05c2d3160e8772eaf089ffa9c Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 30 Jan 2025 12:10:21 +0100
Subject: [PATCH 360/602] Doc

---
 dev/build/makepack-howto.txt | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/dev/build/makepack-howto.txt b/dev/build/makepack-howto.txt
index 61a6006f0ae..b23b21e1bd7 100644
--- a/dev/build/makepack-howto.txt
+++ b/dev/build/makepack-howto.txt
@@ -1,14 +1,14 @@
 ----- Dolibarr Makepack How To -----
-This documentation describe steps to build a BETA or RELEASE versions
-of Dolibarr. There is a chapter for BETA version and a chapter for RELEASE version.
+This documentation describe steps to build a BETA or RELEASE versions of Dolibarr.
+There is a chapter for BETA version and a chapter for RELEASE version.
 
 
-***** Prerequisites For Linux *****
+***** Prerequisites on Linux *****
 
-Prerequisites to build tgz, debian and rpm packages:
+Prerequisites to build the tgz, debian and rpm packages:
 > apt-get install perl tar dpkg dpatch p7zip-full rpm zip php-cli
 
-Prerequisites to build autoexe DoliWamp package from Linux (solution seems broken since Ubuntu 20.04):
+Prerequisites to build autoexe DoliWamp package from Linux (solution seems broken since Ubuntu 20.04+):
 > apt-get install wine q4wine
 > Launch "wine cmd" to check a drive Z: pointing to / exists.
 > Install InnoSetup
@@ -23,7 +23,7 @@ Prerequisites to build autoexe DoliWamp package from Linux (solution seems broke
   The .exe file will be build into directory build.
 
 
-***** Prerequisites For Windows *****
+***** Prerequisites on Windows *****
 
 Prerequisites to build autoexe DoliWamp package from Windows:
 
@@ -49,9 +49,9 @@ This files describe steps made by Dolibarr packaging team to make a beta version
 
 - Check all files are committed.
 - Update version/info in ChangeLog, for this you can:
-To generate a changelog of a major new version x.y.0 (from a repo on branch develop), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
-To generate a changelog of a major new version x.y.0 (from a repo on branch x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
-To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+To generate a changelog of a major new version x.y.0 (from a repo on branch develop), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/changelogtocopy"
+To generate a changelog of a major new version x.y.0 (from a repo on branch x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/changelogtocopy"
+To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/changelogtocopy"
 Recopy the content of the output file into the file ChangeLog.
 - Note: To know number of lines changes: git diff --shortstat A B
 - Update version number with x.y.z-w in file htdocs/filefunc.inc.php
@@ -67,15 +67,15 @@ Recopy the content of the output file into the file ChangeLog.
 ***** Actions to do a RELEASE *****
 
 This files describe steps made by Dolibarr packaging team to make a complete release of Dolibarr, step by step.
-We suppose the branch x.y has already been created during the beta (see previous step).
+We suppose the branch x.y has already been created during the beta (see previous step) and we want to release a version x.y.z (with z >= 0)
 
 - Check all files are committed.
-- Update version/info in ChangeLog, for this you can:
-To generate a changelog of a major new version x.y.0 (from a repo on branch develop), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
-To generate a changelog of a major new version x.y.0 (from a repo pn branch x.y), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
-To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+- Update version/info in ChangeLog, for this:
+To generate a changelog of a major new version x.y.0 (from a repo on branch develop), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/changelogtocopy"
+To generate a changelog of a major new version x.y.0 (from a repo pn branch x.y), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/changelogtocopy"
+To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/changelogtocopy"
 Recopy the content of the output file into the file ChangeLog.
-- Note: To know the number of lines changes: git diff --shortstat A B
+- Note: To know the number of lines changes: git diff --shortstat vA vB
 - Update version number with x.y.z in file htdocs/filefunc.inc.php
 - Commit all changes.
 
@@ -84,6 +84,6 @@ Recopy the content of the output file into the file ChangeLog.
 - Check content of built packages.
 
 - Run makepack-dolibarr.pl again with option to publish files on dolibarr foundation server (Dir /home/dolibarr/wwwroot/files/stable on www.dolibarr.org).
-- Run makepack-dolibarr.pl again with option to publish files on sourceforge. This will also add official tag.
+- Run makepack-dolibarr.pl again with option to publish files on sourceforge. This will also add the official tag x.y.z.
 
-- Post a news on dolibarr.org/dolibarr.fr + social networks
+- Post a news in english dolibarr.org/dolibarr.fr web site by cloning a past news (the news will be propagated on social networks)

From 4e1a319113b3880e1b3161ce0b74c3dece6c8557 Mon Sep 17 00:00:00 2001
From: Dolibot <dolibarr-bot@users.noreply.github.com>
Date: Thu, 30 Jan 2025 12:06:34 +0000
Subject: [PATCH 361/602] PHPStan > Update baseline

---
 dev/build/phpstan/phpstan-baseline.neon | 78 -------------------------
 1 file changed, 78 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 2d9c290b25a..740e50d80c5 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -9540,12 +9540,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/class/dolgraph.class.php
 
-		-
-			message: '#^Comparison operation "\>" between 0 and 0 is always false\.$#'
-			identifier: greater.alwaysFalse
-			count: 3
-			path: ../../../htdocs/core/class/dolgraph.class.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
@@ -9564,24 +9558,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/class/dolgraph.class.php
 
-		-
-			message: '#^Loose comparison using \=\= between 0 and 0 will always evaluate to true\.$#'
-			identifier: equal.alwaysTrue
-			count: 2
-			path: ../../../htdocs/core/class/dolgraph.class.php
-
-		-
-			message: '#^Loose comparison using \=\= between 1 and 3 will always evaluate to false\.$#'
-			identifier: equal.alwaysFalse
-			count: 1
-			path: ../../../htdocs/core/class/dolgraph.class.php
-
-		-
-			message: '#^Offset 0 on array\{array\{stacknum\: int, legend\: mixed, legendwithgroup\: non\-falsy\-string\}\} in empty\(\) always exists and is not falsy\.$#'
-			identifier: empty.offset
-			count: 1
-			path: ../../../htdocs/core/class/dolgraph.class.php
-
 		-
 			message: '#^Ternary operator condition is always true\.$#'
 			identifier: ternary.alwaysTrue
@@ -14670,24 +14646,12 @@ parameters:
 			count: 12
 			path: ../../../htdocs/core/tpl/card_presend.tpl.php
 
-		-
-			message: '#^Variable \$hidedesc might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/card_presend.tpl.php
-
 		-
 			message: '#^Variable \$hidedetails might not be defined\.$#'
 			identifier: variable.undefined
 			count: 1
 			path: ../../../htdocs/core/tpl/card_presend.tpl.php
 
-		-
-			message: '#^Variable \$hideref might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/card_presend.tpl.php
-
 		-
 			message: '#^Variable \$hookmanager might not be defined\.$#'
 			identifier: variable.undefined
@@ -15444,12 +15408,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/cron/list.php
 
-		-
-			message: '#^Variable \$texttoshow might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/cron/list.php
-
 		-
 			message: '#^Offset ''css'' on array\{css\: ''minwidth200'', picto\: mixed\} in empty\(\) always exists and is not falsy\.$#'
 			identifier: empty.offset
@@ -15510,12 +15468,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/delivery/card.php
 
-		-
-			message: '#^Variable \$arrayoptions might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/delivery/card.php
-
 		-
 			message: '#^Variable \$hidedesc might not be defined\.$#'
 			identifier: variable.undefined
@@ -15786,42 +15738,12 @@ parameters:
 			count: 1
 			path: ../../../htdocs/don/paiement/list.php
 
-		-
-			message: '#^Variable \$morecss might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/don/paiement/list.php
-
-		-
-			message: '#^Variable \$morejs might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/don/paiement/list.php
-
-		-
-			message: '#^Variable \$outputlangs might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/don/payment/card.php
-
 		-
 			message: '#^Negated boolean expression is always true\.$#'
 			identifier: booleanNot.alwaysTrue
 			count: 1
 			path: ../../../htdocs/don/payment/payment.php
 
-		-
-			message: '#^Variable \$sumpaid might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: ../../../htdocs/don/payment/payment.php
-
-		-
-			message: '#^Variable \$objectlink might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/don/tpl/linkedobjectblock.tpl.php
-
 		-
 			message: '#^Property EcmFiles\:\:\$acl \(string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property

From 7fa1baf1ddbf35d4710f175d1a5ad387672abcc0 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 30 Jan 2025 13:34:26 +0100
Subject: [PATCH 362/602] Fix regression

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

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 305649da4e4..5dd92761cdb 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1785,10 +1785,9 @@ class Categorie extends CommonObject
 		}
 
 		// Check contrast with background and correct text color
-		//$forced_color = 'categtextwhite'; // TODO This css class hide the link
-		$forced_color = 'categtextblack';
+		$forced_color = 'categtextwhite'; // We want color white because the background is dark (grey or other)
 		if ($this->color) {
-			if (colorIsLight($this->color)) {
+			if (colorIsLight($this->color)) {	// If color is light, we force color to dark
 				$forced_color = 'categtextblack';
 			}
 		}

From 09d745057c92804bf27bc18b6813257c4ea49951 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 30 Jan 2025 14:36:43 +0100
Subject: [PATCH 363/602] Fix structured data

---
 htdocs/core/lib/website.lib.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 697d3f5674d..00de6abe9ae 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -779,13 +779,13 @@ function getStructuredData($type, $data = array())
 
 			$pageurl = $websitepage->pageurl;
 			$title = $websitepage->title;
-			$image = $websitepage->image;
+			$image = getImageFromHtmlContent($websitepage->content);
 			$companyname = $mysoc->name;
 			$description = $websitepage->description;
 
 			$pageurl = str_replace('__WEBSITE_KEY__', $website->ref, $pageurl);
 			$title = str_replace('__WEBSITE_KEY__', $website->ref, $title);
-			$image = '/medias'.(preg_match('/^\//', $image) ? '' : '/').str_replace('__WEBSITE_KEY__', $website->ref, $image);
+			$imagepath = '/medias'.(preg_match('/^\//', $image) ? '' : '/').str_replace('__WEBSITE_KEY__', $website->ref, $image);
 			$companyname = str_replace('__WEBSITE_KEY__', $website->ref, $companyname);
 			$description = str_replace('__WEBSITE_KEY__', $website->ref, $description);
 
@@ -798,10 +798,14 @@ function getStructuredData($type, $data = array())
 				    "@type": "WebPage",
 				    "@id": "'.dol_escape_json($pageurl).'"
 				  },
-				  "headline": "'.dol_escape_json($title).'",
+				  "headline": "'.dol_escape_json($title).'",';
+			if ($image) {
+				$ret .= '
 				  "image": [
-				    "'.dol_escape_json($image).'"
-				   ],
+				    "'.dol_escape_json($imagepath).'"
+				   ],';
+			}
+			$ret .= '
 				  "dateCreated": "'.dol_print_date($websitepage->date_creation, 'dayhourrfc').'",
 				  "datePublished": "'.dol_print_date($websitepage->date_creation, 'dayhourrfc').'",
 				  "dateModified": "'.dol_print_date($websitepage->date_modification, 'dayhourrfc').'",
@@ -814,7 +818,7 @@ function getStructuredData($type, $data = array())
 				     "name": "'.dol_escape_json($companyname).'",
 				     "logo": {
 				        "@type": "ImageObject",
-				        "url": "/wrapper.php?modulepart=mycompany&file=logos%2F'.urlencode($mysoc->logo).'"
+				        "url": "/wrapper.php?modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo).'"
 				     }
 				   },'."\n";
 			if ($websitepage->keywords) {

From 0cc2ce2c1190bca56cf0d984e27bdb1bb5ee816d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sol=C3=A8ne?= <solene.pichon@manchenumerique.fr>
Date: Thu, 30 Jan 2025 15:48:50 +0100
Subject: [PATCH 364/602] Translations fixed

---
 htdocs/core/lib/fichinter.lib.php     | 2 +-
 htdocs/langs/en_US/interventions.lang | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php
index 64b91da0206..2eeb365cc62 100644
--- a/htdocs/core/lib/fichinter.lib.php
+++ b/htdocs/core/lib/fichinter.lib.php
@@ -232,7 +232,7 @@ function fichinter_rec_prepare_head($object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("CardFichinter");
+	$head[$h][1] = $langs->trans("InterventionCard");
 	$head[$h][2] = 'card';
 	$h++;
 
diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang
index 1d7b2ada84f..2e3e1d1f510 100644
--- a/htdocs/langs/en_US/interventions.lang
+++ b/htdocs/langs/en_US/interventions.lang
@@ -86,3 +86,4 @@ TypeContact_fichinter_external_BILLING=Customer contact of intervention billing
 TypeContact_fichinter_external_CUSTOMER=Customer contact of intervention follow-up
 NotARecurringInterventionalTemplate=Not a recurring intervention template
 ShowInterventionModel=Show intervention model
+CreateRepeatableIntervention=Create recurring intervention

From e83e318fc92bef80fa98d919ed694ec627e850d7 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 30 Jan 2025 16:04:25 +0100
Subject: [PATCH 365/602] Enhance selectForForms

---
 htdocs/core/class/commonobject.class.php | 31 +++++++++++-------
 htdocs/core/class/html.form.class.php    | 41 +++++++++++++-----------
 htdocs/hrm/class/position.class.php      |  6 ++--
 htdocs/hrm/position_list.php             | 14 +++++---
 4 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 3aa18de36e9..6ba5e3e730f 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7450,16 +7450,15 @@ abstract class CommonObject
 	 * Return HTML string to put an input field into a page
 	 * Code very similar with showInputField of extra fields
 	 *
-	 * @param ?array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}	$val	Array of properties for field to show (used only if ->fields not defined)
-	 *                                                                                                                                                                                                                                                                                                                                          Array of properties of field to show
-	 * @param  string  		$key           Key of attribute
-	 * @param  string|string[]	$value         Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value, for array type must be array)
-	 * @param  string  		$moreparam     To add more parameters on html input tag
-	 * @param  string  		$keysuffix     Suffix string to add into name and id of field (can be used to avoid duplicate names)
-	 * @param  string  		$keyprefix     Prefix string to add into name and id of field (can be used to avoid duplicate names)
-	 * @param  string|int	$morecss       Value for css to define style/length of field. May also be a numeric.
-	 * @param  int<0,1>		$nonewbutton   Force to not show the new button on field that are links to object
-	 * @return string
+	 * @param 	?array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}	$val	Array of properties for field to show (used only if ->fields not defined, so try to keep this null)
+	 * @param  	string  		$key           Key of attribute
+	 * @param  	string|string[]	$value         Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value, for array type must be array)
+	 * @param  	string  		$moreparam     To add more parameters on html input tag
+	 * @param  	string  		$keysuffix     Suffix string to add into name and id of field (can be used to avoid duplicate names)
+	 * @param  	string  		$keyprefix     Prefix string to add into name and id of field (can be used to avoid duplicate names)
+	 * @param  	string|int	$morecss       Value for css to define style/length of field. May also be a numeric.
+	 * @param  	int<0,1>		$nonewbutton   Force to not show the new button on field that are links to object
+	 * @return 	string
 	 */
 	public function showInputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = 0, $nonewbutton = 0)
 	{
@@ -8269,7 +8268,17 @@ abstract class CommonObject
 					}
 				}
 			}
-			$objectfield = $this->element.($this->module ? '@'.$this->module : '').':'.$key.$keysuffix;
+
+			// $param_list_array[0] can be the name of object (Example 'User' the field is linked to). Not as taking the information from the record in ->fields found from $objectfield.
+
+			// $valparent is a string 'dataobject@module:keyoffieldinfieldsarray' to find the record field to link to.
+			// $valparent = $this->element.($this->module ? '@'.$this->module : '').':'.$key.$keysuffix;
+
+			// $val is already the record field found at same place than found by $valparent but already loaded and may have been modified by parent caller.
+
+			//$objectfield = $valparent;
+			$objectfield = $val;			// Is better than using old method $valparent
+
 			$out = $form->selectForForms($param_list_array[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, $moreparam, 0, (empty($val['disabled']) ? 0 : 1), '', $objectfield);
 
 			if (!empty($param_list_array[2])) {		// If the entry into $fields is set, we must add a create button
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e611d3ec66f..af533b9474b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8486,22 +8486,22 @@ class Form
 
 	/**
 	 * Generic method to select a component from a combo list.
-	 * Can use autocomplete with ajax after x key pressed or a full combo, depending on setup.
+	 * Can use autocomplete with ajax after x key pressed (if $objecttmp->element.'_USE_SEARCH_TO_SELECT' is set) or a full combo, depending on setup.
 	 * This is the generic method that will replace all specific existing methods.
 	 *
-	 * @param	string		$objectdesc           	'ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]'. For hard coded custom needs. Try to prefer method using $objectfield instead of $objectdesc.
-	 * @param	string		$htmlname             	Name of HTML select component
-	 * @param 	int			$preSelectedValue     	Preselected value (ID of element)
+	 * @param	string			$objectdesc           	'ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]'. For hard coded custom needs. Try to prefer method using $objectfield array instead of $objectdesc.
+	 * @param	string			$htmlname             	Name of HTML select component
+	 * @param 	int				$preSelectedValue     	Preselected value (ID of element)
 	 * @param 	string|int<0,1> $showempty			''=empty values not allowed, 'string'=value show if we allow empty values (for example 'All', ...)
-	 * @param 	string		$searchkey            	Search criteria
-	 * @param	string		$placeholder          	Place holder
-	 * @param	string		$morecss              	More CSS
-	 * @param	string		$moreparams           	More params provided to ajax call
-	 * @param 	int			$forcecombo           	Force to load all values and output a standard combobox (with no beautification)
-	 * @param 	int<0,1>	$disabled             	1=Html component is disabled
-	 * @param	string		$selected_input_value 	Value of preselected input text (for use with ajax)
-	 * @param	string		$objectfield          	Object:Field that contains the definition of parent (in table $fields or $extrafields). Example: 'Object:xxx' or 'Object@module:xxx' (old syntax 'Module_Object:xxx') or 'Object:options_xxx' or 'Object@module:options_xxx' (old syntax 'Module_Object:options_xxx')
-	 * @return  string	    						Return HTML string
+	 * @param 	string			$searchkey            	Search criteria
+	 * @param	string			$placeholder          	Place holder
+	 * @param	string			$morecss              	More CSS
+	 * @param	string			$moreparams           	More params provided to ajax call
+	 * @param 	int				$forcecombo           	Force to load all values and output a standard combobox (with no beautification)
+	 * @param 	int<0,1>		$disabled             	1=Html component is disabled
+	 * @param	string			$selected_input_value 	Value of preselected input text (for use with ajax)
+	 * @param	string|array	$objectfield          	'Object:Field' that contains the definition of parent (in table $fields or $extrafields). Example: 'Object:xxx' or 'Object@module:xxx' or 'Object:options_xxx' or 'Object@module:options_xxx' or,  better, the full entry array in ->fields
+	 * @return  string	    							Return HTML string
 	 * @see selectForFormsList(), select_thirdparty_list()
 	 */
 	public function selectForForms($objectdesc, $htmlname, $preSelectedValue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $disabled = 0, $selected_input_value = '', $objectfield = '')
@@ -8511,14 +8511,16 @@ class Form
 		// Example of common usage for a link to a thirdparty
 
 		// We got this in a modulebuilder form of "MyObject" of module "mymodule".
-		// ->fields is array( ... "fk_soc" => array("type"=>"integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))" ...)
+		// When ->fields is array( ... "fk_soc" => array("type"=>"integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))" ...), we have
 		// $objectdesc = 'Societe'
-		// $objectfield = 'myobject@mymodule:fk_soc'  ('fk_soc' is code to retrieve myobject->fields['fk_soc'])
+		// $objectfield = 'myobject@mymodule:fk_soc'  ('fk_soc' is code to retrieve myobject->fields['fk_soc'])   or it can be an array that is directly
+		//                 array("type"=>"integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))" ...)
 
 		// We got this when showing an extrafields on resource that is a link to societe
-		// extrafields 'link_to_societe' of Resource is 'link' to 'Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))" ...)'
+		// When extrafields 'link_to_societe' of Resource is 'link' to 'Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))" ...)', we have
 		// $objectdesc = 'Societe'
-		// $objectfield = 'resource:options_link_to_societe'
+		// $objectfield = 'resource:options_link_to_societe'  or it can be an array that is directly
+		//                array("type"=>'Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))" ...)
 
 		// With old usage:
 		// $objectdesc = 'Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))'
@@ -8534,7 +8536,10 @@ class Form
 		$filter = '';  // Ensure filter has value (for static analysis)
 		$sortfield = '';  // Ensure filter has value (for static analysis)
 
-		if ($objectfield) {	// We must retrieve the objectdesc from the field or extrafield
+		if (is_array($objectfield)) {
+			$objectdesc = $objectfield['type'];
+			$objectdesc = preg_replace('/^integer[^:]*:/', '', $objectdesc);
+		} elseif ($objectfield) {	// We must retrieve the objectdesc from the field or extrafield. Deprecated, it is better to provide the array record directly.
 			// Example: $objectfield = 'product:options_package' or 'myobject@mymodule:options_myfield'
 			$tmparray = explode(':', $objectfield);
 
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 50705c1ece5..2059a1d4ff5 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -207,7 +207,7 @@ class Position extends CommonObject
 	 */
 	public function __construct(DoliDB $db)
 	{
-		global $conf, $langs;
+		global $langs;
 
 		$this->db = $db;
 
@@ -873,7 +873,7 @@ class Position extends CommonObject
 	 * Return HTML string to put an input field into a page
 	 * Code very similar with showInputField of extra fields
 	 *
-	 * @param ?array{type:string,label:string,enabled:int|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}	$val	Array of properties for field to show
+	 * @param ?array{type:string,label:string,enabled:int|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}	$val	Array of properties for field to show. If ->fields is defined, keep this null.
 	 * @param  string  		$key           Key of attribute
 	 * @param  string  		$value         Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
 	 * @param  string  		$moreparam     To add more parameters on html input tag
@@ -890,7 +890,7 @@ class Position extends CommonObject
 		if ($key == 'fk_user') {
 			$vacantId = $keyprefix.$key.'vacant'.$keysuffix;
 
-			$out = parent::showInputField($val, $key, $value, $moreparam, $keysuffix, $keyprefix, $morecss);
+			$out = parent::showInputField(null, $key, $value, $moreparam, $keysuffix, $keyprefix, $morecss);
 			$out .= '<label class="nowrap position-fk-user classfortooltip" title="'.dol_escape_js($langs->trans('VacantCheckboxHelper')).'"><input type="checkbox" id="'.$vacantId.'" name="'.$vacantId.'">&nbsp;'.$langs->trans("Vacant").'</label>'; ?>
 			<script type="text/javascript">
 				$(document).ready(function () {
diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index fd562ed9858..3db770782cc 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
- * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
- * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
- * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2021 Gauthier VERDOL 			<gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 Greg Rastklan 			<greg.rastklan@atm-consulting.fr>
+ * Copyright (C) 2021 Jean-Pascal BOUDET		<jean-pascal.boudet@atm-consulting.fr>
+ * Copyright (C) 2021 Grégory BLEMAND 			<gregory.blemand@atm-consulting.fr>
+ * Copyright (C) 2024 Frédéric France			<frederic.france@free.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
@@ -159,6 +159,10 @@ if (!$permissiontoread) {
 	accessforbidden();
 }
 
+// Force the type of field fk_user to remove the filter on active user.
+// Note: Another fix would be to be able to filter on a freetet on firstname/lastname.
+//var_dump($object->fields['fk_user']);
+$object->fields['fk_user']['type'] = 'integer:User:user/class/user.class.php:0';
 
 
 /*

From ac8557e129365439d09592262bcd5f5ff18a0d75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9?= <noe@scopen.fr>
Date: Thu, 30 Jan 2025 17:07:31 +0100
Subject: [PATCH 366/602] NEW: Add options on intervention clone popup to clone
 or not contact and notes

---
 htdocs/fichinter/card.php                  | 39 ++++++++++++++++++----
 htdocs/fichinter/class/fichinter.class.php | 35 +++++++++++++++++--
 2 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 07311a5ca20..688aa11479c 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -170,8 +170,16 @@ if (empty($reshook)) {
 			if ($object->id > 0) {
 				// Because createFromClone modifies the object, we must clone it so that we can restore it later
 				$orig = clone $object;
+				$clone_notes = false;
+				if (GETPOSTISSET('clone_notes') && GETPOST('clone_notes') === 'on') {
+					$clone_notes = true;
+				}
+				$clone_contacts = false;
+				if (GETPOSTISSET('clone_contacts') && GETPOST('clone_contacts') === 'on') {
+					$clone_contacts = true;
+				}
 
-				$result = $object->createFromClone($user, $socid);
+				$result = $object->createFromClone($user, $socid, $clone_contacts, $clone_notes);
 				if ($result > 0) {
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
@@ -1273,12 +1281,29 @@ if ($action == 'create') {
 	if ($action == 'clone') {
 		// Create an array for form
 		$formquestion = array(
-							// 'text' => $langs->trans("ConfirmClone"),
-							// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' =>
-							// 1),
-							// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value'
-							// => 1),
-							array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOSTINT('socid'), 'socid', '', '', 0, 0, array(), 0, 'minwidth200')));
+			// 'text' => $langs->trans("ConfirmClone"),
+			// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value'
+			// => 1),
+			array(
+				'type' => 'other',
+				'name' => 'socid',
+				'label' => $langs->trans("SelectThirdParty"),
+				'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '', '', 0, 0, null, 0, 'minwidth200')
+			),
+			array(
+				'type' => 'checkbox',
+				'name' => 'clone_contacts',
+				'label' => $langs->trans("CloneContacts"),
+				'value' => 1
+			),
+			array(
+				'type' => 'checkbox',
+				'name' => 'clone_notes',
+				'label' => $langs->trans("CloneNotes"),
+				'value' => 1
+			)
+		);
+
 		// Paiement incomplet. On demande si motif = escompte ou autre
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneIntervention', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 	}
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index edb30a045ca..8c09fbed2e5 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1300,9 +1300,10 @@ class Fichinter extends CommonObject
 	 *	@param		int		$socid			Id of thirdparty
 	 *	@return		int						New id of clone
 	 */
-	public function createFromClone(User $user, $socid = 0)
+	public function createFromClone(User $user, $socid = 0, $clone_contacts = false, $clone_notes = false)
 	{
-		global $hookmanager;
+		global $hookmanager, $langs;
+		$langs->load("errors");
 
 		$error = 0;
 
@@ -1344,6 +1345,11 @@ class Fichinter extends CommonObject
 
 		$this->ref_client         = '';
 
+		if (!$clone_notes) {
+			$this->note_private = '';
+			$this->note_public = '';
+		}
+
 		// Create clone
 		$this->context['createfromclone'] = 'createfromclone';
 		$result = $this->create($user);
@@ -1369,6 +1375,31 @@ class Fichinter extends CommonObject
 			}
 		}
 
+		//Duplicate contact
+		if ($clone_contacts) {
+			foreach (array('internal', 'external') as $source) {
+				$tab = $objFrom->liste_contact(-1, $source);
+				if (is_array($tab) && count($tab) > 0) {
+					foreach ($tab as $contacttoadd) {
+						$retAddContact = $this->add_contact(
+							$contacttoadd['id'],
+							$contacttoadd['code'],
+							$contacttoadd['source']
+						);
+						if ($this->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+							$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
+							$error++;
+						} elseif ($retAddContact < 0) {
+							$error++;
+						}
+					}
+				} elseif ($tab < 0) {
+					$this->error .= $objFrom->error;
+					$error++;
+				}
+			}
+		}
+
 		unset($this->context['createfromclone']);
 
 		// End

From 1d1eafb19fabbeab0074b8fa1f410dfa8fb0f1ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9?= <noe@scopen.fr>
Date: Thu, 30 Jan 2025 17:33:12 +0100
Subject: [PATCH 367/602] FIX: Add documentation for hte new two params

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

diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 8c09fbed2e5..d9e3631a46c 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1298,6 +1298,8 @@ class Fichinter extends CommonObject
 	 *
 	 *  @param	    User	$user		    User making the clone
 	 *	@param		int		$socid			Id of thirdparty
+	 *	@param		bool	$clone_contacts	Clone contacts from origin
+	 *	@param		bool	$clone_notes	Clone notes from origin
 	 *	@return		int						New id of clone
 	 */
 	public function createFromClone(User $user, $socid = 0, $clone_contacts = false, $clone_notes = false)

From 70f9dde739ac3a5aebeb55b7c3e331ed3ea88f03 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 30 Jan 2025 17:53:56 +0100
Subject: [PATCH 368/602] Qual: Improve lang test + message in case of test
 exception

# Qual: Improve lang test + message in case of test exception

This fixes the language test enabling the error message itself.
I also improved the Exception handling so that a backtrace is shown to help
find where it happened (here the error message was empty which was strange
and made it harder to find - the (empty(val)?a:b) was lacking parentheses
for proper concatenation
---
 test/phpunit/CommonClassTest.class.php | 12 +++++++++++-
 test/phpunit/LangTest.php              | 12 ++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
index d083e842758..4f75b562dcd 100644
--- a/test/phpunit/CommonClassTest.class.php
+++ b/test/phpunit/CommonClassTest.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2018 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2023 Alexandre Janniaux   <alexandre.janniaux@gmail.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -168,6 +168,16 @@ abstract class CommonClassTest extends TestCase
 		print "##[group]$className::$failedTestMethod failed - $argsText.".PHP_EOL;
 		print "## ".get_class($t).": {$t->getMessage()}".PHP_EOL;
 
+		// Show some information about where it happened
+		foreach ($t->getTrace() as $idx => $trace) {
+			if (isset($trace['file'], $trace['line'])  // Only if we have a file name
+				&& !preg_match('/(?:\bphar\b|Framework)/', $trace['file']) // Only if it's not in phpunit
+			) {
+				print "## backtrace($idx): From {$trace['file']}:{$trace['line']}.".PHP_EOL;
+			}
+		}
+
+
 		if ($nbLinesToShow) {
 			$newLines = count($last_lines);
 			if ($newLines > 0) {
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index 1cb8c53c532..2442b165848 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2023 Alexandre Janniaux   <alexandre.janniaux@gmail.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -194,14 +194,14 @@ class LangTest extends CommonClassTest
 
 		include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 
-
 		$prefix = __METHOD__."($code) ";
 		$tmplangs = new Translate('', $conf);
 		$langcode = $code;
 		$tmplangs->setDefaultLang($langcode);
 		$tmplangs->load("main");
 
-		print PHP_EOL.$prefix."Check language file".PHP_EOL;
+		print PHP_EOL.$prefix."Check language files".PHP_EOL;
+
 		$result = $tmplangs->transnoentitiesnoconv("FONTFORPDF");
 		print $prefix."FONTFORPDF=".$result.PHP_EOL;
 		$this->assertTrue(in_array($result, array('msungstdlight', 'stsongstdlight', 'helvetica', 'DejaVuSans', 'cid0jp', 'cid0kr', 'freemono', 'freeserif')), 'Error bad value '.$result.' for FONTFORPDF in main.lang file '.$code);
@@ -231,14 +231,14 @@ class LangTest extends CommonClassTest
 
 		unset($tmplangs);
 
-		print $prefix."Check some syntax rules in the language file".PHP_EOL;
+		print $prefix."Check syntax rules in the language files".PHP_EOL;
 		$filesarray2 = scandir(DOL_DOCUMENT_ROOT.'/langs/'.$code);
 		foreach ($filesarray2 as $key => $file) {
 			if (! preg_match('/\.lang$/', $file)) {
 				continue;
 			}
 
-			//print 'Check lang file '.$file.PHP_EOL;
+			//print $prefix.'Check lang file '.$file.PHP_EOL;
 			$filecontent = file_get_contents(DOL_DOCUMENT_ROOT.'/langs/'.$code.'/'.$file);
 
 			$result = preg_match('/=--$/m', $filecontent);	// A special % char we don't want. We want the common one.
@@ -260,7 +260,7 @@ class LangTest extends CommonClassTest
 			$reg = array();
 			$result = preg_match('/(.*)\'notranslate\'/im', $filecontent, $reg);	// A sequence of char we don't want
 			//print $prefix."Result for checking we don't have bad percent char = ".$result.PHP_EOL;
-			$this->assertTrue($result == 0, 'Found a sequence tag \'notranslate\' in the translation file '.$code.'/'.$file.' in line '.empty($reg[1]) ? '' : $reg[1]);
+			$this->assertTrue($result == 0, 'Found a sequence tag \'notranslate\' in the translation file '.$code.'/'.$file.' in line '.(empty($reg[1]) ? '' : $reg[1]));
 
 			if (!in_array($code, array('ar_SA'))) {
 				$reg = array();

From 9530afc85e6bdef79ba1fca10c22a378b82ab758 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 30 Jan 2025 22:51:43 +0100
Subject: [PATCH 369/602] Fix trans

---
 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 7ec8770b234..2c5ce861d47 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -333,7 +333,7 @@ class Form
 					$ret .= '<td>';
 				}
 				//else $ret.='<div class="clearboth"></div>';
-				$ret .= '<input type="submit" class="smallpaddingimp nomargingtop nomarginbottom button' . (empty($notabletag) ? '' : ' ') . '" name="modify" value="' . $langs->trans("Modify") . '">';
+				$ret .= '<input type="submit" class="smallpaddingimp nomargingtop nomarginbottom button' . (empty($notabletag) ? '' : ' ') . '" name="modify" value="' . $langs->trans("Save") . '">';
 				if (preg_match('/ckeditor|textarea/', $typeofdata) && empty($notabletag)) {
 					$ret .= '<br>' . "\n";
 				}

From 301c189c498c09272bcffe21d7bd1795fd76798c Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 30 Jan 2025 23:06:03 +0100
Subject: [PATCH 370/602] Restore full list. Close #32092

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

diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 7d257e5d41c..2002f565869 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -97,7 +97,7 @@ class Position extends CommonObject
 		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -2,),
 		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2,),
 		'fk_contrat' => array('type' => 'integer:Contrat:contrat/class/contrat.class.php', 'label' => 'fk_contrat', 'enabled' => 'isModEnabled("contract")', 'position' => 50, 'notnull' => 0, 'visible' => 0,),
-		'fk_user' => array('type' => 'integer:User:user/class/user.class.php:0:(t.statut:=:1)', 'label' => 'Employee', 'enabled' => 1, 'position' => 55, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'picto' => 'user', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'fk_user' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'Employee', 'enabled' => 1, 'position' => 55, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'picto' => 'user', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
 		'fk_job' => array('type' => 'integer:Job:/hrm/class/job.class.php', 'label' => 'JobProfile', 'enabled' => 1, 'position' => 56, 'notnull' => 1, 'visible' => 1, 'picto' => 'jobprofile', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
 		'date_start' => array('type' => 'date', 'label' => 'DateStart', 'enabled' => 1, 'position' => 101, 'notnull' => 1, 'visible' => 1,),
 		'date_end' => array('type' => 'date', 'label' => 'DateEnd', 'enabled' => 1, 'position' => 102, 'notnull' => 0, 'visible' => 1,),

From 81dda600fc3eed82324a15dd8650cc32d27182a6 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 30 Jan 2025 23:11:33 +0100
Subject: [PATCH 371/602] Merge

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

diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index ffa347e9d60..2059a1d4ff5 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -97,7 +97,7 @@ class Position extends CommonObject
 		'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'position' => 500, 'notnull' => 1, 'visible' => -2,),
 		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'position' => 501, 'notnull' => 0, 'visible' => -2,),
 		'fk_contrat' => array('type' => 'integer:Contrat:contrat/class/contrat.class.php', 'label' => 'fk_contrat', 'enabled' => 'isModEnabled("contract")', 'position' => 50, 'notnull' => 0, 'visible' => 0,),
-		'fk_user' => array('type' => 'integer:User:user/class/user.class.php:0', 'label' => 'Employee', 'enabled' => 1, 'position' => 55, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'picto' => 'user', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+		'fk_user' => array('type' => 'integer:User:user/class/user.class.php:0:(t.statut:=:1)', 'label' => 'Employee', 'enabled' => 1, 'position' => 55, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'picto' => 'user', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
 		'fk_job' => array('type' => 'integer:Job:/hrm/class/job.class.php', 'label' => 'JobProfile', 'enabled' => 1, 'position' => 56, 'notnull' => 1, 'visible' => 1, 'picto' => 'jobprofile', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
 		'date_start' => array('type' => 'date', 'label' => 'DateStart', 'enabled' => 1, 'position' => 101, 'notnull' => 1, 'visible' => 1,),
 		'date_end' => array('type' => 'date', 'label' => 'DateEnd', 'enabled' => 1, 'position' => 102, 'notnull' => 0, 'visible' => 1,),

From effe49ef26de2d33a991e972c5a3446bfc77dba8 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 31 Jan 2025 00:01:17 +0100
Subject: [PATCH 372/602] Debug v21

---
 htdocs/core/class/html.form.class.php |   2 +-
 htdocs/hrm/class/position.class.php   |   2 +-
 htdocs/hrm/position_list.php          | 178 ++++++++++++++++----------
 htdocs/user/group/list.php            |  58 +++++----
 4 files changed, 148 insertions(+), 92 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1eda2d0ec4f..a450aaa7d6c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -873,7 +873,7 @@ class Form
 
 					console.log("initCheckForSelect mode="+mode+" name="+name+" cssclass="+cssclass+" atleastoneselected="+atleastoneselected);
 
-    	  			if (atleastoneselected || ' . $alwaysvisible . ')
+    	  			if (atleastoneselected || ' . ((int) $alwaysvisible) . ')
     	  			{
                                     jQuery("."+name).show();
         			    ' . ($selected ? 'if (atleastoneselected) { jQuery("."+name+"select").val("' . $selected . '").trigger(\'change\'); jQuery("."+name+"confirmed").prop(\'disabled\', false); }' : '') . '
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 1e4b1407046..10d04ebf202 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -1135,7 +1135,7 @@ class Position extends CommonObject
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
 		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
-		$return .= '<input class="fright" id="cb'.$this->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		if (!empty($arraydata['user'])) {
 			$return .= '<br><span class="info-box-label ">'.$arraydata['user'].'</span>';
 		}
diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index fd562ed9858..aa2dce54f9b 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -47,7 +47,7 @@ require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('hrm', 'other'));
 
-// Get Parameters
+// Get parameters
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 $show_files = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
@@ -66,7 +66,7 @@ $ref = GETPOST('ref', 'alpha');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT('page');
 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;
@@ -80,7 +80,7 @@ $object = new Position($db);
 $extrafields = new ExtraFields($db);
 $userstatic = new User($db);
 $diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('positionlist')); // Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array($contextpage));	// Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -98,7 +98,7 @@ if (!$sortorder) {
 }
 
 // Initialize array of search criteria
-$search_all = GETPOST('search_all', 'alphanohtml');
+$search_all = trim(GETPOST('search_all', 'alphanohtml'));
 $search = array();
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
@@ -119,12 +119,13 @@ foreach ($object->fields as $key => $val) {
 }
 
 // Definition of array of fields for columns
+$tableprefix = 't';
 $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((string) $val['visible'], 1);
-		$arrayfields['t.'.$key] = array(
+		$arrayfields[$tableprefix.'.'.$key] = array(
 			'label' => $val['label'],
 			'checked' => (($visible < 0) ? 0 : 1),
 			'enabled' => (abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
@@ -173,7 +174,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array();
+$parameters = array('arrayfields' => &$arrayfields);
 $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');
@@ -192,6 +193,7 @@ if (empty($reshook)) {
 				$search[$key.'_dtend'] = '';
 			}
 		}
+		$search_all = '';
 		$toselect = array();
 		$search_array_options = array();
 	}
@@ -218,9 +220,9 @@ $jobstatic = new Job($db);
 
 $now = dol_now();
 
+$title = $langs->trans('EmployeePositions');
 //$help_url="EN:Module_Position|FR:Module_Position_FR|ES:Módulo_Position";
 $help_url = '';
-$title = $langs->trans('EmployeePositions');
 $morejs = array();
 $morecss = array();
 
@@ -236,24 +238,29 @@ $sql .= ', j.rowid as job_id, j.label as job_label';
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : "");
 	}
 }
 // 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 .= $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 LEFT JOIN ".MAIN_DB_PREFIX.$userstatic->table_element." as u on t.fk_user = u.rowid, ".MAIN_DB_PREFIX."hrm_job as j";
+
+//$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."anothertable as rc ON rc.parent = t.rowid";
 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)";
 }
 // 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).")";
+	$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOSTINT('search_current_entity') ? 0 : 1)).")";
 } else {
 	$sql .= " WHERE 1 = 1";
 }
@@ -270,18 +277,24 @@ foreach ($search as $key => $val) {
 			}
 			$mode_search = 2;
 		}
-		if ($search[$key] != '') {
-			$sql .= natural_search("t.".$db->escape($key), $search[$key], (($key == 'status') ? 2 : $mode_search));
+		if (empty($object->fields[$key]['searchmulti'])) {
+			if (!is_array($search[$key]) && $search[$key] != '') {
+				$sql .= natural_search("t.".$db->escape($key), $search[$key], (($key == 'status') ? 2 : $mode_search));
+			}
+		} else {
+			if (is_array($search[$key]) && !empty($search[$key])) {
+				$sql .= natural_search("t.".$db->escape($key), implode(',', $search[$key]), (($key == 'status') ? 2 : $mode_search));
+			}
 		}
 	} else {
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
-			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $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.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
+					$sql .= " AND t.".$db->sanitize($columnName)." >= '".$db->idate($search[$key])."'";
 				}
 				if (preg_match('/_dtend$/', $key)) {
-					$sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
+					$sql .= " AND t.".$db->sanitize($columnName)." <= '".$db->idate($search[$key])."'";
 				}
 			}
 		}
@@ -299,13 +312,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.".$db->escape($key).", ";
+	$sql .= "t.".$db->sanitize($key).", ";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -313,9 +326,9 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 	}
 }
-// Add where from hooks
+// Add groupby from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/,\s*$/', '', $sql);
 */
@@ -323,9 +336,19 @@ $sql = preg_replace('/,\s*$/', '', $sql);
 // Count total nb of records
 $nbtotalofrecords = '';
 if (!getDolGlobalInt('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;
 	}
@@ -348,7 +371,7 @@ $num = $db->num_rows($resql);
 
 
 // Direct jump if only one record found
-if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
+if ($num == 1 && getDolGlobalInt('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".dol_buildpath('/hrm/position.php', 1).'?id='.$id);
@@ -362,7 +385,7 @@ if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $s
 llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');
 
 // Example : Adding jquery code
-// print '<script type="text/javascript" language="javascript">
+// print '<script type="text/javascript">
 // jQuery(document).ready(function() {
 // 	function init_myfunc()
 // 	{
@@ -388,6 +411,12 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
+if ($groupby != '') {
+	$param .= '&groupby='.urlencode($groupby);
+}
 
 foreach ($search as $key => $val) {
 	if (is_array($search[$key])) {
@@ -397,21 +426,18 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
-		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
-		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
+		$param .= '&search_'.$key.'month='.GETPOSTINT('search_'.$key.'month');
+		$param .= '&search_'.$key.'day='.GETPOSTINT('search_'.$key.'day');
+		$param .= '&search_'.$key.'year='.GETPOSTINT('search_'.$key.'year');
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
 }
-if ($optioncss != '') {
-	$param .= '&optioncss='.urlencode($optioncss);
-}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 // Add $param from hooks
 $parameters = array('param' => &$param);
-$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
@@ -440,6 +466,7 @@ 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 = '';
@@ -459,6 +486,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all) {
 	$setupstring = '';
+	// @phan-suppress-next-line PhanEmptyForeach
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
@@ -473,7 +501,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 {
@@ -487,25 +515,29 @@ if (!empty($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
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column);  // This also change content of $arrayfields with user setup
+$selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
-print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+print '<table class="tagtable nobottomiftotal noborder liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+
 // 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">';
+if ($conf->main_checkbox_left_column) {
+	print '<td class="liste_titre center maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
 	print '</td>';
 }
 foreach ($object->fields as $key => $val) {
-	$searchkey = empty($search[$key]) ? '' : $search[$key];
+	//$searchkey = empty($search[$key]) ? '' : $search[$key];
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
@@ -517,9 +549,13 @@ foreach ($object->fields as $key => $val) {
 		$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);
+			if (empty($val['searchmulti'])) {
+				print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), 1, 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status width100 onrightofpage' : ''), 1);
+			} else {
+				print $form->multiselectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), 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'])) {
@@ -532,9 +568,9 @@ foreach ($object->fields as $key => $val) {
 		} 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, 'minwidth100imp maxwidth125', 2);
+			print $formadmin->select_language((isset($search[$key]) ? $search[$key] : ''), 'search_lang', 0, array(), 1, 0, 0, 'minwidth100imp maxwidth125', 2);
 		} else {
-			print '<input type="text" class="flat maxwidth'.($val['type'] == 'integer' ? '50' : '75').'" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
+			print '<input type="text" class="flat maxwidth'.(in_array($val['type'], array('integer', 'price')) ? '50' : '75').'" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
 		print '</td>';
 	}
@@ -544,11 +580,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 (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print '<td class="liste_titre maxwidthsearch">';
+if (!$conf->main_checkbox_left_column) {
+	print '<td class="liste_titre center maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
@@ -561,8 +597,10 @@ $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";
+// Action column
+if ($conf->main_checkbox_left_column) {
+	print getTitleFieldOfList($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']);
@@ -577,7 +615,7 @@ foreach ($object->fields as $key => $val) {
 	}
 	$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']++;
 	}
 }
@@ -585,13 +623,17 @@ 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;
+/*if (!empty($arrayfields['anotherfield']['checked'])) {
+ print '<th class="liste_titre right">'.$langs->trans("AnotherField").'</th>';
+ $totalarray['nbfield']++;
+ }*/
 // Action column
-if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (!$conf->main_checkbox_left_column) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	$totalarray['nbfield']++;
 }
-$totalarray['nbfield']++;
 print '</tr>'."\n";
 
 
@@ -622,7 +664,6 @@ while ($i < $imaxinloop) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-
 	if ($mode == 'kanban') {
 		if ($i == 0) {
 			print '<tr class="trkanban"><td colspan="'.$savnbfield.'">';
@@ -647,7 +688,7 @@ while ($i < $imaxinloop) {
 		$userstatic->login = $obj->login;
 		$userstatic->photo = $obj->photo;
 
-		// Output kanban
+		// Output Kanban
 		$selected = -1;
 		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;
@@ -661,11 +702,11 @@ while ($i < $imaxinloop) {
 			print '</td></tr>';
 		}
 	} else {
-		// Show here line of result
+		// Show line of result
 		$j = 0;
 		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
 		// Action column
-		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		if ($conf->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;
@@ -675,6 +716,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']);
@@ -685,19 +729,19 @@ while ($i < $imaxinloop) {
 			}
 
 			if (in_array($val['type'], array('timestamp'))) {
-				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowraponall';
 			} elseif ($key == 'ref') {
-				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowraponall';
 			}
 
-			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && empty($val['arrayofkeyval'])) {
 				$cssforfield .= ($cssforfield ? ' ' : '').'right';
 			}
 			//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
-				print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
-				if (preg_match('/tdoverflow/', $cssforfield) && !is_numeric($object->$key)) {
+				print '<td'.($cssforfield ? ' class="'.$cssforfield.((preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) ? ' classfortooltip' : '').'"' : '');
+				if (preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key) && !in_array($key, array('ref'))) {
 					print ' title="'.dol_escape_htmltag($object->$key).'"';
 				}
 				print '>';
@@ -730,10 +774,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 (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		if (empty($conf->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;
@@ -743,9 +787,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/user/group/list.php b/htdocs/user/group/list.php
index 568d7b6d5d7..fd9bb37bfef 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -59,7 +59,7 @@ $search = array();
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT('page');
 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;
@@ -126,7 +126,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array();
+$parameters = array('arrayfields' => &$arrayfields);
 $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');
@@ -145,6 +145,7 @@ if (empty($reshook)) {
 				$search[$key.'_dtend'] = '';
 			}
 		}
+		$search_all = '';
 		$toselect = array();
 		$search_array_options = array();
 	}
@@ -219,7 +220,9 @@ if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 
 // 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);
@@ -248,6 +251,13 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
+if ($groupby != '') {
+	$param .= '&groupby='.urlencode($groupby);
+}
+
 foreach ($search as $key => $val) {
 	if (is_array($search[$key])) {
 		foreach ($search[$key] as $skey) {
@@ -256,16 +266,13 @@ foreach ($search as $key => $val) {
 			}
 		}
 	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-		$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
-		$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
-		$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
+		$param .= '&search_'.$key.'month='.GETPOSTINT('search_'.$key.'month');
+		$param .= '&search_'.$key.'day='.GETPOSTINT('search_'.$key.'day');
+		$param .= '&search_'.$key.'year='.GETPOSTINT('search_'.$key.'year');
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
 }
-if ($optioncss != '') {
-	$param .= '&optioncss='.urlencode($optioncss);
-}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 // Add $param from hooks
@@ -322,6 +329,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all) {
 	$setupstring = '';
+	// @phan-suppress-next-line PhanEmptyForeach
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
@@ -347,26 +355,26 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage=empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column);  // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">';
-print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
+print '<table class="tagtable nobottomiftotal noborder liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-// Fields title search
-// --------------------------------------------------------------------
-// ...
 
 $totalarray = array();
 $totalarray['nbfield'] = 0;
 
 // Fields title label
 // --------------------------------------------------------------------
-print '<tr class="liste_titre">';
-if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
-	$totalarray['nbfield']++;
+print '<tr class="liste_titre_filter">';
+// Action column
+if ($conf->main_checkbox_left_column) {
+	print '<td class="liste_titre center maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
 }
 print_liste_field_titre("Group", $_SERVER["PHP_SELF"], "g.nom", $param, "", "", $sortfield, $sortorder);
 $totalarray['nbfield']++;
@@ -394,7 +402,7 @@ print $hookmanager->resPrint;
  $totalarray['nbfield']++;
  }*/
 // Action column
-if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+if (!$conf->main_checkbox_left_column) {
 	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 	$totalarray['nbfield']++;
 }
@@ -441,11 +449,11 @@ while ($i < $imaxinloop) {
 			print '</td></tr>';
 		}
 	} else {
-		// Show here line of result
+		// Show line of result
 		$j = 0;
 		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
 		// Action column
-		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		if ($conf->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;
@@ -502,7 +510,7 @@ while ($i < $imaxinloop) {
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Action column
-		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		if (empty($conf->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;
@@ -539,6 +547,10 @@ if ($num == 0) {
 
 $db->free($resql);
 
+$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
 print '</table>'."\n";
 print '</div>'."\n";
 

From 0177b4cc94a07ef04d4e8a9ad20c411ee00f7831 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 31 Jan 2025 00:32:30 +0100
Subject: [PATCH 373/602] Doc

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

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index ec038b7a129..eeeba5b20c3 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1833,7 +1833,7 @@ class Categorie extends CommonObject
 		}
 
 		// Check contrast with background and correct text color
-		$forced_color = 'categtextwhite'; // We want color white because the background is dark (grey or other)
+		$forced_color = 'categtextwhite'; // We want color white because the getNomUrl of a tag is always called inside a dark background like '<span color="bbb"></span>' to show it as a tag. TODO Add this in param to force when called outside of span.
 		if ($this->color) {
 			if (colorIsLight($this->color)) {	// If color is light, we force color to dark
 				$forced_color = 'categtextblack';

From f8e27e3c9d2167c0cb43f774f98ebdcd0ca842c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Champlon?= <r.champlon@vold.lu>
Date: Fri, 31 Jan 2025 08:28:44 +0100
Subject: [PATCH 374/602] remove "lire" test

---
 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 030d29cd9e7..b97ec93499f 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -3569,11 +3569,11 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$partsofdirinoriginalfile = explode('/', $original_file);
 			if (!empty($partsofdirinoriginalfile[1])) {    // If original_file is xxx/filename (xxx is a part we will use)
 				$partofdirinoriginalfile = $partsofdirinoriginalfile[0];
-				if (($partofdirinoriginalfile && ($fuser->hasRight($tmpmodule, $partofdirinoriginalfile, 'lire') || $fuser->hasRight($tmpmodule, $partofdirinoriginalfile, 'read'))) || preg_match('/^specimen/i', $original_file)) {
+				if (($partofdirinoriginalfile &&  $fuser->hasRight($tmpmodule, $partofdirinoriginalfile, 'read')) || preg_match('/^specimen/i', $original_file)) {
 					$accessallowed = 1;
 				}
 			}
-			if (($fuser->hasRight($tmpmodule, $lire) || $fuser->hasRight($tmpmodule, $read)) || preg_match('/^specimen/i', $original_file)) {
+			if ($fuser->hasRight($tmpmodule, $read) || preg_match('/^specimen/i', $original_file)) {
 				$accessallowed = 1;
 			}
 

From e34d4a7a0b69a77ea49a6aa35ef1b763f98737e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Champlon?= <r.champlon@vold.lu>
Date: Fri, 31 Jan 2025 08:29:38 +0100
Subject: [PATCH 375/602] fix space

---
 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 b97ec93499f..8f739574230 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -3569,7 +3569,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$partsofdirinoriginalfile = explode('/', $original_file);
 			if (!empty($partsofdirinoriginalfile[1])) {    // If original_file is xxx/filename (xxx is a part we will use)
 				$partofdirinoriginalfile = $partsofdirinoriginalfile[0];
-				if (($partofdirinoriginalfile &&  $fuser->hasRight($tmpmodule, $partofdirinoriginalfile, 'read')) || preg_match('/^specimen/i', $original_file)) {
+				if (($partofdirinoriginalfile && $fuser->hasRight($tmpmodule, $partofdirinoriginalfile, 'read')) || preg_match('/^specimen/i', $original_file)) {
 					$accessallowed = 1;
 				}
 			}

From 285a07aa3225212923adb04c2396d31a496ddc64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Cendrier?= <noe.cendrier@altairis.fr>
Date: Fri, 31 Jan 2025 10:52:43 +0100
Subject: [PATCH 376/602] FIX: searched element value should be the same as the
 one used in add_object_linked()

---
 htdocs/core/class/commonobject.class.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 66ea879552f..4ce2ce3bd9c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4469,10 +4469,11 @@ abstract class CommonObject
 			$deletetarget = true;
 		}
 
+		$element = $this->getElementType();
 		$sourceid = (!empty($sourceid) ? $sourceid : $this->id);
-		$sourcetype = (!empty($sourcetype) ? $sourcetype : $this->element);
+		$sourcetype = (!empty($sourcetype) ? $sourcetype : $element);
 		$targetid = (!empty($targetid) ? $targetid : $this->id);
-		$targettype = (!empty($targettype) ? $targettype : $this->element);
+		$targettype = (!empty($targettype) ? $targettype : $element);
 		$this->db->begin();
 		$error = 0;
 
@@ -4498,14 +4499,14 @@ abstract class CommonObject
 			} else {
 				if ($deletesource) {
 					$sql .= " fk_source = " . ((int) $sourceid) . " AND sourcetype = '" . $this->db->escape($sourcetype) . "'";
-					$sql .= " AND fk_target = " . ((int) $this->id) . " AND targettype = '" . $this->db->escape($this->element) . "'";
+					$sql .= " AND fk_target = " . ((int) $this->id) . " AND targettype = '" . $this->db->escape($element) . "'";
 				} elseif ($deletetarget) {
 					$sql .= " fk_target = " . ((int) $targetid) . " AND targettype = '" . $this->db->escape($targettype) . "'";
-					$sql .= " AND fk_source = " . ((int) $this->id) . " AND sourcetype = '" . $this->db->escape($this->element) . "'";
+					$sql .= " AND fk_source = " . ((int) $this->id) . " AND sourcetype = '" . $this->db->escape($element) . "'";
 				} else {
-					$sql .= " (fk_source = " . ((int) $this->id) . " AND sourcetype = '" . $this->db->escape($this->element) . "')";
+					$sql .= " (fk_source = " . ((int) $this->id) . " AND sourcetype = '" . $this->db->escape($element) . "')";
 					$sql .= " OR";
-					$sql .= " (fk_target = " . ((int) $this->id) . " AND targettype = '" . $this->db->escape($this->element) . "')";
+					$sql .= " (fk_target = " . ((int) $this->id) . " AND targettype = '" . $this->db->escape($element) . "')";
 				}
 			}
 

From b4e9367e3d1e73472751556d3dc9ac482b9d4a61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Lukas?= <gl@gl.co.at>
Date: Fri, 31 Jan 2025 14:28:34 +0100
Subject: [PATCH 377/602] Fix #32890

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

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index c6e97db9d6b..4d9b5a5574d 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -3360,7 +3360,7 @@ class EmailCollector extends CommonObject
 													foreach ($attachments as $attachment) {
 														// $attachment->save($destdir.'/');
 														$typeattachment = (string) $attachment->getDisposition();
-														$filename = $attachment->getFilename();
+														$filename = $attachment->getName();
 														$content = $attachment->getContent();
 														$this->saveAttachment($destdir, $filename, $content);
 													}

From 46125921b1efe625686002d386f8a2767e359c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Lukas?= <gl@gl.co.at>
Date: Fri, 31 Jan 2025 14:41:19 +0100
Subject: [PATCH 378/602] Fix #32892

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

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index c6e97db9d6b..755222224ac 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -2872,7 +2872,7 @@ class EmailCollector extends CommonObject
 										$this->errors = $actioncomm->errors;
 									} else {
 										if ($fk_element_type == "ticket" && is_object($objectemail)) {
-											if ($objectemail->status == Ticket::STATUS_CLOSED || $objectemail->status == Ticket::STATUS_CANCELED) {
+											if ($objectemail->status == Ticket::STATUS_CLOSED || $objectemail->status == Ticket::STATUS_CANCELED || $objectemail->status == Ticket::STATUS_NEED_MORE_INFO || $objectemail->status == Ticket::STATUS_WAITING) {
 												if ($objectemail->fk_user_assign != null) {
 													$res = $objectemail->setStatut(Ticket::STATUS_ASSIGNED);
 												} else {

From ae81f8bf5009ecc81d1be7e666061b5facc64ec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Lukas?= <gl@gl.co.at>
Date: Fri, 31 Jan 2025 14:55:04 +0100
Subject: [PATCH 379/602] Fix #32894

---
 htdocs/emailcollector/class/emailcollector.class.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index c6e97db9d6b..95aea5f8e36 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -3345,6 +3345,13 @@ class EmailCollector extends CommonObject
 										$tickettocreate->context['actionmsg'] = $langs->trans("ActionAC_EMAIL_IN").' - '.$langs->trans("TICKET_CREATEInDolibarr");
 										//$tickettocreate->email_fields_no_propagate_in_actioncomm = 0;
 
+										// Add sender to context array to make sure that confirmation e-mail can be sent by trigger script
+										$sender_contact = New Contact($this->db);
+										$sender_contact->fetch(0, null, '', $from);
+										if (!empty($sender_contact->id)) {
+											$tickettocreate->context['contactid'] = $sender_contact->id;
+										}
+
 										$result = $tickettocreate->create($user);
 										if ($result <= 0) {
 											$errorforactions++;

From adbaaac256ef225472b05250466731d2d54eb27a Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Fri, 31 Jan 2025 17:19:20 +0100
Subject: [PATCH 380/602] add test on null for situation_percent

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

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 67926aa4bdb..d10bf9fd0b3 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3870,7 +3870,7 @@ class Facture extends CommonInvoice
 			if (empty($fk_prev_id)) {
 				$fk_prev_id = 'null';
 			}
-			if (!isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') {
+			if (!isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '' || $situation_percent == null) {
 				$situation_percent = 100;
 			}
 			if (empty($ref_ext)) {
@@ -4131,7 +4131,7 @@ class Facture extends CommonInvoice
 			if (empty($special_code) || $special_code == 3) {
 				$special_code = 0;
 			}
-			if (!isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') {
+			if (!isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '' || $situation_percent == null) {
 				$situation_percent = 100;
 			}
 			if (empty($ref_ext)) {

From c39f295d76c5d1735f3b497ae95a4ac3c9092485 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 1 Feb 2025 06:07:12 +0100
Subject: [PATCH 381/602] FIX #32801 VAT type is inverted in form VAT selector

---
 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 ad27dc50266..a72d7dbd176 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6774,7 +6774,7 @@ class Form
 		// Keep only the VAT qualified for $type_vat
 		$arrayofvatrates = array();
 		foreach ($this->cache_vatrates as $cachevalue) {
-			if (empty($cachevalue['type_vat']) || $cachevalue['type_vat'] != $type_vat) {
+			if (empty($cachevalue['type_vat']) || $cachevalue['type_vat'] == $type_vat) {
 				$arrayofvatrates[] = $cachevalue;
 			}
 		}

From d32f1e716a1bad67ec05e31e3f4fc173d8834e85 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Sat, 1 Feb 2025 14:48:39 +0100
Subject: [PATCH 382/602] FIX missing entity filter

---
 .../class/api_multicurrencies.class.php       | 12 ++++++----
 .../class/multicurrency.class.php             | 23 ++++++++++---------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/htdocs/multicurrency/class/api_multicurrencies.class.php b/htdocs/multicurrency/class/api_multicurrencies.class.php
index 09ad43b6dbe..6df6c15347c 100644
--- a/htdocs/multicurrency/class/api_multicurrencies.class.php
+++ b/htdocs/multicurrency/class/api_multicurrencies.class.php
@@ -65,7 +65,7 @@ class MultiCurrencies extends DolibarrApi
 
 		$sql = "SELECT t.rowid";
 		$sql .= " FROM ".$this->db->prefix()."multicurrency as t";
-		$sql .= ' WHERE 1 = 1';
+		$sql .= " WHERE t.entity IN (".getEntity('multicurrency').")";
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
@@ -386,11 +386,13 @@ class MultiCurrencies extends DolibarrApi
 		$object = parent::_cleanObjectDatas($object);
 
 		// Clear all fields out of interest
-		foreach ($object as $key => $value) {
-			if ($key == "id" || $key == "rate" || $key == "date_sync") {
-				continue;
+		if (!empty($object)) {
+			foreach ($object as $key => $value) {
+				if ($key == "id" || $key == "rate" || $key == "date_sync") {
+					continue;
+				}
+				unset($object->$key);
 			}
-			unset($object->$key);
 		}
 
 		return $object;
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index a8f805814c3..ba36292f6c4 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -192,13 +192,11 @@ class MultiCurrency extends CommonObject
 	{
 		dol_syslog('MultiCurrency::fetch', LOG_DEBUG);
 
-		global $conf;
-
-		$sql = "SELECT";
-		$sql .= ' c.rowid, c.name, c.code, c.entity, c.date_create, c.fk_user';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' AS c';
+		$sql = "SELECT c.rowid, c.name, c.code, c.entity, c.date_create, c.fk_user";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." AS c";
 		if (!empty($code)) {
-			$sql .= ' WHERE c.code = \''.$this->db->escape($code).'\' AND c.entity = '.$conf->entity;
+			$sql .= " WHERE c.code = '".$this->db->escape($code)."'";
+			$sql .= " AND c.entity IN (".getEntity($this->element).")";
 		} else {
 			$sql .= ' WHERE c.rowid = '.((int) $id);
 		}
@@ -244,9 +242,10 @@ class MultiCurrency extends CommonObject
 	public function fetchAllCurrencyRate()
 	{
 		$sql = "SELECT cr.rowid";
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as cr';
-		$sql .= ' WHERE cr.fk_multicurrency = '.((int) $this->id);
-		$sql .= ' ORDER BY cr.date_sync DESC';
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element_line." as cr";
+		$sql .= " WHERE cr.entity IN (".getEntity($this->element).")";
+		$sql .= " AND cr.fk_multicurrency = ".((int) $this->id);
+		$sql .= " ORDER BY cr.date_sync DESC";
 
 		$this->rates = array();
 
@@ -482,8 +481,10 @@ class MultiCurrency extends CommonObject
 	{
 		$sql = "SELECT cr.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element_line." as cr";
-		$sql .= " WHERE cr.fk_multicurrency = ".((int) $this->id);
-		$sql .= " AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM ".MAIN_DB_PREFIX.$this->table_element_line." AS cr2 WHERE cr2.fk_multicurrency = ".((int) $this->id).")";
+		$sql .= " WHERE cr.entity IN (".getEntity($this->element).")";
+		$sql .= " AND cr.fk_multicurrency = ".((int) $this->id);
+		$sql .= " AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM ".MAIN_DB_PREFIX.$this->table_element_line." AS cr2";
+		$sql .= " WHERE cr2.entity IN (".getEntity($this->element).") AND cr2.fk_multicurrency = ".((int) $this->id).")";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);

From bb0212ef6a3a3b5c2b96b07e64f2840ce2db41d4 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 1 Feb 2025 15:39:56 +0100
Subject: [PATCH 383/602] Fix ci: Add full array definition to
 selectForForms:$objectfield

# Fix ci: Add full array definition to selectForForms:$objectfield

Add field definition to phpdoc
---
 htdocs/core/class/html.form.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 2c5ce861d47..12303ed2b1d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3109,7 +3109,7 @@ class Form
 		$sql .= $hookmanager->resPrint;
 		// Add criteria on ref/label
 		if ($filterkey != '') {
-			$sqlSupplierSearch= '';
+			$sqlSupplierSearch = '';
 
 			$sql .= ' AND (';
 			$prefix = !getDolGlobalString('PRODUCT_DONOTSEARCH_ANYWHERE') ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
@@ -3139,7 +3139,7 @@ class Form
 
 				// include search in supplier ref
 				if (getDolGlobalString('MAIN_SEARCH_PRODUCT_BY_FOURN_REF')) {
-					$sqlSupplierSearch .= !empty($sqlSupplierSearch) ? ' OR ':'';
+					$sqlSupplierSearch .= !empty($sqlSupplierSearch) ? ' OR ' : '';
 					$sqlSupplierSearch .= " pfp.ref_fourn LIKE '" . $this->db->escape($prefix . $crit) . "%'";
 				}
 				$sql .= ")";
@@ -8500,7 +8500,7 @@ class Form
 	 * @param 	int				$forcecombo           	Force to load all values and output a standard combobox (with no beautification)
 	 * @param 	int<0,1>		$disabled             	1=Html component is disabled
 	 * @param	string			$selected_input_value 	Value of preselected input text (for use with ajax)
-	 * @param	string|array	$objectfield          	'Object:Field' that contains the definition of parent (in table $fields or $extrafields). Example: 'Object:xxx' or 'Object@module:xxx' or 'Object:options_xxx' or 'Object@module:options_xxx' or,  better, the full entry array in ->fields
+	 * @param	string|array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}	$objectfield	'Object:Field' that contains the definition of parent (in table $fields or $extrafields). Example: 'Object:xxx' or 'Object@module:xxx' or 'Object:options_xxx' or 'Object@module:options_xxx' or,  better, the full entry array in ->fields
 	 * @return  string	    							Return HTML string
 	 * @see selectForFormsList(), select_thirdparty_list()
 	 */

From 465be392bb3da938e1d9f95eba21cc40a0befd9f Mon Sep 17 00:00:00 2001
From: SebHashe <sebastien.hacout@gmail.com>
Date: Sat, 1 Feb 2025 23:40:11 +0100
Subject: [PATCH 384/602] Update llx_accounting_account_fr.sql

Fix PCG18-ASSOC datas with helloAsso
---
 .../mysql/data/llx_accounting_account_fr.sql  | 1846 +++++++----------
 1 file changed, 785 insertions(+), 1061 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_accounting_account_fr.sql b/htdocs/install/mysql/data/llx_accounting_account_fr.sql
index b623f740ceb..6409bbc7aa4 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_fr.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_fr.sql
@@ -40,7 +40,7 @@
 -- Content / Contenu:
 -- PCG25-DEV     -   50
 -- PCG18-ASSOC   -  900
--- PCGAFR14-DEV  - 1963
+-- PCGAFR14-DEV  - 1690
 
 
 
@@ -898,1066 +898,790 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 --
 -- Descriptif des plans comptables FR PCG18-ASSOC
 --
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7001,'PCG18-ASSOC','CAPIT',		'1',    '0', 'Fonds propres, emprunts et dettes assimilésFonds propres, provisions pour risques et charges et dettes à plus dun an', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7002,'PCG18-ASSOC','IMMO',		'2',    '0', 'Frais détablissement. Actifs immobilisés et créances à plus dun an', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7003,'PCG18-ASSOC','STOCK',		'3',    '0', 'Stock et commandes en cours dexécution', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7004,'PCG18-ASSOC','THIRDPARTY',		'4',    '0', 'Créances et dettes à un an au plus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7005,'PCG18-ASSOC','FINAN',		'5',    '0', 'Placement de trésorerie et de valeurs disponibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7006,'PCG18-ASSOC','EXPENSE',		'6',    '0', 'Charges', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7007,'PCG18-ASSOC','INCOME',		'7',    '0', 'Produits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7008,'PCG18-ASSOC','SPECIAL',		'8',    '0', 'Comptes spéciaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7009,'PCG18-ASSOC','CAPIT',		'10',    '7001', 'Fonds propres et réserves', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7010,'PCG18-ASSOC','CAPIT',		'101',    '7009', 'Capital', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7011,'PCG18-ASSOC','CAPIT',		'1011',    '7010', 'Capital souscrit – non appelé', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7012,'PCG18-ASSOC','CAPIT',		'1012',    '7010', 'Capital souscrit – appelé, non versé', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7013,'PCG18-ASSOC','CAPIT',		'1013',    '7010', 'Capital souscrit – appelé, versé', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7014,'PCG18-ASSOC','CAPIT',		'10131',    '7013', 'Capital non amorti', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7015,'PCG18-ASSOC','CAPIT',		'10132',    '7013', 'Capital amorti', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7016,'PCG18-ASSOC','CAPIT',		'1018',    '7010', 'Capital souscrit soumis à des réglementations particulières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7017,'PCG18-ASSOC','CAPIT',		'102',    '7009', 'Fonds propres sans droit de reprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7018,'PCG18-ASSOC','CAPIT',		'1021',    '7017', 'Première situation nette établie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7019,'PCG18-ASSOC','CAPIT',		'1022',    '7017', 'Fonds statutaires (à subdiviser en fonction des statuts)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7020,'PCG18-ASSOC','CAPIT',		'1023',    '7017', 'Dotations non consomptibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7021,'PCG18-ASSOC','CAPIT',		'10231',    '7020', 'Dotations non consomptibles initiales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7022,'PCG18-ASSOC','CAPIT',		'10232',    '7020', 'Dotations non consomptibles complémentaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7023,'PCG18-ASSOC','CAPIT',		'1024',    '7017', 'Autres fonds propres sans droit de reprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7024,'PCG18-ASSOC','CAPIT',		'103',    '7009', 'Fonds propres avec droit de reprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7025,'PCG18-ASSOC','CAPIT',		'1032',    '7024', 'Fonds statutaires (à subdiviser en fonction des statuts)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7026,'PCG18-ASSOC','CAPIT',		'1034',    '7024', 'Autres fonds propres avec droit de reprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7027,'PCG18-ASSOC','CAPIT',		'104',    '7009', 'Primes liées au capital social', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7028,'PCG18-ASSOC','CAPIT',		'1041',    '7027', 'Primes d''émission', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7029,'PCG18-ASSOC','CAPIT',		'1042',    '7027', 'Primes de fusion', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7030,'PCG18-ASSOC','CAPIT',		'1043',    '7027', 'Primes d''apport', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7031,'PCG18-ASSOC','CAPIT',		'1044',    '7027', 'Primes de conversion d''obligations en actions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7032,'PCG18-ASSOC','CAPIT',		'1045',    '7027', 'Bons de souscription d''actions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7033,'PCG18-ASSOC','CAPIT',		'105',    '7009', 'Ecarts de réévaluation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7034,'PCG18-ASSOC','CAPIT',		'1051',    '7033', 'Ecarts de réévaluation sur des biens sans droit de reprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7035,'PCG18-ASSOC','CAPIT',		'1052',    '7033', 'Ecarts de réévaluation sur des biens avec droit de reprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7036,'PCG18-ASSOC','CAPIT',		'1053',    '7033', 'Réserve de réévaluation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7037,'PCG18-ASSOC','CAPIT',		'1055',    '7033', 'Ecarts de réévaluation (autres opérations légales)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7038,'PCG18-ASSOC','CAPIT',		'1057',    '7033', 'Autres écarts de réévaluation en France', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7039,'PCG18-ASSOC','CAPIT',		'1058',    '7033', 'Autres écarts de réévaluation à l''Etranger', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7040,'PCG18-ASSOC','CAPIT',		'106',    '7009', 'Réserves', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7041,'PCG18-ASSOC','CAPIT',		'1061',    '7040', 'Réserve légale', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7042,'PCG18-ASSOC','CAPIT',		'10611',    '7041', 'Réserve légale proprement dite', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7043,'PCG18-ASSOC','CAPIT',		'10612',    '7041', 'Plus-values nettes à long terme', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7044,'PCG18-ASSOC','CAPIT',		'1062',    '7040', 'Réserves indisponibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7045,'PCG18-ASSOC','CAPIT',		'1063',    '7040', 'Réserves statutaires ou contractuelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7046,'PCG18-ASSOC','CAPIT',		'1064',    '7040', 'Réserves réglementées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7047,'PCG18-ASSOC','CAPIT',		'10641',    '7046', 'Plus-values nettes à long terme', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7048,'PCG18-ASSOC','CAPIT',		'10643',    '7046', 'Réserves consécutives à l''octroi de subventions d''investissement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7049,'PCG18-ASSOC','CAPIT',		'10648',    '7046', 'Autres réserves réglementées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7050,'PCG18-ASSOC','CAPIT',		'1068',    '7040', 'Réserves pour projet de l''entité', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7051,'PCG18-ASSOC','CAPIT',		'10681',    '7050', 'Réserve de propre assureur', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7052,'PCG18-ASSOC','CAPIT',		'10688',    '7050', 'Réserves diverses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7053,'PCG18-ASSOC','CAPIT',		'107',    '7009', 'Ecart d''équivalence', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7054,'PCG18-ASSOC','CAPIT',		'108',    '7009', 'Dotations consomptibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7055,'PCG18-ASSOC','CAPIT',		'1081',    '7054', 'Dotations consomptibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7056,'PCG18-ASSOC','CAPIT',		'1089',    '7054', 'Dotations consomptibles inscrites au compte de résultat', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7057,'PCG18-ASSOC','CAPIT',		'109',    '7009', 'Actionnaires : Capital souscrit – non appelé', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7058,'PCG18-ASSOC','CAPIT',		'11',    '7001', 'Report à nouveau (solde créditeur ou débiteur)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7059,'PCG18-ASSOC','CAPIT',		'110',    '7058', 'Report à nouveau (solde créditeur)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7060,'PCG18-ASSOC','CAPIT',		'119',    '7058', 'Report à nouveau (solde débiteur)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7061,'PCG18-ASSOC','CAPIT',		'12',    '7001', 'Résultat de l''exercice (bénéfice ou perte)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7062,'PCG18-ASSOC','CAPIT',		'120',    '7061', 'Résultat de l''exercice (bénéfice)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7063,'PCG18-ASSOC','CAPIT',		'129',    '7061', 'Résultat de l''exercice (perte)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7064,'PCG18-ASSOC','CAPIT',		'13',    '7001', 'Subventions d''investissement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7065,'PCG18-ASSOC','CAPIT',		'131',    '7064', 'Subventions d''équipement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7066,'PCG18-ASSOC','CAPIT',		'1311',    '7065', 'Etat', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7067,'PCG18-ASSOC','CAPIT',		'1312',    '7065', 'Régions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7068,'PCG18-ASSOC','CAPIT',		'1313',    '7065', 'Départements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7069,'PCG18-ASSOC','CAPIT',		'1314',    '7065', 'Communes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7070,'PCG18-ASSOC','CAPIT',		'1315',    '7065', 'Collectivités publiques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7071,'PCG18-ASSOC','CAPIT',		'1316',    '7065', 'Entreprises publiques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7072,'PCG18-ASSOC','CAPIT',		'1317',    '7065', 'Entreprises et organismes privés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7073,'PCG18-ASSOC','CAPIT',		'1318',    '7065', 'Autres', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7074,'PCG18-ASSOC','CAPIT',		'138',    '7064', 'Autres subventions d''investissement (même ventilation que celle du compte 131)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7075,'PCG18-ASSOC','CAPIT',		'139',    '7064', 'Subventions d''investissement inscrites au compte de résultat', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7076,'PCG18-ASSOC','CAPIT',		'1391',    '7075', 'Subventions d''équipement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7077,'PCG18-ASSOC','CAPIT',		'13911',    '7076', 'Etat', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7078,'PCG18-ASSOC','CAPIT',		'13912',    '7076', 'Régions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7079,'PCG18-ASSOC','CAPIT',		'13913',    '7076', 'Départements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7080,'PCG18-ASSOC','CAPIT',		'13914',    '7076', 'Communes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7081,'PCG18-ASSOC','CAPIT',		'13915',    '7076', 'Collectivités publiques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7082,'PCG18-ASSOC','CAPIT',		'13916',    '7076', 'Entreprises publiques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7083,'PCG18-ASSOC','CAPIT',		'13917',    '7076', 'Entreprises et organismes privés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7084,'PCG18-ASSOC','CAPIT',		'13918',    '7076', 'Autres', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7085,'PCG18-ASSOC','CAPIT',		'1398',    '7075', 'Autres subventions d''investissement (même ventilation que celle du compte 1391)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7086,'PCG18-ASSOC','CAPIT',		'14',    '7001', 'Provisions réglementées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7087,'PCG18-ASSOC','CAPIT',		'142',    '7086', 'Provisions réglementées relatives aux immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7088,'PCG18-ASSOC','CAPIT',		'1423',    '7087', 'Provisions pour reconstitution des gisements miniers et pétroliers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7089,'PCG18-ASSOC','CAPIT',		'1424',    '7087', 'Provisions pour investissement (participation des salariés)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7090,'PCG18-ASSOC','CAPIT',		'143',    '7086', 'Provisions réglementées relatives aux stocks', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7091,'PCG18-ASSOC','CAPIT',		'1431',    '7090', 'Hausse des prix', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7092,'PCG18-ASSOC','CAPIT',		'1432',    '7090', 'Fluctuation des cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7093,'PCG18-ASSOC','CAPIT',		'144',    '7086', 'Provisions réglementées relatives aux autres éléments de l''actif', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7094,'PCG18-ASSOC','CAPIT',		'145',    '7086', 'Amortissements dérogatoires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7095,'PCG18-ASSOC','CAPIT',		'146',    '7086', 'Provision spéciale de réévaluation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7096,'PCG18-ASSOC','CAPIT',		'147',    '7086', 'Plus-values réinvesties', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7097,'PCG18-ASSOC','CAPIT',		'148',    '7086', 'Autres provisions réglementées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7098,'PCG18-ASSOC','CAPIT',		'15',    '7001', 'Provisions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7099,'PCG18-ASSOC','CAPIT',		'151',    '7098', 'Provisions pour risques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7100,'PCG18-ASSOC','CAPIT',		'1511',    '7099', 'Provisions pour litiges', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7101,'PCG18-ASSOC','CAPIT',		'1512',    '7099', 'Provisions pour garanties données aux clients', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7102,'PCG18-ASSOC','CAPIT',		'1513',    '7099', 'Provisions pour pertes sur marchés à terme', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7103,'PCG18-ASSOC','CAPIT',		'1514',    '7099', 'Provisions pour amendes et pénalités', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7104,'PCG18-ASSOC','CAPIT',		'1515',    '7099', 'Provisions pour pertes de change', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7105,'PCG18-ASSOC','CAPIT',		'1516',    '7099', 'Provisions pour pertes sur contrats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7106,'PCG18-ASSOC','CAPIT',		'1518',    '7099', 'Autres provisions pour risques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7107,'PCG18-ASSOC','CAPIT',		'152',    '7098', 'Provisions pour charges sur legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7108,'PCG18-ASSOC','CAPIT',		'153',    '7098', 'Provisions pour pensions et obligations similaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7109,'PCG18-ASSOC','CAPIT',		'154',    '7098', 'Provisions pour restructurations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7110,'PCG18-ASSOC','CAPIT',		'155',    '7098', 'Provisions pour impôts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7111,'PCG18-ASSOC','CAPIT',		'156',    '7098', 'Provisions pour renouvellement des immobilisations (entreprises concessionnaires)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7112,'PCG18-ASSOC','CAPIT',		'157',    '7098', 'Provisions pour charges à répartir sur plusieurs exercices', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7113,'PCG18-ASSOC','CAPIT',		'1572',    '7112', 'Provisions pour gros entretien ou grandes révisions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7114,'PCG18-ASSOC','CAPIT',		'158',    '7098', 'Autres provisions pour charges', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7115,'PCG18-ASSOC','CAPIT',		'1581',    '7114', 'Provisions pour remises en état', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7116,'PCG18-ASSOC','CAPIT',		'16',    '7001', 'Emprunts et dettes assimilées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7117,'PCG18-ASSOC','CAPIT',		'161',    '7116', 'Emprunts obligataires convertibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7118,'PCG18-ASSOC','CAPIT',		'162',    '7116', 'Obligations représentatives de passifs nets remis en fiducie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7119,'PCG18-ASSOC','CAPIT',		'163',    '7116', 'Autres emprunts obligataires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7120,'PCG18-ASSOC','CAPIT',		'1631',    '7119', 'Titres associatifs et assimilés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7121,'PCG18-ASSOC','CAPIT',		'164',    '7116', 'Emprunts auprès des établissements de crédit', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7122,'PCG18-ASSOC','CAPIT',		'165',    '7116', 'Dépôts et cautionnements reçus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7123,'PCG18-ASSOC','CAPIT',		'1651',    '7122', 'Dépôts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7124,'PCG18-ASSOC','CAPIT',		'1655',    '7122', 'Cautionnements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7125,'PCG18-ASSOC','CAPIT',		'166',    '7116', 'Participation des salariés aux résultats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7126,'PCG18-ASSOC','CAPIT',		'1661',    '7125', 'Comptes bloqués', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7127,'PCG18-ASSOC','CAPIT',		'1662',    '7125', 'Fonds de participation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7128,'PCG18-ASSOC','CAPIT',		'167',    '7116', 'Emprunts et dettes assortis de conditions particulières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7129,'PCG18-ASSOC','CAPIT',		'1671',    '7128', 'Emissions de titres participatifs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7130,'PCG18-ASSOC','CAPIT',		'1674',    '7128', 'Avances conditionnées de l''Etat', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7131,'PCG18-ASSOC','CAPIT',		'1675',    '7128', 'Emprunts participatifs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7132,'PCG18-ASSOC','CAPIT',		'168',    '7116', 'Autres emprunts et dettes assimilées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7133,'PCG18-ASSOC','CAPIT',		'1681',    '7132', 'Autres emprunts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7134,'PCG18-ASSOC','CAPIT',		'1685',    '7132', 'Rentes viagères capitalisées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7135,'PCG18-ASSOC','CAPIT',		'1687',    '7132', 'Autres dettes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7136,'PCG18-ASSOC','CAPIT',		'1688',    '7132', 'Intérêts courus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7137,'PCG18-ASSOC','CAPIT',		'16881',    '7136', 'sur emprunts obligataires convertibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7138,'PCG18-ASSOC','CAPIT',		'16883',    '7136', 'sur autres emprunts obligataires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7139,'PCG18-ASSOC','CAPIT',		'16884',    '7136', 'sur emprunts auprès des établissements de crédit', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7140,'PCG18-ASSOC','CAPIT',		'16885',    '7136', 'sur dépôts et cautionnements reçus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7141,'PCG18-ASSOC','CAPIT',		'16886',    '7136', 'sur participation des salariés aux résultats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7142,'PCG18-ASSOC','CAPIT',		'16887',    '7136', 'sur emprunts et dettes assortis de conditions particulières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7143,'PCG18-ASSOC','CAPIT',		'16888',    '7136', 'sur autres emprunts et dettes assimilées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7144,'PCG18-ASSOC','CAPIT',		'169',    '7116', 'Primes de remboursement des obligations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7145,'PCG18-ASSOC','CAPIT',		'17',    '7001', 'Dettes rattachées à des participations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7146,'PCG18-ASSOC','CAPIT',		'171',    '7145', 'Dettes rattachées à des participations (groupe)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7147,'PCG18-ASSOC','CAPIT',		'174',    '7145', 'Dettes rattachées à des participations (hors groupe)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7148,'PCG18-ASSOC','CAPIT',		'178',    '7145', 'Dettes rattachées à des sociétés en participation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7149,'PCG18-ASSOC','CAPIT',		'1781',    '7148', 'Principal', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7150,'PCG18-ASSOC','CAPIT',		'1788',    '7148', 'Intérêts courus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7151,'PCG18-ASSOC','CAPIT',		'18',    '7001', 'Comptes de liaison des établissements et sociétés en participation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7152,'PCG18-ASSOC','CAPIT',		'181',    '7151', 'Comptes de liaison des établissements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7153,'PCG18-ASSOC','CAPIT',		'186',    '7151', 'Biens et prestations de services échangés entre établissements (charges)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7154,'PCG18-ASSOC','CAPIT',		'187',    '7151', 'Biens et prestations de services échangés entre établissements (produits)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7155,'PCG18-ASSOC','CAPIT',		'188',    '7151', 'Comptes de liaison des sociétés en participation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7156,'PCG18-ASSOC','CAPIT',		'19',    '7001', 'Fonds dédiés ou reportés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7157,'PCG18-ASSOC','CAPIT',		'191',    '7156', 'Fonds reportés liés aux legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7158,'PCG18-ASSOC','CAPIT',		'1911',    '7157', 'Legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7159,'PCG18-ASSOC','CAPIT',		'1912',    '7157', 'Donations temporaires d''usufruit', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7160,'PCG18-ASSOC','CAPIT',		'194',    '7156', 'Fonds dédiés sur subventions d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7161,'PCG18-ASSOC','CAPIT',		'195',    '7156', 'Fonds dédiés sur contributions financières d''autres organismes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7162,'PCG18-ASSOC','CAPIT',		'196',    '7156', 'Fonds dédiés sur ressources liées à la générosité du public', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7164,'PCG18-ASSOC','IMMO',		'20',    '7002', 'Immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7165,'PCG18-ASSOC','IMMO',		'201',    '7164', 'Frais d''établissement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7166,'PCG18-ASSOC','IMMO',		'2011',    '7165', 'Frais de constitution', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7167,'PCG18-ASSOC','IMMO',		'2012',    '7165', 'Frais de premier établissement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7168,'PCG18-ASSOC','IMMO',		'20121',    '7167', 'Frais de prospection', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7169,'PCG18-ASSOC','IMMO',		'20122',    '7167', 'Frais de publicité', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7170,'PCG18-ASSOC','IMMO',		'2013',    '7165', 'Frais d''augmentation de capital et d''opérations diverses (fusions, scissions, transformations)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7171,'PCG18-ASSOC','IMMO',		'203',    '7164', 'Frais de recherche et de développement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7172,'PCG18-ASSOC','IMMO',		'204',    '7164', 'Donations temporaires d''usufruit', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7173,'PCG18-ASSOC','IMMO',		'205',    '7164', 'Concessions et droits similaires, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7174,'PCG18-ASSOC','IMMO',		'206',    '7164', 'Droit au bail', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7175,'PCG18-ASSOC','IMMO',		'207',    '7164', 'Fonds commercial', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7176,'PCG18-ASSOC','IMMO',		'208',    '7164', 'Autres immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7177,'PCG18-ASSOC','IMMO',		'2081',    '7176', 'Mali de fusion sur actifs incorporels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7178,'PCG18-ASSOC','IMMO',		'21',    '7002', 'Immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7179,'PCG18-ASSOC','IMMO',		'211',    '7178', 'Terrains', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7180,'PCG18-ASSOC','IMMO',		'2111',    '7179', 'Terrains nus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7181,'PCG18-ASSOC','IMMO',		'2112',    '7179', 'Terrains aménagés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7182,'PCG18-ASSOC','IMMO',		'2113',    '7179', 'Sous – sols et sursols', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7183,'PCG18-ASSOC','IMMO',		'2114',    '7179', 'Terrains de carrières (Tréfonds)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7184,'PCG18-ASSOC','IMMO',		'2115',    '7179', 'Terrains bâtis', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7185,'PCG18-ASSOC','IMMO',		'21151',    '7184', 'Ensembles immobiliers industriels (A, B)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7186,'PCG18-ASSOC','IMMO',		'21155',    '7184', 'Ensembles immobiliers administratifs et commerciaux (A, B)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7187,'PCG18-ASSOC','IMMO',		'21158',    '7184', 'Autres ensembles immobiliers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7188,'PCG18-ASSOC','IMMO',		'211581',    '7187', 'affectés aux opérations professionnelles (A, B)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7189,'PCG18-ASSOC','IMMO',		'211588',    '7187', 'affectés aux opérations non professionnelles (A, B)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7190,'PCG18-ASSOC','IMMO',		'2116',    '7179', 'Compte d''ordre sur immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7191,'PCG18-ASSOC','IMMO',		'212',    '7178', 'Agencements et aménagements de terrains (même ventilation que celle du compte 211)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7192,'PCG18-ASSOC','IMMO',		'213',    '7178', 'Constructions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7193,'PCG18-ASSOC','IMMO',		'2131',    '7192', 'Bâtiments', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7194,'PCG18-ASSOC','IMMO',		'21311',    '7193', 'Ensembles immobiliers industriels (A, B)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7195,'PCG18-ASSOC','IMMO',		'21315',    '7193', 'Ensembles immobiliers administratifs et commerciaux (A, B)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7196,'PCG18-ASSOC','IMMO',		'21318',    '7193', 'Autres ensembles immobiliers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7197,'PCG18-ASSOC','IMMO',		'213181',    '7196', 'affectés aux opérations professionnelles (A, B)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7198,'PCG18-ASSOC','IMMO',		'213188',    '7196', 'affectés aux opérations non professionnelles (A, B)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7199,'PCG18-ASSOC','IMMO',		'2135',    '7192', 'Installations générales – agencements – aménagements des constructions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7200,'PCG18-ASSOC','IMMO',		'21351',    '7199', 'Ensembles immobiliers industriels (A, B)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7201,'PCG18-ASSOC','IMMO',		'21355',    '7199', 'Ensembles immobiliers administratifs et commerciaux (A, B)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7202,'PCG18-ASSOC','IMMO',		'21358',    '7199', 'Autres ensembles immobiliers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7203,'PCG18-ASSOC','IMMO',		'213581',    '7202', 'affectés aux opérations professionnelles (A, B)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7204,'PCG18-ASSOC','IMMO',		'213588',    '7202', 'affectés aux opérations non professionnelles (A, B)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7205,'PCG18-ASSOC','IMMO',		'2138',    '7192', 'Ouvrages d''infrastructure', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7206,'PCG18-ASSOC','IMMO',		'21381',    '7205', 'Voies de terre', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7207,'PCG18-ASSOC','IMMO',		'21382',    '7205', 'Voies de fer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7208,'PCG18-ASSOC','IMMO',		'21383',    '7205', 'Voies d''eau', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7209,'PCG18-ASSOC','IMMO',		'21384',    '7205', 'Barrages', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7210,'PCG18-ASSOC','IMMO',		'21385',    '7205', 'Pistes d''aérodromes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7211,'PCG18-ASSOC','IMMO',		'214',    '7178', 'Constructions sur sol d''autrui (même ventilation que celle du compte 213)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7212,'PCG18-ASSOC','IMMO',		'215',    '7178', 'Installations techniques, matériels et outillage industriels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7213,'PCG18-ASSOC','IMMO',		'2151',    '7212', 'Installations complexes spécialisées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7214,'PCG18-ASSOC','IMMO',		'21511',    '7213', 'sur sol propre', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7215,'PCG18-ASSOC','IMMO',		'21514',    '7213', 'sur sol d''autrui', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7216,'PCG18-ASSOC','IMMO',		'2153',    '7212', 'Installations à caractère spécifique', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7217,'PCG18-ASSOC','IMMO',		'21531',    '7216', 'sur sol propre', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7218,'PCG18-ASSOC','IMMO',		'21534',    '7216', 'sur sol d''autrui', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7219,'PCG18-ASSOC','IMMO',		'2154',    '7212', 'Matériel industriel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7220,'PCG18-ASSOC','IMMO',		'2155',    '7212', 'Outillage industriel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7221,'PCG18-ASSOC','IMMO',		'2157',    '7212', 'Agencements et aménagements du matériel et outillage industriels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7222,'PCG18-ASSOC','IMMO',		'218',    '7178', 'Autres immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7223,'PCG18-ASSOC','IMMO',		'2181',    '7222', 'Installations générales, agencements, aménagements divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7224,'PCG18-ASSOC','IMMO',		'2182',    '7222', 'Matériel de transport', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7225,'PCG18-ASSOC','IMMO',		'2183',    '7222', 'Matériel de bureau et matériel informatique', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7226,'PCG18-ASSOC','IMMO',		'2184',    '7222', 'Mobilier', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7227,'PCG18-ASSOC','IMMO',		'2185',    '7222', 'Cheptel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7228,'PCG18-ASSOC','IMMO',		'2186',    '7222', 'Emballages récupérables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7229,'PCG18-ASSOC','IMMO',		'2187',    '7222', 'Mali de fusions sur actifs corporels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7230,'PCG18-ASSOC','IMMO',		'22',    '7002', 'Immobilisations mises en concession', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7231,'PCG18-ASSOC','IMMO',		'23',    '7002', 'Immobilisations en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7232,'PCG18-ASSOC','IMMO',		'231',    '7231', 'Immobilisations corporelles en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7233,'PCG18-ASSOC','IMMO',		'2312',    '7232', 'Terrains', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7234,'PCG18-ASSOC','IMMO',		'2313',    '7232', 'Constructions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7235,'PCG18-ASSOC','IMMO',		'2315',    '7232', 'Installations techniques, matériel et outillage industriels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7236,'PCG18-ASSOC','IMMO',		'2318',    '7232', 'Autres immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7237,'PCG18-ASSOC','IMMO',		'232',    '7231', 'Immobilisations incorporelles en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7238,'PCG18-ASSOC','IMMO',		'237',    '7231', 'Avances et acomptes versés sur immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7239,'PCG18-ASSOC','IMMO',		'238',    '7231', 'Avances et acomptes versés sur commandes d''immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7240,'PCG18-ASSOC','IMMO',		'2382',    '7239', 'Terrains', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7241,'PCG18-ASSOC','IMMO',		'2383',    '7239', 'Constructions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7242,'PCG18-ASSOC','IMMO',		'2385',    '7239', 'Installations techniques, matériel et outillage industriels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7243,'PCG18-ASSOC','IMMO',		'2388',    '7239', 'Autres immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7244,'PCG18-ASSOC','IMMO',		'24',    '7002', 'Biens reçus par legs ou donations destinés à être cédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7245,'PCG18-ASSOC','IMMO',		'25',    '7002', 'Parts dans des entreprises liées et créances sur des entreprises liées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7246,'PCG18-ASSOC','IMMO',		'26',    '7002', 'Participations et créances rattachées à des participations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7247,'PCG18-ASSOC','IMMO',		'261',    '7246', 'Titres de participation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7248,'PCG18-ASSOC','IMMO',		'2611',    '7247', 'Actions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7249,'PCG18-ASSOC','IMMO',		'2618',    '7247', 'Autres titres', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7250,'PCG18-ASSOC','IMMO',		'266',    '7246', 'Autres formes de participation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7251,'PCG18-ASSOC','IMMO',		'2661',    '7250', 'Droits représentatifs d''actifs nets remis en fiducie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7252,'PCG18-ASSOC','IMMO',		'267',    '7246', 'Créances rattachées à des participations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7253,'PCG18-ASSOC','IMMO',		'2671',    '7252', 'Créances rattachées à des participations (groupe)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7254,'PCG18-ASSOC','IMMO',		'2674',    '7252', 'Créances rattachées à des participations (hors groupe)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7255,'PCG18-ASSOC','IMMO',		'2675',    '7252', 'Versements représentatifs d''apports non capitalisés (appel de fonds)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7256,'PCG18-ASSOC','IMMO',		'2676',    '7252', 'Avances consolidables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7257,'PCG18-ASSOC','IMMO',		'2677',    '7252', 'Autres créances rattachées à des participations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7258,'PCG18-ASSOC','IMMO',		'2678',    '7252', 'Intérêts courus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7259,'PCG18-ASSOC','IMMO',		'268',    '7246', 'Créances rattachées à des sociétés en participation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7260,'PCG18-ASSOC','IMMO',		'2681',    '7259', 'Principal', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7261,'PCG18-ASSOC','IMMO',		'2688',    '7259', 'Intérêts courus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7262,'PCG18-ASSOC','IMMO',		'269',    '7246', 'Versements restant à effectuer sur titres de participation non libérés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7263,'PCG18-ASSOC','IMMO',		'27',    '7002', 'Autres immobilisations financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7264,'PCG18-ASSOC','IMMO',		'271',    '7263', 'Titres immobilisés autres que les titres immobilisés de l''activité de portefeuille (droit de propriété)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7265,'PCG18-ASSOC','IMMO',		'2711',    '7264', 'Actions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7266,'PCG18-ASSOC','IMMO',		'2718',    '7264', 'Autres titres', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7267,'PCG18-ASSOC','IMMO',		'272',    '7263', 'Titres immobilisés (droit de créance)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7268,'PCG18-ASSOC','IMMO',		'2721',    '7267', 'Obligations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7269,'PCG18-ASSOC','IMMO',		'2722',    '7267', 'Bons', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7270,'PCG18-ASSOC','IMMO',		'273',    '7263', 'Titres immobilisés de l''activité de portefeuille', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7271,'PCG18-ASSOC','IMMO',		'274',    '7263', 'Prêts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7272,'PCG18-ASSOC','IMMO',		'2741',    '7271', 'Prêts participatifs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7273,'PCG18-ASSOC','IMMO',		'2742',    '7271', 'Prêts aux partenaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7274,'PCG18-ASSOC','IMMO',		'2743',    '7271', 'Prêts au personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7275,'PCG18-ASSOC','IMMO',		'2748',    '7271', 'Autres prêts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7276,'PCG18-ASSOC','IMMO',		'275',    '7263', 'Dépôts et cautionnements versés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7277,'PCG18-ASSOC','IMMO',		'2751',    '7276', 'Dépôts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7278,'PCG18-ASSOC','IMMO',		'2755',    '7276', 'Cautionnements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7279,'PCG18-ASSOC','IMMO',		'276',    '7263', 'Autres créances immobilisées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7280,'PCG18-ASSOC','IMMO',		'2761',    '7279', 'Créances diverses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7281,'PCG18-ASSOC','IMMO',		'2768',    '7279', 'Intérêts courus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7282,'PCG18-ASSOC','IMMO',		'27682',    '7281', 'sur titres immobilisés (droit de créance)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7283,'PCG18-ASSOC','IMMO',		'27684',    '7281', 'sur prêts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7284,'PCG18-ASSOC','IMMO',		'27685',    '7281', 'sur dépôts et cautionnements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7285,'PCG18-ASSOC','IMMO',		'27688',    '7281', 'sur créances diverses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7286,'PCG18-ASSOC','IMMO',		'277',    '7263', '(Actions propres ou parts propres)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7287,'PCG18-ASSOC','IMMO',		'2771',    '7286', 'Actions propres ou parts propres', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7288,'PCG18-ASSOC','IMMO',		'2772',    '7286', 'Actions propres ou parts propres en voie d''annulation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7289,'PCG18-ASSOC','IMMO',		'278',    '7263', 'Mali de fusion sur actifs financiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7290,'PCG18-ASSOC','IMMO',		'279',    '7263', 'Versements restant à effectuer sur titres immobilisés non libérés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7291,'PCG18-ASSOC','IMMO',		'28',    '7002', 'Amortissements des immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7292,'PCG18-ASSOC','IMMO',		'280',    '7291', 'Amortissements des immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7293,'PCG18-ASSOC','IMMO',		'2801',    '7292', 'Frais d''établissement (même ventilation que celle du compte 201)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7294,'PCG18-ASSOC','IMMO',		'2803',    '7292', 'Frais de recherche et de développement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7295,'PCG18-ASSOC','IMMO',		'2804',    '7292', 'Donations temporaires d''usufruit', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7296,'PCG18-ASSOC','IMMO',		'2805',    '7292', 'Concessions et droits similaires, brevets, licences, logiciels, droits et valeurs similaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7297,'PCG18-ASSOC','IMMO',		'2807',    '7292', 'Fonds commercial', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7298,'PCG18-ASSOC','IMMO',		'2808',    '7292', 'Autres immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7299,'PCG18-ASSOC','IMMO',		'28081',    '7298', 'Amortissements du mali de fusion sur actifs incorporels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7300,'PCG18-ASSOC','IMMO',		'281',    '7291', 'Amortissements des immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7301,'PCG18-ASSOC','IMMO',		'2812',    '7300', 'Agencements, aménagements de terrains (même ventilation que celle du compte 212)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7302,'PCG18-ASSOC','IMMO',		'2813',    '7300', 'Constructions (même ventilation que celle du compte 213)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7303,'PCG18-ASSOC','IMMO',		'2814',    '7300', 'Constructions sur sol d''autrui (même ventilation que celle du compte 214)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7304,'PCG18-ASSOC','IMMO',		'2815',    '7300', 'Installations, matériel et outillage industriels (même ventilation que celle du compte 215)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7305,'PCG18-ASSOC','IMMO',		'2818',    '7300', 'Autres immobilisations corporelles (même ventilation que celle du compte 218)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7306,'PCG18-ASSOC','IMMO',		'28187',    '7305', 'Amortissement du mali de fusion sur actifs corporels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7307,'PCG18-ASSOC','IMMO',		'282',    '7291', 'Amortissements des immobilisations mises en concession', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7308,'PCG18-ASSOC','IMMO',		'29',    '7002', 'Dépréciations des immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7309,'PCG18-ASSOC','IMMO',		'290',    '7308', 'Dépréciations des immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7310,'PCG18-ASSOC','IMMO',		'2905',    '7309', 'Marques, procédés, droits et valeurs similaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7311,'PCG18-ASSOC','IMMO',		'2906',    '7309', 'Droit au bail', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7312,'PCG18-ASSOC','IMMO',		'2907',    '7309', 'Fonds commercial', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7313,'PCG18-ASSOC','IMMO',		'2908',    '7309', 'Autres immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7314,'PCG18-ASSOC','IMMO',		'29081',    '7313', 'Dépréciation du mali de fusion sur actifs incorporels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7315,'PCG18-ASSOC','IMMO',		'291',    '7308', 'Dépréciations des immobilisations corporelles (même ventilation que celle du compte 21)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7316,'PCG18-ASSOC','IMMO',		'29187',    '7315', 'Dépréciation du mali de fusion sur actifs corporels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7317,'PCG18-ASSOC','IMMO',		'292',    '7308', 'Dépréciations des immobilisations mises en concession', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7318,'PCG18-ASSOC','IMMO',		'293',    '7308', 'Dépréciations des immobilisations en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7319,'PCG18-ASSOC','IMMO',		'2931',    '7318', 'Immobilisations corporelles en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7320,'PCG18-ASSOC','IMMO',		'2932',    '7318', 'Immobilisations incorporelles en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7321,'PCG18-ASSOC','IMMO',		'294',    '7308', 'Dépréciations des biens reçus par legs ou donations destinés à être cédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7322,'PCG18-ASSOC','IMMO',		'296',    '7308', 'Dépréciations des participations et créances rattachées à des participations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7323,'PCG18-ASSOC','IMMO',		'2961',    '7322', 'Titres de participation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7324,'PCG18-ASSOC','IMMO',		'2966',    '7322', 'Autres formes de participation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7325,'PCG18-ASSOC','IMMO',		'2967',    '7322', 'Créances rattachées à des participations (même ventilation que celle du compte 267)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7326,'PCG18-ASSOC','IMMO',		'2968',    '7322', 'Créances rattachées à des sociétés en participation (même ventilation que celle du compte 268)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7327,'PCG18-ASSOC','IMMO',		'297',    '7308', 'Dépréciations des autres immobilisations financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7328,'PCG18-ASSOC','IMMO',		'2971',    '7327', 'Titres immobilisés autres que les titres immobilisés de l''activité de portefeuille – droit de propriété (même ventilation que celle du compte 271)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7329,'PCG18-ASSOC','IMMO',		'2972',    '7327', 'Droit de créance (même ventilation que celle du compte 272)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7330,'PCG18-ASSOC','IMMO',		'2973',    '7327', 'Titres immobilisés de l''activité de portefeuille', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7331,'PCG18-ASSOC','IMMO',		'2974',    '7327', 'Prêts (même ventilation que celle du compte 274)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7332,'PCG18-ASSOC','IMMO',		'2975',    '7327', 'Dépôts et cautionnements versés (même ventilation que celle du compte 275)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7333,'PCG18-ASSOC','IMMO',		'2976',    '7327', 'Autres créances immobilisées (même ventilation que celle du compte 276)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7334,'PCG18-ASSOC','IMMO',		'29787',    '7327', 'Dépréciation du mali de fusion sur actifs financiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7336,'PCG18-ASSOC','STOCK',		'31',    '7003', 'Matières premières (et fournitures)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7337,'PCG18-ASSOC','STOCK',		'311',    '7336', 'Matières (ou groupe) A', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7338,'PCG18-ASSOC','STOCK',		'312',    '7336', 'Matières (ou groupe) B', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7339,'PCG18-ASSOC','STOCK',		'317',    '7336', 'Fournitures A, B, C,', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7340,'PCG18-ASSOC','STOCK',		'32',    '7003', 'Autres approvisionnements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7341,'PCG18-ASSOC','STOCK',		'321',    '7340', 'Matières consommables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7342,'PCG18-ASSOC','STOCK',		'3211',    '7341', 'Matières (ou groupe) C', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7343,'PCG18-ASSOC','STOCK',		'3212',    '7341', 'Matières (ou groupe) D', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7344,'PCG18-ASSOC','STOCK',		'322',    '7340', 'Fournitures consommables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7345,'PCG18-ASSOC','STOCK',		'3221',    '7344', 'Combustibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7346,'PCG18-ASSOC','STOCK',		'3222',    '7344', 'Produits d''entretien', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7347,'PCG18-ASSOC','STOCK',		'3223',    '7344', 'Fournitures d''atelier et d''usine', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7348,'PCG18-ASSOC','STOCK',		'3224',    '7344', 'Fournitures de magasin', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7349,'PCG18-ASSOC','STOCK',		'3225',    '7344', 'Fournitures de bureau', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7350,'PCG18-ASSOC','STOCK',		'326',    '7340', 'Emballages', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7351,'PCG18-ASSOC','STOCK',		'3261',    '7350', 'Emballages perdus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7352,'PCG18-ASSOC','STOCK',		'3265',    '7350', 'Emballages récupérables non identifiables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7353,'PCG18-ASSOC','STOCK',		'3267',    '7350', 'Emballages à usage mixte', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7354,'PCG18-ASSOC','STOCK',		'33',    '7003', 'En-cours de production de biens', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7355,'PCG18-ASSOC','STOCK',		'331',    '7354', 'Produits en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7356,'PCG18-ASSOC','STOCK',		'3311',    '7355', 'Produits en cours P 1', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7357,'PCG18-ASSOC','STOCK',		'3312',    '7355', 'Produits en cours P 2', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7358,'PCG18-ASSOC','STOCK',		'335',    '7354', 'Travaux en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7359,'PCG18-ASSOC','STOCK',		'3351',    '7358', 'Travaux en cours T 1', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7360,'PCG18-ASSOC','STOCK',		'3352',    '7358', 'Travaux en cours T 2', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7361,'PCG18-ASSOC','STOCK',		'34',    '7003', 'En-cours de production de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7362,'PCG18-ASSOC','STOCK',		'341',    '7361', 'Etudes en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7363,'PCG18-ASSOC','STOCK',		'3411',    '7362', 'Etudes en cours E 1', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7364,'PCG18-ASSOC','STOCK',		'3412',    '7362', 'Etudes en cours E 2', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7365,'PCG18-ASSOC','STOCK',		'345',    '7361', 'Prestations de services en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7366,'PCG18-ASSOC','STOCK',		'3451',    '7365', 'Prestations de services S 1', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7367,'PCG18-ASSOC','STOCK',		'3452',    '7365', 'Prestations de services S 2', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7368,'PCG18-ASSOC','STOCK',		'35',    '7003', 'Stocks de produits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7369,'PCG18-ASSOC','STOCK',		'351',    '7368', 'Produits intermédiaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7370,'PCG18-ASSOC','STOCK',		'3511',    '7369', 'Produits intermédiaires (ou groupe) A', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7371,'PCG18-ASSOC','STOCK',		'3512',    '7369', 'Produits intermédiaires (ou groupe) B', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7372,'PCG18-ASSOC','STOCK',		'355',    '7368', 'Produits finis', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7373,'PCG18-ASSOC','STOCK',		'3551',    '7372', 'Produits finis (ou groupe) A', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7374,'PCG18-ASSOC','STOCK',		'3552',    '7372', 'Produits finis (ou groupe) B', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7375,'PCG18-ASSOC','STOCK',		'358',    '7368', 'Produits résiduels (ou matières de récupération)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7376,'PCG18-ASSOC','STOCK',		'3581',    '7375', 'Déchets', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7377,'PCG18-ASSOC','STOCK',		'3585',    '7375', 'Rebuts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7378,'PCG18-ASSOC','STOCK',		'3586',    '7375', 'Matières de récupération', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7379,'PCG18-ASSOC','STOCK',		'36',    '7003', '(compte à ouvrir, le cas échéant, sous l''intitulé « Stocks provenant d''immobilisations »)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7380,'PCG18-ASSOC','STOCK',		'37',    '7003', 'Stocks de marchandises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7381,'PCG18-ASSOC','STOCK',		'371',    '7380', 'Marchandises (ou groupe) A', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7382,'PCG18-ASSOC','STOCK',		'372',    '7380', 'Marchandises (ou groupe) B', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7383,'PCG18-ASSOC','STOCK',		'38',    '7003', '(lorsque l''entité tient un inventaire permanent en comptabilité générale, le compte 38 peut être utilisé pour comptabiliser les stocks en voie d''acheminement, mis en dépôt ou donnés en consignation)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7384,'PCG18-ASSOC','STOCK',		'39',    '7003', 'Dépréciations des stocks et en-cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7385,'PCG18-ASSOC','STOCK',		'391',    '7384', 'Dépréciations des matières premières (et fournitures)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7386,'PCG18-ASSOC','STOCK',		'3911',    '7385', 'Matières (ou groupe) A', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7387,'PCG18-ASSOC','STOCK',		'3912',    '7385', 'Matières (ou groupe) B', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7388,'PCG18-ASSOC','STOCK',		'3917',    '7385', 'Fournitures A, B, C,', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7389,'PCG18-ASSOC','STOCK',		'392',    '7384', 'Dépréciations des autres approvisionnements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7390,'PCG18-ASSOC','STOCK',		'3921',    '7389', 'Matières consommables (même ventilation que celle du compte 321)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7391,'PCG18-ASSOC','STOCK',		'3922',    '7389', 'Fournitures consommables (même ventilation que celle du compte 322)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7392,'PCG18-ASSOC','STOCK',		'3926',    '7389', 'Emballages (même ventilation que celle du compte 326)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7393,'PCG18-ASSOC','STOCK',		'393',    '7384', 'Dépréciations des en-cours de production de biens', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7394,'PCG18-ASSOC','STOCK',		'3931',    '7393', 'Produits en cours (même ventilation que celle du compte 331)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7395,'PCG18-ASSOC','STOCK',		'3935',    '7393', 'Travaux en cours (même ventilation que celle du compte 335)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7396,'PCG18-ASSOC','STOCK',		'394',    '7384', 'Dépréciations des en-cours de production de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7397,'PCG18-ASSOC','STOCK',		'3941',    '7396', 'Etudes en cours (même ventilation que celle du compte 341)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7398,'PCG18-ASSOC','STOCK',		'3945',    '7396', 'Prestations de services en cours (même ventilation que celle du compte 345)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7399,'PCG18-ASSOC','STOCK',		'395',    '7384', 'Dépréciations des stocks de produits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7400,'PCG18-ASSOC','STOCK',		'3951',    '7399', 'Produits intermédiaires (même ventilation que celle du compte 351)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7401,'PCG18-ASSOC','STOCK',		'3955',    '7399', 'Produits finis (même ventilation que celle du compte 355)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7402,'PCG18-ASSOC','STOCK',		'397',    '7384', 'Dépréciations des stocks de marchandises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7403,'PCG18-ASSOC','STOCK',		'3971',    '7402', 'Marchandise (ou groupe) A', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7404,'PCG18-ASSOC','STOCK',		'3972',    '7402', 'Marchandise (ou groupe) B', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7406,'PCG18-ASSOC','THIRDPARTY',		'40',    '7004', 'Fournisseurs et comptes rattachés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7407,'PCG18-ASSOC','THIRDPARTY',		'400',    '7406', 'Fournisseurs et comptes rattachés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7408,'PCG18-ASSOC','THIRDPARTY',		'401',    '7406', 'Fournisseurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7409,'PCG18-ASSOC','THIRDPARTY',		'4011',    '7408', 'Fournisseurs – Achats de biens et prestations de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7410,'PCG18-ASSOC','THIRDPARTY',		'4017',    '7408', 'Fournisseurs – Retenues de garantie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7411,'PCG18-ASSOC','THIRDPARTY',		'403',    '7406', 'Fournisseurs – Effets à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7412,'PCG18-ASSOC','THIRDPARTY',		'404',    '7406', 'Fournisseurs d''immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7413,'PCG18-ASSOC','THIRDPARTY',		'4041',    '7412', 'Fournisseurs – Achats d''immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7414,'PCG18-ASSOC','THIRDPARTY',		'4047',    '7412', 'Fournisseurs d''immobilisations – Retenues de garantie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7415,'PCG18-ASSOC','THIRDPARTY',		'405',    '7406', 'Fournisseurs d''immobilisations – Effets à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7416,'PCG18-ASSOC','THIRDPARTY',		'408',    '7406', 'Fournisseurs – Factures non parvenues', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7417,'PCG18-ASSOC','THIRDPARTY',		'4081',    '7416', 'Fournisseurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7418,'PCG18-ASSOC','THIRDPARTY',		'4084',    '7416', 'Fournisseurs d''immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7419,'PCG18-ASSOC','THIRDPARTY',		'4088',    '7416', 'Fournisseurs – Intérêts courus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7420,'PCG18-ASSOC','THIRDPARTY',		'409',    '7406', 'Fournisseurs débiteurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7421,'PCG18-ASSOC','THIRDPARTY',		'4091',    '7420', 'Fournisseurs – Avances et acomptes versés sur commandes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7422,'PCG18-ASSOC','THIRDPARTY',		'4096',    '7420', 'Fournisseurs – Créances pour emballages et matériel à rendre', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7423,'PCG18-ASSOC','THIRDPARTY',		'4097',    '7420', 'Fournisseurs – Autres avoirs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7424,'PCG18-ASSOC','THIRDPARTY',		'40971',    '7423', 'Fournisseurs d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7425,'PCG18-ASSOC','THIRDPARTY',		'40974',    '7423', 'Fournisseurs d''immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7426,'PCG18-ASSOC','THIRDPARTY',		'4098',    '7420', 'Rabais, remises, ristournes à obtenir et autres avoirs non encore reçus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7427,'PCG18-ASSOC','THIRDPARTY',		'41',    '7004', 'Clients, adhérents, usagers et comptes rattachés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7428,'PCG18-ASSOC','THIRDPARTY',		'410',    '7427', 'Clients et comptes rattachés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7429,'PCG18-ASSOC','THIRDPARTY',		'411',    '7427', 'Clients', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7430,'PCG18-ASSOC','THIRDPARTY',		'4111',    '7429', 'Clients – Ventes de biens ou de prestations de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7431,'PCG18-ASSOC','THIRDPARTY',		'4117',    '7429', 'Clients – Retenues de garantie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7432,'PCG18-ASSOC','THIRDPARTY',		'413',    '7427', 'Clients – Effets à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7433,'PCG18-ASSOC','THIRDPARTY',		'416',    '7427', 'Clients douteux ou litigieux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7434,'PCG18-ASSOC','THIRDPARTY',		'418',    '7427', 'Clients – Produits non encore facturés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7435,'PCG18-ASSOC','THIRDPARTY',		'4181',    '7434', 'Clients – Factures à établir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7436,'PCG18-ASSOC','THIRDPARTY',		'4188',    '7434', 'Clients – Intérêts courus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7437,'PCG18-ASSOC','THIRDPARTY',		'419',    '7427', 'Clients créditeurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7438,'PCG18-ASSOC','THIRDPARTY',		'4191',    '7437', 'Clients – Avances et acomptes reçus sur commandes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7439,'PCG18-ASSOC','THIRDPARTY',		'4196',    '7437', 'Clients – Dettes sur emballages et matériels consignés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7440,'PCG18-ASSOC','THIRDPARTY',		'4197',    '7437', 'Clients – Autres avoirs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7441,'PCG18-ASSOC','THIRDPARTY',		'4198',    '7437', 'Rabais, remises, ristournes à accorder et autres avoirs à établir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7442,'PCG18-ASSOC','THIRDPARTY',		'42',    '7004', 'Personnel et comptes rattachés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7443,'PCG18-ASSOC','THIRDPARTY',		'421',    '7442', 'Personnel – Rémunérations dues', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7444,'PCG18-ASSOC','THIRDPARTY',		'422',    '7442', 'Comités d''entreprises, d''établissement, …', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7445,'PCG18-ASSOC','THIRDPARTY',		'424',    '7442', 'Participation des salariés aux résultats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7446,'PCG18-ASSOC','THIRDPARTY',		'4246',    '7445', 'Réserve spéciale', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7447,'PCG18-ASSOC','THIRDPARTY',		'4248',    '7445', 'Comptes courants', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7448,'PCG18-ASSOC','THIRDPARTY',		'425',    '7442', 'Personnel – Avances et acomptes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7449,'PCG18-ASSOC','THIRDPARTY',		'426',    '7442', 'Personnel – Dépôts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7450,'PCG18-ASSOC','THIRDPARTY',		'427',    '7442', 'Personnel – Oppositions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7451,'PCG18-ASSOC','THIRDPARTY',		'428',    '7442', 'Personnel – Charges à payer et produits à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7452,'PCG18-ASSOC','THIRDPARTY',		'4282',    '7451', 'Dettes provisionnées pour congés à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7453,'PCG18-ASSOC','THIRDPARTY',		'4284',    '7451', 'Dettes provisionnées pour participation des salariés aux résultats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7454,'PCG18-ASSOC','THIRDPARTY',		'4286',    '7451', 'Autres charges à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7455,'PCG18-ASSOC','THIRDPARTY',		'4287',    '7451', 'Produits à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7456,'PCG18-ASSOC','THIRDPARTY',		'43',    '7004', 'Legs, donations et assurances-vie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7457,'PCG18-ASSOC','THIRDPARTY',		'431',    '7456', 'Sécurité sociale', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7458,'PCG18-ASSOC','THIRDPARTY',		'437',    '7456', 'Autres organismes sociaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7459,'PCG18-ASSOC','THIRDPARTY',		'438',    '7456', 'Organismes sociaux – Charges à payer et produits à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7460,'PCG18-ASSOC','THIRDPARTY',		'4382',    '7459', 'Charges sociales sur congés à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7461,'PCG18-ASSOC','THIRDPARTY',		'4386',    '7459', 'Autres charges à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7462,'PCG18-ASSOC','THIRDPARTY',		'4387',    '7459', 'Produits à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7463,'PCG18-ASSOC','THIRDPARTY',		'44',    '7004', 'État et autres collectivités publiques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7464,'PCG18-ASSOC','THIRDPARTY',		'441',    '7463', 'État – Subventions à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7465,'PCG18-ASSOC','THIRDPARTY',		'4411',    '7464', 'Subventions d''investissement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7466,'PCG18-ASSOC','THIRDPARTY',		'4417',    '7464', 'Subventions d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7467,'PCG18-ASSOC','THIRDPARTY',		'4418',    '7464', 'Subventions d''équilibre', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7468,'PCG18-ASSOC','THIRDPARTY',		'4419',    '7464', 'Avances sur subventions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7469,'PCG18-ASSOC','THIRDPARTY',		'442',    '7463', 'Etat – Impôts et taxes recouvrables sur des tiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7470,'PCG18-ASSOC','THIRDPARTY',		'4424',    '7469', 'Obligataires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7471,'PCG18-ASSOC','THIRDPARTY',		'4425',    '7469', 'Associés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7472,'PCG18-ASSOC','THIRDPARTY',		'443',    '7463', 'Opérations particulières avec l''Etat les collectivités publiques, les organismes internationaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7473,'PCG18-ASSOC','THIRDPARTY',		'4431',    '7472', 'Créances sur l''Etat résultant de la suppression de la règle du décalage d''un mois en matière de TVA', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7474,'PCG18-ASSOC','THIRDPARTY',		'4438',    '7472', 'Intérêts courus sur créances figurant au 4431', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7475,'PCG18-ASSOC','THIRDPARTY',		'444',    '7463', 'Etat – Impôts sur les bénéfices', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7476,'PCG18-ASSOC','THIRDPARTY',		'445',    '7463', 'Etat – Taxes sur le chiffre d''affaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7477,'PCG18-ASSOC','THIRDPARTY',		'4452',    '7476', 'TVA due intracommunautaire', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7478,'PCG18-ASSOC','THIRDPARTY',		'4455',    '7476', 'Taxes sur le chiffre d''affaires à décaisser', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7479,'PCG18-ASSOC','THIRDPARTY',		'44551',    '7478', 'TVA à décaisser', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7480,'PCG18-ASSOC','THIRDPARTY',		'44558',    '7478', 'Taxes assimilées à la TVA', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7481,'PCG18-ASSOC','THIRDPARTY',		'4456',    '7476', 'Taxes sur le chiffre d''affaires déductibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7482,'PCG18-ASSOC','THIRDPARTY',		'44562',    '7481', 'TVA sur immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7483,'PCG18-ASSOC','THIRDPARTY',		'44563',    '7481', 'TVA transférée par d''autres entreprises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7484,'PCG18-ASSOC','THIRDPARTY',		'44566',    '7481', 'TVA sur autres biens et services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7485,'PCG18-ASSOC','THIRDPARTY',		'44567',    '7481', 'Crédit de TVA à reporter', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7486,'PCG18-ASSOC','THIRDPARTY',		'44568',    '7481', 'Taxes assimilées à la TVA', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7487,'PCG18-ASSOC','THIRDPARTY',		'4457',    '7476', 'Taxes sur le chiffre d''affaires collectées par l''entreprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7488,'PCG18-ASSOC','THIRDPARTY',		'44571',    '7487', 'TVA collectée', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7489,'PCG18-ASSOC','THIRDPARTY',		'44578',    '7487', 'Taxes assimilées à la TVA', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7490,'PCG18-ASSOC','THIRDPARTY',		'4458',    '7476', 'Taxes sur le chiffre d''affaires à régulariser ou en attente', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7491,'PCG18-ASSOC','THIRDPARTY',		'44581',    '7490', 'Acomptes – Régime simplifié d''imposition', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7492,'PCG18-ASSOC','THIRDPARTY',		'44582',    '7490', 'Acomptes – Régime de forfait', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7493,'PCG18-ASSOC','THIRDPARTY',		'44583',    '7490', 'Remboursement de taxes sur le chiffre d''affaires demandé', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7494,'PCG18-ASSOC','THIRDPARTY',		'44584',    '7490', 'TVA récupérée d''avance', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7495,'PCG18-ASSOC','THIRDPARTY',		'44586',    '7490', 'Taxes sur le chiffre d''affaires sur factures non parvenues', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7496,'PCG18-ASSOC','THIRDPARTY',		'44587',    '7490', 'Taxes sur le chiffre d''affaires sur factures à établir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7497,'PCG18-ASSOC','THIRDPARTY',		'446',    '7463', 'Obligations cautionnées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7498,'PCG18-ASSOC','THIRDPARTY',		'447',    '7463', 'Autres impôts, taxes et versements assimilés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7499,'PCG18-ASSOC','THIRDPARTY',		'448',    '7463', 'Etat – Charges à payer et produits à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7500,'PCG18-ASSOC','THIRDPARTY',		'4482',    '7499', 'Charges fiscales sur congés à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7501,'PCG18-ASSOC','THIRDPARTY',		'4486',    '7499', 'Charges à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7502,'PCG18-ASSOC','THIRDPARTY',		'4487',    '7499', 'Produits à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7503,'PCG18-ASSOC','THIRDPARTY',		'449',    '7463', 'Quotas d''émission à acquérir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7504,'PCG18-ASSOC','THIRDPARTY',		'45',    '7004', 'Confédération, fédération, union, entités affiliées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7505,'PCG18-ASSOC','THIRDPARTY',		'451',    '7504', 'Groupe', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7506,'PCG18-ASSOC','THIRDPARTY',		'455',    '7504', 'Associés – Comptes courants', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7507,'PCG18-ASSOC','THIRDPARTY',		'4551',    '7506', 'Principal', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7508,'PCG18-ASSOC','THIRDPARTY',		'4558',    '7506', 'Intérêts courus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7509,'PCG18-ASSOC','THIRDPARTY',		'456',    '7504', 'Associés – Opérations sur le capital', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7510,'PCG18-ASSOC','THIRDPARTY',		'4561',    '7509', 'Associés – Comptes d''apport en société', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7511,'PCG18-ASSOC','THIRDPARTY',		'45611',    '7510', 'Apports en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7512,'PCG18-ASSOC','THIRDPARTY',		'45615',    '7510', 'Apports en numéraire', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7513,'PCG18-ASSOC','THIRDPARTY',		'4562',    '7509', 'Apporteurs – Capital appelé, non versé', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7514,'PCG18-ASSOC','THIRDPARTY',		'45621',    '7513', 'Actionnaires – Capital souscrit et appelé, non versé', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7515,'PCG18-ASSOC','THIRDPARTY',		'45625',    '7513', 'Associés – Capital appelé, non versé', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7516,'PCG18-ASSOC','THIRDPARTY',		'4563',    '7509', 'Associés – Versements reçus sur augmentation de capital', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7517,'PCG18-ASSOC','THIRDPARTY',		'4564',    '7509', 'Associés – Versements anticipés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7518,'PCG18-ASSOC','THIRDPARTY',		'4566',    '7509', 'Actionnaires défaillants', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7519,'PCG18-ASSOC','THIRDPARTY',		'4567',    '7509', 'Associés – Capital à rembourser', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7520,'PCG18-ASSOC','THIRDPARTY',		'457',    '7504', 'Associés – Dividendes à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7521,'PCG18-ASSOC','THIRDPARTY',		'458',    '7504', 'Associés – Opérations faites en commun et en GIE', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7522,'PCG18-ASSOC','THIRDPARTY',		'4581',    '7521', 'Opérations courantes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7523,'PCG18-ASSOC','THIRDPARTY',		'4588',    '7521', 'Intérêts courus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7524,'PCG18-ASSOC','THIRDPARTY',		'46',    '7004', 'Débiteurs et créditeurs divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7525,'PCG18-ASSOC','THIRDPARTY',		'461',    '7524', 'Créances reçues par legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7526,'PCG18-ASSOC','THIRDPARTY',		'462',    '7524', 'Créances sur cessions d''immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7527,'PCG18-ASSOC','THIRDPARTY',		'464',    '7524', 'Dettes sur acquisitions de valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7528,'PCG18-ASSOC','THIRDPARTY',		'465',    '7524', 'Créances sur cessions de valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7529,'PCG18-ASSOC','THIRDPARTY',		'466',    '7524', 'Dettes des legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7530,'PCG18-ASSOC','THIRDPARTY',		'467',    '7524', 'Autres comptes débiteurs ou créditeurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7531,'PCG18-ASSOC','THIRDPARTY',		'468',    '7524', 'Divers – charges à payer et produits à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7532,'PCG18-ASSOC','THIRDPARTY',		'4681',    '7531', 'Frais des bénévoles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7533,'PCG18-ASSOC','THIRDPARTY',		'4686',    '7531', 'Charges à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7534,'PCG18-ASSOC','THIRDPARTY',		'4687',    '7531', 'Produits à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7535,'PCG18-ASSOC','THIRDPARTY',		'47',    '7004', 'Comptes transitoires ou d''attente', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7536,'PCG18-ASSOC','THIRDPARTY',		'471',    '7535', 'Comptes d''attente', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7537,'PCG18-ASSOC','THIRDPARTY',		'472',    '7535', 'Comptes d''attente', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7538,'PCG18-ASSOC','THIRDPARTY',		'473',    '7535', 'Comptes d''attente', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7539,'PCG18-ASSOC','THIRDPARTY',		'474',    '7535', 'Comptes d''attente', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7540,'PCG18-ASSOC','THIRDPARTY',		'475',    '7535', 'Comptes d''attente', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7541,'PCG18-ASSOC','THIRDPARTY',		'476',    '7535', 'Différence de conversion – Actif', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7542,'PCG18-ASSOC','THIRDPARTY',		'4761',    '7541', 'Diminution des créances', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7543,'PCG18-ASSOC','THIRDPARTY',		'4762',    '7541', 'Augmentation des dettes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7544,'PCG18-ASSOC','THIRDPARTY',		'4768',    '7541', 'Différences compensées par couverture de change', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7545,'PCG18-ASSOC','THIRDPARTY',		'477',    '7535', 'Différences de conversion – Passif', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7546,'PCG18-ASSOC','THIRDPARTY',		'4771',    '7545', 'Augmentation des créances', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7547,'PCG18-ASSOC','THIRDPARTY',		'4772',    '7545', 'Diminution des dettes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7548,'PCG18-ASSOC','THIRDPARTY',		'4778',    '7545', 'Différences compensées par couverture de change', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7549,'PCG18-ASSOC','THIRDPARTY',		'478',    '7535', 'Autres comptes transitoires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7550,'PCG18-ASSOC','THIRDPARTY',		'48',    '7004', 'Comptes de régularisation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7551,'PCG18-ASSOC','THIRDPARTY',		'481',    '7550', 'Charges à répartir sur plusieurs exercices', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7552,'PCG18-ASSOC','THIRDPARTY',		'4816',    '7551', 'Frais d''émission des emprunts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7553,'PCG18-ASSOC','THIRDPARTY',		'486',    '7550', 'Charges constatées d''avance', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7554,'PCG18-ASSOC','THIRDPARTY',		'487',    '7550', 'Produits constatés d''avance', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7555,'PCG18-ASSOC','THIRDPARTY',		'488',    '7550', 'Comptes de répartition périodique des charges et des produits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7556,'PCG18-ASSOC','THIRDPARTY',		'4886',    '7555', 'Charges', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7557,'PCG18-ASSOC','THIRDPARTY',		'4887',    '7555', 'Produits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7558,'PCG18-ASSOC','THIRDPARTY',		'49',    '7004', 'Dépréciations des comptes de tiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7559,'PCG18-ASSOC','THIRDPARTY',		'491',    '7558', 'Dépréciations des comptes de clients', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7560,'PCG18-ASSOC','THIRDPARTY',		'495',    '7558', 'Dépréciations des comptes du groupe et des associés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7561,'PCG18-ASSOC','THIRDPARTY',		'4951',    '7560', 'Comptes du groupe', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7562,'PCG18-ASSOC','THIRDPARTY',		'4955',    '7560', 'Comptes courants des associés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7563,'PCG18-ASSOC','THIRDPARTY',		'4958',    '7560', 'Opérations faites en commun et en GIE', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7564,'PCG18-ASSOC','THIRDPARTY',		'496',    '7558', 'Dépréciations des comptes de débiteurs divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7565,'PCG18-ASSOC','THIRDPARTY',		'4962',    '7564', 'Créances sur cessions d''immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7566,'PCG18-ASSOC','THIRDPARTY',		'4965',    '7564', 'Créances sur cessions de valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7567,'PCG18-ASSOC','THIRDPARTY',		'4967',    '7564', 'Autres comptes débiteurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7570,'PCG18-ASSOC','FINAN',		'50',    '7005', 'Valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7571,'PCG18-ASSOC','FINAN',		'501',    '7570', 'Parts dans des entreprises liées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7572,'PCG18-ASSOC','FINAN',		'502',    '7570', 'Actions propres', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7573,'PCG18-ASSOC','FINAN',		'5021',    '7572', 'Actons destinées à être attribuées aux employés et affectées à des plans déterminés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7574,'PCG18-ASSOC','FINAN',		'5022',    '7572', 'Actons disponibles pour être attribuées aux employés ou pour la régularisation des cours de bourse', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7575,'PCG18-ASSOC','FINAN',		'503',    '7570', 'Actions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7576,'PCG18-ASSOC','FINAN',		'5031',    '7575', 'Titres cotés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7577,'PCG18-ASSOC','FINAN',		'5035',    '7575', 'Titres non cotés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7578,'PCG18-ASSOC','FINAN',		'504',    '7570', 'Autres titres conférant un droit de propriété', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7579,'PCG18-ASSOC','FINAN',		'505',    '7570', 'Obligations et bons émis par la société et rachetés par elle', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7580,'PCG18-ASSOC','FINAN',		'506',    '7570', 'Obligations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7581,'PCG18-ASSOC','FINAN',		'5061',    '7580', 'Titres cotés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7582,'PCG18-ASSOC','FINAN',		'5065',    '7580', 'Titres non cotés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7583,'PCG18-ASSOC','FINAN',		'507',    '7570', 'Bons du Trésor et bons de caisse à court terme', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7584,'PCG18-ASSOC','FINAN',		'508',    '7570', 'Autres valeurs mobilières de placement et autres créances assimilées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7585,'PCG18-ASSOC','FINAN',		'5081',    '7584', 'Autres valeurs mobilières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7586,'PCG18-ASSOC','FINAN',		'5082',    '7584', 'Bons de souscription', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7587,'PCG18-ASSOC','FINAN',		'5088',    '7584', 'Intérêts courus sur obligations, bons et valeurs assimilés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7588,'PCG18-ASSOC','FINAN',		'509',    '7570', 'Versements restant à effectuer sur valeurs mobilières de placement non libérées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7589,'PCG18-ASSOC','FINAN',		'51',    '7005', 'Banques, établissements financiers et assimilés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7590,'PCG18-ASSOC','FINAN',		'511',    '7589', 'Valeurs à l''encaissement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7591,'PCG18-ASSOC','FINAN',		'5111',    '7590', 'Coupons échus à l''encaissement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7592,'PCG18-ASSOC','FINAN',		'5112',    '7590', 'Chèques à encaisser', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7593,'PCG18-ASSOC','FINAN',		'5113',    '7590', 'Effets à l''encaissement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7594,'PCG18-ASSOC','FINAN',		'5114',    '7590', 'Effets à l''escompte', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7595,'PCG18-ASSOC','FINAN',		'512',    '7589', 'Banques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7596,'PCG18-ASSOC','FINAN',		'5121',    '7595', 'Comptes en monnaie nationale', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7597,'PCG18-ASSOC','FINAN',		'5124',    '7595', 'Comptes en devises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7598,'PCG18-ASSOC','FINAN',		'514',    '7589', 'Chèques postaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7599,'PCG18-ASSOC','FINAN',		'515',    '7589', 'Caisses du Trésor et des établissements publics', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7600,'PCG18-ASSOC','FINAN',		'516',    '7589', 'Sociétés de bourse', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7601,'PCG18-ASSOC','FINAN',		'517',    '7589', 'Autres organismes financiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7602,'PCG18-ASSOC','FINAN',		'518',    '7589', 'Intérêts courus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7603,'PCG18-ASSOC','FINAN',		'5181',    '7602', 'Intérêts courus à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7604,'PCG18-ASSOC','FINAN',		'5188',    '7602', 'Intérêts courus à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7605,'PCG18-ASSOC','FINAN',		'519',    '7589', 'Concours bancaires courants', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7606,'PCG18-ASSOC','FINAN',		'5191',    '7605', 'Crédit de mobilisation de créances commerciales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7607,'PCG18-ASSOC','FINAN',		'5193',    '7605', 'Mobilisation de créances nées à l''étranger', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7608,'PCG18-ASSOC','FINAN',		'5198',    '7605', 'Intérêts courus sur concours bancaires courants', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7609,'PCG18-ASSOC','FINAN',		'52',    '7005', 'Instruments de trésorerie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7610,'PCG18-ASSOC','FINAN',		'53',    '7005', 'Caisse', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7611,'PCG18-ASSOC','FINAN',		'531',    '7610', 'Caisse siège social', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7612,'PCG18-ASSOC','FINAN',		'5311',    '7611', 'Caisse en monnaie nationale', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7613,'PCG18-ASSOC','FINAN',		'5314',    '7611', 'Caisse en devises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7614,'PCG18-ASSOC','FINAN',		'532',    '7610', 'Caisse succursale (ou usine) A', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7615,'PCG18-ASSOC','FINAN',		'533',    '7610', 'Caisse succursale (ou usine) B', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7616,'PCG18-ASSOC','FINAN',		'54',    '7005', 'Régies d''avance et accréditifs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7617,'PCG18-ASSOC','FINAN',		'58',    '7005', 'Virements internes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7618,'PCG18-ASSOC','FINAN',		'59',    '7005', 'Dépréciations des comptes financiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7619,'PCG18-ASSOC','FINAN',		'590',    '7618', 'Dépréciations des valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7620,'PCG18-ASSOC','FINAN',		'5903',    '7619', 'Actions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7621,'PCG18-ASSOC','FINAN',		'5904',    '7619', 'Autres titres conférant un droit de propriété', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7622,'PCG18-ASSOC','FINAN',		'5906',    '7619', 'Obligations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7623,'PCG18-ASSOC','FINAN',		'5908',    '7619', 'Autres valeurs mobilières de placement et créances assimilées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7625,'PCG18-ASSOC','EXPENSE',		'60',    '7006', 'Achats (sauf 603)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7626,'PCG18-ASSOC','EXPENSE',		'601',    '7625', 'Achats stockés – Matières premières (et fournitures)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7627,'PCG18-ASSOC','EXPENSE',		'6011',    '7626', 'Matières (ou groupe) A', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7628,'PCG18-ASSOC','EXPENSE',		'6012',    '7626', 'Matières (ou groupe) B', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7629,'PCG18-ASSOC','EXPENSE',		'6017',    '7626', 'Fournitures A, B, C,', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7630,'PCG18-ASSOC','EXPENSE',		'602',    '7625', 'Achats stockés – Autres approvisionnements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7631,'PCG18-ASSOC','EXPENSE',		'6021',    '7630', 'Matières consommables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7632,'PCG18-ASSOC','EXPENSE',		'60211',    '7631', 'Matières (ou groupe) C', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7633,'PCG18-ASSOC','EXPENSE',		'60212',    '7631', 'Matières (ou groupe) D', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7634,'PCG18-ASSOC','EXPENSE',		'6022',    '7630', 'Fournitures consommables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7635,'PCG18-ASSOC','EXPENSE',		'60221',    '7634', 'Combustibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7636,'PCG18-ASSOC','EXPENSE',		'60222',    '7634', 'Produits d''entretien', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7637,'PCG18-ASSOC','EXPENSE',		'60223',    '7634', 'Fournitures d''atelier et d''usine', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7638,'PCG18-ASSOC','EXPENSE',		'60224',    '7634', 'Fournitures de magasin', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7639,'PCG18-ASSOC','EXPENSE',		'60225',    '7634', 'Fourniture de bureau', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7640,'PCG18-ASSOC','EXPENSE',		'6026',    '7630', 'Emballages', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7641,'PCG18-ASSOC','EXPENSE',		'60261',    '7640', 'Emballages perdus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7642,'PCG18-ASSOC','EXPENSE',		'60265',    '7640', 'Emballages récupérables non identifiables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7643,'PCG18-ASSOC','EXPENSE',		'60267',    '7640', 'Emballages à usage mixte', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7644,'PCG18-ASSOC','EXPENSE',		'603',    '7625', 'Variations des stocks (approvisionnements et marchandises)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7645,'PCG18-ASSOC','EXPENSE',		'6031',    '7644', 'Variation des stocks de matières premières (et fournitures)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7646,'PCG18-ASSOC','EXPENSE',		'6032',    '7644', 'Variation des stocks des autres approvisionnements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7647,'PCG18-ASSOC','EXPENSE',		'6037',    '7644', 'Variation des stocks de marchandises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7648,'PCG18-ASSOC','EXPENSE',		'604',    '7625', 'Achats d''études et prestations de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7649,'PCG18-ASSOC','EXPENSE',		'605',    '7625', 'Achats de matériel, équipements et travaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7650,'PCG18-ASSOC','EXPENSE',		'606',    '7625', 'Achats non stockés de matière et fournitures', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7651,'PCG18-ASSOC','EXPENSE',		'6061',    '7650', 'Fournitures non stockables (eau, énergie, …)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7652,'PCG18-ASSOC','EXPENSE',		'6063',    '7650', 'Fournitures d''entretien et de petit équipement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7653,'PCG18-ASSOC','EXPENSE',		'6064',    '7650', 'Fournitures administratives', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7654,'PCG18-ASSOC','EXPENSE',		'6068',    '7650', 'Autres matières et fournitures', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7655,'PCG18-ASSOC','EXPENSE',		'607',    '7625', 'Achats de marchandises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7656,'PCG18-ASSOC','EXPENSE',		'6071',    '7655', 'Marchandise (ou groupe) A', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7657,'PCG18-ASSOC','EXPENSE',		'6072',    '7655', 'Marchandise (ou groupe) B', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7658,'PCG18-ASSOC','EXPENSE',		'608',    '7625', '(Compte réservé, le cas échéant, à la récapitulation des frais accessoires incorporés aux achats)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7659,'PCG18-ASSOC','EXPENSE',		'6081',    '7658', 'de matières premières (et fournitures)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7660,'PCG18-ASSOC','EXPENSE',		'6082',    '7658', 'd''autres approvisionnements stockés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7661,'PCG18-ASSOC','EXPENSE',		'6084',    '7658', 'd''études et prestations de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7662,'PCG18-ASSOC','EXPENSE',		'6085',    '7658', 'de matériel, équipements et travaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7663,'PCG18-ASSOC','EXPENSE',		'6086',    '7658', 'd''approvisionnements non stockés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7664,'PCG18-ASSOC','EXPENSE',		'6087',    '7658', 'de marchandises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7665,'PCG18-ASSOC','EXPENSE',		'6088',    '7658', 'Rabais, remises et ristournes non affectés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7666,'PCG18-ASSOC','EXPENSE',		'609',    '7625', 'Rabais, remises et ristournes obtenus sur achats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7667,'PCG18-ASSOC','EXPENSE',		'6091',    '7666', 'de matières premières (et fournitures)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7668,'PCG18-ASSOC','EXPENSE',		'6092',    '7666', 'd''autres approvisionnements stockés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7669,'PCG18-ASSOC','EXPENSE',		'6094',    '7666', 'd''études et prestations de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7670,'PCG18-ASSOC','EXPENSE',		'6095',    '7666', 'de matériel, équipements et travaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7671,'PCG18-ASSOC','EXPENSE',		'6096',    '7666', 'd''approvisionnements non stockés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7672,'PCG18-ASSOC','EXPENSE',		'6097',    '7666', 'de marchandises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7673,'PCG18-ASSOC','EXPENSE',		'6098',    '7666', 'Rabais, remises et ristournes non affectés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7674,'PCG18-ASSOC','EXPENSE',		'61',    '7006', 'Services extérieurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7675,'PCG18-ASSOC','EXPENSE',		'611',    '7674', 'Sous-traitance générale', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7676,'PCG18-ASSOC','EXPENSE',		'612',    '7674', 'Redevances de crédit-bail', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7677,'PCG18-ASSOC','EXPENSE',		'6122',    '7676', 'Crédit-bail mobilier', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7678,'PCG18-ASSOC','EXPENSE',		'6125',    '7676', 'Crédit-bail immobilier', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7679,'PCG18-ASSOC','EXPENSE',		'613',    '7674', 'Locations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7680,'PCG18-ASSOC','EXPENSE',		'6132',    '7679', 'Locations immobilières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7681,'PCG18-ASSOC','EXPENSE',		'6135',    '7679', 'Locations mobilières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7682,'PCG18-ASSOC','EXPENSE',		'6136',    '7679', 'Malis sur emballages', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7683,'PCG18-ASSOC','EXPENSE',		'614',    '7674', 'Charges locatives et de copropriété', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7684,'PCG18-ASSOC','EXPENSE',		'615',    '7674', 'Entretien et réparations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7685,'PCG18-ASSOC','EXPENSE',		'6152',    '7684', 'sur biens immobiliers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7686,'PCG18-ASSOC','EXPENSE',		'6155',    '7684', 'sur biens mobiliers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7687,'PCG18-ASSOC','EXPENSE',		'6156',    '7684', 'Maintenance', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7688,'PCG18-ASSOC','EXPENSE',		'616',    '7674', 'Primes d''assurances', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7689,'PCG18-ASSOC','EXPENSE',		'6161',    '7688', 'Multirisques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7690,'PCG18-ASSOC','EXPENSE',		'6162',    '7688', 'Assurance obligatoire dommage construction', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7691,'PCG18-ASSOC','EXPENSE',		'6163',    '7688', 'Assurance – transport', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7692,'PCG18-ASSOC','EXPENSE',		'61636',    '7691', 'sur achats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7693,'PCG18-ASSOC','EXPENSE',		'61637',    '7691', 'sur ventes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7694,'PCG18-ASSOC','EXPENSE',		'61638',    '7691', 'sur autres biens', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7695,'PCG18-ASSOC','EXPENSE',		'6164',    '7688', 'Risques d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7696,'PCG18-ASSOC','EXPENSE',		'6165',    '7688', 'Insolvabilité clients', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7697,'PCG18-ASSOC','EXPENSE',		'617',    '7674', 'Etudes et recherches', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7698,'PCG18-ASSOC','EXPENSE',		'618',    '7674', 'Divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7699,'PCG18-ASSOC','EXPENSE',		'6181',    '7698', 'Documentation générale', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7700,'PCG18-ASSOC','EXPENSE',		'6183',    '7698', 'Documentation technique', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7701,'PCG18-ASSOC','EXPENSE',		'6185',    '7698', 'Frais de colloques, séminaires, conférences', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7702,'PCG18-ASSOC','EXPENSE',		'619',    '7674', 'Rabais, remises et ristournes obtenus sur services extérieurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7703,'PCG18-ASSOC','EXPENSE',		'62',    '7006', 'Autres services extérieurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7704,'PCG18-ASSOC','EXPENSE',		'621',    '7703', 'Personnel extérieur à l''entreprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7705,'PCG18-ASSOC','EXPENSE',		'6211',    '7704', 'Personnel intérimaire', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7706,'PCG18-ASSOC','EXPENSE',		'6214',    '7704', 'Personnel détaché ou prêté à l''entreprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7707,'PCG18-ASSOC','EXPENSE',		'622',    '7703', 'Rémunérations d''intermédiaires et honoraires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7708,'PCG18-ASSOC','EXPENSE',		'6221',    '7707', 'Commissions et courtages sur achats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7709,'PCG18-ASSOC','EXPENSE',		'6222',    '7707', 'Commissions et courtages sur ventes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7710,'PCG18-ASSOC','EXPENSE',		'6224',    '7707', 'Rémunérations des transitaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7711,'PCG18-ASSOC','EXPENSE',		'6225',    '7707', 'Rémunérations d''affacturage', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7712,'PCG18-ASSOC','EXPENSE',		'6226',    '7707', 'Honoraires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7713,'PCG18-ASSOC','EXPENSE',		'62264',    '7712', 'Honoraires sur legs ou donations destinés à être cédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7714,'PCG18-ASSOC','EXPENSE',		'6227',    '7707', 'Frais d''actes et de contentieux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7715,'PCG18-ASSOC','EXPENSE',		'6228',    '7707', 'Divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7716,'PCG18-ASSOC','EXPENSE',		'623',    '7703', 'Publicité, publications, relations publiques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7717,'PCG18-ASSOC','EXPENSE',		'6231',    '7716', 'Annonces et insertions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7718,'PCG18-ASSOC','EXPENSE',		'6232',    '7716', 'Echantillons', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7719,'PCG18-ASSOC','EXPENSE',		'6233',    '7716', 'Foires et expositions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7720,'PCG18-ASSOC','EXPENSE',		'6234',    '7716', 'Cadeaux à la clientèle', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7721,'PCG18-ASSOC','EXPENSE',		'6235',    '7716', 'Primes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7722,'PCG18-ASSOC','EXPENSE',		'6236',    '7716', 'Catalogues et imprimés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7723,'PCG18-ASSOC','EXPENSE',		'6237',    '7716', 'Publications', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7724,'PCG18-ASSOC','EXPENSE',		'6238',    '7716', 'Divers (pourboires, dons courants, …)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7725,'PCG18-ASSOC','EXPENSE',		'624',    '7703', 'Transports de biens et transports collectifs du personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7726,'PCG18-ASSOC','EXPENSE',		'6241',    '7725', 'Transports sur achats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7727,'PCG18-ASSOC','EXPENSE',		'6242',    '7725', 'Transports sur ventes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7728,'PCG18-ASSOC','EXPENSE',		'6243',    '7725', 'Transports entre établissements ou chantiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7729,'PCG18-ASSOC','EXPENSE',		'6244',    '7725', 'Transports administratifs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7730,'PCG18-ASSOC','EXPENSE',		'6247',    '7725', 'Transports collectifs du personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7731,'PCG18-ASSOC','EXPENSE',		'6248',    '7725', 'Divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7732,'PCG18-ASSOC','EXPENSE',		'625',    '7703', 'Déplacements, missions et réceptions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7733,'PCG18-ASSOC','EXPENSE',		'6251',    '7732', 'Voyages et déplacements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7734,'PCG18-ASSOC','EXPENSE',		'6255',    '7732', 'Frais de déménagement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7735,'PCG18-ASSOC','EXPENSE',		'6256',    '7732', 'Missions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7736,'PCG18-ASSOC','EXPENSE',		'6257',    '7732', 'Réceptions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7737,'PCG18-ASSOC','EXPENSE',		'626',    '7703', 'Frais postaux et de télécommunications', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7738,'PCG18-ASSOC','EXPENSE',		'627',    '7703', 'Services bancaires et assimilés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7739,'PCG18-ASSOC','EXPENSE',		'6271',    '7738', 'Frais sur titres (achat, vente, garde)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7740,'PCG18-ASSOC','EXPENSE',		'6272',    '7738', 'Commissions et frais sur émission d''emprunts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7741,'PCG18-ASSOC','EXPENSE',		'6275',    '7738', 'Frais sur effets', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7742,'PCG18-ASSOC','EXPENSE',		'6276',    '7738', 'Location de coffres', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7743,'PCG18-ASSOC','EXPENSE',		'6278',    '7738', 'Autres frais et commissions sur prestations de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7744,'PCG18-ASSOC','EXPENSE',		'628',    '7703', 'Divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7745,'PCG18-ASSOC','EXPENSE',		'6281',    '7744', 'Concours divers (cotisations, )', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7746,'PCG18-ASSOC','EXPENSE',		'6284',    '7744', 'Frais de recrutement de personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7747,'PCG18-ASSOC','EXPENSE',		'629',    '7703', 'Rabais, remises et ristournes obtenus sur autres services extérieurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7748,'PCG18-ASSOC','EXPENSE',		'63',    '7006', 'Impôts, taxes et versements assimilés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7749,'PCG18-ASSOC','EXPENSE',		'631',    '7748', 'Impôts, taxes et versements assimilés sur rémunérations (administrations des impôts)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7750,'PCG18-ASSOC','EXPENSE',		'6311',    '7749', 'Taxe sur les salaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7751,'PCG18-ASSOC','EXPENSE',		'6312',    '7749', 'Taxe d''apprentissage', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7752,'PCG18-ASSOC','EXPENSE',		'6313',    '7749', 'Participation des employeurs à la formation professionnelle continue', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7753,'PCG18-ASSOC','EXPENSE',		'6314',    '7749', 'Cotisation pour défaut d''investissement obligatoire dans la construction', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7754,'PCG18-ASSOC','EXPENSE',		'6318',    '7749', 'Autres', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7755,'PCG18-ASSOC','EXPENSE',		'633',    '7748', 'Impôts, taxes et versements assimilés sur rémunérations (autres organismes)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7756,'PCG18-ASSOC','EXPENSE',		'6331',    '7755', 'Versement de transport', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7757,'PCG18-ASSOC','EXPENSE',		'6332',    '7755', 'Allocations logement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7758,'PCG18-ASSOC','EXPENSE',		'6333',    '7755', 'Participation des employeurs à la formation professionnelle continue', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7759,'PCG18-ASSOC','EXPENSE',		'6334',    '7755', 'Participation des employeurs à l''effort de construction', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7760,'PCG18-ASSOC','EXPENSE',		'6335',    '7755', 'Versements libératoires ouvrant droit à l''exonération de la taxe d''apprentissage', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7761,'PCG18-ASSOC','EXPENSE',		'6338',    '7755', 'Autres', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7762,'PCG18-ASSOC','EXPENSE',		'635',    '7748', 'Autres impôts, taxes et versements assimilés (administrations des impôts)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7763,'PCG18-ASSOC','EXPENSE',		'6351',    '7762', 'Impôts directs (sauf impôts sur les bénéfices)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7764,'PCG18-ASSOC','EXPENSE',		'63511',    '7763', 'Contribution économique territoriale', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7765,'PCG18-ASSOC','EXPENSE',		'63512',    '7763', 'Taxes foncières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7766,'PCG18-ASSOC','EXPENSE',		'63513',    '7763', 'Autres impôts locaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7767,'PCG18-ASSOC','EXPENSE',		'63514',    '7763', 'Taxe sur les véhicules des sociétés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7768,'PCG18-ASSOC','EXPENSE',		'6352',    '7762', 'Taxe sur le chiffre d''affaires non récupérables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7769,'PCG18-ASSOC','EXPENSE',		'6353',    '7762', 'Impôts indirects', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7770,'PCG18-ASSOC','EXPENSE',		'6354',    '7762', 'Droits d''enregistrement et de timbre', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7771,'PCG18-ASSOC','EXPENSE',		'63541',    '7770', 'Droits de mutation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7772,'PCG18-ASSOC','EXPENSE',		'6358',    '7762', 'Autres droits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7773,'PCG18-ASSOC','EXPENSE',		'637',    '7748', 'Autres impôts, taxes et versements assimilés (autres organismes)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7774,'PCG18-ASSOC','EXPENSE',		'6371',    '7773', 'Contribution sociale de solidarité à la charge des sociétés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7775,'PCG18-ASSOC','EXPENSE',		'6372',    '7773', 'Taxes perçues par les organismes publics internationaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7776,'PCG18-ASSOC','EXPENSE',		'6374',    '7773', 'Impôts et taxes exigibles à l''Etranger', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7777,'PCG18-ASSOC','EXPENSE',		'6378',    '7773', 'Taxes diverses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7778,'PCG18-ASSOC','EXPENSE',		'64',    '7006', 'Charges de personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7779,'PCG18-ASSOC','EXPENSE',		'641',    '7778', 'Rémunérations du personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7780,'PCG18-ASSOC','EXPENSE',		'6411',    '7779', 'Salaires, appointements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7781,'PCG18-ASSOC','EXPENSE',		'6412',    '7779', 'Congés payés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7782,'PCG18-ASSOC','EXPENSE',		'6413',    '7779', 'Primes et gratifications', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7783,'PCG18-ASSOC','EXPENSE',		'6414',    '7779', 'Indemnités et avantages divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7784,'PCG18-ASSOC','EXPENSE',		'6415',    '7779', 'Supplément familial', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7785,'PCG18-ASSOC','EXPENSE',		'644',    '7778', 'Rémunération du travail de l''exploitant', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7786,'PCG18-ASSOC','EXPENSE',		'645',    '7778', 'Charges de sécurité sociale et de prévoyance', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7787,'PCG18-ASSOC','EXPENSE',		'6451',    '7786', 'Cotisations à l''URSSAF', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7788,'PCG18-ASSOC','EXPENSE',		'6452',    '7786', 'Cotisations aux mutuelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7789,'PCG18-ASSOC','EXPENSE',		'6453',    '7786', 'Cotisations aux caisses de retraites', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7790,'PCG18-ASSOC','EXPENSE',		'6454',    '7786', 'Cotisations aux ASSEDIC', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7791,'PCG18-ASSOC','EXPENSE',		'6458',    '7786', 'Cotisations aux autres organismes sociaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7792,'PCG18-ASSOC','EXPENSE',		'646',    '7778', 'Cotisations sociales personnelles de l''exploitant', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7793,'PCG18-ASSOC','EXPENSE',		'647',    '7778', 'Autres charges sociales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7794,'PCG18-ASSOC','EXPENSE',		'6471',    '7793', 'Prestations directes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7795,'PCG18-ASSOC','EXPENSE',		'6472',    '7793', 'Versements aux comités d''entreprise et d''établissement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7796,'PCG18-ASSOC','EXPENSE',		'6473',    '7793', 'Versements aux comités d''hygiène et de sécurité', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7797,'PCG18-ASSOC','EXPENSE',		'6474',    '7793', 'Versements aux autres œuvres sociales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7798,'PCG18-ASSOC','EXPENSE',		'6475',    '7793', 'Médecine du travail, pharmacie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7799,'PCG18-ASSOC','EXPENSE',		'648',    '7778', 'Autres charges de personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7800,'PCG18-ASSOC','EXPENSE',		'65',    '7006', 'Autres charges de gestion courante', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7801,'PCG18-ASSOC','EXPENSE',		'651',    '7800', 'Redevances pour concessions, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7802,'PCG18-ASSOC','EXPENSE',		'6511',    '7801', 'Redevances pour concessions, brevets, licences, marques, procédés, logiciels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7803,'PCG18-ASSOC','EXPENSE',		'6516',    '7801', 'Droits d''auteur et de reproduction', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7804,'PCG18-ASSOC','EXPENSE',		'6518',    '7801', 'Autres droits et valeurs similaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7805,'PCG18-ASSOC','EXPENSE',		'653',    '7800', 'Charges de la générosité du public', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7806,'PCG18-ASSOC','EXPENSE',		'6531',    '7805', 'Autres charges sur legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7807,'PCG18-ASSOC','EXPENSE',		'654',    '7800', 'Pertes sur créances irrécouvrables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7808,'PCG18-ASSOC','EXPENSE',		'6541',    '7807', 'Créances de l''exercice', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7809,'PCG18-ASSOC','EXPENSE',		'6544',    '7807', 'Créances des exercices antérieurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7810,'PCG18-ASSOC','EXPENSE',		'655',    '7800', 'Quote-part de résultat sur opérations faites en commun', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7811,'PCG18-ASSOC','EXPENSE',		'6551',    '7810', 'Quote-part de bénéfice transférée (comptabilité du gérant)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7812,'PCG18-ASSOC','EXPENSE',		'6555',    '7810', 'Quote-part de perte supportée (comptabilité des associés non gérants)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7813,'PCG18-ASSOC','EXPENSE',		'657',    '7800', 'Aides financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7814,'PCG18-ASSOC','EXPENSE',		'6571',    '7813', 'Aides financières octroyées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7815,'PCG18-ASSOC','EXPENSE',		'6572',    '7813', 'Quotes-parts de générosité reversée', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7816,'PCG18-ASSOC','EXPENSE',		'658',    '7800', 'Charges diverses de gestion courante', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7817,'PCG18-ASSOC','EXPENSE',		'66',    '7006', 'Charges financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7818,'PCG18-ASSOC','EXPENSE',		'661',    '7817', 'Charges d''intérêts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7819,'PCG18-ASSOC','EXPENSE',		'6611',    '7818', 'Intérêts des emprunts et dettes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7820,'PCG18-ASSOC','EXPENSE',		'66116',    '7819', 'des emprunts et dettes assimilées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7821,'PCG18-ASSOC','EXPENSE',		'66117',    '7819', 'des dettes rattachées à des participations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7822,'PCG18-ASSOC','EXPENSE',		'6612',    '7818', 'Charges de la fiducie, résultat de la période', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7823,'PCG18-ASSOC','EXPENSE',		'6615',    '7818', 'Intérêts des comptes courants et des dépôts créditeurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7824,'PCG18-ASSOC','EXPENSE',		'6616',    '7818', 'Intérêts bancaires et sur opérations de financement (escompte,…)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7825,'PCG18-ASSOC','EXPENSE',		'6617',    '7818', 'Intérêts des obligations cautionnées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7826,'PCG18-ASSOC','EXPENSE',		'6618',    '7818', 'Intérêts des autres dettes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7827,'PCG18-ASSOC','EXPENSE',		'66181',    '7826', 'des dettes commerciales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7828,'PCG18-ASSOC','EXPENSE',		'66188',    '7826', 'des dettes diverses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7829,'PCG18-ASSOC','EXPENSE',		'664',    '7817', 'Pertes sur créances liées à des participations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7830,'PCG18-ASSOC','EXPENSE',		'665',    '7817', 'Escomptes accordés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7831,'PCG18-ASSOC','EXPENSE',		'666',    '7817', 'Pertes de change', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7832,'PCG18-ASSOC','EXPENSE',		'667',    '7817', 'Charges nettes sur cessions de valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7833,'PCG18-ASSOC','EXPENSE',		'668',    '7817', 'Autres charges financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7834,'PCG18-ASSOC','EXPENSE',		'67',    '7006', 'Charges exceptionnelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7835,'PCG18-ASSOC','EXPENSE',		'671',    '7834', 'Charges exceptionnelles sur opérations de gestion', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7836,'PCG18-ASSOC','EXPENSE',		'6711',    '7835', 'Pénalités sur marchés (et dédits payés sur achats et ventes)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7837,'PCG18-ASSOC','EXPENSE',		'6712',    '7835', 'Pénalités, amendes fiscales et pénales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7838,'PCG18-ASSOC','EXPENSE',		'6713',    '7835', 'Dons, libéralités', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7839,'PCG18-ASSOC','EXPENSE',		'6714',    '7835', 'Créances devenues irrécouvrables dans l''exercice', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7840,'PCG18-ASSOC','EXPENSE',		'6715',    '7835', 'Subventions accordées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7841,'PCG18-ASSOC','EXPENSE',		'6717',    '7835', 'Rappel d''impôts (autres qu''impôts sur les bénéfices)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7842,'PCG18-ASSOC','EXPENSE',		'6718',    '7835', 'Autres charges exceptionnelles sur opérations de gestion', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7843,'PCG18-ASSOC','EXPENSE',		'672',    '7834', '(Compte à la disposition des entités pour enregistrer, en cours d''exercice, les charges sur exercices antérieurs)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7844,'PCG18-ASSOC','EXPENSE',		'673',    '7834', 'Apports ou affectations en numéraire', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7845,'PCG18-ASSOC','EXPENSE',		'674',    '7834', 'Opérations de constitution ou liquidation des fiducies', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7846,'PCG18-ASSOC','EXPENSE',		'6741',    '7845', 'Opérations liées à la constitution de fiducie – Transfert des éléments', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7847,'PCG18-ASSOC','EXPENSE',		'6742',    '7845', 'Opérations liées à la liquidation de la fiducie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7848,'PCG18-ASSOC','EXPENSE',		'675',    '7834', 'Valeurs comptables des éléments d''actifs cédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7849,'PCG18-ASSOC','EXPENSE',		'6751',    '7848', 'Immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7850,'PCG18-ASSOC','EXPENSE',		'6752',    '7848', 'Immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7851,'PCG18-ASSOC','EXPENSE',		'6754',    '7848', 'Immobilisations reçues par legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7852,'PCG18-ASSOC','EXPENSE',		'6756',    '7848', 'Immobilisations financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7853,'PCG18-ASSOC','EXPENSE',		'6758',    '7848', 'Autres éléments d''actif', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7854,'PCG18-ASSOC','EXPENSE',		'678',    '7834', 'Autres charges exceptionnelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7855,'PCG18-ASSOC','EXPENSE',		'6781',    '7854', 'Malis provenant de clauses d''indexation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7856,'PCG18-ASSOC','EXPENSE',		'6782',    '7854', 'Lots', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7857,'PCG18-ASSOC','EXPENSE',		'6783',    '7854', 'Malis provenant du rachat par l''entreprise d''actions et obligations émises par ellemême', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7858,'PCG18-ASSOC','EXPENSE',		'6788',    '7854', 'Charges exceptionnelles diverses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7859,'PCG18-ASSOC','EXPENSE',		'68',    '7006', 'Dotations aux amortissements, provisions et engagements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7860,'PCG18-ASSOC','EXPENSE',		'681',    '7859', 'Dotations aux amortissements, aux dépréciations et aux provisions – Charges d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7861,'PCG18-ASSOC','EXPENSE',		'6811',    '7860', 'Dotations aux amortissements sur immobilisations incorporelles et corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7862,'PCG18-ASSOC','EXPENSE',		'68111',    '7861', 'Immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7863,'PCG18-ASSOC','EXPENSE',		'68112',    '7861', 'Immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7864,'PCG18-ASSOC','EXPENSE',		'6812',    '7860', 'Dotations aux amortissements des charges d''exploitation à répartir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7865,'PCG18-ASSOC','EXPENSE',		'6815',    '7860', 'Dotations aux provisions d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7866,'PCG18-ASSOC','EXPENSE',		'6816',    '7860', 'Dotations pour dépréciations des immobilisations incorporelles et corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7867,'PCG18-ASSOC','EXPENSE',		'68161',    '7866', 'Immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7868,'PCG18-ASSOC','EXPENSE',		'68162',    '7866', 'Immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7869,'PCG18-ASSOC','EXPENSE',		'68164',    '7866', 'Dotations pour dépréciation d''actifs reçus par legs ou donations destinés à être cédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7870,'PCG18-ASSOC','EXPENSE',		'6817',    '7860', 'Dotations pour dépréciations des actifs circulants', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7871,'PCG18-ASSOC','EXPENSE',		'68173',    '7870', 'Stocks et en-cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7872,'PCG18-ASSOC','EXPENSE',		'68174',    '7870', 'Créances', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7873,'PCG18-ASSOC','EXPENSE',		'686',    '7859', 'Dotations aux amortissements, aux dépréciations et aux provisions – Charges financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7874,'PCG18-ASSOC','EXPENSE',		'6861',    '7873', 'Dotations aux amortissements des primes de remboursement des obligations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7875,'PCG18-ASSOC','EXPENSE',		'6865',    '7873', 'Dotations aux provisions financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7876,'PCG18-ASSOC','EXPENSE',		'6866',    '7873', 'Dotations pour dépréciations des éléments financiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7877,'PCG18-ASSOC','EXPENSE',		'68662',    '7876', 'Immobilisations financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7878,'PCG18-ASSOC','EXPENSE',		'68665',    '7876', 'Valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7879,'PCG18-ASSOC','EXPENSE',		'6868',    '7873', 'Autres dotations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7880,'PCG18-ASSOC','EXPENSE',		'687',    '7859', 'Dotations aux amortissements, aux dépréciations et aux provisions – Charges exceptionnelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7881,'PCG18-ASSOC','EXPENSE',		'6871',    '7880', 'Dotations aux amortissements exceptionnels des immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7882,'PCG18-ASSOC','EXPENSE',		'6872',    '7880', 'Dotations aux provisions réglementées (immobilisations)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7883,'PCG18-ASSOC','EXPENSE',		'68725',    '7882', 'Amortissements dérogatoires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7884,'PCG18-ASSOC','EXPENSE',		'6873',    '7880', 'Dotations aux provisions réglementées (stocks)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7885,'PCG18-ASSOC','EXPENSE',		'6874',    '7880', 'Dotations aux autres provisions réglementées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7886,'PCG18-ASSOC','EXPENSE',		'6875',    '7880', 'Dotations aux provisions exceptionnelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7887,'PCG18-ASSOC','EXPENSE',		'6876',    '7880', 'Dotations pour dépréciations exceptionnelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7888,'PCG18-ASSOC','EXPENSE',		'689',    '7859', 'Reports en fonds dédiés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7889,'PCG18-ASSOC','EXPENSE',		'6891',    '7888', 'Reports en fonds reportés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7890,'PCG18-ASSOC','EXPENSE',		'6894',    '7888', 'Reports en fonds dédiés sur subventions d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7891,'PCG18-ASSOC','EXPENSE',		'6895',    '7888', 'Reports en fonds dédiés sur contributions financières d''autres organismes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7892,'PCG18-ASSOC','EXPENSE',		'6896',    '7888', 'Reports en fonds dédiés sur ressources liées à la générosité du public', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7893,'PCG18-ASSOC','EXPENSE',		'69',    '7006', 'Participation des salariés – Impôts sur les bénéfices et assimilés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7894,'PCG18-ASSOC','EXPENSE',		'691',    '7893', 'Participation des salariés aux résultats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7895,'PCG18-ASSOC','EXPENSE',		'695',    '7893', 'Impôts sur les bénéfices', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7896,'PCG18-ASSOC','EXPENSE',		'6951',    '7895', 'Impôts dus en France', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7897,'PCG18-ASSOC','EXPENSE',		'6952',    '7895', 'Contribution additionnelle à l''impôt sur les bénéfices', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7898,'PCG18-ASSOC','EXPENSE',		'6954',    '7895', 'Impôts dus à l''étranger', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7899,'PCG18-ASSOC','EXPENSE',		'696',    '7893', 'Suppléments d''impôt sur les sociétés liés aux distributions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7900,'PCG18-ASSOC','EXPENSE',		'698',    '7893', 'Intégration fiscale', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7901,'PCG18-ASSOC','EXPENSE',		'6981',    '7900', 'Intégration fiscale – Charges', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7902,'PCG18-ASSOC','EXPENSE',		'6989',    '7900', 'Intégration fiscale – Produits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7903,'PCG18-ASSOC','EXPENSE',		'699',    '7893', 'Produits – Reports en arrière des déficits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7905,'PCG18-ASSOC','INCOME',		'70',    '7007', 'Ventes de produits fabriqués, prestations de services, marchandises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7906,'PCG18-ASSOC','INCOME',		'701',    '7905', 'Ventes de produits finis', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7907,'PCG18-ASSOC','INCOME',		'7011',    '7906', 'Produits finis (ou groupe) A', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7908,'PCG18-ASSOC','INCOME',		'7012',    '7906', 'Produits finis (ou groupe) B', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7909,'PCG18-ASSOC','INCOME',		'702',    '7905', 'Ventes de produits intermédiaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7910,'PCG18-ASSOC','INCOME',		'703',    '7905', 'Ventes de produits résiduels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7911,'PCG18-ASSOC','INCOME',		'704',    '7905', 'Travaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7912,'PCG18-ASSOC','INCOME',		'7041',    '7911', 'Travaux de catégorie (ou activité) A', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7913,'PCG18-ASSOC','INCOME',		'7042',    '7911', 'Travaux de catégorie (ou activité) B', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7914,'PCG18-ASSOC','INCOME',		'705',    '7905', 'Etudes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7915,'PCG18-ASSOC','INCOME',		'706',    '7905', 'Ventes de prestations de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7916,'PCG18-ASSOC','INCOME',		'7063',    '7915', 'Parrainages', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7917,'PCG18-ASSOC','INCOME',		'707',    '7905', 'Ventes de marchandises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7918,'PCG18-ASSOC','INCOME',		'7071',    '7917', 'Marchandises (ou groupe) A', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7919,'PCG18-ASSOC','INCOME',		'7072',    '7917', 'Marchandises (ou groupe) B', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7920,'PCG18-ASSOC','INCOME',		'7073',    '7917', 'Ventes de dons en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7921,'PCG18-ASSOC','INCOME',		'708',    '7905', 'Produits des activités annexes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7922,'PCG18-ASSOC','INCOME',		'7081',    '7921', 'Produits des services exploités dans l''intérêt du personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7923,'PCG18-ASSOC','INCOME',		'7082',    '7921', 'Commissions et courtages', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7924,'PCG18-ASSOC','INCOME',		'7083',    '7921', 'Locations diverses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7925,'PCG18-ASSOC','INCOME',		'7084',    '7921', 'Mise à disposition de personnel facturée', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7926,'PCG18-ASSOC','INCOME',		'7085',    '7921', 'Ports et frais accessoires facturés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7927,'PCG18-ASSOC','INCOME',		'7086',    '7921', 'Bonis sur reprises d''emballages consignés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7928,'PCG18-ASSOC','INCOME',		'7087',    '7921', 'Bonifications obtenues des clients et primes sur ventes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7929,'PCG18-ASSOC','INCOME',		'7088',    '7921', 'Autres produits d''activités annexes (cessions d''approvisionnements,)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7930,'PCG18-ASSOC','INCOME',		'709',    '7905', 'Rabais, remises et ristournes accordés par l''entreprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7931,'PCG18-ASSOC','INCOME',		'7091',    '7930', 'sur ventes de produits finis', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7932,'PCG18-ASSOC','INCOME',		'7092',    '7930', 'sur ventes de produits intermédiaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7933,'PCG18-ASSOC','INCOME',		'7094',    '7930', 'sur travaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7934,'PCG18-ASSOC','INCOME',		'7095',    '7930', 'sur études', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7935,'PCG18-ASSOC','INCOME',		'7096',    '7930', 'sur prestations de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7936,'PCG18-ASSOC','INCOME',		'7097',    '7930', 'sur ventes de marchandises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7937,'PCG18-ASSOC','INCOME',		'7098',    '7930', 'sur produits des activités annexes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7938,'PCG18-ASSOC','INCOME',		'71',    '7007', 'Production stockée (ou déstockage)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7939,'PCG18-ASSOC','INCOME',		'713',    '7938', 'Variation des stocks (en-cours de production, produits)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7940,'PCG18-ASSOC','INCOME',		'7133',    '7939', 'Variation des en-cours de production de biens', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7941,'PCG18-ASSOC','INCOME',		'71331',    '7940', 'Produits en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7942,'PCG18-ASSOC','INCOME',		'71335',    '7940', 'Travaux en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7943,'PCG18-ASSOC','INCOME',		'7134',    '7939', 'Variation des en-cours de production de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7944,'PCG18-ASSOC','INCOME',		'71341',    '7943', 'Etudes en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7945,'PCG18-ASSOC','INCOME',		'71345',    '7943', 'Prestations de services en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7946,'PCG18-ASSOC','INCOME',		'7135',    '7939', 'Variation des stocks de produits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7947,'PCG18-ASSOC','INCOME',		'71351',    '7946', 'Produits intermédiaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7948,'PCG18-ASSOC','INCOME',		'71355',    '7946', 'Produits finis', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7949,'PCG18-ASSOC','INCOME',		'71358',    '7946', 'Produits résiduels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7950,'PCG18-ASSOC','INCOME',		'72',    '7007', 'Production immobilisée', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7951,'PCG18-ASSOC','INCOME',		'721',    '7950', 'Immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7952,'PCG18-ASSOC','INCOME',		'722',    '7950', 'Immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7953,'PCG18-ASSOC','INCOME',		'73',    '7007', 'Concours publics', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7954,'PCG18-ASSOC','INCOME',		'74',    '7007', 'Subventions d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7955,'PCG18-ASSOC','INCOME',		'75',    '7007', 'Autres produits de gestion courante', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7956,'PCG18-ASSOC','INCOME',		'751',    '7955', 'Redevances pour concessions, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7957,'PCG18-ASSOC','INCOME',		'7511',    '7956', 'Redevances pour concessions, brevets, licences, marques, procédés, logiciels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7958,'PCG18-ASSOC','INCOME',		'7516',    '7956', 'Droits d''auteur et de reproduction', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7959,'PCG18-ASSOC','INCOME',		'7518',    '7956', 'Autres droits et valeurs similaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7960,'PCG18-ASSOC','INCOME',		'752',    '7955', 'Revenus des immeubles non affectés à des activités professionnelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7961,'PCG18-ASSOC','INCOME',		'753',    '7955', 'Versements des fondateurs ou consommation de la dotation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7962,'PCG18-ASSOC','INCOME',		'7531',    '7961', 'Versements des fondateurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7963,'PCG18-ASSOC','INCOME',		'7532',    '7961', 'Quotes-parts de dotation consomptible virée au compte de résultat', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7964,'PCG18-ASSOC','INCOME',		'754',    '7955', 'Ressources liées à la générosité du public', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7965,'PCG18-ASSOC','INCOME',		'7541',    '7964', 'Dons manuels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7966,'PCG18-ASSOC','INCOME',		'75411',    '7965', 'Dons manuels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7967,'PCG18-ASSOC','INCOME',		'75412',    '7965', 'Abandons de frais par les bénévoles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7968,'PCG18-ASSOC','INCOME',		'7542',    '7964', 'Mécénats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7969,'PCG18-ASSOC','INCOME',		'75431',    '7964', 'Assurances-vie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7970,'PCG18-ASSOC','INCOME',		'75432',    '7964', 'Legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7971,'PCG18-ASSOC','INCOME',		'75433',    '7964', 'Autres produits sur legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7972,'PCG18-ASSOC','INCOME',		'755',    '7955', 'Contributions financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7973,'PCG18-ASSOC','INCOME',		'7551',    '7972', 'Contributions financières d''autres organismes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7974,'PCG18-ASSOC','INCOME',		'7552',    '7972', 'Quotes-parts de générosité reçues', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7975,'PCG18-ASSOC','INCOME',		'7555',    '7972', 'Quote-part de bénéfice attribuée (comptabilité des associés non – gérants)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7976,'PCG18-ASSOC','INCOME',		'756',    '7955', 'Cotisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7977,'PCG18-ASSOC','INCOME',		'7561',    '7976', 'Cotisations sans contrepartie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7978,'PCG18-ASSOC','INCOME',		'7562',    '7976', 'Cotisations avec contrepartie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7979,'PCG18-ASSOC','INCOME',		'757',    '7955', 'Gains de change sur créances et dettes d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7980,'PCG18-ASSOC','INCOME',		'758',    '7955', 'Produits divers de gestion courante', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7981,'PCG18-ASSOC','INCOME',		'76',    '7007', 'Produits financiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7982,'PCG18-ASSOC','INCOME',		'761',    '7981', 'Produits de participations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7983,'PCG18-ASSOC','INCOME',		'7611',    '7982', 'Revenus des titres de participation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7984,'PCG18-ASSOC','INCOME',		'7612',    '7982', 'Produits de la fiducie, résultat de la période', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7985,'PCG18-ASSOC','INCOME',		'7616',    '7982', 'Revenus sur autres formes de participation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7986,'PCG18-ASSOC','INCOME',		'7617',    '7982', 'Revenus des créances rattachées à des participations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7987,'PCG18-ASSOC','INCOME',		'762',    '7981', 'Produits des autres immobilisations financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7988,'PCG18-ASSOC','INCOME',		'7621',    '7987', 'Revenus des titres immobilisés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7989,'PCG18-ASSOC','INCOME',		'7626',    '7987', 'Revenus des prêts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7990,'PCG18-ASSOC','INCOME',		'7627',    '7987', 'Revenus des créances immobilisées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7991,'PCG18-ASSOC','INCOME',		'763',    '7981', 'Revenus des autres créances', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7992,'PCG18-ASSOC','INCOME',		'7631',    '7991', 'Revenus des créances commerciales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7993,'PCG18-ASSOC','INCOME',		'7638',    '7991', 'Revenus des créances diverses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7994,'PCG18-ASSOC','INCOME',		'764',    '7981', 'Revenus des valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7995,'PCG18-ASSOC','INCOME',		'765',    '7981', 'Escomptes obtenus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7996,'PCG18-ASSOC','INCOME',		'766',    '7981', 'Gains de change', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7997,'PCG18-ASSOC','INCOME',		'767',    '7981', 'Produits nets sur cessions de valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7998,'PCG18-ASSOC','INCOME',		'768',    '7981', 'Autres produits financiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7999,'PCG18-ASSOC','INCOME',		'77',    '7007', 'Produits exceptionnels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8000,'PCG18-ASSOC','INCOME',		'771',    '7999', 'Produits exceptionnels sur opérations de gestion', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8001,'PCG18-ASSOC','INCOME',		'7711',    '8000', 'Dédits et pénalités perçus sur achats et sur ventes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8002,'PCG18-ASSOC','INCOME',		'7713',    '8000', 'Libéralités reçues', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8003,'PCG18-ASSOC','INCOME',		'7714',    '8000', 'Rentrées sur créances amorties', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8004,'PCG18-ASSOC','INCOME',		'7715',    '8000', 'Subventions d''équilibre', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8005,'PCG18-ASSOC','INCOME',		'7717',    '8000', 'Dégrèvements d''impôts autres qu''impôts sur les bénéfices', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8006,'PCG18-ASSOC','INCOME',		'7718',    '8000', 'Autres produits exceptionnels sur opérations de gestion', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8007,'PCG18-ASSOC','INCOME',		'772',    '7999', '(Compte à la disposition des entités pour enregistrer, en cours d''exercice, les produits sur exercices antérieurs)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8008,'PCG18-ASSOC','INCOME',		'774',    '7999', 'Opérations de constitution ou liquidation des fiducies', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8009,'PCG18-ASSOC','INCOME',		'7741',    '8008', 'Opérations liées à la constitution de fiducie – Transfert des éléments', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8010,'PCG18-ASSOC','INCOME',		'7742',    '8008', 'Opérations liées à la liquidation de la fiducie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8011,'PCG18-ASSOC','INCOME',		'775',    '7999', 'Produits des cessions d''éléments d''actifs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8012,'PCG18-ASSOC','INCOME',		'7751',    '8011', 'Immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8013,'PCG18-ASSOC','INCOME',		'7752',    '8011', 'Immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8014,'PCG18-ASSOC','INCOME',		'7754',    '8011', 'Immobilisations reçues en legs ou donations destinées à être cédées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8015,'PCG18-ASSOC','INCOME',		'7756',    '8011', 'Immobilisations financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8016,'PCG18-ASSOC','INCOME',		'7758',    '8011', 'Autres éléments d''actif', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8017,'PCG18-ASSOC','INCOME',		'777',    '7999', 'Quote-part des subventions d''investissement virée au résultat de l''exercice', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8018,'PCG18-ASSOC','INCOME',		'778',    '7999', 'Autres produits exceptionnels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8019,'PCG18-ASSOC','INCOME',		'7781',    '8018', 'Bonis provenant de clauses d''indexation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8020,'PCG18-ASSOC','INCOME',		'7782',    '8018', 'Lots', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8021,'PCG18-ASSOC','INCOME',		'7783',    '8018', 'Bonis provenant du rachat par l''entreprise d''actions et d''obligations émises par elle-même', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8022,'PCG18-ASSOC','INCOME',		'7788',    '8018', 'Produits exceptionnels divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8023,'PCG18-ASSOC','INCOME',		'78',    '7007', 'Reprises sur amortissements, dépréciations et provisions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8024,'PCG18-ASSOC','INCOME',		'781',    '8023', 'Reprises sur amortissements des immobilisations dépréciations et provisions (à inscrire dans les produits d''exploitation)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8025,'PCG18-ASSOC','INCOME',		'7811',    '8024', 'Reprises sur amortissements des immobilisations incorporelles et corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8026,'PCG18-ASSOC','INCOME',		'78111',    '8025', 'Immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8027,'PCG18-ASSOC','INCOME',		'78112',    '8025', 'Immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8028,'PCG18-ASSOC','INCOME',		'7815',    '8024', 'Reprises sur provisions d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8029,'PCG18-ASSOC','INCOME',		'7816',    '8024', 'Reprises sur dépréciations des immobilisations incorporelles et corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8030,'PCG18-ASSOC','INCOME',		'78161',    '8029', 'Immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8031,'PCG18-ASSOC','INCOME',		'78162',    '8029', 'Immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8032,'PCG18-ASSOC','INCOME',		'78164',    '8029', 'Reprises sur dépréciations d''actifs reçus par legs ou donations destinés à être cédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8033,'PCG18-ASSOC','INCOME',		'7817',    '8024', 'Reprises sur dépréciations des actifs circulants', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8034,'PCG18-ASSOC','INCOME',		'78173',    '8033', 'Stocks et en-cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8035,'PCG18-ASSOC','INCOME',		'78174',    '8033', 'Créances', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8036,'PCG18-ASSOC','INCOME',		'786',    '8023', 'Reprises sur provisions pour risques et dépréciations (à inscrire dans les produits financiers)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8037,'PCG18-ASSOC','INCOME',		'7865',    '8036', 'Reprises sur provisions financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8038,'PCG18-ASSOC','INCOME',		'7866',    '8036', 'Reprises sur dépréciations des éléments financiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8039,'PCG18-ASSOC','INCOME',		'78662',    '8038', 'Immobilisations financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8040,'PCG18-ASSOC','INCOME',		'78665',    '8038', 'Valeurs mobilières de placements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8041,'PCG18-ASSOC','INCOME',		'787',    '8023', 'Reprises sur provisions et dépréciations (à inscrire dans les produits exceptionnels)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8042,'PCG18-ASSOC','INCOME',		'7872',    '8041', 'Reprises sur provisions réglementées (immobilisations)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8043,'PCG18-ASSOC','INCOME',		'78725',    '8042', 'Amortissements dérogatoires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8044,'PCG18-ASSOC','INCOME',		'78726',    '8042', 'Provision spéciale de réévaluation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8045,'PCG18-ASSOC','INCOME',		'78727',    '8042', 'Plus-values réinvesties', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8046,'PCG18-ASSOC','INCOME',		'7873',    '8041', 'Reprises sur provisions réglementées (stocks)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8047,'PCG18-ASSOC','INCOME',		'7874',    '8041', 'Reprises sur autres provisions réglementées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8048,'PCG18-ASSOC','INCOME',		'7875',    '8041', 'Reprises sur provisions exceptionnelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8049,'PCG18-ASSOC','INCOME',		'7876',    '8041', 'Reprises sur dépréciations exceptionnelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8050,'PCG18-ASSOC','INCOME',		'789',    '8023', 'Utilisations de fonds reportés et de fonds dédiés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8051,'PCG18-ASSOC','INCOME',		'7891',    '8050', 'Utilisations de fonds reportés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8052,'PCG18-ASSOC','INCOME',		'7894',    '8050', 'Utilisations des fonds dédiés sur subventions d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8053,'PCG18-ASSOC','INCOME',		'7895',    '8050', 'Utilisations des fonds dédiés sur contributions financières d''autres organismes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8054,'PCG18-ASSOC','INCOME',		'7896',    '8050', 'Utilisations des fonds dédiés sur ressources liées à la générosité du public', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8055,'PCG18-ASSOC','INCOME',		'79',    '7007', 'Transferts de charges', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8056,'PCG18-ASSOC','INCOME',		'791',    '8055', 'Transferts de charges d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8057,'PCG18-ASSOC','INCOME',		'796',    '8055', 'Transferts de charges financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8058,'PCG18-ASSOC','INCOME',		'797',    '8055', 'Transferts de charges exceptionnelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8060,'PCG18-ASSOC','SPECIAL',		'86',    '7008', 'Emplois des contributions volontaires en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8061,'PCG18-ASSOC','SPECIAL',		'860',    '8060', 'Secours en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8062,'PCG18-ASSOC','SPECIAL',		'861',    '8060', 'Mises à disposition gratuite de biens', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8063,'PCG18-ASSOC','SPECIAL',		'862',    '8060', 'Prestations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8064,'PCG18-ASSOC','SPECIAL',		'864',    '8060', 'Personnel bénévole', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8065,'PCG18-ASSOC','SPECIAL',		'87',    '7008', 'Contributions volontaires en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8066,'PCG18-ASSOC','SPECIAL',		'870',    '8065', 'Dons en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8067,'PCG18-ASSOC','SPECIAL',		'871',    '8065', 'Prestations en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8068,'PCG18-ASSOC','SPECIAL',		'875',    '8065', 'Bénévolat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7001,'PCG18-ASSOC','CAPIT',		'1',    '0', 'Comptes de capitaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7002,'PCG18-ASSOC','IMMO',		'2',    '0', 'Comptes d''immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7003,'PCG18-ASSOC','STOCK',		'3',    '0', 'Comptes de stocks et en-cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7004,'PCG18-ASSOC','THIRDPARTY',		'4',    '0', 'Comptes de tiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7005,'PCG18-ASSOC','FINAN',		'5',    '0', 'Comptes financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7006,'PCG18-ASSOC','EXPENSE',		'6',    '0', 'Comptes de charges', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7007,'PCG18-ASSOC','INCOME',		'7',    '0', 'Comptes de produits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7008,'PCG18-ASSOC','SPECIAL',		'8',    '0', 'Comptes de contributions volontaires en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7010,'PCG18-ASSOC','CAPIT',		'10',    '7001', 'Fonds propres et réserves', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7011,'PCG18-ASSOC','CAPIT',		'102',    '7010', 'Fonds propres sans droit de reprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7012,'PCG18-ASSOC','CAPIT',		'1021',    '7011', 'Première situation nette établie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7013,'PCG18-ASSOC','CAPIT',		'1022',    '7011', 'Fonds statutaires (à subdiviser en fonction des statuts)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7014,'PCG18-ASSOC','CAPIT',		'1023',    '7011', 'Dotations non consomptibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7015,'PCG18-ASSOC','CAPIT',		'10231',    '7014', 'Dotations non consomptibles initiales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7016,'PCG18-ASSOC','CAPIT',		'10232',    '7014', 'Dotations non consomptibles complémentaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7017,'PCG18-ASSOC','CAPIT',		'1024',    '7011', 'Autres fonds propres sans droit de reprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7018,'PCG18-ASSOC','CAPIT',		'1025',    '7011', 'Legs et donations avec contrepartie d''actifs immobilisés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7019,'PCG18-ASSOC','CAPIT',		'103',    '7010', 'Fonds propres avec droit de reprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7020,'PCG18-ASSOC','CAPIT',		'1032',    '7019', 'Fonds statutaires (à subdiviser en fonction des statuts)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7021,'PCG18-ASSOC','CAPIT',		'1034',    '7019', 'Autres fonds propres avec droit de reprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7022,'PCG18-ASSOC','CAPIT',		'1035',    '7019', 'Legs et donations avec contrepartie d''actifs immobilisés assortis d''une obligation ou d''une condition', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7023,'PCG18-ASSOC','CAPIT',		'105',    '7010', 'Ecarts de réévaluation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7024,'PCG18-ASSOC','CAPIT',		'1051',    '7023', 'Ecarts de réévaluation sur des biens sans droit de reprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7025,'PCG18-ASSOC','CAPIT',		'1052',    '7023', 'Ecarts de réévaluation sur des biens avec droit de reprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7026,'PCG18-ASSOC','CAPIT',		'106',    '7010', 'Réserves', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7027,'PCG18-ASSOC','CAPIT',		'1062',    '7026', 'Réserves indisponibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7028,'PCG18-ASSOC','CAPIT',		'1063',    '7026', 'Réserves statutaires et contractuelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7029,'PCG18-ASSOC','CAPIT',		'1064',    '7026', 'Réserves réglementées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7030,'PCG18-ASSOC','CAPIT',		'1068',    '7026', 'Autres réserves', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7031,'PCG18-ASSOC','CAPIT',		'10681',    '7030', 'Réserves pour projet de l''entité', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7032,'PCG18-ASSOC','CAPIT',		'10688',    '7030', 'Réserves diverses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7033,'PCG18-ASSOC','CAPIT',		'108',    '7010', 'Dotations consomptibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7034,'PCG18-ASSOC','CAPIT',		'1081',    '7033', 'Dotations consomptibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7035,'PCG18-ASSOC','CAPIT',		'1089',    '7033', 'Dotations consomptibles inscrites au compte de résultat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7036,'PCG18-ASSOC','CAPIT',		'11',    '7001', 'Eléments en instance d''affectation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7037,'PCG18-ASSOC','CAPIT',		'110',    '7036', 'Report à nouveau excédentaire (solde créditeur)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7038,'PCG18-ASSOC','CAPIT',		'115',    '7036', 'Report à nouveau sous contrôle de tiers financeurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7039,'PCG18-ASSOC','CAPIT',		'119',    '7036', 'Report à nouveau déficitaire (solde débiteur)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7040,'PCG18-ASSOC','CAPIT',		'12',    '7001', 'Résultat net de l''exercice', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7041,'PCG18-ASSOC','CAPIT',		'120',    '7040', 'Excédent de l''exercice', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7042,'PCG18-ASSOC','CAPIT',		'129',    '7040', 'Déficit de l''exercice', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7043,'PCG18-ASSOC','CAPIT',		'13',    '7001', 'Subventions d''investissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7044,'PCG18-ASSOC','CAPIT',		'131',    '7043', 'Subventions d''investissement reçues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7045,'PCG18-ASSOC','CAPIT',		'1311',    '7044', 'Etat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7046,'PCG18-ASSOC','CAPIT',		'1312',    '7044', 'Régions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7047,'PCG18-ASSOC','CAPIT',		'1313',    '7044', 'Départements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7048,'PCG18-ASSOC','CAPIT',		'1314',    '7044', 'Communes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7049,'PCG18-ASSOC','CAPIT',		'1315',    '7044', 'Collectivités publiques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7050,'PCG18-ASSOC','CAPIT',		'1316',    '7044', 'Entreprises publiques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7051,'PCG18-ASSOC','CAPIT',		'1318',    '7044', 'Autres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7052,'PCG18-ASSOC','CAPIT',		'13181',    '7051', 'Taxe d''apprentissage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7053,'PCG18-ASSOC','CAPIT',		'13182',    '7051', 'Autres subventions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7054,'PCG18-ASSOC','CAPIT',		'139',    '7043', 'Subventions d''investissement inscrites au compte de résultat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7055,'PCG18-ASSOC','CAPIT',		'1391',    '7054', 'Subventions d''investissement inscrites au compte de résultat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7056,'PCG18-ASSOC','CAPIT',		'1398',    '7054', 'Autres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7057,'PCG18-ASSOC','CAPIT',		'13981',    '7056', 'Taxe d''apprentissage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7058,'PCG18-ASSOC','CAPIT',		'13988',    '7056', 'Autres subventions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7059,'PCG18-ASSOC','CAPIT',		'14',    '7001', 'Provisions réglementées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7060,'PCG18-ASSOC','CAPIT',		'142',    '7059', 'Provisions réglementées relatives aux immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7061,'PCG18-ASSOC','CAPIT',		'1424',    '7060', 'Provisions pour investissement (participation des salariés)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7062,'PCG18-ASSOC','CAPIT',		'143',    '7059', 'Provisions réglementées relatives aux stocks', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7063,'PCG18-ASSOC','CAPIT',		'144',    '7059', 'Provisions réglementées relatives aux éléments d''actif', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7064,'PCG18-ASSOC','CAPIT',		'145',    '7059', 'Amortissements dérogatoires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7065,'PCG18-ASSOC','CAPIT',		'148',    '7059', 'Autres provisions réglementées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7066,'PCG18-ASSOC','CAPIT',		'15',    '7001', 'Provisions pour risques et charges', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7067,'PCG18-ASSOC','CAPIT',		'151',    '7066', 'Provisions pour risques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7068,'PCG18-ASSOC','CAPIT',		'1511',    '7067', 'Provisions pour litiges', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7069,'PCG18-ASSOC','CAPIT',		'1514',    '7067', 'Provisions pour amendes et pénalités', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7070,'PCG18-ASSOC','CAPIT',		'1515',    '7067', 'Provisions pour pertes de change', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7071,'PCG18-ASSOC','CAPIT',		'1516',    '7067', 'Provisions pour risque d''emploi', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7072,'PCG18-ASSOC','CAPIT',		'1518',    '7067', 'Autres provisions pour risques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7073,'PCG18-ASSOC','CAPIT',		'152',    '7066', 'Provisions pour charges sur legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7074,'PCG18-ASSOC','CAPIT',		'153',    '7066', 'Provisions pour pensions et obligations similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7075,'PCG18-ASSOC','CAPIT',		'155',    '7066', 'Provisions pour impôts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7076,'PCG18-ASSOC','CAPIT',		'157',    '7066', 'Provisions pour charges à répartir sur plusieurs exercices', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7077,'PCG18-ASSOC','CAPIT',		'1572',    '7076', 'Provisions pour gros entretiens ou grandes révisions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7078,'PCG18-ASSOC','CAPIT',		'158',    '7066', 'Autres provisions pour charges', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7079,'PCG18-ASSOC','CAPIT',		'16',    '7001', 'Emprunts et dettes assimilées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7080,'PCG18-ASSOC','CAPIT',		'163',    '7079', 'Emprunts obligataires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7081,'PCG18-ASSOC','CAPIT',		'1631',    '7080', 'Titres associatifs et assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7082,'PCG18-ASSOC','CAPIT',		'164',    '7079', 'Emprunts auprès des établissements de crédit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7083,'PCG18-ASSOC','CAPIT',		'165',    '7079', 'Dépôts et cautionnements reçus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7084,'PCG18-ASSOC','CAPIT',		'1651',    '7083', 'Dépôts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7085,'PCG18-ASSOC','CAPIT',		'1652',    '7083', 'Cautionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7086,'PCG18-ASSOC','CAPIT',		'167',    '7079', 'Emprunts et dettes assortis de condition particulières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7087,'PCG18-ASSOC','CAPIT',		'168',    '7079', 'Autres emprunts et dettes assimilées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7088,'PCG18-ASSOC','CAPIT',		'1681',    '7087', 'Autres emprunts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7089,'PCG18-ASSOC','CAPIT',		'1685',    '7087', 'Rentes viagères capitalisées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7090,'PCG18-ASSOC','CAPIT',		'1687',    '7087', 'Autres dettes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7091,'PCG18-ASSOC','CAPIT',		'1688',    '7087', 'Intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7092,'PCG18-ASSOC','CAPIT',		'16883',    '7091', 'Sur titres associatifs et assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7093,'PCG18-ASSOC','CAPIT',		'16884',    '7091', 'Sur emprunts auprès des établissements de crédit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7094,'PCG18-ASSOC','CAPIT',		'16885',    '7091', 'Sur dépôts et cautionnements reçus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7095,'PCG18-ASSOC','CAPIT',		'16887',    '7091', 'Sur emprunts et dettes assortis de conditions particulières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7096,'PCG18-ASSOC','CAPIT',		'16888',    '7091', 'Sur autres emprunts et dettes assimilées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7097,'PCG18-ASSOC','CAPIT',		'17',    '7001', 'Dettes rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7098,'PCG18-ASSOC','CAPIT',		'171',    '7097', 'Dettes rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7099,'PCG18-ASSOC','CAPIT',		'1711',    '7098', 'Principal', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7100,'PCG18-ASSOC','CAPIT',		'1718',    '7098', 'Intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7101,'PCG18-ASSOC','CAPIT',		'18',    '7001', 'Comptes de liaison entre établissements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7102,'PCG18-ASSOC','CAPIT',		'181',    '7101', 'Apports permanents entre siège social et établissements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7103,'PCG18-ASSOC','CAPIT',		'185',    '7101', 'Biens et prestations de services échangés entre établissements et siège social', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7104,'PCG18-ASSOC','CAPIT',		'186',    '7101', 'Biens et prestations de services entre établissements (charges)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7105,'PCG18-ASSOC','CAPIT',		'187',    '7101', 'Biens et prestations de services entre établissements (produits)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7106,'PCG18-ASSOC','CAPIT',		'19',    '7001', 'Fonds dédiés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7107,'PCG18-ASSOC','CAPIT',		'191',    '7106', 'Fonds reportés liés aux legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7108,'PCG18-ASSOC','CAPIT',		'1911',    '7107', 'Legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7109,'PCG18-ASSOC','CAPIT',		'1912',    '7107', 'Donations temporaires d''usufruit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7110,'PCG18-ASSOC','CAPIT',		'193',    '7106', 'Fonds dédiés des fondations abritées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7111,'PCG18-ASSOC','CAPIT',		'194',    '7106', 'Fonds dédiés sur subventions d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7112,'PCG18-ASSOC','CAPIT',		'195',    '7106', 'Fonds dédiés sur contributions financières d''autres organismes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7113,'PCG18-ASSOC','CAPIT',		'196',    '7106', 'Fonds dédiés sur ressources liées à la générosité du public', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7115,'PCG18-ASSOC','IMMO',		'20',    '7002', 'Immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7116,'PCG18-ASSOC','IMMO',		'201',    '7115', 'Frais d''établissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7117,'PCG18-ASSOC','IMMO',		'2011',    '7116', 'Frais de constitution', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7118,'PCG18-ASSOC','IMMO',		'2012',    '7116', 'Frais de premier établissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7119,'PCG18-ASSOC','IMMO',		'203',    '7115', 'Frais de recherche et développement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7120,'PCG18-ASSOC','IMMO',		'204',    '7115', 'Donations temporaires d''usufruit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7121,'PCG18-ASSOC','IMMO',		'205',    '7115', 'Concessions et droits similaires, brevets, licences, marques et procédés, droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7122,'PCG18-ASSOC','IMMO',		'206',    '7115', 'Droit au bail', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7123,'PCG18-ASSOC','IMMO',		'208',    '7115', 'Autres immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7124,'PCG18-ASSOC','IMMO',		'21',    '7002', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7125,'PCG18-ASSOC','IMMO',		'211',    '7124', 'Terrains', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7126,'PCG18-ASSOC','IMMO',		'2111',    '7125', 'Terrains nus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7127,'PCG18-ASSOC','IMMO',		'2112',    '7125', 'Terrains aménagés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7128,'PCG18-ASSOC','IMMO',		'2115',    '7125', 'Terrains bâtis', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7129,'PCG18-ASSOC','IMMO',		'212',    '7124', 'Agencements et aménagements de terrains sur sol propre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7130,'PCG18-ASSOC','IMMO',		'213',    '7124', 'Constructions sur sol propre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7131,'PCG18-ASSOC','IMMO',		'2131',    '7130', 'Bâtiments', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7132,'PCG18-ASSOC','IMMO',		'2135',    '7130', 'Installations générales - agencements, aménagements des constructions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7133,'PCG18-ASSOC','IMMO',		'214',    '7124', 'Constructions sur sol d''autrui (même ventilation que le 213)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7134,'PCG18-ASSOC','IMMO',		'215',    '7124', 'Installations techniques - matériel et outillage industriel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7135,'PCG18-ASSOC','IMMO',		'2151',    '7134', 'Installations complexes spécialisées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7136,'PCG18-ASSOC','IMMO',		'2153',    '7134', 'Installations à caractère spécifique', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7137,'PCG18-ASSOC','IMMO',		'2154',    '7134', 'Matériel industriel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7138,'PCG18-ASSOC','IMMO',		'2155',    '7134', 'Outillage industriel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7139,'PCG18-ASSOC','IMMO',		'2157',    '7134', 'Agencements et aménagements des matériels et outillages industriels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7140,'PCG18-ASSOC','IMMO',		'216',    '7124', 'Collections - œuvres d''art', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7141,'PCG18-ASSOC','IMMO',		'218',    '7124', 'Autres immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7142,'PCG18-ASSOC','IMMO',		'2181',    '7141', 'Installations générales, agencements et aménagements divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7143,'PCG18-ASSOC','IMMO',		'2182',    '7141', 'Matériel de transport', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7144,'PCG18-ASSOC','IMMO',		'2183',    '7141', 'Matériel de bureau et informatique', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7145,'PCG18-ASSOC','IMMO',		'2184',    '7141', 'Mobilier', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7146,'PCG18-ASSOC','IMMO',		'2185',    '7141', 'Cheptel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7147,'PCG18-ASSOC','IMMO',		'2186',    '7141', 'Emballages récupérables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7148,'PCG18-ASSOC','IMMO',		'22',    '7002', 'Immobilisations mises en concession', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7149,'PCG18-ASSOC','IMMO',		'23',    '7002', 'Immobilisations en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7150,'PCG18-ASSOC','IMMO',		'231',    '7149', 'Immobilisations corporelles en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7151,'PCG18-ASSOC','IMMO',		'2312',    '7150', 'Terrains', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7152,'PCG18-ASSOC','IMMO',		'2313',    '7150', 'Constructions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7153,'PCG18-ASSOC','IMMO',		'2315',    '7150', 'Installations techniques, matériel et outillage industriels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7154,'PCG18-ASSOC','IMMO',		'2318',    '7150', 'Autres immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7155,'PCG18-ASSOC','IMMO',		'232',    '7149', 'Immobilisations incorporelles en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7156,'PCG18-ASSOC','IMMO',		'237',    '7149', 'Avances et acomptes versés sur commandes d''immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7157,'PCG18-ASSOC','IMMO',		'238',    '7149', 'Avances et acomptes versés sur commandes d''immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7158,'PCG18-ASSOC','IMMO',		'2382',    '7157', 'Terrains', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7159,'PCG18-ASSOC','IMMO',		'2383',    '7157', 'Constructions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7160,'PCG18-ASSOC','IMMO',		'2385',    '7157', 'Installations techniques, matériel et outillage industriels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7161,'PCG18-ASSOC','IMMO',		'2388',    '7157', 'Autres immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7162,'PCG18-ASSOC','IMMO',		'24',    '7002', 'Biens reçus par legs ou donations destinés à être cédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7163,'PCG18-ASSOC','IMMO',		'26',    '7002', 'Participations et créances rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7164,'PCG18-ASSOC','IMMO',		'261',    '7163', 'Titres de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7165,'PCG18-ASSOC','IMMO',		'2611',    '7164', 'Actions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7166,'PCG18-ASSOC','IMMO',		'2618',    '7164', 'Autres titres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7167,'PCG18-ASSOC','IMMO',		'266',    '7163', 'Autres formes de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7168,'PCG18-ASSOC','IMMO',		'267',    '7163', 'Créances rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7169,'PCG18-ASSOC','IMMO',		'2671',    '7168', 'Principal', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7170,'PCG18-ASSOC','IMMO',		'2678',    '7168', 'Intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7171,'PCG18-ASSOC','IMMO',		'269',    '7163', 'Versements restant à effectuer sur titres de participation non libérés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7172,'PCG18-ASSOC','IMMO',		'27',    '7002', 'Autres immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7173,'PCG18-ASSOC','IMMO',		'271',    '7172', 'Titres immobilisés (droit de propriété)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7174,'PCG18-ASSOC','IMMO',		'2711',    '7173', 'Actions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7175,'PCG18-ASSOC','IMMO',		'2718',    '7173', 'Autres titres immobilisés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7176,'PCG18-ASSOC','IMMO',		'272',    '7172', 'Titres immobilisés (droit de créance)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7177,'PCG18-ASSOC','IMMO',		'2721',    '7176', 'Obligations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7178,'PCG18-ASSOC','IMMO',		'2722',    '7176', 'Bons', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7179,'PCG18-ASSOC','IMMO',		'2728',    '7176', 'Autres titres immobilisés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7180,'PCG18-ASSOC','IMMO',		'274',    '7172', 'Prêts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7181,'PCG18-ASSOC','IMMO',		'2742',    '7180', 'Prêts aux partenaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7182,'PCG18-ASSOC','IMMO',		'2743',    '7180', 'Prêts au personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7183,'PCG18-ASSOC','IMMO',		'2748',    '7180', 'Autres prêts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7184,'PCG18-ASSOC','IMMO',		'275',    '7172', 'Dépôts et cautionnements versés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7185,'PCG18-ASSOC','IMMO',		'2751',    '7184', 'Dépôts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7186,'PCG18-ASSOC','IMMO',		'2755',    '7184', 'Cautionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7187,'PCG18-ASSOC','IMMO',		'276',    '7172', 'Autres créances immobilisées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7188,'PCG18-ASSOC','IMMO',		'2761',    '7187', 'Autres créances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7189,'PCG18-ASSOC','IMMO',		'2768',    '7187', 'Intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7190,'PCG18-ASSOC','IMMO',		'27682',    '7189', 'Sur titres immobilisés (droit de créance)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7191,'PCG18-ASSOC','IMMO',		'27684',    '7189', 'Sur prêts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7192,'PCG18-ASSOC','IMMO',		'27685',    '7189', 'Sur dépôts et cautionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7193,'PCG18-ASSOC','IMMO',		'27688',    '7189', 'Sur autres créances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7194,'PCG18-ASSOC','IMMO',		'279',    '7172', 'Versements restant à effectuer sur titres immobilisés non libérés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7195,'PCG18-ASSOC','IMMO',		'28',    '7002', 'Amortissements des immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7196,'PCG18-ASSOC','IMMO',		'280',    '7195', 'Amortissements des immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7197,'PCG18-ASSOC','IMMO',		'2804',    '7196', 'Donations temporaires d''usufruit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7198,'PCG18-ASSOC','IMMO',		'281',    '7195', 'Amortissements des immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7199,'PCG18-ASSOC','IMMO',		'2812',    '7198', 'Agencements et aménagements de terrains sur sol propre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7200,'PCG18-ASSOC','IMMO',		'2813',    '7198', 'Constructions sur sol propre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7201,'PCG18-ASSOC','IMMO',		'2814',    '7198', 'Constructions sur sol d''autrui', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7202,'PCG18-ASSOC','IMMO',		'2815',    '7198', 'Installations techniques, matériel et outillage industriels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7203,'PCG18-ASSOC','IMMO',		'2818',    '7198', 'Autres immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7204,'PCG18-ASSOC','IMMO',		'29',    '7002', 'Provisions pour dépréciation des immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7205,'PCG18-ASSOC','IMMO',		'290',    '7204', 'Provisions pour dépréciation des immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7206,'PCG18-ASSOC','IMMO',		'2905',    '7205', 'Concessions et droits similaires, brevets, licences, marques et procédés, droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7207,'PCG18-ASSOC','IMMO',		'2906',    '7205', 'Droit au bail', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7208,'PCG18-ASSOC','IMMO',		'2908',    '7205', 'Autres immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7209,'PCG18-ASSOC','IMMO',		'291',    '7204', 'Provisions pour dépréciation des immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7210,'PCG18-ASSOC','IMMO',		'2911',    '7209', 'Terrains', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7211,'PCG18-ASSOC','IMMO',		'293',    '7204', 'Provisions pour dépréciation des immobilisations en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7212,'PCG18-ASSOC','IMMO',		'294',    '7204', 'Dépréciations des biens reçus par legs ou donations destinés à être cédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7213,'PCG18-ASSOC','IMMO',		'296',    '7204', 'Provisions pour dépréciation des participations et Créances rattachées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7214,'PCG18-ASSOC','IMMO',		'2961',    '7213', 'Titres de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7215,'PCG18-ASSOC','IMMO',		'2966',    '7213', 'Autres formes de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7216,'PCG18-ASSOC','IMMO',		'2967',    '7213', 'Créances rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7217,'PCG18-ASSOC','IMMO',		'297',    '7204', 'Provisions pour dépréciation des autres immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7218,'PCG18-ASSOC','IMMO',		'2971',    '7217', 'Titres immobilisés (droit de propriété)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7219,'PCG18-ASSOC','IMMO',		'2972',    '7217', 'Titres immobilisés (droit de créance)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7220,'PCG18-ASSOC','IMMO',		'2974',    '7217', 'Prêts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7221,'PCG18-ASSOC','IMMO',		'2975',    '7217', 'Dépôts et cautionnements versés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7222,'PCG18-ASSOC','IMMO',		'2976',    '7217', 'Autres créances immobilisées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7224,'PCG18-ASSOC','STOCK',		'31',    '7003', 'Matières premières et fournitures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7225,'PCG18-ASSOC','STOCK',		'311',    '7224', 'Matières premières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7226,'PCG18-ASSOC','STOCK',		'317',    '7224', 'Fournitures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7227,'PCG18-ASSOC','STOCK',		'32',    '7003', 'Autres approvisionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7228,'PCG18-ASSOC','STOCK',		'321',    '7227', 'Matières consommables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7229,'PCG18-ASSOC','STOCK',		'322',    '7227', 'Fournitures consommables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7230,'PCG18-ASSOC','STOCK',		'3221',    '7229', 'Combustibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7231,'PCG18-ASSOC','STOCK',		'3222',    '7229', 'Produits d''entretien', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7232,'PCG18-ASSOC','STOCK',		'3223',    '7229', 'Fournitures d''atelier', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7233,'PCG18-ASSOC','STOCK',		'3224',    '7229', 'Fournitures de magasin', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7234,'PCG18-ASSOC','STOCK',		'3225',    '7229', 'Fournitures de bureau', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7235,'PCG18-ASSOC','STOCK',		'3226',    '7229', 'Carburants', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7236,'PCG18-ASSOC','STOCK',		'3227',    '7229', 'Autres fournitures de matériel de transport', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7237,'PCG18-ASSOC','STOCK',		'3228',    '7229', 'Petit outillage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7238,'PCG18-ASSOC','STOCK',		'326',    '7227', 'Emballages (propriété de l''entité)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7239,'PCG18-ASSOC','STOCK',		'3261',    '7238', 'Emballages perdus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7240,'PCG18-ASSOC','STOCK',		'3265',    '7238', 'Emballages récupérables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7241,'PCG18-ASSOC','STOCK',		'3267',    '7238', 'Emballages mixtes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7242,'PCG18-ASSOC','STOCK',		'33',    '7003', 'En-cours de production de biens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7243,'PCG18-ASSOC','STOCK',		'331',    '7242', 'Produits en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7244,'PCG18-ASSOC','STOCK',		'335',    '7242', 'Travaux en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7245,'PCG18-ASSOC','STOCK',		'34',    '7003', 'En-cours de production de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7246,'PCG18-ASSOC','STOCK',		'341',    '7245', 'Etudes en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7247,'PCG18-ASSOC','STOCK',		'345',    '7245', 'Prestations de services en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7248,'PCG18-ASSOC','STOCK',		'35',    '7003', 'Stocks de produits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7249,'PCG18-ASSOC','STOCK',		'351',    '7248', 'Produits intermédiaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7250,'PCG18-ASSOC','STOCK',		'355',    '7248', 'Produits finis', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7251,'PCG18-ASSOC','STOCK',		'358',    '7248', 'Produits résiduels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7252,'PCG18-ASSOC','STOCK',		'37',    '7003', 'Stocks de marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7253,'PCG18-ASSOC','STOCK',		'39',    '7003', 'Provisions pour dépréciation des stocks', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7254,'PCG18-ASSOC','STOCK',		'391',    '7253', 'Dépréciation des matières premières et fournitures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7255,'PCG18-ASSOC','STOCK',		'3911',    '7254', 'Matières premières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7256,'PCG18-ASSOC','STOCK',		'3917',    '7254', 'Fournitures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7257,'PCG18-ASSOC','STOCK',		'392',    '7253', 'Dépréciation des autres approvisionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7258,'PCG18-ASSOC','STOCK',		'3921',    '7257', 'Matières consommables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7259,'PCG18-ASSOC','STOCK',		'3922',    '7257', 'Fournitures consommables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7260,'PCG18-ASSOC','STOCK',		'3926',    '7257', 'Emballages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7261,'PCG18-ASSOC','STOCK',		'393',    '7253', 'Dépréciation des en-cours de production de biens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7262,'PCG18-ASSOC','STOCK',		'3931',    '7261', 'Produits en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7263,'PCG18-ASSOC','STOCK',		'3935',    '7261', 'Travaux en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7264,'PCG18-ASSOC','STOCK',		'394',    '7253', 'Dépréciation des en-cours de production de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7265,'PCG18-ASSOC','STOCK',		'3941',    '7264', 'Etudes en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7266,'PCG18-ASSOC','STOCK',		'3945',    '7264', 'Prestations de services en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7267,'PCG18-ASSOC','STOCK',		'395',    '7253', 'Dépréciation des stocks de produits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7268,'PCG18-ASSOC','STOCK',		'3951',    '7267', 'Produits intermédiaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7269,'PCG18-ASSOC','STOCK',		'3955',    '7267', 'Produits finis', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7270,'PCG18-ASSOC','STOCK',		'397',    '7253', 'Dépréciation des marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7272,'PCG18-ASSOC','THIRDPARTY',		'40',    '7004', 'Fournisseurs et comptes rattachés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7273,'PCG18-ASSOC','THIRDPARTY',		'401',    '7272', 'Fournisseurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7274,'PCG18-ASSOC','THIRDPARTY',		'4011',    '7273', 'Fournisseurs - achats de biens ou de prestations de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7275,'PCG18-ASSOC','THIRDPARTY',		'4017',    '7273', 'Fournisseurs - retenues de garanties et oppositions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7276,'PCG18-ASSOC','THIRDPARTY',		'403',    '7272', 'Fournisseurs - effets à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7277,'PCG18-ASSOC','THIRDPARTY',		'404',    '7272', 'Fournisseurs d''immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7278,'PCG18-ASSOC','THIRDPARTY',		'4041',    '7277', 'Fournisseurs - achats d''immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7279,'PCG18-ASSOC','THIRDPARTY',		'4047',    '7277', 'Fournisseurs d''immobilisations - retenues de garantie et oppositions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7280,'PCG18-ASSOC','THIRDPARTY',		'405',    '7272', 'Fournisseurs d''immobilisations - effets à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7281,'PCG18-ASSOC','THIRDPARTY',		'408',    '7272', 'Fournisseurs - factures non parvenues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7282,'PCG18-ASSOC','THIRDPARTY',		'4081',    '7281', 'Fournisseurs d''autres biens et services - factures non parvenues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7283,'PCG18-ASSOC','THIRDPARTY',		'4084',    '7281', 'Fournisseurs d''immobilisations - factures non parvenues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7284,'PCG18-ASSOC','THIRDPARTY',		'409',    '7272', 'Fournisseurs débiteurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7285,'PCG18-ASSOC','THIRDPARTY',		'4091',    '7284', 'Fournisseurs, avances versées sur commandes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7286,'PCG18-ASSOC','THIRDPARTY',		'4096',    '7284', 'Fournisseurs, créances pour emballages et matériel à rendre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7287,'PCG18-ASSOC','THIRDPARTY',		'4098',    '7284', 'Rabais, remises et ristournes à obtenir et autres avoirs non encore reçus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7288,'PCG18-ASSOC','THIRDPARTY',		'41',    '7004', 'Clients, usagers et comptes rattachés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7289,'PCG18-ASSOC','THIRDPARTY',		'411',    '7288', 'Clients, usagers (et organismes de prise en charge)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7290,'PCG18-ASSOC','THIRDPARTY',		'413',    '7288', 'Clients, usagers, effets à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7291,'PCG18-ASSOC','THIRDPARTY',		'416',    '7288', 'Clients, usagers, créances douteuses ou litigieuses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7292,'PCG18-ASSOC','THIRDPARTY',		'418',    '7288', 'Clients, usagers, produits non encore facturés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7293,'PCG18-ASSOC','THIRDPARTY',		'4181',    '7292', 'Clients, usagers - factures à établir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7294,'PCG18-ASSOC','THIRDPARTY',		'4188',    '7292', 'Clients, usagers - intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7295,'PCG18-ASSOC','THIRDPARTY',		'419',    '7288', 'Clients, usagers - clients, créditeurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7296,'PCG18-ASSOC','THIRDPARTY',		'4191',    '7295', 'Clients, usagers - avances et acomptes reçus sur commande', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7297,'PCG18-ASSOC','THIRDPARTY',		'4196',    '7295', 'Clients, usagers - dettes pour emballages et matériels consignés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7298,'PCG18-ASSOC','THIRDPARTY',		'4198',    '7295', 'Rabais, remises et ristournes à accorder et autres avoirs à établir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7299,'PCG18-ASSOC','THIRDPARTY',		'42',    '7004', 'Personnel et comptes rattachés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7300,'PCG18-ASSOC','THIRDPARTY',		'421',    '7299', 'Personnel - rémunérations dues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7301,'PCG18-ASSOC','THIRDPARTY',		'422',    '7299', 'Comité d''entreprise, d''établissement, d''hygiène et de sécurité, œuvres sociales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7302,'PCG18-ASSOC','THIRDPARTY',		'424',    '7299', 'Participation des salariés aux résultats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7303,'PCG18-ASSOC','THIRDPARTY',		'425',    '7299', 'Personnel - avances et acomptes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7304,'PCG18-ASSOC','THIRDPARTY',		'426',    '7299', 'Personnel - dépôts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7305,'PCG18-ASSOC','THIRDPARTY',		'427',    '7299', 'Personnel - oppositions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7306,'PCG18-ASSOC','THIRDPARTY',		'428',    '7299', 'Personnel - charges à payer et produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7307,'PCG18-ASSOC','THIRDPARTY',		'4282',    '7306', 'Dettes provisionnées pour congés à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7308,'PCG18-ASSOC','THIRDPARTY',		'4284',    '7306', 'Dettes provisionnées pour participation des salariés aux résultats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7309,'PCG18-ASSOC','THIRDPARTY',		'4286',    '7306', 'Personnel - autres charges à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7310,'PCG18-ASSOC','THIRDPARTY',		'4287',    '7306', 'Personnel - produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7311,'PCG18-ASSOC','THIRDPARTY',		'43',    '7004', 'Sécurité Sociale et autres organismes sociaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7312,'PCG18-ASSOC','THIRDPARTY',		'431',    '7311', 'Sécurité Sociale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7313,'PCG18-ASSOC','THIRDPARTY',		'437',    '7311', 'Autres organismes sociaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7314,'PCG18-ASSOC','THIRDPARTY',		'4372',    '7313', 'Mutuelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7315,'PCG18-ASSOC','THIRDPARTY',		'4373',    '7313', 'Caisses de retraite et de prévoyance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7316,'PCG18-ASSOC','THIRDPARTY',		'4374',    '7313', 'Caisses d''allocations de chômage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7317,'PCG18-ASSOC','THIRDPARTY',		'4378',    '7313', 'Autres organismes sociaux divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7318,'PCG18-ASSOC','THIRDPARTY',		'438',    '7311', 'Organismes sociaux - charges à payer et produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7319,'PCG18-ASSOC','THIRDPARTY',		'4382',    '7318', 'Charges sociales sur congés à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7320,'PCG18-ASSOC','THIRDPARTY',		'4386',    '7318', 'Organismes sociaux - charges à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7321,'PCG18-ASSOC','THIRDPARTY',		'4387',    '7318', 'Organismes sociaux - produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7322,'PCG18-ASSOC','THIRDPARTY',		'44',    '7004', 'Etat et autres collectivités publiques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7323,'PCG18-ASSOC','THIRDPARTY',		'441',    '7322', 'Etat, établissements publics et collectivités publiques - Subventions à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7324,'PCG18-ASSOC','THIRDPARTY',		'4411',    '7323', 'Subventions d''investissement à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7325,'PCG18-ASSOC','THIRDPARTY',		'4417',    '7323', 'Subventions d''exploitation à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7326,'PCG18-ASSOC','THIRDPARTY',		'4418',    '7323', 'Subventions d''équilibre à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7327,'PCG18-ASSOC','THIRDPARTY',		'4419',    '7323', 'Avances sur subventions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7328,'PCG18-ASSOC','THIRDPARTY',		'442',    '7322', 'Contributions, impôts et taxes recouvrés pour le compte de l''Etat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7329,'PCG18-ASSOC','THIRDPARTY',		'4421',    '7328', 'Prélèvements à la source (Impôt sur le revenu)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7330,'PCG18-ASSOC','THIRDPARTY',		'4422',    '7328', 'Prélèvements forfaitaires non libératoires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7331,'PCG18-ASSOC','THIRDPARTY',		'443',    '7322', 'Opérations particulières avec l''Etat, les collectivités  publiques, les organismes internationaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7332,'PCG18-ASSOC','THIRDPARTY',		'444',    '7322', 'Etat - impôts sur les bénéfices', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7333,'PCG18-ASSOC','THIRDPARTY',		'445',    '7322', 'Etat - taxes sur le chiffre d''affaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7334,'PCG18-ASSOC','THIRDPARTY',		'4452',    '7333', 'TVA due intracommunautaire', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7335,'PCG18-ASSOC','THIRDPARTY',		'4455',    '7333', 'Taxes sur le chiffre d''affaires à décaisser', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7336,'PCG18-ASSOC','THIRDPARTY',		'44551',    '7335', 'TVA à décaisser', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7337,'PCG18-ASSOC','THIRDPARTY',		'4456',    '7333', 'Taxes sur le chiffre d''affaires déductibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7338,'PCG18-ASSOC','THIRDPARTY',		'44562',    '7337', 'TVA sur immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7339,'PCG18-ASSOC','THIRDPARTY',		'44566',    '7337', 'TVA sur biens et services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7340,'PCG18-ASSOC','THIRDPARTY',		'44567',    '7337', 'Crédit de TVA à reporter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7341,'PCG18-ASSOC','THIRDPARTY',		'4457',    '7333', 'Taxes sur le chiffre d''affaires collectées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7342,'PCG18-ASSOC','THIRDPARTY',		'44571',    '7341', 'TVA collectée', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7343,'PCG18-ASSOC','THIRDPARTY',		'4458',    '7333', 'Taxes sur le chiffre d''affaires à régulariser', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7344,'PCG18-ASSOC','THIRDPARTY',		'44583',    '7343', 'Remboursement de taxe sur le chiffre d''affaires demandé', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7345,'PCG18-ASSOC','THIRDPARTY',		'44584',    '7343', 'TVA récupérée d''avance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7346,'PCG18-ASSOC','THIRDPARTY',		'447',    '7322', 'Autres impôts, taxes et versements assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7347,'PCG18-ASSOC','THIRDPARTY',		'4471',    '7346', 'Taxe sur les salaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7348,'PCG18-ASSOC','THIRDPARTY',		'4472',    '7346', 'CFE, CVAE', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7349,'PCG18-ASSOC','THIRDPARTY',		'4478',    '7346', 'Autres impôts et taxes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7350,'PCG18-ASSOC','THIRDPARTY',		'448',    '7322', 'Etat, charges à payer et produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7351,'PCG18-ASSOC','THIRDPARTY',		'4482',    '7350', 'Charges fiscales sur congés à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7352,'PCG18-ASSOC','THIRDPARTY',		'4486',    '7350', 'Etat - charges à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7353,'PCG18-ASSOC','THIRDPARTY',		'4487',    '7350', 'Etat - produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7354,'PCG18-ASSOC','THIRDPARTY',		'45',    '7004', 'Confédération, fédération, union, entités affiliées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7355,'PCG18-ASSOC','THIRDPARTY',		'451',    '7354', 'Confédération, fédération, union et entités affiliées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7356,'PCG18-ASSOC','THIRDPARTY',		'455',    '7354', 'Partenaires - comptes courants', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7357,'PCG18-ASSOC','THIRDPARTY',		'46',    '7004', 'Débiteurs et créditeurs divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7358,'PCG18-ASSOC','THIRDPARTY',		'461',    '7357', 'Créances reçues par legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7359,'PCG18-ASSOC','THIRDPARTY',		'462',    '7357', 'Créances sur cessions d''immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7360,'PCG18-ASSOC','THIRDPARTY',		'463',    '7357', 'Fonds en dépôts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7361,'PCG18-ASSOC','THIRDPARTY',		'4632',    '7360', 'Fonds reçus ou déposés - usagers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7362,'PCG18-ASSOC','THIRDPARTY',		'4633',    '7360', 'Autres fonds en dépôt', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7363,'PCG18-ASSOC','THIRDPARTY',		'464',    '7357', 'Dettes sur acquisitions de valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7364,'PCG18-ASSOC','THIRDPARTY',		'465',    '7357', 'Créances sur acquisitions de valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7365,'PCG18-ASSOC','THIRDPARTY',		'466',    '7357', 'Dettes des legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7366,'PCG18-ASSOC','THIRDPARTY',		'467',    '7357', 'Autres comptes débiteurs ou créditeurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7367,'PCG18-ASSOC','THIRDPARTY',		'4671',    '7366', 'Créditeurs divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7368,'PCG18-ASSOC','THIRDPARTY',		'4672',    '7366', 'Débiteurs divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7369,'PCG18-ASSOC','THIRDPARTY',		'468',    '7357', 'Divers, charges à payer - produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7370,'PCG18-ASSOC','THIRDPARTY',		'4681',    '7369', 'Frais des bénévoles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7371,'PCG18-ASSOC','THIRDPARTY',		'4686',    '7369', 'Autres charges à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7372,'PCG18-ASSOC','THIRDPARTY',		'4687',    '7369', 'Autres produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7373,'PCG18-ASSOC','THIRDPARTY',		'47',    '7004', 'Comptes transitoires ou d''attente', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7374,'PCG18-ASSOC','THIRDPARTY',		'471',    '7373', 'Comptes d''attente (jusqu''à 474)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7375,'PCG18-ASSOC','THIRDPARTY',		'476',    '7373', 'Différences de conversion - actif', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7376,'PCG18-ASSOC','THIRDPARTY',		'477',    '7373', 'Différences de conversion - passif', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7377,'PCG18-ASSOC','THIRDPARTY',		'478',    '7373', 'Autres comptes transitoires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7378,'PCG18-ASSOC','THIRDPARTY',		'48',    '7004', 'Comptes de régularisation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7379,'PCG18-ASSOC','THIRDPARTY',		'481',    '7378', 'Charges à répartir sur plusieurs exercices', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7380,'PCG18-ASSOC','THIRDPARTY',		'4816',    '7379', 'Frais d''émission d''emprunts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7381,'PCG18-ASSOC','THIRDPARTY',		'486',    '7378', 'Charges constatées d''avance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7382,'PCG18-ASSOC','THIRDPARTY',		'487',    '7378', 'Produits constatés d''avance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7383,'PCG18-ASSOC','THIRDPARTY',		'49',    '7004', 'Provisions pour dépréciation des comptes de tiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7384,'PCG18-ASSOC','THIRDPARTY',		'491',    '7383', 'Dépréciation des comptes de clients et d''usagers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7385,'PCG18-ASSOC','THIRDPARTY',		'495',    '7383', 'Dépréciation des comptes de confédérations, fédérations, unions, entités affiliées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7386,'PCG18-ASSOC','THIRDPARTY',		'496',    '7383', 'Dépréciation des comptes de débiteurs divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7388,'PCG18-ASSOC','FINAN',		'50',    '7005', 'Valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7389,'PCG18-ASSOC','FINAN',		'503',    '7388', 'Actions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7390,'PCG18-ASSOC','FINAN',		'5031',    '7389', 'Titres cotés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7391,'PCG18-ASSOC','FINAN',		'5035',    '7389', 'Titres non cotés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7392,'PCG18-ASSOC','FINAN',		'504',    '7388', 'Autres titres conférant un droit de propriété', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7393,'PCG18-ASSOC','FINAN',		'506',    '7388', 'Obligations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7394,'PCG18-ASSOC','FINAN',		'5061',    '7393', 'Titres cotés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7395,'PCG18-ASSOC','FINAN',		'5065',    '7393', 'Titres non cotés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7396,'PCG18-ASSOC','FINAN',		'507',    '7388', 'Bons du Trésor et bons de caisse à court terme', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7397,'PCG18-ASSOC','FINAN',		'508',    '7388', 'Autres valeurs mobilières et créances assimilées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7398,'PCG18-ASSOC','FINAN',		'5081',    '7397', 'Autres valeurs mobilières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7399,'PCG18-ASSOC','FINAN',		'5082',    '7397', 'Bons de souscription', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7400,'PCG18-ASSOC','FINAN',		'5088',    '7397', 'Intérêts courus sur obligations, bons et valeurs assimilées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7401,'PCG18-ASSOC','FINAN',		'509',    '7388', 'Versements restant à effectuer sur VMP non libérées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7402,'PCG18-ASSOC','FINAN',		'51',    '7005', 'Banques et établissements financiers assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7403,'PCG18-ASSOC','FINAN',		'511',    '7402', 'Valeurs à l''encaissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7404,'PCG18-ASSOC','FINAN',		'5111',    '7403', 'Coupons échus à l''encaissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7405,'PCG18-ASSOC','FINAN',		'5112',    '7403', 'Chèques à encaisser', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7406,'PCG18-ASSOC','FINAN',		'5113',    '7403', 'Effets à l''encaissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7407,'PCG18-ASSOC','FINAN',		'5114',    '7403', 'Effets à l''escompte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7408,'PCG18-ASSOC','FINAN',		'512',    '7402', 'Banques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7409,'PCG18-ASSOC','FINAN',		'5121',    '7408', 'Comptes en monnaie nationale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7410,'PCG18-ASSOC','FINAN',		'5124',    '7408', 'Comptes en devises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7411,'PCG18-ASSOC','FINAN',		'514',    '7402', 'Chèques postaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7412,'PCG18-ASSOC','FINAN',		'515',    '7402', '"Caisse" du Trésor et des établissements publics', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7413,'PCG18-ASSOC','FINAN',		'516',    '7402', 'Sociétés de bourse', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7414,'PCG18-ASSOC','FINAN',		'517',    '7402', 'Autres organismes financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7415,'PCG18-ASSOC','FINAN',		'518',    '7402', 'Intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7416,'PCG18-ASSOC','FINAN',		'5186',    '7415', 'Intérêts courus à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7417,'PCG18-ASSOC','FINAN',		'5187',    '7415', 'Intérêts courus à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7418,'PCG18-ASSOC','FINAN',		'519',    '7402', 'Concours bancaires courants (même ventilation que les 51)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7419,'PCG18-ASSOC','FINAN',		'52',    '7005', 'Instruments de trésorerie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7420,'PCG18-ASSOC','FINAN',		'53',    '7005', 'Caisse', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7421,'PCG18-ASSOC','FINAN',		'531',    '7420', 'Caisses du siège', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7422,'PCG18-ASSOC','FINAN',		'532',    '7420', 'Caisses des établissements (jusqu''à 537)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7423,'PCG18-ASSOC','FINAN',		'54',    '7005', 'Régies d''avance et accréditifs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7424,'PCG18-ASSOC','FINAN',		'541',    '7423', 'Régie d''avance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7425,'PCG18-ASSOC','FINAN',		'542',    '7423', 'Accréditifs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7426,'PCG18-ASSOC','FINAN',		'58',    '7005', 'Virements internes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7427,'PCG18-ASSOC','FINAN',		'581',    '7426', 'Virements de fonds', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7428,'PCG18-ASSOC','FINAN',		'59',    '7005', 'Provisions pour dépréciation des comptes financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7429,'PCG18-ASSOC','FINAN',		'590',    '7428', 'Provisions pour dépréciation des valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7430,'PCG18-ASSOC','FINAN',		'5903',    '7429', 'Actions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7431,'PCG18-ASSOC','FINAN',		'5904',    '7429', 'Autres titres conférant un droit de propriété', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7432,'PCG18-ASSOC','FINAN',		'5906',    '7429', 'Obligations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7433,'PCG18-ASSOC','FINAN',		'5908',    '7429', 'Autres valeurs mobilières de placement et créances assimilées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7435,'PCG18-ASSOC','EXPENSE',		'60',    '7006', 'Achats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7436,'PCG18-ASSOC','EXPENSE',		'601',    '7435', 'Achats stockés - matières premières et fournitures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7437,'PCG18-ASSOC','EXPENSE',		'602',    '7435', 'Achats stockés - autres approvisionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7438,'PCG18-ASSOC','EXPENSE',		'6021',    '7437', 'Produits pharmaceutiques et produits à usage médical', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7439,'PCG18-ASSOC','EXPENSE',		'6022',    '7437', 'Fournitures consommables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7440,'PCG18-ASSOC','EXPENSE',		'6023',    '7437', 'Alimentation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7441,'PCG18-ASSOC','EXPENSE',		'6026',    '7437', 'Emballages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7442,'PCG18-ASSOC','EXPENSE',		'6028',    '7437', 'Autres fournitures suivies en stock', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7443,'PCG18-ASSOC','EXPENSE',		'603',    '7435', 'Variations des stocks', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7444,'PCG18-ASSOC','EXPENSE',		'6031',    '7443', 'Variations des stocks de matières premières et fournitures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7445,'PCG18-ASSOC','EXPENSE',		'6032',    '7443', 'Variations des stocks des autres approvisionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7446,'PCG18-ASSOC','EXPENSE',		'6037',    '7443', 'Variation des stocks de marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7447,'PCG18-ASSOC','EXPENSE',		'604',    '7435', 'Achats d''études et de prestations de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7448,'PCG18-ASSOC','EXPENSE',		'605',    '7435', 'Achats de matériels, d''équipements et de travaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7449,'PCG18-ASSOC','EXPENSE',		'606',    '7435', 'Achats non stockés de matières et fournitures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7450,'PCG18-ASSOC','EXPENSE',		'6061',    '7449', 'Fournitures non stockables (eau, énergie ….)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7451,'PCG18-ASSOC','EXPENSE',		'6063',    '7449', 'Fournitures d''entretien et de petit équipement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7452,'PCG18-ASSOC','EXPENSE',		'6064',    '7449', 'Fournitures administratives', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7453,'PCG18-ASSOC','EXPENSE',		'6068',    '7449', 'Autres matières et fournitures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7454,'PCG18-ASSOC','EXPENSE',		'607',    '7435', 'Achats de marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7455,'PCG18-ASSOC','EXPENSE',		'608',    '7435', 'Frais accessoires d''achats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7456,'PCG18-ASSOC','EXPENSE',		'609',    '7435', 'Rabais, remises et ristournes obtenus sur achats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7457,'PCG18-ASSOC','EXPENSE',		'61',    '7006', 'Services extérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7458,'PCG18-ASSOC','EXPENSE',		'611',    '7457', 'Sous-traitance générale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7459,'PCG18-ASSOC','EXPENSE',		'612',    '7457', 'Redevances de crédit bail', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7460,'PCG18-ASSOC','EXPENSE',		'6122',    '7459', 'Crédit bail mobilier', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7461,'PCG18-ASSOC','EXPENSE',		'6125',    '7459', 'Crédit bail immobilier', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7462,'PCG18-ASSOC','EXPENSE',		'613',    '7457', 'Locations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7463,'PCG18-ASSOC','EXPENSE',		'6132',    '7462', 'Locations immobilières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7464,'PCG18-ASSOC','EXPENSE',		'6135',    '7462', 'Locations mobilières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7465,'PCG18-ASSOC','EXPENSE',		'614',    '7457', 'Charges locatives et de copropriété', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7466,'PCG18-ASSOC','EXPENSE',		'615',    '7457', 'Entretien et réparations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7467,'PCG18-ASSOC','EXPENSE',		'6152',    '7466', 'Entretien et réparations sur biens immobiliers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7468,'PCG18-ASSOC','EXPENSE',		'6155',    '7466', 'Entretien et réparations sur biens mobiliers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7469,'PCG18-ASSOC','EXPENSE',		'6156',    '7466', 'Maintenance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7470,'PCG18-ASSOC','EXPENSE',		'616',    '7457', 'Primes d''assurances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7471,'PCG18-ASSOC','EXPENSE',		'6161',    '7470', 'Multirisques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7472,'PCG18-ASSOC','EXPENSE',		'6162',    '7470', 'Assurance obligatoire dommage construction', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7473,'PCG18-ASSOC','EXPENSE',		'6163',    '7470', 'Assurance transport', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7474,'PCG18-ASSOC','EXPENSE',		'6164',    '7470', 'Risques d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7475,'PCG18-ASSOC','EXPENSE',		'6165',    '7470', 'Insolvabilité clients', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7476,'PCG18-ASSOC','EXPENSE',		'617',    '7457', 'Etudes et recherches', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7477,'PCG18-ASSOC','EXPENSE',		'618',    '7457', 'Divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7478,'PCG18-ASSOC','EXPENSE',		'6181',    '7477', 'Documentation générale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7479,'PCG18-ASSOC','EXPENSE',		'6183',    '7477', 'Documentation technique', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7480,'PCG18-ASSOC','EXPENSE',		'6185',    '7477', 'Frais de colloques, séminaires, conférences', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7481,'PCG18-ASSOC','EXPENSE',		'619',    '7457', 'Rabais, remises et ristournes obtenus sur services extérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7482,'PCG18-ASSOC','EXPENSE',		'62',    '7006', 'Autres services extérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7483,'PCG18-ASSOC','EXPENSE',		'621',    '7482', 'Personnel extérieur à l''association', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7484,'PCG18-ASSOC','EXPENSE',		'6211',    '7483', 'Personnel intérimaire', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7485,'PCG18-ASSOC','EXPENSE',		'6214',    '7483', 'Personnel détaché ou prêté à l''association', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7486,'PCG18-ASSOC','EXPENSE',		'622',    '7482', 'Rémunérations d''intermédiaires et honoraires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7487,'PCG18-ASSOC','EXPENSE',		'6221',    '7486', 'Commissions et courtages sur achats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7488,'PCG18-ASSOC','EXPENSE',		'6222',    '7486', 'Commissions et courtages sur ventes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7489,'PCG18-ASSOC','EXPENSE',		'6224',    '7486', 'rémunérations des transitaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7490,'PCG18-ASSOC','EXPENSE',		'6225',    '7486', 'rémunérations d''affacturage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7491,'PCG18-ASSOC','EXPENSE',		'6226',    '7486', 'Honoraires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7492,'PCG18-ASSOC','EXPENSE',		'62264',    '7491', 'Honoraires sur legs ou donations destinés à être cédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7493,'PCG18-ASSOC','EXPENSE',		'6227',    '7486', 'Frais d''actes et de contentieux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7494,'PCG18-ASSOC','EXPENSE',		'6228',    '7486', 'Divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7495,'PCG18-ASSOC','EXPENSE',		'623',    '7482', 'Information, publications, relations publiques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7496,'PCG18-ASSOC','EXPENSE',		'6231',    '7495', 'Annonces et insertions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7497,'PCG18-ASSOC','EXPENSE',		'6232',    '7495', 'Echantillons', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7498,'PCG18-ASSOC','EXPENSE',		'6233',    '7495', 'Foires et expositions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7499,'PCG18-ASSOC','EXPENSE',		'6234',    '7495', 'Cadeaux à la clientèle', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7500,'PCG18-ASSOC','EXPENSE',		'6235',    '7495', 'Primes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7501,'PCG18-ASSOC','EXPENSE',		'6236',    '7495', 'Catalogues et imprimés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7502,'PCG18-ASSOC','EXPENSE',		'6237',    '7495', 'Publications', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7503,'PCG18-ASSOC','EXPENSE',		'6238',    '7495', 'Divers ( pourboires, dons courants, …)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7504,'PCG18-ASSOC','EXPENSE',		'624',    '7482', 'Transports de biens, d''usagers et transports collectifs du personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7505,'PCG18-ASSOC','EXPENSE',		'6241',    '7504', 'Transport aux achats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7506,'PCG18-ASSOC','EXPENSE',		'6242',    '7504', 'Transport aux ventes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7507,'PCG18-ASSOC','EXPENSE',		'6243',    '7504', 'Transport entre établissements ou chantiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7508,'PCG18-ASSOC','EXPENSE',		'6244',    '7504', 'Transport administratifs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7509,'PCG18-ASSOC','EXPENSE',		'6247',    '7504', 'Transport collectif du personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7510,'PCG18-ASSOC','EXPENSE',		'625',    '7482', 'Déplacements, missions et réceptions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7511,'PCG18-ASSOC','EXPENSE',		'6251',    '7510', 'Voyages et déplacements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7512,'PCG18-ASSOC','EXPENSE',		'6255',    '7510', 'Frais de déménagement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7513,'PCG18-ASSOC','EXPENSE',		'6256',    '7510', 'Missions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7514,'PCG18-ASSOC','EXPENSE',		'6257',    '7510', 'Réceptions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7515,'PCG18-ASSOC','EXPENSE',		'626',    '7482', 'Frais postaux et frais de télécommunications', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7516,'PCG18-ASSOC','EXPENSE',		'6261',    '7515', 'Liaisons informatiques et spécialisées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7517,'PCG18-ASSOC','EXPENSE',		'6263',    '7515', 'Affranchissements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7518,'PCG18-ASSOC','EXPENSE',		'6265',    '7515', 'Téléphone', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7519,'PCG18-ASSOC','EXPENSE',		'6268',    '7515', 'Autres frais postaux et de télécommunications', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7520,'PCG18-ASSOC','EXPENSE',		'627',    '7482', 'Services bancaires et assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7521,'PCG18-ASSOC','EXPENSE',		'6271',    '7520', 'Frais sur titres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7522,'PCG18-ASSOC','EXPENSE',		'6272',    '7520', 'Commissions sur emprunts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7523,'PCG18-ASSOC','EXPENSE',		'6275',    '7520', 'Frais sur effets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7524,'PCG18-ASSOC','EXPENSE',		'6276',    '7520', 'Location de coffre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7525,'PCG18-ASSOC','EXPENSE',		'6278',    '7520', 'Autres frais et commissions sur prestations de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7526,'PCG18-ASSOC','EXPENSE',		'628',    '7482', 'Autres prestations de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7527,'PCG18-ASSOC','EXPENSE',		'6281',    '7526', 'Concours divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7528,'PCG18-ASSOC','EXPENSE',		'6284',    '7526', 'Frais de recrutement  du personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7529,'PCG18-ASSOC','EXPENSE',		'6288',    '7526', 'Autres prestations diverses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7530,'PCG18-ASSOC','EXPENSE',		'629',    '7482', 'Rabais, remises et ristournes obtenus sur autres services extérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7531,'PCG18-ASSOC','EXPENSE',		'63',    '7006', 'Impôts, taxes et versements assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7532,'PCG18-ASSOC','EXPENSE',		'631',    '7531', 'Impôts, taxes et versements assimilés sur rémunérations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7533,'PCG18-ASSOC','EXPENSE',		'6311',    '7532', 'Taxes sur les salaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7534,'PCG18-ASSOC','EXPENSE',		'6312',    '7532', 'Taxe d''apprentissage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7535,'PCG18-ASSOC','EXPENSE',		'6313',    '7532', 'Participation des employeurs à la formation professionnelle continue', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7536,'PCG18-ASSOC','EXPENSE',		'6314',    '7532', 'Cotisation pour défaut d''investissement obligatoire dans laconstruction', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7537,'PCG18-ASSOC','EXPENSE',		'6318',    '7532', 'Autres impôts sur rémunérations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7538,'PCG18-ASSOC','EXPENSE',		'633',    '7531', 'Impôts, taxes et versements assimilés sur rémunérations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7539,'PCG18-ASSOC','EXPENSE',		'6331',    '7538', 'Versement de transport', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7540,'PCG18-ASSOC','EXPENSE',		'6332',    '7538', 'Allocation logement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7541,'PCG18-ASSOC','EXPENSE',		'6333',    '7538', 'Participation des employeurs à la formation professionnelle continue', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7542,'PCG18-ASSOC','EXPENSE',		'6334',    '7538', 'Participation des employeurs à l''effort de construction', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7543,'PCG18-ASSOC','EXPENSE',		'6335',    '7538', 'Versements libératoires ouvrant droit à l''exonération de la taxe d''apprentissage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7544,'PCG18-ASSOC','EXPENSE',		'6338',    '7538', 'Autres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7545,'PCG18-ASSOC','EXPENSE',		'635',    '7531', 'Autres impôts, taxes et versements assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7546,'PCG18-ASSOC','EXPENSE',		'6351',    '7545', 'Impôts directs (sauf impôts sur les bénéfices)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7547,'PCG18-ASSOC','EXPENSE',		'63511',    '7546', 'CFE, CVAE', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7548,'PCG18-ASSOC','EXPENSE',		'63512',    '7546', 'Taxes foncières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7549,'PCG18-ASSOC','EXPENSE',		'63513',    '7546', 'Autres impôts locaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7550,'PCG18-ASSOC','EXPENSE',		'6352',    '7545', 'Taxe sur le chiffre d''affaire non récupérables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7551,'PCG18-ASSOC','EXPENSE',		'6353',    '7545', 'Impôts indirects', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7552,'PCG18-ASSOC','EXPENSE',		'6354',    '7545', 'Droits d''enregistrement et de timbres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7553,'PCG18-ASSOC','EXPENSE',		'63541',    '7552', 'Droit de mutation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7554,'PCG18-ASSOC','EXPENSE',		'6358',    '7545', 'Autres droits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7555,'PCG18-ASSOC','EXPENSE',		'637',    '7531', 'Autres impôts, taxes et versements assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7556,'PCG18-ASSOC','EXPENSE',		'6371',    '7555', 'Contribution sociale de solidarité à la charge des sociétés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7557,'PCG18-ASSOC','EXPENSE',		'6374',    '7555', 'Impôts et taxes exigibles à l''étranger', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7558,'PCG18-ASSOC','EXPENSE',		'6378',    '7555', 'Taxes diverses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7559,'PCG18-ASSOC','EXPENSE',		'64',    '7006', 'Charges de personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7560,'PCG18-ASSOC','EXPENSE',		'641',    '7559', 'Rémunérations du personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7561,'PCG18-ASSOC','EXPENSE',		'6411',    '7560', 'Salaires, appointements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7562,'PCG18-ASSOC','EXPENSE',		'6412',    '7560', 'Congés payés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7563,'PCG18-ASSOC','EXPENSE',		'6413',    '7560', 'Primes et gratifications', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7564,'PCG18-ASSOC','EXPENSE',		'6414',    '7560', 'Indemnités et avantages divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7565,'PCG18-ASSOC','EXPENSE',		'6415',    '7560', 'Supplément familial', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7566,'PCG18-ASSOC','EXPENSE',		'645',    '7559', 'Charges de Sécurité Sociale et de prévoyance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7567,'PCG18-ASSOC','EXPENSE',		'6451',    '7566', 'Cotisations à l''URSSAF', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7568,'PCG18-ASSOC','EXPENSE',		'6452',    '7566', 'Cotisations aux mutuelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7569,'PCG18-ASSOC','EXPENSE',		'6453',    '7566', 'Cotisations aux caisses de retraite', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7570,'PCG18-ASSOC','EXPENSE',		'6454',    '7566', 'Cotisations aux caisses d''allocations de chômage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7571,'PCG18-ASSOC','EXPENSE',		'6458',    '7566', 'Cotisations aux autres organismes sociaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7572,'PCG18-ASSOC','EXPENSE',		'647',    '7559', 'Autres charges sociales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7573,'PCG18-ASSOC','EXPENSE',		'6471',    '7572', 'Prestations directes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7574,'PCG18-ASSOC','EXPENSE',		'6472',    '7572', 'Versements aux comités d''entreprise et d''établissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7575,'PCG18-ASSOC','EXPENSE',		'6473',    '7572', 'Dotations aux comités d''hygiène et de sécurité', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7576,'PCG18-ASSOC','EXPENSE',		'6474',    '7572', 'Dotations aux autres œuvres sociales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7577,'PCG18-ASSOC','EXPENSE',		'6475',    '7572', 'Médecine du travail', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7578,'PCG18-ASSOC','EXPENSE',		'6478',    '7572', 'Divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7579,'PCG18-ASSOC','EXPENSE',		'648',    '7559', 'Autres charges de personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7580,'PCG18-ASSOC','EXPENSE',		'65',    '7006', 'Autres charges de gestion courante', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7581,'PCG18-ASSOC','EXPENSE',		'651',    '7580', 'Redevances pour concessions, brevets, licences, procédés, droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7582,'PCG18-ASSOC','EXPENSE',		'6511',    '7581', 'Redevances pour concessions, brevets, licences, marques et procédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7583,'PCG18-ASSOC','EXPENSE',		'6516',    '7581', 'Droits d''auteurs et de reproduction', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7584,'PCG18-ASSOC','EXPENSE',		'6518',    '7581', 'Autres droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7585,'PCG18-ASSOC','EXPENSE',		'653',    '7580', 'Charges de la générosité du public', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7586,'PCG18-ASSOC','EXPENSE',		'6531',    '7585', 'Autres charges sur legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7587,'PCG18-ASSOC','EXPENSE',		'654',    '7580', 'Pertes sur créances irrécouvrables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7588,'PCG18-ASSOC','EXPENSE',		'6541',    '7587', 'Créances de l''exercice', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7589,'PCG18-ASSOC','EXPENSE',		'6544',    '7587', 'Créances des exercices antérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7590,'PCG18-ASSOC','EXPENSE',		'655',    '7580', 'Quotes-parts de résultat sur opérations faites en commun', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7591,'PCG18-ASSOC','EXPENSE',		'6556',    '7590', 'Frais de siège social du gestionnaire', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7592,'PCG18-ASSOC','EXPENSE',		'6558',    '7590', 'Quotes-parts de résultat sur opérations faites dans le cadre d''un groupement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7593,'PCG18-ASSOC','EXPENSE',		'657',    '7580', 'Aides financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7594,'PCG18-ASSOC','EXPENSE',		'6571',    '7593', 'Aides financières versées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7595,'PCG18-ASSOC','EXPENSE',		'6572',    '7593', 'Quotes-parts de générosité reversée', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7596,'PCG18-ASSOC','EXPENSE',		'658',    '7580', 'Charges diverses de gestion courante', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7597,'PCG18-ASSOC','EXPENSE',		'6586',    '7596', 'Fonds de solidarité', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7598,'PCG18-ASSOC','EXPENSE',		'6588',    '7596', 'Autres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7599,'PCG18-ASSOC','EXPENSE',		'66',    '7006', 'Charges financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7600,'PCG18-ASSOC','EXPENSE',		'661',    '7599', 'Charges d''intérêts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7601,'PCG18-ASSOC','EXPENSE',		'6611',    '7600', 'Intérêts des emprunts et dettes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7602,'PCG18-ASSOC','EXPENSE',		'6615',    '7600', 'Intérêts des comptes courants et des dépôts créditeurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7603,'PCG18-ASSOC','EXPENSE',		'6616',    '7600', 'Intérêts bancaires et sur opérations de financement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7604,'PCG18-ASSOC','EXPENSE',		'6617',    '7600', 'Intérêts des obligations cautionnées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7605,'PCG18-ASSOC','EXPENSE',		'6618',    '7600', 'Intérêts des autres dettes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7606,'PCG18-ASSOC','EXPENSE',		'664',    '7599', 'Pertes sur créances liées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7607,'PCG18-ASSOC','EXPENSE',		'665',    '7599', 'Escomptes accordés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7608,'PCG18-ASSOC','EXPENSE',		'666',    '7599', 'Pertes de change', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7609,'PCG18-ASSOC','EXPENSE',		'667',    '7599', 'Charges nettes sur cessions de valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7610,'PCG18-ASSOC','EXPENSE',		'668',    '7599', 'Autres charges financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7611,'PCG18-ASSOC','EXPENSE',		'67',    '7006', 'Charges exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7612,'PCG18-ASSOC','EXPENSE',		'671',    '7611', 'Charges exceptionnelles sur opérations de gestion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7613,'PCG18-ASSOC','EXPENSE',		'6711',    '7612', 'Pénalités sur marchés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7614,'PCG18-ASSOC','EXPENSE',		'6712',    '7612', 'Pénalités, amendes fiscales et pénales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7615,'PCG18-ASSOC','EXPENSE',		'6713',    '7612', 'Dons, libéralités', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7616,'PCG18-ASSOC','EXPENSE',		'6714',    '7612', 'Créances devenues irrécouvrables dans l''exercice', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7617,'PCG18-ASSOC','EXPENSE',		'6715',    '7612', 'Aides financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7618,'PCG18-ASSOC','EXPENSE',		'6717',    '7612', 'Rappel d''impôts (autres qu''impôts sur les bénéfices)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7619,'PCG18-ASSOC','EXPENSE',		'6718',    '7612', 'Autres charges exceptionnelles sur opération de gestion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7620,'PCG18-ASSOC','EXPENSE',		'672',    '7611', 'Charges sur exercices antérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7621,'PCG18-ASSOC','EXPENSE',		'673',    '7611', 'Apports ou affectations en numéraire', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7622,'PCG18-ASSOC','EXPENSE',		'675',    '7611', 'Valeurs comptables des éléments d''actif cédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7623,'PCG18-ASSOC','EXPENSE',		'6751',    '7622', 'Immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7624,'PCG18-ASSOC','EXPENSE',		'6752',    '7622', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7625,'PCG18-ASSOC','EXPENSE',		'6754',    '7622', 'Immobilisations reçues en legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7626,'PCG18-ASSOC','EXPENSE',		'6756',    '7622', 'Immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7627,'PCG18-ASSOC','EXPENSE',		'6758',    '7622', 'Autres éléments d''actif', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7628,'PCG18-ASSOC','EXPENSE',		'678',    '7611', 'Autres charges exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7629,'PCG18-ASSOC','EXPENSE',		'68',    '7006', 'Dotations aux amortissements, provisions et engagements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7630,'PCG18-ASSOC','EXPENSE',		'681',    '7629', 'Dotations aux amortissements et aux provisions - charges d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7631,'PCG18-ASSOC','EXPENSE',		'6811',    '7630', 'Dotations aux amortissements sur immobilisations incorporelles et corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7632,'PCG18-ASSOC','EXPENSE',		'6812',    '7630', 'Dotation aux amortissements des charges d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7633,'PCG18-ASSOC','EXPENSE',		'6815',    '7630', 'Dotations aux provisions d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7634,'PCG18-ASSOC','EXPENSE',		'6816',    '7630', 'Dotations pour dépréciations d''immobilisations incorporelles et corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7635,'PCG18-ASSOC','EXPENSE',		'68164',    '7634', 'Dotations pour dépréciation d''actifs reçus par legs ou donations destinés à être cédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7636,'PCG18-ASSOC','EXPENSE',		'6817',    '7630', 'Dotations pour dépréciations des actifs circulant', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7637,'PCG18-ASSOC','EXPENSE',		'686',    '7629', 'Dotations aux amortissements et aux provisions - charges financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7638,'PCG18-ASSOC','EXPENSE',		'6861',    '7637', 'Dotations aux amortissements des primes de remboursement des obligations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7639,'PCG18-ASSOC','EXPENSE',		'6865',    '7637', 'Dotation aux provisions pour risques et charges financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7640,'PCG18-ASSOC','EXPENSE',		'6866',    '7637', 'Dotation aux provisions pour dépréciation des éléments financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7641,'PCG18-ASSOC','EXPENSE',		'6868',    '7637', 'Autres dotations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7642,'PCG18-ASSOC','EXPENSE',		'687',    '7629', 'Dotations aux amortissements et aux provisions - charges exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7643,'PCG18-ASSOC','EXPENSE',		'6871',    '7642', 'Dotations aux amortissements exceptionnels des immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7644,'PCG18-ASSOC','EXPENSE',		'6872',    '7642', 'Dotations aux provision réglementées (immobilisations)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7645,'PCG18-ASSOC','EXPENSE',		'6873',    '7642', 'Dotations aux provisions réglementées (stocks)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7646,'PCG18-ASSOC','EXPENSE',		'6874',    '7642', 'Dotations aux autres provisions réglementées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7647,'PCG18-ASSOC','EXPENSE',		'6875',    '7642', 'Dotations aux provisions exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7648,'PCG18-ASSOC','EXPENSE',		'6876',    '7642', 'Dotations pour dépréciations exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7649,'PCG18-ASSOC','EXPENSE',		'689',    '7629', 'Reports en fonds dédiés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7650,'PCG18-ASSOC','EXPENSE',		'6891',    '7649', 'Reports en fonds reportés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7651,'PCG18-ASSOC','EXPENSE',		'6893',    '7649', 'Reports en fonds dédiés des fondations abritées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7652,'PCG18-ASSOC','EXPENSE',		'6894',    '7649', 'Reports en fonds dédiés sur subventions d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7653,'PCG18-ASSOC','EXPENSE',		'6895',    '7649', 'Reports en fonds dédiés sur contributions financières d''autres organismes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7654,'PCG18-ASSOC','EXPENSE',		'6896',    '7649', 'Reports en fonds dédiés sur ressources liées à la générosité du public', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7655,'PCG18-ASSOC','EXPENSE',		'69',    '7006', 'Impôts sur les sociétés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7656,'PCG18-ASSOC','EXPENSE',		'691',    '7655', 'Participation des salariés aux résultats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7657,'PCG18-ASSOC','EXPENSE',		'695',    '7655', 'Impôts sur les sociétés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7658,'PCG18-ASSOC','EXPENSE',		'6951',    '7657', 'Impôts sur les sociétés des activités fiscalisées de l''entité', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7659,'PCG18-ASSOC','EXPENSE',		'6952',    '7657', 'Impôts sur les sociétés des personnes morales à but non lucratif', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7660,'PCG18-ASSOC','EXPENSE',		'699',    '7655', 'Report en arrière des déficits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7662,'PCG18-ASSOC','INCOME',		'70',    '7007', 'Ventes de produits fabriqués, de prestations de services et de marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7663,'PCG18-ASSOC','INCOME',		'701',    '7662', 'Ventes de produits finis', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7664,'PCG18-ASSOC','INCOME',		'702',    '7662', 'Ventes de produits intermédiaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7665,'PCG18-ASSOC','INCOME',		'703',    '7662', 'Ventes de produits résiduels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7666,'PCG18-ASSOC','INCOME',		'704',    '7662', 'Ventes de travaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7667,'PCG18-ASSOC','INCOME',		'705',    '7662', 'Etudes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7668,'PCG18-ASSOC','INCOME',		'706',    '7662', 'Ventes de prestations de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7669,'PCG18-ASSOC','INCOME',		'7063',    '7668', 'Parrainages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7670,'PCG18-ASSOC','INCOME',		'707',    '7662', 'Ventes de marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7671,'PCG18-ASSOC','INCOME',		'7073',    '7670', 'Ventes de dons en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7672,'PCG18-ASSOC','INCOME',		'708',    '7662', 'Produits des activités annexes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7673,'PCG18-ASSOC','INCOME',		'7081',    '7672', 'Produits des services exploités dans l''intérêt du personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7674,'PCG18-ASSOC','INCOME',		'7082',    '7672', 'Commissions et courtages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7675,'PCG18-ASSOC','INCOME',		'7083',    '7672', 'Locations diverses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7676,'PCG18-ASSOC','INCOME',		'7084',    '7672', 'Mise à disposition de personnel facturée', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7677,'PCG18-ASSOC','INCOME',		'7085',    '7672', 'Ports et frais accessoires facturés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7678,'PCG18-ASSOC','INCOME',		'7088',    '7672', 'Autres produits d''activités annexes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7679,'PCG18-ASSOC','INCOME',		'709',    '7662', 'Rabais, remises et ristournes accordés par l''association', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7680,'PCG18-ASSOC','INCOME',		'71',    '7007', 'Production stockée', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7681,'PCG18-ASSOC','INCOME',		'713',    '7680', 'Variation des stocks', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7682,'PCG18-ASSOC','INCOME',		'7133',    '7681', 'Variation des en-cours de production de biens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7683,'PCG18-ASSOC','INCOME',		'7134',    '7681', 'Variation des en-cours de production de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7684,'PCG18-ASSOC','INCOME',		'7135',    '7681', 'Variation des stocks de produits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7685,'PCG18-ASSOC','INCOME',		'71355',    '7684', 'Variation des stocks de produits finis', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7686,'PCG18-ASSOC','INCOME',		'72',    '7007', 'Production immobilisée', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7687,'PCG18-ASSOC','INCOME',		'721',    '7686', 'Immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7688,'PCG18-ASSOC','INCOME',		'722',    '7686', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7689,'PCG18-ASSOC','INCOME',		'73',    '7007', 'Concours publics', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7690,'PCG18-ASSOC','INCOME',		'74',    '7007', 'Subventions de fonctionnement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7691,'PCG18-ASSOC','INCOME',		'75',    '7007', 'Autres produits de gestion courante', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7692,'PCG18-ASSOC','INCOME',		'751',    '7691', 'Redevances pour concessions, brevets, licences, procédés, droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7693,'PCG18-ASSOC','INCOME',		'7511',    '7692', 'Redevances pour concessions, brevets, licences, marques et procédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7694,'PCG18-ASSOC','INCOME',		'7516',    '7692', 'Droits d''auteurs et de reproduction', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7695,'PCG18-ASSOC','INCOME',		'7518',    '7692', 'Autres droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7696,'PCG18-ASSOC','INCOME',		'752',    '7691', 'Revenus des immeubles non affectés aux activités relevant de l''objet statutaire', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7697,'PCG18-ASSOC','INCOME',		'753',    '7691', 'Versements des fondateurs ou consommation de la dotation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7698,'PCG18-ASSOC','INCOME',		'7531',    '7697', 'Versements des fondateurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7699,'PCG18-ASSOC','INCOME',		'7532',    '7697', 'Quotes-parts de dotation consomptible virée au compte de résultat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7700,'PCG18-ASSOC','INCOME',		'754',    '7691', 'Ressources liées à la générosité du public', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7701,'PCG18-ASSOC','INCOME',		'7541',    '7700', 'Dons manuels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7702,'PCG18-ASSOC','INCOME',		'75411',    '7701', 'Dons manuels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7703,'PCG18-ASSOC','INCOME',		'75412',    '7701', 'Abandons de frais par les bénévoles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7704,'PCG18-ASSOC','INCOME',		'7542',    '7700', 'Mécénats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7705,'PCG18-ASSOC','INCOME',		'7543',    '7700', 'Legs, donations et assurances-vie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7706,'PCG18-ASSOC','INCOME',		'75431',    '7705', 'Assurances-vie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7707,'PCG18-ASSOC','INCOME',		'75432',    '7705', 'Legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7708,'PCG18-ASSOC','INCOME',		'75433',    '7705', 'Autres produits sur legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7709,'PCG18-ASSOC','INCOME',		'755',    '7691', 'Contributions financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7710,'PCG18-ASSOC','INCOME',		'7551',    '7709', 'Contributions financières reçues d''autres organismes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7711,'PCG18-ASSOC','INCOME',		'7552',    '7709', 'Quotes-parts de générosité reçues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7712,'PCG18-ASSOC','INCOME',		'756',    '7691', 'Cotisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7713,'PCG18-ASSOC','INCOME',		'7561',    '7712', 'Cotisations sans contrepartie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7714,'PCG18-ASSOC','INCOME',		'7562',    '7712', 'Cotisations avec contrepartie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7715,'PCG18-ASSOC','INCOME',		'757',    '7691', 'Gains de change sur créances et dettes d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7716,'PCG18-ASSOC','INCOME',		'758',    '7691', 'Produits divers de gestion courante', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7717,'PCG18-ASSOC','INCOME',		'76',    '7007', 'Produits financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7718,'PCG18-ASSOC','INCOME',		'761',    '7717', 'Produits des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7719,'PCG18-ASSOC','INCOME',		'7611',    '7718', 'Revenus des titres de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7720,'PCG18-ASSOC','INCOME',		'7616',    '7718', 'Revenus des autres formes de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7721,'PCG18-ASSOC','INCOME',		'7617',    '7718', 'Revenus des créances rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7722,'PCG18-ASSOC','INCOME',		'762',    '7717', 'Produits des immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7723,'PCG18-ASSOC','INCOME',		'7621',    '7722', 'Revenus des titres immobilisés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7724,'PCG18-ASSOC','INCOME',		'7624',    '7722', 'Revenus des prêts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7725,'PCG18-ASSOC','INCOME',		'7627',    '7722', 'Revenus des créances immobilisées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7726,'PCG18-ASSOC','INCOME',		'763',    '7717', 'Revenus des autres créances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7727,'PCG18-ASSOC','INCOME',		'764',    '7717', 'Revenus des valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7728,'PCG18-ASSOC','INCOME',		'765',    '7717', 'Escomptes de règlement obtenus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7729,'PCG18-ASSOC','INCOME',		'766',    '7717', 'Gains de change', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7730,'PCG18-ASSOC','INCOME',		'767',    '7717', 'Produits nets sur cessions de valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7731,'PCG18-ASSOC','INCOME',		'768',    '7717', 'Autres produits financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7732,'PCG18-ASSOC','INCOME',		'77',    '7007', 'Produits exceptionnels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7733,'PCG18-ASSOC','INCOME',		'771',    '7732', 'Produits exceptionnels sur opérations de gestion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7734,'PCG18-ASSOC','INCOME',		'7713',    '7733', 'Libéralités reçues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7735,'PCG18-ASSOC','INCOME',		'7714',    '7733', 'Rentrées sur créances amorties', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7736,'PCG18-ASSOC','INCOME',		'7715',    '7733', 'Subventions d''équilibre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7737,'PCG18-ASSOC','INCOME',		'7717',    '7733', 'Dégrèvements d''impôts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7738,'PCG18-ASSOC','INCOME',		'7718',    '7733', 'Autres produits exceptionnels sur opérations de gestion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7739,'PCG18-ASSOC','INCOME',		'772',    '7732', 'Produits sur exercices antérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7740,'PCG18-ASSOC','INCOME',		'775',    '7732', 'Produits des cessions d''éléments d''actif', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7741,'PCG18-ASSOC','INCOME',		'7751',    '7740', 'Immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7742,'PCG18-ASSOC','INCOME',		'7752',    '7740', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7743,'PCG18-ASSOC','INCOME',		'7754',    '7740', 'Immobilisations reçues en legs ou donations destinées à être cédées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7744,'PCG18-ASSOC','INCOME',		'7756',    '7740', 'Immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7745,'PCG18-ASSOC','INCOME',		'7758',    '7740', 'Autres éléments d''actif', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7746,'PCG18-ASSOC','INCOME',		'777',    '7732', 'Quote-part des subventions d''investissement virée au résultat de l''exercice', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7747,'PCG18-ASSOC','INCOME',		'778',    '7732', 'Autres produits exceptionnels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7748,'PCG18-ASSOC','INCOME',		'78',    '7007', 'Reprises sur amortissements, dépréciations et provisions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7749,'PCG18-ASSOC','INCOME',		'781',    '7748', 'Reprises sur amortissements des immobilisations, dépréciations et provisions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7750,'PCG18-ASSOC','INCOME',		'7811',    '7749', 'Reprises sur amortissements des immobilisations incorporelles et corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7751,'PCG18-ASSOC','INCOME',		'78111',    '7750', 'immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7752,'PCG18-ASSOC','INCOME',		'78112',    '7750', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7753,'PCG18-ASSOC','INCOME',		'7815',    '7749', 'Reprises sur provisions d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7754,'PCG18-ASSOC','INCOME',		'7816',    '7749', 'Reprises sur dépréciation des immobilisations incorporelles et corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7755,'PCG18-ASSOC','INCOME',		'78161',    '7754', 'Immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7756,'PCG18-ASSOC','INCOME',		'78162',    '7754', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7757,'PCG18-ASSOC','INCOME',		'78164',    '7754', 'Reprises sur dépréciations d''actifs reçus par legs ou donations destinés à être cédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7758,'PCG18-ASSOC','INCOME',		'7817',    '7749', 'Reprises sur provisions pour dépréciation des actifs circulants', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7759,'PCG18-ASSOC','INCOME',		'78173',    '7758', 'Pour dépréciation des stocks', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7760,'PCG18-ASSOC','INCOME',		'78174',    '7758', 'Pour dépréciation des créances usagers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7761,'PCG18-ASSOC','INCOME',		'786',    '7748', 'Reprises sur amortissements et provisions - produits financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7762,'PCG18-ASSOC','INCOME',		'7865',    '7761', 'Reprises sur provisions pour risques et charges financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7763,'PCG18-ASSOC','INCOME',		'7866',    '7761', 'Reprises sur provisions pour dépréciation des éléments financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7764,'PCG18-ASSOC','INCOME',		'78662',    '7763', 'Pour dépréciation des immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7765,'PCG18-ASSOC','INCOME',		'78665',    '7763', 'Pour dépréciation des valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7766,'PCG18-ASSOC','INCOME',		'787',    '7748', 'Reprises sur amortissements et provisions - produits exceptionnels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7767,'PCG18-ASSOC','INCOME',		'7872',    '7766', 'Reprises sur provisions réglementées amortissements dérogatoires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7768,'PCG18-ASSOC','INCOME',		'7873',    '7766', 'Reprises sur provisions réglementées stocks', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7769,'PCG18-ASSOC','INCOME',		'7874',    '7766', 'Reprises sur autres provisions réglementées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7770,'PCG18-ASSOC','INCOME',		'7875',    '7766', 'Reprises sur provisions pour risques et charges exceptionnels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7771,'PCG18-ASSOC','INCOME',		'7876',    '7766', 'Reprises sur provisions pour dépréciations exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7772,'PCG18-ASSOC','INCOME',		'789',    '7748', 'Utilisations de fonds reportés et de fonds dédiés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7773,'PCG18-ASSOC','INCOME',		'7891',    '7772', 'Utilisation de fonds reportés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7774,'PCG18-ASSOC','INCOME',		'7893',    '7772', 'Utilisation de fonds dédiés des fondations abritées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7775,'PCG18-ASSOC','INCOME',		'7894',    '7772', 'Utilisation des fonds dédiés sur subventions d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7776,'PCG18-ASSOC','INCOME',		'7895',    '7772', 'Utilisation des fonds dédiés sur contributions financières d''autres organismes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7777,'PCG18-ASSOC','INCOME',		'7896',    '7772', 'Utilisation des fonds dédiés sur ressources liées à la générosité du public', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7778,'PCG18-ASSOC','INCOME',		'79',    '7007', 'Transferts de charges', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7779,'PCG18-ASSOC','INCOME',		'791',    '7778', 'Transfert de charges d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7780,'PCG18-ASSOC','INCOME',		'796',    '7778', 'Transfert de charges financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7781,'PCG18-ASSOC','INCOME',		'797',    '7778', 'Transfert de charges exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7783,'PCG18-ASSOC','SPECIAL',		'86',    '7008', 'Emploi des contributions volontaires en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7784,'PCG18-ASSOC','SPECIAL',		'860',    '7783', 'Secours en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7785,'PCG18-ASSOC','SPECIAL',		'861',    '7783', 'Mise à disposition gratuite de biens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7786,'PCG18-ASSOC','SPECIAL',		'862',    '7783', 'Prestations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7787,'PCG18-ASSOC','SPECIAL',		'864',    '7783', 'Personnel bénévole', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7788,'PCG18-ASSOC','SPECIAL',		'87',    '7008', 'Contributions volontaires en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7789,'PCG18-ASSOC','SPECIAL',		'870',    '7788', 'Dons en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7790,'PCG18-ASSOC','SPECIAL',		'871',    '7788', 'Prestations en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7791,'PCG18-ASSOC','SPECIAL',		'875',    '7788', 'Bénévolat', 1);
+
 
 
 --

From b1fa23608f0ba4f8405496eedc67f5699d63f1eb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 2 Feb 2025 00:29:08 +0100
Subject: [PATCH 385/602] Debug v21

---
 htdocs/core/lib/functions.lib.php | 2 +-
 htdocs/public/users/view.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0a8cab279a9..23780903360 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6052,7 +6052,7 @@ function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss
 		if ($picto == 'warning') {
 			$fa = 'exclamation-triangle';
 		}
-		$result = ($nodiv ? '' : '<div class="wordbreak '.$class.($morecss ? ' '.$morecss : '').($textfordropdown ? ' hidden' : '').'">').'<span class="fa fa-'.$fa.'" title="'.dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).'"></span> ';
+		$result = ($nodiv ? '' : '<div class="wordbreakall '.$class.($morecss ? ' '.$morecss : '').($textfordropdown ? ' hidden' : '').'">').'<span class="fa fa-'.$fa.'" title="'.dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).'"></span> ';
 		$result .= dol_escape_htmltag($text, 1, 0, 'div,span,b,br,a');
 		$result .= ($nodiv ? '' : '</div>');
 
diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php
index e87dcdbd08e..94c94a778f7 100644
--- a/htdocs/public/users/view.php
+++ b/htdocs/public/users/view.php
@@ -387,7 +387,7 @@ if (!empty($object->socialnetworks) && is_array($object->socialnetworks)) {
 		$listOfSocialNetworks = $object->socialnetworks;
 		foreach ($listOfSocialNetworks as $key => $value) {
 			if (!getDolUserString('USER_HIDE_SOCIALNETWORK_'.strtoupper($key), 0, $object)) {
-				$usersection .= '<div class="flexitemsmall">'.dol_print_socialnetworks($key, 0, $object->id, strtolower($key), $socialnetworksdict).'</div>';
+				$usersection .= '<div class="flexitemsmall">'.dol_print_socialnetworks($value, 0, $object->id, strtolower($key), $socialnetworksdict).'</div>';
 			}
 		}
 	}

From 74cebf398f9ed1e676a135b56611127437dadacd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 2 Feb 2025 00:29:08 +0100
Subject: [PATCH 386/602] Debug v21

---
 htdocs/core/lib/functions.lib.php | 2 +-
 htdocs/public/users/view.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7ad4d1888ce..c13b68023ef 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6049,7 +6049,7 @@ function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss
 		if ($picto == 'warning') {
 			$fa = 'exclamation-triangle';
 		}
-		$result = ($nodiv ? '' : '<div class="wordbreak '.$class.($morecss ? ' '.$morecss : '').($textfordropdown ? ' hidden' : '').'">').'<span class="fa fa-'.$fa.'" title="'.dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).'"></span> ';
+		$result = ($nodiv ? '' : '<div class="wordbreakall '.$class.($morecss ? ' '.$morecss : '').($textfordropdown ? ' hidden' : '').'">').'<span class="fa fa-'.$fa.'" title="'.dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).'"></span> ';
 		$result .= dol_escape_htmltag($text, 1, 0, 'div,span,b,br,a');
 		$result .= ($nodiv ? '' : '</div>');
 
diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php
index e87dcdbd08e..94c94a778f7 100644
--- a/htdocs/public/users/view.php
+++ b/htdocs/public/users/view.php
@@ -387,7 +387,7 @@ if (!empty($object->socialnetworks) && is_array($object->socialnetworks)) {
 		$listOfSocialNetworks = $object->socialnetworks;
 		foreach ($listOfSocialNetworks as $key => $value) {
 			if (!getDolUserString('USER_HIDE_SOCIALNETWORK_'.strtoupper($key), 0, $object)) {
-				$usersection .= '<div class="flexitemsmall">'.dol_print_socialnetworks($key, 0, $object->id, strtolower($key), $socialnetworksdict).'</div>';
+				$usersection .= '<div class="flexitemsmall">'.dol_print_socialnetworks($value, 0, $object->id, strtolower($key), $socialnetworksdict).'</div>';
 			}
 		}
 	}

From 0a186804f5befed9d7ea46fac53895ada3f89112 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 2 Feb 2025 00:53:10 +0100
Subject: [PATCH 387/602] Fix missing picto

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index c201ca97b73..9133d2bc825 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -2539,7 +2539,7 @@ if ($id > 0) {
 							} elseif ($value == 'block_if_negative') {
 								$valuetoshow = yn($obj->{$value});
 							} elseif ($value == 'icon') {
-								$valuetoshow = $obj->{$value}." ".img_picto("", $obj->{$value});
+								$valuetoshow = $obj->{$value}." ".img_picto("", preg_replace('/^fa-/', '', $obj->{$value}));
 							} elseif ($value == 'type_duration') {
 								$TDurationTypes = array('y' => $langs->trans('Years'), 'm' => $langs->trans('Month'), 'w' => $langs->trans('Weeks'), 'd' => $langs->trans('Days'), 'h' => $langs->trans('Hours'), 'i' => $langs->trans('Minutes'));
 								if (!empty($obj->{$value}) && array_key_exists($obj->{$value}, $TDurationTypes)) {
@@ -2560,7 +2560,7 @@ if ($id > 0) {
 							if (in_array($value, array('nbjour', 'decalage', 'pos', 'position', 'deposit_percent'))) {
 								$class .= ' right';
 							}
-							if (in_array($value, array('type_vat', 'localtax1_type', 'localtax2_type'))) {
+							if (in_array($value, array('icon', 'type_vat', 'localtax1_type', 'localtax2_type'))) {
 								$class .= ' nowraponall';
 							}
 							if (in_array($value, array('use_default', 'fk_parent', 'sortorder'))) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c13b68023ef..7f9633a2d8e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5183,7 +5183,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
 				'paiment', 'paragraph', 'play', 'pdf', 'phone', 'phoning', 'phoning_mobile', 'phoning_fax', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'proposal', 'puce',
 				'stock', 'resize', 'service', 'stats',
 				'security', 'setup', 'share-alt', 'sign-out', 'split', 'stripe', 'stripe-s', 'switch_off', 'switch_on', 'switch_on_grey', 'switch_on_warning', 'switch_on_red', 'tools', 'unlink', 'uparrow', 'user', 'user-tie', 'vcard', 'wrench',
-				'github', 'google', 'jabber', 'microsoft', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
+				'discord', 'facebook', 'flickr', 'instagram','linkedin', 'github', 'google', 'jabber', 'meetup', 'microsoft', 'skype', 'slack', 'twitter', 'pinterest', 'reddit', 'snapchat', 'tumblr', 'youtube', 'viadeo', 'google-plus-g', 'whatsapp',
 				'generic', 'home', 'hrm', 'members', 'products', 'invoicing',
 				'partnership', 'payment', 'payment_vat', 'pencil-ruler', 'pictoconfirm', 'preview', 'project', 'projectpub', 'projecttask', 'question', 'refresh', 'region',
 				'salary', 'shipment', 'state', 'supplier_invoice', 'supplier_invoicea', 'supplier_invoicer', 'supplier_invoiced',
@@ -5204,7 +5204,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
 			if (in_array($pictowithouttext, array('card', 'bell', 'clock', 'establishment', 'file', 'file-o', 'generic', 'minus-square', 'object_generic', 'pdf', 'plus-square', 'timespent', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) {
 				$fa = 'far';
 			}
-			if (in_array($pictowithouttext, array('black-tie', 'github', 'google', 'microsoft', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'stripe', 'stripe-s', 'youtube', 'google-plus-g', 'whatsapp'))) {
+			if (in_array($pictowithouttext, array('black-tie', 'discord', 'facebook', 'flickr', 'github', 'google', 'google-plus-g', 'instagram', 'linkedin', 'meetup', 'microsoft', 'pinterest', 'skype', 'slack', 'twitter', 'reddit', 'snapchat', 'stripe', 'stripe-s', 'tumblr', 'viadeo', 'whatsapp', 'youtube'))) {
 				$fa = 'fab';
 			}
 

From 4e18a4e44edb5b2644b125abccb3acb570f0dcdb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 2 Feb 2025 00:56:51 +0100
Subject: [PATCH 388/602] Fix fedivers

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

diff --git a/htdocs/admin/fediverse.php b/htdocs/admin/fediverse.php
index e10baa10207..d2848b905ec 100644
--- a/htdocs/admin/fediverse.php
+++ b/htdocs/admin/fediverse.php
@@ -25,9 +25,9 @@
  */
 
 /**
- *      \file       htdocs/admin/faitdivers.php
- *      \ingroup    faitdivers
- *      \brief      Page to setupe module Socialnetworks
+ *      \file       htdocs/admin/fediverse.php
+ *      \ingroup    fedivers
+ *      \brief      Page to setup fedivers in module Socialnetworks
  */
 
 //load Dolibarr environment

From 522700baddbd65b06c2f1c512dfd3f932fa0a709 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 2 Feb 2025 00:56:43 +0100
Subject: [PATCH 389/602] Fix ci(21.0) - Remove unused fields, define unset
 field

---
 htdocs/hrm/position_list.php | 18 ++++++++----------
 htdocs/user/group/list.php   | 18 +++++++++---------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index aa2dce54f9b..0571d4abe61 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -414,9 +415,6 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
 }
-if ($groupby != '') {
-	$param .= '&groupby='.urlencode($groupby);
-}
 
 foreach ($search as $key => $val) {
 	if (is_array($search[$key])) {
@@ -470,8 +468,8 @@ 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 .= 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_buildpath('/hrm/position.php', 1).'?action=create', '', $permissiontoadd);
 
@@ -579,7 +577,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -622,7 +620,7 @@ foreach ($object->fields as $key => $val) {
 // 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, 'totalarray'=>&$totalarray);
+$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['anotherfield']['checked'])) {
@@ -696,7 +694,7 @@ while ($i < $imaxinloop) {
 				$selected = 1;
 			}
 		}
-		print $object->getKanbanView('', array('user' => $userstatic->getNomUrl(-1), 'job'=> $jobstatic->getNomUrl(1), 'selected' => $selected));
+		print $object->getKanbanView('', array('user' => $userstatic->getNomUrl(-1), 'job' => $jobstatic->getNomUrl(1), 'selected' => $selected));
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
@@ -773,7 +771,7 @@ while ($i < $imaxinloop) {
 		// 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);
+		$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;
 		// Action column
@@ -815,7 +813,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index fd9bb37bfef..f892164abf2 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2024	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2011		Herve Prot				<herve.prot@symeos.com>
  * Copyright (C) 2019-2024  Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -87,6 +88,8 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
+$arrayfields = array();
+
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val) {
@@ -254,9 +257,6 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
 }
-if ($groupby != '') {
-	$param .= '&groupby='.urlencode($groupby);
-}
 
 foreach ($search as $key => $val) {
 	if (is_array($search[$key])) {
@@ -310,8 +310,8 @@ 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 .= 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'));
 
 if ($caneditperms) {
 	$newcardbutton .= dolGetButtonTitleSeparator();
@@ -354,7 +354,7 @@ if (!empty($moreforfilter)) {
 	print '</div>';
 }
 
-$varpage=empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column);  // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
@@ -394,7 +394,7 @@ $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, 'totalarray'=>&$totalarray);
+$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['anotherfield']['checked'])) {
@@ -506,7 +506,7 @@ while ($i < $imaxinloop) {
 		// 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);
+		$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;
 		// Action column
@@ -547,7 +547,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From 8b04314ea331fde15f705a4302e90bab6790fc0e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 2 Feb 2025 01:08:40 +0100
Subject: [PATCH 390/602] Add a TODO

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

diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 956a3f2d2a5..897a6f5711d 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -1016,20 +1016,20 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 /**
  *  Return the list of public holidays including Friday, Saturday and Sunday (or not) between 2 dates in timestamp.
  *  Dates must be UTC with hour, min, sec to 0.
- *  Called by function  num_open_day()
+ *  TODO Not used yet. Must be shared with num_public_holiday()
  *
- * @param int $timestampStart Timestamp start (UTC with hour, min, sec = 0)
- * @param int $timestampEnd Timestamp end (UTC with hour, min, sec = 0)
- * @param string $country_code Country code
- * @param int $lastday Last day is included, 0: no, 1:yes
- * @param int $excludesaturday Exclude saturday as non working day (-1=use setup, 0=no, 1=yes)
- * @param int $excludesunday Exclude sunday as non working day (-1=use setup, 0=no, 1=yes)
- * @param int $excludefriday Exclude friday as non working day (-1=use setup, 0=no, 1=yes)
- * @param int $excludemonday Exclude monday as non working day (-1=use setup, 0=no, 1=yes)
- * @return    string|int[]                        List of public holidays timestamps or error message string if error
- * @see num_between_day(), num_open_day()
+ * @param 	int 		$timestampStart 	Timestamp start (UTC with hour, min, sec = 0)
+ * @param 	int 		$timestampEnd 		Timestamp end (UTC with hour, min, sec = 0)
+ * @param 	string 		$country_code 		Country code
+ * @param 	int 		$lastday 			Last day is included, 0: no, 1:yes
+ * @param 	int 		$excludesaturday 	Exclude saturday as non working day (-1=use setup, 0=no, 1=yes)
+ * @param 	int 		$excludesunday 		Exclude sunday as non working day (-1=use setup, 0=no, 1=yes)
+ * @param 	int 		$excludefriday 		Exclude friday as non working day (-1=use setup, 0=no, 1=yes)
+ * @param 	int 		$excludemonday 		Exclude monday as non working day (-1=use setup, 0=no, 1=yes)
+ * @return	string|int[]                    List of public holidays timestamps or error message string if error
+ * @see num_public_holiday(), num_open_day()
  */
-function list_public_holiday($timestampStart, $timestampEnd, $country_code = '', $lastday = 0, $excludesaturday = -1, $excludesunday = -1, $excludefriday = -1, $excludemonday = -1)
+function listPublicHoliday($timestampStart, $timestampEnd, $country_code = '', $lastday = 0, $excludesaturday = -1, $excludesunday = -1, $excludefriday = -1, $excludemonday = -1)
 {
 	global $conf, $db, $mysoc;
 

From 76ab4d7ce5a554a021f77c47cc855e6d9977e920 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 Feb 2025 01:21:57 +0100
Subject: [PATCH 391/602] Update emailcollector.class.php

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

diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 95aea5f8e36..082b4ac6f67 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -3346,7 +3346,7 @@ class EmailCollector extends CommonObject
 										//$tickettocreate->email_fields_no_propagate_in_actioncomm = 0;
 
 										// Add sender to context array to make sure that confirmation e-mail can be sent by trigger script
-										$sender_contact = New Contact($this->db);
+										$sender_contact = new Contact($this->db);
 										$sender_contact->fetch(0, null, '', $from);
 										if (!empty($sender_contact->id)) {
 											$tickettocreate->context['contactid'] = $sender_contact->id;

From bea27b0be44d72f47d9173096f089ec3392e70ed Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 21 Jan 2025 00:33:58 +0100
Subject: [PATCH 392/602] Qual: Fix phan notices

---
 htdocs/core/class/html.form.class.php         |  2 +-
 htdocs/core/class/html.formcontract.class.php |  9 ++--
 htdocs/core/lib/price.lib.php                 |  4 +-
 .../conferenceorbooth_card.php                |  4 +-
 .../conferenceorboothattendee_card.php        |  2 +-
 htdocs/expedition/shipment.php                |  2 +-
 htdocs/expensereport/payment/card.php         |  3 +-
 htdocs/expensereport/payment/info.php         |  3 +-
 htdocs/expensereport/payment/payment.php      |  3 +-
 htdocs/expensereport/stats/index.php          | 11 ++---
 .../tpl/expensereport_addfile.tpl.php         |  9 ++++
 .../tpl/expensereport_linktofile.tpl.php      | 10 ++++-
 htdocs/fichinter/card-rec.php                 | 27 +++++++-----
 htdocs/fichinter/card.php                     | 36 +++++++--------
 .../class/api_interventions.class.php         |  9 ++--
 htdocs/fichinter/class/fichinterrec.class.php | 16 +++----
 htdocs/fichinter/list.php                     | 44 ++++++++++---------
 htdocs/fourn/card.php                         | 25 ++++++-----
 htdocs/public/payment/paymentko.php           |  6 +--
 htdocs/public/payment/paymentok.php           |  4 +-
 htdocs/societe/consumption.php                |  4 +-
 21 files changed, 129 insertions(+), 104 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 12303ed2b1d..5dee9316b1e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5648,7 +5648,7 @@ class Form
 	 * @param string 		$title 				Title
 	 * @param string 		$question 			Question
 	 * @param string 		$action 			Action
-	 * @param array<array{name:string,value:string,values?:string[],default?:string,label:string,type:string,size?:string,morecss?:string,moreattr?:string,style?:string,inputko?:int<0,1>}>|string|null 	$formquestion 		An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , 'size'=>, 'morecss'=>, 'moreattr'=>'autofocus' or 'style=...'))
+	 * @param array<array{name:string,value?:string,values?:string[],default?:string,label:string,type:string,size?:string,morecss?:string,moreattr?:string,style?:string,inputko?:int<0,1>}>|string|null 	$formquestion 		An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , 'size'=>, 'morecss'=>, 'moreattr'=>'autofocus' or 'style=...'))
 	 *                                                                                                                                                                                                                          'type' can be 'text', 'password', 'checkbox', 'radio', 'date', 'datetime', 'select', 'multiselect', 'morecss',
 	 *                                                                                                                                                                                                                          'other', 'onecolumn' or 'hidden'...
 	 * @param int<0,1>|''|'no'|'yes'|'1'|'0'	$selectedchoice 	'' or 'no', or 'yes' or '1', 1, '0' or 0
diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index b9be63dee34..11eca55e4b6 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2012-2018  Charlene BENKE	<charlie@patas-monkey.com>
+ * Copyright (C) 2025		MDW				<mdeweerd@users.noreply.github.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
@@ -180,17 +181,17 @@ class FormContract
 	/**
 	 *  Show a form to select a contract
 	 *
-	 *  @param  int     $page       Page
+	 *  @param  string  $page       Page
 	 *  @param  int     $socid      Id third party (-1=all, 0=only contracts not linked to a third party, id=contracts not linked or linked to third party id)
 	 *  @param  int     $selected   Id contract preselected
 	 *  @param  string  $htmlname   Nom de la zone html
 	 *  @param  int     $maxlength	Maximum length of label
 	 *  @param  int     $showempty	Show empty line
 	 *  @param  int     $showRef    Show customer and supplier reference on each contract (when found)
-	 *  @param	int		$noouput	1=Return the output instead of display
+	 *  @param	int<0,1>	$nooutput	1=Return the output instead of display
 	 *  @return string|void         html string
 	 */
-	public function formSelectContract($page, $socid = -1, $selected = 0, $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0, $noouput = 0)
+	public function formSelectContract($page, $socid = -1, $selected = 0, $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0, $nooutput = 0)
 	{
 		global $langs;
 
@@ -201,7 +202,7 @@ class FormContract
 		$ret .= '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 		$ret .= '</form>';
 
-		if ($noouput) {
+		if ($nooutput) {
 			return $ret;
 		}
 
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index 11df59e893a..ec5ff384592 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -48,7 +48,7 @@
  *		@param	string	$price_base_type 			'HT'=Unit price parameter $pu is HT, 'TTC'=Unit price parameter $pu is TTC (HT+VAT but not Localtax. TODO Add also mode 'INCT' when pu is price HT+VAT+LT1+LT2)
  *		@param	int		$info_bits					Miscellaneous information on line
  *		@param	int<0,1>	$type					0/1=Product/service
- *		@param  string|Societe|string $seller		Third party seller (we need $seller->country_id property). Provided only if seller is the supplier, otherwise $seller will be $mysoc.
+ *		@param  string|Societe|null $seller			Third party seller (we need $seller->country_id property). Provided only if seller is the supplier, otherwise $seller will be $mysoc.
  *		@param  array{0:string,1:int|string,2:string,3:string}|array{0:string,1:int|string,2:string,3:int|string,4:string,5:string}	$localtaxes_array			Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
  *		@param  float	$progress					Situation invoices progress (value from 0 to 100, 100 by default)
  *		@param  float	$multicurrency_tx           Currency rate (1 by default)
@@ -87,7 +87,7 @@
  *
  * @phan-suppress PhanTypeMismatchDefault
  */
-function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller = '', $localtaxes_array = [], $progress = 100, $multicurrency_tx = 1, $pu_devise = 0, $multicurrency_code = '') // @phpstan-ignore-line
+function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller = null, $localtaxes_array = [], $progress = 100, $multicurrency_tx = 1, $pu_devise = 0, $multicurrency_code = '') // @phpstan-ignore-line
 {
 	global $conf, $mysoc, $db;
 
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index ff6d66b04f3..2a35ceb8dfb 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -365,13 +365,13 @@ if (!empty($withproject)) {
 	print '<tr><td class="valuefield">';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 	print '</td><td class="valuefield">';
-	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', null, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', null, null, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td class="valuefield">';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 	print '</td><td class="valuefield">';
-	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', null, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', null, null, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td class="titlefield">';
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index 041e671a8f0..899debd01d4 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -373,7 +373,7 @@ if (!empty($withproject)) {
 	print '<tr><td>';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', '', $projectstatic, 0, 'amount', '', 0, 0, 'projectid');
 	print '</td><td>';
-	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', null, 0, '', 0, '', 'projectid');
+	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $projectstatic->price_booth, $projectstatic, 0, 'amount', '', null, null, '', 0, '', 'projectid');
 	print "</td></tr>";
 
 	print '<tr><td>';
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index e7ecf387ec1..c0d84059027 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -734,7 +734,7 @@ if ($id > 0 || !empty($ref)) {
 						$text .= ' - '.$label;
 						$description = (getDolGlobalInt('PRODUIT_DESC_IN_FORM_ACCORDING_TO_DEVICE') ? '' : dol_htmlentitiesbr($objp->description)).'<br>';
 						$description .= $product_static->show_photos('product', $conf->product->multidir_output[$product_static->entity], 1, 1, 0, 0, 0, 80);
-						print $form->textwithtooltip($text, $description, 3, '', 0, (string) $i);
+						print $form->textwithtooltip($text, $description, 3, 0, '', (string) $i);
 
 						// Show range
 						print_date_range($db->jdate($objp->date_start), $db->jdate($objp->date_end));
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index bd58dbaad93..9aa1c990e47 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2015-2017  Alexandre Spangaro  <aspangaro@open-dsi.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -130,6 +130,7 @@ print '<tr><td>'.$langs->trans('Amount').'</td><td>'.price($object->amount, 0, $
 print '<tr><td class="tdtop">'.$langs->trans('Note').'</td><td class="valeur sensiblehtmlcontent">'.dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_public)).'</td></tr>';
 
 $disable_delete = 0;
+$title_button = '';
 // Bank account
 if (isModEnabled("bank")) {
 	if ($object->bank_account) {
diff --git a/htdocs/expensereport/payment/info.php b/htdocs/expensereport/payment/info.php
index cb83c850443..5b6fa16191c 100644
--- a/htdocs/expensereport/payment/info.php
+++ b/htdocs/expensereport/payment/info.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2013      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2015       Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -42,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'trips'));
 
-$id = GETPOST('id');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 2c69d7af7c9..b0045757bab 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2015       Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2015       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -225,6 +225,7 @@ if ($action == 'create' || empty($action)) {
 	$sql .= " FROM ".MAIN_DB_PREFIX."payment_expensereport as p, ".MAIN_DB_PREFIX."expensereport as e";
 	$sql .= " WHERE p.fk_expensereport = e.rowid AND p.fk_expensereport = ".((int) $id);
 	$sql .= ' AND e.entity IN ('.getEntity('expensereport').')';
+	$sumpaid = 0;
 	$resql = $db->query($sql);
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index 0ddaee0be92..e5bb55b9438 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -2,8 +2,8 @@
 /* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (c) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2018-2024  Frédéric France      <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -159,6 +159,7 @@ if (!$mesg) {
 
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
+$fileurl_avg = null;
 if (!$user->hasRight('societe', 'client', 'voir')) {
 	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
 	if ($mode == 'customer') {
@@ -179,7 +180,7 @@ if (!$user->hasRight('societe', 'client', 'voir')) {
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
-if (!$mesg) {
+if (!$mesg && $fileurl_avg !== null) {
 	$px3->SetData($data);
 	$i = $startyear;
 	$legend = array();
@@ -190,7 +191,7 @@ if (!$mesg) {
 	$px3->SetLegend($legend);
 	$px3->SetYLabel($langs->trans("AmountAverage"));
 	$px3->SetMaxValue($px3->GetCeilMaxValue());
-	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetMinValue((int) $px3->GetFloorMinValue());
 	$px3->SetWidth($WIDTH);
 	$px3->SetHeight($HEIGHT);
 	$px3->SetShading(3);
@@ -248,7 +249,7 @@ if (!$user->hasRight('expensereport', 'readall') && !$user->hasRight('expenserep
 	$include = 'hierarchy';
 }
 print img_picto('', 'user', 'class="pictofixedwidth"');
-print $form->select_dolusers($userid, 'userid', 1, '', 0, $include, '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
+print $form->select_dolusers($userid, 'userid', 1, null, 0, $include, '', '', 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
 print '</td></tr>';
 // Status
 print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
diff --git a/htdocs/expensereport/tpl/expensereport_addfile.tpl.php b/htdocs/expensereport/tpl/expensereport_addfile.tpl.php
index ff2fd3d4285..b0442bd9a10 100644
--- a/htdocs/expensereport/tpl/expensereport_addfile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_addfile.tpl.php
@@ -1,4 +1,13 @@
 <?php
+/* Copyright (C) 2025		MDW	<mdeweerd@users.noreply.github.com>
+ */
+
+/**
+ * @var int $colspan
+ */
+'
+@phan-var-force int $colspan
+';
 
 // Add line to upload new file
 print '<!-- expensereport_addfile.tpl.php -->'."\n";
diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index 2e02e7b8808..c4fbd00374b 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -1,6 +1,12 @@
 <?php
-/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+/* Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  */
+/**
+ * @var int $colspan
+ */
+'
+@phan-var-force int $colspan
+';
 
 // Add line to select existing file
 if (!getDolGlobalString('EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES')) {
@@ -29,6 +35,7 @@ if (!getDolGlobalString('EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES')) {
 		$maxheightmini = 48;
 		$relativepath = (!empty($object->ref) ? dol_sanitizeFileName($object->ref) : '').'/';
 		$filei = 0;
+		$minifile = null;
 		// Loop on each attached file
 		foreach ($arrayoffiles as $file) {
 			$urlforhref = array();
@@ -95,6 +102,7 @@ if (!getDolGlobalString('EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES')) {
 				}
 				print '<div class="photoref backgroundblank">';
 
+				// TODO: Check that $minifile has a proper value here (set in true part of if, not else part).
 				print $thumbshown ? $thumbshown : img_mime($minifile);
 
 				print '</div>';
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 93b6157ea19..a84871b25fc 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2016-2018  Charlie Benke           <charlie@patas-monkey.com>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -121,7 +121,7 @@ $result = restrictedArea($user, 'ficheinter', $id, $objecttype);
 
 $permissiontoadd = $user->hasRight('ficheinter', 'creer');
 $permissiontodelete = $user->hasRight('ficheinter', 'supprimer');
-
+$objp = null;
 
 /*
  * Actions
@@ -215,7 +215,7 @@ if ($action == 'add' && $permissiontoadd) {
 	}
 
 	$newinter->entity = $object->entity;
-	$newinter->duree = $object->duree;
+	$newinter->duration = $object->duration;
 
 	$newinter->description = $object->description;
 	$newinter->note_private = $object->note_private;
@@ -254,7 +254,7 @@ if ($action == 'add' && $permissiontoadd) {
 } elseif ($action == 'setfrequency' && $permissiontoadd) {
 	// Set frequency and unit frequency
 	$object->fetch($id);
-	$object->setFrequencyAndUnit(GETPOST('frequency', 'int'), GETPOST('unit_frequency', 'alpha'));
+	$object->setFrequencyAndUnit(GETPOSTINT('frequency'), GETPOST('unit_frequency', 'alpha'));
 } elseif ($action == 'setdate_when' && $permissiontoadd) {
 	// Set next date of execution
 	$object->fetch($id);
@@ -280,6 +280,8 @@ llxHeader('', $langs->trans("RepeatableIntervention"), $help_url, '', 0, 0, '',
 $form = new Form($db);
 $fichinterrecstatic = new FichinterRec($db);
 $companystatic = new Societe($db);
+$contratstatic = null;
+$projectstatic = null;
 if (isModEnabled('contract')) {
 	$contratstatic = new Contrat($db);
 }
@@ -508,7 +510,7 @@ if ($action == 'create') {
 			$object->fetch_thirdparty();
 
 			$author = new User($db);
-			$author->fetch($object->user_author);
+			$author->fetch((int) $object->user_author);
 
 			$head = fichinter_rec_prepare_head($object);
 
@@ -535,11 +537,11 @@ if ($action == 'create') {
 						$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($object->socid, (string) $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, $object->socid, (string) $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 					}
 				} else {
 					if (!empty($object->fk_project)) {
@@ -577,7 +579,7 @@ if ($action == 'create') {
 			print '<tr><td>'.$langs->trans("Description").'</td><td colspan="3">'.nl2br($object->description)."</td></tr>";
 
 			// Contract
-			if (isModEnabled('contract')) {
+			if (isModEnabled('contract') && $contratstatic !== null) {
 				$langs->load('contracts');
 				print '<tr>';
 				print '<td>';
@@ -599,7 +601,7 @@ if ($action == 'create') {
 					if ($object->fk_contrat) {
 						$contratstatic = new Contrat($db);
 						$contratstatic->fetch($object->fk_contrat);
-						print $contratstatic->getNomUrl(0, '', 1);
+						print $contratstatic->getNomUrl(0, 0, 1);
 					} else {
 						print "&nbsp;";
 					}
@@ -666,7 +668,7 @@ if ($action == 'create') {
 			// Max period / Rest period
 			print '<tr><td>';
 			if ($user->hasRight('ficheinter', 'creer') && ($action == 'nb_gen_max' || $object->frequency > 0)) {
-				print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->hasRight('facture', 'creer'));
+				print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', (string) $object->nb_gen_max, $object, $user->hasRight('facture', 'creer'));
 			} else {
 				print $langs->trans("MaxPeriodNumber");
 			}
@@ -743,6 +745,7 @@ if ($action == 'create') {
 					$type = $object->lines[$i]->product_type;
 				} // else { $object->lines[$i]->fk_product_type; }
 
+				// TODO: $objp is not set here, so why test?
 				if (isset($objp) && is_object($objp)) {
 					// Try to enhance type detection using date_start and date_end for free lines when type
 					// was not saved.
@@ -871,7 +874,7 @@ if ($action == 'create') {
 						print '<td>'.$langs->trans("None").'</td>';
 					}
 
-					if (isModEnabled('contract')) {
+					if (isModEnabled('contract') && $contratstatic !== null) {
 						print '<td>';
 						if ($objp->fk_contrat > 0) {
 							$contratstatic->fetch($objp->fk_contrat);
@@ -879,7 +882,7 @@ if ($action == 'create') {
 						}
 						print '</td>';
 					}
-					if (isModEnabled('project')) {
+					if (isModEnabled('project') && $projectstatic !== null) {
 						print '<td>';
 						if ($objp->fk_project > 0) {
 							$projectstatic->fetch($objp->fk_project);
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 07311a5ca20..f3c6ca5250f 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2020-2024	Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2023       Benjamin Grembi				<benjamin@oarces.fr>
  * Copyright (C) 2023-2024	William Mead				<william.mead@manchenumerique.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -937,7 +937,7 @@ if ($action == 'create') {
 			$classname = ucfirst($subelement);
 			$objectsrc = new $classname($db);
 			'@phan-var-force Commande|Propal|Contrat $objectsrc';
-			$objectsrc->fetch(GETPOST('originid'));
+			$objectsrc->fetch(GETPOSTINT('originid'));
 			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines')) {
 				$objectsrc->fetch_lines();
 				$lines = $objectsrc->lines;
@@ -1048,7 +1048,7 @@ if ($action == 'create') {
 		print '<tr>';
 		print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 		print '<td>';
-		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', false, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_public', (string) $note_public, '', 80, 'dolibarr_notes', 'In', false, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		//print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
 		print '</td></tr>';
@@ -1058,7 +1058,7 @@ if ($action == 'create') {
 			print '<tr>';
 			print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
 			print '<td>';
-			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', false, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_private', (string) $note_private, '', 80, 'dolibarr_notes', 'In', false, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
 			//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
 			print '</td></tr>';
@@ -1316,7 +1316,7 @@ if ($action == 'create') {
 			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');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
@@ -1509,13 +1509,11 @@ if ($action == 'create') {
 
 					$extrafields->fetch_name_optionals_label($objectline->table_element);
 
-					if (!empty($extrafields)) {
-						$temps = $objectline->showOptionals($extrafields, 'view', array(), '', '', 1, 'line');
-						if (!empty($temps)) {
-							print '<div style="padding-top: 10px" id="extrafield_lines_area_'.$line->id.'" name="extrafield_lines_area_'.$line->id.'">';
-							print $temps;
-							print '</div>';
-						}
+					$temps = $objectline->showOptionals($extrafields, 'view', array(), '', '', '1', 'line');
+					if (!empty($temps)) {
+						print '<div style="padding-top: 10px" id="extrafield_lines_area_'.$line->id.'" name="extrafield_lines_area_'.$line->id.'">';
+						print $temps;
+						print '</div>';
 					}
 
 					print '</td>';
@@ -1581,13 +1579,11 @@ if ($action == 'create') {
 
 					$extrafields->fetch_name_optionals_label($objectline->table_element);
 
-					if (!empty($extrafields)) {
-						$temps = $objectline->showOptionals($extrafields, 'edit', array(), '', '', 1, 'line');
-						if (!empty($temps)) {
-							print '<div style="padding-top: 10px" id="extrafield_lines_area_'.$line->id.'" name="extrafield_lines_area_'.$line->id.'">';
-							print $temps;
-							print '</div>';
-						}
+					$temps = $objectline->showOptionals($extrafields, 'edit', array(), '', '', '1', 'line');
+					if (!empty($temps)) {
+						print '<div style="padding-top: 10px" id="extrafield_lines_area_'.$line->id.'" name="extrafield_lines_area_'.$line->id.'">';
+						print $temps;
+						print '</div>';
 					}
 
 					print '</td>';
@@ -1663,7 +1659,7 @@ if ($action == 'create') {
 				$extrafields->fetch_name_optionals_label($objectline->table_element);
 
 				if (is_object($objectline)) {
-					$temps = $objectline->showOptionals($extrafields, 'create', array(), '', '', 1, 'line');
+					$temps = $objectline->showOptionals($extrafields, 'create', array(), '', '', '1', 'line');
 
 					if (!empty($temps)) {
 						print '<div style="padding-top: 10px" id="extrafield_lines_area_create" name="extrafield_lines_area_create">';
diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index 08697cc34c2..57699f6f593 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -35,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 class Interventions extends DolibarrApi
 {
 	/**
-	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 * @var array       Mandatory fields, checked when create and update object
 	 */
 	public static $FIELDS = array(
 	  'socid',
@@ -44,7 +45,7 @@ class Interventions extends DolibarrApi
 	);
 
 	/**
-	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 * @var array       Mandatory fields, checked when create and update object
 	 */
 	public static $FIELDSLINE = array(
 	  'description',
@@ -53,7 +54,7 @@ class Interventions extends DolibarrApi
 	);
 
 	/**
-	 * @var Fichinter $fichinter {@type fichinter}
+	 * @var Fichinter {@type fichinter}
 	 */
 	public $fichinter;
 
@@ -287,7 +288,7 @@ class Interventions extends DolibarrApi
 			$id,
 			$this->fichinter->description,
 			$this->fichinter->date,
-			$this->fichinter->duree
+			$this->fichinter->duration
 		);
 
 		if ($updateRes > 0) {
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index a623c2d7237..bcd1916c744 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2016-2018  Charlie Benke			<charlie@patas-monkey.com>
  * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -91,7 +91,7 @@ class FichinterRec extends Fichinter
 	public $date_last_gen;
 
 	/**
-	 * @var datetime|string
+	 * @var int|string
 	 */
 	public $date_when;
 
@@ -255,7 +255,7 @@ class FichinterRec extends Fichinter
 						$fichintsrc->lines[$i]->product_type,
 						$fichintsrc->lines[$i]->special_code,
 						!empty($fichintsrc->lines[$i]->label) ? $fichintsrc->lines[$i]->label : "",
-						$fichintsrc->lines[$i]->fk_unit
+						(string) $fichintsrc->lines[$i]->fk_unit
 					);
 
 					if ($result_insert < 0) {
@@ -527,7 +527,7 @@ class FichinterRec extends Fichinter
 			// qty, pu, remise_percent et txtva
 			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
 			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
-			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, 0, 0, 0, $price_base_type, $info_bits, $type, $mysoc);
+			$tabprice = calcul_price_total($qty, (float) $pu, (float) $remise_percent, $txtva, 0, 0, 0, $price_base_type, $info_bits, $type, $mysoc);
 
 			$total_ht  = $tabprice[0];
 			$total_tva = $tabprice[1];
@@ -609,7 +609,7 @@ class FichinterRec extends Fichinter
 		// phpcs:enable
 		if ($user->hasRight('fichinter', 'creer')) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter_rec ";
-			$sql .= " SET frequency='".$this->db->escape($freq)."'";
+			$sql .= " SET frequency='".$this->db->escape((string) $freq)."'";
 			$sql .= ", date_last_gen='".$this->db->escape($courant)."'";
 			$sql .= " WHERE rowid = ".((int) $this->id);
 
@@ -749,7 +749,7 @@ class FichinterRec extends Fichinter
 		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		$sql .= ' SET frequency = '.($frequency ? $this->db->escape($frequency) : 'null');
+		$sql .= ' SET frequency = '.($frequency ? $this->db->escape((string) $frequency) : 'null');
 		if (!empty($unit)) {
 			$sql .= ', unit_frequency = "'.$this->db->escape($unit).'"';
 		}
@@ -771,8 +771,8 @@ class FichinterRec extends Fichinter
 	/**
 	 *	Update the next date of execution
 	 *
-	 *	@param	 	datetime	$date					date of execution
-	 *	@param	 	int			$increment_nb_gen_done	0 do nothing more, >0 increment nb_gen_done
+	 *	@param	 	int			$date					date of execution
+	 *	@param	 	int<0,max>	$increment_nb_gen_done	0 do nothing more, >0 increment nb_gen_done
 	 *	@return		int									Return integer <0 if KO, >0 if OK
 	 */
 	public function setNextDate($date, $increment_nb_gen_done = 0)
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index a2270349bab..308af88fce9 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2021-2024  Frédéric France			<frederic.france@free.fr>
  * Copyright (C) 2022		Charlène Benke			<charlene@patas-monkey.com>
  * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Benjamin Falière		<benjamin.faliere@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -139,29 +139,29 @@ if (getDolGlobalString('FICHINTER_DISABLE_DETAILS')) {
 
 // Definition of fields for list
 $arrayfields = array(
-	'f.ref' => array('label' => 'Ref', 'checked' => 1),
-	'f.ref_client' => array('label' => 'RefCustomer', 'checked' => 1),
-	's.nom' => array('label' => 'ThirdParty', 'checked' => 1),
-	'pr.ref' => array('label' => 'Project', 'checked' => 1, 'enabled' => (!isModEnabled('project') ? 0 : 1)),
-	'c.ref' => array('label' => 'Contract', 'checked' => 1, 'enabled' => (empty($conf->contrat->enabled) ? 0 : 1)),
-	'f.description' => array('label' => 'Description', 'checked' => 1),
-	'f.datec' => array('label' => 'DateCreation', 'checked' => 0, 'position' => 500),
-	'f.tms' => array('label' => 'DateModificationShort', 'checked' => 0, 'position' => 500),
-	'f.note_public' => array('label' => 'NotePublic', 'checked' => 0, 'position' => 510, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES'))),
-	'f.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'position' => 511, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES'))),
-	'f.fk_statut' => array('label' => 'Status', 'checked' => 1, 'position' => 1000),
-	'f.signed_status' => array('label' => 'SignedStatus', 'checked' => 0, 'position' => 1001),
-	'fd.description' => array('label' => "DescriptionOfLine", 'checked' => 1, 'enabled' => getDolGlobalString('FICHINTER_DISABLE_DETAILS') != '1' ? 1 : 0),
-	'fd.date' => array('label' => 'DateOfLine', 'checked' => 1, 'enabled' => getDolGlobalString('FICHINTER_DISABLE_DETAILS') != '1' ? 1 : 0),
-	'fd.duree' => array('label' => 'DurationOfLine', 'type' => 'duration', 'checked' => 1, 'enabled' => !getDolGlobalString('FICHINTER_DISABLE_DETAILS') ? 1 : 0), //type duration is here because in database, column 'duree' is double
+	'f.ref' => array('label' => 'Ref', 'checked' => '1'),
+	'f.ref_client' => array('label' => 'RefCustomer', 'checked' => '1'),
+	's.nom' => array('label' => 'ThirdParty', 'checked' => '1'),
+	'pr.ref' => array('label' => 'Project', 'checked' => '1', 'enabled' => (!isModEnabled('project') ? '0' : '1')),
+	'c.ref' => array('label' => 'Contract', 'checked' => '1', 'enabled' => (empty($conf->contrat->enabled) ? '0' : '1')),
+	'f.description' => array('label' => 'Description', 'checked' => '1'),
+	'f.datec' => array('label' => 'DateCreation', 'checked' => '0', 'position' => 500),
+	'f.tms' => array('label' => 'DateModificationShort', 'checked' => '0', 'position' => 500),
+	'f.note_public' => array('label' => 'NotePublic', 'checked' => '0', 'position' => 510, 'enabled' => (string) (!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES'))),
+	'f.note_private' => array('label' => 'NotePrivate', 'checked' => '0', 'position' => 511, 'enabled' => (string) (!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES'))),
+	'f.fk_statut' => array('label' => 'Status', 'checked' => '1', 'position' => 1000),
+	'f.signed_status' => array('label' => 'SignedStatus', 'checked' => '0', 'position' => 1001),
+	'fd.description' => array('label' => "DescriptionOfLine", 'checked' => '1', 'enabled' => getDolGlobalString('FICHINTER_DISABLE_DETAILS') != '1' ? '1' : '0'),
+	'fd.date' => array('label' => 'DateOfLine', 'checked' => '1', 'enabled' => getDolGlobalString('FICHINTER_DISABLE_DETAILS') != '1' ? '1' : '0'),
+	'fd.duree' => array('label' => 'DurationOfLine', 'type' => 'duration', 'checked' => '1', 'enabled' => !getDolGlobalString('FICHINTER_DISABLE_DETAILS') ? '1' : '0'), //type duration is here because in database, column 'duree' is double
 );
-'@phan-var-force array{label:string,type?:string,checked:int,position?:int,enabled?:int,langfile?:string,help:string} $arrayfields';
+'@phan-var-force array{label:string,type?:string,checked:string,position?:int,enabled?:string,langfile?:string,help:string} $arrayfields';
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array{label:string,type?:string,checked:string,position?:int,enabled?:string,langfile?:string,help:string} $arrayfields'; // dol_sort_array looses type for Phan
 
 // Security check
 $id = GETPOSTINT('id');
@@ -237,6 +237,8 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $objectstatic = new Fichinter($db);
 $companystatic = new Societe($db);
+$projetstatic = null;
+$contratstatic = null;
 if (isModEnabled('project')) {
 	$projetstatic = new Project($db);
 }
@@ -921,7 +923,7 @@ while ($i < $imaxinloop) {
 			}
 		}
 		// Project ref
-		if (!empty($arrayfields['pr.ref']['checked'])) {
+		if (!empty($arrayfields['pr.ref']['checked']) && $projetstatic !== null) {
 			print '<td class="tdoverflowmax150">';
 			$projetstatic->id = $obj->projet_id;
 			$projetstatic->ref = $obj->projet_ref;
@@ -935,14 +937,14 @@ while ($i < $imaxinloop) {
 			}
 		}
 		// Contract
-		if (!empty($arrayfields['c.ref']['checked'])) {
+		if (!empty($arrayfields['c.ref']['checked']) && $contratstatic !== null) {
 			print '<td class="tdoverflowmax150">';
 			$contratstatic->id = $obj->contrat_id;
 			$contratstatic->ref = $obj->contrat_ref;
 			$contratstatic->ref_customer = $obj->contrat_ref_customer;
 			$contratstatic->ref_supplier = $obj->contrat_ref_supplier;
 			if ($contratstatic->id > 0) {
-				print $contratstatic->getNomUrl(1, '');
+				print $contratstatic->getNomUrl(1, 0);
 				print '</td>';
 			}
 			if (!$i) {
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 026901afa32..b42f5a557ef 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2015		Marcos García				<marcosgdf@gmail.com>
  * Copyright (C) 2015		Raphaël Doursenaud			<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2021-2024  Frédéric France				<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -363,9 +363,9 @@ if ($object->id > 0) {
 	print '</tr></table>';
 	print '</td><td>';
 	if ($action == 'editconditions') {
-		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_supplier_id, 'cond_reglement_supplier_id', 1);
+		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, (string) $object->cond_reglement_supplier_id, 'cond_reglement_supplier_id', 1);
 	} else {
-		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_supplier_id, 'none');
+		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, (string) $object->cond_reglement_supplier_id, 'none');
 	}
 	print "</td>";
 	print '</tr>';
@@ -381,9 +381,9 @@ if ($object->id > 0) {
 	print '</tr></table>';
 	print '</td><td>';
 	if ($action == 'editmode') {
-		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_supplier_id, 'mode_reglement_supplier_id', 'DBIT', 1, 1);
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, (string) $object->mode_reglement_supplier_id, 'mode_reglement_supplier_id', 'DBIT', 1, 1);
 	} else {
-		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_supplier_id, 'none');
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, (string) $object->mode_reglement_supplier_id, 'none');
 	}
 	print "</td>";
 	print '</tr>';
@@ -400,9 +400,9 @@ if ($object->id > 0) {
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editbankaccount') {
-			$form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_account, 'fk_account', 1);
+			$form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, (string) $object->fk_account, 'fk_account', 1);
 		} else {
-			$form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_account, 'none');
+			$form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, (string) $object->fk_account, 'none');
 		}
 		print "</td>";
 		print '</tr>';
@@ -432,7 +432,7 @@ if ($object->id > 0) {
 	print '</td></tr></table>';
 	print '</td>';
 	print '<td>';
-	$amount_discount = $object->getAvailableDiscounts('', '', 0, 1);
+	$amount_discount = $object->getAvailableDiscounts(null, '', 0, 1);
 	if ($amount_discount < 0) {
 		dol_print_error($db, $object->error);
 	}
@@ -474,7 +474,7 @@ if ($object->id > 0) {
 		print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
 		print '<td>';
 		$adh = new Adherent($db);
-		$result = $adh->fetch('', '', $object->id);
+		$result = $adh->fetch(0, '', $object->id);
 		if ($result > 0) {
 			$adh->ref = $adh->getFullName($langs);
 			print $adh->getNomUrl(1);
@@ -493,7 +493,7 @@ if ($object->id > 0) {
 	$boxstat = '';
 
 	// Nbre max d'elements des petites listes
-	$MAXLIST = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT');
+	$MAXLIST = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
 
 	print '<div class="underbanner underbanner-before-box clearboth"></div>';
 	print '<br>';
@@ -614,7 +614,7 @@ if ($object->id > 0) {
 	print $boxstat;
 
 
-	$MAXLIST = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT');
+	$MAXLIST = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
 
 
 	/*
@@ -762,6 +762,7 @@ if ($object->id > 0) {
 	 * Latest supplier orders
 	 */
 	$orderstatic = new CommandeFournisseur($db);
+	$orders2invoice = 0;
 
 	if ($user->hasRight("fournisseur", "commande", "lire")) {
 		// TODO move to DAO class
@@ -775,7 +776,7 @@ if ($object->id > 0) {
 		$sql2 .= ' AND s.rowid = '.((int) $object->id);
 		// Show orders we can bill
 		if (!getDolGlobalString('SUPPLIER_ORDER_TO_INVOICE_STATUS')) {
-			$sql2 .= " AND c.fk_statut IN (".$db->sanitize(CommandeFournisseur::STATUS_RECEIVED_COMPLETELY).")"; //  Must match filter in htdocs/fourn/commande/list.php
+			$sql2 .= " AND c.fk_statut IN (".$db->sanitize((string) CommandeFournisseur::STATUS_RECEIVED_COMPLETELY).")"; //  Must match filter in htdocs/fourn/commande/list.php
 		} else {
 			// CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.", ".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY
 			$sql2 .= " AND c.fk_statut IN (".$db->sanitize(getDolGlobalString('SUPPLIER_ORDER_TO_INVOICE_STATUS')).")";
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 5f833ed119d..74fd7762873 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2006-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -41,7 +41,7 @@ if (!defined('NOBROWSERNOTIF')) {
 }
 
 if (!defined('XFRAMEOPTIONS_ALLOWALL')) {
-		define('XFRAMEOPTIONS_ALLOWALL', '1');
+	define('XFRAMEOPTIONS_ALLOWALL', '1');
 }
 
 // For MultiCompany module.
@@ -204,7 +204,7 @@ if (!empty($_SESSION['ipaddress'])) {      // To avoid to make action twice
 	// Send warning of error to administrator
 	if ($sendemail) {
 		// Get default language to use for the company for supervision emails
-		$myCompanyDefaultLang = $mysoc->default_lang;
+		$myCompanyDefaultLang = (string) $mysoc->default_lang;
 		if (empty($myCompanyDefaultLang) || $myCompanyDefaultLang === 'auto') {
 			// We must guess the language from the company country. We must not use the language of the visitor. This is a technical email for supervision
 			// so it must always be into the same language.
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 6d415d7820f..26b2db6e80b 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -589,7 +589,7 @@ if ($ispaymentok) {
 
 				// Set output language
 				$outputlangs = new Translate('', $conf);
-				$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
+				$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? (string) $mysoc->default_lang : (string) $object->thirdparty->default_lang);
 				$paymentdate = $now;
 				$amount = $FinalPaymentAmt;
 				$formatteddate = dol_print_date($paymentdate, 'dayhour', 'auto', $outputlangs);
@@ -1446,7 +1446,7 @@ if ($ispaymentok) {
 							$formmail = new FormMail($db);
 							// Set output language
 							$outputlangs = new Translate('', $conf);
-							$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
+							$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? (string) $mysoc->default_lang : (string) $thirdparty->default_lang);
 							// Load traductions files required by page
 							$outputlangs->loadLangs(array("main", "members", "eventorganization"));
 							// Get email content from template
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 2a6d965b012..a84b221ab06 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2015-2017 Ferran Marcet		<fmarcet@2byte.es>
  * Copyright (C) 2021-2024  Frédéric France		<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -416,7 +416,7 @@ if (!empty($sql_select)) {
 	$sql .= $where;
 	$sql .= dolSqlDateFilter($dateprint, 0, $month, $year);
 	if ($sref) {
-		$sql .= " AND ".$db->sanitize($doc_number)." LIKE '%".$db->escape($sref)."%'";
+		$sql .= " AND ".$db->sanitize((string) $doc_number)." LIKE '%".$db->escape($sref)."%'";
 	}
 	if ($sprod_fulldescr) {
 		// We test both case description is correctly saved of was save after dol_escape_htmltag().

From 991afe2b2179f0957f1c28c9366e3ac00602e2a8 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 29 Jan 2025 01:03:16 +0100
Subject: [PATCH 393/602] Qual: Fix notices in api_interventions, phpstan
 notice

---
 htdocs/fichinter/card-rec.php                 |  2 +-
 .../class/api_interventions.class.php         | 34 ++++++++++++-------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index a84871b25fc..8ad1c46c169 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -746,7 +746,7 @@ if ($action == 'create') {
 				} // else { $object->lines[$i]->fk_product_type; }
 
 				// TODO: $objp is not set here, so why test?
-				if (isset($objp) && is_object($objp)) {
+				if (isset($objp) && is_object($objp)) {  // $objp always null @phpstan-ignore-line
 					// Try to enhance type detection using date_start and date_end for free lines when type
 					// was not saved.
 					if (!empty($objp->date_start)) {
diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index 57699f6f593..7a86225622e 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2025		MDW					<mdeweerd@users.noreply.github.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
@@ -36,21 +36,21 @@ require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 class Interventions extends DolibarrApi
 {
 	/**
-	 * @var array       Mandatory fields, checked when create and update object
+	 * @var string[]	Mandatory fields, checked when create and update object
 	 */
 	public static $FIELDS = array(
-	  'socid',
-	  'fk_project',
-	  'description',
+		'socid',
+		'fk_project',
+		'description',
 	);
 
 	/**
-	 * @var array       Mandatory fields, checked when create and update object
+	 * @var string[]	Mandatory fields, checked when create and update object
 	 */
 	public static $FIELDSLINE = array(
-	  'description',
-	  'date',
-	  'duree',
+		'description',
+		'date',
+		'duree',
 	);
 
 	/**
@@ -108,6 +108,8 @@ class Interventions extends DolibarrApi
 	 * @param string    $sqlfilters             Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
 	 * @param string    $properties				Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                           Array of order objects
+	 * @phan-return array<object>
+	 * @phpstan-return array<object>
 	 *
 	 * @throws RestException
 	 */
@@ -187,6 +189,8 @@ class Interventions extends DolibarrApi
 	 * Create intervention object
 	 *
 	 * @param   array   $request_data   Request data
+	 * @phan-param ?array<string,string>    $request_data
+	 * @phpstan-param ?array<string,string> $request_data
 	 * @return  int     ID of intervention
 	 */
 	public function post($request_data = null)
@@ -252,6 +256,8 @@ class Interventions extends DolibarrApi
 	 *
 	 * @param	int		$id             Id of intervention to update
 	 * @param   array   $request_data   Request data
+	 * @phan-param ?array<string,string>    $request_data
+	 * @phpstan-param ?array<string,string> $request_data
 	 *
 	 * @url     POST {id}/lines
 	 *
@@ -303,6 +309,8 @@ class Interventions extends DolibarrApi
 	 *
 	 * @param   int     $id         Order ID
 	 * @return  array
+	 * @phan-return array<string,array{code:int,message:string}>
+	 * @phpstan-return array<string,array{code:int,message:string}>
 	 */
 	public function delete($id)
 	{
@@ -412,8 +420,8 @@ class Interventions extends DolibarrApi
 	/**
 	 * Validate fields before create or update object
 	 *
-	 * @param array $data   Data to validate
-	 * @return array
+	 * @param ?array<null|int|float|string> $data   Data to validate
+	 * @return array<string,null|int|float|string>
 	 *
 	 * @throws RestException
 	 */
@@ -451,8 +459,8 @@ class Interventions extends DolibarrApi
 	/**
 	 * Validate fields before create or update object
 	 *
-	 * @param array $data   Data to validate
-	 * @return array
+	 * @param array<string,null|int|float|string>   $data   Data to validate
+	 * @return array<string,null|int|float|string>          Return array with validated mandatory fields and their value
 	 *
 	 * @throws RestException
 	 */

From 18f616b201eb6ccab8e2cfcd7cb366abd400c466 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 29 Jan 2025 01:05:06 +0100
Subject: [PATCH 394/602] Qual: Fix remaining phan notice in
 expensereport_linktofile

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

diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index c4fbd00374b..c565fe32894 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -103,7 +103,7 @@ if (!getDolGlobalString('EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES')) {
 				print '<div class="photoref backgroundblank">';
 
 				// TODO: Check that $minifile has a proper value here (set in true part of if, not else part).
-				print $thumbshown ? $thumbshown : img_mime($minifile);
+				print $thumbshown ? $thumbshown : ($minifile ? img_mime($minifile) : null);
 
 				print '</div>';
 				if (empty($urlforhref) || empty($thumbshown)) {

From 42be9a344292b822bcfe44ccdc6876e16c84d9bf Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 29 Jan 2025 01:07:15 +0100
Subject: [PATCH 395/602] Qual: Update phan baseline

---
 dev/tools/phan/baseline.txt | 39 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 7007834787e..f69251c12c0 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -10,14 +10,14 @@
 return [
     // # Issue statistics:
     // PhanUndeclaredProperty : 540+ occurrences
-    // PhanPossiblyUndeclaredGlobalVariable : 250+ occurrences
-    // PhanUndeclaredGlobalVariable : 220+ occurrences
+    // PhanPossiblyUndeclaredGlobalVariable : 210+ occurrences
+    // PhanUndeclaredGlobalVariable : 210+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 180+ occurrences
-    // PhanTypeMismatchArgumentProbablyReal : 180+ occurrences
+    // PhanTypeMismatchArgumentProbablyReal : 160+ occurrences
     // PhanTypeMismatchProperty : 140+ occurrences
     // PhanPluginUnknownArrayMethodParamType : 120+ occurrences
-    // PhanPluginUndeclaredVariableIsset : 45+ occurrences
     // PhanRedefineFunction : 45+ occurrences
+    // PhanPluginUndeclaredVariableIsset : 40+ occurrences
     // PhanTypeExpectedObjectPropAccess : 40+ occurrences
     // PhanTypeInvalidDimOffset : 25+ occurrences
     // PhanTypeMismatchDimFetch : 25+ occurrences
@@ -32,7 +32,7 @@ return [
     // PhanPluginDuplicateExpressionBinaryOp : 6 occurrences
     // PhanTypeArraySuspiciousNull : 6 occurrences
     // PhanParamTooMany : 5 occurrences
-    // PhanPluginBothLiteralsBinaryOp : 5 occurrences
+    // PhanPluginBothLiteralsBinaryOp : 4 occurrences
     // PhanPluginDuplicateArrayKey : 4 occurrences
     // PhanEmptyFQSENInClasslike : 3 occurrences
     // PhanInvalidFQSENInClasslike : 3 occurrences
@@ -203,41 +203,25 @@ return [
         'htdocs/don/info.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/don/list.php' => ['PhanTypeMismatchProperty'],
         'htdocs/don/note.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/ecm/dir_card.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/ecm/index.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/emailcollector/class/emailcollector.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/eventorganization/class/conferenceorboothattendee.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
         'htdocs/eventorganization/conferenceorbooth_card.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/eventorganization/conferenceorbooth_list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/eventorganization/conferenceorboothattendee_card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/eventorganization/conferenceorboothattendee_list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/eventorganization/conferenceorboothattendee_card.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/eventorganization/core/actions_massactions_mail.inc.php' => ['PhanUndeclaredProperty'],
         'htdocs/expedition/card.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/expedition/class/api_shipments.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/expedition/class/expedition.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/expedition/contact.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/expedition/dispatch.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/expedition/document.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/expedition/list.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/expedition/note.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/expedition/shipment.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/expensereport/card.php' => ['PhanPluginBothLiteralsBinaryOp', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
+        'htdocs/expensereport/card.php' => ['PhanUndeclaredProperty'],
         'htdocs/expensereport/class/api_expensereports.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
-        'htdocs/expensereport/payment/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/expensereport/payment/card.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/expensereport/payment/info.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/expensereport/payment/payment.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/expensereport/stats/index.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/expensereport/tpl/expensereport_addfile.tpl.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/expensereport/tpl/expensereport_linktofile.tpl.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/expensereport/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/externalsite/frames.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/fichinter/card-rec.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/fichinter/class/api_interventions.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanUndeclaredProperty'],
+        'htdocs/fichinter/card-rec.php' => ['PhanUndeclaredGlobalVariable'],
+        'htdocs/fichinter/class/api_interventions.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/fichinter/class/fichinterrec.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/fichinter/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/fichinter/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/filefunc.inc.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/fourn/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/fourn/class/api_supplier_invoices.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/fourn/class/api_supplier_orders.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/fourn/class/fournisseur.commande.class.php' => ['PhanUndeclaredProperty'],
@@ -294,7 +278,7 @@ return [
         'htdocs/loan/card.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/loan/document.php' => ['PhanUndeclaredProperty'],
         'htdocs/loan/note.php' => ['PhanUndeclaredProperty'],
-        'htdocs/loan/payment/payment.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/loan/payment/payment.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/margin/customerMargins.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/margin/productMargins.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/master.inc.php' => ['PhanUndeclaredGlobalVariable'],
@@ -476,7 +460,6 @@ return [
         'htdocs/ticket/class/cticketcategory.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/ticket/class/ticket.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/ticket/index.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal'],
-        'htdocs/ticket/list.php' => ['PhanTypeComparisonFromArray'],
         'htdocs/user/card.php' => ['PhanTypeMismatchProperty'],
         'htdocs/user/class/api_users.class.php' => ['PhanTypeMismatchProperty'],
         'htdocs/user/class/user.class.php' => ['PhanUndeclaredProperty'],

From dc069b8439d72cd437ac1d2aa9be58d1cb498b31 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 2 Feb 2025 02:07:56 +0100
Subject: [PATCH 396/602] Update societe.class.php

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 65c0c3e6145..7aa0f338dec 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2517,13 +2517,12 @@ class Societe extends CommonObject
 				$discount->amount_ttc = price2num($remise, 'MT');
 				$discount->amount_ht = price2num((float) $remise / (1 + (float) $vatrate / 100), 'MT');
 				$discount->amount_tva = price2num((float) $discount->amount_ttc - (float) $discount->amount_ht, 'MT');
-
 			} else {
 				$discount->amount_ht = price2num($remise, 'MT');
 				$discount->amount_tva = price2num((float) $remise * (float) $vatrate / 100, 'MT');
 				$discount->amount_ttc = price2num((float) $discount->amount_ht + (float) $discount->amount_tva, 'MT');
 
-				$discount->multicurrency_amount_ht = price2num($remise * (float)$discount->multicurrency_tx, 'MT');
+				$discount->multicurrency_amount_ht = price2num($remise * (float) $discount->multicurrency_tx, 'MT');
 				$discount->multicurrency_amount_tva = price2num(((float) $remise * (float) $vatrate / 100) * (float) $discount->multicurrency_tx, 'MT');
 				$discount->multicurrency_amount_ttc= price2num(((float) $discount->amount_ht + (float) $discount->amount_tva) * (float) $discount->multicurrency_tx, 'MT');
 			}

From 01d9ff6a1b194dd437e102b17149631ca4ca316b Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Sun, 2 Feb 2025 07:10:28 +0100
Subject: [PATCH 397/602] FIX phan error

---
 .../multicurrency/class/api_multicurrencies.class.php  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/htdocs/multicurrency/class/api_multicurrencies.class.php b/htdocs/multicurrency/class/api_multicurrencies.class.php
index 6df6c15347c..3d044f2dc10 100644
--- a/htdocs/multicurrency/class/api_multicurrencies.class.php
+++ b/htdocs/multicurrency/class/api_multicurrencies.class.php
@@ -386,13 +386,11 @@ class MultiCurrencies extends DolibarrApi
 		$object = parent::_cleanObjectDatas($object);
 
 		// Clear all fields out of interest
-		if (!empty($object)) {
-			foreach ($object as $key => $value) {
-				if ($key == "id" || $key == "rate" || $key == "date_sync") {
-					continue;
-				}
-				unset($object->$key);
+		foreach ($object as $key => $value) {
+			if ($key == "id" || $key == "rate" || $key == "date_sync") {
+				continue;
 			}
+			unset($object->$key);
 		}
 
 		return $object;

From e1da6dd789c30ff997617a82d4ca70f8ca4c0848 Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <alexandre.janniaux@gmail.com>
Date: Sun, 2 Feb 2025 20:09:41 +0100
Subject: [PATCH 398/602] docker-dev: fix paths for docker-compose volumes

The folder was moved in c9519a1a5a2508fb08ea1b717bc4a9893cd60678
but the paths in 9a61a6e6c904cbd19ccade141340a7d3b8684647 were not
updated afterwards.
---
 dev/build/docker-dev/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/build/docker-dev/docker-compose.yml b/dev/build/docker-dev/docker-compose.yml
index cc2988a67d1..8a5c2a4b241 100644
--- a/dev/build/docker-dev/docker-compose.yml
+++ b/dev/build/docker-dev/docker-compose.yml
@@ -37,8 +37,8 @@ services:
             PHP_INI_DATE_TIMEZONE: $PHP_INI_DATE_TIMEZONE
             PHP_INI_MEMORY_LIMIT: $PHP_INI_MEMORY_LIMIT
         volumes:
-            - ../../htdocs:/var/www/html/
-            - ../../documents:/var/documents
+            - ../../../htdocs:/var/www/html/
+            - ../../../documents:/var/www/documents
         ports:
             - "80:80"
             - "9000:9000"

From 2e7b90a31c27126eb527ed4e8580142b65fa8c65 Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <alexandre.janniaux@gmail.com>
Date: Sun, 2 Feb 2025 20:09:44 +0100
Subject: [PATCH 399/602] docker-dev: fix LDAP configuration

The libraries are not in /usr/lib/x86_64-gnu-linux anymore, multilib not
being enabled.
---
 dev/build/docker-dev/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/build/docker-dev/Dockerfile b/dev/build/docker-dev/Dockerfile
index 5cd4c60673b..601878c0211 100644
--- a/dev/build/docker-dev/Dockerfile
+++ b/dev/build/docker-dev/Dockerfile
@@ -27,7 +27,7 @@ RUN apt-get update -y \
     && rm -rf /var/lib/apt/lists/* \
     && docker-php-ext-configure gd --with-freetype --with-jpeg \
     && docker-php-ext-install -j$(nproc) calendar intl mysqli pdo_mysql gd soap zip \
-    && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
+    && docker-php-ext-configure ldap \
     && docker-php-ext-install -j$(nproc) ldap && \
     mv ${PHP_INI_DIR}/php.ini-development ${PHP_INI_DIR}/php.ini
 

From 19d69eaac957912b93ac8d6a29941faf54fa580c Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <alexandre.janniaux@gmail.com>
Date: Sun, 2 Feb 2025 20:09:46 +0100
Subject: [PATCH 400/602] docker-dev: add support for postgresql database

The PostgreSQL database can be used as the following:

        docker compose -f docker-compose.yml -f docker-compose.postgres.yml up

This allows a bit more modularity and ensuring people can start a
PostgreSQL development setup quickly.
---
 dev/build/docker-dev/Dockerfile   |  3 ++-
 dev/build/docker-dev/postgres.yml | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 dev/build/docker-dev/postgres.yml

diff --git a/dev/build/docker-dev/Dockerfile b/dev/build/docker-dev/Dockerfile
index 601878c0211..f98726d4f8c 100644
--- a/dev/build/docker-dev/Dockerfile
+++ b/dev/build/docker-dev/Dockerfile
@@ -23,10 +23,11 @@ RUN apt-get update -y \
         msmtp \
         msmtp-mta \
         mailutils \
+        libpq-dev \
     && apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/* \
     && docker-php-ext-configure gd --with-freetype --with-jpeg \
-    && docker-php-ext-install -j$(nproc) calendar intl mysqli pdo_mysql gd soap zip \
+    && docker-php-ext-install -j$(nproc) calendar intl mysqli pdo_mysql pgsql gd soap zip \
     && docker-php-ext-configure ldap \
     && docker-php-ext-install -j$(nproc) ldap && \
     mv ${PHP_INI_DIR}/php.ini-development ${PHP_INI_DIR}/php.ini
diff --git a/dev/build/docker-dev/postgres.yml b/dev/build/docker-dev/postgres.yml
new file mode 100644
index 00000000000..ab740658894
--- /dev/null
+++ b/dev/build/docker-dev/postgres.yml
@@ -0,0 +1,18 @@
+---
+networks:
+    internal-pod:
+        internal: true
+    external-pod:
+        internal: false
+
+services:
+    postgres:
+        image: postgres:latest
+        environment:
+            POSTGRES_PASSWORD: rootpassfordev
+        networks:
+            - internal-pod
+            - external-pod
+    web:
+        depends_on:
+            - postgres

From 57ccb41c6ef5b26c9392388fdce514efaf772a98 Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <alexandre.janniaux@gmail.com>
Date: Sun, 2 Feb 2025 20:09:47 +0100
Subject: [PATCH 401/602] docker-dev: remove files rights change in
 docker-run.sh

File rights from the whole environment should not change since the files
are belonging to the git tree. In addition, setting www-data to the same
user id as the user (or likewise, setting a userns remapping) remove the
need to change the rights.
---
 dev/build/docker-dev/docker-run.sh | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/dev/build/docker-dev/docker-run.sh b/dev/build/docker-dev/docker-run.sh
index 07bc35947cf..7b78b2b1e65 100755
--- a/dev/build/docker-dev/docker-run.sh
+++ b/dev/build/docker-dev/docker-run.sh
@@ -2,19 +2,14 @@
 # Script used by the Dockerfile.
 # See README.md to know how to create a Dolibarr env with docker
 
+if [ "${HOST_USER_ID}" == "" ]; then
+	echo "Define HOST_USER_ID to your user ID before starting"
+	exit 1
+fi
+
 usermod -u "${HOST_USER_ID}" www-data
 groupmod -g "${HOST_USER_ID}" www-data
 
-chgrp -hR www-data /var/www/html
-chmod g+rwx /var/www/html/conf
-
-if [ ! -d /var/documents ]; then
-	echo "[docker-run] => create volume directory /var/documents ..."
-	mkdir -p /var/documents
-fi
-echo "[docker-run] => Set Permission to www-data for /var/documents"
-chown -R www-data:www-data /var/documents
-
 echo "[docker-run] => update '${PHP_INI_DIR}/conf.d/dolibarr-php.ini'"
 cat <<EOF > "${PHP_INI_DIR}/conf.d/dolibarr-php.ini"
 date.timezone = ${PHP_INI_DATE_TIMEZONE:-UTC}

From f3613f0425d982539540e99e133ae8aa2c59bf90 Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <alexandre.janniaux@gmail.com>
Date: Sun, 2 Feb 2025 20:09:49 +0100
Subject: [PATCH 402/602] docker-dev: compose: fix warnings

version is deprecated and yaml document starts after --- marker.
---
 dev/build/docker-dev/docker-compose.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev/build/docker-dev/docker-compose.yml b/dev/build/docker-dev/docker-compose.yml
index 8a5c2a4b241..4339b473258 100644
--- a/dev/build/docker-dev/docker-compose.yml
+++ b/dev/build/docker-dev/docker-compose.yml
@@ -1,5 +1,4 @@
-version: '3'
-
+---
 networks:
     internal-pod:
         internal: true

From 2b9deda89b4a85a9d24aa62087f8245d1406154f Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <alexandre.janniaux@gmail.com>
Date: Sun, 2 Feb 2025 20:09:50 +0100
Subject: [PATCH 403/602] docker-dev: README: set document width to 80

Improve terminal reading experience by limiting the document width to
80. On the web interface, markdown with merge every line into a single
paragraph.
---
 dev/build/docker-dev/README.md     | 15 +++++++++------
 dev/build/docker-dev/docker-run.sh |  2 ++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/dev/build/docker-dev/README.md b/dev/build/docker-dev/README.md
index bb5c82391f1..111d9f6b941 100644
--- a/dev/build/docker-dev/README.md
+++ b/dev/build/docker-dev/README.md
@@ -1,8 +1,9 @@
 # How to use it ?
 
-The docker-compose.yml file is a sample of a config file to use to build and run Dolibarr in the current workspace with Docker.
-This docker image is intended for development usage.
-For production usage you should consider other contributor reference like https://hub.docker.com/r/dolibarr/dolibarr 
+The docker-compose.yml file is a sample of a config file to use to build and run
+Dolibarr in the current workspace with Docker. This docker image is intended for
+**development usage**. For production usage you should consider other
+contributor reference like https://hub.docker.com/r/dolibarr/dolibarr.
 
 Before build/run, define the variable HOST_USER_ID as following:
 
@@ -26,9 +27,11 @@ The URL to go to PhpMyAdmin is (login/password is root/root) :
 
         http://0.0.0.0:8080
 
-In Dolibarr configuration Email let PHP mail function, To see all mail send by Dolibarr go to maildev
+In Dolibarr configuration Email let PHP mail function, To see all mail send by
+Dolibarr go to maildev
 
         http://0.0.0.0:8081
 
-Setup the database connection during the installation process, please use mariadb (name of the database container) as database host.
-Setup documents folder, during the installation process, to /var/documents
+Setup the database connection during the installation process, please use
+mariadb (name of the database container) as database host. Setup documents
+folder, during the installation process, to /var/documents.
diff --git a/dev/build/docker-dev/docker-run.sh b/dev/build/docker-dev/docker-run.sh
index 7b78b2b1e65..a3a1123c1f2 100755
--- a/dev/build/docker-dev/docker-run.sh
+++ b/dev/build/docker-dev/docker-run.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 # Script used by the Dockerfile.
 # See README.md to know how to create a Dolibarr env with docker
+set -ex
 
 if [ "${HOST_USER_ID}" == "" ]; then
 	echo "Define HOST_USER_ID to your user ID before starting"
@@ -14,6 +15,7 @@ echo "[docker-run] => update '${PHP_INI_DIR}/conf.d/dolibarr-php.ini'"
 cat <<EOF > "${PHP_INI_DIR}/conf.d/dolibarr-php.ini"
 date.timezone = ${PHP_INI_DATE_TIMEZONE:-UTC}
 memory_limit = ${PHP_INI_MEMORY_LIMIT:-256M}
+display_errors = Off
 EOF
 
 exec apache2-foreground

From 99d9d991157612075d1348016736ea6d60b92200 Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <alexandre.janniaux@gmail.com>
Date: Sun, 2 Feb 2025 20:09:51 +0100
Subject: [PATCH 404/602] docker-dev: README: use new docker compose subcommand

docker-compose has been replaced by docker compose.
---
 dev/build/docker-dev/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/build/docker-dev/README.md b/dev/build/docker-dev/README.md
index 111d9f6b941..820b9f3da3b 100644
--- a/dev/build/docker-dev/README.md
+++ b/dev/build/docker-dev/README.md
@@ -15,7 +15,7 @@ Go in repository build/docker :
 
 And then, you can run :
 
-        docker-compose up
+        docker compose up
 
 This will run 4 containers Docker : Dolibarr, MariaDB, PhpMyAdmin and MailDev.
 

From e6516f06a4e339b111023741f039786d1f605c82 Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <alexandre.janniaux@gmail.com>
Date: Sun, 2 Feb 2025 20:09:53 +0100
Subject: [PATCH 405/602] docker-dev: extract mariadb.yml from docker compose
 file

This extracts the mariadb part to be able to compose different
docker-compose manifests and use PostgreSQL instead for module
development and debugging.
---
 dev/build/docker-dev/docker-compose.yml | 14 ----------
 dev/build/docker-dev/mariadb.yml        | 34 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 14 deletions(-)
 create mode 100644 dev/build/docker-dev/mariadb.yml

diff --git a/dev/build/docker-dev/docker-compose.yml b/dev/build/docker-dev/docker-compose.yml
index 4339b473258..84a48d00f48 100644
--- a/dev/build/docker-dev/docker-compose.yml
+++ b/dev/build/docker-dev/docker-compose.yml
@@ -16,19 +16,6 @@ services:
         networks:
             - internal-pod
             - external-pod
-
-    phpmyadmin:
-        image: phpmyadmin/phpmyadmin
-        environment:
-            PMA_HOST: mariadb
-        depends_on:
-            - mariadb
-        ports:
-            - "8080:80"
-        networks:
-            - internal-pod
-            - external-pod
-
     web:
         build: .
         environment:
@@ -42,7 +29,6 @@ services:
             - "80:80"
             - "9000:9000"
         depends_on:
-            - mariadb
             - mail
         networks:
             - internal-pod
diff --git a/dev/build/docker-dev/mariadb.yml b/dev/build/docker-dev/mariadb.yml
new file mode 100644
index 00000000000..c9b2e78ac18
--- /dev/null
+++ b/dev/build/docker-dev/mariadb.yml
@@ -0,0 +1,34 @@
+---
+networks:
+    internal-pod:
+        internal: true
+    external-pod:
+        internal: false
+
+services:
+    mariadb:
+        image: mariadb:latest
+        environment:
+            MYSQL_ROOT_PASSWORD: rootpassfordev
+            MYSQL_DATABASE: dolibarr
+        ports:
+            - "3306:3306"
+        networks:
+            - internal-pod
+            - external-pod
+    web:
+        depends_on:
+            - mariadb
+    phpmyadmin:
+        image: phpmyadmin/phpmyadmin
+        environment:
+            PMA_HOST: mariadb
+        depends_on:
+            - mariadb
+        ports:
+            - "8080:80"
+        networks:
+            - internal-pod
+            - external-pod
+
+

From 39e07232147788e5a3fae9680eac4d668e8ea3b7 Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <alexandre.janniaux@gmail.com>
Date: Sun, 2 Feb 2025 20:09:54 +0100
Subject: [PATCH 406/602] docker-dev: README: improve usage documentation

This commit adds more documentation on how to use the docker-compose
setup in different environment (postgres / mariadb) as well as how to
setup it for module development.
---
 dev/build/docker-dev/README.md | 39 ++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/dev/build/docker-dev/README.md b/dev/build/docker-dev/README.md
index 820b9f3da3b..22a1a671121 100644
--- a/dev/build/docker-dev/README.md
+++ b/dev/build/docker-dev/README.md
@@ -13,11 +13,18 @@ Go in repository build/docker :
 
         cd dev/build/docker
 
-And then, you can run :
+And then, depending on whether you want to run with a MariaDB database or
+PostgreSQL database, you can run:
 
-        docker compose up
+        docker compose -f docker-compose.yml -f mariadb.yml up
+
+or
+
+        docker compose -f docker-compose.yml -f postgres.yml up
 
 This will run 4 containers Docker : Dolibarr, MariaDB, PhpMyAdmin and MailDev.
+In the case of PostgreSQL, only Dolibarr, MailDev and the PostgreSQL database
+will be running.
 
 The URL to go to the Dolibarr is :
 
@@ -33,5 +40,29 @@ Dolibarr go to maildev
         http://0.0.0.0:8081
 
 Setup the database connection during the installation process, please use
-mariadb (name of the database container) as database host. Setup documents
-folder, during the installation process, to /var/documents.
+mariadb or postgres (name of the database container) as database host.
+
+## Setup your custom modules
+
+You can setup your own modules from your development folder by using volume
+mounts and docker compose override. For instance for your module "yourmodule"
+located in `/path/to/your/module_folder`, you can edit `yourmodule.yml` and
+write:
+
+        ---
+        services:
+            web:
+                volumes:
+                    - /path/to/your/module_folder:/var/www/html/custom/yourmodule/
+
+This will add your module at runtime inside the dolibarr custom plugins and it
+will automatically be synced with your development environment.
+
+Then, you can start by extending one of the commands above, for instance for
+mariadb:
+
+        docker compose \
+            -f docker-compose.yml \
+            -f postgres.yml \
+            -f yourmodule.yml \
+            up

From ab80e0337d9184883b2d5e29d1707e867258c312 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Feb 2025 05:55:39 +0000
Subject: [PATCH 407/602] Bump mdeweerd/logToCheckStyle from 2024.3.5 to
 2025.1.1

Bumps [mdeweerd/logToCheckStyle](https://github.com/mdeweerd/logtocheckstyle) from 2024.3.5 to 2025.1.1.
- [Commits](https://github.com/mdeweerd/logtocheckstyle/compare/v2024.3.5...v2025.1.1)

---
updated-dependencies:
- dependency-name: mdeweerd/logToCheckStyle
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/pre-commit.yml | 2 +-
 .github/workflows/windows-ci.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index ccd276f8a97..26d49f0b1f4 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -131,7 +131,7 @@ jobs:
           ls -l ~/.cache/pre-commit/
 
       - name: Convert Raw Log to Annotations
-        uses: mdeweerd/logToCheckStyle@v2024.3.5
+        uses: mdeweerd/logToCheckStyle@v2025.1.1
         if: ${{ failure() }}
         with:
           in: ${{ env.RAW_LOG }}
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
index c15d2747125..2c34622bb70 100644
--- a/.github/workflows/windows-ci.yml
+++ b/.github/workflows/windows-ci.yml
@@ -165,7 +165,7 @@ jobs:
           for /f "tokens=2 delims==" %%A in ('doskey /m:err') do EXIT /B %%A
 
       - name: Convert Raw Log to Annotations
-        uses: mdeweerd/logToCheckStyle@v2024.3.5
+        uses: mdeweerd/logToCheckStyle@v2025.1.1
         if: ${{ failure() }}
         with:
           in: ${{ env.PHPUNIT_LOG }}

From efddb65ac98a41c7a5f0fb95000b12e6eccbcbfc Mon Sep 17 00:00:00 2001
From: SebHashe <sebastien.hacout@gmail.com>
Date: Mon, 3 Feb 2025 08:27:11 +0100
Subject: [PATCH 408/602] Update llx_accounting_account_fr.sql

fix 1 to __ENTITY___
---
 .../mysql/data/llx_accounting_account_fr.sql  | 1566 ++++++++---------
 1 file changed, 783 insertions(+), 783 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_accounting_account_fr.sql b/htdocs/install/mysql/data/llx_accounting_account_fr.sql
index 6409bbc7aa4..b1d2a719664 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_fr.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_fr.sql
@@ -898,789 +898,789 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 --
 -- Descriptif des plans comptables FR PCG18-ASSOC
 --
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7001,'PCG18-ASSOC','CAPIT',		'1',    '0', 'Comptes de capitaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7002,'PCG18-ASSOC','IMMO',		'2',    '0', 'Comptes d''immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7003,'PCG18-ASSOC','STOCK',		'3',    '0', 'Comptes de stocks et en-cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7004,'PCG18-ASSOC','THIRDPARTY',		'4',    '0', 'Comptes de tiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7005,'PCG18-ASSOC','FINAN',		'5',    '0', 'Comptes financiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7006,'PCG18-ASSOC','EXPENSE',		'6',    '0', 'Comptes de charges', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7007,'PCG18-ASSOC','INCOME',		'7',    '0', 'Comptes de produits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7008,'PCG18-ASSOC','SPECIAL',		'8',    '0', 'Comptes de contributions volontaires en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7010,'PCG18-ASSOC','CAPIT',		'10',    '7001', 'Fonds propres et réserves', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7011,'PCG18-ASSOC','CAPIT',		'102',    '7010', 'Fonds propres sans droit de reprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7012,'PCG18-ASSOC','CAPIT',		'1021',    '7011', 'Première situation nette établie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7013,'PCG18-ASSOC','CAPIT',		'1022',    '7011', 'Fonds statutaires (à subdiviser en fonction des statuts)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7014,'PCG18-ASSOC','CAPIT',		'1023',    '7011', 'Dotations non consomptibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7015,'PCG18-ASSOC','CAPIT',		'10231',    '7014', 'Dotations non consomptibles initiales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7016,'PCG18-ASSOC','CAPIT',		'10232',    '7014', 'Dotations non consomptibles complémentaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7017,'PCG18-ASSOC','CAPIT',		'1024',    '7011', 'Autres fonds propres sans droit de reprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7018,'PCG18-ASSOC','CAPIT',		'1025',    '7011', 'Legs et donations avec contrepartie d''actifs immobilisés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7019,'PCG18-ASSOC','CAPIT',		'103',    '7010', 'Fonds propres avec droit de reprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7020,'PCG18-ASSOC','CAPIT',		'1032',    '7019', 'Fonds statutaires (à subdiviser en fonction des statuts)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7021,'PCG18-ASSOC','CAPIT',		'1034',    '7019', 'Autres fonds propres avec droit de reprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7022,'PCG18-ASSOC','CAPIT',		'1035',    '7019', 'Legs et donations avec contrepartie d''actifs immobilisés assortis d''une obligation ou d''une condition', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7023,'PCG18-ASSOC','CAPIT',		'105',    '7010', 'Ecarts de réévaluation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7024,'PCG18-ASSOC','CAPIT',		'1051',    '7023', 'Ecarts de réévaluation sur des biens sans droit de reprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7025,'PCG18-ASSOC','CAPIT',		'1052',    '7023', 'Ecarts de réévaluation sur des biens avec droit de reprise', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7026,'PCG18-ASSOC','CAPIT',		'106',    '7010', 'Réserves', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7027,'PCG18-ASSOC','CAPIT',		'1062',    '7026', 'Réserves indisponibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7028,'PCG18-ASSOC','CAPIT',		'1063',    '7026', 'Réserves statutaires et contractuelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7029,'PCG18-ASSOC','CAPIT',		'1064',    '7026', 'Réserves réglementées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7030,'PCG18-ASSOC','CAPIT',		'1068',    '7026', 'Autres réserves', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7031,'PCG18-ASSOC','CAPIT',		'10681',    '7030', 'Réserves pour projet de l''entité', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7032,'PCG18-ASSOC','CAPIT',		'10688',    '7030', 'Réserves diverses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7033,'PCG18-ASSOC','CAPIT',		'108',    '7010', 'Dotations consomptibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7034,'PCG18-ASSOC','CAPIT',		'1081',    '7033', 'Dotations consomptibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7035,'PCG18-ASSOC','CAPIT',		'1089',    '7033', 'Dotations consomptibles inscrites au compte de résultat', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7036,'PCG18-ASSOC','CAPIT',		'11',    '7001', 'Eléments en instance d''affectation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7037,'PCG18-ASSOC','CAPIT',		'110',    '7036', 'Report à nouveau excédentaire (solde créditeur)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7038,'PCG18-ASSOC','CAPIT',		'115',    '7036', 'Report à nouveau sous contrôle de tiers financeurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7039,'PCG18-ASSOC','CAPIT',		'119',    '7036', 'Report à nouveau déficitaire (solde débiteur)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7040,'PCG18-ASSOC','CAPIT',		'12',    '7001', 'Résultat net de l''exercice', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7041,'PCG18-ASSOC','CAPIT',		'120',    '7040', 'Excédent de l''exercice', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7042,'PCG18-ASSOC','CAPIT',		'129',    '7040', 'Déficit de l''exercice', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7043,'PCG18-ASSOC','CAPIT',		'13',    '7001', 'Subventions d''investissement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7044,'PCG18-ASSOC','CAPIT',		'131',    '7043', 'Subventions d''investissement reçues', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7045,'PCG18-ASSOC','CAPIT',		'1311',    '7044', 'Etat', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7046,'PCG18-ASSOC','CAPIT',		'1312',    '7044', 'Régions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7047,'PCG18-ASSOC','CAPIT',		'1313',    '7044', 'Départements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7048,'PCG18-ASSOC','CAPIT',		'1314',    '7044', 'Communes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7049,'PCG18-ASSOC','CAPIT',		'1315',    '7044', 'Collectivités publiques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7050,'PCG18-ASSOC','CAPIT',		'1316',    '7044', 'Entreprises publiques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7051,'PCG18-ASSOC','CAPIT',		'1318',    '7044', 'Autres', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7052,'PCG18-ASSOC','CAPIT',		'13181',    '7051', 'Taxe d''apprentissage', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7053,'PCG18-ASSOC','CAPIT',		'13182',    '7051', 'Autres subventions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7054,'PCG18-ASSOC','CAPIT',		'139',    '7043', 'Subventions d''investissement inscrites au compte de résultat', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7055,'PCG18-ASSOC','CAPIT',		'1391',    '7054', 'Subventions d''investissement inscrites au compte de résultat', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7056,'PCG18-ASSOC','CAPIT',		'1398',    '7054', 'Autres', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7057,'PCG18-ASSOC','CAPIT',		'13981',    '7056', 'Taxe d''apprentissage', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7058,'PCG18-ASSOC','CAPIT',		'13988',    '7056', 'Autres subventions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7059,'PCG18-ASSOC','CAPIT',		'14',    '7001', 'Provisions réglementées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7060,'PCG18-ASSOC','CAPIT',		'142',    '7059', 'Provisions réglementées relatives aux immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7061,'PCG18-ASSOC','CAPIT',		'1424',    '7060', 'Provisions pour investissement (participation des salariés)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7062,'PCG18-ASSOC','CAPIT',		'143',    '7059', 'Provisions réglementées relatives aux stocks', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7063,'PCG18-ASSOC','CAPIT',		'144',    '7059', 'Provisions réglementées relatives aux éléments d''actif', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7064,'PCG18-ASSOC','CAPIT',		'145',    '7059', 'Amortissements dérogatoires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7065,'PCG18-ASSOC','CAPIT',		'148',    '7059', 'Autres provisions réglementées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7066,'PCG18-ASSOC','CAPIT',		'15',    '7001', 'Provisions pour risques et charges', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7067,'PCG18-ASSOC','CAPIT',		'151',    '7066', 'Provisions pour risques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7068,'PCG18-ASSOC','CAPIT',		'1511',    '7067', 'Provisions pour litiges', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7069,'PCG18-ASSOC','CAPIT',		'1514',    '7067', 'Provisions pour amendes et pénalités', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7070,'PCG18-ASSOC','CAPIT',		'1515',    '7067', 'Provisions pour pertes de change', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7071,'PCG18-ASSOC','CAPIT',		'1516',    '7067', 'Provisions pour risque d''emploi', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7072,'PCG18-ASSOC','CAPIT',		'1518',    '7067', 'Autres provisions pour risques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7073,'PCG18-ASSOC','CAPIT',		'152',    '7066', 'Provisions pour charges sur legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7074,'PCG18-ASSOC','CAPIT',		'153',    '7066', 'Provisions pour pensions et obligations similaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7075,'PCG18-ASSOC','CAPIT',		'155',    '7066', 'Provisions pour impôts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7076,'PCG18-ASSOC','CAPIT',		'157',    '7066', 'Provisions pour charges à répartir sur plusieurs exercices', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7077,'PCG18-ASSOC','CAPIT',		'1572',    '7076', 'Provisions pour gros entretiens ou grandes révisions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7078,'PCG18-ASSOC','CAPIT',		'158',    '7066', 'Autres provisions pour charges', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7079,'PCG18-ASSOC','CAPIT',		'16',    '7001', 'Emprunts et dettes assimilées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7080,'PCG18-ASSOC','CAPIT',		'163',    '7079', 'Emprunts obligataires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7081,'PCG18-ASSOC','CAPIT',		'1631',    '7080', 'Titres associatifs et assimilés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7082,'PCG18-ASSOC','CAPIT',		'164',    '7079', 'Emprunts auprès des établissements de crédit', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7083,'PCG18-ASSOC','CAPIT',		'165',    '7079', 'Dépôts et cautionnements reçus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7084,'PCG18-ASSOC','CAPIT',		'1651',    '7083', 'Dépôts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7085,'PCG18-ASSOC','CAPIT',		'1652',    '7083', 'Cautionnements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7086,'PCG18-ASSOC','CAPIT',		'167',    '7079', 'Emprunts et dettes assortis de condition particulières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7087,'PCG18-ASSOC','CAPIT',		'168',    '7079', 'Autres emprunts et dettes assimilées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7088,'PCG18-ASSOC','CAPIT',		'1681',    '7087', 'Autres emprunts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7089,'PCG18-ASSOC','CAPIT',		'1685',    '7087', 'Rentes viagères capitalisées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7090,'PCG18-ASSOC','CAPIT',		'1687',    '7087', 'Autres dettes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7091,'PCG18-ASSOC','CAPIT',		'1688',    '7087', 'Intérêts courus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7092,'PCG18-ASSOC','CAPIT',		'16883',    '7091', 'Sur titres associatifs et assimilés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7093,'PCG18-ASSOC','CAPIT',		'16884',    '7091', 'Sur emprunts auprès des établissements de crédit', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7094,'PCG18-ASSOC','CAPIT',		'16885',    '7091', 'Sur dépôts et cautionnements reçus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7095,'PCG18-ASSOC','CAPIT',		'16887',    '7091', 'Sur emprunts et dettes assortis de conditions particulières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7096,'PCG18-ASSOC','CAPIT',		'16888',    '7091', 'Sur autres emprunts et dettes assimilées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7097,'PCG18-ASSOC','CAPIT',		'17',    '7001', 'Dettes rattachées à des participations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7098,'PCG18-ASSOC','CAPIT',		'171',    '7097', 'Dettes rattachées à des participations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7099,'PCG18-ASSOC','CAPIT',		'1711',    '7098', 'Principal', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7100,'PCG18-ASSOC','CAPIT',		'1718',    '7098', 'Intérêts courus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7101,'PCG18-ASSOC','CAPIT',		'18',    '7001', 'Comptes de liaison entre établissements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7102,'PCG18-ASSOC','CAPIT',		'181',    '7101', 'Apports permanents entre siège social et établissements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7103,'PCG18-ASSOC','CAPIT',		'185',    '7101', 'Biens et prestations de services échangés entre établissements et siège social', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7104,'PCG18-ASSOC','CAPIT',		'186',    '7101', 'Biens et prestations de services entre établissements (charges)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7105,'PCG18-ASSOC','CAPIT',		'187',    '7101', 'Biens et prestations de services entre établissements (produits)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7106,'PCG18-ASSOC','CAPIT',		'19',    '7001', 'Fonds dédiés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7107,'PCG18-ASSOC','CAPIT',		'191',    '7106', 'Fonds reportés liés aux legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7108,'PCG18-ASSOC','CAPIT',		'1911',    '7107', 'Legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7109,'PCG18-ASSOC','CAPIT',		'1912',    '7107', 'Donations temporaires d''usufruit', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7110,'PCG18-ASSOC','CAPIT',		'193',    '7106', 'Fonds dédiés des fondations abritées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7111,'PCG18-ASSOC','CAPIT',		'194',    '7106', 'Fonds dédiés sur subventions d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7112,'PCG18-ASSOC','CAPIT',		'195',    '7106', 'Fonds dédiés sur contributions financières d''autres organismes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7113,'PCG18-ASSOC','CAPIT',		'196',    '7106', 'Fonds dédiés sur ressources liées à la générosité du public', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7115,'PCG18-ASSOC','IMMO',		'20',    '7002', 'Immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7116,'PCG18-ASSOC','IMMO',		'201',    '7115', 'Frais d''établissement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7117,'PCG18-ASSOC','IMMO',		'2011',    '7116', 'Frais de constitution', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7118,'PCG18-ASSOC','IMMO',		'2012',    '7116', 'Frais de premier établissement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7119,'PCG18-ASSOC','IMMO',		'203',    '7115', 'Frais de recherche et développement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7120,'PCG18-ASSOC','IMMO',		'204',    '7115', 'Donations temporaires d''usufruit', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7121,'PCG18-ASSOC','IMMO',		'205',    '7115', 'Concessions et droits similaires, brevets, licences, marques et procédés, droits et valeurs similaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7122,'PCG18-ASSOC','IMMO',		'206',    '7115', 'Droit au bail', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7123,'PCG18-ASSOC','IMMO',		'208',    '7115', 'Autres immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7124,'PCG18-ASSOC','IMMO',		'21',    '7002', 'Immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7125,'PCG18-ASSOC','IMMO',		'211',    '7124', 'Terrains', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7126,'PCG18-ASSOC','IMMO',		'2111',    '7125', 'Terrains nus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7127,'PCG18-ASSOC','IMMO',		'2112',    '7125', 'Terrains aménagés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7128,'PCG18-ASSOC','IMMO',		'2115',    '7125', 'Terrains bâtis', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7129,'PCG18-ASSOC','IMMO',		'212',    '7124', 'Agencements et aménagements de terrains sur sol propre', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7130,'PCG18-ASSOC','IMMO',		'213',    '7124', 'Constructions sur sol propre', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7131,'PCG18-ASSOC','IMMO',		'2131',    '7130', 'Bâtiments', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7132,'PCG18-ASSOC','IMMO',		'2135',    '7130', 'Installations générales - agencements, aménagements des constructions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7133,'PCG18-ASSOC','IMMO',		'214',    '7124', 'Constructions sur sol d''autrui (même ventilation que le 213)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7134,'PCG18-ASSOC','IMMO',		'215',    '7124', 'Installations techniques - matériel et outillage industriel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7135,'PCG18-ASSOC','IMMO',		'2151',    '7134', 'Installations complexes spécialisées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7136,'PCG18-ASSOC','IMMO',		'2153',    '7134', 'Installations à caractère spécifique', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7137,'PCG18-ASSOC','IMMO',		'2154',    '7134', 'Matériel industriel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7138,'PCG18-ASSOC','IMMO',		'2155',    '7134', 'Outillage industriel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7139,'PCG18-ASSOC','IMMO',		'2157',    '7134', 'Agencements et aménagements des matériels et outillages industriels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7140,'PCG18-ASSOC','IMMO',		'216',    '7124', 'Collections - œuvres d''art', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7141,'PCG18-ASSOC','IMMO',		'218',    '7124', 'Autres immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7142,'PCG18-ASSOC','IMMO',		'2181',    '7141', 'Installations générales, agencements et aménagements divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7143,'PCG18-ASSOC','IMMO',		'2182',    '7141', 'Matériel de transport', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7144,'PCG18-ASSOC','IMMO',		'2183',    '7141', 'Matériel de bureau et informatique', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7145,'PCG18-ASSOC','IMMO',		'2184',    '7141', 'Mobilier', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7146,'PCG18-ASSOC','IMMO',		'2185',    '7141', 'Cheptel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7147,'PCG18-ASSOC','IMMO',		'2186',    '7141', 'Emballages récupérables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7148,'PCG18-ASSOC','IMMO',		'22',    '7002', 'Immobilisations mises en concession', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7149,'PCG18-ASSOC','IMMO',		'23',    '7002', 'Immobilisations en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7150,'PCG18-ASSOC','IMMO',		'231',    '7149', 'Immobilisations corporelles en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7151,'PCG18-ASSOC','IMMO',		'2312',    '7150', 'Terrains', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7152,'PCG18-ASSOC','IMMO',		'2313',    '7150', 'Constructions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7153,'PCG18-ASSOC','IMMO',		'2315',    '7150', 'Installations techniques, matériel et outillage industriels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7154,'PCG18-ASSOC','IMMO',		'2318',    '7150', 'Autres immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7155,'PCG18-ASSOC','IMMO',		'232',    '7149', 'Immobilisations incorporelles en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7156,'PCG18-ASSOC','IMMO',		'237',    '7149', 'Avances et acomptes versés sur commandes d''immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7157,'PCG18-ASSOC','IMMO',		'238',    '7149', 'Avances et acomptes versés sur commandes d''immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7158,'PCG18-ASSOC','IMMO',		'2382',    '7157', 'Terrains', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7159,'PCG18-ASSOC','IMMO',		'2383',    '7157', 'Constructions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7160,'PCG18-ASSOC','IMMO',		'2385',    '7157', 'Installations techniques, matériel et outillage industriels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7161,'PCG18-ASSOC','IMMO',		'2388',    '7157', 'Autres immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7162,'PCG18-ASSOC','IMMO',		'24',    '7002', 'Biens reçus par legs ou donations destinés à être cédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7163,'PCG18-ASSOC','IMMO',		'26',    '7002', 'Participations et créances rattachées à des participations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7164,'PCG18-ASSOC','IMMO',		'261',    '7163', 'Titres de participation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7165,'PCG18-ASSOC','IMMO',		'2611',    '7164', 'Actions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7166,'PCG18-ASSOC','IMMO',		'2618',    '7164', 'Autres titres', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7167,'PCG18-ASSOC','IMMO',		'266',    '7163', 'Autres formes de participation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7168,'PCG18-ASSOC','IMMO',		'267',    '7163', 'Créances rattachées à des participations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7169,'PCG18-ASSOC','IMMO',		'2671',    '7168', 'Principal', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7170,'PCG18-ASSOC','IMMO',		'2678',    '7168', 'Intérêts courus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7171,'PCG18-ASSOC','IMMO',		'269',    '7163', 'Versements restant à effectuer sur titres de participation non libérés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7172,'PCG18-ASSOC','IMMO',		'27',    '7002', 'Autres immobilisations financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7173,'PCG18-ASSOC','IMMO',		'271',    '7172', 'Titres immobilisés (droit de propriété)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7174,'PCG18-ASSOC','IMMO',		'2711',    '7173', 'Actions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7175,'PCG18-ASSOC','IMMO',		'2718',    '7173', 'Autres titres immobilisés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7176,'PCG18-ASSOC','IMMO',		'272',    '7172', 'Titres immobilisés (droit de créance)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7177,'PCG18-ASSOC','IMMO',		'2721',    '7176', 'Obligations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7178,'PCG18-ASSOC','IMMO',		'2722',    '7176', 'Bons', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7179,'PCG18-ASSOC','IMMO',		'2728',    '7176', 'Autres titres immobilisés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7180,'PCG18-ASSOC','IMMO',		'274',    '7172', 'Prêts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7181,'PCG18-ASSOC','IMMO',		'2742',    '7180', 'Prêts aux partenaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7182,'PCG18-ASSOC','IMMO',		'2743',    '7180', 'Prêts au personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7183,'PCG18-ASSOC','IMMO',		'2748',    '7180', 'Autres prêts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7184,'PCG18-ASSOC','IMMO',		'275',    '7172', 'Dépôts et cautionnements versés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7185,'PCG18-ASSOC','IMMO',		'2751',    '7184', 'Dépôts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7186,'PCG18-ASSOC','IMMO',		'2755',    '7184', 'Cautionnements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7187,'PCG18-ASSOC','IMMO',		'276',    '7172', 'Autres créances immobilisées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7188,'PCG18-ASSOC','IMMO',		'2761',    '7187', 'Autres créances', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7189,'PCG18-ASSOC','IMMO',		'2768',    '7187', 'Intérêts courus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7190,'PCG18-ASSOC','IMMO',		'27682',    '7189', 'Sur titres immobilisés (droit de créance)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7191,'PCG18-ASSOC','IMMO',		'27684',    '7189', 'Sur prêts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7192,'PCG18-ASSOC','IMMO',		'27685',    '7189', 'Sur dépôts et cautionnements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7193,'PCG18-ASSOC','IMMO',		'27688',    '7189', 'Sur autres créances', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7194,'PCG18-ASSOC','IMMO',		'279',    '7172', 'Versements restant à effectuer sur titres immobilisés non libérés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7195,'PCG18-ASSOC','IMMO',		'28',    '7002', 'Amortissements des immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7196,'PCG18-ASSOC','IMMO',		'280',    '7195', 'Amortissements des immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7197,'PCG18-ASSOC','IMMO',		'2804',    '7196', 'Donations temporaires d''usufruit', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7198,'PCG18-ASSOC','IMMO',		'281',    '7195', 'Amortissements des immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7199,'PCG18-ASSOC','IMMO',		'2812',    '7198', 'Agencements et aménagements de terrains sur sol propre', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7200,'PCG18-ASSOC','IMMO',		'2813',    '7198', 'Constructions sur sol propre', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7201,'PCG18-ASSOC','IMMO',		'2814',    '7198', 'Constructions sur sol d''autrui', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7202,'PCG18-ASSOC','IMMO',		'2815',    '7198', 'Installations techniques, matériel et outillage industriels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7203,'PCG18-ASSOC','IMMO',		'2818',    '7198', 'Autres immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7204,'PCG18-ASSOC','IMMO',		'29',    '7002', 'Provisions pour dépréciation des immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7205,'PCG18-ASSOC','IMMO',		'290',    '7204', 'Provisions pour dépréciation des immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7206,'PCG18-ASSOC','IMMO',		'2905',    '7205', 'Concessions et droits similaires, brevets, licences, marques et procédés, droits et valeurs similaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7207,'PCG18-ASSOC','IMMO',		'2906',    '7205', 'Droit au bail', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7208,'PCG18-ASSOC','IMMO',		'2908',    '7205', 'Autres immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7209,'PCG18-ASSOC','IMMO',		'291',    '7204', 'Provisions pour dépréciation des immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7210,'PCG18-ASSOC','IMMO',		'2911',    '7209', 'Terrains', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7211,'PCG18-ASSOC','IMMO',		'293',    '7204', 'Provisions pour dépréciation des immobilisations en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7212,'PCG18-ASSOC','IMMO',		'294',    '7204', 'Dépréciations des biens reçus par legs ou donations destinés à être cédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7213,'PCG18-ASSOC','IMMO',		'296',    '7204', 'Provisions pour dépréciation des participations et Créances rattachées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7214,'PCG18-ASSOC','IMMO',		'2961',    '7213', 'Titres de participation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7215,'PCG18-ASSOC','IMMO',		'2966',    '7213', 'Autres formes de participation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7216,'PCG18-ASSOC','IMMO',		'2967',    '7213', 'Créances rattachées à des participations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7217,'PCG18-ASSOC','IMMO',		'297',    '7204', 'Provisions pour dépréciation des autres immobilisations financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7218,'PCG18-ASSOC','IMMO',		'2971',    '7217', 'Titres immobilisés (droit de propriété)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7219,'PCG18-ASSOC','IMMO',		'2972',    '7217', 'Titres immobilisés (droit de créance)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7220,'PCG18-ASSOC','IMMO',		'2974',    '7217', 'Prêts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7221,'PCG18-ASSOC','IMMO',		'2975',    '7217', 'Dépôts et cautionnements versés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7222,'PCG18-ASSOC','IMMO',		'2976',    '7217', 'Autres créances immobilisées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7224,'PCG18-ASSOC','STOCK',		'31',    '7003', 'Matières premières et fournitures', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7225,'PCG18-ASSOC','STOCK',		'311',    '7224', 'Matières premières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7226,'PCG18-ASSOC','STOCK',		'317',    '7224', 'Fournitures', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7227,'PCG18-ASSOC','STOCK',		'32',    '7003', 'Autres approvisionnements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7228,'PCG18-ASSOC','STOCK',		'321',    '7227', 'Matières consommables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7229,'PCG18-ASSOC','STOCK',		'322',    '7227', 'Fournitures consommables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7230,'PCG18-ASSOC','STOCK',		'3221',    '7229', 'Combustibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7231,'PCG18-ASSOC','STOCK',		'3222',    '7229', 'Produits d''entretien', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7232,'PCG18-ASSOC','STOCK',		'3223',    '7229', 'Fournitures d''atelier', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7233,'PCG18-ASSOC','STOCK',		'3224',    '7229', 'Fournitures de magasin', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7234,'PCG18-ASSOC','STOCK',		'3225',    '7229', 'Fournitures de bureau', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7235,'PCG18-ASSOC','STOCK',		'3226',    '7229', 'Carburants', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7236,'PCG18-ASSOC','STOCK',		'3227',    '7229', 'Autres fournitures de matériel de transport', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7237,'PCG18-ASSOC','STOCK',		'3228',    '7229', 'Petit outillage', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7238,'PCG18-ASSOC','STOCK',		'326',    '7227', 'Emballages (propriété de l''entité)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7239,'PCG18-ASSOC','STOCK',		'3261',    '7238', 'Emballages perdus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7240,'PCG18-ASSOC','STOCK',		'3265',    '7238', 'Emballages récupérables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7241,'PCG18-ASSOC','STOCK',		'3267',    '7238', 'Emballages mixtes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7242,'PCG18-ASSOC','STOCK',		'33',    '7003', 'En-cours de production de biens', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7243,'PCG18-ASSOC','STOCK',		'331',    '7242', 'Produits en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7244,'PCG18-ASSOC','STOCK',		'335',    '7242', 'Travaux en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7245,'PCG18-ASSOC','STOCK',		'34',    '7003', 'En-cours de production de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7246,'PCG18-ASSOC','STOCK',		'341',    '7245', 'Etudes en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7247,'PCG18-ASSOC','STOCK',		'345',    '7245', 'Prestations de services en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7248,'PCG18-ASSOC','STOCK',		'35',    '7003', 'Stocks de produits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7249,'PCG18-ASSOC','STOCK',		'351',    '7248', 'Produits intermédiaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7250,'PCG18-ASSOC','STOCK',		'355',    '7248', 'Produits finis', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7251,'PCG18-ASSOC','STOCK',		'358',    '7248', 'Produits résiduels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7252,'PCG18-ASSOC','STOCK',		'37',    '7003', 'Stocks de marchandises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7253,'PCG18-ASSOC','STOCK',		'39',    '7003', 'Provisions pour dépréciation des stocks', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7254,'PCG18-ASSOC','STOCK',		'391',    '7253', 'Dépréciation des matières premières et fournitures', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7255,'PCG18-ASSOC','STOCK',		'3911',    '7254', 'Matières premières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7256,'PCG18-ASSOC','STOCK',		'3917',    '7254', 'Fournitures', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7257,'PCG18-ASSOC','STOCK',		'392',    '7253', 'Dépréciation des autres approvisionnements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7258,'PCG18-ASSOC','STOCK',		'3921',    '7257', 'Matières consommables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7259,'PCG18-ASSOC','STOCK',		'3922',    '7257', 'Fournitures consommables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7260,'PCG18-ASSOC','STOCK',		'3926',    '7257', 'Emballages', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7261,'PCG18-ASSOC','STOCK',		'393',    '7253', 'Dépréciation des en-cours de production de biens', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7262,'PCG18-ASSOC','STOCK',		'3931',    '7261', 'Produits en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7263,'PCG18-ASSOC','STOCK',		'3935',    '7261', 'Travaux en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7264,'PCG18-ASSOC','STOCK',		'394',    '7253', 'Dépréciation des en-cours de production de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7265,'PCG18-ASSOC','STOCK',		'3941',    '7264', 'Etudes en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7266,'PCG18-ASSOC','STOCK',		'3945',    '7264', 'Prestations de services en cours', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7267,'PCG18-ASSOC','STOCK',		'395',    '7253', 'Dépréciation des stocks de produits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7268,'PCG18-ASSOC','STOCK',		'3951',    '7267', 'Produits intermédiaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7269,'PCG18-ASSOC','STOCK',		'3955',    '7267', 'Produits finis', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7270,'PCG18-ASSOC','STOCK',		'397',    '7253', 'Dépréciation des marchandises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7272,'PCG18-ASSOC','THIRDPARTY',		'40',    '7004', 'Fournisseurs et comptes rattachés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7273,'PCG18-ASSOC','THIRDPARTY',		'401',    '7272', 'Fournisseurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7274,'PCG18-ASSOC','THIRDPARTY',		'4011',    '7273', 'Fournisseurs - achats de biens ou de prestations de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7275,'PCG18-ASSOC','THIRDPARTY',		'4017',    '7273', 'Fournisseurs - retenues de garanties et oppositions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7276,'PCG18-ASSOC','THIRDPARTY',		'403',    '7272', 'Fournisseurs - effets à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7277,'PCG18-ASSOC','THIRDPARTY',		'404',    '7272', 'Fournisseurs d''immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7278,'PCG18-ASSOC','THIRDPARTY',		'4041',    '7277', 'Fournisseurs - achats d''immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7279,'PCG18-ASSOC','THIRDPARTY',		'4047',    '7277', 'Fournisseurs d''immobilisations - retenues de garantie et oppositions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7280,'PCG18-ASSOC','THIRDPARTY',		'405',    '7272', 'Fournisseurs d''immobilisations - effets à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7281,'PCG18-ASSOC','THIRDPARTY',		'408',    '7272', 'Fournisseurs - factures non parvenues', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7282,'PCG18-ASSOC','THIRDPARTY',		'4081',    '7281', 'Fournisseurs d''autres biens et services - factures non parvenues', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7283,'PCG18-ASSOC','THIRDPARTY',		'4084',    '7281', 'Fournisseurs d''immobilisations - factures non parvenues', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7284,'PCG18-ASSOC','THIRDPARTY',		'409',    '7272', 'Fournisseurs débiteurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7285,'PCG18-ASSOC','THIRDPARTY',		'4091',    '7284', 'Fournisseurs, avances versées sur commandes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7286,'PCG18-ASSOC','THIRDPARTY',		'4096',    '7284', 'Fournisseurs, créances pour emballages et matériel à rendre', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7287,'PCG18-ASSOC','THIRDPARTY',		'4098',    '7284', 'Rabais, remises et ristournes à obtenir et autres avoirs non encore reçus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7288,'PCG18-ASSOC','THIRDPARTY',		'41',    '7004', 'Clients, usagers et comptes rattachés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7289,'PCG18-ASSOC','THIRDPARTY',		'411',    '7288', 'Clients, usagers (et organismes de prise en charge)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7290,'PCG18-ASSOC','THIRDPARTY',		'413',    '7288', 'Clients, usagers, effets à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7291,'PCG18-ASSOC','THIRDPARTY',		'416',    '7288', 'Clients, usagers, créances douteuses ou litigieuses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7292,'PCG18-ASSOC','THIRDPARTY',		'418',    '7288', 'Clients, usagers, produits non encore facturés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7293,'PCG18-ASSOC','THIRDPARTY',		'4181',    '7292', 'Clients, usagers - factures à établir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7294,'PCG18-ASSOC','THIRDPARTY',		'4188',    '7292', 'Clients, usagers - intérêts courus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7295,'PCG18-ASSOC','THIRDPARTY',		'419',    '7288', 'Clients, usagers - clients, créditeurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7296,'PCG18-ASSOC','THIRDPARTY',		'4191',    '7295', 'Clients, usagers - avances et acomptes reçus sur commande', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7297,'PCG18-ASSOC','THIRDPARTY',		'4196',    '7295', 'Clients, usagers - dettes pour emballages et matériels consignés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7298,'PCG18-ASSOC','THIRDPARTY',		'4198',    '7295', 'Rabais, remises et ristournes à accorder et autres avoirs à établir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7299,'PCG18-ASSOC','THIRDPARTY',		'42',    '7004', 'Personnel et comptes rattachés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7300,'PCG18-ASSOC','THIRDPARTY',		'421',    '7299', 'Personnel - rémunérations dues', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7301,'PCG18-ASSOC','THIRDPARTY',		'422',    '7299', 'Comité d''entreprise, d''établissement, d''hygiène et de sécurité, œuvres sociales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7302,'PCG18-ASSOC','THIRDPARTY',		'424',    '7299', 'Participation des salariés aux résultats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7303,'PCG18-ASSOC','THIRDPARTY',		'425',    '7299', 'Personnel - avances et acomptes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7304,'PCG18-ASSOC','THIRDPARTY',		'426',    '7299', 'Personnel - dépôts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7305,'PCG18-ASSOC','THIRDPARTY',		'427',    '7299', 'Personnel - oppositions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7306,'PCG18-ASSOC','THIRDPARTY',		'428',    '7299', 'Personnel - charges à payer et produits à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7307,'PCG18-ASSOC','THIRDPARTY',		'4282',    '7306', 'Dettes provisionnées pour congés à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7308,'PCG18-ASSOC','THIRDPARTY',		'4284',    '7306', 'Dettes provisionnées pour participation des salariés aux résultats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7309,'PCG18-ASSOC','THIRDPARTY',		'4286',    '7306', 'Personnel - autres charges à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7310,'PCG18-ASSOC','THIRDPARTY',		'4287',    '7306', 'Personnel - produits à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7311,'PCG18-ASSOC','THIRDPARTY',		'43',    '7004', 'Sécurité Sociale et autres organismes sociaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7312,'PCG18-ASSOC','THIRDPARTY',		'431',    '7311', 'Sécurité Sociale', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7313,'PCG18-ASSOC','THIRDPARTY',		'437',    '7311', 'Autres organismes sociaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7314,'PCG18-ASSOC','THIRDPARTY',		'4372',    '7313', 'Mutuelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7315,'PCG18-ASSOC','THIRDPARTY',		'4373',    '7313', 'Caisses de retraite et de prévoyance', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7316,'PCG18-ASSOC','THIRDPARTY',		'4374',    '7313', 'Caisses d''allocations de chômage', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7317,'PCG18-ASSOC','THIRDPARTY',		'4378',    '7313', 'Autres organismes sociaux divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7318,'PCG18-ASSOC','THIRDPARTY',		'438',    '7311', 'Organismes sociaux - charges à payer et produits à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7319,'PCG18-ASSOC','THIRDPARTY',		'4382',    '7318', 'Charges sociales sur congés à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7320,'PCG18-ASSOC','THIRDPARTY',		'4386',    '7318', 'Organismes sociaux - charges à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7321,'PCG18-ASSOC','THIRDPARTY',		'4387',    '7318', 'Organismes sociaux - produits à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7322,'PCG18-ASSOC','THIRDPARTY',		'44',    '7004', 'Etat et autres collectivités publiques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7323,'PCG18-ASSOC','THIRDPARTY',		'441',    '7322', 'Etat, établissements publics et collectivités publiques - Subventions à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7324,'PCG18-ASSOC','THIRDPARTY',		'4411',    '7323', 'Subventions d''investissement à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7325,'PCG18-ASSOC','THIRDPARTY',		'4417',    '7323', 'Subventions d''exploitation à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7326,'PCG18-ASSOC','THIRDPARTY',		'4418',    '7323', 'Subventions d''équilibre à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7327,'PCG18-ASSOC','THIRDPARTY',		'4419',    '7323', 'Avances sur subventions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7328,'PCG18-ASSOC','THIRDPARTY',		'442',    '7322', 'Contributions, impôts et taxes recouvrés pour le compte de l''Etat', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7329,'PCG18-ASSOC','THIRDPARTY',		'4421',    '7328', 'Prélèvements à la source (Impôt sur le revenu)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7330,'PCG18-ASSOC','THIRDPARTY',		'4422',    '7328', 'Prélèvements forfaitaires non libératoires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7331,'PCG18-ASSOC','THIRDPARTY',		'443',    '7322', 'Opérations particulières avec l''Etat, les collectivités  publiques, les organismes internationaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7332,'PCG18-ASSOC','THIRDPARTY',		'444',    '7322', 'Etat - impôts sur les bénéfices', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7333,'PCG18-ASSOC','THIRDPARTY',		'445',    '7322', 'Etat - taxes sur le chiffre d''affaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7334,'PCG18-ASSOC','THIRDPARTY',		'4452',    '7333', 'TVA due intracommunautaire', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7335,'PCG18-ASSOC','THIRDPARTY',		'4455',    '7333', 'Taxes sur le chiffre d''affaires à décaisser', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7336,'PCG18-ASSOC','THIRDPARTY',		'44551',    '7335', 'TVA à décaisser', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7337,'PCG18-ASSOC','THIRDPARTY',		'4456',    '7333', 'Taxes sur le chiffre d''affaires déductibles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7338,'PCG18-ASSOC','THIRDPARTY',		'44562',    '7337', 'TVA sur immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7339,'PCG18-ASSOC','THIRDPARTY',		'44566',    '7337', 'TVA sur biens et services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7340,'PCG18-ASSOC','THIRDPARTY',		'44567',    '7337', 'Crédit de TVA à reporter', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7341,'PCG18-ASSOC','THIRDPARTY',		'4457',    '7333', 'Taxes sur le chiffre d''affaires collectées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7342,'PCG18-ASSOC','THIRDPARTY',		'44571',    '7341', 'TVA collectée', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7343,'PCG18-ASSOC','THIRDPARTY',		'4458',    '7333', 'Taxes sur le chiffre d''affaires à régulariser', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7344,'PCG18-ASSOC','THIRDPARTY',		'44583',    '7343', 'Remboursement de taxe sur le chiffre d''affaires demandé', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7345,'PCG18-ASSOC','THIRDPARTY',		'44584',    '7343', 'TVA récupérée d''avance', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7346,'PCG18-ASSOC','THIRDPARTY',		'447',    '7322', 'Autres impôts, taxes et versements assimilés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7347,'PCG18-ASSOC','THIRDPARTY',		'4471',    '7346', 'Taxe sur les salaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7348,'PCG18-ASSOC','THIRDPARTY',		'4472',    '7346', 'CFE, CVAE', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7349,'PCG18-ASSOC','THIRDPARTY',		'4478',    '7346', 'Autres impôts et taxes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7350,'PCG18-ASSOC','THIRDPARTY',		'448',    '7322', 'Etat, charges à payer et produits à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7351,'PCG18-ASSOC','THIRDPARTY',		'4482',    '7350', 'Charges fiscales sur congés à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7352,'PCG18-ASSOC','THIRDPARTY',		'4486',    '7350', 'Etat - charges à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7353,'PCG18-ASSOC','THIRDPARTY',		'4487',    '7350', 'Etat - produits à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7354,'PCG18-ASSOC','THIRDPARTY',		'45',    '7004', 'Confédération, fédération, union, entités affiliées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7355,'PCG18-ASSOC','THIRDPARTY',		'451',    '7354', 'Confédération, fédération, union et entités affiliées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7356,'PCG18-ASSOC','THIRDPARTY',		'455',    '7354', 'Partenaires - comptes courants', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7357,'PCG18-ASSOC','THIRDPARTY',		'46',    '7004', 'Débiteurs et créditeurs divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7358,'PCG18-ASSOC','THIRDPARTY',		'461',    '7357', 'Créances reçues par legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7359,'PCG18-ASSOC','THIRDPARTY',		'462',    '7357', 'Créances sur cessions d''immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7360,'PCG18-ASSOC','THIRDPARTY',		'463',    '7357', 'Fonds en dépôts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7361,'PCG18-ASSOC','THIRDPARTY',		'4632',    '7360', 'Fonds reçus ou déposés - usagers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7362,'PCG18-ASSOC','THIRDPARTY',		'4633',    '7360', 'Autres fonds en dépôt', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7363,'PCG18-ASSOC','THIRDPARTY',		'464',    '7357', 'Dettes sur acquisitions de valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7364,'PCG18-ASSOC','THIRDPARTY',		'465',    '7357', 'Créances sur acquisitions de valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7365,'PCG18-ASSOC','THIRDPARTY',		'466',    '7357', 'Dettes des legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7366,'PCG18-ASSOC','THIRDPARTY',		'467',    '7357', 'Autres comptes débiteurs ou créditeurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7367,'PCG18-ASSOC','THIRDPARTY',		'4671',    '7366', 'Créditeurs divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7368,'PCG18-ASSOC','THIRDPARTY',		'4672',    '7366', 'Débiteurs divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7369,'PCG18-ASSOC','THIRDPARTY',		'468',    '7357', 'Divers, charges à payer - produits à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7370,'PCG18-ASSOC','THIRDPARTY',		'4681',    '7369', 'Frais des bénévoles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7371,'PCG18-ASSOC','THIRDPARTY',		'4686',    '7369', 'Autres charges à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7372,'PCG18-ASSOC','THIRDPARTY',		'4687',    '7369', 'Autres produits à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7373,'PCG18-ASSOC','THIRDPARTY',		'47',    '7004', 'Comptes transitoires ou d''attente', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7374,'PCG18-ASSOC','THIRDPARTY',		'471',    '7373', 'Comptes d''attente (jusqu''à 474)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7375,'PCG18-ASSOC','THIRDPARTY',		'476',    '7373', 'Différences de conversion - actif', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7376,'PCG18-ASSOC','THIRDPARTY',		'477',    '7373', 'Différences de conversion - passif', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7377,'PCG18-ASSOC','THIRDPARTY',		'478',    '7373', 'Autres comptes transitoires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7378,'PCG18-ASSOC','THIRDPARTY',		'48',    '7004', 'Comptes de régularisation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7379,'PCG18-ASSOC','THIRDPARTY',		'481',    '7378', 'Charges à répartir sur plusieurs exercices', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7380,'PCG18-ASSOC','THIRDPARTY',		'4816',    '7379', 'Frais d''émission d''emprunts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7381,'PCG18-ASSOC','THIRDPARTY',		'486',    '7378', 'Charges constatées d''avance', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7382,'PCG18-ASSOC','THIRDPARTY',		'487',    '7378', 'Produits constatés d''avance', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7383,'PCG18-ASSOC','THIRDPARTY',		'49',    '7004', 'Provisions pour dépréciation des comptes de tiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7384,'PCG18-ASSOC','THIRDPARTY',		'491',    '7383', 'Dépréciation des comptes de clients et d''usagers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7385,'PCG18-ASSOC','THIRDPARTY',		'495',    '7383', 'Dépréciation des comptes de confédérations, fédérations, unions, entités affiliées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7386,'PCG18-ASSOC','THIRDPARTY',		'496',    '7383', 'Dépréciation des comptes de débiteurs divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7388,'PCG18-ASSOC','FINAN',		'50',    '7005', 'Valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7389,'PCG18-ASSOC','FINAN',		'503',    '7388', 'Actions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7390,'PCG18-ASSOC','FINAN',		'5031',    '7389', 'Titres cotés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7391,'PCG18-ASSOC','FINAN',		'5035',    '7389', 'Titres non cotés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7392,'PCG18-ASSOC','FINAN',		'504',    '7388', 'Autres titres conférant un droit de propriété', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7393,'PCG18-ASSOC','FINAN',		'506',    '7388', 'Obligations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7394,'PCG18-ASSOC','FINAN',		'5061',    '7393', 'Titres cotés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7395,'PCG18-ASSOC','FINAN',		'5065',    '7393', 'Titres non cotés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7396,'PCG18-ASSOC','FINAN',		'507',    '7388', 'Bons du Trésor et bons de caisse à court terme', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7397,'PCG18-ASSOC','FINAN',		'508',    '7388', 'Autres valeurs mobilières et créances assimilées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7398,'PCG18-ASSOC','FINAN',		'5081',    '7397', 'Autres valeurs mobilières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7399,'PCG18-ASSOC','FINAN',		'5082',    '7397', 'Bons de souscription', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7400,'PCG18-ASSOC','FINAN',		'5088',    '7397', 'Intérêts courus sur obligations, bons et valeurs assimilées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7401,'PCG18-ASSOC','FINAN',		'509',    '7388', 'Versements restant à effectuer sur VMP non libérées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7402,'PCG18-ASSOC','FINAN',		'51',    '7005', 'Banques et établissements financiers assimilés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7403,'PCG18-ASSOC','FINAN',		'511',    '7402', 'Valeurs à l''encaissement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7404,'PCG18-ASSOC','FINAN',		'5111',    '7403', 'Coupons échus à l''encaissement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7405,'PCG18-ASSOC','FINAN',		'5112',    '7403', 'Chèques à encaisser', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7406,'PCG18-ASSOC','FINAN',		'5113',    '7403', 'Effets à l''encaissement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7407,'PCG18-ASSOC','FINAN',		'5114',    '7403', 'Effets à l''escompte', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7408,'PCG18-ASSOC','FINAN',		'512',    '7402', 'Banques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7409,'PCG18-ASSOC','FINAN',		'5121',    '7408', 'Comptes en monnaie nationale', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7410,'PCG18-ASSOC','FINAN',		'5124',    '7408', 'Comptes en devises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7411,'PCG18-ASSOC','FINAN',		'514',    '7402', 'Chèques postaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7412,'PCG18-ASSOC','FINAN',		'515',    '7402', '"Caisse" du Trésor et des établissements publics', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7413,'PCG18-ASSOC','FINAN',		'516',    '7402', 'Sociétés de bourse', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7414,'PCG18-ASSOC','FINAN',		'517',    '7402', 'Autres organismes financiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7415,'PCG18-ASSOC','FINAN',		'518',    '7402', 'Intérêts courus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7416,'PCG18-ASSOC','FINAN',		'5186',    '7415', 'Intérêts courus à payer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7417,'PCG18-ASSOC','FINAN',		'5187',    '7415', 'Intérêts courus à recevoir', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7418,'PCG18-ASSOC','FINAN',		'519',    '7402', 'Concours bancaires courants (même ventilation que les 51)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7419,'PCG18-ASSOC','FINAN',		'52',    '7005', 'Instruments de trésorerie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7420,'PCG18-ASSOC','FINAN',		'53',    '7005', 'Caisse', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7421,'PCG18-ASSOC','FINAN',		'531',    '7420', 'Caisses du siège', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7422,'PCG18-ASSOC','FINAN',		'532',    '7420', 'Caisses des établissements (jusqu''à 537)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7423,'PCG18-ASSOC','FINAN',		'54',    '7005', 'Régies d''avance et accréditifs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7424,'PCG18-ASSOC','FINAN',		'541',    '7423', 'Régie d''avance', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7425,'PCG18-ASSOC','FINAN',		'542',    '7423', 'Accréditifs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7426,'PCG18-ASSOC','FINAN',		'58',    '7005', 'Virements internes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7427,'PCG18-ASSOC','FINAN',		'581',    '7426', 'Virements de fonds', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7428,'PCG18-ASSOC','FINAN',		'59',    '7005', 'Provisions pour dépréciation des comptes financiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7429,'PCG18-ASSOC','FINAN',		'590',    '7428', 'Provisions pour dépréciation des valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7430,'PCG18-ASSOC','FINAN',		'5903',    '7429', 'Actions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7431,'PCG18-ASSOC','FINAN',		'5904',    '7429', 'Autres titres conférant un droit de propriété', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7432,'PCG18-ASSOC','FINAN',		'5906',    '7429', 'Obligations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7433,'PCG18-ASSOC','FINAN',		'5908',    '7429', 'Autres valeurs mobilières de placement et créances assimilées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7435,'PCG18-ASSOC','EXPENSE',		'60',    '7006', 'Achats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7436,'PCG18-ASSOC','EXPENSE',		'601',    '7435', 'Achats stockés - matières premières et fournitures', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7437,'PCG18-ASSOC','EXPENSE',		'602',    '7435', 'Achats stockés - autres approvisionnements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7438,'PCG18-ASSOC','EXPENSE',		'6021',    '7437', 'Produits pharmaceutiques et produits à usage médical', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7439,'PCG18-ASSOC','EXPENSE',		'6022',    '7437', 'Fournitures consommables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7440,'PCG18-ASSOC','EXPENSE',		'6023',    '7437', 'Alimentation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7441,'PCG18-ASSOC','EXPENSE',		'6026',    '7437', 'Emballages', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7442,'PCG18-ASSOC','EXPENSE',		'6028',    '7437', 'Autres fournitures suivies en stock', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7443,'PCG18-ASSOC','EXPENSE',		'603',    '7435', 'Variations des stocks', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7444,'PCG18-ASSOC','EXPENSE',		'6031',    '7443', 'Variations des stocks de matières premières et fournitures', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7445,'PCG18-ASSOC','EXPENSE',		'6032',    '7443', 'Variations des stocks des autres approvisionnements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7446,'PCG18-ASSOC','EXPENSE',		'6037',    '7443', 'Variation des stocks de marchandises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7447,'PCG18-ASSOC','EXPENSE',		'604',    '7435', 'Achats d''études et de prestations de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7448,'PCG18-ASSOC','EXPENSE',		'605',    '7435', 'Achats de matériels, d''équipements et de travaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7449,'PCG18-ASSOC','EXPENSE',		'606',    '7435', 'Achats non stockés de matières et fournitures', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7450,'PCG18-ASSOC','EXPENSE',		'6061',    '7449', 'Fournitures non stockables (eau, énergie ….)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7451,'PCG18-ASSOC','EXPENSE',		'6063',    '7449', 'Fournitures d''entretien et de petit équipement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7452,'PCG18-ASSOC','EXPENSE',		'6064',    '7449', 'Fournitures administratives', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7453,'PCG18-ASSOC','EXPENSE',		'6068',    '7449', 'Autres matières et fournitures', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7454,'PCG18-ASSOC','EXPENSE',		'607',    '7435', 'Achats de marchandises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7455,'PCG18-ASSOC','EXPENSE',		'608',    '7435', 'Frais accessoires d''achats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7456,'PCG18-ASSOC','EXPENSE',		'609',    '7435', 'Rabais, remises et ristournes obtenus sur achats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7457,'PCG18-ASSOC','EXPENSE',		'61',    '7006', 'Services extérieurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7458,'PCG18-ASSOC','EXPENSE',		'611',    '7457', 'Sous-traitance générale', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7459,'PCG18-ASSOC','EXPENSE',		'612',    '7457', 'Redevances de crédit bail', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7460,'PCG18-ASSOC','EXPENSE',		'6122',    '7459', 'Crédit bail mobilier', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7461,'PCG18-ASSOC','EXPENSE',		'6125',    '7459', 'Crédit bail immobilier', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7462,'PCG18-ASSOC','EXPENSE',		'613',    '7457', 'Locations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7463,'PCG18-ASSOC','EXPENSE',		'6132',    '7462', 'Locations immobilières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7464,'PCG18-ASSOC','EXPENSE',		'6135',    '7462', 'Locations mobilières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7465,'PCG18-ASSOC','EXPENSE',		'614',    '7457', 'Charges locatives et de copropriété', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7466,'PCG18-ASSOC','EXPENSE',		'615',    '7457', 'Entretien et réparations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7467,'PCG18-ASSOC','EXPENSE',		'6152',    '7466', 'Entretien et réparations sur biens immobiliers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7468,'PCG18-ASSOC','EXPENSE',		'6155',    '7466', 'Entretien et réparations sur biens mobiliers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7469,'PCG18-ASSOC','EXPENSE',		'6156',    '7466', 'Maintenance', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7470,'PCG18-ASSOC','EXPENSE',		'616',    '7457', 'Primes d''assurances', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7471,'PCG18-ASSOC','EXPENSE',		'6161',    '7470', 'Multirisques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7472,'PCG18-ASSOC','EXPENSE',		'6162',    '7470', 'Assurance obligatoire dommage construction', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7473,'PCG18-ASSOC','EXPENSE',		'6163',    '7470', 'Assurance transport', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7474,'PCG18-ASSOC','EXPENSE',		'6164',    '7470', 'Risques d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7475,'PCG18-ASSOC','EXPENSE',		'6165',    '7470', 'Insolvabilité clients', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7476,'PCG18-ASSOC','EXPENSE',		'617',    '7457', 'Etudes et recherches', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7477,'PCG18-ASSOC','EXPENSE',		'618',    '7457', 'Divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7478,'PCG18-ASSOC','EXPENSE',		'6181',    '7477', 'Documentation générale', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7479,'PCG18-ASSOC','EXPENSE',		'6183',    '7477', 'Documentation technique', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7480,'PCG18-ASSOC','EXPENSE',		'6185',    '7477', 'Frais de colloques, séminaires, conférences', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7481,'PCG18-ASSOC','EXPENSE',		'619',    '7457', 'Rabais, remises et ristournes obtenus sur services extérieurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7482,'PCG18-ASSOC','EXPENSE',		'62',    '7006', 'Autres services extérieurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7483,'PCG18-ASSOC','EXPENSE',		'621',    '7482', 'Personnel extérieur à l''association', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7484,'PCG18-ASSOC','EXPENSE',		'6211',    '7483', 'Personnel intérimaire', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7485,'PCG18-ASSOC','EXPENSE',		'6214',    '7483', 'Personnel détaché ou prêté à l''association', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7486,'PCG18-ASSOC','EXPENSE',		'622',    '7482', 'Rémunérations d''intermédiaires et honoraires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7487,'PCG18-ASSOC','EXPENSE',		'6221',    '7486', 'Commissions et courtages sur achats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7488,'PCG18-ASSOC','EXPENSE',		'6222',    '7486', 'Commissions et courtages sur ventes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7489,'PCG18-ASSOC','EXPENSE',		'6224',    '7486', 'rémunérations des transitaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7490,'PCG18-ASSOC','EXPENSE',		'6225',    '7486', 'rémunérations d''affacturage', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7491,'PCG18-ASSOC','EXPENSE',		'6226',    '7486', 'Honoraires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7492,'PCG18-ASSOC','EXPENSE',		'62264',    '7491', 'Honoraires sur legs ou donations destinés à être cédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7493,'PCG18-ASSOC','EXPENSE',		'6227',    '7486', 'Frais d''actes et de contentieux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7494,'PCG18-ASSOC','EXPENSE',		'6228',    '7486', 'Divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7495,'PCG18-ASSOC','EXPENSE',		'623',    '7482', 'Information, publications, relations publiques', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7496,'PCG18-ASSOC','EXPENSE',		'6231',    '7495', 'Annonces et insertions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7497,'PCG18-ASSOC','EXPENSE',		'6232',    '7495', 'Echantillons', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7498,'PCG18-ASSOC','EXPENSE',		'6233',    '7495', 'Foires et expositions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7499,'PCG18-ASSOC','EXPENSE',		'6234',    '7495', 'Cadeaux à la clientèle', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7500,'PCG18-ASSOC','EXPENSE',		'6235',    '7495', 'Primes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7501,'PCG18-ASSOC','EXPENSE',		'6236',    '7495', 'Catalogues et imprimés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7502,'PCG18-ASSOC','EXPENSE',		'6237',    '7495', 'Publications', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7503,'PCG18-ASSOC','EXPENSE',		'6238',    '7495', 'Divers ( pourboires, dons courants, …)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7504,'PCG18-ASSOC','EXPENSE',		'624',    '7482', 'Transports de biens, d''usagers et transports collectifs du personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7505,'PCG18-ASSOC','EXPENSE',		'6241',    '7504', 'Transport aux achats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7506,'PCG18-ASSOC','EXPENSE',		'6242',    '7504', 'Transport aux ventes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7507,'PCG18-ASSOC','EXPENSE',		'6243',    '7504', 'Transport entre établissements ou chantiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7508,'PCG18-ASSOC','EXPENSE',		'6244',    '7504', 'Transport administratifs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7509,'PCG18-ASSOC','EXPENSE',		'6247',    '7504', 'Transport collectif du personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7510,'PCG18-ASSOC','EXPENSE',		'625',    '7482', 'Déplacements, missions et réceptions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7511,'PCG18-ASSOC','EXPENSE',		'6251',    '7510', 'Voyages et déplacements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7512,'PCG18-ASSOC','EXPENSE',		'6255',    '7510', 'Frais de déménagement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7513,'PCG18-ASSOC','EXPENSE',		'6256',    '7510', 'Missions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7514,'PCG18-ASSOC','EXPENSE',		'6257',    '7510', 'Réceptions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7515,'PCG18-ASSOC','EXPENSE',		'626',    '7482', 'Frais postaux et frais de télécommunications', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7516,'PCG18-ASSOC','EXPENSE',		'6261',    '7515', 'Liaisons informatiques et spécialisées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7517,'PCG18-ASSOC','EXPENSE',		'6263',    '7515', 'Affranchissements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7518,'PCG18-ASSOC','EXPENSE',		'6265',    '7515', 'Téléphone', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7519,'PCG18-ASSOC','EXPENSE',		'6268',    '7515', 'Autres frais postaux et de télécommunications', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7520,'PCG18-ASSOC','EXPENSE',		'627',    '7482', 'Services bancaires et assimilés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7521,'PCG18-ASSOC','EXPENSE',		'6271',    '7520', 'Frais sur titres', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7522,'PCG18-ASSOC','EXPENSE',		'6272',    '7520', 'Commissions sur emprunts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7523,'PCG18-ASSOC','EXPENSE',		'6275',    '7520', 'Frais sur effets', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7524,'PCG18-ASSOC','EXPENSE',		'6276',    '7520', 'Location de coffre', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7525,'PCG18-ASSOC','EXPENSE',		'6278',    '7520', 'Autres frais et commissions sur prestations de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7526,'PCG18-ASSOC','EXPENSE',		'628',    '7482', 'Autres prestations de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7527,'PCG18-ASSOC','EXPENSE',		'6281',    '7526', 'Concours divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7528,'PCG18-ASSOC','EXPENSE',		'6284',    '7526', 'Frais de recrutement  du personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7529,'PCG18-ASSOC','EXPENSE',		'6288',    '7526', 'Autres prestations diverses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7530,'PCG18-ASSOC','EXPENSE',		'629',    '7482', 'Rabais, remises et ristournes obtenus sur autres services extérieurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7531,'PCG18-ASSOC','EXPENSE',		'63',    '7006', 'Impôts, taxes et versements assimilés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7532,'PCG18-ASSOC','EXPENSE',		'631',    '7531', 'Impôts, taxes et versements assimilés sur rémunérations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7533,'PCG18-ASSOC','EXPENSE',		'6311',    '7532', 'Taxes sur les salaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7534,'PCG18-ASSOC','EXPENSE',		'6312',    '7532', 'Taxe d''apprentissage', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7535,'PCG18-ASSOC','EXPENSE',		'6313',    '7532', 'Participation des employeurs à la formation professionnelle continue', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7536,'PCG18-ASSOC','EXPENSE',		'6314',    '7532', 'Cotisation pour défaut d''investissement obligatoire dans laconstruction', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7537,'PCG18-ASSOC','EXPENSE',		'6318',    '7532', 'Autres impôts sur rémunérations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7538,'PCG18-ASSOC','EXPENSE',		'633',    '7531', 'Impôts, taxes et versements assimilés sur rémunérations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7539,'PCG18-ASSOC','EXPENSE',		'6331',    '7538', 'Versement de transport', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7540,'PCG18-ASSOC','EXPENSE',		'6332',    '7538', 'Allocation logement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7541,'PCG18-ASSOC','EXPENSE',		'6333',    '7538', 'Participation des employeurs à la formation professionnelle continue', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7542,'PCG18-ASSOC','EXPENSE',		'6334',    '7538', 'Participation des employeurs à l''effort de construction', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7543,'PCG18-ASSOC','EXPENSE',		'6335',    '7538', 'Versements libératoires ouvrant droit à l''exonération de la taxe d''apprentissage', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7544,'PCG18-ASSOC','EXPENSE',		'6338',    '7538', 'Autres', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7545,'PCG18-ASSOC','EXPENSE',		'635',    '7531', 'Autres impôts, taxes et versements assimilés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7546,'PCG18-ASSOC','EXPENSE',		'6351',    '7545', 'Impôts directs (sauf impôts sur les bénéfices)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7547,'PCG18-ASSOC','EXPENSE',		'63511',    '7546', 'CFE, CVAE', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7548,'PCG18-ASSOC','EXPENSE',		'63512',    '7546', 'Taxes foncières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7549,'PCG18-ASSOC','EXPENSE',		'63513',    '7546', 'Autres impôts locaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7550,'PCG18-ASSOC','EXPENSE',		'6352',    '7545', 'Taxe sur le chiffre d''affaire non récupérables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7551,'PCG18-ASSOC','EXPENSE',		'6353',    '7545', 'Impôts indirects', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7552,'PCG18-ASSOC','EXPENSE',		'6354',    '7545', 'Droits d''enregistrement et de timbres', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7553,'PCG18-ASSOC','EXPENSE',		'63541',    '7552', 'Droit de mutation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7554,'PCG18-ASSOC','EXPENSE',		'6358',    '7545', 'Autres droits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7555,'PCG18-ASSOC','EXPENSE',		'637',    '7531', 'Autres impôts, taxes et versements assimilés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7556,'PCG18-ASSOC','EXPENSE',		'6371',    '7555', 'Contribution sociale de solidarité à la charge des sociétés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7557,'PCG18-ASSOC','EXPENSE',		'6374',    '7555', 'Impôts et taxes exigibles à l''étranger', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7558,'PCG18-ASSOC','EXPENSE',		'6378',    '7555', 'Taxes diverses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7559,'PCG18-ASSOC','EXPENSE',		'64',    '7006', 'Charges de personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7560,'PCG18-ASSOC','EXPENSE',		'641',    '7559', 'Rémunérations du personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7561,'PCG18-ASSOC','EXPENSE',		'6411',    '7560', 'Salaires, appointements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7562,'PCG18-ASSOC','EXPENSE',		'6412',    '7560', 'Congés payés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7563,'PCG18-ASSOC','EXPENSE',		'6413',    '7560', 'Primes et gratifications', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7564,'PCG18-ASSOC','EXPENSE',		'6414',    '7560', 'Indemnités et avantages divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7565,'PCG18-ASSOC','EXPENSE',		'6415',    '7560', 'Supplément familial', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7566,'PCG18-ASSOC','EXPENSE',		'645',    '7559', 'Charges de Sécurité Sociale et de prévoyance', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7567,'PCG18-ASSOC','EXPENSE',		'6451',    '7566', 'Cotisations à l''URSSAF', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7568,'PCG18-ASSOC','EXPENSE',		'6452',    '7566', 'Cotisations aux mutuelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7569,'PCG18-ASSOC','EXPENSE',		'6453',    '7566', 'Cotisations aux caisses de retraite', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7570,'PCG18-ASSOC','EXPENSE',		'6454',    '7566', 'Cotisations aux caisses d''allocations de chômage', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7571,'PCG18-ASSOC','EXPENSE',		'6458',    '7566', 'Cotisations aux autres organismes sociaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7572,'PCG18-ASSOC','EXPENSE',		'647',    '7559', 'Autres charges sociales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7573,'PCG18-ASSOC','EXPENSE',		'6471',    '7572', 'Prestations directes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7574,'PCG18-ASSOC','EXPENSE',		'6472',    '7572', 'Versements aux comités d''entreprise et d''établissement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7575,'PCG18-ASSOC','EXPENSE',		'6473',    '7572', 'Dotations aux comités d''hygiène et de sécurité', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7576,'PCG18-ASSOC','EXPENSE',		'6474',    '7572', 'Dotations aux autres œuvres sociales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7577,'PCG18-ASSOC','EXPENSE',		'6475',    '7572', 'Médecine du travail', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7578,'PCG18-ASSOC','EXPENSE',		'6478',    '7572', 'Divers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7579,'PCG18-ASSOC','EXPENSE',		'648',    '7559', 'Autres charges de personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7580,'PCG18-ASSOC','EXPENSE',		'65',    '7006', 'Autres charges de gestion courante', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7581,'PCG18-ASSOC','EXPENSE',		'651',    '7580', 'Redevances pour concessions, brevets, licences, procédés, droits et valeurs similaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7582,'PCG18-ASSOC','EXPENSE',		'6511',    '7581', 'Redevances pour concessions, brevets, licences, marques et procédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7583,'PCG18-ASSOC','EXPENSE',		'6516',    '7581', 'Droits d''auteurs et de reproduction', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7584,'PCG18-ASSOC','EXPENSE',		'6518',    '7581', 'Autres droits et valeurs similaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7585,'PCG18-ASSOC','EXPENSE',		'653',    '7580', 'Charges de la générosité du public', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7586,'PCG18-ASSOC','EXPENSE',		'6531',    '7585', 'Autres charges sur legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7587,'PCG18-ASSOC','EXPENSE',		'654',    '7580', 'Pertes sur créances irrécouvrables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7588,'PCG18-ASSOC','EXPENSE',		'6541',    '7587', 'Créances de l''exercice', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7589,'PCG18-ASSOC','EXPENSE',		'6544',    '7587', 'Créances des exercices antérieurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7590,'PCG18-ASSOC','EXPENSE',		'655',    '7580', 'Quotes-parts de résultat sur opérations faites en commun', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7591,'PCG18-ASSOC','EXPENSE',		'6556',    '7590', 'Frais de siège social du gestionnaire', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7592,'PCG18-ASSOC','EXPENSE',		'6558',    '7590', 'Quotes-parts de résultat sur opérations faites dans le cadre d''un groupement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7593,'PCG18-ASSOC','EXPENSE',		'657',    '7580', 'Aides financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7594,'PCG18-ASSOC','EXPENSE',		'6571',    '7593', 'Aides financières versées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7595,'PCG18-ASSOC','EXPENSE',		'6572',    '7593', 'Quotes-parts de générosité reversée', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7596,'PCG18-ASSOC','EXPENSE',		'658',    '7580', 'Charges diverses de gestion courante', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7597,'PCG18-ASSOC','EXPENSE',		'6586',    '7596', 'Fonds de solidarité', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7598,'PCG18-ASSOC','EXPENSE',		'6588',    '7596', 'Autres', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7599,'PCG18-ASSOC','EXPENSE',		'66',    '7006', 'Charges financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7600,'PCG18-ASSOC','EXPENSE',		'661',    '7599', 'Charges d''intérêts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7601,'PCG18-ASSOC','EXPENSE',		'6611',    '7600', 'Intérêts des emprunts et dettes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7602,'PCG18-ASSOC','EXPENSE',		'6615',    '7600', 'Intérêts des comptes courants et des dépôts créditeurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7603,'PCG18-ASSOC','EXPENSE',		'6616',    '7600', 'Intérêts bancaires et sur opérations de financement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7604,'PCG18-ASSOC','EXPENSE',		'6617',    '7600', 'Intérêts des obligations cautionnées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7605,'PCG18-ASSOC','EXPENSE',		'6618',    '7600', 'Intérêts des autres dettes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7606,'PCG18-ASSOC','EXPENSE',		'664',    '7599', 'Pertes sur créances liées à des participations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7607,'PCG18-ASSOC','EXPENSE',		'665',    '7599', 'Escomptes accordés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7608,'PCG18-ASSOC','EXPENSE',		'666',    '7599', 'Pertes de change', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7609,'PCG18-ASSOC','EXPENSE',		'667',    '7599', 'Charges nettes sur cessions de valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7610,'PCG18-ASSOC','EXPENSE',		'668',    '7599', 'Autres charges financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7611,'PCG18-ASSOC','EXPENSE',		'67',    '7006', 'Charges exceptionnelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7612,'PCG18-ASSOC','EXPENSE',		'671',    '7611', 'Charges exceptionnelles sur opérations de gestion', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7613,'PCG18-ASSOC','EXPENSE',		'6711',    '7612', 'Pénalités sur marchés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7614,'PCG18-ASSOC','EXPENSE',		'6712',    '7612', 'Pénalités, amendes fiscales et pénales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7615,'PCG18-ASSOC','EXPENSE',		'6713',    '7612', 'Dons, libéralités', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7616,'PCG18-ASSOC','EXPENSE',		'6714',    '7612', 'Créances devenues irrécouvrables dans l''exercice', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7617,'PCG18-ASSOC','EXPENSE',		'6715',    '7612', 'Aides financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7618,'PCG18-ASSOC','EXPENSE',		'6717',    '7612', 'Rappel d''impôts (autres qu''impôts sur les bénéfices)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7619,'PCG18-ASSOC','EXPENSE',		'6718',    '7612', 'Autres charges exceptionnelles sur opération de gestion', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7620,'PCG18-ASSOC','EXPENSE',		'672',    '7611', 'Charges sur exercices antérieurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7621,'PCG18-ASSOC','EXPENSE',		'673',    '7611', 'Apports ou affectations en numéraire', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7622,'PCG18-ASSOC','EXPENSE',		'675',    '7611', 'Valeurs comptables des éléments d''actif cédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7623,'PCG18-ASSOC','EXPENSE',		'6751',    '7622', 'Immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7624,'PCG18-ASSOC','EXPENSE',		'6752',    '7622', 'Immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7625,'PCG18-ASSOC','EXPENSE',		'6754',    '7622', 'Immobilisations reçues en legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7626,'PCG18-ASSOC','EXPENSE',		'6756',    '7622', 'Immobilisations financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7627,'PCG18-ASSOC','EXPENSE',		'6758',    '7622', 'Autres éléments d''actif', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7628,'PCG18-ASSOC','EXPENSE',		'678',    '7611', 'Autres charges exceptionnelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7629,'PCG18-ASSOC','EXPENSE',		'68',    '7006', 'Dotations aux amortissements, provisions et engagements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7630,'PCG18-ASSOC','EXPENSE',		'681',    '7629', 'Dotations aux amortissements et aux provisions - charges d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7631,'PCG18-ASSOC','EXPENSE',		'6811',    '7630', 'Dotations aux amortissements sur immobilisations incorporelles et corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7632,'PCG18-ASSOC','EXPENSE',		'6812',    '7630', 'Dotation aux amortissements des charges d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7633,'PCG18-ASSOC','EXPENSE',		'6815',    '7630', 'Dotations aux provisions d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7634,'PCG18-ASSOC','EXPENSE',		'6816',    '7630', 'Dotations pour dépréciations d''immobilisations incorporelles et corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7635,'PCG18-ASSOC','EXPENSE',		'68164',    '7634', 'Dotations pour dépréciation d''actifs reçus par legs ou donations destinés à être cédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7636,'PCG18-ASSOC','EXPENSE',		'6817',    '7630', 'Dotations pour dépréciations des actifs circulant', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7637,'PCG18-ASSOC','EXPENSE',		'686',    '7629', 'Dotations aux amortissements et aux provisions - charges financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7638,'PCG18-ASSOC','EXPENSE',		'6861',    '7637', 'Dotations aux amortissements des primes de remboursement des obligations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7639,'PCG18-ASSOC','EXPENSE',		'6865',    '7637', 'Dotation aux provisions pour risques et charges financiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7640,'PCG18-ASSOC','EXPENSE',		'6866',    '7637', 'Dotation aux provisions pour dépréciation des éléments financiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7641,'PCG18-ASSOC','EXPENSE',		'6868',    '7637', 'Autres dotations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7642,'PCG18-ASSOC','EXPENSE',		'687',    '7629', 'Dotations aux amortissements et aux provisions - charges exceptionnelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7643,'PCG18-ASSOC','EXPENSE',		'6871',    '7642', 'Dotations aux amortissements exceptionnels des immobilisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7644,'PCG18-ASSOC','EXPENSE',		'6872',    '7642', 'Dotations aux provision réglementées (immobilisations)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7645,'PCG18-ASSOC','EXPENSE',		'6873',    '7642', 'Dotations aux provisions réglementées (stocks)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7646,'PCG18-ASSOC','EXPENSE',		'6874',    '7642', 'Dotations aux autres provisions réglementées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7647,'PCG18-ASSOC','EXPENSE',		'6875',    '7642', 'Dotations aux provisions exceptionnelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7648,'PCG18-ASSOC','EXPENSE',		'6876',    '7642', 'Dotations pour dépréciations exceptionnelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7649,'PCG18-ASSOC','EXPENSE',		'689',    '7629', 'Reports en fonds dédiés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7650,'PCG18-ASSOC','EXPENSE',		'6891',    '7649', 'Reports en fonds reportés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7651,'PCG18-ASSOC','EXPENSE',		'6893',    '7649', 'Reports en fonds dédiés des fondations abritées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7652,'PCG18-ASSOC','EXPENSE',		'6894',    '7649', 'Reports en fonds dédiés sur subventions d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7653,'PCG18-ASSOC','EXPENSE',		'6895',    '7649', 'Reports en fonds dédiés sur contributions financières d''autres organismes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7654,'PCG18-ASSOC','EXPENSE',		'6896',    '7649', 'Reports en fonds dédiés sur ressources liées à la générosité du public', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7655,'PCG18-ASSOC','EXPENSE',		'69',    '7006', 'Impôts sur les sociétés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7656,'PCG18-ASSOC','EXPENSE',		'691',    '7655', 'Participation des salariés aux résultats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7657,'PCG18-ASSOC','EXPENSE',		'695',    '7655', 'Impôts sur les sociétés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7658,'PCG18-ASSOC','EXPENSE',		'6951',    '7657', 'Impôts sur les sociétés des activités fiscalisées de l''entité', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7659,'PCG18-ASSOC','EXPENSE',		'6952',    '7657', 'Impôts sur les sociétés des personnes morales à but non lucratif', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7660,'PCG18-ASSOC','EXPENSE',		'699',    '7655', 'Report en arrière des déficits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7662,'PCG18-ASSOC','INCOME',		'70',    '7007', 'Ventes de produits fabriqués, de prestations de services et de marchandises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7663,'PCG18-ASSOC','INCOME',		'701',    '7662', 'Ventes de produits finis', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7664,'PCG18-ASSOC','INCOME',		'702',    '7662', 'Ventes de produits intermédiaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7665,'PCG18-ASSOC','INCOME',		'703',    '7662', 'Ventes de produits résiduels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7666,'PCG18-ASSOC','INCOME',		'704',    '7662', 'Ventes de travaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7667,'PCG18-ASSOC','INCOME',		'705',    '7662', 'Etudes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7668,'PCG18-ASSOC','INCOME',		'706',    '7662', 'Ventes de prestations de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7669,'PCG18-ASSOC','INCOME',		'7063',    '7668', 'Parrainages', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7670,'PCG18-ASSOC','INCOME',		'707',    '7662', 'Ventes de marchandises', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7671,'PCG18-ASSOC','INCOME',		'7073',    '7670', 'Ventes de dons en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7672,'PCG18-ASSOC','INCOME',		'708',    '7662', 'Produits des activités annexes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7673,'PCG18-ASSOC','INCOME',		'7081',    '7672', 'Produits des services exploités dans l''intérêt du personnel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7674,'PCG18-ASSOC','INCOME',		'7082',    '7672', 'Commissions et courtages', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7675,'PCG18-ASSOC','INCOME',		'7083',    '7672', 'Locations diverses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7676,'PCG18-ASSOC','INCOME',		'7084',    '7672', 'Mise à disposition de personnel facturée', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7677,'PCG18-ASSOC','INCOME',		'7085',    '7672', 'Ports et frais accessoires facturés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7678,'PCG18-ASSOC','INCOME',		'7088',    '7672', 'Autres produits d''activités annexes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7679,'PCG18-ASSOC','INCOME',		'709',    '7662', 'Rabais, remises et ristournes accordés par l''association', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7680,'PCG18-ASSOC','INCOME',		'71',    '7007', 'Production stockée', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7681,'PCG18-ASSOC','INCOME',		'713',    '7680', 'Variation des stocks', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7682,'PCG18-ASSOC','INCOME',		'7133',    '7681', 'Variation des en-cours de production de biens', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7683,'PCG18-ASSOC','INCOME',		'7134',    '7681', 'Variation des en-cours de production de services', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7684,'PCG18-ASSOC','INCOME',		'7135',    '7681', 'Variation des stocks de produits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7685,'PCG18-ASSOC','INCOME',		'71355',    '7684', 'Variation des stocks de produits finis', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7686,'PCG18-ASSOC','INCOME',		'72',    '7007', 'Production immobilisée', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7687,'PCG18-ASSOC','INCOME',		'721',    '7686', 'Immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7688,'PCG18-ASSOC','INCOME',		'722',    '7686', 'Immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7689,'PCG18-ASSOC','INCOME',		'73',    '7007', 'Concours publics', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7690,'PCG18-ASSOC','INCOME',		'74',    '7007', 'Subventions de fonctionnement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7691,'PCG18-ASSOC','INCOME',		'75',    '7007', 'Autres produits de gestion courante', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7692,'PCG18-ASSOC','INCOME',		'751',    '7691', 'Redevances pour concessions, brevets, licences, procédés, droits et valeurs similaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7693,'PCG18-ASSOC','INCOME',		'7511',    '7692', 'Redevances pour concessions, brevets, licences, marques et procédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7694,'PCG18-ASSOC','INCOME',		'7516',    '7692', 'Droits d''auteurs et de reproduction', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7695,'PCG18-ASSOC','INCOME',		'7518',    '7692', 'Autres droits et valeurs similaires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7696,'PCG18-ASSOC','INCOME',		'752',    '7691', 'Revenus des immeubles non affectés aux activités relevant de l''objet statutaire', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7697,'PCG18-ASSOC','INCOME',		'753',    '7691', 'Versements des fondateurs ou consommation de la dotation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7698,'PCG18-ASSOC','INCOME',		'7531',    '7697', 'Versements des fondateurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7699,'PCG18-ASSOC','INCOME',		'7532',    '7697', 'Quotes-parts de dotation consomptible virée au compte de résultat', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7700,'PCG18-ASSOC','INCOME',		'754',    '7691', 'Ressources liées à la générosité du public', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7701,'PCG18-ASSOC','INCOME',		'7541',    '7700', 'Dons manuels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7702,'PCG18-ASSOC','INCOME',		'75411',    '7701', 'Dons manuels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7703,'PCG18-ASSOC','INCOME',		'75412',    '7701', 'Abandons de frais par les bénévoles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7704,'PCG18-ASSOC','INCOME',		'7542',    '7700', 'Mécénats', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7705,'PCG18-ASSOC','INCOME',		'7543',    '7700', 'Legs, donations et assurances-vie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7706,'PCG18-ASSOC','INCOME',		'75431',    '7705', 'Assurances-vie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7707,'PCG18-ASSOC','INCOME',		'75432',    '7705', 'Legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7708,'PCG18-ASSOC','INCOME',		'75433',    '7705', 'Autres produits sur legs ou donations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7709,'PCG18-ASSOC','INCOME',		'755',    '7691', 'Contributions financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7710,'PCG18-ASSOC','INCOME',		'7551',    '7709', 'Contributions financières reçues d''autres organismes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7711,'PCG18-ASSOC','INCOME',		'7552',    '7709', 'Quotes-parts de générosité reçues', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7712,'PCG18-ASSOC','INCOME',		'756',    '7691', 'Cotisations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7713,'PCG18-ASSOC','INCOME',		'7561',    '7712', 'Cotisations sans contrepartie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7714,'PCG18-ASSOC','INCOME',		'7562',    '7712', 'Cotisations avec contrepartie', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7715,'PCG18-ASSOC','INCOME',		'757',    '7691', 'Gains de change sur créances et dettes d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7716,'PCG18-ASSOC','INCOME',		'758',    '7691', 'Produits divers de gestion courante', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7717,'PCG18-ASSOC','INCOME',		'76',    '7007', 'Produits financiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7718,'PCG18-ASSOC','INCOME',		'761',    '7717', 'Produits des participations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7719,'PCG18-ASSOC','INCOME',		'7611',    '7718', 'Revenus des titres de participation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7720,'PCG18-ASSOC','INCOME',		'7616',    '7718', 'Revenus des autres formes de participation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7721,'PCG18-ASSOC','INCOME',		'7617',    '7718', 'Revenus des créances rattachées à des participations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7722,'PCG18-ASSOC','INCOME',		'762',    '7717', 'Produits des immobilisations financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7723,'PCG18-ASSOC','INCOME',		'7621',    '7722', 'Revenus des titres immobilisés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7724,'PCG18-ASSOC','INCOME',		'7624',    '7722', 'Revenus des prêts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7725,'PCG18-ASSOC','INCOME',		'7627',    '7722', 'Revenus des créances immobilisées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7726,'PCG18-ASSOC','INCOME',		'763',    '7717', 'Revenus des autres créances', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7727,'PCG18-ASSOC','INCOME',		'764',    '7717', 'Revenus des valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7728,'PCG18-ASSOC','INCOME',		'765',    '7717', 'Escomptes de règlement obtenus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7729,'PCG18-ASSOC','INCOME',		'766',    '7717', 'Gains de change', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7730,'PCG18-ASSOC','INCOME',		'767',    '7717', 'Produits nets sur cessions de valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7731,'PCG18-ASSOC','INCOME',		'768',    '7717', 'Autres produits financiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7732,'PCG18-ASSOC','INCOME',		'77',    '7007', 'Produits exceptionnels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7733,'PCG18-ASSOC','INCOME',		'771',    '7732', 'Produits exceptionnels sur opérations de gestion', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7734,'PCG18-ASSOC','INCOME',		'7713',    '7733', 'Libéralités reçues', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7735,'PCG18-ASSOC','INCOME',		'7714',    '7733', 'Rentrées sur créances amorties', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7736,'PCG18-ASSOC','INCOME',		'7715',    '7733', 'Subventions d''équilibre', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7737,'PCG18-ASSOC','INCOME',		'7717',    '7733', 'Dégrèvements d''impôts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7738,'PCG18-ASSOC','INCOME',		'7718',    '7733', 'Autres produits exceptionnels sur opérations de gestion', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7739,'PCG18-ASSOC','INCOME',		'772',    '7732', 'Produits sur exercices antérieurs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7740,'PCG18-ASSOC','INCOME',		'775',    '7732', 'Produits des cessions d''éléments d''actif', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7741,'PCG18-ASSOC','INCOME',		'7751',    '7740', 'Immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7742,'PCG18-ASSOC','INCOME',		'7752',    '7740', 'Immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7743,'PCG18-ASSOC','INCOME',		'7754',    '7740', 'Immobilisations reçues en legs ou donations destinées à être cédées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7744,'PCG18-ASSOC','INCOME',		'7756',    '7740', 'Immobilisations financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7745,'PCG18-ASSOC','INCOME',		'7758',    '7740', 'Autres éléments d''actif', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7746,'PCG18-ASSOC','INCOME',		'777',    '7732', 'Quote-part des subventions d''investissement virée au résultat de l''exercice', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7747,'PCG18-ASSOC','INCOME',		'778',    '7732', 'Autres produits exceptionnels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7748,'PCG18-ASSOC','INCOME',		'78',    '7007', 'Reprises sur amortissements, dépréciations et provisions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7749,'PCG18-ASSOC','INCOME',		'781',    '7748', 'Reprises sur amortissements des immobilisations, dépréciations et provisions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7750,'PCG18-ASSOC','INCOME',		'7811',    '7749', 'Reprises sur amortissements des immobilisations incorporelles et corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7751,'PCG18-ASSOC','INCOME',		'78111',    '7750', 'immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7752,'PCG18-ASSOC','INCOME',		'78112',    '7750', 'Immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7753,'PCG18-ASSOC','INCOME',		'7815',    '7749', 'Reprises sur provisions d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7754,'PCG18-ASSOC','INCOME',		'7816',    '7749', 'Reprises sur dépréciation des immobilisations incorporelles et corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7755,'PCG18-ASSOC','INCOME',		'78161',    '7754', 'Immobilisations incorporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7756,'PCG18-ASSOC','INCOME',		'78162',    '7754', 'Immobilisations corporelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7757,'PCG18-ASSOC','INCOME',		'78164',    '7754', 'Reprises sur dépréciations d''actifs reçus par legs ou donations destinés à être cédés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7758,'PCG18-ASSOC','INCOME',		'7817',    '7749', 'Reprises sur provisions pour dépréciation des actifs circulants', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7759,'PCG18-ASSOC','INCOME',		'78173',    '7758', 'Pour dépréciation des stocks', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7760,'PCG18-ASSOC','INCOME',		'78174',    '7758', 'Pour dépréciation des créances usagers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7761,'PCG18-ASSOC','INCOME',		'786',    '7748', 'Reprises sur amortissements et provisions - produits financiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7762,'PCG18-ASSOC','INCOME',		'7865',    '7761', 'Reprises sur provisions pour risques et charges financiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7763,'PCG18-ASSOC','INCOME',		'7866',    '7761', 'Reprises sur provisions pour dépréciation des éléments financiers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7764,'PCG18-ASSOC','INCOME',		'78662',    '7763', 'Pour dépréciation des immobilisations financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7765,'PCG18-ASSOC','INCOME',		'78665',    '7763', 'Pour dépréciation des valeurs mobilières de placement', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7766,'PCG18-ASSOC','INCOME',		'787',    '7748', 'Reprises sur amortissements et provisions - produits exceptionnels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7767,'PCG18-ASSOC','INCOME',		'7872',    '7766', 'Reprises sur provisions réglementées amortissements dérogatoires', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7768,'PCG18-ASSOC','INCOME',		'7873',    '7766', 'Reprises sur provisions réglementées stocks', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7769,'PCG18-ASSOC','INCOME',		'7874',    '7766', 'Reprises sur autres provisions réglementées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7770,'PCG18-ASSOC','INCOME',		'7875',    '7766', 'Reprises sur provisions pour risques et charges exceptionnels', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7771,'PCG18-ASSOC','INCOME',		'7876',    '7766', 'Reprises sur provisions pour dépréciations exceptionnelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7772,'PCG18-ASSOC','INCOME',		'789',    '7748', 'Utilisations de fonds reportés et de fonds dédiés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7773,'PCG18-ASSOC','INCOME',		'7891',    '7772', 'Utilisation de fonds reportés', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7774,'PCG18-ASSOC','INCOME',		'7893',    '7772', 'Utilisation de fonds dédiés des fondations abritées', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7775,'PCG18-ASSOC','INCOME',		'7894',    '7772', 'Utilisation des fonds dédiés sur subventions d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7776,'PCG18-ASSOC','INCOME',		'7895',    '7772', 'Utilisation des fonds dédiés sur contributions financières d''autres organismes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7777,'PCG18-ASSOC','INCOME',		'7896',    '7772', 'Utilisation des fonds dédiés sur ressources liées à la générosité du public', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7778,'PCG18-ASSOC','INCOME',		'79',    '7007', 'Transferts de charges', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7779,'PCG18-ASSOC','INCOME',		'791',    '7778', 'Transfert de charges d''exploitation', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7780,'PCG18-ASSOC','INCOME',		'796',    '7778', 'Transfert de charges financières', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7781,'PCG18-ASSOC','INCOME',		'797',    '7778', 'Transfert de charges exceptionnelles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7783,'PCG18-ASSOC','SPECIAL',		'86',    '7008', 'Emploi des contributions volontaires en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7784,'PCG18-ASSOC','SPECIAL',		'860',    '7783', 'Secours en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7785,'PCG18-ASSOC','SPECIAL',		'861',    '7783', 'Mise à disposition gratuite de biens', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7786,'PCG18-ASSOC','SPECIAL',		'862',    '7783', 'Prestations', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7787,'PCG18-ASSOC','SPECIAL',		'864',    '7783', 'Personnel bénévole', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7788,'PCG18-ASSOC','SPECIAL',		'87',    '7008', 'Contributions volontaires en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7789,'PCG18-ASSOC','SPECIAL',		'870',    '7788', 'Dons en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7790,'PCG18-ASSOC','SPECIAL',		'871',    '7788', 'Prestations en nature', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (1, 7791,'PCG18-ASSOC','SPECIAL',		'875',    '7788', 'Bénévolat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7001,'PCG18-ASSOC','CAPIT',		'1',    '0', 'Comptes de capitaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7002,'PCG18-ASSOC','IMMO',		'2',    '0', 'Comptes d''immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7003,'PCG18-ASSOC','STOCK',		'3',    '0', 'Comptes de stocks et en-cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7004,'PCG18-ASSOC','THIRDPARTY',		'4',    '0', 'Comptes de tiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7005,'PCG18-ASSOC','FINAN',		'5',    '0', 'Comptes financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7006,'PCG18-ASSOC','EXPENSE',		'6',    '0', 'Comptes de charges', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7007,'PCG18-ASSOC','INCOME',		'7',    '0', 'Comptes de produits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7008,'PCG18-ASSOC','SPECIAL',		'8',    '0', 'Comptes de contributions volontaires en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7010,'PCG18-ASSOC','CAPIT',		'10',    '7001', 'Fonds propres et réserves', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7011,'PCG18-ASSOC','CAPIT',		'102',    '7010', 'Fonds propres sans droit de reprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7012,'PCG18-ASSOC','CAPIT',		'1021',    '7011', 'Première situation nette établie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7013,'PCG18-ASSOC','CAPIT',		'1022',    '7011', 'Fonds statutaires (à subdiviser en fonction des statuts)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7014,'PCG18-ASSOC','CAPIT',		'1023',    '7011', 'Dotations non consomptibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7015,'PCG18-ASSOC','CAPIT',		'10231',    '7014', 'Dotations non consomptibles initiales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7016,'PCG18-ASSOC','CAPIT',		'10232',    '7014', 'Dotations non consomptibles complémentaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7017,'PCG18-ASSOC','CAPIT',		'1024',    '7011', 'Autres fonds propres sans droit de reprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7018,'PCG18-ASSOC','CAPIT',		'1025',    '7011', 'Legs et donations avec contrepartie d''actifs immobilisés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7019,'PCG18-ASSOC','CAPIT',		'103',    '7010', 'Fonds propres avec droit de reprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7020,'PCG18-ASSOC','CAPIT',		'1032',    '7019', 'Fonds statutaires (à subdiviser en fonction des statuts)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7021,'PCG18-ASSOC','CAPIT',		'1034',    '7019', 'Autres fonds propres avec droit de reprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7022,'PCG18-ASSOC','CAPIT',		'1035',    '7019', 'Legs et donations avec contrepartie d''actifs immobilisés assortis d''une obligation ou d''une condition', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7023,'PCG18-ASSOC','CAPIT',		'105',    '7010', 'Ecarts de réévaluation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7024,'PCG18-ASSOC','CAPIT',		'1051',    '7023', 'Ecarts de réévaluation sur des biens sans droit de reprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7025,'PCG18-ASSOC','CAPIT',		'1052',    '7023', 'Ecarts de réévaluation sur des biens avec droit de reprise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7026,'PCG18-ASSOC','CAPIT',		'106',    '7010', 'Réserves', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7027,'PCG18-ASSOC','CAPIT',		'1062',    '7026', 'Réserves indisponibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7028,'PCG18-ASSOC','CAPIT',		'1063',    '7026', 'Réserves statutaires et contractuelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7029,'PCG18-ASSOC','CAPIT',		'1064',    '7026', 'Réserves réglementées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7030,'PCG18-ASSOC','CAPIT',		'1068',    '7026', 'Autres réserves', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7031,'PCG18-ASSOC','CAPIT',		'10681',    '7030', 'Réserves pour projet de l''entité', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7032,'PCG18-ASSOC','CAPIT',		'10688',    '7030', 'Réserves diverses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7033,'PCG18-ASSOC','CAPIT',		'108',    '7010', 'Dotations consomptibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7034,'PCG18-ASSOC','CAPIT',		'1081',    '7033', 'Dotations consomptibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7035,'PCG18-ASSOC','CAPIT',		'1089',    '7033', 'Dotations consomptibles inscrites au compte de résultat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7036,'PCG18-ASSOC','CAPIT',		'11',    '7001', 'Eléments en instance d''affectation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7037,'PCG18-ASSOC','CAPIT',		'110',    '7036', 'Report à nouveau excédentaire (solde créditeur)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7038,'PCG18-ASSOC','CAPIT',		'115',    '7036', 'Report à nouveau sous contrôle de tiers financeurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7039,'PCG18-ASSOC','CAPIT',		'119',    '7036', 'Report à nouveau déficitaire (solde débiteur)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7040,'PCG18-ASSOC','CAPIT',		'12',    '7001', 'Résultat net de l''exercice', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7041,'PCG18-ASSOC','CAPIT',		'120',    '7040', 'Excédent de l''exercice', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7042,'PCG18-ASSOC','CAPIT',		'129',    '7040', 'Déficit de l''exercice', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7043,'PCG18-ASSOC','CAPIT',		'13',    '7001', 'Subventions d''investissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7044,'PCG18-ASSOC','CAPIT',		'131',    '7043', 'Subventions d''investissement reçues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7045,'PCG18-ASSOC','CAPIT',		'1311',    '7044', 'Etat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7046,'PCG18-ASSOC','CAPIT',		'1312',    '7044', 'Régions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7047,'PCG18-ASSOC','CAPIT',		'1313',    '7044', 'Départements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7048,'PCG18-ASSOC','CAPIT',		'1314',    '7044', 'Communes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7049,'PCG18-ASSOC','CAPIT',		'1315',    '7044', 'Collectivités publiques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7050,'PCG18-ASSOC','CAPIT',		'1316',    '7044', 'Entreprises publiques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7051,'PCG18-ASSOC','CAPIT',		'1318',    '7044', 'Autres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7052,'PCG18-ASSOC','CAPIT',		'13181',    '7051', 'Taxe d''apprentissage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7053,'PCG18-ASSOC','CAPIT',		'13182',    '7051', 'Autres subventions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7054,'PCG18-ASSOC','CAPIT',		'139',    '7043', 'Subventions d''investissement inscrites au compte de résultat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7055,'PCG18-ASSOC','CAPIT',		'1391',    '7054', 'Subventions d''investissement inscrites au compte de résultat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7056,'PCG18-ASSOC','CAPIT',		'1398',    '7054', 'Autres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7057,'PCG18-ASSOC','CAPIT',		'13981',    '7056', 'Taxe d''apprentissage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7058,'PCG18-ASSOC','CAPIT',		'13988',    '7056', 'Autres subventions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7059,'PCG18-ASSOC','CAPIT',		'14',    '7001', 'Provisions réglementées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7060,'PCG18-ASSOC','CAPIT',		'142',    '7059', 'Provisions réglementées relatives aux immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7061,'PCG18-ASSOC','CAPIT',		'1424',    '7060', 'Provisions pour investissement (participation des salariés)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7062,'PCG18-ASSOC','CAPIT',		'143',    '7059', 'Provisions réglementées relatives aux stocks', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7063,'PCG18-ASSOC','CAPIT',		'144',    '7059', 'Provisions réglementées relatives aux éléments d''actif', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7064,'PCG18-ASSOC','CAPIT',		'145',    '7059', 'Amortissements dérogatoires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7065,'PCG18-ASSOC','CAPIT',		'148',    '7059', 'Autres provisions réglementées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7066,'PCG18-ASSOC','CAPIT',		'15',    '7001', 'Provisions pour risques et charges', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7067,'PCG18-ASSOC','CAPIT',		'151',    '7066', 'Provisions pour risques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7068,'PCG18-ASSOC','CAPIT',		'1511',    '7067', 'Provisions pour litiges', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7069,'PCG18-ASSOC','CAPIT',		'1514',    '7067', 'Provisions pour amendes et pénalités', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7070,'PCG18-ASSOC','CAPIT',		'1515',    '7067', 'Provisions pour pertes de change', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7071,'PCG18-ASSOC','CAPIT',		'1516',    '7067', 'Provisions pour risque d''emploi', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7072,'PCG18-ASSOC','CAPIT',		'1518',    '7067', 'Autres provisions pour risques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7073,'PCG18-ASSOC','CAPIT',		'152',    '7066', 'Provisions pour charges sur legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7074,'PCG18-ASSOC','CAPIT',		'153',    '7066', 'Provisions pour pensions et obligations similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7075,'PCG18-ASSOC','CAPIT',		'155',    '7066', 'Provisions pour impôts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7076,'PCG18-ASSOC','CAPIT',		'157',    '7066', 'Provisions pour charges à répartir sur plusieurs exercices', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7077,'PCG18-ASSOC','CAPIT',		'1572',    '7076', 'Provisions pour gros entretiens ou grandes révisions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7078,'PCG18-ASSOC','CAPIT',		'158',    '7066', 'Autres provisions pour charges', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7079,'PCG18-ASSOC','CAPIT',		'16',    '7001', 'Emprunts et dettes assimilées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7080,'PCG18-ASSOC','CAPIT',		'163',    '7079', 'Emprunts obligataires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7081,'PCG18-ASSOC','CAPIT',		'1631',    '7080', 'Titres associatifs et assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7082,'PCG18-ASSOC','CAPIT',		'164',    '7079', 'Emprunts auprès des établissements de crédit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7083,'PCG18-ASSOC','CAPIT',		'165',    '7079', 'Dépôts et cautionnements reçus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7084,'PCG18-ASSOC','CAPIT',		'1651',    '7083', 'Dépôts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7085,'PCG18-ASSOC','CAPIT',		'1652',    '7083', 'Cautionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7086,'PCG18-ASSOC','CAPIT',		'167',    '7079', 'Emprunts et dettes assortis de condition particulières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7087,'PCG18-ASSOC','CAPIT',		'168',    '7079', 'Autres emprunts et dettes assimilées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7088,'PCG18-ASSOC','CAPIT',		'1681',    '7087', 'Autres emprunts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7089,'PCG18-ASSOC','CAPIT',		'1685',    '7087', 'Rentes viagères capitalisées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7090,'PCG18-ASSOC','CAPIT',		'1687',    '7087', 'Autres dettes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7091,'PCG18-ASSOC','CAPIT',		'1688',    '7087', 'Intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7092,'PCG18-ASSOC','CAPIT',		'16883',    '7091', 'Sur titres associatifs et assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7093,'PCG18-ASSOC','CAPIT',		'16884',    '7091', 'Sur emprunts auprès des établissements de crédit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7094,'PCG18-ASSOC','CAPIT',		'16885',    '7091', 'Sur dépôts et cautionnements reçus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7095,'PCG18-ASSOC','CAPIT',		'16887',    '7091', 'Sur emprunts et dettes assortis de conditions particulières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7096,'PCG18-ASSOC','CAPIT',		'16888',    '7091', 'Sur autres emprunts et dettes assimilées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7097,'PCG18-ASSOC','CAPIT',		'17',    '7001', 'Dettes rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7098,'PCG18-ASSOC','CAPIT',		'171',    '7097', 'Dettes rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7099,'PCG18-ASSOC','CAPIT',		'1711',    '7098', 'Principal', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7100,'PCG18-ASSOC','CAPIT',		'1718',    '7098', 'Intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7101,'PCG18-ASSOC','CAPIT',		'18',    '7001', 'Comptes de liaison entre établissements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7102,'PCG18-ASSOC','CAPIT',		'181',    '7101', 'Apports permanents entre siège social et établissements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7103,'PCG18-ASSOC','CAPIT',		'185',    '7101', 'Biens et prestations de services échangés entre établissements et siège social', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7104,'PCG18-ASSOC','CAPIT',		'186',    '7101', 'Biens et prestations de services entre établissements (charges)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7105,'PCG18-ASSOC','CAPIT',		'187',    '7101', 'Biens et prestations de services entre établissements (produits)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7106,'PCG18-ASSOC','CAPIT',		'19',    '7001', 'Fonds dédiés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7107,'PCG18-ASSOC','CAPIT',		'191',    '7106', 'Fonds reportés liés aux legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7108,'PCG18-ASSOC','CAPIT',		'1911',    '7107', 'Legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7109,'PCG18-ASSOC','CAPIT',		'1912',    '7107', 'Donations temporaires d''usufruit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7110,'PCG18-ASSOC','CAPIT',		'193',    '7106', 'Fonds dédiés des fondations abritées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7111,'PCG18-ASSOC','CAPIT',		'194',    '7106', 'Fonds dédiés sur subventions d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7112,'PCG18-ASSOC','CAPIT',		'195',    '7106', 'Fonds dédiés sur contributions financières d''autres organismes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7113,'PCG18-ASSOC','CAPIT',		'196',    '7106', 'Fonds dédiés sur ressources liées à la générosité du public', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7115,'PCG18-ASSOC','IMMO',		'20',    '7002', 'Immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7116,'PCG18-ASSOC','IMMO',		'201',    '7115', 'Frais d''établissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7117,'PCG18-ASSOC','IMMO',		'2011',    '7116', 'Frais de constitution', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7118,'PCG18-ASSOC','IMMO',		'2012',    '7116', 'Frais de premier établissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7119,'PCG18-ASSOC','IMMO',		'203',    '7115', 'Frais de recherche et développement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7120,'PCG18-ASSOC','IMMO',		'204',    '7115', 'Donations temporaires d''usufruit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7121,'PCG18-ASSOC','IMMO',		'205',    '7115', 'Concessions et droits similaires, brevets, licences, marques et procédés, droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7122,'PCG18-ASSOC','IMMO',		'206',    '7115', 'Droit au bail', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7123,'PCG18-ASSOC','IMMO',		'208',    '7115', 'Autres immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7124,'PCG18-ASSOC','IMMO',		'21',    '7002', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7125,'PCG18-ASSOC','IMMO',		'211',    '7124', 'Terrains', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7126,'PCG18-ASSOC','IMMO',		'2111',    '7125', 'Terrains nus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7127,'PCG18-ASSOC','IMMO',		'2112',    '7125', 'Terrains aménagés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7128,'PCG18-ASSOC','IMMO',		'2115',    '7125', 'Terrains bâtis', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7129,'PCG18-ASSOC','IMMO',		'212',    '7124', 'Agencements et aménagements de terrains sur sol propre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7130,'PCG18-ASSOC','IMMO',		'213',    '7124', 'Constructions sur sol propre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7131,'PCG18-ASSOC','IMMO',		'2131',    '7130', 'Bâtiments', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7132,'PCG18-ASSOC','IMMO',		'2135',    '7130', 'Installations générales - agencements, aménagements des constructions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7133,'PCG18-ASSOC','IMMO',		'214',    '7124', 'Constructions sur sol d''autrui (même ventilation que le 213)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7134,'PCG18-ASSOC','IMMO',		'215',    '7124', 'Installations techniques - matériel et outillage industriel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7135,'PCG18-ASSOC','IMMO',		'2151',    '7134', 'Installations complexes spécialisées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7136,'PCG18-ASSOC','IMMO',		'2153',    '7134', 'Installations à caractère spécifique', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7137,'PCG18-ASSOC','IMMO',		'2154',    '7134', 'Matériel industriel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7138,'PCG18-ASSOC','IMMO',		'2155',    '7134', 'Outillage industriel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7139,'PCG18-ASSOC','IMMO',		'2157',    '7134', 'Agencements et aménagements des matériels et outillages industriels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7140,'PCG18-ASSOC','IMMO',		'216',    '7124', 'Collections - œuvres d''art', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7141,'PCG18-ASSOC','IMMO',		'218',    '7124', 'Autres immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7142,'PCG18-ASSOC','IMMO',		'2181',    '7141', 'Installations générales, agencements et aménagements divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7143,'PCG18-ASSOC','IMMO',		'2182',    '7141', 'Matériel de transport', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7144,'PCG18-ASSOC','IMMO',		'2183',    '7141', 'Matériel de bureau et informatique', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7145,'PCG18-ASSOC','IMMO',		'2184',    '7141', 'Mobilier', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7146,'PCG18-ASSOC','IMMO',		'2185',    '7141', 'Cheptel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7147,'PCG18-ASSOC','IMMO',		'2186',    '7141', 'Emballages récupérables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7148,'PCG18-ASSOC','IMMO',		'22',    '7002', 'Immobilisations mises en concession', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7149,'PCG18-ASSOC','IMMO',		'23',    '7002', 'Immobilisations en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7150,'PCG18-ASSOC','IMMO',		'231',    '7149', 'Immobilisations corporelles en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7151,'PCG18-ASSOC','IMMO',		'2312',    '7150', 'Terrains', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7152,'PCG18-ASSOC','IMMO',		'2313',    '7150', 'Constructions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7153,'PCG18-ASSOC','IMMO',		'2315',    '7150', 'Installations techniques, matériel et outillage industriels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7154,'PCG18-ASSOC','IMMO',		'2318',    '7150', 'Autres immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7155,'PCG18-ASSOC','IMMO',		'232',    '7149', 'Immobilisations incorporelles en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7156,'PCG18-ASSOC','IMMO',		'237',    '7149', 'Avances et acomptes versés sur commandes d''immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7157,'PCG18-ASSOC','IMMO',		'238',    '7149', 'Avances et acomptes versés sur commandes d''immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7158,'PCG18-ASSOC','IMMO',		'2382',    '7157', 'Terrains', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7159,'PCG18-ASSOC','IMMO',		'2383',    '7157', 'Constructions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7160,'PCG18-ASSOC','IMMO',		'2385',    '7157', 'Installations techniques, matériel et outillage industriels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7161,'PCG18-ASSOC','IMMO',		'2388',    '7157', 'Autres immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7162,'PCG18-ASSOC','IMMO',		'24',    '7002', 'Biens reçus par legs ou donations destinés à être cédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7163,'PCG18-ASSOC','IMMO',		'26',    '7002', 'Participations et créances rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7164,'PCG18-ASSOC','IMMO',		'261',    '7163', 'Titres de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7165,'PCG18-ASSOC','IMMO',		'2611',    '7164', 'Actions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7166,'PCG18-ASSOC','IMMO',		'2618',    '7164', 'Autres titres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7167,'PCG18-ASSOC','IMMO',		'266',    '7163', 'Autres formes de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7168,'PCG18-ASSOC','IMMO',		'267',    '7163', 'Créances rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7169,'PCG18-ASSOC','IMMO',		'2671',    '7168', 'Principal', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7170,'PCG18-ASSOC','IMMO',		'2678',    '7168', 'Intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7171,'PCG18-ASSOC','IMMO',		'269',    '7163', 'Versements restant à effectuer sur titres de participation non libérés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7172,'PCG18-ASSOC','IMMO',		'27',    '7002', 'Autres immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7173,'PCG18-ASSOC','IMMO',		'271',    '7172', 'Titres immobilisés (droit de propriété)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7174,'PCG18-ASSOC','IMMO',		'2711',    '7173', 'Actions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7175,'PCG18-ASSOC','IMMO',		'2718',    '7173', 'Autres titres immobilisés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7176,'PCG18-ASSOC','IMMO',		'272',    '7172', 'Titres immobilisés (droit de créance)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7177,'PCG18-ASSOC','IMMO',		'2721',    '7176', 'Obligations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7178,'PCG18-ASSOC','IMMO',		'2722',    '7176', 'Bons', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7179,'PCG18-ASSOC','IMMO',		'2728',    '7176', 'Autres titres immobilisés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7180,'PCG18-ASSOC','IMMO',		'274',    '7172', 'Prêts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7181,'PCG18-ASSOC','IMMO',		'2742',    '7180', 'Prêts aux partenaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7182,'PCG18-ASSOC','IMMO',		'2743',    '7180', 'Prêts au personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7183,'PCG18-ASSOC','IMMO',		'2748',    '7180', 'Autres prêts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7184,'PCG18-ASSOC','IMMO',		'275',    '7172', 'Dépôts et cautionnements versés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7185,'PCG18-ASSOC','IMMO',		'2751',    '7184', 'Dépôts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7186,'PCG18-ASSOC','IMMO',		'2755',    '7184', 'Cautionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7187,'PCG18-ASSOC','IMMO',		'276',    '7172', 'Autres créances immobilisées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7188,'PCG18-ASSOC','IMMO',		'2761',    '7187', 'Autres créances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7189,'PCG18-ASSOC','IMMO',		'2768',    '7187', 'Intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7190,'PCG18-ASSOC','IMMO',		'27682',    '7189', 'Sur titres immobilisés (droit de créance)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7191,'PCG18-ASSOC','IMMO',		'27684',    '7189', 'Sur prêts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7192,'PCG18-ASSOC','IMMO',		'27685',    '7189', 'Sur dépôts et cautionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7193,'PCG18-ASSOC','IMMO',		'27688',    '7189', 'Sur autres créances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7194,'PCG18-ASSOC','IMMO',		'279',    '7172', 'Versements restant à effectuer sur titres immobilisés non libérés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7195,'PCG18-ASSOC','IMMO',		'28',    '7002', 'Amortissements des immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7196,'PCG18-ASSOC','IMMO',		'280',    '7195', 'Amortissements des immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7197,'PCG18-ASSOC','IMMO',		'2804',    '7196', 'Donations temporaires d''usufruit', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7198,'PCG18-ASSOC','IMMO',		'281',    '7195', 'Amortissements des immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7199,'PCG18-ASSOC','IMMO',		'2812',    '7198', 'Agencements et aménagements de terrains sur sol propre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7200,'PCG18-ASSOC','IMMO',		'2813',    '7198', 'Constructions sur sol propre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7201,'PCG18-ASSOC','IMMO',		'2814',    '7198', 'Constructions sur sol d''autrui', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7202,'PCG18-ASSOC','IMMO',		'2815',    '7198', 'Installations techniques, matériel et outillage industriels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7203,'PCG18-ASSOC','IMMO',		'2818',    '7198', 'Autres immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7204,'PCG18-ASSOC','IMMO',		'29',    '7002', 'Provisions pour dépréciation des immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7205,'PCG18-ASSOC','IMMO',		'290',    '7204', 'Provisions pour dépréciation des immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7206,'PCG18-ASSOC','IMMO',		'2905',    '7205', 'Concessions et droits similaires, brevets, licences, marques et procédés, droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7207,'PCG18-ASSOC','IMMO',		'2906',    '7205', 'Droit au bail', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7208,'PCG18-ASSOC','IMMO',		'2908',    '7205', 'Autres immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7209,'PCG18-ASSOC','IMMO',		'291',    '7204', 'Provisions pour dépréciation des immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7210,'PCG18-ASSOC','IMMO',		'2911',    '7209', 'Terrains', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7211,'PCG18-ASSOC','IMMO',		'293',    '7204', 'Provisions pour dépréciation des immobilisations en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7212,'PCG18-ASSOC','IMMO',		'294',    '7204', 'Dépréciations des biens reçus par legs ou donations destinés à être cédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7213,'PCG18-ASSOC','IMMO',		'296',    '7204', 'Provisions pour dépréciation des participations et Créances rattachées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7214,'PCG18-ASSOC','IMMO',		'2961',    '7213', 'Titres de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7215,'PCG18-ASSOC','IMMO',		'2966',    '7213', 'Autres formes de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7216,'PCG18-ASSOC','IMMO',		'2967',    '7213', 'Créances rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7217,'PCG18-ASSOC','IMMO',		'297',    '7204', 'Provisions pour dépréciation des autres immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7218,'PCG18-ASSOC','IMMO',		'2971',    '7217', 'Titres immobilisés (droit de propriété)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7219,'PCG18-ASSOC','IMMO',		'2972',    '7217', 'Titres immobilisés (droit de créance)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7220,'PCG18-ASSOC','IMMO',		'2974',    '7217', 'Prêts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7221,'PCG18-ASSOC','IMMO',		'2975',    '7217', 'Dépôts et cautionnements versés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7222,'PCG18-ASSOC','IMMO',		'2976',    '7217', 'Autres créances immobilisées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7224,'PCG18-ASSOC','STOCK',		'31',    '7003', 'Matières premières et fournitures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7225,'PCG18-ASSOC','STOCK',		'311',    '7224', 'Matières premières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7226,'PCG18-ASSOC','STOCK',		'317',    '7224', 'Fournitures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7227,'PCG18-ASSOC','STOCK',		'32',    '7003', 'Autres approvisionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7228,'PCG18-ASSOC','STOCK',		'321',    '7227', 'Matières consommables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7229,'PCG18-ASSOC','STOCK',		'322',    '7227', 'Fournitures consommables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7230,'PCG18-ASSOC','STOCK',		'3221',    '7229', 'Combustibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7231,'PCG18-ASSOC','STOCK',		'3222',    '7229', 'Produits d''entretien', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7232,'PCG18-ASSOC','STOCK',		'3223',    '7229', 'Fournitures d''atelier', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7233,'PCG18-ASSOC','STOCK',		'3224',    '7229', 'Fournitures de magasin', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7234,'PCG18-ASSOC','STOCK',		'3225',    '7229', 'Fournitures de bureau', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7235,'PCG18-ASSOC','STOCK',		'3226',    '7229', 'Carburants', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7236,'PCG18-ASSOC','STOCK',		'3227',    '7229', 'Autres fournitures de matériel de transport', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7237,'PCG18-ASSOC','STOCK',		'3228',    '7229', 'Petit outillage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7238,'PCG18-ASSOC','STOCK',		'326',    '7227', 'Emballages (propriété de l''entité)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7239,'PCG18-ASSOC','STOCK',		'3261',    '7238', 'Emballages perdus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7240,'PCG18-ASSOC','STOCK',		'3265',    '7238', 'Emballages récupérables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7241,'PCG18-ASSOC','STOCK',		'3267',    '7238', 'Emballages mixtes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7242,'PCG18-ASSOC','STOCK',		'33',    '7003', 'En-cours de production de biens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7243,'PCG18-ASSOC','STOCK',		'331',    '7242', 'Produits en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7244,'PCG18-ASSOC','STOCK',		'335',    '7242', 'Travaux en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7245,'PCG18-ASSOC','STOCK',		'34',    '7003', 'En-cours de production de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7246,'PCG18-ASSOC','STOCK',		'341',    '7245', 'Etudes en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7247,'PCG18-ASSOC','STOCK',		'345',    '7245', 'Prestations de services en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7248,'PCG18-ASSOC','STOCK',		'35',    '7003', 'Stocks de produits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7249,'PCG18-ASSOC','STOCK',		'351',    '7248', 'Produits intermédiaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7250,'PCG18-ASSOC','STOCK',		'355',    '7248', 'Produits finis', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7251,'PCG18-ASSOC','STOCK',		'358',    '7248', 'Produits résiduels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7252,'PCG18-ASSOC','STOCK',		'37',    '7003', 'Stocks de marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7253,'PCG18-ASSOC','STOCK',		'39',    '7003', 'Provisions pour dépréciation des stocks', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7254,'PCG18-ASSOC','STOCK',		'391',    '7253', 'Dépréciation des matières premières et fournitures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7255,'PCG18-ASSOC','STOCK',		'3911',    '7254', 'Matières premières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7256,'PCG18-ASSOC','STOCK',		'3917',    '7254', 'Fournitures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7257,'PCG18-ASSOC','STOCK',		'392',    '7253', 'Dépréciation des autres approvisionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7258,'PCG18-ASSOC','STOCK',		'3921',    '7257', 'Matières consommables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7259,'PCG18-ASSOC','STOCK',		'3922',    '7257', 'Fournitures consommables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7260,'PCG18-ASSOC','STOCK',		'3926',    '7257', 'Emballages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7261,'PCG18-ASSOC','STOCK',		'393',    '7253', 'Dépréciation des en-cours de production de biens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7262,'PCG18-ASSOC','STOCK',		'3931',    '7261', 'Produits en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7263,'PCG18-ASSOC','STOCK',		'3935',    '7261', 'Travaux en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7264,'PCG18-ASSOC','STOCK',		'394',    '7253', 'Dépréciation des en-cours de production de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7265,'PCG18-ASSOC','STOCK',		'3941',    '7264', 'Etudes en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7266,'PCG18-ASSOC','STOCK',		'3945',    '7264', 'Prestations de services en cours', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7267,'PCG18-ASSOC','STOCK',		'395',    '7253', 'Dépréciation des stocks de produits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7268,'PCG18-ASSOC','STOCK',		'3951',    '7267', 'Produits intermédiaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7269,'PCG18-ASSOC','STOCK',		'3955',    '7267', 'Produits finis', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7270,'PCG18-ASSOC','STOCK',		'397',    '7253', 'Dépréciation des marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7272,'PCG18-ASSOC','THIRDPARTY',		'40',    '7004', 'Fournisseurs et comptes rattachés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7273,'PCG18-ASSOC','THIRDPARTY',		'401',    '7272', 'Fournisseurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7274,'PCG18-ASSOC','THIRDPARTY',		'4011',    '7273', 'Fournisseurs - achats de biens ou de prestations de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7275,'PCG18-ASSOC','THIRDPARTY',		'4017',    '7273', 'Fournisseurs - retenues de garanties et oppositions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7276,'PCG18-ASSOC','THIRDPARTY',		'403',    '7272', 'Fournisseurs - effets à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7277,'PCG18-ASSOC','THIRDPARTY',		'404',    '7272', 'Fournisseurs d''immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7278,'PCG18-ASSOC','THIRDPARTY',		'4041',    '7277', 'Fournisseurs - achats d''immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7279,'PCG18-ASSOC','THIRDPARTY',		'4047',    '7277', 'Fournisseurs d''immobilisations - retenues de garantie et oppositions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7280,'PCG18-ASSOC','THIRDPARTY',		'405',    '7272', 'Fournisseurs d''immobilisations - effets à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7281,'PCG18-ASSOC','THIRDPARTY',		'408',    '7272', 'Fournisseurs - factures non parvenues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7282,'PCG18-ASSOC','THIRDPARTY',		'4081',    '7281', 'Fournisseurs d''autres biens et services - factures non parvenues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7283,'PCG18-ASSOC','THIRDPARTY',		'4084',    '7281', 'Fournisseurs d''immobilisations - factures non parvenues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7284,'PCG18-ASSOC','THIRDPARTY',		'409',    '7272', 'Fournisseurs débiteurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7285,'PCG18-ASSOC','THIRDPARTY',		'4091',    '7284', 'Fournisseurs, avances versées sur commandes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7286,'PCG18-ASSOC','THIRDPARTY',		'4096',    '7284', 'Fournisseurs, créances pour emballages et matériel à rendre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7287,'PCG18-ASSOC','THIRDPARTY',		'4098',    '7284', 'Rabais, remises et ristournes à obtenir et autres avoirs non encore reçus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7288,'PCG18-ASSOC','THIRDPARTY',		'41',    '7004', 'Clients, usagers et comptes rattachés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7289,'PCG18-ASSOC','THIRDPARTY',		'411',    '7288', 'Clients, usagers (et organismes de prise en charge)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7290,'PCG18-ASSOC','THIRDPARTY',		'413',    '7288', 'Clients, usagers, effets à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7291,'PCG18-ASSOC','THIRDPARTY',		'416',    '7288', 'Clients, usagers, créances douteuses ou litigieuses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7292,'PCG18-ASSOC','THIRDPARTY',		'418',    '7288', 'Clients, usagers, produits non encore facturés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7293,'PCG18-ASSOC','THIRDPARTY',		'4181',    '7292', 'Clients, usagers - factures à établir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7294,'PCG18-ASSOC','THIRDPARTY',		'4188',    '7292', 'Clients, usagers - intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7295,'PCG18-ASSOC','THIRDPARTY',		'419',    '7288', 'Clients, usagers - clients, créditeurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7296,'PCG18-ASSOC','THIRDPARTY',		'4191',    '7295', 'Clients, usagers - avances et acomptes reçus sur commande', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7297,'PCG18-ASSOC','THIRDPARTY',		'4196',    '7295', 'Clients, usagers - dettes pour emballages et matériels consignés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7298,'PCG18-ASSOC','THIRDPARTY',		'4198',    '7295', 'Rabais, remises et ristournes à accorder et autres avoirs à établir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7299,'PCG18-ASSOC','THIRDPARTY',		'42',    '7004', 'Personnel et comptes rattachés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7300,'PCG18-ASSOC','THIRDPARTY',		'421',    '7299', 'Personnel - rémunérations dues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7301,'PCG18-ASSOC','THIRDPARTY',		'422',    '7299', 'Comité d''entreprise, d''établissement, d''hygiène et de sécurité, œuvres sociales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7302,'PCG18-ASSOC','THIRDPARTY',		'424',    '7299', 'Participation des salariés aux résultats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7303,'PCG18-ASSOC','THIRDPARTY',		'425',    '7299', 'Personnel - avances et acomptes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7304,'PCG18-ASSOC','THIRDPARTY',		'426',    '7299', 'Personnel - dépôts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7305,'PCG18-ASSOC','THIRDPARTY',		'427',    '7299', 'Personnel - oppositions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7306,'PCG18-ASSOC','THIRDPARTY',		'428',    '7299', 'Personnel - charges à payer et produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7307,'PCG18-ASSOC','THIRDPARTY',		'4282',    '7306', 'Dettes provisionnées pour congés à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7308,'PCG18-ASSOC','THIRDPARTY',		'4284',    '7306', 'Dettes provisionnées pour participation des salariés aux résultats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7309,'PCG18-ASSOC','THIRDPARTY',		'4286',    '7306', 'Personnel - autres charges à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7310,'PCG18-ASSOC','THIRDPARTY',		'4287',    '7306', 'Personnel - produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7311,'PCG18-ASSOC','THIRDPARTY',		'43',    '7004', 'Sécurité Sociale et autres organismes sociaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7312,'PCG18-ASSOC','THIRDPARTY',		'431',    '7311', 'Sécurité Sociale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7313,'PCG18-ASSOC','THIRDPARTY',		'437',    '7311', 'Autres organismes sociaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7314,'PCG18-ASSOC','THIRDPARTY',		'4372',    '7313', 'Mutuelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7315,'PCG18-ASSOC','THIRDPARTY',		'4373',    '7313', 'Caisses de retraite et de prévoyance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7316,'PCG18-ASSOC','THIRDPARTY',		'4374',    '7313', 'Caisses d''allocations de chômage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7317,'PCG18-ASSOC','THIRDPARTY',		'4378',    '7313', 'Autres organismes sociaux divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7318,'PCG18-ASSOC','THIRDPARTY',		'438',    '7311', 'Organismes sociaux - charges à payer et produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7319,'PCG18-ASSOC','THIRDPARTY',		'4382',    '7318', 'Charges sociales sur congés à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7320,'PCG18-ASSOC','THIRDPARTY',		'4386',    '7318', 'Organismes sociaux - charges à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7321,'PCG18-ASSOC','THIRDPARTY',		'4387',    '7318', 'Organismes sociaux - produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7322,'PCG18-ASSOC','THIRDPARTY',		'44',    '7004', 'Etat et autres collectivités publiques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7323,'PCG18-ASSOC','THIRDPARTY',		'441',    '7322', 'Etat, établissements publics et collectivités publiques - Subventions à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7324,'PCG18-ASSOC','THIRDPARTY',		'4411',    '7323', 'Subventions d''investissement à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7325,'PCG18-ASSOC','THIRDPARTY',		'4417',    '7323', 'Subventions d''exploitation à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7326,'PCG18-ASSOC','THIRDPARTY',		'4418',    '7323', 'Subventions d''équilibre à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7327,'PCG18-ASSOC','THIRDPARTY',		'4419',    '7323', 'Avances sur subventions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7328,'PCG18-ASSOC','THIRDPARTY',		'442',    '7322', 'Contributions, impôts et taxes recouvrés pour le compte de l''Etat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7329,'PCG18-ASSOC','THIRDPARTY',		'4421',    '7328', 'Prélèvements à la source (Impôt sur le revenu)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7330,'PCG18-ASSOC','THIRDPARTY',		'4422',    '7328', 'Prélèvements forfaitaires non libératoires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7331,'PCG18-ASSOC','THIRDPARTY',		'443',    '7322', 'Opérations particulières avec l''Etat, les collectivités  publiques, les organismes internationaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7332,'PCG18-ASSOC','THIRDPARTY',		'444',    '7322', 'Etat - impôts sur les bénéfices', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7333,'PCG18-ASSOC','THIRDPARTY',		'445',    '7322', 'Etat - taxes sur le chiffre d''affaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7334,'PCG18-ASSOC','THIRDPARTY',		'4452',    '7333', 'TVA due intracommunautaire', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7335,'PCG18-ASSOC','THIRDPARTY',		'4455',    '7333', 'Taxes sur le chiffre d''affaires à décaisser', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7336,'PCG18-ASSOC','THIRDPARTY',		'44551',    '7335', 'TVA à décaisser', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7337,'PCG18-ASSOC','THIRDPARTY',		'4456',    '7333', 'Taxes sur le chiffre d''affaires déductibles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7338,'PCG18-ASSOC','THIRDPARTY',		'44562',    '7337', 'TVA sur immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7339,'PCG18-ASSOC','THIRDPARTY',		'44566',    '7337', 'TVA sur biens et services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7340,'PCG18-ASSOC','THIRDPARTY',		'44567',    '7337', 'Crédit de TVA à reporter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7341,'PCG18-ASSOC','THIRDPARTY',		'4457',    '7333', 'Taxes sur le chiffre d''affaires collectées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7342,'PCG18-ASSOC','THIRDPARTY',		'44571',    '7341', 'TVA collectée', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7343,'PCG18-ASSOC','THIRDPARTY',		'4458',    '7333', 'Taxes sur le chiffre d''affaires à régulariser', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7344,'PCG18-ASSOC','THIRDPARTY',		'44583',    '7343', 'Remboursement de taxe sur le chiffre d''affaires demandé', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7345,'PCG18-ASSOC','THIRDPARTY',		'44584',    '7343', 'TVA récupérée d''avance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7346,'PCG18-ASSOC','THIRDPARTY',		'447',    '7322', 'Autres impôts, taxes et versements assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7347,'PCG18-ASSOC','THIRDPARTY',		'4471',    '7346', 'Taxe sur les salaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7348,'PCG18-ASSOC','THIRDPARTY',		'4472',    '7346', 'CFE, CVAE', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7349,'PCG18-ASSOC','THIRDPARTY',		'4478',    '7346', 'Autres impôts et taxes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7350,'PCG18-ASSOC','THIRDPARTY',		'448',    '7322', 'Etat, charges à payer et produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7351,'PCG18-ASSOC','THIRDPARTY',		'4482',    '7350', 'Charges fiscales sur congés à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7352,'PCG18-ASSOC','THIRDPARTY',		'4486',    '7350', 'Etat - charges à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7353,'PCG18-ASSOC','THIRDPARTY',		'4487',    '7350', 'Etat - produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7354,'PCG18-ASSOC','THIRDPARTY',		'45',    '7004', 'Confédération, fédération, union, entités affiliées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7355,'PCG18-ASSOC','THIRDPARTY',		'451',    '7354', 'Confédération, fédération, union et entités affiliées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7356,'PCG18-ASSOC','THIRDPARTY',		'455',    '7354', 'Partenaires - comptes courants', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7357,'PCG18-ASSOC','THIRDPARTY',		'46',    '7004', 'Débiteurs et créditeurs divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7358,'PCG18-ASSOC','THIRDPARTY',		'461',    '7357', 'Créances reçues par legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7359,'PCG18-ASSOC','THIRDPARTY',		'462',    '7357', 'Créances sur cessions d''immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7360,'PCG18-ASSOC','THIRDPARTY',		'463',    '7357', 'Fonds en dépôts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7361,'PCG18-ASSOC','THIRDPARTY',		'4632',    '7360', 'Fonds reçus ou déposés - usagers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7362,'PCG18-ASSOC','THIRDPARTY',		'4633',    '7360', 'Autres fonds en dépôt', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7363,'PCG18-ASSOC','THIRDPARTY',		'464',    '7357', 'Dettes sur acquisitions de valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7364,'PCG18-ASSOC','THIRDPARTY',		'465',    '7357', 'Créances sur acquisitions de valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7365,'PCG18-ASSOC','THIRDPARTY',		'466',    '7357', 'Dettes des legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7366,'PCG18-ASSOC','THIRDPARTY',		'467',    '7357', 'Autres comptes débiteurs ou créditeurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7367,'PCG18-ASSOC','THIRDPARTY',		'4671',    '7366', 'Créditeurs divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7368,'PCG18-ASSOC','THIRDPARTY',		'4672',    '7366', 'Débiteurs divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7369,'PCG18-ASSOC','THIRDPARTY',		'468',    '7357', 'Divers, charges à payer - produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7370,'PCG18-ASSOC','THIRDPARTY',		'4681',    '7369', 'Frais des bénévoles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7371,'PCG18-ASSOC','THIRDPARTY',		'4686',    '7369', 'Autres charges à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7372,'PCG18-ASSOC','THIRDPARTY',		'4687',    '7369', 'Autres produits à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7373,'PCG18-ASSOC','THIRDPARTY',		'47',    '7004', 'Comptes transitoires ou d''attente', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7374,'PCG18-ASSOC','THIRDPARTY',		'471',    '7373', 'Comptes d''attente (jusqu''à 474)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7375,'PCG18-ASSOC','THIRDPARTY',		'476',    '7373', 'Différences de conversion - actif', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7376,'PCG18-ASSOC','THIRDPARTY',		'477',    '7373', 'Différences de conversion - passif', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7377,'PCG18-ASSOC','THIRDPARTY',		'478',    '7373', 'Autres comptes transitoires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7378,'PCG18-ASSOC','THIRDPARTY',		'48',    '7004', 'Comptes de régularisation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7379,'PCG18-ASSOC','THIRDPARTY',		'481',    '7378', 'Charges à répartir sur plusieurs exercices', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7380,'PCG18-ASSOC','THIRDPARTY',		'4816',    '7379', 'Frais d''émission d''emprunts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7381,'PCG18-ASSOC','THIRDPARTY',		'486',    '7378', 'Charges constatées d''avance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7382,'PCG18-ASSOC','THIRDPARTY',		'487',    '7378', 'Produits constatés d''avance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7383,'PCG18-ASSOC','THIRDPARTY',		'49',    '7004', 'Provisions pour dépréciation des comptes de tiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7384,'PCG18-ASSOC','THIRDPARTY',		'491',    '7383', 'Dépréciation des comptes de clients et d''usagers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7385,'PCG18-ASSOC','THIRDPARTY',		'495',    '7383', 'Dépréciation des comptes de confédérations, fédérations, unions, entités affiliées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7386,'PCG18-ASSOC','THIRDPARTY',		'496',    '7383', 'Dépréciation des comptes de débiteurs divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7388,'PCG18-ASSOC','FINAN',		'50',    '7005', 'Valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7389,'PCG18-ASSOC','FINAN',		'503',    '7388', 'Actions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7390,'PCG18-ASSOC','FINAN',		'5031',    '7389', 'Titres cotés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7391,'PCG18-ASSOC','FINAN',		'5035',    '7389', 'Titres non cotés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7392,'PCG18-ASSOC','FINAN',		'504',    '7388', 'Autres titres conférant un droit de propriété', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7393,'PCG18-ASSOC','FINAN',		'506',    '7388', 'Obligations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7394,'PCG18-ASSOC','FINAN',		'5061',    '7393', 'Titres cotés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7395,'PCG18-ASSOC','FINAN',		'5065',    '7393', 'Titres non cotés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7396,'PCG18-ASSOC','FINAN',		'507',    '7388', 'Bons du Trésor et bons de caisse à court terme', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7397,'PCG18-ASSOC','FINAN',		'508',    '7388', 'Autres valeurs mobilières et créances assimilées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7398,'PCG18-ASSOC','FINAN',		'5081',    '7397', 'Autres valeurs mobilières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7399,'PCG18-ASSOC','FINAN',		'5082',    '7397', 'Bons de souscription', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7400,'PCG18-ASSOC','FINAN',		'5088',    '7397', 'Intérêts courus sur obligations, bons et valeurs assimilées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7401,'PCG18-ASSOC','FINAN',		'509',    '7388', 'Versements restant à effectuer sur VMP non libérées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7402,'PCG18-ASSOC','FINAN',		'51',    '7005', 'Banques et établissements financiers assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7403,'PCG18-ASSOC','FINAN',		'511',    '7402', 'Valeurs à l''encaissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7404,'PCG18-ASSOC','FINAN',		'5111',    '7403', 'Coupons échus à l''encaissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7405,'PCG18-ASSOC','FINAN',		'5112',    '7403', 'Chèques à encaisser', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7406,'PCG18-ASSOC','FINAN',		'5113',    '7403', 'Effets à l''encaissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7407,'PCG18-ASSOC','FINAN',		'5114',    '7403', 'Effets à l''escompte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7408,'PCG18-ASSOC','FINAN',		'512',    '7402', 'Banques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7409,'PCG18-ASSOC','FINAN',		'5121',    '7408', 'Comptes en monnaie nationale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7410,'PCG18-ASSOC','FINAN',		'5124',    '7408', 'Comptes en devises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7411,'PCG18-ASSOC','FINAN',		'514',    '7402', 'Chèques postaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7412,'PCG18-ASSOC','FINAN',		'515',    '7402', '"Caisse" du Trésor et des établissements publics', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7413,'PCG18-ASSOC','FINAN',		'516',    '7402', 'Sociétés de bourse', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7414,'PCG18-ASSOC','FINAN',		'517',    '7402', 'Autres organismes financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7415,'PCG18-ASSOC','FINAN',		'518',    '7402', 'Intérêts courus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7416,'PCG18-ASSOC','FINAN',		'5186',    '7415', 'Intérêts courus à payer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7417,'PCG18-ASSOC','FINAN',		'5187',    '7415', 'Intérêts courus à recevoir', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7418,'PCG18-ASSOC','FINAN',		'519',    '7402', 'Concours bancaires courants (même ventilation que les 51)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7419,'PCG18-ASSOC','FINAN',		'52',    '7005', 'Instruments de trésorerie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7420,'PCG18-ASSOC','FINAN',		'53',    '7005', 'Caisse', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7421,'PCG18-ASSOC','FINAN',		'531',    '7420', 'Caisses du siège', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7422,'PCG18-ASSOC','FINAN',		'532',    '7420', 'Caisses des établissements (jusqu''à 537)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7423,'PCG18-ASSOC','FINAN',		'54',    '7005', 'Régies d''avance et accréditifs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7424,'PCG18-ASSOC','FINAN',		'541',    '7423', 'Régie d''avance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7425,'PCG18-ASSOC','FINAN',		'542',    '7423', 'Accréditifs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7426,'PCG18-ASSOC','FINAN',		'58',    '7005', 'Virements internes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7427,'PCG18-ASSOC','FINAN',		'581',    '7426', 'Virements de fonds', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7428,'PCG18-ASSOC','FINAN',		'59',    '7005', 'Provisions pour dépréciation des comptes financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7429,'PCG18-ASSOC','FINAN',		'590',    '7428', 'Provisions pour dépréciation des valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7430,'PCG18-ASSOC','FINAN',		'5903',    '7429', 'Actions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7431,'PCG18-ASSOC','FINAN',		'5904',    '7429', 'Autres titres conférant un droit de propriété', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7432,'PCG18-ASSOC','FINAN',		'5906',    '7429', 'Obligations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7433,'PCG18-ASSOC','FINAN',		'5908',    '7429', 'Autres valeurs mobilières de placement et créances assimilées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7435,'PCG18-ASSOC','EXPENSE',		'60',    '7006', 'Achats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7436,'PCG18-ASSOC','EXPENSE',		'601',    '7435', 'Achats stockés - matières premières et fournitures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7437,'PCG18-ASSOC','EXPENSE',		'602',    '7435', 'Achats stockés - autres approvisionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7438,'PCG18-ASSOC','EXPENSE',		'6021',    '7437', 'Produits pharmaceutiques et produits à usage médical', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7439,'PCG18-ASSOC','EXPENSE',		'6022',    '7437', 'Fournitures consommables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7440,'PCG18-ASSOC','EXPENSE',		'6023',    '7437', 'Alimentation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7441,'PCG18-ASSOC','EXPENSE',		'6026',    '7437', 'Emballages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7442,'PCG18-ASSOC','EXPENSE',		'6028',    '7437', 'Autres fournitures suivies en stock', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7443,'PCG18-ASSOC','EXPENSE',		'603',    '7435', 'Variations des stocks', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7444,'PCG18-ASSOC','EXPENSE',		'6031',    '7443', 'Variations des stocks de matières premières et fournitures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7445,'PCG18-ASSOC','EXPENSE',		'6032',    '7443', 'Variations des stocks des autres approvisionnements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7446,'PCG18-ASSOC','EXPENSE',		'6037',    '7443', 'Variation des stocks de marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7447,'PCG18-ASSOC','EXPENSE',		'604',    '7435', 'Achats d''études et de prestations de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7448,'PCG18-ASSOC','EXPENSE',		'605',    '7435', 'Achats de matériels, d''équipements et de travaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7449,'PCG18-ASSOC','EXPENSE',		'606',    '7435', 'Achats non stockés de matières et fournitures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7450,'PCG18-ASSOC','EXPENSE',		'6061',    '7449', 'Fournitures non stockables (eau, énergie ….)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7451,'PCG18-ASSOC','EXPENSE',		'6063',    '7449', 'Fournitures d''entretien et de petit équipement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7452,'PCG18-ASSOC','EXPENSE',		'6064',    '7449', 'Fournitures administratives', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7453,'PCG18-ASSOC','EXPENSE',		'6068',    '7449', 'Autres matières et fournitures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7454,'PCG18-ASSOC','EXPENSE',		'607',    '7435', 'Achats de marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7455,'PCG18-ASSOC','EXPENSE',		'608',    '7435', 'Frais accessoires d''achats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7456,'PCG18-ASSOC','EXPENSE',		'609',    '7435', 'Rabais, remises et ristournes obtenus sur achats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7457,'PCG18-ASSOC','EXPENSE',		'61',    '7006', 'Services extérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7458,'PCG18-ASSOC','EXPENSE',		'611',    '7457', 'Sous-traitance générale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7459,'PCG18-ASSOC','EXPENSE',		'612',    '7457', 'Redevances de crédit bail', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7460,'PCG18-ASSOC','EXPENSE',		'6122',    '7459', 'Crédit bail mobilier', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7461,'PCG18-ASSOC','EXPENSE',		'6125',    '7459', 'Crédit bail immobilier', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7462,'PCG18-ASSOC','EXPENSE',		'613',    '7457', 'Locations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7463,'PCG18-ASSOC','EXPENSE',		'6132',    '7462', 'Locations immobilières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7464,'PCG18-ASSOC','EXPENSE',		'6135',    '7462', 'Locations mobilières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7465,'PCG18-ASSOC','EXPENSE',		'614',    '7457', 'Charges locatives et de copropriété', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7466,'PCG18-ASSOC','EXPENSE',		'615',    '7457', 'Entretien et réparations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7467,'PCG18-ASSOC','EXPENSE',		'6152',    '7466', 'Entretien et réparations sur biens immobiliers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7468,'PCG18-ASSOC','EXPENSE',		'6155',    '7466', 'Entretien et réparations sur biens mobiliers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7469,'PCG18-ASSOC','EXPENSE',		'6156',    '7466', 'Maintenance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7470,'PCG18-ASSOC','EXPENSE',		'616',    '7457', 'Primes d''assurances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7471,'PCG18-ASSOC','EXPENSE',		'6161',    '7470', 'Multirisques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7472,'PCG18-ASSOC','EXPENSE',		'6162',    '7470', 'Assurance obligatoire dommage construction', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7473,'PCG18-ASSOC','EXPENSE',		'6163',    '7470', 'Assurance transport', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7474,'PCG18-ASSOC','EXPENSE',		'6164',    '7470', 'Risques d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7475,'PCG18-ASSOC','EXPENSE',		'6165',    '7470', 'Insolvabilité clients', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7476,'PCG18-ASSOC','EXPENSE',		'617',    '7457', 'Etudes et recherches', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7477,'PCG18-ASSOC','EXPENSE',		'618',    '7457', 'Divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7478,'PCG18-ASSOC','EXPENSE',		'6181',    '7477', 'Documentation générale', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7479,'PCG18-ASSOC','EXPENSE',		'6183',    '7477', 'Documentation technique', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7480,'PCG18-ASSOC','EXPENSE',		'6185',    '7477', 'Frais de colloques, séminaires, conférences', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7481,'PCG18-ASSOC','EXPENSE',		'619',    '7457', 'Rabais, remises et ristournes obtenus sur services extérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7482,'PCG18-ASSOC','EXPENSE',		'62',    '7006', 'Autres services extérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7483,'PCG18-ASSOC','EXPENSE',		'621',    '7482', 'Personnel extérieur à l''association', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7484,'PCG18-ASSOC','EXPENSE',		'6211',    '7483', 'Personnel intérimaire', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7485,'PCG18-ASSOC','EXPENSE',		'6214',    '7483', 'Personnel détaché ou prêté à l''association', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7486,'PCG18-ASSOC','EXPENSE',		'622',    '7482', 'Rémunérations d''intermédiaires et honoraires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7487,'PCG18-ASSOC','EXPENSE',		'6221',    '7486', 'Commissions et courtages sur achats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7488,'PCG18-ASSOC','EXPENSE',		'6222',    '7486', 'Commissions et courtages sur ventes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7489,'PCG18-ASSOC','EXPENSE',		'6224',    '7486', 'rémunérations des transitaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7490,'PCG18-ASSOC','EXPENSE',		'6225',    '7486', 'rémunérations d''affacturage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7491,'PCG18-ASSOC','EXPENSE',		'6226',    '7486', 'Honoraires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7492,'PCG18-ASSOC','EXPENSE',		'62264',    '7491', 'Honoraires sur legs ou donations destinés à être cédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7493,'PCG18-ASSOC','EXPENSE',		'6227',    '7486', 'Frais d''actes et de contentieux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7494,'PCG18-ASSOC','EXPENSE',		'6228',    '7486', 'Divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7495,'PCG18-ASSOC','EXPENSE',		'623',    '7482', 'Information, publications, relations publiques', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7496,'PCG18-ASSOC','EXPENSE',		'6231',    '7495', 'Annonces et insertions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7497,'PCG18-ASSOC','EXPENSE',		'6232',    '7495', 'Echantillons', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7498,'PCG18-ASSOC','EXPENSE',		'6233',    '7495', 'Foires et expositions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7499,'PCG18-ASSOC','EXPENSE',		'6234',    '7495', 'Cadeaux à la clientèle', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7500,'PCG18-ASSOC','EXPENSE',		'6235',    '7495', 'Primes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7501,'PCG18-ASSOC','EXPENSE',		'6236',    '7495', 'Catalogues et imprimés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7502,'PCG18-ASSOC','EXPENSE',		'6237',    '7495', 'Publications', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7503,'PCG18-ASSOC','EXPENSE',		'6238',    '7495', 'Divers ( pourboires, dons courants, …)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7504,'PCG18-ASSOC','EXPENSE',		'624',    '7482', 'Transports de biens, d''usagers et transports collectifs du personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7505,'PCG18-ASSOC','EXPENSE',		'6241',    '7504', 'Transport aux achats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7506,'PCG18-ASSOC','EXPENSE',		'6242',    '7504', 'Transport aux ventes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7507,'PCG18-ASSOC','EXPENSE',		'6243',    '7504', 'Transport entre établissements ou chantiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7508,'PCG18-ASSOC','EXPENSE',		'6244',    '7504', 'Transport administratifs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7509,'PCG18-ASSOC','EXPENSE',		'6247',    '7504', 'Transport collectif du personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7510,'PCG18-ASSOC','EXPENSE',		'625',    '7482', 'Déplacements, missions et réceptions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7511,'PCG18-ASSOC','EXPENSE',		'6251',    '7510', 'Voyages et déplacements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7512,'PCG18-ASSOC','EXPENSE',		'6255',    '7510', 'Frais de déménagement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7513,'PCG18-ASSOC','EXPENSE',		'6256',    '7510', 'Missions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7514,'PCG18-ASSOC','EXPENSE',		'6257',    '7510', 'Réceptions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7515,'PCG18-ASSOC','EXPENSE',		'626',    '7482', 'Frais postaux et frais de télécommunications', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7516,'PCG18-ASSOC','EXPENSE',		'6261',    '7515', 'Liaisons informatiques et spécialisées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7517,'PCG18-ASSOC','EXPENSE',		'6263',    '7515', 'Affranchissements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7518,'PCG18-ASSOC','EXPENSE',		'6265',    '7515', 'Téléphone', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7519,'PCG18-ASSOC','EXPENSE',		'6268',    '7515', 'Autres frais postaux et de télécommunications', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7520,'PCG18-ASSOC','EXPENSE',		'627',    '7482', 'Services bancaires et assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7521,'PCG18-ASSOC','EXPENSE',		'6271',    '7520', 'Frais sur titres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7522,'PCG18-ASSOC','EXPENSE',		'6272',    '7520', 'Commissions sur emprunts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7523,'PCG18-ASSOC','EXPENSE',		'6275',    '7520', 'Frais sur effets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7524,'PCG18-ASSOC','EXPENSE',		'6276',    '7520', 'Location de coffre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7525,'PCG18-ASSOC','EXPENSE',		'6278',    '7520', 'Autres frais et commissions sur prestations de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7526,'PCG18-ASSOC','EXPENSE',		'628',    '7482', 'Autres prestations de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7527,'PCG18-ASSOC','EXPENSE',		'6281',    '7526', 'Concours divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7528,'PCG18-ASSOC','EXPENSE',		'6284',    '7526', 'Frais de recrutement  du personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7529,'PCG18-ASSOC','EXPENSE',		'6288',    '7526', 'Autres prestations diverses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7530,'PCG18-ASSOC','EXPENSE',		'629',    '7482', 'Rabais, remises et ristournes obtenus sur autres services extérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7531,'PCG18-ASSOC','EXPENSE',		'63',    '7006', 'Impôts, taxes et versements assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7532,'PCG18-ASSOC','EXPENSE',		'631',    '7531', 'Impôts, taxes et versements assimilés sur rémunérations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7533,'PCG18-ASSOC','EXPENSE',		'6311',    '7532', 'Taxes sur les salaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7534,'PCG18-ASSOC','EXPENSE',		'6312',    '7532', 'Taxe d''apprentissage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7535,'PCG18-ASSOC','EXPENSE',		'6313',    '7532', 'Participation des employeurs à la formation professionnelle continue', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7536,'PCG18-ASSOC','EXPENSE',		'6314',    '7532', 'Cotisation pour défaut d''investissement obligatoire dans laconstruction', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7537,'PCG18-ASSOC','EXPENSE',		'6318',    '7532', 'Autres impôts sur rémunérations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7538,'PCG18-ASSOC','EXPENSE',		'633',    '7531', 'Impôts, taxes et versements assimilés sur rémunérations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7539,'PCG18-ASSOC','EXPENSE',		'6331',    '7538', 'Versement de transport', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7540,'PCG18-ASSOC','EXPENSE',		'6332',    '7538', 'Allocation logement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7541,'PCG18-ASSOC','EXPENSE',		'6333',    '7538', 'Participation des employeurs à la formation professionnelle continue', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7542,'PCG18-ASSOC','EXPENSE',		'6334',    '7538', 'Participation des employeurs à l''effort de construction', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7543,'PCG18-ASSOC','EXPENSE',		'6335',    '7538', 'Versements libératoires ouvrant droit à l''exonération de la taxe d''apprentissage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7544,'PCG18-ASSOC','EXPENSE',		'6338',    '7538', 'Autres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7545,'PCG18-ASSOC','EXPENSE',		'635',    '7531', 'Autres impôts, taxes et versements assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7546,'PCG18-ASSOC','EXPENSE',		'6351',    '7545', 'Impôts directs (sauf impôts sur les bénéfices)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7547,'PCG18-ASSOC','EXPENSE',		'63511',    '7546', 'CFE, CVAE', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7548,'PCG18-ASSOC','EXPENSE',		'63512',    '7546', 'Taxes foncières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7549,'PCG18-ASSOC','EXPENSE',		'63513',    '7546', 'Autres impôts locaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7550,'PCG18-ASSOC','EXPENSE',		'6352',    '7545', 'Taxe sur le chiffre d''affaire non récupérables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7551,'PCG18-ASSOC','EXPENSE',		'6353',    '7545', 'Impôts indirects', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7552,'PCG18-ASSOC','EXPENSE',		'6354',    '7545', 'Droits d''enregistrement et de timbres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7553,'PCG18-ASSOC','EXPENSE',		'63541',    '7552', 'Droit de mutation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7554,'PCG18-ASSOC','EXPENSE',		'6358',    '7545', 'Autres droits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7555,'PCG18-ASSOC','EXPENSE',		'637',    '7531', 'Autres impôts, taxes et versements assimilés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7556,'PCG18-ASSOC','EXPENSE',		'6371',    '7555', 'Contribution sociale de solidarité à la charge des sociétés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7557,'PCG18-ASSOC','EXPENSE',		'6374',    '7555', 'Impôts et taxes exigibles à l''étranger', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7558,'PCG18-ASSOC','EXPENSE',		'6378',    '7555', 'Taxes diverses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7559,'PCG18-ASSOC','EXPENSE',		'64',    '7006', 'Charges de personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7560,'PCG18-ASSOC','EXPENSE',		'641',    '7559', 'Rémunérations du personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7561,'PCG18-ASSOC','EXPENSE',		'6411',    '7560', 'Salaires, appointements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7562,'PCG18-ASSOC','EXPENSE',		'6412',    '7560', 'Congés payés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7563,'PCG18-ASSOC','EXPENSE',		'6413',    '7560', 'Primes et gratifications', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7564,'PCG18-ASSOC','EXPENSE',		'6414',    '7560', 'Indemnités et avantages divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7565,'PCG18-ASSOC','EXPENSE',		'6415',    '7560', 'Supplément familial', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7566,'PCG18-ASSOC','EXPENSE',		'645',    '7559', 'Charges de Sécurité Sociale et de prévoyance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7567,'PCG18-ASSOC','EXPENSE',		'6451',    '7566', 'Cotisations à l''URSSAF', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7568,'PCG18-ASSOC','EXPENSE',		'6452',    '7566', 'Cotisations aux mutuelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7569,'PCG18-ASSOC','EXPENSE',		'6453',    '7566', 'Cotisations aux caisses de retraite', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7570,'PCG18-ASSOC','EXPENSE',		'6454',    '7566', 'Cotisations aux caisses d''allocations de chômage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7571,'PCG18-ASSOC','EXPENSE',		'6458',    '7566', 'Cotisations aux autres organismes sociaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7572,'PCG18-ASSOC','EXPENSE',		'647',    '7559', 'Autres charges sociales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7573,'PCG18-ASSOC','EXPENSE',		'6471',    '7572', 'Prestations directes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7574,'PCG18-ASSOC','EXPENSE',		'6472',    '7572', 'Versements aux comités d''entreprise et d''établissement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7575,'PCG18-ASSOC','EXPENSE',		'6473',    '7572', 'Dotations aux comités d''hygiène et de sécurité', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7576,'PCG18-ASSOC','EXPENSE',		'6474',    '7572', 'Dotations aux autres œuvres sociales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7577,'PCG18-ASSOC','EXPENSE',		'6475',    '7572', 'Médecine du travail', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7578,'PCG18-ASSOC','EXPENSE',		'6478',    '7572', 'Divers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7579,'PCG18-ASSOC','EXPENSE',		'648',    '7559', 'Autres charges de personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7580,'PCG18-ASSOC','EXPENSE',		'65',    '7006', 'Autres charges de gestion courante', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7581,'PCG18-ASSOC','EXPENSE',		'651',    '7580', 'Redevances pour concessions, brevets, licences, procédés, droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7582,'PCG18-ASSOC','EXPENSE',		'6511',    '7581', 'Redevances pour concessions, brevets, licences, marques et procédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7583,'PCG18-ASSOC','EXPENSE',		'6516',    '7581', 'Droits d''auteurs et de reproduction', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7584,'PCG18-ASSOC','EXPENSE',		'6518',    '7581', 'Autres droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7585,'PCG18-ASSOC','EXPENSE',		'653',    '7580', 'Charges de la générosité du public', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7586,'PCG18-ASSOC','EXPENSE',		'6531',    '7585', 'Autres charges sur legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7587,'PCG18-ASSOC','EXPENSE',		'654',    '7580', 'Pertes sur créances irrécouvrables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7588,'PCG18-ASSOC','EXPENSE',		'6541',    '7587', 'Créances de l''exercice', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7589,'PCG18-ASSOC','EXPENSE',		'6544',    '7587', 'Créances des exercices antérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7590,'PCG18-ASSOC','EXPENSE',		'655',    '7580', 'Quotes-parts de résultat sur opérations faites en commun', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7591,'PCG18-ASSOC','EXPENSE',		'6556',    '7590', 'Frais de siège social du gestionnaire', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7592,'PCG18-ASSOC','EXPENSE',		'6558',    '7590', 'Quotes-parts de résultat sur opérations faites dans le cadre d''un groupement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7593,'PCG18-ASSOC','EXPENSE',		'657',    '7580', 'Aides financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7594,'PCG18-ASSOC','EXPENSE',		'6571',    '7593', 'Aides financières versées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7595,'PCG18-ASSOC','EXPENSE',		'6572',    '7593', 'Quotes-parts de générosité reversée', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7596,'PCG18-ASSOC','EXPENSE',		'658',    '7580', 'Charges diverses de gestion courante', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7597,'PCG18-ASSOC','EXPENSE',		'6586',    '7596', 'Fonds de solidarité', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7598,'PCG18-ASSOC','EXPENSE',		'6588',    '7596', 'Autres', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7599,'PCG18-ASSOC','EXPENSE',		'66',    '7006', 'Charges financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7600,'PCG18-ASSOC','EXPENSE',		'661',    '7599', 'Charges d''intérêts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7601,'PCG18-ASSOC','EXPENSE',		'6611',    '7600', 'Intérêts des emprunts et dettes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7602,'PCG18-ASSOC','EXPENSE',		'6615',    '7600', 'Intérêts des comptes courants et des dépôts créditeurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7603,'PCG18-ASSOC','EXPENSE',		'6616',    '7600', 'Intérêts bancaires et sur opérations de financement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7604,'PCG18-ASSOC','EXPENSE',		'6617',    '7600', 'Intérêts des obligations cautionnées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7605,'PCG18-ASSOC','EXPENSE',		'6618',    '7600', 'Intérêts des autres dettes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7606,'PCG18-ASSOC','EXPENSE',		'664',    '7599', 'Pertes sur créances liées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7607,'PCG18-ASSOC','EXPENSE',		'665',    '7599', 'Escomptes accordés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7608,'PCG18-ASSOC','EXPENSE',		'666',    '7599', 'Pertes de change', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7609,'PCG18-ASSOC','EXPENSE',		'667',    '7599', 'Charges nettes sur cessions de valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7610,'PCG18-ASSOC','EXPENSE',		'668',    '7599', 'Autres charges financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7611,'PCG18-ASSOC','EXPENSE',		'67',    '7006', 'Charges exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7612,'PCG18-ASSOC','EXPENSE',		'671',    '7611', 'Charges exceptionnelles sur opérations de gestion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7613,'PCG18-ASSOC','EXPENSE',		'6711',    '7612', 'Pénalités sur marchés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7614,'PCG18-ASSOC','EXPENSE',		'6712',    '7612', 'Pénalités, amendes fiscales et pénales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7615,'PCG18-ASSOC','EXPENSE',		'6713',    '7612', 'Dons, libéralités', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7616,'PCG18-ASSOC','EXPENSE',		'6714',    '7612', 'Créances devenues irrécouvrables dans l''exercice', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7617,'PCG18-ASSOC','EXPENSE',		'6715',    '7612', 'Aides financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7618,'PCG18-ASSOC','EXPENSE',		'6717',    '7612', 'Rappel d''impôts (autres qu''impôts sur les bénéfices)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7619,'PCG18-ASSOC','EXPENSE',		'6718',    '7612', 'Autres charges exceptionnelles sur opération de gestion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7620,'PCG18-ASSOC','EXPENSE',		'672',    '7611', 'Charges sur exercices antérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7621,'PCG18-ASSOC','EXPENSE',		'673',    '7611', 'Apports ou affectations en numéraire', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7622,'PCG18-ASSOC','EXPENSE',		'675',    '7611', 'Valeurs comptables des éléments d''actif cédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7623,'PCG18-ASSOC','EXPENSE',		'6751',    '7622', 'Immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7624,'PCG18-ASSOC','EXPENSE',		'6752',    '7622', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7625,'PCG18-ASSOC','EXPENSE',		'6754',    '7622', 'Immobilisations reçues en legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7626,'PCG18-ASSOC','EXPENSE',		'6756',    '7622', 'Immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7627,'PCG18-ASSOC','EXPENSE',		'6758',    '7622', 'Autres éléments d''actif', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7628,'PCG18-ASSOC','EXPENSE',		'678',    '7611', 'Autres charges exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7629,'PCG18-ASSOC','EXPENSE',		'68',    '7006', 'Dotations aux amortissements, provisions et engagements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7630,'PCG18-ASSOC','EXPENSE',		'681',    '7629', 'Dotations aux amortissements et aux provisions - charges d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7631,'PCG18-ASSOC','EXPENSE',		'6811',    '7630', 'Dotations aux amortissements sur immobilisations incorporelles et corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7632,'PCG18-ASSOC','EXPENSE',		'6812',    '7630', 'Dotation aux amortissements des charges d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7633,'PCG18-ASSOC','EXPENSE',		'6815',    '7630', 'Dotations aux provisions d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7634,'PCG18-ASSOC','EXPENSE',		'6816',    '7630', 'Dotations pour dépréciations d''immobilisations incorporelles et corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7635,'PCG18-ASSOC','EXPENSE',		'68164',    '7634', 'Dotations pour dépréciation d''actifs reçus par legs ou donations destinés à être cédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7636,'PCG18-ASSOC','EXPENSE',		'6817',    '7630', 'Dotations pour dépréciations des actifs circulant', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7637,'PCG18-ASSOC','EXPENSE',		'686',    '7629', 'Dotations aux amortissements et aux provisions - charges financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7638,'PCG18-ASSOC','EXPENSE',		'6861',    '7637', 'Dotations aux amortissements des primes de remboursement des obligations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7639,'PCG18-ASSOC','EXPENSE',		'6865',    '7637', 'Dotation aux provisions pour risques et charges financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7640,'PCG18-ASSOC','EXPENSE',		'6866',    '7637', 'Dotation aux provisions pour dépréciation des éléments financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7641,'PCG18-ASSOC','EXPENSE',		'6868',    '7637', 'Autres dotations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7642,'PCG18-ASSOC','EXPENSE',		'687',    '7629', 'Dotations aux amortissements et aux provisions - charges exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7643,'PCG18-ASSOC','EXPENSE',		'6871',    '7642', 'Dotations aux amortissements exceptionnels des immobilisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7644,'PCG18-ASSOC','EXPENSE',		'6872',    '7642', 'Dotations aux provision réglementées (immobilisations)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7645,'PCG18-ASSOC','EXPENSE',		'6873',    '7642', 'Dotations aux provisions réglementées (stocks)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7646,'PCG18-ASSOC','EXPENSE',		'6874',    '7642', 'Dotations aux autres provisions réglementées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7647,'PCG18-ASSOC','EXPENSE',		'6875',    '7642', 'Dotations aux provisions exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7648,'PCG18-ASSOC','EXPENSE',		'6876',    '7642', 'Dotations pour dépréciations exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7649,'PCG18-ASSOC','EXPENSE',		'689',    '7629', 'Reports en fonds dédiés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7650,'PCG18-ASSOC','EXPENSE',		'6891',    '7649', 'Reports en fonds reportés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7651,'PCG18-ASSOC','EXPENSE',		'6893',    '7649', 'Reports en fonds dédiés des fondations abritées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7652,'PCG18-ASSOC','EXPENSE',		'6894',    '7649', 'Reports en fonds dédiés sur subventions d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7653,'PCG18-ASSOC','EXPENSE',		'6895',    '7649', 'Reports en fonds dédiés sur contributions financières d''autres organismes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7654,'PCG18-ASSOC','EXPENSE',		'6896',    '7649', 'Reports en fonds dédiés sur ressources liées à la générosité du public', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7655,'PCG18-ASSOC','EXPENSE',		'69',    '7006', 'Impôts sur les sociétés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7656,'PCG18-ASSOC','EXPENSE',		'691',    '7655', 'Participation des salariés aux résultats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7657,'PCG18-ASSOC','EXPENSE',		'695',    '7655', 'Impôts sur les sociétés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7658,'PCG18-ASSOC','EXPENSE',		'6951',    '7657', 'Impôts sur les sociétés des activités fiscalisées de l''entité', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7659,'PCG18-ASSOC','EXPENSE',		'6952',    '7657', 'Impôts sur les sociétés des personnes morales à but non lucratif', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7660,'PCG18-ASSOC','EXPENSE',		'699',    '7655', 'Report en arrière des déficits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7662,'PCG18-ASSOC','INCOME',		'70',    '7007', 'Ventes de produits fabriqués, de prestations de services et de marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7663,'PCG18-ASSOC','INCOME',		'701',    '7662', 'Ventes de produits finis', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7664,'PCG18-ASSOC','INCOME',		'702',    '7662', 'Ventes de produits intermédiaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7665,'PCG18-ASSOC','INCOME',		'703',    '7662', 'Ventes de produits résiduels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7666,'PCG18-ASSOC','INCOME',		'704',    '7662', 'Ventes de travaux', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7667,'PCG18-ASSOC','INCOME',		'705',    '7662', 'Etudes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7668,'PCG18-ASSOC','INCOME',		'706',    '7662', 'Ventes de prestations de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7669,'PCG18-ASSOC','INCOME',		'7063',    '7668', 'Parrainages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7670,'PCG18-ASSOC','INCOME',		'707',    '7662', 'Ventes de marchandises', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7671,'PCG18-ASSOC','INCOME',		'7073',    '7670', 'Ventes de dons en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7672,'PCG18-ASSOC','INCOME',		'708',    '7662', 'Produits des activités annexes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7673,'PCG18-ASSOC','INCOME',		'7081',    '7672', 'Produits des services exploités dans l''intérêt du personnel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7674,'PCG18-ASSOC','INCOME',		'7082',    '7672', 'Commissions et courtages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7675,'PCG18-ASSOC','INCOME',		'7083',    '7672', 'Locations diverses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7676,'PCG18-ASSOC','INCOME',		'7084',    '7672', 'Mise à disposition de personnel facturée', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7677,'PCG18-ASSOC','INCOME',		'7085',    '7672', 'Ports et frais accessoires facturés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7678,'PCG18-ASSOC','INCOME',		'7088',    '7672', 'Autres produits d''activités annexes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7679,'PCG18-ASSOC','INCOME',		'709',    '7662', 'Rabais, remises et ristournes accordés par l''association', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7680,'PCG18-ASSOC','INCOME',		'71',    '7007', 'Production stockée', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7681,'PCG18-ASSOC','INCOME',		'713',    '7680', 'Variation des stocks', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7682,'PCG18-ASSOC','INCOME',		'7133',    '7681', 'Variation des en-cours de production de biens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7683,'PCG18-ASSOC','INCOME',		'7134',    '7681', 'Variation des en-cours de production de services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7684,'PCG18-ASSOC','INCOME',		'7135',    '7681', 'Variation des stocks de produits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7685,'PCG18-ASSOC','INCOME',		'71355',    '7684', 'Variation des stocks de produits finis', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7686,'PCG18-ASSOC','INCOME',		'72',    '7007', 'Production immobilisée', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7687,'PCG18-ASSOC','INCOME',		'721',    '7686', 'Immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7688,'PCG18-ASSOC','INCOME',		'722',    '7686', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7689,'PCG18-ASSOC','INCOME',		'73',    '7007', 'Concours publics', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7690,'PCG18-ASSOC','INCOME',		'74',    '7007', 'Subventions de fonctionnement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7691,'PCG18-ASSOC','INCOME',		'75',    '7007', 'Autres produits de gestion courante', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7692,'PCG18-ASSOC','INCOME',		'751',    '7691', 'Redevances pour concessions, brevets, licences, procédés, droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7693,'PCG18-ASSOC','INCOME',		'7511',    '7692', 'Redevances pour concessions, brevets, licences, marques et procédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7694,'PCG18-ASSOC','INCOME',		'7516',    '7692', 'Droits d''auteurs et de reproduction', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7695,'PCG18-ASSOC','INCOME',		'7518',    '7692', 'Autres droits et valeurs similaires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7696,'PCG18-ASSOC','INCOME',		'752',    '7691', 'Revenus des immeubles non affectés aux activités relevant de l''objet statutaire', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7697,'PCG18-ASSOC','INCOME',		'753',    '7691', 'Versements des fondateurs ou consommation de la dotation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7698,'PCG18-ASSOC','INCOME',		'7531',    '7697', 'Versements des fondateurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7699,'PCG18-ASSOC','INCOME',		'7532',    '7697', 'Quotes-parts de dotation consomptible virée au compte de résultat', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7700,'PCG18-ASSOC','INCOME',		'754',    '7691', 'Ressources liées à la générosité du public', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7701,'PCG18-ASSOC','INCOME',		'7541',    '7700', 'Dons manuels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7702,'PCG18-ASSOC','INCOME',		'75411',    '7701', 'Dons manuels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7703,'PCG18-ASSOC','INCOME',		'75412',    '7701', 'Abandons de frais par les bénévoles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7704,'PCG18-ASSOC','INCOME',		'7542',    '7700', 'Mécénats', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7705,'PCG18-ASSOC','INCOME',		'7543',    '7700', 'Legs, donations et assurances-vie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7706,'PCG18-ASSOC','INCOME',		'75431',    '7705', 'Assurances-vie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7707,'PCG18-ASSOC','INCOME',		'75432',    '7705', 'Legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7708,'PCG18-ASSOC','INCOME',		'75433',    '7705', 'Autres produits sur legs ou donations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7709,'PCG18-ASSOC','INCOME',		'755',    '7691', 'Contributions financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7710,'PCG18-ASSOC','INCOME',		'7551',    '7709', 'Contributions financières reçues d''autres organismes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7711,'PCG18-ASSOC','INCOME',		'7552',    '7709', 'Quotes-parts de générosité reçues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7712,'PCG18-ASSOC','INCOME',		'756',    '7691', 'Cotisations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7713,'PCG18-ASSOC','INCOME',		'7561',    '7712', 'Cotisations sans contrepartie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7714,'PCG18-ASSOC','INCOME',		'7562',    '7712', 'Cotisations avec contrepartie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7715,'PCG18-ASSOC','INCOME',		'757',    '7691', 'Gains de change sur créances et dettes d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7716,'PCG18-ASSOC','INCOME',		'758',    '7691', 'Produits divers de gestion courante', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7717,'PCG18-ASSOC','INCOME',		'76',    '7007', 'Produits financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7718,'PCG18-ASSOC','INCOME',		'761',    '7717', 'Produits des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7719,'PCG18-ASSOC','INCOME',		'7611',    '7718', 'Revenus des titres de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7720,'PCG18-ASSOC','INCOME',		'7616',    '7718', 'Revenus des autres formes de participation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7721,'PCG18-ASSOC','INCOME',		'7617',    '7718', 'Revenus des créances rattachées à des participations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7722,'PCG18-ASSOC','INCOME',		'762',    '7717', 'Produits des immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7723,'PCG18-ASSOC','INCOME',		'7621',    '7722', 'Revenus des titres immobilisés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7724,'PCG18-ASSOC','INCOME',		'7624',    '7722', 'Revenus des prêts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7725,'PCG18-ASSOC','INCOME',		'7627',    '7722', 'Revenus des créances immobilisées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7726,'PCG18-ASSOC','INCOME',		'763',    '7717', 'Revenus des autres créances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7727,'PCG18-ASSOC','INCOME',		'764',    '7717', 'Revenus des valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7728,'PCG18-ASSOC','INCOME',		'765',    '7717', 'Escomptes de règlement obtenus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7729,'PCG18-ASSOC','INCOME',		'766',    '7717', 'Gains de change', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7730,'PCG18-ASSOC','INCOME',		'767',    '7717', 'Produits nets sur cessions de valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7731,'PCG18-ASSOC','INCOME',		'768',    '7717', 'Autres produits financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7732,'PCG18-ASSOC','INCOME',		'77',    '7007', 'Produits exceptionnels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7733,'PCG18-ASSOC','INCOME',		'771',    '7732', 'Produits exceptionnels sur opérations de gestion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7734,'PCG18-ASSOC','INCOME',		'7713',    '7733', 'Libéralités reçues', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7735,'PCG18-ASSOC','INCOME',		'7714',    '7733', 'Rentrées sur créances amorties', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7736,'PCG18-ASSOC','INCOME',		'7715',    '7733', 'Subventions d''équilibre', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7737,'PCG18-ASSOC','INCOME',		'7717',    '7733', 'Dégrèvements d''impôts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7738,'PCG18-ASSOC','INCOME',		'7718',    '7733', 'Autres produits exceptionnels sur opérations de gestion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7739,'PCG18-ASSOC','INCOME',		'772',    '7732', 'Produits sur exercices antérieurs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7740,'PCG18-ASSOC','INCOME',		'775',    '7732', 'Produits des cessions d''éléments d''actif', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7741,'PCG18-ASSOC','INCOME',		'7751',    '7740', 'Immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7742,'PCG18-ASSOC','INCOME',		'7752',    '7740', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7743,'PCG18-ASSOC','INCOME',		'7754',    '7740', 'Immobilisations reçues en legs ou donations destinées à être cédées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7744,'PCG18-ASSOC','INCOME',		'7756',    '7740', 'Immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7745,'PCG18-ASSOC','INCOME',		'7758',    '7740', 'Autres éléments d''actif', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7746,'PCG18-ASSOC','INCOME',		'777',    '7732', 'Quote-part des subventions d''investissement virée au résultat de l''exercice', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7747,'PCG18-ASSOC','INCOME',		'778',    '7732', 'Autres produits exceptionnels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7748,'PCG18-ASSOC','INCOME',		'78',    '7007', 'Reprises sur amortissements, dépréciations et provisions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7749,'PCG18-ASSOC','INCOME',		'781',    '7748', 'Reprises sur amortissements des immobilisations, dépréciations et provisions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7750,'PCG18-ASSOC','INCOME',		'7811',    '7749', 'Reprises sur amortissements des immobilisations incorporelles et corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7751,'PCG18-ASSOC','INCOME',		'78111',    '7750', 'immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7752,'PCG18-ASSOC','INCOME',		'78112',    '7750', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7753,'PCG18-ASSOC','INCOME',		'7815',    '7749', 'Reprises sur provisions d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7754,'PCG18-ASSOC','INCOME',		'7816',    '7749', 'Reprises sur dépréciation des immobilisations incorporelles et corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7755,'PCG18-ASSOC','INCOME',		'78161',    '7754', 'Immobilisations incorporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7756,'PCG18-ASSOC','INCOME',		'78162',    '7754', 'Immobilisations corporelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7757,'PCG18-ASSOC','INCOME',		'78164',    '7754', 'Reprises sur dépréciations d''actifs reçus par legs ou donations destinés à être cédés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7758,'PCG18-ASSOC','INCOME',		'7817',    '7749', 'Reprises sur provisions pour dépréciation des actifs circulants', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7759,'PCG18-ASSOC','INCOME',		'78173',    '7758', 'Pour dépréciation des stocks', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7760,'PCG18-ASSOC','INCOME',		'78174',    '7758', 'Pour dépréciation des créances usagers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7761,'PCG18-ASSOC','INCOME',		'786',    '7748', 'Reprises sur amortissements et provisions - produits financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7762,'PCG18-ASSOC','INCOME',		'7865',    '7761', 'Reprises sur provisions pour risques et charges financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7763,'PCG18-ASSOC','INCOME',		'7866',    '7761', 'Reprises sur provisions pour dépréciation des éléments financiers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7764,'PCG18-ASSOC','INCOME',		'78662',    '7763', 'Pour dépréciation des immobilisations financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7765,'PCG18-ASSOC','INCOME',		'78665',    '7763', 'Pour dépréciation des valeurs mobilières de placement', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7766,'PCG18-ASSOC','INCOME',		'787',    '7748', 'Reprises sur amortissements et provisions - produits exceptionnels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7767,'PCG18-ASSOC','INCOME',		'7872',    '7766', 'Reprises sur provisions réglementées amortissements dérogatoires', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7768,'PCG18-ASSOC','INCOME',		'7873',    '7766', 'Reprises sur provisions réglementées stocks', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7769,'PCG18-ASSOC','INCOME',		'7874',    '7766', 'Reprises sur autres provisions réglementées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7770,'PCG18-ASSOC','INCOME',		'7875',    '7766', 'Reprises sur provisions pour risques et charges exceptionnels', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7771,'PCG18-ASSOC','INCOME',		'7876',    '7766', 'Reprises sur provisions pour dépréciations exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7772,'PCG18-ASSOC','INCOME',		'789',    '7748', 'Utilisations de fonds reportés et de fonds dédiés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7773,'PCG18-ASSOC','INCOME',		'7891',    '7772', 'Utilisation de fonds reportés', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7774,'PCG18-ASSOC','INCOME',		'7893',    '7772', 'Utilisation de fonds dédiés des fondations abritées', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7775,'PCG18-ASSOC','INCOME',		'7894',    '7772', 'Utilisation des fonds dédiés sur subventions d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7776,'PCG18-ASSOC','INCOME',		'7895',    '7772', 'Utilisation des fonds dédiés sur contributions financières d''autres organismes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7777,'PCG18-ASSOC','INCOME',		'7896',    '7772', 'Utilisation des fonds dédiés sur ressources liées à la générosité du public', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7778,'PCG18-ASSOC','INCOME',		'79',    '7007', 'Transferts de charges', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7779,'PCG18-ASSOC','INCOME',		'791',    '7778', 'Transfert de charges d''exploitation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7780,'PCG18-ASSOC','INCOME',		'796',    '7778', 'Transfert de charges financières', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7781,'PCG18-ASSOC','INCOME',		'797',    '7778', 'Transfert de charges exceptionnelles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7783,'PCG18-ASSOC','SPECIAL',		'86',    '7008', 'Emploi des contributions volontaires en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7784,'PCG18-ASSOC','SPECIAL',		'860',    '7783', 'Secours en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7785,'PCG18-ASSOC','SPECIAL',		'861',    '7783', 'Mise à disposition gratuite de biens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7786,'PCG18-ASSOC','SPECIAL',		'862',    '7783', 'Prestations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7787,'PCG18-ASSOC','SPECIAL',		'864',    '7783', 'Personnel bénévole', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7788,'PCG18-ASSOC','SPECIAL',		'87',    '7008', 'Contributions volontaires en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7789,'PCG18-ASSOC','SPECIAL',		'870',    '7788', 'Dons en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7790,'PCG18-ASSOC','SPECIAL',		'871',    '7788', 'Prestations en nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7791,'PCG18-ASSOC','SPECIAL',		'875',    '7788', 'Bénévolat', 1);
 
 
 

From ed2a013da3c41312d6c60c3b5d5db7a8f7a25d6b Mon Sep 17 00:00:00 2001
From: Dolibot <dolibarr-bot@users.noreply.github.com>
Date: Mon, 3 Feb 2025 12:06:55 +0000
Subject: [PATCH 409/602] PHPStan > Update baseline

---
 dev/build/phpstan/phpstan-baseline.neon | 216 ------------------------
 1 file changed, 216 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 740e50d80c5..01c75984c0d 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -15882,12 +15882,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/ecm/dir_card.php
 
-		-
-			message: '#^Variable \$oldlabel might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/ecm/dir_card.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
@@ -15924,12 +15918,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/ecm/file_card.php
 
-		-
-			message: '#^Variable \$relativepath might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/ecm/index.php
-
 		-
 			message: '#^If condition is always true\.$#'
 			identifier: if.alwaysTrue
@@ -16260,12 +16248,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/eventorganization/conferenceorboothattendee_card.php
 
-		-
-			message: '#^Variable \$confOrBooth might not be defined\.$#'
-			identifier: variable.undefined
-			count: 4
-			path: ../../../htdocs/eventorganization/conferenceorboothattendee_card.php
-
 		-
 			message: '#^Variable \$text might not be defined\.$#'
 			identifier: variable.undefined
@@ -16680,48 +16662,18 @@ parameters:
 			count: 8
 			path: ../../../htdocs/expedition/contact.php
 
-		-
-			message: '#^Variable \$typeobject might not be defined\.$#'
-			identifier: variable.undefined
-			count: 4
-			path: ../../../htdocs/expedition/contact.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
 			count: 1
 			path: ../../../htdocs/expedition/dispatch.php
 
-		-
-			message: '#^Variable \$modebatch might not be defined\.$#'
-			identifier: variable.undefined
-			count: 4
-			path: ../../../htdocs/expedition/dispatch.php
-
-		-
-			message: '#^Variable \$nbproduct might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/expedition/dispatch.php
-
 		-
 			message: '#^Variable \$objectsrc might not be defined\.$#'
 			identifier: variable.undefined
 			count: 3
 			path: ../../../htdocs/expedition/dispatch.php
 
-		-
-			message: '#^Variable \$objsearchdet might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/expedition/dispatch.php
-
-		-
-			message: '#^Variable \$typeobject might not be defined\.$#'
-			identifier: variable.undefined
-			count: 4
-			path: ../../../htdocs/expedition/dispatch.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
@@ -16734,12 +16686,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/expedition/document.php
 
-		-
-			message: '#^Variable \$typeobject might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/expedition/document.php
-
 		-
 			message: '#^Call to function method_exists\(\) with Expedition and ''fetch_lines'' will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -16782,12 +16728,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/expedition/list.php
 
-		-
-			message: '#^Variable \$search_shipping_method_id might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/expedition/list.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
@@ -16800,12 +16740,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/expedition/note.php
 
-		-
-			message: '#^Variable \$typeobject might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/expedition/note.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
@@ -16842,12 +16776,6 @@ parameters:
 			count: 6
 			path: ../../../htdocs/expedition/shipment.php
 
-		-
-			message: '#^Variable \$toBeShippedTotal might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/expedition/shipment.php
-
 		-
 			message: '#^Variable \$socid might not be defined\.$#'
 			identifier: variable.undefined
@@ -16908,18 +16836,6 @@ parameters:
 			count: 10
 			path: ../../../htdocs/expensereport/card.php
 
-		-
-			message: '#^Variable \$remaintopay might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/expensereport/card.php
-
-		-
-			message: '#^Variable \$userauthor might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/expensereport/card.php
-
 		-
 			message: '#^Method ExpenseReports\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
@@ -17148,12 +17064,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/expensereport/payment/card.php
 
-		-
-			message: '#^Variable \$title_button might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/expensereport/payment/card.php
-
 		-
 			message: '#^Variable \$linkback might not be defined\.$#'
 			identifier: variable.undefined
@@ -17184,30 +17094,12 @@ parameters:
 			count: 1
 			path: ../../../htdocs/expensereport/payment/payment.php
 
-		-
-			message: '#^Variable \$sumpaid might not be defined\.$#'
-			identifier: variable.undefined
-			count: 5
-			path: ../../../htdocs/expensereport/payment/payment.php
-
-		-
-			message: '#^Variable \$fileurl_avg might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/expensereport/stats/index.php
-
 		-
 			message: '#^Variable \$action might not be defined\.$#'
 			identifier: variable.undefined
 			count: 2
 			path: ../../../htdocs/expensereport/tpl/expensereport_addfile.tpl.php
 
-		-
-			message: '#^Variable \$colspan might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/expensereport/tpl/expensereport_addfile.tpl.php
-
 		-
 			message: '#^Variable \$conf might not be defined\.$#'
 			identifier: variable.undefined
@@ -17238,12 +17130,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
 
-		-
-			message: '#^Variable \$colspan might not be defined\.$#'
-			identifier: variable.undefined
-			count: 4
-			path: ../../../htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
-
 		-
 			message: '#^Variable \$conf might not be defined\.$#'
 			identifier: variable.undefined
@@ -17262,12 +17148,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
 
-		-
-			message: '#^Variable \$minifile might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
-
 		-
 			message: '#^Variable \$object might not be defined\.$#'
 			identifier: variable.undefined
@@ -17358,12 +17238,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/fichinter/card.php
 
-		-
-			message: '#^Variable \$extrafields in empty\(\) always exists and is not falsy\.$#'
-			identifier: empty.variable
-			count: 2
-			path: ../../../htdocs/fichinter/card.php
-
 		-
 			message: '#^Variable \$line might not be defined\.$#'
 			identifier: variable.undefined
@@ -17376,66 +17250,6 @@ parameters:
 			count: 11
 			path: ../../../htdocs/fichinter/card.php
 
-		-
-			message: '#^Method Interventions\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/fichinter/class/api_interventions.class.php
-
-		-
-			message: '#^Method Interventions\:\:_validate\(\) return type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/fichinter/class/api_interventions.class.php
-
-		-
-			message: '#^Method Interventions\:\:_validateLine\(\) has parameter \$data with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/fichinter/class/api_interventions.class.php
-
-		-
-			message: '#^Method Interventions\:\:_validateLine\(\) return type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/fichinter/class/api_interventions.class.php
-
-		-
-			message: '#^Method Interventions\:\:delete\(\) return type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/fichinter/class/api_interventions.class.php
-
-		-
-			message: '#^Method Interventions\:\:index\(\) return type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/fichinter/class/api_interventions.class.php
-
-		-
-			message: '#^Method Interventions\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/fichinter/class/api_interventions.class.php
-
-		-
-			message: '#^Method Interventions\:\:postLine\(\) has parameter \$request_data with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/fichinter/class/api_interventions.class.php
-
-		-
-			message: '#^Property Interventions\:\:\$FIELDS type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/fichinter/class/api_interventions.class.php
-
-		-
-			message: '#^Property Interventions\:\:\$FIELDSLINE has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: ../../../htdocs/fichinter/class/api_interventions.class.php
-
 		-
 			message: '#^Call to function method_exists\(\) with \$this\(Fichinter\) and ''getLibStatut'' will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -17484,24 +17298,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/fichinter/class/fichinterligne.class.php
 
-		-
-			message: '#^Parameter \#17 \$fk_unit of method FichinterRec\:\:addLineRec\(\) expects string\|null, int\|null given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/fichinter/class/fichinterrec.class.php
-
-		-
-			message: '#^Parameter \#2 \$pu of function calcul_price_total expects float, string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/fichinter/class/fichinterrec.class.php
-
-		-
-			message: '#^Parameter \#3 \$remise_percent_ligne of function calcul_price_total expects float, string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/fichinter/class/fichinterrec.class.php
-
 		-
 			message: '#^Right side of && is always false\.$#'
 			identifier: booleanAnd.rightAlwaysFalse
@@ -17544,18 +17340,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/fichinter/list.php
 
-		-
-			message: '#^Variable \$contratstatic might not be defined\.$#'
-			identifier: variable.undefined
-			count: 6
-			path: ../../../htdocs/fichinter/list.php
-
-		-
-			message: '#^Variable \$projetstatic might not be defined\.$#'
-			identifier: variable.undefined
-			count: 5
-			path: ../../../htdocs/fichinter/list.php
-
 		-
 			message: '#^Right side of && is always false\.$#'
 			identifier: booleanAnd.rightAlwaysFalse

From c5715f54a604bd4490867e57e1b3725fae07f9b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 3 Feb 2025 15:44:50 +0100
Subject: [PATCH 410/602] Debug v21

---
 htdocs/fourn/facture/card.php   |  4 +--
 htdocs/projet/admin/project.php | 53 +++++++++++++++++++--------------
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index e71d2927d76..9c321a165a0 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -3599,10 +3599,10 @@ if ($action == 'create') {
 				print '&nbsp; &nbsp; &nbsp; &nbsp;';
 				print '</div>';
 			}
-			print price($object->total_tva, 1, $langs, 0, -1, -1, $conf->currency);
+			print '<span class="nowraponall">'.price($object->total_tva, 1, $langs, 0, -1, -1, $conf->currency).'</span>';
 			print '</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowraponall amountcard right">' . price($object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
 			}
 			print '</tr>';
 
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 1a2fd304576..58fae61f8d2 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -199,11 +199,14 @@ if ($action == 'updateMaskTask') {
 	// Set default model
 	dolibarr_set_const($db, "PROJECT_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity);
 
-	// On active le modele
+	// We also enable the template
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
+} elseif ($action == 'unsetdoc') {
+	// Set default model
+	dolibarr_del_const($db, "PROJECT_ADDON_PDF", $conf->entity);
 } elseif ($action == 'setdoctask') {
 	if (dolibarr_set_const($db, "PROJECT_TASK_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity)) {
 		// La constante qui a ete lue en avant du nouveau set
@@ -216,6 +219,9 @@ if ($action == 'updateMaskTask') {
 	if ($ret > 0) {
 		$ret = addDocumentModel($value, 'project_task', $label, $scandir);
 	}
+} elseif ($action == 'unsetdoctask') {
+	// Set default model
+	dolibarr_del_const($db, "PROJECT_TASK_ADDON_PDF", $conf->entity);
 } elseif ($action == 'setmod') {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
@@ -252,6 +258,8 @@ if ($action == 'updateMaskTask') {
  * View
  */
 
+$form = new Form($db);
+
 $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
 llxHeader("", $langs->trans("ProjectsSetup"), '', '', 0, 0, '', '', '', 'mod-project page-admin');
@@ -265,10 +273,9 @@ $head = project_admin_prepare_head();
 
 print dol_get_fiche_head($head, 'project', $langs->trans("Projects"), -1, 'project');
 
-
+print '<br>';
 
 // Main options
-$form = new Form($db);
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -464,7 +471,7 @@ if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 							print '</td>'."\n";
 
 							print '<td class="center">';
-							if ($conf->global->PROJECT_TASK_ADDON == 'mod_'.$classname) {
+							if (getDolGlobalString("PROJECT_TASK_ADDON") == 'mod_'.$classname) {
 								print img_picto($langs->trans("Activated"), 'switch_on');
 							} else {
 								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodtask&token='.newToken().'&value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
@@ -594,21 +601,24 @@ foreach ($dirmodels as $reldir) {
 
 								// Active
 								if (in_array($name, $def)) {
-									print "<td class=\"center\">\n";
+									print '<td class="center">'."\n";
 									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">';
 									print img_picto($langs->trans("Enabled"), 'switch_on');
 									print '</a>';
 									print "</td>";
 								} else {
-									print "<td class=\"center\">\n";
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<td class="center">'."\n";
+									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">';
+									print img_picto($langs->trans("Disabled"), 'switch_off');
+									print '</a>';
 									print "</td>";
 								}
 
 								// Default
-								print "<td class=\"center\">";
+								print '<td class="center">';
 								if (getDolGlobalString('PROJECT_ADDON_PDF') == "$name") {
-									print img_picto($langs->trans("Default"), 'on');
+									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'on').'</a>';
+									//print img_picto($langs->trans("Default"), 'on');
 								} else {
 									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 								}
@@ -753,8 +763,8 @@ if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 
 									// Default
 									print '<td class="center">';
-									if ($conf->global->PROJECT_TASK_ADDON_PDF == "$name") {
-										print img_picto($langs->trans("Default"), 'on');
+									if (getDolGlobalString("PROJECT_TASK_ADDON_PDF", $name)) {
+										print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=unsetdoctask&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'on').'</a>';
 									} else {
 										print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoctask&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 									}
@@ -811,24 +821,23 @@ print '<div class="div-table-responsive-no-min">'; // You can use div-table-resp
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print "<td>".$langs->trans("Parameters")."</td>\n";
-print '<td class="right" width="60">'.$langs->trans("Value").'</td>'."\n";
-print '<td width="80">&nbsp;</td></tr>'."\n";
+print '<td></td>';
+print '</tr>'."\n";
 
 print '<tr class="oddeven">';
-print '<td width="80%">'.$langs->trans("UseSearchToSelectProject").'</td>';
+print '<td>'.$langs->trans("UseSearchToSelectProject").'</td>';
 if (!$conf->use_javascript_ajax) {
-	print '<td class="nowrap right" colspan="2">';
+	print '<td class="nowrap right">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
 } else {
-	print '<td width="60" class="right">';
+	print '<td class="right">';
 	$arrval = array('0' => $langs->trans("No"),
 		'1' => $langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
 		'2' => $langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
 		'3' => $langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
 	);
 	print $form->selectarray("activate_PROJECT_USE_SEARCH_TO_SELECT", $arrval, getDolGlobalString("PROJECT_USE_SEARCH_TO_SELECT"));
-	print '</td><td class="right">';
 	print '<input type="submit" class="button small reposition" name="PROJECT_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
 	print "</td>";
 }
@@ -836,8 +845,7 @@ print '</tr>';
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("AllowToSelectProjectFromOtherCompany").'</td>';
-
-print '<td class="right" width="60" colspan="2">';
+print '<td class="right">';
 print '<input type="text" id="projectToSelect" name="projectToSelect" value="' . getDolGlobalString('PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY').'"/>&nbsp;';
 print $form->textwithpicto('', $langs->trans('AllowToLinkFromOtherCompany'));
 print '<input type="submit" class="button small reposition" name="PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY" value="'.$langs->trans("Modify").'">';
@@ -849,15 +857,14 @@ echo '<tr class="oddeven">',
 '<td class="left">',
 $form->textwithpicto($langs->transnoentities($key), $langs->transnoentities($key . '_help')),
 '</td>',
-'<td class="right" colspan="2">',
+'<td class="right">',
 ajax_constantonoff($key),
 '</td>',
 '</tr>';
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("TimesheetPreventAfterFollowingMonths").'</td>';
-
-print '<td class="right" width="60" colspan="2">';
+print '<td class="right">';
 print '<input type="number" class="width50" id="timesheetFreezeDuration" name="timesheetFreezeDuration" min="0" step="1" value="' . getDolGlobalString('PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS').'"/>&nbsp;';
 print '<input type="submit" class="button small reposition" name="PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS" value="'.$langs->trans("Modify").'">';
 print '</td>';
@@ -867,7 +874,7 @@ print '<tr class="oddeven">';
 print '<td class="left">';
 print $form->textwithpicto($langs->transnoentities('PROJECT_DISPLAY_LINKED_BY_CONTACT'), $langs->transnoentities('PROJECT_DISPLAY_LINKED_BY_CONTACT_help'));
 print '</td>';
-print '<td class="right" colspan="2">';
+print '<td class="right">';
 print ajax_constantonoff('PROJECT_DISPLAY_LINKED_BY_CONTACT');
 print '</td>';
 print '</tr>';

From f66e9553d5a83f1a87b271c82f554019a5e2e7c1 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 30 Jan 2025 22:20:24 +0100
Subject: [PATCH 411/602] Qual: Fix phan notices

# Qual: Fix phan notices

Fix phan notices in fourn/commande (+form class)
---
 dev/tools/phan/baseline.txt                   | 12 +--
 dev/tools/phan/config.php                     |  2 +-
 htdocs/core/class/html.form.class.php         | 78 ++++++++++---------
 htdocs/core/lib/ajax.lib.php                  | 16 ++--
 .../class/fournisseur.commande.class.php      |  4 +-
 htdocs/fourn/commande/card.php                | 64 +++++++--------
 htdocs/fourn/commande/contact.php             | 12 +--
 htdocs/fourn/commande/document.php            |  8 +-
 htdocs/fourn/commande/info.php                | 10 ++-
 htdocs/fourn/commande/list.php                | 43 +++++-----
 htdocs/fourn/commande/note.php                |  6 +-
 htdocs/fourn/contact.php                      |  2 +
 htdocs/societe/class/societe.class.php        | 19 +++--
 13 files changed, 141 insertions(+), 135 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index f69251c12c0..6d3655afa34 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -11,11 +11,11 @@ return [
     // # Issue statistics:
     // PhanUndeclaredProperty : 540+ occurrences
     // PhanPossiblyUndeclaredGlobalVariable : 210+ occurrences
-    // PhanUndeclaredGlobalVariable : 210+ occurrences
+    // PhanUndeclaredGlobalVariable : 200+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 180+ occurrences
     // PhanTypeMismatchArgumentProbablyReal : 160+ occurrences
     // PhanTypeMismatchProperty : 140+ occurrences
-    // PhanPluginUnknownArrayMethodParamType : 120+ occurrences
+    // PhanPluginUnknownArrayMethodParamType : 110+ occurrences
     // PhanRedefineFunction : 45+ occurrences
     // PhanPluginUndeclaredVariableIsset : 40+ occurrences
     // PhanTypeExpectedObjectPropAccess : 40+ occurrences
@@ -225,13 +225,7 @@ return [
         'htdocs/fourn/class/api_supplier_invoices.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/fourn/class/api_supplier_orders.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/fourn/class/fournisseur.commande.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/fourn/commande/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchDimAssignment', 'PhanTypeMismatchProperty', 'PhanTypeSuspiciousStringExpression', 'PhanUndeclaredProperty'],
-        'htdocs/fourn/commande/contact.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/fourn/commande/document.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/fourn/commande/info.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/fourn/commande/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/fourn/commande/note.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/fourn/contact.php' => ['PhanUndeclaredGlobalVariable'],
+        'htdocs/fourn/commande/card.php' => ['PhanTypeMismatchDimAssignment', 'PhanTypeSuspiciousStringExpression', 'PhanUndeclaredProperty'],
         'htdocs/fourn/facture/card-rec.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/fourn/facture/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchProperty'],
         'htdocs/fourn/facture/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index b13c4c1e769..366e52ffd15 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -267,7 +267,7 @@ return [
 		'linkedObjectBlock' => '\CommonObject[]', // See htdocs/core/class/html.form.class.php
 		'mainmenu' => 'string',
 		'menumanager' => '\MenuManager',
-		'mysoc' => '?\Societe',
+		'mysoc' => '\Societe',
 		'nblines' => '\int',
 		'objectoffield' => '\CommonObject',
 		'objsoc' => '\Societe',
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5dee9316b1e..d6f4d59281a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2968,7 +2968,7 @@ class Form
 		if (count($warehouseStatusArray)) {
 			$selectFieldsGrouped = ", sum(" . $this->db->ifsql("e.statut IS NULL", "0", "ps.reel") . ") as stock"; // e.statut is null if there is no record in stock
 		} else {
-			$selectFieldsGrouped = ", " . $this->db->ifsql("p.stock IS NULL", 0, "p.stock") . " AS stock";
+			$selectFieldsGrouped = ", " . $this->db->ifsql("p.stock IS NULL", '0', "p.stock") . " AS stock";
 		}
 
 		$sql = "SELECT ";
@@ -3262,7 +3262,7 @@ class Form
 				} else {
 					if (isModEnabled('dynamicprices') && !empty($objp->fk_price_expression)) {
 						$price_product = new Product($this->db);
-						$price_product->fetch($objp->rowid, '', '', 1);
+						$price_product->fetch($objp->rowid, '', '', '1');
 
 						require_once DOL_DOCUMENT_ROOT . '/product/dynamic_price/class/price_parser.class.php';
 						$priceparser = new PriceParser($this->db);
@@ -3341,7 +3341,7 @@ class Form
 		$outtva_tx = '';
 		$outdefault_vat_code = '';
 		$outqty = 1;
-		$outdiscount = 0;
+		$outdiscount = '0';
 
 		$maxlengtharticle = (!getDolGlobalString('PRODUCT_MAX_LENGTH_COMBO') ? 48 : $conf->global->PRODUCT_MAX_LENGTH_COMBO);
 
@@ -3711,7 +3711,7 @@ class Form
 			if ($selected > 0) {
 				require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 				$producttmpselect = new Product($this->db);
-				$producttmpselect->fetch($selected);
+				$producttmpselect->fetch((int) $selected);
 				$selected_input_value = $producttmpselect->ref;
 				unset($producttmpselect);
 			}
@@ -5172,14 +5172,14 @@ class Form
 	 *
 	 * @param int|''	 	$selected 		Id account preselected
 	 * @param string 		$htmlname 		Name of select zone
-	 * @param int 			$status 		Status of searched accounts (0=open, 1=closed, 2=both)
+	 * @param int<0,2>		$status 		Status of searched accounts (0=open, 1=closed, 2=both)
 	 * @param string 		$filtre 		To filter the list. This parameter must not come from input of users
-	 * @param int|string	$useempty 		1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+	 * @param int<0,2>|string	$useempty 	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
 	 * @param string 		$moreattrib 	To add more attribute on select
-	 * @param int 			$showcurrency 	Show currency in label
+	 * @param int<0,1>		$showcurrency 	Show currency in label
 	 * @param string 		$morecss 		More CSS
 	 * @param int<0,1>		$nooutput 		1=Return string, do not send to output
-	 * @return int|string   	           	If noouput=0: Return integer <0 if error, Num of bank account found if OK (0, 1, 2, ...), If nooutput=1: Return a HTML select string.
+	 * @return int|string   	           	If nooutput=0: Return integer <0 if error, Num of bank account found if OK (0, 1, 2, ...), If nooutput=1: Return a HTML select string.
 	 */
 	public function select_comptes($selected = '', $htmlname = 'accountid', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0, $morecss = '', $nooutput = 0)
 	{
@@ -5418,7 +5418,7 @@ class Form
 	 * @param string 	$page 		Page
 	 * @param string 	$selected 	Id of bank account
 	 * @param string 	$htmlname 	Name of select html field
-	 * @param int 		$addempty 	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+	 * @param int<0,2>	$addempty 	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
 	 * @return    					void
 	 */
 	public function formSelectAccount($page, $selected = '', $htmlname = 'fk_account', $addempty = 0)
@@ -5440,7 +5440,7 @@ class Form
 			if ($selected) {
 				require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
 				$bankstatic = new Account($this->db);
-				$result = $bankstatic->fetch($selected);
+				$result = $bankstatic->fetch((int) $selected);
 				if ($result) {
 					print $bankstatic->getNomUrl(1);
 				}
@@ -5479,7 +5479,7 @@ class Form
 			if ($selected) {
 				require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
 				$bankstatic = new CompanyBankAccount($this->db);
-				$result = $bankstatic->fetch($selected);
+				$result = $bankstatic->fetch((int) $selected);
 				if ($result) {
 					print $bankstatic->label;
 					if ($showibanbic) {
@@ -6100,7 +6100,7 @@ class Form
 			$out .= '<span class="project_head_block">';
 			if ($selected) {
 				$projet = new Project($this->db);
-				$projet->fetch($selected);
+				$projet->fetch((int) $selected);
 				$out .= $projet->getNomUrl(0, '', 1);
 			} else {
 				$out .= '<span class="opacitymedium">' . $textifnoproject . '</span>';
@@ -6123,8 +6123,8 @@ class Form
 	 * @param string 	$page 				Page
 	 * @param string 	$selected 			Id condition pre-selectionne
 	 * @param string 	$htmlname 			Name of select html field
-	 * @param int 		$addempty 			Add empty entry
-	 * @param string 	$type 				Type ('direct-debit' or 'bank-transfer')
+	 * @param int<0,1> 	$addempty 			Add empty entry
+	 * @param ''|'direct-debit'|'bank-transfer'	$type 	Type ('direct-debit' or 'bank-transfer')
 	 * @param int 		$filtertype 		If > 0, include payment terms with deposit percentage (for objects other than invoices and invoice templates)
 	 * @param int	 	$deposit_percent 	< 0 : deposit_percent input makes no sense (for example, in list filters)
 	 *                                		0 : use default deposit percentage from entry
@@ -6146,7 +6146,7 @@ class Form
 			if ($type) {
 				$out .= '<input type="hidden" name="type" value="' . dol_escape_htmltag($type) . '">';
 			}
-			$out .= $this->getSelectConditionsPaiements($selected, $htmlname, $filtertype, $addempty, 0, '', $deposit_percent);
+			$out .= $this->getSelectConditionsPaiements((int) $selected, $htmlname, $filtertype, $addempty, 0, '', $deposit_percent);
 			$out .= '<input type="submit" class="button valignmiddle smallpaddingimp" value="' . $langs->trans("Modify") . '">';
 			$out .= '</form>';
 		} else {
@@ -6184,7 +6184,7 @@ class Form
 	 * @param 	string 		$page 		Page
 	 * @param 	string 		$selected 	Id condition pre-selectionne
 	 * @param 	string 		$htmlname 	Name of select html field
-	 * @param 	int 		$addempty 	Add an empty entry
+	 * @param 	int<0,1> 	$addempty 	Add an empty entry
 	 * @return  void
 	 */
 	public function form_availability($page, $selected = '', $htmlname = 'availability', $addempty = 0)
@@ -6322,7 +6322,7 @@ class Form
 			if ($selected) {
 				require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
 				$theuser = new User($this->db);
-				$theuser->fetch($selected);
+				$theuser->fetch((int) $selected);
 				print $theuser->getNomUrl(1);
 			} else {
 				print "&nbsp;";
@@ -6340,8 +6340,8 @@ class Form
 	 * @param string $selected Id mode pre-selectionne
 	 * @param string $htmlname Name of select html field
 	 * @param string $filtertype To filter on field type in llx_c_paiement ('CRDT' or 'DBIT' or array('code'=>xx,'label'=>zz))
-	 * @param int $active Active or not, -1 = all
-	 * @param int $addempty 1=Add empty entry
+	 * @param int<-1,1> $active Active or not, -1 = all
+	 * @param int<0,1> $addempty 1=Add empty entry
 	 * @param string $type Type ('direct-debit' or 'bank-transfer')
 	 * @param int<0,1> $nooutput 1=Return string, no output
 	 * @return    string                    HTML output or ''
@@ -6613,7 +6613,7 @@ class Form
 			if ($selected) {
 				require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
 				$contact = new Contact($this->db);
-				$contact->fetch($selected);
+				$contact->fetch((int) $selected);
 				print $contact->getFullName($langs);
 			} else {
 				print "&nbsp;";
@@ -6656,7 +6656,7 @@ class Form
 			if ($selected) {
 				require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 				$soc = new Societe($this->db);
-				$soc->fetch($selected);
+				$soc->fetch((int) $selected);
 				$out .= $soc->getNomUrl(0, '');
 			} else {
 				$out .= '<span class="opacitymedium">' . $textifnothirdparty . '</span>';
@@ -6982,7 +6982,7 @@ class Form
 			// If SERVICE_ARE_ECOMMERCE_200238EC=1 combo list vat rate of purchaser and seller countries
 			// If SERVICE_ARE_ECOMMERCE_200238EC=2 combo list only the vat rate of the purchaser country
 			$selectVatComboMode = getDolGlobalString('SERVICE_ARE_ECOMMERCE_200238EC');
-			if (isInEEC($societe_vendeuse) && isInEEC($societe_acheteuse) && !$societe_acheteuse->isACompany()) {
+			if (is_object($societe_vendeuse) && isInEEC($societe_vendeuse) && isInEEC($societe_acheteuse) && !$societe_acheteuse->isACompany()) {
 				// We also add the buyer country code
 				if (is_numeric($type)) {
 					if ($type == 1) { // We know product is a service
@@ -7029,7 +7029,7 @@ class Form
 
 		if ($num > 0) {
 			// Definition du taux a pre-selectionner (si defaulttx non force et donc vaut -1 ou '')
-			if ($defaulttx < 0 || dol_strlen($defaulttx) == 0) {
+			if (($defaulttx < 0 || dol_strlen($defaulttx) == 0) && is_object($societe_vendeuse)) {
 				$tmpthirdparty = new Societe($this->db);
 
 				$defaulttx = get_default_tva($societe_vendeuse, (is_object($societe_acheteuse) ? $societe_acheteuse : $tmpthirdparty), $idprod);
@@ -7835,7 +7835,7 @@ class Form
 			if ($selected && empty($selected_input_value)) {
 				require_once DOL_DOCUMENT_ROOT . '/ticket/class/ticket.class.php';
 				$tickettmpselect = new Ticket($this->db);
-				$tickettmpselect->fetch($selected);
+				$tickettmpselect->fetch((int) $selected);
 				$selected_input_value = $tickettmpselect->ref;
 				unset($tickettmpselect);
 			}
@@ -8031,7 +8031,7 @@ class Form
 	 * @param 	string 		$selected 				Preselected tickets
 	 * @param 	string 		$htmlname 				Name of HTML select field (must be unique in page).
 	 * @param 	string 		$filtertype				To add a filter
-	 * @param 	int 		$limit 					Limit on number of returned lines
+	 * @param 	int<0,max>	$limit 					Limit on number of returned lines
 	 * @param 	int 		$status 				Not used
 	 * @param 	string 		$selected_input_value 	Value of preselected input text (for use with ajax)
 	 * @param 	int<0,3>	$hidelabel 				Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)
@@ -8061,7 +8061,7 @@ class Form
 			if ($selected && empty($selected_input_value)) {
 				require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 				$projecttmpselect = new Project($this->db);
-				$projecttmpselect->fetch($selected);
+				$projecttmpselect->fetch((int) $selected);
 				$selected_input_value = $projecttmpselect->ref;
 				unset($projecttmpselect);
 			}
@@ -8222,7 +8222,9 @@ class Form
 	 *
 	 * @param stdClass 	$objp 		Result set of fetch
 	 * @param string 	$opt 		Option (var used for returned value in string option format)
-	 * @param array{key:string,value:string,type:string}	$optJson 	Option (var used for returned value in json format)
+	 * @param array{}	$optJson 	Option (var used for returned value in json format) @phan-output-reference
+	 * @phan-param array{key:string,value:string,type:string}	$optJson 	Option (var used for returned value in json format) @phan-output-reference
+	 * @phpstan-param-out array{key:string,value:string,type:string}	$optJson
 	 * @param string 	$selected 	Preselected value
 	 * @param string 	$filterkey 	Filter key to highlight
 	 * @return    void
@@ -8290,7 +8292,7 @@ class Form
 			if ($selected && empty($selected_input_value)) {
 				require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
 				$adherenttmpselect = new Adherent($this->db);
-				$adherenttmpselect->fetch($selected);
+				$adherenttmpselect->fetch((int) $selected);
 				$selected_input_value = $adherenttmpselect->ref;
 				unset($adherenttmpselect);
 			}
@@ -8396,7 +8398,7 @@ class Form
 
 			if (!$forcecombo) {
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($htmlname, $events, getDolGlobalString('PROJECT_USE_SEARCH_TO_SELECT') ? $conf->global->PROJECT_USE_SEARCH_TO_SELECT : '');
+				$out .= ajax_combobox($htmlname, $events, getDolGlobalInt('PROJECT_USE_SEARCH_TO_SELECT'));
 			}
 
 			$out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';
@@ -8915,14 +8917,14 @@ class Form
 	 * @param int<0,1>				$value_as_key 		1 to use value as key
 	 * @param string 				$moreparam 			Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
 	 * @param int<0,1>				$translate 			1=Translate and encode value
-	 * @param int 					$maxlen 			Length maximum for labels
+	 * @param int<0,max> 			$maxlen 			Length maximum for labels
 	 * @param int<0,1>				$disabled 			Html select box is disabled
-	 * @param string 				$sort 				'ASC' or 'DESC' = Sort on label, '' or 'NONE' or 'POS' = Do not sort, we keep original order
+	 * @param ''|'ASC'|'DESC'|'NONE'|'POS'	$sort 		'ASC' or 'DESC' = Sort on label, '' or 'NONE' or 'POS' = Do not sort, we keep original order
 	 * @param string 				$morecss 			Add more class to css styles
-	 * @param int 					$addjscombo 		Add js combo
+	 * @param int<0,1>				$addjscombo 		Add js combo
 	 * @param string 				$moreparamonempty 	Add more param on the empty option line. Not used if show_empty not set
 	 * @param int 					$disablebademail 	1=Check if a not valid email, 2=Check string '---', and if found into value, disable and colorize entry
-	 * @param int 					$nohtmlescape 		No html escaping (not recommended, use 'data-html' if you need to use label with HTML content).
+	 * @param int<0,1> 				$nohtmlescape 		No html escaping (not recommended, use 'data-html' if you need to use label with HTML content).
 	 * @return string									HTML select string.
 	 * @see multiselectarray(), selectArrayAjax(), selectArrayFilter()
 	 */
@@ -9447,7 +9449,7 @@ class Form
 	 * If a saved selection of fields exists for user (into $user->conf->MAIN_SELECTEDFIELDS_contextofpage), we use this one instead of default.
 	 *
 	 * @param string 	$htmlname 	Name of HTML field
-	 * @param array<string,array{label:string,checked:string,enabled?:string,type?:string,langfile?:string,position?:int,help?:string}> 	$array 	Array with array of fields we could show. This array may be modified according to setup of user.
+	 * @param array<string,array{label:string,checked?:string,enabled?:string,type?:string,langfile?:string,position?:int,help?:string}> 	$array 	Array with array of fields we could show. This array may be modified according to setup of user.
 	 * @param string 	$varpage 	Id of context for page. Can be set by caller with $varpage=(empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage);
 	 * @param string 	$pos 		Position colon on liste value 'left' or '' (meaning 'right').
 	 * @return string            	HTML multiselect string
@@ -10313,7 +10315,7 @@ class Form
 
 		// For thirdparty, contact, user, member, the ref is the id, so we show something else
 		if ($object->element == 'societe') {
-			$ret .= dol_htmlentities($object->name);
+			$ret .= dol_htmlentities((string) $object->name);
 
 			// List of extra languages
 			$arrayoflangcode = array();
@@ -10350,14 +10352,14 @@ class Form
 			$ret .= $object->ref . '<br>';
 			$fullname = $object->getFullName($langs);
 			if ($object->morphy == 'mor' && $object->societe) {
-				$ret .= dol_htmlentities($object->societe) . ((!empty($fullname) && $object->societe != $fullname) ? ' (' . dol_htmlentities($fullname) . $addgendertxt . ')' : '');
+				$ret .= dol_htmlentities((string) $object->societe) . ((!empty($fullname) && $object->societe != $fullname) ? ' (' . dol_htmlentities($fullname) . $addgendertxt . ')' : '');
 			} else {
-				$ret .= dol_htmlentities($fullname) . $addgendertxt . ((!empty($object->societe) && $object->societe != $fullname) ? ' (' . dol_htmlentities($object->societe) . ')' : '');
+				$ret .= dol_htmlentities($fullname) . $addgendertxt . ((!empty($object->societe) && $object->societe != $fullname) ? ' (' . dol_htmlentities((string) $object->societe) . ')' : '');
 			}
 		} elseif (in_array($object->element, array('contact', 'user'))) {
 			$ret .= '<span class="valignmiddle">'.dol_htmlentities($object->getFullName($langs)).'</span>'.$addgendertxt;
 		} elseif ($object->element == 'usergroup') {
-			$ret .= dol_htmlentities($object->name);
+			$ret .= dol_htmlentities((string) $object->name);
 		} elseif (in_array($object->element, array('action', 'agenda'))) {
 			'@phan-var-force ActionComm $object';
 			$ret .= $object->ref . '<br>' . $object->label;
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 933a6422512..0a638b41049 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2007-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2007-2015 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -446,14 +446,14 @@ function ajax_dialog($title, $message, $w = 350, $h = 150)
  * Use ajax_combobox() only for small combo list! If not, use instead ajax_autocompleter().
  * TODO: It is used when COMPANY_USE_SEARCH_TO_SELECT and CONTACT_USE_SEARCH_TO_SELECT are set by html.formcompany.class.php. Should use ajax_autocompleter instead like done by html.form.class.php for select_produits.
  *
- * @param	string	$htmlname					Name of html select field ('myid' or '.myclass')
+ * @param	string		$htmlname					Name of html select field ('myid' or '.myclass')
  * @param	array<array{method:string,url:string,htmlname:string,params?:array<string,string>}>	$events						More events option. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
- * @param  	int		$minLengthToAutocomplete	Minimum length of input string to start autocomplete
- * @param	int		$forcefocus					Force focus on field
- * @param	string	$widthTypeOfAutocomplete	'resolve' or 'off'
- * @param	string	$idforemptyvalue			'-1'
- * @param	string	$morecss					More css
- * @return	string								Return html string to convert a select field into a combo, or '' if feature has been disabled for some reason.
+ * @param  	int<0,max>	$minLengthToAutocomplete	Minimum length of input string to start autocomplete
+ * @param	int<0,1>	$forcefocus					Force focus on field
+ * @param	'resolve'|'off'	$widthTypeOfAutocomplete	'resolve' or 'off'
+ * @param	string		$idforemptyvalue			Defaults to '-1'
+ * @param	string		$morecss					More css
+ * @return	string									Return html string to convert a select field into a combo, or '' if feature has been disabled for some reason.
  * @see selectArrayAjax() of html.form.class
  */
 function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete = 0, $forcefocus = 0, $widthTypeOfAutocomplete = 'resolve', $idforemptyvalue = '-1', $morecss = '')
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index e8576c94002..84e30e0ad86 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -14,7 +14,7 @@
  * Copyright (C) 2021		Josep Lluís Amador		<joseplluis@lliuretic.cat>
  * Copyright (C) 2022		Gauthier VERDOL			<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024		Solution Libre SAS		<contact@solution-libre.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1508,7 +1508,7 @@ class CommandeFournisseur extends CommonOrder
 	 * 	Submit a supplier order to supplier
 	 *
 	 * 	@param		User	$user		User making change
-	 * 	@param		integer	$date		Date
+	 * 	@param		int		$date		Date
 	 * 	@param		int		$methode	Method
 	 * 	@param		string	$comment	Comment
 	 * 	@return		int			        Return integer <0 if KO, >0 if OK
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index d4fff20a846..d22e57f50d1 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2022      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2022      Charlene Benke       <charlene@patas-monkey.com>
  * Copyright (C) 2023 	   Joachim Kueter       <git-jk@bloxera.com>
- * Copyright (C) 2024      MDW                  <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW                  <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024      Nick Fragoulis
  *
  * This	program	is free	software; you can redistribute it and/or modify
@@ -259,7 +259,7 @@ if (empty($reshook)) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	} elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		// Multicurrency rate
-		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOSTINT('calculation_mode'));
+		$result = $object->setMulticurrencyRate((float) price2num(GETPOST('multicurrency_tx')), GETPOSTINT('calculation_mode'));
 	}
 
 	// bank account
@@ -439,7 +439,7 @@ if (empty($reshook)) {
 		$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
 		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
 		foreach ($object->lines as $line) {
-			$result = $object->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $line->info_bits, $line->product_type, 0, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice, $line->ref_supplier);
+			$result = $object->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, (float) $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $line->info_bits, $line->product_type, 0, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice, $line->ref_supplier);
 		}
 	} elseif ($action == 'addline' && $usercancreate) {
 		$db->begin();
@@ -529,7 +529,7 @@ if (empty($reshook)) {
 
 			$reg = array();
 			if (preg_match('/^idprod_([0-9]+)$/', GETPOST('idprodfournprice', 'alpha'), $reg)) {
-				$idprod = $reg[1];
+				$idprod = (int) $reg[1];
 				$res = $productsupplier->fetch($idprod); // Load product from its id
 				// Call to init some price properties of $productsupplier
 				// So if a supplier price already exists for another thirdparty (first one found), we use it as reference price
@@ -543,10 +543,10 @@ if (empty($reshook)) {
 					$fksoctosearch = $object->thirdparty->id;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 				}
-			} elseif (GETPOST('idprodfournprice', 'alpha') > 0) {
-				$qtytosearch = $qty; // Just to see if a price exists for the quantity. Not used to found vat.
+			} elseif (GETPOSTINT('idprodfournprice') > 0) {  // field is not idprod_..., should be int
+				$qtytosearch = (float) $qty; // Just to see if a price exists for the quantity. Not used to find vat.
 				//$qtytosearch = -1;	 // We force qty to -1 to be sure to find if a supplier price exist
-				$idprod = $productsupplier->get_buyprice(GETPOST('idprodfournprice', 'alpha'), $qtytosearch);
+				$idprod = $productsupplier->get_buyprice(GETPOSTINT('idprodfournprice'), $qtytosearch);
 				$res = $productsupplier->fetch($idprod);
 			}
 
@@ -636,7 +636,7 @@ if (empty($reshook)) {
 				$result = $object->addline(
 					$desc,
 					($price_base_type == 'HT' ? $pu : 0),
-					$qty,
+					(float) $qty,
 					$tva_tx,
 					$localtax1_tx,
 					$localtax2_tx,
@@ -676,10 +676,10 @@ if (empty($reshook)) {
 			$tva_tx = str_replace('*', '', $tva_tx);
 			$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
 			$desc = $product_desc;
-			$type = GETPOST('type');
+			$type = GETPOSTINT('type');
 			$ref_supplier = GETPOST('fourn_ref', 'alpha');
 
-			$fk_unit = GETPOST('units', 'alpha');
+			$fk_unit = ((string) GETPOST('units')) == '' ? null : GETPOSTINT('units');
 
 			if (!preg_match('/\((.*)\)/', $tva_tx)) {
 				$tva_tx = price2num($tva_tx); // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
@@ -699,7 +699,7 @@ if (empty($reshook)) {
 			$price_base_type = 'HT';
 			$pu_ht_devise = price2num($price_ht_devise, 'CU');
 
-			$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, $ref_supplier, $remise_percent, $price_base_type, $pu_ttc, $type, 0, 0, $date_start, $date_end, $array_options, $fk_unit, $pu_ht_devise);
+			$result = $object->addline($desc, (float) $pu_ht, (float) $qty, (float) $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, $ref_supplier, $remise_percent, $price_base_type, (float) $pu_ttc, $type, 0, 0, $date_start, $date_end, $array_options, $fk_unit, $pu_ht_devise);
 		}
 
 		//print "xx".$tva_tx; exit;
@@ -789,7 +789,7 @@ if (empty($reshook)) {
 
 		$productsupplier = new ProductFournisseur($db);
 		if (getDolGlobalInt('SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY') == 1) {		// Not the common case
-			if ($line->fk_product > 0 && $productsupplier->get_buyprice(0, price2num(GETPOSTINT('qty')), $line->fk_product, 'none', GETPOSTINT('socid')) < 0) {
+			if ($line->fk_product > 0 && $productsupplier->get_buyprice(0, (float) price2num(GETPOSTFLOAT('qty')), $line->fk_product, 'none', GETPOSTINT('socid')) < 0) {
 				setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
 			}
 		}
@@ -840,20 +840,20 @@ if (empty($reshook)) {
 			$lineid,
 			GETPOST('product_desc', 'restricthtml'),
 			$ht,
-			price2num(GETPOST('qty'), 'MS'),
-			price2num(GETPOST('remise_percent'), '', 2),
-			$vat_rate,
+			(float) price2num(GETPOST('qty'), 'MS'),
+			(float) price2num(GETPOST('remise_percent'), '', 2),
+			(float) $vat_rate,
 			$localtax1_rate,
 			$localtax2_rate,
 			$price_base_type,
 			0,
 			GETPOSTISSET("type") ? GETPOST("type") : $line->product_type,
-			false,
+			0,
 			$date_start,
 			$date_end,
 			$array_options,
-			GETPOST('units'),
-			$pu_ht_devise,
+			((string) GETPOST('units') === '') ? null : GETPOSTINT('units'),
+			(float) $pu_ht_devise,
 			GETPOST('fourn_ref', 'alpha')
 		);
 		unset($_POST['qty']);
@@ -1098,7 +1098,7 @@ if (empty($reshook)) {
 	if ($action == 'confirm_commande' && $confirm == 'yes' && $usercanorder) {
 		$db->begin();
 
-		$result = $object->commande($user, GETPOST("datecommande"), GETPOSTINT("methode"), GETPOSTINT('comment'));
+		$result = $object->commande($user, GETPOSTINT("datecommande"), GETPOSTINT("methode"), GETPOST('comment'));
 		if ($result > 0) {
 			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
@@ -1340,7 +1340,7 @@ if (empty($reshook)) {
 			$object->fk_incoterms = GETPOSTINT('incoterm_id');
 			$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 			$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
-			$object->multicurrency_tx = price2num(GETPOST('originmulticurrency_tx', 'alpha'));
+			$object->multicurrency_tx = (float) price2num(GETPOSTFLOAT('originmulticurrency_tx'));
 			$object->fk_project       = GETPOSTINT('projectid');
 
 			// Fill array 'array_options' with data from add form
@@ -1421,6 +1421,8 @@ if (empty($reshook)) {
 								if (method_exists($lines[$i], 'fetch_optionals')) { 							// For avoid conflicts if
 									$lines[$i]->fetch_optionals();
 									$array_option = $lines[$i]->array_options;
+								} else {
+									$array_option = array();
 								}
 
 								$ref_supplier = '';
@@ -1552,7 +1554,7 @@ if (empty($reshook)) {
 	if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 		if ($action == 'addcontact' && $permissiontoadd) {
 			if ($object->id > 0) {
-				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+				$contactid = (GETPOST('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
 				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 			}
@@ -1836,7 +1838,7 @@ if ($action == 'create') {
 			$langs->load("bank");
 			print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
 			print img_picto('', 'bank_account', 'class="pictofixedwidth"');
-			$form->select_comptes($fk_account, 'fk_account', 0, '', 1);
+			$form->select_comptes($fk_account ?? '', 'fk_account', 0, '', 1);
 			print '</td></tr>';
 		}
 
@@ -2150,7 +2152,7 @@ if ($action == 'create') {
 
 	$morehtmlref = '<div class="refidno">';
 	// Ref supplier
-	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, (int) $usercancreate, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>';
@@ -2182,7 +2184,7 @@ if ($action == 'create') {
 			if ($action != 'classify' && $caneditproject) {
 				$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, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 1, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 1, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
@@ -2268,9 +2270,9 @@ if ($action == 'create') {
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editconditions') {
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->cond_reglement_id, 'cond_reglement_id');
 		} else {
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->cond_reglement_id, 'none');
 		}
 		print "</td>";
 		print '</tr>';
@@ -2287,9 +2289,9 @@ if ($action == 'create') {
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editmode') {
-			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1);
+			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1);
 		} else {
-			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
+			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->mode_reglement_id, 'none');
 		}
 		print '</td></tr>';
 
@@ -2305,9 +2307,9 @@ if ($action == 'create') {
 			print '</tr></table>';
 			print '</td><td>';
 			if ($action == 'editbankaccount') {
-				$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
+				$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->fk_account, 'fk_account', 1);
 			} else {
-				$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+				$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->fk_account, 'none');
 			}
 			print '</td>';
 			print '</tr>';
@@ -2784,7 +2786,7 @@ if ($action == 'create') {
 			$delallowed = $usercancreate;
 			$modelpdf = (!empty($object->model_pdf) ? $object->model_pdf : (!getDolGlobalString('COMMANDE_SUPPLIER_ADDON_PDF') ? '' : $conf->global->COMMANDE_SUPPLIER_ADDON_PDF));
 
-			print $formfile->showdocuments('commande_fournisseur', $objref, $filedir, $urlsource, $genallowed, $delallowed, $modelpdf, 1, 0, 0, 0, 0, '', '', '', $object->thirdparty->default_lang, '', $object);
+			print $formfile->showdocuments('commande_fournisseur', $objref, $filedir, $urlsource, (int) $genallowed, (int) $delallowed, $modelpdf, 1, 0, 0, 0, 0, '', '', '', $object->thirdparty->default_lang, '', $object);
 			$somethingshown = $formfile->numoffiles;
 
 			// Show links to link elements
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 67b436e308e..3e5c60bff1a 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
  * Copyright (C) 2023      Christian Foellmann  <christian@foellmann.de>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -62,12 +63,13 @@ $object = new CommandeFournisseur($db);
 
 $usercancreate	= ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"));
 $permissiontoadd	= $usercancreate; // Used by the include of actions_addupdatedelete.inc.php
+$caneditproject = false;
 
 /*
  * Actions
  */
 
-$parameters = array('id'=>$id);
+$parameters = array('id' => $id);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -82,8 +84,8 @@ if (empty($reshook)) {
 		$result = $object->fetch($id);
 
 		if ($result > 0 && $id > 0) {
-			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-			$typeid    = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+			$contactid = (GETPOST('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
+			$typeid    = (GETPOST('typecontact') ? GETPOSTINT('typecontact') : GETPOSTINT('type'));
 			$result    = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 		}
 
@@ -165,10 +167,10 @@ if ($id > 0 || !empty($ref)) {
 			$morehtmlref .= '<br>';
 			if (0) {
 				$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
-				if ($action != 'classify' && $caneditproject) {
+				if ($action != 'classify' && $caneditproject) {  // Always false @phpstan-ignore-line
 					$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, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 5c43e0ba3d8..2a6c5d18865 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
  * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -93,6 +94,7 @@ if ($user->socid) {
 $result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
 
 $permissiontoadd = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); // Used by the include of actions_setnotes.inc.php
+$caneditproject = false;
 
 
 /*
@@ -106,7 +108,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
  * View
  */
 
-$form = new	Form($db);
+$form = new Form($db);
 
 $title = $object->ref." - ".$langs->trans('Documents');
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
@@ -146,10 +148,10 @@ if ($object->id > 0) {
 		$morehtmlref .= '<br>';
 		if (0) {
 			$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
-			if ($action != 'classify' && $caneditproject) {
+			if ($action != 'classify' && $caneditproject) {  // Always false @phpstan-ignore-line
 				$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, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 477b4b11f95..11ca80f1469 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -96,13 +97,14 @@ if (!$user->hasRight("fournisseur", "commande", "lire")) {
 
 $usercancreate	= ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"));
 $permissiontoadd	= $usercancreate; // Used by the include of actions_addupdatedelete.inc.php
+$caneditproject = false;
 
 
 /*
  *	Actions
  */
 
-$parameters = array('id'=>$id);
+$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');
@@ -120,7 +122,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
  * View
  */
 
-$form = new	Form($db);
+$form = new Form($db);
 $object = new CommandeFournisseur($db);
 
 if ($id > 0 || !empty($ref)) {
@@ -160,10 +162,10 @@ if (isModEnabled('project')) {
 	$morehtmlref .= '<br>';
 	if (0) {
 		$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
-		if ($action != 'classify' && $caneditproject) {
+		if ($action != 'classify' && $caneditproject) {  // Always false @phpstan-ignore-line
 			$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, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 	} else {
 		if (!empty($object->fk_project)) {
 			$proj = new Project($db);
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 5fd1c22b0ce..848634b588c 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2018-2022 Charlene Benke		<charlene@patas-monkey.com>
  * Copyright (C) 2019      Nicolas Zabouri		<info@inovea-conseil.com>
  * Copyright (C) 2021-2023 Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		William Mead		<william.mead@manchenumerique.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -134,7 +134,7 @@ $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'a
 $search_multicurrency_montant_tva = GETPOST('search_multicurrency_montant_tva', 'alpha');
 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
-$search_billed = GETPOST('search_billed', 'intcomma');
+$billed = GETPOSTINT('billed');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
@@ -218,7 +218,7 @@ foreach ($object->fields as $key => $val) {
 		$visible = (int) dol_eval((string) $val['visible'], 1);
 		$arrayfields['cf.'.$key] = array(
 			'label' => $val['label'],
-			'checked' => (($visible < 0) ? 0 : 1),
+			'checked' => (($visible < 0) ? '0' : '1'),
 			'enabled' => (abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
 			'position' => $val['position'],
 			'help' => isset($val['help']) ? $val['help'] : ''
@@ -230,7 +230,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:string,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
 
 $error = 0;
 
@@ -336,7 +336,6 @@ if (empty($reshook)) {
 		$search_date_approve_start = '';
 		$search_date_approve_end = '';
 		$billed = '';
-		$search_billed = '';
 		$toselect = array();
 		$search_array_options = array();
 	}
@@ -508,7 +507,7 @@ if (empty($reshook)) {
 							// Positive line
 							$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 							// Date start
-							$date_start = false;
+							$date_start = 0;
 							if ($lines[$i]->date_debut_prevue) {
 								$date_start = $lines[$i]->date_debut_prevue;
 							}
@@ -519,7 +518,7 @@ if (empty($reshook)) {
 								$date_start = $lines[$i]->date_start;
 							}
 							//Date end
-							$date_end = false;
+							$date_end = 0;
 							if ($lines[$i]->date_fin_prevue) {
 								$date_end = $lines[$i]->date_fin_prevue;
 							}
@@ -549,15 +548,15 @@ if (empty($reshook)) {
 								$lines[$i]->qty,
 								$lines[$i]->fk_product,
 								$lines[$i]->remise_percent,
-								$date_start,
-								$date_end,
+								(int) $date_start,
+								(int) $date_end,
 								0,
 								$lines[$i]->info_bits,
 								'HT',
 								$product_type,
 								// we don't use the rank from orderline because we may have lines from several orders
 								-1,
-								false,
+								0,
 								$lines[$i]->array_options,
 								$lines[$i]->fk_unit,
 								// we use the id of each order, not the id of the first one stored in $objecttmp->origin_id
@@ -765,7 +764,7 @@ if (empty($reshook)) {
 				$param .= '&optioncss='.urlencode($optioncss);
 			}
 			if ($billed != '') {
-				$param .= '&billed='.urlencode($billed);
+				$param .= '&billed='.((int) ($billed));
 			}
 
 			header("Location: ".$_SERVER['PHP_SELF'].'?'.$param);
@@ -803,7 +802,7 @@ if ($socid > 0) {
 	$title .= ' - '.$fourn->name;
 }
 
-if ($search_billed > 0) {
+if ($billed > 0) {
 	$title .= ' - '.$langs->trans("Billed");
 }
 
@@ -883,8 +882,8 @@ if (empty($arrayfields['s.name_alias']['checked']) && $search_company) {
 if ($search_request_author) {
 	$sql .= natural_search(array('u.lastname', 'u.firstname', 'u.login'), $search_request_author);
 }
-if ($search_billed != '' && $search_billed >= 0) {
-	$sql .= " AND cf.billed = ".((int) $search_billed);
+if ($billed != '' && $billed != '-1') {
+	$sql .= " AND cf.billed = ".((int) $billed);
 }
 //Required triple check because statut=0 means draft filter
 if (GETPOST('statut', 'intcomma') !== '') {
@@ -1203,8 +1202,8 @@ if ($resql) {
 	if ($search_project_ref >= 0) {
 		$param .= "&search_project_ref=".urlencode($search_project_ref);
 	}
-	if ($search_billed != '') {
-		$param .= "&search_billed=".urlencode($search_billed);
+	if ($billed != '') {
+		$param .= "&billed=".((int) $billed);
 	}
 	if ($show_files) {
 		$param .= '&show_files='.urlencode((string) ($show_files));
@@ -1346,7 +1345,7 @@ if ($resql) {
 	if ($user->hasRight("user", "user", "lire")) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('LinkedToSpecificUsers');
-		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx');
+		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, null, 0, '', '', '0', 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx');
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
@@ -1354,8 +1353,8 @@ if ($resql) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('IncludingProductWithTag');
-		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300 widthcentpercentminusx', 1);
+		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 0, 0, 1);
+		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, '', 'maxwidth300 widthcentpercentminusx', 1);
 		$moreforfilter .= '</div>';
 	}
 	// alert on late date
@@ -1543,7 +1542,7 @@ if ($resql) {
 	// Billed
 	if (!empty($arrayfields['cf.billed']['checked'])) {
 		print '<td class="liste_titre center parentonrightofpage">';
-		print $form->selectyesno('search_billed', $search_billed, 1, false, 1, 1, 'search_status width100 onrightofpage');
+		print $form->selectyesno('billed', $billed, 1, false, 1, 1, 'search_status width100 onrightofpage');
 		print '</td>';
 	}
 	// Status
@@ -1787,7 +1786,7 @@ if ($resql) {
 			$thirdpartytmp->client = $obj->client;
 			$thirdpartytmp->fournisseur = $obj->fournisseur;
 			// Output Kanban
-			print $objectstatic->getKanbanView('', array('thirdparty' => $thirdpartytmp->getNomUrl('supplier', 0, 0, -1), 'selected' => in_array($objectstatic->id, $arrayofselected)));
+			print $objectstatic->getKanbanView('', array('thirdparty' => $thirdpartytmp->getNomUrl(1, 'supplier', 0, 0, -1), 'selected' => in_array($objectstatic->id, $arrayofselected)));
 			if ($i == ($imaxinloop - 1)) {
 				print '</div>';
 				print '</td></tr>';
@@ -2176,7 +2175,7 @@ if ($resql) {
 	$genallowed = $permissiontoread;
 	$delallowed = $permissiontoadd;
 
-	print $formfile->showdocuments('massfilesarea_supplier_order', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+	print $formfile->showdocuments('massfilesarea_supplier_order', '', $filedir, $urlsource, 0, (int) $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 } else {
 	dol_print_error($db);
 }
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 967a875cd60..30fc1e63e68 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2017      Ferran Marcet       	<fmarcet@2byte.es>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -67,6 +68,7 @@ $object->fetch($id, $ref);
 $permissionnote = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); // Used by the include of actions_setnotes.inc.php
 $usercancreate	= ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"));
 $permissiontoadd	= $usercancreate; // Used by the include of actions_addupdatedelete.inc.php
+$caneditproject = false;
 
 
 /*
@@ -128,10 +130,10 @@ if ($id > 0 || !empty($ref)) {
 			$morehtmlref .= '<br>';
 			if (0) {
 				$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
-				if ($action != 'classify' && $caneditproject) {
+				if ($action != 'classify' && $caneditproject) {  // Always false @phpstan-ignore-line
 					$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, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index 302379acf8e..7b4006532a3 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2006 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -67,6 +68,7 @@ if (!$sortfield) {
 	$sortfield = "p.lastname";
 }
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
+$begin = '';
 
 
 /*
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 0508e7ac723..4d35651b3b2 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -3009,15 +3009,15 @@ class Societe extends CommonObject
 	/**
 	 *    	Return a link on thirdparty (with picto)
 	 *
-	 *		@param	int		$withpicto		          	Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only)
-	 *		@param	string	$option			          	Target of link (''=auto, 'nolink'=no link, 'customer', 'prospect', 'supplier', 'project', 'agenda', ...)
-	 *		@param	int		$maxlen			          	Max length of name
-	 *      @param	int  	$notooltip		          	1=Disable tooltip
-	 *      @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-	 *      @param	int		$noaliasinname			  	1=Do not add alias into the link ref
-	 *      @param	string	$target			  		  	add attribute target
-	 *      @param	string	$morecss					More CSS
-	 *		@return	string					          	String with URL
+	 *		@param	int<0,2>	$withpicto		          	Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only)
+	 *		@param	string		$option			          	Target of link (''=auto, 'nolink'=no link, 'customer', 'prospect', 'supplier', 'project', 'agenda', ...)
+	 *		@param	int<0,max>	$maxlen			          	Max length of name
+	 *      @param	int<0,1> 	$notooltip		          	1=Disable tooltip
+	 *      @param  int<-1,1>	$save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *      @param	int<0,1>	$noaliasinname			  	1=Do not add alias into the link ref
+	 *      @param	string		$target			  		  	add attribute target
+	 *      @param	string		$morecss					More CSS
+	 *		@return	string						          	String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $notooltip = 0, $save_lastsearch_value = -1, $noaliasinname = 0, $target = '', $morecss = '')
 	{
@@ -5443,7 +5443,6 @@ class Societe extends CommonObject
 	 *    @param    string      $code       Filter on this code of contact type ('SHIPPING', 'BILLING', ...)
 	 *	  @param    string      $element    Filter on this element of default contact type ('facture', 'propal', 'commande' ...)
 	 *    @return	array|int		        Array of contacts, -1 if error
-	 *
 	 */
 	public function getContacts($list = 0, $code = '', $element = '')
 	{

From 4af154c6d5831c58f2ad68b77ba8b28c6387c33b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Fri, 31 Jan 2025 11:02:34 +0100
Subject: [PATCH 412/602] Qual: Fix phan notices

# Qual: Fix phan notices

Fix phan notices mostly in relation with supplier invoices,
Fix phan notices in relation with formquestion (phpdoc update, casts).
---
 htdocs/adherents/card.php                     |   8 +-
 htdocs/compta/bank/various_payment/card.php   |   4 +-
 .../facture/class/facture-rec.class.php       |  10 +-
 htdocs/core/class/html.form.class.php         |  20 ++--
 .../modules/rapport/pdf_paiement.class.php    |   4 +-
 htdocs/fichinter/class/fichinterrec.class.php |   4 +-
 .../class/fournisseur.facture-rec.class.php   |  28 ++---
 htdocs/fourn/facture/agenda.php               |   6 +-
 htdocs/fourn/facture/card-rec.php             |  82 +++++++------
 htdocs/fourn/facture/card.php                 | 111 +++++++++---------
 htdocs/fourn/facture/contact.php              |   9 +-
 htdocs/fourn/facture/document.php             |   3 +-
 htdocs/fourn/facture/info.php                 |   3 +-
 htdocs/fourn/facture/list-rec.php             |  46 ++++----
 htdocs/fourn/facture/list.php                 |  96 +++++++--------
 htdocs/fourn/facture/messaging.php            |   6 +-
 htdocs/fourn/facture/note-rec.php             |   4 +-
 htdocs/fourn/facture/note.php                 |   3 +-
 htdocs/fourn/facture/paiement.php             |   6 +-
 htdocs/fourn/paiement/card.php                |   9 +-
 htdocs/fourn/paiement/document.php            |   5 +-
 htdocs/fourn/paiement/list.php                |  20 ++--
 .../recruitmentcandidature_card.php           |   4 +-
 htdocs/ticket/card.php                        |   6 +-
 htdocs/workstation/workstation_card.php       |   3 +-
 25 files changed, 258 insertions(+), 242 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 3e9335a30d1..82cf1ba1d43 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2015-2024	Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) 2018-2024	Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2021		Waël Almoman				<info@almoman.com>
- * Copyright (C) 2024       MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -1563,14 +1563,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			$fullname = $object->getFullName($langs);
 
 			if ($object->morphy == 'mor') {
-				$companyname = $object->company;
+				$companyname = (string) $object->company;
 				if (!empty($fullname)) {
-					$companyalias = $fullname;
+					$companyalias = (string) $fullname;
 				}
 			} else {
 				$companyname = $fullname;
 				if (!empty($object->company)) {
-					$companyalias = $object->company;
+					$companyalias = (string) $object->company;
 				}
 			}
 
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 8dc01195026..ce5565f644a 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2023       Joachim Kueter     		<git-jk@bloxera.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -597,7 +597,7 @@ if ($id) {
 			array('type' => 'date', 'name' => 'clone_date_value', 'label' => $langs->trans("DateValue"), 'value' => -1),
 			array('type' => 'other', 'tdclass' => 'fieldrequired', 'name' => 'clone_accountid', 'label' => $langs->trans("BankAccount"), 'value' => $form->select_comptes($object->fk_account, "accountid", 0, '', 1, '', 0, 'minwidth200', 1)),
 			array('type' => 'text', 'name' => 'clone_amount', 'label' => $langs->trans("Amount"), 'value' => price($object->amount)),
-			array('type' => 'select', 'name' => 'clone_sens', 'label' => $langs->trans("Sens").' '.$set_value_help, 'values' => $sensarray, 'default' => $object->sens),
+			array('type' => 'select', 'name' => 'clone_sens', 'label' => $langs->trans("Sens").' '.$set_value_help, 'values' => $sensarray, 'default' => (string) $object->sens),
 		);
 
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneVariousPayment', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 350);
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index cdc391e1ee8..01d22afb608 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -148,7 +148,7 @@ class FactureRec extends CommonInvoice
 	public $user_author;
 
 	/**
-	 * @var int Frequency
+	 * @var ?int Frequency
 	 */
 	public $frequency;
 
@@ -1945,10 +1945,10 @@ class FactureRec extends CommonInvoice
 	/**
 	 *	Update frequency and unit
 	 *
-	 *	@param     	int		$frequency		value of frequency
-	 *	@param     	string	$unit 			unit of frequency  (d, m, y)
-	 *	@param     	int 	$notrigger 		Disable the trigger
-	 *	@return		int						Return integer <0 if KO, >0 if OK
+	 *	@param     	?int		$frequency		value of frequency
+	 *	@param     	string		$unit 			unit of frequency  (d, m, y)
+	 *	@param     	int<0,1> 	$notrigger 		Disable the trigger
+	 *	@return		int							Return integer <0 if KO, >0 if OK
 	 */
 	public function setFrequencyAndUnit($frequency, $unit, $notrigger = 0)
 	{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d6f4d59281a..e95e401aaf0 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4077,7 +4077,7 @@ class Form
 					$optstart .= ' data-qty="' . dol_escape_htmltag($objp->quantity) . '"';
 					$optstart .= ' data-up="' . dol_escape_htmltag(price2num($objp->unitprice)) . '"';		// the price with numeric international format
 					$optstart .= ' data-up-locale="' . dol_escape_htmltag(price($objp->unitprice)) . '"';	// the price formatted in user language
-					$optstart .= ' data-discount="' . dol_escape_htmltag($outdiscount) . '"';
+					$optstart .= ' data-discount="' . dol_escape_htmltag((string) $outdiscount) . '"';
 					$optstart .= ' data-tvatx="' . dol_escape_htmltag(price2num($objp->tva_tx)) . '"';		// the rate with numeric international format
 					$optstart .= ' data-tvatx-formated="' . dol_escape_htmltag(price($objp->tva_tx, 0, $langs, 1, -1, 2)) . '"';	// the rate formatted in user language
 					$optstart .= ' data-default-vat-code="' . dol_escape_htmltag($objp->default_vat_code) . '"';
@@ -5274,7 +5274,7 @@ class Form
 	 * @param int 			$showibanbic 	Show iban/bic in label
 	 * @param string 		$morecss 		More CSS
 	 * @param int<0,1>		$nooutput 		1=Return string, do not send to output
-	 * @return int|string   	           	If noouput=0: Return integer <0 if error, Num of bank account found if OK (0, 1, 2, ...), If nooutput=1: Return a HTML select string.
+	 * @return int|string   	           	If nooutput=0: Return integer <0 if error, Num of bank account found if OK (0, 1, 2, ...), If nooutput=1: Return a HTML select string.
 	 */
 	public function selectRib($selected = '', $htmlname = 'ribcompanyid', $filtre = '', $useempty = 0, $moreattrib = '', $showibanbic = 0, $morecss = '', $nooutput = 0)
 	{
@@ -5615,11 +5615,11 @@ class Form
 	 * @param string $title Title
 	 * @param string $question Question
 	 * @param string $action Action
-	 * @param array<array{name:string,value:string,values:string[],default:string,label:string,type:string,size:string,morecss:string,moreattr:string,style:string,inputko?:int<0,1>}>|string|null 	$formquestion 		An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , 'size'=>, 'morecss'=>, 'moreattr'=>'autofocus' or 'style=...'))
-	 *                                                                                                                                                                                                                  'type' can be 'text', 'password', 'checkbox', 'radio', 'date', 'datetime', 'select', 'multiselect', 'morecss',
-	 *                                                                                                                                                                                                                  'other', 'onecolumn' or 'hidden'...
+	 * @param array<array{name?:string,value?:string|float|bool,values?:string[],default?:string,label?:string,type:string,size?:int|string,morecss?:string,moreattr?:string,style?:string,inputko?:int<0,1>}>|string|null 	$formquestion 		An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , 'size'=>, 'morecss'=>, 'moreattr'=>'autofocus' or 'style=...'))
+	 *                                                                                                                                                                                                                                          'type' can be 'text', 'password', 'checkbox', 'radio', 'date', 'datetime', 'select', 'multiselect', 'morecss',
+	 *                                                                                                                                                                                                                                          'other', 'onecolumn' or 'hidden'...
 	 * @param string $selectedchoice "" or "no" or "yes"
-	 * @param int|string $useajax 0=No, 1=Yes use Ajax to show the popup, 2=Yes and also submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx
+	 * @param int<0,2>|string $useajax 0=No, 1=Yes use Ajax to show the popup, 2=Yes and also submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx
 	 * @param int $height Force height of box
 	 * @param int $width Force width of box
 	 * @return    void
@@ -5648,9 +5648,9 @@ class Form
 	 * @param string 		$title 				Title
 	 * @param string 		$question 			Question
 	 * @param string 		$action 			Action
-	 * @param array<array{name:string,value?:string,values?:string[],default?:string,label:string,type:string,size?:string,morecss?:string,moreattr?:string,style?:string,inputko?:int<0,1>}>|string|null 	$formquestion 		An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , 'size'=>, 'morecss'=>, 'moreattr'=>'autofocus' or 'style=...'))
-	 *                                                                                                                                                                                                                          'type' can be 'text', 'password', 'checkbox', 'radio', 'date', 'datetime', 'select', 'multiselect', 'morecss',
-	 *                                                                                                                                                                                                                          'other', 'onecolumn' or 'hidden'...
+	 * @param null|string|array<array{name?:string,value?:string|float|bool,values?:string[],default?:string,label?:string,type:string,size?:int|string,morecss?:string,moreattr?:string,style?:string,inputko?:int<0,1>,tdclass?:string}>|array{text:string,0?:array{name:string,value?:string|float|bool,values?:string[],default?:string,label?:string,type:string,size?:int|string,morecss?:string,moreattr?:string,style?:string,inputko?:int<0,1>,tdclass?:string},1?:array{name:string,value?:string|float|bool,values?:string[],default?:string,label?:string,type:string,size?:int|string,morecss?:string,moreattr?:string,style?:string,inputko?:int<0,1>,tdclass?:string}}	$formquestion 		An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , 'size'=>, 'morecss'=>, 'moreattr'=>'autofocus' or 'style=...'))
+	 *                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      'type' can be 'text', 'password', 'checkbox', 'radio', 'date', 'datetime', 'select', 'multiselect', 'morecss',
+	 *                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      'other', 'onecolumn' or 'hidden'...
 	 * @param int<0,1>|''|'no'|'yes'|'1'|'0'	$selectedchoice 	'' or 'no', or 'yes' or '1', 1, '0' or 0
 	 * @param int<0,2>|string	$useajax 			0=No, 1=Yes use Ajax to show the popup, 2=Yes and also submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx
 	 * @param int|string 	$height 			Force height of box (0 = auto)
@@ -7222,7 +7222,7 @@ class Form
 	 * @param int<0,1> 				$disabled 		Disable input fields
 	 * @param int|string			$fullday 		When a checkbox with id #fullday is checked, hours are set with 00:00 (if value if 'fulldaystart') or 23:59 (if value is 'fulldayend')
 	 * @param string 				$addplusone 	Add a link "+1 hour". Value must be name of another selectDate field.
-	 * @param int|string|array<string,mixed>      $adddateof 		Add a link "Date of ..." using the following date. Must be array(array('adddateof' => ..., 'labeladddateof' => ...))
+	 * @param int|string|array<array{adddateof:int,labeladddateof?:string}>      $adddateof 		Add a link "Date of ..." using the following date. Must be array(array('adddateof' => ..., 'labeladddateof' => ...))
 	 * @param string 				$openinghours 	Specify hour start and hour end for the select ex 8,20
 	 * @param int 					$stepminutes 	Specify step for minutes between 1 and 30
 	 * @param string 				$labeladddateof Label to use for the $adddateof parameter. Deprecated. Used only when $adddateof is not an array.
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 105b69fe703..f6464155003 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2006-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015-2018 Charlene BENKE  	<charlie@patas-monkey.com>
  * Copyright (C) 2020      Maxime DEMAREST <maxime@indelog.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -156,7 +156,7 @@ class pdf_paiement extends CommonDocGenerator
 	 *	@param	string	$_dir			repertoire
 	 *	@param	int		$month			mois du rapport
 	 *	@param	int		$year			annee du rapport
-	 *	@param	string	$outputlangs	Lang output object
+	 *	@param	?Translate	$outputlangs	Lang output object
 	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function write_file($_dir, $month, $year, $outputlangs)
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index bcd1916c744..0a362916ee9 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -66,7 +66,7 @@ class FichinterRec extends Fichinter
 	public $auto_validate;
 
 	/**
-	 * @var int Frequency
+	 * @var ?int Frequency
 	 */
 	public $frequency;
 
@@ -732,7 +732,7 @@ class FichinterRec extends Fichinter
 	/**
 	 *	Update frequency and unit
 	 *
-	 *	@param	 	int		$frequency		value of frequency
+	 *	@param	 	?int	$frequency		value of frequency
 	 *	@param	 	string	$unit 			unit of frequency  (d, m, y)
 	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index 5b5b2dbb025..89cf0c3acb3 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -116,7 +116,7 @@ class FactureFournisseurRec extends CommonInvoice
 	public $label;
 
 	/**
-	 * @var float $amount
+	 * @var float
 	 * @deprecated
 	 */
 	public $amount;
@@ -183,7 +183,7 @@ class FactureFournisseurRec extends CommonInvoice
 	 */
 	public $usenewprice = 0;
 	/**
-	 * @var int
+	 * @var ?int
 	 */
 	public $frequency;
 	/**
@@ -949,15 +949,15 @@ class FactureFournisseurRec extends CommonInvoice
 	 * @param string 	$ref			Ref
 	 * @param string 	$label			Label
 	 * @param string 	$desc 			Description de la ligne
-	 * @param double 	$pu_ht			Unit price
-	 * @param double 	$pu_ttc			Unit price with tax
-	 * @param double 	$qty 			Quantity
-	 * @param int 		$remise_percent Percentage discount of the line
-	 * @param double 	$txtva 			Taux de tva force, sinon -1
+	 * @param float		$pu_ht			Unit price
+	 * @param float		$pu_ttc			Unit price with tax
+	 * @param float		$qty 			Quantity
+	 * @param float		$remise_percent Percentage discount of the line
+	 * @param float		$txtva 			Taux de tva force, sinon -1
 	 * @param int 		$txlocaltax1 	Local tax 1 rate (deprecated)
 	 * @param int 		$txlocaltax2 	Local tax 2 rate (deprecated)
 	 * @param string 	$price_base_type HT or TTC
-	 * @param int 		$type 			Type of line (0=product, 1=service)
+	 * @param int<0,1>	$type 			Type of line (0=product, 1=service)
 	 * @param int 		$date_start		Date start
 	 * @param int 		$date_end		Date end
 	 * @param int 		$info_bits 		VAT npr or not ?
@@ -1142,10 +1142,10 @@ class FactureFournisseurRec extends CommonInvoice
 	 * @param string	$ref				Ref
 	 * @param string 	$label 				Label of the line
 	 * @param string 	$desc 				Description de la ligne
-	 * @param double 	$pu_ht 				Unit price HT (> 0 even for credit note)
-	 * @param double 	$qty 				Quantity
+	 * @param float		$pu_ht 				Unit price HT (> 0 even for credit note)
+	 * @param float		$qty 				Quantity
 	 * @param int 		$remise_percent 	Percentage discount of the line
-	 * @param double 	$txtva 				VAT rate forced with format '5.0 (XXX)', or -1
+	 * @param float		$txtva 				VAT rate forced with format '5.0 (XXX)', or -1
 	 * @param int 		$txlocaltax1 		Local tax 1 rate (deprecated)
 	 * @param int 		$txlocaltax2 		Local tax 2 rate (deprecated)
 	 * @param string 	$price_base_type 	HT or TTC
@@ -1156,8 +1156,8 @@ class FactureFournisseurRec extends CommonInvoice
 	 * @param int 		$special_code 		Special code
 	 * @param int 		$rang 				Position of line
 	 * @param string 	$fk_unit 			Unit
-	 * @param double	$pu_ht_devise 		Unit price in currency
-	 * @param double    $pu_ttc             Unit price TTC (> 0 even for credit note)
+	 * @param float		$pu_ht_devise 		Unit price in currency
+	 * @param float		$pu_ttc             Unit price TTC (> 0 even for credit note)
 	 * @return int  		                Return integer <0 if KO, Id of line if OK
 	 * @throws Exception
 	 */
@@ -1879,7 +1879,7 @@ class FactureFournisseurRec extends CommonInvoice
 	/**
 	 *	Update frequency and unit
 	 *
-	 *	@param     	int		$frequency		value of frequency
+	 *	@param     	?int	$frequency		value of frequency
 	 *	@param     	string	$unit 			unit of frequency  (d, m, y)
 	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
diff --git a/htdocs/fourn/facture/agenda.php b/htdocs/fourn/facture/agenda.php
index bf25c4ae4f5..7b95b3cd375 100644
--- a/htdocs/fourn/facture/agenda.php
+++ b/htdocs/fourn/facture/agenda.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2023 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -167,7 +167,7 @@ if ($object->id > 0) {
 
 	$morehtmlref = '<div class="refidno">';
 	// Ref customer
-	$morehtmlref .= $form->editfieldkey("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldkey("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, (int) $usercancreate, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1, 'supplier');
@@ -183,7 +183,7 @@ if ($object->id > 0) {
 			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');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
index 4b5584b46e1..86150a73118 100644
--- a/htdocs/fourn/facture/card-rec.php
+++ b/htdocs/fourn/facture/card-rec.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2016       Meziane Sof             <virtualsof@yahoo.fr>
  * Copyright (C) 2017-2024	Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023-2024  Nick Fragoulis
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -140,6 +140,7 @@ $usercancreatewithdrarequest = $user->hasRight("prelevement", "bons", "creer");
 $now = dol_now();
 
 $error = 0;
+$predef = '';  // Legacy?  Used in several cards, always ''
 
 $result = restrictedArea($user, 'supplier_invoicerec', $object->id, $objecttype);
 
@@ -318,10 +319,10 @@ if (empty($reshook)) {
 		$result = $object->setBankAccount(GETPOSTINT('fk_account'));
 	} elseif ($action == 'setfrequency' && $permissiontoadd) {
 		// Set frequency and unit frequency
-		$object->setFrequencyAndUnit(GETPOST('frequency', 'int'), GETPOST('unit_frequency', 'alpha'));
+		$object->setFrequencyAndUnit((GETPOST('frequency') != '' ? GETPOSTINT('frequency') : null), GETPOST('unit_frequency', 'alpha'));
 	} elseif ($action == 'setdate_when' && $permissiontoadd) {
 		// Set next date of execution
-		$date = dol_mktime(GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear'));
+		$date = dol_mktime(GETPOSTINT('date_whenhour'), GETPOSTINT('date_whenmin'), 0, GETPOSTINT('date_whenmonth'), GETPOSTINT('date_whenday'), GETPOSTINT('date_whenyear'));
 		if (!empty($date)) {
 			$object->setNextDate($date);
 		}
@@ -376,12 +377,12 @@ if (empty($reshook)) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	} elseif ($action == 'setmulticurrencyrate' && $permissiontoadd) {
 		// Multicurrency rate
-		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOSTINT('calculation_mode'));
+		$result = $object->setMulticurrencyRate((float) price2num(GETPOST('multicurrency_tx')), GETPOSTINT('calculation_mode'));
 	} elseif ($action == 'setlibelle' && $permissiontoadd) {
 		// Set label
 		$object->fetch($id);
-		$object->libelle = GETPOST('libelle');
 		$object->label = GETPOST('libelle');
+		$object->libelle = $object->label;
 		$result = $object->update($user);
 
 		if ($result < 0) {
@@ -446,14 +447,15 @@ if (empty($reshook)) {
 		$prod_entry_mode = GETPOST('prod_entry_mode', 'alpha');
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
-			$tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0);
+			$tva_tx = (GETPOST('tva_tx', 'alpha') ? (string) GETPOST('tva_tx', 'alpha') : 0);
 			$ref_fournisseur = (GETPOSTISSET('fourn_ref') ? GETPOST('fourn_ref', 'restricthtml') : '');
 		} else {
 			$idprod = GETPOSTINT('idprod');
 			$tva_tx = '';
 		}
 
-		$qty = price2num(GETPOST('qty' . $predef, 'alpha'), 'MS', 2);
+		$qty = GETPOST('qty' . $predef, 'alpha');
+		$qty = ($qty === '') ? '' : (float) price2num(GETPOST('qty' . $predef, 'alpha'), 'MS', 2);
 		$remise_percent = price2num(GETPOST('remise_percent' . $predef), '', 2);
 
 		// Extrafields
@@ -467,7 +469,7 @@ if (empty($reshook)) {
 			}
 		}
 
-		if ((empty($idprod) || $idprod < 0) && ($price_ht < 0) && ($qty < 0)) {
+		if ((empty($idprod) || $idprod < 0) && ($price_ht < 0) && ((float) $qty < 0)) {
 			setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
 		}
@@ -493,6 +495,7 @@ if (empty($reshook)) {
 			$error++;
 		}
 
+		$ref_fournisseur = null;
 		if ($prod_entry_mode != 'free' && empty($error)) {    // With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
 			$productsupplier = new ProductFournisseur($db);
 
@@ -516,9 +519,9 @@ if (empty($reshook)) {
 					$fksoctosearch = $object->thirdparty->id;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 				}
-			} elseif (GETPOST('idprodfournprice', 'alpha') > 0) {
+			} elseif (GETPOSTINT('idprodfournprice') > 0) {  // Not a string here
 				$qtytosearch = $qty; // Just to see if a price exists for the quantity. Not used to found vat.
-				$idprod = $productsupplier->get_buyprice(GETPOST('idprodfournprice', 'alpha'), $qtytosearch);
+				$idprod = $productsupplier->get_buyprice(GETPOSTINT('idprodfournprice'), $qtytosearch);
 				$res = $productsupplier->fetch($idprod);
 				$ref_fournisseur = $productsupplier->ref_supplier;
 			}
@@ -533,12 +536,13 @@ if (empty($reshook)) {
 			$ret = $object->fetch_thirdparty();
 
 			// Clean parameters
-			$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'));
+			$date_start = dol_mktime(GETPOSTINT('date_start' . $predef . 'hour'), GETPOSTINT('date_start' . $predef . 'min'), GETPOSTINT('date_start' . $predef . 'sec'), GETPOSTINT('date_start' . $predef . 'month'), GETPOSTINT('date_start' . $predef . 'day'), GETPOSTINT('date_start' . $predef . 'year'));
+			$date_end = dol_mktime(GETPOSTINT('date_end' . $predef . 'hour'), GETPOSTINT('date_end' . $predef . 'min'), GETPOSTINT('date_end' . $predef . 'sec'), GETPOSTINT('date_end' . $predef . 'month'), GETPOSTINT('date_end' . $predef . 'day'), GETPOSTINT('date_end' . $predef . 'year'));
 			$price_base_type = (GETPOST('price_base_type', 'alpha') ? GETPOST('price_base_type', 'alpha') : 'HT');
 
 			// Define special_code for special lines
 			$special_code = 0;
+			$price_min = 0;
 			// if (!GETPOST('qty')) $special_code=3; // Options should not exists on invoices
 
 			// Ecrase $pu par celui du produit
@@ -666,7 +670,7 @@ if (empty($reshook)) {
 				}
 				$desc = $product_desc;
 				$type = GETPOST('type');
-				$fk_unit = GETPOST('units', 'alpha');
+				$fk_unit = GETPOST('units') ? GETPOSTINT('units') : null;
 			}
 
 			$date_start_fill = !empty(GETPOSTINT('date_start_fill')) ? GETPOSTINT('date_start_fill') : null;
@@ -677,8 +681,8 @@ if (empty($reshook)) {
 			$buyingprice = price2num(GETPOST('buying_price' . $predef) != '' ? GETPOST('buying_price' . $predef) : ''); // If buying_price is '0', we must keep this value
 
 			// Local Taxes
-			$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty, $tva_npr);
-			$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty, $tva_npr);
+			$localtax1_tx = get_localtax((string) $tva_tx, 1, $mysoc, $object->thirdparty, $tva_npr);
+			$localtax2_tx = get_localtax((string) $tva_tx, 2, $mysoc, $object->thirdparty, $tva_npr);
 			$info_bits = 0;
 			if ($tva_npr) {
 				$info_bits |= 0x01;
@@ -688,13 +692,13 @@ if (empty($reshook)) {
 			$pu_ht = (float) price2num($pu_ht);
 			$remise_percent = (float) price2num($remise_percent);
 
-			$price_min = (float) price2num($price_min);
+			$price_min = (float) price2num((float) $price_min);
 			if ($usercanproductignorepricemin && (!empty($price_min) && ($pu_ht * (1 - $remise_percent / 100) < $price_min))) {
 				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
 				setEventMessages($mesg, null, 'errors');
 			} else {
 				// Insert line
-				$result = $object->addline($idprod, $ref_fournisseur, $label, $desc, $pu_ht, $pu_ttc, $qty, $remise_percent, $tva_tx, $localtax1_tx, $localtax2_tx, $price_base_type, $type, $date_start_fill, $date_end_fill, $info_bits, $special_code, -1, $fk_unit);
+				$result = $object->addline($idprod, (string) $ref_fournisseur, $label, $desc, $pu_ht, $pu_ttc, (float) $qty, $remise_percent, (float) $tva_tx, $localtax1_tx, $localtax2_tx, $price_base_type, $type, $date_start_fill, $date_end_fill, $info_bits, $special_code, -1, (string) $fk_unit);
 
 				if ($result > 0) {
 					$object->fetch($object->id); // Reload lines
@@ -839,7 +843,7 @@ if (empty($reshook)) {
 
 		// Update line
 		if (! $error) {
-			$result = $object->updateline(GETPOSTINT('lineid'), GETPOSTINT('productid'), $ref_fourn, $label, $description, $pu_ht, $qty, $remise_percent, $vat_rate, $localtax1_rate, $localtax1_rate, 'HT', $type, $date_start_fill, $date_end_fill, $info_bits, $special_code, -1);
+			$result = $object->updateline(GETPOSTINT('lineid'), GETPOSTINT('productid'), $ref_fourn, $label, $description, (float) $pu_ht, (float) $qty, $remise_percent, (float) $vat_rate, $localtax1_rate, $localtax1_rate, 'HT', $type, $date_start_fill, $date_end_fill, $info_bits, $special_code, -1);
 			if ($result >= 0) {
 				$object->fetch($object->id); // Reload lines
 
@@ -894,6 +898,8 @@ $form = new Form($db);
 $formother = new FormOther($db);
 if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
+} else {
+	$formproject = null;
 }
 $companystatic = new Societe($db);
 $invoicerectmp = new FactureFournisseurRec($db);
@@ -999,7 +1005,7 @@ if ($action == 'create') {
 		print "</td></tr>";
 
 		// Project
-		if (isModEnabled('project') && is_object($object->thirdparty) && $object->thirdparty->id > 0) {
+		if (isModEnabled('project') && $formproject !== null && is_object($object->thirdparty) && $object->thirdparty->id > 0) {
 			$projectid = GETPOST('projectid') ? GETPOST('projectid') : $object->fk_project;
 			$langs->load('projects');
 			print '<tr><td>' . $langs->trans('Project') . '</td><td>';
@@ -1011,13 +1017,13 @@ if ($action == 'create') {
 		// Bank account
 		if ($object->fk_account > 0) {
 			print "<tr><td>" . $langs->trans('BankAccount') . "</td><td>";
-			$form->formSelectAccount($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_account, 'none');
+			$form->formSelectAccount($_SERVER['PHP_SELF'] . '?id=' . $object->id, (string) $object->fk_account, 'none');
 			print "</td></tr>";
 		}
 
 		//extrafields
 		$draft = new FactureFournisseur($db);
-		$draft->fetch(GETPOST('facid', 'int'));
+		$draft->fetch(GETPOSTINT('facid'));
 
 		$extralabels = new ExtraFields($db);
 		$extralabels = $extrafields->fetch_name_optionals_label($draft->table_element);
@@ -1076,7 +1082,7 @@ if ($action == 'create') {
 
 		// Date next run
 		print "<tr><td>" . $langs->trans('NextDateToExecution') . "</td><td>";
-		$date_next_execution = isset($date_next_execution) ? $date_next_execution : (GETPOST('remonth') ? dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')) : -1);
+		$date_next_execution = isset($date_next_execution) ? $date_next_execution : (GETPOST('remonth') ? dol_mktime(12, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear')) : -1);
 		print $form->selectDate($date_next_execution, '', 1, 1, 0, "add", 1, 1);
 		print "</td></tr>";
 
@@ -1171,19 +1177,19 @@ if ($action == 'create') {
 
 		$morehtmlref = '';
 		if ($action != 'edittitle') {
-			$morehtmlref .= $form->editfieldkey($object->title, 'title', $object->title, $object, $usercancreate, '', '', 0, 2);
+			$morehtmlref .= $form->editfieldkey($object->title, 'title', $object->title, $object, (int) $usercancreate, '', '', 0, 2);
 		} else {
 			$morehtmlref .= $form->editfieldval('', 'title', $object->title, $object, $usercancreate, 'string');
 		}
 		$morehtmlref .= '<div class="refidno">';
 		//Ref supplier
-		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, (int) $usercancreate, 'string', '', 0, 1);
 		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
 		// Thirdparty
 		$morehtmlref .= '<br>' . $langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 
 		// Project
-		if (isModEnabled('project')) {
+		if (isModEnabled('project') && $formproject !== null) {
 			$langs->load('projects');
 			$morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
 			if ($usercancreate) {
@@ -1194,11 +1200,11 @@ if ($action == 'create') {
 					$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($object->socid, (string) $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, $object->socid, (string) $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 				}
 			} else {
 				if (!empty($object->fk_project)) {
@@ -1238,7 +1244,7 @@ if ($action == 'create') {
 
 		// Label
 		print '<tr>';
-		print '<td>' . $form->editfieldkey("Label", 'libelle', $object->libelle, $object, $usercancreate) . '</td>';
+		print '<td>' . $form->editfieldkey("Label", 'libelle', $object->libelle, $object, (int) $usercancreate) . '</td>';
 		print '<td>' . $form->editfieldval("Label", 'libelle', $object->libelle, $object, $usercancreate) . '</td>';
 		print '</tr>';
 
@@ -1273,9 +1279,9 @@ if ($action == 'create') {
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editconditions') {
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'cond_reglement_id');
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, (string) $object->cond_reglement_id, 'cond_reglement_id');
 		} else {
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'none');
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, (string) $object->cond_reglement_id, 'none');
 		}
 
 		print '</td></tr>';
@@ -1291,9 +1297,9 @@ if ($action == 'create') {
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editmode') {
-			$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
+			$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, (string) $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
 		} else {
-			$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->mode_reglement_id, 'none');
+			$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, (string) $object->mode_reglement_id, 'none');
 		}
 		print '</td></tr>';
 
@@ -1308,9 +1314,9 @@ if ($action == 'create') {
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editbankaccount') {
-			$form->formSelectAccount($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_account, 'fk_account', 1);
+			$form->formSelectAccount($_SERVER['PHP_SELF'] . '?id=' . $object->id, (string) $object->fk_account, 'fk_account', 1);
 		} else {
-			$form->formSelectAccount($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_account, 'none');
+			$form->formSelectAccount($_SERVER['PHP_SELF'] . '?id=' . $object->id, (string) $object->fk_account, 'none');
 		}
 		print "</td>";
 		print '</tr>';
@@ -1397,7 +1403,7 @@ if ($action == 'create') {
 		// Date when (next invoice generation)
 		print '<tr><td>';
 		if ($action == 'date_when' || $object->frequency > 0) {
-			print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $usercancreate, 'day');
+			print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', (string) $object->date_when, $object, (int) $usercancreate, 'day');
 		} else {
 			print $langs->trans("NextDateToExecution");
 		}
@@ -1419,7 +1425,7 @@ if ($action == 'create') {
 		// Max period / Rest period
 		print '<tr><td>';
 		if ($action == 'nb_gen_max' || $object->frequency > 0) {
-			print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $usercancreate);
+			print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', (string) $object->nb_gen_max, $object, (int) $usercancreate);
 		} else {
 			print $langs->trans("MaxPeriodNumber");
 		}
@@ -1435,7 +1441,7 @@ if ($action == 'create') {
 		// Status of generated invoices
 		print '<tr><td>';
 		if ($action == 'auto_validate' || $object->frequency > 0) {
-			print $form->editfieldkey($langs->trans("StatusOfAutoGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $usercancreate);
+			print $form->editfieldkey($langs->trans("StatusOfAutoGeneratedInvoices"), 'auto_validate', (string) $object->auto_validate, $object, (int) $usercancreate);
 		} else {
 			print $langs->trans("StatusOfAutoGeneratedInvoices");
 		}
@@ -1450,7 +1456,7 @@ if ($action == 'create') {
 			print '<tr>';
 			print '<td>';
 			if ($action == 'generate_pdf' || $object->frequency > 0) {
-				print $form->editfieldkey($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $usercancreate);
+				print $form->editfieldkey($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', (string) $object->generate_pdf, $object, (int) $usercancreate);
 			} else {
 				print $langs->trans("StatusOfGeneratedDocuments");
 			}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 212ba2476e0..86162cdc9b7 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -13,7 +13,7 @@
  * Copyright (C) 2019       Ferran Marcet	        <fmarcet@2byte.es>
  * Copyright (C) 2022       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2023		Nick Fragoulis
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -193,7 +193,7 @@ if (empty($reshook)) {
 	if (GETPOST('linkedOrder') && empty($cancel) && $id > 0 && $permissiontoadd) {
 		$object->fetch($id);
 		$object->fetch_thirdparty();
-		$result = $object->add_object_linked('order_supplier', GETPOST('linkedOrder'));
+		$result = $object->add_object_linked('order_supplier', GETPOSTINT('linkedOrder'));
 	}
 
 	// Action clone object
@@ -283,7 +283,7 @@ if (empty($reshook)) {
 			$revertstock = GETPOST('revertstock');
 
 			if ($revertstock) {
-				$idwarehouse = GETPOST('idwarehouse');
+				$idwarehouse = GETPOSTINT('idwarehouse');
 
 				$qualified_for_stock_change = 0;
 				if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
@@ -462,7 +462,7 @@ if (empty($reshook)) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	} elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		// Multicurrency rate
-		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx', 'alpha')), GETPOSTINT('calculation_mode'));
+		$result = $object->setMulticurrencyRate((float) price2num(GETPOST('multicurrency_tx', 'alpha')), GETPOSTINT('calculation_mode'));
 	} elseif ($action == 'setbankaccount' && $usercancreate) {
 		// bank account
 		$result = $object->setBankAccount(GETPOSTINT('fk_account'));
@@ -762,7 +762,7 @@ if (empty($reshook)) {
 		$object->fetch($id);
 		if ($object->status == FactureFournisseur::STATUS_VALIDATED && $object->paid == 0) {
 			$paiementfourn = new PaiementFourn($db);
-			$result = $paiementfourn->fetch(GETPOST('paiement_id'));
+			$result = $paiementfourn->fetch(GETPOSTINT('paiement_id'));
 			if ($result > 0) {
 				$result = $paiementfourn->delete($user);
 				if ($result > 0) {
@@ -910,8 +910,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');
-				$object->mode_reglement_id	= GETPOST('mode_reglement_id');
+				$object->cond_reglement_id	= GETPOSTINT('cond_reglement_id');
+				$object->mode_reglement_id	= GETPOSTINT('mode_reglement_id');
 				$object->fk_account			= GETPOSTINT('fk_account');
 				$object->vat_reverse_charge	= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
 				$object->fk_project			= ($tmpproject > 0) ? $tmpproject : null;
@@ -1080,8 +1080,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');
-				$object->mode_reglement_id	= GETPOST('mode_reglement_id');
+				$object->cond_reglement_id	= GETPOSTINT('cond_reglement_id');
+				$object->mode_reglement_id	= GETPOSTINT('mode_reglement_id');
 				$object->fk_account			= GETPOSTINT('fk_account');
 				$object->vat_reverse_charge	= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
 				$object->fk_project			= ($tmpproject > 0) ? $tmpproject : null;
@@ -1253,7 +1253,7 @@ if (empty($reshook)) {
 								$descline .= ' - '.$srcobject->ref;
 								$result = $object->addline(
 									$descline,
-									$amount, // subprice
+									(float) $amount, // subprice
 									$tva, // vat rate
 									0, // localtax1_tx
 									0, // localtax2_tx
@@ -1273,7 +1273,7 @@ if (empty($reshook)) {
 									$object->origin,
 									0,
 									'',
-									'0', // special_code
+									0, // special_code
 									0,
 									0
 									//,$langs->trans('Deposit') //Deprecated
@@ -1374,8 +1374,8 @@ if (empty($reshook)) {
 									$lines[$i]->qty,
 									$lines[$i]->fk_product,
 									$lines[$i]->remise_percent,
-									$date_start,
-									$date_end,
+									(int) $date_start,
+									(int) $date_end,
 									0,
 									$lines[$i]->info_bits,
 									'HT',
@@ -1458,13 +1458,13 @@ if (empty($reshook)) {
 		if (GETPOST('productid') > 0) {
 			$productsupplier = new ProductFournisseur($db);
 			if (getDolGlobalInt('SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY') == 1) {		// Not the common case
-				if (GETPOST('productid') > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty')), GETPOSTINT('productid'), 'restricthtml', GETPOSTINT('socid')) < 0) {
+				if (GETPOST('productid') > 0 && $productsupplier->get_buyprice(0, (float) price2num(GETPOST('qty')), GETPOSTINT('productid'), 'restricthtml', GETPOSTINT('socid')) < 0) {
 					setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
 				}
 			}
 
 			$prod = new Product($db);
-			$prod->fetch(GETPOST('productid'));
+			$prod->fetch(GETPOSTINT('productid'));
 			$label = $prod->description;
 			if (trim(GETPOST('product_desc', 'restricthtml')) != trim($label)) {
 				$label = GETPOST('product_desc', 'restricthtml');
@@ -1476,8 +1476,8 @@ if (empty($reshook)) {
 			$type = GETPOST("type") ? GETPOST("type") : 0;
 		}
 
-		$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), GETPOST('date_startsec'), GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
-		$date_end = dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
+		$date_start = dol_mktime(GETPOSTINT('date_starthour'), GETPOSTINT('date_startmin'), GETPOSTINT('date_startsec'), GETPOSTINT('date_startmonth'), GETPOSTINT('date_startday'), GETPOSTINT('date_startyear'));
+		$date_end = dol_mktime(GETPOSTINT('date_endhour'), GETPOSTINT('date_endmin'), GETPOSTINT('date_endsec'), GETPOSTINT('date_endmonth'), GETPOSTINT('date_endday'), GETPOSTINT('date_endyear'));
 
 		// Define info_bits
 		$info_bits = 0;
@@ -1506,22 +1506,22 @@ if (empty($reshook)) {
 		$result = $object->updateline(
 			GETPOSTINT('lineid'),
 			$label,
-			$up,
-			$tva_tx,
+			(float) $up,
+			(float) $tva_tx,
 			$localtax1_tx,
 			$localtax2_tx,
-			price2num(GETPOST('qty'), 'MS'),
+			(float) price2num(GETPOST('qty'), 'MS'),
 			GETPOSTINT('productid'),
 			$price_base_type,
 			$info_bits,
 			$type,
-			$remise_percent,
+			(float) $remise_percent,
 			0,
 			$date_start,
 			$date_end,
 			$array_options,
-			GETPOST('units', 'alpha'),
-			$pu_devise,
+			GETPOST('units') != '' ? GETPOSTINT('units') : null,
+			(float) $pu_devise,
 			GETPOST('fourn_ref', 'alpha')
 		);
 		if ($result >= 0) {
@@ -1549,8 +1549,8 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && (GETPOST('alldate_start', 'alpha') || GETPOST('alldate_end', 'alpha')) && $usercancreate) {
 		// Define date start and date end for all line
-		$alldate_start = dol_mktime(GETPOST('alldate_starthour'), GETPOST('alldate_startmin'), 0, GETPOST('alldate_startmonth'), GETPOST('alldate_startday'), GETPOST('alldate_startyear'));
-		$alldate_end = dol_mktime(GETPOST('alldate_endhour'), GETPOST('alldate_endmin'), 0, GETPOST('alldate_endmonth'), GETPOST('alldate_endday'), GETPOST('alldate_endyear'));
+		$alldate_start = dol_mktime(GETPOSTINT('alldate_starthour'), GETPOSTINT('alldate_startmin'), 0, GETPOSTINT('alldate_startmonth'), GETPOSTINT('alldate_startday'), GETPOSTINT('alldate_startyear'));
+		$alldate_end = dol_mktime(GETPOSTINT('alldate_endhour'), GETPOSTINT('alldate_endmin'), 0, GETPOSTINT('alldate_endmonth'), GETPOSTINT('alldate_endday'), GETPOSTINT('alldate_endyear'));
 		foreach ($object->lines as $line) {
 			if ($line->product_type == 1) { // only service line
 				$result = $object->updateline($line->id, $line->desc, $line->subprice, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->qty, $line->fk_product, 'HT', $line->info_bits, $line->product_type, $line->remise_percent, 0, $alldate_start, $alldate_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice, $line->ref_supplier, $line->rang);
@@ -1563,7 +1563,7 @@ if (empty($reshook)) {
 		$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
 		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
 		foreach ($object->lines as $line) {
-			$result = $object->updateline($line->id, $line->desc, $line->subprice, $vat_rate, $localtax1_rate, $localtax2_rate, $line->qty, $line->fk_product, 'HT', $line->info_bits, $line->product_type, $line->remise_percent, 0, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice, $line->ref_supplier, $line->rang);
+			$result = $object->updateline($line->id, $line->desc, $line->subprice, (float) $vat_rate, $localtax1_rate, $localtax2_rate, $line->qty, $line->fk_product, 'HT', $line->info_bits, $line->product_type, $line->remise_percent, 0, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice, $line->ref_supplier, $line->rang);
 		}
 	} elseif ($action == 'addline' && $usercancreate) {
 		// Add a product line
@@ -1582,8 +1582,8 @@ if (empty($reshook)) {
 		// Set if we used free entry or predefined product
 		$predef = '';
 		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
-		$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'));
+		$date_start = dol_mktime(GETPOSTINT('date_start'.$predef.'hour'), GETPOSTINT('date_start'.$predef.'min'), GETPOSTINT('date_start'.$predef.'sec'), GETPOSTINT('date_start'.$predef.'month'), GETPOSTINT('date_start'.$predef.'day'), GETPOSTINT('date_start'.$predef.'year'));
+		$date_end = dol_mktime(GETPOSTINT('date_end'.$predef.'hour'), GETPOSTINT('date_end'.$predef.'min'), GETPOSTINT('date_end'.$predef.'sec'), GETPOSTINT('date_end'.$predef.'month'), GETPOSTINT('date_end'.$predef.'day'), GETPOSTINT('date_end'.$predef.'year'));
 
 		$prod_entry_mode = GETPOST('prod_entry_mode');
 		if ($prod_entry_mode == 'free') {
@@ -1695,7 +1695,7 @@ if (empty($reshook)) {
 
 			$reg = array();
 			if (preg_match('/^idprod_([0-9]+)$/', GETPOST('idprodfournprice', 'alpha'), $reg)) {
-				$idprod = $reg[1];
+				$idprod = (int) $reg[1];
 				$res = $productsupplier->fetch($idprod); // Load product from its id
 				// Call to init some price properties of $productsupplier
 				// So if a supplier price already exists for another thirdparty (first one found), we use it as reference price
@@ -1709,10 +1709,10 @@ if (empty($reshook)) {
 					$fksoctosearch = $object->thirdparty->id;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 				}
-			} elseif (GETPOST('idprodfournprice', 'alpha') > 0) {
-				$qtytosearch = $qty; // Just to see if a price exists for the quantity. Not used to found vat.
+			} elseif (GETPOSTINT('idprodfournprice') > 0) {  // Should be an int at this point
+				$qtytosearch = (float) $qty; // Just to see if a price exists for the quantity. Not used to found vat.
 				//$qtytosearch=-1;	       // We force qty to -1 to be sure to find if a supplier price exist
-				$idprod = $productsupplier->get_buyprice(GETPOST('idprodfournprice', 'alpha'), $qtytosearch);
+				$idprod = $productsupplier->get_buyprice(GETPOSTINT('idprodfournprice'), $qtytosearch);
 				$res = $productsupplier->fetch($idprod);
 			}
 
@@ -1804,7 +1804,7 @@ if (empty($reshook)) {
 					$tva_tx,
 					$localtax1_tx,
 					$localtax2_tx,
-					$qty,
+					(float) $qty,
 					$idprod,
 					$remise_percent,
 					$date_start,
@@ -1840,10 +1840,10 @@ if (empty($reshook)) {
 			$tva_tx = str_replace('*', '', $tva_tx);
 			$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
 			$desc = $product_desc;
-			$type = GETPOST('type');
+			$type = GETPOSTINT('type');
 			$ref_supplier = GETPOST('fourn_ref', 'alpha');
 
-			$fk_unit = GETPOST('units', 'alpha');
+			$fk_unit = GETPOST('units') !== '' ? GETPOSTINT('units') : null;
 
 			if (!preg_match('/\((.*)\)/', $tva_tx)) {
 				$tva_tx = price2num($tva_tx); // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
@@ -1862,7 +1862,7 @@ if (empty($reshook)) {
 			$price_base_type = 'HT';
 			$pu_devise = price2num($price_ht_devise, 'CU');
 
-			$result = $object->addline($product_desc, $pu_ht, $tva_tx, $localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $date_start, $date_end, 0, $tva_npr, $price_base_type, $type, -1, 0, $array_options, $fk_unit, 0, $pu_devise, $ref_supplier);
+			$result = $object->addline($product_desc, (float) $pu_ht, (float) $tva_tx, $localtax1_tx, $localtax2_tx, (float) $qty, 0, $remise_percent, $date_start, $date_end, 0, $tva_npr, $price_base_type, $type, -1, 0, $array_options, $fk_unit, 0, (float) $pu_devise, $ref_supplier);
 		}
 
 		//print "xx".$tva_tx; exit;
@@ -2065,8 +2065,8 @@ if (empty($reshook)) {
 			$result = $object->fetch($id);
 
 			if ($result > 0 && $id > 0) {
-				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+				$contactid = (GETPOST('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
+				$typeid = (GETPOST('typecontact') ? GETPOSTINT('typecontact') : GETPOSTINT('type'));
 				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 			}
 
@@ -2135,6 +2135,7 @@ if ($action == 'create') {
 	dol_htmloutput_events();
 
 	$currency_code = $conf->currency;
+	$vat_reverse_charge = 0;
 
 	$societe = '';
 	if (GETPOSTINT('socid') > 0) {
@@ -2695,7 +2696,7 @@ if ($action == 'create') {
 		// Invoice Subtype
 		if (getDolGlobalInt('INVOICE_SUBTYPE_ENABLED')) {
 			print '<tr><td class="fieldrequired">'.$langs->trans('InvoiceSubtype').'</td><td colspan="2">';
-			print $form->getSelectInvoiceSubtype(GETPOST('subtype'), 'subtype', 1, 0, '');
+			print $form->getSelectInvoiceSubtype(GETPOSTINT('subtype'), 'subtype', 1, 0, '');
 			print '</td></tr>';
 		}
 
@@ -2717,7 +2718,7 @@ 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, '', 0, 0, 0, "add", 1, 1);
+		print $form->selectDate((int) $dateinvoice, '', 0, 0, 0, "add", 1, 1);
 		print '</td></tr>';
 
 		// Payment term
@@ -3271,7 +3272,7 @@ if ($action == 'create') {
 
 		$morehtmlref = '<div class="refidno">';
 		// Ref supplier
-		$morehtmlref .= $form->editfieldkey("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldkey("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, (int) $usercancreate, 'string', '', 0, 1);
 		$morehtmlref .= $form->editfieldval("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
 		// Thirdparty
 		$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1, 'supplier');
@@ -3287,7 +3288,7 @@ if ($action == 'create') {
 				if ($action != 'classify') {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.((int) $object->id).'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 				}
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
@@ -3400,7 +3401,7 @@ if ($action == 'create') {
 
 			// Label
 			print '<tr>';
-			print '<td>'.$form->editfieldkey("Label", 'label', $object->label, $object, $usercancreate).'</td>';
+			print '<td>'.$form->editfieldkey("Label", 'label', $object->label, $object, (int) $usercancreate).'</td>';
 			print '<td>'.$form->editfieldval("Label", 'label', $object->label, $object, $usercancreate).'</td>';
 			print '</tr>';
 
@@ -3409,7 +3410,7 @@ if ($action == 'create') {
 
 			// Date
 			print '<tr><td>';
-			print $form->editfieldkey("DateInvoice", 'datef', $object->date, $object, $form_permission, 'datepicker');
+			print $form->editfieldkey("DateInvoice", 'datef', (string) $object->date, $object, (int) $form_permission, 'datepicker');
 			print '</td><td colspan="3">';
 			print $form->editfieldval("Date", 'datef', $object->date, $object, $form_permission, 'datepicker');
 			print '</td>';
@@ -3426,16 +3427,16 @@ if ($action == 'create') {
 			print '</tr></table>';
 			print '</td><td>';
 			if ($action == 'editconditions') {
-				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
+				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->cond_reglement_id, 'cond_reglement_id');
 			} else {
-				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
+				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->cond_reglement_id, 'none');
 			}
 			print "</td>";
 			print '</tr>';
 
 			// Due date
 			print '<tr><td>';
-			print $form->editfieldkey("DateMaxPayment", 'date_lim_reglement', $object->date_echeance, $object, $form_permission, 'datepicker');
+			print $form->editfieldkey("DateMaxPayment", 'date_lim_reglement', (string) $object->date_echeance, $object, (int) $form_permission, 'datepicker');
 			print '</td><td>';
 			print $form->editfieldval("DateMaxPayment", 'date_lim_reglement', $object->date_echeance, $object, $form_permission, 'datepicker');
 			if ($action != 'editdate_lim_reglement' && $object->hasDelay()) {
@@ -3455,9 +3456,9 @@ if ($action == 'create') {
 			print '</tr></table>';
 			print '</td><td>';
 			if ($action == 'editmode') {
-				$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1);
+				$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1);
 			} else {
-				$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
+				$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->mode_reglement_id, 'none');
 			}
 			print '</td></tr>';
 
@@ -3473,9 +3474,9 @@ if ($action == 'create') {
 				print '</tr></table>';
 				print '</td><td>';
 				if ($action == 'editbankaccount') {
-					$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
+					$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->fk_account, 'fk_account', 1);
 				} else {
-					$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+					$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->fk_account, 'none');
 				}
 				print "</td>";
 				print '</tr>';
@@ -3544,9 +3545,9 @@ if ($action == 'create') {
 				print '</td>';
 				print '<td>';
 				if ($action == 'edittransportmode') {
-					$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, $object->transport_mode_id, 'transport_mode_id', 1, 1);
+					$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->transport_mode_id, 'transport_mode_id', 1, 1);
 				} else {
-					$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, $object->transport_mode_id, 'none');
+					$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, (string) $object->transport_mode_id, 'none');
 				}
 				print '</td></tr>';
 			}
@@ -4194,7 +4195,7 @@ if ($action == 'create') {
 						$enableDelete = true;
 						$htmltooltip = '';
 					}
-					print dolGetButtonAction($htmltooltip, $langs->trans("Delete"), 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), $object->id, $enableDelete, $params);
+					print dolGetButtonAction($htmltooltip, $langs->trans("Delete"), 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), (string) $object->id, $enableDelete, $params);
 				}
 				print '</div>';
 
@@ -4213,7 +4214,7 @@ if ($action == 'create') {
 					$modelpdf = (empty($object->model_pdf) ? getDolGlobalString('INVOICE_SUPPLIER_ADDON_PDF') : $object->model_pdf);
 					$genifempty = 0;
 
-					print $formfile->showdocuments('facture_fournisseur', $subdir, $filedir, $urlsource, $genallowed, $delallowed, $modelpdf, $genifempty, 0, 0, 40, 0, '', '', '', $societe->default_lang);
+					print $formfile->showdocuments('facture_fournisseur', $subdir, $filedir, $urlsource, (int) $genallowed, (int) $delallowed, $modelpdf, $genifempty, 0, 0, 40, 0, '', '', '', $societe->default_lang);
 					$somethingshown = $formfile->numoffiles;
 
 					// Show links to link elements
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 5fd19773108..9a9c38ae0a5 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2017		Ferran Marcet       	<fmarcet@2byte.es>
  * Copyright (C) 2021-2024  Frédéric France			<frederic.france@free.fr>
  * Copyright (C) 2023       Christian Foellmann  <christian@foellmann.de>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -68,7 +69,7 @@ $permissiontoadd = $usercancreate;
  * Actions
  */
 
-$parameters = array('id'=>$id);
+$parameters = array('id' => $id);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -83,8 +84,8 @@ if (empty($reshook)) {
 		$result = $object->fetch($id, $ref);
 
 		if ($result > 0 && $id > 0) {
-			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-			$typeid    = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+			$contactid = (GETPOST('userid') ? GETPOSTINT('userid') : GETPOSTINT('contactid'));
+			$typeid    = (GETPOST('typecontact') ? GETPOSTINT('typecontact') : GETPOSTINT('type'));
 			$result    = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 		}
 
@@ -170,7 +171,7 @@ if ($id > 0 || !empty($ref)) {
 				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, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 75d961308b0..63d22994487 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2016		Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2017		Ferran Marcet       	<fmarcet@2byte.es>
  * Copyright (C) 2021-2024  Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -134,7 +135,7 @@ if ($object->id > 0) {
 			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, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index 1888bffdf73..a7e3a9d4840 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2016      Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -100,7 +101,7 @@ if (isModEnabled('project')) {
 		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, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 	} else {
 		if (!empty($object->fk_project)) {
 			$proj = new Project($db);
diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php
index 105e2b08deb..5362aa4bd42 100644
--- a/htdocs/fourn/facture/list-rec.php
+++ b/htdocs/fourn/facture/list-rec.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2015-2021 Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2016      Meziane Sof          <virtualsof@yahoo.fr>
- * Copyright (C) 2024	   MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024      Nick Fragoulis
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
@@ -84,7 +84,7 @@ $search_montant_ht = GETPOST('search_montant_ht');
 $search_montant_vat = GETPOST('search_montant_vat');
 $search_montant_ttc = GETPOST('search_montant_ttc');
 $search_payment_mode = GETPOST('search_payment_mode');
-$search_payment_term = GETPOST('search_payment_term');
+$search_payment_term = GETPOST('search_payment_term', 'int');
 $search_date_startday = GETPOSTINT('search_date_startday');
 $search_date_startmonth = GETPOSTINT('search_date_startmonth');
 $search_date_startyear = GETPOSTINT('search_date_startyear');
@@ -146,31 +146,31 @@ if (!$sortfield) {
 	$sortfield = 'f.titre';
 }
 $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_ttc' => array('label' => 'AmountTTC', 'checked' => 1),
-	'f.fk_mode_reglement' => array('label' => 'PaymentMode', 'checked' => 0),
-	'f.fk_cond_reglement' => array('label' => 'PaymentTerm', 'checked' => 0),
-	'recurring' => array('label' => 'RecurringInvoice', 'checked' => 1),
-	'f.frequency' => array('label' => 'Frequency', 'checked' => 1),
-	'f.unit_frequency' => array('label' => 'FrequencyUnit', 'checked' => 1),
-	'f.nb_gen_done' => array('label' => 'NbOfGenerationDoneShort', 'checked' => 1),
-	'f.date_last_gen' => array('label' => 'DateLastGenerationShort', 'checked' => 1),
-	'f.date_when' => array('label' => 'NextDateToExecutionShort', 'checked' => 1),
-	'f.fk_user_author' => array('label' => 'UserCreation', 'checked' => 0, 'position' => 500),
-	'f.fk_user_modif' => array('label' => 'UserModification', 'checked' => 0, 'position' => 505),
-	'f.datec' => array('label' => 'DateCreation', 'checked' => 0, 'position' => 520),
-	'f.tms' => array('label' => 'DateModificationShort', 'checked' => 0, 'position' => 525),
-	'status' => array('label' => 'Status', 'checked' => 1, 'position' => 1000),
+	'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_ttc' => array('label' => 'AmountTTC', 'checked' => '1'),
+	'f.fk_mode_reglement' => array('label' => 'PaymentMode', 'checked' => '0'),
+	'f.fk_cond_reglement' => array('label' => 'PaymentTerm', 'checked' => '0'),
+	'recurring' => array('label' => 'RecurringInvoice', 'checked' => '1'),
+	'f.frequency' => array('label' => 'Frequency', 'checked' => '1'),
+	'f.unit_frequency' => array('label' => 'FrequencyUnit', 'checked' => '1'),
+	'f.nb_gen_done' => array('label' => 'NbOfGenerationDoneShort', 'checked' => '1'),
+	'f.date_last_gen' => array('label' => 'DateLastGenerationShort', 'checked' => '1'),
+	'f.date_when' => array('label' => 'NextDateToExecutionShort', 'checked' => '1'),
+	'f.fk_user_author' => array('label' => 'UserCreation', 'checked' => '0', 'position' => 500),
+	'f.fk_user_modif' => array('label' => 'UserModification', 'checked' => '0', 'position' => 505),
+	'f.datec' => array('label' => 'DateCreation', 'checked' => '0', 'position' => 520),
+	'f.tms' => array('label' => 'DateModificationShort', 'checked' => '0', 'position' => 525),
+	'status' => array('label' => 'Status', 'checked' => '1', 'position' => 1000),
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:string,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
 
 if ($socid > 0) {
 	$tmpthirdparty = new Societe($db);
@@ -610,7 +610,7 @@ if (!empty($arrayfields['f.titre']['checked'])) {
 }
 // Thirdparty
 if (!empty($arrayfields['s.nom']['checked'])) {
-	print '<td class="liste_titre left"><input class="flat" type="text" size="8" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
+	print '<td class="liste_titre left"><input class="flat" type="text" size="8" name="search_societe" value="'.dol_escape_htmltag((string) $search_societe).'"></td>';
 }
 if (!empty($arrayfields['f.total_ht']['checked'])) {
 	// Amount net
@@ -633,7 +633,7 @@ if (!empty($arrayfields['f.total_ttc']['checked'])) {
 if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
 	// Payment term
 	print '<td class="liste_titre">';
-	print $form->getSelectConditionsPaiements($search_payment_term, 'search_payment_term', -1, 1, 1, 'maxwidth100');
+	print $form->getSelectConditionsPaiements((int) $search_payment_term, 'search_payment_term', -1, 1, 1, 'maxwidth100');
 	print "</td>";
 }
 if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 883dfa9955f..da53f54dd30 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -15,7 +15,7 @@
  * Copyright (C) 2019-2024	Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) 2023		Nick Fragoulis
  * Copyright (C) 2023		Joachim Kueter				<git-jk@bloxera.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -95,7 +95,7 @@ $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat',
 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
 $search_status = GETPOST('search_status', 'intcomma');	// Can be '' or a numeric
 $search_paymentmode = GETPOST('search_paymentmode', 'intcomma');
-$search_paymentcond = GETPOST('search_paymentcond', 'intcomma');
+$search_paymentcond = GETPOST('search_paymentcond') ? GETPOSTINT('search_paymentcond') : '';
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST("search_state");
@@ -179,42 +179,42 @@ if (empty($user->socid)) {
 
 $checkedtypetiers = 0;
 $arrayfields = array(
-	'f.ref' => array('label' => "Ref", 'checked' => 1, 'position' => 5),
-	'f.ref_supplier' => array('label' => "RefSupplier", 'checked' => 1, 'position' => 7),
-	'f.type' => array('label' => "Type", 'checked' => 0, 'position' => 15),
-	'f.subtype' => array('label' => "InvoiceSubtype", 'checked' => 0, 'position' => 17),
-	'f.label' => array('label' => "Label", 'checked' => 0, 'position' => 20),
-	'f.datef' => array('label' => "DateInvoice", 'checked' => 1, 'position' => 25),
-	'f.date_lim_reglement' => array('label' => "DateDue", 'checked' => 1, 'position' => 27),
-	'p.ref' => array('label' => "ProjectRef", 'checked' => 0, 'position' => 30),
-	's.nom' => array('label' => "ThirdParty", 'checked' => 1, 'position' => 41),
-	's.name_alias' => array('label' => "AliasNameShort", 'checked' => 0, 'position' => 42),
-	's.town' => array('label' => "Town", 'checked' => -1, 'position' => 43),
-	's.zip' => array('label' => "Zip", 'checked' => -1, 'position' => 44),
-	'state.nom' => array('label' => "StateShort", 'checked' => 0, 'position' => 45),
-	'country.code_iso' => array('label' => "Country", 'checked' => 0, 'position' => 46),
+	'f.ref' => array('label' => "Ref", 'checked' => '1', 'position' => 5),
+	'f.ref_supplier' => array('label' => "RefSupplier", 'checked' => '1', 'position' => 7),
+	'f.type' => array('label' => "Type", 'checked' => '0', 'position' => 15),
+	'f.subtype' => array('label' => "InvoiceSubtype", 'checked' => '0', 'position' => 17),
+	'f.label' => array('label' => "Label", 'checked' => '0', 'position' => 20),
+	'f.datef' => array('label' => "DateInvoice", 'checked' => '1', 'position' => 25),
+	'f.date_lim_reglement' => array('label' => "DateDue", 'checked' => '1', 'position' => 27),
+	'p.ref' => array('label' => "ProjectRef", 'checked' => '0', 'position' => 30),
+	's.nom' => array('label' => "ThirdParty", 'checked' => '1', 'position' => 41),
+	's.name_alias' => array('label' => "AliasNameShort", 'checked' => '0', 'position' => 42),
+	's.town' => array('label' => "Town", 'checked' => '-1', 'position' => 43),
+	's.zip' => array('label' => "Zip", 'checked' => '-1', 'position' => 44),
+	'state.nom' => array('label' => "StateShort", 'checked' => '0', 'position' => 45),
+	'country.code_iso' => array('label' => "Country", 'checked' => '0', 'position' => 46),
 	'typent.code' => array('label' => "ThirdPartyType", 'checked' => $checkedtypetiers, 'position' => 49),
-	'f.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => 1, 'position' => 52),
-	'f.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => 1, 'position' => 50),
-	'f.total_ht' => array('label' => "AmountHT", 'checked' => 1, 'position' => 105),
-	'f.total_vat' => array('label' => "AmountVAT", 'checked' => 0, 'position' => 110),
-	'f.total_localtax1' => array('label' => $langs->transcountry("AmountLT1", $mysoc->country_code), 'checked' => 0, 'enabled' => $mysoc->localtax1_assuj == "1", 'position' => 95),
-	'f.total_localtax2' => array('label' => $langs->transcountry("AmountLT2", $mysoc->country_code), 'checked' => 0, 'enabled' => $mysoc->localtax2_assuj == "1", 'position' => 100),
-	'f.total_ttc' => array('label' => "AmountTTC", 'checked' => 1, 'position' => 115),
-	'dynamount_payed' => array('label' => "Paid", 'checked' => 0, 'position' => 116),
-	'rtp' => array('label' => "Rest", 'checked' => 0, 'position' => 117),
-	'f.multicurrency_code' => array('label' => 'Currency', 'checked' => 0, 'position' => 205, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
-	'f.multicurrency_tx' => array('label' => 'CurrencyRate', 'checked' => 0, 'position' => 206, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
-	'f.multicurrency_total_ht' => array('label' => 'MulticurrencyAmountHT', 'position' => 207, 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
-	'f.multicurrency_total_vat' => array('label' => 'MulticurrencyAmountVAT', 'position' => 208, 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
-	'f.multicurrency_total_ttc' => array('label' => 'MulticurrencyAmountTTC', 'position' => 209, 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
-	'multicurrency_dynamount_payed' => array('label' => 'MulticurrencyAlreadyPaid', 'position' => 210, 'checked' => 0, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
-	'multicurrency_rtp' => array('label' => 'MulticurrencyRemainderToPay', 'checked' => 0, 'position' => 211, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)), // Not enabled by default because slow
-	'u.login' => array('label' => "Author", 'checked' => -1, 'position' => 500),
-	'f.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 501),
-	'f.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 502),
-	'f.nb_docs' => array('label' => "Documents", 'checked' => -1, 'position' => 510),
-	'f.fk_statut' => array('label' => "Status", 'checked' => 1, 'position' => 1000),
+	'f.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => '1', 'position' => 52),
+	'f.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => '1', 'position' => 50),
+	'f.total_ht' => array('label' => "AmountHT", 'checked' => '1', 'position' => 105),
+	'f.total_vat' => array('label' => "AmountVAT", 'checked' => '0', 'position' => 110),
+	'f.total_localtax1' => array('label' => $langs->transcountry("AmountLT1", $mysoc->country_code), 'checked' => '0', 'enabled' => $mysoc->localtax1_assuj == "1", 'position' => 95),
+	'f.total_localtax2' => array('label' => $langs->transcountry("AmountLT2", $mysoc->country_code), 'checked' => '0', 'enabled' => $mysoc->localtax2_assuj == "1", 'position' => 100),
+	'f.total_ttc' => array('label' => "AmountTTC", 'checked' => '1', 'position' => 115),
+	'dynamount_payed' => array('label' => "Paid", 'checked' => '0', 'position' => 116),
+	'rtp' => array('label' => "Rest", 'checked' => '0', 'position' => 117),
+	'f.multicurrency_code' => array('label' => 'Currency', 'checked' => '0', 'position' => 205, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'f.multicurrency_tx' => array('label' => 'CurrencyRate', 'checked' => '0', 'position' => 206, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'f.multicurrency_total_ht' => array('label' => 'MulticurrencyAmountHT', 'position' => 207, 'checked' => '0', 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'f.multicurrency_total_vat' => array('label' => 'MulticurrencyAmountVAT', 'position' => 208, 'checked' => '0', 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'f.multicurrency_total_ttc' => array('label' => 'MulticurrencyAmountTTC', 'position' => 209, 'checked' => '0', 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'multicurrency_dynamount_payed' => array('label' => 'MulticurrencyAlreadyPaid', 'position' => 210, 'checked' => '0', 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)),
+	'multicurrency_rtp' => array('label' => 'MulticurrencyRemainderToPay', 'checked' => '0', 'position' => 211, 'enabled' => (!isModEnabled("multicurrency") ? 0 : 1)), // Not enabled by default because slow
+	'u.login' => array('label' => "Author", 'checked' => '-1', 'position' => 500),
+	'f.datec' => array('label' => "DateCreation", 'checked' => '0', 'position' => 501),
+	'f.tms' => array('label' => "DateModificationShort", 'checked' => '0', 'position' => 502),
+	'f.nb_docs' => array('label' => "Documents", 'checked' => '-1', 'position' => 510),
+	'f.fk_statut' => array('label' => "Status", 'checked' => '1', 'position' => 1000),
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -226,7 +226,7 @@ if (empty($subtypearray)) {
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:string,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
 
 if (!isModEnabled('supplier_invoice')) {
 	accessforbidden();
@@ -384,6 +384,7 @@ if (empty($reshook)) {
 					$rsql .= " AND pfd.traite = 0";
 					$rsql .= " ORDER BY pfd.date_demande DESC";
 
+					$numprlv = 0;
 					$result_sql = $db->query($rsql);
 					if ($result_sql) {
 						$numprlv = $db->num_rows($result_sql);
@@ -439,6 +440,7 @@ $thirdparty = new Societe($db);
 $subtypearray = $object->getArrayOfInvoiceSubtypes(0);
 $now = dol_now();
 
+$soc = null;
 if ($socid > 0) {
 	$soc = new Societe($db);
 	$soc->fetch($socid);
@@ -447,7 +449,7 @@ if ($socid > 0) {
 	}
 }
 
-$title = $langs->trans("BillsSuppliers").($socid ? ' - '.$soc->name : '');
+$title = $langs->trans("BillsSuppliers").($socid && ($soc !== null) ? ' - '.$soc->name : '');
 $help_url = 'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores';
 
 // Build and execute select
@@ -1064,7 +1066,7 @@ if ($user->hasRight("user", "user", "lire")) {
 if ($user->hasRight("user", "user", "lire")) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('LinkedToSpecificUsers');
-	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
+	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, null, 0, '', '', '', 0, 0, '', 0, '', 'maxwidth200');
 	$moreforfilter .= '</div>';
 }
 // If the user can view prospects other than his'
@@ -1072,8 +1074,8 @@ if (isModEnabled('category') && $user->hasRight('categorie', 'lire') && ($user->
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('IncludingProductWithTag');
-	$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300 widthcentpercentminusx', 1);
+	$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 0, 0, 1);
+	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, '', 'maxwidth300 widthcentpercentminusx', 1);
 	$moreforfilter .= '</div>';
 }
 
@@ -1185,7 +1187,7 @@ if (!empty($arrayfields['p.ref']['checked'])) {
 }
 // Thirpdarty
 if (!empty($arrayfields['s.nom']['checked'])) {
-	print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'"'.($socid > 0 ? " disabled" : "").'></td>';
+	print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_company" value="'.dol_escape_htmltag((string) $search_company).'"'.($socid > 0 ? " disabled" : "").'></td>';
 }
 // Alias
 if (!empty($arrayfields['s.name_alias']['checked'])) {
@@ -1208,7 +1210,7 @@ if (!empty($arrayfields['state.nom']['checked'])) {
 // Country
 if (!empty($arrayfields['country.code_iso']['checked'])) {
 	print '<td class="liste_titre center">';
-	print $form->select_country($search_country, 'search_country', '', 0, 'minwidth150imp maxwidth150', 'code2', 1, 0, 1, null, 1);
+	print $form->select_country($search_country, 'search_country', '', 0, 'minwidth150imp maxwidth150', 'code2', 1, 0, 1, array(), 1);
 	print '</td>';
 }
 // Company type
@@ -1619,10 +1621,10 @@ while ($i < $imaxinloop) {
 		$multicurrency_remaintopay = 0;
 	}
 	if ($facturestatic->type == FactureFournisseur::TYPE_CREDIT_NOTE && $obj->paye == 1) {		// If credit note closed, we take into account the amount not yet consumed
-		$remaincreditnote = $discount->getAvailableDiscounts($thirdparty, '', 'rc.fk_facture_source='.$facturestatic->id);
+		$remaincreditnote = $discount->getAvailableDiscounts($thirdparty, null, 'rc.fk_facture_source='.$facturestatic->id);
 		$remaintopay = -$remaincreditnote;
 		$totalpay = price2num($facturestatic->total_ttc - $remaintopay);
-		$multicurrency_remaincreditnote = $discount->getAvailableDiscounts($thirdparty, '', 'rc.fk_facture_source='.$facturestatic->id, 0, 0, 1);
+		$multicurrency_remaincreditnote = $discount->getAvailableDiscounts($thirdparty, null, 'rc.fk_facture_source='.$facturestatic->id, 0, 0, 1);
 		$multicurrency_remaintopay = -$multicurrency_remaincreditnote;
 		$multicurrency_totalpay = price2num($facturestatic->multicurrency_total_ttc - $multicurrency_remaintopay);
 	}
@@ -2126,7 +2128,7 @@ if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords
 	$delallowed = $permissiontoadd;
 	$title = '';
 
-	print $formfile->showdocuments('massfilesarea_supplier_invoice', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+	print $formfile->showdocuments('massfilesarea_supplier_invoice', '', $filedir, $urlsource, 0, (int) $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
 
 // End of page
diff --git a/htdocs/fourn/facture/messaging.php b/htdocs/fourn/facture/messaging.php
index a860423e10c..c623bac5a54 100644
--- a/htdocs/fourn/facture/messaging.php
+++ b/htdocs/fourn/facture/messaging.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2023 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -169,7 +169,7 @@ if ($object->id > 0) {
 
 	$morehtmlref = '<div class="refidno">';
 	// Ref customer
-	$morehtmlref .= $form->editfieldkey("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldkey("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, (int) $usercancreate, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1, 'supplier');
@@ -185,7 +185,7 @@ if ($object->id > 0) {
 			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');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/fourn/facture/note-rec.php b/htdocs/fourn/facture/note-rec.php
index 12e4782886d..8332324f9f5 100644
--- a/htdocs/fourn/facture/note-rec.php
+++ b/htdocs/fourn/facture/note-rec.php
@@ -157,7 +157,7 @@ if ($id > 0) {
 			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');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
@@ -183,7 +183,7 @@ if ($id > 0) {
 
 	$dateexample = dol_now();
 	if (!empty($object->frequency) && !empty($object->date_when)) {
-		$dateexample = $object->date_when;
+		$dateexample = (int) $object->date_when;
 	}
 
 	$substitutionarray = getCommonSubstitutionArray($langs, 2, null, $object);
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 001797dc5a6..979d08f08f5 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2017      	Ferran Marcet       	<fmarcet@2byte.es>
  * Copyright (C) 2021-2024  Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -130,7 +131,7 @@ if ($object->id > 0) {
 			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, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 8c52413f4a5..9b44a560d9f 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -13,7 +13,7 @@
  * Copyright (C) 2021       Charlene Benke          <charlene@patas-monkey.com>
  * Copyright (C) 2022       Udo Tamm				<dev@dolibit.de>
  * Copyright (C) 2023       Sylvain Legrand			<technique@infras.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -171,7 +171,7 @@ if (empty($reshook)) {
 		$i = 0;
 		foreach ($_POST as $key => $value) {
 			if (substr($key, 0, 7) == 'amount_') {
-				$cursorfacid = substr($key, 7);
+				$cursorfacid = (int) substr($key, 7);
 				$amounts[$cursorfacid] = price2num(GETPOST($key));
 				if (!empty($amounts[$cursorfacid])) {
 					$atleastonepaymentnotnull++;
@@ -202,7 +202,7 @@ if (empty($reshook)) {
 
 				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOST($key));
 			} elseif (substr($key, 0, 21) == 'multicurrency_amount_') {
-				$cursorfacid = substr($key, 21);
+				$cursorfacid = (int) substr($key, 21);
 				$multicurrency_amounts[$cursorfacid] = (GETPOST($key) ? price2num(GETPOST($key)) : 0);
 				$multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
 				if (!empty($multicurrency_amounts[$cursorfacid])) {
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index f6d344cb376..94a7732af27 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2006-2010 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2014      Marcos García         <marcosgdf@gmail.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -208,7 +208,7 @@ if ($result > 0) {
 	print '</td></tr>';*/
 
 	// Date of payment
-	print '<tr><td class="titlefield">'.$form->editfieldkey("Date", 'datep', $object->date, $object, $object->statut == 0 && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"))).'</td>';
+	print '<tr><td class="titlefield">'.$form->editfieldkey("Date", 'datep', $object->date, $object, (int) ($object->statut == 0 && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer")))).'</td>';
 	print '<td>';
 	print $form->editfieldval("Date", 'datep', $object->date, $object, $object->statut == 0 && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer")), 'datehourpicker', '', null, $langs->trans('PaymentDateUpdateSucceeded'));
 	print '</td></tr>';
@@ -239,6 +239,7 @@ if ($result > 0) {
 	}
 
 	$allow_delete = 1;
+	$title_button = '';
 	// Bank account
 	if (isModEnabled("bank")) {
 		if ($object->fk_account) {
@@ -268,7 +269,7 @@ if ($result > 0) {
 	}
 
 	// Note
-	print '<tr><td>'.$form->editfieldkey("Comments", 'note', $object->note_private, $object, ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"))).'</td>';
+	print '<tr><td>'.$form->editfieldkey("Comments", 'note', $object->note_private, $object, (int) ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"))).'</td>';
 	print '<td>';
 	print $form->editfieldval("Note", 'note', $object->note_private, $object, ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer")), 'textarea');
 	print '</td></tr>';
@@ -409,7 +410,7 @@ if ($result > 0) {
 			$delallowed = ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"));
 			$modelpdf = (!empty($object->model_pdf) ? $object->model_pdf : (!getDolGlobalString('SUPPLIER_PAYMENT_ADDON_PDF') ? '' : $conf->global->SUPPLIER_PAYMENT_ADDON_PDF));
 
-			print $formfile->showdocuments('supplier_payment', $ref, $filedir, $urlsource, $genallowed, $delallowed, $modelpdf, 1, 0, 0, 40, 0, '', '', '', $object->thirdparty->default_lang);
+			print $formfile->showdocuments('supplier_payment', $ref, $filedir, $urlsource, (int) $genallowed, (int) $delallowed, $modelpdf, 1, 0, 0, 40, 0, '', '', '', $object->thirdparty->default_lang);
 			$somethingshown = $formfile->numoffiles;
 		}
 
diff --git a/htdocs/fourn/paiement/document.php b/htdocs/fourn/paiement/document.php
index ef68272e1c8..e0e51f8990e 100644
--- a/htdocs/fourn/paiement/document.php
+++ b/htdocs/fourn/paiement/document.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
  * Copyright (C) 2021      Jesus Jerez       	 <jesusballesteros@protonmail.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -107,7 +108,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
  * View
  */
 
-$form = new	Form($db);
+$form = new Form($db);
 
 $title = $langs->trans('Payment')." - ".$langs->trans('Documents');
 llxHeader('', $title);
@@ -122,7 +123,7 @@ if ($object->id > 0) {
 	$morehtmlref = '<div class="refidno">';
 
 	// Date of payment
-	$morehtmlref .= $form->editfieldkey("Date", 'datep', $object->date, $object, $object->statut == 0 && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer")), 'datehourpicker', '', null, 3).': ';
+	$morehtmlref .= $form->editfieldkey("Date", 'datep', $object->date, $object, (int) ($object->statut == 0 && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"))), 'datehourpicker', '', 0, 3).': ';
 	$morehtmlref .= $form->editfieldval("Date", 'datep', $object->date, $object, $object->statut == 0 && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer")), 'datehourpicker', '', null, $langs->trans('PaymentDateUpdateSucceeded'));
 
 	// Payment mode
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index b07b9a45add..84cbf54fa25 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2018-2024  Frédéric France			<frederic.france@free.fr>
  * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
  * Copyright (C) 2021		Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -30,7 +30,7 @@
 
 /**
  *	\file		htdocs/fourn/paiement/list.php
-*	\ingroup	fournisseur,facture
+ *	\ingroup	fournisseur,facture
  *	\brief		Payment list for supplier invoices
  */
 
@@ -107,16 +107,16 @@ $fieldstosearchall = array(
 );
 
 $arrayfields = array(
-	'p.ref'				=> array('label' => "RefPayment", 'checked' => 1, 'position' => 10),
-	'p.datep'			=> array('label' => "Date", 'checked' => 1, 'position' => 20),
-	's.nom'				=> array('label' => "ThirdParty", 'checked' => 1, 'position' => 30),
-	'c.libelle'			=> array('label' => "Type", 'checked' => 1, 'position' => 40),
-	'p.num_paiement'	=> array('label' => "Numero", 'checked' => 1, 'position' => 50, 'tooltip' => "ChequeOrTransferNumber"),
-	'ba.label'			=> array('label' => "BankAccount", 'checked' => 1, 'position' => 60, 'enable' => (isModEnabled("bank"))),
-	'p.amount'			=> array('label' => "Amount", 'checked' => 1, 'position' => 70),
+	'p.ref'				=> array('label' => "RefPayment", 'checked' => '1', 'position' => 10),
+	'p.datep'			=> array('label' => "Date", 'checked' => '1', 'position' => 20),
+	's.nom'				=> array('label' => "ThirdParty", 'checked' => '1', 'position' => 30),
+	'c.libelle'			=> array('label' => "Type", 'checked' => '1', 'position' => 40),
+	'p.num_paiement'	=> array('label' => "Numero", 'checked' => '1', 'position' => 50, 'tooltip' => "ChequeOrTransferNumber"),
+	'ba.label'			=> array('label' => "BankAccount", 'checked' => '1', 'position' => 60, 'enable' => (isModEnabled("bank"))),
+	'p.amount'			=> array('label' => "Amount", 'checked' => '1', 'position' => 70),
 );
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:string,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
 
 // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
 $hookmanager->initHooks(array('paymentsupplierlist'));
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index b47557d5f45..e71616a8879 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2020 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -419,7 +419,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if ($action == 'close') {
 		$langs->load("propal");
-
+		$formquestion = array();
 		//Form to close proposal (signed or not)
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ConfirmClose'), $langs->trans('ConfirmCloseAsk'), 'confirm_close', $formquestion, '', 1, 250);
 	}
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index ec400e313ed..84d5297f4c0 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2021      Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2022-2023 Charlene Benke       <charlene@patas-monkey.com>
  * Copyright (C) 2023      Benjamin Falière		<benjamin.faliere@altairis.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	   Irvine FLEITH		<irvine.fleith@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -787,7 +787,7 @@ if ($action == 'create' || $action == 'presend') {
 			}
 
 			// Default select all or no contact
-			$default = (getDolGlobalString('TICKET_NOTIFY_AT_CLOSING') ? -2 : -3);
+			$default = (getDolGlobalString('TICKET_NOTIFY_AT_CLOSING') ? '-2' : '-3');
 			$formquestion = array(
 				array(
 					'name' => 'contactid',
@@ -987,7 +987,7 @@ if ($action == 'create' || $action == 'presend') {
 			}
 			$morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, $object->socid, $action == 'editcustomer' ? 'editcustomer' : 'none', '', 1, 0, 0, array(), 1);
 			if (!empty($object->socid)) {
-				$morehtmlref .= ' - <a href="'.DOL_URL_ROOT.'/ticket/list.php?socid='.$object->socid.'&sortfield=t.datec&sortorder=desc'.(getDolGlobalBool('TICKET_CLIENT_OTHER_TICKET_ONLY_OPEN')?'&search_fk_statut[]=openall':'').'">'.img_picto($langs->trans("Tickets"), 'ticket', 'class="pictofixedwidth"').' '.$langs->trans("TicketHistory").'</a>';
+				$morehtmlref .= ' - <a href="'.DOL_URL_ROOT.'/ticket/list.php?socid='.$object->socid.'&sortfield=t.datec&sortorder=desc'.(getDolGlobalBool('TICKET_CLIENT_OTHER_TICKET_ONLY_OPEN') ? '&search_fk_statut[]=openall' : '').'">'.img_picto($langs->trans("Tickets"), 'ticket', 'class="pictofixedwidth"').' '.$langs->trans("TicketHistory").'</a>';
 			}
 		}
 
diff --git a/htdocs/workstation/workstation_card.php b/htdocs/workstation/workstation_card.php
index 15e4f76a034..c93b540984e 100644
--- a/htdocs/workstation/workstation_card.php
+++ b/htdocs/workstation/workstation_card.php
@@ -2,6 +2,7 @@
 
 /* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -327,10 +328,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))) {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteWorkstation'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 'action-delete');
 	}
+	$formquestion = array();
 	// Clone confirmation
 	if ($action == 'clone') {
 		// Create an array for form
-		$formquestion = array();
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 	}
 

From 7f6c09fc63d66a0df101b95db01a3ddc86ee4382 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 1 Feb 2025 15:19:42 +0100
Subject: [PATCH 413/602] Qual: Update baseline, enable
 PhanTypeMismatchArgument

# Qual: Update baseline, enable PhanTypeMismatchArgument

Update the baseline for fixes.
Enable PhanTypeMismatchArgument as this is being fixed and to avoid
that new cases occur in files where these are fixed.
Only about 3800 cases remain, was more than 12000 when starting with Phan.
---
 dev/tools/phan/baseline.txt        | 1079 +++++++++++++++++++++-------
 dev/tools/phan/config.php          |    2 +-
 dev/tools/phan/config_extended.php |    2 +-
 3 files changed, 806 insertions(+), 277 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 6d3655afa34..eb6649f9507 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,12 +9,14 @@
  */
 return [
     // # Issue statistics:
+    // PhanTypeMismatchArgument : 3800+ occurrences
     // PhanUndeclaredProperty : 540+ occurrences
-    // PhanPossiblyUndeclaredGlobalVariable : 210+ occurrences
-    // PhanUndeclaredGlobalVariable : 200+ occurrences
+    // PhanTypeMismatchArgumentNullable : 460+ occurrences
+    // PhanPossiblyUndeclaredGlobalVariable : 200+ occurrences
+    // PhanUndeclaredGlobalVariable : 190+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 180+ occurrences
-    // PhanTypeMismatchArgumentProbablyReal : 160+ occurrences
-    // PhanTypeMismatchProperty : 140+ occurrences
+    // PhanTypeMismatchArgumentProbablyReal : 150+ occurrences
+    // PhanTypeMismatchProperty : 130+ occurrences
     // PhanPluginUnknownArrayMethodParamType : 110+ occurrences
     // PhanRedefineFunction : 45+ occurrences
     // PhanPluginUndeclaredVariableIsset : 40+ occurrences
@@ -47,395 +49,900 @@ return [
 
     // Currently, file_suppressions and directory_suppressions are the only supported suppressions
     'file_suppressions' => [
-        'htdocs/accountancy/class/accountancyexport.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/adherents/list.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/adherents/type.php' => ['PhanTypeMismatchProperty'],
-        'htdocs/admin/agenda_other.php' => ['PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/accountancy/admin/account.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/accountancy/admin/card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/accountancy/admin/categories.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/accountancy/admin/categories_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/accountancy/admin/fiscalyear_card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/accountancy/admin/journals_list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/accountancy/admin/productaccount.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/accountancy/admin/report_list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/accountancy/admin/subaccount.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/accountancy/bookkeeping/card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/accountancy/bookkeeping/export.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/accountancy/bookkeeping/list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/accountancy/bookkeeping/listbyaccount.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/accountancy/class/accountancycategory.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/accountancy/class/accountancyexport.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/accountancy/class/accountancyimport.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/accountancy/class/accountingjournal.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/accountancy/class/bookkeeping.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/accountancy/class/lettering.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/accountancy/closure/index.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/accountancy/customer/index.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/accountancy/customer/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/accountancy/expensereport/index.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/accountancy/expensereport/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/accountancy/journal/bankjournal.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/accountancy/journal/expensereportsjournal.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/accountancy/journal/purchasesjournal.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/accountancy/journal/sellsjournal.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/accountancy/journal/variousjournal.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/accountancy/supplier/index.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/accountancy/supplier/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/accountancy/tpl/export_journal.tpl.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/adherents/admin/member.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/adherents/admin/website.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/adherents/canvas/actions_adherentcard_common.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/adherents/card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/adherents/class/adherent.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/adherents/class/adherent_type.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/adherents/class/api_members.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/adherents/class/subscription.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/adherents/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/adherents/stats/geo.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/adherents/subscription.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/adherents/subscription/list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/adherents/type.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty'],
+        'htdocs/adherents/vcard.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/agenda_other.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/admin/agenda_reminder.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/admin/bank.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/barcode.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/bom.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/boxes.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/chequereceipts.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/company.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/contract.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/defaultvalues.php' => ['PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/admin/delivery.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/dict.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/emailcollector_card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/emailcollector_list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/eventorganization.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/expedition.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/expensereport.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/expensereport_rules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/external_rss.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/fckeditor.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/fichinter.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/holiday.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/hrm.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/invoice.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/knowledgemanagement.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/mails.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/mails_emailing.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/admin/mails_passwordreset.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/admin/mails_senderprofile_list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/mails_templates.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/admin/mails_ticket.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/admin/menus/index.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/mrp.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/multicurrency.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/order.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/payment.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/paymentbybanktransfer.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/pdf_other.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/prelevement.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/propal.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/receiptprinter.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/reception_setup.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/remotestore/class/PSWebServiceLibrary.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/admin/remotestore/class/dolistore.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/stock.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/stocktransfer.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/supplier_invoice.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/supplier_order.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/supplier_payment.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/supplier_proposal.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/system/filecheck.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/system/modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/taxes.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/admin/ticket.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/tools/export.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/user.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/usergroup.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/webhook.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/website.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/admin/workstation.php' => ['PhanTypeMismatchArgument'],
         'htdocs/api/class/api_access.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanUndeclaredProperty'],
-        'htdocs/api/class/api_documents.class.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
-        'htdocs/api/class/api_login.class.php' => ['PhanPluginUnknownArrayMethodReturnType'],
-        'htdocs/api/class/api_setup.class.php' => ['PhanPluginUnknownArrayMethodReturnType'],
+        'htdocs/api/class/api_documents.class.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
+        'htdocs/api/class/api_login.class.php' => ['PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
+        'htdocs/api/class/api_setup.class.php' => ['PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
         'htdocs/api/class/api_status.class.php' => ['PhanPluginUnknownArrayMethodReturnType'],
-        'htdocs/asset/class/asset.class.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanTypeInvalidDimOffset'],
+        'htdocs/asset/admin/setup.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/asset/card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/asset/class/asset.class.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanTypeInvalidDimOffset', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/asset/class/assetdepreciationoptions.class.php' => ['PhanTypeInvalidDimOffset'],
         'htdocs/asset/class/assetmodel.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/asset/tpl/accountancy_codes_edit.tpl.php' => ['PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/asset/list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/asset/model/list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/asset/tpl/accountancy_codes_edit.tpl.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/asset/tpl/depreciation_options_edit.tpl.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
         'htdocs/asset/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/asterisk/wrapper.php' => ['PhanRedefineFunction'],
-        'htdocs/barcode/printsheet.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
-        'htdocs/bom/bom_card.php' => ['PhanUndeclaredProperty'],
+        'htdocs/barcode/printsheet.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/blockedlog/admin/blockedlog_list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/bom/bom_card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/bom/bom_list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/bom/class/api_boms.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
-        'htdocs/bom/tpl/objectline_edit.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/bom/tpl/objectline_view.tpl.php' => ['PhanUndeclaredProperty'],
+        'htdocs/bom/class/bom.class.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/bom/tpl/linkedobjectblock.tpl.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/bom/tpl/objectline_create.tpl.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/bom/tpl/objectline_edit.tpl.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/bom/tpl/objectline_view.tpl.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/bookcal/availabilities_card.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/bookcal/availabilities_list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/bookcal/booking_list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/bookcal/calendar_card.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/bookcal/calendar_document.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/bookcal/calendar_list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/bookcal/class/availabilities.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
         'htdocs/bookcal/class/calendar.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
+        'htdocs/bookmarks/card.php' => ['PhanTypeMismatchArgument'],
         'htdocs/categories/class/api_categories.class.php' => ['PhanAccessMethodProtected', 'PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
-        'htdocs/categories/viewcat.php' => ['PhanUndeclaredProperty'],
+        'htdocs/categories/class/categorie.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/categories/edit.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/categories/photos.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/categories/viewcat.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/collab/index.php' => ['PhanParamTooMany', 'PhanUndeclaredProperty'],
-        'htdocs/comm/action/card.php' => ['PhanPluginBothLiteralsBinaryOp'],
+        'htdocs/comm/action/card.php' => ['PhanPluginBothLiteralsBinaryOp', 'PhanTypeMismatchArgument'],
+        'htdocs/comm/action/class/actioncomm.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/comm/action/class/api_agendaevents.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchProperty'],
         'htdocs/comm/action/class/cactioncomm.class.php' => ['PhanPluginUnknownArrayPropertyType'],
-        'htdocs/comm/action/index.php' => ['PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty'],
-        'htdocs/comm/action/info.php' => ['PhanUndeclaredProperty'],
-        'htdocs/comm/action/pertype.php' => ['PhanTypeComparisonFromArray', 'PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchDimFetch'],
-        'htdocs/comm/action/peruser.php' => ['PhanTypeComparisonFromArray'],
-        'htdocs/comm/mailing/card.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/comm/mailing/cibles.php' => ['PhanUndeclaredProperty'],
+        'htdocs/comm/action/document.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/comm/action/index.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty'],
+        'htdocs/comm/action/info.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/comm/action/list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/comm/action/pertype.php' => ['PhanTypeComparisonFromArray', 'PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchArgument', 'PhanTypeMismatchDimFetch'],
+        'htdocs/comm/action/peruser.php' => ['PhanTypeComparisonFromArray', 'PhanTypeMismatchArgument'],
+        'htdocs/comm/action/rapport/index.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/comm/card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/comm/mailing/card.php' => ['PhanPluginSuspiciousParamPosition', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/comm/mailing/cibles.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/comm/mailing/class/advtargetemailing.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/comm/mailing/index.php' => ['PhanUndeclaredProperty'],
-        'htdocs/comm/propal/card.php' => ['PhanTypeMismatchProperty'],
+        'htdocs/comm/multiprix.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/comm/propal/agenda.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/comm/propal/card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchProperty'],
         'htdocs/comm/propal/class/api_proposals.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
-        'htdocs/comm/propal/list.php' => ['PhanUndeclaredProperty'],
+        'htdocs/comm/propal/class/propal.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/comm/propal/class/propaleligne.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/comm/propal/contact.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/comm/propal/document.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/comm/propal/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/comm/propal/note.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/comm/propal/stats/index.php' => ['PhanTypeMismatchArgument'],
         'htdocs/comm/propal/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/commande/class/api_orders.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
-        'htdocs/commande/class/commande.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/comm/remise.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/comm/remx.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/commande/agenda.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/commande/card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/commande/class/api_orders.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
+        'htdocs/commande/class/commande.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/commande/class/orderline.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/commande/contact.php' => ['PhanTypeMismatchArgument'],
         'htdocs/commande/customer.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/commande/list.php' => ['PhanUndeclaredProperty'],
-        'htdocs/commande/list_det.php' => ['PhanTypeInvalidDimOffset'],
+        'htdocs/commande/document.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/commande/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/commande/list_det.php' => ['PhanTypeInvalidDimOffset', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/commande/note.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/commande/stats/index.php' => ['PhanTypeMismatchArgument'],
         'htdocs/commande/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
+        'htdocs/compta/accounting-files.php' => ['PhanTypeMismatchArgument'],
         'htdocs/compta/bank/account_statement_document.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/compta/bank/class/account.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/compta/bank/class/api_bankaccounts.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/compta/bank/line.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/compta/bank/various_payment/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/compta/bank/various_payment/document.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/compta/bank/various_payment/info.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/compta/bank/annuel.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/bank/bankentries_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/compta/bank/card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/bank/categ.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/bank/class/account.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/compta/bank/class/api_bankaccounts.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/compta/bank/class/paymentvarious.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/bank/graph.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/bank/line.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/compta/bank/list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/bank/releve.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/bank/transfer.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/bank/treso.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/bank/various_payment/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/compta/bank/various_payment/document.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/compta/bank/various_payment/info.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/compta/bank/various_payment/list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/compta/cashcontrol/cashcontrol_card.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
-        'htdocs/compta/cashcontrol/cashcontrol_list.php' => ['PhanTypeMismatchProperty'],
-        'htdocs/compta/clients.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/compta/facture/card.php' => ['PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
-        'htdocs/compta/facture/class/api_invoices.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeComparisonFromArray', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/compta/facture/class/facture-rec.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/compta/facture/class/facture.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/compta/cashcontrol/cashcontrol_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty'],
+        'htdocs/compta/charges/index.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/compta/clients.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/compta/deplacement/card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/deplacement/class/deplacement.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/deplacement/class/deplacementstats.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/deplacement/stats/index.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/facture/agenda-rec.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/facture/agenda.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/facture/card-rec.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/compta/facture/card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
+        'htdocs/compta/facture/class/api_invoices.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeComparisonFromArray', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/compta/facture/class/facture-rec.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/compta/facture/class/facture.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/compta/facture/class/factureligne.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/facture/class/paymentterm.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/facture/contact.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/facture/document.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/facture/invoicetemplate_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/compta/facture/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/compta/facture/messaging.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/facture/note.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/facture/prelevement.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/facture/stats/index.php' => ['PhanTypeMismatchArgument'],
         'htdocs/compta/facture/tpl/linkedobjectblock.tpl.php' => ['PhanEmptyFQSENInClasslike', 'PhanInvalidFQSENInClasslike', 'PhanTypeMismatchArgumentNullableInternal'],
         'htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/compta/localtax/card.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/compta/localtax/clients.php' => ['PhanTypeExpectedObjectPropAccess'],
-        'htdocs/compta/localtax/list.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/compta/paiement.php' => ['PhanTypeMismatchDimFetch'],
-        'htdocs/compta/paiement/card.php' => ['PhanUndeclaredProperty'],
-        'htdocs/compta/paiement/cheque/list.php' => ['PhanTypeMismatchProperty', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/compta/paiement/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/compta/sociales/card.php' => ['PhanUndeclaredProperty'],
+        'htdocs/compta/localtax/clients.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchArgument'],
+        'htdocs/compta/localtax/index.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/localtax/list.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/compta/paiement.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchDimFetch'],
+        'htdocs/compta/paiement/card.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/compta/paiement/cheque/card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/paiement/cheque/class/remisecheque.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/paiement/cheque/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/compta/paiement/class/paiement.class.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/compta/paiement/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullableInternal', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/compta/paiement/rapport.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/prelevement/card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/prelevement/class/bonprelevement.class.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/compta/prelevement/class/rejetprelevement.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/prelevement/create.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/prelevement/demandes.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/compta/prelevement/line.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/compta/prelevement/list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/prelevement/orders_list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/resultat/clientfourn.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/resultat/index.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/resultat/projects.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/resultat/result.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/sociales/card.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/compta/sociales/list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/sociales/payments.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/compta/stats/cabyprodserv.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/compta/stats/supplier_turnover_by_prodserv.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/compta/stats/supplier_turnover_by_thirdparty.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/tva/card.php' => ['PhanTypeMismatchArgument'],
         'htdocs/compta/tva/class/paymentvat.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/compta/tva/clients.php' => ['PhanTypeArraySuspiciousNull', 'PhanTypeInvalidDimOffset', 'PhanTypeMismatchProperty'],
-        'htdocs/compta/tva/payments.php' => ['PhanTypeMismatchArgumentNullableInternal'],
-        'htdocs/compta/tva/quadri_detail.php' => ['PhanTypeArraySuspiciousNull', 'PhanTypeInvalidDimOffset', 'PhanTypeMismatchProperty'],
-        'htdocs/contrat/agenda.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/contrat/card.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/contrat/class/api_contracts.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
+        'htdocs/compta/tva/class/tva.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/tva/clients.php' => ['PhanTypeArraySuspiciousNull', 'PhanTypeInvalidDimOffset', 'PhanTypeMismatchArgument', 'PhanTypeMismatchProperty'],
+        'htdocs/compta/tva/index.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/tva/list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/compta/tva/payments.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentNullableInternal'],
+        'htdocs/compta/tva/quadri_detail.php' => ['PhanTypeArraySuspiciousNull', 'PhanTypeInvalidDimOffset', 'PhanTypeMismatchArgument', 'PhanTypeMismatchProperty'],
+        'htdocs/contact/ajax/contact.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/contact/canvas/actions_contactcard_common.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/contact/card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/contact/class/contact.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/contact/consumption.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/contact/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/contrat/agenda.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/contrat/card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/contrat/class/api_contracts.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
+        'htdocs/contrat/class/contrat.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/contrat/class/contratligne.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/contrat/contact.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/contrat/document.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/contrat/index.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/contrat/list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/contrat/messaging.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/contrat/note.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/contrat/services_list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/actions_addupdatedelete.inc.php' => ['PhanTypeMismatchDimFetch', 'PhanUndeclaredProperty'],
-        'htdocs/core/actions_massactions.inc.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/actions_extrafields.inc.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/actions_lineupdown.inc.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/actions_massactions.inc.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/core/actions_printing.inc.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/actions_sendmails.inc.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/core/ajax/ajaxdirtree.php' => ['PhanTypeMismatchProperty', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/core/actions_sendmails.inc.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/core/ajax/ajaxdirpreview.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/ajax/ajaxdirtree.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/core/ajax/ajaxstatusprospect.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/ajax/contacts.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/ajax/editinline.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/ajax/loadinplace.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/ajax/saveinplace.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/ajax/selectobject.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/boxes/box_produits.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/boxes/box_produits_alerte_stock.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/class/CMailFile.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/core/class/canvas.class.php' => ['PhanParamTooMany', 'PhanUndeclaredMethod'],
-        'htdocs/core/class/ccountry.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/class/ccountry.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/core/class/cgenericdic.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/class/commonobject.class.php' => ['PhanParamTooMany', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
+        'htdocs/core/class/commondocgenerator.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/class/commoninvoice.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/class/commonobject.class.php' => ['PhanParamTooMany', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
         'htdocs/core/class/commonpeople.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/class/commonsocialnetworks.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/class/commonstickergenerator.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/conf.class.php' => ['PhanTypeMismatchArgumentNullableInternal', 'PhanTypeMismatchProperty'],
+        'htdocs/core/class/cregion.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/class/cstate.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/class/ctypent.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/ctyperesource.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/class/cunits.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/doleditor.class.php' => ['PhanPluginDuplicateExpressionAssignmentOperation'],
         'htdocs/core/class/dolgraph.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/class/dolreceiptprinter.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/emailsenderprofile.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/class/evalmath.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/class/extrafields.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/class/fileupload.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/class/fiscalyear.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/hookmanager.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/class/html.formcompany.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/class/html.formfile.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/class/html.formmail.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/class/html.form.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/class/html.formcategory.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/class/html.formcompany.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/core/class/html.formfile.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/core/class/html.formmail.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/core/class/html.formorder.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/class/html.formother.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/class/html.formprojet.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/class/html.formsetup.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/class/html.formticket.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/class/link.class.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/class/menubase.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/notify.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/class/openid.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/class/rssparser.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/timespent.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
+        'htdocs/core/customreports.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/lib/admin.lib.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/lib/files.lib.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/lib/agenda.lib.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/lib/ajax.lib.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/lib/barcode.lib.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/lib/company.lib.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/lib/date.lib.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/lib/expedition.lib.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/lib/files.lib.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/core/lib/functions.lib.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/core/lib/functions2.lib.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/lib/pdf.lib.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/lib/project.lib.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/lib/xcal.lib.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/lib/functionsnumtoword.lib.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/lib/images.lib.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/lib/invoice.lib.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/lib/loan.lib.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/lib/modulebuilder.lib.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/lib/pdf.lib.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/core/lib/product.lib.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/lib/project.lib.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/core/lib/security.lib.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/lib/sendings.lib.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/lib/website.lib.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/lib/xcal.lib.php' => ['PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/core/login/functions_dolibarr.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/login/functions_ldap.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/menus/standard/auguria.lib.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/menus/standard/eldy.lib.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/action/doc/pdf_standard_actions.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/core/modules/asset/mod_asset_advanced.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/bom/mod_bom_advanced.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/commande/doc/pdf_einstein.modules.php' => ['PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php' => ['PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/bank/doc/pdf_ban.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/barcode/mod_barcode_product_standard.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/bom/mod_bom_advanced.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/cheque/doc/pdf_blochet.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/modules/cheque/modules_chequereceipts.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/commande/doc/pdf_einstein.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/commande/mod_commande_saphir.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/contract/doc/pdf_strato.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/modules/delivery/doc/pdf_storm.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/modules/delivery/doc/pdf_typhon.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/core/modules/delivery/mod_delivery_saphir.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/facture/doc/pdf_crabe.modules.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/facture/doc/pdf_octopus.modules.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/facture/doc/pdf_sponge.modules.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/expedition/doc/pdf_espadon.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/modules/expedition/doc/pdf_merou.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/modules/expedition/doc/pdf_rouget.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/expensereport/mod_expensereport_jade.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/facture/doc/pdf_crabe.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/facture/doc/pdf_octopus.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/facture/doc/pdf_sponge.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/facture/modules_facture.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/modules/fichinter/mod_arctic.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/modules/holiday/mod_holiday_immaculate.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/hrm/mod_evaluation_advanced.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/import/import_csv.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchProperty'],
+        'htdocs/core/modules/import/import_csv.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchProperty'],
         'htdocs/core/modules/import/import_xlsx.modules.php' => ['PhanTypeMismatchProperty'],
-        'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/modules/mailings/eventorganization.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/mailings/modules_mailings.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/member/doc/pdf_standard_member.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/member/modules_cards.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modAdherent.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modAgenda.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modBlockedLog.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modCommande.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modContrat.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modDon.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modExpedition.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modExpenseReport.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modFacture.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modFicheinter.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modFournisseur.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modHRM.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modMrp.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modPrelevement.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modProjet.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modPropale.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modReceiptPrinter.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modReception.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modStock.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modSupplierProposal.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/modTicket.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/mrp/mod_mo_advanced.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/oauth/github_oauthcallback.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/project/doc/pdf_timespent.modules.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/propale/doc/pdf_azur.modules.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/propale/doc/pdf_cyan.modules.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/reception/doc/pdf_squille.modules.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/product/doc/pdf_standard.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/project/doc/pdf_baleine.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/project/doc/pdf_beluga.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/project/doc/pdf_timespent.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/propale/doc/pdf_azur.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/propale/doc/pdf_cyan.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/rapport/pdf_paiement.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/reception/doc/pdf_squille.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/societe/doc/doc_generic_odt.modules.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php' => ['PhanTypeMismatchProperty'],
-        'htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php' => ['PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php' => ['PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php' => ['PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php' => ['PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchProperty'],
+        'htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanPluginDuplicateArrayKey'],
+        'htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/workstation/mod_workstation_advanced.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/tpl/extrafields_view.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/tpl/massactions_pre.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/tpl/objectline_view.tpl.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/multicompany_page.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/search_page.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/tpl/admin_extrafields_add.tpl.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/tpl/admin_extrafields_edit.tpl.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/tpl/advtarget.tpl.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/tpl/extrafields_list_array_fields.tpl.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/tpl/extrafields_list_print_fields.tpl.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/tpl/extrafields_view.tpl.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/core/tpl/massactions_pre.tpl.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/core/tpl/notes.tpl.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/tpl/object_discounts.tpl.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/tpl/objectline_create.tpl.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/tpl/objectline_edit.tpl.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/tpl/objectline_view.tpl.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/core/tpl/objectlinked_lineimport.tpl.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/tpl/passwordreset.tpl.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/core/tpl/resource_view.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/datapolicy/class/datapolicycron.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/dav/dav.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/debugbar/class/TraceableDB.php' => ['PhanTypeMismatchArgument'],
         'htdocs/delivery/class/delivery.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/don/admin/donation.php' => ['PhanUndeclaredMethod'],
         'htdocs/don/class/api_donations.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/don/class/don.class.php' => ['PhanParamTooMany'],
         'htdocs/don/document.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/don/info.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/don/list.php' => ['PhanTypeMismatchProperty'],
+        'htdocs/don/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty'],
         'htdocs/don/note.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/emailcollector/class/emailcollector.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/don/stats/index.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/ecm/class/ecmdirectory.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/ecm/class/ecmfiles.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/ecm/dir_add_card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/ecm/file_card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/ecm/file_note.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/ecm/search.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/emailcollector/class/emailcollector.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/eventorganization/class/conferenceorboothattendee.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
         'htdocs/eventorganization/conferenceorbooth_card.php' => ['PhanUndeclaredGlobalVariable'],
+        'htdocs/eventorganization/conferenceorbooth_contact.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/eventorganization/conferenceorbooth_document.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/eventorganization/conferenceorbooth_list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/eventorganization/conferenceorboothattendee_card.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/eventorganization/core/actions_massactions_mail.inc.php' => ['PhanUndeclaredProperty'],
-        'htdocs/expedition/card.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/eventorganization/conferenceorboothattendee_list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/eventorganization/core/actions_massactions_mail.inc.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/expedition/ajax/searchfrombarcode.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/expedition/card.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/expedition/class/api_shipments.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
-        'htdocs/expedition/class/expedition.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/expensereport/card.php' => ['PhanUndeclaredProperty'],
+        'htdocs/expedition/class/expedition.class.php' => ['PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/expedition/class/expeditionlinebatch.class.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/expedition/list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/expedition/stats/index.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/expensereport/ajax/ajaxik.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/expensereport/card.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/expensereport/class/api_expensereports.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
+        'htdocs/expensereport/class/expensereport.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/expensereport/class/expensereportline.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/expensereport/class/expensereportstats.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/expensereport/class/paymentexpensereport.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/expensereport/list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/expensereport/payment/card.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/expensereport/payment/info.php' => ['PhanUndeclaredGlobalVariable'],
+        'htdocs/expensereport/payment/list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/expensereport/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
+        'htdocs/exports/class/export.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/exports/export.php' => ['PhanTypeMismatchArgument'],
         'htdocs/externalsite/frames.php' => ['PhanUndeclaredGlobalVariable'],
+        'htdocs/fichinter/agenda.php' => ['PhanTypeMismatchArgument'],
         'htdocs/fichinter/card-rec.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/fichinter/class/api_interventions.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/fichinter/class/api_interventions.class.php' => ['PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/fichinter/class/fichinter.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/fichinter/class/fichinterrec.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/fichinter/contact.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/fichinter/document.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/fichinter/list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/fichinter/note.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/fichinter/stats/index.php' => ['PhanTypeMismatchArgument'],
         'htdocs/fichinter/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/filefunc.inc.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/fourn/class/api_supplier_invoices.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
+        'htdocs/fourn/class/api_supplier_invoices.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
         'htdocs/fourn/class/api_supplier_orders.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/fourn/class/fournisseur.commande.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/fourn/class/fournisseur.commande.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/fourn/class/fournisseur.facture-rec.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/fourn/class/fournisseur.facture-rec.ligne.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/fourn/class/fournisseur.facture.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/fourn/class/fournisseur.facture.ligne.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/fourn/class/fournisseur.orderline.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/fourn/class/fournisseur.product.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/fourn/commande/card.php' => ['PhanTypeMismatchDimAssignment', 'PhanTypeSuspiciousStringExpression', 'PhanUndeclaredProperty'],
-        'htdocs/fourn/facture/card-rec.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/fourn/facture/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchProperty'],
-        'htdocs/fourn/facture/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/fourn/commande/dispatch.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/fourn/commande/list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/fourn/facture/card-rec.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/fourn/facture/card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty'],
+        'htdocs/fourn/facture/list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/fourn/facture/paiement.php' => ['PhanUndeclaredGlobalVariable'],
+        'htdocs/fourn/facture/rapport.php' => ['PhanTypeMismatchArgument'],
         'htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/fourn/paiement/card.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/fourn/paiement/document.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/ftp/admin/ftpclient.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/ftp/index.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/holiday/card_group.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
-        'htdocs/holiday/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/holiday/view_log.php' => ['PhanTypeMismatchDimFetch'],
+        'htdocs/ftp/index.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/holiday/card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/holiday/card_group.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
+        'htdocs/holiday/class/holiday.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/holiday/define_holiday.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/holiday/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/holiday/month_report.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/holiday/view_log.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchDimFetch'],
         'htdocs/hrm/admin/admin_hrm.php' => ['PhanEmptyForeach'],
+        'htdocs/hrm/class/establishment.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/hrm/class/evaluation.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/hrm/class/evaluationdet.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/hrm/class/job.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/hrm/class/position.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/hrm/class/skill.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/hrm/class/skilldet.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/hrm/class/skillrank.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/hrm/class/evaluationdet.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/hrm/class/job.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/hrm/class/position.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/hrm/class/skill.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/hrm/class/skilldet.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/hrm/class/skillrank.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/hrm/compare.php' => ['PhanTypeMismatchArgument'],
         'htdocs/hrm/core/tpl/objectline_view.tpl.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/hrm/evaluation_list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/hrm/job_agenda.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
+        'htdocs/hrm/establishment/card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/hrm/evaluation_card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/hrm/evaluation_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/hrm/job_agenda.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/hrm/job_card.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/hrm/job_list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/hrm/position_list.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
-        'htdocs/hrm/skill_card.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/hrm/skill_list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/hrm/job_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/hrm/position_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
+        'htdocs/hrm/skill_card.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/hrm/skill_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/imports/emptyexample.php' => ['PhanRedefineFunction', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/imports/import.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/install/check.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal'],
+        'htdocs/imports/import.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/index.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/install/check.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullableInternal'],
         'htdocs/install/fileconf.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/install/inc.php' => ['PhanPluginUndeclaredVariableIsset'],
         'htdocs/install/index.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/install/repair.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable'],
+        'htdocs/install/repair.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument'],
+        'htdocs/install/step1.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/install/step2.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal', 'PhanUndeclaredProperty'],
         'htdocs/install/step5.php' => ['PhanPluginUndeclaredVariableIsset'],
         'htdocs/install/upgrade.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal'],
+        'htdocs/install/upgrade2.php' => ['PhanTypeMismatchArgument'],
         'htdocs/intracommreport/card.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
-        'htdocs/knowledgemanagement/class/knowledgerecord.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/knowledgemanagement/knowledgerecord_card.php' => ['PhanPluginEmptyStatementIf', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/knowledgemanagement/knowledgerecord_list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/loan/card.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/loan/document.php' => ['PhanUndeclaredProperty'],
-        'htdocs/loan/note.php' => ['PhanUndeclaredProperty'],
+        'htdocs/intracommreport/class/intracommreport.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/intracommreport/list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
+        'htdocs/knowledgemanagement/class/knowledgerecord.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/knowledgemanagement/knowledgerecord_card.php' => ['PhanPluginEmptyStatementIf', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/knowledgemanagement/knowledgerecord_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/loan/card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/loan/class/loan.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/loan/class/paymentloan.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/loan/document.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/loan/list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/loan/note.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/loan/payment/payment.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/margin/customerMargins.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/margin/productMargins.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/master.inc.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/mrp/class/api_mos.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
-        'htdocs/mrp/class/mo.class.php' => ['PhanTypeMismatchProperty'],
-        'htdocs/mrp/mo_card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/mrp/mo_movements.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/mrp/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
+        'htdocs/loan/schedule.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/main.inc.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/margin/agentMargins.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/margin/customerMargins.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/margin/productMargins.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/margin/tabs/productMargins.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/master.inc.php' => ['PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/modulebuilder/index.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/modulebuilder/template/admin/setup.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/modulebuilder/template/ajax/myobject.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/modulebuilder/template/class/api_mymodule.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/modulebuilder/template/class/myobject.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/modulebuilder/template/myobject_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/mrp/ajax/ajax_bom.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/mrp/class/api_mos.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
+        'htdocs/mrp/class/mo.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty'],
+        'htdocs/mrp/class/moline.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/mrp/index.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/mrp/mo_agenda.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/mrp/mo_card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/mrp/mo_document.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/mrp/mo_list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/mrp/mo_movements.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/mrp/mo_note.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/mrp/mo_production.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/mrp/tpl/linkedobjectblock.tpl.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/mrp/tpl/originproductline.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/multicurrency/class/api_multicurrencies.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
-        'htdocs/multicurrency/class/multicurrency.class.php' => ['PhanTypeExpectedObjectPropAccess'],
+        'htdocs/multicurrency/class/api_multicurrencies.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
+        'htdocs/multicurrency/class/multicurrency.class.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchArgument'],
+        'htdocs/multicurrency/multicurrency_rate.php' => ['PhanTypeMismatchArgument'],
         'htdocs/opcachepreload.php' => ['PhanEmptyForeach'],
-        'htdocs/opensurvey/card.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
+        'htdocs/opensurvey/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument'],
         'htdocs/opensurvey/class/opensurveysondage.class.php' => ['PhanTypeMismatchProperty'],
+        'htdocs/opensurvey/exportcsv.php' => ['PhanTypeMismatchArgument'],
         'htdocs/opensurvey/list.php' => ['PhanPluginUndeclaredVariableIsset'],
-        'htdocs/opensurvey/results.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/opensurvey/wizard/choix_date.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
+        'htdocs/opensurvey/results.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullableInternal', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/opensurvey/wizard/choix_date.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument'],
         'htdocs/opensurvey/wizard/create_survey.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/partnership/class/api_partnerships.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
+        'htdocs/partnership/class/api_partnerships.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
         'htdocs/partnership/class/partnership.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php' => ['PhanUndeclaredProperty'],
+        'htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/partnership/partnership_card.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/partnership/partnership_list.php' => ['PhanUndeclaredProperty'],
+        'htdocs/partnership/partnership_contact.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/partnership/partnership_list.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/printing/index.php' => ['PhanUndeclaredProperty'],
-        'htdocs/product/admin/product.php' => ['PhanPluginEmptyStatementIf', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/product/ajax/products.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/product/card.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/product/class/api_products.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanUndeclaredProperty'],
+        'htdocs/product/admin/price_rules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/admin/product.php' => ['PhanPluginEmptyStatementIf', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/product/admin/product_lot.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/admin/product_tools.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/ajax/products.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/product/canvas/product/actions_card_product.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/product/canvas/service/actions_card_service.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/product/class/api_products.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/product/class/html.formproduct.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/product/class/product.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/product/class/productcustomerprice.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/product/class/productfournisseurprice.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
-        'htdocs/product/document.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/product/index.php' => ['PhanPluginUndeclaredVariableIsset'],
-        'htdocs/product/inventory/card.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredGlobalVariable'],
+        'htdocs/product/composition/card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/document.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/product/dynamic_price/class/price_parser.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/index.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanTypeMismatchArgument'],
+        'htdocs/product/inventory/ajax/searchfrombarcode.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/inventory/card.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/product/inventory/class/inventory.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/product/inventory/inventory.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/product/inventory/list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/product/list.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/product/price.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/product/inventory/inventory.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/product/inventory/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/product/list.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/product/price.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/product/price_suppliers.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/product/reassort.php' => ['PhanTypeExpectedObjectPropAccessButGotNull'],
-        'htdocs/product/stats/card.php' => ['PhanTypeComparisonFromArray'],
-        'htdocs/product/stock/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
-        'htdocs/product/stock/class/api_stockmovements.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
+        'htdocs/product/stats/card.php' => ['PhanTypeComparisonFromArray', 'PhanTypeMismatchArgument'],
+        'htdocs/product/stats/commande.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/stats/commande_fournisseur.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/stats/contrat.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/stats/expedition.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/stats/facture_fournisseur.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/stats/facturerec.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/stats/mo.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/stats/propal.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/stats/reception.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/stats/supplier_proposal.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/stock/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
+        'htdocs/product/stock/class/api_stockmovements.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
         'htdocs/product/stock/class/api_warehouses.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/product/stock/class/entrepot.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/product/stock/info.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/movement_card.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/movement_list.php' => ['PhanPluginBothLiteralsBinaryOp', 'PhanPluginUndeclaredVariableIsset', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/product.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/product/stock/productlot_card.php' => ['PhanUndeclaredProperty'],
-        'htdocs/product/stock/productlot_list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/product/stock/replenish.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/product/stock/stats/commande_fournisseur.php' => ['PhanUndeclaredProperty'],
-        'htdocs/product/stock/stats/expedition.php' => ['PhanUndeclaredProperty'],
-        'htdocs/product/stock/stats/mo.php' => ['PhanUndeclaredProperty'],
-        'htdocs/product/stock/stats/reception.php' => ['PhanUndeclaredProperty'],
-        'htdocs/product/stock/stockatdate.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/product/stock/stocktransfer/class/stocktransferline.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/product/stock/stocktransfer/stocktransfer_card.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/product/stock/stocktransfer/stocktransfer_list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/product/stock/tpl/stockcorrection.tpl.php' => ['PhanUndeclaredProperty'],
+        'htdocs/product/stock/class/mouvementstock.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/stock/info.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/product/stock/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
+        'htdocs/product/stock/massstockmove.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/product/stock/movement_card.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/product/stock/movement_list.php' => ['PhanPluginBothLiteralsBinaryOp', 'PhanPluginUndeclaredVariableIsset', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/product/stock/product.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/product/stock/productlot_card.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/product/stock/productlot_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/product/stock/replenish.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/product/stock/stats/commande_fournisseur.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/product/stock/stats/expedition.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/product/stock/stats/mo.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/product/stock/stats/reception.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/product/stock/stockatdate.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/product/stock/stocktransfer/class/stocktransferline.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/product/stock/stocktransfer/stocktransfer_card.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/product/stock/stocktransfer/stocktransfer_contact.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/stock/stocktransfer/stocktransfer_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/product/stock/tpl/stockcorrection.tpl.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/product/stock/tpl/stocktransfer.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/projet/admin/project.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/projet/ajax/projects.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/projet/card.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/projet/class/api_tasks.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
-        'htdocs/projet/contact.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeComparisonFromArray', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/projet/element.php' => ['PhanUndeclaredProperty'],
+        'htdocs/projet/activity/perday.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/projet/activity/permonth.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/projet/activity/perweek.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/projet/admin/project.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/projet/admin/website.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/projet/ajax/projects.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/projet/card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/projet/class/api_projects.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/projet/class/api_tasks.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
+        'htdocs/projet/class/project.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/projet/class/projectstats.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/projet/class/task.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/projet/class/taskstats.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/projet/contact.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeComparisonFromArray', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/projet/element.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/projet/ganttchart.inc.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
         'htdocs/projet/ganttview.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/projet/graph_opportunities.inc.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/projet/stats/index.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/projet/tasks.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/projet/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/projet/stats/index.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument'],
+        'htdocs/projet/tasks.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/projet/tasks/comment.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/projet/tasks/contact.php' => ['PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/projet/tasks/contact.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/projet/tasks/document.php' => ['PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/projet/tasks/list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/projet/tasks/note.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/projet/tasks/task.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/projet/tasks/time.php' => ['PhanEmptyForeach', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeInvalidDimOffset', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
+        'htdocs/projet/tasks/task.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/projet/tasks/time.php' => ['PhanEmptyForeach', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeInvalidDimOffset', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
         'htdocs/projet/tasks/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/public/agenda/agendaexport.php' => ['PhanRedefineFunction'],
         'htdocs/public/bookcal/index.php' => ['PhanRedefineFunction'],
-        'htdocs/public/company/new.php' => ['PhanRedefineFunction'],
+        'htdocs/public/company/new.php' => ['PhanRedefineFunction', 'PhanTypeMismatchArgument'],
         'htdocs/public/cron/cron_run_jobs_by_url.php' => ['PhanUndeclaredProperty'],
         'htdocs/public/demo/index.php' => ['PhanRedefineFunction'],
         'htdocs/public/donations/donateurs_code.php' => ['PhanRedefineFunction'],
         'htdocs/public/emailing/mailing-read.php' => ['PhanRedefineFunction'],
-        'htdocs/public/eventorganization/attendee_new.php' => ['PhanRedefineFunction'],
+        'htdocs/public/eventorganization/attendee_new.php' => ['PhanRedefineFunction', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/public/eventorganization/subscriptionok.php' => ['PhanRedefineFunction', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/public/members/new.php' => ['PhanRedefineFunction', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/public/members/new.php' => ['PhanRedefineFunction', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable'],
         'htdocs/public/members/public_card.php' => ['PhanRedefineFunction'],
         'htdocs/public/members/public_list.php' => ['PhanRedefineFunction'],
-        'htdocs/public/onlinesign/newonlinesign.php' => ['PhanTypeMismatchArgumentNullableInternal'],
-        'htdocs/public/opensurvey/studs.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/public/partnership/new.php' => ['PhanRedefineFunction'],
-        'htdocs/public/payment/newpayment.php' => ['PhanUndeclaredProperty'],
-        'htdocs/public/payment/paymentko.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/public/payment/paymentok.php' => ['PhanPluginSuspiciousParamPosition', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/public/onlinesign/newonlinesign.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentNullableInternal'],
+        'htdocs/public/opensurvey/studs.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument'],
+        'htdocs/public/partnership/new.php' => ['PhanRedefineFunction', 'PhanTypeMismatchArgument'],
+        'htdocs/public/payment/newpayment.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/public/payment/paymentko.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/public/payment/paymentok.php' => ['PhanPluginSuspiciousParamPosition', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
         'htdocs/public/project/index.php' => ['PhanRedefineFunction', 'PhanUndeclaredGlobalVariable'],
         'htdocs/public/project/new.php' => ['PhanRedefineFunction'],
-        'htdocs/public/project/suggestbooth.php' => ['PhanRedefineFunction', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/public/project/suggestconference.php' => ['PhanRedefineFunction', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/public/project/viewandvote.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/public/project/suggestbooth.php' => ['PhanRedefineFunction', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/public/project/suggestconference.php' => ['PhanRedefineFunction', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/public/project/viewandvote.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable'],
         'htdocs/public/recruitment/view.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/public/stripe/ipn.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/public/stripe/ipn.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
         'htdocs/public/test/test_arrays.php' => ['PhanPluginUndeclaredVariableIsset'],
-        'htdocs/public/ticket/create_ticket.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchDimFetchNullable', 'PhanTypeMismatchProperty'],
+        'htdocs/public/ticket/create_ticket.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchDimFetchNullable', 'PhanTypeMismatchProperty'],
+        'htdocs/public/ticket/list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/public/ticket/view.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/public/webportal/tpl/menu.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/public/webportal/webportal.main.inc.php' => ['PhanRedefineFunction'],
-        'htdocs/public/website/index.php' => ['PhanRedefineFunction'],
+        'htdocs/public/webportal/webportal.main.inc.php' => ['PhanRedefineFunction', 'PhanTypeMismatchArgument'],
+        'htdocs/public/website/index.php' => ['PhanRedefineFunction', 'PhanTypeMismatchArgument'],
         'htdocs/public/website/javascript.js.php' => ['PhanRedefineFunction'],
         'htdocs/public/website/styles.css.php' => ['PhanRedefineFunction'],
-        'htdocs/reception/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/reception/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/reception/class/api_receptions.class.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/reception/class/reception.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/reception/contact.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/reception/dispatch.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/reception/list.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/reception/note.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/recruitment/admin/setup.php' => ['PhanEmptyForeach'],
-        'htdocs/recruitment/admin/setup_candidatures.php' => ['PhanEmptyForeach'],
+        'htdocs/reception/contact.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/reception/dispatch.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/reception/document.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/reception/list.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/reception/note.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/reception/stats/index.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/recruitment/admin/setup.php' => ['PhanEmptyForeach', 'PhanTypeMismatchArgument'],
+        'htdocs/recruitment/admin/setup_candidatures.php' => ['PhanEmptyForeach', 'PhanTypeMismatchArgument'],
+        'htdocs/recruitment/class/api_recruitments.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/recruitment/class/recruitmentcandidature.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/recruitment/class/recruitmentjobposition.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php' => ['PhanUndeclaredProperty'],
-        'htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php' => ['PhanUndeclaredProperty'],
-        'htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php' => ['PhanUndeclaredProperty'],
+        'htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/recruitment/index.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/recruitment/recruitmentcandidature_card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
-        'htdocs/recruitment/recruitmentcandidature_list.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/recruitment/recruitmentjobposition_agenda.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/recruitment/recruitmentjobposition_applications.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/recruitment/recruitmentjobposition_card.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/recruitment/recruitmentjobposition_document.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/recruitment/recruitmentjobposition_list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/recruitment/recruitmentjobposition_note.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/recruitment/recruitmentcandidature_card.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
+        'htdocs/recruitment/recruitmentcandidature_list.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/recruitment/recruitmentjobposition_agenda.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/recruitment/recruitmentjobposition_applications.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/recruitment/recruitmentjobposition_card.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/recruitment/recruitmentjobposition_document.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/recruitment/recruitmentjobposition_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/recruitment/recruitmentjobposition_note.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/resource/card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/resource/class/dolresource.class.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/resource/class/html.formresource.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/resource/element_resource.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/resource/list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/salaries/admin/salaries.php' => ['PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/salaries/card.php' => ['PhanTypeMismatchArgument'],
         'htdocs/salaries/class/api_salaries.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
-        'htdocs/salaries/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/salaries/paiement_salary.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
-        'htdocs/salaries/virement_request.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/societe/admin/societe.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredMethod'],
-        'htdocs/societe/ajax/company.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
+        'htdocs/salaries/class/paymentsalary.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/salaries/class/salariesstats.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/salaries/class/salary.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/salaries/document.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/salaries/info.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/salaries/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/salaries/paiement_salary.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
+        'htdocs/salaries/payments.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/salaries/stats/index.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/salaries/virement_request.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/societe/admin/societe.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredMethod'],
+        'htdocs/societe/ajax/company.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
+        'htdocs/societe/canvas/actions_card_common.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/societe/canvas/company/actions_card_company.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/societe/card.php' => ['PhanTypeMismatchArgument'],
         'htdocs/societe/checkvat/checkVatPopup.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/societe/class/api_thirdparties.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
-        'htdocs/societe/class/societe.class.php' => ['PhanTypeMismatchProperty'],
-        'htdocs/societe/consumption.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/societe/list.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/societe/paymentmodes.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeExpectedObjectPropAccess', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/societe/price.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/societe/tpl/linesalesrepresentative.tpl.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/societe/website.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/stripe/class/actions_stripe.class.php' => ['PhanPluginBothLiteralsBinaryOp', 'PhanPluginSuspiciousParamPosition'],
+        'htdocs/societe/class/api_thirdparties.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
+        'htdocs/societe/class/companybankaccount.class.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/societe/class/societe.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchProperty'],
+        'htdocs/societe/consumption.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/societe/contact.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/societe/list.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/societe/paymentmodes.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/societe/price.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/societe/tpl/linesalesrepresentative.tpl.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/societe/website.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/stripe/admin/stripe.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/stripe/charge.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/stripe/class/actions_stripe.class.php' => ['PhanPluginBothLiteralsBinaryOp', 'PhanPluginSuspiciousParamPosition', 'PhanTypeMismatchArgument'],
         'htdocs/stripe/class/stripe.class.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchProperty'],
-        'htdocs/supplier_proposal/card.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/stripe/lib/stripe.lib.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/supplier_proposal/card.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/supplier_proposal/class/api_supplier_proposals.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanUndeclaredProperty'],
-        'htdocs/supplier_proposal/class/supplier_proposal.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/supplier_proposal/list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/takepos/ajax/ajax.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
+        'htdocs/supplier_proposal/class/supplier_proposal.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/supplier_proposal/contact.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/supplier_proposal/document.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/supplier_proposal/info.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/supplier_proposal/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/supplier_proposal/note.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/takepos/admin/bar.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/takepos/admin/setup.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/takepos/admin/terminal.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/takepos/ajax/ajax.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
         'htdocs/takepos/floors.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/takepos/freezone.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/takepos/index.php' => ['PhanPluginUndeclaredVariableIsset'],
-        'htdocs/takepos/invoice.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/takepos/pay.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
+        'htdocs/takepos/freezone.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/takepos/index.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanTypeMismatchArgument'],
+        'htdocs/takepos/invoice.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/takepos/pay.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/takepos/phone.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/takepos/send.php' => ['PhanTypeMismatchArgument'],
         'htdocs/takepos/split.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/theme/eldy/badges.inc.php' => ['PhanRedefineFunction'],
         'htdocs/theme/eldy/btn.inc.php' => ['PhanUndeclaredGlobalVariable'],
@@ -448,48 +955,70 @@ return [
         'htdocs/theme/md/dropdown.inc.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/theme/md/flags-sprite.inc.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/theme/md/progress.inc.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/ticket/card.php' => ['PhanUndeclaredProperty'],
-        'htdocs/ticket/class/actions_ticket.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/ticket/agenda.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/ticket/card.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/ticket/class/actions_ticket.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/ticket/class/api_tickets.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/ticket/class/cticketcategory.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/ticket/class/ticket.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/ticket/class/ticket.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/ticket/class/ticketstats.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/ticket/contact.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/ticket/document.php' => ['PhanTypeMismatchArgument'],
         'htdocs/ticket/index.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal'],
-        'htdocs/user/card.php' => ['PhanTypeMismatchProperty'],
-        'htdocs/user/class/api_users.class.php' => ['PhanTypeMismatchProperty'],
-        'htdocs/user/class/user.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/ticket/list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/ticket/messaging.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/ticket/stats/index.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/user/bank.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/user/card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchProperty'],
+        'htdocs/user/class/api_users.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty'],
+        'htdocs/user/class/user.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/user/class/userbankaccount.class.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/user/class/usergroup.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/user/document.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/user/group/card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/user/group/list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/user/list.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/user/param_ihm.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/user/virtualcard.php' => ['PhanTypeMismatchArgument'],
         'htdocs/variants/ajax/get_attribute_values.php' => ['PhanTypeComparisonFromArray'],
-        'htdocs/variants/class/ProductCombination.class.php' => ['PhanPluginSuspiciousParamPosition'],
-        'htdocs/variants/combinations.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchProperty'],
+        'htdocs/variants/card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/variants/class/ProductAttribute.class.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/variants/class/ProductCombination.class.php' => ['PhanPluginSuspiciousParamPosition', 'PhanTypeMismatchArgument'],
+        'htdocs/variants/combinations.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchProperty'],
+        'htdocs/variants/list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/variants/tpl/productattributevalueline_edit.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/variants/tpl/productattributevalueline_view.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/viewimage.php' => ['PhanRedefineFunction', 'PhanUndeclaredMethod'],
         'htdocs/webhook/class/api_webhook.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/webhook/class/target.class.php' => ['PhanUndeclaredMethod'],
         'htdocs/webhook/target_card.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/webhook/target_list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/webportal/class/html.formcardwebportal.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/webportal/class/html.formlistwebportal.class.php' => ['PhanTypeInvalidDimOffset', 'PhanUndeclaredProperty'],
+        'htdocs/webhook/target_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/webportal/admin/setup.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/webportal/class/html.formcardwebportal.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/webportal/class/html.formlistwebportal.class.php' => ['PhanTypeInvalidDimOffset', 'PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/webportal/class/html.formwebportal.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/webportal/class/webportalpropal.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/webservices/server_actioncomm.php' => ['PhanUndeclaredProperty'],
-        'htdocs/webservices/server_category.php' => ['PhanUndeclaredProperty'],
-        'htdocs/webservices/server_contact.php' => ['PhanUndeclaredProperty'],
-        'htdocs/webservices/server_invoice.php' => ['PhanUndeclaredProperty'],
-        'htdocs/webservices/server_order.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanTypeInvalidDimOffset', 'PhanTypeSuspiciousStringExpression', 'PhanUndeclaredProperty'],
-        'htdocs/webservices/server_payment.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanUndeclaredProperty'],
-        'htdocs/webservices/server_productorservice.php' => ['PhanUndeclaredProperty'],
-        'htdocs/webservices/server_project.php' => ['PhanUndeclaredProperty'],
+        'htdocs/webportal/controllers/membercard.controller.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/webportal/controllers/partnershipcard.controller.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/webservices/server_actioncomm.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/webservices/server_category.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/webservices/server_contact.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/webservices/server_invoice.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/webservices/server_order.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanTypeInvalidDimOffset', 'PhanTypeMismatchArgument', 'PhanTypeSuspiciousStringExpression', 'PhanUndeclaredProperty'],
+        'htdocs/webservices/server_payment.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/webservices/server_productorservice.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/webservices/server_project.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/webservices/server_supplier_invoice.php' => ['PhanUndeclaredProperty'],
-        'htdocs/webservices/server_thirdparty.php' => ['PhanUndeclaredProperty'],
-        'htdocs/webservices/server_user.php' => ['PhanUndeclaredProperty'],
-        'htdocs/website/class/website.class.php' => ['PhanTypeMismatchArgumentNullableInternal'],
-        'htdocs/website/index.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/website/samples/wrapper.php' => ['PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/webservices/server_thirdparty.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/webservices/server_user.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/website/class/website.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullableInternal'],
+        'htdocs/website/index.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/website/samples/wrapper.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/website/websiteaccount_card.php' => ['PhanUndeclaredProperty'],
         'htdocs/workstation/class/api_workstations.class.php' => ['PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/workstation/class/workstation.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/workstation/workstation_card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
-        'htdocs/workstation/workstation_list.php' => ['PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/workstation/workstation_card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
+        'htdocs/workstation/workstation_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/zapier/class/api_zapier.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/zapier/class/hook.class.php' => ['PhanUndeclaredProperty'],
         'internal' => ['PhanUndeclaredConstant'],
diff --git a/dev/tools/phan/config.php b/dev/tools/phan/config.php
index 366e52ffd15..a59ceeef325 100644
--- a/dev/tools/phan/config.php
+++ b/dev/tools/phan/config.php
@@ -440,7 +440,7 @@ return [
 
 		'PhanPluginNonBoolBranch',			// Not essential - 31240+ occurrences
 		'PhanPluginNumericalComparison',	// Not essential - 19870+ occurrences
-		'PhanTypeMismatchArgument',			// Also reported by phpstan < lvl6 - 12300+ occurrences
+		// 'PhanTypeMismatchArgument',		// Can detect missing array keys, invalid types, objects being passed when scalar expected - Not all reported by phpstan - <=3800 cases (was: 12300+ before)
 		'PhanPluginNonBoolInLogicalArith',	// Not essential - 11040+ occurrences
 		'PhanPluginConstantVariableScalar',	// Not essential - 5180+ occurrences
 		'PhanPluginDuplicateAdjacentStatement',
diff --git a/dev/tools/phan/config_extended.php b/dev/tools/phan/config_extended.php
index 38cd62d20f6..380493bbdd9 100644
--- a/dev/tools/phan/config_extended.php
+++ b/dev/tools/phan/config_extended.php
@@ -85,7 +85,7 @@ $config['suppress_issue_types'] = [
 
 		'PhanPluginNonBoolBranch',			// Not essential - 31240+ occurrences
 		'PhanPluginNumericalComparison',	// Not essential - 19870+ occurrences
-		'PhanTypeMismatchArgument',			// Not essential - 12300+ occurrences
+		'PhanTypeMismatchArgument',			// Not showing in cti.dolibarr until low count - Can detect missing array keys, invalid types, objects being passed when scalar expected - Not all reported by phpstan - <=3800 cases (was: 12300+ before)
 		'PhanPluginNonBoolInLogicalArith',	// Not essential - 11040+ occurrences
 		'PhanPluginConstantVariableScalar',	// Not essential - 5180+ occurrences
 		'PhanPluginDuplicateAdjacentStatement',

From f750f2c40cbe6058886e409c7a0b818e2aae4f40 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 1 Feb 2025 15:53:36 +0100
Subject: [PATCH 414/602] Qual: Fix phan notices not seen locally

---
 htdocs/bom/bom_net_needs.php               |  5 +++--
 htdocs/core/class/commoninvoice.class.php  |  6 +++---
 htdocs/core/db/pgsql.class.php             |  8 ++++----
 htdocs/exports/export.php                  | 14 +++++++-------
 htdocs/website/class/website.class.php     |  2 +-
 htdocs/website/class/websitepage.class.php |  6 +++---
 6 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/htdocs/bom/bom_net_needs.php b/htdocs/bom/bom_net_needs.php
index ed592c8ff91..1663a64d1bf 100644
--- a/htdocs/bom/bom_net_needs.php
+++ b/htdocs/bom/bom_net_needs.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017-2020  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -135,7 +136,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 
 $title = $langs->trans('BOM');
-$help_url ='EN:Module_BOM';
+$help_url = 'EN:Module_BOM';
 
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-bom page-net_needs');
 
@@ -330,7 +331,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				if ($useunit) {
 					require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
 					$unit = new CUnits($db);
-					$unit->fetch($elem['fk_unit']);
+					$unit->fetch((int) $elem['fk_unit']);
 					print(isset($unit->label) ? "&nbsp;".$langs->trans(ucwords($unit->label))."&nbsp;" : '');
 				}
 				print '</td>';
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index bc0cd86198c..d22f304ca0d 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2012-2014	Raphaël Doursenaud			<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2023		Nick Fragoulis
  * Copyright (C) 2024-2025  Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1984,7 +1984,7 @@ abstract class CommonInvoice extends CommonObject
 			$s .= dol_trunc($mysoc->country_code, 2, 'right', 'UTF-8', 1)."\n";*/
 		} else {
 			$s .= "S\n";
-			$s .= dol_trunc($mysoc->name, 70, 'right', 'UTF-8', 1)."\n";
+			$s .= dol_trunc((string) $mysoc->name, 70, 'right', 'UTF-8', 1)."\n";
 			$addresslinearray = explode("\n", $mysoc->address);
 			$s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1)."\n";		// address line 1
 			$s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1)."\n";		// address line 2
@@ -2005,7 +2005,7 @@ abstract class CommonInvoice extends CommonObject
 		$s .= ($this->multicurrency_code ? $this->multicurrency_code : $conf->currency)."\n";
 		// Buyer
 		$s .= "S\n";
-		$s .= dol_trunc($this->thirdparty->name, 70, 'right', 'UTF-8', 1)."\n";
+		$s .= dol_trunc((string) $this->thirdparty->name, 70, 'right', 'UTF-8', 1)."\n";
 		$addresslinearray = explode("\n", $this->thirdparty->address);
 		$s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1)."\n";		// address line 1
 		$s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1)."\n";		// address line 2
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 8c456044410..28561f73648 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2012		Yann Droneaud			<yann@droneaud.fr>
  * Copyright (C) 2012		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -53,11 +53,11 @@ class DoliDBPgsql extends DoliDB
 	const VERSIONMIN = '9.0.0'; // Version min database
 
 	/**
-	 * @var boolean $unescapeslashquot  			Set this to 1 when calling SQL queries, to say that SQL is not standard but already escaped for Mysql. Used by PostgreSQL driver
+	 * @var boolean  			Set this to 1 when calling SQL queries, to say that SQL is not standard but already escaped for Mysql. Used by PostgreSQL driver
 	 */
 	public $unescapeslashquot = false;
 	/**
-	 * @var boolean $standard_conforming_strings		Set this to true if postgres accept only standard encoding of string using '' and not \'
+	 * @var boolean		Set this to true if postgres accept only standard encoding of string using '' and not \'
 	 */
 	public $standard_conforming_strings = false;
 
@@ -951,7 +951,7 @@ class DoliDBPgsql extends DoliDB
 		//print $charset.' '.setlocale(LC_CTYPE,'0'); exit;
 
 		// NOTE: Do not use ' around the database name
-		$sql = "CREATE DATABASE ".$this->escape($database)." OWNER '".$this->escape($owner)."' ENCODING '".$this->escape($charset)."'";
+		$sql = "CREATE DATABASE ".$this->escape($database)." OWNER '".$this->escape($owner)."' ENCODING '".$this->escape((string) $charset)."'";
 
 		dol_syslog($sql, LOG_DEBUG);
 		$ret = $this->query($sql);
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 72d260e1525..8f6f88a21ce 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2012		Charles-Fr BENKE	<charles.fr@benke.fr>
  * Copyright (C) 2015       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2024		Frédéric France				<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -631,7 +631,7 @@ if ($step == 2 && $datatoexport) {
 			$entityicon = $tmparray[0];
 			$entitylang = $tmparray[1];
 		}
-		print img_object('', $entityicon).' '.$langs->trans($entitylang);
+		print img_object('', $entityicon).' '.$langs->trans((string) $entitylang);
 		print '</td>';
 
 		$text = (empty($objexport->array_export_special[0][$code]) ? '' : '<i>');
@@ -641,7 +641,7 @@ if ($step == 2 && $datatoexport) {
 		} else {
 			$text .= $langs->trans($label);
 		}
-		$text .=(empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
+		$text .= (empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
 
 		$tablename = getablenamefromfield($code, $sqlmaxforexport);
 		$htmltext = '<b>'.$langs->trans("Name").":</b> ".$text.'<br>';
@@ -823,7 +823,7 @@ if ($step == 3 && $datatoexport) {
 			$entityicon = $tmparray[0];
 			$entitylang = $tmparray[1];
 		}
-		print img_object('', $entityicon).' '.$langs->trans($entitylang);
+		print img_object('', $entityicon).' '.$langs->trans((string) $entitylang);
 		print '</td>';
 
 		// Field name
@@ -837,7 +837,7 @@ if ($step == 3 && $datatoexport) {
 		} else {
 			$text .= $langs->trans($label);
 		}
-		$text .=(empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
+		$text .= (empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
 
 		$tablename = getablenamefromfield($code, $sqlmaxforexport);
 		$htmltext = '<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
@@ -1034,7 +1034,7 @@ if ($step == 4 && $datatoexport) {
 			$entityicon = $tmparray[0];
 			$entitylang = $tmparray[1];
 		}
-		print img_object('', $entityicon).' '.$langs->trans($entitylang);
+		print img_object('', $entityicon).' '.$langs->trans((string) $entitylang);
 		print '</td>';
 
 		$labelName = $objexport->array_export_fields[0][$code];
@@ -1046,7 +1046,7 @@ if ($step == 4 && $datatoexport) {
 		} else {
 			$text .= $langs->trans($labelName);
 		}
-		$text .=(empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
+		$text .= (empty($objexport->array_export_special[0][$code]) ? '' : '</i>');
 
 		$tablename = getablenamefromfield($code, $sqlmaxforexport);
 		$htmltext = '<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index d1efc20b1ea..ae56eae9af4 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -1173,7 +1173,7 @@ class Website extends CommonObject
 			$line .= "'".$this->db->escape($objectpageold->status)."', ";
 			$line .= "'".$this->db->idate($objectpageold->date_creation)."', ";
 			$line .= "'".$this->db->idate($objectpageold->date_modification)."', ";
-			$line .= ($objectpageold->import_key ? "'".$this->db->escape($objectpageold->import_key)."'" : "null").", ";
+			$line .= ($objectpageold->import_key ? "'".$this->db->escape((string) $objectpageold->import_key)."'" : "null").", ";
 			$line .= "'".$this->db->escape($objectpageold->grabbed_from)."', ";
 			$line .= "'".$this->db->escape($objectpageold->type_container)."', ";
 
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 59c5afa6c8d..b2ce563d33a 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2020 	   Nicolas ZABOURI		<info@inovea-conseil.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -163,7 +163,7 @@ class WebsitePage extends CommonObject
 	public $fk_object;
 
 	/**
-	 * @var int			Another ID that is the $id but with an offset so that ID of pages of the website start at 1
+	 * @var int			Another ID that is the but with an offset so that ID of pages of the website start at 1
 	 */
 	public $newid;
 
@@ -661,7 +661,7 @@ class WebsitePage extends CommonObject
 				return -1;
 			}
 			$tmppage = new WebsitePage($this->db);
-			$tmppage->fetch($this->fk_page);
+			$tmppage->fetch((int) $this->fk_page);
 			if ($tmppage->lang == $this->lang) {
 				$this->error = "ErrorLanguageOfTranslatedPageIsSameThanThisPage";
 				return -1;

From 2cd13853d584994a68fade5823fc17685527fa9c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sun, 2 Feb 2025 22:19:18 +0100
Subject: [PATCH 415/602] Qual: Fix phan notices (ftp, holiday)

# Qual: Fix phan notices (ftp, holiday)
---
 dev/tools/phan/baseline.txt                   | 16 +++-----
 .../holiday/mod_holiday_immaculate.php        |  4 +-
 .../modules/holiday/mod_holiday_madonna.php   |  4 +-
 .../core/modules/holiday/modules_holiday.php  |  4 +-
 htdocs/ftp/admin/ftpclient.php                |  9 +++++
 htdocs/ftp/index.php                          |  8 ++--
 htdocs/holiday/card.php                       | 15 +++----
 htdocs/holiday/card_group.php                 | 20 +++++-----
 htdocs/holiday/class/holiday.class.php        | 16 ++++----
 htdocs/holiday/define_holiday.php             | 18 ++++-----
 htdocs/holiday/list.php                       | 35 +++++++++--------
 htdocs/holiday/month_report.php               | 23 +++++------
 htdocs/holiday/view_log.php                   | 39 ++++++++++---------
 13 files changed, 110 insertions(+), 101 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index eb6649f9507..2773f00fb3a 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,12 +9,12 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 3800+ occurrences
+    // PhanTypeMismatchArgument : 3760+ occurrences
     // PhanUndeclaredProperty : 540+ occurrences
     // PhanTypeMismatchArgumentNullable : 460+ occurrences
-    // PhanPossiblyUndeclaredGlobalVariable : 200+ occurrences
     // PhanUndeclaredGlobalVariable : 190+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 180+ occurrences
+    // PhanPossiblyUndeclaredGlobalVariable : 180+ occurrences
     // PhanTypeMismatchArgumentProbablyReal : 150+ occurrences
     // PhanTypeMismatchProperty : 130+ occurrences
     // PhanPluginUnknownArrayMethodParamType : 110+ occurrences
@@ -22,8 +22,8 @@ return [
     // PhanPluginUndeclaredVariableIsset : 40+ occurrences
     // PhanTypeExpectedObjectPropAccess : 40+ occurrences
     // PhanTypeInvalidDimOffset : 25+ occurrences
-    // PhanTypeMismatchDimFetch : 25+ occurrences
     // PhanTypeMismatchArgumentNullableInternal : 20+ occurrences
+    // PhanTypeMismatchDimFetch : 20+ occurrences
     // PhanUndeclaredConstant : 15+ occurrences
     // PhanTypeComparisonFromArray : 10+ occurrences
     // PhanUndeclaredMethod : 10+ occurrences
@@ -628,15 +628,9 @@ return [
         'htdocs/fourn/facture/paiement.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/fourn/facture/rapport.php' => ['PhanTypeMismatchArgument'],
         'htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/ftp/admin/ftpclient.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/ftp/index.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullable'],
-        'htdocs/holiday/card.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/holiday/card_group.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
-        'htdocs/holiday/class/holiday.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
-        'htdocs/holiday/define_holiday.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
-        'htdocs/holiday/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/holiday/card_group.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/holiday/list.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/holiday/month_report.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/holiday/view_log.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchDimFetch'],
         'htdocs/hrm/admin/admin_hrm.php' => ['PhanEmptyForeach'],
         'htdocs/hrm/class/establishment.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/hrm/class/evaluation.class.php' => ['PhanUndeclaredProperty'],
diff --git a/htdocs/core/modules/holiday/mod_holiday_immaculate.php b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
index c8ed8ec5996..b2d4cd403e6 100644
--- a/htdocs/core/modules/holiday/mod_holiday_immaculate.php
+++ b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2011-2019	Juanjo Menent	    	<jmenent@2byte.es>
  * Copyright (C) 2018		Charlene Benke			<charlie@patas-monkey.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -110,7 +110,7 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 	/**
 	 *	Return next value
 	 *
-	 *	@param	Societe			$objsoc     third party object
+	 *	@param	?Societe		$objsoc     third party object
 	 *	@param	Holiday			$holiday	holiday object
 	 *	@return string|int<-1,0>   			Value if OK, <=0 if KO
 	 */
diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php
index 9f10ed28eef..a20eebdc1f3 100644
--- a/htdocs/core/modules/holiday/mod_holiday_madonna.php
+++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2018-2023 Charlene Benke		<charlene@patas-monkey.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -113,7 +113,7 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 	/**
 	 *	Return next value
 	 *
-	 *	@param	Societe			$objsoc     third party object
+	 *	@param	?Societe		$objsoc     third party object
 	 *	@param	Holiday			$holiday	holiday object
 	 *	@return string|int<-1,0>   			Value if OK, <=0 if KO
 	 */
diff --git a/htdocs/core/modules/holiday/modules_holiday.php b/htdocs/core/modules/holiday/modules_holiday.php
index 0bc07d3e73a..f5073b546ae 100644
--- a/htdocs/core/modules/holiday/modules_holiday.php
+++ b/htdocs/core/modules/holiday/modules_holiday.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2013      Philippe Grand	    <philippe.grand@atoo-net.com>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2018      Charlene Benke		<charlie@patas-monkey.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -85,7 +85,7 @@ abstract class ModelNumRefHolidays extends CommonNumRefGenerator
 	/**
 	 *	Return next value
 	 *
-	 *	@param	Societe			$objsoc     third party object
+	 *	@param	?Societe		$objsoc     third party object
 	 *	@param	Holiday			$holiday	holiday object
 	 *	@return string|int<-1,0>   			Value if OK, <=0 if KO
 	 */
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 7299245250e..c10fe97ca93 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004-2022 Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2011       Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -48,6 +49,14 @@ if (!$user->admin) {
 	accessforbidden();
 }
 
+// Initialise variables
+$result1 = 0;
+$result2 = 0;
+$result3 = 0;
+$result4 = 0;
+$result5 = 0;
+$result6 = 0;
+
 
 /*
  * Action
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index a91f23eff26..265b3709e75 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2008-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2008-2009  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2019-2024	Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -107,6 +107,7 @@ $result = restrictedArea($user, 'ftp', '');
  */
 
 if ($action == 'uploadfile' && $user->hasRight('ftp', 'write')) {
+	$newsectioniso = null;
 	// set up a connection or die
 	if (!$conn_id) {
 		$newsectioniso = mb_convert_encoding($section, 'ISO-8859-1');
@@ -115,7 +116,7 @@ if ($action == 'uploadfile' && $user->hasRight('ftp', 'write')) {
 		$ok = $resultarray['ok'];
 		$mesg = $resultarray['mesg'];
 	}
-	if ($conn_id && $ok && !$mesg) {
+	if ($conn_id && $ok && !$mesg && $newsectioniso) {
 		$nbfile = count($_FILES['userfile']['name']);
 		for ($i = 0; $i < $nbfile; $i++) {
 			$newsection = $newsectioniso;
@@ -138,6 +139,7 @@ if ($action == 'uploadfile' && $user->hasRight('ftp', 'write')) {
 
 if ($action == 'addfolder' && $user->hasRight('ftp', 'write')) {
 	// set up a connection or die
+	$newsectioniso = null;
 	if (!$conn_id) {
 		$newsectioniso = mb_convert_encoding($section, 'ISO-8859-1');
 		$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
@@ -145,7 +147,7 @@ if ($action == 'addfolder' && $user->hasRight('ftp', 'write')) {
 		$ok = $resultarray['ok'];
 		$mesg = $resultarray['mesg'];
 	}
-	if ($conn_id && $ok && !$mesg) {
+	if ($conn_id && $ok && !$mesg && $newsectioniso) {
 		$result = dol_ftp_mkdir($conn_id, $newfolder, $newsectioniso);
 
 		if ($result) {
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 29595dc17a2..ad025b35c10 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2020-2021	Udo Tamm					<dev@dolibit.de>
  * Copyright (C) 2022		Anthony Berton				<anthony.berton@bb2a.fr>
  * Copyright (C) 2024		Charlene Benke				<charlene@patas-monkey.com>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -980,7 +981,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $object = new Holiday($db);
 
-$listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
+$listhalfday = array('morning' => $langs->trans("Morning"), "afternoon" => $langs->trans("Afternoon"));
 
 $title = $langs->trans('Leave');
 $help_url = 'EN:Module_Holiday';
@@ -1079,10 +1080,10 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 		print '<td class="titlefield fieldrequired tdtop">'.$langs->trans("User").'</td>';
 		print '<td><div class="inline-block">';
 		if ($permissiontoadd && !$permissiontoaddall) {
-			print img_picto('', 'user', 'class="pictofixedwidth"').$form->select_dolusers(($fuserid ? $fuserid : $user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'minwidth200 maxwidth500 inline-block');
+			print img_picto('', 'user', 'class="pictofixedwidth"').$form->select_dolusers(($fuserid ? $fuserid : $user->id), 'fuserid', 0, null, 0, 'hierarchyme', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'minwidth200 maxwidth500 inline-block');
 			//print '<input type="hidden" name="fuserid" value="'.($fuserid?$fuserid:$user->id).'">';
 		} else {
-			print img_picto('', 'user', 'class="pictofixedwidth"').$form->select_dolusers($fuserid ? $fuserid : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'minwidth200 maxwidth500 inline-block');
+			print img_picto('', 'user', 'class="pictofixedwidth"').$form->select_dolusers($fuserid ? $fuserid : $user->id, 'fuserid', 0, null, 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'minwidth200 maxwidth500 inline-block');
 		}
 		print '</div>';
 
@@ -1104,7 +1105,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			$htmltooltip = $langs->trans("Detail").'<br>';
 			$htmltooltip .= $out;
 
-			print $form->textwithtooltip($langs->trans('SoldeCPUser', round($nb_holiday, 5)).' '.img_picto('', 'help'), $htmltooltip);
+			print $form->textwithtooltip($langs->trans('SoldeCPUser', (string) round($nb_holiday, 5)).' '.img_picto('', 'help'), $htmltooltip);
 
 			print '</div>';
 			if (!empty($conf->use_javascript_ajax)) {
@@ -1141,7 +1142,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')' : '');
 			$arraytypeleaves[$val['rowid']] = $labeltoshow;
 		}
-		print $form->selectarray('type', $arraytypeleaves, (GETPOST('type', 'alpha') ? GETPOST('type', 'alpha') : ''), 1, 0, 0, '', 0, 0, 0, '', '', true);
+		print $form->selectarray('type', $arraytypeleaves, (GETPOST('type', 'alpha') ? GETPOST('type', 'alpha') : ''), 1, 0, 0, '', 0, 0, 0, '', '', 1);
 		if ($user->admin) {
 			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
@@ -1201,7 +1202,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			if (GETPOSTINT('valideur') > 0) {
 				$defaultselectuser = GETPOSTINT('valideur');
 			}
-			$s = $form->select_dolusers($defaultselectuser, "valideur", 1, '', 0, $include_users, '', '0,'.$conf->entity, 0, 0, '', 0, '', 'minwidth200 maxwidth500');
+			$s = $form->select_dolusers($defaultselectuser, "valideur", 1, null, 0, $include_users, '', '0,'.$conf->entity, 0, 0, '', 0, '', 'minwidth200 maxwidth500');
 			print img_picto('', 'user', 'class="pictofixedwidth"').$form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
 		}
 
@@ -1549,7 +1550,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 
 				// Si refus de la demande
 				if ($action == 'refuse') {
-					$array_input = array(array('type'=>"text", 'label'=> $langs->trans('DetailRefusCP'), 'name'=>"detail_refuse", 'size'=>"50", 'value'=>""));
+					$array_input = array(array('type' => "text", 'label' => $langs->trans('DetailRefusCP'), 'name' => "detail_refuse", 'size' => "50", 'value' => ""));
 					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&action=confirm_refuse", $langs->trans("TitleRefuseCP"), $langs->trans('ConfirmRefuseCP'), "confirm_refuse", $array_input, 1, 0);
 				}
 
diff --git a/htdocs/holiday/card_group.php b/htdocs/holiday/card_group.php
index 9eb3f2ab5d0..0a913e24274 100644
--- a/htdocs/holiday/card_group.php
+++ b/htdocs/holiday/card_group.php
@@ -171,10 +171,10 @@ if (empty($reshook)) {
 		$users 		=  GETPOST('users', 'array');
 		$groups 	=  GETPOST('groups', 'array');
 
-		$date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'));
-		$date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'));
-		$date_debut_gmt = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'), 1);
-		$date_fin_gmt = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'), 1);
+		$date_debut = dol_mktime(0, 0, 0, GETPOSTINT('date_debut_month'), GETPOSTINT('date_debut_day'), GETPOSTINT('date_debut_year'));
+		$date_fin = dol_mktime(0, 0, 0, GETPOSTINT('date_fin_month'), GETPOSTINT('date_fin_day'), GETPOSTINT('date_fin_year'));
+		$date_debut_gmt = dol_mktime(0, 0, 0, GETPOSTINT('date_debut_month'), GETPOSTINT('date_debut_day'), GETPOSTINT('date_debut_year'), 1);
+		$date_fin_gmt = dol_mktime(0, 0, 0, GETPOSTINT('date_fin_month'), GETPOSTINT('date_fin_day'), GETPOSTINT('date_fin_year'), 1);
 		$starthalfday = GETPOST('starthalfday');
 		$endhalfday = GETPOST('endhalfday');
 		$type = GETPOSTINT('type');
@@ -414,7 +414,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 					break;
 			}
 
-			setEventMessages($errors, array(), 'errors');
+			setEventMessages('', $errors, 'errors');
 		}
 
 
@@ -508,7 +508,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			$Tgroup[$obj->rowid] = $obj->nom;
 		}
 
-		print $form->multiselectarray('groups', $Tgroup, GETPOST('groups', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+		print $form->multiselectarray('groups', $Tgroup, GETPOST('groups', 'array'), 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 
 		print '</td>';
 
@@ -543,7 +543,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			}
 		}
 
-		print img_picto('', 'users', 'class="pictofixedwidth"') . $form->multiselectarray('users', $userlist, GETPOST('users', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+		print img_picto('', 'users', 'class="pictofixedwidth"') . $form->multiselectarray('users', $userlist, GETPOST('users', 'array'), 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 		print '</td>';
 
 		// Type
@@ -557,7 +557,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')' : '');
 			$arraytypeleaves[$val['rowid']] = $labeltoshow;
 		}
-		print $form->selectarray('type', $arraytypeleaves, (GETPOST('type', 'alpha') ? GETPOST('type', 'alpha') : ''), 1, 0, 0, '', 0, 0, 0, '', '', true);
+		print $form->selectarray('type', $arraytypeleaves, (GETPOST('type', 'alpha') ? GETPOST('type', 'alpha') : ''), 1, 0, 0, '', 0, 0, 0, '', '', 1);
 		if ($user->admin) {
 			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
@@ -618,7 +618,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			if (GETPOSTINT('valideur') > 0) {
 				$defaultselectuser = GETPOSTINT('valideur');
 			}
-			$s = $form->select_dolusers($defaultselectuser, "valideur", 1, '', 0, $include_users, '', '0,'.$conf->entity, 0, 0, '', 0, '', 'minwidth200 maxwidth500');
+			$s = $form->select_dolusers($defaultselectuser, "valideur", 1, null, 0, $include_users, '', '0,'.$conf->entity, 0, 0, '', 0, '', 'minwidth200 maxwidth500');
 			print img_picto('', 'user').$form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
 		}
 
@@ -701,7 +701,7 @@ function sendMail($id, $cancreate, $now, $autoValidation)
 	if ($result) {
 		// If draft and owner of leave
 		if ($object->status == Holiday::STATUS_VALIDATED && $cancreate) {
-			$object->oldcopy = dol_clone($object, 2);
+			$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
 
 			//if ($autoValidation) $object->status = Holiday::STATUS_VALIDATED;
 
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index c6808b57aff..082111cd7f0 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2016       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -1012,9 +1012,9 @@ class Holiday extends CommonObject
 	/**
 	 *	Update database
 	 *
-	 *  @param	User		$user        	User that modify
-	 *  @param  int<0,1>	$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int         			Return integer <0 if KO, >0 if OK
+	 *  @param	?User		$user			User that modify
+	 *  @param  int<0,1>	$notrigger		0=launch triggers after, 1=disable triggers
+	 *  @return int							Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -1054,7 +1054,7 @@ class Holiday extends CommonObject
 			$error++;
 		}
 		if (!empty($this->fk_validator)) {
-			$sql .= " fk_validator = '".$this->db->escape($this->fk_validator)."',";
+			$sql .= " fk_validator = ".((int) $this->fk_validator).",";
 		} else {
 			$error++;
 		}
@@ -1123,7 +1123,7 @@ class Holiday extends CommonObject
 		}
 
 		if (!$error) {
-			if (!$notrigger) {
+			if (!$notrigger && $user !== null) {
 				// Call trigger
 				$result = $this->call_trigger('HOLIDAY_MODIFY', $user);
 				if ($result < 0) {
@@ -2211,7 +2211,7 @@ class Holiday extends CommonObject
 	 * @param 	int		$fk_user_action		Id user creation
 	 * @param 	int		$fk_user_update		Id user update
 	 * @param 	string	$label				Label (Example: 'Leave', 'Manual update', 'Leave request cancelation'...)
-	 * @param 	int		$new_solde			New value
+	 * @param 	float	$new_solde			New value
 	 * @param	int		$fk_type			Type of vacation
 	 * @return 	int							Id of record added, 0 if nothing done, < 0 if KO
 	 */
@@ -2221,7 +2221,7 @@ class Holiday extends CommonObject
 
 		$error = 0;
 
-		$prev_solde = price2num($this->getCPforUser($fk_user_update, $fk_type), 5);
+		$prev_solde = price2num((float) $this->getCPforUser($fk_user_update, $fk_type), 5);
 		$new_solde = price2num($new_solde, 5);
 		//print "$prev_solde == $new_solde";
 
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 3b1f193e1b6..48dde5e60bd 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2016		Regis Houssin				<regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -83,10 +83,10 @@ $extrafields = new ExtraFields($db);
 $holiday = new Holiday($db);
 
 $arrayfields = array(
-	'cp.rowid' => array('label' => $langs->trans("Employee"), 'checked' => 1, 'position' => 20),
-	'cp.fk_user' => array('label' => $langs->trans("Supervisor"), 'checked' => 1, 'position' => 30),
-	'cp.nbHoliday' => array('label' => $langs->trans("MenuConfCP"), 'checked' => 1, 'position' => 40),
-	'cp.note_public' => array('label' => $langs->trans("Note"), 'checked' => 1, 'position' => 50),
+	'cp.rowid' => array('label' => $langs->trans("Employee"), 'checked' => '1', 'position' => 20),
+	'cp.fk_user' => array('label' => $langs->trans("Supervisor"), 'checked' => '1', 'position' => 30),
+	'cp.nbHoliday' => array('label' => $langs->trans("MenuConfCP"), 'checked' => '1', 'position' => 40),
+	'cp.note_public' => array('label' => $langs->trans("Note"), 'checked' => '1', 'position' => 50),
 );
 
 $permissiontoread = $user->hasRight('holiday', 'read');
@@ -178,7 +178,7 @@ if (empty($reshook)) {
 			//print 'holiday: '.$val['rowid'].'-'.$userValue;exit;
 			if ($userValue != '') {
 				// We add the modification to the log (must be done before the update of balance because we read current value of balance inside this method)
-				$result = $holiday->addLogCP($user->id, $userID, $langs->transnoentitiesnoconv('ManualUpdate').$comment, $userValue, $val['rowid']);
+				$result = $holiday->addLogCP($user->id, $userID, $langs->transnoentitiesnoconv('ManualUpdate').$comment, (float) $userValue, $val['rowid']);
 				if ($result < 0) {
 					setEventMessages($holiday->error, $holiday->errors, 'errors');
 					$error++;
@@ -188,7 +188,7 @@ if (empty($reshook)) {
 				if ($result > 0) {
 					$nbok++;
 
-					$result = $holiday->updateSoldeCP($userID, $userValue, $val['rowid']);
+					$result = $holiday->updateSoldeCP($userID, (float) $userValue, $val['rowid']);
 					if ($result < 0) {
 						setEventMessages($holiday->error, $holiday->errors, 'errors');
 						$error++;
@@ -373,7 +373,7 @@ if (count($typeleaves) == 0) {
 	// Supervisor
 	if (!empty($arrayfields['cp.fk_user']['checked'])) {
 		print '<td class="liste_titre">';
-		print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, null, 0, array(), '', 0, 0, 0, '', 0, '', 'maxwidth150');
+		print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, null, 0, array(), '', '', 0, 0, '', 0, '', 'maxwidth150');
 		print '</td>';
 	}
 	// Type of leave request
@@ -493,7 +493,7 @@ if (count($typeleaves) == 0) {
 				foreach ($typeleaves as $key => $val) {
 					$nbtoshow = '';
 					if ($holiday->getCPforUser($users['rowid'], $val['rowid']) != '') {
-						$nbtoshow = price2num($holiday->getCPforUser($users['rowid'], $val['rowid']), 5);
+						$nbtoshow = price2num((float) $holiday->getCPforUser($users['rowid'], $val['rowid']), 5);
 					}
 
 					//var_dump($users['rowid'].' - '.$val['rowid']);
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index de0d14ebd49..a3563b839e4 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2019-2024  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2024		Benjamin Falière			<benjamin.faliere@altairis.fr>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -129,18 +129,18 @@ $fieldstosearchall = array(
 );
 
 $arrayfields = array(
-	'cp.ref' => array('label' => $langs->trans("Ref"), 'checked' => 1),
-	'cp.fk_user' => array('label' => $langs->trans("Employee"), 'checked' => 1, 'position' => 20),
-	'cp.fk_validator' => array('label' => $langs->trans("ValidatorCP"), 'checked' => 1, 'position' => 30),
-	'cp.fk_type' => array('label' => $langs->trans("Type"), 'checked' => 1, 'position' => 35),
-	'duration' => array('label' => $langs->trans("NbUseDaysCPShort"), 'checked' => 1, 'position' => 38),
-	'cp.date_debut' => array('label' => $langs->trans("DateStart"), 'checked' => 1, 'position' => 40),
-	'cp.date_fin' => array('label' => $langs->trans("DateEnd"), 'checked' => 1, 'position' => 42),
-	'cp.date_valid' => array('label' => $langs->trans("DateValidation"), 'checked' => 1, 'position' => 60),
-	'cp.date_approval' => array('label' => $langs->trans("DateApprove"), 'checked' => 1, 'position' => 70),
-	'cp.date_create' => array('label' => $langs->trans("DateCreation"), 'checked' => 0, 'position' => 500),
-	'cp.tms' => array('label' => $langs->trans("DateModificationShort"), 'checked' => 0, 'position' => 501),
-	'cp.statut' => array('label' => $langs->trans("Status"), 'checked' => 1, 'position' => 1000),
+	'cp.ref' => array('label' => $langs->trans("Ref"), 'checked' => '1'),
+	'cp.fk_user' => array('label' => $langs->trans("Employee"), 'checked' => '1', 'position' => 20),
+	'cp.fk_validator' => array('label' => $langs->trans("ValidatorCP"), 'checked' => '1', 'position' => 30),
+	'cp.fk_type' => array('label' => $langs->trans("Type"), 'checked' => '1', 'position' => 35),
+	'duration' => array('label' => $langs->trans("NbUseDaysCPShort"), 'checked' => '1', 'position' => 38),
+	'cp.date_debut' => array('label' => $langs->trans("DateStart"), 'checked' => '1', 'position' => 40),
+	'cp.date_fin' => array('label' => $langs->trans("DateEnd"), 'checked' => '1', 'position' => 42),
+	'cp.date_valid' => array('label' => $langs->trans("DateValidation"), 'checked' => '1', 'position' => 60),
+	'cp.date_approval' => array('label' => $langs->trans("DateApprove"), 'checked' => '1', 'position' => 70),
+	'cp.date_create' => array('label' => $langs->trans("DateCreation"), 'checked' => '0', 'position' => 500),
+	'cp.tms' => array('label' => $langs->trans("DateModificationShort"), 'checked' => '0', 'position' => 501),
+	'cp.statut' => array('label' => $langs->trans("Status"), 'checked' => '1', 'position' => 1000),
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -364,7 +364,7 @@ if (!$user->hasRight('holiday', 'readall')) {
 	$sql .= ' AND cp.fk_user IN ('.$db->sanitize(implode(',', $childids)).')';
 }
 if ($id > 0) {
-	$sql .= " AND cp.fk_user IN (".$db->sanitize($id).")";
+	$sql .= " AND cp.fk_user = ".((int) $id);
 }
 
 // Add where from extra fields
@@ -627,7 +627,7 @@ if (!empty($arrayfields['cp.fk_user']['checked'])) {
 	}
 
 	print '<td class="liste_titre maxwidthonsmartphone left">';
-	print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, $include, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth125');
+	print $form->select_dolusers($search_employee, "search_employee", 1, null, $disabled, $include, '', '0', 0, 0, $morefilter, 0, '', 'maxwidth125');
 	print '</td>';
 }
 
@@ -642,7 +642,7 @@ if (!empty($arrayfields['cp.fk_validator']['checked'])) {
 		foreach ($valideurobjects as $val) {
 			$valideurarray[$val] = $val;
 		}
-		print $form->select_dolusers($search_valideur, "search_valideur", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth125');
+		print $form->select_dolusers($search_valideur, "search_valideur", 1, null, 0, $valideurarray, '', '0', 0, 0, $morefilter, 0, '', 'maxwidth125');
 		print '</td>';
 	} else {
 		print '<td class="liste_titre">&nbsp;</td>';
@@ -886,6 +886,7 @@ if ($id && !$user->hasRight('holiday', 'readall') && !in_array($id, $childids))
 
 			$holidaystatic->fk_type = empty($typeleaves[$obj->fk_type]['rowid']) ? 0 : $typeleaves[$obj->fk_type]['rowid'];
 
+			$arraydata = array();
 			// Output Kanban
 			if ($massactionbutton || $massaction) {
 				$selected = 0;
@@ -1127,7 +1128,7 @@ function showMyBalance($holiday, $user_id)
 		$nb_holiday += $nb_type;
 		$out .= ' - '.$val['label'].': <strong>'.($nb_type ? price2num($nb_type) : 0).'</strong><br>';
 	}
-	$out = $langs->trans('SoldeCPUser', round($nb_holiday, 5)).'<br>'.$out;
+	$out = $langs->trans('SoldeCPUser', (string) round($nb_holiday, 5)).'<br>'.$out;
 
 	return $out;
 }
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index b1be5ddcff2..08f56f3dafa 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2018-2024	Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2020		Tobias Sekan				<tobias.sekan@startmail.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -132,16 +133,16 @@ if (empty($reshook)) {
 }
 
 $arrayfields = array(
-	'cp.ref' => array('label' => 'Ref', 'checked' => 1, 'position' => 5),
-	'cp.fk_type' => array('label' => 'Type', 'checked' => 1, 'position' => 10),
-	'cp.fk_user' => array('label' => 'Employee', 'checked' => 1, 'position' => 20),
-	'cp.date_debut' => array('label' => 'DateDebCP', 'checked' => -1, 'position' => 30),
-	'cp.date_fin' => array('label' => 'DateFinCP', 'checked' => -1, 'position' => 32),
-	'used_days' => array('label' => 'NbUseDaysCPShort', 'checked' => -1, 'position' => 34),
-	'date_start_month' => array('label' => 'DateStartInMonth', 'checked' => 1, 'position' => 50),
-	'date_end_month' => array('label' => 'DateEndInMonth', 'checked' => 1, 'position' => 52),
-	'used_days_month' => array('label' => 'NbUseDaysCPShortInMonth', 'checked' => 1, 'position' => 54),
-	'cp.description' => array('label' => 'DescCP', 'checked' => -1, 'position' => 800),
+	'cp.ref' => array('label' => 'Ref', 'checked' => '1', 'position' => 5),
+	'cp.fk_type' => array('label' => 'Type', 'checked' => '1', 'position' => 10),
+	'cp.fk_user' => array('label' => 'Employee', 'checked' => '1', 'position' => 20),
+	'cp.date_debut' => array('label' => 'DateDebCP', 'checked' => '-1', 'position' => 30),
+	'cp.date_fin' => array('label' => 'DateFinCP', 'checked' => '-1', 'position' => 32),
+	'used_days' => array('label' => 'NbUseDaysCPShort', 'checked' => '-1', 'position' => 34),
+	'date_start_month' => array('label' => 'DateStartInMonth', 'checked' => '1', 'position' => 50),
+	'date_end_month' => array('label' => 'DateEndInMonth', 'checked' => '1', 'position' => 52),
+	'used_days_month' => array('label' => 'NbUseDaysCPShortInMonth', 'checked' => '1', 'position' => 54),
+	'cp.description' => array('label' => 'DescCP', 'checked' => '-1', 'position' => 800),
 );
 
 
@@ -282,7 +283,7 @@ if (!empty($arrayfields['cp.fk_type']['checked'])) {
 // Filter: Employee
 if (!empty($arrayfields['cp.fk_user']['checked'])) {
 	print '<th class="liste_titre">';
-	print $form->select_dolusers($search_employee, "search_employee", 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth100');
+	print $form->select_dolusers($search_employee, "search_employee", 1, null, 0, '', '', '0', 0, 0, '', 0, '', 'maxwidth100');
 	print '</th>';
 }
 
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index a6a4aae0481..761edc5c8f6 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2020		Tobias Sekan				<tobias.sekan@startmail.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -167,15 +168,15 @@ if (empty($reshook)) {
 
 // Definition of fields for lists
 $arrayfields = array(
-	'cpl.rowid' => array('label' => "ID", 'checked' => 1),
-	'cpl.date_action' => array('label' => "Date", 'checked' => 1),
-	'cpl.fk_user_action' => array('label' => "ActionByCP", 'checked' => 1),
-	'cpl.fk_user_update' => array('label' => "UserUpdateCP", 'checked' => 1),
-	'cpl.type_action' => array('label' => "Description", 'checked' => 1),
-	'cpl.fk_type' => array('label' => "Type", 'checked' => 1),
-	'cpl.prev_solde' => array('label' => "PrevSoldeCP", 'checked' => 1),
-	'variation' => array('label' => "Variation", 'checked' => 1),
-	'cpl.new_solde' => array('label' => "NewSoldeCP", 'checked' => 1),
+	'cpl.rowid' => array('label' => "ID", 'checked' => '1'),
+	'cpl.date_action' => array('label' => "Date", 'checked' => '1'),
+	'cpl.fk_user_action' => array('label' => "ActionByCP", 'checked' => '1'),
+	'cpl.fk_user_update' => array('label' => "UserUpdateCP", 'checked' => '1'),
+	'cpl.type_action' => array('label' => "Description", 'checked' => '1'),
+	'cpl.fk_type' => array('label' => "Type", 'checked' => '1'),
+	'cpl.prev_solde' => array('label' => "PrevSoldeCP", 'checked' => '1'),
+	'variation' => array('label' => "Variation", 'checked' => '1'),
+	'cpl.new_solde' => array('label' => "NewSoldeCP", 'checked' => '1'),
 );
 
 
@@ -363,14 +364,14 @@ if (!empty($arrayfields['cpl.fk_user_action']['checked'])) {
 	}
 
 	print '<td class="liste_titre">';
-	print $form->select_dolusers($search_validator, "search_validator", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
+	print $form->select_dolusers($search_validator, "search_validator", 1, null, 0, $valideurarray, '', '0', 0, 0, $morefilter, 0, '', 'maxwidth200');
 	print '</td>';
 }
 
 // Filter: User
 if (!empty($arrayfields['cpl.fk_user_update']['checked'])) {
 	print '<td class="liste_titre">';
-	print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, $include, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
+	print $form->select_dolusers($search_employee, "search_employee", 1, null, $disabled, $include, '', '0', 0, 0, $morefilter, 0, '', 'maxwidth200');
 	print '</td>';
 }
 
@@ -475,14 +476,14 @@ while ($i < min($num, $limit)) {
 		break;
 	}
 
-	$holidaylogstatic->id = $obj['rowid'];
-	$holidaylogstatic->date = $obj['date_action'];
-	$holidaylogstatic->validator = $obj['fk_user_action'];
-	$holidaylogstatic->employee = $obj['fk_user_update'];
-	$holidaylogstatic->description = $obj['type_action'];
-	$holidaylogstatic->type = $obj['fk_type'];
-	$holidaylogstatic->balance_previous = $obj['prev_solde'];
-	$holidaylogstatic->balance_new = $obj['new_solde'];
+	$holidaylogstatic->id = (int) $obj['rowid'];
+	$holidaylogstatic->date = (string) $obj['date_action'];
+	$holidaylogstatic->validator = (int) $obj['fk_user_action'];
+	$holidaylogstatic->employee = (int) $obj['fk_user_update'];
+	$holidaylogstatic->description = (string) $obj['type_action'];
+	$holidaylogstatic->type = (int) $obj['fk_type'];
+	$holidaylogstatic->balance_previous = (float) $obj['prev_solde'];
+	$holidaylogstatic->balance_new = (float) $obj['new_solde'];
 
 	print '<tr class="oddeven">';
 

From 749296b6e136e6b18778fe564876b7b605ba1a07 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 3 Feb 2025 01:07:08 +0100
Subject: [PATCH 416/602] Qual: Fix phan notices (hrm)

# Qual: Fix phan notices (hrm)
---
 dev/tools/phan/baseline.txt                   | 34 +++++++------------
 htdocs/core/class/html.form.class.php         |  2 +-
 .../modules/hrm/mod_evaluation_advanced.php   |  6 ++--
 .../modules/hrm/mod_evaluation_standard.php   |  4 +--
 .../core/modules/hrm/modules_evaluation.php   |  4 +--
 htdocs/hrm/admin/admin_hrm.php                |  5 +--
 htdocs/hrm/class/establishment.class.php      |  4 +--
 htdocs/hrm/class/evaluation.class.php         |  4 +--
 htdocs/hrm/class/job.class.php                |  4 +--
 htdocs/hrm/class/position.class.php           |  4 +--
 htdocs/hrm/class/skill.class.php              |  4 +--
 htdocs/hrm/compare.php                        |  6 ++--
 htdocs/hrm/core/tpl/objectline_view.tpl.php   |  3 +-
 htdocs/hrm/establishment/card.php             |  9 ++---
 htdocs/hrm/evaluation_list.php                | 25 +++++++-------
 htdocs/hrm/job_agenda.php                     |  3 +-
 htdocs/hrm/job_list.php                       | 21 ++++++------
 htdocs/hrm/position_list.php                  | 25 +++++++-------
 htdocs/hrm/skill_card.php                     |  4 +--
 htdocs/hrm/skill_list.php                     | 33 +++++++++---------
 20 files changed, 100 insertions(+), 104 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 2773f00fb3a..efc4c42240a 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,13 +9,13 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 3760+ occurrences
+    // PhanTypeMismatchArgument : 3730+ occurrences
     // PhanUndeclaredProperty : 540+ occurrences
-    // PhanTypeMismatchArgumentNullable : 460+ occurrences
+    // PhanTypeMismatchArgumentNullable : 450+ occurrences
     // PhanUndeclaredGlobalVariable : 190+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 180+ occurrences
     // PhanPossiblyUndeclaredGlobalVariable : 180+ occurrences
-    // PhanTypeMismatchArgumentProbablyReal : 150+ occurrences
+    // PhanTypeMismatchArgumentProbablyReal : 140+ occurrences
     // PhanTypeMismatchProperty : 130+ occurrences
     // PhanPluginUnknownArrayMethodParamType : 110+ occurrences
     // PhanRedefineFunction : 45+ occurrences
@@ -28,11 +28,11 @@ return [
     // PhanTypeComparisonFromArray : 10+ occurrences
     // PhanUndeclaredMethod : 10+ occurrences
     // PhanPluginUnknownObjectMethodCall : 8 occurrences
-    // PhanEmptyForeach : 7 occurrences
     // PhanPluginEmptyStatementIf : 7 occurrences
     // PhanPluginSuspiciousParamPosition : 7 occurrences
     // PhanPluginDuplicateExpressionBinaryOp : 6 occurrences
     // PhanTypeArraySuspiciousNull : 6 occurrences
+    // PhanEmptyForeach : 5 occurrences
     // PhanParamTooMany : 5 occurrences
     // PhanPluginBothLiteralsBinaryOp : 4 occurrences
     // PhanPluginDuplicateArrayKey : 4 occurrences
@@ -630,27 +630,17 @@ return [
         'htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/holiday/card_group.php' => ['PhanTypeMismatchArgument'],
         'htdocs/holiday/list.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/holiday/month_report.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/hrm/admin/admin_hrm.php' => ['PhanEmptyForeach'],
-        'htdocs/hrm/class/establishment.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/hrm/class/evaluation.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/hrm/class/evaluationdet.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/hrm/class/job.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/hrm/class/position.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/hrm/class/skill.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/hrm/class/skilldet.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/hrm/class/skillrank.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/hrm/compare.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/hrm/core/tpl/objectline_view.tpl.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/hrm/establishment/card.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/hrm/class/evaluationdet.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/hrm/class/job.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/hrm/class/position.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/hrm/class/skill.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/hrm/class/skilldet.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/hrm/class/skillrank.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/hrm/core/tpl/objectline_view.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/hrm/evaluation_card.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/hrm/evaluation_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/hrm/job_agenda.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/hrm/job_card.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/hrm/job_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/hrm/position_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
-        'htdocs/hrm/skill_card.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/hrm/skill_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/hrm/skill_card.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/imports/emptyexample.php' => ['PhanRedefineFunction', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/imports/import.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/index.php' => ['PhanTypeMismatchArgument'],
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e95e401aaf0..b5d8bb8b867 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -10434,7 +10434,7 @@ class Form
 	 * @param string 	$imagesize 					'mini', 'small' or '' (original)
 	 * @param int<0,1>	$addlinktofullsize 			Add link to fullsize image
 	 * @param int<0,1>	$cache 						1=Accept to use image in cache
-	 * @param string 	$forcecapture 				'', 'user' or 'environment'. Force parameter capture on HTML input file element to ask a smartphone to allow to open camera to take photo. Auto if ''.
+	 * @param ''|'user'|'environment' 	$forcecapture 	'', 'user' or 'environment'. Force parameter capture on HTML input file element to ask a smartphone to allow to open camera to take photo. Auto if ''.
 	 * @param int<0,1>	$noexternsourceoverwrite 	No overwrite image with extern source (like 'gravatar' or other module)
 	 * @return string                            	HTML code to output photo
 	 * @see getImagePublicURLOfObject()
diff --git a/htdocs/core/modules/hrm/mod_evaluation_advanced.php b/htdocs/core/modules/hrm/mod_evaluation_advanced.php
index 434512e1cb1..0d363412797 100644
--- a/htdocs/core/modules/hrm/mod_evaluation_advanced.php
+++ b/htdocs/core/modules/hrm/mod_evaluation_advanced.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
  * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  * Copyright (C) 2019-2024  Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/modules/hrm/modules_evaluation.php';
 
 
 /**
- *	Class to manage customer Bom numbering rules advanced
+ *	Class to manage customer evaluation numbering rules advanced
  */
 class mod_evaluation_advanced extends ModeleNumRefEvaluation
 {
@@ -125,7 +125,7 @@ class mod_evaluation_advanced extends ModeleNumRefEvaluation
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param  Evaluation		$object		Object we need next value for
+	 *  @param  Evaluation|EvaluationLine|Job|Position|Skill|Skilldet|SkillRank	$object		Object	$object		Object we need next value for
 	 *  @return string|int<-1,0>			Value if OK, <=0 if KO
 	 */
 	public function getNextValue($object)
diff --git a/htdocs/core/modules/hrm/mod_evaluation_standard.php b/htdocs/core/modules/hrm/mod_evaluation_standard.php
index 70a65e99913..7cafb0fde53 100644
--- a/htdocs/core/modules/hrm/mod_evaluation_standard.php
+++ b/htdocs/core/modules/hrm/mod_evaluation_standard.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024-2025  Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -122,7 +122,7 @@ class mod_evaluation_standard extends ModeleNumRefEvaluation
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param  Evaluation		$object		Object we need next value for
+	 *  @param  Evaluation|EvaluationLine|Job|Position|Skill|Skilldet|SkillRank	$object		Object	$object		Object we need next value for
 	 *  @return string|int<-1,0>			Value if OK, <=0 if KO
 	 */
 	public function getNextValue($object)
diff --git a/htdocs/core/modules/hrm/modules_evaluation.php b/htdocs/core/modules/hrm/modules_evaluation.php
index 02258ad5fa3..230aa8cd808 100644
--- a/htdocs/core/modules/hrm/modules_evaluation.php
+++ b/htdocs/core/modules/hrm/modules_evaluation.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2012      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -86,7 +86,7 @@ abstract class ModeleNumRefEvaluation extends CommonNumRefGenerator
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param  Evaluation		$object		Object we need next value for
+	 *  @param  Evaluation|EvaluationLine|Job|Position|Skill|Skilldet|SkillRank	$object		Object we need next value for
 	 *  @return string|int<-1,0>			Value if OK, <=0 if KO
 	 */
 	abstract public function getNextValue($object);
diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php
index 8d6e2be1a95..f5baec33bc6 100644
--- a/htdocs/hrm/admin/admin_hrm.php
+++ b/htdocs/hrm/admin/admin_hrm.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015 		Alexandre Spangaro <aspangaro@open-dsi.fr>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -70,7 +71,7 @@ if (empty($permissiontoread)) {
 if ($action == 'update') {
 	$error = 0;
 
-	foreach ($list as $constname) {
+	foreach ($list as $constname) {  // @phan-suppress-current-line PhanEmptyForeach
 		$constvalue = GETPOST($constname, 'alpha');
 
 		if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
@@ -117,7 +118,7 @@ print '<tr class="liste_titre">';
 print '<td colspan="3">'.$langs->trans('Parameters').'</td>';
 print "</tr>\n";
 
-foreach ($list as $key) {
+foreach ($list as $key) {  // @phan-suppress-current-line PhanEmptyForeach
 	print '<tr class="oddeven value">';
 
 	// Param
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index e81a051e9e0..d37d98de350 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2015		Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -227,7 +227,7 @@ class Establishment extends CommonObject
 		} else {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'establishment');
 
-			$sql = 'UPDATE '.MAIN_DB_PREFIX."establishment SET ref = '".$this->db->escape($this->id)."'";
+			$sql = 'UPDATE '.MAIN_DB_PREFIX."establishment SET ref = '".$this->db->escape((string) $this->id)."'";
 			$sql .= " WHERE rowid = ".((int) $this->id);
 			$this->db->query($sql);
 
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 51b0c78ed3a..060ebb80781 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -1057,7 +1057,7 @@ class Evaluation extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 1377ad1db43..ab637ea411e 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2021 	Jean-Pascal BOUDET  <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 	Grégory BLEMAND     <gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2024	Frédéric France     <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW				<mdeweerd@users.noreply.github.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
@@ -1046,7 +1046,7 @@ class Job extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 2059a1d4ff5..2bac261ec4d 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -1119,7 +1119,7 @@ class Position extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index 9c8239465aa..fea3035c32f 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -1123,7 +1123,7 @@ class Skill extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>		$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/hrm/compare.php b/htdocs/hrm/compare.php
index 89eb1f374b5..3a06e903ab2 100644
--- a/htdocs/hrm/compare.php
+++ b/htdocs/hrm/compare.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2021		Jean-Pascal BOUDET			<jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021		Grégory BLEMAND				<gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -295,7 +295,6 @@ $db->close();
 
 
 /**
- *
  * 	Return a html list element with diff  between required rank  and user rank
  *
  * 		@param array<int,stdClass> $TMergedSkills skill list with all rate to add good picto
@@ -496,7 +495,7 @@ function displayUsersListWithPicto(&$TUser, $fk_usergroup = 0, $namelist = 'list
 			}
 
 			$out .= '<li fk_user="' . $user->id . '" class="' . $class . '">
-		      ' . $form->showphoto('userphoto', $user, 0, 0, 0, 'photoref', 'small', 1, 0, 1) . '
+		      ' . $form->showphoto('userphoto', $user, 0, 0, 0, 'photoref', 'small', 1, 0, '', 1) . '
 		      <h3>' . $name . '</h3>
 		      <p>' . $desc . '</p>
 		    </li>';
@@ -510,7 +509,6 @@ function displayUsersListWithPicto(&$TUser, $fk_usergroup = 0, $namelist = 'list
 
 
 /**
- *
  * 		Allow to get skill(s) of a user
  *
  * 		@param int[] $TUser array of employees we need to get skills
diff --git a/htdocs/hrm/core/tpl/objectline_view.tpl.php b/htdocs/hrm/core/tpl/objectline_view.tpl.php
index 2fb438a9f55..47ac29016b3 100644
--- a/htdocs/hrm/core/tpl/objectline_view.tpl.php
+++ b/htdocs/hrm/core/tpl/objectline_view.tpl.php
@@ -72,6 +72,7 @@ $coldisplay = 0;
 <?php } ?>
 	<td class="linecollabel"><?php $coldisplay++; ?><div id="line_<?php print $line->id; ?>"></div>
 <?php
+$skill = null;
 $resSkill = 0;
 if ($line->fk_skill > 0) {
 	$skill = new Skill($this->db);
@@ -84,7 +85,7 @@ if ($line->fk_skill > 0) {
 	</td>
 	<td>
 <?php
-if ($line->fk_skill > 0) {
+if ($line->fk_skill > 0 && $skill !== null) {
 	print $skill->getNomUrl(1);
 }
 ?>
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index edaa432226a..6fe9db3088a 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015      Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -49,8 +50,8 @@ $id = GETPOSTINT('id');
 
 // List of status
 static $tmpstatus2label = array(
-		'0'=>'CloseEtablishment',
-		'1'=>'OpenEtablishment'
+		'0' => 'CloseEtablishment',
+		'1' => 'OpenEtablishment'
 );
 $status2label = array('');
 foreach ($tmpstatus2label as $key => $val) {
@@ -242,7 +243,7 @@ if ($action == 'create') {
 	print '<tr>';
 	print '<td>'.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).'</td>';
 	print '<td class="maxwidthonsmartphone">';
-	print $form->select_country(GETPOSTISSET('country_id') ? GETPOSTINT('country_id') : ($object->country_id ? $object->country_id : $mysoc->country_id), 'country_id');
+	print $form->select_country((string) (GETPOSTISSET('country_id') ? GETPOSTINT('country_id') : ($object->country_id ? $object->country_id : $mysoc->country_id)), 'country_id');
 	if ($user->admin) {
 		print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 	}
@@ -326,7 +327,7 @@ if ((!empty($id) || !empty($ref)) && $action == 'edit') {
 			// Country
 			print '<tr><td>'.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).'</td>';
 			print '<td class="maxwidthonsmartphone">';
-			print $form->select_country($object->country_id, 'country_id');
+			print $form->select_country((string) $object->country_id, 'country_id');
 			if ($user->admin) {
 				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php
index 75af2891413..15bc4d690ad 100644
--- a/htdocs/hrm/evaluation_list.php
+++ b/htdocs/hrm/evaluation_list.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -277,7 +278,7 @@ foreach ($search as $key => $val) {
 		}
 	} else {
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
-			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $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.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
@@ -294,7 +295,7 @@ if ($search_all) {
 }
 
 if (empty($permissiontoreadall)) {
-	$sql.= " AND t.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
+	$sql .= " AND t.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
 }
 
 //$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
@@ -454,8 +455,8 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 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 .= 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_buildpath('/hrm/evaluation_card.php', 1).'?action=create', '', $permissiontoadd);
 
@@ -543,7 +544,7 @@ foreach ($object->fields as $key => $val) {
 		} 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, 'minwidth100imp maxwidth125', 2);
+			print $formadmin->select_language($search[$key], 'search_lang', 0, array(), 1, 0, 0, 'minwidth100imp maxwidth125', 2);
 		} else {
 			print '<input type="text" class="flat maxwidth'.($val['type'] == 'integer' ? '50' : '75').'" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
@@ -554,7 +555,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -597,7 +598,7 @@ foreach ($object->fields as $key => $val) {
 // 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, 'totalarray'=>&$totalarray);
+$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
@@ -658,7 +659,7 @@ while ($i < $imaxinloop) {
 				$selected = 1;
 			}
 		}
-		print $object->getKanbanView('', array('user'=>$userstatic->getNomUrl(-1), 'job'=>$job->getNomUrl(1), 'selected' => $selected));
+		print $object->getKanbanView('', array('user' => $userstatic->getNomUrl(-1), 'job' => $job->getNomUrl(1), 'selected' => $selected));
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
@@ -703,13 +704,13 @@ while ($i < $imaxinloop) {
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
 				print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield) && !is_numeric($object->$key)) {
-					print ' title="'.dol_escape_htmltag($object->$key).'"';
+					print ' title="'.dol_escape_htmltag((string) $object->$key).'"';
 				}
 				print '>';
 				if ($key == 'status') {
 					print $object->getLibStatut(5);
 				} elseif ($key == 'rowid') {
-					print $object->showOutputField($val, $key, $object->id, '');
+					print $object->showOutputField($val, $key, (string) $object->id, '');
 				} elseif ($key == 'label') {
 					print $object->showOutputField($val, $key, $object->label, '');
 				} else {
@@ -736,7 +737,7 @@ while ($i < $imaxinloop) {
 		// 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);
+		$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;
 		// Action column
@@ -777,7 +778,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/hrm/job_agenda.php b/htdocs/hrm/job_agenda.php
index de7cf34b08b..a29e4f2e6e1 100644
--- a/htdocs/hrm/job_agenda.php
+++ b/htdocs/hrm/job_agenda.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -202,9 +203,9 @@ if ($object->id > 0) {
 	}
 
 
+	$newcardbutton = '';
 	if (isModEnabled('agenda')) {
 		if ($user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda', 'allactions', 'create')) {
-			$newcardbutton = '';
 			$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
 		}
 	}
diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php
index b61195bde8b..499cc4ddc69 100644
--- a/htdocs/hrm/job_list.php
+++ b/htdocs/hrm/job_list.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -268,7 +269,7 @@ foreach ($search as $key => $val) {
 		}
 	} else {
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
-			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $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.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
@@ -432,8 +433,8 @@ 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 .= 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_buildpath('/hrm/job_card.php', 1).'?action=create', '', $permissiontoadd);
 
@@ -521,7 +522,7 @@ foreach ($object->fields as $key => $val) {
 		} 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, 'minwidth100imp maxwidth125', 2);
+			print $formadmin->select_language($search[$key], 'search_lang', 0, array(), 1, 0, 0, 'minwidth100imp maxwidth125', 2);
 		} else {
 			print '<input type="text" class="flat maxwidth'.($val['type'] == 'integer' ? '50' : '75').'" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
@@ -532,7 +533,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -573,7 +574,7 @@ foreach ($object->fields as $key => $val) {
 // 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, 'totalarray'=>&$totalarray);
+$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
 print $hookmanager->resPrint;
 // Action column
@@ -670,13 +671,13 @@ while ($i < $imaxinloop) {
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
 				print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield) && !is_numeric($object->$key)) {
-					print ' title="'.dol_escape_htmltag($object->$key).'"';
+					print ' title="'.dol_escape_htmltag((string) $object->$key).'"';
 				}
 				print '>';
 				if ($key == 'status') {
 					print $object->getLibStatut(5);
 				} elseif ($key == 'rowid') {
-					print $object->showOutputField($val, $key, $object->id, '');
+					print $object->showOutputField($val, $key, (string) $object->id, '');
 				} elseif ($key == 'label') {
 					print $object->getNomUrl(1);
 				} else {
@@ -703,7 +704,7 @@ while ($i < $imaxinloop) {
 		// 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);
+		$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
 		print $hookmanager->resPrint;
 		// Action column
@@ -745,7 +746,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index 3db770782cc..9ece241a231 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2021 Jean-Pascal BOUDET		<jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND 			<gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2024 Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW					<mdeweerd@users.noreply.github.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
@@ -279,7 +280,7 @@ foreach ($search as $key => $val) {
 		}
 	} else {
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
-			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $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.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
@@ -447,8 +448,8 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 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 .= 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_buildpath('/hrm/position.php', 1).'?action=create', '', $permissiontoadd);
 
@@ -536,7 +537,7 @@ foreach ($object->fields as $key => $val) {
 		} 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, 'minwidth100imp maxwidth125', 2);
+			print $formadmin->select_language($search[$key], 'search_lang', 0, array(), 1, 0, 0, 'minwidth100imp maxwidth125', 2);
 		} else {
 			print '<input type="text" class="flat maxwidth'.($val['type'] == 'integer' ? '50' : '75').'" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
@@ -547,7 +548,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -588,7 +589,7 @@ foreach ($object->fields as $key => $val) {
 // 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, 'totalarray'=>&$totalarray);
+$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
 print $hookmanager->resPrint;
 // Action column
@@ -642,7 +643,7 @@ while ($i < $imaxinloop) {
 		$jobstatic->status = $obj->job_status;
 
 		$userstatic->id = $obj->fk_user;
-		$userstatic->ref = $obj->fk_user;
+		$userstatic->ref = (string) $obj->fk_user;
 		$userstatic->firstname = $obj->firstname;
 		$userstatic->lastname = $obj->lastname;
 		$userstatic->email = $obj->email;
@@ -659,7 +660,7 @@ while ($i < $imaxinloop) {
 				$selected = 1;
 			}
 		}
-		print $object->getKanbanView('', array('user' => $userstatic->getNomUrl(-1), 'job'=> $jobstatic->getNomUrl(1), 'selected' => $selected));
+		print $object->getKanbanView('', array('user' => $userstatic->getNomUrl(-1), 'job' => $jobstatic->getNomUrl(1), 'selected' => $selected));
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
@@ -702,13 +703,13 @@ while ($i < $imaxinloop) {
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
 				print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield) && !is_numeric($object->$key)) {
-					print ' title="'.dol_escape_htmltag($object->$key).'"';
+					print ' title="'.dol_escape_htmltag((string) $object->$key).'"';
 				}
 				print '>';
 				if ($key == 'status') {
 					print $object->getLibStatut(5);
 				} elseif ($key == 'rowid') {
-					print $object->showOutputField($val, $key, $object->id, '');
+					print $object->showOutputField($val, $key, (string) $object->id, '');
 				} else {
 					print $object->showOutputField($val, $key, $object->$key, '');
 				}
@@ -733,7 +734,7 @@ while ($i < $imaxinloop) {
 		// 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);
+		$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
 		print $hookmanager->resPrint;
 		// Action column
@@ -775,7 +776,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/hrm/skill_card.php b/htdocs/hrm/skill_card.php
index 6c4362511ea..fb091e8f8da 100644
--- a/htdocs/hrm/skill_card.php
+++ b/htdocs/hrm/skill_card.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2023-2024  Frédéric France     <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -792,7 +792,7 @@ if ($action != "create" && $action != "edit") {
 				if ($key == 'status') {
 					print $objectline->getLibStatut(5);
 				} elseif ($key == 'rowid') {
-					print $objectline->showOutputField($val, $key, $objectline->id, '');
+					print $objectline->showOutputField($val, $key, (string) $objectline->id, '');
 					// ajout pencil
 					print '<a class="timeline-btn" href="' . DOL_MAIN_URL_ROOT . '/comm/action/skilldet_card.php?action=edit&id=' . $objectline->id . '"><i class="fa fa-pencil" title="' . $langs->trans("Modify") . '" ></i></a>';
 				} else {
diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php
index 89be7098c24..646bfd41388 100644
--- a/htdocs/hrm/skill_list.php
+++ b/htdocs/hrm/skill_list.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -117,7 +118,7 @@ foreach ($object->fields as $key => $val) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
-$parameters = array('fieldstosearchall'=>$fieldstosearchall);
+$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'];
@@ -132,11 +133,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval((string) $val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -283,7 +284,7 @@ foreach ($search as $key => $val) {
 		}
 	} else {
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
-			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $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.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
@@ -442,8 +443,8 @@ 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 .= 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);
 
@@ -532,7 +533,7 @@ foreach ($object->fields as $key => $val) {
 		} 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, 'minwidth100imp maxwidth125', 2);
+			print $formadmin->select_language($search[$key], 'search_lang', 0, array(), 1, 0, 0, 'minwidth100imp maxwidth125', 2);
 		} else {
 			print '<input type="text" class="flat maxwidth'.($val['type'] == 'integer' ? '50' : '75').'" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
@@ -543,7 +544,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -586,7 +587,7 @@ foreach ($object->fields as $key => $val) {
 // 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, 'totalarray'=>&$totalarray);
+$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
@@ -688,13 +689,13 @@ while ($i < $imaxinloop) {
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
 				print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield) && !is_numeric($object->$key)) {
-					print ' title="'.dol_escape_htmltag($object->$key).'"';
+					print ' title="'.dol_escape_htmltag((string) $object->$key).'"';
 				}
 				print '>';
 				if ($key == 'status') {
 					print $object->getLibStatut(5);
 				} elseif ($key == 'rowid') {
-					print $object->showOutputField($val, $key, $object->id, '');
+					print $object->showOutputField($val, $key, (string) $object->id, '');
 				} elseif ($key == 'label') {
 					print $object->getNomUrl(1);
 				} else {
@@ -721,7 +722,7 @@ while ($i < $imaxinloop) {
 		// 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);
+		$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;
 		// Action column
@@ -762,7 +763,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From 71e1d9ff10c455105b32b94f437eb7e76ee1416c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 3 Feb 2025 16:32:06 +0100
Subject: [PATCH 417/602] add missing translation

---
 dev/translation/ignore_translation_keys.lst | 1 -
 htdocs/langs/en_US/products.lang            | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst
index 9a34c97bc3f..6f590c41f3e 100644
--- a/dev/translation/ignore_translation_keys.lst
+++ b/dev/translation/ignore_translation_keys.lst
@@ -568,7 +568,6 @@ NbOfOrder
 NbOfSendingsByMonth
 NbOfTicket
 NeedRefresh
-NetMeasure
 Network
 NewAdherent
 NewAdherentAddress
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index a948c81da99..84cfffe0780 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -326,6 +326,7 @@ TranslatedDescription=Translated description
 TranslatedNote=Translated notes
 ProductWeight=Weight for 1 product
 ProductVolume=Volume for 1 product
+NetMeasure=Net measure
 WeightUnits=Weight unit
 VolumeUnits=Volume unit
 WidthUnits=Width unit

From 6c7fe69582b557c3b9af916d8ef05ae4d30396b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 3 Feb 2025 16:36:35 +0100
Subject: [PATCH 418/602] add missing translation

---
 dev/translation/ignore_translation_keys.lst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst
index 6f590c41f3e..edb528c90de 100644
--- a/dev/translation/ignore_translation_keys.lst
+++ b/dev/translation/ignore_translation_keys.lst
@@ -588,7 +588,6 @@ NoOperations
 NoPasswordGenerationRuleConfigured
 NoReader
 NoRecordedUnpaidInvoices
-NoRecordfound
 NoRecords
 NoRecordsToDisplay
 NoSenderEmailDefined

From fa52f9227062fa6ec09ab2be14f639ca9ccb55e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 3 Feb 2025 16:37:04 +0100
Subject: [PATCH 419/602] add missing translation

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

diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 8dc01195026..783d2b02f6c 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017-2024  Alexandre Spangaro      <aspangaro@easya.solutions>
- * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2023       Joachim Kueter     		<git-jk@bloxera.com>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
@@ -739,7 +739,7 @@ if ($id) {
 		} else {
 			$bankaccountnotfound = 1;
 
-			print '<span class="opacitymedium">'.$langs->trans("NoRecordfound").'</span>';
+			print '<span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span>';
 		}
 		print '</td>';
 		print '</tr>';

From bef5cbc8bcc0f297969e2e581df730b2ead924e3 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 3 Feb 2025 17:01:38 +0100
Subject: [PATCH 420/602] FIX: FEC import

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

diff --git a/htdocs/accountancy/class/accountancyimport.class.php b/htdocs/accountancy/class/accountancyimport.class.php
index abd54516e85..32cb1dc8405 100644
--- a/htdocs/accountancy/class/accountancyimport.class.php
+++ b/htdocs/accountancy/class/accountancyimport.class.php
@@ -132,9 +132,9 @@ class AccountancyImport
 				$sens = 'C';
 			}
 
-			return "'" . $this->db->escape($sens) . "'";
+			return $this->db->escape($sens);
 		}
 
-		return "''";
+		return "";
 	}
 }

From 8c4b624541c14e31b467ef05542afb727419d4ae Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 3 Feb 2025 17:18:14 +0100
Subject: [PATCH 421/602] Debug v21

---
 .../core/modules/project/doc/pdf_baleine.modules.php  |  8 ++++----
 .../core/modules/project/doc/pdf_beluga.modules.php   |  2 +-
 .../modules/project/doc/pdf_timespent.modules.php     |  2 --
 htdocs/core/tpl/card_presend.tpl.php                  | 11 ++++++++++-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index e8c066d72cd..510d123b2f5 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -524,8 +524,6 @@ class pdf_baleine extends ModelePDFProjects
 	 */
 	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
-		global $conf, $mysoc;
-
 		$heightoftitleline = 10;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -547,6 +545,8 @@ class pdf_baleine extends ModelePDFProjects
 		$pdf->SetXY($this->posxlabel, $tab_top + 1);
 		$pdf->MultiCell($this->posxworkload - $this->posxlabel, 3, $outputlangs->transnoentities("Description"), 0, 'L');
 
+		$pdf->SetFont('', '', $default_font_size - 1);
+
 		$pdf->SetXY($this->posxworkload, $tab_top + 1);
 		$pdf->MultiCell($this->posxprogress - $this->posxworkload, 3, $outputlangs->transnoentities("PlannedWorkloadShort"), 0, 'R');
 
@@ -555,11 +555,11 @@ class pdf_baleine extends ModelePDFProjects
 
 		// Date start
 		$pdf->SetXY($this->posxdatestart, $tab_top + 1);
-		$pdf->MultiCell($this->posxdateend - $this->posxdatestart, 3, $outputlangs->trans("Start"), 0, 'C');
+		$pdf->MultiCell($this->posxdateend - $this->posxdatestart, 3, $outputlangs->transnoentities("DateStart"), 0, 'C');
 
 		// Date end
 		$pdf->SetXY($this->posxdateend, $tab_top + 1);
-		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdateend, 3, $outputlangs->trans("End"), 0, 'C');
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdateend, 3, $outputlangs->transnoentities("DateEnd"), 0, 'C');
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 127e07842e3..51ba7d63d1d 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -122,7 +122,7 @@ class pdf_beluga extends ModelePDFProjects
 	 */
 	public function __construct($db)
 	{
-		global $conf, $langs, $mysoc;
+		global $langs, $mysoc;
 
 		// Translations
 		$langs->loadLangs(array("main", "projects", "companies"));
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index dc51b62caab..630eff6d0e0 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -522,8 +522,6 @@ class pdf_timespent extends ModelePDFProjects
 	 */
 	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
-		global $conf, $mysoc;
-
 		$heightoftitleline = 10;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index d29932c2c20..6b526cbbafe 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -54,6 +54,7 @@ if ($action == 'presend') {
 	$titreform = 'SendMail';
 
 	$object->fetchProject();
+
 	$ref = dol_sanitizeFileName($object->ref);
 	if (!in_array($object->element, array('user', 'member'))) {
 		//$fileparams['fullname'] can be filled from the card
@@ -102,17 +103,25 @@ if ($action == 'presend') {
 		$topicmail = $outputlangs->trans($defaulttopic, '__REF__ (__REF_CLIENT__)');
 	}
 
-	// Build document if it not exists
+	// Build document if it does not exists
 	$forcebuilddoc = true;
+	// except for some cases where it can not exists
 	if (in_array($object->element, array('user', 'member'))) {
 		$forcebuilddoc = false;
 	}
 	if ($object->element == 'invoice_supplier' && !getDolGlobalString('INVOICE_SUPPLIER_ADDON_PDF')) {
 		$forcebuilddoc = false;
 	}
+	if ($object->element == 'project' && !getDolGlobalString('PROJECT_ADDON_PDF')) {
+		$forcebuilddoc = false;
+	}
+	if ($object->element == 'project_task' && !getDolGlobalString('PROJECT_TASK_ADDON_PDF')) {
+		$forcebuilddoc = false;
+	}
 	if ($object->element == 'societe' && !getDolGlobalString('COMPANY_ADDON_PDF')) {
 		$forcebuilddoc = false;
 	}
+
 	if ($forcebuilddoc) {    // If there is no default value for supplier invoice, we do not generate file, even if modelpdf was set by a manual generation
 		if ((!$file || !is_readable($file)) && method_exists($object, 'generateDocument')) {
 			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);

From 10ea271a4e35bc55400c54119e4f26374da9e94a Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 3 Feb 2025 18:07:17 +0100
Subject: [PATCH 422/602] Debug v21

---
 htdocs/adherents/class/adherent.class.php | 66 ++++++++++++++++++-----
 htdocs/adherents/list.php                 |  7 ++-
 htdocs/admin/ihm.php                      |  4 +-
 htdocs/core/class/html.form.class.php     |  3 +-
 htdocs/core/lib/usergroups.lib.php        | 12 ++---
 5 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 3f5291e077f..5e84c7496a4 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -317,38 +317,76 @@ class Adherent extends CommonObject
 
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 *  'type' field format:
+	 *  	'integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]',
+	 *  	'select' (list of values are in 'options'. for integer list of values are in 'arrayofkeyval'),
+	 *  	'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter[:CategoryIdType[:CategoryIdList[:SortField]]]]]]',
+	 *  	'chkbxlst:...',
+	 *  	'varchar(x)',
+	 *  	'text', 'text:none', 'html',
+	 *   	'double(24,8)', 'real', 'price', 'stock',
+	 *  	'date', 'datetime', 'timestamp', 'duration',
+	 *  	'boolean', 'checkbox', 'radio', 'array',
+	 *  	'mail', 'phone', 'url', 'password', 'ip'
+	 *		Note: Filter must be a Dolibarr Universal Filter syntax string. Example: "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.status:!=:0) or (t.nature:is:NULL)"
+	 *  'length' the length of field. Example: 255, '24,8'
+	 *  'label' the translation key.
+	 *  'alias' the alias used into some old hard coded SQL requests
+	 *  '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 'getDolGlobalInt("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 recommended 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'
+	 *  'placeholder' to set the placeholder of a varchar field.
+	 *  'help' and 'helplist' 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 like the constructor of the class.
+	 *  '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 you need to validate the field with $this->validateField(). Need MAIN_ACTIVATE_VALIDATION_RESULT.
+	 *  '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.
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
 		'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'default' => '1', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 12, 'index' => 1),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
+		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => 3, 'notnull' => 1, 'position' => 15, 'index' => 1),
 		'ref_ext' => array('type' => 'varchar(128)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 20),
 		'civility' => array('type' => 'varchar(6)', 'label' => 'Civility', 'enabled' => 1, 'visible' => -1, 'position' => 25),
 		'lastname' => array('type' => 'varchar(50)', 'label' => 'Lastname', 'enabled' => 1, 'visible' => 1, 'position' => 30, 'showoncombobox' => 1),
 		'firstname' => array('type' => 'varchar(50)', 'label' => 'Firstname', 'enabled' => 1, 'visible' => 1, 'position' => 35, 'showoncombobox' => 1),
 		'login' => array('type' => 'varchar(50)', 'label' => 'Login', 'enabled' => 1, 'visible' => 1, 'position' => 40),
-		'pass' => array('type' => 'varchar(50)', 'label' => 'Pass', 'enabled' => 1, 'visible' => -1, 'position' => 45),
-		'pass_crypted' => array('type' => 'varchar(128)', 'label' => 'Pass crypted', 'enabled' => 1, 'visible' => -1, 'position' => 50),
+		'pass' => array('type' => 'varchar(50)', 'label' => 'Pass', 'enabled' => 1, 'visible' => 3, 'position' => 45),
+		'pass_crypted' => array('type' => 'varchar(128)', 'label' => 'Pass crypted', 'enabled' => 1, 'visible' => 3, 'position' => 50),
 		'morphy' => array('type' => 'varchar(3)', 'label' => 'MemberNature', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 55),
-		'fk_adherent_type' => array('type' => 'integer', 'label' => 'Fk adherent type', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 60),
+		'fk_adherent_type' => array('type' => 'integer', 'label' => 'MemberType', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 60),
 		'societe' => array('type' => 'varchar(128)', 'label' => 'Societe', 'enabled' => 1, 'visible' => 1, 'position' => 65, 'showoncombobox' => 2),
 		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 1, 'visible' => 1, 'position' => 70),
 		'address' => array('type' => 'text', 'label' => 'Address', 'enabled' => 1, 'visible' => -1, 'position' => 75),
 		'zip' => array('type' => 'varchar(10)', 'label' => 'Zip', 'enabled' => 1, 'visible' => -1, 'position' => 80),
 		'town' => array('type' => 'varchar(50)', 'label' => 'Town', 'enabled' => 1, 'visible' => -1, 'position' => 85),
-		'state_id' => array('type' => 'integer', 'label' => 'State id', 'enabled' => 1, 'visible' => -1, 'position' => 90),
+		'state_id' => array('type' => 'integer', 'label' => 'State', 'enabled' => 1, 'visible' => -1, 'position' => 90),
 		'country' => array('type' => 'integer:Ccountry:core/class/ccountry.class.php', 'label' => 'Country', 'enabled' => 1, 'visible' => 1, 'position' => 95),
 		'phone' => array('type' => 'varchar(30)', 'label' => 'Phone', 'enabled' => 1, 'visible' => -1, 'position' => 115),
 		'phone_perso' => array('type' => 'varchar(30)', 'label' => 'Phone perso', 'enabled' => 1, 'visible' => -1, 'position' => 120),
 		'phone_mobile' => array('type' => 'varchar(30)', 'label' => 'Phone mobile', 'enabled' => 1, 'visible' => -1, 'position' => 125),
 		'email' => array('type' => 'varchar(255)', 'label' => 'Email', 'enabled' => 1, 'visible' => 1, 'position' => 126),
 		'url' => array('type' => 'varchar(255)', 'label' => 'Url', 'enabled' => 1, 'visible' => -1, 'position' => 127),
-		'socialnetworks' => array('type' => 'text', 'label' => 'Socialnetworks', 'enabled' => 1, 'visible' => -1, 'position' => 128),
+		'socialnetworks' => array('type' => 'text', 'label' => 'Socialnetworks', 'enabled' => 1, 'visible' => 3, 'position' => 128),
 		'birth' => array('type' => 'date', 'label' => 'DateOfBirth', 'enabled' => 1, 'visible' => -1, 'position' => 130),
 		'gender' => array('type' => 'varchar(10)', 'label' => 'Gender', 'enabled' => 1, 'visible' => -1, 'position' => 132),
 		'photo' => array('type' => 'varchar(255)', 'label' => 'Photo', 'enabled' => 1, 'visible' => -1, 'position' => 135),
-		'public' => array('type' => 'smallint(6)', 'label' => 'Public', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 145),
+		'public' => array('type' => 'smallint(6)', 'label' => 'Public', 'enabled' => 1, 'visible' => 3, 'notnull' => 1, 'position' => 145),
 		'datefin' => array('type' => 'datetime', 'label' => 'DateEnd', 'enabled' => 1, 'visible' => 1, 'position' => 150),
 		'default_lang' => array('type' => 'varchar(6)', 'label' => 'Default lang', 'enabled' => 1, 'visible' => -1, 'position' => 153),
 		'note_public' => array('type' => 'text', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 155),
@@ -356,13 +394,13 @@ class Adherent extends CommonObject
 		'datevalid' => array('type' => 'datetime', 'label' => 'DateValidation', 'enabled' => 1, 'visible' => -1, 'position' => 165),
 		'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 170),
 		'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 175),
-		'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fk user author', 'enabled' => 1, 'visible' => -1, 'position' => 180),
-		'fk_user_mod' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fk user mod', 'enabled' => 1, 'visible' => -1, 'position' => 185),
-		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'enabled' => 1, 'visible' => -1, 'position' => 190),
-		'canvas' => array('type' => 'varchar(32)', 'label' => 'Canvas', 'enabled' => 1, 'visible' => -1, 'position' => 195),
-		'statut' => array('type' => 'smallint(6)', 'label' => 'Statut', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 500, 'arrayofkeyval' => array(-1 => 'Draft', 1 => 'Validated', 0 => 'MemberStatusResiliatedShort', -2 => 'MemberStatusExcludedShort')),
+		'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserCreation', 'enabled' => 1, 'visible' => 3, 'position' => 180),
+		'fk_user_mod' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModification', 'enabled' => 1, 'visible' => 3, 'position' => 185),
+		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'enabled' => 1, 'visible' => 3, 'position' => 190),
+		'canvas' => array('type' => 'varchar(32)', 'label' => 'Canvas', 'enabled' => 1, 'visible' => 0, 'position' => 195),
 		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 800),
-		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 805)
+		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 805),
+		'statut' => array('type' => 'smallint(6)', 'label' => 'Statut', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 1000, 'arrayofkeyval' => array(-1 => 'Draft', 1 => 'Validated', 0 => 'MemberStatusResiliatedShort', -2 => 'MemberStatusExcludedShort'))
 	);
 
 	/**
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 21f24487c24..5c18a3688d1 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -174,7 +174,7 @@ $arrayfields = array(
 	'd.company' => array('label' => "Company", 'checked' => 1, 'position' => 70),
 	'd.login' => array('label' => "Login", 'checked' => 1),
 	'd.morphy' => array('label' => "MemberNature", 'checked' => 1),
-	't.libelle' => array('label' => "Type", 'checked' => 1, 'position' => 55),
+	't.libelle' => array('label' => "MemberType", 'checked' => 1, 'position' => 55),
 	'd.address' => array('label' => "Address", 'checked' => 0),
 	'd.zip' => array('label' => "Zip", 'checked' => 0),
 	'd.town' => array('label' => "Town", 'checked' => 0),
@@ -199,6 +199,10 @@ $tableprefix = 'd';
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
+		// Special case already added
+		if (in_array($key, array('fk_adherent_type', 'state_id', 'country'))) {	// Already managed by another field key in arrayfields
+			continue;
+		}
 		$visible = (int) dol_eval((string) $val['visible'], 1);
 		$arrayfields[$tableprefix.'.'.$key] = array(
 			'label' => $val['label'],
@@ -222,7 +226,6 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 // Security check
 $result = restrictedArea($user, 'adherent');
 
-
 /*
  * Actions
  */
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 1ec7c21252f..41ba080ff85 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -400,7 +400,7 @@ if ($mode == 'other') {
 
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">';
 	print $langs->trans("Language");
-	print '</td><td class="titlefieldmiddle">';
+	print '</td><td>';
 	print '</td></tr>';
 
 	// Default language
@@ -435,7 +435,7 @@ if ($mode == 'other') {
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">';
 	print $langs->trans("Miscellaneous");
 	print '</td>';
-	print '<td class="titlefieldmiddle"></td>';
+	print '<td></td>';
 	print '</tr>';
 
 	if (!empty($conf->use_javascript_ajax)) {
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a450aaa7d6c..fefa4a3fa83 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -9482,7 +9482,8 @@ class Form
 				}
 
 				// Note: $val['checked'] <> 0 means we must show the field into the combo list  @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset
-				$listoffieldsforselection .= '<li><input type="checkbox" id="checkbox' . $key . '" value="' . $key . '"' . ((!array_key_exists('checked', $val) || empty($val['checked']) || $val['checked'] == '-1') ? '' : ' checked="checked"') . '/><label for="checkbox' . $key . '">' . dol_escape_htmltag($langs->trans($val['label'])) . '</label></li>';
+				$listoffieldsforselection .= '<li><input type="checkbox" id="checkbox' . $key . '" value="' . $key . '"' . ((!array_key_exists('checked', $val) || empty($val['checked']) || $val['checked'] == '-1') ? '' : ' checked="checked"') . '/>';
+				$listoffieldsforselection .= '<label for="checkbox' . $key . '">'.dol_string_nohtmltag($langs->trans($val['label'])) . '</label></li>';
 				$listcheckedstring .= (empty($val['checked']) ? '' : $key . ',');
 			}
 		}
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 1604ee7cc70..3b6c29c94e6 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -398,7 +398,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<th colspan="2">&nbsp;</th>';
 		print '</tr>';
 
-		print '<tr>';
+		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("DefaultSkin").'</td>';
 		print '<td>' . getDolGlobalString('MAIN_THEME').'</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>';
@@ -410,19 +410,19 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			$dirthemestring .= '"'.$dirtheme.'" ';
 		}
 
-		print '<tr class="liste_titre"><th class="titlefieldmiddle">';
+		print '<tr class="liste_titre"><td class="titlefieldmiddle">';
 		print $form->textwithpicto($langs->trans("DefaultSkin"), $langs->trans("ThemeDir").' : '.$dirthemestring);
-		print '</th>';
-		print '<th class="right">';
+		print '</td>';
+		print '<td class="right">';
 		$url = 'https://www.dolistore.com/9-skins';
 		print '<a href="'.$url.'" target="_blank" rel="noopener noreferrer external">';
 		print $langs->trans('DownloadMoreSkins');
 		print img_picto('', 'globe', 'class="paddingleft"');
 		print '</a>';
-		print '</th></tr>';
+		print '</td></tr>';
 	}
 
-	print '<tr><td colspan="'.$colspan.'" class="center">';
+	print '<tr class="oddeven"><td colspan="'.$colspan.'" class="center">';
 
 	if (getDolGlobalString('MAIN_FORCETHEME')) {
 		$langs->load("errors");

From 7a0f37febd6be48baec4b29331e86df9ab9a166b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 3 Feb 2025 18:33:28 +0100
Subject: [PATCH 423/602] fix phpstan

---
 dev/build/phpstan/phpstan-baseline.neon   | 36 -----------------------
 htdocs/core/tpl/card_presend.tpl.php      |  5 ++++
 htdocs/core/tpl/commonfields_edit.tpl.php |  5 ++--
 htdocs/core/tpl/commonfields_view.tpl.php |  3 +-
 4 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 01c75984c0d..1fd9eb19e8c 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -14634,36 +14634,12 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/tpl/bloc_showhide.tpl.php
 
-		-
-			message: '#^Variable \$action might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/card_presend.tpl.php
-
-		-
-			message: '#^Variable \$db might not be defined\.$#'
-			identifier: variable.undefined
-			count: 12
-			path: ../../../htdocs/core/tpl/card_presend.tpl.php
-
 		-
 			message: '#^Variable \$hidedetails might not be defined\.$#'
 			identifier: variable.undefined
 			count: 1
 			path: ../../../htdocs/core/tpl/card_presend.tpl.php
 
-		-
-			message: '#^Variable \$hookmanager might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/card_presend.tpl.php
-
-		-
-			message: '#^Variable \$langs might not be defined\.$#'
-			identifier: variable.undefined
-			count: 6
-			path: ../../../htdocs/core/tpl/card_presend.tpl.php
-
 		-
 			message: '#^Variable \$modelmail might not be defined\.$#'
 			identifier: variable.undefined
@@ -14682,18 +14658,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/tpl/card_presend.tpl.php
 
-		-
-			message: '#^Variable \$db might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/commonfields_edit.tpl.php
-
-		-
-			message: '#^Variable \$db might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/commonfields_view.tpl.php
-
 		-
 			message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 254107a725e..eb7ec2ec97b 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -37,7 +37,12 @@
  * @var string $defaulttopiclang
  * @var string[] $arrayoffamiliestoexclude
  * @var string $file
+ * @var string $action
  * @var CommonObject $object
+ * @var Conf $conf
+ * @var DoliDB $db
+ * @var HookManager $hookmanager
+ * @var Translate $langs
  */
 '
 @phan-var-force int<0,1> $diroutput
diff --git a/htdocs/core/tpl/commonfields_edit.tpl.php b/htdocs/core/tpl/commonfields_edit.tpl.php
index 530d34a15af..2fdd82a3b76 100644
--- a/htdocs/core/tpl/commonfields_edit.tpl.php
+++ b/htdocs/core/tpl/commonfields_edit.tpl.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2017-2019  Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+/* Copyright (C) 2017-2019  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2024-2025  Frédéric France			<frederic.france@free.fr>
  * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,6 +27,7 @@
 /**
  * @var CommonObject $object
  * @var Conf $conf
+ * @var DoliDB $db
  * @var Form $form
  * @var FormAdmin $formadmin
  * @var Translate $langs
diff --git a/htdocs/core/tpl/commonfields_view.tpl.php b/htdocs/core/tpl/commonfields_view.tpl.php
index 5122a2e7944..cca11e95467 100644
--- a/htdocs/core/tpl/commonfields_view.tpl.php
+++ b/htdocs/core/tpl/commonfields_view.tpl.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,7 @@
 /**
  * @var CommonObject $object
  * @var Conf $conf
+ * @var DoliDB $db
  * @var Form $form
  * @var FormAdmin $formadmin
  * @var Translate $langs

From fb0083a3ec147dbfa4ba025a69e98ba7929d4fba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 3 Feb 2025 18:37:57 +0100
Subject: [PATCH 424/602] fix phpstan

---
 dev/build/phpstan/phpstan-baseline.neon   | 18 ------------------
 htdocs/core/tpl/commonfields_view.tpl.php |  2 +-
 htdocs/core/tpl/contacts.tpl.php          |  4 +++-
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 1fd9eb19e8c..788622de452 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -14670,30 +14670,12 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/tpl/contacts.tpl.php
 
-		-
-			message: '#^Variable \$action might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/contacts.tpl.php
-
 		-
 			message: '#^Variable \$conf might not be defined\.$#'
 			identifier: variable.undefined
 			count: 1
 			path: ../../../htdocs/core/tpl/contacts.tpl.php
 
-		-
-			message: '#^Variable \$db might not be defined\.$#'
-			identifier: variable.undefined
-			count: 4
-			path: ../../../htdocs/core/tpl/contacts.tpl.php
-
-		-
-			message: '#^Variable \$hookmanager might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/contacts.tpl.php
-
 		-
 			message: '#^Variable \$action might not be defined\.$#'
 			identifier: variable.undefined
diff --git a/htdocs/core/tpl/commonfields_view.tpl.php b/htdocs/core/tpl/commonfields_view.tpl.php
index cca11e95467..1eeb8603cc5 100644
--- a/htdocs/core/tpl/commonfields_view.tpl.php
+++ b/htdocs/core/tpl/commonfields_view.tpl.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2017  Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2017       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.com>
  *
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 85413f255e1..3f4abfee8bb 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2013-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2015-2016  Charlie BENKE 	        <charlie@patas-monkey.com>
- * Copyright (C) 2021-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2021-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2024-2025	MDW					    <mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,9 @@
 /**
  * @var ?CommonObject $object
  * @var ?CommonObject $objectsrc
+ * @var DoliDB $db
  * @var Form $form
+ * @var HookManager $hookmanager
  * @var Translate $langs
  * @var User $user
  * @var ?string $permission

From 2794f53a10a5955b38ad4935fd8930086704cbc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 3 Feb 2025 18:42:04 +0100
Subject: [PATCH 425/602] fix phpstan

---
 dev/build/phpstan/phpstan-baseline.neon       | 30 -------------------
 .../tpl/extrafields_list_search_input.tpl.php | 23 ++++++++++++++
 .../tpl/extrafields_list_search_param.tpl.php | 22 ++++++++++++++
 .../tpl/extrafields_list_search_sql.tpl.php   | 22 ++++++++++++++
 .../tpl/extrafields_list_search_title.tpl.php | 21 +++++++++++++
 5 files changed, 88 insertions(+), 30 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 788622de452..311e90abeb2 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -14760,12 +14760,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/tpl/extrafields_list_print_fields.tpl.php
 
-		-
-			message: '#^Variable \$object might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/extrafields_list_search_input.tpl.php
-
 		-
 			message: '#^Variable \$extrafields might not be defined\.$#'
 			identifier: variable.undefined
@@ -14778,12 +14772,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/tpl/extrafields_list_search_param.tpl.php
 
-		-
-			message: '#^Variable \$object might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/extrafields_list_search_param.tpl.php
-
 		-
 			message: '#^Variable \$param might not be defined\.$#'
 			identifier: variable.undefined
@@ -14802,30 +14790,12 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/tpl/extrafields_list_search_sql.tpl.php
 
-		-
-			message: '#^Variable \$object might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/extrafields_list_search_sql.tpl.php
-
 		-
 			message: '#^Variable \$sql might not be defined\.$#'
 			identifier: variable.undefined
 			count: 7
 			path: ../../../htdocs/core/tpl/extrafields_list_search_sql.tpl.php
 
-		-
-			message: '#^Variable \$langs might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/extrafields_list_search_title.tpl.php
-
-		-
-			message: '#^Variable \$object might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/extrafields_list_search_title.tpl.php
-
 		-
 			message: '#^Variable \$param might not be defined\.$#'
 			identifier: variable.undefined
diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index d9c860a050f..7582f21e471 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -1,5 +1,28 @@
 <?php
 
+/* Copyright (C) 2025		Frédéric France			<frederic.france@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * @var Conf $conf
+ * @var DoliDB $db
+ * @var CommonObject $object
+ */
+
 print '<!-- extrafields_list_search_input.tpl.php -->'."\n";
 
 // Protection to avoid direct call of template
diff --git a/htdocs/core/tpl/extrafields_list_search_param.tpl.php b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
index 4b539cfc0c3..ebb49d9a444 100644
--- a/htdocs/core/tpl/extrafields_list_search_param.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
@@ -1,5 +1,27 @@
 <?php
 
+/* Copyright (C) 2025		Frédéric France			<frederic.france@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * @var Conf $conf
+ * @var CommonObject $object
+ */
+
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index 6901b9a3472..a75c249c352 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -1,5 +1,27 @@
 <?php
 
+/* Copyright (C) 2025		Frédéric France			<frederic.france@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * @var Conf $conf
+ * @var CommonObject $object
+ */
+
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index d5b4979dcce..b225d507022 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -1,6 +1,27 @@
 <?php
 
 /* Copyright (C) 2025		MDW	<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2025		Frédéric France			<frederic.france@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * @var Conf $conf
+ * @var CommonObject $object
+ * @var ?Translate $langs
  */
 
 // Protection to avoid direct call of template

From 1dabc6d1207c60fcc02fa989bb8595a6ce3f87fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 3 Feb 2025 20:06:32 +0100
Subject: [PATCH 426/602] fix phpstan

---
 dev/build/phpstan/phpstan-baseline.neon     |  6 ------
 htdocs/core/tpl/filemanager.tpl.php         |  4 ++--
 htdocs/core/tpl/formlayoutai.tpl.php        |  4 ++--
 htdocs/core/tpl/list_print_subtotal.tpl.php | 21 +++++++++++++++++++++
 htdocs/core/tpl/notes.tpl.php               |  8 +++++---
 5 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 311e90abeb2..238e6fd6ffb 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -14886,12 +14886,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/tpl/formlayoutai.tpl.php
 
-		-
-			message: '#^Variable \$langs might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/list_print_subtotal.tpl.php
-
 		-
 			message: '#^Variable \$limit might not be defined\.$#'
 			identifier: variable.undefined
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index 63318ea609e..1652b8fee92 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025  Frédéric France			<frederic.france@free.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/core/tpl/formlayoutai.tpl.php b/htdocs/core/tpl/formlayoutai.tpl.php
index 79e6db0ba9c..944f6d5722b 100644
--- a/htdocs/core/tpl/formlayoutai.tpl.php
+++ b/htdocs/core/tpl/formlayoutai.tpl.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2024  Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.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/core/tpl/list_print_subtotal.tpl.php b/htdocs/core/tpl/list_print_subtotal.tpl.php
index 5f04d570ce4..71dfa92158f 100644
--- a/htdocs/core/tpl/list_print_subtotal.tpl.php
+++ b/htdocs/core/tpl/list_print_subtotal.tpl.php
@@ -1,4 +1,25 @@
 <?php
+/* Copyright (C) 2025		Frédéric France			<frederic.france@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * @var Translate $langs
+ * @var array{nbfield:int,pos?:array<int,int>,val?:array<int,float>} $totalarray
+ */
 
 '@phan-var-force array{nbfield:int,pos?:array<int,int>,val?:array<int,float>} $totalarray';
 
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index c78acbae1e0..a2283dae519 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2012      Regis Houssin       <regis.houssin@inodbox.com>
  * Copyright (C) 2013      Florian Henry	   <florian.henry@open-concept.pro>
  * Copyright (C) 2014-2020 Laurent Destailleur <eldy@destailleur.fr>
- * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,12 +19,14 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 /**
- * @var CommonObject $object
+ * @var ?CommonObject $object
  * @var Form $form
  * @var Translate $langs
  * @var User $user
  *
- * @var int $permissionnote
+ * @var ?int<0,1> $permissionnote
+ * @var string $moreparam
+ * @var ?int $colwidth
  * @var string $cssclass
  */
 // Protection to avoid direct call of template

From 50f3fa27c5af2a66a121ece04289a5e478b93609 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 3 Feb 2025 20:25:56 +0100
Subject: [PATCH 427/602] WIP Upload file

---
 htdocs/core/class/html.form.class.php |  4 +--
 htdocs/core/customreports.php         |  1 -
 htdocs/core/upload_page.php           | 47 +++++++++++++++++----------
 htdocs/theme/eldy/global.inc.php      |  1 +
 4 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 2c5ce861d47..446ed19cf36 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2726,8 +2726,6 @@ class Form
 				$urloption .= '&warehouseid=' . (int) $warehouseId;
 			}
 
-			$out .= ajax_autocompleter((string) $selected, $htmlname, DOL_URL_ROOT . '/product/ajax/products.php', $urloption, getDolGlobalInt('PRODUIT_USE_SEARCH_TO_SELECT'), getDolGlobalInt('PRODUCT_SEARCH_AUTO_SELECT_IF_ONLY_ONE', 1), $ajaxoptions);
-
 			if (isModEnabled('variants') && is_array($selected_combinations)) {
 				// Code to automatically insert with javascript the select of attributes under the select of product
 				// when a parent of variant has been selected.
@@ -2817,6 +2815,8 @@ class Form
 			if ($hidelabel == 3) {
 				$out .= img_picto($langs->trans("Search"), 'search');
 			}
+
+			$out .= ajax_autocompleter((string) $selected, $htmlname, DOL_URL_ROOT . '/product/ajax/products.php', $urloption, getDolGlobalInt('PRODUIT_USE_SEARCH_TO_SELECT'), getDolGlobalInt('PRODUCT_SEARCH_AUTO_SELECT_IF_ONLY_ONE', 1), $ajaxoptions);
 		} else {
 			$out .= $this->select_produits_list($selected, $htmlname, $filtertype, $limit, $price_level, '', $status, $finished, 0, $socid, $showempty, $forcecombo, $morecss, $hidepriceinlabel, $warehouseStatus, $status_purchase, $warehouseId);
 		}
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index e15031940c7..b257748dea1 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2020-2024 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
diff --git a/htdocs/core/upload_page.php b/htdocs/core/upload_page.php
index eeafaaff78c..325a52b7ec5 100644
--- a/htdocs/core/upload_page.php
+++ b/htdocs/core/upload_page.php
@@ -148,10 +148,23 @@ if (isModEnabled('supplier_invoice')) {
 	<div>'.$langs->trans("SupplierInvoice").'<br><br>';
 
 	$uploadform .= img_picto('', 'company', 'class="pictofixedwidth"');
-	$uploadform .= $form->select_company(GETPOSTINT('socid'), 'socid', 'statut=0', $langs->transnoentitiesnoconv("Supplier"));
+	//$uploadform .= '<span class="disableautoopen">';
+	$uploadform .= $form->select_company(GETPOSTINT('socid'), 'socid', '(statut:=:0)', $langs->transnoentitiesnoconv("Supplier"), 0, 0, array(), 0, 'maxwidth200 disableautoopen');
+	//$uploadform .= '</span>';
 
-	$uploadform .= '<br><br>
-	<small>('.$langs->trans("OrClickToSelectAFile").')</small>
+	$uploadform .= '<br>';
+
+	$uploadform .= img_picto('', 'product', 'class="pictofixedwidth"');
+	$prodid = GETPOSTINT('prodid');
+	$prodtext = '';
+
+	//$uploadform .= '<span class="disableautoopen">';
+	$uploadform .= $form->select_produits($prodid, 'prodid', '', 0, 0, 1, 2, $prodtext, 0, array(), GETPOSTINT('socid'), '1', 0, 'maxwidth200 disableautoopen', 0, '', null, 1);
+	//$uploadform .= '</span>';
+
+	$uploadform .= '<br>';
+
+	$uploadform .= '<small>('.$langs->trans("OrClickToSelectAFile").')</small>
 	</div>
 	</div>';
 }
@@ -227,26 +240,26 @@ print $out;
 
 print "<script>
 $(document).ready(function() {
-	jQuery('#supplierinvoice').on('click', function(event) {
-		console.log('Click on link to open input file');
+	jQuery('#supplierinvoice:not(.disableautoopen)').on('click', function(event) {
+		console.log('Click on link supplierinvoice to open input file');
 		console.log(event);
-		$('#modulepart').val('invoice_supplier');
-		$('#fileInput').click();
+		if (!event.target.closest('.disableautoopen')) {
+			$('#modulepart').val('invoice_supplier');
+			$('#fileInput').click();
+		}
 	});
 
-	jQuery('#userpayroll').on('click', function(event) {
-		console.log('Click on link to open input file');
+	jQuery('#userpayroll:not(.disableautoopen)').on('click', function(event) {
+		console.log('Click on link userpayroll to open input file');
 		console.log(event);
-		$('#modulepart').val('salary');
-		$('#fileInput').click();
+		if (!event.target.closest('.disableautoopen')) {
+			$('#modulepart').val('salary');
+			$('#fileInput').click();
+		}
 	});
 
-    jQuery('#search_socid').on('click', function(event) {
-        event.stopPropagation();
-		console.log('Avoid to open the input select');
-    });
-
-	jQuery('#fileInput').on('change', function() {
+	jQuery('#fileInput').on('change', function(event) {
+		console.log(event);
 		console.log('A file was selected, we submit the form');
 		$('#uploadform').submit();
 	});
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 22fc9cbf8eb..f85966907ab 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -323,6 +323,7 @@ tr.liste_titre_filter th.liste_titre { text-align: unset; }
 
 input {
 	font-size: unset;
+	box-sizing: border-box;
 }
 select.vmenusearchselectcombo {
 	background-color: unset;

From 729c7068f0a3f0750194f0476ab67f548cdcb16d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Mon, 3 Feb 2025 20:29:43 +0100
Subject: [PATCH 428/602] fix phpstan

---
 dev/build/phpstan/phpstan-baseline.neon | 12 ------------
 htdocs/user/card.php                    | 11 +++++++----
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 238e6fd6ffb..d93d80a939d 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -30024,18 +30024,6 @@ parameters:
 			count: 7
 			path: ../../../htdocs/user/card.php
 
-		-
-			message: '#^Variable \$dolibarr_main_authentication might not be defined\.$#'
-			identifier: variable.undefined
-			count: 12
-			path: ../../../htdocs/user/card.php
-
-		-
-			message: '#^Variable \$formproduct might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/user/card.php
-
 		-
 			message: '#^Variable \$mc might not be defined\.$#'
 			identifier: variable.undefined
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 19334550f40..0aacc461e20 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -13,7 +13,7 @@
  * Copyright (C) 2015		Ari Elbaz (elarifr)			<github@accedinfo.com>
  * Copyright (C) 2015-2018	Charlene Benke				<charlie@patas-monkey.com>
  * Copyright (C) 2016		Raphaël Doursenaud			<rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2018-2024	Frédéric France				<frederic.france@free.fr>
+ * Copyright (C) 2018-2025  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2018		David Beniamine				<David.Beniamine@Tetras-Libre.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
@@ -70,17 +70,19 @@ if (isModEnabled('stock')) {
  * @var HookManager $hookmanager
  * @var Translate $langs
  * @var User $user
+ *
+ * @var string $dolibarr_main_authentication
  */
 
 // Load translation files required by page
 $langs->loadLangs(array('users', 'companies', 'ldap', 'admin', 'hrm', 'stocks', 'other'));
 
 $id = GETPOSTINT('id');
-$action		= GETPOST('action', 'aZ09');
+$action = GETPOST('action', 'aZ09');
 $mode = GETPOST('mode', 'alpha');
-$confirm	= GETPOST('confirm', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 $group = GETPOSTINT("group", 3);
-$cancel		= GETPOST('cancel', 'alpha');
+$cancel = GETPOST('cancel', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'useracard'; // To manage different context of search
 
 if (empty($id) && $action != 'add' && $action != 'create') {
@@ -876,6 +878,7 @@ $formother = new FormOther($db);
 $formcompany = new FormCompany($db);
 $formadmin = new FormAdmin($db);
 $formfile = new FormFile($db);
+$formproduct = null;
 if (isModEnabled('stock')) {
 	$formproduct = new FormProduct($db);
 }

From d7300e55c301899b517c686c8fd95b3b453e8dbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 3 Feb 2025 20:44:40 +0100
Subject: [PATCH 429/602] fix CI branch 21.0

---
 htdocs/core/tpl/card_presend.tpl.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 6b526cbbafe..29f47a8f493 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -31,6 +31,19 @@
  * $arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...);
  * $file
  */
+/**
+ * @var int<0,1> $diroutput
+ * @var string $defaulttopic
+ * @var string $defaulttopiclang
+ * @var string[] $arrayoffamiliestoexclude
+ * @var string $file
+ * @var string $action
+ * @var CommonObject $object
+ * @var Conf $conf
+ * @var DoliDB $db
+ * @var HookManager $hookmanager
+ * @var Translate $langs
+ */
 '
 @phan-var-force int<0,1> $diroutput
 @phan-var-force string $defaulttopic

From 79027bbf533a6dc315e1e1c418b6570789af58aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 3 Feb 2025 20:46:10 +0100
Subject: [PATCH 430/602] Update website.lang

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

diff --git a/htdocs/langs/fr_CA/website.lang b/htdocs/langs/fr_CA/website.lang
index 343f62fb804..589f08c1dd9 100644
--- a/htdocs/langs/fr_CA/website.lang
+++ b/htdocs/langs/fr_CA/website.lang
@@ -44,7 +44,7 @@ YouCanAlsoDeployToAnotherWHP=<u>Exécutez votre site Web dans un fournisseur d'h
 CheckVirtualHostPerms=Vérifiez également que l'utilisateur de l'hôte virtuel (par exemple www-data) dispose des autorisations <strong>%s</strong> sur les fichiers dans <br><strong>%s</strong>
 TestDeployOnWeb=Tester/déployer sur le Web
 PreviewSiteServedByWebServer=<u>Aperçu %s dans un nouvel onglet.</u><br><br>Le %s sera servi par un serveur Web externe (comme Apache, Nginx, IIS). Vous devez installer et configurer ce serveur avant de pointer vers le répertoire :<br><strong>%s</strong><br>URL servie par un serveur externe :<br><strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Aperçu %s dans un nouvel onglet.</u><br><br>Le %s sera servi par le serveur Dolibarr, il n'a donc pas besoin d'installer de serveur Web supplémentaire (comme Apache, Nginx, IIS).<br>L'inconvénient est que les URL des pages ne sont pas conviviales et commencez par le chemin de votre Dolibarr.<br>URL servie par Dolibarr :<br><strong>%s</strong><br><br>Pour déployer ou tester en utilisant votre propre serveur Web externe (comme Apache, Nginx, Lighttp), utilisez le lien "<br> class='notranslate'>%s</span>".
+PreviewSiteServedByDolibarr=<u>Aperçu %s dans un nouvel onglet.</u><br><br>Le %s sera servi par le serveur Dolibarr, il n'a donc pas besoin d'installer de serveur Web supplémentaire (comme Apache, Nginx, IIS).<br>L'inconvénient est que les URL des pages ne sont pas conviviales et commencez par le chemin de votre Dolibarr.<br>URL servie par Dolibarr :<br><strong>%s</strong><br><br>Pour déployer ou tester en utilisant votre propre serveur Web externe (comme Apache, Nginx, Lighttp), utilisez le lien "%s".
 VirtualHostUrlNotDefined=L'URL de l'hôte virtuel servi par le serveur Web externe n'est pas définie
 NoPageYet=Pas encore de pages
 YouCanCreatePageOrImportTemplate=Vous pouvez créer une nouvelle page ou importer un modèle de site Web complet

From e7b1e916f1333d4cbbf880e1095a0feff3dfa3cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 3 Feb 2025 21:26:30 +0100
Subject: [PATCH 431/602] Update companies.lang

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

diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 02a97523afa..18d3f4f6df1 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -463,5 +463,5 @@ IDOfPaymentInAnExternalSystem=Αναγνωριστικό του τρόπου π
 AADEWebserviceCredentials=Στοιχεία πρόσβασης υπηρεσιών ΑΑΔΕ
 ThirdPartyMustBeACustomerToCreateBANOnStripe=Το τρίτο μέρος πρέπει να είναι πελάτης για να επιτρέπεται η καταχώρηση των τραπεζικών του στοιχείων από το Stripe
 NewSocNameForClone=Νέο όνομα εταιρίας
-ConfirmCloneThirdparties=Είστε σίγουροι ότι θέλετε να δημιουργήσετε αντίγραφο της εταιρίας <b>%s</b></s ='notranslate'>;
+ConfirmCloneThirdparties=Είστε σίγουροι ότι θέλετε να δημιουργήσετε αντίγραφο της εταιρίας <b>%s</b>
 SocialNetworksBusiness=Κοινωνικά δίκτυα εταιρίας

From 72ffcdfc941746024138c57680865c36719f3dee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 3 Feb 2025 21:46:43 +0100
Subject: [PATCH 432/602] Update llx_accounting_account_fr.sql

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

diff --git a/htdocs/install/mysql/data/llx_accounting_account_fr.sql b/htdocs/install/mysql/data/llx_accounting_account_fr.sql
index 4bccc36b9a2..63d2f6599e9 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_fr.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_fr.sql
@@ -247,7 +247,7 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 5252,'PCG25-DEV','IMMO',   '278',5226,'Mali de fusion sur actifs financiers','1');
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 5253,'PCG25-DEV','IMMO',   '279',5226,'Versements restant à effectuer sur titres immobilisés non libérés','1');
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 5254,'PCG25-DEV','IMMO',    '28',5968,'Amortissements des immobilisations','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 5255,'PCG25-DEV','IMMO',   '280',5254,'Amortissements des immobilisations incorporelles et des frais d''''établissement (même ventilation que celle du compte 20)','1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 5255,'PCG25-DEV','IMMO',   '280',5254,'Amortissements des immobilisations incorporelles et des frais d''établissement (même ventilation que celle du compte 20)','1');
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 5256,'PCG25-DEV','IMMO',  '2801',5255,'Frais d''établissement (même ventilation que celle du compte 201)','1');
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 5257,'PCG25-DEV','IMMO',  '2803',5255,'Frais de développement','1');
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 5258,'PCG25-DEV','IMMO',  '2805',5255,'Concessions et droits similaires, brevets, licences, solutions informatiques, droits et valeurs similaires','1');

From 0871b6e9f25de29821096e25df5b87759661bdb3 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 3 Feb 2025 23:18:42 +0100
Subject: [PATCH 433/602] FIX  Fiscal year missing translation on status

---
 htdocs/accountancy/admin/fiscalyear.php |  4 ++--
 htdocs/core/class/fiscalyear.class.php  | 19 ++++++++-----------
 htdocs/langs/en_US/compta.lang          |  4 ++++
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index cb142948096..692202c68a4 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2013-2024  Alexandre Spangaro  <aspangaro@easya.solutions>
+/* Copyright (C) 2013-2025	Alexandre Spangaro			<alexandre@inovea-conseil.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
@@ -123,7 +123,7 @@ if ($result) {
 	$newcardbutton = empty($hookmanager->resPrint) ? '' : $hookmanager->resPrint;
 
 	if (empty($reshook)) {
-		$newcardbutton .= dolGetButtonTitle($langs->trans('NewFiscalYear'), '', 'fa fa-plus-circle', 'fiscalyear_card.php?action=create', '', $user->hasRight('accounting', 'fiscalyear', 'write'));
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewFiscalYear'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/accountancy/admin/fiscalyear_card.php?action=create', '', $user->hasRight('accounting', 'fiscalyear', 'write'));
 	}
 
 	$title = $langs->trans('AccountingPeriods');
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index 0162ee7de95..53a0b24e919 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2014-2020  Alexandre Spangaro  <aspangaro@open-dsi.fr>
- * Copyright (C) 2020       OScss-Shop          <support@oscss-shop.fr>
- * Copyright (C) 2023       Frédéric France     <frederic.france@netlogic.fr>
+/* Copyright (C) 2014-2025	Alexandre Spangaro			<alexandre@inovea-conseil.com>
+ * Copyright (C) 2020       OScss-Shop					<support@oscss-shop.fr>
+ * Copyright (C) 2023       Frédéric France				<frederic.france@free.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
@@ -122,9 +122,6 @@ class Fiscalyear extends CommonObject
 	public function __construct(DoliDB $db)
 	{
 		$this->db = $db;
-
-		$this->labelStatusShort = array(self::STATUS_OPEN => 'Opened', self::STATUS_CLOSED => 'Closed');
-		$this->labelStatus = array(self::STATUS_OPEN => 'Opened', self::STATUS_CLOSED => 'Closed');
 	}
 
 	/**
@@ -411,11 +408,11 @@ class Fiscalyear extends CommonObject
 		// phpcs:enable
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
-			//$langs->load("mymodule@mymodule");
-			$this->labelStatus[self::STATUS_OPEN] = $langs->transnoentitiesnoconv('Draft');
-			$this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Enabled');
-			$this->labelStatusShort[self::STATUS_OPEN] = $langs->transnoentitiesnoconv('Enabled');
-			$this->labelStatusShort[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('Disabled');
+
+			$this->labelStatus[self::STATUS_OPEN] = $langs->transnoentitiesnoconv('FiscalYearOpened');
+			$this->labelStatus[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('FiscalYearClosed');
+			$this->labelStatusShort[self::STATUS_OPEN] = $langs->transnoentitiesnoconv('FiscalYearOpenedShort');
+			$this->labelStatusShort[self::STATUS_CLOSED] = $langs->transnoentitiesnoconv('FiscalYearClosedShort');
 		}
 
 		$statusType = 'status4';
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 62cd3bca571..d40d89d1d96 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -277,6 +277,10 @@ ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Accounting period
+FiscalYearOpened=Fiscal year opened
+FiscalYearClosed=Fiscal year closed
+FiscalYearOpenedShort=Opened
+FiscalYearClosedShort=Closed
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignment

From ecf1d2553b0df484579666fe8ab6c28d6622f1e7 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 4 Feb 2025 02:27:34 +0100
Subject: [PATCH 434/602] FIX wrong file path + avoid warning

---
 htdocs/core/class/commonobject.class.php | 2 +-
 htdocs/holiday/document.php              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 66ea879552f..e6198c8bb6e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -10198,7 +10198,7 @@ abstract class CommonObject
 		}
 
 		// Create lines
-		if (!empty($this->table_element_line) && !empty($this->fk_element)) {
+		if (!empty($this->table_element_line) && !empty($this->fk_element) && !empty($this->lines)) {
 			foreach ($this->lines as $line) {
 				$keyforparent = $this->fk_element;
 				$line->$keyforparent = $this->id;
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index 43fe279c57d..9609f214f6d 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -95,7 +95,7 @@ if (($id > 0) || $ref) {
 }
 
 
-$upload_dir = $conf->holiday->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, '');
+$upload_dir = $conf->holiday->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, '');
 $modulepart = 'holiday';
 
 // Protection if external user
@@ -293,7 +293,7 @@ if ($object->id) {
 	$permissiontoadd = $user->hasRight('holiday', 'write');
 	$permtoedit = $user->hasRight('holiday', 'write');
 	$param = '&id='.$object->id;
-	$relativepathwithnofile = dol_sanitizeFileName($object->ref).'/';
+	$relativepathwithnofile = get_exdir(0, 0, 0, 1, $object, '').'/';
 	$savingdocmask = dol_sanitizeFileName($object->ref).'-__file__';
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

From 3da1c1c84335f97211e57543b2670703433ae2f0 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 4 Feb 2025 04:54:54 +0100
Subject: [PATCH 435/602] FIX more bugs and warnings

---
 htdocs/core/lib/files.lib.php           | 4 +++-
 htdocs/core/modules/modAgenda.class.php | 5 +----
 htdocs/install/upgrade2.php             | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index fccce0cc1a9..9033ff0c87d 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1562,7 +1562,9 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 					}
 				}
 			} else {
-				$ok = false; // to avoid false positive
+				if (empty($nophperrors)) {
+					$ok = false; // to avoid false positive
+				}
 				dol_syslog("No files to delete found", LOG_DEBUG);
 			}
 		} else {
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 6f05062276d..7e17b32b699 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -603,10 +603,7 @@ class modAgenda extends DolibarrModules
 		// Permissions
 		$this->remove($options);
 
-		$sql = array(
-			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type='member' AND entity = ".((int) $conf->entity),
-			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','member',".((int) $conf->entity).")"
-		);
+		$sql = array();
 
 		return $this->_init($sql, $options);
 	}
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 53c9d12c399..a0af8634baa 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -4135,7 +4135,7 @@ function migrate_delete_old_files($db, $langs, $conf)
 		//print '<b>'DOL_DOCUMENT_ROOT.$filetodelete."</b><br>\n";
 		if (preg_match('/\*/', $filetodelete) || file_exists(DOL_DOCUMENT_ROOT.$filetodelete)) {
 			//print "Process file ".$filetodelete."\n";
-			$result = dol_delete_file(DOL_DOCUMENT_ROOT.$filetodelete, 0, 0, 0, null, true, false);
+			$result = dol_delete_file(DOL_DOCUMENT_ROOT.$filetodelete, 0, 1, 0, null, true, false); // nophperrors to avoid false positive with asterisk
 			if (!$result) {
 				$langs->load("errors");
 				print '<div class="error">'.$langs->trans("Error").': '.$langs->trans("ErrorFailToDeleteFile", DOL_DOCUMENT_ROOT.$filetodelete);

From 064813d72863bc6e8720611d0e91a86bf20e3a0a Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 4 Feb 2025 05:11:40 +0100
Subject: [PATCH 436/602] FIX wrong search filter, empty product unit is "none"

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

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 7bb3761497e..306335940a6 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -630,7 +630,7 @@ if ($search_accountancy_code_buy_intra) {
 if ($search_accountancy_code_buy_export) {
 	$sql .= natural_search($alias_product_perentity . '.accountancy_code_buy_export', clean_account($search_accountancy_code_buy_export));
 }
-if (getDolGlobalString('PRODUCT_USE_UNITS') && $search_units) {
+if (getDolGlobalString('PRODUCT_USE_UNITS') && !empty($search_units) && $search_units !== 'none') {
 	$sql .= natural_search('cu.rowid', $search_units);
 }
 // Add where from extra fields

From 09395edd95d8cd5df63151753da635556e64701c Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Tue, 4 Feb 2025 10:51:55 +0100
Subject: [PATCH 437/602] FIX search status in tasks

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

diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index ab518028caa..26f471e6ab4 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -330,8 +330,8 @@ if (!empty($search_progresscalc)) {
 	$morewherefilterarray[] = '(planned_workload IS NULL OR planned_workload = 0 OR '.natural_search('ROUND(100 * duration_effective / planned_workload, 2)', $search_progresscalc, 1, 1).')';
 	//natural_search('round(100 * $line->duration_effective / $line->planned_workload,2)', $filterprogresscalc, 1, 1).' {return 1;} else {return 0;}';
 }
-if ($search_status > -1) {
-	$morewherefilterarray[] = " t.fk_statut = ".$search_status;
+if ($search_status > -1 && $search_status != '') {
+	$morewherefilterarray[] = " t.fk_statut = ".((int) $search_status);
 }
 if ($search_task_budget_amount) {
 	$morewherefilterarray[] = natural_search('t.budget_amount', $search_task_budget_amount, 1, 1);

From 7a9ad13adfba36755d55090b437282e462501c66 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Tue, 4 Feb 2025 11:15:48 +0100
Subject: [PATCH 438/602] FIX wrong message on update shipment

---
 htdocs/expedition/dispatch.php   | 2 +-
 htdocs/langs/en_US/sendings.lang | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/expedition/dispatch.php b/htdocs/expedition/dispatch.php
index 67c30c5ff95..0711f4597fb 100644
--- a/htdocs/expedition/dispatch.php
+++ b/htdocs/expedition/dispatch.php
@@ -357,7 +357,7 @@ if ($action == 'updatelines' && $usercancreate) {
 		setEventMessages($langs->trans("Error"), $errors, 'errors');
 	} else {
 		$db->commit();
-		setEventMessages($langs->trans("ReceptionUpdated"), null);
+		setEventMessages($langs->trans("ShipmentUpdated"), null);
 
 		header("Location: ".DOL_URL_ROOT.'/expedition/dispatch.php?id='.$object->id);
 		exit;
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index fe9fdc20532..f2fafacff93 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -66,6 +66,7 @@ NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 CreateInvoiceForThisCustomerFromSendings=Create Bills
 IfValidateInvoiceIsNoSendingStayUnbilled=If invoice validation is 'No', the sending will remain to status 'Unbilled' until the invoice is validated.
 OptionToSetSendingBilledNotEnabled=Option from module Workflow, to set sending to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of sendings to 'Billed' manually after the invoice has been generated.
+ShipmentUpdated=Shipment successfully updated
 
 # Sending methods
 # ModelDocument

From 4f7d5770bd8f6b668ef006623cd63aea24e78ad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 4 Feb 2025 12:03:45 +0100
Subject: [PATCH 439/602] remove superfluous characters

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

diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 2ced259dfeb..dba5f48db1c 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -702,7 +702,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		print '</td>';
 		print '<td>';
 		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
-			print '<input type="checkbox" id="usage_opportunity" name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') ? ' checked="checked"' : '') : ' checked="checked"').'"> ';
+			print '<input type="checkbox" id="usage_opportunity" name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') ? ' checked="checked"' : '') : ' checked="checked"').'> ';
 			$htmltext = $langs->trans("ProjectFollowOpportunity");
 			print '<label for="usage_opportunity">'.$form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext).'</label>';
 			print '<script>';
@@ -725,7 +725,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			print '<br>';
 		}
 		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
-			print '<input type="checkbox" id="usage_task" name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') ? ' checked="checked"' : '') : ' checked="checked"').'"> ';
+			print '<input type="checkbox" id="usage_task" name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') ? ' checked="checked"' : '') : ' checked="checked"').'> ';
 			$htmltext = $langs->trans("ProjectFollowTasks");
 			print '<label for="usage_task">'.$form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext).'</label>';
 			print '<script>';
@@ -748,7 +748,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			print '<br>';
 		}
 		if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
-			print '<input type="checkbox" id="usage_bill_time" name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') ? ' checked="checked"' : '') : '').'"> ';
+			print '<input type="checkbox" id="usage_bill_time" name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') ? ' checked="checked"' : '') : '').'> ';
 			$htmltext = $langs->trans("ProjectBillTimeDescription");
 			print '<label for="usage_bill_time">'.$form->textwithpicto($langs->trans("BillTime"), $htmltext).'</label>';
 			print '<script>';

From 72ea4fadb3033f1c6a6eda83de7283592f5e2711 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 4 Feb 2025 13:22:04 +0100
Subject: [PATCH 440/602] Debug v21

---
 htdocs/core/actions_addupdatedelete.inc.php        | 14 +++++++++++---
 htdocs/core/class/commonobject.class.php           |  8 ++++++++
 htdocs/core/tpl/commonfields_add.tpl.php           |  2 +-
 .../template/class/myobject.class.php              |  2 +-
 htdocs/societe/class/societeaccount.class.php      |  6 +++++-
 htdocs/societe/website.php                         |  4 ++--
 htdocs/website/websiteaccount_card.php             |  5 +++++
 7 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index a9a51bf849a..78ca677f9fa 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -334,9 +334,17 @@ if ($action == 'update' && !empty($permissiontoadd)) {
 		}
 
 		$object->$key = $value;
-		if (!empty($val['notnull']) && $val['notnull'] > 0 && $object->$key == '' && (!isset($val['default']) || is_null($val['default']))) {
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+
+		if ($key == 'pass_crypted' && property_exists($object, 'pass')) {
+			if (GETPOST("pass", "password")) {	// If not provided, we do not change it. We never erase a password with empty.
+				$object->pass = GETPOST("pass", "password");
+			}
+			// TODO Manadatory for password not yet managed
+		} else {
+			if (!empty($val['notnull']) && $val['notnull'] > 0 && $object->$key == '' && (!isset($val['default']) || is_null($val['default']))) {
+				$error++;
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+			}
 		}
 
 		// Validation of fields values
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 227bcf8775a..87aebb5c6eb 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -10677,6 +10677,14 @@ abstract class CommonObject
 		if (array_key_exists('user_modification_id', $fieldvalues) && !($fieldvalues['user_modification_id'] > 0)) {
 			$fieldvalues['user_modification_id'] = $user->id;
 		}
+		if (array_key_exists('pass_crypted', $fieldvalues) && property_exists($this, 'pass') && !empty($this->pass)) {
+			// @phan-suppress-next-line PhanUndeclaredProperty
+			$tmparray = dol_hash($this->pass, '0', 0, 1);
+			$fieldvalues['pass_crypted'] = $tmparray['pass_encrypted'];
+			if (array_key_exists('pass_encoding', $fieldvalues) && property_exists($this, 'pass_encoding')) {
+				$fieldvalues['pass_encoding'] = $tmparray['pass_encoding'];
+			}
+		}
 		if (array_key_exists('ref', $fieldvalues)) {
 			$fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data
 		}
diff --git a/htdocs/core/tpl/commonfields_add.tpl.php b/htdocs/core/tpl/commonfields_add.tpl.php
index 5ab7e7aa799..8e1c87a7a2e 100644
--- a/htdocs/core/tpl/commonfields_add.tpl.php
+++ b/htdocs/core/tpl/commonfields_add.tpl.php
@@ -50,7 +50,7 @@ foreach ($object->fields as $key => $val) {
 	// Discard if field is a hidden field on form
 	// Ensure $val['visible'] is treated as an integer
 	$visible = (int) $val['visible'];
-	if (abs($visible) != 1 && abs($visible) != 3) {
+	if (abs($visible) != 1 && abs($visible) != 3 && abs($visible) != 6) {
 		continue;
 	}
 
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index f9251809d17..fc064086174 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -83,7 +83,7 @@ class MyObject extends CommonObject
 	 *  'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalInt("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)
+	 *  '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 (not create). 5=Visible on list and view form (not create/not update). 6=visible on list and update/view form (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.
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 80fb22b0838..9322bb6956f 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -104,7 +104,7 @@ class SocieteAccount extends CommonObject
 		'pass_encoding' => array('type' => 'varchar(24)', 'label' => 'PassEncoding', 'visible' => 0, 'enabled' => 1, 'position' => 30),
 		'pass_crypted' => array('type' => 'password', 'label' => 'Password', 'visible' => -1, 'enabled' => 1, 'position' => 31, 'notnull' => 1),
 		'pass_temp'    => array('type' => 'varchar(128)', 'label' => 'Temp', 'visible' => 0, 'enabled' => 0, 'position' => 32, 'notnull' => -1,),
-		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'visible' => 1, 'enabled' => 1, 'position' => 40, 'notnull' => -1, 'index' => 1, 'picto' => 'company', 'css' => 'maxwidth300 widthcentpercentminusxx'),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'visible' => -6, 'enabled' => 1, 'position' => 40, 'notnull' => -1, 'index' => 1, 'picto' => 'company', 'css' => 'maxwidth300 widthcentpercentminusxx'),
 		'site' => array('type' => 'varchar(128)', 'label' => 'WebsiteTypeLabel', 'visible' => 0, 'enabled' => 0, 'position' => 41, 'notnull' => 1, 'default' => '', 'help' => 'Name of the website or service if this is account on an external website or service', 'csslist' => 'tdoverflowmax150', 'arrayofkeyval' => array(/* For static analysis, filled in constructor */)),
 		'fk_website' => array('type' => 'integer:Website:website/class/website.class.php', 'label' => 'WebSite', 'visible' => 0, 'enabled' => 0, 'position' => 42, 'notnull' => -1, 'index' => 1, 'picto' => 'website', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
 		'site_account' => array('type' => 'varchar(128)', 'label' => 'ExternalSiteAccount', 'visible' => 0, 'enabled' => 1, 'position' => 44, 'help' => 'A key to identify the account on external web site if this is an account on an external website'),
@@ -148,6 +148,10 @@ class SocieteAccount extends CommonObject
 	 * @var string
 	 */
 	public $pass_crypted;
+	/**
+	 * @var string
+	 */
+	public $pass;
 	/**
 	 * @var string
 	 */
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 1fa3b0678f7..e245f49d91b 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -472,10 +472,10 @@ $objecttmp = new SocieteAccount($db);
 $trackid = 'thi'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-/*if ($sall)
+/*if ($search_all)
 {
 	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ', $fieldstosearchall).'</div>';
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all) . join(', ', $fieldstosearchall).'</div>';
 }*/
 
 $moreforfilter = '';
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index b0b00dcb2e3..c76229eb804 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -415,6 +415,11 @@ 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');
 			}
 
+			// Modify
+			if ($permissiontoadd) {
+				print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.(!empty($object->socid) ? '&socid='.$object->socid : '').'&action=edit&token='.newToken(), '', $permissiontoadd);
+			}
+
 			// Clone
 			if ($permissiontoadd) {
 				print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.(!empty($object->socid) ? '&socid='.$object->socid : '').'&action=clone&token='.newToken(), '', $permissiontoadd);

From 288f37a4b8f0765cbe20e54952fe0db78cade4d5 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 4 Feb 2025 14:10:12 +0100
Subject: [PATCH 441/602] Missing info in link

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

diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index f6d344cb376..f2ba0fe9c18 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -261,7 +261,7 @@ if ($result > 0) {
 			print '<tr>';
 			print '<td>'.$langs->trans('BankTransactionLine').'</td>';
 			print '<td>';
-			print $bankline->getNomUrl(1, 0, 'showconciliated');
+			print $bankline->getNomUrl(1, 0, 'showconciliatedandaccounted');
 			print '</td>';
 			print '</tr>';
 		}

From 6c9f3f64f24606f504b6049aff70867a3697aa97 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 4 Feb 2025 14:10:13 +0100
Subject: [PATCH 442/602] Missing info in link


From 66dc3e810a241ad75af2dd2488cc5b22465d807e Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 4 Feb 2025 15:06:28 +0100
Subject: [PATCH 443/602] Debug v21

---
 htdocs/comm/action/index.php   | 13 ++++++-------
 htdocs/comm/action/peruser.php |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 86b41f9d7ad..e7dcc756305 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -477,7 +477,7 @@ if ($mode == 'show_day') {
 	$picto = 'calendarday';
 }
 if (empty($conf->dol_optimize_smallscreen)) {
-	$nav .= ' &nbsp; <a href="?year='.$nowyear.'&month='.$nowmonth.'&day='.$nowday.$param.'" class="datenowlink">'.$langs->trans("Today").'</a> ';
+	$nav .= ' <a href="?year='.$nowyear.'&month='.$nowmonth.'&day='.$nowday.$param.'" class="datenowlink marginleftonly marginrightonly">'.$langs->trans("Today").'</a> ';
 }
 $nav .= '</div>';
 
@@ -581,7 +581,6 @@ if ($user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda'
 
 // Define the legend/list of calendard to show
 $s = '';
-$link = '';
 
 
 $showextcals = $listofextcals;
@@ -726,14 +725,14 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 	if (!preg_match('/showbirthday=/i', $newparam)) {
 		$newparam .= '&showbirthday=1';
 	}
-	$link = '<a href="'.$_SERVER['PHP_SELF'].'?'.dol_escape_htmltag($newparam);
-	$link .= '">';
+	$s = '<a href="'.$_SERVER['PHP_SELF'].'?'.dol_escape_htmltag($newparam);
+	$s .= '">';
 	if (empty($showbirthday)) {
-		$link .= $langs->trans("AgendaShowBirthdayEvents");
+		$s .= $langs->trans("AgendaShowBirthdayEvents");
 	} else {
-		$link .= $langs->trans("AgendaHideBirthdayEvents");
+		$s .= $langs->trans("AgendaHideBirthdayEvents");
 	}
-	$link .= '</a>';
+	$s .= '</a>';
 }
 
 
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 8457f983e5d..e17bbc316f6 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -433,7 +433,7 @@ $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_mo
 $nav .= " </span>\n";
 $nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\" title=\"".dol_escape_htmltag($langs->trans("Next"))."\"></i></a>\n";
 if (empty($conf->dol_optimize_smallscreen)) {
-	$nav .= ' &nbsp; <a href="?year='.$nowyear.'&month='.$nowmonth.'&day='.$nowday.$param.'" class="datenowlink">'.$langs->trans("Today").'</a> ';
+	$nav .= ' <a href="?year='.$nowyear.'&month='.$nowmonth.'&day='.$nowday.$param.'" class="datenowlink marginleftonly marginrightonly">'.$langs->trans("Today").'</a> ';
 }
 $nav .= '</div>';
 $nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);

From 0a958e98ec7646f7071d5997dad5dbfb422683b2 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Tue, 4 Feb 2025 16:16:02 +0100
Subject: [PATCH 444/602] NEW: takepos cash control: add vat taxless total

---
 htdocs/compta/cashcontrol/report.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index d4d1d6d758f..4b9d33c32af 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -226,6 +226,7 @@ if ($resql) {
 	$totalqty = 0;
 	$totalvat = 0;
 	$totalvatperrate = array();
+	$totalhtperrate = array();
 	$totallocaltax1 = 0;
 	$totallocaltax2 = 0;
 	$cachebankaccount = array();
@@ -257,8 +258,10 @@ if ($resql) {
 				if ($line->tva_tx) {
 					if (empty($totalvatperrate[$line->tva_tx])) {
 						$totalvatperrate[$line->tva_tx] = 0;
+						$totalhtperrate[$line->tva_tx] = 0;
 					}
 					$totalvatperrate[$line->tva_tx] += $line->total_tva;
+					$totalhtperrate[$line->tva_tx] += $line->total_ht;
 				}
 				$totallocaltax1 += $line->total_localtax1;
 				$totallocaltax2 += $line->total_localtax2;
@@ -448,9 +451,9 @@ if ($resql) {
 	}
 
 	if (!empty($totalvatperrate) && is_array($totalvatperrate)) {
-		print '<br><br><div class="small inline-block">'.$langs->trans("VATRate").'</div>';
+		print '<br><br><div class="small inline-block width100">'.$langs->trans("TotalHT").'</div><div class="small inline-block width100">'.$langs->trans("TotalVAT").'</div>';
 		foreach ($totalvatperrate as $keyrate => $valuerate) {
-			print '<br><div class="small">'.$langs->trans("VATRate").' '.vatrate($keyrate, true).' : <div class="inline-block amount width100"></div><div class="inline-block amount width100">'.price($valuerate).'</div></div>';
+			print '<br><div class="small">'.$langs->trans("VATRate").' '.vatrate($keyrate, true).' : <div class="inline-block amount width100">'.price($totalhtperrate[$keyrate] ?? 0).'</div><div class="inline-block amount width100">'.price($valuerate).'</div></div>';
 		}
 	}
 

From fda8e56ded3a49db04005dfa79c32689d6b75d36 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 4 Feb 2025 16:30:06 +0100
Subject: [PATCH 445/602] CSS

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

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 31f7fc7ca20..451802d6c84 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -799,7 +799,7 @@ if ($action == 'create') {
 		if ($object->type == Account::TYPE_SAVINGS || $object->type == Account::TYPE_CURRENT) {
 			print '<table class="border tableforfield centpercent">';
 
-			print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("BankName").'</td>';
+			print '<tr><td class="titlefieldmiddle">'.$langs->trans("BankName").'</td>';
 			print '<td>'.$object->bank.'</td></tr>';
 
 			$ibankey = FormBank::getIBANLabel($object);

From 41dd4e884e6d7fb89e007c43e398e9926b18afc9 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 4 Feb 2025 17:20:42 +0100
Subject: [PATCH 446/602] Debug v21

---
 htdocs/core/ajax/ajaxdirpreview.php | 2 +-
 htdocs/core/lib/files.lib.php       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 51f053c9eda..6a826b5a126 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -300,7 +300,7 @@ if ($type == 'directory') {
 
 	// Automatic list
 	if (in_array($module, $automodules)) {
-		$param .= '&module='.$module;
+		$param .= '&module='.urlencode($module);
 		if (isset($search_doc_ref) && $search_doc_ref != '') {
 			$param .= '&search_doc_ref='.urlencode($search_doc_ref);
 		}
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 16e56bdff81..a6012f37864 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -250,7 +250,7 @@ function dol_dir_list($utf8_path, $types = "all", $recursive = 0, $filter = "",
  * Scan a directory and return a list of files/directories.
  * Content for string is UTF8 and dir separator is "/".
  *
- * @param	string		$path        	Starting path from which to search. Example: 'produit/MYPROD'
+ * @param	string		$path        	Starting path from which to search. Example: 'produit/MYPROD' or 'produit/%'
  * @param	string		$filter        	Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function
  * @param	string[]|null	$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview.*\.png)$','^\.'))
  * @param	string		$sortcriteria	Sort criteria ("","fullname","name","date","size")
@@ -272,9 +272,9 @@ function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $s
 		$sql .= ", description";
 	}
 	$sql .= " FROM ".MAIN_DB_PREFIX."ecm_files";
-	$sql .= " WHERE entity = ".$conf->entity;
+	$sql .= " WHERE entity = ".((int) $conf->entity);
 	if (preg_match('/%$/', $path)) {
-		$sql .= " AND filepath LIKE '".$db->escape($path)."'";
+		$sql .= " AND (filepath LIKE '".$db->escape($path)."' OR filepath = '".$db->escape(preg_replace('/\/%$/', '', $path))."')";
 	} else {
 		$sql .= " AND filepath = '".$db->escape($path)."'";
 	}

From ab4eb1f8341c73e112443b352c4815eb2228981c Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 4 Feb 2025 18:46:20 +0100
Subject: [PATCH 447/602] WIP Dir statement in ECM

---
 htdocs/core/ajax/ajaxdirpreview.php       |  6 +-
 htdocs/core/class/html.formfile.class.php |  9 ++-
 htdocs/core/lib/files.lib.php             | 86 +++++++++++++----------
 htdocs/ecm/index_auto.php                 |  3 +
 4 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 51f053c9eda..cf4bf9f79bc 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -233,6 +233,7 @@ if ($type == 'directory') {
 		'holiday',
 		'recruitment-recruitmentcandidature',
 		'banque',
+		'bank-statement',
 		'chequereceipt',
 		'mrp-mo'
 	);
@@ -286,6 +287,8 @@ if ($type == 'directory') {
 		$upload_dir = $conf->recruitment->dir_output.'/recruitmentcandidature';
 	} elseif ($module == 'banque') {
 		$upload_dir = $conf->bank->dir_output;
+	} elseif ($module == 'bank-statement') {
+		$upload_dir = $conf->bank->dir_output.'/*/statement';
 	} elseif ($module == 'chequereceipt') {
 		$upload_dir = $conf->bank->dir_output.'/checkdeposits';
 	} elseif ($module == 'mrp-mo') {
@@ -300,7 +303,7 @@ if ($type == 'directory') {
 
 	// Automatic list
 	if (in_array($module, $automodules)) {
-		$param .= '&module='.$module;
+		$param .= '&module='.urlencode($module);
 		if (isset($search_doc_ref) && $search_doc_ref != '') {
 			$param .= '&search_doc_ref='.urlencode($search_doc_ref);
 		}
@@ -309,6 +312,7 @@ if ($type == 'directory') {
 
 		$filter = preg_quote((string) $search_doc_ref, '/');
 		$filearray = dol_dir_list($upload_dir, "files", 1, $filter, $excludefiles, $sortfield, $sorting, 1);
+		//var_dump($filearray);
 
 		// To allow external users,we must restrict $filearray to entries the user is a thirdparty.
 		// This can be done by filtering on entries found into llx_ecm
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 54b63b884d3..85cedff7d47 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1837,7 +1837,7 @@ class FormFile
 		}
 
 		print '<div class="div-table-responsive-no-min">';
-		print '<table width="100%" class="noborder">'."\n";
+		print '<table class="noborder centpercent">'."\n";
 
 		if (!empty($addfilterfields)) {
 			print '<tr class="liste_titre nodrag nodrop">';
@@ -1927,6 +1927,9 @@ class FormFile
 		} elseif ($modulepart == 'banque') {
 			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 			$object_instance = new Account($this->db);
+		} elseif ($modulepart == 'bank-statement') {
+			//include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+			$object_instance = null;
 		} elseif ($modulepart == 'chequereceipt') {
 			include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 			$object_instance = new RemiseCheque($this->db);
@@ -2050,8 +2053,8 @@ class FormFile
 							$result = $object_instance->fetch($id);
 						} else {
 							if (!($result = $object_instance->fetch(0, $ref))) {
-								//fetchOneLike looks for objects with wildcards in its reference.
-								//It is useful for those masks who get underscores instead of their actual symbols (because the _ had replaced all forbidden chars into filename)
+								// fetchOneLike looks for objects with wildcards in its reference.
+								// It is useful for those masks who get underscores instead of their actual symbols (because the _ had replaced all forbidden chars into filename)
 								// TODO Example when this is needed ?
 								// This may find when ref is 'A_B' and date was stored as 'A~B' into database, but in which case do we have this ?
 								// May be we can add hidden option to enable this.
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 345d170ff2d..3b61c736971 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -62,7 +62,7 @@ function dol_basename($pathfile)
  */
 function dol_dir_list($utf8_path, $types = "all", $recursive = 0, $filter = "", $excludefilter = null, $sortcriteria = "name", $sortorder = SORT_ASC, $mode = 0, $nohook = 0, $relativename = "", $donotfollowsymlinks = 0, $nbsecondsold = 0)
 {
-	global $db, $hookmanager;
+	global $hookmanager;
 	global $object;
 
 	if ($recursive <= 1) {	// Avoid too verbose log
@@ -97,43 +97,52 @@ function dol_dir_list($utf8_path, $types = "all", $recursive = 0, $filter = "",
 	$loadsize = ($mode == 1 || $mode == 3 || $sortcriteria == 'size');
 	$loadperm = ($mode == 1 || $mode == 4 || $sortcriteria == 'perm');
 
-	// Clean parameters
-	$utf8_path = preg_replace('/([\\/]+)$/', '', $utf8_path);
-	$os_path = dol_osencode($utf8_path);
 	$now = dol_now();
-
 	$reshook = 0;
 	$file_list = array();
 
-	if (!$nohook && $hookmanager instanceof HookManager) {
-		$hookmanager->resArray = array();
+	// Clean parameters
+	$utf8_path = preg_replace('/([\\/]+)$/', '', $utf8_path);
 
-		$hookmanager->initHooks(array('fileslib'));
-
-		$parameters = array(
-			'path' => $os_path,
-			'types' => $types,
-			'recursive' => $recursive,
-			'filter' => $filter,
-			'excludefilter' => $exclude_array,  // Already converted to array.
-			'sortcriteria' => $sortcriteria,
-			'sortorder' => $sortorder,
-			'loaddate' => $loaddate,
-			'loadsize' => $loadsize,
-			'mode' => $mode
-		);
-		$reshook = $hookmanager->executeHooks('getDirList', $parameters, $object);
+	if (preg_match('/\*/', $utf8_path)) {
+		$utf8_path_array = glob($utf8_path, GLOB_ONLYDIR);	// This scan dir for files. If file does not exists, return empty.
+		//$os_path_array = dol_dir_list($utf8_path);
+	} else {
+		$utf8_path_array = array($utf8_path);
 	}
 
-	// $hookmanager->resArray may contain array stacked by other modules
-	if (empty($reshook)) {
-		if (!is_dir($os_path)) {
-			return array();
+	foreach ($utf8_path_array as $utf8_path_cursor) {
+		$os_path = dol_osencode($utf8_path_cursor);
+		if (!$nohook && $hookmanager instanceof HookManager) {
+			$hookmanager->resArray = array();
+
+			$hookmanager->initHooks(array('fileslib'));
+
+			$parameters = array(
+				'path' => $os_path,
+				'types' => $types,
+				'recursive' => $recursive,
+				'filter' => $filter,
+				'excludefilter' => $exclude_array,  // Already converted to array.
+				'sortcriteria' => $sortcriteria,
+				'sortorder' => $sortorder,
+				'loaddate' => $loaddate,
+				'loadsize' => $loadsize,
+				'mode' => $mode
+			);
+			$reshook = $hookmanager->executeHooks('getDirList', $parameters, $object);
 		}
 
-		if (($dir = opendir($os_path)) === false) {
-			return array();
-		} else {
+		// $hookmanager->resArray may contain array stacked by other modules
+		if (empty($reshook)) {
+			if (!is_dir($os_path)) {
+				continue;
+			}
+
+			if (($dir = opendir($os_path)) === false) {
+				continue;
+			}
+
 			$filedate = '';
 			$filesize = '';
 			$fileperm = '';
@@ -149,7 +158,7 @@ function dol_dir_list($utf8_path, $types = "all", $recursive = 0, $filter = "",
 
 				$qualified = 1;
 
-				$utf8_fullpathfile = "$utf8_path/$utf8_file";  // Temp variable for speed
+				$utf8_fullpathfile = $utf8_path_cursor."/".$utf8_file;  // Temp variable for speed
 
 				// Check if file is qualified
 				foreach ($excludefilterarray as $filt) {
@@ -230,14 +239,14 @@ function dol_dir_list($utf8_path, $types = "all", $recursive = 0, $filter = "",
 				}
 			}
 			closedir($dir);
-
-			// Obtain a list of columns
-			if (!empty($sortcriteria) && $sortorder) {
-				$file_list = dol_sort_array($file_list, $sortcriteria, ($sortorder == SORT_ASC ? 'asc' : 'desc'));
-			}
 		}
 	}
 
+	// Obtain a list of columns
+	if (!empty($sortcriteria) && $sortorder) {
+		$file_list = dol_sort_array($file_list, $sortcriteria, ($sortorder == SORT_ASC ? 'asc' : 'desc'));
+	}
+
 	if ($hookmanager instanceof HookManager && is_array($hookmanager->resArray)) {
 		$file_list = array_merge($file_list, $hookmanager->resArray);
 	}
@@ -250,7 +259,7 @@ function dol_dir_list($utf8_path, $types = "all", $recursive = 0, $filter = "",
  * Scan a directory and return a list of files/directories.
  * Content for string is UTF8 and dir separator is "/".
  *
- * @param	string		$path        	Starting path from which to search. Example: 'produit/MYPROD'
+ * @param	string		$path        	Starting path from which to search. Example: 'produit/MYPROD' or 'produit/%'
  * @param	string		$filter        	Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function
  * @param	string[]|null	$excludefilter  Array of Regex for exclude filter (example: array('(\.meta|_preview.*\.png)$','^\.'))
  * @param	string		$sortcriteria	Sort criteria ("","fullname","name","date","size")
@@ -272,9 +281,9 @@ function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $s
 		$sql .= ", description";
 	}
 	$sql .= " FROM ".MAIN_DB_PREFIX."ecm_files";
-	$sql .= " WHERE entity = ".$conf->entity;
+	$sql .= " WHERE entity = ".((int) $conf->entity);
 	if (preg_match('/%$/', $path)) {
-		$sql .= " AND filepath LIKE '".$db->escape($path)."'";
+		$sql .= " AND (filepath LIKE '".$db->escape($path)."' OR filepath = '".$db->escape(preg_replace('/\/%$/', '', $path))."')";
 	} else {
 		$sql .= " AND filepath = '".$db->escape($path)."'";
 	}
@@ -3577,7 +3586,6 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			if ($fuser->hasRight($tmpmodule, $read) || preg_match('/^specimen/i', $original_file)) {
 				$accessallowed = 1;
 			}
-
 			$original_file = $conf->$tmpmodule->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 		} else {
 			if (empty($conf->$modulepart->dir_output)) {	// modulepart not supported
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index b7b30ba4d1e..d6f9f5142f2 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -393,6 +393,9 @@ if (!getDolGlobalString('ECM_AUTO_TREE_HIDEN')) {
 		$langs->load("banks");
 		$rowspan++;
 		$sectionauto[] = array('position' => 180, 'level' => 1, 'module' => 'banque', 'test' => isModEnabled('bank'), 'label' => $langs->trans("BankAccount"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount")));
+		// TODO Enable this
+		//$rowspan++;
+		//$sectionauto[] = array('position' => 182, 'level' => 1, 'module' => 'bank-statement', 'test' => isModEnabled('bank'), 'label' => $langs->trans("BankAccount").' - '.$langs->trans("Statement"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount").' - '.$langs->transnoentitiesnoconv("Statement")));
 		$rowspan++;
 		$sectionauto[] = array('position' => 190, 'level' => 1, 'module' => 'chequereceipt', 'test' => isModEnabled('bank'), 'label' => $langs->trans("CheckReceipt"), 'desc' => $langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("CheckReceipt")));
 	}

From fa846254e54a8dc44395318c61508f93aaa9f4e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Tue, 4 Feb 2025 20:42:07 +0100
Subject: [PATCH 448/602] fix phpstan

---
 dev/build/phpstan/phpstan-baseline.neon |  6 ------
 htdocs/core/ajax/ajaxdirpreview.php     | 18 +++++++++---------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index d93d80a939d..4f95b73a9fb 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -8034,12 +8034,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/ajax/ajaxdirpreview.php
 
-		-
-			message: '#^Variable \$module might not be defined\.$#'
-			identifier: variable.undefined
-			count: 34
-			path: ../../../htdocs/core/ajax/ajaxdirpreview.php
-
 		-
 			message: '#^Variable \$section might not be defined\.$#'
 			identifier: variable.undefined
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index cf4bf9f79bc..e15ee650179 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -1,12 +1,12 @@
 <?php
-/* Copyright (C) 2004-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Simon Tosser         <simon@kornog-computing.com>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2010	   Pierre Morin         <pierre.morin@auguria.net>
- * Copyright (C) 2013      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2024      MDW                  <mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+/* Copyright (C) 2004-2007  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005       Simon Tosser            <simon@kornog-computing.com>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2010	    Pierre Morin            <pierre.morin@auguria.net>
+ * Copyright (C) 2013       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2024       MDW                     <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.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
@@ -49,7 +49,7 @@ if (!defined('NOREQUIREAJAX')) {
  * @var Translate $langs
  * @var User $user
  */
-
+$module = '';
 if (!isset($mode) || $mode != 'noajax') {    // For ajax call
 	require_once '../../main.inc.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

From 46f17187dc7f658ccab1393ddeeb46391a051344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 4 Feb 2025 20:59:46 +0100
Subject: [PATCH 449/602] Update societeaccount.class.php

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

diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 9322bb6956f..4a386774140 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -94,7 +94,7 @@ class SocieteAccount extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 
 	public $fields = array(

From 076a329a041d130dc376c42e4581317d2fcc1703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 4 Feb 2025 21:06:19 +0100
Subject: [PATCH 450/602] Update commonobject.class.php

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 87aebb5c6eb..04c180cd5b2 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -140,7 +140,7 @@ abstract class CommonObject
 
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>	Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>	Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array();
 

From d648159cb1063f6ad38892d8f011895b60bf5654 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 4 Feb 2025 22:43:01 +0100
Subject: [PATCH 451/602] Fix for marketplace

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

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 00de6abe9ae..c243285abe2 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -1080,10 +1080,11 @@ function getNbOfImagePublicURLOfObject($object)
  * @param	Object	$object			Object
  * @param	int		$no				Numero of image (if there is several images. 1st one by default)
  * @param   string  $extName        Extension to differentiate thumb file name ('', '_small', '_mini')
+ * @param	int		$cover			1=Add a filter on field "cover", 0=Exclude "cover" images, -1=No filter
  * @return  string					HTML img content or '' if no image found
  * @see getNbOfImagePublicURLOfObject(), getPublicFilesOfObject(), getImageFromHtmlContent()
  */
-function getImagePublicURLOfObject($object, $no = 1, $extName = '')
+function getImagePublicURLOfObject($object, $no = 1, $extName = '', $cover = -1)
 {
 	global $db;
 
@@ -1098,6 +1099,7 @@ function getImagePublicURLOfObject($object, $no = 1, $extName = '')
 	$sql .= " WHERE entity IN (".getEntity($object->element).")";
 	$sql .= " AND src_object_type = '".$db->escape($object->element)."' AND src_object_id = ".((int) $object->id);	// Filter on object
 	$sql .= " AND ".$db->regexpsql('filename', $regexforimg, 1);
+	$sql .= ($cover >= 0 ? " AND cover = ".((int) $cover) : "");
 	$sql .= $db->order("cover,position,rowid", "ASC,ASC,ASC");
 
 	$resql = $db->query($sql);

From 0cc61215a939d5d096438509f169198f1ec32fbb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Feb 2025 22:56:35 +0100
Subject: [PATCH 452/602] Update accountancyimport.class.php

---
 htdocs/accountancy/class/accountancyimport.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyimport.class.php b/htdocs/accountancy/class/accountancyimport.class.php
index 32cb1dc8405..7ce2554c1d4 100644
--- a/htdocs/accountancy/class/accountancyimport.class.php
+++ b/htdocs/accountancy/class/accountancyimport.class.php
@@ -113,12 +113,12 @@ class AccountancyImport
 
 
 	/**
-	 *  Compute direction
+	 * Compute direction
 	 *
 	 * @param   array       $arrayrecord        Array of read values: [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=string), [fieldpos+1]...
 	 * @param   array       $listfields         Fields list to add
 	 * @param 	int			$record_key         Record key
-	 * @return  mixed							Value
+	 * @return  string							Value D or C or ""
 	 */
 	public function computeDirection(&$arrayrecord, $listfields, $record_key)
 	{
@@ -132,7 +132,7 @@ class AccountancyImport
 				$sens = 'C';
 			}
 
-			return $this->db->escape($sens);
+			return $sens;
 		}
 
 		return "";

From eb58bf92d7fea5c4a90e01cd5bdde0e322200f75 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Feb 2025 23:17:22 +0100
Subject: [PATCH 453/602] Update upgrade2.php

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

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index a0af8634baa..92e58782523 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -4135,7 +4135,7 @@ function migrate_delete_old_files($db, $langs, $conf)
 		//print '<b>'DOL_DOCUMENT_ROOT.$filetodelete."</b><br>\n";
 		if (preg_match('/\*/', $filetodelete) || file_exists(DOL_DOCUMENT_ROOT.$filetodelete)) {
 			//print "Process file ".$filetodelete."\n";
-			$result = dol_delete_file(DOL_DOCUMENT_ROOT.$filetodelete, 0, 1, 0, null, true, false); // nophperrors to avoid false positive with asterisk
+			$result = dol_delete_file(DOL_DOCUMENT_ROOT.$filetodelete, 0, (preg_match('/\*/', $filetodelete) ? 1 : 0), 0, null, true, false); // nophperrors to avoid false positive with asterisk
 			if (!$result) {
 				$langs->load("errors");
 				print '<div class="error">'.$langs->trans("Error").': '.$langs->trans("ErrorFailToDeleteFile", DOL_DOCUMENT_ROOT.$filetodelete);

From efeeab4108e6d8d7af47be7dc982d753fc92853c Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 4 Feb 2025 23:58:14 +0100
Subject: [PATCH 454/602] Debug v22

---
 htdocs/core/ajax/ajaxdirpreview.php             | 4 ++++
 htdocs/core/class/html.form.class.php           | 2 +-
 htdocs/modulebuilder/template/myobject_list.php | 2 +-
 htdocs/user/group/list.php                      | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index cf4bf9f79bc..cfab01f54a4 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -96,11 +96,15 @@ if (!isset($mode) || $mode != 'noajax') {    // For ajax call
 	}
 } else {
 	// When no an ajax call (include from other file)
+	/*
+	 * @var string $module
+	 */
 	'
 	@phan-var-force int $section
 	@phan-var-force string $module
 	@phan-var-force string $showonrightsize
 	';
+
 	$rootdirfordoc = $conf->ecm->dir_output;
 
 	$ecmdir = new EcmDirectory($db);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 2faab59a652..57769c5b7cd 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -9449,7 +9449,7 @@ class Form
 	 * @param string 	$htmlname 	Name of HTML field
 	 * @param array<string,array{label:string,checked:string,enabled?:string,type?:string,langfile?:string,position?:int,help?:string}> 	$array 	Array with array of fields we could show. This array may be modified according to setup of user.
 	 * @param string 	$varpage 	Id of context for page. Can be set by caller with $varpage=(empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage);
-	 * @param string 	$pos 		Position colon on liste value 'left' or '' (meaning 'right').
+	 * @param string 	$pos 		Position of the colon in list: 'left' or '' (meaning 'right').
 	 * @return string            	HTML multiselect string
 	 * @see selectarray()
 	 */
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 85bf290801a..2451c35d972 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -606,7 +606,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column);  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column ? 'left' : '');  // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index f892164abf2..8c7a4d1b5fb 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -355,7 +355,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column);  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column ? 'left' : '');  // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 

From db640de728d7429564b69bcc795ebf0017495631 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 00:02:41 +0100
Subject: [PATCH 455/602] Update expensereport_linktofile.tpl.php

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

diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index b789360e3f2..689fe8903fb 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -95,7 +95,7 @@ if (!getDolGlobalString('EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES')) {
 				}
 				print '<div class="photoref backgroundblank">';
 
-				print $thumbshown ? $thumbshown : ($minifile ? img_mime($minifile): '');
+				print $thumbshown ? $thumbshown : (empty($minifile) ? '' : img_mime($minifile));
 
 				print '</div>';
 				if (empty($urlforhref) || empty($thumbshown)) {

From 39d15ffde2d454a7c3c1e163cf3eb1a85657ea8b Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 00:06:43 +0100
Subject: [PATCH 456/602] Fix annotation

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

diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index cfab01f54a4..b86ab79058f 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -96,7 +96,7 @@ if (!isset($mode) || $mode != 'noajax') {    // For ajax call
 	}
 } else {
 	// When no an ajax call (include from other file)
-	/*
+	/**
 	 * @var string $module
 	 */
 	'

From ac7269eb686f670979b7f8d1f6364fb4be58650c Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 00:10:06 +0100
Subject: [PATCH 457/602] Fix phpstan

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

diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index d9fe89e164a..b3f9759ac87 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -517,7 +517,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column);  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column ? 'left' : '');  // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -744,7 +744,7 @@ while ($i < $imaxinloop) {
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
 				print '<td'.($cssforfield ? ' class="'.$cssforfield.((preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key) && !in_array($key, array('ref'))) {
-					print ' title="'.dol_escape_htmltag($object->$key).'"';
+					print ' title="'.dolPrintHTMLForAttribute((string) $object->$key).'"';
 				}
 				print '>';
 				if ($key == 'status') {

From 9cafa5f1a982ffe34700df900a6184084d187d33 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 00:32:27 +0100
Subject: [PATCH 458/602] Fix phan

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

diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 9322bb6956f..c28581683b7 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -94,7 +94,7 @@ class SocieteAccount extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 
 	public $fields = array(

From 732f97d73cd6d71e8f7a3b71ffd4acf71238e4ea Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 00:40:06 +0100
Subject: [PATCH 459/602] Merge branch 'develop' of
 git@github.com:Dolibarr/dolibarr.git into develop

---
 htdocs/adherents/class/subscription.class.php                 | 2 +-
 htdocs/asset/class/asset.class.php                            | 2 +-
 htdocs/asset/class/assetdepreciationoptions.class.php         | 2 +-
 htdocs/asset/class/assetmodel.class.php                       | 2 +-
 htdocs/bom/class/bom.class.php                                | 2 +-
 htdocs/bom/class/bomline.class.php                            | 2 +-
 htdocs/bookcal/class/availabilities.class.php                 | 2 +-
 htdocs/bookcal/class/calendar.class.php                       | 2 +-
 htdocs/comm/action/class/actioncommreminder.class.php         | 2 +-
 htdocs/comm/propal/class/propal.class.php                     | 2 +-
 htdocs/commande/class/commande.class.php                      | 2 +-
 htdocs/compta/bank/class/account.class.php                    | 2 +-
 htdocs/compta/bank/class/paymentvarious.class.php             | 2 +-
 htdocs/compta/facture/class/facture-rec.class.php             | 2 +-
 htdocs/compta/facture/class/facture.class.php                 | 2 +-
 htdocs/compta/prelevement/class/bonprelevement.class.php      | 2 +-
 htdocs/contrat/class/contrat.class.php                        | 2 +-
 htdocs/contrat/class/contratligne.class.php                   | 2 +-
 htdocs/core/class/ccountry.class.php                          | 2 +-
 htdocs/core/class/commonobject.class.php                      | 2 +-
 htdocs/core/class/defaultvalues.class.php                     | 2 +-
 htdocs/core/class/emailsenderprofile.class.php                | 2 +-
 htdocs/core/class/events.class.php                            | 2 +-
 htdocs/core/class/html.form.class.php                         | 2 +-
 htdocs/core/class/html.formmail.class.php                     | 2 +-
 htdocs/core/class/timespent.class.php                         | 2 +-
 htdocs/emailcollector/class/emailcollector.class.php          | 2 +-
 htdocs/emailcollector/class/emailcollectoraction.class.php    | 2 +-
 htdocs/emailcollector/class/emailcollectorfilter.class.php    | 2 +-
 htdocs/eventorganization/class/conferenceorbooth.class.php    | 2 +-
 .../class/conferenceorboothattendee.class.php                 | 2 +-
 htdocs/expedition/class/expedition.class.php                  | 2 +-
 htdocs/expensereport/class/expensereport_ik.class.php         | 2 +-
 htdocs/expensereport/class/expensereport_rule.class.php       | 2 +-
 htdocs/fourn/class/fournisseur.facture-rec.class.php          | 2 +-
 htdocs/hrm/class/evaluation.class.php                         | 2 +-
 htdocs/hrm/class/evaluationdet.class.php                      | 2 +-
 htdocs/hrm/class/job.class.php                                | 2 +-
 htdocs/hrm/class/position.class.php                           | 2 +-
 htdocs/hrm/class/skill.class.php                              | 2 +-
 htdocs/hrm/class/skilldet.class.php                           | 2 +-
 htdocs/hrm/class/skillrank.class.php                          | 2 +-
 htdocs/intracommreport/class/intracommreport.class.php        | 2 +-
 htdocs/knowledgemanagement/class/knowledgerecord.class.php    | 2 +-
 htdocs/mrp/class/mo.class.php                                 | 2 +-
 htdocs/opensurvey/class/opensurveysondage.class.php           | 2 +-
 htdocs/partnership/class/partnership.class.php                | 2 +-
 htdocs/product/class/product.class.php                        | 2 +-
 htdocs/product/class/productcustomerprice.class.php           | 2 +-
 htdocs/product/class/productfournisseurprice.class.php        | 2 +-
 htdocs/product/inventory/class/inventory.class.php            | 4 ++--
 htdocs/product/stock/class/entrepot.class.php                 | 2 +-
 htdocs/product/stock/class/productlot.class.php               | 2 +-
 .../product/stock/stocktransfer/class/stocktransfer.class.php | 2 +-
 .../stock/stocktransfer/class/stocktransferline.class.php     | 2 +-
 htdocs/projet/class/project.class.php                         | 2 +-
 htdocs/recruitment/class/recruitmentcandidature.class.php     | 2 +-
 htdocs/recruitment/class/recruitmentjobposition.class.php     | 2 +-
 htdocs/salaries/class/paymentsalary.class.php                 | 2 +-
 htdocs/societe/class/companybankaccount.class.php             | 2 +-
 htdocs/societe/class/companypaymentmode.class.php             | 2 +-
 htdocs/societe/class/societe.class.php                        | 2 +-
 htdocs/ticket/class/cticketcategory.class.php                 | 2 +-
 htdocs/variants/class/ProductAttribute.class.php              | 2 +-
 htdocs/variants/class/ProductAttributeValue.class.php         | 2 +-
 htdocs/webhook/class/target.class.php                         | 2 +-
 htdocs/webportal/class/webportalinvoice.class.php             | 2 +-
 htdocs/webportal/class/webportalmember.class.php              | 2 +-
 htdocs/webportal/class/webportalorder.class.php               | 2 +-
 htdocs/webportal/class/webportalpartnership.class.php         | 2 +-
 htdocs/webportal/class/webportalpropal.class.php              | 2 +-
 htdocs/website/class/websitepage.class.php                    | 2 +-
 htdocs/workstation/class/workstation.class.php                | 2 +-
 htdocs/workstation/class/workstationresource.class.php        | 2 +-
 htdocs/workstation/class/workstationusergroup.class.php       | 2 +-
 htdocs/zapier/class/hook.class.php                            | 2 +-
 76 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index 8fa636ca903..a9b1ef730ca 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -98,7 +98,7 @@ class Subscription extends CommonObject
 	public $fk_bank;
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index e90672c6d76..a4600c70283 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -84,7 +84,7 @@ class Asset extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/asset/class/assetdepreciationoptions.class.php b/htdocs/asset/class/assetdepreciationoptions.class.php
index ecd6d276726..16db99fcd02 100644
--- a/htdocs/asset/class/assetdepreciationoptions.class.php
+++ b/htdocs/asset/class/assetdepreciationoptions.class.php
@@ -66,7 +66,7 @@ class AssetDepreciationOptions extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array();
 
diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index fcb463504e4..f985497ed4d 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -89,7 +89,7 @@ class AssetModel extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index d779f11f4d7..49ebde095d7 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -98,7 +98,7 @@ class BOM extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => -2, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/bom/class/bomline.class.php b/htdocs/bom/class/bomline.class.php
index 67b879078df..a26f0c2a9f2 100644
--- a/htdocs/bom/class/bomline.class.php
+++ b/htdocs/bom/class/bomline.class.php
@@ -80,7 +80,7 @@ class BOMLine extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 'LineID', 'enabled' => 1, 'visible' => -1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index 8906b147c82..4dd000ab3d7 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -101,7 +101,7 @@ class Availabilities extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	* @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}> Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	* @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}> 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' => 1, 'notnull' => 1, 'visible' => 2, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/bookcal/class/calendar.class.php b/htdocs/bookcal/class/calendar.class.php
index db5eff037cd..1271b8ec8ac 100644
--- a/htdocs/bookcal/class/calendar.class.php
+++ b/htdocs/bookcal/class/calendar.class.php
@@ -101,7 +101,7 @@ class Calendar extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	* @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}> Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	* @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}> 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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'right', 'comment' => "Id"),
diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index a1d248df806..f7894822fb3 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -71,7 +71,7 @@ class ActionCommReminder extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 4031c5e5361..7aa4d215061 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -356,7 +356,7 @@ class Propal extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 7a68bc13620..28c11b0b566 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -304,7 +304,7 @@ class Commande extends CommonOrder
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 45a30fdef82..d5a7e828953 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -348,7 +348,7 @@ class Account extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 7f38dab7af2..0c8d7c0ac9b 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -198,7 +198,7 @@ class PaymentVarious extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		// TODO: fill this array
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 01d22afb608..7e45aaa7faf 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -235,7 +235,7 @@ class FactureRec extends CommonInvoice
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 5d22fb3f0fe..9ce43e36298 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -321,7 +321,7 @@ class Facture extends CommonInvoice
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>	Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>	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, 'visible' => -1, 'notnull' => 1, 'position' => 1),
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 376a958ee6a..593e4cddf29 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -194,7 +194,7 @@ class BonPrelevement extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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,),
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index c7f1bc8f41a..a50e16dca9e 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -263,7 +263,7 @@ class Contrat extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/contrat/class/contratligne.class.php b/htdocs/contrat/class/contratligne.class.php
index 9b2184c8b03..09c42a1a632 100644
--- a/htdocs/contrat/class/contratligne.class.php
+++ b/htdocs/contrat/class/contratligne.class.php
@@ -299,7 +299,7 @@ class ContratLigne extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index 81be08a78b8..171100943fc 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -63,7 +63,7 @@ class Ccountry extends CommonDict
 
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>
 	 */
 	public $fields = array(
 		'label' => array('type' => 'varchar(250)', 'label' => 'Label', 'enabled' => 1, 'visible' => 1, 'position' => 15, 'notnull' => -1, 'showoncombobox' => 1)
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e69d651a9d6..5056559a2d4 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -140,7 +140,7 @@ abstract class CommonObject
 
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>	Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>	Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array();
 
diff --git a/htdocs/core/class/defaultvalues.class.php b/htdocs/core/class/defaultvalues.class.php
index 0d28daa0958..c92697a4a9f 100644
--- a/htdocs/core/class/defaultvalues.class.php
+++ b/htdocs/core/class/defaultvalues.class.php
@@ -76,7 +76,7 @@ class DefaultValues extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index fb2f9a289e4..bd1034abe3d 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -87,7 +87,7 @@ class EmailSenderProfile extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index d1f80baadb2..1a581c464e6 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -127,7 +127,7 @@ class Events // extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>	Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>	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, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 26971221bab..77e4cec648e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8502,7 +8502,7 @@ class Form
 	 * @param 	int				$forcecombo           	Force to load all values and output a standard combobox (with no beautification)
 	 * @param 	int<0,1>		$disabled             	1=Html component is disabled
 	 * @param	string			$selected_input_value 	Value of preselected input text (for use with ajax)
-	 * @param	string|array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}	$objectfield	'Object:Field' that contains the definition of parent (in table $fields or $extrafields). Example: 'Object:xxx' or 'Object@module:xxx' or 'Object:options_xxx' or 'Object@module:options_xxx' or,  better, the full entry array in ->fields
+	 * @param	string|array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}	$objectfield	'Object:Field' that contains the definition of parent (in table $fields or $extrafields). Example: 'Object:xxx' or 'Object@module:xxx' or 'Object:options_xxx' or 'Object@module:options_xxx' or,  better, the full entry array in ->fields
 	 * @return  string	    							Return HTML string
 	 * @see selectForFormsList(), select_thirdparty_list()
 	 */
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index d86a8cb0fc2..a9b87e75da6 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -2249,7 +2249,7 @@ class ModelMail extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>	Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>	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' => -1,),
diff --git a/htdocs/core/class/timespent.class.php b/htdocs/core/class/timespent.class.php
index fdd8dd83bcd..87bb25277f1 100644
--- a/htdocs/core/class/timespent.class.php
+++ b/htdocs/core/class/timespent.class.php
@@ -101,7 +101,7 @@ class TimeSpent extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 344ac3e1ac4..979e676ee7d 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -110,7 +110,7 @@ class EmailCollector extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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', 'visible' => 2, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1),
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index 198d5ed878f..eea46233dad 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -69,7 +69,7 @@ class EmailCollectorAction extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => -1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index dc32722847e..3611bdfdbbc 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -71,7 +71,7 @@ class EmailCollectorFilter extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => -1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 6d435671c79..b1c42a70ab2 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -100,7 +100,7 @@ class ConferenceOrBooth extends ActionComm
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'id' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'csslist' => 'left', 'comment' => "Id"),
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index ccdb2ade31a..77357da66d6 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -92,7 +92,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index b46fd85ccfd..a68cc64de77 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -86,7 +86,7 @@ class Expedition extends CommonObject
 
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array();
 
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index de6296fe230..42e8c4abd46 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -73,7 +73,7 @@ class ExpenseReportIk extends CommonObject
 
 	/**
 	 * Attribute object linked with database
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 'ID', 'enabled' => 1, 'index' => 1, 'visible' => -1, 'position' => 10),
diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index c84d4b55d93..6995ed3d609 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -110,7 +110,7 @@ class ExpenseReportRule extends CommonObject
 
 	/**
 	 * Attribute object linked with database
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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', 'index' => 1, 'label' => 'ID', 'enabled' => 1, 'visible' => -1, 'position' => 10),
diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index 89cf0c3acb3..bbbfed11139 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -263,7 +263,7 @@ class FactureFournisseurRec extends CommonInvoice
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 51b0c78ed3a..a8f0abe070f 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -92,7 +92,7 @@ class Evaluation extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index 17b98170904..10e55284fba 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -101,7 +101,7 @@ class EvaluationLine extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index 1377ad1db43..a98c9fd4d85 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -90,7 +90,7 @@ class Job extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 09099e9a1fd..d148f0fa403 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -89,7 +89,7 @@ class Position extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 2, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index 9c8239465aa..57c198c9e3a 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -95,7 +95,7 @@ class Skill extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index cc0d8d1faa5..c5d9f1dc155 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -99,7 +99,7 @@ class Skilldet extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index 06cefd85cc1..34fb53116c6 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -93,7 +93,7 @@ class SkillRank extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index 5bc4c30dfdc..8b8c13051aa 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -101,7 +101,7 @@ class IntracommReport extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>	Array of properties of field to show
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>	Array of properties of field to show
 	 */
 	public $fields = array(
 		"rowid" => array("type" => "integer", "label" => "TechnicalID", "enabled" => 1, 'position' => 10, 'notnull' => 1, "visible" => "0",),
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index f2eb7fb8fe4..8e6b6eaf3fb 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -88,7 +88,7 @@ class KnowledgeRecord extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index c9a54f04c89..a70b5ddd1d2 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -82,7 +82,7 @@ class Mo extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => -2, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id",),
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 3d8135fa900..67a8cee2e0d 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -101,7 +101,7 @@ class Opensurveysondage extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'id_sondage' => array('type' => 'varchar(16)', 'label' => 'Idsondage', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => -1,),
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 86d0cb5700a..0f05deb89fe 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -99,7 +99,7 @@ class Partnership extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index bb42e09c7d0..df26c3c57d1 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -850,7 +850,7 @@ class Product extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>	Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>	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, 'visible' => -2, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 4e3a7bcc92f..ccd7510b6de 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
 class ProductCustomerPrice extends CommonObject
 {
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'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),
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index d6421263010..5f8372f6c83 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -81,7 +81,7 @@ class ProductFournisseurPrice extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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,),
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 6add004e188..0dc3ca67847 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -86,7 +86,7 @@ class Inventory extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),
@@ -837,7 +837,7 @@ class InventoryLine extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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', 'visible' => -1, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 76ddc84ecfb..a64de5937ff 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -158,7 +158,7 @@ class Entrepot extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 'ID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 1c7d90d763c..5eadd6ebbcf 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -144,7 +144,7 @@ class Productlot extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index 0c7a35b4251..1f563ae5fde 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -140,7 +140,7 @@ class StockTransfer extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => "Id"),
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index 841fbdeb54f..f4bc5fa55c7 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -82,7 +82,7 @@ class StockTransferLine extends CommonObjectLine
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => "Id"),
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 5114564141b..76cdb08ea99 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -339,7 +339,7 @@ class Project extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 'ID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 45a3c3a827b..724fffc30e4 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -97,7 +97,7 @@ class RecruitmentCandidature extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => "Id"),
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 67b04b6c05b..e9b353ba8e4 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -102,7 +102,7 @@ class RecruitmentJobPosition extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => "Id"),
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 1097eb06f6d..1c2f47190a1 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -155,7 +155,7 @@ class PaymentSalary extends CommonObject
 	public $datev = '';
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => 0, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 7847255fe64..bfdbf8c7920 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -86,7 +86,7 @@ class CompanyBankAccount extends Account
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => -1,),
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index 107ee3af714..69701cab92c 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -72,7 +72,7 @@ class CompanyPaymentMode extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 'Rowid', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 4d35651b3b2..46f613dd151 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -174,7 +174,7 @@ class Societe extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'),
diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
index d34b0a2187e..ae86cfe6df9 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -87,7 +87,7 @@ class CTicketCategory extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => -1, 'notnull' => 1, 'position' => 10),
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index 07554b580d3..53198494d2a 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -97,7 +97,7 @@ class ProductAttribute 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.
 	 */
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index c84fbb7d6ed..158d00758e9 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -66,7 +66,7 @@ class ProductAttributeValue extends CommonObjectLine
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
 	 */
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index d15e25d5457..64eb5066614 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -90,7 +90,7 @@ class Target extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/webportal/class/webportalinvoice.class.php b/htdocs/webportal/class/webportalinvoice.class.php
index be5c6e808c2..c7112e9aa6b 100644
--- a/htdocs/webportal/class/webportalinvoice.class.php
+++ b/htdocs/webportal/class/webportalinvoice.class.php
@@ -93,7 +93,7 @@ class WebPortalInvoice extends Facture
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>	Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>	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, 'visible' => 0, 'notnull' => 1, 'position' => 1,),
diff --git a/htdocs/webportal/class/webportalmember.class.php b/htdocs/webportal/class/webportalmember.class.php
index 7d50d3ec397..e44a633319a 100644
--- a/htdocs/webportal/class/webportalmember.class.php
+++ b/htdocs/webportal/class/webportalmember.class.php
@@ -109,7 +109,7 @@ class WebPortalMember extends Adherent
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => 0, 'notnull' => 1, 'position' => 10,),
diff --git a/htdocs/webportal/class/webportalorder.class.php b/htdocs/webportal/class/webportalorder.class.php
index 48ac04bbf73..5e7079a69a3 100644
--- a/htdocs/webportal/class/webportalorder.class.php
+++ b/htdocs/webportal/class/webportalorder.class.php
@@ -94,7 +94,7 @@ class WebPortalOrder extends Commande
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => 0, 'notnull' => 1, 'position' => 10,),
diff --git a/htdocs/webportal/class/webportalpartnership.class.php b/htdocs/webportal/class/webportalpartnership.class.php
index 4c8c9f44dbb..d91c64c818e 100644
--- a/htdocs/webportal/class/webportalpartnership.class.php
+++ b/htdocs/webportal/class/webportalpartnership.class.php
@@ -93,7 +93,7 @@ class WebPortalPartnership extends Partnership
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id",),
diff --git a/htdocs/webportal/class/webportalpropal.class.php b/htdocs/webportal/class/webportalpropal.class.php
index 3cff9e7c028..60bae2ebd39 100644
--- a/htdocs/webportal/class/webportalpropal.class.php
+++ b/htdocs/webportal/class/webportalpropal.class.php
@@ -94,7 +94,7 @@ class WebPortalPropal extends Propal
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id",),
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index b2ce563d33a..5df3a715b33 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -198,7 +198,7 @@ class WebsitePage extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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, 'visible' => -1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'),
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index a4e9c3157cd..5b41ab79677 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -96,7 +96,7 @@ class Workstation extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"),
diff --git a/htdocs/workstation/class/workstationresource.class.php b/htdocs/workstation/class/workstationresource.class.php
index 78115ea8da0..36d3638e971 100644
--- a/htdocs/workstation/class/workstationresource.class.php
+++ b/htdocs/workstation/class/workstationresource.class.php
@@ -37,7 +37,7 @@ class WorkstationResource extends CommonObject
 	public $element = 'workstationresource';
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'fk_workstation' => array('type' => 'integer', 'label' => 'Workstation', 'enabled' => 1, 'position' => 10, 'visible' => 1),
diff --git a/htdocs/workstation/class/workstationusergroup.class.php b/htdocs/workstation/class/workstationusergroup.class.php
index ce1f3bea2b8..0f623d57564 100644
--- a/htdocs/workstation/class/workstationusergroup.class.php
+++ b/htdocs/workstation/class/workstationusergroup.class.php
@@ -36,7 +36,7 @@ class WorkstationUserGroup extends CommonObject
 	public $element = 'workstationusergroup';
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
 		'fk_workstation' => array('type' => 'integer', 'label' => 'Workstation', 'enabled' => 1, 'position' => 10, 'visible' => 1),
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index cab56314ff3..a6cae084088 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -72,7 +72,7 @@ class Hook extends CommonObject
 	 */
 
 	/**
-	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-5,5>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 * @var array<string,array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int<-6,6>|string,alwayseditable?:int<0,1>,noteditable?:int<0,1>,default?:string,index?:int,foreignkey?:string,searchall?:int<0,1>,isameasure?:int<0,1>,css?:string,csslist?:string,help?:string,showoncombobox?:int<0,4>,disabled?:int<0,1>,arrayofkeyval?:array<int|string,string>,autofocusoncreate?:int<0,1>,comment?:string,copytoclipboard?:int<1,2>,validate?:int<0,1>,showonheader?:int<0,1>}>  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(

From 24fa28dfe2b17a0f0fc28f4a6554610cd156e455 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 3 Feb 2025 11:24:16 +0100
Subject: [PATCH 460/602] Qual: Fix getKanban phpdoc

# Qual: Fix getKanban phpdoc

Array phpdoc for getKanban corrections.
---
 dev/tools/phan/baseline.txt                   | 17 +++--------
 htdocs/adherents/class/adherent.class.php     |  4 +--
 .../adherents/class/adherent_type.class.php   | 16 +++++------
 htdocs/adherents/class/subscription.class.php | 10 +++----
 htdocs/adherents/subscription/list.php        | 28 +++++++++----------
 htdocs/bookcal/class/availabilities.class.php |  4 +--
 htdocs/bookcal/class/calendar.class.php       |  6 ++--
 htdocs/comm/propal/class/propal.class.php     |  2 +-
 htdocs/compta/bank/class/account.class.php    |  4 +--
 .../bank/class/paymentvarious.class.php       |  4 +--
 .../cashcontrol/class/cashcontrol.class.php   |  6 ++--
 htdocs/compta/facture/class/facture.class.php |  2 +-
 .../compta/localtax/class/localtax.class.php  |  4 +--
 .../cheque/class/remisecheque.class.php       |  4 +--
 .../class/bonprelevement.class.php            |  6 ++--
 .../sociales/class/chargesociales.class.php   |  6 ++--
 htdocs/compta/tva/class/tva.class.php         |  4 +--
 htdocs/contact/class/contact.class.php        |  4 +--
 htdocs/contrat/class/contrat.class.php        |  4 +--
 htdocs/core/class/commonorder.class.php       |  4 +--
 htdocs/don/class/don.class.php                |  4 +--
 .../class/conferenceorbooth.class.php         |  4 +--
 htdocs/expedition/class/expedition.class.php  |  2 +-
 .../class/expensereport.class.php             |  8 ++++--
 .../class/paymentexpensereport.class.php      |  4 +--
 htdocs/fichinter/class/fichinter.class.php    |  4 +--
 .../class/fournisseur.commande.class.php      |  2 +-
 .../fourn/class/fournisseur.facture.class.php |  8 +++---
 .../class/intracommreport.class.php           |  4 +--
 .../class/knowledgerecord.class.php           |  4 +--
 htdocs/loan/class/loan.class.php              |  4 +--
 .../template/class/myobject.class.php         |  4 +--
 htdocs/mrp/class/mo.class.php                 | 10 +++----
 .../partnership/class/partnership.class.php   |  8 +++---
 htdocs/product/class/product.class.php        | 10 +++----
 .../inventory/class/inventory.class.php       |  8 +++---
 htdocs/product/stock/class/entrepot.class.php |  8 +++---
 htdocs/projet/class/project.class.php         | 14 +++++-----
 htdocs/projet/class/task.class.php            |  8 +++---
 htdocs/reception/class/reception.class.php    |  8 +++---
 .../class/recruitmentcandidature.class.php    |  8 +++---
 .../class/recruitmentjobposition.class.php    |  8 +++---
 htdocs/salaries/class/paymentsalary.class.php |  8 +++---
 htdocs/salaries/class/salary.class.php        |  8 +++---
 .../class/supplier_proposal.class.php         |  8 +++---
 htdocs/ticket/class/ticket.class.php          |  9 +++---
 htdocs/user/class/user.class.php              |  8 +++---
 htdocs/user/class/usergroup.class.php         |  8 +++---
 .../variants/class/ProductAttribute.class.php |  4 +--
 .../class/webportalinvoice.class.php          |  8 +++---
 .../webportal/class/webportalorder.class.php  |  4 +--
 .../webportal/class/webportalpropal.class.php |  8 +++---
 .../workstation/class/workstation.class.php   |  8 +++---
 53 files changed, 178 insertions(+), 184 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index efc4c42240a..856529688c3 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,7 +9,7 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 3730+ occurrences
+    // PhanTypeMismatchArgument : 3680+ occurrences
     // PhanUndeclaredProperty : 540+ occurrences
     // PhanTypeMismatchArgumentNullable : 450+ occurrences
     // PhanUndeclaredGlobalVariable : 190+ occurrences
@@ -88,11 +88,9 @@ return [
         'htdocs/adherents/class/adherent.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/adherents/class/adherent_type.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/adherents/class/api_members.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
-        'htdocs/adherents/class/subscription.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/adherents/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable'],
         'htdocs/adherents/stats/geo.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/adherents/subscription.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/adherents/subscription/list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/adherents/type.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty'],
         'htdocs/adherents/vcard.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/agenda_other.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
@@ -288,7 +286,7 @@ return [
         'htdocs/compta/localtax/card.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/compta/localtax/clients.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchArgument'],
         'htdocs/compta/localtax/index.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/compta/localtax/list.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/compta/localtax/list.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/compta/paiement.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchDimFetch'],
         'htdocs/compta/paiement/card.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/compta/paiement/cheque/card.php' => ['PhanTypeMismatchArgument'],
@@ -303,8 +301,6 @@ return [
         'htdocs/compta/prelevement/create.php' => ['PhanTypeMismatchArgument'],
         'htdocs/compta/prelevement/demandes.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/compta/prelevement/line.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
-        'htdocs/compta/prelevement/list.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/compta/prelevement/orders_list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/compta/resultat/clientfourn.php' => ['PhanTypeMismatchArgument'],
         'htdocs/compta/resultat/index.php' => ['PhanTypeMismatchArgument'],
         'htdocs/compta/resultat/projects.php' => ['PhanTypeMismatchArgument'],
@@ -558,7 +554,7 @@ return [
         'htdocs/don/class/don.class.php' => ['PhanParamTooMany'],
         'htdocs/don/document.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/don/info.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/don/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty'],
+        'htdocs/don/list.php' => ['PhanTypeMismatchProperty'],
         'htdocs/don/note.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/don/stats/index.php' => ['PhanTypeMismatchArgument'],
         'htdocs/ecm/class/ecmdirectory.class.php' => ['PhanTypeMismatchArgument'],
@@ -621,10 +617,8 @@ return [
         'htdocs/fourn/class/fournisseur.product.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/fourn/commande/card.php' => ['PhanTypeMismatchDimAssignment', 'PhanTypeSuspiciousStringExpression', 'PhanUndeclaredProperty'],
         'htdocs/fourn/commande/dispatch.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
-        'htdocs/fourn/commande/list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/fourn/facture/card-rec.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/fourn/facture/card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty'],
-        'htdocs/fourn/facture/list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/fourn/facture/paiement.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/fourn/facture/rapport.php' => ['PhanTypeMismatchArgument'],
         'htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
@@ -666,7 +660,6 @@ return [
         'htdocs/loan/class/loan.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/loan/class/paymentloan.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/loan/document.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/loan/list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/loan/note.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/loan/payment/payment.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/loan/schedule.php' => ['PhanTypeMismatchArgument'],
@@ -882,9 +875,8 @@ return [
         'htdocs/salaries/class/salary.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/salaries/document.php' => ['PhanTypeMismatchArgument'],
         'htdocs/salaries/info.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/salaries/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/salaries/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
         'htdocs/salaries/paiement_salary.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
-        'htdocs/salaries/payments.php' => ['PhanTypeMismatchArgument'],
         'htdocs/salaries/stats/index.php' => ['PhanTypeMismatchArgument'],
         'htdocs/salaries/virement_request.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/societe/admin/societe.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredMethod'],
@@ -960,7 +952,6 @@ return [
         'htdocs/user/class/usergroup.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/user/document.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/user/group/card.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/user/group/list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/user/list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/user/param_ihm.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/user/virtualcard.php' => ['PhanTypeMismatchArgument'],
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index a21165c42dd..bcd8753aa95 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -15,7 +15,7 @@
  * Copyright (C) 2020		Josep Lluís Amador 			<joseplluis@lliuretic.cat>
  * Copyright (C) 2021		Waël Almoman            	<info@almoman.com>
  * Copyright (C) 2021		Philippe Grand          	<philippe.grand@atoo-net.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -3344,7 +3344,7 @@ class Adherent extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 1af9ebd608d..7c431a82063 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2018-2019  Thibault Foucart		<support@ptibogxiv.net>
  * Copyright (C) 2021     	Waël Almoman            <info@almoman.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -299,12 +299,12 @@ class AdherentType extends CommonObject
 	}
 
 	/**
-		* Delete a language for this member type
-		*
-		* @param string $langtodelete 	Language code to delete
-		* @param User   $user         	Object user making delete
-		* @return int                   Return integer <0 if KO, >0 if OK
-		*/
+	 * Delete a language for this member type
+	 *
+	 * @param string $langtodelete 	Language code to delete
+	 * @param User   $user         	Object user making delete
+	 * @return int                   Return integer <0 if KO, >0 if OK
+	 */
 	public function delMultiLangs($langtodelete, $user)
 	{
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type_lang";
@@ -1001,7 +1001,7 @@ class AdherentType extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index a9b1ef730ca..c021e335604 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2006-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -166,7 +166,7 @@ class Subscription extends CommonObject
 		}
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."subscription (fk_adherent, fk_type, datec, dateadh, datef, subscription, note, fk_user_creat)";
-		$sql .= " VALUES (".((int) $this->fk_adherent).", '".$this->db->escape($type)."', '".$this->db->idate($now)."',";
+		$sql .= " VALUES (".((int) $this->fk_adherent).", '".$this->db->escape((string) $type)."', '".$this->db->idate($now)."',";
 		$sql .= " '".$this->db->idate($this->dateh)."',";
 		$sql .= " '".$this->db->idate($this->datef)."',";
 		$sql .= " ".((float) $this->amount).",";
@@ -543,9 +543,9 @@ class Subscription extends CommonObject
 	/**
 	 *	Return clickable link of object (with eventually picto)
 	 *
-	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{selected:?int,member:?Adherent,bank:?Account}	$arraydata	Array of data
-	 *  @return		string								HTML Code for Kanban thumb.
+	 *	@param	string					$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array{selected?:int|bool,adherent_type?:AdherentType,member?:Adherent,bank?:Account}	$arraydata	Array of data
+	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index c34a84824cc..a038e3b11f8 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2003		Jean-Louis Bergamo			<jlb@j1b.org>
  * Copyright (C) 2004-2023	Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -102,20 +102,20 @@ $fieldstosearchall = array(
 	'c.note' => "Label",
 );
 $arrayfields = array(
-	'd.ref' => array('label' => "Ref", 'checked' => 1),
-	'd.fk_type' => array('label' => "Type", 'checked' => 1),
-	'd.lastname' => array('label' => "Lastname", 'checked' => 1),
-	'd.firstname' => array('label' => "Firstname", 'checked' => 1),
-	'd.login' => array('label' => "Login", 'checked' => 1),
-	'c.note' => array('label' => "Label", 'checked' => 1),
-	'd.bank' => array('label' => "BankAccount", 'checked' => 1, 'enabled' => (isModEnabled('bank'))),
+	'd.ref' => array('label' => "Ref", 'checked' => '1'),
+	'd.fk_type' => array('label' => "Type", 'checked' => '1'),
+	'd.lastname' => array('label' => "Lastname", 'checked' => '1'),
+	'd.firstname' => array('label' => "Firstname", 'checked' => '1'),
+	'd.login' => array('label' => "Login", 'checked' => '1'),
+	'c.note' => array('label' => "Label", 'checked' => '1'),
+	'd.bank' => array('label' => "BankAccount", 'checked' => '1', 'enabled' => (string) (int) (isModEnabled('bank'))),
 	/*'d.note_public'=>array('label'=>"NotePublic", 'checked'=>0),
 	 'd.note_private'=>array('label'=>"NotePrivate", 'checked'=>0),*/
-	'c.dateadh' => array('label' => "DateSubscription", 'checked' => 1, 'position' => 100),
-	'c.datef' => array('label' => "EndSubscription", 'checked' => 1, 'position' => 101),
-	'd.amount' => array('label' => "Amount", 'checked' => 1, 'position' => 102),
-	'c.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 500),
-	'c.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 500),
+	'c.dateadh' => array('label' => "DateSubscription", 'checked' => '1', 'position' => 100),
+	'c.datef' => array('label' => "EndSubscription", 'checked' => '1', 'position' => 101),
+	'd.amount' => array('label' => "Amount", 'checked' => '1', 'position' => 102),
+	'c.datec' => array('label' => "DateCreation", 'checked' => '0', 'position' => 500),
+	'c.tms' => array('label' => "DateModificationShort", 'checked' => '0', 'position' => 500),
 //	'd.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
 );
 
@@ -223,7 +223,7 @@ if ($search_ref) {
 	}
 }
 if ($search_type > 0) {
-	$sql .= natural_search(array('c.fk_type'), $search_type);
+	$sql .= natural_search(array('c.fk_type'), (string) $search_type);
 }
 if ($search_lastname) {
 	$sql .= natural_search(array('d.lastname', 'd.societe'), $search_lastname);
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index 4dd000ab3d7..ce329cc9620 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2022 Alice Adminson <aadminson@example.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -831,7 +831,7 @@ class Availabilities extends CommonObject
 	 *	Return a thumb for kanban views
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/bookcal/class/calendar.class.php b/htdocs/bookcal/class/calendar.class.php
index 1271b8ec8ac..a6f76aafb1d 100644
--- a/htdocs/bookcal/class/calendar.class.php
+++ b/htdocs/bookcal/class/calendar.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2017		Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024	Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2023		Alice Adminson				<aadminson@example.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -816,8 +816,8 @@ class Calendar extends CommonObject
 	/**
 	 *	Return a thumb for kanban views
 	 *
-	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *	@param      string	    $option					Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param		?array<string,mixed>	$arraydata	Array of data
 	 *  @return		string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 7aa4d215061..5f3e292e106 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -4014,7 +4014,7 @@ class Propal extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index d5a7e828953..050e4267f95 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2016		Ferran Marcet   		<fmarcet@2byte.es>
  * Copyright (C) 2019		JC Prieto				<jcprieto@virtual20.com><prietojc@gmail.com>
  * Copyright (C) 2022-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -2016,7 +2016,7 @@ class Account extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 0c8d7c0ac9b..d46e5bd90dd 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2017-2021  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -825,7 +825,7 @@ class PaymentVarious extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 755c2f711eb..1449d27ffa6 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2016 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2018 Andreu Bisquerra     <jove@bisquerra.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -160,7 +160,7 @@ class CashControl extends CommonObject
 	public $fk_user_creat;
 
 	/**
-	 * @var int|'' $date_valid
+	 * @var int|''
 	 */
 	public $date_valid;
 
@@ -502,7 +502,7 @@ class CashControl extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 3d95be49f56..f9064e51b20 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -6109,7 +6109,7 @@ class Facture extends CommonInvoice
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param	string	    			$option			Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param	array{string,mixed}		$arraydata		Array of data
+	 *  @param	?array<string,mixed>	$arraydata		Array of data
 	 *  @return	string									HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 398c7f443cc..b7725e4f736 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2011-2014	Juanjo Menent	<jmenent@2byte.es>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -671,7 +671,7 @@ class Localtax extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index ddce090b667..33a10159f33 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2011-2016 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -1031,7 +1031,7 @@ class RemiseCheque extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 593e4cddf29..861948151d6 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2014-2016 Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2018      Nicolas ZABOURI      <info@inovea-conseil.com>
  * Copyright (C) 2019      JC Prieto			<jcprieto@virtual20.com><prietojc@gmail.com>
- * Copyright (C) 2024      MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024      Frédéric France      <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -252,7 +252,7 @@ class BonPrelevement extends CommonObject
 	 */
 	public $date_trans;
 	/**
-	 * @var int Current transport method, index to $methodes_trans
+	 * @var int Current transport method, index to `$methodes_trans`
 	 */
 	public $method_trans;
 	/**
@@ -2912,7 +2912,7 @@ class BonPrelevement extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		?array{string,mixed}	$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 97ac741e52e..35a1535e232 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2016-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2017       Alexandre Spangaro	    <aspangaro@open-dsi.fr>
  * Copyright (C) 2021       Gauthier VERDOL		    <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -62,7 +62,7 @@ class ChargeSociales extends CommonObject
 	protected $table_ref_field = 'ref';
 
 	/**
-	 * @var int|string $date_ech
+	 * @var int|string
 	 */
 	public $date_ech;
 
@@ -820,7 +820,7 @@ class ChargeSociales extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 1222d7c1472..3079b6225de 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2018       Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -935,7 +935,7 @@ class Tva extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index e785fc0a520..2dbc8c53381 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2019      Nicolas ZABOURI 	           <info@inovea-conseil.com>
  * Copyright (C) 2020      Open-Dsi  	               <support@open-dsi.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -2248,7 +2248,7 @@ class Contact extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index a50e16dca9e..f1ea95f0024 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2015-2018	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -2921,7 +2921,7 @@ class Contrat extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php
index 5fbf92c7446..9ab9401c570 100644
--- a/htdocs/core/class/commonorder.class.php
+++ b/htdocs/core/class/commonorder.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2012 Regis Houssin  <regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -39,7 +39,7 @@ abstract class CommonOrder extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index da8bc1d2cf0..c1f3065035e 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2019      Thibault FOUCART     <support@ptibogxiv.net>
  * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2021       Maxime DEMAREST         <maxime@indelog.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -1170,7 +1170,7 @@ class Don extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index b1c42a70ab2..6b725881c59 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2017	Laurent Destailleur         <eldy@users.sourceforge.net>
  * Copyright (C) 2024   Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024	MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -723,7 +723,7 @@ class ConferenceOrBooth extends ActionComm
 	 *	Return a thumb for kanban views
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index a68cc64de77..49dc4843f56 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -2089,7 +2089,7 @@ class Expedition extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 0ce56691fcb..2eacf539c4e 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (c) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2016-2020 	Ferran Marcet       	<fmarcet@2byte.es>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -2827,13 +2827,17 @@ class ExpenseReport extends CommonObject
 	 *	Return clickable link of object (with optional picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $langs;
 
+		if ($arraydata === null) {
+			$arraydata = array();
+		}
+
 		$selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']);
 
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index d8ecfc9962f..c0d0d5d09e5 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2015-2017  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Nicolas ZABOURI  <info@inovea-conseil.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -746,7 +746,7 @@ class PaymentExpenseReport extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index edb30a045ca..e5830ddf88a 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2018      Nicolas ZABOURI	    <info@inovea-conseil.com>
  * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2023-2024  William Mead        <william.mead@manchenumerique.fr>
- * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -1598,7 +1598,7 @@ class Fichinter extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 84e30e0ad86..837a21b9bb2 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3801,7 +3801,7 @@ class CommandeFournisseur extends CommonOrder
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 88331cf8bbd..1f6bce675e2 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -15,7 +15,7 @@
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2022      	Gauthier VERDOL     	<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2023		Nick Fragoulis
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -3359,9 +3359,9 @@ class FactureFournisseur extends CommonInvoice
 	/**
 	 *	Return clickable link of object (with eventually picto)
 	 *
-	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		?array{selected?:int<0,1>}	$arraydata	Array of data
-	 *  @return		string								HTML Code for Kanban thumb.
+	 *	@param	string					$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
+	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index 8b8c13051aa..3b18fb2bec1 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2015       ATM Consulting          <support@atm-consulting.fr>
  * Copyright (C) 2019-2020  Open-DSI                <support@open-dsi.fr>
  * Copyright (C) 2020-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -783,7 +783,7 @@ class IntracommReport extends CommonObject
 	 *	Return a thumb for kanban views
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 8e6b6eaf3fb..4c233a053e7 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -1169,7 +1169,7 @@ class KnowledgeRecord extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index abcfd857a84..e92cf3863bb 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2014-2018  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2015-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -767,7 +767,7 @@ class Loan extends CommonObject
 	 *	Return clickable link of object (with eventually picto)
 	 *
 	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
+	 *  @param		?array<string,mixed>	$arraydata				Array of data
 	 *  @return		string											HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index af3070b6526..ceefd2998b0 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -181,7 +181,7 @@ class MyObject extends CommonObject
 	public $fk_user_modif;
 
 	/**
-	 * @var string public $last_main_doc
+	 * @var string public
 	 */
 	public $last_main_doc;
 
@@ -908,7 +908,7 @@ class MyObject extends CommonObject
 	 *	Return a thumb for kanban views
 	 *
 	 *	@param	string	    			$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param	?array<string,string>	$arraydata	Array of data
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
 	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index a70b5ddd1d2..afbd022789f 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2017  		Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2020  		Lenin Rivas		   	<lenin@leninrivas.com>
  * Copyright (C) 2023-2024  Frédéric France     <frederic.france@free.fr>
- * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -266,7 +266,7 @@ class Mo extends CommonObject
 	public $fk_parent_line;
 
 	/**
-	 @ var array{id:int,label:string,qty_bom:int|float,stock:float,seuil_stock_alerte:float,virtual_stock:float,qty:float,fk_unit:int,qty_frozen:float,disable_stock_change:int<0,1>,efficiency:float}	tpl
+	 * @ var array{id:int,label:string,qty_bom:int|float,stock:float,seuil_stock_alerte:float,virtual_stock:float,qty:float,fk_unit:int,qty_frozen:float,disable_stock_change:int<0,1>,efficiency:float}	tpl
 	 */
 	public $tpl = array();
 
@@ -1981,9 +1981,9 @@ class Mo extends CommonObject
 	/**
 	 *	Return clickable link of object (with eventually picto)
 	 *
-	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		?array{string,mixed}		$arraydata			Array of data
-	 *  @return		string											HTML Code for Kanban thumb.
+	 *	@param	string	    			$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
+	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 0f05deb89fe..6593b6e40b2 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2017 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2021 NextGestion         <contact@nextgestion.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -1388,9 +1388,9 @@ class Partnership extends CommonObject
 	/**
 	 *	Return a thumb for kanban views
 	 *
-	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
-	 *  @return		string											HTML Code for Kanban thumb.
+	 *	@param	string					$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
+	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index df26c3c57d1..807acd3ce95 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -16,7 +16,7 @@
  * Copyright (C) 2017		Gustavo Novaro
  * Copyright (C) 2019-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023		Benjamin Falière		<benjamin.faliere@altairis.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -379,7 +379,7 @@ class Product extends CommonObject
 	public $seuil_stock_alerte = 0;
 
 	/**
-	 * @var float Ask for replenishment when $desiredstock < $stock_reel
+	 * @var float Ask for replenishment when `$desiredstock` < `$stock_reel`
 	 */
 	public $desiredstock = 0;
 
@@ -6437,7 +6437,7 @@ class Product extends CommonObject
 	 *  Move an uploaded file described into $file array into target directory $sdir.
 	 *
 	 * @param	string $sdir Target directory
-
+	 *
 	 * @param	array{name:string,tmp_name:string}	$file	Array of file info of file to upload: array('name'=>..., 'tmp_name'=>...)
 	 * @return	int											Return integer <0 if KO, >0 if OK
 	 */
@@ -7050,8 +7050,8 @@ class Product extends CommonObject
 	/**
 	 *	Return clickable link of object (with eventually picto)
 	 *
-	 *	@param	string	    $option					Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param	?array{string,mixed}	$arraydata	Array of data
+	 *	@param	string					$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
 	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 0dc3ca67847..2e517001469 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -678,9 +678,9 @@ class Inventory extends CommonObject
 	/**
 	 *	Return a thumb for kanban views
 	 *
-	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
-	 *  @return		string											HTML Code for Kanban thumb.
+	 *	@param	string	    			$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
+	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index a64de5937ff..ebe21bdc622 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2011	   Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2016	   Francis Appels       <francis.appels@yahoo.com>
  * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -1038,9 +1038,9 @@ class Entrepot extends CommonObject
 	/**
 	 *	Return clickable link of object (with eventually picto)
 	 *
-	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
-	 *  @return		string											HTML Code for Kanban thumb.
+	 *	@param	string	    			$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
+	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 76cdb08ea99..fa22c00d98b 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2022       Charlene Benke          <charlene@patas-monkey.com>
  * Copyright (C) 2023       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024		Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -176,8 +176,8 @@ class Project extends CommonObject
 	public $usage_bill_time; // Is the time spent on project must be invoiced or not
 
 	/**
-	   * @var integer		Event organization: Use Event Organization
-	   */
+	 * @var integer		Event organization: Use Event Organization
+	 */
 	public $usage_organize_event;
 
 	/**
@@ -2515,10 +2515,10 @@ class Project extends CommonObject
 	/**
 	 *	Return clickable link of object (with eventually picto)
 	 *
-	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
-	 *  @param		string					$size					Size of thumb (''=auto, 'large'=large, 'small'=small)
-	 *  @return		string											HTML Code for Kanban thumb.
+	 *	@param	string	    			$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
+	 *  @param	string					$size		Size of thumb (''=auto, 'large'=large, 'small'=small)
+	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null, $size = '')
 	{
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 2c9620f0886..ba6f4f83ca5 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2020       Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2022       Charlene Benke		<charlene@patas-monkey.com>
  * Copyright (C) 2023      	Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Vincent de Grandpré <vincent@de-grandpre.quebec>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -2729,9 +2729,9 @@ class Task extends CommonObjectLine
 	/**
 	 *	Return clickable link of object (with eventually picto)
 	 *
-	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
-	 *  @return		string											HTML Code for Kanban thumb.
+	 *	@param	string	    			$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
+	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 55072848b4a..1516689de63 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2016-2022	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018		Quentin Vial-Gouteyron  <quentin.vial-gouteyron@atm-consulting.fr>
  * Copyright (C) 2022-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -1447,9 +1447,9 @@ class Reception extends CommonObject
 	/**
 	 *	Return clickable link of object (with eventually picto)
 	 *
-	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
-	 *  @return		string											HTML Code for Kanban thumb.
+	 *	@param	string	    			$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
+	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 724fffc30e4..3db699c6d45 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2020  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -1112,9 +1112,9 @@ class RecruitmentCandidature extends CommonObject
 	/**
 	 *	Return clickable link of object (with eventually picto)
 	 *
-	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
-	 *  @return		string											HTML Code for Kanban thumb.
+	 *	@param	string	    			$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
+	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index e9b353ba8e4..6beb6c590bf 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2020       Laurent Destailleur	<eldy@users.sourceforge.net>
 /* Copyright (C) 2022       Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -1151,9 +1151,9 @@ class RecruitmentJobPosition extends CommonObject
 	/**
 	 *	Return clickable link of object (with eventually picto)
 	 *
-	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
-	 *  @return		string											HTML Code for Kanban thumb.
+	 *	@param	string	    			$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
+	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 1c2f47190a1..b83a5331aa3 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2014		Juanjo Menent				<jmenent@2byte.es>
  * Copyright (C) 2021		Gauthier VERDOL				<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024		Frédéric France				<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -989,9 +989,9 @@ class PaymentSalary extends CommonObject
 	/**
 	 *	Return clickable link of object (with eventually picto)
 	 *
-	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
-	 *  @return		string											HTML Code for Kanban thumb.
+	 *	@param	string	    			$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
+	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index da4fed65b02..c0fcd932e7c 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2014       Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -856,9 +856,9 @@ class Salary extends CommonObject
 	/**
 	 *	Return clickable link of object (with eventually picto)
 	 *
-	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
-	 *  @return		string											HTML Code for Kanban thumb.
+	 *	@param	string	    			$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
+	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 09474546f81..e33cdc6c377 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -16,7 +16,7 @@
  * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
  * Copyright (C) 2022      Gauthier VERDOL     		<gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -2799,9 +2799,9 @@ class SupplierProposal extends CommonObject
 	/**
 	 *	Return clickable link of object (with eventually picto)
 	 *
-	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
-	 *  @return		string											HTML Code for Kanban thumb.
+	 *	@param	string	    			$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
+	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 52b3d99467e..35bf143e0fe 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2023       Charlene Benke 	   		<charlene@patas-monkey.com>
  * Copyright (C) 2023-2024  Benjamin Falière	    <benjamin.faliere@altairis.fr>
  * Copyright (C) 2024		William Mead			<william.mead@manchenumerique.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -465,7 +465,6 @@ class Ticket extends CommonObject
 	}
 
 	/**
-	 *
 	 * Check if ref exists or not
 	 *
 	 * @param string $action    Action
@@ -3260,9 +3259,9 @@ class Ticket extends CommonObject
 	/**
 	 *	Return clickable link of object (with eventually picto)
 	 *
-	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
-	 *  @return		string											HTML Code for Kanban thumb.
+	 *	@param	string	    			$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
+	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 549bbb4454d..3c46fd80675 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -14,7 +14,7 @@
  * Copyright (C) 2018-2021	Nicolas ZABOURI			<info@inovea-conseil.com>
  * Copyright (C) 2019-2024	Frédéric France			<frederic.france@free.fr>
  * Copyright (C) 2019		Abbes Bahfir			<dolipar@dolipar.org>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Lenin Rivas				<lenin.rivas777@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -3345,9 +3345,9 @@ class User extends CommonObject
 	/**
 	 *	Return clickable link of object (optionally with picto)
 	 *
-	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
-	 *  @return		string											HTML Code for Kanban thumb.
+	 *	@param	string	    			$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
+	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 81b9945e780..04f014d7133 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
  * Copyright (C) 2019       Abbes Bahfir            <dolipar@dolipar.org>
  * Copyright (C) 2023-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -1039,9 +1039,9 @@ class UserGroup extends CommonObject
 	/**
 	 *	Return clickable link of object (with eventually picto)
 	 *
-	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
-	 *  @return		string											HTML Code for Kanban thumb.
+	 *	@param	string	    			$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
+	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index 53198494d2a..2a6fd052745 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2016	    Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2022       Open-Dsi			<support@open-dsi.fr>
  * Copyright (C) 2023-2024  Frédéric France     <frederic.france@free.fr>
- * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -1237,7 +1237,7 @@ class ProductAttribute extends CommonObject
 	 *	Return a thumb for kanban views
 	 *
 	 *	@param	string	    			$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param	?array<string,string>	$arraydata	Array of data
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
 	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/webportal/class/webportalinvoice.class.php b/htdocs/webportal/class/webportalinvoice.class.php
index c7112e9aa6b..edbfa2040a3 100644
--- a/htdocs/webportal/class/webportalinvoice.class.php
+++ b/htdocs/webportal/class/webportalinvoice.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2023-2024 	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024	Lionel Vessiller		<lvessiller@easya.solutions>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024-2025  Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -270,9 +270,9 @@ class WebPortalInvoice extends Facture
 	/**
 	 * Return clickable link of object (with eventually picto)
 	 *
-	 * @param	string					$option				Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 * @param	array{string,mixed} 	$arraydata			Array of data
-	 * @return	string										HTML Code for Kanban thumb.
+	 * @param	string				$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 * @param	?array<string,mixed> $arraydata	Array of data
+	 * @return	string							HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
diff --git a/htdocs/webportal/class/webportalorder.class.php b/htdocs/webportal/class/webportalorder.class.php
index 5e7079a69a3..1cbf082dccb 100644
--- a/htdocs/webportal/class/webportalorder.class.php
+++ b/htdocs/webportal/class/webportalorder.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2023-2024 	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024	Lionel Vessiller		<lvessiller@easya.solutions>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -264,7 +264,7 @@ class WebPortalOrder extends Commande
 	 * Return clickable link of object (with eventually picto)
 	 *
 	 * @param	string					$option				Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 * @param	array{string,mixed}		$arraydata			Array of data
+	 * @param	?array<string,mixed>	$arraydata			Array of data
 	 * @return	string										HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
diff --git a/htdocs/webportal/class/webportalpropal.class.php b/htdocs/webportal/class/webportalpropal.class.php
index 60bae2ebd39..838080a666c 100644
--- a/htdocs/webportal/class/webportalpropal.class.php
+++ b/htdocs/webportal/class/webportalpropal.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2023-2024 	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2023-2024	Lionel Vessiller		<lvessiller@easya.solutions>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -256,9 +256,9 @@ class WebPortalPropal extends Propal
 	/**
 	 * Return a thumb for kanban views
 	 *
-	 * @param	string					$option				Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 * @param	array{string,mixed}		$arraydata			Array of data
-	 * @return	string										HTML Code for Kanban thumb.
+	 * @param	string					$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 * @param	?array<string,mixed>	$arraydata	Array of data
+	 * @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index 5b41ab79677..8478f75527e 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2017       Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2020       Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2023-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -727,9 +727,9 @@ class Workstation extends CommonObject
 	/**
 	 *	Return a thumb for kanban views
 	 *
-	 *	@param      string	    			$option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
-	 *  @param		array{string,mixed}		$arraydata				Array of data
-	 *  @return		string											HTML Code for Kanban thumb.
+	 *	@param	string	    			$option		Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param	?array<string,mixed>	$arraydata	Array of data
+	 *  @return	string								HTML Code for Kanban thumb.
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{

From aa521a46d22980ada967df15f45e597f67671ae1 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 3 Feb 2025 13:37:43 +0100
Subject: [PATCH 461/602] Qual: Fix phan notices (import)

---
 .../class/accountancyimport.class.php         |  4 +-
 htdocs/core/modules/import/modules_import.php | 72 ++++++++++++++++++-
 htdocs/imports/class/import.class.php         | 14 ++--
 htdocs/imports/emptyexample.php               |  9 +--
 htdocs/imports/import.php                     |  7 +-
 5 files changed, 88 insertions(+), 18 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyimport.class.php b/htdocs/accountancy/class/accountancyimport.class.php
index a35235e0218..11c9f9c82d4 100644
--- a/htdocs/accountancy/class/accountancyimport.class.php
+++ b/htdocs/accountancy/class/accountancyimport.class.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2017-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2017       André Schild        <a.schild@aarboard.ch>
  * Copyright (C) 2020       Guillaume Alexandre <guillaume@tag-info.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -109,7 +109,7 @@ class AccountancyImport
 				$amount = (float) price2num($arrayrecord[$credit_index]['val']);
 			}
 
-			return "'" . $this->db->escape(abs($amount)) . "'";
+			return "'" . $this->db->escape((string) abs($amount)) . "'";
 		}
 
 		return "''";
diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php
index 864338b5bca..ca956a86f87 100644
--- a/htdocs/core/modules/import/modules_import.php
+++ b/htdocs/core/modules/import/modules_import.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2005-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin		<regis.houssin@inodbox.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -490,4 +490,74 @@ class ModeleImports
 		$this->error = $msg;
 		return -1;
 	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * 	Output header of an example file for this format
+	 *
+	 * 	@param	Translate	$outputlangs		Output language
+	 *  @return	string							Empty string
+	 */
+	public function write_header_example($outputlangs)
+	{
+		// phpcs:enable
+		$msg = get_class($this)."::".__FUNCTION__." not implemented";
+		dol_syslog($msg, LOG_ERR);
+		$this->errors[] = $msg;
+		$this->error = $msg;
+		return '';
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * 	Output title line of an example file for this format
+	 *
+	 * 	@param	Translate	$outputlangs		Output language
+	 *  @param	string[]	$headerlinefields	Array of fields name
+	 * 	@return	string							String output
+	 */
+	public function write_title_example($outputlangs, $headerlinefields)
+	{
+		// phpcs:enable
+		$msg = get_class($this)."::".__FUNCTION__." not implemented";
+		dol_syslog($msg, LOG_ERR);
+		$this->errors[] = $msg;
+		$this->error = $msg;
+		return '';
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * 	Output record of an example file for this format
+	 *
+	 * 	@param	Translate	$outputlangs		Output language
+	 * 	@param	mixed[]		$contentlinevalues	Array of lines
+	 * 	@return	string							Empty string
+	 */
+	public function write_record_example($outputlangs, $contentlinevalues)
+	{
+		// phpcs:enable
+		$msg = get_class($this)."::".__FUNCTION__." not implemented";
+		dol_syslog($msg, LOG_ERR);
+		$this->errors[] = $msg;
+		$this->error = $msg;
+		return '';
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * 	Output footer of an example file for this format
+	 *
+	 * 	@param	Translate	$outputlangs		Output language
+	 *  @return	string							String output
+	 */
+	public function write_footer_example($outputlangs)
+	{
+		// phpcs:enable
+		$msg = get_class($this)."::".__FUNCTION__." not implemented";
+		dol_syslog($msg, LOG_ERR);
+		$this->errors[] = $msg;
+		$this->error = $msg;
+		return '';
+	}
 }
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index f9156a38115..00923125430 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2016       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2020		Ahmad Jamaly Rabib	<rabib@metroworks.co.jp>
  * Copyright (C) 2021-2024  Frédéric France		<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -303,11 +303,11 @@ class Import
 	 *  Build an import example file.
 	 *  Arrays this->array_export_xxx are already loaded for required datatoexport
 	 *
-	 *  @param      string	$model              Name of import engine ('csv', ...)
-	 *  @param      string	$headerlinefields   Array of values for first line of example file
-	 *  @param      string	$contentlinevalues	Array of values for content line of example file
-	 *  @param		string	$datatoimport		Dataset to import
-	 *  @return		string						Return integer <0 if KO, >0 if OK
+	 *  @param      string		$model              Name of import engine ('csv', ...)
+	 *  @param      string[]	$headerlinefields   Array of values for first line of example file
+	 *  @param      string[]	$contentlinevalues	Array of values for content line of example file
+	 *  @param		string		$datatoimport		Dataset to import
+	 *  @return		string							Return integer <0 if KO, >0 if OK
 	 */
 	public function build_example_file($model, $headerlinefields, $contentlinevalues, $datatoimport)
 	{
@@ -324,7 +324,7 @@ class Import
 		$classname = "Import".$model;
 		require_once $dir.$file;
 		$objmodel = new $classname($this->db, $datatoimport);
-		'@phan-var-force CommonObject $objmodel';
+		'@phan-var-force ModeleImports $objmodel';
 
 		$outputlangs = $langs; // Lang for output
 		$s = '';
diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php
index 310f9dd0800..cd05fcfe1ac 100644
--- a/htdocs/imports/emptyexample.php
+++ b/htdocs/imports/emptyexample.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2009-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -47,7 +48,7 @@ if (!defined('NOTOKENRENEWAL')) {
  * @param	int				$disablenoindex		Disable the "noindex" on meta robot header
  * @return	void
  */
-function llxHeader($head = '', $title = '', $help_url = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $morequerystring = '', $morecssonbody = '', $replacemainareaby = '', $disablenofollow = 0, $disablenoindex = 0)
+function llxHeaderEmptyExample($head = '', $title = '', $help_url = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $morequerystring = '', $morecssonbody = '', $replacemainareaby = '', $disablenofollow = 0, $disablenoindex = 0)
 {
 	print '<html><title>Build an import example file</title><body>';
 }
@@ -60,7 +61,7 @@ function llxHeader($head = '', $title = '', $help_url = '', $target = '', $disab
  * @param	int		$disabledoutputofmessages	Clear all messages stored into session without displaying them
  * @return	void
  */
-function llxFooter($comment = '', $zone = 'private', $disabledoutputofmessages = 0)
+function llxFooterEmptyExample($comment = '', $zone = 'private', $disabledoutputofmessages = 0)
 {
 	print '</body></html>';
 }
@@ -89,9 +90,9 @@ $langs->load("exports");
 if (empty($datatoimport)) {
 	$user->loadRights();
 
-	llxHeader();
+	llxHeaderEmptyExample();
 	print '<div class="error">Bad value for datatoimport.</div>';
-	llxFooter();
+	llxFooterEmptyExample();
 	exit;
 }
 
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index fc0a9ff8750..5ddde8e2465 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2012      Christophe Battarel	<christophe.battarel@altairis.fr>
  * Copyright (C) 2022      Charlene Benke		<charlene@patas-monkey.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1057,7 +1057,7 @@ if ($step == 4 && $datatoimport) {
 	$s = str_replace('{s1}', img_picto('', 'grip_title', '', 0, 0, 0, '', '', 0), $s);
 	print $s;
 	print '</span> ';
-	$htmlother->select_import_model($importmodelid, 'importmodelid', $datatoimport, 1, $user->id);
+	$htmlother->select_import_model((string) $importmodelid, 'importmodelid', $datatoimport, 1, $user->id);
 	print '<input type="submit" class="button small reposition" value="'.$langs->trans("Select").'">';
 	print '</div>';
 	print '</form>';
@@ -1088,8 +1088,7 @@ if ($step == 4 && $datatoimport) {
 
 	$lefti = 1;
 	foreach ($fieldssource as $key => $val) {
-		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
-		show_elem($fieldssource, $key, $val); // key is field number in source file
+		show_elem($fieldssource, $key, (string) $key); // key is field number in source file @phan-suppress-current-line PhanPluginSuspiciousParamPosition
 		$listofkeys[$key] = 1;
 		$fieldsplaced[$key] = 1;
 		$valforsourcefieldnb[$lefti] = $key;

From 97c2c3aea29fd06f66bc198034246e1b3b243991 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 3 Feb 2025 13:44:10 +0100
Subject: [PATCH 462/602] Qual: Fix phan notices (blockedlog)

---
 htdocs/blockedlog/admin/blockedlog_list.php  |  8 ++++----
 htdocs/blockedlog/class/blockedlog.class.php | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 01cb2c58f1c..35f7934add0 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2017		ATM Consulting				<contact@atm-consulting.fr>
  * Copyright (C) 2017-2018	Laurent Destailleur			<eldy@destailleur.fr>
  * Copyright (C) 2018-2024	Frédéric France				<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -353,7 +353,7 @@ $help_url = "EN:Module_Unalterable_Archives_-_Logs|FR:Module_Archives_-_Logs_Ina
 
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'bodyforlist mod-blockedlog page-admin_blockedlog_list');
 
-$blocks = $block_static->getLog('all', $search_id, $MAXLINES, $sortfield, $sortorder, $search_fk_user, $search_start, $search_end, $search_ref, $search_amount, $search_code);
+$blocks = $block_static->getLog('all', (int) $search_id, $MAXLINES, $sortfield, $sortorder, (int) $search_fk_user, $search_start, $search_end, $search_ref, $search_amount, $search_code);
 if (!is_array($blocks)) {
 	if ($blocks == -2) {
 		setEventMessages($langs->trans("TooManyRecordToScanRestrictFilters", $MAXLINES), null, 'errors');
@@ -440,7 +440,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<div class="right">';
 print $langs->trans("RestrictYearToExport").': ';
 // Month
-print $formother->select_month(GETPOSTINT('monthtoexport'), 'monthtoexport', 1, 0, 'minwidth50 maxwidth75imp valignmiddle', true);
+print $formother->select_month((string) GETPOSTINT('monthtoexport'), 'monthtoexport', 1, 0, 'minwidth50 maxwidth75imp valignmiddle', true);
 print '<input type="text" name="yeartoexport" class="valignmiddle maxwidth50imp" value="'.GETPOST('yeartoexport').'" placeholder="'.$langs->trans("Year").'">';
 print '<input type="hidden" name="withtab" value="'.GETPOST('withtab', 'alpha').'">';
 print '<input type="submit" name="downloadcsv" class="button" value="'.$langs->trans('DownloadLogCSV').'">';
@@ -491,7 +491,7 @@ print '</td>';
 
 // User
 print '<td class="liste_titre">';
-print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth150');
+print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, '', '', '0', 0, 0, '', 0, '', 'maxwidth150');
 print '</td>';
 
 // Actions code
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index c959800cef7..afe6549c03d 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2017       ATM Consulting      <contact@atm-consulting.fr>
  * Copyright (C) 2017-2020  Laurent Destailleur <eldy@destailleur.fr>
  * Copyright (C) 2022 		charlene benke		<charlene@patas-monkey.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -102,12 +102,12 @@ class BlockedLog
 	public $fk_user = 0;
 
 	/**
-	 * @var int|string date_creation
+	 * @var int|string
 	 */
 	public $date_creation;
 
 	/**
-	 * @var int|string $date_modification;
+	 * @var int|string
 	 */
 	public $date_modification;
 
@@ -395,11 +395,11 @@ class BlockedLog
 	/**
 	 *	Populate properties of log from object data
 	 *
-	 *	@param	CommonObject	$object		object to store
-	 *	@param	string			$action		action
-	 *	@param	float|int		$amounts	amounts
-	 *	@param	?User			$fuser		User object (forced)
-	 *	@return	int<-1,-1>|int<1,1>			>0 if OK, <0 if KO
+	 *	@param	CommonObject|stdClass	$object		object to store
+	 *	@param	string					$action		action
+	 *	@param	float|int				$amounts	amounts
+	 *	@param	?User					$fuser		User object (forced)
+	 *	@return	int<-1,-1>|int<1,1>					>0 if OK, <0 if KO
 	 */
 	public function setObjectData(&$object, $action, $amounts, $fuser = null)
 	{
@@ -1115,7 +1115,7 @@ class BlockedLog
 		if (empty($previoussignature)) {
 			$sql = "SELECT rowid, signature FROM ".MAIN_DB_PREFIX."blockedlog";
 			if ($beforeid) {
-				$sql.= $this->db->hintindex('entity_rowid', 1);
+				$sql .= $this->db->hintindex('entity_rowid', 1);
 			}
 			$sql .= " WHERE entity = ".((int) $conf->entity);
 			if ($beforeid) {

From 97099b854fdf16c5aa971e7fbb9ecaf72b9757a1 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 3 Feb 2025 14:28:54 +0100
Subject: [PATCH 463/602] Qual: Fix phan notices (install)

---
 htdocs/core/db/Database.interface.php |  4 +--
 htdocs/core/db/mysqli.class.php       |  4 +--
 htdocs/core/db/pgsql.class.php        |  4 +--
 htdocs/core/db/sqlite3.class.php      |  4 +--
 htdocs/debugbar/class/TraceableDB.php |  4 +--
 htdocs/index.php                      |  4 +--
 htdocs/install/check.php              |  7 +++---
 htdocs/install/fileconf.php           | 35 ++++++++++++++++++++++++++-
 htdocs/install/inc.php                |  7 +++++-
 htdocs/install/index.php              |  3 ++-
 htdocs/install/repair.php             |  9 ++++++-
 htdocs/install/step1.php              | 23 ++++++++++++------
 htdocs/install/step2.php              | 10 +++++---
 htdocs/install/step5.php              |  7 ++++++
 htdocs/install/upgrade.php            |  7 +++---
 15 files changed, 98 insertions(+), 34 deletions(-)

diff --git a/htdocs/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php
index 60b129b5a08..046f8504722 100644
--- a/htdocs/core/db/Database.interface.php
+++ b/htdocs/core/db/Database.interface.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2014-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -372,7 +372,7 @@ interface Database
 	 *
 	 * @param    string $table 				Name of table
 	 * @param    string $field_name 		Name of field to add
-	 * @param    array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string} $field_desc 		Associative array of description of the field to insert [parameter name][parameter value]
+	 * @param    array{type:string,label?:string,enabled?:int<0,2>|string,position?:int,notnull?:int,visible?:int,noteditable?:int,default?:string,extra?:string,null?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string} $field_desc 		Associative array of description of the field to insert [parameter name][parameter value]
 	 * @param    string $field_position 	Optional ex .: "after field stuff"
 	 * @return   int                        Return integer <0 if KO, >0 if OK
 	 */
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index f572225a3ab..160805761bc 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Charlene Benke	        <charlene@patas-monkey.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
@@ -962,7 +962,7 @@ class DoliDBMysqli extends DoliDB
 	 *
 	 *	@param	string	$table 				Name of table
 	 *	@param	string	$field_name 		Name of field to add
-	 *	@param	array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}	$field_desc 		Associative table with description of field to insert [parameter name][parameter value]
+	 *	@param	array{type:string,label?:string,enabled?:int<0,2>|string,position?:int,notnull?:int,visible?:int,noteditable?:int,default?:string,extra?:string,null?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string} $field_desc 		Associative array of description of the field to insert [parameter name][parameter value]
 	 *	@param	string	$field_position 	Optional e.g.: "after some_field"
 	 *	@return	int							Return integer <0 if KO, >0 if OK
 	 */
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 28561f73648..02288a05e21 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2012		Yann Droneaud			<yann@droneaud.fr>
  * Copyright (C) 2012		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1194,7 +1194,7 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@param	string	$table 				Name of table
 	 *	@param	string	$field_name 		Name of field to add
-	 *  @param  array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string} $field_desc 		Associative array of description of the field to insert [parameter name][parameter value]
+	 *	@param	array{type:string,label?:string,enabled?:int<0,2>|string,position?:int,notnull?:int,visible?:int,noteditable?:int,default?:string,extra?:string,null?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string} $field_desc 		Associative array of description of the field to insert [parameter name][parameter value]
 	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
 	 *	@return	int							Return integer <0 if KO, >0 if OK
 	 */
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index 23fa3483e76..e10cda471b0 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -939,7 +939,7 @@ class DoliDBSqlite3 extends DoliDB
 	 *
 	 *	@param	string	$table		Name of table
 	 *	@return	array<array<mixed>>	Table with information of columns in the table
-
+	 *
 	 *	TODO modify for sqlite
 	 */
 	public function DDLInfoTable($table)
@@ -1104,7 +1104,7 @@ class DoliDBSqlite3 extends DoliDB
 	 *
 	 *	@param	string	$table 				Table name
 	 *	@param	string	$field_name 		Field name to add
-	 *	@param	array{type:string,label:string,enabled:int<0,2>|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}	$field_desc 		Associative table with description of field to insert [parameter name][parameter value]
+	 *	@param	array{type:string,label?:string,enabled?:int<0,2>|string,position?:int,notnull?:int,visible?:int,noteditable?:int,default?:string,extra?:string,null?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string} $field_desc 		Associative array of description of the field to insert [parameter name][parameter value]
 	 *	@param	string	$field_position 	Optional e.g.: "after some_field"
 	 *	@return	int							Return integer <0 if KO, >0 if OK
 	 */
diff --git a/htdocs/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php
index 9211e8e5fae..a7b45a7da6b 100644
--- a/htdocs/debugbar/class/TraceableDB.php
+++ b/htdocs/debugbar/class/TraceableDB.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2023	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -535,7 +535,7 @@ class TraceableDB extends DoliDB
 	 *
 	 * @param    string $table 				Name of table
 	 * @param    string $field_name 		Name of field to add
-	 * @param    array{type:string,label:string,enabled:int|string,position:int,notnull?:int,visible:int,noteditable?:int,default?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string}	$field_desc 		Tableau associatif de description du champ a inserer[nom du parameter][valeur du parameter]
+	 * @param    array{type:string,label?:string,enabled?:int<0,2>|string,position?:int,notnull?:int,visible?:int,noteditable?:int,default?:string,extra?:string,null?:string,index?:int,foreignkey?:string,searchall?:int,isameasure?:int,css?:string,csslist?:string,help?:string,showoncombobox?:int,disabled?:int,arrayofkeyval?:array<int,string>,comment?:string} $field_desc 		Associative array of description of the field to insert [parameter name][parameter value]
 	 * @param    string $field_position 	Optionnel ex.: "after champtruc"
 	 * @return   int                        Return integer <0 if KO, >0 if OK
 	 */
diff --git a/htdocs/index.php b/htdocs/index.php
index 5e2b667dbae..a7b2c9acf5e 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2011-2012	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2021-2024  Frédéric France			<frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro		<alexandre@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -677,7 +677,7 @@ if (!getDolGlobalString('MAIN_DISABLE_GLOBAL_WORKBOARD') && getDolGlobalInt('MAI
 			} else {
 				$weatherDashBoard .= '			<span class="info-box-number">'.$langs->transnoentitiesnoconv(
 					"NActionsLate",
-					$totalLateNumber
+					(string) $totalLateNumber
 				).'</span>'."\n";
 				if ($totallatePercentage > 0) {
 					$weatherDashBoard .= '			<span class="progress-description">'.$langs->trans(
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 2e9e89c8dc9..e60249532db 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2013-2014  Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2014       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015-2016  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -374,7 +374,7 @@ if (!file_exists($conffile)) {
 					$conf->db->name = $dolibarr_main_db_name;
 					$conf->db->user = $dolibarr_main_db_user;
 					$conf->db->pass = $dolibarr_main_db_pass;
-					$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port);
+					$db = getDoliDBInstance($conf->db->type, $conf->db->host, (string) $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port);
 					if ($db->connected && $db->database_selected) {
 						$ok = true;
 					}
@@ -382,6 +382,7 @@ if (!file_exists($conffile)) {
 			}
 		}
 
+		$dolibarrlastupgradeversionarray = array();
 		// If database access is available, we set more variables
 		if ($ok) {
 			if (empty($dolibarr_main_db_encryption)) {
@@ -514,7 +515,7 @@ if (!file_exists($conffile)) {
 			}
 
 			if ($ok) {
-				if (count($dolibarrlastupgradeversionarray) >= 2) {	// If database access is available and last upgrade version is known
+				if (is_array($dolibarrlastupgradeversionarray) && count($dolibarrlastupgradeversionarray) >= 2) {	// If database access is available and last upgrade version is known
 					// Now we check if this is the first qualified choice
 					if ($allowupgrade && empty($foundrecommandedchoice) &&
 						(versioncompare($dolibarrversiontoarray, $dolibarrlastupgradeversionarray) > 0 || versioncompare($dolibarrversiontoarray, $versionarray) < -2)
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 5c73f49a6b1..1514f9e7e40 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2004       Sebastien DiCintio      <sdicintio@ressource-toi.org>
  * Copyright (C) 2005-2011  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -42,6 +42,37 @@ include_once 'inc.php';
  * @var string $conffile
  * @var string $conffiletoshow
  */
+'
+@phan-var-force string $dolibarr_main_db_host
+@phan-var-force string $dolibarr_main_db_port
+@phan-var-force string $dolibarr_main_db_name
+@phan-var-force string $dolibarr_main_db_user
+@phan-var-force string $dolibarr_main_db_pass
+@phan-var-force string $dolibarr_main_db_encrypted_pass
+@phan-var-force string $conffile
+@phan-var-force string $conffiletoshow
+@phan-var-force ?bool $force_install_
+@phan-var-force ?string $force_install_packager
+@phan-var-force ?string $force_install_message
+@phan-var-force ?string $force_install_main_data_root
+@phan-var-force ?int<0,2> $force_install_noedit
+@phan-var-force ?string $force_install_type
+@phan-var-force ?string $force_install_dbserver
+@phan-var-force ?string $force_install_port
+@phan-var-force ?string $force_install_database
+@phan-var-force ?string $force_install_prefix
+@phan-var-force ?string $force_install_createdatabase
+@phan-var-force ?string $force_install_databaselogin
+@phan-var-force ?string $force_install_databasepass
+@phan-var-force ?string $force_install_databaserootlogin
+@phan-var-force ?string $force_install_databaserootpass
+@phan-var-force ?string $force_install_dolibarrlogin
+@phan-var-force ?string $force_install_nophpinfo
+@phan-var-force ?string $force_install_lockinstall
+@phan-var-force ?string $force_install_distrib
+@phan-var-force ?string $db_user_root
+@phan-var-force ?string $db_pass_root
+';
 
 $err = 0;
 
@@ -339,6 +370,8 @@ if (!empty($force_install_noedit)) {
 						$defaultype = 'mysql';
 					}
 
+					$testclass = '';
+					$testfunction = null;
 					// Show line into list
 					if ($type == 'mysql') {
 						$testfunction = 'mysql_connect';
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 3fd55c11bc4..b1c967e790e 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2021       Charlene Benke      	<charlene@patas-monkey.com>
  * Copyright (C) 2023       Alexandre Janniaux      <alexandre.janniaux@gmail.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -48,6 +48,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
+'
+@phan-var-force ?string $dolibarr_main_url_root_alt
+@phan-var-force ?string $dolibarr_main_db_prefix
+';
+
 $conf = new Conf();
 
 // Force $_REQUEST["logtohtml"]
diff --git a/htdocs/install/index.php b/htdocs/install/index.php
index d62f82eaa27..c089a90fdf4 100644
--- a/htdocs/install/index.php
+++ b/htdocs/install/index.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004-2005  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -63,7 +64,7 @@ print '<table>';
 
 print '<tr>';
 print '<td>'.$langs->trans("DefaultLanguage").' : </td><td>';
-print $formadmin->select_language('auto', 'selectlang', 1, 0, 0, 1);
+print $formadmin->select_language('auto', 'selectlang', 1, array(), 0, 1);
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 4df5b65250d..ccf25a7f725 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2021-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2023       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Vincent de Grandpré	    <vincent@de-grandpre.quebec>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -43,6 +43,11 @@ if (file_exists($conffile)) {
  * @var string $dolibarr_main_db_pass
  */
 
+'
+@phan-var-force ?string $dolibarr_main_db_encryption
+@phan-var-force ?string $dolibarr_main_db_cryptkey
+';
+
 require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
 include_once $dolibarr_main_document_root.'/core/lib/images.lib.php';
 require_once $dolibarr_main_document_root.'/core/class/extrafields.class.php';
@@ -858,6 +863,7 @@ if ($ok && GETPOST('clean_orphelin_dir', 'alpha')) {
 
 		$filearray = dol_dir_list($upload_dir, "files", 1, '', array('^SPECIMEN\.pdf$', '^\.', '(\.meta|_preview.*\.png)$', '^temp$', '^payments$', '^CVS$', '^thumbs$'), '', SORT_DESC, 1, 1);
 
+		$object_instance = null;
 		// To show ref or specific information according to view to show (defined by $module)
 		if ($modulepart == 'company') {
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
@@ -954,6 +960,7 @@ if ($ok && GETPOST('clean_orphelin_dir', 'alpha')) {
 	}
 }
 
+$methodtofix = '';
 // clean_linked_elements: Check and clean linked elements
 if ($ok && GETPOST('clean_product_stock_batch', 'alpha')) {
 	$methodtofix = GETPOST('methodtofix', 'alpha') ? GETPOST('methodtofix', 'alpha') : 'updatestock';
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index 6ec6c03743d..9d1bbe6d463 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2004       Sebastien Di Cintio     <sdicintio@ressource-toi.org>
  * Copyright (C) 2005-2011  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2015-2016  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -101,8 +101,9 @@ if (@file_exists($forcedfile)) {
 			$main_data_dir = $argv[4]; // override when executing the script in command line
 		}
 		// In mode 3 the main_url is custom
-		if ($force_install_noedit != 3)
-		$main_url = detect_dolibarr_main_url_root();
+		if ($force_install_noedit != 3) {
+			$main_url = detect_dolibarr_main_url_root();
+		}
 		if (!empty($argv[5])) {
 			$main_url = $argv[5]; // override when executing the script in command line
 		}
@@ -567,14 +568,20 @@ if (!$error && $db->connected && $action == "set") {	// Test on permission not r
 
 			// Check database connection
 
-			$db = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, $databasefortest, (int) $conf->db->port);
-
-			if ($db->error) {
-				print '<div class="error">'.$db->error.'</div>';
+			$db = null;
+			if ($databasefortest === null) {
+				print '<div class="error">Database name can not be empty</div>';
 				$error++;
+			} else {
+				$db = getDoliDBInstance($conf->db->type, $conf->db->host, $userroot, $passroot, $databasefortest, (int) $conf->db->port);
+
+				if ($db->error) {
+					print '<div class="error">'.$db->error.'</div>';
+					$error++;
+				}
 			}
 
-			if (!$error) {
+			if (!$error && $db !== null) {
 				if ($db->connected) {
 					$resultbis = 1;
 
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index a0b64c28a22..c58c9fe6fc4 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2010  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Cedric GROSS            <c.gross@kreiz-it.fr>
  * Copyright (C) 2015-2016  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -141,6 +141,7 @@ if ($action == "set") {		// Test on permission not required. Already managed by
 	}
 
 
+	$versionarray = array();
 	// Display version / Affiche version
 	if ($ok) {
 		$version = $db->getVersion();
@@ -166,7 +167,7 @@ if ($action == "set") {		// Test on permission not required. Already managed by
 
 	// To say that SQL we pass to query are already escaped for mysql, so we need to unescape them
 	if (property_exists($db, 'unescapeslashquot')) {
-		$db->unescapeslashquot = true;
+		$db->unescapeslashquot = true;  // @phan-suppress-current-line PhanUndeclaredProperty
 	}
 
 	/**************************************************************************************
@@ -396,6 +397,7 @@ if ($action == "set") {		// Test on permission not required. Already managed by
 	 ***************************************************************************************/
 	if ($ok && $createfunctions) {
 		// For this file, we use a directory according to database type
+		$dir = null;
 		if ($choix == 1) {
 			$dir = "mysql/functions/";
 		} elseif ($choix == 2) {
@@ -408,11 +410,11 @@ if ($action == "set") {		// Test on permission not required. Already managed by
 
 		// Creation of data
 		$file = "functions.sql";
-		if (file_exists($dir.$file)) {
+		if ($dir !== null && file_exists($dir.$file)) {
 			$fp = fopen($dir.$file, "r");
 			dolibarr_install_syslog("step2: open function file ".$dir.$file." handle=".(is_bool($fp) ? json_encode($fp) : $fp));
+			$buffer = '';
 			if ($fp) {
-				$buffer = '';
 				while (!feof($fp)) {
 					$buf = fgets($fp, 4096);
 					if (substr($buf, 0, 2) != '--') {
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index 7b410b14656..9d13cd986ad 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2004       Sebastien DiCintio      <sdicintio@ressource-toi.org>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2015-2016  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -45,6 +46,12 @@ require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
 require_once $dolibarr_main_document_root.'/core/lib/security.lib.php'; // for dol_hash
 require_once $dolibarr_main_document_root.'/core/lib/functions2.lib.php';
 
+'
+@phan-var-force ?string $modulesdir
+@phan-var-force ?string $dolibarr_main_db_encryption
+@phan-var-force ?string $dolibarr_main_db_cryptkey
+';
+
 global $langs;
 
 $versionfrom = GETPOST("versionfrom", 'alpha', 3) ? GETPOST("versionfrom", 'alpha', 3) : (empty($argv[1]) ? '' : $argv[1]);
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 4a09cff906f..8de7713dd32 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2015-2016  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -180,6 +180,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 	}
 
 	// Affiche version
+	$versionarray = array();
 	if ($ok) {
 		$version = $db->getVersion();
 		$versionarray = $db->getVersionArray();
@@ -210,8 +211,8 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 		// Test database version is not forbidden for migration
 		if (empty($ignoredbversion)) {
 			$dbversion_disallowed = array(
-				array('type'=>'mysql', 'version'=>array(5, 5, 40)),
-				array('type'=>'mysqli', 'version'=>array(5, 5, 40)) //,
+				array('type' => 'mysql', 'version' => array(5, 5, 40)),
+				array('type' => 'mysqli', 'version' => array(5, 5, 40)) //,
 				//array('type'=>'mysql','version'=>array(5,5,41)),
 				//array('type'=>'mysqli','version'=>array(5,5,41))
 			);

From 30c10f54c8451f8ad727c59b18651d2ab814cb96 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 3 Feb 2025 15:17:58 +0100
Subject: [PATCH 464/602] Qual: Update phan baseline

---
 dev/tools/phan/baseline.txt | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 856529688c3..ca2ed9bfd30 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,21 +9,21 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 3680+ occurrences
-    // PhanUndeclaredProperty : 540+ occurrences
+    // PhanTypeMismatchArgument : 3660+ occurrences
+    // PhanUndeclaredProperty : 530+ occurrences
     // PhanTypeMismatchArgumentNullable : 450+ occurrences
     // PhanUndeclaredGlobalVariable : 190+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 180+ occurrences
-    // PhanPossiblyUndeclaredGlobalVariable : 180+ occurrences
+    // PhanPossiblyUndeclaredGlobalVariable : 170+ occurrences
     // PhanTypeMismatchArgumentProbablyReal : 140+ occurrences
     // PhanTypeMismatchProperty : 130+ occurrences
     // PhanPluginUnknownArrayMethodParamType : 110+ occurrences
-    // PhanRedefineFunction : 45+ occurrences
-    // PhanPluginUndeclaredVariableIsset : 40+ occurrences
+    // PhanRedefineFunction : 40+ occurrences
     // PhanTypeExpectedObjectPropAccess : 40+ occurrences
     // PhanTypeInvalidDimOffset : 25+ occurrences
-    // PhanTypeMismatchArgumentNullableInternal : 20+ occurrences
+    // PhanPluginUndeclaredVariableIsset : 20+ occurrences
     // PhanTypeMismatchDimFetch : 20+ occurrences
+    // PhanTypeMismatchArgumentNullableInternal : 15+ occurrences
     // PhanUndeclaredConstant : 15+ occurrences
     // PhanTypeComparisonFromArray : 10+ occurrences
     // PhanUndeclaredMethod : 10+ occurrences
@@ -64,7 +64,6 @@ return [
         'htdocs/accountancy/bookkeeping/listbyaccount.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/accountancy/class/accountancycategory.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/accountancy/class/accountancyexport.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
-        'htdocs/accountancy/class/accountancyimport.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/accountancy/class/accountingjournal.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/accountancy/class/bookkeeping.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/accountancy/class/lettering.class.php' => ['PhanTypeMismatchArgument'],
@@ -170,7 +169,6 @@ return [
         'htdocs/asset/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/asterisk/wrapper.php' => ['PhanRedefineFunction'],
         'htdocs/barcode/printsheet.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanTypeMismatchArgumentNullable'],
-        'htdocs/blockedlog/admin/blockedlog_list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/bom/bom_card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/bom/bom_list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/bom/class/api_boms.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
@@ -466,7 +464,6 @@ return [
         'htdocs/core/modules/member/modules_cards.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/modAdherent.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/modAgenda.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/modBlockedLog.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/modCommande.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/modContrat.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/modDon.class.php' => ['PhanTypeMismatchArgument'],
@@ -635,19 +632,7 @@ return [
         'htdocs/hrm/evaluation_card.php' => ['PhanTypeMismatchArgument'],
         'htdocs/hrm/job_card.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/hrm/skill_card.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/imports/emptyexample.php' => ['PhanRedefineFunction', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/imports/import.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/index.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/install/check.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullableInternal'],
-        'htdocs/install/fileconf.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable'],
-        'htdocs/install/inc.php' => ['PhanPluginUndeclaredVariableIsset'],
-        'htdocs/install/index.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/install/repair.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument'],
-        'htdocs/install/step1.php' => ['PhanTypeMismatchArgumentNullable'],
-        'htdocs/install/step2.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal', 'PhanUndeclaredProperty'],
-        'htdocs/install/step5.php' => ['PhanPluginUndeclaredVariableIsset'],
-        'htdocs/install/upgrade.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal'],
-        'htdocs/install/upgrade2.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/imports/import.php' => ['PhanTypeMismatchArgument'],
         'htdocs/intracommreport/card.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/intracommreport/class/intracommreport.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/intracommreport/list.php' => ['PhanTypeMismatchArgument'],

From 6bf8f7674d320857f241a9d6bc46ea4338cfae18 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 3 Feb 2025 23:46:14 +0100
Subject: [PATCH 465/602] Qual: Fix phan notices (intracomm)

---
 .../class/intracommreport.class.php           | 27 ++++++++++---------
 htdocs/intracommreport/list.php               |  8 +++---
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index 3b18fb2bec1..e551e2fc002 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -139,7 +139,7 @@ class IntracommReport extends CommonObject
 	 */
 	public $content_xml;
 	/**
-	 * @var string
+	 * @var 'deb'|'des'
 	 */
 	public $type_export;
 	/**
@@ -241,8 +241,8 @@ class IntracommReport extends CommonObject
 	/**
 	 * Function create
 	 *
-	 * @param 	User 	$user 		User
-	 * @param 	int 	$notrigger 	notrigger
+	 * @param 	User		$user 		User
+	 * @param 	int<0,1> 	$notrigger 	notrigger
 	 * @return 	int
 	 */
 	public function create($user, $notrigger = 0)
@@ -350,8 +350,8 @@ class IntracommReport extends CommonObject
 	 * Generate XMLDes file
 	 *
 	 * @param int		$period_year		Year of declaration
-	 * @param int		$period_month		Month of declaration
-	 * @param string	$type_declaration	Declaration type by default - 'introduction' or 'expedition' (always 'expedition' for Des)
+	 * @param int<1,12>	$period_month		Month of declaration
+	 * @param 'introduction'|'expedition'	$type_declaration	Declaration type by default - 'introduction' or 'expedition' (always 'expedition' for Des)
 	 * @return string|false					Return a well-formed XML string based on SimpleXML element, false or 0 if error
 	 */
 	public function getXMLDes($period_year, $period_month, $type_declaration = 'expedition')
@@ -383,8 +383,8 @@ class IntracommReport extends CommonObject
 	 *
 	 *  @param	SimpleXMLElement	$declaration		Reference declaration
 	 *  @param	string				$type				Declaration type by default - 'introduction' or 'expedition' (always 'expedition' for Des)
-	 *  @param	int					$period_reference	Reference period
-	 *  @param	string				$exporttype	    	'deb' for DEB, 'des' for DES
+	 *  @param	string				$period_reference	Reference period ("YYYY-MM")
+	 *  @param	'deb'|'des'			$exporttype	    	'deb' for DEB, 'des' for DES
 	 *  @return	int       			  					Return integer <0 if KO, >0 if OK
 	 */
 	public function addItemsFact(&$declaration, $type, $period_reference, $exporttype = 'deb')
@@ -406,7 +406,7 @@ class IntracommReport extends CommonObject
 			$categ_fraisdeport = null;
 			if ($exporttype == 'deb' && getDolGlobalInt('INTRACOMMREPORT_CATEG_FRAISDEPORT') > 0) {
 				$categ_fraisdeport = new Categorie($this->db);
-				$categ_fraisdeport->fetch(getDolGlobalString('INTRACOMMREPORT_CATEG_FRAISDEPORT'));
+				$categ_fraisdeport->fetch(getDolGlobalInt('INTRACOMMREPORT_CATEG_FRAISDEPORT'));
 				$TLinesFraisDePort = array();
 			}
 
@@ -429,7 +429,7 @@ class IntracommReport extends CommonObject
 				$i++;
 			}
 
-			if (!empty($TLinesFraisDePort)) {
+			if (!empty($TLinesFraisDePort) && $categ_fraisdeport !== null) {
 				$this->addItemFraisDePort($declaration, $TLinesFraisDePort, $type, $categ_fraisdeport, $i);
 			}
 
@@ -445,8 +445,8 @@ class IntracommReport extends CommonObject
 	 *  Add invoice line
 	 *
 	 *  @param      string	$type				Declaration type by default - introduction or expedition (always 'expedition' for Des)
-	 *  @param      int		$period_reference	Reference declaration
-	 *  @param      string	$exporttype	    	deb=DEB, des=DES
+	 *  @param      string	$period_reference	Reference declaration
+	 *  @param      'deb'|'des'	$exporttype	    	deb=DEB, des=DES
 	 *  @return     string       			  	Return integer <0 if KO, >0 if OK
 	 */
 	public function getSQLFactLines($type, $period_reference, $exporttype = 'deb')
@@ -466,6 +466,9 @@ class IntracommReport extends CommonObject
 			$tabledet = 'facture_fourn_det';
 			$field_link = 'fk_facture_fourn';
 		}
+		list($year, $month) = explode('-', $period_reference);
+		$period_end_of_month_day = cal_days_in_month(CAL_GREGORIAN, (int) $month, (int) $year);
+
 		$sql .= ", l.fk_product, l.qty
 				, p.weight, p.rowid as id_prod, p.customcode
 				, s.rowid as id_client, s.nom, s.zip, s.fk_pays, s.tva_intra
@@ -481,7 +484,7 @@ class IntracommReport extends CommonObject
 				AND l.product_type = ".($exporttype == "des" ? 1 : 0)."
 				AND f.entity = ".((int) $conf->entity)."
 				AND (s.fk_pays <> ".((int) $mysoc->country_id)." OR s.fk_pays IS NULL)
-				AND f.datef BETWEEN '".$this->db->escape($period_reference)."-01' AND '".$this->db->escape($period_reference)."-".date('t')."'";
+				AND f.datef BETWEEN '".$this->db->escape((string) $period_reference)."-01' AND '".$this->db->escape((string) $period_reference)."-".((int) $period_end_of_month_day)."'";
 
 		return $sql;
 	}
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index 8bad85d7b15..4d35c926827 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2015       ATM Consulting          <support@atm-consulting.fr>
  * Copyright (C) 2019-2020  Open-DSI                <support@open-dsi.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -546,7 +546,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column);  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, (string) $conf->main_checkbox_left_column);  // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -765,13 +765,13 @@ while ($i < $imaxinloop) {
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
 				print '<td'.($cssforfield ? ' class="'.$cssforfield.((preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) {
-					print ' title="'.dol_escape_htmltag($object->$key).'"';
+					print ' title="'.dol_escape_htmltag((string) $object->$key).'"';
 				}
 				print '>';
 				if ($key == 'status') {
 					print $object->getLibStatut(5);
 				} elseif ($key == 'rowid') {
-					print $object->showOutputField($val, $key, $object->id, '');
+					print $object->showOutputField($val, $key, (string) $object->id, '');
 				} else {
 					print $object->showOutputField($val, $key, $object->$key, '');
 				}

From 941fa4964bdf857f30ba0e37ab36fdaf4769ff7e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 4 Feb 2025 00:02:03 +0100
Subject: [PATCH 466/602] Qual: Fix phan notices (knowledgemanagement)

---
 htdocs/core/class/html.form.class.php         |  2 +-
 .../class/knowledgerecord.class.php           |  2 +-
 .../mod_knowledgerecord_advanced.php          |  4 +--
 .../knowledgerecord_card.php                  | 16 ++++++----
 .../knowledgerecord_list.php                  | 31 ++++++++++---------
 5 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index afe919f3f01..aea65289ce9 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -9293,7 +9293,7 @@ class Form
 	 * Show a multiselect form from an array. WARNING: Use this only for short lists.
 	 *
 	 * @param 	string 		$htmlname 		Name of select
-	 * @param 	array<string,string|array{id:string,label:string,color:string,picto:string,labelhtml:string}>	$array 			Array(key=>value) or Array(key=>array('id'=>key, 'label'=>value, 'color'=> , 'picto'=> , 'labelhtml'=> ))
+	 * @param 	array<string|int,string|array{id:string,label:string,color:string,picto:string,labelhtml:string}>	$array 			Array(key=>value) or Array(key=>array('id'=>key, 'label'=>value, 'color'=> , 'picto'=> , 'labelhtml'=> ))
 	 * @param 	string[]	$selected 		Array of keys preselected
 	 * @param 	int<0,1>	$key_in_label 	1 to show key like in "[key] value"
 	 * @param 	int<0,1>	$value_as_key 	1 to use value as key
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 4c233a053e7..784b833138f 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -424,7 +424,7 @@ class KnowledgeRecord extends CommonObject
 					if ($key == 't.rowid') {
 						$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
 					} elseif (array_key_exists($key, $this->fields) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate((int) $value)."'";
 					} elseif (strpos($value, '%') === false) {
 						$sqlwhere[] = $this->db->sanitize($key).' IN ('.$this->db->sanitize($this->db->escape($value)).')';
 					} else {
diff --git a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
index 1923836a6fe..51415c1affa 100644
--- a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
+++ b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
  * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  * Copyright (C) 2019-2024  Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -82,7 +82,7 @@ class mod_knowledgerecord_advanced extends ModeleNumRefKnowledgeRecord
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskKnowledgeRecord" value="'.getDolGlobalString('KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADVANCED_MASK').'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskKnowledgeRecord" value="'.getDolGlobalString('KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADVANCED_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>';
 
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index 354bdff5580..bf03ca6313d 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017-2021 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -203,11 +203,13 @@ if ($action == 'create') {
 
 	if (isModEnabled('category')) {
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', 'parent', 64, 0, 3);
+		// $output_mode is 3, so fix return type:
+		'@phan-var-force array<int,array{rowid:int,id:int,fk_parent:int,label:string,description:string,color:string,position:string,visible:int,ref_ext:string,picto:string,fullpath:string,fulllabel:string}> $cate_arbo';
 
 		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').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print "</td></tr>";
 		}
 	}
@@ -260,6 +262,8 @@ if (($id || $ref) && $action == 'edit') {
 
 	if (isModEnabled('category')) {
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', 'parent', 64, 0, 3);
+		// $output_mode is 3, so fix return type:
+		'@phan-var-force array<int,array{rowid:int,id:int,fk_parent:int,label:string,description:string,color:string,position:string,visible:int,ref_ext:string,picto:string,fullpath:string,fulllabel:string}> $cate_arbo';
 
 		if (count($cate_arbo)) {
 			// Categories
@@ -272,7 +276,7 @@ if (($id || $ref) && $action == 'edit') {
 					$arrayselected[] = $cat->id;
 				}
 			}
-			print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+			print $form->multiselectarray('categories', $cate_arbo, $arrayselected, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print "</td></tr>";
 		}
 	}
@@ -482,9 +486,9 @@ 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#formmailbeforetitle');
-			}
+			//if (empty($user->socid)) {
+			//print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle');
+			//}
 
 			// Back to draft
 			if ($object->status == $object::STATUS_VALIDATED) {
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index 6eb297100af..423c44ee4c3 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2023	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2021-2024	Frédéric France			<frederic.france@free.fr>
  * Copyright (C) 2023		Anthony Berton			<anthony.berton@bb2a.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -129,11 +130,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval((string) $val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -472,8 +473,8 @@ 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 .= 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_buildpath('/knowledgemanagement/knowledgerecord_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 
@@ -565,7 +566,7 @@ foreach ($object->fields as $key => $val) {
 		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'.($key == 'status' ? ' search_status width100 onrightofpage' : ''), 1);
-		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:')=== 0)) {
+		} 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'])) {
 			print '<div class="nowrap">';
@@ -577,7 +578,7 @@ foreach ($object->fields as $key => $val) {
 		} 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, 'minwidth100imp maxwidth125', 2);
+			print $formadmin->select_language($search[$key], 'search_lang', 0, array(), 1, 0, 0, 'minwidth100imp maxwidth125', 2);
 		} else {
 			print '<input type="text" class="flat maxwidth'.($val['type'] == 'integer' ? '50' : '75').'" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
@@ -588,7 +589,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -630,7 +631,7 @@ foreach ($object->fields as $key => $val) {
 // 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, 'totalarray'=>&$totalarray);
+$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
@@ -725,13 +726,13 @@ while ($i < $imaxinloop) {
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
 				print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield) && !is_numeric($object->$key)) {
-					print ' title="'.dol_escape_htmltag(dol_nl2br($object->$key, 1)).'"';	// We add dol_nl2br for the question and answer fields
+					print ' title="'.dol_escape_htmltag(dol_nl2br((string) $object->$key, 1)).'"';	// We add dol_nl2br for the question and answer fields
 				}
 				print '>';
 				if ($key == 'status') {
 					print $object->getLibStatut(5);
 				} elseif ($key == 'rowid') {
-					print $object->showOutputField($val, $key, $object->id, '');
+					print $object->showOutputField($val, $key, (string) $object->id, '');
 				} elseif ($key == 'fk_user_creat') {
 					if ($object->fk_user_creat > 0) {
 						if (isset($conf->cache['user'][$object->fk_user_creat])) {
@@ -795,7 +796,7 @@ while ($i < $imaxinloop) {
 		// 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);
+		$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;
 		// Action column
@@ -836,7 +837,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From b8e083a4a07eab992699b2c02a0817a7d9651b67 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 4 Feb 2025 00:18:24 +0100
Subject: [PATCH 467/602] Qual: Fix phan notices (loan)

---
 htdocs/loan/card.php             | 35 ++++++++++++++++----------------
 htdocs/loan/class/loan.class.php | 10 ++++-----
 htdocs/loan/document.php         |  6 +++---
 htdocs/loan/note.php             |  4 ++--
 htdocs/loan/payment/payment.php  |  2 ++
 htdocs/loan/schedule.php         |  8 ++++----
 6 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index db15cac8665..b60db0ef32f 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2015-2024  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2017		Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2020		Maxime DEMAREST				<maxime@indelog.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -274,6 +274,7 @@ $form = new Form($db);
 $formproject = new FormProjets($db);
 $morehtmlstatus = '';
 $outputlangs = $langs;
+$formaccounting = null;
 if (isModEnabled('accounting')) {
 	$formaccounting = new FormAccounting($db);
 }
@@ -347,7 +348,7 @@ if ($action == 'create') {
 
 		print '<tr><td>'.$langs->trans("Project").'</td><td>';
 
-		$numproject = $formproject->select_projects(-1, $projectid, 'projectid', 16, 0, 1, 1);
+		$numproject = $formproject->select_projects(-1, (string) $projectid, 'projectid', 16, 0, 1, 1);
 
 		print '</td></tr>';
 	}
@@ -371,24 +372,24 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Accountancy
-	if (isModEnabled('accounting')) {
+	if (isModEnabled('accounting') && $formaccounting !== null) {
 		/** @var FormAccounting $formaccounting */
 		// 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') : getDolGlobalString('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, array(), 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') : getDolGlobalString('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, array(), 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') : getDolGlobalString('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, array(), 1, 1);
 		print '</td></tr>';
 	} else {
 		// For external software
@@ -467,11 +468,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(-1, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= $formproject->select_projects(-1, (string) $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, -1, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, -1, (string) $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 				}
 			} else {
 				if (!empty($object->fk_project)) {
@@ -563,9 +564,9 @@ if ($id > 0) {
 			print $langs->trans("LoanAccountancyCapitalCode");
 			print '</td><td>';
 
-			if (isModEnabled('accounting')) {
+			if (isModEnabled('accounting') && $formaccounting !== null) {
 				/** @var FormAccounting $formaccounting */
-				print $formaccounting->select_account($object->account_capital, 'accountancy_account_capital', 1, '', 1, 1);
+				print $formaccounting->select_account($object->account_capital, 'accountancy_account_capital', 1, array(), 1, 1);
 			} else {
 				print '<input name="accountancy_account_capital" size="16" value="'.$object->account_capital.'">';
 			}
@@ -577,7 +578,7 @@ if ($id > 0) {
 
 			if (isModEnabled('accounting')) {
 				$accountingaccount = new AccountingAccount($db);
-				$accountingaccount->fetch('', $object->account_capital, 1);
+				$accountingaccount->fetch(0, $object->account_capital, 1);
 
 				print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
 			} else {
@@ -595,9 +596,9 @@ if ($id > 0) {
 			print $langs->trans("LoanAccountancyInsuranceCode");
 			print '</td><td>';
 
-			if (isModEnabled('accounting')) {
+			if (isModEnabled('accounting') && $formaccounting !== null) {
 				/** @var FormAccounting $formaccounting */
-				print $formaccounting->select_account($object->account_insurance, 'accountancy_account_insurance', 1, '', 1, 1);
+				print $formaccounting->select_account($object->account_insurance, 'accountancy_account_insurance', 1, array(), 1, 1);
 			} else {
 				print '<input name="accountancy_account_insurance" size="16" value="'.$object->account_insurance.'">';
 			}
@@ -609,7 +610,7 @@ if ($id > 0) {
 
 			if (isModEnabled('accounting')) {
 				$accountingaccount = new AccountingAccount($db);
-				$accountingaccount->fetch('', $object->account_insurance, 1);
+				$accountingaccount->fetch(0, $object->account_insurance, 1);
 
 				print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
 			} else {
@@ -627,9 +628,9 @@ if ($id > 0) {
 			print $langs->trans("LoanAccountancyInterestCode");
 			print '</td><td>';
 
-			if (isModEnabled('accounting')) {
+			if (isModEnabled('accounting') && $formaccounting !== null) {
 				/** @var FormAccounting $formaccounting */
-				print $formaccounting->select_account($object->account_interest, 'accountancy_account_interest', 1, '', 1, 1);
+				print $formaccounting->select_account($object->account_interest, 'accountancy_account_interest', 1, array(), 1, 1);
 			} else {
 				print '<input name="accountancy_account_interest" size="16" value="'.$object->account_interest.'">';
 			}
@@ -641,7 +642,7 @@ if ($id > 0) {
 
 			if (isModEnabled('accounting')) {
 				$accountingaccount = new AccountingAccount($db);
-				$accountingaccount->fetch('', $object->account_interest, 1);
+				$accountingaccount->fetch(0, $object->account_interest, 1);
 
 				print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
 			} else {
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index e92cf3863bb..9d0e8b8f014 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -301,12 +301,12 @@ class Loan extends CommonObject
 		$sql .= " accountancy_account_capital, accountancy_account_insurance, accountancy_account_interest, entity,";
 		$sql .= " datec, fk_projet, fk_user_author, insurance_amount)";
 		$sql .= " VALUES ('".$this->db->escape($this->label)."',";
-		$sql .= " '".$this->db->escape($this->fk_bank)."',";
+		$sql .= " '".$this->db->escape((string) $this->fk_bank)."',";
 		$sql .= " '".price2num($newcapital)."',";
 		$sql .= " '".$this->db->idate($this->datestart)."',";
 		$sql .= " '".$this->db->idate($this->dateend)."',";
-		$sql .= " '".$this->db->escape($this->nbterm)."',";
-		$sql .= " '".$this->db->escape($this->rate)."',";
+		$sql .= " '".$this->db->escape((string) $this->nbterm)."',";
+		$sql .= " '".$this->db->escape((string) $this->rate)."',";
 		$sql .= " '".$this->db->escape($this->note_private)."',";
 		$sql .= " '".$this->db->escape($this->note_public)."',";
 		$sql .= " '".$this->db->escape($this->account_capital)."',";
@@ -413,7 +413,7 @@ class Loan extends CommonObject
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."loan";
 		$sql .= " SET label='".$this->db->escape($this->label)."',";
-		$sql .= " capital='".price2num($this->db->escape($this->capital))."',";
+		$sql .= " capital='".$this->db->escape(price2num($this->capital))."',";
 		$sql .= " datestart='".$this->db->idate($this->datestart)."',";
 		$sql .= " dateend='".$this->db->idate($this->dateend)."',";
 		$sql .= " nbterm=".((float) $this->nbterm).",";
@@ -423,7 +423,7 @@ class Loan extends CommonObject
 		$sql .= " accountancy_account_interest = '".$this->db->escape($this->account_interest)."',";
 		$sql .= " fk_projet=".(empty($this->fk_project) ? 'NULL' : ((int) $this->fk_project)).",";
 		$sql .= " fk_user_modif = ".((int) $user->id).",";
-		$sql .= " insurance_amount = '".price2num($this->db->escape($this->insurance_amount))."'";
+		$sql .= " insurance_amount = '".price2num($this->db->escape((string) $this->insurance_amount))."'";
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 7439076d226..7d6aba80f8f 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2014-2024	Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) 2017		Ferran Marcet				<fmarcet@2byte.es>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -129,11 +129,11 @@ if ($object->id) {
 				$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', 16, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= $formproject->select_projects($object->socid, (string) $object->fk_project, 'projectid', 16, 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, $object->socid, (string) $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index 680ad131370..8d0765fac30 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -116,11 +116,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', 16, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= $formproject->select_projects($object->socid, (string) $object->fk_project, 'projectid', 16, 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, $object->socid, (string) $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index ce0e53dde2d..e57ea4351ed 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2014-2024	Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) 2015-2025  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2020		Maxime DEMAREST				<maxime@indelog.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -254,6 +255,7 @@ llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'bodyforlist mod-loan pag
 // Form to create loan's payment
 if ($action == 'create') {
 	$total = $loan->capital;
+	$sumpaid = 0;
 
 	print load_fiche_titre($langs->trans("DoPayment"));
 
diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php
index 23e6c561dfd..e02861d8161 100644
--- a/htdocs/loan/schedule.php
+++ b/htdocs/loan/schedule.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2017		Franck Moreau				<franck.moreau@theobald.com>
  * Copyright (C) 2018-2024	Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) 2020		Maxime DEMAREST				<maxime@indelog.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France				<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -125,7 +125,7 @@ if ($action == 'updateecheancier' && empty($pay_without_schedule) && $permission
 	while ($i < $object->nbterm + 1) {
 		$mens = price2num(GETPOST('mens'.$i));
 		$int = price2num(GETPOST('hi_interets'.$i));
-		$id = GETPOST('hi_rowid'.$i);
+		$id = GETPOSTINT('hi_rowid'.$i);
 		$insurance = price2num(GETPOST('hi_insurance'.$i));
 
 		$new_echeance = new LoanSchedule($db);
@@ -185,11 +185,11 @@ if (isModEnabled('project')) {
 				$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(-1, $object->fk_project, 'projectid', 16, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= $formproject->select_projects(-1, (string) $object->fk_project, 'projectid', 16, 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, -1, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, -1, (string) $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		}
 	} else {

From 5ead7465115a94ec7cfe1dcca50e3f05c69fb07c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 4 Feb 2025 00:36:09 +0100
Subject: [PATCH 468/602] Qual: Fix phan notices (main.inc,master.inc)

---
 htdocs/main.inc.php   | 10 +++++-----
 htdocs/master.inc.php | 24 ++++++++++++++++++------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index ac53e4decaa..1bfd7b4361e 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -12,12 +12,12 @@
  * Copyright (C) 2014-2015  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2020       Demarest Maxime         <maxime@indelog.fr>
- * Copyright (C) 2020-2024       Charlene Benke          <charlene@patas-monkey.com>
+ * Copyright (C) 2020-2024  Charlene Benke          <charlene@patas-monkey.com>
  * Copyright (C) 2021-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2021       Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2023       Joachim Küter      		<git-jk@bloxera.com>
  * Copyright (C) 2023       Eric Seigne      		<eric.seigne@cap-rel.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -255,7 +255,7 @@ function testSqlAndScriptInject($val, $type)
 /**
  * Return true if security check on parameters are OK, false otherwise.
  *
- * @param		string|array<string,string>	$var		Variable name
+ * @param		string|array<int|string,string>	$var		Variable name
  * @param		int<0,2>		$type		1=GET, 0=POST, 2=PHP_SELF
  * @param		int<0,1>		$stopcode	0=No stop code, 1=Stop code (default) if injection found
  * @return		boolean						True if there is no injection.
@@ -3133,7 +3133,7 @@ function printDropdownQuickadd($mode = 0)
 	// Allow the $items of the menu to be manipulated by modules
 	$parameters = array();
 	$hook_items = $items;
-	$reshook = $hookmanager->executeHooks('menuDropdownQuickaddItems', $parameters, $hook_items); // Note that $action and $object may have been modified by some hooks
+	$reshook = $hookmanager->executeHooks('menuDropdownQuickaddItems', $parameters, $hook_items); // Note that $action and $object may have been modified by some hooks @phan-suppress-current-line PhanTypeMismatchArgument
 	if (is_numeric($reshook) && !empty($hookmanager->resArray) && is_array($hookmanager->resArray)) {
 		if ($reshook == 0) {
 			$items['items'] = array_merge($items['items'], $hookmanager->resArray); // add
@@ -3498,7 +3498,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 
 				//$textsearch = $langs->trans("Search");
 				$textsearch = '<span class="fa fa-search paddingright pictofixedwidth"></span>'.$langs->trans("Search");
-				$searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, 'accesskey="s"', 1, 0, (getDolGlobalString('MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY') ? 0 : 1), 'vmenusearchselectcombo', 1, $textsearch, 1, $stringforfirstkey.' s');
+				$searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, (string) $selected, 'accesskey="s"', 1, 0, (getDolGlobalString('MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY') ? 0 : 1), 'vmenusearchselectcombo', 1, $textsearch, 1, $stringforfirstkey.' s');
 			} else {
 				if (is_array($arrayresult)) {
 					// @phan-suppress-next-line PhanEmptyForeach // array is really empty in else case.
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index e2ccbe25dd2..41cb8f391cd 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2010		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2014		Teddy Andreotti			<125155@supinfo.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -45,6 +45,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
  * @var string $dolibarr_main_url_root_alt
  */
 
+'
+@phan-var-force ?string $dolibarr_main_db_prefix
+@phan-var-force ?string $dolibarr_main_db_encryption
+@phan-var-force ?string $dolibarr_main_db_cryptkey
+@phan-var-force ?string $dolibarr_main_limit_users
+@phan-var-force ?string $dolibarr_main_url_root_alt
+';
+
 if (!function_exists('is_countable')) {
 	/**
 	 * function is_countable (to remove when php version supported will be >= 7.3)
@@ -99,7 +107,7 @@ if (!empty($dolibarr_main_document_root_alt)) {
 	foreach ($values as $value) {
 		$conf->file->dol_document_root['alt'.($i++)] = (string) $value;
 	}
-	$values = preg_split('/[;,]/', $dolibarr_main_url_root_alt);
+	$values = preg_split('/[;,]/', (string) $dolibarr_main_url_root_alt);
 	$i = 0;
 	foreach ($values as $value) {
 		if (preg_match('/^http(s)?:/', $value)) {
@@ -178,14 +186,16 @@ unset($conf->db->pass); // This is to avoid password to be shown in memory/swap
 /*
  * Object $user
  */
-if (!defined('NOREQUIREUSER')) {
+if (!defined('NOREQUIREUSER') && $db !== null) {
 	$user = new User($db);
 }
 
 /*
  * Create the global $hookmanager object
  */
-$hookmanager = new HookManager($db);
+if ($db !== null) {
+	$hookmanager = new HookManager($db);
+}
 
 
 /*
@@ -212,10 +222,12 @@ if (!is_numeric($conf->entity)) {
 }
 // Here we read database (llx_const table) and define conf var $conf->global->XXX.
 //print "We work with data into entity instance number '".$conf->entity."'";
-$conf->setValues($db);
+if ($db !== null) {
+	$conf->setValues($db);
+}
 
 // Create object $mysoc (A thirdparty object that contains properties of companies managed by Dolibarr.
-if (!defined('NOREQUIREDB') && !defined('NOREQUIRESOC')) {
+if (!defined('NOREQUIREDB') && !defined('NOREQUIRESOC') && $db != null) {
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
 	$mysoc = new Societe($db);

From fb62409ca7351e8b73aa1193437f4b88f028a5aa Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 4 Feb 2025 01:17:07 +0100
Subject: [PATCH 469/602] Qual: Fix phan notices (eldy.lib)

---
 htdocs/core/lib/functions.lib.php       |   4 +-
 htdocs/core/menus/standard/eldy.lib.php | 138 ++++++++++++------------
 2 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index fa6deaefda1..3695a1eeb69 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -12452,7 +12452,7 @@ function colorIsLight($stringcolor)
  * Function to test if an entry is enabled or not
  *
  * @param	int<0,1>	$type_user					0=We test for internal user, 1=We test for external user
- * @param	array{enabled:int<0,1>,module:string,perms:string} $menuentry	Array for feature entry to test
+ * @param	array{enabled:int<0,1>,module?:string,perms:string} $menuentry	Array for feature entry to test
  * @param	string[]	$listofmodulesforexternal	Array with list of modules allowed to external users
  * @return	int<0,2>								0=Hide, 1=Show, 2=Show gray
  */
@@ -12465,7 +12465,7 @@ function isVisibleToUserType($type_user, &$menuentry, &$listofmodulesforexternal
 	if (empty($menuentry['enabled'])) {
 		return 0; // Entry disabled by condition
 	}
-	if ($type_user && $menuentry['module']) {
+	if ($type_user && array_key_exists('module', $menuentry) && $menuentry['module']) {
 		$tmploops = explode('|', $menuentry['module']);
 		$found = 0;
 		foreach ($tmploops as $tmploop) {
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 76040bb5c01..3b3c57167ac 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2018		Ferran Marcet				<fmarcet@2byte.es>
  * Copyright (C) 2018-2024	Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2021		Gauthier VERDOL				<gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -97,8 +97,8 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Members
 	$tmpentry = array(
-		'enabled' => isModEnabled('member'),
-		'perms' => $user->hasRight('adherent', 'lire'),
+		'enabled' => (int) isModEnabled('member'),
+		'perms' => (string) (int) $user->hasRight('adherent', 'lire'),
 		'module' => 'adherent'
 	);
 	$menu_arr[] = array(
@@ -106,7 +106,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'link' => '/adherents/index.php?mainmenu=members&amp;leftmenu=',
 		'title' => "MenuMembers",
 		'level' => 0,
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => (int) ($showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal)),
 		'target' => $atarget,
 		'mainmenu' => "members",
 		'leftmenu' => '',
@@ -122,14 +122,14 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Third parties
 	$tmpentry = array(
-		'enabled' => (
+		'enabled' => (int) (
 			(
 				isModEnabled('societe') &&
 			(!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') || !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS'))
 			)
 			|| (isModEnabled('supplier_proposal') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice'))
 		),
-		'perms' => ($user->hasRight('societe', 'lire') || $user->hasRight('societe', 'contact', 'lire') || $user->hasRight('fournisseur', 'lire') || $user->hasRight('supplier_order', 'lire') || $user->hasRight('supplier_invoice', 'lire') || $user->hasRight('supplier_proposal', 'lire')),
+		'perms' => (string) (int) ($user->hasRight('societe', 'lire') || $user->hasRight('societe', 'contact', 'lire') || $user->hasRight('fournisseur', 'lire') || $user->hasRight('supplier_order', 'lire') || $user->hasRight('supplier_invoice', 'lire') || $user->hasRight('supplier_proposal', 'lire')),
 		'module' => 'societe|fournisseur'
 	);
 
@@ -138,7 +138,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'link' => '/societe/index.php?mainmenu=companies&amp;leftmenu=',
 		'title' => "ThirdParties",
 		'level' => 0,
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => (int) ($showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal)),
 		'target' => $atarget,
 		'mainmenu' => "companies",
 		'leftmenu' => '',
@@ -154,8 +154,8 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Products-Services
 	$tmpentry = array(
-		'enabled' => (isModEnabled('product') || isModEnabled('service') || isModEnabled('shipping')),
-		'perms' => ($user->hasRight('product', 'read') || $user->hasRight('service', 'read') || $user->hasRight('expedition', 'lire')),
+		'enabled' => (int) (isModEnabled('product') || isModEnabled('service') || isModEnabled('shipping')),
+		'perms' => (string) (int) ($user->hasRight('product', 'read') || $user->hasRight('service', 'read') || $user->hasRight('expedition', 'lire')),
 		'module' => 'product|service'
 	);
 	$menu_arr[] = array(
@@ -165,7 +165,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		? (array("TMenuProducts", " | ", "TMenuServices"))
 		: (isModEnabled('product') ? "TMenuProducts" : "TMenuServices"),
 		'level' => 0,
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => (int) ($showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal)),
 		'target' => $atarget,
 		'mainmenu' => "products",
 		'leftmenu' => '',
@@ -181,8 +181,8 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// MRP - GPAO
 	$tmpentry = array(
-		'enabled' => (isModEnabled('bom') || isModEnabled('mrp')),
-		'perms' => ($user->hasRight('bom', 'read') || $user->hasRight('mrp', 'read')),
+		'enabled' => (int) (isModEnabled('bom') || isModEnabled('mrp')),
+		'perms' => (string) (int) ($user->hasRight('bom', 'read') || $user->hasRight('mrp', 'read')),
 		'module' => 'bom|mrp'
 	);
 	$menu_arr[] = array(
@@ -190,7 +190,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'link' => '/mrp/index.php?mainmenu=mrp&amp;leftmenu=',
 		'title' => "TMenuMRP",
 		'level' => 0,
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => (int) ($showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal)),
 		'target' => $atarget,
 		'mainmenu' => "mrp",
 		'leftmenu' => '',
@@ -206,8 +206,8 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Projects
 	$tmpentry = array(
-		'enabled' => (isModEnabled('project') ? 1 : 0),
-		'perms' => ($user->hasRight('projet', 'lire') ? 1 : 0),
+		'enabled' => (int) (isModEnabled('project') ? 1 : 0),
+		'perms' => (string) (int) ($user->hasRight('projet', 'lire') ? 1 : 0),
 		'module' => 'projet'
 	);
 
@@ -228,7 +228,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'link' => '/projet/index.php?mainmenu=project&amp;leftmenu=',
 		'title' => $titleboth,
 		'level' => 0,
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => (int) ($showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal)),
 		'target' => $atarget,
 		'mainmenu' => "project",
 		'leftmenu' => '',
@@ -244,7 +244,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Commercial (propal, commande, supplier_proposal, supplier_order, contrat, ficheinter)
 	$tmpentry = array(
-		'enabled' => (
+		'enabled' => (int) (
 			isModEnabled('propal')
 			|| isModEnabled('order')
 			|| isModEnabled('fournisseur')
@@ -253,7 +253,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			|| isModEnabled('contract')
 			|| isModEnabled('intervention')
 		) ? 1 : 0,
-		'perms' => (
+		'perms' => (string) (int) (
 			$user->hasRight('propal', 'read')
 			|| $user->hasRight('commande', 'lire')
 			|| $user->hasRight('supplier_proposal', 'lire')
@@ -279,7 +279,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'link' => ($onlysupplierorder ? '/fourn/commande/index.php?mainmenu=commercial&amp;leftmenu=' : '/comm/index.php?mainmenu=commercial&amp;leftmenu='),
 		'title' => "Commercial",
 		'level' => 0,
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => (int) ($showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal)),
 		'target' => $atarget,
 		'mainmenu' => "commercial",
 		'leftmenu' => '',
@@ -295,7 +295,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Billing - Financial
 	$tmpentry = array(
-		'enabled' => (
+		'enabled' => (int) (
 			isModEnabled('invoice') ||
 			isModEnabled('don') ||
 			isModEnabled('tax') ||
@@ -304,7 +304,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			isModEnabled('loan') ||
 			isModEnabled('margin')
 		) ? 1 : 0,
-		'perms' => ($user->hasRight('facture', 'lire') || $user->hasRight('don', 'contact', 'lire')
+		'perms' => (string) (int) ($user->hasRight('facture', 'lire') || $user->hasRight('don', 'contact', 'lire')
 			|| $user->hasRight('tax', 'charges', 'lire') || $user->hasRight('salaries', 'read')
 			|| $user->hasRight('fournisseur', 'facture', 'lire') || $user->hasRight('loan', 'read') || $user->hasRight('margins', 'liretous')),
 		'module' => 'facture|supplier_invoice|don|tax|salaries|loan'
@@ -314,7 +314,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'link' => '/compta/index.php?mainmenu=billing&amp;leftmenu=',
 		'title' =>  "MenuFinancial",
 		'level' => 0,
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => (int) ($showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal)),
 		'target' => $atarget,
 		'mainmenu' => "billing",
 		'leftmenu' => '',
@@ -330,8 +330,8 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Bank
 	$tmpentry = array(
-		'enabled' => (isModEnabled('bank') || isModEnabled('prelevement')),
-		'perms' => ($user->hasRight('banque', 'lire') || $user->hasRight('prelevement', 'lire') || $user->hasRight('paymentbybanktransfer', 'read')),
+		'enabled' => (int) (isModEnabled('bank') || isModEnabled('prelevement')),
+		'perms' => (string) (int) ($user->hasRight('banque', 'lire') || $user->hasRight('prelevement', 'lire') || $user->hasRight('paymentbybanktransfer', 'read')),
 		'module' => 'banque|prelevement|paymentbybanktransfer'
 	);
 	$menu_arr[] = array(
@@ -339,7 +339,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'link' => '/compta/bank/list.php?mainmenu=bank&amp;leftmenu=&amp;search_status=opened',
 		'title' =>  "MenuBankCash",
 		'level' => 0,
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => (int) ($showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal)),
 		'target' => $atarget,
 		'mainmenu' => "bank",
 		'leftmenu' => '',
@@ -355,8 +355,8 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Accounting
 	$tmpentry = array(
-		'enabled' => (isModEnabled('comptabilite') || isModEnabled('accounting') || isModEnabled('asset') || isModEnabled('intracommreport')),
-		'perms' => ($user->hasRight('compta', 'resultat', 'lire') || $user->hasRight('accounting', 'comptarapport', 'lire') || $user->hasRight('accounting', 'mouvements', 'lire') || $user->hasRight('asset', 'read') || $user->hasRight('intracommreport', 'read')),
+		'enabled' => (int) (isModEnabled('comptabilite') || isModEnabled('accounting') || isModEnabled('asset') || isModEnabled('intracommreport')),
+		'perms' => (string) (int) ($user->hasRight('compta', 'resultat', 'lire') || $user->hasRight('accounting', 'comptarapport', 'lire') || $user->hasRight('accounting', 'mouvements', 'lire') || $user->hasRight('asset', 'read') || $user->hasRight('intracommreport', 'read')),
 		'module' => 'comptabilite|accounting|asset|intracommreport'
 	);
 	$menu_arr[] = array(
@@ -364,7 +364,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'link' => '/accountancy/index.php?mainmenu=accountancy&amp;leftmenu=',
 		'title' =>  "MenuAccountancy",
 		'level' => 0,
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => (int) ($showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal)),
 		'target' => $atarget,
 		'mainmenu' => "accountancy",
 		'leftmenu' => '',
@@ -380,8 +380,8 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// HRM
 	$tmpentry = array(
-		'enabled' => (isModEnabled('hrm') || (isModEnabled('holiday')) || isModEnabled('deplacement') || isModEnabled('expensereport') || isModEnabled('recruitment')),
-		'perms' => ($user->hasRight('user', 'user', 'lire') || $user->hasRight('holiday', 'read') || $user->hasRight('deplacement', 'lire') || $user->hasRight('expensereport', 'lire') || $user->hasRight('recruitment', 'recruitmentjobposition', 'read')),
+		'enabled' => (int) (isModEnabled('hrm') || (isModEnabled('holiday')) || isModEnabled('deplacement') || isModEnabled('expensereport') || isModEnabled('recruitment')),
+		'perms' => (string) (int) ($user->hasRight('user', 'user', 'lire') || $user->hasRight('holiday', 'read') || $user->hasRight('deplacement', 'lire') || $user->hasRight('expensereport', 'lire') || $user->hasRight('recruitment', 'recruitmentjobposition', 'read')),
 		'module' => 'hrm|holiday|deplacement|expensereport|recruitment'
 	);
 
@@ -390,7 +390,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'link' => '/hrm/index.php?mainmenu=hrm&amp;leftmenu=',
 		'title' =>  "HRM",
 		'level' => 0,
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => (int) ($showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal)),
 		'target' => $atarget,
 		'mainmenu' => "hrm",
 		'leftmenu' => '',
@@ -406,8 +406,8 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Tickets and Knowledge base
 	$tmpentry = array(
-		'enabled' => (isModEnabled('ticket') || isModEnabled('knowledgemanagement')),
-		'perms' => ($user->hasRight('ticket', 'read') || $user->hasRight('knowledgemanagement', 'knowledgerecord', 'read')),
+		'enabled' => (int) (isModEnabled('ticket') || isModEnabled('knowledgemanagement')),
+		'perms' => (string) (int) ($user->hasRight('ticket', 'read') || $user->hasRight('knowledgemanagement', 'knowledgerecord', 'read')),
 		'module' => 'ticket|knowledgemanagement'
 	);
 	$link = '';
@@ -421,7 +421,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'link' => $link,
 		'title' =>  isModEnabled('ticket') ? "Tickets" : "MenuKnowledgeRecordShort",
 		'level' => 0,
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => (int) ($showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal)),
 		'target' => $atarget,
 		'mainmenu' => "ticket",
 		'leftmenu' => '',
@@ -438,7 +438,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Tools
 	$tmpentry = array(
 		'enabled' => 1,
-		'perms' => 1,
+		'perms' => '1',
 		'module' => ''
 	);
 	$menu_arr[] = array(
@@ -446,7 +446,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'link' => '/core/tools.php?mainmenu=tools&amp;leftmenu=',
 		'title' =>  "Tools",
 		'level' => 0,
-		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => (int) ($showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal)),
 		'target' => $atarget,
 		'mainmenu' => "tools",
 		'leftmenu' => '',
@@ -484,7 +484,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 				$mtitle = $langs->trans($smenu->title);
 			}
 			// Add item
-			$menu->add($smenu->link, $mtitle, $smenu->level, $smenu->enabled, $smenu->target, $smenu->mainmenu, $smenu->leftmenu, $smenu->position, $smenu->id, $smenu->idsel, $smenu->classname, $smenu->prefix);
+			$menu->add($smenu->link, $mtitle, $smenu->level, $smenu->enabled, $smenu->target, $smenu->mainmenu, $smenu->leftmenu, $smenu->position, $smenu->id, $smenu->idsel, $smenu->classname, (string) $smenu->prefix);
 		}
 	}
 
@@ -724,9 +724,9 @@ function print_end_menu_array()
  * Fill &$menu (example with $forcemainmenu='home' $forceleftmenu='all', return left menu tree of Home)
  *
  * @param	DoliDB		$db                 Database handler
- * @param 	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string}> 	$menu_array_before  Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
- * @param   array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string}>		$menu_array_after   Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
- * @param	array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string}> 	$tabMenu       		If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+ * @param 	array<array{rowid:string,fk_menu:string,module?:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string}> 	$menu_array_before  Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
+ * @param   array<array{rowid:string,fk_menu:string,module?:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string}>		$menu_array_after   Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
+ * @param	array<array{rowid:string,fk_menu:string,module?:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level?:int,prefix:string}> 	$tabMenu       		If array with menu entries already loaded, we put this array here (in most cases, it's empty)
  * @param	Menu		$menu				Object Menu to return back list of menu entries
  * @param	int<0,1>	$noout				Disable output (Initialise &$menu only).
  * @param	string		$forcemainmenu		'x'=Force mainmenu to mainmenu='x'
@@ -907,7 +907,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		'mainmenu' => $mainmenu,
 	);
 	$hook_items = $menu_array;
-	$reshook = $hookmanager->executeHooks('menuLeftMenuItems', $parameters, $hook_items); // Note that $action and $object may have been modified by some hooks
+	$reshook = $hookmanager->executeHooks('menuLeftMenuItems', $parameters, $hook_items); // Note that $action and $object may have been modified by some hooks  @phan-suppress-current-line PhanTypeMismatchArgument
 
 	if (is_numeric($reshook)) {
 		if ($reshook == 0 && !empty($hookmanager->resArray)) {
@@ -1224,17 +1224,17 @@ function get_left_menu_home($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 		$newmenu->add("/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->hasRight('user', 'user', 'read'), '', $mainmenu, 'users', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));
 		if ($user->hasRight('user', 'user', 'read')) {
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "users") {
-				$newmenu->add("", $langs->trans("Users"), 1, $user->hasRight('user', 'user', 'read') || $user->admin);
-				$newmenu->add("/user/card.php?leftmenu=users&action=create", $langs->trans("NewUser"), 2, ($user->hasRight("user", "user", "write") || $user->admin) && !(isModEnabled('multicompany') && !empty($user->entity) && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')), '', 'home');
-				$newmenu->add("/user/list.php?leftmenu=users", $langs->trans("ListOfUsers"), 2, $user->hasRight('user', 'user', 'read') || $user->admin);
-				$newmenu->add("/user/hierarchy.php?leftmenu=users", $langs->trans("HierarchicView"), 2, $user->hasRight('user', 'user', 'read') || $user->admin);
+				$newmenu->add("", $langs->trans("Users"), 1, (int) ($user->hasRight('user', 'user', 'read') || $user->admin));
+				$newmenu->add("/user/card.php?leftmenu=users&action=create", $langs->trans("NewUser"), 2, (int) (($user->hasRight("user", "user", "write") || $user->admin) && !(isModEnabled('multicompany') && !empty($user->entity) && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE'))), '', 'home');
+				$newmenu->add("/user/list.php?leftmenu=users", $langs->trans("ListOfUsers"), 2, (int) ($user->hasRight('user', 'user', 'read') || $user->admin));
+				$newmenu->add("/user/hierarchy.php?leftmenu=users", $langs->trans("HierarchicView"), 2, (int) ($user->hasRight('user', 'user', 'read') || $user->admin));
 				if (isModEnabled('category')) {
 					$langs->load("categories");
 					$newmenu->add("/categories/index.php?leftmenu=users&type=7", $langs->trans("UsersCategoriesShort"), 2, $user->hasRight('categorie', 'read'), '', $mainmenu, 'cat');
 				}
-				$newmenu->add("", $langs->trans("Groups"), 1, ($user->hasRight('user', 'user', 'read') || $user->admin) && !(isModEnabled('multicompany') && !empty($user->entity) && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')));
-				$newmenu->add("/user/group/card.php?leftmenu=users&action=create", $langs->trans("NewGroup"), 2, ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight("user", "group_advance", "write") : $user->hasRight("user", "user", "write")) || $user->admin) && !(isModEnabled('multicompany') && !empty($user->entity) && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')));
-				$newmenu->add("/user/group/list.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('user', 'group_advance', 'read') : $user->hasRight('user', 'user', 'read')) || $user->admin));
+				$newmenu->add("", $langs->trans("Groups"), 1, (int) (($user->hasRight('user', 'user', 'read') || $user->admin) && !(isModEnabled('multicompany') && !empty($user->entity) && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE'))));
+				$newmenu->add("/user/group/card.php?leftmenu=users&action=create", $langs->trans("NewGroup"), 2, (int) (((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight("user", "group_advance", "write") : $user->hasRight("user", "user", "write")) || $user->admin) && !(isModEnabled('multicompany') && !empty($user->entity) && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE'))));
+				$newmenu->add("/user/group/list.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, (int) ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('user', 'group_advance', 'read') : $user->hasRight('user', 'user', 'read')) || $user->admin));
 			}
 		}
 	}
@@ -1289,9 +1289,9 @@ function get_left_menu_thridparties($mainmenu, &$newmenu, $usemenuhider = 1, $le
 		// Suppliers
 		if (isModEnabled('societe') && (isModEnabled('supplier_order') || isModEnabled('supplier_invoice') || isModEnabled('supplier_proposal'))) {
 			$langs->load("suppliers");
-			$newmenu->add("/societe/list.php?type=f&amp;leftmenu=suppliers", $langs->trans("Suppliers"), 2, ($user->hasRight('fournisseur', 'lire') || $user->hasRight('supplier_order', 'lire') || $user->hasRight('supplier_invoice', 'lire') || $user->hasRight('supplier_proposal', 'lire')), '', $mainmenu, 'suppliers', 15);
+			$newmenu->add("/societe/list.php?type=f&amp;leftmenu=suppliers", $langs->trans("Suppliers"), 2, (int) ($user->hasRight('fournisseur', 'lire') || $user->hasRight('supplier_order', 'lire') || $user->hasRight('supplier_invoice', 'lire') || $user->hasRight('supplier_proposal', 'lire')), '', $mainmenu, 'suppliers', 15);
 
-			$newmenu->add("/societe/card.php?leftmenu=suppliers&action=create&type=f", $langs->trans("MenuNewSupplier"), 3, $user->hasRight('societe', 'creer') && ($user->hasRight('fournisseur', 'lire') || $user->hasRight('supplier_order', 'lire') || $user->hasRight('supplier_invoice', 'lire') || $user->hasRight('supplier_proposal', 'lire')));
+			$newmenu->add("/societe/card.php?leftmenu=suppliers&action=create&type=f", $langs->trans("MenuNewSupplier"), 3, (int) ($user->hasRight('societe', 'creer') && ($user->hasRight('fournisseur', 'lire') || $user->hasRight('supplier_order', 'lire') || $user->hasRight('supplier_invoice', 'lire') || $user->hasRight('supplier_proposal', 'lire'))));
 		}
 
 		// Categories
@@ -1514,7 +1514,7 @@ function get_left_menu_billing($mainmenu, &$newmenu, $usemenuhider = 1, $leftmen
 		if (isModEnabled('societe') && isModEnabled('supplier_invoice') && !getDolGlobalString('SUPPLIER_INVOICE_MENU_DISABLED')) {
 			$langs->load("bills");
 			$newmenu->add("/fourn/facture/index.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"), 0, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills', 0, '', '', '', img_picto('', 'supplier_invoice', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/fourn/facture/card.php?leftmenu=suppliers_bills&action=create", $langs->trans("NewBill"), 1, ($user->hasRight('fournisseur', 'facture', 'creer') || $user->hasRight('supplier_invoice', 'creer')), '', $mainmenu, 'suppliers_bills_create');
+			$newmenu->add("/fourn/facture/card.php?leftmenu=suppliers_bills&action=create", $langs->trans("NewBill"), 1, (int) ($user->hasRight('fournisseur', 'facture', 'creer') || $user->hasRight('supplier_invoice', 'creer')), '', $mainmenu, 'suppliers_bills_create');
 			$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"), 1, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_list');
 
 			if ($usemenuhider || empty($leftmenu) || preg_match('/suppliers_bills/', $leftmenu)) {
@@ -1821,7 +1821,7 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 
 
 			// Accounting
-			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, $user->hasRight('accounting', 'mouvements', 'lire') || $user->hasRight('accounting', 'comptarapport', 'lire'), '', $mainmenu, 'accountancy', 1, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, (int) ($user->hasRight('accounting', 'mouvements', 'lire') || $user->hasRight('accounting', 'comptarapport', 'lire')), '', $mainmenu, 'accountancy', 1, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
 
 			// General Ledger
 			$newmenu->add("/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Bookkeeping"), 1, $user->hasRight('accounting', 'mouvements', 'lire'));
@@ -2003,10 +2003,10 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 			$newmenu->add("/asset/list.php?leftmenu=asset&mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->hasRight('asset', 'read'), '', $mainmenu, 'asset', 100, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
 			$newmenu->add("/asset/card.php?leftmenu=asset&action=create", $langs->trans("MenuNewAsset"), 1, $user->hasRight('asset', 'write'));
 			$newmenu->add("/asset/list.php?leftmenu=asset&mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->hasRight('asset', 'read'));
-			$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuAssetModels"), 1, (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'read')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'read')), '', $mainmenu, 'asset_model');
+			$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuAssetModels"), 1, (int) ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'read')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'read'))), '', $mainmenu, 'asset_model');
 			if ($usemenuhider || empty($leftmenu) || preg_match('/asset_model/', $leftmenu)) {
-				$newmenu->add("/asset/model/card.php?leftmenu=asset_model&action=create", $langs->trans("MenuNewAssetModel"), 2, (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'write')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'write')));
-				$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuListAssetModels"), 2, (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'read')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'read')));
+				$newmenu->add("/asset/model/card.php?leftmenu=asset_model&action=create", $langs->trans("MenuNewAssetModel"), 2, (int) ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'write')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'write'))));
+				$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuListAssetModels"), 2, (int) ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'read')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'read'))));
 			}
 		}
 	}
@@ -2088,9 +2088,9 @@ function get_left_menu_bank($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 		// Cash Control
 		if (isModEnabled('takepos') || isModEnabled('cashdesk')) {
 			$permtomakecashfence = ($user->hasRight('cashdesk', 'run') || $user->hasRight('takepos', 'run'));
-			$newmenu->add("/compta/cashcontrol/cashcontrol_list.php", $langs->trans("CashControl"), 0, $permtomakecashfence, '', $mainmenu, 'cashcontrol', 0, '', '', '', img_picto('', 'pos', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/compta/cashcontrol/cashcontrol_card.php?action=create", $langs->trans("NewCashFence"), 1, $permtomakecashfence);
-			$newmenu->add("/compta/cashcontrol/cashcontrol_list.php", $langs->trans("List"), 1, $permtomakecashfence);
+			$newmenu->add("/compta/cashcontrol/cashcontrol_list.php", $langs->trans("CashControl"), 0, (int) $permtomakecashfence, '', $mainmenu, 'cashcontrol', 0, '', '', '', img_picto('', 'pos', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/compta/cashcontrol/cashcontrol_card.php?action=create", $langs->trans("NewCashFence"), 1, (int) $permtomakecashfence);
+			$newmenu->add("/compta/cashcontrol/cashcontrol_list.php", $langs->trans("List"), 1, (int) $permtomakecashfence);
 		}
 	}
 }
@@ -2116,12 +2116,12 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 			$newmenu->add("/product/card.php?leftmenu=product&action=create&amp;type=0", $langs->trans("NewProduct"), 1, $user->hasRight('product', 'creer'));
 			$newmenu->add("/product/list.php?leftmenu=product&type=0", $langs->trans("List"), 1, $user->hasRight('product', 'read'));
 			if (isModEnabled('stock')) {
-				$newmenu->add("/product/reassort.php?type=0", $langs->trans("MenuStocks"), 1, $user->hasRight('product', 'read') && $user->hasRight('stock', 'lire'));
+				$newmenu->add("/product/reassort.php?type=0", $langs->trans("MenuStocks"), 1, (int) ($user->hasRight('product', 'read') && $user->hasRight('stock', 'lire')));
 			}
 			if (isModEnabled('productbatch')) {
 				$langs->load("stocks");
-				$newmenu->add("/product/reassortlot.php?type=0&search_subjecttolotserial=1", $langs->trans("StocksByLotSerial"), 1, $user->hasRight('product', 'read') && $user->hasRight('stock', 'lire'));
-				$newmenu->add("/product/stock/productlot_list.php", $langs->trans("LotSerial"), 1, $user->hasRight('product', 'read') && $user->hasRight('stock', 'lire'));
+				$newmenu->add("/product/reassortlot.php?type=0&search_subjecttolotserial=1", $langs->trans("StocksByLotSerial"), 1, (int) ($user->hasRight('product', 'read') && $user->hasRight('stock', 'lire')));
+				$newmenu->add("/product/stock/productlot_list.php", $langs->trans("LotSerial"), 1, (int) ($user->hasRight('product', 'read') && $user->hasRight('stock', 'lire')));
 			}
 			if (isModEnabled('variants')) {
 				$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->hasRight('product', 'read'));
@@ -2145,7 +2145,7 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 			$newmenu->add("/product/list.php?leftmenu=service&type=1", $langs->trans("List"), 1, $user->hasRight('service', 'read'));
 
 			if (isModEnabled('stock') && getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
-				$newmenu->add("/product/reassort.php?type=1", $langs->trans("MenuStocks"), 1, $user->hasRight('service', 'read') && $user->hasRight('stock', 'lire'));
+				$newmenu->add("/product/reassort.php?type=1", $langs->trans("MenuStocks"), 1, (int) ($user->hasRight('service', 'read') && $user->hasRight('stock', 'lire')));
 			}
 			if (isModEnabled('variants')) {
 				$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->hasRight('service', 'read'));
@@ -2171,9 +2171,9 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 
 			$newmenu->add("/product/stock/massstockmove.php?init=1", $langs->trans("MassStockTransferShort"), 1, $user->hasRight('stock', 'mouvement', 'creer'));
 			if (isModEnabled('supplier_order')) {
-				$newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->hasRight('stock', 'mouvement', 'creer') && $user->hasRight('fournisseur', 'lire'));
+				$newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, (int) ($user->hasRight('stock', 'mouvement', 'creer') && $user->hasRight('fournisseur', 'lire')));
 			}
-			$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->hasRight('product', 'read') && $user->hasRight('stock', 'lire'));
+			$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, (int) ($user->hasRight('product', 'read') && $user->hasRight('stock', 'lire')));
 
 			// Categories for warehouses
 			if (isModEnabled('category')) {
@@ -2294,8 +2294,8 @@ function get_left_menu_projects($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 			$search_project_user = GETPOSTINT('search_project_user');
 
 			$tmpentry = array(
-				'enabled' => isModEnabled('project'),
-				'perms' => $user->hasRight('projet', 'lire'),
+				'enabled' => (int) isModEnabled('project'),
+				'perms' => (string) (int) $user->hasRight('projet', 'lire'),
 				'module' => 'projet'
 			);
 			$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));
@@ -2392,7 +2392,7 @@ function get_left_menu_hrm($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 			$newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Evals"), 1, $user->hasRight('hrm', 'evaluation', 'read'), '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));
 			//$newmenu->add("/hrm/evaluation_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->trans("NewEval"), 1, $user->hasRight('hrm',  'evaluation', 'write'));
 			//$newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->hasRight('hrm', 'evaluation', 'read'));
-			$newmenu->add("/hrm/compare.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillComparison"), 1, $user->hasRight('hrm', 'evaluation', 'read') || $user->hasRight('hrm', 'compare_advance', 'read'));
+			$newmenu->add("/hrm/compare.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillComparison"), 1, (int) ($user->hasRight('hrm', 'evaluation', 'read') || $user->hasRight('hrm', 'compare_advance', 'read')));
 		}
 
 		// Leave/Holiday/Vacation module
@@ -2402,7 +2402,7 @@ function get_left_menu_hrm($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 
 			$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("CPTitreMenu"), 0, $user->hasRight('holiday', 'read'), '', $mainmenu, 'holiday', 0, '', '', '', img_picto('', 'holiday', 'class="paddingright pictofixedwidth"'));
 			$newmenu->add("/holiday/card.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("New"), 1, $user->hasRight('holiday', 'write'), '', $mainmenu);
-			$newmenu->add("/holiday/card_group.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("NewHolidayForGroup"), 1, ($user->hasRight('holiday', 'writeall') && $user->hasRight('holiday', 'readall')), '', $mainmenu, 'holiday_sm');
+			$newmenu->add("/holiday/card_group.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("NewHolidayForGroup"), 1, (int) ($user->hasRight('holiday', 'writeall') && $user->hasRight('holiday', 'readall')), '', $mainmenu, 'holiday_sm');
 			$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("List"), 1, $user->hasRight('holiday', 'read'), '', $mainmenu);
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "holiday") {
 				$newmenu->add("/holiday/list.php?search_status=1&mainmenu=hrm&leftmenu=holiday", $langs->trans("DraftCP"), 2, $user->hasRight('holiday', 'read'), '', $mainmenu, 'holiday_sm');
@@ -2439,7 +2439,7 @@ function get_left_menu_hrm($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 				$newmenu->add("/expensereport/list.php?search_status=4&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Canceled"), 2, $user->hasRight('expensereport', 'lire'));
 				$newmenu->add("/expensereport/list.php?search_status=99&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Refused"), 2, $user->hasRight('expensereport', 'lire'));
 			}
-			$newmenu->add("/expensereport/payment/list.php?leftmenu=expensereport_payments&amp;mainmenu=hrm", $langs->trans("Payments"), 1, ($user->hasRight('expensereport', 'lire')) && isModEnabled('bank'));
+			$newmenu->add("/expensereport/payment/list.php?leftmenu=expensereport_payments&amp;mainmenu=hrm", $langs->trans("Payments"), 1, (int) (int) ($user->hasRight('expensereport', 'lire') && isModEnabled('bank')));
 			$newmenu->add("/expensereport/stats/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->hasRight('expensereport', 'lire'));
 		}
 

From 4eeb0bdf5825b0bb691be909fa73a6b35b01d195 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 4 Feb 2025 02:01:46 +0100
Subject: [PATCH 470/602] Qual: Update phan baseline

---
 dev/tools/phan/baseline.txt | 39 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index ca2ed9bfd30..120481e2752 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,13 +9,13 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 3660+ occurrences
+    // PhanTypeMismatchArgument : 3560+ occurrences
     // PhanUndeclaredProperty : 530+ occurrences
     // PhanTypeMismatchArgumentNullable : 450+ occurrences
     // PhanUndeclaredGlobalVariable : 190+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 180+ occurrences
-    // PhanPossiblyUndeclaredGlobalVariable : 170+ occurrences
-    // PhanTypeMismatchArgumentProbablyReal : 140+ occurrences
+    // PhanPossiblyUndeclaredGlobalVariable : 160+ occurrences
+    // PhanTypeMismatchArgumentProbablyReal : 130+ occurrences
     // PhanTypeMismatchProperty : 130+ occurrences
     // PhanPluginUnknownArrayMethodParamType : 110+ occurrences
     // PhanRedefineFunction : 40+ occurrences
@@ -28,9 +28,9 @@ return [
     // PhanTypeComparisonFromArray : 10+ occurrences
     // PhanUndeclaredMethod : 10+ occurrences
     // PhanPluginUnknownObjectMethodCall : 8 occurrences
-    // PhanPluginEmptyStatementIf : 7 occurrences
     // PhanPluginSuspiciousParamPosition : 7 occurrences
     // PhanPluginDuplicateExpressionBinaryOp : 6 occurrences
+    // PhanPluginEmptyStatementIf : 6 occurrences
     // PhanTypeArraySuspiciousNull : 6 occurrences
     // PhanEmptyForeach : 5 occurrences
     // PhanParamTooMany : 5 occurrences
@@ -245,7 +245,7 @@ return [
         'htdocs/compta/bank/class/api_bankaccounts.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/compta/bank/class/paymentvarious.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/compta/bank/graph.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/compta/bank/line.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/compta/bank/line.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/compta/bank/list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/compta/bank/releve.php' => ['PhanTypeMismatchArgument'],
         'htdocs/compta/bank/transfer.php' => ['PhanTypeMismatchArgument'],
@@ -376,16 +376,13 @@ return [
         'htdocs/core/class/fileupload.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/fiscalyear.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/hookmanager.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/class/html.form.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
-        'htdocs/core/class/html.formcategory.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/class/html.form.class.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/class/html.formcompany.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/core/class/html.formfile.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/core/class/html.formmail.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/core/class/html.formorder.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/html.formother.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/html.formprojet.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/html.formsetup.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
-        'htdocs/core/class/html.formticket.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/link.class.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/class/menubase.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/notify.class.php' => ['PhanUndeclaredProperty'],
@@ -418,7 +415,6 @@ return [
         'htdocs/core/login/functions_dolibarr.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/login/functions_ldap.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/core/menus/standard/auguria.lib.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/menus/standard/eldy.lib.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/action/doc/pdf_standard_actions.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
@@ -525,7 +521,6 @@ return [
         'htdocs/core/search_page.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/tpl/admin_extrafields_add.tpl.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/tpl/admin_extrafields_edit.tpl.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/tpl/advtarget.tpl.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/tpl/extrafields_list_array_fields.tpl.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/tpl/extrafields_list_print_fields.tpl.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/tpl/extrafields_view.tpl.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
@@ -553,7 +548,6 @@ return [
         'htdocs/don/info.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/don/list.php' => ['PhanTypeMismatchProperty'],
         'htdocs/don/note.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/don/stats/index.php' => ['PhanTypeMismatchArgument'],
         'htdocs/ecm/class/ecmdirectory.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/ecm/class/ecmfiles.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/ecm/dir_add_card.php' => ['PhanTypeMismatchArgument'],
@@ -634,26 +628,17 @@ return [
         'htdocs/hrm/skill_card.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/imports/import.php' => ['PhanTypeMismatchArgument'],
         'htdocs/intracommreport/card.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/intracommreport/class/intracommreport.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
-        'htdocs/intracommreport/list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
-        'htdocs/knowledgemanagement/class/knowledgerecord.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/knowledgemanagement/knowledgerecord_card.php' => ['PhanPluginEmptyStatementIf', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/knowledgemanagement/knowledgerecord_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/loan/card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/loan/class/loan.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/knowledgemanagement/class/knowledgerecord.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/knowledgemanagement/knowledgerecord_card.php' => ['PhanTypeMismatchArgument'],
         'htdocs/loan/class/paymentloan.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/loan/document.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/loan/note.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/loan/payment/payment.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/loan/schedule.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/main.inc.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/loan/document.php' => ['PhanUndeclaredProperty'],
+        'htdocs/loan/note.php' => ['PhanUndeclaredProperty'],
+        'htdocs/loan/payment/payment.php' => ['PhanUndeclaredProperty'],
         'htdocs/margin/agentMargins.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/margin/customerMargins.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/margin/productMargins.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/margin/tabs/productMargins.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/master.inc.php' => ['PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable'],
         'htdocs/modulebuilder/index.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/modulebuilder/template/admin/setup.php' => ['PhanTypeMismatchArgument'],
         'htdocs/modulebuilder/template/ajax/myobject.php' => ['PhanTypeMismatchArgument'],
@@ -878,7 +863,7 @@ return [
         'htdocs/societe/list.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/societe/paymentmodes.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable'],
         'htdocs/societe/price.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/societe/tpl/linesalesrepresentative.tpl.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/societe/tpl/linesalesrepresentative.tpl.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/societe/website.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/stripe/admin/stripe.php' => ['PhanTypeMismatchArgument'],
         'htdocs/stripe/charge.php' => ['PhanTypeMismatchArgument'],

From 2e30ae50ac20da1aca7322e74da490a266fe3737 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 4 Feb 2025 02:49:41 +0100
Subject: [PATCH 471/602] Qual: fix phpstan notices after fixing phan notices

---
 dev/tools/phan/baseline.txt                     | 5 +----
 htdocs/admin/boxes.php                          | 4 ++--
 htdocs/core/boxes/box_produits.php              | 6 +++---
 htdocs/core/boxes/box_produits_alerte_stock.php | 6 +++---
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 120481e2752..1c639a11b22 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,7 +9,7 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 3560+ occurrences
+    // PhanTypeMismatchArgument : 3540+ occurrences
     // PhanUndeclaredProperty : 530+ occurrences
     // PhanTypeMismatchArgumentNullable : 450+ occurrences
     // PhanUndeclaredGlobalVariable : 190+ occurrences
@@ -97,7 +97,6 @@ return [
         'htdocs/admin/bank.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/barcode.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/bom.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/boxes.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/chequereceipts.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/company.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/contract.php' => ['PhanTypeMismatchArgument'],
@@ -349,8 +348,6 @@ return [
         'htdocs/core/ajax/loadinplace.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/ajax/saveinplace.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/core/ajax/selectobject.php' => ['PhanTypeMismatchArgumentNullable'],
-        'htdocs/core/boxes/box_produits.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/boxes/box_produits_alerte_stock.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/CMailFile.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/core/class/canvas.class.php' => ['PhanParamTooMany', 'PhanUndeclaredMethod'],
         'htdocs/core/class/ccountry.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 07f6779fd90..11955d4ae4f 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2022 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -471,7 +471,7 @@ print '</tr>';
 print '</table>';
 print '</div>';
 
-print $form->buttonsSaveCancel("Save", '', array(), 0, 'reposition');
+print $form->buttonsSaveCancel("Save", '', array(), false, 'reposition');
 
 print '</form>';
 print "\n".'<!-- End Other Const -->'."\n";
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index db7710e960b..5e622fd0792 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2015-2023 Frederic France      <frederic.france@netlogic.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -52,7 +52,7 @@ class box_produits extends ModeleBoxes
 		$this->db = $db;
 
 		$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));
-		$tmpentry = array('enabled' => (isModEnabled("product") || isModEnabled("service")), 'perms' => ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire')), 'module' => 'product|service');
+		$tmpentry = array('enabled' => (int) (isModEnabled("product") || isModEnabled("service")), 'perms' => (string) (int) ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire')), 'module' => 'product|service');
 		$showmode = isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
 		$this->hidden = ($showmode != 1);
 		$this->urltoaddentry = DOL_URL_ROOT.'/product/card.php?action=create';
@@ -167,7 +167,7 @@ class box_produits extends ModeleBoxes
 							$price = ($objp->price_base_type == 'HT') ? price($objp->price) : $price = price($objp->price_ttc);
 						} else {
 							//Parse the dynamic price
-							$productstatic->fetch($objp->rowid, '', '', 1);
+							$productstatic->fetch($objp->rowid, '', '', '1');
 
 							require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
 							$priceparser = new PriceParser($this->db);
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index f2a18d04ccc..fc5448fed47 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005-2012 Maxime Kohlhaas      <mko@atm-consulting.fr>
  * Copyright (C) 2015-2021 Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2015      Juanjo Menent	    <jmenent@2byte.es>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -54,7 +54,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 		$this->db = $db;
 
 		$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));
-		$tmpentry = array('enabled' => ((isModEnabled("product") || isModEnabled("service")) && isModEnabled('stock')), 'perms' => $user->hasRight('stock', 'lire'), 'module' => 'product|service|stock');
+		$tmpentry = array('enabled' => (int) ((isModEnabled("product") || isModEnabled("service")) && isModEnabled('stock')), 'perms' => (string) (int) $user->hasRight('stock', 'lire'), 'module' => 'product|service|stock');
 		$showmode = isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
 		$this->hidden = ($showmode != 1);
 		$this->urltoaddentry = DOL_URL_ROOT.'/product/card.php?action=create';
@@ -163,7 +163,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 						$price_base_type = $langs->trans($objp->price_base_type);
 						$price = ($objp->price_base_type == 'HT') ? price($objp->price) : $price = price($objp->price_ttc);
 					} else { //Parse the dynamic price
-						$productstatic->fetch($objp->rowid, '', '', 1);
+						$productstatic->fetch($objp->rowid, '', '', '1');
 
 						require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
 						$priceparser = new PriceParser($this->db);

From 7841b55813ab7e1abdb90f80a3168b9ffd32315c Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 4 Feb 2025 23:04:36 +0100
Subject: [PATCH 472/602] Qual: Fix MultiCell 'fill' argument type

---
 .../phan/plugins/setPageOrientationFixer.php  | 176 ++++++++++++++++++
 .../action/doc/pdf_standard_actions.class.php |  14 +-
 .../bank/doc/pdf_sepamandate.modules.php      |  14 +-
 .../modules/cheque/doc/pdf_blochet.class.php  |  14 +-
 .../commande/doc/pdf_einstein.modules.php     |  60 +++---
 .../commande/doc/pdf_eratosthene.modules.php  |  56 +++---
 .../contract/doc/pdf_strato.modules.php       |   4 +-
 .../expedition/doc/pdf_merou.modules.php      |  18 +-
 .../expedition/doc/pdf_rouget.modules.php     |  16 +-
 .../pdf_standard_expensereport.modules.php    |  30 +--
 .../modules/facture/doc/pdf_crabe.modules.php | 122 ++++++------
 .../facture/doc/pdf_octopus.modules.php       | 171 +++++++++--------
 .../facture/doc/pdf_sponge.modules.php        | 130 ++++++-------
 .../fichinter/doc/pdf_soleil.modules.php      |   8 +-
 .../doc/pdf_standard_evaluation.modules.php   |   4 +-
 .../pdf_standard_movementstock.modules.php    |   6 +-
 .../modules/mrp/doc/pdf_vinci.modules.php     |  42 ++---
 .../modules/propale/doc/pdf_azur.modules.php  |  60 +++---
 .../modules/propale/doc/pdf_cyan.modules.php  |  56 +++---
 .../modules/rapport/pdf_paiement.class.php    |  28 +--
 .../reception/doc/pdf_squille.modules.php     |  14 +-
 .../stock/doc/pdf_standard_stock.modules.php  |   6 +-
 .../stocktransfer/doc/pdf_eagle.modules.php   |  12 +-
 .../doc/pdf_eagle_proforma.modules.php        |  22 +--
 .../doc/pdf_canelle.modules.php               |  70 +++----
 .../supplier_order/doc/pdf_cornas.modules.php |  42 ++---
 .../doc/pdf_muscadet.modules.php              |  46 ++---
 .../pdf_standard_supplierpayment.modules.php  |  28 +--
 .../doc/pdf_aurore.modules.php                |  46 ++---
 .../doc/pdf_zenith.modules.php                |  44 ++---
 .../doc/pdf_standard_myobject.modules.php     |   2 +-
 ...tandard_recruitmentjobposition.modules.php |   2 +-
 32 files changed, 769 insertions(+), 594 deletions(-)
 create mode 100644 dev/tools/phan/plugins/setPageOrientationFixer.php

diff --git a/dev/tools/phan/plugins/setPageOrientationFixer.php b/dev/tools/phan/plugins/setPageOrientationFixer.php
new file mode 100644
index 00000000000..657241ca155
--- /dev/null
+++ b/dev/tools/phan/plugins/setPageOrientationFixer.php
@@ -0,0 +1,176 @@
+<?php
+/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ *
+ * For 'price()', replace $form parameter that is '' with 0.
+ */
+
+declare(strict_types=1);
+
+use ast\flags;
+use Microsoft\PhpParser\Node\Expression\CallExpression;
+use Microsoft\PhpParser\Node\QualifiedName;
+use Phan\AST\TolerantASTConverter\NodeUtils;
+use Phan\CodeBase;
+use Phan\IssueInstance;
+use Phan\Library\FileCacheEntry;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEdit;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEditSet;
+use Phan\Plugin\Internal\IssueFixingPlugin\IssueFixer;
+use Microsoft\PhpParser\Node\Expression\ArgumentExpression;
+use Microsoft\PhpParser\Node\DelimitedList\ArgumentExpressionList;
+use Microsoft\PhpParser\Node\StringLiteral;
+use Microsoft\PhpParser\Node\ReservedWord;
+use Microsoft\PhpParser\Token;
+
+/**
+ * This is a prototype, there are various features it does not implement.
+ */
+
+call_user_func(static function (): void {
+	/**
+	 * @param $code_base @unused-param
+	 * @return ?FileEditSet a representation of the edit to make to replace a call to a function alias with a call to the original function
+	 */
+	$fix = static function (CodeBase $code_base, FileCacheEntry $contents, IssueInstance $instance): ?FileEditSet {
+
+		// Argument {INDEX} (${PARAMETER}) is {CODE} of type {TYPE}{DETAILS} but
+		// {FUNCTIONLIKE} takes {TYPE}{DETAILS} defined at {FILE}:{LINE} (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+
+		//htdocs\supplier_proposal\card.php:1705 PhanTypeMismatchArgumentProbablyReal Argument 3 ($h) is '' of type '' but \Form::selectDate() takes int (no real type) defined at htdocs\core\class\html.form.class.php:6799 (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+		//htdocs\supplier_proposal\card.php:1705 PhanTypeMismatchArgumentProbablyReal Argument 4 ($m) is '' of type '' but \Form::selectDate() takes int (no real type) defined at htdocs\core\class\html.form.class.php:6799 (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+
+		$argument_index = (string) $instance->getTemplateParameters()[0];
+		$argument_name = (string) $instance->getTemplateParameters()[1];
+		$argument_code = (string) $instance->getTemplateParameters()[2];
+		$argument_type = (string) $instance->getTemplateParameters()[3];
+		$details = (string) $instance->getTemplateParameters()[4];
+		$functionlike = (string) $instance->getTemplateParameters()[5];
+
+		$expected_functionlike = "\\TCPDI::setPageOrientation()";
+		$expected_name = "setPageOrientation";
+		if ($functionlike !== $expected_functionlike) {
+			print "$functionlike != '$expected_functionlike'".PHP_EOL;
+			return null;
+		}
+
+		$toBoolReplaceArray=array("0"=>"false","1"=>"true");
+		// Check if we fix any of this
+		if (
+			($argument_name === 'argument_name' && in_array($argument_code, array_keys($toBoolReplaceArray)))
+			//|| ($argument_name === 'm' && $argument_code === "''")
+			//|| ($argument_name === 'empty' && $argument_code === "''")
+		) {
+			$replacement = $toBoolReplaceArray[$argument_name];
+			$argIdx = ($argument_index - 1) * 2;
+			$expectedStringValue = "";
+		} else {
+			print "ARG$argument_index:$argument_name CODE:$argument_name".PHP_EOL;
+			return null;
+		}
+
+		// At this point we established that the notification
+		// matches some we fix.
+
+		$line = $instance->getLine();
+
+		$edits = [];
+		foreach ($contents->getNodesAtLine($line) as $node) {
+			if (!$node instanceof ArgumentExpressionList) {
+				continue;
+			}
+			$arguments = $node->children;
+			if (count($arguments) <= $argIdx) {
+				// print "Arg Count is ".count($arguments)." - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			$is_actual_call = $node->parent instanceof CallExpression;
+			if (!$is_actual_call) {
+				// print "Not actual call - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			print "Actual call - $instance".PHP_EOL;
+			$callable = $node->parent;
+
+			$callableExpression = $callable->callableExpression;
+
+			if ($callableExpression instanceof Microsoft\PhpParser\Node\QualifiedName) {
+				$actual_name = $callableExpression->getResolvedName();
+			} elseif ($callableExpression instanceof Microsoft\PhpParser\Node\Expression\MemberAccessExpression) {
+				$memberNameToken = $callableExpression->memberName;
+				$actual_name = (new NodeUtils($contents->getContents()))->tokenToString($memberNameToken);
+			} else {
+				print "Callable expression is ".get_class($callableExpression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			if ((string) $actual_name !== (string) $expected_name) {
+				// print "Name unexpected '$actual_name'!='$expected_name' - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			foreach ($arguments as $i => $argument) {
+				if ($argument instanceof ArgumentExpression) {
+					print "Type$i: ".get_class($argument->expression).PHP_EOL;
+				}
+			}
+
+			$stringValue = null;
+
+
+			$arg = $arguments[$argIdx];
+
+			if (
+				$arg instanceof ArgumentExpression
+				&& $arg->expression instanceof StringLiteral
+			) {
+				// Get the string value of the StringLiteral
+				$stringValue = $arg->expression->getStringContentsText();
+				print "String is '$stringValue'".PHP_EOL;
+			} elseif ($arg instanceof ArgumentExpression && $arg->expression instanceof ReservedWord) {
+				$child = $arg->expression->children;
+				if (!$child instanceof Token) {
+					continue;
+				}
+				$token_str = (new NodeUtils($contents->getContents()))->tokenToString($child);
+				print "$token_str KIND:".($child->kind ?? 'no kind')." ".get_class($child).PHP_EOL;
+
+				if ($token_str !== 'null') {
+					continue;
+				}
+
+				$stringValue = '';  // Fake empty
+			} else {
+				print "Expression is not string or null ".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			if ($stringValue !== $expectedStringValue) {
+				print "Not replacing $argument_name which is '$stringValue'/".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			print "Fixture elem on $line - $actual_name(...'$stringValue'...) - $instance".PHP_EOL;
+
+
+
+			// Get the first argument (delimiter)
+			$argument_to_replace = $arg;
+
+			$arg_start_pos = $argument_to_replace->getStartPosition();
+			$arg_end_pos = $argument_to_replace->getEndPosition();
+
+			// Set edit instruction
+			$edits[] = new FileEdit($arg_start_pos, $arg_end_pos, $replacement);
+		}
+		if ($edits) {
+			return new FileEditSet($edits);
+		}
+		return null;
+	};
+	IssueFixer::registerFixerClosure(
+		'PhanTypeMismatchArgument',
+		$fix
+	);
+});
diff --git a/htdocs/core/modules/action/doc/pdf_standard_actions.class.php b/htdocs/core/modules/action/doc/pdf_standard_actions.class.php
index 83b6a9ec13b..f61d8b09760 100644
--- a/htdocs/core/modules/action/doc/pdf_standard_actions.class.php
+++ b/htdocs/core/modules/action/doc/pdf_standard_actions.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004       Rodolphe Quiedeville   <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2012  Laurent Destailleur    <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009  Regis Houssin          <regis.houssin@inodbox.com>
- * Copyright (C) 2024		MDW					   <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					   <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France        <frederic.france@free.fr>
  * Copyright (C) 2024	    Nick Fragoulis
  *
@@ -366,12 +366,12 @@ class pdf_standard_actions
 					}
 				}
 				$textdate = $outputlangs->trans("ID").' '.$obj->id.' - '.$textdate;
-				$pdf->MultiCell(45 - $this->marge_gauche, $height, $textdate, 0, 'L', 0);
+				$pdf->MultiCell(45 - $this->marge_gauche, $height, $textdate, 0, 'L', false);
 				$y0 = $pdf->GetY();
 
 				// Third party
 				$pdf->SetXY(45, $y);
-				$pdf->MultiCell(28, $height, dol_trunc($outputlangs->convToOutputCharset($obj->thirdparty), 28), 0, 'L', 0);
+				$pdf->MultiCell(28, $height, dol_trunc($outputlangs->convToOutputCharset($obj->thirdparty), 28), 0, 'L', false);
 				$y1 = $pdf->GetY();
 
 				// Action code
@@ -387,12 +387,12 @@ class pdf_standard_actions
 				$pdf->SetXY(73, $y);
 				$labelactiontype = $outputlangs->transnoentitiesnoconv("Action".$code);
 				$labelactiontypeshort = $outputlangs->transnoentitiesnoconv("Action".$code.'Short');
-				$pdf->MultiCell(32, $height, dol_trunc($outputlangs->convToOutputCharset($labelactiontypeshort == "Action".$code.'Short' ? $labelactiontype : $labelactiontypeshort), 32), 0, 'L', 0);
+				$pdf->MultiCell(32, $height, dol_trunc($outputlangs->convToOutputCharset($labelactiontypeshort == "Action".$code.'Short' ? $labelactiontype : $labelactiontypeshort), 32), 0, 'L', false);
 				$y2 = $pdf->GetY();
 
 				// Description of event
 				$pdf->SetXY(106, $y);
-				$pdf->MultiCell(94, $height, $outputlangs->convToOutputCharset(dol_trunc(dol_string_nohtmltag($text, 0), 250, 'right', 'UTF-8', 0)), 0, 'L', 0);
+				$pdf->MultiCell(94, $height, $outputlangs->convToOutputCharset(dol_trunc(dol_string_nohtmltag($text, 0), 250, 'right', 'UTF-8', 0)), 0, 'L', false);
 				$y3 = $pdf->GetY();
 
 				$i++;
@@ -421,11 +421,11 @@ class pdf_standard_actions
 		// Show title
 		$pdf->SetFont('', 'B', 10);
 		$pdf->SetXY($this->marge_gauche, $this->marge_haute);
-		$pdf->MultiCell(120, 1, $outputlangs->convToOutputCharset($this->title), 0, 'L', 0);
+		$pdf->MultiCell(120, 1, $outputlangs->convToOutputCharset($this->title), 0, 'L', false);
 		// Show page nb only on iso languages (so default Helvetica font)
 		if (pdf_getPDFFont($outputlangs) == 'Helvetica') {
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - 40, $this->marge_haute);
-			$pdf->MultiCell(40, 1, $pagenb.'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
+			$pdf->MultiCell(40, 1, $pagenb.'/'.$pdf->getAliasNbPages(), 0, 'R', false);
 		}
 
 		$y = $pdf->GetY() + 2;
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index be1a81ddfac..eef507075db 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2016       Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2020       Josep Lluís Amador   <joseplluis@lliuretic.cat>
- * Copyright (C) 2024		MDW					 <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					 <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024-2025  Frédéric France		 <frederic.france@free.fr>
  * Copyright (C) 2024	    Nick Fragoulis
  *
@@ -526,13 +526,13 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 
 		$pdf->SetXY($this->marge_gauche, $posy);
 		$pdf->SetFont('', '', $default_font_size);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentitiesnoconv("PleaseReturnMandate", $mysoc->email).':', 0, 'L', 0);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentitiesnoconv("PleaseReturnMandate", $mysoc->email).':', 0, 'L', false);
 		$posy = $pdf->GetY() + 2;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
 		$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-		$pdf->MultiCell(100, 6, $mysoc->name, 0, 'L', 0);
-		$pdf->MultiCell(100, 6, $outputlangs->convToOutputCharset($mysoc->getFullAddress(1)), 0, 'L', 0);
+		$pdf->MultiCell(100, 6, $mysoc->name, 0, 'L', false);
+		$pdf->MultiCell(100, 6, $outputlangs->convToOutputCharset($mysoc->getFullAddress(1)), 0, 'L', false);
 		$posy = $pdf->GetY() + 2;
 
 		return $posy;
@@ -562,9 +562,9 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentitiesnoconv("DateSigning"), 0, 'L', 0);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentitiesnoconv("DateSigning"), 0, 'L', false);
 		$pdf->MultiCell(100, 3, ' ');
-		$pdf->MultiCell(100, 3, '______________________', 0, 'L', 0);
+		$pdf->MultiCell(100, 3, '______________________', 0, 'L', false);
 
 		$posx = $this->xPosSignArea;
 		$largcol = ($this->page_largeur - $this->marge_droite - $posx);
@@ -572,7 +572,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($posx, $tab_top);
-		$pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentitiesnoconv("Signature"), 0, 'L', 1);
+		$pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentitiesnoconv("Signature"), 0, 'L', true);
 
 		$pdf->SetXY($posx, $tab_top + $tab_hl);
 		//$pdf->MultiCell($largcol, $tab_hl * 3, '', 1, 'R');
diff --git a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
index a5c00ad81bd..e69f8b24ac8 100644
--- a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2009-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2016      Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2024      Frédéric France      <frederic.france@free.fr>
- * Copyright (C) 2024	   MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	   Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -325,7 +325,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 
 		$pdf->SetFont('', 'B', $default_font_size);
 		$pdf->SetXY(170, $posy + 1);
-		$pdf->MultiCell(31, 2, price($this->amount), 0, 'C', 0);
+		$pdf->MultiCell(31, 2, price($this->amount), 0, 'C', false);
 
 		// Tableau
 		$pdf->SetFont('', '', $default_font_size - 2);
@@ -402,19 +402,19 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 			$lineinpage += $nb_lines;
 
 			$pdf->SetXY(1, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(8, $this->line_height, $j + 1, 0, 'R', 0);
+			$pdf->MultiCell(8, $this->line_height, $j + 1, 0, 'R', false);
 
 			$pdf->SetXY(10, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(30, $this->line_height, $this->lines[$j]->num_chq ? $this->lines[$j]->num_chq : '', 0, 'L', 0);
+			$pdf->MultiCell(30, $this->line_height, $this->lines[$j]->num_chq ? $this->lines[$j]->num_chq : '', 0, 'L', false);
 
 			$pdf->SetXY(40, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(60, $this->line_height, $outputlangs->convToOutputCharset($this->lines[$j]->bank_chq, 44), 0, 'L', 0);
+			$pdf->MultiCell(60, $this->line_height, $outputlangs->convToOutputCharset($this->lines[$j]->bank_chq, 44), 0, 'L', false);
 
 			$pdf->SetXY(100, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(80, $this->line_height, $outputlangs->convToOutputCharset($this->lines[$j]->emetteur_chq, 50), 0, 'L', 0);
+			$pdf->MultiCell(80, $this->line_height, $outputlangs->convToOutputCharset($this->lines[$j]->emetteur_chq, 50), 0, 'L', false);
 
 			$pdf->SetXY(180, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(20, $this->line_height, price($this->lines[$j]->amount_chq), 0, 'R', 0);
+			$pdf->MultiCell(20, $this->line_height, price($this->lines[$j]->amount_chq), 0, 'R', false);
 
 			$yp += ($this->line_height * $nb_lines);
 		}
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 39c393568bf..43733946c25 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -470,7 +470,7 @@ class pdf_einstein extends ModelePDFCommandes
 					// Unit price before discount
 					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->posxup, $curY);
-					$pdf->MultiCell($this->posxqty - $this->posxup - 0.8, 3, $up_excl_tax, 0, 'R', 0);
+					$pdf->MultiCell($this->posxqty - $this->posxup - 0.8, 3, $up_excl_tax, 0, 'R', false);
 
 					// Quantity
 					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
@@ -495,7 +495,7 @@ class pdf_einstein extends ModelePDFCommandes
 					// Total HT line
 					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->postotalht, $curY);
-					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
+					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', false);
 
 					// Collection of totals by value of vat in $this->vat["rate"] = total_tva
 					if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
@@ -732,7 +732,7 @@ class pdf_einstein extends ModelePDFCommandes
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
 			$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 			$pdf->SetXY($this->marge_gauche, $posy);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', false);
 
 			$posy = $pdf->GetY() + 4;
 		}
@@ -843,26 +843,26 @@ class pdf_einstein extends ModelePDFCommandes
 
 					$pdf->SetXY($this->marge_gauche, $posy);
 					$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->owner_name), 0, 'L', 0);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->owner_name), 0, 'L', false);
 					$posy = $pdf->GetY() + 1;
 
 					if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', false);
 						$posy = $pdf->GetY() + 2;
 					}
 				}
 				if ($conf->global->FACTURE_CHQ_NUMBER == -1) {
 					$pdf->SetXY($this->marge_gauche, $posy);
 					$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', false);
 					$posy = $pdf->GetY() + 1;
 
 					if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', false);
 						$posy = $pdf->GetY() + 2;
 					}
 				}
@@ -949,18 +949,18 @@ class pdf_einstein extends ModelePDFCommandes
 		if ($total_line_remise > 0) {
 			$pdf->SetFillColor(255, 255, 255);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalDiscount") : ''), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalDiscount") : ''), 0, 'L', true);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise, 0, $outputlangs), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise, 0, $outputlangs), 0, 'R', true);
 
 			$index++;
 
 			// Show total NET before discount
 			$pdf->SetFillColor(255, 255, 255);
 			$pdf->SetXY($col1x, $tab2_top);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTBeforeDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTBeforeDiscount") : ''), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTBeforeDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTBeforeDiscount") : ''), 0, 'L', true);
 			$pdf->SetXY($col2x, $tab2_top);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise + $total_ht, 0, $outputlangs), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise + $total_ht, 0, $outputlangs), 0, 'R', true);
 
 			$index++;
 		}
@@ -968,11 +968,11 @@ class pdf_einstein extends ModelePDFCommandes
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', true);
 
 		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', true);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
@@ -1011,12 +1011,12 @@ class pdf_einstein extends ModelePDFCommandes
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1047,12 +1047,12 @@ class pdf_einstein extends ModelePDFCommandes
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1081,10 +1081,10 @@ class pdf_einstein extends ModelePDFCommandes
 						} else {
 							$totalvat .= vatrate($tvaval['vatrate'], true).($tvaval['vatcode'] ? ' ('.$tvaval['vatcode'].')' : '').$tvacompl;
 						}
-						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($tvaval['amount'], 'MT'), 0, $outputlangs), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($tvaval['amount'], 'MT'), 0, $outputlangs), 0, 'R', true);
 					}
 				}
 
@@ -1117,12 +1117,12 @@ class pdf_einstein extends ModelePDFCommandes
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1157,12 +1157,12 @@ class pdf_einstein extends ModelePDFCommandes
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1173,10 +1173,10 @@ class pdf_einstein extends ModelePDFCommandes
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->SetFillColor(224, 224, 224);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalTTC", $mysoc->country_code) : ''), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalTTC", $mysoc->country_code) : ''), $useborder, 'L', true);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', true);
 			}
 		}
 
@@ -1197,18 +1197,18 @@ class pdf_einstein extends ModelePDFCommandes
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), 0, 'L', false);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', false);
 
 			$index++;
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), $useborder, 'L', true);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', true);
 
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetTextColor(0, 0, 0);
@@ -1614,7 +1614,7 @@ class pdf_einstein extends ModelePDFCommandes
 					// Show shipping frame
 					$pdf->SetXY($posx + 2, $posy - 5);
 					$pdf->SetFont('', '', $default_font_size - 2);
-					$pdf->MultiCell($widthrecbox, 0, $outputlangs->transnoentities('ShippingTo'), 0, 'L', 0);
+					$pdf->MultiCell($widthrecbox, 0, $outputlangs->transnoentities('ShippingTo'), 0, 'L', false);
 					$pdf->RoundedRect($posx, $posy, $widthrecbox, $hautcadre, $this->corner_radius, '1234', 'D');
 
 					// Show shipping name
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 1362556387d..65075ab0ba6 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -949,7 +949,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
 			$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 			$pdf->SetXY($this->marge_gauche, $posy);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', false);
 
 			$posy = $pdf->GetY() + 4;
 		}
@@ -1059,26 +1059,26 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 					$pdf->SetXY($this->marge_gauche, $posy);
 					$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->owner_name), 0, 'L', 0);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->owner_name), 0, 'L', false);
 					$posy = $pdf->GetY() + 1;
 
 					if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', false);
 						$posy = $pdf->GetY() + 2;
 					}
 				}
 				if ($conf->global->FACTURE_CHQ_NUMBER == -1) {
 					$pdf->SetXY($this->marge_gauche, $posy);
 					$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', false);
 					$posy = $pdf->GetY() + 1;
 
 					if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', false);
 						$posy = $pdf->GetY() + 2;
 					}
 				}
@@ -1165,18 +1165,18 @@ class pdf_eratosthene extends ModelePDFCommandes
 		if ($total_line_remise > 0) {
 			$pdf->SetFillColor(255, 255, 255);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalDiscount") : ''), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalDiscount") : ''), 0, 'L', true);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise, 0, $outputlangs), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise, 0, $outputlangs), 0, 'R', true);
 
 			$index++;
 
 			// Show total NET before discount
 			$pdf->SetFillColor(255, 255, 255);
 			$pdf->SetXY($col1x, $tab2_top);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTBeforeDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTBeforeDiscount") : ''), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTBeforeDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTBeforeDiscount") : ''), 0, 'L', true);
 			$pdf->SetXY($col2x, $tab2_top);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise + $total_ht, 0, $outputlangs), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise + $total_ht, 0, $outputlangs), 0, 'R', true);
 
 			$index++;
 		}
@@ -1184,10 +1184,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', true);
 		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', true);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
@@ -1225,12 +1225,12 @@ class pdf_eratosthene extends ModelePDFCommandes
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1261,12 +1261,12 @@ class pdf_eratosthene extends ModelePDFCommandes
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1295,10 +1295,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 						} else {
 							$totalvat .= vatrate($tvaval['vatrate'], true).($tvaval['vatcode'] ? ' ('.$tvaval['vatcode'].')' : '').$tvacompl;
 						}
-						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($tvaval['amount'], 'MT'), 0, $outputlangs), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($tvaval['amount'], 'MT'), 0, $outputlangs), 0, 'R', true);
 					}
 				}
 
@@ -1329,12 +1329,12 @@ class pdf_eratosthene extends ModelePDFCommandes
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1367,12 +1367,12 @@ class pdf_eratosthene extends ModelePDFCommandes
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1383,10 +1383,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->SetFillColor(224, 224, 224);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalTTC", $mysoc->country_code) : ''), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalTTC", $mysoc->country_code) : ''), $useborder, 'L', true);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', true);
 			}
 		}
 
@@ -1407,18 +1407,18 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), 0, 'L', false);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', false);
 
 			$index++;
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("RemainderToPay") : ''), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("RemainderToPay") : ''), $useborder, 'L', true);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', true);
 
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetTextColor(0, 0, 0);
@@ -1810,7 +1810,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					// Show shipping frame
 					$pdf->SetXY($posx + 2, $posy - 5);
 					$pdf->SetFont('', '', $default_font_size - 2);
-					$pdf->MultiCell($widthrecbox, 0, $outputlangs->transnoentities('ShippingTo'), 0, 'L', 0);
+					$pdf->MultiCell($widthrecbox, 0, $outputlangs->transnoentities('ShippingTo'), 0, 'L', false);
 					$pdf->RoundedRect($posx, $posy, $widthrecbox, $hautcadre, $this->corner_radius, '1234', 'D');
 
 					// Show shipping name
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index f5f86c6008a..ea44c428b90 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -591,7 +591,7 @@ class pdf_strato extends ModelePDFContract
 
 		if (!getDolGlobalString('CONTRACT_HIDE_MYCOMPANY_SIGNATURE_SECTION_PDF')) {
 			$pdf->SetXY($this->marge_gauche, $posy);
-			$pdf->MultiCell($posmiddle - $this->marge_gauche - 5, 5, $outputlangs->transnoentities("ContactNameAndSignature", $this->emetteur->name), 0, 'L', 0);
+			$pdf->MultiCell($posmiddle - $this->marge_gauche - 5, 5, $outputlangs->transnoentities("ContactNameAndSignature", $this->emetteur->name), 0, 'L', false);
 
 			$pdf->SetXY($this->marge_gauche, $posy + 5);
 			$pdf->RoundedRect($this->marge_gauche, $posy + 5, $posmiddle - $this->marge_gauche - 5, 20, $this->corner_radius, '1234', 'D');
@@ -599,7 +599,7 @@ class pdf_strato extends ModelePDFContract
 
 		if (!getDolGlobalString('CONTRACT_HIDE_THIRPARTY_SIGNATURE_SECTION_PDF')) {
 			$pdf->SetXY($posmiddle + 5, $posy);
-			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posmiddle - 5, 5, $outputlangs->transnoentities("ContactNameAndSignature", $this->recipient->name), 0, 'L', 0);
+			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posmiddle - 5, 5, $outputlangs->transnoentities("ContactNameAndSignature", $this->recipient->name), 0, 'L', false);
 
 			$pdf->SetXY($posmiddle + 5, $posy + 5);
 			$pdf->RoundedRect($posmiddle + 5, $posy + 5, $this->page_largeur - $this->marge_droite - $posmiddle - 5, 20, $this->corner_radius, '1234', 'D');
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index d54d831adb1..6178f9efc1e 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -324,13 +324,13 @@ class pdf_merou extends ModelePdfExpedition
 					//Inserting the product reference
 					$pdf->SetXY(30, $curY);
 					$pdf->SetFont('', 'B', $default_font_size - 3);
-					$pdf->MultiCell(24, 3, $outputlangs->convToOutputCharset($object->lines[$i]->ref), 0, 'L', 0);
+					$pdf->MultiCell(24, 3, $outputlangs->convToOutputCharset($object->lines[$i]->ref), 0, 'L', false);
 
 					$pdf->SetXY(140, $curY);
-					$pdf->MultiCell(30, 3, $object->lines[$i]->qty_asked, 0, 'C', 0);
+					$pdf->MultiCell(30, 3, $object->lines[$i]->qty_asked, 0, 'C', false);
 
 					$pdf->SetXY(170, $curY);
-					$pdf->MultiCell(30, 3, $object->lines[$i]->qty_shipped, 0, 'C', 0);
+					$pdf->MultiCell(30, 3, $object->lines[$i]->qty_shipped, 0, 'C', false);
 
 					// Add line
 					if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) {
@@ -441,19 +441,19 @@ class pdf_merou extends ModelePdfExpedition
 		if (empty($hidetop)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY(10, $tab_top);
-			$pdf->MultiCell(10, 5, "LS", 0, 'C', 1);
+			$pdf->MultiCell(10, 5, "LS", 0, 'C', true);
 			$pdf->line(20, $tab_top, 20, $tab_top + $tab_height);
 			$pdf->SetXY(20, $tab_top);
-			$pdf->MultiCell(10, 5, "LR", 0, 'C', 1);
+			$pdf->MultiCell(10, 5, "LR", 0, 'C', true);
 			$pdf->line(30, $tab_top, 30, $tab_top + $tab_height);
 			$pdf->SetXY(30, $tab_top);
-			$pdf->MultiCell(20, 5, $outputlangs->transnoentities("Ref"), 0, 'C', 1);
+			$pdf->MultiCell(20, 5, $outputlangs->transnoentities("Ref"), 0, 'C', true);
 			$pdf->SetXY(50, $tab_top);
-			$pdf->MultiCell(90, 5, $outputlangs->transnoentities("Description"), 0, 'L', 1);
+			$pdf->MultiCell(90, 5, $outputlangs->transnoentities("Description"), 0, 'L', true);
 			$pdf->SetXY(140, $tab_top);
-			$pdf->MultiCell(30, 5, $outputlangs->transnoentities("QtyOrdered"), 0, 'C', 1);
+			$pdf->MultiCell(30, 5, $outputlangs->transnoentities("QtyOrdered"), 0, 'C', true);
 			$pdf->SetXY(170, $tab_top);
-			$pdf->MultiCell(30, 5, $outputlangs->transnoentities("QtyToShip"), 0, 'C', 1);
+			$pdf->MultiCell(30, 5, $outputlangs->transnoentities("QtyToShip"), 0, 'C', true);
 		}
 		$pdf->RoundedRect(10, $tab_top, 190, $tab_height, $this->corner_radius, '1234', 'D');
 	}
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index d10193f90b0..1a9c3d34fd0 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2012	Regis Houssin				<regis.houssin@inodbox.com>
  * Copyright (C) 2014-2015	Marcos García				<marcosgdf@gmail.com>
  * Copyright (C) 2018-2025  Frédéric France				<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Nick Fragoulis
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
@@ -781,37 +781,37 @@ class pdf_rouget extends ModelePdfExpedition
 
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Total"), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Total"), 0, 'L', true);
 
 		if (!getDolGlobalString('SHIPPING_PDF_HIDE_ORDERED')) {
 			$pdf->SetXY($this->posxqtyordered, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($this->posxqtytoship - $this->posxqtyordered, $tab2_hl, $totalOrdered, 0, 'C', 1);
+			$pdf->MultiCell($this->posxqtytoship - $this->posxqtyordered, $tab2_hl, $totalOrdered, 0, 'C', true);
 		}
 
 		if (!getDolGlobalString('SHIPPING_PDF_HIDE_QTYTOSHIP')) {
 			$pdf->SetXY($this->posxqtytoship, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($this->posxpuht - $this->posxqtytoship, $tab2_hl, $totalToShip, 0, 'C', 1);
+			$pdf->MultiCell($this->posxpuht - $this->posxqtytoship, $tab2_hl, $totalToShip, 0, 'C', true);
 		}
 
 		if (getDolGlobalString('SHIPPING_PDF_DISPLAY_AMOUNT_HT')) {
 			$pdf->SetXY($this->posxpuht, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($this->posxtotalht - $this->posxpuht, $tab2_hl, '', 0, 'C', 1);
+			$pdf->MultiCell($this->posxtotalht - $this->posxpuht, $tab2_hl, '', 0, 'C', true);
 
 			$pdf->SetXY($this->posxtotalht, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalht, $tab2_hl, price($object->total_ht, 0, $outputlangs), 0, 'C', 1);
+			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalht, $tab2_hl, price($object->total_ht, 0, $outputlangs), 0, 'C', true);
 		}
 
 		if (!getDolGlobalString('SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME')) {
 			// Total Weight
 			if ($totalWeighttoshow) {
 				$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalWeighttoshow, 0, 'C', 1);
+				$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalWeighttoshow, 0, 'C', true);
 
 				$index++;
 			}
 			if ($totalVolumetoshow) {
 				$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalVolumetoshow, 0, 'C', 1);
+				$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalVolumetoshow, 0, 'C', true);
 
 				$index++;
 			}
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
index 52d72c00e62..d98ea1a7ec4 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
@@ -1045,19 +1045,19 @@ class pdf_standard_expensereport extends ModeleExpenseReport
 		$pdf->SetFont('', '', $default_font_size - 2);
 		$pdf->SetXY($tab3_posx, $tab3_top - 4);
 		$pdf->SetTextColor(0, 0, 0);
-		$pdf->MultiCell(60, 3, $title, 0, 'L', 0);
+		$pdf->MultiCell(60, 3, $title, 0, 'L', false);
 
 		$pdf->line($tab3_posx, $tab3_top, $tab3_posx + $tab3_width + 2, $tab3_top); // Top border line of table title
 
 		$pdf->SetXY($tab3_posx, $tab3_top + 1);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Date"), 0, 'L', 0);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Date"), 0, 'L', false);
 		$pdf->SetXY($tab3_posx + 19, $tab3_top + 1); // Old value 17
-		$pdf->MultiCell(15, 3, $outputlangs->transnoentities("Amount"), 0, 'C', 0);
+		$pdf->MultiCell(15, 3, $outputlangs->transnoentities("Amount"), 0, 'C', false);
 		$pdf->SetXY($tab3_posx + 45, $tab3_top + 1);
-		$pdf->MultiCell(35, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
+		$pdf->MultiCell(35, 3, $outputlangs->transnoentities("Type"), 0, 'L', false);
 		if (isModEnabled("bank")) {
 			$pdf->SetXY($tab3_posx + 65, $tab3_top + 1);
-			$pdf->MultiCell(25, 3, $outputlangs->transnoentities("BankAccount"), 0, 'L', 0);
+			$pdf->MultiCell(25, 3, $outputlangs->transnoentities("BankAccount"), 0, 'L', false);
 		}
 		$pdf->line($tab3_posx, $tab3_top + $tab3_height, $tab3_posx + $tab3_width + 2, $tab3_top + $tab3_height); // Bottom border line of table title
 
@@ -1088,16 +1088,16 @@ class pdf_standard_expensereport extends ModeleExpenseReport
 				$row = $this->db->fetch_object($resql);
 
 				$pdf->SetXY($tab3_posx, $tab3_top + $y + 1);
-				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->dp), 'day', false, $outputlangs, true), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->dp), 'day', false, $outputlangs, true), 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 20, $tab3_top + $y + 1);
-				$pdf->MultiCell(20, 3, price($sign * $row->amount, 0, $outputlangs), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price($sign * $row->amount, 0, $outputlangs), 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 45, $tab3_top + $y + 1);
 				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$row->p_code);
 
-				$pdf->MultiCell(40, 3, $oper, 0, 'L', 0);
+				$pdf->MultiCell(40, 3, $oper, 0, 'L', false);
 				if (isModEnabled("bank")) {
 					$pdf->SetXY($tab3_posx + 65, $tab3_top + $y + 1);
-					$pdf->MultiCell(30, 3, $row->baref, 0, 'L', 0);
+					$pdf->MultiCell(30, 3, $row->baref, 0, 'L', false);
 				}
 
 				$pdf->line($tab3_posx, $tab3_top + $y + $tab3_height, $tab3_posx + $tab3_width + 2, $tab3_top + $y + $tab3_height); // Bottom line border of table
@@ -1108,20 +1108,20 @@ class pdf_standard_expensereport extends ModeleExpenseReport
 				$y += $tab3_height;
 
 				$pdf->SetXY($tab3_posx + 17, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price($totalpaid), 0, 'R', 0);
+				$pdf->MultiCell(20, 3, price($totalpaid), 0, 'R', false);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
-				$pdf->MultiCell(30, 4, $outputlangs->transnoentitiesnoconv("AlreadyPaid"), 0, 'L', 0);
+				$pdf->MultiCell(30, 4, $outputlangs->transnoentitiesnoconv("AlreadyPaid"), 0, 'L', false);
 				$y += $tab3_height - 2;
 				$pdf->SetXY($tab3_posx + 17, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price($object->total_ttc), 0, 'R', 0);
+				$pdf->MultiCell(20, 3, price($object->total_ttc), 0, 'R', false);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
-				$pdf->MultiCell(30, 4, $outputlangs->transnoentitiesnoconv("AmountExpected"), 0, 'L', 0);
+				$pdf->MultiCell(30, 4, $outputlangs->transnoentitiesnoconv("AmountExpected"), 0, 'L', false);
 				$y += $tab3_height - 2;
 				$remaintopay = $object->total_ttc - $totalpaid;
 				$pdf->SetXY($tab3_posx + 17, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price($remaintopay), 0, 'R', 0);
+				$pdf->MultiCell(20, 3, price($remaintopay), 0, 'R', false);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
-				$pdf->MultiCell(30, 4, $outputlangs->transnoentitiesnoconv("RemainderToPay"), 0, 'L', 0);
+				$pdf->MultiCell(30, 4, $outputlangs->transnoentitiesnoconv("RemainderToPay"), 0, 'L', false);
 			}
 		} else {
 			$this->error = $this->db->lasterror();
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 97c8787a3ee..1e5d131662b 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -486,7 +486,7 @@ class pdf_crabe extends ModelePDFFactures
 						if ($object->fk_account > 0 || $object->fk_bank > 0 || getDolGlobalInt('FACTURE_RIB_NUMBER')) {
 							$pdf->SetXY($this->marge_gauche + 30, $pdf->GetY() - 15);
 							$pdf->SetFont('', '', $default_font_size - 4);
-							$pdf->MultiCell(40, 3, $langs->transnoentitiesnoconv("INVOICE_ADD_EPC_QR_CODEPay"), 0, 'L', 0);
+							$pdf->MultiCell(40, 3, $langs->transnoentitiesnoconv("INVOICE_ADD_EPC_QR_CODEPay"), 0, 'L', false);
 						}
 					}
 
@@ -688,7 +688,7 @@ class pdf_crabe extends ModelePDFFactures
 					// Unit price before discount
 					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->posxup, $curY);
-					$pdf->MultiCell($this->posxqty - $this->posxup - 0.8, 3, $up_excl_tax, 0, 'R', 0);
+					$pdf->MultiCell($this->posxqty - $this->posxup - 0.8, 3, $up_excl_tax, 0, 'R', false);
 
 					// Quantity
 					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
@@ -719,7 +719,7 @@ class pdf_crabe extends ModelePDFFactures
 					// Total HT line
 					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->postotalht, $curY);
-					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
+					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', false);
 
 
 					$sign = 1;
@@ -1030,13 +1030,13 @@ class pdf_crabe extends ModelePDFFactures
 				$invoice->fetch($obj->fk_facture_source);
 
 				$pdf->SetXY($tab3_posx, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($obj->datef), 'day', false, $outputlangs, true), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($obj->datef), 'day', false, $outputlangs, true), 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, $text, 0, 'L', 0);
+				$pdf->MultiCell(20, 3, $text, 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 58, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, $invoice->ref, 0, 'L', 0);
+				$pdf->MultiCell(20, 3, $invoice->ref, 0, 'L', false);
 
 				$pdf->line($tab3_posx, $tab3_top + $y + 3, $tab3_posx + $tab3_width, $tab3_top + $y + 3);
 
@@ -1082,16 +1082,16 @@ class pdf_crabe extends ModelePDFFactures
 				$row = $this->db->fetch_object($resql);
 
 				$pdf->SetXY($tab3_posx, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date), 'day', false, $outputlangs, true), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date), 'day', false, $outputlangs, true), 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price($sign * ((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price($sign * ((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
 				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$row->code);
 
-				$pdf->MultiCell(20, 3, $oper, 0, 'L', 0);
+				$pdf->MultiCell(20, 3, $oper, 0, 'L', false);
 				$maxY = max($pdf->GetY() - $tab3_top - 3, $maxY);
 				$pdf->SetXY($tab3_posx + 58, $tab3_top + $y);
-				$pdf->MultiCell(30, 3, $row->num, 0, 'L', 0);
+				$pdf->MultiCell(30, 3, $row->num, 0, 'L', false);
 				$y = $maxY = max($pdf->GetY() - $tab3_top - 3, $maxY);
 				$pdf->line($tab3_posx, $tab3_top + $y + 3, $tab3_posx + $tab3_width, $tab3_top + $y + 3);
 				$y += 3;
@@ -1130,19 +1130,19 @@ class pdf_crabe extends ModelePDFFactures
 
 		$pdf->SetFont('', '', $default_font_size - 3);
 		$pdf->SetXY($tab3_posx, $tab3_top - 4);
-		$pdf->MultiCell(60, 3, $title, 0, 'L', 0);
+		$pdf->MultiCell(60, 3, $title, 0, 'L', false);
 
 		$pdf->line($tab3_posx, $tab3_top, $tab3_posx + $tab3_width, $tab3_top);
 
 		$pdf->SetFont('', '', $default_font_size - 4);
 		$pdf->SetXY($tab3_posx, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', 0);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', false);
 		$pdf->SetXY($tab3_posx + 21, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', 0);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', false);
 		$pdf->SetXY($tab3_posx + 40, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', false);
 		$pdf->SetXY($tab3_posx + 58, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', 0);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', false);
 
 		$pdf->line($tab3_posx, $tab3_top - 1 + $tab3_height, $tab3_posx + $tab3_width, $tab3_top - 1 + $tab3_height);
 	}
@@ -1236,12 +1236,12 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->SetXY($this->marge_gauche, $posy);
 			if (empty($mysoc->tva_assuj)) {
 				if ($mysoc->forme_juridique_code == 92) {
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoiceAsso"), 0, 'L', 0);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoiceAsso"), 0, 'L', false);
 				} else {
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', false);
 				}
 			} elseif (getDolGlobalString("INVOICE_VAT_SHOW_REVERSE_CHARGE_MENTION") && $this->emetteur->country_code != $object->thirdparty->country_code && $this->emetteur->isInEEC() && $object->thirdparty->isInEEC()) {
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedReverseChargeProcedure"), 0, 'L', 0);
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedReverseChargeProcedure"), 0, 'L', false);
 			}
 			$posy = $pdf->GetY() + 4;
 		}
@@ -1298,7 +1298,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$this->error = $outputlangs->transnoentities("ErrorPaymentModeDefinedToWithoutSetup", $object->mode_reglement_code);
-				$pdf->MultiCell(80, 3, $this->error, 0, 'L', 0);
+				$pdf->MultiCell(80, 3, $this->error, 0, 'L', false);
 				$pdf->SetTextColor(0, 0, 0);
 
 				$posy = $pdf->GetY() + 1;
@@ -1381,26 +1381,26 @@ class pdf_crabe extends ModelePDFFactures
 
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->owner_name), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->owner_name), 0, 'L', false);
 						$posy = $pdf->GetY() + 1;
 
 						if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', false);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
 					if (getDolGlobalInt('FACTURE_CHQ_NUMBER') == -1) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', false);
 						$posy = $pdf->GetY() + 1;
 
 						if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', false);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
@@ -1428,7 +1428,7 @@ class pdf_crabe extends ModelePDFFactures
 						include_once DOL_DOCUMENT_ROOT.'/core/lib/functions_be.lib.php';
 						$invoicePaymentKey = dolBECalculateStructuredCommunication($object->ref, $object->type);
 
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": " . $outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": " . $outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', false);
 					}
 				}
 			}
@@ -1503,18 +1503,18 @@ class pdf_crabe extends ModelePDFFactures
 		if ($total_line_remise > 0) {
 			$pdf->SetFillColor(255, 255, 255);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalDiscount") : ''), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalDiscount") : ''), 0, 'L', true);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise, 0, $outputlangs), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise, 0, $outputlangs), 0, 'R', true);
 
 			$index++;
 
 			// Show total NET before discount
 			$pdf->SetFillColor(255, 255, 255);
 			$pdf->SetXY($col1x, $tab2_top);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTBeforeDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTBeforeDiscount") : ''), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTBeforeDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTBeforeDiscount") : ''), 0, 'L', true);
 			$pdf->SetXY($col2x, $tab2_top);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise + $total_ht, 0, $outputlangs), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise + $total_ht, 0, $outputlangs), 0, 'R', true);
 
 			$index++;
 		}
@@ -1522,20 +1522,20 @@ class pdf_crabe extends ModelePDFFactures
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities(!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') ? "TotalHT" : "Total").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities(!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') ? "TotalHT" : "Total") : ''), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities(!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') ? "TotalHT" : "Total").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities(!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') ? "TotalHT" : "Total") : ''), 0, 'L', true);
 
 		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, $outputlangs), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, $outputlangs), 0, 'R', true);
 
 		if (getDolGlobalInt('PDF_INVOICE_SHOW_VAT_ANALYSIS')) {
 			$index++;
 			$pdf->SetFillColor(255, 255, 255);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalVAT"), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalVAT"), 0, 'L', true);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_tva), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_tva), 0, 'R', true);
 		}
 
 		// Show VAT by rates and total
@@ -1577,12 +1577,12 @@ class pdf_crabe extends ModelePDFFactures
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1614,12 +1614,12 @@ class pdf_crabe extends ModelePDFFactures
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1649,9 +1649,9 @@ class pdf_crabe extends ModelePDFFactures
 							} else {
 								$totalvat .= vatrate($tvaval['vatrate'], true).($tvaval['vatcode'] ? ' ('.$tvaval['vatcode'].')' : '').$tvacompl;
 							}
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($tvaval['amount'], 'MT'), 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($tvaval['amount'], 'MT'), 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1682,12 +1682,12 @@ class pdf_crabe extends ModelePDFFactures
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1717,12 +1717,12 @@ class pdf_crabe extends ModelePDFFactures
 							$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 						}
 
-						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 						$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 					}
 				}
 
@@ -1730,10 +1730,10 @@ class pdf_crabe extends ModelePDFFactures
 				if (price2num($object->revenuestamp, 'MT') != 0) {
 					$index++;
 					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp"), $useborder, 'L', 1);
+					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp"), $useborder, 'L', true);
 
 					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->revenuestamp), $useborder, 'R', 1);
+					$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->revenuestamp), $useborder, 'R', true);
 				}
 
 				// Total TTC
@@ -1741,10 +1741,10 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->SetFillColor(224, 224, 224);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', true);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', true);
 
 				// Retained warranty
 				if ($object->displayRetainedWarranty()) {
@@ -1757,10 +1757,10 @@ class pdf_crabe extends ModelePDFFactures
 					// Billed - retained warranty
 					$index++;
 					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')), $useborder, 'L', 1);
+					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')), $useborder, 'L', true);
 
 					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price($billedWithRetainedWarranty), $useborder, 'R', 1);
+					$pdf->MultiCell($largcol2, $tab2_hl, price($billedWithRetainedWarranty), $useborder, 'R', true);
 
 					// retained warranty
 					$index++;
@@ -1769,9 +1769,9 @@ class pdf_crabe extends ModelePDFFactures
 					$retainedWarrantyToPayOn = $outputlangs->transnoentities("RetainedWarranty").' ('.$object->retained_warranty.'%)';
 					$retainedWarrantyToPayOn .= !empty($object->retained_warranty_date_limit) ? ' '.$outputlangs->transnoentities("toPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
 
-					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $retainedWarrantyToPayOn, $useborder, 'L', 1);
+					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $retainedWarrantyToPayOn, $useborder, 'L', true);
 					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price($retainedWarranty), $useborder, 'R', 1);
+					$pdf->MultiCell($largcol2, $tab2_hl, price($retainedWarranty), $useborder, 'R', true);
 				}
 			}
 		}
@@ -1789,18 +1789,18 @@ class pdf_crabe extends ModelePDFFactures
 			// Already paid + Deposits
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Paid"), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Paid"), 0, 'L', false);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', 0);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', false);
 
 			// Credit note
 			if ($creditnoteamount) {
 				$labeltouse = ($outputlangs->transnoentities("CreditNotesOrExcessReceived") != "CreditNotesOrExcessReceived") ? $outputlangs->transnoentities("CreditNotesOrExcessReceived") : $outputlangs->transnoentities("CreditNotes");
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $labeltouse, 0, 'L', 0);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $labeltouse, 0, 'L', false);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($creditnoteamount, 0, $outputlangs), 0, 'R', 0);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($creditnoteamount, 0, $outputlangs), 0, 'R', false);
 			}
 
 			// Escompte
@@ -1809,9 +1809,9 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetFillColor(255, 255, 255);
 
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', true);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', true);
 
 				$resteapayer = 0;
 			}
@@ -1820,9 +1820,9 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', true);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', true);
 
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetTextColor(0, 0, 0);
@@ -1834,7 +1834,7 @@ class pdf_crabe extends ModelePDFFactures
 			$index++;
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, getDolGlobalString('BILL_TEXT_TOTAL_FOOTER'), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, getDolGlobalString('BILL_TEXT_TOTAL_FOOTER'), 0, 'L', false);
 		}
 
 		return ($tab2_top + ($tab2_hl * $index));
@@ -2338,7 +2338,7 @@ class pdf_crabe extends ModelePDFFactures
 					// Show shipping frame
 					$pdf->SetXY($posx + 2, $posy - 5);
 					$pdf->SetFont('', '', $default_font_size - 2);
-					$pdf->MultiCell($widthrecbox, 0, $outputlangs->transnoentities('ShippingTo'), 0, 'L', 0);
+					$pdf->MultiCell($widthrecbox, 0, $outputlangs->transnoentities('ShippingTo'), 0, 'L', false);
 					$pdf->RoundedRect($posx, $posy, $widthrecbox, $hautcadre, $this->corner_radius, '1234', 'D');
 
 					// Show shipping name
diff --git a/htdocs/core/modules/facture/doc/pdf_octopus.modules.php b/htdocs/core/modules/facture/doc/pdf_octopus.modules.php
index 067a3a126b1..e80737f02f5 100644
--- a/htdocs/core/modules/facture/doc/pdf_octopus.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_octopus.modules.php
@@ -1210,19 +1210,19 @@ class pdf_octopus extends ModelePDFFactures
 
 		$pdf->SetFont('', '', $default_font_size - 3);
 		$pdf->SetXY($tab3_posx, $tab3_top - 4);
-		$pdf->MultiCell(60, 3, $title, 0, 'L', 0);
+		$pdf->MultiCell(60, 3, $title, 0, 'L', false);
 
 		$pdf->line($tab3_posx, $tab3_top, $tab3_posx + $tab3_width, $tab3_top);
 
 		$pdf->SetFont('', '', $default_font_size - 4);
 		$pdf->SetXY($tab3_posx, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', 0);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', false);
 		$pdf->SetXY($tab3_posx + 21, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', 0);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', false);
 		$pdf->SetXY($tab3_posx + 40, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', false);
 		$pdf->SetXY($tab3_posx + 58, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', 0);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', false);
 
 		$pdf->line($tab3_posx, $tab3_top - 1 + $tab3_height, $tab3_posx + $tab3_width, $tab3_top - 1 + $tab3_height);
 
@@ -1259,13 +1259,13 @@ class pdf_octopus extends ModelePDFFactures
 				$invoice->fetch($obj->fk_facture_source);
 
 				$pdf->SetXY($tab3_posx, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($obj->datef), 'day', false, $outputlangs, true), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($obj->datef), 'day', false, $outputlangs, true), 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, $text, 0, 'L', 0);
+				$pdf->MultiCell(20, 3, $text, 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 58, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, $invoice->ref, 0, 'L', 0);
+				$pdf->MultiCell(20, 3, $invoice->ref, 0, 'L', false);
 
 				$pdf->line($tab3_posx, $tab3_top + $y + 3, $tab3_posx + $tab3_width, $tab3_top + $y + 3);
 
@@ -1295,16 +1295,16 @@ class pdf_octopus extends ModelePDFFactures
 			while ($i < $num) {
 				$row = $this->db->fetch_object($resql);
 				$pdf->SetXY($tab3_posx, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date), 'day', false, $outputlangs, true), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date), 'day', false, $outputlangs, true), 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price($sign * ((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price($sign * ((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
 				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$row->code);
 
-				$pdf->MultiCell(20, 3, $oper, 0, 'L', 0);
+				$pdf->MultiCell(20, 3, $oper, 0, 'L', false);
 				$maxY = max($pdf->GetY() - $tab3_top - 3, $maxY);
 				$pdf->SetXY($tab3_posx + 58, $tab3_top + $y);
-				$pdf->MultiCell(30, 3, $row->num, 0, 'L', 0);
+				$pdf->MultiCell(30, 3, $row->num, 0, 'L', false);
 				$y = $maxY = max($pdf->GetY() - 3 - $tab3_top, $maxY);
 				$pdf->line($tab3_posx, $tab3_top + $y + 3, $tab3_posx + $tab3_width, $tab3_top + $y + 3);
 				$y += 3;
@@ -1405,12 +1405,12 @@ class pdf_octopus extends ModelePDFFactures
 			$pdf->SetXY($this->marge_gauche, $posy);
 			if (empty($mysoc->tva_assuj)) {
 				if ($mysoc->forme_juridique_code == 92) {
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoiceAsso"), 0, 'L', 0);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoiceAsso"), 0, 'L', false);
 				} else {
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', false);
 				}
 			} elseif (getDolGlobalString("INVOICE_VAT_SHOW_REVERSE_CHARGE_MENTION") && $this->emetteur->country_code != $object->thirdparty->country_code && $this->emetteur->isInEEC() && $object->thirdparty->isInEEC()) {
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedReverseChargeProcedure"), 0, 'L', 0);
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedReverseChargeProcedure"), 0, 'L', false);
 			}
 			$posy = $pdf->GetY() + 4;
 		}
@@ -1467,7 +1467,7 @@ class pdf_octopus extends ModelePDFFactures
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$this->error = $outputlangs->transnoentities("ErrorPaymentModeDefinedToWithoutSetup", $object->mode_reglement_code);
-				$pdf->MultiCell($posxend - $this->marge_gauche, 3, $this->error, 0, 'L', 0);
+				$pdf->MultiCell($posxend - $this->marge_gauche, 3, $this->error, 0, 'L', false);
 				$pdf->SetTextColor(0, 0, 0);
 
 				$posy = $pdf->GetY() + 1;
@@ -1565,26 +1565,26 @@ class pdf_octopus extends ModelePDFFactures
 
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->owner_name), 0, 'L', 0);
+						$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->owner_name), 0, 'L', false);
 						$posy = $pdf->GetY() + 1;
 
 						if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+							$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', false);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
 					if (getDolGlobalString('FACTURE_CHQ_NUMBER') == -1) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+						$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', false);
 						$posy = $pdf->GetY() + 1;
 
 						if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+							$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', false);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
@@ -1613,7 +1613,7 @@ class pdf_octopus extends ModelePDFFactures
 						include_once DOL_DOCUMENT_ROOT.'/core/lib/functions_be.lib.php';
 						$invoicePaymentKey = dolBECalculateStructuredCommunication($object->ref, $object->type);
 
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": " . $outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": " . $outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', false);
 					}
 				}
 			}
@@ -1670,35 +1670,35 @@ class pdf_octopus extends ModelePDFFactures
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + 0);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', true);
 
 		$total_ht = ((isModEnabled('multicurrency') && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht, 0, $outputlangs), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht, 0, $outputlangs), 0, 'R', true);
 
 		$remise = !empty($object->remise) ? $object->remise : 0;
 		if ($remise > 0) {
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("DiscountHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("DiscountHT") : ''), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("DiscountHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("DiscountHT") : ''), 0, 'L', true);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($remise, 0, $outputlangs), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($remise, 0, $outputlangs), 0, 'R', true);
 
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTWithDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTWithDiscount") : ''), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTWithDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTWithDiscount") : ''), 0, 'L', true);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht - $remise, 0, $outputlangs), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht - $remise, 0, $outputlangs), 0, 'R', true);
 		}
 
 		if (getDolGlobalInt('PDF_INVOICE_SHOW_VAT_ANALYSIS')) {
 			$index++;
 			$pdf->SetFillColor(255, 255, 255);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalVAT"), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalVAT"), 0, 'L', true);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_tva), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_tva), 0, 'R', true);
 		}
 
 		// Show VAT by rates and total
@@ -1740,12 +1740,12 @@ class pdf_octopus extends ModelePDFFactures
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1777,12 +1777,12 @@ class pdf_octopus extends ModelePDFFactures
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1828,10 +1828,10 @@ class pdf_octopus extends ModelePDFFactures
 							} else {
 								$totalvat .= vatrate($tvaval['vatrate'], true).($tvaval['vatcode'] ? ' ('.$tvaval['vatcode'].')' : '').$tvacompl;
 							}
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($tvaval['amount'], 'MT'), 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($tvaval['amount'], 'MT'), 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1863,12 +1863,12 @@ class pdf_octopus extends ModelePDFFactures
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1901,12 +1901,12 @@ class pdf_octopus extends ModelePDFFactures
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1916,10 +1916,10 @@ class pdf_octopus extends ModelePDFFactures
 				if (price2num($object->revenuestamp, 'MT') != 0) {
 					$index++;
 					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("RevenueStamp", $mysoc->country_code) : ''), $useborder, 'L', 1);
+					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("RevenueStamp", $mysoc->country_code) : ''), $useborder, 'L', true);
 
 					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->revenuestamp), $useborder, 'R', 1);
+					$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->revenuestamp), $useborder, 'R', true);
 				}
 
 				// Total TTC
@@ -1927,10 +1927,10 @@ class pdf_octopus extends ModelePDFFactures
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->SetFillColor(224, 224, 224);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalTTC") : ''), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalTTC") : ''), $useborder, 'L', true);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', true);
 
 
 				// Retained warranty
@@ -1944,10 +1944,10 @@ class pdf_octopus extends ModelePDFFactures
 					// Billed - retained warranty
 					$index++;
 					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')), $useborder, 'L', 1);
+					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')), $useborder, 'L', true);
 
 					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price($billedWithRetainedWarranty), $useborder, 'R', 1);
+					$pdf->MultiCell($largcol2, $tab2_hl, price($billedWithRetainedWarranty), $useborder, 'R', true);
 
 					// retained warranty
 					$index++;
@@ -1956,9 +1956,9 @@ class pdf_octopus extends ModelePDFFactures
 					$retainedWarrantyToPayOn = $outputlangs->transnoentities("RetainedWarranty").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("RetainedWarranty") : '').' ('.$object->retained_warranty.'%)';
 					$retainedWarrantyToPayOn .= !empty($object->retained_warranty_date_limit) ? ' '.$outputlangs->transnoentities("toPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
 
-					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $retainedWarrantyToPayOn, $useborder, 'L', 1);
+					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $retainedWarrantyToPayOn, $useborder, 'L', true);
 					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price($retainedWarranty), $useborder, 'R', 1);
+					$pdf->MultiCell($largcol2, $tab2_hl, price($retainedWarranty), $useborder, 'R', true);
 				}
 			}
 		}
@@ -1976,10 +1976,10 @@ class pdf_octopus extends ModelePDFFactures
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), 0, 'L', false);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', false);
 
 			/*
 			if ($object->close_code == 'discount_vat')
@@ -2001,9 +2001,9 @@ class pdf_octopus extends ModelePDFFactures
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("RemainderToPay") : ''), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("RemainderToPay") : ''), $useborder, 'L', true);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', true);
 
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetTextColor(0, 0, 0);
@@ -2505,7 +2505,7 @@ class pdf_octopus extends ModelePDFFactures
 					// Show shipping frame
 					$pdf->SetXY($posx + 2, $posy - 5);
 					$pdf->SetFont('', '', $default_font_size - 2);
-					$pdf->MultiCell($widthrecbox, 0, $outputlangs->transnoentities('ShippingTo'), 0, 'L', 0);
+					$pdf->MultiCell($widthrecbox, 0, $outputlangs->transnoentities('ShippingTo'), 0, 'L', false);
 					$pdf->RoundedRect($posx, $posy, $widthrecbox, $hautcadre, $this->corner_radius, '1234', 'D');
 
 					// Show shipping name
@@ -3074,7 +3074,6 @@ class pdf_octopus extends ModelePDFFactures
 	 * cumul_anterieur: data from previous status invoice
 	 * nouveau_cumul: Cumulative data from all invoices up to the current one
 	 * current: current status invoice data
-	 *
 	 */
 	public function getDataSituation(&$object)
 	{
@@ -3530,10 +3529,10 @@ class pdf_octopus extends ModelePDFFactures
 			$pdf->SetFont('', '', $default_font_size - 1);
 
 			$label = $outputlangs->transnoentities("SituationInvoiceTotalProposal");
-			$pdf->MultiCell($this->page_largeur - ($this->marge_droite + $this->marge_gauche), 3, $label, 0, 'L', 0, 1, $posx, $posy + 1);
+			$pdf->MultiCell($this->page_largeur - ($this->marge_droite + $this->marge_gauche), 3, $label, 0, 'L', false, 1, $posx, $posy + 1);
 
 			$amount = price($sign * ($total_ht + (! empty($propal->remise) ? $propal->remise : 0)));
-			$pdf->MultiCell($width2, 3, $amount, 0, 'R', 0, 1, $posx + $width, $posy + 1);
+			$pdf->MultiCell($width2, 3, $amount, 0, 'R', false, 1, $posx + $width, $posy + 1);
 
 			$pdf->SetFont('', '', $default_font_size - 1);
 
@@ -3599,7 +3598,7 @@ class pdf_octopus extends ModelePDFFactures
 
 			$ref .= ' - '. $invoice->ref;
 			$ref .= ' ('.dol_print_date($invoice->date, "%d/%m/%Y", false, $outputlangs).')';
-			$pdf->MultiCell($this->page_largeur - ($this->marge_droite + $this->marge_gauche), 3, $ref, 0, 'L', 0);
+			$pdf->MultiCell($this->page_largeur - ($this->marge_droite + $this->marge_gauche), 3, $ref, 0, 'L', false);
 
 			$pdf->SetFont('', '', $default_font_size - 1);
 
@@ -3612,12 +3611,12 @@ class pdf_octopus extends ModelePDFFactures
 			// Total HT
 			$pdf->SetFillColor(255, 255, 255);
 			$pdf->SetXY($posx, $posy);
-			$pdf->MultiCell($width, $height, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+			$pdf->MultiCell($width, $height, $outputlangs->transnoentities("TotalHT"), 0, 'L', true);
 
 			$total_ht = (isModEnabled('multicurrency') && $invoice->multicurrency_tx != 1 ? $invoice->multicurrency_total_ht : $invoice->total_ht);
 
 			$pdf->SetXY($posx + $width, $posy);
-			$pdf->MultiCell($width2, $height, price($sign * ($total_ht + (!empty($invoice->remise) ? $invoice->remise : 0)), 0, $outputlangs), 0, 'R', 1);
+			$pdf->MultiCell($width2, $height, price($sign * ($total_ht + (!empty($invoice->remise) ? $invoice->remise : 0)), 0, $outputlangs), 0, 'R', true);
 
 			$tvas = array();
 			$nblines = count($invoice->lines);
@@ -3648,10 +3647,10 @@ class pdf_octopus extends ModelePDFFactures
 					}
 					$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).' ';
 					$totalvat .= vatrate($tvakey, true).$tvacompl;
-					$pdf->MultiCell($width, $height, $totalvat, 0, 'L', 1);
+					$pdf->MultiCell($width, $height, $totalvat, 0, 'L', true);
 
 					$pdf->SetXY($posx + $width, $posy + $height * $index);
-					$pdf->MultiCell($width2, $height, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+					$pdf->MultiCell($width2, $height, price($tvaval, 0, $outputlangs), 0, 'R', true);
 				}
 			}
 
@@ -3664,11 +3663,11 @@ class pdf_octopus extends ModelePDFFactures
 			$pdf->SetXY($posx, $posy + $height * $index);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
-			$pdf->MultiCell($width, $height, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+			$pdf->MultiCell($width, $height, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', true);
 
 
 			$pdf->SetXY($posx + $width, $posy + $height * $index);
-			$pdf->MultiCell($width2, $height, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+			$pdf->MultiCell($width2, $height, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', true);
 
 			$retainedWarrantyRate = (float) ($object->retained_warranty ? price2num($object->retained_warranty) : price2num(getDolGlobalString('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT', 0)));
 
@@ -3681,13 +3680,13 @@ class pdf_octopus extends ModelePDFFactures
 				$pdf->SetXY($posx, $posy + $height * $index);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->SetFillColor(241, 241, 241);
-				$pdf->MultiCell($width, $height, $outputlangs->transnoentities("RetainedWarrantyShort", $retainedWarrantyRate), $useborder, 'L', 1);
+				$pdf->MultiCell($width, $height, $outputlangs->transnoentities("RetainedWarrantyShort", $retainedWarrantyRate), $useborder, 'L', true);
 
 				$total_ht_rg = (float) price2num(price($total_ht * $retainedWarrantyRate / 100), 'MT');
 				$total_ttc_rg = (float) price2num(price($total_ttc * $retainedWarrantyRate / 100), 'MT');
 
 				$pdf->SetXY($posx + $width, $posy + $height * $index);
-				$pdf->MultiCell($width2, $height, price(-$sign * $total_ht_rg, 0, $outputlangs), $useborder, 'R', 1);
+				$pdf->MultiCell($width2, $height, price(-$sign * $total_ht_rg, 0, $outputlangs), $useborder, 'R', true);
 
 				$total_ht_with_rg = $total_ht - $total_ht_rg;
 				$total_ttc_with_rg = $total_ttc - $total_ttc_rg;
@@ -3698,10 +3697,10 @@ class pdf_octopus extends ModelePDFFactures
 				$pdf->SetXY($posx, $posy + $height * $index);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->SetFillColor(224, 224, 224);
-				$pdf->MultiCell($width, $height, $outputlangs->transnoentities("TotalSituationInvoiceWithRetainedWarranty"), $useborder, 'L', 1);
+				$pdf->MultiCell($width, $height, $outputlangs->transnoentities("TotalSituationInvoiceWithRetainedWarranty"), $useborder, 'L', true);
 
 				$pdf->SetXY($posx + $width, $posy + $height * $index);
-				$pdf->MultiCell($width2, $height, price($sign * $total_ttc_with_rg, 0, $outputlangs), $useborder, 'R', 1);
+				$pdf->MultiCell($width2, $height, price($sign * $total_ttc_with_rg, 0, $outputlangs), $useborder, 'R', true);
 			}
 
 
@@ -3726,17 +3725,17 @@ class pdf_octopus extends ModelePDFFactures
 			$tot_deja_regle += $deja_regle + $depositsamount;
 
 			$pdf->SetXY($posx, $posy + $height * $index);
-			$pdf->MultiCell($width, $height, $outputlangs->transnoentities("Paid"), 0, 'L', 0);
+			$pdf->MultiCell($width, $height, $outputlangs->transnoentities("Paid"), 0, 'L', false);
 			$pdf->SetXY($posx + $width, $posy + $height * $index);
-			$pdf->MultiCell($width2, $height, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', 0);
+			$pdf->MultiCell($width2, $height, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', false);
 
 			// Credit note
 			if ($creditnoteamount) {
 				$index++;
 				$pdf->SetXY($posx, $posy + $height * $index);
-				$pdf->MultiCell($width, $height, $outputlangs->transnoentities("CreditNotes"), 0, 'L', 0);
+				$pdf->MultiCell($width, $height, $outputlangs->transnoentities("CreditNotes"), 0, 'L', false);
 				$pdf->SetXY($posx + $width, $posy + $height * $index);
-				$pdf->MultiCell($width2, $height, price($creditnoteamount, 0, $outputlangs), 0, 'R', 0);
+				$pdf->MultiCell($width2, $height, price($creditnoteamount, 0, $outputlangs), 0, 'R', false);
 			}
 
 			// Escompte
@@ -3745,9 +3744,9 @@ class pdf_octopus extends ModelePDFFactures
 				$pdf->SetFillColor(255, 255, 255);
 
 				$pdf->SetXY($posx, $posy + $height * $index);
-				$pdf->MultiCell($width, $height, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', 1);
+				$pdf->MultiCell($width, $height, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', true);
 				$pdf->SetXY($posx + $width, $posy + $height * $index);
-				$pdf->MultiCell($width2, $height, price($invoice->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', 1);
+				$pdf->MultiCell($width2, $height, price($invoice->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', true);
 
 				$resteapayer = 0;
 			}
@@ -3756,9 +3755,9 @@ class pdf_octopus extends ModelePDFFactures
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($posx, $posy + $height * $index);
-			$pdf->MultiCell($width, $height, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+			$pdf->MultiCell($width, $height, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', true);
 			$pdf->SetXY($posx + $width, $posy + $height * $index);
-			$pdf->MultiCell($width2, $height, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
+			$pdf->MultiCell($width2, $height, price($resteapayer, 0, $outputlangs), $useborder, 'R', true);
 
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetTextColor(0, 0, 0);
@@ -3773,7 +3772,7 @@ class pdf_octopus extends ModelePDFFactures
 
 				$pdf->SetFont('', '', $default_font_size - 3);
 				$pdf->SetXY($posx, $posy + $height * $index);
-				$pdf->MultiCell($width, $height, $title, 0, 'L', 0);
+				$pdf->MultiCell($width, $height, $title, 0, 'L', false);
 
 				//$pdf->line($tab3_posx, $tab3_top, $tab3_posx+$tab3_width, $tab3_top);
 
@@ -3783,13 +3782,13 @@ class pdf_octopus extends ModelePDFFactures
 
 				$pdf->SetFont('', '', $default_font_size - 4);
 				$pdf->SetXY($posx, $posy + $height * $index);
-				$pdf->MultiCell($width4, $height - 1, $outputlangs->transnoentities("Payment"), 0, 'L', 0);
+				$pdf->MultiCell($width4, $height - 1, $outputlangs->transnoentities("Payment"), 0, 'L', false);
 				$pdf->SetXY($posx + $width4, $posy + $height * $index);
-				$pdf->MultiCell($width4, $height - 1, $outputlangs->transnoentities("Amount"), 0, 'L', 0);
+				$pdf->MultiCell($width4, $height - 1, $outputlangs->transnoentities("Amount"), 0, 'L', false);
 				$pdf->SetXY($posx + $width4 * 2, $posy + $height * $index);
-				$pdf->MultiCell($width4, $height - 1, $outputlangs->transnoentities("Type"), 0, 'L', 0);
+				$pdf->MultiCell($width4, $height - 1, $outputlangs->transnoentities("Type"), 0, 'L', false);
 				$pdf->SetXY($posx + $width4 * 3, $posy + $height * $index);
-				$pdf->MultiCell($width4, $height - 1, $outputlangs->transnoentities("Num"), 0, 'L', 0);
+				$pdf->MultiCell($width4, $height - 1, $outputlangs->transnoentities("Num"), 0, 'L', false);
 
 				//$pdf->line($tab3_posx, $tab3_top-1+$tab3_height, $tab3_posx+$tab3_width, $tab3_top-1+$tab3_height);
 
@@ -3802,15 +3801,15 @@ class pdf_octopus extends ModelePDFFactures
 				if (count($payments)) {
 					foreach ($payments as $payment) {
 						$pdf->SetXY($posx, $posy + $height * $index + $y);
-						$pdf->MultiCell($width4, $height - 1, dol_print_date($this->db->jdate($payment['date']), 'day', false, $outputlangs, true), 0, 'L', 0);
+						$pdf->MultiCell($width4, $height - 1, dol_print_date($this->db->jdate($payment['date']), 'day', false, $outputlangs, true), 0, 'L', false);
 						$pdf->SetXY($posx + $width4, $posy + $height * $index + $y);
-						$pdf->MultiCell($width4, $height - 1, price($sign * $payment['amount'], 0, $outputlangs), 0, 'L', 0);
+						$pdf->MultiCell($width4, $height - 1, price($sign * $payment['amount'], 0, $outputlangs), 0, 'L', false);
 						$pdf->SetXY($posx + $width4 * 2, $posy + $height * $index + $y);
 						$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $payment['type']);
 
-						$pdf->MultiCell($width4, $height - 1, $oper, 0, 'L', 0);
+						$pdf->MultiCell($width4, $height - 1, $oper, 0, 'L', false);
 						$pdf->SetXY($posx + $width4 * 3, $posy + $height * $index + $y);
-						$pdf->MultiCell($width4, $height - 1, $payment['num'], 0, 'L', 0);
+						$pdf->MultiCell($width4, $height - 1, $payment['num'], 0, 'L', false);
 
 						//$pdf->line($tab3_posx, $tab3_top+$y+3, $tab3_posx+$tab3_width, $tab3_top+$y+3);
 						$y += ($height - 1);
@@ -3875,10 +3874,10 @@ class pdf_octopus extends ModelePDFFactures
 		$pdf->SetFont('', '', $default_font_size - 1);
 		$pdf->SetXY($this->marge_gauche, $posy + 1);
 		$label = $outputlangs->transnoentities("SituationTotalRayToRest");
-		$pdf->MultiCell($this->page_largeur - ($this->marge_droite + $this->marge_gauche), 3, $label, 0, 'L', 0);
+		$pdf->MultiCell($this->page_largeur - ($this->marge_droite + $this->marge_gauche), 3, $label, 0, 'L', false);
 
 		$amount = price($remain_to_pay);
-		$pdf->MultiCell($width2, 3, $amount, 0, 'R', 0, 1, $posx + $width, $posy + 1);
+		$pdf->MultiCell($width2, 3, $amount, 0, 'R', false, 1, $posx + $width, $posy + 1);
 
 		$pdf->SetDrawColor(128, 128, 128);
 		//$this->printRect($pdf, $this->marge_gauche, $posy, $this->page_largeur - $this->marge_gauche - $this->marge_droite, 7);
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 0474bd6bf61..d34c7146710 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -496,7 +496,7 @@ class pdf_sponge extends ModelePDFFactures
 						if ($object->fk_account > 0 || $object->fk_bank > 0 || getDolGlobalInt('FACTURE_RIB_NUMBER')) {
 							$pdf->SetXY($this->marge_gauche + 30, $pdf->GetY() - 15);
 							$pdf->SetFont('', '', $default_font_size - 4);
-							$pdf->MultiCell(40, 3, $langs->transnoentitiesnoconv("INVOICE_ADD_EPC_QR_CODEPay"), 0, 'L', 0);
+							$pdf->MultiCell(40, 3, $langs->transnoentitiesnoconv("INVOICE_ADD_EPC_QR_CODEPay"), 0, 'L', false);
 						}
 					}
 
@@ -1141,19 +1141,19 @@ class pdf_sponge extends ModelePDFFactures
 
 		$pdf->SetFont('', '', $default_font_size - 3);
 		$pdf->SetXY($tab3_posx, $tab3_top - 4);
-		$pdf->MultiCell(60, 3, $title, 0, 'L', 0);
+		$pdf->MultiCell(60, 3, $title, 0, 'L', false);
 
 		$pdf->line($tab3_posx, $tab3_top, $tab3_posx + $tab3_width, $tab3_top);
 
 		$pdf->SetFont('', '', $default_font_size - 4);
 		$pdf->SetXY($tab3_posx, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', 0);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', false);
 		$pdf->SetXY($tab3_posx + 21, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', 0);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', false);
 		$pdf->SetXY($tab3_posx + 40, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', false);
 		$pdf->SetXY($tab3_posx + 58, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', 0);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', false);
 
 		$pdf->line($tab3_posx, $tab3_top - 1 + $tab3_height, $tab3_posx + $tab3_width, $tab3_top - 1 + $tab3_height);
 
@@ -1190,13 +1190,13 @@ class pdf_sponge extends ModelePDFFactures
 				$invoice->fetch($obj->fk_facture_source);
 
 				$pdf->SetXY($tab3_posx, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($obj->datef), 'day', false, $outputlangs, true), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($obj->datef), 'day', false, $outputlangs, true), 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, $text, 0, 'L', 0);
+				$pdf->MultiCell(20, 3, $text, 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 58, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, $invoice->ref, 0, 'L', 0);
+				$pdf->MultiCell(20, 3, $invoice->ref, 0, 'L', false);
 
 				$pdf->line($tab3_posx, $tab3_top + $y + 3, $tab3_posx + $tab3_width, $tab3_top + $y + 3);
 
@@ -1226,16 +1226,16 @@ class pdf_sponge extends ModelePDFFactures
 			while ($i < $num) {
 				$row = $this->db->fetch_object($resql);
 				$pdf->SetXY($tab3_posx, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date), 'day', false, $outputlangs, true), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date), 'day', false, $outputlangs, true), 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price($sign * ((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price($sign * ((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
 				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$row->code);
 
-				$pdf->MultiCell(20, 3, $oper, 0, 'L', 0);
+				$pdf->MultiCell(20, 3, $oper, 0, 'L', false);
 				$maxY = max($pdf->GetY() - $tab3_top - 3, $maxY);
 				$pdf->SetXY($tab3_posx + 58, $tab3_top + $y);
-				$pdf->MultiCell(30, 3, $row->num, 0, 'L', 0);
+				$pdf->MultiCell(30, 3, $row->num, 0, 'L', false);
 				$y = $maxY = max($pdf->GetY() - 3 - $tab3_top, $maxY);
 				$pdf->line($tab3_posx, $tab3_top + $y + 3, $tab3_posx + $tab3_width, $tab3_top + $y + 3);
 				$y += 3;
@@ -1336,12 +1336,12 @@ class pdf_sponge extends ModelePDFFactures
 			$pdf->SetXY($this->marge_gauche, $posy);
 			if (empty($mysoc->tva_assuj)) {
 				if ($mysoc->forme_juridique_code == 92) {
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoiceAsso"), 0, 'L', 0);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoiceAsso"), 0, 'L', false);
 				} else {
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', false);
 				}
 			} elseif (getDolGlobalString("INVOICE_VAT_SHOW_REVERSE_CHARGE_MENTION") && $this->emetteur->country_code != $object->thirdparty->country_code && $this->emetteur->isInEEC() && $object->thirdparty->isInEEC()) {
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedReverseChargeProcedure"), 0, 'L', 0);
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedReverseChargeProcedure"), 0, 'L', false);
 			}
 			$posy = $pdf->GetY() + 4;
 		}
@@ -1398,7 +1398,7 @@ class pdf_sponge extends ModelePDFFactures
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$this->error = $outputlangs->transnoentities("ErrorPaymentModeDefinedToWithoutSetup", $object->mode_reglement_code);
-				$pdf->MultiCell($posxend - $this->marge_gauche, 3, $this->error, 0, 'L', 0);
+				$pdf->MultiCell($posxend - $this->marge_gauche, 3, $this->error, 0, 'L', false);
 				$pdf->SetTextColor(0, 0, 0);
 
 				$posy = $pdf->GetY() + 1;
@@ -1484,26 +1484,26 @@ class pdf_sponge extends ModelePDFFactures
 
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->owner_name), 0, 'L', 0);
+						$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->owner_name), 0, 'L', false);
 						$posy = $pdf->GetY() + 1;
 
 						if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+							$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', false);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
 					if (getDolGlobalInt('FACTURE_CHQ_NUMBER') == -1) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+						$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', false);
 						$posy = $pdf->GetY() + 1;
 
 						if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+							$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', false);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
@@ -1546,7 +1546,7 @@ class pdf_sponge extends ModelePDFFactures
 
 						$pdf->SetXY($qrPosX + 30, $posy + 5);
 						$pdf->SetFont('', '', $default_font_size - 5);
-						$pdf->MultiCell(30, 3, $outputlangs->transnoentitiesnoconv("INVOICE_ADD_EPC_QR_CODEPay"), 0, 'L', 0);
+						$pdf->MultiCell(30, 3, $outputlangs->transnoentitiesnoconv("INVOICE_ADD_EPC_QR_CODEPay"), 0, 'L', false);
 						$posy = $pdf->GetY() + 2;
 					}
 
@@ -1555,7 +1555,7 @@ class pdf_sponge extends ModelePDFFactures
 						include_once DOL_DOCUMENT_ROOT.'/core/lib/functions_be.lib.php';
 						$invoicePaymentKey = dolBECalculateStructuredCommunication($object->ref, $object->type);
 
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": " . $outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": " . $outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', false);
 					}
 				}
 			}
@@ -1672,7 +1672,7 @@ class pdf_sponge extends ModelePDFFactures
 				$index++;
 				$pdf->SetFillColor(255, 255, 255);
 				$pdf->SetXY($col1x, $posy);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("PDFSituationTitle", $fac->situation_counter).' '.$outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("PDFSituationTitle", $fac->situation_counter).' '.$outputlangs->transnoentities("TotalHT"), 0, 'L', true);
 
 				$pdf->SetXY($col2x, $posy);
 
@@ -1683,7 +1683,7 @@ class pdf_sponge extends ModelePDFFactures
 
 				$displayAmount = ' '.$facSign.' '.price($fac->total_ht, 0, $outputlangs);
 
-				$pdf->MultiCell($largcol2, $tab2_hl, $displayAmount, 0, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, $displayAmount, 0, 'R', true);
 
 				$i++;
 				$posy += $tab2_hl;
@@ -1694,7 +1694,7 @@ class pdf_sponge extends ModelePDFFactures
 			// Display current total
 			$pdf->SetFillColor(255, 255, 255);
 			$pdf->SetXY($col1x, $posy);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("PDFSituationTitle", $object->situation_counter).' '.$outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("PDFSituationTitle", $object->situation_counter).' '.$outputlangs->transnoentities("TotalHT"), 0, 'L', true);
 
 			$pdf->SetXY($col2x, $posy);
 			$facSign = '';
@@ -1708,7 +1708,7 @@ class pdf_sponge extends ModelePDFFactures
 
 
 			$displayAmount = ' '.$facSign.' '.price($object->total_ht, 0, $outputlangs);
-			$pdf->MultiCell($largcol2, $tab2_hl, $displayAmount, 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, $displayAmount, 0, 'R', true);
 
 			$posy += $tab2_hl;
 
@@ -1716,10 +1716,10 @@ class pdf_sponge extends ModelePDFFactures
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetFillColor(255, 255, 255);
 			$pdf->SetXY($col1x, $posy);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("SituationTotalProgress", $avancementGlobal), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("SituationTotalProgress", $avancementGlobal), 0, 'L', true);
 
 			$pdf->SetXY($col2x, $posy);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($total_a_payer * $avancementGlobal / 100, 0, $outputlangs), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($total_a_payer * $avancementGlobal / 100, 0, $outputlangs), 0, 'R', true);
 			$pdf->SetFont('', '', $default_font_size - 2);
 
 			$posy += $tab2_hl;
@@ -1759,18 +1759,18 @@ class pdf_sponge extends ModelePDFFactures
 		if ($total_line_remise > 0) {
 			$pdf->SetFillColor(255, 255, 255);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalDiscount") : ''), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalDiscount") : ''), 0, 'L', true);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise, 0, $outputlangs), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise, 0, $outputlangs), 0, 'R', true);
 
 			$index++;
 
 			// Show total NET before discount
 			$pdf->SetFillColor(255, 255, 255);
 			$pdf->SetXY($col1x, $tab2_top);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTBeforeDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTBeforeDiscount") : ''), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTBeforeDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTBeforeDiscount") : ''), 0, 'L', true);
 			$pdf->SetXY($col2x, $tab2_top);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise + $total_ht, 0, $outputlangs), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise + $total_ht, 0, $outputlangs), 0, 'R', true);
 
 			$index++;
 		}
@@ -1778,20 +1778,20 @@ class pdf_sponge extends ModelePDFFactures
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities(!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') ? "TotalHT" : "Total").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities(!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') ? "TotalHT" : "Total") : ''), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities(!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') ? "TotalHT" : "Total").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities(!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') ? "TotalHT" : "Total") : ''), 0, 'L', true);
 
 		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, $outputlangs), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, $outputlangs), 0, 'R', true);
 
 		if (getDolGlobalInt('PDF_INVOICE_SHOW_VAT_ANALYSIS')) {
 			$index++;
 			$pdf->SetFillColor(255, 255, 255);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalVAT"), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalVAT"), 0, 'L', true);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_tva), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_tva), 0, 'R', true);
 		}
 
 		// Show VAT by rates and total
@@ -1833,12 +1833,12 @@ class pdf_sponge extends ModelePDFFactures
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1870,12 +1870,12 @@ class pdf_sponge extends ModelePDFFactures
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1929,10 +1929,10 @@ class pdf_sponge extends ModelePDFFactures
 							} else {
 								$totalvat .= vatrate($tvaval['vatrate'], true).($tvaval['vatcode'] ? ' ('.$tvaval['vatcode'].')' : '').$tvacompl;
 							}
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($tvaval['amount'], 'MT'), 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($tvaval['amount'], 'MT'), 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1964,12 +1964,12 @@ class pdf_sponge extends ModelePDFFactures
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -2002,12 +2002,12 @@ class pdf_sponge extends ModelePDFFactures
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -2016,10 +2016,10 @@ class pdf_sponge extends ModelePDFFactures
 				if (price2num($object->revenuestamp, 'MT') != 0) {
 					$index++;
 					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("RevenueStamp", $mysoc->country_code) : ''), $useborder, 'L', 1);
+					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("RevenueStamp", $mysoc->country_code) : ''), $useborder, 'L', true);
 
 					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->revenuestamp), $useborder, 'R', 1);
+					$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->revenuestamp), $useborder, 'R', true);
 				}
 
 				// Total TTC
@@ -2027,10 +2027,10 @@ class pdf_sponge extends ModelePDFFactures
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->SetFillColor(224, 224, 224);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalTTC") : ''), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalTTC") : ''), $useborder, 'L', true);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', true);
 
 
 				// Retained warranty
@@ -2044,10 +2044,10 @@ class pdf_sponge extends ModelePDFFactures
 					// Billed - retained warranty
 					$index++;
 					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')), $useborder, 'L', 1);
+					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')), $useborder, 'L', true);
 
 					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price($billedWithRetainedWarranty), $useborder, 'R', 1);
+					$pdf->MultiCell($largcol2, $tab2_hl, price($billedWithRetainedWarranty), $useborder, 'R', true);
 
 					// retained warranty
 					$index++;
@@ -2056,9 +2056,9 @@ class pdf_sponge extends ModelePDFFactures
 					$retainedWarrantyToPayOn = $outputlangs->transnoentities("RetainedWarranty").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("RetainedWarranty") : '').' ('.$object->retained_warranty.'%)';
 					$retainedWarrantyToPayOn .= !empty($object->retained_warranty_date_limit) ? ' '.$outputlangs->transnoentities("toPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
 
-					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $retainedWarrantyToPayOn, $useborder, 'L', 1);
+					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $retainedWarrantyToPayOn, $useborder, 'L', true);
 					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price($retainedWarranty), $useborder, 'R', 1);
+					$pdf->MultiCell($largcol2, $tab2_hl, price($retainedWarranty), $useborder, 'R', true);
 				}
 			}
 		}
@@ -2077,9 +2077,9 @@ class pdf_sponge extends ModelePDFFactures
 			// Already paid + Deposits
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Paid").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("Paid") : ''), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Paid").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("Paid") : ''), 0, 'L', false);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', 0);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', false);
 
 			// Credit note
 			if ($creditnoteamount) {
@@ -2087,9 +2087,9 @@ class pdf_sponge extends ModelePDFFactures
 				$labeltouse .= (is_object($outputlangsbis) ? (' / '.(($outputlangsbis->transnoentities("CreditNotesOrExcessReceived") != "CreditNotesOrExcessReceived") ? $outputlangsbis->transnoentities("CreditNotesOrExcessReceived") : $outputlangsbis->transnoentities("CreditNotes"))) : '');
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $labeltouse, 0, 'L', 0);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $labeltouse, 0, 'L', false);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($creditnoteamount, 0, $outputlangs), 0, 'R', 0);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($creditnoteamount, 0, $outputlangs), 0, 'R', false);
 			}
 
 			if ($object->close_code == Facture::CLOSECODE_DISCOUNTVAT) {
@@ -2097,9 +2097,9 @@ class pdf_sponge extends ModelePDFFactures
 				$pdf->SetFillColor(255, 255, 255);
 
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("EscompteOfferedShort") : ''), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("EscompteOfferedShort") : ''), $useborder, 'L', true);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT'), 0, $outputlangs), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT'), 0, $outputlangs), $useborder, 'R', true);
 
 				$resteapayer = 0;
 			}
@@ -2108,9 +2108,9 @@ class pdf_sponge extends ModelePDFFactures
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("RemainderToPay") : ''), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("RemainderToPay") : ''), $useborder, 'L', true);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', true);
 
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetTextColor(0, 0, 0);
@@ -2588,7 +2588,7 @@ class pdf_sponge extends ModelePDFFactures
 					// Show shipping frame
 					$pdf->SetXY($posx + 2, $posy - 5);
 					$pdf->SetFont('', '', $default_font_size - 2);
-					$pdf->MultiCell($widthrecbox, 0, $outputlangs->transnoentities('ShippingTo'), 0, 'L', 0);
+					$pdf->MultiCell($widthrecbox, 0, $outputlangs->transnoentities('ShippingTo'), 0, 'L', false);
 					$pdf->RoundedRect($posx, $posy, $widthrecbox, $hautcadre, $this->corner_radius, '1234', 'D');
 
 					// Show shipping name
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 72788ca6ce3..b46621fd396 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2011		Fabrice CHERRIER
  * Copyright (C) 2013		Cédric Salvador				<csalvador@gpcsolutions.fr>
  * Copyright (C) 2015       Marcos García               <marcosgdf@gmail.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2024	    Nick Fragoulis
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
@@ -273,7 +273,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				$nexY = $tab_top + 7;
 
 				$pdf->SetXY($this->marge_gauche, $tab_top);
-				$pdf->MultiCell(190, 5, $outputlangs->transnoentities("Description"), 0, 'L', 0);
+				$pdf->MultiCell(190, 5, $outputlangs->transnoentities("Description"), 0, 'L', false);
 				$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5);
 
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -507,13 +507,13 @@ class pdf_soleil extends ModelePDFFicheinter
 			}
 
 			$pdf->SetXY(20, 230);
-			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("NameAndSignatureOfInternalContact"), 0, 'L', 0);
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("NameAndSignatureOfInternalContact"), 0, 'L', false);
 
 			$pdf->SetXY(20, 235);
 			$pdf->MultiCell(80, 25, $employee_name, 1, 'L');
 
 			$pdf->SetXY(110, 230);
-			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("NameAndSignatureOfExternalContact"), 0, 'L', 0);
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("NameAndSignatureOfExternalContact"), 0, 'L', false);
 
 			$pdf->SetXY(110, 235);
 			$pdf->MultiCell(80, 25, '', 1);
diff --git a/htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php b/htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php
index 8b2b2fb5c0b..9f8a685a31e 100644
--- a/htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php
+++ b/htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php
@@ -285,7 +285,7 @@ class pdf_standard_evaluation extends ModelePDFEvaluation
 					$tab_top = 65;
 
 					$pdf->SetFont('', 'B', $default_font_size);
-					$pdf->MultiCell(190, 4, $outputlangs->transnoentities("Notes") . ":", 0, 'L', 0, 0, 12, $tab_top);
+					$pdf->MultiCell(190, 4, $outputlangs->transnoentities("Notes") . ":", 0, 'L', false, 0, 12, $tab_top);
 					$tab_top += 4;
 					$pdf->SetFont('', '', $default_font_size - 1);
 					$pdf->writeHTMLCell(190, 3, $this->posxnotes + 1, $tab_top + 1, dol_htmlentitiesbr($object->note_public), 0, 1);
@@ -518,7 +518,7 @@ class pdf_standard_evaluation extends ModelePDFEvaluation
 			$pdf->SetFillColor(255, 255, 255);
 		}
 		$result = (($objectligne->required_rank != 0 && $objectligne->rankorder != 0) ? $objectligne->rankorder . "/" . $objectligne->required_rank : "-");
-		$pdf->MultiCell($this->posxresult - 210 - 0.8 - 4, 4, $result, 0, 'C', 1);
+		$pdf->MultiCell($this->posxresult - 210 - 0.8 - 4, 4, $result, 0, 'C', true);
 
 
 		// required Rank
diff --git a/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php b/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
index 9f461561c32..fcc366eb619 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
@@ -636,7 +636,7 @@ class pdf_standard_movementstock extends ModelePDFMovement
 						// Origin
 						$pricemin = $objp->price;
 						$pdf->SetXY($this->posxdiscount, $curY);
-						$pdf->MultiCell($this->postotalht - $this->posxdiscount - 0.8, 3, $origin, 0, 'R', 0);
+						$pdf->MultiCell($this->postotalht - $this->posxdiscount - 0.8, 3, $origin, 0, 'R', false);
 
 						// Qty
 						$valtoshow = price2num($objp->qty, 'MS');
@@ -644,7 +644,7 @@ class pdf_standard_movementstock extends ModelePDFMovement
 						$totalunit += $objp->qty;
 
 						$pdf->SetXY($this->postotalht, $curY);
-						$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $objp->qty, 0, 'R', 0);
+						$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $objp->qty, 0, 'R', false);
 
 						$totalvaluesell += price2num($pricemin * $objp->value, 'MT');
 
@@ -720,7 +720,7 @@ class pdf_standard_movementstock extends ModelePDFMovement
 
 					// Total Qty
 					$pdf->SetXY($this->postotalht, $curY);
-					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $totalunit, 0, 'R', 0);
+					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $totalunit, 0, 'R', false);
 				} else {
 					dol_print_error($this->db);
 				}
diff --git a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
index db63002175f..276bd535801 100644
--- a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
+++ b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
@@ -658,7 +658,7 @@ class pdf_vinci extends ModelePDFMo
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', false);
 
 			$posy = $pdf->GetY() + 4;
 		}
@@ -737,11 +737,11 @@ class pdf_vinci extends ModelePDFMo
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', true);
 
 		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', true);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
@@ -763,36 +763,36 @@ class pdf_vinci extends ModelePDFMo
 
 				$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).' ';
 				$totalvat .= vatrate($tvakey, true).$tvacompl;
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', true);
 			}
 		}
 		if (!$this->atleastoneratenotnull) { // If no vat at all
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code), 0, 'L', true);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva), 0, 'R', true);
 
 			// Total LocalTax1
 			if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on' && $object->total_localtax1 > 0) {
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code), 0, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code), 0, 'L', true);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1), $useborder, 'R', true);
 			}
 
 			// Total LocalTax2
 			if (getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') == 'localtax2on' && $object->total_localtax2 > 0) {
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code), 0, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code), 0, 'L', true);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', true);
 			}
 		} else {
 			//if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on')
@@ -817,10 +817,10 @@ class pdf_vinci extends ModelePDFMo
 						}
 						$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
 						$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
-						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', true);
 					}
 				}
 			}
@@ -847,10 +847,10 @@ class pdf_vinci extends ModelePDFMo
 						}
 						$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
 						$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
-						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', true);
 					}
 				}
 			}
@@ -861,11 +861,11 @@ class pdf_vinci extends ModelePDFMo
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFillColor(224, 224, 224);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', true);
 
 		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc), $useborder, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc), $useborder, 'R', true);
 		$pdf->SetFont('', '', $default_font_size - 1);
 		$pdf->SetTextColor(0, 0, 0);
 
@@ -884,18 +884,18 @@ class pdf_vinci extends ModelePDFMo
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', false);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle), 0, 'R', 0);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle), 0, 'R', false);
 
 			$index++;
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', true);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $useborder, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $useborder, 'R', true);
 
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 8021ef701dc..83e348cb0db 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -585,7 +585,7 @@ class pdf_azur extends ModelePDFPropales
 					// Unit price before discount
 					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->posxup, $curY);
-					$pdf->MultiCell($this->posxqty - $this->posxup - 0.8, 3, $up_excl_tax, 0, 'R', 0);
+					$pdf->MultiCell($this->posxqty - $this->posxup - 0.8, 3, $up_excl_tax, 0, 'R', false);
 
 					// Quantity
 					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
@@ -610,7 +610,7 @@ class pdf_azur extends ModelePDFPropales
 					// Total HT line
 					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->postotalht, $curY);
-					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
+					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', false);
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
 					if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
@@ -930,7 +930,7 @@ class pdf_azur extends ModelePDFPropales
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
 			$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 			$pdf->SetXY($this->marge_gauche, $posy);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', false);
 
 			$posy = $pdf->GetY() + 4;
 		}
@@ -1041,26 +1041,26 @@ class pdf_azur extends ModelePDFPropales
 
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->owner_name), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->owner_name), 0, 'L', false);
 						$posy = $pdf->GetY() + 1;
 
 						if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', false);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
 					if (getDolGlobalInt('FACTURE_CHQ_NUMBER') == -1) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', false);
 						$posy = $pdf->GetY() + 1;
 
 						if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', false);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
@@ -1140,18 +1140,18 @@ class pdf_azur extends ModelePDFPropales
 		if ($total_line_remise > 0) {
 			$pdf->SetFillColor(255, 255, 255);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalDiscount") : ''), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalDiscount") : ''), 0, 'L', true);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise, 0, $outputlangs), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise, 0, $outputlangs), 0, 'R', true);
 
 			$index++;
 
 			// Show total NET before discount
 			$pdf->SetFillColor(255, 255, 255);
 			$pdf->SetXY($col1x, $tab2_top);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTBeforeDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTBeforeDiscount") : ''), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTBeforeDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTBeforeDiscount") : ''), 0, 'L', true);
 			$pdf->SetXY($col2x, $tab2_top);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise + $total_ht, 0, $outputlangs), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise + $total_ht, 0, $outputlangs), 0, 'R', true);
 
 			$index++;
 		}
@@ -1159,11 +1159,11 @@ class pdf_azur extends ModelePDFPropales
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', true);
 
 		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', true);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
@@ -1202,12 +1202,12 @@ class pdf_azur extends ModelePDFPropales
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1238,12 +1238,12 @@ class pdf_azur extends ModelePDFPropales
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1272,10 +1272,10 @@ class pdf_azur extends ModelePDFPropales
 						} else {
 							$totalvat .= vatrate($tvaval['vatrate'], true).($tvaval['vatcode'] ? ' ('.$tvaval['vatcode'].')' : '').$tvacompl;
 						}
-						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($tvaval['amount'], 'MT'), 0, $outputlangs), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($tvaval['amount'], 'MT'), 0, $outputlangs), 0, 'R', true);
 					}
 				}
 
@@ -1305,12 +1305,12 @@ class pdf_azur extends ModelePDFPropales
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1342,12 +1342,12 @@ class pdf_azur extends ModelePDFPropales
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1358,10 +1358,10 @@ class pdf_azur extends ModelePDFPropales
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->SetFillColor(224, 224, 224);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', true);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', true);
 			}
 		}
 
@@ -1377,10 +1377,10 @@ class pdf_azur extends ModelePDFPropales
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', false);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', false);
 
 			/*
 			if ($object->close_code == 'discount_vat') {
@@ -1401,10 +1401,10 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', true);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', true);
 
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetTextColor(0, 0, 0);
@@ -1851,7 +1851,7 @@ class pdf_azur extends ModelePDFPropales
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($posx, $tab_top);
 		$pdf->SetFont('', '', $default_font_size - 2);
-		$pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentities("ProposalCustomerSignature"), 0, 'L', 1);
+		$pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentities("ProposalCustomerSignature"), 0, 'L', true);
 
 		$pdf->SetXY($posx, $tab_top + $tab_hl + 3);
 		//$pdf->MultiCell($largcol, $tab_hl * 3, '', 1, 'R');
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index de8072300ba..f8db0c8030b 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -1031,7 +1031,7 @@ class pdf_cyan extends ModelePDFPropales
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
 			$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 			$pdf->SetXY($this->marge_gauche, $posy);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', false);
 
 			$posy = $pdf->GetY() + 4;
 		}
@@ -1142,26 +1142,26 @@ class pdf_cyan extends ModelePDFPropales
 
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->owner_name), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->owner_name), 0, 'L', false);
 						$posy = $pdf->GetY() + 1;
 
 						if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', false);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
 					if (getDolGlobalInt('FACTURE_CHQ_NUMBER') == -1) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', false);
 						$posy = $pdf->GetY() + 1;
 
 						if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', false);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
@@ -1247,18 +1247,18 @@ class pdf_cyan extends ModelePDFPropales
 		if ($total_line_remise > 0) {
 			$pdf->SetFillColor(255, 255, 255);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalDiscount") : ''), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalDiscount") : ''), 0, 'L', true);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise, 0, $outputlangs), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise, 0, $outputlangs), 0, 'R', true);
 
 			$index++;
 
 			// Show total NET before discount
 			$pdf->SetFillColor(255, 255, 255);
 			$pdf->SetXY($col1x, $tab2_top);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTBeforeDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTBeforeDiscount") : ''), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTBeforeDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTBeforeDiscount") : ''), 0, 'L', true);
 			$pdf->SetXY($col2x, $tab2_top);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise + $total_ht, 0, $outputlangs), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise + $total_ht, 0, $outputlangs), 0, 'R', true);
 
 			$index++;
 		}
@@ -1266,11 +1266,11 @@ class pdf_cyan extends ModelePDFPropales
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', true);
 
 		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', true);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
@@ -1306,12 +1306,12 @@ class pdf_cyan extends ModelePDFPropales
 							$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalLT1", $mysoc->country_code) : '');
 							$totalvat .= ' ';
 							$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1339,12 +1339,12 @@ class pdf_cyan extends ModelePDFPropales
 							$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalLT2", $mysoc->country_code) : '');
 							$totalvat .= ' ';
 							$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1366,10 +1366,10 @@ class pdf_cyan extends ModelePDFPropales
 						$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalVAT", $mysoc->country_code) : '');
 						$totalvat .= ' ';
 						$totalvat .= vatrate($tvakey, true).$tvacompl;
-						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', true);
 					}
 				}
 
@@ -1397,12 +1397,12 @@ class pdf_cyan extends ModelePDFPropales
 							$totalvat .= ' ';
 
 							$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1437,12 +1437,12 @@ class pdf_cyan extends ModelePDFPropales
 								$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
 							}
 
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$total_localtax = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? price2num($tvaval * $object->multicurrency_tx, 'MT') : $tvaval);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($total_localtax, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1453,10 +1453,10 @@ class pdf_cyan extends ModelePDFPropales
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->SetFillColor(224, 224, 224);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalTTC") : ''), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalTTC") : ''), $useborder, 'L', true);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', true);
 			}
 		}
 
@@ -1473,10 +1473,10 @@ class pdf_cyan extends ModelePDFPropales
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), 0, 'L', false);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', false);
 
 			/*
 			if ($object->close_code == 'discount_vat') {
@@ -1497,10 +1497,10 @@ class pdf_cyan extends ModelePDFPropales
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("RemainderToPay") : ''), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("RemainderToPay") : ''), $useborder, 'L', true);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', true);
 
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetTextColor(0, 0, 0);
@@ -1923,7 +1923,7 @@ class pdf_cyan extends ModelePDFPropales
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($posx, $tab_top);
 		$pdf->SetFont('', '', $default_font_size - 2);
-		$pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentities("ProposalCustomerSignature"), 0, 'L', 1);
+		$pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentities("ProposalCustomerSignature"), 0, 'L', true);
 
 		$pdf->SetXY($posx, $tab_top + $tab_hl + 3);
 		//$pdf->MultiCell($largcol, $tab_hl * 3, '', 1, 'R');
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index f6464155003..d0ab88db2a2 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -539,9 +539,9 @@ class pdf_paiement extends CommonDocGenerator
 					$pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
 					$pdf->SetFont('', 'B', $default_font_size - 1);
 					$pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
-					$pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('SubTotal')." : ", 0, 'R', 1);
+					$pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('SubTotal')." : ", 0, 'R', true);
 					$pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
-					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total_page), 0, 'R', 1);
+					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total_page), 0, 'R', true);
 					$pdf->SetFont('', '', $default_font_size - 1);
 					$pdf->SetFillColor(220, 220, 220);
 					$page++;
@@ -554,16 +554,16 @@ class pdf_paiement extends CommonDocGenerator
 				}
 
 				$pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
-				$pdf->MultiCell($this->posxpaymenttype - $this->posxdate + 1, $this->line_height, $lines[$j][1], 0, 'L', 1);
+				$pdf->MultiCell($this->posxpaymenttype - $this->posxdate + 1, $this->line_height, $lines[$j][1], 0, 'L', true);
 
 				$pdf->SetXY($this->posxpaymenttype, $this->tab_top + 10 + $yp);
-				$pdf->MultiCell($this->posxinvoiceamount - $this->posxpaymenttype, $this->line_height, $lines[$j][2].' '.$lines[$j][3], 0, 'L', 1);
+				$pdf->MultiCell($this->posxinvoiceamount - $this->posxpaymenttype, $this->line_height, $lines[$j][2].' '.$lines[$j][3], 0, 'L', true);
 
 				$pdf->SetXY($this->posxinvoiceamount, $this->tab_top + 10 + $yp);
-				$pdf->MultiCell($this->posxpaymentamount - $this->posxinvoiceamount, $this->line_height, '', 0, 'R', 1);
+				$pdf->MultiCell($this->posxpaymentamount - $this->posxinvoiceamount, $this->line_height, '', 0, 'R', true);
 
 				$pdf->SetXY($this->posxpaymentamount, $this->tab_top + 10 + $yp);
-				$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount, $this->line_height, $lines[$j][4], 0, 'R', 1);
+				$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount, $this->line_height, $lines[$j][4], 0, 'R', true);
 				$yp += 5;
 				$total_page += (float) $lines[$j][9];
 				if (($this->doc_type == 'client' && getDolGlobalString('PAYMENTS_REPORT_GROUP_BY_MOD')) || ($this->doc_type == 'fourn' && getDolGlobalString('PAYMENTS_FOURN_REPORT_GROUP_BY_MOD'))) {
@@ -573,19 +573,19 @@ class pdf_paiement extends CommonDocGenerator
 
 			// Invoice number
 			$pdf->SetXY($this->posxinvoice, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell($this->posxinvoice - $this->posxbankaccount, $this->line_height, $lines[$j][0], 0, 'L', 0);
+			$pdf->MultiCell($this->posxinvoice - $this->posxbankaccount, $this->line_height, $lines[$j][0], 0, 'L', false);
 
 			// BankAccount
 			$pdf->SetXY($this->posxbankaccount, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell($this->posxbankaccount - $this->posxdate, $this->line_height, $lines[$j][8], 0, 'L', 0);
+			$pdf->MultiCell($this->posxbankaccount - $this->posxdate, $this->line_height, $lines[$j][8], 0, 'L', false);
 
 			// Invoice amount
 			$pdf->SetXY($this->posxinvoiceamount, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell($this->posxpaymentamount - $this->posxinvoiceamount - 1, $this->line_height, $lines[$j][5], 0, 'R', 0);
+			$pdf->MultiCell($this->posxpaymentamount - $this->posxinvoiceamount - 1, $this->line_height, $lines[$j][5], 0, 'R', false);
 
 			// Payment amount
 			$pdf->SetXY($this->posxpaymentamount, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount, $this->line_height, $lines[$j][6], 0, 'R', 0);
+			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount, $this->line_height, $lines[$j][6], 0, 'R', false);
 			$yp += 5;
 
 			if ($oldprowid != $lines[$j][7]) {
@@ -600,9 +600,9 @@ class pdf_paiement extends CommonDocGenerator
 				$pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
 				$pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
 				$pdf->SetFont('', 'I', $default_font_size - 1);
-				$pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('Total').' '.$mod." : ", 0, 'R', 1);
+				$pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('Total').' '.$mod." : ", 0, 'R', true);
 				$pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
-				$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total_mod), 0, 'R', 1);
+				$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total_mod), 0, 'R', true);
 				$pdf->SetFont('', '', $default_font_size - 1);
 				$mod = $lines[$j + 1][2];
 				$total_mod = 0;
@@ -624,9 +624,9 @@ class pdf_paiement extends CommonDocGenerator
 		$pdf->line($this->marge_gauche, $this->tab_top + 15 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 15 + $yp);
 		$pdf->SetXY($this->posxdate - 1, $this->tab_top + 10 + $yp);
 		$pdf->SetFont('', 'B');
-		$pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('Total')." : ", 0, 'R', 1);
+		$pdf->MultiCell($this->posxpaymentamount - 2 - $this->marge_droite, $this->line_height, $langs->transnoentities('Total')." : ", 0, 'R', true);
 		$pdf->SetXY($this->posxpaymentamount - 1, $this->tab_top + 10 + $yp);
-		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total), 0, 'R', 1);
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount + 1, $this->line_height, price($total), 0, 'R', true);
 		$pdf->SetFillColor(220, 220, 220);
 	}
 }
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 9d9a0d28f8e..910ba1c1c25 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -753,39 +753,39 @@ class pdf_squille extends ModelePdfReception
 
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Total"), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Total"), 0, 'L', true);
 
 		$index2 = 0;
 
 		// Total Weight
 		if ($totalWeighttoshow) {
 			$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * ($index + $index2));
-			$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalWeighttoshow, 0, 'C', 1);
+			$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalWeighttoshow, 0, 'C', true);
 			$index2++;
 		}
 		if ($totalVolumetoshow) {
 			$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * ($index + $index2));
-			$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalVolumetoshow, 0, 'C', 1);
+			$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalVolumetoshow, 0, 'C', true);
 			$index2++;
 		}
 
 		// Total qty ordered
 		if (!getDolGlobalString('RECEPTION_PDF_HIDE_ORDERED')) {
 			$pdf->SetXY($this->posxqtyordered, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($this->posxqtytoship - $this->posxqtyordered, $tab2_hl, $totalOrdered, 0, 'C', 1);
+			$pdf->MultiCell($this->posxqtytoship - $this->posxqtyordered, $tab2_hl, $totalOrdered, 0, 'C', true);
 		}
 
 		// Total received
 		$pdf->SetXY($this->posxqtytoship, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($this->posxpuht - $this->posxqtytoship, $tab2_hl, $totalToShip, 0, 'C', 1);
+		$pdf->MultiCell($this->posxpuht - $this->posxqtytoship, $tab2_hl, $totalToShip, 0, 'C', true);
 
 		// Amount
 		if (getDolGlobalString('MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT')) {
 			$pdf->SetXY($this->posxpuht, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($this->posxtotalht - $this->posxpuht, $tab2_hl, '', 0, 'C', 1);
+			$pdf->MultiCell($this->posxtotalht - $this->posxpuht, $tab2_hl, '', 0, 'C', true);
 
 			$pdf->SetXY($this->posxtotalht, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalht, $tab2_hl, price($totalAmount, 0, $outputlangs), 0, 'C', 1);
+			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalht, $tab2_hl, price($totalAmount, 0, $outputlangs), 0, 'C', true);
 		}
 
 		$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php b/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php
index 9b1d95ab7bd..ae2b65bac15 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php
@@ -426,11 +426,11 @@ class pdf_standard_stock extends ModelePDFStock
 						if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 							$pricemin = $objp->price;
 							$pdf->SetXY($this->posxdiscount, $curY);
-							$pdf->MultiCell($this->postotalht - $this->posxdiscount, 3, price(price2num($pricemin, 'MU'), 0, $outputlangs), 0, 'R', 0);
+							$pdf->MultiCell($this->postotalht - $this->posxdiscount, 3, price(price2num($pricemin, 'MU'), 0, $outputlangs), 0, 'R', false);
 
 							// Total sell min
 							$pdf->SetXY($this->postotalht, $curY);
-							$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, price(price2num($pricemin * $objp->value, 'MT'), 0, $outputlangs), 0, 'R', 0);
+							$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, price(price2num($pricemin * $objp->value, 'MT'), 0, $outputlangs), 0, 'R', false);
 						}
 						$totalvaluesell += price2num($pricemin * $objp->value, 'MT');
 
@@ -519,7 +519,7 @@ class pdf_standard_stock extends ModelePDFStock
 						if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 							// Total sell min
 							$pdf->SetXY($this->postotalht, $curY);
-							$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, price(price2num($totalvaluesell, 'MT'), 0, $outputlangs), 0, 'R', 0);
+							$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, price(price2num($totalvaluesell, 'MT'), 0, $outputlangs), 0, 'R', false);
 						}
 					}
 				} else {
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
index 702ffad456a..75a6f12b163 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
@@ -843,32 +843,32 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Total"), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Total"), 0, 'L', true);
 
 		if (!getDolGlobalString('STOCKTRANSFER_PDF_HIDE_ORDERED')) {
 			$pdf->SetXY($this->posxqty, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($this->posxwarehousesource - $this->posxqty, $tab2_hl, $totalQty, 0, 'C', 1);
+			$pdf->MultiCell($this->posxwarehousesource - $this->posxqty, $tab2_hl, $totalQty, 0, 'C', true);
 		}
 
 		if (getDolGlobalString('STOCKTRANSFER_PDF_DISPLAY_AMOUNT_HT')) {
 			$pdf->SetXY($this->posxpuht, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($this->posxtotalht - $this->posxpuht, $tab2_hl, '', 0, 'C', 1);
+			$pdf->MultiCell($this->posxtotalht - $this->posxpuht, $tab2_hl, '', 0, 'C', true);
 
 			$pdf->SetXY($this->posxtotalht, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalht, $tab2_hl, price($object->total_ht, 0, $outputlangs), 0, 'C', 1);
+			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalht, $tab2_hl, price($object->total_ht, 0, $outputlangs), 0, 'C', true);
 		}
 
 		if (!getDolGlobalString('STOCKTRANSFER_PDF_HIDE_WEIGHT_AND_VOLUME')) {
 			// Total Weight
 			if ($totalWeighttoshow) {
 				$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell(($this->posxqty - $this->posxweightvol), $tab2_hl, $totalWeighttoshow, 0, 'C', 1);
+				$pdf->MultiCell(($this->posxqty - $this->posxweightvol), $tab2_hl, $totalWeighttoshow, 0, 'C', true);
 
 				$index++;
 			}
 			if ($totalVolumetoshow) {
 				$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell(($this->posxqty - $this->posxweightvol), $tab2_hl, $totalVolumetoshow, 0, 'C', 1);
+				$pdf->MultiCell(($this->posxqty - $this->posxweightvol), $tab2_hl, $totalVolumetoshow, 0, 'C', true);
 
 				$index++;
 			}
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 de6a8693412..a2c0e496c5c 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
@@ -862,7 +862,7 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', false);
 
 			$posy = $pdf->GetY() + 4;
 		}
@@ -975,26 +975,26 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 
 					$pdf->SetXY($this->marge_gauche, $posy);
 					$pdf->SetFont('', 'B', $default_font_size - 3);
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->owner_name), 0, 'L', 0);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->owner_name), 0, 'L', false);
 					$posy = $pdf->GetY() + 1;
 
 					if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', '', $default_font_size - 3);
-						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', false);
 						$posy = $pdf->GetY() + 2;
 					}
 				}
 				if (getDolGlobalInt('FACTURE_CHQ_NUMBER') == -1) {
 					$pdf->SetXY($this->marge_gauche, $posy);
 					$pdf->SetFont('', 'B', $default_font_size - 3);
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', false);
 					$posy = $pdf->GetY() + 1;
 
 					if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', '', $default_font_size - 3);
-						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', false);
 						$posy = $pdf->GetY() + 2;
 					}
 				}
@@ -1081,10 +1081,10 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFillColor(224, 224, 224);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Total").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("Total", $mysoc->country_code) : ''), $useborder, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Total").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("Total", $mysoc->country_code) : ''), $useborder, 'L', true);
 
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', true);
 
 		$pdf->SetTextColor(0, 0, 0);
 
@@ -1103,18 +1103,18 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), 0, 'L', false);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', false);
 
 			$index++;
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), $useborder, 'L', true);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', true);
 
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetTextColor(0, 0, 0);
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 d5f4c3e16a7..8e7219b19f9 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -443,7 +443,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					// Unit price before discount
 					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->posxup, $curY);
-					$pdf->MultiCell($this->posxqty - $this->posxup - 0.8, 3, $up_excl_tax, 0, 'R', 0);
+					$pdf->MultiCell($this->posxqty - $this->posxup - 0.8, 3, $up_excl_tax, 0, 'R', false);
 
 					// Quantity
 					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
@@ -467,7 +467,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					// Total HT line
 					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->postotalht, $curY);
-					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
+					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', false);
 
 					// Collection of totals by VAT value in $this->tva["taux"]=total_tva
 					if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
@@ -651,11 +651,11 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', true);
 
 		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, $outputlangs), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, $outputlangs), 0, 'R', true);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
@@ -679,35 +679,35 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 				$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).' ';
 				$totalvat .= vatrate($tvakey, true).$tvacompl;
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', true);
 			}
 		}
 		if (!$this->atleastoneratenotnull) { // If no vat at all
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code), 0, 'L', true);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva, 0, $outputlangs), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva, 0, $outputlangs), 0, 'R', true);
 
 			// Total LocalTax1
 			if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on' && $object->total_localtax1 > 0) {
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code), 0, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code), 0, 'L', true);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1, 0, $outputlangs), 0, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1, 0, $outputlangs), 0, 'R', true);
 			}
 
 			// Total LocalTax2
 			if (getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') == 'localtax2on' && $object->total_localtax2 > 0) {
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code), 0, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code), 0, 'L', true);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2, 0, $outputlangs), 0, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2, 0, $outputlangs), 0, 'R', true);
 			}
 		} else {
 			//if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on')
@@ -727,10 +727,10 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					}
 					$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
 					$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
-					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price((string) $tvaval, 0, $outputlangs), 0, 'R', 1);
+					$pdf->MultiCell($largcol2, $tab2_hl, price((string) $tvaval, 0, $outputlangs), 0, 'R', true);
 				}
 			}
 			//}
@@ -752,10 +752,10 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					}
 					$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
 					$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
-					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price((string) $tvaval, 0, $outputlangs), 0, 'R', 1);
+					$pdf->MultiCell($largcol2, $tab2_hl, price((string) $tvaval, 0, $outputlangs), 0, 'R', true);
 				}
 			}
 			//}
@@ -766,10 +766,10 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFillColor(224, 224, 224);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', true);
 
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', true);
 
 		$pdf->SetTextColor(0, 0, 0);
 		$creditnoteamount = $object->getSumCreditNotesUsed((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? 1 : 0); // Warning, this also include excess received
@@ -784,18 +784,18 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			// Already paid + Deposits
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Paid"), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Paid"), 0, 'L', false);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', 0);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', false);
 
 			// Credit note
 			if ($creditnoteamount) {
 				$labeltouse = ($outputlangs->transnoentities("CreditNotesOrExcessReceived") != "CreditNotesOrExcessReceived") ? $outputlangs->transnoentities("CreditNotesOrExcessReceived") : $outputlangs->transnoentities("CreditNotes");
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $labeltouse, 0, 'L', 0);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $labeltouse, 0, 'L', false);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($creditnoteamount, 0, $outputlangs), 0, 'R', 0);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($creditnoteamount, 0, $outputlangs), 0, 'R', false);
 			}
 
 			// Escompte
@@ -804,9 +804,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$pdf->SetFillColor(255, 255, 255);
 
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', true);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', true);
 
 				$resteapayer = 0;
 			}
@@ -815,10 +815,10 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', true);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', true);
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetTextColor(0, 0, 0);
 		}
@@ -973,19 +973,19 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 		$pdf->SetFont('', '', $default_font_size - 3);
 		$pdf->SetXY($tab3_posx, $tab3_top - 4);
-		$pdf->MultiCell(60, 3, $outputlangs->transnoentities("PaymentsAlreadyDone"), 0, 'L', 0);
+		$pdf->MultiCell(60, 3, $outputlangs->transnoentities("PaymentsAlreadyDone"), 0, 'L', false);
 
 		$pdf->line($tab3_posx, $tab3_top, $tab3_posx + $tab3_width, $tab3_top);
 
 		$pdf->SetFont('', '', $default_font_size - 4);
 		$pdf->SetXY($tab3_posx, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', 0);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Payment"), 0, 'L', false);
 		$pdf->SetXY($tab3_posx + 21, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', 0);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Amount"), 0, 'L', false);
 		$pdf->SetXY($tab3_posx + 40, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Type"), 0, 'L', false);
 		$pdf->SetXY($tab3_posx + 58, $tab3_top);
-		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', 0);
+		$pdf->MultiCell(20, 3, $outputlangs->transnoentities("Num"), 0, 'L', false);
 
 		$pdf->line($tab3_posx, $tab3_top - 1 + $tab3_height, $tab3_posx + $tab3_width, $tab3_top - 1 + $tab3_height);
 
@@ -1012,15 +1012,15 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$row = $this->db->fetch_object($resql);
 
 				$pdf->SetXY($tab3_posx, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date), 'day', false, $outputlangs, true), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date), 'day', false, $outputlangs, true), 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price($sign * ((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount)), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price($sign * ((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount)), 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
 				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$row->code);
 
-				$pdf->MultiCell(20, 3, $oper, 0, 'L', 0);
+				$pdf->MultiCell(20, 3, $oper, 0, 'L', false);
 				$pdf->SetXY($tab3_posx + 58, $tab3_top + $y);
-				$pdf->MultiCell(30, 3, $row->num_payment, 0, 'L', 0);
+				$pdf->MultiCell(30, 3, $row->num_payment, 0, 'L', false);
 
 				$pdf->line($tab3_posx, $tab3_top + $y + 3, $tab3_posx + $tab3_width, $tab3_top + $y + 3);
 
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 4811fd9b1a0..94b6621ecf1 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -884,7 +884,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
 			$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 			$pdf->SetXY($this->marge_gauche, $posy);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', false);
 
 			$posy = $pdf->GetY() + 4;
 		}
@@ -963,11 +963,11 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', true);
 
 		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', true);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
@@ -989,36 +989,36 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 				$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).' ';
 				$totalvat .= vatrate($tvakey, true).$tvacompl;
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', true);
 			}
 		}
 		if (!$this->atleastoneratenotnull) { // If no vat at all
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code), 0, 'L', true);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva), 0, 'R', true);
 
 			// Total LocalTax1
 			if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on' && $object->total_localtax1 > 0) {
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code), 0, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code), 0, 'L', true);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1), $useborder, 'R', true);
 			}
 
 			// Total LocalTax2
 			if (getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') == 'localtax2on' && $object->total_localtax2 > 0) {
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code), 0, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code), 0, 'L', true);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', true);
 			}
 		} else {
 			//if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on')
@@ -1043,10 +1043,10 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 						}
 						$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
 						$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
-						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', true);
 					}
 				}
 			}
@@ -1073,10 +1073,10 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 						}
 						$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
 						$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
-						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', true);
 					}
 				}
 			}
@@ -1087,11 +1087,11 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFillColor(224, 224, 224);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', true);
 
 		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc), $useborder, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc), $useborder, 'R', true);
 		$pdf->SetFont('', '', $default_font_size - 1);
 		$pdf->SetTextColor(0, 0, 0);
 
@@ -1110,18 +1110,18 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', false);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle), 0, 'R', 0);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle), 0, 'R', false);
 
 			$index++;
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', true);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $useborder, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $useborder, 'R', true);
 
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetTextColor(0, 0, 0);
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 c0c3f1ef183..9f9ac87007c 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -504,7 +504,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE')) {
 						$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxup, $curY);
-						$pdf->MultiCell($this->posxqty - $this->posxup - 0.8, 3, $up_excl_tax, 0, 'R', 0);
+						$pdf->MultiCell($this->posxqty - $this->posxup - 0.8, 3, $up_excl_tax, 0, 'R', false);
 					}
 
 					// Quantity
@@ -530,7 +530,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN')) {
 						$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->postotalht, $curY);
-						$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
+						$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', false);
 					}
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
@@ -747,7 +747,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
 			$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 			$pdf->SetXY($this->marge_gauche, $posy);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', false);
 
 			$posy = $pdf->GetY() + 4;
 		}
@@ -825,11 +825,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', true);
 
 		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', true);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
@@ -851,36 +851,36 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 				$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).' ';
 				$totalvat .= vatrate($tvakey, true).$tvacompl;
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', true);
 			}
 		}
 		if (!$this->atleastoneratenotnull) { // If no vat at all
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code), 0, 'L', true);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva), 0, 'R', true);
 
 			// Total LocalTax1
 			if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on' && $object->total_localtax1 > 0) {
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code), 0, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code), 0, 'L', true);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1), $useborder, 'R', true);
 			}
 
 			// Total LocalTax2
 			if (getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') == 'localtax2on' && $object->total_localtax2 > 0) {
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code), 0, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code), 0, 'L', true);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', true);
 			}
 		} else {
 			//if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on')
@@ -905,10 +905,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						}
 						$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
 						$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
-						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', true);
 					}
 				}
 			}
@@ -935,10 +935,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						}
 						$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
 						$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
-						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', true);
 					}
 				}
 			}
@@ -949,11 +949,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFillColor(224, 224, 224);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', true);
 
 		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc), $useborder, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc), $useborder, 'R', true);
 		$pdf->SetFont('', '', $default_font_size - 1);
 		$pdf->SetTextColor(0, 0, 0);
 
@@ -972,18 +972,18 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', false);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle), 0, 'R', 0);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle), 0, 'R', false);
 
 			$index++;
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', true);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $useborder, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $useborder, 'R', true);
 
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
index 3f9c8cc9288..a4265fe88e6 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
@@ -388,27 +388,27 @@ class pdf_standard_supplierpayment extends ModelePDFSuppliersPayments
 
 					// ref fourn
 					$pdf->SetXY($this->posxreffacturefourn, $curY);
-					$pdf->MultiCell($this->posxreffacturefourn - 0.8, 3, $object->lines[$i]->ref_supplier, 0, 'L', 0);
+					$pdf->MultiCell($this->posxreffacturefourn - 0.8, 3, $object->lines[$i]->ref_supplier, 0, 'L', false);
 
 					// ref facture fourn
 					$pdf->SetXY($this->posxreffacture, $curY);
-					$pdf->MultiCell($this->posxreffacture - 0.8, 3, $object->lines[$i]->ref, 0, 'L', 0);
+					$pdf->MultiCell($this->posxreffacture - 0.8, 3, $object->lines[$i]->ref, 0, 'L', false);
 
 					// type
 					$pdf->SetXY($this->posxtype, $curY);
-					$pdf->MultiCell($this->posxtype - 0.8, 3, $object->lines[$i]->type, 0, 'L', 0);
+					$pdf->MultiCell($this->posxtype - 0.8, 3, $object->lines[$i]->type, 0, 'L', false);
 
 					// Total ht
 					$pdf->SetXY($this->posxtotalht, $curY);
-					$pdf->MultiCell($this->posxtotalht - 0.8, 3, price($object->lines[$i]->total_ht), 0, 'R', 0);
+					$pdf->MultiCell($this->posxtotalht - 0.8, 3, price($object->lines[$i]->total_ht), 0, 'R', false);
 
 					// Total tva
 					$pdf->SetXY($this->posxtva, $curY);
-					$pdf->MultiCell($this->posxtva - 0.8, 3, price($object->lines[$i]->total_tva), 0, 'R', 0);
+					$pdf->MultiCell($this->posxtva - 0.8, 3, price($object->lines[$i]->total_tva), 0, 'R', false);
 
 					// Total TTC line
 					$pdf->SetXY($this->posxtotalttc, $curY);
-					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalttc, 3, price($object->lines[$i]->total_ttc), 0, 'R', 0);
+					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalttc, 3, price($object->lines[$i]->total_ttc), 0, 'R', false);
 
 
 					// Add line
@@ -533,15 +533,15 @@ class pdf_standard_supplierpayment extends ModelePDFSuppliersPayments
 
 		// N° payment
 		$pdf->SetXY($this->marge_gauche, $posy);
-		$pdf->MultiCell(30, 4, 'N° '.$outputlangs->transnoentities("Payment"), 0, 'L', 1);
+		$pdf->MultiCell(30, 4, 'N° '.$outputlangs->transnoentities("Payment"), 0, 'L', true);
 
 		// Ref payment
 		$pdf->SetXY($this->marge_gauche + 30, $posy);
-		$pdf->MultiCell(50, 4, $object->ref, 0, 'L', 1);
+		$pdf->MultiCell(50, 4, $object->ref, 0, 'L', true);
 
 		// Total payments
 		$pdf->SetXY($this->page_largeur - $this->marge_droite - 50, $posy);
-		$pdf->MultiCell(50, 4, price($object->amount), 0, 'R', 1);
+		$pdf->MultiCell(50, 4, price($object->amount), 0, 'R', true);
 		$posy += 20;
 
 		// translate amount
@@ -549,27 +549,27 @@ class pdf_standard_supplierpayment extends ModelePDFSuppliersPayments
 		$translateinletter = strtoupper(dol_convertToWord((float) price2num($object->amount, 'MT'), $outputlangs, $currency));
 		$pdf->SetXY($this->marge_gauche + 50, $posy);
 		$pdf->SetFont('', '', $default_font_size - 3);
-		$pdf->MultiCell(90, 8, $translateinletter, 0, 'L', 1);
+		$pdf->MultiCell(90, 8, $translateinletter, 0, 'L', true);
 		$pdf->SetFont('', '', $default_font_size - 1);
 		$posy += 8;
 
 		// To
 		$pdf->SetXY($this->marge_gauche + 50, $posy);
-		$pdf->MultiCell(150, 4, $object->thirdparty->name, 0, 'L', 1);
+		$pdf->MultiCell(150, 4, $object->thirdparty->name, 0, 'L', true);
 
 		$LENGTHAMOUNT = 35;
 		$pdf->SetXY($this->page_largeur - $this->marge_droite - $LENGTHAMOUNT, $posy);
-		$pdf->MultiCell($LENGTHAMOUNT, 4, str_pad(price($object->amount).' '.$currency, 18, '*', STR_PAD_LEFT), 0, 'R', 1);
+		$pdf->MultiCell($LENGTHAMOUNT, 4, str_pad(price($object->amount).' '.$currency, 18, '*', STR_PAD_LEFT), 0, 'R', true);
 		$posy += 10;
 
 		// City
 		$pdf->SetXY($this->page_largeur - $this->marge_droite - 30, $posy);
-		$pdf->MultiCell(150, 4, $mysoc->town, 0, 'L', 1);
+		$pdf->MultiCell(150, 4, $mysoc->town, 0, 'L', true);
 		$posy += 4;
 
 		// Date
 		$pdf->SetXY($this->page_largeur - $this->marge_droite - 30, $posy);
-		$pdf->MultiCell(150, 4, date("d").' '.$outputlangs->transnoentitiesnoconv(date("F")).' '.date("Y"), 0, 'L', 1);
+		$pdf->MultiCell(150, 4, date("d").' '.$outputlangs->transnoentitiesnoconv(date("F")).' '.date("Y"), 0, 'L', true);
 		return $posy;
 	}
 
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 4f1cd2887f1..e1434cb202e 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
  * Copyright (C) 2017      Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2024-2025  Frédéric France      <frederic.france@free.fr>
- * Copyright (C) 2024	   MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	   Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -822,26 +822,26 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->owner_name), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->owner_name), 0, 'L', false);
 						$posy = $pdf->GetY() + 1;
 
 						if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', false);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
 					if (getDolGlobalInt('FACTURE_CHQ_NUMBER') == -1) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', false);
 						$posy = $pdf->GetY() + 1;
 
 						if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', false);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
@@ -904,11 +904,11 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', true);
 
 		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', true);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
@@ -941,10 +941,10 @@ class pdf_aurore extends ModelePDFSupplierProposal
 							}
 							$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
 							$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -973,10 +973,10 @@ class pdf_aurore extends ModelePDFSupplierProposal
 							}
 							$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
 							$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -996,10 +996,10 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						}
 						$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).' ';
 						$totalvat .= vatrate($tvakey, true).$tvacompl;
-						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', true);
 					}
 				}
 
@@ -1026,9 +1026,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
 							$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
 
 							$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1057,10 +1057,10 @@ class pdf_aurore extends ModelePDFSupplierProposal
 							$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
 
 							$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
-							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 							$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+							$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', true);
 						}
 					}
 				}
@@ -1071,10 +1071,10 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->SetFillColor(224, 224, 224);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', true);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc, 0, $outputlangs), $useborder, 'R', true);
 			}
 		}
 
@@ -1089,19 +1089,19 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', false);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', false);
 
 			$index++;
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', true);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', true);
 
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
index 16cd7001f6d..ec3d19c9768 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2017      Ferran Marcet         <fmarcet@2byte.es>
  * Copyright (C) 2018-2025  Frédéric France       <frederic.france@free.fr>
- * Copyright (C) 2024	   MDW					 <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					 <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	   Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -866,7 +866,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
 			$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 			$pdf->SetXY($this->marge_gauche, $posy);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', false);
 
 			$posy = $pdf->GetY() + 4;
 		}
@@ -945,11 +945,11 @@ class pdf_zenith extends ModelePDFSupplierProposal
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', true);
 
 		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', true);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
@@ -971,36 +971,36 @@ class pdf_zenith extends ModelePDFSupplierProposal
 
 				$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).' ';
 				$totalvat .= vatrate($tvakey, true).$tvacompl;
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', true);
 			}
 		}
 		if (!$this->atleastoneratenotnull) { // If no vat at all
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code), 0, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code), 0, 'L', true);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva), 0, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva), 0, 'R', true);
 
 			// Total LocalTax1
 			if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on' && $object->total_localtax1 > 0) {
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code), 0, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code), 0, 'L', true);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1), $useborder, 'R', true);
 			}
 
 			// Total LocalTax2
 			if (getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') == 'localtax2on' && $object->total_localtax2 > 0) {
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code), 0, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code), 0, 'L', true);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', true);
 			}
 		} else {
 			//if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on')
@@ -1025,10 +1025,10 @@ class pdf_zenith extends ModelePDFSupplierProposal
 						}
 						$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
 						$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
-						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', true);
 					}
 				}
 			}
@@ -1055,10 +1055,10 @@ class pdf_zenith extends ModelePDFSupplierProposal
 						}
 						$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
 						$totalvat .= vatrate((string) abs((float) $tvakey), true).$tvacompl;
-						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', true);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', true);
 					}
 				}
 			}
@@ -1069,11 +1069,11 @@ class pdf_zenith extends ModelePDFSupplierProposal
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFillColor(224, 224, 224);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', true);
 
 		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc), $useborder, 'R', 1);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc), $useborder, 'R', true);
 		$pdf->SetFont('', '', $default_font_size - 1);
 		$pdf->SetTextColor(0, 0, 0);
 
@@ -1092,18 +1092,18 @@ class pdf_zenith extends ModelePDFSupplierProposal
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', false);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle), 0, 'R', 0);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle), 0, 'R', false);
 
 			$index++;
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', true);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $useborder, 'R', 1);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $useborder, 'R', true);
 
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index 1f227a8be10..96dfa1b9797 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -1108,7 +1108,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 				$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillFrom").":", 0, $ltrdirection);
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetFillColor(230, 230, 230);
-				$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
+				$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', true);
 				$pdf->SetTextColor(0, 0, 60);
 			}
 
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index 165f96b6ad3..96fa3b5d001 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -887,7 +887,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetFillColor(230, 230, 230);
-			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
+			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', true);
 			$pdf->SetTextColor(0, 0, 60);
 
 			// Show sender name

From 2117c5e55037244fcea59ad578271a6292e6103f Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Tue, 4 Feb 2025 23:12:31 +0100
Subject: [PATCH 473/602] Qual: Fix setPageOrientation 'autopagebreak' type

---
 .../asset/doc/pdf_standard_asset.modules.php  | 16 +++++++-------
 .../commande/doc/pdf_einstein.modules.php     |  8 +++----
 .../commande/doc/pdf_eratosthene.modules.php  | 20 ++++++++---------
 .../contract/doc/pdf_strato.modules.php       |  8 +++----
 .../delivery/doc/pdf_storm.modules.php        |  8 +++----
 .../delivery/doc/pdf_typhon.modules.php       |  8 +++----
 .../expedition/doc/pdf_espadon.modules.php    | 16 +++++++-------
 .../expedition/doc/pdf_merou.modules.php      |  6 ++---
 .../expedition/doc/pdf_rouget.modules.php     |  8 +++----
 .../pdf_standard_expensereport.modules.php    | 12 +++++-----
 .../modules/facture/doc/pdf_crabe.modules.php |  8 +++----
 .../facture/doc/pdf_sponge.modules.php        | 22 +++++++++----------
 .../fichinter/doc/pdf_soleil.modules.php      |  8 +++----
 .../doc/pdf_standard_evaluation.modules.php   | 12 +++++-----
 .../pdf_standard_movementstock.modules.php    |  8 +++----
 .../modules/mrp/doc/pdf_vinci.modules.php     | 14 ++++++------
 .../project/doc/pdf_baleine.modules.php       | 14 ++++++------
 .../project/doc/pdf_beluga.modules.php        | 14 ++++++------
 .../project/doc/pdf_timespent.modules.php     | 14 ++++++------
 .../modules/propale/doc/pdf_azur.modules.php  |  8 +++----
 .../modules/propale/doc/pdf_cyan.modules.php  | 22 +++++++++----------
 .../reception/doc/pdf_squille.modules.php     |  8 +++----
 .../stock/doc/pdf_standard_stock.modules.php  |  8 +++----
 .../stocktransfer/doc/pdf_eagle.modules.php   |  8 +++----
 .../doc/pdf_eagle_proforma.modules.php        | 16 +++++++-------
 .../doc/pdf_canelle.modules.php               |  8 +++----
 .../supplier_order/doc/pdf_cornas.modules.php | 14 ++++++------
 .../doc/pdf_muscadet.modules.php              |  8 +++----
 .../pdf_standard_supplierpayment.modules.php  |  8 +++----
 .../doc/pdf_aurore.modules.php                |  8 +++----
 .../doc/pdf_zenith.modules.php                | 14 ++++++------
 ...tandard_recruitmentjobposition.modules.php | 16 +++++++-------
 32 files changed, 185 insertions(+), 185 deletions(-)

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 4854eb516c4..ca4f59699a1 100644
--- a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
+++ b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
@@ -345,12 +345,12 @@ class pdf_standard_asset extends ModelePDFAsset
 							// $this->_pagefoot($pdf,$object,$outputlangs,1);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 						}
 
 						// back to start
 						$pdf->setPage($pageposbeforenote);
-						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 						$pdf->SetFont('', '', $default_font_size - 1);
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 						$pageposafternote = $pdf->getPage();
@@ -364,7 +364,7 @@ class pdf_standard_asset extends ModelePDFAsset
 							$pdf->setPage($pageposafternote);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 							//$posyafter = $tab_top_newpage;
 						}
 
@@ -386,7 +386,7 @@ class pdf_standard_asset extends ModelePDFAsset
 							}
 
 							// Add footer
-							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 
 							$i++;
@@ -451,7 +451,7 @@ class pdf_standard_asset extends ModelePDFAsset
 					$pdf->SetTextColor(0, 0, 0);
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					$showpricebeforepagebreak = 1;
@@ -466,7 +466,7 @@ class pdf_standard_asset extends ModelePDFAsset
 
 						if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 							$pdf->rollbackTransaction(true);
-							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
@@ -499,7 +499,7 @@ class pdf_standard_asset extends ModelePDFAsset
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description were moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
@@ -632,7 +632,7 @@ class pdf_standard_asset extends ModelePDFAsset
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 43733946c25..c18f93820ce 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -401,7 +401,7 @@ class pdf_einstein extends ModelePDFCommandes
 					$pdf->SetTextColor(0, 0, 0);
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					// Description of product line
@@ -416,7 +416,7 @@ class pdf_einstein extends ModelePDFCommandes
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 4, $curX, $curY, $hideref, $hidedesc);
 						$pageposafter = $pdf->getPage();
 						$posyafter = $pdf->GetY();
@@ -450,7 +450,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 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 && empty($showpricebeforepagebreak)) {
@@ -585,7 +585,7 @@ class pdf_einstein extends ModelePDFCommandes
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 65075ab0ba6..d0bc8af2e09 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -454,12 +454,12 @@ class pdf_eratosthene extends ModelePDFCommandes
 							// $this->_pagefoot($pdf,$object,$outputlangs,1);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 						}
 
 						// back to start
 						$pdf->setPage($pageposbeforenote);
-						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 						$pdf->SetFont('', '', $default_font_size - 1);
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 						$pageposafternote = $pdf->getPage();
@@ -473,7 +473,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 							$pdf->setPage($pageposafternote);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 							//$posyafter = $tab_top_newpage;
 						}
 
@@ -495,7 +495,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 							}
 
 							// Add footer
-							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 
 							$i++;
@@ -585,7 +585,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					}
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 					$curYBefore = $curY;
 
@@ -602,7 +602,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 								$pdf->useTemplate($tplidx);
 							}
 							$pdf->setPage($pageposbefore + 1);
-							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 							$curY = $tab_top_newpage;
 							$showpricebeforepagebreak = 0;
 						}
@@ -620,7 +620,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					}
 
 					// restore Page orientation for text
-					$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 					// Description of product line
 					if ($this->getColumnStatus('desc')) {
@@ -631,7 +631,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					$afterPosData = $this->getMaxAfterColsLinePositionsData();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 0, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', false, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description or photo were moved completely on next page
 					if ($afterPosData['page'] > $pageposbefore && (empty($showpricebeforepagebreak) || ($curY + 4) > ($this->page_hauteur - $heightforfooter))) {
@@ -800,7 +800,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				for ($i = $pageposbeforeprintlines; $i <= $drawTabNumbPage; $i++) {
 					$pdf->setPage($i);
 					// reset page orientation each loop to override it if it was changed
-					$pdf->setPageOrientation('', 0, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', false, 0); // The only function to edit the bottom margin of current page to set it.
 
 					$drawTabHideTop = $hidetop;
 					$drawTabTop = $tab_top_newpage;
@@ -833,7 +833,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					$pdf->setPage($i); // in case of _pagefoot or _tableau change it
 
 					// reset page orientation each loop to override it if it was changed by _pagefoot or _tableau change it
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// Don't print head on first page ($pageposbeforeprintlines) because already added previously
 					if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') && $i != $pageposbeforeprintlines) {
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index ea44c428b90..65338574fe0 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -327,7 +327,7 @@ class pdf_strato extends ModelePDFContract
 						$pdf->SetTextColor(0, 0, 0);
 
 						$pdf->setTopMargin($tab_top_newpage);
-						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 						$pageposbefore = $pdf->getPage();
 
 						// Description of product line
@@ -391,7 +391,7 @@ class pdf_strato extends ModelePDFContract
 							$pdf->rollbackTransaction(true);
 							$pageposafter = $pageposbefore;
 							//print $pageposafter.'-'.$pageposbefore;exit;
-							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 							$pdf->writeHTMLCell(0, 0, $curX, $curY, dol_concatdesc($txtpredefinedservice, dol_concatdesc($txt, $desc)), 0, 1, 0);
 							$pageposafter = $pdf->getPage();
 							$posyafter = $pdf->GetY();
@@ -426,7 +426,7 @@ class pdf_strato extends ModelePDFContract
 
 						$pdf->setPage($pageposbefore);
 						$pdf->setTopMargin($this->marge_haute);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 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 && empty($showpricebeforepagebreak)) {
@@ -447,7 +447,7 @@ class pdf_strato extends ModelePDFContract
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 							$pagenb++;
 							$pdf->setPage($pagenb);
-							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 							if (!getDolGlobalString('MAIN_PDF_DONOTREPEAT_HEAD')) {
 								$this->_pagehead($pdf, $object, 0, $outputlangs);
 							}
diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
index 4db4e14fe06..1d7a72a0d6e 100644
--- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
@@ -381,7 +381,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					// Description of product line
@@ -429,7 +429,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 							$pdf->rollbackTransaction(true);
 							$pageposafter = $pageposbefore;
 							//print $pageposafter.'-'.$pageposbefore;exit;
-							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 							pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 4, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
 							$posyafter = $pdf->GetY();
 							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {    // There is no space left for total+free text
@@ -463,7 +463,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 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 && empty($showpricebeforepagebreak)) {
@@ -522,7 +522,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
diff --git a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
index 75249c60d89..b3557520f3f 100644
--- a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
@@ -346,7 +346,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					$pdf->SetTextColor(0, 0, 0);
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					// Description of product line
@@ -361,7 +361,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxcomm - $curX, 4, $curX, $curY, $hideref, $hidedesc);
 						$posyafter = $pdf->GetY();
 						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
@@ -392,7 +392,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 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 && empty($showpricebeforepagebreak)) {
@@ -462,7 +462,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index ec08b9cc21e..f7208018efd 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2014-2015  Marcos García				<marcosgdf@gmail.com>
  * Copyright (C) 2018-2025  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2023 		Charlene Benke				<charlene@patas-monkey.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024	    Nick Fragoulis
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
@@ -418,12 +418,12 @@ class pdf_espadon extends ModelePdfExpedition
 								// $this->_pagefoot($pdf,$object,$outputlangs,1);
 								$pdf->setTopMargin($tab_top_newpage);
 								// The only function to edit the bottom margin of current page to set it.
-								$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+								$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 							}
 
 							// back to start
 							$pdf->setPage($pageposbeforenote);
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 							$pdf->SetFont('', '', $default_font_size - 1);
 							$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 							$pageposafternote = $pdf->getPage();
@@ -437,7 +437,7 @@ class pdf_espadon extends ModelePdfExpedition
 								$pdf->setPage($pageposafternote);
 								$pdf->setTopMargin($tab_top_newpage);
 								// The only function to edit the bottom margin of current page to set it.
-								$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+								$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 								//$posyafter = $tab_top_newpage;
 							}
 
@@ -469,7 +469,7 @@ class pdf_espadon extends ModelePdfExpedition
 								}
 
 								// Add footer
-								$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+								$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 								$this->_pagefoot($pdf, $object, $outputlangs, 1);
 
 								$i++;
@@ -582,7 +582,7 @@ class pdf_espadon extends ModelePdfExpedition
 					}
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					$showpricebeforepagebreak = 1;
@@ -662,7 +662,7 @@ class pdf_espadon extends ModelePdfExpedition
 
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description or photo were moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
@@ -750,7 +750,7 @@ class pdf_espadon extends ModelePdfExpedition
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index 6178f9efc1e..07b721b8038 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -296,7 +296,7 @@ class pdf_merou extends ModelePdfExpedition
 					$pdf->SetTextColor(0, 0, 0);
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					// Description of product line
@@ -306,7 +306,7 @@ class pdf_merou extends ModelePdfExpedition
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 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) {
@@ -354,7 +354,7 @@ class pdf_merou extends ModelePdfExpedition
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 					}
 					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {  // @phan-suppress-current-line PhanUndeclaredProperty
 						if ($pagenb == 1) {
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 1a9c3d34fd0..26b5791fcdf 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -475,7 +475,7 @@ class pdf_rouget extends ModelePdfExpedition
 					}
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					$showpricebeforepagebreak = 1;
@@ -522,7 +522,7 @@ class pdf_rouget extends ModelePdfExpedition
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture - $curX, 3, $curX, $curY, $hideref, $hidedesc);
 
 						$pageposafter = $pdf->getPage();
@@ -559,7 +559,7 @@ class pdf_rouget extends ModelePdfExpedition
 
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description or photo were moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
@@ -635,7 +635,7 @@ class pdf_rouget extends ModelePdfExpedition
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
index d98ea1a7ec4..7cb520f98c4 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
@@ -369,9 +369,9 @@ class pdf_standard_expensereport extends ModeleExpenseReport
 
 					$pdf->setTopMargin($tab_top_newpage);
 					if (empty($showpricebeforepagebreak) && ($i !== ($nblines - 1))) {
-						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 					} else {
-						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					}
 
 					$pageposbefore = $pdf->getPage();
@@ -403,7 +403,7 @@ class pdf_standard_expensereport extends ModeleExpenseReport
 							$pdf->setTopMargin($tab_top_newpage);
 							continue;
 						} else {
-							$pdf->setPageOrientation('', 1, $heightforfooter);
+							$pdf->setPageOrientation('', true, $heightforfooter);
 							$showpricebeforepagebreak = 0;
 						}
 
@@ -442,7 +442,7 @@ class pdf_standard_expensereport extends ModeleExpenseReport
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 					//$nexY+=$nblineFollowComment*($pdf->getFontSize()*1.3);    // Add space between lines
 					$nexY += ($pdf->getFontSize() * 1.3); // Add space between lines
@@ -450,7 +450,7 @@ class pdf_standard_expensereport extends ModeleExpenseReport
 					// Detect if some page were added automatically and output _tableau for past pages
 					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
@@ -459,7 +459,7 @@ class pdf_standard_expensereport extends ModeleExpenseReport
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 1e5d131662b..e2f67b56d65 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -586,7 +586,7 @@ class pdf_crabe extends ModelePDFFactures
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$page_bottom_margin = $heightforfooter + $heightforfreetext + $heightforinfotot + $this->getHeightForQRInvoice($pdf->getPage(), $object, $langs);
-					$pdf->setPageOrientation('', 1, $page_bottom_margin);
+					$pdf->setPageOrientation('', true, $page_bottom_margin);
 					$pageposbefore = $pdf->getPage();
 
 					$showpricebeforepagebreak = 1;
@@ -632,7 +632,7 @@ class pdf_crabe extends ModelePDFFactures
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture - $curX - $progress_width, 3, $curX, $curY, $hideref, $hidedesc);
 						$pageposafter = $pdf->getPage();
 						$posyafter = $pdf->GetY();
@@ -668,7 +668,7 @@ class pdf_crabe extends ModelePDFFactures
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description or photo were moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
@@ -834,7 +834,7 @@ class pdf_crabe extends ModelePDFFactures
 						$this->_pagefoot($pdf, $object, $outputlangs, 1, $this->getHeightForQRInvoice($pagenb, $object, $langs));
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$top_shift = $this->_pagehead($pdf, $object, 0, $outputlangs);
 							$tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index d34c7146710..1ae6c72f67e 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -601,12 +601,12 @@ class pdf_sponge extends ModelePDFFactures
 							}
 							$pdf->setTopMargin($this->tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $this->heightforfooter + $this->heightforfreetext);
+							$pdf->setPageOrientation('', true, $this->heightforfooter + $this->heightforfreetext);
 						}
 
 						// back to start
 						$pdf->setPage($pageposbeforenote);
-						$pdf->setPageOrientation('', 1, $this->heightforfooter + $this->heightforfreetext);
+						$pdf->setPageOrientation('', true, $this->heightforfooter + $this->heightforfreetext);
 						$pdf->SetFont('', '', $default_font_size - 1);
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $this->tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 						$pageposafternote = $pdf->getPage();
@@ -620,7 +620,7 @@ class pdf_sponge extends ModelePDFFactures
 							$pdf->setPage($pageposafternote);
 							$pdf->setTopMargin($this->tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $this->heightforfooter + $this->heightforfreetext);
+							$pdf->setPageOrientation('', true, $this->heightforfooter + $this->heightforfreetext);
 							//$posyafter = $this->tab_top_newpage;
 						}
 
@@ -642,7 +642,7 @@ class pdf_sponge extends ModelePDFFactures
 							}
 
 							// Add footer
-							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 							$this->_pagefoot($pdf, $object, $outputlangs, 1, $this->getHeightForQRInvoice($i, $object, $outputlangs));
 
 							$i++;
@@ -730,7 +730,7 @@ class pdf_sponge extends ModelePDFFactures
 					}
 
 					$pdf->setTopMargin($this->tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $this->heightforfooter);
+					$pdf->setPageOrientation('', true, $this->heightforfooter);
 					$pageposbefore = $pdf->getPage();
 					$curYBefore = $curY;
 
@@ -746,12 +746,12 @@ class pdf_sponge extends ModelePDFFactures
 								$pdf->useTemplate($tplidx);
 							}
 							$pdf->setPage($pageposbefore + 1);
-							$pdf->setPageOrientation('', 1, $this->heightforfooter); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, $this->heightforfooter); // The only function to edit the bottom margin of current page to set it.
 							$curY = $this->tab_top_newpage;
 							$showpricebeforepagebreak = 0;
 						}
 
-						$pdf->setPageOrientation('', 0, $this->heightforfooter + $this->heightforfreetext); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', false, $this->heightforfooter + $this->heightforfreetext); // The only function to edit the bottom margin of current page to set it.
 						// @phan-suppress-next-line PhanTypeMismatchProperty
 						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
 							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY + $imageTopMargin, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
@@ -763,7 +763,7 @@ class pdf_sponge extends ModelePDFFactures
 					}
 
 					// restore Page orientation for text
-					$pdf->setPageOrientation('', 1, $this->heightforfooter); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $this->heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 					// Description of product line
 					if ($this->getColumnStatus('desc')) {
@@ -776,7 +776,7 @@ class pdf_sponge extends ModelePDFFactures
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
 					$curY = $curYBefore;
-					$pdf->setPageOrientation('', 0, $this->heightforfooter); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', false, $this->heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description or photo were moved completely on next page
 					if ($afterPosData['page'] > $pageposbefore && (empty($showpricebeforepagebreak) || ($curY + 4) > ($this->page_hauteur - $this->heightforfooter))) {
@@ -984,7 +984,7 @@ class pdf_sponge extends ModelePDFFactures
 				for ($i = $pageposbeforeprintlines; $i <= $drawTabNumbPage; $i++) {
 					$pdf->setPage($i);
 					// reset page orientation each loop to override it if it was changed
-					$pdf->setPageOrientation('', 0, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', false, 0); // The only function to edit the bottom margin of current page to set it.
 
 					$drawTabHideTop = $hidetop;
 					$drawTabTop = $this->tab_top_newpage;
@@ -1018,7 +1018,7 @@ class pdf_sponge extends ModelePDFFactures
 					$pdf->setPage($i); // in case of _pagefoot or _tableau change it
 
 					// reset page orientation each loop to override it if it was changed by _pagefoot or _tableau change it
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// Don't print head on first page ($pageposbeforeprintlines) because already added previously
 					if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') && $i != $pageposbeforeprintlines) {
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index b46621fd396..b233f9b3ada 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -305,7 +305,7 @@ class pdf_soleil extends ModelePDFFicheinter
 						$pdf->SetTextColor(0, 0, 0);
 
 						$pdf->setTopMargin($tab_top_newpage);
-						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 						$pageposbefore = $pdf->getPage();
 
 						// Description of product line
@@ -331,7 +331,7 @@ class pdf_soleil extends ModelePDFFicheinter
 							$pdf->rollbackTransaction(true);
 							$pageposafter = $pageposbefore;
 							//print $pageposafter.'-'.$pageposbefore;exit;
-							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 							$pdf->writeHTMLCell(0, 0, $curX, $curY, dol_concatdesc($txt, $desc), 0, 1, 0);
 							$pageposafter = $pdf->getPage();
 							$posyafter = $pdf->GetY();
@@ -356,7 +356,7 @@ class pdf_soleil extends ModelePDFFicheinter
 						$pageposafter = $pdf->getPage();
 						$pdf->setPage($pageposbefore);
 						$pdf->setTopMargin($this->marge_haute);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 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) {
@@ -377,7 +377,7 @@ class pdf_soleil extends ModelePDFFicheinter
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 							$pagenb++;
 							$pdf->setPage($pagenb);
-							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 							if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 								$this->_pagehead($pdf, $object, 0, $outputlangs);
 							}
diff --git a/htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php b/htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php
index 9f8a685a31e..58c7961b866 100644
--- a/htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php
+++ b/htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php
@@ -313,9 +313,9 @@ class pdf_standard_evaluation extends ModelePDFEvaluation
 					$pdf->SetTextColor(0, 0, 0);
 
 					if (empty($showmorebeforepagebreak) && ($i !== ($nblines - 1))) {
-						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 					} else {
-						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					}
 
 					$pdf->setTopMargin($tab_top_newpage);
@@ -352,7 +352,7 @@ class pdf_standard_evaluation extends ModelePDFEvaluation
 							$pdf->setTopMargin($tab_top_newpage);
 							continue;
 						} else {
-							$pdf->setPageOrientation('', 1, $heightforfooter);
+							$pdf->setPageOrientation('', true, $heightforfooter);
 							$showmorebeforepagebreak = 0;
 						}
 
@@ -392,7 +392,7 @@ class pdf_standard_evaluation extends ModelePDFEvaluation
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 
 					$nexY += ($pdf->getFontSize() * 1.3); // Add space between lines
@@ -400,7 +400,7 @@ class pdf_standard_evaluation extends ModelePDFEvaluation
 					// Detect if some page were added automatically and output _tableau for past pages
 					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
@@ -409,7 +409,7 @@ class pdf_standard_evaluation extends ModelePDFEvaluation
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
diff --git a/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php b/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
index fcc366eb619..81afde6396b 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
@@ -513,7 +513,7 @@ class pdf_standard_movementstock extends ModelePDFMovement
 						$pdf->SetTextColor(0, 0, 0);
 
 						$pdf->setTopMargin($tab_top_newpage);
-						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 						$pageposbefore = $pdf->getPage();
 
 						// Description of product line
@@ -528,7 +528,7 @@ class pdf_standard_movementstock extends ModelePDFMovement
 							$pdf->rollbackTransaction(true);
 							$pageposafter = $pageposbefore;
 							//print $pageposafter.'-'.$pageposbefore;exit;
-							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 							pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 4, $curX, $curY, $hideref, $hidedesc);
 							$pageposafter = $pdf->getPage();
 							$posyafter = $pdf->GetY();
@@ -563,7 +563,7 @@ class pdf_standard_movementstock extends ModelePDFMovement
 
 						$pdf->setPage($pageposbefore);
 						$pdf->setTopMargin($this->marge_haute);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 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 && empty($showpricebeforepagebreak)) {
@@ -671,7 +671,7 @@ class pdf_standard_movementstock extends ModelePDFMovement
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 							$pagenb++;
 							$pdf->setPage($pagenb);
-							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 							if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 								$this->_pagehead($pdf, $object, 0, $outputlangs);
 							}
diff --git a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
index 276bd535801..5ccdd42956d 100644
--- a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
+++ b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
@@ -315,12 +315,12 @@ class pdf_vinci extends ModelePDFMo
 							// $this->_pagefoot($pdf,$object,$outputlangs,1);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 						}
 
 						// back to start
 						$pdf->setPage($pageposbeforenote);
-						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 						$pdf->SetFont('', '', $default_font_size - 1);
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 						$pageposafternote = $pdf->getPage();
@@ -334,7 +334,7 @@ class pdf_vinci extends ModelePDFMo
 							$pdf->setPage($pageposafternote);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 							//$posyafter = $tab_top_newpage;
 						}
 
@@ -355,7 +355,7 @@ class pdf_vinci extends ModelePDFMo
 							}
 
 							// Add footer
-							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 
 							$i++;
@@ -425,7 +425,7 @@ class pdf_vinci extends ModelePDFMo
 					$prod->fetch($bom->lines[$i]->fk_product);
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					$showpricebeforepagebreak = 1;
@@ -478,7 +478,7 @@ class pdf_vinci extends ModelePDFMo
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 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 && empty($showpricebeforepagebreak)) {
@@ -529,7 +529,7 @@ class pdf_vinci extends ModelePDFMo
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 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 && empty($showpricebeforepagebreak)) {
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 510d123b2f5..049f6b52e83 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2010-2012 Regis Houssin          <regis.houssin@inodbox.com>
  * Copyright (C) 2018      Laurent Destailleur    <eldy@users.sourceforge.net>
- * Copyright (C) 2024	   MDW					  <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					  <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024      Frédéric France        <frederic.france@free.fr>
  * Copyright (C) 2024	    Nick Fragoulis
  *
@@ -299,7 +299,7 @@ class pdf_baleine extends ModelePDFProjects
 					$pdf->SetTextColor(0, 0, 0);
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					// Description of line
@@ -321,7 +321,7 @@ class pdf_baleine extends ModelePDFProjects
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 						// Label
 						$pdf->SetXY($this->posxlabel, $curY);
 						$posybefore = $pdf->GetY();
@@ -353,7 +353,7 @@ class pdf_baleine extends ModelePDFProjects
 							if ($forcedesconsamepage) {
 								$pdf->rollbackTransaction(true);
 								$pageposafter = $pageposbefore;
-								$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+								$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 								$pdf->AddPage('', '', true);
 								if (!empty($tplidx)) {
@@ -367,7 +367,7 @@ class pdf_baleine extends ModelePDFProjects
 								$pdf->MultiCell(0, 3, ''); // Set interline to 3
 								$pdf->SetTextColor(0, 0, 0);
 
-								$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+								$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 								$curY = $tab_top_newpage + $heightoftitleline + 1;
 
 								// Label
@@ -388,7 +388,7 @@ class pdf_baleine extends ModelePDFProjects
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 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 && empty($showpricebeforepagebreak)) {
@@ -439,7 +439,7 @@ class pdf_baleine extends ModelePDFProjects
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 51ba7d63d1d..e19c4457a6b 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2010-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2015-2018  Charlene Benke          <charlie@patas-monkey.com>
  * Copyright (C) 2018       Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2024	    Nick Fragoulis
  *
@@ -517,7 +517,7 @@ class pdf_beluga extends ModelePDFProjects
 								$pdf->SetTextColor(0, 0, 0);
 
 								$pdf->setTopMargin($tab_top_newpage);
-								$pdf->setPageOrientation($this->orientation, 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+								$pdf->setPageOrientation($this->orientation, true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 								$pageposbefore = $pdf->getPage();
 
 								// Description of line
@@ -552,7 +552,7 @@ class pdf_beluga extends ModelePDFProjects
 									$pdf->rollbackTransaction(true);
 									$pageposafter = $pageposbefore;
 									//print $pageposafter.'-'.$pageposbefore;exit;
-									$pdf->setPageOrientation($this->orientation, 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+									$pdf->setPageOrientation($this->orientation, true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 									// Label
 									$pdf->SetXY($this->posxref, $curY);
 									$posybefore = $pdf->GetY();
@@ -584,7 +584,7 @@ class pdf_beluga extends ModelePDFProjects
 										if ($forcedesconsamepage) {
 											$pdf->rollbackTransaction(true);
 											$pageposafter = $pageposbefore;
-											$pdf->setPageOrientation($this->orientation, 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+											$pdf->setPageOrientation($this->orientation, true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 											$pdf->AddPage($this->orientation, '', true);
 											if (!empty($tplidx)) {
@@ -598,7 +598,7 @@ class pdf_beluga extends ModelePDFProjects
 											$pdf->MultiCell(0, 3, ''); // Set interline to 3
 											$pdf->SetTextColor(0, 0, 0);
 
-											$pdf->setPageOrientation($this->orientation, 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+											$pdf->setPageOrientation($this->orientation, true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 											$curY = $tab_top_newpage + $heightoftitleline + 1;
 
 											// Label
@@ -619,7 +619,7 @@ class pdf_beluga extends ModelePDFProjects
 								$pageposafter = $pdf->getPage();
 								$pdf->setPage($pageposbefore);
 								$pdf->setTopMargin($this->marge_haute);
-								$pdf->setPageOrientation($this->orientation, 1, 0); // The only function to edit the bottom margin of current page to set it.
+								$pdf->setPageOrientation($this->orientation, true, 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 && empty($showpricebeforepagebreak)) {
@@ -716,7 +716,7 @@ class pdf_beluga extends ModelePDFProjects
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation($this->orientation, 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation($this->orientation, true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index 630eff6d0e0..8837c2cca7c 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2010-2012 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2024	   MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024      Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2024	    Nick Fragoulis
  *
@@ -298,7 +298,7 @@ class pdf_timespent extends ModelePDFProjects
 					$pdf->SetTextColor(0, 0, 0);
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					// Description of line
@@ -320,7 +320,7 @@ class pdf_timespent extends ModelePDFProjects
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 						// Label
 						$pdf->SetXY($this->posxlabel, $curY);
 						$posybefore = $pdf->GetY();
@@ -352,7 +352,7 @@ class pdf_timespent extends ModelePDFProjects
 							if ($forcedesconsamepage) {
 								$pdf->rollbackTransaction(true);
 								$pageposafter = $pageposbefore;
-								$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+								$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 								$pdf->AddPage('', '', true);
 								if (!empty($tplidx)) {
@@ -366,7 +366,7 @@ class pdf_timespent extends ModelePDFProjects
 								$pdf->MultiCell(0, 3, ''); // Set interline to 3
 								$pdf->SetTextColor(0, 0, 0);
 
-								$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+								$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 								$curY = $tab_top_newpage + $heightoftitleline + 1;
 
 								// Label
@@ -387,7 +387,7 @@ class pdf_timespent extends ModelePDFProjects
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 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 && empty($showpricebeforepagebreak)) {
@@ -437,7 +437,7 @@ class pdf_timespent extends ModelePDFProjects
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 83e348cb0db..a8f99c8ddf7 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -483,7 +483,7 @@ class pdf_azur extends ModelePDFPropales
 					}
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					$showpricebeforepagebreak = 1;
@@ -528,7 +528,7 @@ class pdf_azur extends ModelePDFPropales
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture - $curX, 3, $curX, $curY, $hideref, $hidedesc);
 
 						$pageposafter = $pdf->getPage();
@@ -565,7 +565,7 @@ class pdf_azur extends ModelePDFPropales
 
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description or photo were moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
@@ -704,7 +704,7 @@ class pdf_azur extends ModelePDFPropales
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index f8db0c8030b..eed656eab7b 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -458,12 +458,12 @@ class pdf_cyan extends ModelePDFPropales
 							// $this->_pagefoot($pdf,$object,$outputlangs,1);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 						}
 
 						// back to start
 						$pdf->setPage($pageposbeforenote);
-						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 						$pdf->SetFont('', '', $default_font_size - 1);
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 						$pageposafternote = $pdf->getPage();
@@ -477,7 +477,7 @@ class pdf_cyan extends ModelePDFPropales
 							$pdf->setPage($pageposafternote);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 							//$posyafter = $tab_top_newpage;
 						}
 
@@ -499,7 +499,7 @@ class pdf_cyan extends ModelePDFPropales
 							}
 
 							// Add footer
-							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 
 							$i++;
@@ -587,7 +587,7 @@ class pdf_cyan extends ModelePDFPropales
 					}
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 					$curYBefore = $curY;
 
@@ -605,12 +605,12 @@ class pdf_cyan extends ModelePDFPropales
 								$pdf->useTemplate($tplidx);
 							}
 							$pdf->setPage($pageposbefore + 1);
-							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 							$curY = $tab_top_newpage;
 							$showpricebeforepagebreak = 0;
 						}
 
-						$pdf->setPageOrientation('', 0, $heightforfooter + $heightforfreetext); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', false, $heightforfooter + $heightforfreetext); // The only function to edit the bottom margin of current page to set it.
 						// @phan-suppress-next-line PhanTypeMismatchProperty
 						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
 							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY + $imageTopMargin, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
@@ -622,7 +622,7 @@ class pdf_cyan extends ModelePDFPropales
 					}
 
 					// restore Page orientation for text
-					$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 					if ($this->getColumnStatus('desc')) {
 						$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
@@ -633,7 +633,7 @@ class pdf_cyan extends ModelePDFPropales
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
 					$curY = $curYBefore;
-					$pdf->setPageOrientation('', 0, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', false, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 
 					// We suppose that a too long description or photo were moved completely on next page
@@ -819,7 +819,7 @@ class pdf_cyan extends ModelePDFPropales
 				for ($i = $pageposbeforeprintlines; $i <= $drawTabNumbPage; $i++) {
 					$pdf->setPage($i);
 					// reset page orientation each loop to override it if it was changed
-					$pdf->setPageOrientation('', 0, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', false, 0); // The only function to edit the bottom margin of current page to set it.
 
 					$drawTabHideTop = $hidetop;
 					$drawTabTop = $tab_top_newpage;
@@ -852,7 +852,7 @@ class pdf_cyan extends ModelePDFPropales
 					$pdf->setPage($i); // in case of _pagefoot or _tableau change it
 
 					// reset page orientation each loop to override it if it was changed by _pagefoot or _tableau change it
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// Don't print head on first page ($pageposbeforeprintlines) because already added previously
 					if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') && $i != $pageposbeforeprintlines) {
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 910ba1c1c25..a4ad33d98c1 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -433,7 +433,7 @@ class pdf_squille extends ModelePdfReception
 					}
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					$showpricebeforepagebreak = 1;
@@ -491,7 +491,7 @@ class pdf_squille extends ModelePdfReception
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture - $curX, 3, $curX, $curY, $hideref, $hidedesc);
 
@@ -529,7 +529,7 @@ class pdf_squille extends ModelePdfReception
 
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description or photo were moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
@@ -612,7 +612,7 @@ class pdf_squille extends ModelePdfReception
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!empty($tplidx)) {
 							$pdf->useTemplate($tplidx);
 						}
diff --git a/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php b/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php
index ae2b65bac15..a4e44bad713 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php
@@ -326,7 +326,7 @@ class pdf_standard_stock extends ModelePDFStock
 						$pdf->SetTextColor(0, 0, 0);
 
 						$pdf->setTopMargin($tab_top_newpage);
-						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 						$pageposbefore = $pdf->getPage();
 
 						// Description of product line
@@ -342,7 +342,7 @@ class pdf_standard_stock extends ModelePDFStock
 							$pdf->rollbackTransaction(true);
 							$pageposafter = $pageposbefore;
 							//print $pageposafter.'-'.$pageposbefore;exit;
-							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 							$pdf->writeHTMLCell($this->wref, 4, $curX, $curY, $outputlangs->convToOutputCharset($objp->ref), 0, 1, false, true, 'J', true);
 							//pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 4, $curX, $curY, $hideref, $hidedesc);
 							$pageposafter = $pdf->getPage();
@@ -378,7 +378,7 @@ class pdf_standard_stock extends ModelePDFStock
 
 						$pdf->setPage($pageposbefore);
 						$pdf->setTopMargin($this->marge_haute);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 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 && empty($showpricebeforepagebreak)) {
@@ -456,7 +456,7 @@ class pdf_standard_stock extends ModelePDFStock
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 							$pagenb++;
 							$pdf->setPage($pagenb);
-							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 							if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 								$this->_pagehead($pdf, $object, 0, $outputlangs);
 							}
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
index 75a6f12b163..3d2c7dbb03f 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
@@ -493,7 +493,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 					}
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					$showpricebeforepagebreak = 1;
@@ -557,7 +557,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture - $curX, 3, $curX, $curY, $hideref, $hidedesc);
 
 						$pageposafter = $pdf->getPage();
@@ -594,7 +594,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description or photo were moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
@@ -694,7 +694,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
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 a2c0e496c5c..dadaab85f50 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
@@ -420,12 +420,12 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 							// $this->_pagefoot($pdf,$object,$outputlangs,1);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 						}
 
 						// back to start
 						$pdf->setPage($pageposbeforenote);
-						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 						$pdf->SetFont('', '', $default_font_size - 1);
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 						$pageposafternote = $pdf->getPage();
@@ -439,7 +439,7 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 							$pdf->setPage($pageposafternote);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 							//$posyafter = $tab_top_newpage;
 						}
 
@@ -461,7 +461,7 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 							}
 
 							// Add footer
-							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 
 							$i++;
@@ -533,7 +533,7 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 					}
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 
@@ -583,7 +583,7 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 							$pdf->rollbackTransaction(true);
 							$pageposafter = $pageposbefore;
 							//print $pageposafter.'-'.$pageposbefore;exit;
-							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
 							$pageposafter = $pdf->getPage();
@@ -620,7 +620,7 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 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 && empty($showpricebeforepagebreak)) {
@@ -770,7 +770,7 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
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 8e7219b19f9..3b3d5ecc645 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -375,7 +375,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					//}
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					$showpricebeforepagebreak = 1;
@@ -391,7 +391,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 4, $curX, $curY, $hideref, $hidedesc, 1);
 						$posyafter = $pdf->GetY();
 						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
@@ -423,7 +423,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description or photo were moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
@@ -530,7 +530,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
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 94b6621ecf1..5c2ca83bf27 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -401,12 +401,12 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 							// $this->_pagefoot($pdf,$object,$outputlangs,1);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 						}
 
 						// back to start
 						$pdf->setPage($pageposbeforenote);
-						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 						$pdf->SetFont('', '', $default_font_size - 1);
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 						$pageposafternote = $pdf->getPage();
@@ -420,7 +420,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 							$pdf->setPage($pageposafternote);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 							//$posyafter = $tab_top_newpage;
 						}
 
@@ -442,7 +442,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 							}
 
 							// Add footer
-							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 
 							$i++;
@@ -520,7 +520,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					}
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					$showpricebeforepagebreak = 1;
@@ -599,7 +599,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 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 && empty($showpricebeforepagebreak)) {
@@ -771,7 +771,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
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 9f9ac87007c..86bd5637fd7 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -401,7 +401,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					}
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					$showpricebeforepagebreak = 1;
@@ -452,7 +452,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $descWidth, 3, $curX, $curY, $hideref, $hidedesc, 1);
 						$posyafter = $pdf->GetY();
 						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
@@ -483,7 +483,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 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 && empty($showpricebeforepagebreak)) {
@@ -625,7 +625,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
index a4265fe88e6..797bd8414d8 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
@@ -329,7 +329,7 @@ class pdf_standard_supplierpayment extends ModelePDFSuppliersPayments
 					$pdf->SetTextColor(0, 0, 0);
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					// Description of product line
@@ -344,7 +344,7 @@ class pdf_standard_supplierpayment extends ModelePDFSuppliersPayments
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 						//pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc,1);
 						$pdf->writeHTMLCell($this->posxtva - $curX, 4, $curX, $curY, $object->lines[$i]->datef, 0, 1, false, true, 'J', true);
 						$posyafter = $pdf->GetY();
@@ -376,7 +376,7 @@ class pdf_standard_supplierpayment extends ModelePDFSuppliersPayments
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 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 && empty($showpricebeforepagebreak)) {
@@ -433,7 +433,7 @@ class pdf_standard_supplierpayment extends ModelePDFSuppliersPayments
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
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 e1434cb202e..64acd0ff7c8 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -394,7 +394,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					}
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					$showpricebeforepagebreak = 1;
@@ -445,7 +445,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $descWidth, 3, $curX, $curY, $hideref, $hidedesc, 1);
 
 						$pageposafter = $pdf->getPage();
@@ -481,7 +481,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description or photo were moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
@@ -611,7 +611,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
index ec3d19c9768..2c49a6a51cc 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
@@ -392,12 +392,12 @@ class pdf_zenith extends ModelePDFSupplierProposal
 							// $this->_pagefoot($pdf,$object,$outputlangs,1);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 						}
 
 						// back to start
 						$pdf->setPage($pageposbeforenote);
-						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 						$pdf->SetFont('', '', $default_font_size - 1);
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 						$pageposafternote = $pdf->getPage();
@@ -411,7 +411,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 							$pdf->setPage($pageposafternote);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 							//$posyafter = $tab_top_newpage;
 						}
 
@@ -433,7 +433,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 							}
 
 							// Add footer
-							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 
 							$i++;
@@ -500,7 +500,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 					}
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					$showpricebeforepagebreak = 1;
@@ -577,7 +577,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 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 && empty($showpricebeforepagebreak)) {
@@ -744,7 +744,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index 96fa3b5d001..109149efab0 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -378,12 +378,12 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 							// $this->_pagefoot($pdf,$object,$outputlangs,1);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 						}
 
 						// back to start
 						$pdf->setPage($pageposbeforenote);
-						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 						$pdf->SetFont('', '', $default_font_size - 1);
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 						$pageposafternote = $pdf->getPage();
@@ -397,7 +397,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 							$pdf->setPage($pageposafternote);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 							//$posyafter = $tab_top_newpage;
 						}
 
@@ -419,7 +419,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 							}
 
 							// Add footer
-							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 
 							$i++;
@@ -483,7 +483,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 					$pdf->SetTextColor(0, 0, 0);
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					$showpricebeforepagebreak = 1;
@@ -497,7 +497,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 
 						if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 							$pdf->rollbackTransaction(true);
-							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
@@ -530,7 +530,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description were moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
@@ -562,7 +562,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalString('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}

From e5b1946bc7d7994f990ca496ca6d5377093fa70e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 5 Feb 2025 00:52:48 +0100
Subject: [PATCH 474/602] Qual: Fix arguments types on TCPDF/TCPDI calls

---
 htdocs/core/lib/pdf.lib.php                   | 60 +++++++++----------
 .../action/doc/pdf_standard_actions.class.php |  2 +-
 .../asset/doc/pdf_standard_asset.modules.php  |  2 +-
 .../core/modules/bank/doc/pdf_ban.modules.php |  4 +-
 .../bank/doc/pdf_sepamandate.modules.php      |  2 +-
 .../modules/cheque/doc/pdf_blochet.class.php  |  2 +-
 .../commande/doc/pdf_einstein.modules.php     |  2 +-
 .../commande/doc/pdf_eratosthene.modules.php  |  2 +-
 .../contract/doc/pdf_strato.modules.php       |  2 +-
 .../delivery/doc/pdf_storm.modules.php        |  2 +-
 .../delivery/doc/pdf_typhon.modules.php       |  2 +-
 .../expedition/doc/pdf_espadon.modules.php    |  2 +-
 .../expedition/doc/pdf_merou.modules.php      |  2 +-
 .../expedition/doc/pdf_rouget.modules.php     |  2 +-
 .../pdf_standard_expensereport.modules.php    |  2 +-
 .../modules/facture/doc/pdf_crabe.modules.php |  2 +-
 .../facture/doc/pdf_octopus.modules.php       | 22 +++----
 .../facture/doc/pdf_sponge.modules.php        |  2 +-
 .../fichinter/doc/pdf_soleil.modules.php      |  2 +-
 .../doc/pdf_standard_evaluation.modules.php   |  2 +-
 .../member/doc/pdf_standard_member.class.php  |  4 +-
 .../pdf_standard_movementstock.modules.php    |  2 +-
 .../modules/mrp/doc/pdf_vinci.modules.php     |  2 +-
 .../doc/pdf_standardlabel.class.php           |  4 +-
 .../printsheet/doc/pdf_tcpdflabel.class.php   |  4 +-
 .../product/doc/pdf_standard.modules.php      |  2 +-
 .../project/doc/pdf_baleine.modules.php       |  2 +-
 .../project/doc/pdf_beluga.modules.php        |  2 +-
 .../project/doc/pdf_timespent.modules.php     |  2 +-
 .../modules/propale/doc/pdf_azur.modules.php  |  2 +-
 .../modules/propale/doc/pdf_cyan.modules.php  |  2 +-
 .../modules/rapport/pdf_paiement.class.php    |  2 +-
 .../reception/doc/pdf_squille.modules.php     |  2 +-
 .../stock/doc/pdf_standard_stock.modules.php  |  2 +-
 .../stocktransfer/doc/pdf_eagle.modules.php   |  2 +-
 .../doc/pdf_eagle_proforma.modules.php        |  4 +-
 .../doc/pdf_canelle.modules.php               |  2 +-
 .../supplier_order/doc/pdf_cornas.modules.php |  2 +-
 .../doc/pdf_muscadet.modules.php              |  2 +-
 .../pdf_standard_supplierpayment.modules.php  |  2 +-
 .../doc/pdf_aurore.modules.php                |  2 +-
 .../doc/pdf_zenith.modules.php                |  2 +-
 .../doc/pdf_standard_myobject.modules.php     | 10 ++--
 ...tandard_recruitmentjobposition.modules.php |  2 +-
 44 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 3945810f622..a5d50d8c0bb 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -736,7 +736,7 @@ function pdf_pagehead(&$pdf, $outputlangs, $page_height)
 	if (getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF') && (getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF') != '-1')) {		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
 		$filepath = $conf->mycompany->dir_output.'/logos/' . getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF');
 		if (file_exists($filepath)) {
-			$pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak before adding image
+			$pdf->setAutoPageBreak(false, 0); // Disable auto pagebreak before adding image
 			if (getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF_ALPHA')) {
 				$pdf->SetAlpha(getDolGlobalFloat('MAIN_USE_BACKGROUND_ON_PDF_ALPHA'));
 			} // Option for change opacity of background
@@ -745,7 +745,7 @@ function pdf_pagehead(&$pdf, $outputlangs, $page_height)
 				$pdf->SetAlpha(1);
 			}
 			$pdf->SetPageMark(); // This option avoid to have the images missing on some pages
-			$pdf->SetAutoPageBreak(1, 0); // Restore pagebreak
+			$pdf->setAutoPageBreak(true, 0); // Restore pagebreak
 		}
 	}
 	if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND') && getDolGlobalString('MAIN_ADD_PDF_BACKGROUND') != '-1') {
@@ -825,7 +825,7 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
 
 	// set alpha to semi-transparency
 	$pdf->SetAlpha(0.3);
-	$pdf->Cell($w - 20, 25, $outputlangs->convToOutputCharset($text), "", 2, "C", 0);
+	$pdf->Cell($w - 20, 25, $outputlangs->convToOutputCharset($text), "", 2, "C", false);
 
 	// antirotate
 	$pdf->_out('Q');
@@ -861,7 +861,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 
 	if (empty($onlynumber)) {
 		$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', false);
 		$cury += 4;
 	}
 
@@ -883,7 +883,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 		if (empty($onlynumber)) {
 			$pdf->SetFont('', '', $default_font_size - $diffsizecontent);
 			$pdf->SetXY($curx, $cury);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': '.$outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': '.$outputlangs->convToOutputCharset($account->bank), 0, 'L', false);
 			$cury += 3;
 		}
 
@@ -927,11 +927,11 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 					break;
 				}
 
-				$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($content), 0, 'C', 0);
+				$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($content), 0, 'C', false);
 				$pdf->SetXY($curx, $cury + 1);
 				$curx += $tmplength;
 				$pdf->SetFont('', 'B', $default_font_size - $diffsizecontent);
-				$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities($val), 0, 'C', 0);
+				$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities($val), 0, 'C', false);
 				if (empty($onlynumber)) {
 					$pdf->line($curx, $cury + 1, $curx, $cury + 7);
 				}
@@ -943,12 +943,12 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 	} elseif (!empty($account->number)) {
 		$pdf->SetFont('', 'B', $default_font_size - $diffsizecontent);
 		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': '.$outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': '.$outputlangs->convToOutputCharset($account->bank), 0, 'L', false);
 		$cury += 3;
 
 		$pdf->SetFont('', 'B', $default_font_size - $diffsizecontent);
 		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("BankAccountNumber").': '.$outputlangs->convToOutputCharset($account->number), 0, 'L', 0);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("BankAccountNumber").': '.$outputlangs->convToOutputCharset($account->number), 0, 'L', false);
 		$cury += 3;
 
 		if ($diffsizecontent <= 2) {
@@ -961,7 +961,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 	if (empty($onlynumber) && !empty($account->address)) {
 		$pdf->SetXY($curx, $cury);
 		$val = $outputlangs->transnoentities("Residence").': '.$outputlangs->convToOutputCharset($account->address);
-		$pdf->MultiCell(100, 3, $val, 0, 'L', 0);
+		$pdf->MultiCell(100, 3, $val, 0, 'L', false);
 		//$nboflines=dol_nboflines_bis($val,120);
 		//$cury+=($nboflines*3)+2;
 		$tmpy = $pdf->getStringHeight(100, $val);
@@ -971,7 +971,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 	if (!empty($account->owner_name)) {
 		$pdf->SetXY($curx, $cury);
 		$val = $outputlangs->transnoentities("BankAccountOwner").': '.$outputlangs->convToOutputCharset($account->owner_name);
-		$pdf->MultiCell(100, 3, $val, 0, 'L', 0);
+		$pdf->MultiCell(100, 3, $val, 0, 'L', false);
 		$tmpy = $pdf->getStringHeight(100, $val);
 		$cury += $tmpy;
 	} elseif (!$usedetailedbban) {
@@ -996,14 +996,14 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 
 		$pdf->SetFont('', 'B', $default_font_size - 3);
 		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': '.$ibanDisplay, 0, 'L', 0);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': '.$ibanDisplay, 0, 'L', false);
 		$cury += 3;
 	}
 
 	if (!empty($account->bic)) {
 		$pdf->SetFont('', 'B', $default_font_size - 3);
 		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': '.$outputlangs->convToOutputCharset($account->bic), 0, 'L', 0);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': '.$outputlangs->convToOutputCharset($account->bic), 0, 'L', false);
 	}
 
 	return $pdf->getY();
@@ -1253,25 +1253,25 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 			// Option for footer background color (without freetext zone)
 			if (getDolGlobalString('PDF_FOOTER_BACKGROUND_COLOR')) {
 				list($r, $g, $b) = sscanf($conf->global->PDF_FOOTER_BACKGROUND_COLOR, '%d, %d, %d');
-				$pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak
+				$pdf->setAutoPageBreak(false, 0); // Disable auto pagebreak
 				$pdf->Rect(0, $dims['hk'] - $posy + $freetextheight, $dims['wk'] + 1, $marginwithfooter + 1, 'F', array(), $fill_color = array($r, $g, $b));
-				$pdf->SetAutoPageBreak(1, 0); // Restore pagebreak
+				$pdf->setAutoPageBreak(true, 0); // Restore pagebreak
 			}
 
 			if (getDolGlobalInt('PDF_FREETEXT_DISABLE_PAGEBREAK') === 1) {
-				$pdf->SetAutoPageBreak(0, 0);
+				$pdf->setAutoPageBreak(false, 0);
 			} // Option for disable auto pagebreak
 			if ($line) {	// Free text
 				$pdf->SetXY($dims['lm'], -$posy);
 				if (!getDolGlobalString('PDF_ALLOW_HTML_FOR_FREE_TEXT')) {   // by default
-					$pdf->MultiCell(0, 3, $line, 0, $align, 0);
+					$pdf->MultiCell(0, 3, $line, 0, $align, false);
 				} else {
 					$pdf->writeHTMLCell($dims['wk'] - $dims['lm'] - $dims['rm'], $freetextheight, $dims['lm'], $dims['hk'] - $marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
 				}
 				$posy -= $freetextheight;
 			}
 			if (getDolGlobalInt('PDF_FREETEXT_DISABLE_PAGEBREAK') === 1) {
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 			} // Restore pagebreak
 
 			$pdf->SetY(-$posy);
@@ -1289,11 +1289,11 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 			}
 
 			if (getDolGlobalInt('PDF_FOOTER_DISABLE_PAGEBREAK') === 1) {
-				$pdf->SetAutoPageBreak(0, 0);
+				$pdf->setAutoPageBreak(false, 0);
 			} // Option for disable auto pagebreak
 			$pdf->writeHTMLCell($dims['wk'] - $dims['lm'] - $dims['rm'], $mycustomfooterheight, $dims['lm'], $dims['hk'] - $posy, dol_htmlentitiesbr($mycustomfooter, 1, 'UTF-8', 0));
 			if (getDolGlobalInt('PDF_FOOTER_DISABLE_PAGEBREAK') === 1) {
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 			} // Restore pagebreak
 
 			$posy -= $mycustomfooterheight - 3;
@@ -1305,25 +1305,25 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 			// Option for footer background color (without freetext zone)
 			if (getDolGlobalString('PDF_FOOTER_BACKGROUND_COLOR')) {
 				list($r, $g, $b) = sscanf($conf->global->PDF_FOOTER_BACKGROUND_COLOR, '%d, %d, %d');
-				$pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak
+				$pdf->setAutoPageBreak(false, 0); // Disable auto pagebreak
 				$pdf->Rect(0, $dims['hk'] - $posy + $freetextheight, $dims['wk'] + 1, $marginwithfooter + 1, 'F', array(), $fill_color = array($r, $g, $b));
-				$pdf->SetAutoPageBreak(1, 0); // Restore pagebreak
+				$pdf->setAutoPageBreak(true, 0); // Restore pagebreak
 			}
 
 			if (getDolGlobalInt('PDF_FREETEXT_DISABLE_PAGEBREAK') === 1) {
-				$pdf->SetAutoPageBreak(0, 0);
+				$pdf->setAutoPageBreak(false, 0);
 			} // Option for disable auto pagebreak
 			if ($line) {	// Free text
 				$pdf->SetXY($dims['lm'], -$posy);
 				if (!getDolGlobalString('PDF_ALLOW_HTML_FOR_FREE_TEXT')) {   // by default
-					$pdf->MultiCell(0, 3, $line, 0, $align, 0);
+					$pdf->MultiCell(0, 3, $line, 0, $align, false);
 				} else {
 					$pdf->writeHTMLCell($dims['wk'] - $dims['lm'] - $dims['rm'], $freetextheight, $dims['lm'], $dims['hk'] - $marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
 				}
 				$posy -= $freetextheight;
 			}
 			if (getDolGlobalInt('PDF_FREETEXT_DISABLE_PAGEBREAK') === 1) {
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 			} // Restore pagebreak
 
 			$pdf->SetY(-$posy);
@@ -1345,7 +1345,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 				if (!empty($line1)) {
 					$pdf->SetFont('', 'B', 7);
 					$pdf->SetXY($dims['lm'], -$posy);
-					$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line1, 0, 'C', 0);
+					$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line1, 0, 'C', false);
 					$posy -= 3;
 					$pdf->SetFont('', '', 7);
 				}
@@ -1353,20 +1353,20 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 				if (!empty($line2)) {
 					$pdf->SetFont('', 'B', 7);
 					$pdf->SetXY($dims['lm'], -$posy);
-					$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line2, 0, 'C', 0);
+					$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line2, 0, 'C', false);
 					$posy -= 3;
 					$pdf->SetFont('', '', 7);
 				}
 
 				if (!empty($line3)) {
 					$pdf->SetXY($dims['lm'], -$posy);
-					$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line3, 0, 'C', 0);
+					$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line3, 0, 'C', false);
 				}
 
 				if (!empty($line4)) {
 					$posy -= 3;
 					$pdf->SetXY($dims['lm'], -$posy);
-					$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line4, 0, 'C', 0);
+					$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line4, 0, 'C', false);
 				}
 			}
 		}
@@ -1380,7 +1380,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 	if (in_array(pdf_getPDFFont($outputlangs), array('freemono',  'DejaVuSans'))) {
 		$fontRenderCorrection = 10;
 	}
-	$pdf->MultiCell(18 + $fontRenderCorrection, 2, $pagination, 0, 'R', 0);
+	$pdf->MultiCell(18 + $fontRenderCorrection, 2, $pagination, 0, 'R', false);
 
 	//  Show Draft Watermark
 	if (!empty($watermark)) {
diff --git a/htdocs/core/modules/action/doc/pdf_standard_actions.class.php b/htdocs/core/modules/action/doc/pdf_standard_actions.class.php
index f61d8b09760..3cccf3e808f 100644
--- a/htdocs/core/modules/action/doc/pdf_standard_actions.class.php
+++ b/htdocs/core/modules/action/doc/pdf_standard_actions.class.php
@@ -220,7 +220,7 @@ class pdf_standard_actions
 			$heightforinfotot = 50; // Height reserved to output the info and total part
 			$heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page
 			$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-			$pdf->SetAutoPageBreak(1, 0);
+			$pdf->setAutoPageBreak(true, 0);
 
 			if (class_exists('TCPDF')) {
 				$pdf->setPrintHeader(false);
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 ca4f59699a1..129aeae7262 100644
--- a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
+++ b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
@@ -224,7 +224,7 @@ class pdf_standard_asset extends ModelePDFAsset
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				$heightforinfotot = 50; // Height reserved to output the info and total part and payment part
 				$heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page
diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
index ab5c06aa008..f84c3745f1f 100644
--- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2016 		Laurent Destailleur 		<eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024-2025  Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2024	    Nick Fragoulis
  *
@@ -165,7 +165,7 @@ class pdf_ban extends ModeleBankAccountDoc
 				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index eef507075db..bcda206e9d3 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -197,7 +197,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$this->heightforfooter  += 6;
 				}
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
diff --git a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
index e69f8b24ac8..e41993f16d3 100644
--- a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
@@ -166,7 +166,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 			$heightforfooter += 6;
 		}
-		$pdf->SetAutoPageBreak(1, 0);
+		$pdf->setAutoPageBreak(true, 0);
 
 		if (class_exists('TCPDF')) {
 			$pdf->setPrintHeader(false);
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index c18f93820ce..b824ee320fb 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -258,7 +258,7 @@ class pdf_einstein extends ModelePDFCommandes
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index d0bc8af2e09..4a8c3ce92dc 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -306,7 +306,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 65338574fe0..ce62ec155dc 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -221,7 +221,7 @@ class pdf_strato extends ModelePDFContract
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				$heightforinfotot = 50; // Height reserved to output the info and total part
 				$heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page
diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
index 1d7a72a0d6e..d83e5ff9846 100644
--- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
@@ -242,7 +242,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
diff --git a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
index b3557520f3f..fc627f2e759 100644
--- a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
@@ -218,7 +218,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index f7208018efd..87d07f0e7cc 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -264,7 +264,7 @@ class pdf_espadon extends ModelePdfExpedition
 				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index 07b721b8038..bdc5dacba98 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -216,7 +216,7 @@ class pdf_merou extends ModelePdfExpedition
 				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 26b5791fcdf..b40bdf24cbf 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -295,7 +295,7 @@ class pdf_rouget extends ModelePdfExpedition
 				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
index 7cb520f98c4..002fd83daad 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
@@ -275,7 +275,7 @@ class pdf_standard_expensereport extends ModeleExpenseReport
 					$heightforfooter += 6;
 				}
 
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index e2f67b56d65..8b1f893cb43 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -304,7 +304,7 @@ class pdf_crabe extends ModelePDFFactures
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				$heightforinfotot = 50 + (4 * $nbpayments); // Height reserved to output the info and total part and payment part
 				if ($heightforinfotot > 220) {
diff --git a/htdocs/core/modules/facture/doc/pdf_octopus.modules.php b/htdocs/core/modules/facture/doc/pdf_octopus.modules.php
index e80737f02f5..7c9df706b30 100644
--- a/htdocs/core/modules/facture/doc/pdf_octopus.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_octopus.modules.php
@@ -414,7 +414,7 @@ class pdf_octopus extends ModelePDFFactures
 				$pdf = pdf_getInstance($this->format);
 				//$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
 				$default_font_size = 9;
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				// compute height for situation invoices
 				$this->heightforinfotot = 45;	// Height reserved to output the info and total part and payment part
@@ -672,12 +672,12 @@ class pdf_octopus extends ModelePDFFactures
 							}
 							$pdf->setTopMargin($this->tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $this->heightforfooter + $this->heightforfreetext);
+							$pdf->setPageOrientation('', true, $this->heightforfooter + $this->heightforfreetext);
 						}
 
 						// back to start
 						$pdf->setPage($pageposbeforenote);
-						$pdf->setPageOrientation('', 1, $this->heightforfooter + $this->heightforfreetext);
+						$pdf->setPageOrientation('', true, $this->heightforfooter + $this->heightforfreetext);
 						$pdf->SetFont('', '', $default_font_size - 1);
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $this->tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 						$pageposafternote = $pdf->getPage();
@@ -691,7 +691,7 @@ class pdf_octopus extends ModelePDFFactures
 							$pdf->setPage($pageposafternote);
 							$pdf->setTopMargin($this->tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $this->heightforfooter + $this->heightforfreetext);
+							$pdf->setPageOrientation('', true, $this->heightforfooter + $this->heightforfreetext);
 							//$posyafter = $this->tab_top_newpage;
 						}
 
@@ -713,7 +713,7 @@ class pdf_octopus extends ModelePDFFactures
 							}
 
 							// Add footer
-							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 
 							$i++;
@@ -786,7 +786,7 @@ class pdf_octopus extends ModelePDFFactures
 					}
 
 					$pdf->setTopMargin($this->tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $this->heightforfooter + $this->heightforfreetext + $this->heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $this->heightforfooter + $this->heightforfreetext + $this->heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					$showpricebeforepagebreak = 1;
@@ -830,7 +830,7 @@ class pdf_octopus extends ModelePDFFactures
 						if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 							$pdf->rollbackTransaction(true);
 							$pageposafter = $pageposbefore;
-							$pdf->setPageOrientation('', 1, $this->heightforfooter); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, $this->heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 							$this->printColDescContent($pdf, $posy, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
@@ -865,7 +865,7 @@ class pdf_octopus extends ModelePDFFactures
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description or photo were moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
@@ -1082,7 +1082,7 @@ class pdf_octopus extends ModelePDFFactures
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs, $outputlangsbis);
 						}
@@ -3836,7 +3836,7 @@ class pdf_octopus extends ModelePDFFactures
 					$this->_pagehead($pdf, $object, 0, $outputlangs);
 				}
 				$pdf->setPage($pageposafter + 1);
-				$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+				$pdf->setPageOrientation('', true, 0);	// The only function to edit the bottom margin of current page to set it.
 
 				$posy = $this->tab_top_newpage + 1;
 			} else {
@@ -3868,7 +3868,7 @@ class pdf_octopus extends ModelePDFFactures
 
 		$posy += 10;
 
-		$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+		$pdf->setPageOrientation('', true, 0);	// The only function to edit the bottom margin of current page to set it.
 
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', '', $default_font_size - 1);
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 1ae6c72f67e..52c587e62aa 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -338,7 +338,7 @@ class pdf_sponge extends ModelePDFFactures
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				$this->heightforinfotot = 50 + (4 * $nbpayments); // Height reserved to output the info and total part and payment part
 				$this->heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index b233f9b3ada..3a3b9a4a873 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -199,7 +199,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
diff --git a/htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php b/htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php
index 58c7961b866..482578c3fd2 100644
--- a/htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php
+++ b/htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php
@@ -235,7 +235,7 @@ class pdf_standard_evaluation extends ModelePDFEvaluation
 					$heightforfooter += 6;
 				}
 
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
diff --git a/htdocs/core/modules/member/doc/pdf_standard_member.class.php b/htdocs/core/modules/member/doc/pdf_standard_member.class.php
index 42113bb78cd..a75a1863120 100644
--- a/htdocs/core/modules/member/doc/pdf_standard_member.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard_member.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2006-2013 	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2015 		Francis Appels  		<francis.appels@yahoo.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -419,7 +419,7 @@ class pdf_standard_member extends CommonStickerGenerator
 		}
 
 		$pdf->SetMargins(0, 0);
-		$pdf->SetAutoPageBreak(false);
+		$pdf->setAutoPageBreak(false);
 
 		$this->_Metric_Doc = $this->Tformat['metric'];
 		// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja service
diff --git a/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php b/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
index 81afde6396b..ba5ab15d3de 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
@@ -422,7 +422,7 @@ class pdf_standard_movementstock extends ModelePDFMovement
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page
diff --git a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
index 5ccdd42956d..8dcb13bcfb9 100644
--- a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
+++ b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
@@ -222,7 +222,7 @@ class pdf_vinci extends ModelePDFMo
 				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
index 6e81bbe71df..eed4da190ed 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2002-2003  Jean-Louis Bergamo      <jlb@j1b.org>
  * Copyright (C) 2006-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Francis Appels          <francis.appels@yahoo.com>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -299,7 +299,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 		}
 
 		$pdf->SetMargins(0, 0);
-		$pdf->SetAutoPageBreak(false);
+		$pdf->setAutoPageBreak(false);
 
 		$this->_Metric_Doc = $this->Tformat['metric'];
 		// Enable  printing the label when the page was already started
diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
index 87ac116b2c3..0b2fe4836f9 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2002-2003 Jean-Louis Bergamo	<jlb@j1b.org>
  * Copyright (C) 2006-2013 Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2015 Francis Appels  <francis.appels@yahoo.com>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -335,7 +335,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 		}
 
 		$pdf->SetMargins(0, 0);
-		$pdf->SetAutoPageBreak(false);
+		$pdf->setAutoPageBreak(false);
 
 		$this->_Metric_Doc = $this->Tformat['metric'];
 		// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja service
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index adba3813d90..a90e4c064a9 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -184,7 +184,7 @@ class pdf_standard extends ModelePDFProduct
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 049f6b52e83..8098896a64e 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -199,7 +199,7 @@ class pdf_baleine extends ModelePDFProjects
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index e19c4457a6b..3b5cf8daf32 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -248,7 +248,7 @@ class pdf_beluga extends ModelePDFProjects
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index 8837c2cca7c..70f83aec0e3 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -194,7 +194,7 @@ class pdf_timespent extends ModelePDFProjects
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index a8f99c8ddf7..31effee1731 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -316,7 +316,7 @@ class pdf_azur extends ModelePDFPropales
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index eed656eab7b..9cefefeb228 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -295,7 +295,7 @@ class pdf_cyan extends ModelePDFPropales
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index d0ab88db2a2..0d80927958d 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -377,7 +377,7 @@ class pdf_paiement extends CommonDocGenerator
 
 		// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 		$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
-		$pdf->SetAutoPageBreak(1, 0);
+		$pdf->setAutoPageBreak(true, 0);
 
 		// New page
 		$pdf->AddPage();
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index a4ad33d98c1..88e841dabce 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -253,7 +253,7 @@ class pdf_squille extends ModelePdfReception
 				$heightforinfotot = 8; // Height reserved to output the info and total part
 				$heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
diff --git a/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php b/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php
index a4e44bad713..84966bb0c70 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php
@@ -222,7 +222,7 @@ class pdf_standard_stock extends ModelePDFStock
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
index 3d2c7dbb03f..4413d742a92 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
@@ -311,7 +311,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
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 dadaab85f50..9856be325d4 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
@@ -279,12 +279,12 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs);
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS') ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
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 3b3d5ecc645..a60fc341832 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -234,7 +234,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				$heightforinfotot = 50 + (4 * $nbpayments); // Height reserved to output the info and total part and payment part
 				if ($heightforinfotot > 220) {
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 5c2ca83bf27..2f84cbf3b6c 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -282,7 +282,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
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 86bd5637fd7..1c69f02962b 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -288,7 +288,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
index 797bd8414d8..3b0cb46ba1e 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
@@ -267,7 +267,7 @@ class pdf_standard_supplierpayment extends ModelePDFSuppliersPayments
 				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
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 64acd0ff7c8..150a39553eb 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -278,7 +278,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
index 2c49a6a51cc..814e910b081 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
@@ -275,7 +275,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index 96dfa1b9797..7ac4f25e47e 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -307,7 +307,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 				$pdf = pdf_getInstance($this->format);
 				'@phan-var-force TCPDI|TCPDF $pdf';
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				$heightforinfotot = 50; // Height reserved to output the info and total part and payment part
 				$heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page
@@ -544,7 +544,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 					// }
 
 					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					$showpricebeforepagebreak = 1;
@@ -587,7 +587,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 						if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 							$pdf->rollbackTransaction(true);
 							$pageposafter = $pageposbefore;
-							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
@@ -623,7 +623,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 					// We suppose that a too long description or photo were moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
@@ -752,7 +752,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index 109149efab0..d7859da8565 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -257,7 +257,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-				$pdf->SetAutoPageBreak(1, 0);
+				$pdf->setAutoPageBreak(true, 0);
 
 				$heightforinfotot = 50; // Height reserved to output the info and total part and payment part
 				$heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page

From bb4ae71c750eee5ae34f285b4e2bb7df7968e479 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 5 Feb 2025 00:54:54 +0100
Subject: [PATCH 475/602] Qual: New fixers for phan

---
 dev/tools/phan/config_fixer.php               |  22 ++-
 dev/tools/phan/plugins/CellFixer.php          | 185 ++++++++++++++++++
 dev/tools/phan/plugins/MultiCellFixer.php     | 185 ++++++++++++++++++
 .../phan/plugins/setAutoPageBreakFixer.php    | 185 ++++++++++++++++++
 .../phan/plugins/setPageOrientationFixer.php  |  43 ++--
 5 files changed, 593 insertions(+), 27 deletions(-)
 create mode 100644 dev/tools/phan/plugins/CellFixer.php
 create mode 100644 dev/tools/phan/plugins/MultiCellFixer.php
 create mode 100644 dev/tools/phan/plugins/setAutoPageBreakFixer.php

diff --git a/dev/tools/phan/config_fixer.php b/dev/tools/phan/config_fixer.php
index b290e5ef5c7..8f5df967bca 100644
--- a/dev/tools/phan/config_fixer.php
+++ b/dev/tools/phan/config_fixer.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+/* Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  */
 
@@ -9,30 +9,40 @@
 $config = include __DIR__.DIRECTORY_SEPARATOR."config.php";
 
 
+// Note: When more than one fixer is attached to the same Notice, only the last fix is applied.
 //require_once __DIR__.'/plugins/DeprecatedModuleNameFixer.php';
 //require_once __DIR__.'/plugins/PriceFormFixer.php';
 //require_once __DIR__.'/plugins/UrlEncodeStringifyFixer.php';
-require_once __DIR__.'/plugins/SelectDateFixer.php';
+//require_once __DIR__.'/plugins/SelectDateFixer.php';
+require_once __DIR__.'/plugins/setPageOrientationFixer.php';
+//require_once __DIR__.'/plugins/MultiCellFixer.php';
+//require_once __DIR__.'/plugins/setAutoPageBreakFixer.php';
+//require_once __DIR__.'/plugins/CellFixer.php';
 
 //$deprecatedModuleNameRegex = '/^(?!(?:'.implode('|', array_keys($DEPRECATED_MODULE_MAPPING)).')$).*/';
 
-require_once __DIR__.'/plugins/DeprecatedModuleNameFixer.php';
+//require_once __DIR__.'/plugins/DeprecatedModuleNameFixer.php';
 
 $config['exclude_file_regex'] = '@^('  // @phpstan-ignore-line
 		.'dummy'  // @phpstan-ignore-line
+		//.'|(?!htdocs/modulebuilderrtemplate/core/modules/mymodule/doc/pdf_standard_myobject.modules.php).*'  // Only this file for test @php-stan-ignore-line
+		.'|htdocs/custom/.*'  // Ignore all custom modules @phpstan-ignore-line
 		.'|htdocs/.*/canvas/.*/tpl/.*.tpl.php'  // @phpstan-ignore-line
 		.'|htdocs/admin/tools/ui/.*'  // @phpstan-ignore-line
 		//.'|htdocs/modulebuilder/template/.*'  // @phpstan-ignore-line
+		// Included as stub (better analysis)
+		.'|htdocs/includes/nusoap/.*'  // @phpstan-ignore-line
 		// Included as stub (old version + incompatible typing hints)
 		.'|htdocs/includes/restler/.*'  // @phpstan-ignore-line
-		// Included as stub (did not seem properly analysed by phan without it)
+		// Included as stub (did not seem properly analyzed by phan without it)
 		.'|htdocs/includes/stripe/.*'  // @phpstan-ignore-line
 		.'|htdocs/conf/conf.php'  // @phpstan-ignore-line
-		//.'|htdocs/[^c][^o][^r][^e][^/].*'  // For testing @phpstan-ignore-line
-		//.'|htdocs/[^h].*' // For testing on restricted set @phpstan-ignore-line
+		//.'|htdocs/[^mi](?!.*(pdf_|tcpdf)).*\.php'  // @phpstan-ignore-line
+		//.'|htdocs/(?!.*modules.*(pdf_|pdf.lib)).*\.php'  // @phpstan-ignore-line
 		.')@';  // @phpstan-ignore-line
 
 // $config['plugins'][] = __DIR__.'/plugins/ParamMatchRegexPlugin.php';
+$config['plugins'] = [];
 $config['plugins'][] = 'DeprecateAliasPlugin';
 // $config['plugins'][] = __DIR__.'/plugins/GetPostFixerPlugin.php';
 // $config['plugins'][] = 'PHPDocToRealTypesPlugin';
diff --git a/dev/tools/phan/plugins/CellFixer.php b/dev/tools/phan/plugins/CellFixer.php
new file mode 100644
index 00000000000..bb49d415b47
--- /dev/null
+++ b/dev/tools/phan/plugins/CellFixer.php
@@ -0,0 +1,185 @@
+<?php
+/* Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
+ *
+ * For 'price()', replace $form parameter that is '' with 0.
+ */
+
+declare(strict_types=1);
+
+use ast\flags;
+use Microsoft\PhpParser\Node\Expression\CallExpression;
+use Microsoft\PhpParser\Node\QualifiedName;
+use Phan\AST\TolerantASTConverter\NodeUtils;
+use Phan\CodeBase;
+use Phan\IssueInstance;
+use Phan\Library\FileCacheEntry;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEdit;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEditSet;
+use Phan\Plugin\Internal\IssueFixingPlugin\IssueFixer;
+use Microsoft\PhpParser\Node\Expression\ArgumentExpression;
+use Microsoft\PhpParser\Node\DelimitedList\ArgumentExpressionList;
+use Microsoft\PhpParser\Node\StringLiteral;
+use Microsoft\PhpParser\Node\NumericLiteral;
+use Microsoft\PhpParser\Node\ReservedWord;
+use Microsoft\PhpParser\Token;
+
+/**
+ * This is a prototype, there are various features it does not implement.
+ */
+
+call_user_func(static function (): void {
+	/**
+	 * @param $code_base @unused-param
+	 * @return ?FileEditSet a representation of the edit to make to replace a call to a function alias with a call to the original function
+	 */
+	$fix = static function (CodeBase $code_base, FileCacheEntry $contents, IssueInstance $instance): ?FileEditSet {
+
+		// Argument {INDEX} (${PARAMETER}) is {CODE} of type {TYPE}{DETAILS} but
+		// {FUNCTIONLIKE} takes {TYPE}{DETAILS} defined at {FILE}:{LINE} (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+
+		//htdocs\supplier_proposal\card.php:1705 PhanTypeMismatchArgumentProbablyReal Argument 3 ($h) is '' of type '' but \Form::selectDate() takes int (no real type) defined at htdocs\core\class\html.form.class.php:6799 (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+		//htdocs\supplier_proposal\card.php:1705 PhanTypeMismatchArgumentProbablyReal Argument 4 ($m) is '' of type '' but \Form::selectDate() takes int (no real type) defined at htdocs\core\class\html.form.class.php:6799 (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+		// var_dump($instance->getTemplateParameters());
+		$argument_index = (string) $instance->getTemplateParameters()[0];
+		$argument_name = (string) $instance->getTemplateParameters()[1];
+		$argument_code = (string) $instance->getTemplateParameters()[2];
+		$argument_type = (string) $instance->getTemplateParameters()[3];
+		$functionlike = (string) $instance->getTemplateParameters()[4];
+		$functiontype = (string) $instance->getTemplateParameters()[5];
+
+		$expected_functionlike = "\\TCPDI::Cell()";
+		$expected_functionlike2 = "\\TCPDF::Cell()";
+		$expected_name = "Cell";
+		if ($functionlike !== $expected_functionlike
+			&& $functionlike !== $expected_functionlike2) {
+			print "$functionlike != '$expected_functionlike'|'$expected_functionlike2".PHP_EOL;
+			return null;
+		}
+
+		$toBoolReplaceArray = array("0" => "false","1" => "true");
+		// Check if we fix any of this
+		if (
+			($argument_name === 'fill' && in_array($argument_code, array_keys($toBoolReplaceArray)))
+			//|| ($argument_name === 'm' && $argument_code === "''")
+			//|| ($argument_name === 'empty' && $argument_code === "''")
+		) {
+			$replacement = $toBoolReplaceArray[$argument_code];
+			$argIdx = ($argument_index - 1) * 2;
+			$expectedStringValue = $argument_code;
+		} else {
+			print "ARG$argument_index:$argument_name CODE:$argument_name".PHP_EOL;
+			return null;
+		}
+
+		// At this point we established that the notification
+		// matches some we fix.
+
+		$line = $instance->getLine();
+
+		$edits = [];
+		foreach ($contents->getNodesAtLine($line) as $node) {
+			if (!$node instanceof ArgumentExpressionList) {
+				continue;
+			}
+			$arguments = $node->children;
+			if (count($arguments) <= $argIdx) {
+				print "Arg Count is ".count($arguments)." - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			$is_actual_call = $node->parent instanceof CallExpression;
+			if (!$is_actual_call) {
+				print "Not actual call - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			print "Actual call - $instance".PHP_EOL;
+			$callable = $node->parent;
+
+			$callableExpression = $callable->callableExpression;
+
+			if ($callableExpression instanceof Microsoft\PhpParser\Node\QualifiedName) {
+				$actual_name = $callableExpression->getResolvedName();
+			} elseif ($callableExpression instanceof Microsoft\PhpParser\Node\Expression\MemberAccessExpression) {
+				$memberNameToken = $callableExpression->memberName;
+				$actual_name = (new NodeUtils($contents->getContents()))->tokenToString($memberNameToken);
+			} else {
+				print "Callable expression is ".get_class($callableExpression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			if ((string) $actual_name !== (string) $expected_name) {
+				// print "Name unexpected '$actual_name'!='$expected_name' - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			foreach ($arguments as $i => $argument) {
+				if ($argument instanceof ArgumentExpression) {
+					print "Type$i: ".get_class($argument->expression).PHP_EOL;
+				}
+			}
+
+			$fieldValue = null;
+
+
+			$arg = $arguments[$argIdx];
+
+			if (
+				$arg instanceof ArgumentExpression
+				// && $arg->expression instanceof StringLiteral
+				&& $arg->expression instanceof NumericLiteral
+			) {
+				// Get the value of the NumericLiteral
+				$fieldValue = (string) $arg->expression;
+				print "Number is '$fieldValue'".PHP_EOL;
+				/*
+				// Get the string value of the StringLiteral
+				$fieldValue = $arg->expression->getStringContentsText();
+				print "String is '$fieldValue'".PHP_EOL;
+				*/
+			} elseif ($arg instanceof ArgumentExpression && $arg->expression instanceof ReservedWord) {
+				$child = $arg->expression->children;
+				if (!$child instanceof Token) {
+					continue;
+				}
+				$token_str = (new NodeUtils($contents->getContents()))->tokenToString($child);
+				print "$token_str KIND:".($child->kind ?? 'no kind')." ".get_class($child).PHP_EOL;
+
+				if ($token_str !== 'null') {
+					continue;
+				}
+
+				$fieldValue = '';  // Fake empty
+			} else {
+				print "Expression is not expected type ".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			if ($fieldValue !== $expectedStringValue) {
+				print "Not replacing $argument_name which is '$fieldValue'/".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			print "Fixture elem on $line - $actual_name(...'$fieldValue'...) - $instance".PHP_EOL;
+
+
+
+			// Get the first argument (delimiter)
+			$argument_to_replace = $arg;
+
+			$arg_start_pos = $argument_to_replace->getStartPosition();
+			$arg_end_pos = $argument_to_replace->getEndPosition();
+
+			// Set edit instruction
+			$edits[] = new FileEdit($arg_start_pos, $arg_end_pos, $replacement);
+		}
+		if ($edits) {
+			return new FileEditSet($edits);
+		}
+		return null;
+	};
+	IssueFixer::registerFixerClosure(
+		'PhanTypeMismatchArgument',
+		$fix
+	);
+});
diff --git a/dev/tools/phan/plugins/MultiCellFixer.php b/dev/tools/phan/plugins/MultiCellFixer.php
new file mode 100644
index 00000000000..e126d0c622e
--- /dev/null
+++ b/dev/tools/phan/plugins/MultiCellFixer.php
@@ -0,0 +1,185 @@
+<?php
+/* Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
+ *
+ * For 'price()', replace $form parameter that is '' with 0.
+ */
+
+declare(strict_types=1);
+
+use ast\flags;
+use Microsoft\PhpParser\Node\Expression\CallExpression;
+use Microsoft\PhpParser\Node\QualifiedName;
+use Phan\AST\TolerantASTConverter\NodeUtils;
+use Phan\CodeBase;
+use Phan\IssueInstance;
+use Phan\Library\FileCacheEntry;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEdit;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEditSet;
+use Phan\Plugin\Internal\IssueFixingPlugin\IssueFixer;
+use Microsoft\PhpParser\Node\Expression\ArgumentExpression;
+use Microsoft\PhpParser\Node\DelimitedList\ArgumentExpressionList;
+use Microsoft\PhpParser\Node\StringLiteral;
+use Microsoft\PhpParser\Node\NumericLiteral;
+use Microsoft\PhpParser\Node\ReservedWord;
+use Microsoft\PhpParser\Token;
+
+/**
+ * This is a prototype, there are various features it does not implement.
+ */
+
+call_user_func(static function (): void {
+	/**
+	 * @param $code_base @unused-param
+	 * @return ?FileEditSet a representation of the edit to make to replace a call to a function alias with a call to the original function
+	 */
+	$fix = static function (CodeBase $code_base, FileCacheEntry $contents, IssueInstance $instance): ?FileEditSet {
+
+		// Argument {INDEX} (${PARAMETER}) is {CODE} of type {TYPE}{DETAILS} but
+		// {FUNCTIONLIKE} takes {TYPE}{DETAILS} defined at {FILE}:{LINE} (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+
+		//htdocs\supplier_proposal\card.php:1705 PhanTypeMismatchArgumentProbablyReal Argument 3 ($h) is '' of type '' but \Form::selectDate() takes int (no real type) defined at htdocs\core\class\html.form.class.php:6799 (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+		//htdocs\supplier_proposal\card.php:1705 PhanTypeMismatchArgumentProbablyReal Argument 4 ($m) is '' of type '' but \Form::selectDate() takes int (no real type) defined at htdocs\core\class\html.form.class.php:6799 (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+		// var_dump($instance->getTemplateParameters());
+		$argument_index = (string) $instance->getTemplateParameters()[0];
+		$argument_name = (string) $instance->getTemplateParameters()[1];
+		$argument_code = (string) $instance->getTemplateParameters()[2];
+		$argument_type = (string) $instance->getTemplateParameters()[3];
+		$functionlike = (string) $instance->getTemplateParameters()[4];
+		$functiontype = (string) $instance->getTemplateParameters()[5];
+
+		$expected_functionlike = "\\TCPDI::MultiCell()";
+		$expected_functionlike2 = "\\TCPDF::MultiCell()";
+		$expected_name = "MultiCell";
+		if ($functionlike !== $expected_functionlike
+			&& $functionlike !== $expected_functionlike2) {
+			print "$functionlike != '$expected_functionlike'|'$expected_functionlike2".PHP_EOL;
+			return null;
+		}
+
+		$toBoolReplaceArray = array("0" => "false","1" => "true");
+		// Check if we fix any of this
+		if (
+			($argument_name === 'fill' && in_array($argument_code, array_keys($toBoolReplaceArray)))
+			//|| ($argument_name === 'm' && $argument_code === "''")
+			//|| ($argument_name === 'empty' && $argument_code === "''")
+		) {
+			$replacement = $toBoolReplaceArray[$argument_code];
+			$argIdx = ($argument_index - 1) * 2;
+			$expectedStringValue = $argument_code;
+		} else {
+			print "ARG$argument_index:$argument_name CODE:$argument_name".PHP_EOL;
+			return null;
+		}
+
+		// At this point we established that the notification
+		// matches some we fix.
+
+		$line = $instance->getLine();
+
+		$edits = [];
+		foreach ($contents->getNodesAtLine($line) as $node) {
+			if (!$node instanceof ArgumentExpressionList) {
+				continue;
+			}
+			$arguments = $node->children;
+			if (count($arguments) <= $argIdx) {
+				print "Arg Count is ".count($arguments)." - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			$is_actual_call = $node->parent instanceof CallExpression;
+			if (!$is_actual_call) {
+				print "Not actual call - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			print "Actual call - $instance".PHP_EOL;
+			$callable = $node->parent;
+
+			$callableExpression = $callable->callableExpression;
+
+			if ($callableExpression instanceof Microsoft\PhpParser\Node\QualifiedName) {
+				$actual_name = $callableExpression->getResolvedName();
+			} elseif ($callableExpression instanceof Microsoft\PhpParser\Node\Expression\MemberAccessExpression) {
+				$memberNameToken = $callableExpression->memberName;
+				$actual_name = (new NodeUtils($contents->getContents()))->tokenToString($memberNameToken);
+			} else {
+				print "Callable expression is ".get_class($callableExpression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			if ((string) $actual_name !== (string) $expected_name) {
+				// print "Name unexpected '$actual_name'!='$expected_name' - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			foreach ($arguments as $i => $argument) {
+				if ($argument instanceof ArgumentExpression) {
+					print "Type$i: ".get_class($argument->expression).PHP_EOL;
+				}
+			}
+
+			$fieldValue = null;
+
+
+			$arg = $arguments[$argIdx];
+
+			if (
+				$arg instanceof ArgumentExpression
+				// && $arg->expression instanceof StringLiteral
+				&& $arg->expression instanceof NumericLiteral
+			) {
+				// Get the value of the NumericLiteral
+				$fieldValue = (string) $arg->expression;
+				print "Number is '$fieldValue'".PHP_EOL;
+				/*
+				// Get the string value of the StringLiteral
+				$fieldValue = $arg->expression->getStringContentsText();
+				print "String is '$fieldValue'".PHP_EOL;
+				*/
+			} elseif ($arg instanceof ArgumentExpression && $arg->expression instanceof ReservedWord) {
+				$child = $arg->expression->children;
+				if (!$child instanceof Token) {
+					continue;
+				}
+				$token_str = (new NodeUtils($contents->getContents()))->tokenToString($child);
+				print "$token_str KIND:".($child->kind ?? 'no kind')." ".get_class($child).PHP_EOL;
+
+				if ($token_str !== 'null') {
+					continue;
+				}
+
+				$fieldValue = '';  // Fake empty
+			} else {
+				print "Expression is not expected type ".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			if ($fieldValue !== $expectedStringValue) {
+				print "Not replacing $argument_name which is '$fieldValue'/".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			print "Fixture elem on $line - $actual_name(...'$fieldValue'...) - $instance".PHP_EOL;
+
+
+
+			// Get the first argument (delimiter)
+			$argument_to_replace = $arg;
+
+			$arg_start_pos = $argument_to_replace->getStartPosition();
+			$arg_end_pos = $argument_to_replace->getEndPosition();
+
+			// Set edit instruction
+			$edits[] = new FileEdit($arg_start_pos, $arg_end_pos, $replacement);
+		}
+		if ($edits) {
+			return new FileEditSet($edits);
+		}
+		return null;
+	};
+	IssueFixer::registerFixerClosure(
+		'PhanTypeMismatchArgument',
+		$fix
+	);
+});
diff --git a/dev/tools/phan/plugins/setAutoPageBreakFixer.php b/dev/tools/phan/plugins/setAutoPageBreakFixer.php
new file mode 100644
index 00000000000..2d0c0ba11a7
--- /dev/null
+++ b/dev/tools/phan/plugins/setAutoPageBreakFixer.php
@@ -0,0 +1,185 @@
+<?php
+/* Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
+ *
+ * For 'price()', replace $form parameter that is '' with 0.
+ */
+
+declare(strict_types=1);
+
+use ast\flags;
+use Microsoft\PhpParser\Node\Expression\CallExpression;
+use Microsoft\PhpParser\Node\QualifiedName;
+use Phan\AST\TolerantASTConverter\NodeUtils;
+use Phan\CodeBase;
+use Phan\IssueInstance;
+use Phan\Library\FileCacheEntry;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEdit;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEditSet;
+use Phan\Plugin\Internal\IssueFixingPlugin\IssueFixer;
+use Microsoft\PhpParser\Node\Expression\ArgumentExpression;
+use Microsoft\PhpParser\Node\DelimitedList\ArgumentExpressionList;
+use Microsoft\PhpParser\Node\StringLiteral;
+use Microsoft\PhpParser\Node\NumericLiteral;
+use Microsoft\PhpParser\Node\ReservedWord;
+use Microsoft\PhpParser\Token;
+
+/**
+ * This is a prototype, there are various features it does not implement.
+ */
+
+call_user_func(static function (): void {
+	/**
+	 * @param $code_base @unused-param
+	 * @return ?FileEditSet a representation of the edit to make to replace a call to a function alias with a call to the original function
+	 */
+	$fix = static function (CodeBase $code_base, FileCacheEntry $contents, IssueInstance $instance): ?FileEditSet {
+
+		// Argument {INDEX} (${PARAMETER}) is {CODE} of type {TYPE}{DETAILS} but
+		// {FUNCTIONLIKE} takes {TYPE}{DETAILS} defined at {FILE}:{LINE} (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+
+		//htdocs\supplier_proposal\card.php:1705 PhanTypeMismatchArgumentProbablyReal Argument 3 ($h) is '' of type '' but \Form::selectDate() takes int (no real type) defined at htdocs\core\class\html.form.class.php:6799 (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+		//htdocs\supplier_proposal\card.php:1705 PhanTypeMismatchArgumentProbablyReal Argument 4 ($m) is '' of type '' but \Form::selectDate() takes int (no real type) defined at htdocs\core\class\html.form.class.php:6799 (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+		// var_dump($instance->getTemplateParameters());
+		$argument_index = (string) $instance->getTemplateParameters()[0];
+		$argument_name = (string) $instance->getTemplateParameters()[1];
+		$argument_code = (string) $instance->getTemplateParameters()[2];
+		$argument_type = (string) $instance->getTemplateParameters()[3];
+		$functionlike = (string) $instance->getTemplateParameters()[4];
+		$functiontype = (string) $instance->getTemplateParameters()[5];
+
+		$expected_functionlike = "\\TCPDI::setAutoPageBreak()";
+		$expected_functionlike2 = "\\TCPDF::setAutoPageBreak()";
+		$expected_name = "setAutoPageBreak";
+		if ($functionlike !== $expected_functionlike
+			&& $functionlike !== $expected_functionlike2) {
+			//print "$functionlike != '$expected_functionlike'|'$expected_functionlike2".PHP_EOL;
+			return null;
+		}
+
+		$toBoolReplaceArray = array("0" => "false","1" => "true");
+		// Check if we fix any of this
+		if (
+			($argument_name === 'auto' && in_array($argument_code, array_keys($toBoolReplaceArray)))
+			//|| ($argument_name === 'm' && $argument_code === "''")
+			//|| ($argument_name === 'empty' && $argument_code === "''")
+		) {
+			$replacement = $toBoolReplaceArray[$argument_code];
+			$argIdx = ($argument_index - 1) * 2;
+			$expectedStringValue = $argument_code;
+		} else {
+			//print "ARG$argument_index:$argument_name CODE:$argument_name".PHP_EOL;
+			return null;
+		}
+
+		// At this point we established that the notification
+		// matches some we fix.
+
+		$line = $instance->getLine();
+
+		$edits = [];
+		foreach ($contents->getNodesAtLine($line) as $node) {
+			if (!$node instanceof ArgumentExpressionList) {
+				continue;
+			}
+			$arguments = $node->children;
+			if (count($arguments) <= $argIdx) {
+				// print "Arg Count is ".count($arguments)." - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			$is_actual_call = $node->parent instanceof CallExpression;
+			if (!$is_actual_call) {
+				//print "Not actual call - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			//print "Actual call - $instance".PHP_EOL;
+			$callable = $node->parent;
+
+			$callableExpression = $callable->callableExpression;
+
+			if ($callableExpression instanceof Microsoft\PhpParser\Node\QualifiedName) {
+				$actual_name = $callableExpression->getResolvedName();
+			} elseif ($callableExpression instanceof Microsoft\PhpParser\Node\Expression\MemberAccessExpression) {
+				$memberNameToken = $callableExpression->memberName;
+				$actual_name = (new NodeUtils($contents->getContents()))->tokenToString($memberNameToken);
+			} else {
+				//print "Callable expression is ".get_class($callableExpression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			if ((string) $actual_name !== (string) $expected_name) {
+				print "Name unexpected '$actual_name'!='$expected_name' - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			foreach ($arguments as $i => $argument) {
+				if ($argument instanceof ArgumentExpression) {
+					//print "Type$i: ".get_class($argument->expression).PHP_EOL;
+				}
+			}
+
+			$fieldValue = null;
+
+
+			$arg = $arguments[$argIdx];
+
+			if (
+				$arg instanceof ArgumentExpression
+				// && $arg->expression instanceof StringLiteral
+				&& $arg->expression instanceof NumericLiteral
+			) {
+				// Get the value of the NumericLiteral
+				$fieldValue = (string) $arg->expression;
+				print "Number is '$fieldValue'".PHP_EOL;
+				/*
+				// Get the string value of the StringLiteral
+				$fieldValue = $arg->expression->getStringContentsText();
+				print "String is '$fieldValue'".PHP_EOL;
+				*/
+			} elseif ($arg instanceof ArgumentExpression && $arg->expression instanceof ReservedWord) {
+				$child = $arg->expression->children;
+				if (!$child instanceof Token) {
+					continue;
+				}
+				$token_str = (new NodeUtils($contents->getContents()))->tokenToString($child);
+				print "$token_str KIND:".($child->kind ?? 'no kind')." ".get_class($child).PHP_EOL;
+
+				if ($token_str !== 'null') {
+					continue;
+				}
+
+				$fieldValue = '';  // Fake empty
+			} else {
+				print "Expression is not expected type ".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			if ($fieldValue !== $expectedStringValue) {
+				print "Not replacing '$argument_name' which is '$fieldValue'/".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			print "Fixture elem on $line - $actual_name(...'$fieldValue'...) - $instance".PHP_EOL;
+
+
+
+			// Get the first argument (delimiter)
+			$argument_to_replace = $arg;
+
+			$arg_start_pos = $argument_to_replace->getStartPosition();
+			$arg_end_pos = $argument_to_replace->getEndPosition();
+
+			// Set edit instruction
+			$edits[] = new FileEdit($arg_start_pos, $arg_end_pos, $replacement);
+		}
+		if ($edits) {
+			return new FileEditSet($edits);
+		}
+		return null;
+	};
+	IssueFixer::registerFixerClosure(
+		'PhanTypeMismatchArgument',
+		$fix
+	);
+});
diff --git a/dev/tools/phan/plugins/setPageOrientationFixer.php b/dev/tools/phan/plugins/setPageOrientationFixer.php
index 657241ca155..09658fe6d23 100644
--- a/dev/tools/phan/plugins/setPageOrientationFixer.php
+++ b/dev/tools/phan/plugins/setPageOrientationFixer.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+/* Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  *
  * For 'price()', replace $form parameter that is '' with 0.
  */
@@ -19,6 +19,7 @@ use Phan\Plugin\Internal\IssueFixingPlugin\IssueFixer;
 use Microsoft\PhpParser\Node\Expression\ArgumentExpression;
 use Microsoft\PhpParser\Node\DelimitedList\ArgumentExpressionList;
 use Microsoft\PhpParser\Node\StringLiteral;
+use Microsoft\PhpParser\Node\NumericLiteral;
 use Microsoft\PhpParser\Node\ReservedWord;
 use Microsoft\PhpParser\Token;
 
@@ -38,31 +39,31 @@ call_user_func(static function (): void {
 
 		//htdocs\supplier_proposal\card.php:1705 PhanTypeMismatchArgumentProbablyReal Argument 3 ($h) is '' of type '' but \Form::selectDate() takes int (no real type) defined at htdocs\core\class\html.form.class.php:6799 (the inferred real argument type has nothing in common with the parameter's phpdoc type)
 		//htdocs\supplier_proposal\card.php:1705 PhanTypeMismatchArgumentProbablyReal Argument 4 ($m) is '' of type '' but \Form::selectDate() takes int (no real type) defined at htdocs\core\class\html.form.class.php:6799 (the inferred real argument type has nothing in common with the parameter's phpdoc type)
-
+		// var_dump($instance->getTemplateParameters());
 		$argument_index = (string) $instance->getTemplateParameters()[0];
 		$argument_name = (string) $instance->getTemplateParameters()[1];
 		$argument_code = (string) $instance->getTemplateParameters()[2];
 		$argument_type = (string) $instance->getTemplateParameters()[3];
-		$details = (string) $instance->getTemplateParameters()[4];
-		$functionlike = (string) $instance->getTemplateParameters()[5];
+		$functionlike = (string) $instance->getTemplateParameters()[4];
+		$functiontype = (string) $instance->getTemplateParameters()[5];
 
-		$expected_functionlike = "\\TCPDI::setPageOrientation()";
+		$expected_functionlike = "\\TCPDF::setPageOrientation()";
 		$expected_name = "setPageOrientation";
 		if ($functionlike !== $expected_functionlike) {
-			print "$functionlike != '$expected_functionlike'".PHP_EOL;
+			//print "$functionlike != '$expected_functionlike'".PHP_EOL;
 			return null;
 		}
 
-		$toBoolReplaceArray=array("0"=>"false","1"=>"true");
+		$toBoolReplaceArray = array("0" => "false","1" => "true");
 		// Check if we fix any of this
 		if (
-			($argument_name === 'argument_name' && in_array($argument_code, array_keys($toBoolReplaceArray)))
+			($argument_name === 'autopagebreak' && in_array($argument_code, array_keys($toBoolReplaceArray)))
 			//|| ($argument_name === 'm' && $argument_code === "''")
 			//|| ($argument_name === 'empty' && $argument_code === "''")
 		) {
-			$replacement = $toBoolReplaceArray[$argument_name];
+			$replacement = $toBoolReplaceArray[$argument_code];
 			$argIdx = ($argument_index - 1) * 2;
-			$expectedStringValue = "";
+			$expectedStringValue = $argument_code;
 		} else {
 			print "ARG$argument_index:$argument_name CODE:$argument_name".PHP_EOL;
 			return null;
@@ -112,22 +113,22 @@ call_user_func(static function (): void {
 
 			foreach ($arguments as $i => $argument) {
 				if ($argument instanceof ArgumentExpression) {
-					print "Type$i: ".get_class($argument->expression).PHP_EOL;
+					// print "Type$i: ".get_class($argument->expression).PHP_EOL;
 				}
 			}
 
-			$stringValue = null;
+			$fieldValue = null;
 
 
 			$arg = $arguments[$argIdx];
 
 			if (
 				$arg instanceof ArgumentExpression
-				&& $arg->expression instanceof StringLiteral
+				&& $arg->expression instanceof NumericLiteral
 			) {
-				// Get the string value of the StringLiteral
-				$stringValue = $arg->expression->getStringContentsText();
-				print "String is '$stringValue'".PHP_EOL;
+				// Get the string value of the NumericLiteral
+				$fieldValue = (string) $arg->expression;
+				//print "Field is '$fieldValue'".PHP_EOL;
 			} elseif ($arg instanceof ArgumentExpression && $arg->expression instanceof ReservedWord) {
 				$child = $arg->expression->children;
 				if (!$child instanceof Token) {
@@ -140,18 +141,18 @@ call_user_func(static function (): void {
 					continue;
 				}
 
-				$stringValue = '';  // Fake empty
+				$fieldValue = '';  // Fake empty
 			} else {
-				print "Expression is not string or null ".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
+				// print "Expression is not expected type ".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
 				continue;
 			}
 
-			if ($stringValue !== $expectedStringValue) {
-				print "Not replacing $argument_name which is '$stringValue'/".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
+			if ($fieldValue !== $expectedStringValue) {
+				// print "Not replacing '$argument_name' which is '$fieldValue'/".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
 				continue;
 			}
 
-			print "Fixture elem on $line - $actual_name(...'$stringValue'...) - $instance".PHP_EOL;
+			print "Fixture elem on $line - $actual_name(...'$fieldValue'...) - $instance".PHP_EOL;
 
 
 

From 3c39df33f55f3a037e3bb7bf4fdd5964221e9349 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 5 Feb 2025 01:38:23 +0100
Subject: [PATCH 476/602] Qual: Update phan baseline

---
 dev/tools/phan/baseline.txt | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 1c639a11b22..47f28a257ba 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,7 +9,7 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 3540+ occurrences
+    // PhanTypeMismatchArgument : 2570+ occurrences
     // PhanUndeclaredProperty : 530+ occurrences
     // PhanTypeMismatchArgumentNullable : 450+ occurrences
     // PhanUndeclaredGlobalVariable : 190+ occurrences
@@ -412,12 +412,9 @@ return [
         'htdocs/core/login/functions_dolibarr.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/login/functions_ldap.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/core/menus/standard/auguria.lib.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/action/doc/pdf_standard_actions.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/modules/asset/mod_asset_advanced.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/bank/doc/pdf_ban.modules.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/barcode/mod_barcode_product_standard.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php' => ['PhanTypeMismatchArgument'],
@@ -483,33 +480,28 @@ return [
         'htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/product/doc/pdf_standard.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/project/doc/pdf_baleine.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/project/doc/pdf_beluga.modules.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/project/doc/pdf_timespent.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/project/doc/pdf_timespent.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/propale/doc/pdf_azur.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/propale/doc/pdf_cyan.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/rapport/pdf_paiement.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/reception/doc/pdf_squille.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/societe/doc/doc_generic_odt.modules.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/stock/doc/pdf_standard_stock.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchProperty'],
+        'htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchProperty'],
         'htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanPluginDuplicateArrayKey'],
         'htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php' => ['PhanTypeMismatchArgument'],
@@ -817,7 +809,7 @@ return [
         'htdocs/recruitment/class/recruitmentcandidature.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/recruitment/class/recruitmentjobposition.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/recruitment/index.php' => ['PhanUndeclaredGlobalVariable'],

From 14f3ee6cc09835e018d063b5121072198ec4a04c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 03:04:11 +0100
Subject: [PATCH 477/602] Update ChangeLog

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 44bf9938e38..c8f9e8bb857 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1216,7 +1216,7 @@ NEW: updating for display Help title when try to delete Don (issue  #25314)
 NEW: Upgrade in module builder in menu section
 NEW: use account address in sepa mandate (#23642)
 NEW: VAT rate - Add entity
-NEW: When an user unset the batch management of products, transformation of each batch stock mouvement in global stock mouvement
+NEW: When an user unset the batch management of products, transformation of each batch stock movement in global stock movement
 NEW: PDF Generation for each Human Resource Evaluations.
 
 SEC: #25512 applicative anti bruteforce - security on too many login attempts (#25520)

From e1ff669ca5121a0a723087073f6c334b86196fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 5 Feb 2025 08:50:45 +0100
Subject: [PATCH 478/602] fix translations

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

diff --git a/htdocs/langs/fr_CA/website.lang b/htdocs/langs/fr_CA/website.lang
index 589f08c1dd9..be642d35a98 100644
--- a/htdocs/langs/fr_CA/website.lang
+++ b/htdocs/langs/fr_CA/website.lang
@@ -50,7 +50,7 @@ NoPageYet=Pas encore de pages
 YouCanCreatePageOrImportTemplate=Vous pouvez créer une nouvelle page ou importer un modèle de site Web complet
 SyntaxHelp=Aide sur des astuces de syntaxe spécifiques
 YouCanEditHtmlSourceckeditor=Vous pouvez modifier le code source HTML en utilisant le bouton « Source » dans l'éditeur.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Vous pouvez inclure du code PHP dans cette source en utilisant les balises <strong>&lt;?php ?&gt;</strong>. Les variables globales suivantes sont disponibles : $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> Vous pouvez également inclure le contenu d'une autre page/conteneur avec la syntaxe suivante :<br><strong>&lt;?php includeContainer('alias_du_conteneur_à_inclure'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> Vous pouvez créer une redirection vers une autre page/conteneur avec la syntaxe suivante (Remarque : n'affichez aucun contenu avant une redirection) :<br><strong>&lt;?php redirectToContainer('alias_du_conteneur_vers_la_rediriger'); ?&gt;</strong><br>Vous pouvez également effectuer une redirection avec des paramètres GET :<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> Pour ajouter un lien vers une autre page, utilisez la syntaxe :<br><strong>&lt;a href="alias_de_la_page_à_lier_à.php"&gt;monlien&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> Vous pouvez définir dynamiquement le titre de la page et les <strong>balises méta SEO</strong> (titre, mots-clés, description). Définissez simplement les variables suivantes :<br> <code>$__PAGE__TITLE__ = "Valeur du titre …";</code><br> <code>$__PAGE__KEYWORDS__ = "mot-clé1, mot-clé2, mot-clé3 …"; // Séparé par des virgules</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> À inclure un <strong>lien pour télécharger</strong> un fichier stocké dans le répertoire <strong>documents</strong>, utilisez le wrapper <strong>document.php</strong> :<br>Exemple, pour un fichier dans documents/ecm (à enregistrer), la syntaxe est :<br> class='notranslate'><br></span><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Pour un fichier dans documents/medias (répertoire ouvert pour accès public), la syntaxe est :<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Pour un fichier partagé avec un lien de partage (accès ouvert à l'aide de la clé de hachage de partage du fichier), la syntaxe est :<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong>b0342f ccfda19bz0
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Vous pouvez inclure du code PHP dans cette source en utilisant les balises <strong>&lt;?php ?&gt;</strong>. Les variables globales suivantes sont disponibles : $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> Vous pouvez également inclure le contenu d'une autre page/conteneur avec la syntaxe suivante :<br><strong>&lt;?php includeContainer('alias_du_conteneur_à_inclure'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> Vous pouvez créer une redirection vers une autre page/conteneur avec la syntaxe suivante (Remarque : n'affichez aucun contenu avant une redirection) :<br><strong>&lt;?php redirectToContainer('alias_du_conteneur_vers_la_rediriger'); ?&gt;</strong><br>Vous pouvez également effectuer une redirection avec des paramètres GET :<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> Pour ajouter un lien vers une autre page, utilisez la syntaxe :<br><strong>&lt;a href="alias_de_la_page_à_lier_à.php"&gt;monlien&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> Vous pouvez définir dynamiquement le titre de la page et les <strong>balises méta SEO</strong> (titre, mots-clés, description). Définissez simplement les variables suivantes :<br> <code>$__PAGE__TITLE__ = "Valeur du titre …";</code><br> <code>$__PAGE__KEYWORDS__ = "mot-clé1, mot-clé2, mot-clé3 …"; // Séparé par des virgules</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> À inclure un <strong>lien pour télécharger</strong> un fichier stocké dans le répertoire <strong>documents</strong>, utilisez le wrapper <strong>document.php</strong> :<br>Exemple, pour un fichier dans documents/ecm (à enregistrer), la syntaxe est :<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Pour un fichier dans documents/medias (répertoire ouvert pour accès public), la syntaxe est :<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Pour un fichier partagé avec un lien de partage (accès ouvert à l'aide de la clé de hachage de partage du fichier), la syntaxe est :<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong>b0342f ccfda19bz0
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Pour inclure une <strong>image</strong> stockée dans le répertoire <strong>medias</strong> (répertoire ouvert au public), utilisez le chemin relatif commençant par <strong>/medias</strong>, exemple :<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
 YouCanEditHtmlSource2=Pour une image partagée avec un lien de partage (accès libre à l'aide de la clé de hachage de partage du fichier), utilisez le wrapper :<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=Pour obtenir l'URL de l'image d'un objet PHP, utilisez<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index 423aefb5ee8..106bb9eb483 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -62,7 +62,7 @@ NoPageYet=Pas de page pour l'instant
 YouCanCreatePageOrImportTemplate=Vous pouvez créer une nouvelle page ou importer un modèle de site Web complet.
 SyntaxHelp=Aide sur quelques astuces spécifiques de syntaxe
 YouCanEditHtmlSourceckeditor=Vous pouvez éditer le code source en activant l'éditeur HTML avec le bouton "Source".
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Vous pouvez inclure du code PHP dans cette source en utilisant les tags <strong>&lt;?php ?&gt;</strong>. Les variables globales suivantes sont disponibles : $conf, $db, $mysoc, $utilisateur, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> Vous pouvez également inclure du contenu d'une autre page/conteneur avec la syntaxe suivante :<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> Vous pouvez effectuer une redirection vers une autre page/conteneur avec la syntaxe suivante (Remarque : ne génère aucun contenu avant une redirection) :<br><strong>&lt;?php redirectToContainer(' alias_of_container_to_redirect_to'); ?&gt;</strong><br>Vous pouvez également effectuer une redirection avec les paramètres GET :<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> Pour ajouter un lien vers une autre page, utilisez la syntaxe :<br><strong>&lt;a href="alias_of_page_to_link_to.php" &gt;monlien&lt;a&gt;</strong> <br><br><span class="fa fa-download paddingright"></span> Pour inclure un<strong> lien pour télécharger</strong> un fichier stocké dans le répertoire <strong>documents</strong>, utilisez l'encapsuleur <strong> document.php</strong> :<br>Exemple, pour un fichier dans documents/ecm (besoin d'être loggué), la syntaxe est :<br><strong>&lt;a href="/document.php?modulepart=ecm&fichier= [relative_dir/]filename.ext"&gt;</strong><br>Pour un fichier dans des documents/médias (répertoire ouvert en accès public), la syntaxe est:<br><strong>&lt;a href="/document.php?modulepart=medias&fichier=[relative_dir/]filename.ext"&gt;</strong><br>Pour un fichier partagé avec un lien de partage (accès ouvert en utilisant la clé de  partage de fichier), la syntaxe est:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Vous pouvez inclure du code PHP dans cette source en utilisant les tags <strong>&lt;?php ?&gt;</strong>. Les variables globales suivantes sont disponibles : $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> Vous pouvez également inclure du contenu d'une autre page/conteneur avec la syntaxe suivante :<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> Vous pouvez effectuer une redirection vers une autre page/conteneur avec la syntaxe suivante (Remarque : ne génère aucun contenu avant une redirection) :<br><strong>&lt;?php redirectToContainer(' alias_of_container_to_redirect_to'); ?&gt;</strong><br>Vous pouvez également effectuer une redirection avec les paramètres GET :<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> Pour ajouter un lien vers une autre page, utilisez la syntaxe :<br><strong>&lt;a href="alias_of_page_to_link_to.php" &gt;monlien&lt;a&gt;</strong> <br><br><span class="fa fa-download paddingright"></span> Pour inclure un<strong> lien pour télécharger</strong> un fichier stocké dans le répertoire <strong>documents</strong>, utilisez l'encapsuleur <strong> document.php</strong> :<br>Exemple, pour un fichier dans documents/ecm (besoin d'être loggué), la syntaxe est :<br><strong>&lt;a href="/document.php?modulepart=ecm&fichier= [relative_dir/]filename.ext"&gt;</strong><br>Pour un fichier dans des documents/médias (répertoire ouvert en accès public), la syntaxe est:<br><strong>&lt;a href="/document.php?modulepart=medias&fichier=[relative_dir/]filename.ext"&gt;</strong><br>Pour un fichier partagé avec un lien de partage (accès ouvert en utilisant la clé de  partage de fichier), la syntaxe est:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Pour inclure une <strong>image</strong> stockée dans le répertoire <strong>medias</strong> (répertoire ouvert au public), utilisez le chemin relatif commençant par <strong>/medias</strong>, exemple:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
 YouCanEditHtmlSource2=Pour une image partagée avec un lien de partage (accès libre à l'aide de la clé de partage de fichier), utilisez l'encapsuleur :<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=Pour obtenir l'adresse URL de l'image d'un objet PHP, utilisez<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>

From e6e79fde1f3381ac111b83f86b66649ad2d0c0d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 5 Feb 2025 09:00:24 +0100
Subject: [PATCH 479/602] fix translations admin

---
 dev/translation/ignore_translation_keys.lst | 2 --
 htdocs/langs/en_US/admin.lang               | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst
index edb528c90de..34e7a95595f 100644
--- a/dev/translation/ignore_translation_keys.lst
+++ b/dev/translation/ignore_translation_keys.lst
@@ -428,7 +428,6 @@ FeatureNotAvailableWithThisDatabaseDriver
 FieldNotFoundInObject
 FieldsEdit
 FieldsInsert
-FieldsLinked
 FieldsView
 File encoding
 FileDidAlreadyExist
@@ -1097,7 +1096,6 @@ PDF/A-1b
 PDF/A-3b
 PartnershipSentByEMail
 PdfTitle
-Privileges
 ProcessingError
 PurchaseOrder
 PurchaseOrders
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 4166884bdf2..58a95356419 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2608,3 +2608,5 @@ PdfAddTermOfSaleHelp=You can upload the terms and conditions of sale file at the
 WarningOnlineSignature=Please note that this function allows a person (customer, supplier...) to insert, online, the image of his signature in the PDF document. As for a handwritten signature, such a signature can be made by anyone and might not have the same legal value as a legal electronic signature system going through an authorized trusted third party. If you need this level of security, you can contact an integrator for more information or check for addons on www.dolistore.org.
 UploadExtensionRestriction=List of forbidden file extensions to upload
 UploadExtensionRestrictionExemple=htm, html, shtml, js, php
+Privileges=Privileges
+FieldsLinked=Fields Linked

From 51353339cff780c6800bb5b78628d563c7c2b4e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 5 Feb 2025 09:23:36 +0100
Subject: [PATCH 480/602] fix translations modulebuilder

---
 dev/translation/ignore_translation_keys.lst | 3 ---
 htdocs/langs/en_US/modulebuilder.lang       | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst
index 34e7a95595f..a75b4fa5975 100644
--- a/dev/translation/ignore_translation_keys.lst
+++ b/dev/translation/ignore_translation_keys.lst
@@ -426,9 +426,6 @@ FailedtoSetToApprove
 FailedtoSetToDeny
 FeatureNotAvailableWithThisDatabaseDriver
 FieldNotFoundInObject
-FieldsEdit
-FieldsInsert
-FieldsView
 File encoding
 FileDidAlreadyExist
 FileIsNotCorrect
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 5a8117149c7..82256006853 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -190,3 +190,6 @@ EmailingSelectorFile=Emails selector file
 NoEmailingSelector=No emails selector file
 ModuleTranslatedIntoLangForKeyInto=Translated into a .lang file for key %s into "%s"
 PageLinkedByAMenuEntry=Page linked by at least one menu entry
+FieldsEdit=Fields edit
+FieldsInsert=Fields insert
+FieldsView=Fields view

From 7f53089663ab910f489b4cd7cbef2bd8ef4b83e7 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 10:42:16 +0100
Subject: [PATCH 481/602] Fix better way to use filter on cover

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

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index c243285abe2..ae13e84ebe6 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -1080,11 +1080,11 @@ function getNbOfImagePublicURLOfObject($object)
  * @param	Object	$object			Object
  * @param	int		$no				Numero of image (if there is several images. 1st one by default)
  * @param   string  $extName        Extension to differentiate thumb file name ('', '_small', '_mini')
- * @param	int		$cover			1=Add a filter on field "cover", 0=Exclude "cover" images, -1=No filter
+ * @param	int		$cover			1=Sort with cover then position, -1=Filter on cover last then position, 0=Exclude cover and filter on position first
  * @return  string					HTML img content or '' if no image found
  * @see getNbOfImagePublicURLOfObject(), getPublicFilesOfObject(), getImageFromHtmlContent()
  */
-function getImagePublicURLOfObject($object, $no = 1, $extName = '', $cover = -1)
+function getImagePublicURLOfObject($object, $no = 1, $extName = '', $cover = 1)
 {
 	global $db;
 
@@ -1099,8 +1099,12 @@ function getImagePublicURLOfObject($object, $no = 1, $extName = '', $cover = -1)
 	$sql .= " WHERE entity IN (".getEntity($object->element).")";
 	$sql .= " AND src_object_type = '".$db->escape($object->element)."' AND src_object_id = ".((int) $object->id);	// Filter on object
 	$sql .= " AND ".$db->regexpsql('filename', $regexforimg, 1);
-	$sql .= ($cover >= 0 ? " AND cover = ".((int) $cover) : "");
-	$sql .= $db->order("cover,position,rowid", "ASC,ASC,ASC");
+	$sql .= ($cover ? "" : " AND cover <> 1");
+	if ($cover == 1) {
+		$sql .= $db->order("cover,position,rowid", "ASC,ASC,ASC");
+	} else {
+		$sql .= $db->order("cover,position,rowid", "DESC,ASC,ASC");
+	}
 
 	$resql = $db->query($sql);
 	if ($resql) {

From ca5c511bb6613780c71205e3f315c5456d9d2e14 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 11:17:40 +0100
Subject: [PATCH 482/602] Fix warning

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

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 9df8ba6334f..f1e44a4476f 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -961,10 +961,10 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 				$filename .= '_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid")));
 			}
 		}
-		if ($year) {
+		if (!empty($year)) {
 			$filename .= '_'.$year;
 		}
-		if ($month) {
+		if (!empty($month)) {
 			$filename .= '_'.$month;
 		}
 		if ($pagecount) {

From bbbba45fc1d87c3c438226e2c22e814c8d280b7b Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Wed, 5 Feb 2025 11:19:36 +0100
Subject: [PATCH 483/602] FIX wrong message on update shipment

---
 htdocs/expedition/dispatch.php   | 2 +-
 htdocs/langs/en_US/sendings.lang | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/expedition/dispatch.php b/htdocs/expedition/dispatch.php
index bf7b23b21d3..fd9f2f7f1b9 100644
--- a/htdocs/expedition/dispatch.php
+++ b/htdocs/expedition/dispatch.php
@@ -342,7 +342,7 @@ if ($action == 'updatelines' && $usercancreate) {
 		setEventMessages($error, $errors, 'errors');
 	} else {
 		$db->commit();
-		setEventMessages($langs->trans("ReceptionUpdated"), null);
+		setEventMessages($langs->trans("ShipmentUpdated"), null);
 
 		header("Location: ".DOL_URL_ROOT.'/expedition/dispatch.php?id='.$object->id);
 		exit;
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index b3fc779dd2f..87975084a50 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -63,6 +63,7 @@ NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. C
 WeightVolShort=Weight/Vol.
 ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
+ShipmentUpdated=Shipment successfully updated
 
 # Sending methods
 # ModelDocument

From 27d5eada7a40d292277a1ef476e7b4732792a5b1 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 11:36:44 +0100
Subject: [PATCH 484/602] Fix translation

---
 htdocs/langs/en_US/website.lang                        | 5 ++++-
 htdocs/website/index.php                               | 3 +++
 htdocs/website/samples/page-sample-dynamiccontent.html | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 212147881ff..bc3cb7f6bc3 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -62,7 +62,10 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><p><span class="fa fa-bug paddingright"></span> You can dynamically set the page title and <strong>SEO meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE__TITLE__ = "Title value …";</code><br> <code>$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE__DESC__ = "Description …";</code></p><br><span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug paddingright"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>You can also make a redirection with GET parameters:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?&gt;</strong><br><br><span class="fa fa-link paddingright"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br>
+YouCanEditHtmlSourceb=<span class="fa fa-bug paddingright"></span> You can dynamically set <strong>SEO title and meta tags</strong> (title, keywords, description). Simply define the following variables:<br> <code>$__PAGE_TITLE__ = "Title value …";</code><br> <code>$__PAGE_KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated</code><br> <code>$__PAGE_DESC__ = "Description …";</code><br>
+YouCanEditHtmlSourcec=<span class="fa fa-download paddingright"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSourced=For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
 YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index f4c758417a7..baec057484e 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3788,6 +3788,9 @@ if (!GETPOST('hide_websitemenu')) {
 
 			$htmltext = '<small>';
 			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSource", $url);
+			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSourceb", $url);
+			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSourcec", $url);
+			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSourced", $url);
 			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSource1", $url);
 			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSource2", $url);
 			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSource3", $url);
diff --git a/htdocs/website/samples/page-sample-dynamiccontent.html b/htdocs/website/samples/page-sample-dynamiccontent.html
index d66e04cfd01..2f33407960a 100644
--- a/htdocs/website/samples/page-sample-dynamiccontent.html
+++ b/htdocs/website/samples/page-sample-dynamiccontent.html
@@ -38,6 +38,9 @@ __(AnotherContainer)__
 <section id="div5" style="text-align: center" contenteditable="true">
 <br><br>
 __(YouCanEditHtmlSource)__
+__(YouCanEditHtmlSourceb)__
+__(YouCanEditHtmlSourcec)__
+__(YouCanEditHtmlSourced)__
 <br><br>
 Page created by __WEBSITE_CREATED_BY__
 <br>

From 01bda57d3a79dfae91bf24795dee220859986157 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 11:51:27 +0100
Subject: [PATCH 485/602] Fix translation

---
 htdocs/langs/ca_ES/website.lang | 6 +++---
 htdocs/langs/da_DK/website.lang | 6 +++---
 htdocs/langs/lv_LV/website.lang | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index 6c11449aed0..b496eaf6e50 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -62,11 +62,11 @@ NoPageYet=Encara sense pàgines
 YouCanCreatePageOrImportTemplate=Podeu crear una pàgina nova o importar una plantilla completa del lloc web
 SyntaxHelp=Ajuda sobre consells de sintaxi específica
 YouCanEditHtmlSourceckeditor=Podeu editar el codi font HTML usant el botó "Codi font" a l'editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Podeu incloure codi PHP en aquesta font utilitzant les etiquetes <strong>&lt;?php ?&gt;b70f65fc09 /span>. Les variables globals següents estan disponibles: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<span class='notranslate'><br><br><span class="fa fa-bug paddingright"></span> També podeu incloure contingut d'una altra pàgina/contenidor amb la sintaxi següent:<br> span><span class='notranslate'><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br>b0342fc9bz0<span> /span><span class='notranslate'><span class="fa fa-bug paddingright"></span> Podeu fer una redirecció a una altra pàgina/contenidor amb la sintaxi següent (Nota: no envieu cap contingut abans d'una redirecció) :<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>També podeu fer una redirecció amb els paràmetres GET: <br><strong>&lt;?php redirectToContainer('alias_to', 'redirect,_0_to', 'redirectTo' 0, $array_of_get_params); ?&gt;</strong><br>b0342fc9bz0<span> /span><span class='notranslate'><span class="fa fa-link paddingright"></span> Per afegir un enllaç a una altra pàgina, utilitzeu la sintaxi:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink<0 class='notranslate'>&lt;</span>a&gt;</strong>b0319bzcc</strong>b0319bzcc ><br><p><span class="fa fa-bug paddingright">b014d7f165b Podeu configurar dinàmicament el títol de la pàgina i <span class='notranslate'><strong>Metaetiquetes de SEO</strong> (títol, paraules clau, descripció). Simplement definiu les variables següents:<br> <code>$__PAGE__TITLE__ = "Valor del títol...";b1z08a8b77 <br> <code>$__PAGE__KEYWORDS__ = "paraula clau1, paraula clau2, paraula clau3..."; // Separat per comes</code><br> <code>$___PAGE =Descripció ;</code></p><br>b0d9a138z0<br>b0d9a138 <span class='notranslate'></span> Per incloure un <strong>enllaç per baixar</strong> un fitxer emmagatzemat al  class='notranslate'><strong>documents</strong>, utilitzeu el directori <strong>document.php</strong> wrapper:<br>Exemple, per a un fitxer en documents/ecm (cal registrar-se), la sintaxi és:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Per a un fitxer en documents o mitjans (directori obert per a l'accés públic), la sintaxi és: <br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Per a un fitxer compartit amb un enllaç compartit (accés obert mitjançant la clau hash per compartir del fitxer), la sintaxi és:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt; </strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Per incloure un <strong>imatge</strong> emmagatzemat als <strong>mitjans de comunicació<span directori class='notranslate'></strong></span> (directori obert per a l'accés públic), utilitzeu el camí relatiu que comença per <strong>/mediasb0a65dc071f , exemple:<br><strong>&lt;img src="/medias/image/myimagepath/filename ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Podeu incloure codi PHP en aquesta font utilitzant les etiquetes <strong>&lt;?php ?&gt;b70f65fc09 /span>. Les variables globals següents estan disponibles: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<span><br><br><span class="fa fa-bug paddingright"></span> També podeu incloure contingut d'una altra pàgina/contenidor amb la sintaxi següent:<br> span><span class='notranslate'><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br>b0342fc9bz0<span> /span><span class='notranslate'><span class="fa fa-bug paddingright"></span> Podeu fer una redirecció a una altra pàgina/contenidor amb la sintaxi següent (Nota: no envieu cap contingut abans d'una redirecció) :<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>També podeu fer una redirecció amb els paràmetres GET: <br><strong>&lt;?php redirectToContainer('alias_to', 'redirect,_0_to', 'redirectTo' 0, $array_of_get_params); ?&gt;</strong><br>b0342fc9bz0<span> /span><span class='notranslate'><span class="fa fa-link paddingright"></span> Per afegir un enllaç a una altra pàgina, utilitzeu la sintaxi:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink<0 class='notranslate'>&lt;</span>a&gt;</strong>b0319bzcc</strong>b0319bzcc ><br><p><span class="fa fa-bug paddingright">b014d7f165b Podeu configurar dinàmicament el títol de la pàgina i <span class='notranslate'><strong>Metaetiquetes de SEO</strong> (títol, paraules clau, descripció). Simplement definiu les variables següents:<br> <code>$__PAGE__TITLE__ = "Valor del títol...";b1z08a8b77 <br> <code>$__PAGE__KEYWORDS__ = "paraula clau1, paraula clau2, paraula clau3..."; // Separat per comes</code><br> <code>$___PAGE =Descripció ;</code></p><br>b0d9a138z0<br>b0d9a138 <span class='notranslate'></span> Per incloure un <strong>enllaç per baixar</strong> un fitxer emmagatzemat al <strong>documents</strong>, utilitzeu el directori <strong>document.php</strong> wrapper:<br>Exemple, per a un fitxer en documents/ecm (cal registrar-se), la sintaxi és:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Per a un fitxer en documents o mitjans (directori obert per a l'accés públic), la sintaxi és: <br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Per a un fitxer compartit amb un enllaç compartit (accés obert mitjançant la clau hash per compartir del fitxer), la sintaxi és:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt; </strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Per incloure un <strong>imatge</strong> emmagatzemat als <strong>mitjans de comunicació<span directori</strong></span> (directori obert per a l'accés públic), utilitzeu el camí relatiu que comença per <strong>/mediasb0a65dc071f , exemple:<br><strong>&lt;img src="/medias/image/myimagepath/filename ext"&gt;</strong><br>
 YouCanEditHtmlSource2=Per a una imatge compartida amb un enllaç per compartir (accés obert mitjançant la clau hash per compartir del fitxer), utilitzeu l'embolcall:<br><strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong>b0319bzcc
 YouCanEditHtmlSource3=Per a obtenir l'URL de la imatge d'un objecte PHP, utilitzeu<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
-YouCanEditHtmlSource4=Per obtenir l'URL d'una imatge dins del contingut html d'un article, utilitzeu<br><strong> &lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"b0012c7z0</be08c7zc><span> span class='notranslate'></strong><br>
+YouCanEditHtmlSource4=Per obtenir l'URL d'una imatge dins del contingut html d'un article, utilitzeu<br><strong> &lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Clona la pàgina/contenidor
 CloneSite=Clona el lloc
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index 287f0beafe9..0c12d24c6e4 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -56,17 +56,17 @@ ReadPerm=Læs
 WritePerm=Skriv
 TestDeployOnWeb=Test / implementer på nettet
 PreviewSiteServedByWebServer=<u> Se %s i en ny fane. </u> <br> <br> %s vil blive serveret af en ekstern webserver (som Apache, Nginx, IIS). Du skal installere og konfigurere denne server før du peger på biblioteket: <br> <strong> %s </strong> <br> URL serveret af ekstern server: <br> <strong> %s </strong>
-PreviewSiteServedByDolibarr=<u>Se forhåndsvisning af %s på en ny fane.</u><br><br>%s vil blive serveret af Dolibarr-serveren, så den behøver ikke nogen ekstra webserver (som Apache, Nginx, IIS) skal installeres.<br>Det ubelejlige er, at sidernes URL'er ikke er brugervenlige og starter med stien til din Dolibarr.<br>URL tjent af Dolibarr:<br><strong><span class='notranslate2ecz8b<04fec2ecz8b /span></strong><br><br>For at implementere eller teste ved hjælp af din egen eksterne webserver (som Apache, Nginx, Lighttp) bruger linket "%s".
+PreviewSiteServedByDolibarr=<u>Se forhåndsvisning af %s på en ny fane.</u><br><br>%s vil blive serveret af Dolibarr-serveren, så den behøver ikke nogen ekstra webserver (som Apache, Nginx, IIS) skal installeres.<br>Det ubelejlige er, at sidernes URL'er ikke er brugervenlige og starter med stien til din Dolibarr.<br>URL tjent af Dolibarr:<br><strong></strong><br><br>For at implementere eller teste ved hjælp af din egen eksterne webserver (som Apache, Nginx, Lighttp) bruger linket "%s".
 VirtualHostUrlNotDefined=URL til den virtuelle vært, der serveres af en ekstern webserver, der ikke er defineret
 NoPageYet=Ingen sider endnu
 YouCanCreatePageOrImportTemplate=Du kan oprette en ny side eller importere en fuld hjemmeside skabelon
 SyntaxHelp=Hjælp til specifikke syntax tips
 YouCanEditHtmlSourceckeditor=Du kan redigere HTML-kildekode ved hjælp af knappen "Kilde" i editoren.
 YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Du kan inkludere PHP-kode i denne kilde ved hjælp af tags <strong>&lt;?php ?&gt;<span class='01a66fccz01a665d9d0 </span>. Følgende globale variabler er tilgængelige: $conf, $db, $mysoc, $user, $websted, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> Du kan også inkludere af en anden side/beholder med følgende syntaks:<br><strong>&lt;? php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br>b03492bzfcc<fda /span><span class='notranslate'><span class="fa fa-bug paddingright"></span> Du kan foretage en omdirigering til en anden side/beholder med følgende syntaks (Bemærk: udskriv ikke nogen indhold før en omdirigering):<br><strong>&lt;?php redirectToContainer alias_of_container_to_redirect_to'); ?&gt;</strong><br>Du kan også lave en omdirigering med GET-parametre: <br><strong>&lt;?php redirectToContainer('container_to', 'container_alias_of', 'container_to' 0, 0, $array_of_get_params); ?&gt;</strong><br>b03492bzfcc<fda /span><span class='notranslate'><span class="fa fa-link paddingright"></span> For at tilføje et link til en anden side skal du bruge syntaksen:<br> <strong>&lt;a href="alias_of_page_to_link_to.php"b0012c7z0</0be12c7z0 >mylink<span class='notranslate'>&lt;a&gt;</strong> <br><br><p>b02bd88d791translate'><spanlate'0 '></span> Du kan dynamisk indstille sidetitlen og <strong>SEO-metatags</strong>, søgeord, ). Definer blot følgende variabler:<br> <code>$__PAGE__TITLE__ = "Titelværdi …";<span class='notranslate67b'>7d08a8a67b>b316dz0 </span><br> <code>$__PAGE__KEYWORDS__ = "søgeord1, søgeord2, søgeord3 …"; // Kommasepareret</code><br> <code>____PAGE_DEscriptionSC ;</code></p><br>840d /span><span class='notranslate'></span> At inkludere et <strong>link til download</strong> en fil gemt i mappen <strong>documents</strong>, skal du bruge <strong>document.php</span> </strong> wrapper:<br>Eksempel, for en fil til dokumenter/ecm (skal logges), er syntaksen:<br><strong>&lt;a href="/document.php?modulepart=[ecm&file relative_dir/]filename.ext"&gt;</strong><br> tilFor en fil dokumenter/medier (åben mappe for offentlig adgang), syntaks er:<br><strong>&lt; /span>a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"<span class='notranslate'>&gt;</strong> <br>For en fil, der deles med et delingslink (åben adgang ved hjælp af filens hash-nøgle), er syntaksen:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"b0012c7dcbe</span087 ><span class='notranslate'></strong><br>
-YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> At inkludere en  <strong>image</strong> gemt i <strong>medier</strong> Bibliotek (bibliotek åben for offentlig adgang), brug den relative sti, der starter med <strong>/medias</strong>, eksempel:<br><strong>&lt;img src="/medias/image/.myimagepath/filename" span class='notranslate'>&gt;</strong><br>
+YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> At inkludere en  <strong>image</strong> gemt i <strong>medier</strong> Bibliotek (bibliotek åben for offentlig adgang), brug den relative sti, der starter med <strong>/medias</strong>, eksempel:<br><strong>&lt;img src="/medias/image/.myimagepath/filename"&gt;</strong><br>
 YouCanEditHtmlSource2=For et billede, der er delt med et delelink (åben adgang ved hjælp af filens hashnøgle til deling), skal du bruge wrapperen:<br><strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt; </strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
-YouCanEditHtmlSource4=For at få URL'en til et billede i et html-indhold i en artikel brug<br><strong>  &lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?b0012c>b0012c>class ='notranslate'>&gt;</strong><br>
+YouCanEditHtmlSource4=For at få URL'en til et billede i et html-indhold i en artikel brug<br><strong>  &lt;img src="&lt;?php print getImageFromHtmlContent($htmlcontent, 1) ?&gt;"&gt;</strong><br>
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external" class="nofocusvisible">the wiki documentation</a>.<br>
 ClonePage=Klon side / container
 CloneSite=Klon website
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index 7d4929e545f..85de851d2e0 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -62,7 +62,7 @@ NoPageYet=Vēl nav nevienas lapas
 YouCanCreatePageOrImportTemplate=Jūs varat izveidot jaunu lapu vai importēt pilnu vietnes veidni
 SyntaxHelp=Palīdzība par konkrētiem sintakses padomiem
 YouCanEditHtmlSourceckeditor=Jūs varat rediģēt HTML avota kodu, izmantojot redaktorā pogu "Avots".
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Šajā avotā varat iekļaut PHP kodu, izmantojot tagus <strong>&lt;?php ?&gt;<span class='notranslate6fd70b10af6fd70 </span>. Ir pieejami šādi globālie mainīgie: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> Varat iekļaut arī citas lapas/konteinera saturu ar šādu sintaksi:<br><strong>&lt;?php includeContainer('alias_of_includeer'); ?&gt;</strong><br>ccfda192bz0 /span><span class='notranslate'><span class="fa fa-bug paddingright"></span> Varat veikt novirzīšanu uz citu lapu/konteineru, izmantojot šādu sintaksi (piezīme: neizvadiet nevienu saturs pirms novirzīšanas):<br><strong>&lt;?php redirectToContainer alias_of_container_to_redirect_to'); ?&gt;</strong><br>Varat arī veikt novirzīšanu, izmantojot GET parametrus. <br><strong>&lt;?php redirectToContainer,'alias_of_container, 0, 0, $array_of_get_params); ?&gt;</strong><br>ccfda192bz0 /span><span class='notranslate'><span class="fa fa-link paddingright"></span> Lai pievienotu saiti uz citu lapu, izmantojiet sintaksi:<br> <strong>&lt;a href="alias_of_page_to_link_to.php"b0012c7d0be</08c7d >mana saite<span class='notranslate'>&lt;a&gt;</strong> <br><br><p>b02bd88d791f12 classz0'no '></span> Varat dinamiski iestatīt lapas nosaukumu un <strong>SEO metatagus</strong>, ti, aprakstu ). Vienkārši definējiet šādus mainīgos:<br> <code>$__PAGE__TITLE__ = "Nosaukuma vērtība…";7b05d <br> <code>$__PAGE__KEYWORDS__ = "atslēgvārds1, atslēgvārds2, atslēgvārds…"; // Atdalīts ar komatu</code><br> <code>DESC___PAGE__ ;</code> /span></span> Lai iekļautu <strong>saiti, lai lejupielādētu</strong> failu kas saglabāti <strong>dokumentu</strong> direktorijā, izmantojiet <strong>. <span class='notranslate'></strong> iesaiņojums:<br>Piemērs, failam dokumentos/ecm (jāreģistrē), sintakse ir:<br><strong>&lt;a href="/document.php?modulepart=[ecm&fi relation_dir/]filename.ext"&gt;</strong><br> failā dokumenti/mediji (atvērts direktorijs publiskai piekļuvei), sintakse ir:<br><strong>&lt; /span>a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"<span class='notranslate'>&gt;</strong> <br>Failam, kas kopīgots ar kopīgošanas saiti (atvērta piekļuve, izmantojot faila koplietošanas jaucējatslēgu), sintakse ir šāda:<br><. span class='notranslate'><strong></span>&lt;a href="/document.php?hashp=publicsharekeyoffile"b0012c7dc0</span8c7d ><span class='notranslate'></strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Šajā avotā varat iekļaut PHP kodu, izmantojot tagus <strong>&lt;?php ?&gt;. Ir pieejami šādi globālie mainīgie: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> Varat iekļaut arī citas lapas/konteinera saturu ar šādu sintaksi:<br><strong>&lt;?php includeContainer('alias_of_includeer'); ?&gt;</strong><br>ccfda192bz0 /span><span class='notranslate'><span class="fa fa-bug paddingright"></span> Varat veikt novirzīšanu uz citu lapu/konteineru, izmantojot šādu sintaksi (piezīme: neizvadiet nevienu saturs pirms novirzīšanas):<br><strong>&lt;?php redirectToContainer alias_of_container_to_redirect_to'); ?&gt;</strong><br>Varat arī veikt novirzīšanu, izmantojot GET parametrus. <br><strong>&lt;?php redirectToContainer,'alias_of_container, 0, 0, $array_of_get_params); ?&gt;</strong><br>ccfda192bz0 /span><span class='notranslate'><span class="fa fa-link paddingright"></span> Lai pievienotu saiti uz citu lapu, izmantojiet sintaksi:<br> <strong>&lt;a href="alias_of_page_to_link_to.php"b0012c7d0be</08c7d >mana saite<span class='notranslate'>&lt;a&gt;</strong> <br><br><p>b02bd88d791f12 classz0'no '></span> Varat dinamiski iestatīt lapas nosaukumu un <strong>SEO metatagus</strong>, ti, aprakstu ). Vienkārši definējiet šādus mainīgos:<br> <code>$__PAGE__TITLE__ = "Nosaukuma vērtība…";7b05d <br> <code>$__PAGE__KEYWORDS__ = "atslēgvārds1, atslēgvārds2, atslēgvārds…"; // Atdalīts ar komatu</code><br> <code>DESC___PAGE__ ;</code> /span></span> Lai iekļautu <strong>saiti, lai lejupielādētu</strong> failu kas saglabāti <strong>dokumentu</strong> direktorijā, izmantojiet <strong>. <span class='notranslate'></strong> iesaiņojums:<br>Piemērs, failam dokumentos/ecm (jāreģistrē), sintakse ir:<br><strong>&lt;a href="/document.php?modulepart=[ecm&fi relation_dir/]filename.ext"&gt;</strong><br> failā dokumenti/mediji (atvērts direktorijs publiskai piekļuvei), sintakse ir:<br><strong>&lt; /span>a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"<span class='notranslate'>&gt;</strong> <br>Failam, kas kopīgots ar kopīgošanas saiti (atvērta piekļuve, izmantojot faila koplietošanas jaucējatslēgu), sintakse ir šāda:<br><. span class='notranslate'><strong></span>&lt;a href="/document.php?hashp=publicsharekeyoffile"b0012c7dc0</span8c7d ><span class='notranslate'></strong><br>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
 YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>

From 8cbdc82dc0676ba30978123d3171becff019ec46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 5 Feb 2025 12:07:54 +0100
Subject: [PATCH 486/602] fix CI

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

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index a2fd416be65..94e39d68610 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1295,7 +1295,7 @@ if (!$error && ($action == 'updateprice' && $confirm == 'yes') && $permissiontoa
 						}
 					} elseif (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 						$maxlevel = getDolGlobalInt('PRODUIT_MULTIPRICES_LIMIT');
-						for ($level = 1; $level <= $malevel; $level++) {
+						for ($level = 1; $level <= $maxlevel; $level++) {
 							if ($object->price_base_type == 'TTC') {
 								$newprice = $object->multiprices_ttc[$level] * (100 + $pricepercentage) / 100;
 								$minprice = $object->multiprices_min_ttc[$level];

From 38820af10f6b8b4a2540a1a7ff1de9a22ccddc7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 5 Feb 2025 12:29:19 +0100
Subject: [PATCH 487/602] Update html.formticket.class.php

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

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 76c1ed3dda0..94517d5e4b1 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1277,7 +1277,7 @@ class FormTicket
 					print ' selected="selected"';
 				} elseif ($arrayseverities['use_default'] == "1" && empty($selected) && (!$empty || $empty == 'ifone')) {
 					print ' selected="selected"';
-				} elseif (count($ticketstat->cache_severity_tickets) == 1 && (!$empty || $empty == 'ifone')) {	// If only 1 choice, we autoselect it
+				} elseif (count($conf->cache['severity_tickets']) == 1 && (!$empty || $empty == 'ifone')) {	// If only 1 choice, we autoselect it
 					print ' selected="selected"';
 				}
 

From 932b34e76eac0e5ba259bfe5ba736fbfb449dbc4 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 12:55:10 +0100
Subject: [PATCH 488/602] Debug v21

---
 htdocs/core/tpl/objectline_create.tpl.php | 2 +-
 htdocs/societe/class/societe.class.php    | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 96cfc189c13..4547984cf9f 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -499,7 +499,7 @@ if ($nolinesbefore) {
 	if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 		$coldisplay++;
 		print '<td class="nobottom linecoluseunit left">';
-		print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, "units");
+		print $form->selectUnits(empty($line->fk_unit) ? getDolGlobalInt('PRODUCT_USE_UNITS') : $line->fk_unit, "units");
 		print '</td>';
 	}
 	$remise_percent = $buyer->remise_percent;
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 8d664fda47f..95a40d04e12 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4231,7 +4231,7 @@ class Societe extends CommonObject
 	public function isACompany()
 	{
 		// Define if third party is treated as company (or not) when nature is unknown
-		$isACompany = getDolGlobalInt('MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES');
+		$isACompany = getDolGlobalInt('MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES', 1);	// default if not set is 1 because it was like this in all past versions
 
 		// Now try to guess using different tips
 		if (!empty($this->tva_intra)) {
@@ -4239,12 +4239,9 @@ class Societe extends CommonObject
 		} elseif (!empty($this->idprof1) || !empty($this->idprof2) || !empty($this->idprof3) || !empty($this->idprof4) || !empty($this->idprof5) || !empty($this->idprof6)) {
 			$isACompany = 1;
 		} else {
-			if (!getDolGlobalString('MAIN_CUSTOMERS_ARE_COMPANIES_EVEN_IF_SET_AS_INDIVIDUAL')) {
-				// TODO Add a field is_a_company into dictionary
-				if (preg_match('/^TE_PRIVATE/', $this->typent_code)) {
+			if (!getDolGlobalString('MAIN_CUSTOMERS_ARE_COMPANIES_EVEN_IF_SET_AS_INDIVIDUAL')) {	// never or rarely set
+				if (preg_match('/^TE_PRIVATE/', $this->typent_code)) {	// TODO Add a field is_a_company into dictionary
 					$isACompany = 0;
-				} else {
-					$isACompany = 1;
 				}
 			} else {
 				$isACompany = 1;

From b1132131f307b7fa85ceeaad5d0ffd32cef8fcfa Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 13:09:06 +0100
Subject: [PATCH 489/602] Fix regression

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

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 62280a7cce2..57dbaecd040 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1375,7 +1375,7 @@ if (!$error && ($action == 'updateprice' && $confirm == 'yes') && $permissiontoa
 						}
 					} elseif (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 						$maxlevel = getDolGlobalInt('PRODUIT_MULTIPRICES_LIMIT');
-						for ($level = 1; $level <= $malevel; $level++) {
+						for ($level = 1; $level <= $maxlevel; $level++) {
 							if ($object->price_base_type == 'TTC') {
 								$newprice = $object->multiprices_ttc[$level] * (100 + $pricepercentage) / 100;
 								$minprice = $object->multiprices_min_ttc[$level];

From 0a5bf30ef7b61dbe8501fda8db812150d4ca50a6 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 13:24:48 +0100
Subject: [PATCH 490/602] Fix var not defined

---
 htdocs/core/class/html.formticket.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index b95d057d48b..39c1336930b 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1388,8 +1388,6 @@ class FormTicket
 					print ' selected="selected"';
 				} elseif ($arrayseverities['use_default'] == "1" && empty($selected) && (!$empty || $empty == 'ifone')) {
 					print ' selected="selected"';
-				} elseif (count($ticketstat->cache_severity_tickets) == 1 && (!$empty || $empty == 'ifone')) {	// If only 1 choice, we autoselect it
-					print ' selected="selected"';
 				} elseif (count($conf->cache['severity_tickets']) == 1 && (!$empty || $empty == 'ifone')) {	// If only 1 choice, we autoselect it
 					print ' selected="selected"';
 				}

From f885d1e05b1ca69ae7732c6290132efa1661045b Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 13:26:16 +0100
Subject: [PATCH 491/602] Fix use of cache

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

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 76c1ed3dda0..94517d5e4b1 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1277,7 +1277,7 @@ class FormTicket
 					print ' selected="selected"';
 				} elseif ($arrayseverities['use_default'] == "1" && empty($selected) && (!$empty || $empty == 'ifone')) {
 					print ' selected="selected"';
-				} elseif (count($ticketstat->cache_severity_tickets) == 1 && (!$empty || $empty == 'ifone')) {	// If only 1 choice, we autoselect it
+				} elseif (count($conf->cache['severity_tickets']) == 1 && (!$empty || $empty == 'ifone')) {	// If only 1 choice, we autoselect it
 					print ' selected="selected"';
 				}
 

From c9f9d549e6221cb999b28d6bc429dc51435d3022 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 13:27:41 +0100
Subject: [PATCH 492/602] Fix cache

---
 htdocs/core/class/html.formticket.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 27f45a9ecab..9503d073268 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1388,8 +1388,6 @@ class FormTicket
 					print ' selected="selected"';
 				} elseif ($arrayseverities['use_default'] == "1" && empty($selected) && (!$empty || $empty == 'ifone')) {
 					print ' selected="selected"';
-				} elseif (count($ticketstat->cache_severity_tickets) == 1 && (!$empty || $empty == 'ifone')) {	// If only 1 choice, we autoselect it
-					print ' selected="selected"';
 				} elseif (count($conf->cache['severity_tickets']) == 1 && (!$empty || $empty == 'ifone')) {	// If only 1 choice, we autoselect it
 					print ' selected="selected"';
 				}

From 4ee2bf542825a52b2835cf96ba611579a1294584 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 13:35:43 +0100
Subject: [PATCH 493/602] Clean cache. Must use conf->cache

---
 htdocs/core/class/html.formticket.class.php |  6 ++---
 htdocs/ticket/class/api_tickets.class.php   |  1 -
 htdocs/ticket/class/ticket.class.php        | 25 +++++++++------------
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 9503d073268..5ba1465f7b4 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1000,8 +1000,8 @@ class FormTicket
 				print '<option value="">'.((is_numeric($empty) || $empty == 'ifone') ? '&nbsp;' : $empty).'</option>';
 			}
 
-			if (is_array($ticketstat->cache_category_tickets) && count($ticketstat->cache_category_tickets)) {
-				foreach ($ticketstat->cache_category_tickets as $id => $arraycategories) {
+			if (is_array($conf->cache['category_tickets']) && count($conf->cache['category_tickets'])) {
+				foreach ($conf->cache['category_tickets'] as $id => $arraycategories) {
 					// Exclude some record
 					if ($publicgroups) {
 						if (empty($arraycategories['public'])) {
@@ -1044,7 +1044,7 @@ class FormTicket
 						print ' selected="selected"';
 					} elseif ($arraycategories['use_default'] == "1" && empty($selected) && (!$empty || $empty == 'ifone')) {
 						print ' selected="selected"';
-					} elseif (count($ticketstat->cache_category_tickets) == 1 && (!$empty || $empty == 'ifone')) {	// If only 1 choice, we autoselect it
+					} elseif (count($conf->cache['category_tickets']) == 1 && (!$empty || $empty == 'ifone')) {	// If only 1 choice, we autoselect it
 						print ' selected="selected"';
 					}
 
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index 2d0fca7f77a..6b2d9e759c9 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -554,7 +554,6 @@ class Tickets extends DolibarrApi
 			"cache_msgs_ticket",
 			"cache_logs_ticket",
 			"cache_types_tickets",
-			"cache_category_tickets",
 			"regeximgext",
 			"labelStatus",
 			"labelStatusShort",
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 35bf143e0fe..92c95699183 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -216,11 +216,6 @@ class Ticket extends CommonObject
 	 */
 	public $cache_types_tickets;
 
-	/**
-	 * @var array<int,array{code:string,use_default:int,pos:int,public:int,active:int,force_severity:int,fk_parent:int,label:string}>	Cache of Ticket categories
-	 */
-	public $cache_category_tickets;
-
 	/**
 	 * @var array<int,array{private:0|1|'0'|'1',fk_user_author:int,fk_contact_author?:int,message:string}> cache msgs ticket
 	 */
@@ -1384,9 +1379,9 @@ class Ticket extends CommonObject
 	 */
 	public function loadCacheCategoriesTickets($publicgroup = -1)
 	{
-		global $langs;
+		global $conf, $langs;
 
-		if ($publicgroup == -1 && !empty($this->cache_category_tickets) && count($this->cache_category_tickets)) {
+		if ($publicgroup == -1 && !empty($conf->cache['category_tickets']) && count($conf->cache['category_tickets'])) {
 			// Cache already loaded
 			return 0;
 		}
@@ -1408,18 +1403,18 @@ class Ticket extends CommonObject
 			$i = 0;
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
-				$this->cache_category_tickets[$obj->rowid]['code'] = $obj->code;
-				$this->cache_category_tickets[$obj->rowid]['use_default'] = $obj->use_default;
-				$this->cache_category_tickets[$obj->rowid]['pos'] = $obj->pos;
-				$this->cache_category_tickets[$obj->rowid]['public'] = $obj->public;
-				$this->cache_category_tickets[$obj->rowid]['active'] = $obj->active;
-				$this->cache_category_tickets[$obj->rowid]['force_severity'] = $obj->force_severity;
-				$this->cache_category_tickets[$obj->rowid]['fk_parent'] = $obj->fk_parent;
+				$conf->cache['category_tickets'][$obj->rowid]['code'] = $obj->code;
+				$conf->cache['category_tickets'][$obj->rowid]['use_default'] = $obj->use_default;
+				$conf->cache['category_tickets'][$obj->rowid]['pos'] = $obj->pos;
+				$conf->cache['category_tickets'][$obj->rowid]['public'] = $obj->public;
+				$conf->cache['category_tickets'][$obj->rowid]['active'] = $obj->active;
+				$conf->cache['category_tickets'][$obj->rowid]['force_severity'] = $obj->force_severity;
+				$conf->cache['category_tickets'][$obj->rowid]['fk_parent'] = $obj->fk_parent;
 
 				// If  translation exists, we use it to store already translated string.
 				// Warning: You should not use this and recompute the translated string into caller code to get the value into expected language
 				$label = ($langs->trans("TicketCategoryShort".$obj->code) != "TicketCategoryShort".$obj->code ? $langs->trans("TicketCategoryShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
-				$this->cache_category_tickets[$obj->rowid]['label'] = $label;
+				$conf->cache['category_tickets'][$obj->rowid]['label'] = $label;
 
 				$i++;
 			}

From af5dbfe0a739fb5b0f268b96aa8434bd51461ed0 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 13:41:03 +0100
Subject: [PATCH 494/602] Fix phpunit

---
 htdocs/langs/ca_ES/website.lang | 1 -
 htdocs/langs/da_DK/website.lang | 1 -
 htdocs/langs/lv_LV/website.lang | 1 -
 3 files changed, 3 deletions(-)

diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index b496eaf6e50..685518d716b 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -62,7 +62,6 @@ NoPageYet=Encara sense pàgines
 YouCanCreatePageOrImportTemplate=Podeu crear una pàgina nova o importar una plantilla completa del lloc web
 SyntaxHelp=Ajuda sobre consells de sintaxi específica
 YouCanEditHtmlSourceckeditor=Podeu editar el codi font HTML usant el botó "Codi font" a l'editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Podeu incloure codi PHP en aquesta font utilitzant les etiquetes <strong>&lt;?php ?&gt;b70f65fc09 /span>. Les variables globals següents estan disponibles: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<span><br><br><span class="fa fa-bug paddingright"></span> També podeu incloure contingut d'una altra pàgina/contenidor amb la sintaxi següent:<br> span><span class='notranslate'><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br>b0342fc9bz0<span> /span><span class='notranslate'><span class="fa fa-bug paddingright"></span> Podeu fer una redirecció a una altra pàgina/contenidor amb la sintaxi següent (Nota: no envieu cap contingut abans d'una redirecció) :<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br>També podeu fer una redirecció amb els paràmetres GET: <br><strong>&lt;?php redirectToContainer('alias_to', 'redirect,_0_to', 'redirectTo' 0, $array_of_get_params); ?&gt;</strong><br>b0342fc9bz0<span> /span><span class='notranslate'><span class="fa fa-link paddingright"></span> Per afegir un enllaç a una altra pàgina, utilitzeu la sintaxi:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink<0 class='notranslate'>&lt;</span>a&gt;</strong>b0319bzcc</strong>b0319bzcc ><br><p><span class="fa fa-bug paddingright">b014d7f165b Podeu configurar dinàmicament el títol de la pàgina i <span class='notranslate'><strong>Metaetiquetes de SEO</strong> (títol, paraules clau, descripció). Simplement definiu les variables següents:<br> <code>$__PAGE__TITLE__ = "Valor del títol...";b1z08a8b77 <br> <code>$__PAGE__KEYWORDS__ = "paraula clau1, paraula clau2, paraula clau3..."; // Separat per comes</code><br> <code>$___PAGE =Descripció ;</code></p><br>b0d9a138z0<br>b0d9a138 <span class='notranslate'></span> Per incloure un <strong>enllaç per baixar</strong> un fitxer emmagatzemat al <strong>documents</strong>, utilitzeu el directori <strong>document.php</strong> wrapper:<br>Exemple, per a un fitxer en documents/ecm (cal registrar-se), la sintaxi és:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Per a un fitxer en documents o mitjans (directori obert per a l'accés públic), la sintaxi és: <br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Per a un fitxer compartit amb un enllaç compartit (accés obert mitjançant la clau hash per compartir del fitxer), la sintaxi és:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt; </strong><br>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> Per incloure un <strong>imatge</strong> emmagatzemat als <strong>mitjans de comunicació<span directori</strong></span> (directori obert per a l'accés públic), utilitzeu el camí relatiu que comença per <strong>/mediasb0a65dc071f , exemple:<br><strong>&lt;img src="/medias/image/myimagepath/filename ext"&gt;</strong><br>
 YouCanEditHtmlSource2=Per a una imatge compartida amb un enllaç per compartir (accés obert mitjançant la clau hash per compartir del fitxer), utilitzeu l'embolcall:<br><strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong>b0319bzcc
 YouCanEditHtmlSource3=Per a obtenir l'URL de la imatge d'un objecte PHP, utilitzeu<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index 0c12d24c6e4..967a994c7a4 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -62,7 +62,6 @@ NoPageYet=Ingen sider endnu
 YouCanCreatePageOrImportTemplate=Du kan oprette en ny side eller importere en fuld hjemmeside skabelon
 SyntaxHelp=Hjælp til specifikke syntax tips
 YouCanEditHtmlSourceckeditor=Du kan redigere HTML-kildekode ved hjælp af knappen "Kilde" i editoren.
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Du kan inkludere PHP-kode i denne kilde ved hjælp af tags <strong>&lt;?php ?&gt;<span class='01a66fccz01a665d9d0 </span>. Følgende globale variabler er tilgængelige: $conf, $db, $mysoc, $user, $websted, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> Du kan også inkludere af en anden side/beholder med følgende syntaks:<br><strong>&lt;? php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br>b03492bzfcc<fda /span><span class='notranslate'><span class="fa fa-bug paddingright"></span> Du kan foretage en omdirigering til en anden side/beholder med følgende syntaks (Bemærk: udskriv ikke nogen indhold før en omdirigering):<br><strong>&lt;?php redirectToContainer alias_of_container_to_redirect_to'); ?&gt;</strong><br>Du kan også lave en omdirigering med GET-parametre: <br><strong>&lt;?php redirectToContainer('container_to', 'container_alias_of', 'container_to' 0, 0, $array_of_get_params); ?&gt;</strong><br>b03492bzfcc<fda /span><span class='notranslate'><span class="fa fa-link paddingright"></span> For at tilføje et link til en anden side skal du bruge syntaksen:<br> <strong>&lt;a href="alias_of_page_to_link_to.php"b0012c7z0</0be12c7z0 >mylink<span class='notranslate'>&lt;a&gt;</strong> <br><br><p>b02bd88d791translate'><spanlate'0 '></span> Du kan dynamisk indstille sidetitlen og <strong>SEO-metatags</strong>, søgeord, ). Definer blot følgende variabler:<br> <code>$__PAGE__TITLE__ = "Titelværdi …";<span class='notranslate67b'>7d08a8a67b>b316dz0 </span><br> <code>$__PAGE__KEYWORDS__ = "søgeord1, søgeord2, søgeord3 …"; // Kommasepareret</code><br> <code>____PAGE_DEscriptionSC ;</code></p><br>840d /span><span class='notranslate'></span> At inkludere et <strong>link til download</strong> en fil gemt i mappen <strong>documents</strong>, skal du bruge <strong>document.php</span> </strong> wrapper:<br>Eksempel, for en fil til dokumenter/ecm (skal logges), er syntaksen:<br><strong>&lt;a href="/document.php?modulepart=[ecm&file relative_dir/]filename.ext"&gt;</strong><br> tilFor en fil dokumenter/medier (åben mappe for offentlig adgang), syntaks er:<br><strong>&lt; /span>a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"<span class='notranslate'>&gt;</strong> <br>For en fil, der deles med et delingslink (åben adgang ved hjælp af filens hash-nøgle), er syntaksen:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"b0012c7dcbe</span087 ><span class='notranslate'></strong><br>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> At inkludere en  <strong>image</strong> gemt i <strong>medier</strong> Bibliotek (bibliotek åben for offentlig adgang), brug den relative sti, der starter med <strong>/medias</strong>, eksempel:<br><strong>&lt;img src="/medias/image/.myimagepath/filename"&gt;</strong><br>
 YouCanEditHtmlSource2=For et billede, der er delt med et delelink (åben adgang ved hjælp af filens hashnøgle til deling), skal du bruge wrapperen:<br><strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt; </strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index 85de851d2e0..0892b5d653c 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -62,7 +62,6 @@ NoPageYet=Vēl nav nevienas lapas
 YouCanCreatePageOrImportTemplate=Jūs varat izveidot jaunu lapu vai importēt pilnu vietnes veidni
 SyntaxHelp=Palīdzība par konkrētiem sintakses padomiem
 YouCanEditHtmlSourceckeditor=Jūs varat rediģēt HTML avota kodu, izmantojot redaktorā pogu "Avots".
-YouCanEditHtmlSource=<br><span class="fa fa-bug paddingright"></span> Šajā avotā varat iekļaut PHP kodu, izmantojot tagus <strong>&lt;?php ?&gt;. Ir pieejami šādi globālie mainīgie: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug paddingright"></span> Varat iekļaut arī citas lapas/konteinera saturu ar šādu sintaksi:<br><strong>&lt;?php includeContainer('alias_of_includeer'); ?&gt;</strong><br>ccfda192bz0 /span><span class='notranslate'><span class="fa fa-bug paddingright"></span> Varat veikt novirzīšanu uz citu lapu/konteineru, izmantojot šādu sintaksi (piezīme: neizvadiet nevienu saturs pirms novirzīšanas):<br><strong>&lt;?php redirectToContainer alias_of_container_to_redirect_to'); ?&gt;</strong><br>Varat arī veikt novirzīšanu, izmantojot GET parametrus. <br><strong>&lt;?php redirectToContainer,'alias_of_container, 0, 0, $array_of_get_params); ?&gt;</strong><br>ccfda192bz0 /span><span class='notranslate'><span class="fa fa-link paddingright"></span> Lai pievienotu saiti uz citu lapu, izmantojiet sintaksi:<br> <strong>&lt;a href="alias_of_page_to_link_to.php"b0012c7d0be</08c7d >mana saite<span class='notranslate'>&lt;a&gt;</strong> <br><br><p>b02bd88d791f12 classz0'no '></span> Varat dinamiski iestatīt lapas nosaukumu un <strong>SEO metatagus</strong>, ti, aprakstu ). Vienkārši definējiet šādus mainīgos:<br> <code>$__PAGE__TITLE__ = "Nosaukuma vērtība…";7b05d <br> <code>$__PAGE__KEYWORDS__ = "atslēgvārds1, atslēgvārds2, atslēgvārds…"; // Atdalīts ar komatu</code><br> <code>DESC___PAGE__ ;</code> /span></span> Lai iekļautu <strong>saiti, lai lejupielādētu</strong> failu kas saglabāti <strong>dokumentu</strong> direktorijā, izmantojiet <strong>. <span class='notranslate'></strong> iesaiņojums:<br>Piemērs, failam dokumentos/ecm (jāreģistrē), sintakse ir:<br><strong>&lt;a href="/document.php?modulepart=[ecm&fi relation_dir/]filename.ext"&gt;</strong><br> failā dokumenti/mediji (atvērts direktorijs publiskai piekļuvei), sintakse ir:<br><strong>&lt; /span>a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"<span class='notranslate'>&gt;</strong> <br>Failam, kas kopīgots ar kopīgošanas saiti (atvērta piekļuve, izmantojot faila koplietošanas jaucējatslēgu), sintakse ir šāda:<br><. span class='notranslate'><strong></span>&lt;a href="/document.php?hashp=publicsharekeyoffile"b0012c7dc0</span8c7d ><span class='notranslate'></strong><br>
 YouCanEditHtmlSource1=<br><span class="fa fa-image paddingright"></span> To include an <strong>image</strong> stored into the <strong>medias</strong> directory (directory open for public access), use the relative path starting with <strong>/medias</strong>, example:<br><strong>&lt;img src="/medias/image/myimagepath/filename.ext"&gt;</strong><br>
 YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), use the wrapper:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource3=To get the URL of the image of a PHP object, use<br><strong>&lt;img src="&lt;?php print getImagePublicURLOfObject($object, 1, "_small") ?&gt;"&gt;</strong><br>

From 3e45bf00eb0ba476c2ef27f79f77a8337cef6670 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 5 Feb 2025 13:54:36 +0100
Subject: [PATCH 495/602] FIX missing company name if dontaion is linked to
 third party

---
 htdocs/compta/index.php | 16 ++++++++++++----
 htdocs/don/card.php     |  4 ++--
 htdocs/don/index.php    | 16 ++++++++++++----
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index a238b4f6a2b..5fc3880c600 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -422,7 +422,7 @@ if (isModEnabled('don') && $user->hasRight('don', 'lire')) {
 	$langs->load("boxes");
 	$donationstatic = new Don($db);
 
-	$sql = "SELECT d.rowid, d.lastname, d.firstname, d.societe, d.datedon as date, d.tms as dm, d.amount, d.fk_statut as status";
+	$sql = "SELECT d.rowid, d.lastname, d.firstname, d.societe, d.datedon as date, d.tms as dm, d.amount, d.fk_statut as status, d.fk_soc as socid";
 	$sql .= " FROM ".MAIN_DB_PREFIX."don as d";
 	$sql .= " WHERE d.entity IN (".getEntity('donation').")";
 	// Add where from hooks
@@ -473,9 +473,17 @@ if (isModEnabled('don') && $user->hasRight('don', 'lire')) {
 				$donationstatic->statut = $obj->status;
 				$donationstatic->status = $obj->status;
 
-				$label = $donationstatic->getFullName($langs);
-				if ($obj->societe) {
-					$label .= ($label ? ' - ' : '').$obj->societe;
+				if (!empty($obj->socid)) {
+					$companystatic = new Societe($db);
+					$ret = $companystatic->fetch($obj->socid);
+					if ($ret > 0) {
+						$label = $companystatic->getNomUrl(1);
+					}
+				} else {
+					$label = $donationstatic->getFullName($langs);
+					if ($obj->societe) {
+						$label .= ($label ? ' - ' : '').$obj->societe;
+					}
 				}
 
 				print '<tr class="oddeven tdoverflowmax100">';
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index abb8560727f..675a8655c30 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -398,7 +398,7 @@ if ($action == 'create') {
 	// Company
 	if (isModEnabled("societe") && getDolGlobalString('DONATION_USE_THIRDPARTIES')) {
 		// Thirdparty
-		if ($soc->id > 0) {
+		if (!empty($soc) && $soc->id > 0) {
 			print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
 			print '<td>';
 			print $soc->getNomUrl(1);
@@ -420,7 +420,7 @@ if ($action == 'create') {
 			print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
 			print '<td>';
 			$filter = '((s.client:IN:1,2,3) AND (status:=:1))';
-			print $form->select_company($soc->id, 'socid', $filter, 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+			print $form->select_company($socid, 'socid', $filter, 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 			// Option to reload page to retrieve customer information. Note, this clear other input
 			if (getDolGlobalString('RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED')) {
 				print '<script type="text/javascript">
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index 57cf398b2a8..33b4e05044c 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -205,7 +205,7 @@ $max = 10;
  * Last modified donations
  */
 
-$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.societe, c.lastname, c.firstname, c.tms as datem, c.amount";
+$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.societe, c.lastname, c.firstname, c.tms as datem, c.amount, c.fk_soc as socid";
 $sql .= " FROM ".MAIN_DB_PREFIX."don as c";
 $sql .= " WHERE c.entity = ".$conf->entity;
 //$sql.= " AND c.fk_statut > 2";
@@ -234,9 +234,17 @@ if ($resql) {
 			print '</td>';
 
 			print '<td class="nobordernopadding">';
-			print $obj->societe;
-			print($obj->societe && ($obj->lastname || $obj->firstname) ? ' / ' : '');
-			print dolGetFirstLastname($obj->firstname, $obj->lastname);
+			if (!empty($obj->socid)) {
+				$companystatic = new Societe($db);
+				$ret = $companystatic->fetch($obj->socid);
+				if ($ret > 0) {
+					print $companystatic->getNomUrl(1);
+				}
+			} else {
+				print $obj->societe;
+				print($obj->societe && ($obj->lastname || $obj->firstname) ? ' / ' : '');
+				print dolGetFirstLastname($obj->firstname, $obj->lastname);
+			}
 			print '</td>';
 
 			print '<td class="right nobordernopadding nowraponall amount">';

From 56b44faac61cd3430bda2802928eb368db9b7682 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 14:04:47 +0100
Subject: [PATCH 496/602] Fix phpunit

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

diff --git a/htdocs/install/mysql/data/llx_accounting_account_fr.sql b/htdocs/install/mysql/data/llx_accounting_account_fr.sql
index 2c274c6c3b5..5679c105298 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_fr.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_fr.sql
@@ -1304,7 +1304,7 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7409,'PCG18-ASSOC','FINAN',		'5121',    '7408', 'Comptes en monnaie nationale', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7410,'PCG18-ASSOC','FINAN',		'5124',    '7408', 'Comptes en devises', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7411,'PCG18-ASSOC','FINAN',		'514',    '7402', 'Chèques postaux', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7412,'PCG18-ASSOC','FINAN',		'515',    '7402', '"Caisse" du Trésor et des établissements publics', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7412,'PCG18-ASSOC','FINAN',		'515',    '7402', 'Caisse du Trésor et des établissements publics', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7413,'PCG18-ASSOC','FINAN',		'516',    '7402', 'Sociétés de bourse', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7414,'PCG18-ASSOC','FINAN',		'517',    '7402', 'Autres organismes financiers', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7415,'PCG18-ASSOC','FINAN',		'518',    '7402', 'Intérêts courus', 1);

From 1d560c3623515ab12586b45de43bb445030c9465 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 14:11:32 +0100
Subject: [PATCH 497/602] Fix sql injection detection

---
 htdocs/don/class/donstats.class.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/don/class/donstats.class.php b/htdocs/don/class/donstats.class.php
index b0e8440e2f7..50a482c9db0 100644
--- a/htdocs/don/class/donstats.class.php
+++ b/htdocs/don/class/donstats.class.php
@@ -91,11 +91,11 @@ class DonationStats extends Stats
 		$this->join = '';
 
 		if ($status == 0 || $status == 1 || $status == 2) {
-			$this->where = ' d.fk_statut IN ('.$this->db->sanitize($status).')';
+			$this->where = " d.fk_statut IN (".$this->db->sanitize($status).")";
 		} elseif ($status == 3) {
-			$this->where = ' d.fk_statut IN (-1)';
+			$this->where = " d.fk_statut IN (-1)";
 		} elseif ($status == 4) {
-			$this->where = ' d.fk_statut >= 0';
+			$this->where = " d.fk_statut >= 0";
 		}
 
 		$object = new Don($this->db);
@@ -105,14 +105,14 @@ class DonationStats extends Stats
 			$this->where .= " AND d.fk_soc = ".((int) $socid);
 		}
 
-		$this->where .= " AND d.entity = ".$conf->entity;
+		$this->where .= " AND d.entity = ".((int) $conf->entity);
 		if ($this->userid > 0) {
 			$this->where .= ' AND d.fk_user_author = '.((int) $this->userid);
 		}
 
 		if ($typentid) {
-			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = d.fk_soc';
-			$this->where .= ' AND s.fk_typent = '.((int) $typentid);
+			$this->join .= " LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = d.fk_soc";
+			$this->where .= " AND s.fk_typent = ".((int) $typentid);
 		}
 	}
 
@@ -144,7 +144,7 @@ class DonationStats extends Stats
 	 */
 	public function getNbByYear()
 	{
-		$sql = "SELECT date_format(d.datedon,'%Y') as dm, COUNT(*) as nb, SUM(d.".$this->field.")";
+		$sql = "SELECT date_format(d.datedon,'%Y') as dm, COUNT(*) as nb, SUM(d.".$this->db->sanitize($this->field).")";
 		$sql .= " FROM ".$this->from;
 		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
@@ -163,7 +163,7 @@ class DonationStats extends Stats
 	 */
 	public function getAmountByMonth($year, $format = 0)
 	{
-		$sql = "SELECT date_format(d.datedon,'%m') as dm, sum(d.".$this->field.")";
+		$sql = "SELECT date_format(d.datedon,'%m') as dm, sum(d.".$this->db->sanitize($this->field).")";
 		$sql .= " FROM ".$this->from;
 		$sql .= $this->join;
 		$sql .= " WHERE ".dolSqlDateFilter('d.datedon', 0, 0, (int) $year, 1);
@@ -182,7 +182,7 @@ class DonationStats extends Stats
 	 */
 	public function getAverageByMonth($year)
 	{
-		$sql = "SELECT date_format(d.datedon,'%m') as dm, avg(d.".$this->field.")";
+		$sql = "SELECT date_format(d.datedon,'%m') as dm, avg(d.".$this->db->sanitize($this->field).")";
 		$sql .= " FROM ".$this->from;
 		$sql .= $this->join;
 		$sql .= " WHERE ".dolSqlDateFilter('d.datedon', 0, 0, (int) $year, 1);
@@ -200,7 +200,7 @@ class DonationStats extends Stats
 	 */
 	public function getAllByYear()
 	{
-		$sql = "SELECT date_format(d.datedon,'%Y') as year, COUNT(*) as nb, SUM(d.".$this->field.") as total, AVG(".$this->field.") as avg";
+		$sql = "SELECT date_format(d.datedon,'%Y') as year, COUNT(*) as nb, SUM(d.".$this->db->sanitize($this->field).") as total, AVG(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
 		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;

From 231fdd50e2b1a13ae16c259084fe0f03e35be25d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 5 Feb 2025 16:05:20 +0100
Subject: [PATCH 498/602] FIX Prices didn't update when clone a propale with
 update prices

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

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 27cc54b38e3..48e65c735d6 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -224,7 +224,7 @@ if (empty($reshook)) {
 					}
 				}
 
-				$result = $object->createFromClone($user, $socid, (GETPOSTISSET('entity') ? GETPOSTINT('entity') : null), (GETPOSTINT('update_prices') ? true : false), (GETPOSTINT('update_desc') ? true : false));
+				$result = $object->createFromClone($user, $socid, (GETPOSTISSET('entity') ? GETPOSTINT('entity') : null), (GETPOSTISSET('update_prices') ? true : false), (GETPOSTISSET('update_desc') ? true : false));
 				if ($result > 0) {
 					$warningMsgLineList = array();
 					// check all product lines are to sell otherwise add a warning message for each product line is not to sell

From 45c62dec9ab4dff646e7862c39b93a5ebb80b351 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 5 Feb 2025 16:32:37 +0100
Subject: [PATCH 499/602] FIX wrong check

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

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 48e65c735d6..2db169bd49e 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -224,7 +224,7 @@ if (empty($reshook)) {
 					}
 				}
 
-				$result = $object->createFromClone($user, $socid, (GETPOSTISSET('entity') ? GETPOSTINT('entity') : null), (GETPOSTISSET('update_prices') ? true : false), (GETPOSTISSET('update_desc') ? true : false));
+				$result = $object->createFromClone($user, $socid, (GETPOSTISSET('entity') ? GETPOSTINT('entity') : null), (GETPOST('update_prices') == 'on' ? true : false), (GETPOST('update_desc') == 'on' ? true : false));
 				if ($result > 0) {
 					$warningMsgLineList = array();
 					// check all product lines are to sell otherwise add a warning message for each product line is not to sell

From 6cf72fbf77f8c9f527dbbb8c819f88ccf392a6dc Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 16:37:55 +0100
Subject: [PATCH 500/602] Fix travis

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index d3f1a32c067..80826abe00e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -511,6 +511,9 @@ script:
     php upgrade.php 20.0.0 21.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade20002100.log || cat $TRAVIS_BUILD_DIR/upgrade20002100.log
     php upgrade2.php 20.0.0 21.0.0 > $TRAVIS_BUILD_DIR/upgrade20002100-2.log || cat $TRAVIS_BUILD_DIR/upgrade20002100-2.log
     php step5.php 20.0.0 21.0.0 > $TRAVIS_BUILD_DIR/upgrade20002100-3.log || cat $TRAVIS_BUILD_DIR/upgrade20002100-3.log
+    php upgrade.php 21.0.0 22.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade21002200.log || cat $TRAVIS_BUILD_DIR/upgrade21002200.log
+    php upgrade2.php 21.0.0 22.0.0 > $TRAVIS_BUILD_DIR/upgrade21002200-2.log || cat $TRAVIS_BUILD_DIR/upgrade21002200-2.log
+    php step5.php 21.0.0 22.0.0 > $TRAVIS_BUILD_DIR/upgrade21002200-3.log || cat $TRAVIS_BUILD_DIR/upgrade21002200-3.log
     set +e
     echo
 

From 010aeec0b9ff20ffa28503a75d6aa537d1b48c08 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 16:52:13 +0100
Subject: [PATCH 501/602] Update card.php

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

diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 894b2de73d0..f628b2bd80e 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1282,13 +1282,12 @@ if ($action == 'create') {
 		// Create an array for form
 		$formquestion = array(
 			// 'text' => $langs->trans("ConfirmClone"),
-			// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value'
-			// => 1),
+			// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
 			array(
 				'type' => 'other',
 				'name' => 'socid',
 				'label' => $langs->trans("SelectThirdParty"),
-				'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '', '', 0, 0, null, 0, 'minwidth200')
+				'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '', '', 0, 0, array(), 0, 'minwidth200')
 			),
 			array(
 				'type' => 'checkbox',

From 0060cb2041c032bb9433d9e944830b4cee1d4b04 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 16:53:04 +0100
Subject: [PATCH 502/602] Update card.php

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

diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index f628b2bd80e..451f7197600 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1287,7 +1287,7 @@ if ($action == 'create') {
 				'type' => 'other',
 				'name' => 'socid',
 				'label' => $langs->trans("SelectThirdParty"),
-				'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '', '', 0, 0, array(), 0, 'minwidth200')
+				'value' => $form->select_company(GETPOSTINT('socid'), 'socid', '', '', 0, 0, array(), 0, 'minwidth200')
 			),
 			array(
 				'type' => 'checkbox',

From c4875fdc945a1e43a56a3000e97a64b044508718 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 17:08:39 +0100
Subject: [PATCH 503/602] Fix translation (do not show experimental
 translation)

---
 htdocs/core/tpl/admin_extrafields_add.tpl.php  | 4 ++--
 htdocs/core/tpl/admin_extrafields_edit.tpl.php | 4 ++--
 htdocs/langs/en_US/admin.lang                  | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 5a55b5b1f3a..25452bca8db 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -195,8 +195,8 @@ print $formadmin->selectTypeOfFields('type', GETPOST('type', 'alpha'));
 		<textarea name="param" id="param" cols="80" rows="<?php echo ROWS_4 ?>"><?php echo GETPOST('param', 'alpha'); ?></textarea>
 	</td><td>
 	<span id="helpselect" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 0, '', 0, 2, 'helpvalue1')?></span>
-	<span id="helpsellist" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue2')?></span>
-	<span id="helpchkbxlst" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue3')?></span>
+	<span id="helpsellist" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist").(getDolGlobalInt('MAIN_FEATUREES_LEVEL') > 0 ? '<br>'.$langs->trans("ExtrafieldParamHelpsellist2") : ''), 1, 0, '', 0, 2, 'helpvalue2')?></span>
+	<span id="helpchkbxlst" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist").(getDolGlobalInt('MAIN_FEATUREES_LEVEL') > 0 ? '<br>'.$langs->trans("ExtrafieldParamHelpsellist2") : ''), 1, 0, '', 0, 2, 'helpvalue3')?></span>
 	<span id="helplink" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink").'<br><br>'.$langs->trans("Examples").':<br>'.$listofexamplesforlink, 1, 0, '', 0, 2, 'helpvalue4')?></span>
 	<span id="helppassword" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 0, '', 0, 2, 'helpvalue5')?></span>
 	<span id="helpseparate" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpSeparator"), 1, 0, '', 0, 2, 'helpvalue6')?></span>
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 9c931d0503e..78e0e8a2da0 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -257,8 +257,8 @@ if (in_array($type, array_keys($typewecanchangeinto))) {
 		<textarea name="param" id="param" cols="80" rows="<?php echo ROWS_4 ?>"><?php echo dol_htmlcleanlastbr($param_chain); ?></textarea>
 	</td><td>
 	<span id="helpselect" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 0, '', 0, 2, 'helpvalue1')?></span>
-	<span id="helpsellist" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue2')?></span>
-	<span id="helpchkbxlst" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue3')?></span>
+	<span id="helpsellist" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist").(getDolGlobalInt('MAIN_FEATUREES_LEVEL') > 0 ? '<br>'.$langs->trans("ExtrafieldParamHelpsellist2") : ''), 1, 0, '', 0, 2, 'helpvalue2')?></span>
+	<span id="helpchkbxlst" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist").(getDolGlobalInt('MAIN_FEATUREES_LEVEL') > 0 ? '<br>'.$langs->trans("ExtrafieldParamHelpsellist2") : ''), 1, 0, '', 0, 2, 'helpvalue3')?></span>
 	<span id="helplink" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink").'<br><br>'.$langs->trans("Examples").':<br>'.$listofexamplesforlink, 1, 0, '', 0, 2, 'helpvalue4')?></span>
 	<span id="helppassword" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 0, '', 0, 2, 'helpvalue5')?></span>
 	<span id="helpseparate" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpSeparator"), 1, 0, '', 0, 2, 'helpvalue6')?></span>
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 322057484fc..8a2f17f3287 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -475,7 +475,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarily a primary int key<br>- filtersql is a condition. It must use the USF syntax. Example: (active:=:1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>If you want to filter on extrafields use syntax  extra.fieldcode=... (where fieldcode is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values coming from a table<br><br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarily a primary int key<br>- filtersql is a condition. It must use the USF syntax. Example: (active:=:1) to display only active value<br><br>You can also use $ID$ in filter which is the current id of current object<br>If you want to filter on extrafields use syntax  extra.fieldcode=... (where fieldcode is the code of extrafield)
+ExtrafieldParamHelpsellist2=<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation

From 2bc3b872f23bf115d51477735387d16cefc2e0d9 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 17:50:53 +0100
Subject: [PATCH 504/602] FIX #32880 - Tags are using a special rendering.

---
 htdocs/categories/class/categorie.class.php |  2 +-
 htdocs/core/class/extrafields.class.php     | 16 +++++++++++++---
 htdocs/core/tpl/extrafields_view.tpl.php    |  3 +++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index eeeba5b20c3..ffdfa80e1c4 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -322,7 +322,7 @@ class Categorie extends CommonObject
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => -1,),
 		'entity'	=> array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'default' => '1', 'notnull' => 1, 'index' => 1, 'position' => 5),
 		'fk_parent' => array('type' => 'integer', 'label' => 'Fkparent', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => -1, 'css' => 'maxwidth500 widthcentpercentminusxx',),
-		'label' => array('type' => 'varchar(180)', 'label' => 'Label', 'enabled' => 1, 'position' => 25, 'notnull' => 1, 'visible' => -1, 'alwayseditable' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'csslist' => 'tdoverflowmax150',),
+		'label' => array('type' => 'varchar(180)', 'label' => 'Label', 'enabled' => 1, 'position' => 25, 'notnull' => 1, 'visible' => -1, 'alwayseditable' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'csslist' => 'tdoverflowmax150', 'showoncombobox' => 1),
 		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'position' => 30, 'notnull' => 0, 'visible' => 0, 'alwayseditable' => 1,),
 		'type' => array('type' => 'integer', 'label' => 'Type', 'enabled' => 1, 'position' => 35, 'notnull' => 1, 'visible' => -1, 'alwayseditable' => 1,),
 		'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'position' => 40, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index f03f3dfe15d..3313aa39bc7 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -2065,7 +2065,7 @@ class ExtraFields
 		} elseif ($type == 'price') {
 			//$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 			if ($value || $value == '0') {
-				$value = price($value, 0, $outputlangs, 0, $conf->global->MAIN_MAX_DECIMALS_TOT, -1).' '.$outputlangs->getCurrencySymbol($conf->currency);
+				$value = price($value, 0, $outputlangs, 0, getDolGlobalInt('MAIN_MAX_DECIMALS_TOT'), -1).' '.$outputlangs->getCurrencySymbol($conf->currency);
 			}
 		} elseif ($type == 'pricecy') {
 			$currency = $conf->currency;
@@ -2076,7 +2076,7 @@ class ExtraFields
 				$value = $pricetmp[0];
 			}
 			if ($value || $value == '0') {
-				$value = price($value, 0, $outputlangs, 0, $conf->global->MAIN_MAX_DECIMALS_TOT, -1, $currency);
+				$value = price($value, 0, $outputlangs, 0, getDolGlobalInt('MAIN_MAX_DECIMALS_TOT'), -1, $currency);
 			}
 		} elseif ($type == 'select') {
 			$valstr = (!empty($param['options'][$value]) ? $param['options'][$value] : '');
@@ -2313,7 +2313,17 @@ class ExtraFields
 						$tmpobject = new $classname($this->db);
 						'@phan-var-force CommonObject $tmpobject';
 						$tmpobject->fetch($value);
-						$value = $tmpobject->getNomUrl(3);
+
+						if (get_class($tmpobject) == 'Categorie') {
+							// For category object, rendering must use the same method than the one deinfed into showCategories()
+							$color = $tmpobject->color;
+							$sfortag = '<span class="noborderoncategories"' . ($color ? ' style="background: #' . $color . ';"' : ' style="background: #bbb"') . '>';
+							$sfortag .= $tmpobject->getNomUrl(3);
+							$sfortag .= '</span>';
+							$value = $sfortag;
+						} else {
+							$value = $tmpobject->getNomUrl(3);
+						}
 					}
 				} else {
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 1c8c0104b43..0227bd16ba7 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -254,6 +254,7 @@ if (empty($reshook) && !empty($object->table_element) && isset($extrafields->att
 
 			//TODO Improve element and rights detection
 			if ($action == 'edit_extras' && $permok && GETPOST('attribute', 'restricthtml') == $tmpkeyextra) {
+				// Show the extrafield in create or edit mode
 				$fieldid = 'id';
 				if ($object->table_element == 'societe') {
 					$fieldid = 'socid';
@@ -269,6 +270,8 @@ if (empty($reshook) && !empty($object->table_element) && isset($extrafields->att
 
 				print '</form>';
 			} else {
+				// Show the extrafield in view mode
+
 				//var_dump($tmpkeyextra.'-'.$value.'-'.$object->table_element);
 				print $extrafields->showOutputField($tmpkeyextra, $value, '', $object->table_element, null, $object);
 			}

From daed8e303d2792b05deb43260d94cabc5d2bccf8 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 17:51:45 +0100
Subject: [PATCH 505/602] CSS v21

---
 htdocs/langs/en_US/admin.lang    |  2 +-
 htdocs/langs/en_US/errors.lang   |  1 +
 htdocs/theme/eldy/global.inc.php |  4 ++--
 htdocs/theme/md/style.css.php    |  5 +++--
 htdocs/user/card.php             | 16 ++++++++--------
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 8a2f17f3287..ad8c3bede2e 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -477,7 +477,7 @@ ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=List of values coming from a table<br><br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarily a primary int key<br>- filtersql is a condition. It must use the USF syntax. Example: (active:=:1) to display only active value<br><br>You can also use $ID$ in filter which is the current id of current object<br>If you want to filter on extrafields use syntax  extra.fieldcode=... (where fieldcode is the code of extrafield)
 ExtrafieldParamHelpsellist2=<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath[:AddCreateButtonOrNot[:Filter[:Sortfield]]]
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 302f4f0c0ed..ed6c0f707c8 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -437,3 +437,4 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
 ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
 EmptyMessageNotAllowedError=Empty message is not allowed
 ErrorIsNotInError=%s is not in error
+ErrorNoValueForSelectListType=Error, a value for this type of field is mandatory
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 46f5c1ddf45..7e597d769ba 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -7377,10 +7377,10 @@ span#select2-boxbookmark-container {
 
 /* To emulate select 2 style */
 .select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
-  padding: 3px 5px 2px 5px;
+  padding: 3px 5px 3px 5px;
   margin: 0 0 2px 3px;
   position: relative;
-  line-height: 13px;
+  /* line-height: 1em; */
   color: #333;
   cursor: default;
   border: 1px solid #aaaaaa;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 00a7322e0e1..72b5152557e 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -7228,10 +7228,10 @@ span#select2-boxbookmark-container, span#select2-boxcombo-container {
 
 /* To emulate select 2 style */
 .select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
-  padding: 3px 5px 2px 5px;
+  padding: 3px 5px 3px 5px;
   margin: 0 0 2px 3px;
   position: relative;
-  line-height: 13px;
+  /* line-height: 1em; */
   color: #444;
   cursor: default;
   border: 1px solid #ddd;
@@ -7328,6 +7328,7 @@ select.multiselectononeline {
 	box-shadow: none;
 	-webkit-box-shadow: none !important;
 	box-shadow: none !important;
+	margin-top: 1px !important;
 	margin-bottom: 0 !important;
 }
 span.noborderoncategories a, li.noborderoncategories a {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index eb985493718..5f62db21a13 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2559,32 +2559,32 @@ if ($action == 'create' || $action == 'adduserldap') {
 				}
 
 				if ($object->socid > 0 && !($object->contact_id > 0)) {	// external user but no link to a contact
-					print img_picto('', 'company').$form->select_company($object->socid, 'socid', '', '&nbsp;', 0, 0, array(), 0, 'maxwidth300');
-					print img_picto('', 'contact');
+					print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company($object->socid, 'socid', '', '&nbsp;', 0, 0, array(), 0, 'maxwidth300');
+					print img_picto('', 'contact', 'class="pictofixedwidth"');
 					//print $form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, 'maxwidth300', false, 1);
 					print $form->select_contact(0, 0, 'contactid', 1, '', '', 1, 'minwidth100imp widthcentpercentminusxx maxwidth300', true, 1);
 					if ($object->ldap_sid) {
 						print ' ('.$langs->trans("DomainUser").')';
 					}
 				} elseif ($object->socid > 0 && $object->contact_id > 0) {	// external user with a link to a contact
-					print img_picto('', 'company').$form->select_company($object->socid, 'socid', '', '&nbsp;', 0, 0, array(), 0, 'maxwidth300'); // We keep thirdparty empty, contact is already set
-					print img_picto('', 'contact');
+					print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company($object->socid, 'socid', '', '&nbsp;', 0, 0, array(), 0, 'maxwidth300'); // We keep thirdparty empty, contact is already set
+					print img_picto('', 'contact', 'class="pictofixedwidth"');
 					//print $form->selectcontacts(0, $object->contact_id, 'contactid', 1, '', '', 1, 'maxwidth300', false, 1);
 					print $form->select_contact(0, $object->contact_id, 'contactid', 1, '', '', 1, 'minwidth100imp widthcentpercentminusxx maxwidth300', true, 1);
 					if ($object->ldap_sid) {
 						print ' ('.$langs->trans("DomainUser").')';
 					}
 				} elseif (!($object->socid > 0) && $object->contact_id > 0) {	// internal user with a link to a contact
-					print img_picto('', 'company').$form->select_company(0, 'socid', '', '&nbsp;', 0, 0, array(), 0, 'maxwidth300'); // We keep thirdparty empty, contact is already set
-					print img_picto('', 'contact');
+					print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company(0, 'socid', '', '&nbsp;', 0, 0, array(), 0, 'maxwidth300'); // We keep thirdparty empty, contact is already set
+					print img_picto('', 'contact', 'class="pictofixedwidth"');
 					//print $form->selectcontacts(0, $object->contact_id, 'contactid', 1, '', '', 1, 'maxwidth300', false, 1);
 					print $form->select_contact(0, $object->contact_id, 'contactid', 1, '', '', 1, 'minwidth100imp widthcentpercentminusxx maxwidth300', true, 1);
 					if ($object->ldap_sid) {
 						print ' ('.$langs->trans("DomainUser").')';
 					}
 				} else {	// $object->socid is not > 0 here
-					print img_picto('', 'company').$form->select_company(0, 'socid', '', '&nbsp;', 0, 0, array(), 0, 'maxwidth300'); // We keep thirdparty empty, contact is already set
-					print img_picto('', 'contact');
+					print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company(0, 'socid', '', '&nbsp;', 0, 0, array(), 0, 'maxwidth300'); // We keep thirdparty empty, contact is already set
+					print img_picto('', 'contact', 'class="pictofixedwidth"');
 					//print $form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, 'maxwidth300', false, 1);
 					print $form->select_contact(0, 0, 'contactid', 1, '', '', 1, 'minwidth100imp widthcentpercentminusxx maxwidth300', true, 1);
 				}

From 4f318a5efd405852eaa640777fe1ec314634d087 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 17:50:53 +0100
Subject: [PATCH 506/602] FIX #32880 - Tags are using a special rendering.

---
 htdocs/core/class/extrafields.class.php  | 21 ++++++++++++++++-----
 htdocs/core/tpl/extrafields_view.tpl.php |  3 +++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 9b1f5921740..54e02a07454 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1975,7 +1975,7 @@ class ExtraFields
 		} elseif ($type == 'price') {
 			//$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 			if ($value || $value == '0') {
-				$value = price($value, 0, $outputlangs, 0, $conf->global->MAIN_MAX_DECIMALS_TOT, -1).' '.$outputlangs->getCurrencySymbol($conf->currency);
+				$value = price($value, 0, $outputlangs, 0, getDolGlobalInt('MAIN_MAX_DECIMALS_TOT'), -1).' '.$outputlangs->getCurrencySymbol($conf->currency);
 			}
 		} elseif ($type == 'pricecy') {
 			$currency = $conf->currency;
@@ -1986,7 +1986,7 @@ class ExtraFields
 				$value = $pricetmp[0];
 			}
 			if ($value || $value == '0') {
-				$value = price($value, 0, $outputlangs, 0, $conf->global->MAIN_MAX_DECIMALS_TOT, -1, $currency);
+				$value = price($value, 0, $outputlangs, 0, getDolGlobalInt('MAIN_MAX_DECIMALS_TOT'), -1, $currency);
 			}
 		} elseif ($type == 'select') {
 			$valstr = (!empty($param['options'][$value]) ? $param['options'][$value] : '');
@@ -2220,9 +2220,20 @@ class ExtraFields
 				if (!empty($classpath)) {
 					dol_include_once($InfoFieldList[1]);
 					if ($classname && class_exists($classname)) {
-						$object = new $classname($this->db);
-						$object->fetch($value);
-						$value = $object->getNomUrl(3);
+						$tmpobject = new $classname($this->db);
+						'@phan-var-force CommonObject $tmpobject';
+						$tmpobject->fetch($value);
+
+						if (get_class($tmpobject) == 'Categorie') {
+							// For category object, rendering must use the same method than the one deinfed into showCategories()
+							$color = $tmpobject->color;
+							$sfortag = '<span class="noborderoncategories"' . ($color ? ' style="background: #' . $color . ';"' : ' style="background: #bbb"') . '>';
+							$sfortag .= $tmpobject->getNomUrl(3);
+							$sfortag .= '</span>';
+							$value = $sfortag;
+						} else {
+							$value = $tmpobject->getNomUrl(3);
+						}
 					}
 				} else {
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 26c11f099a6..3f637f6d762 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -246,6 +246,7 @@ if (empty($reshook) && !empty($object->table_element) && isset($extrafields->att
 
 			//TODO Improve element and rights detection
 			if ($action == 'edit_extras' && $permok && GETPOST('attribute', 'restricthtml') == $tmpkeyextra) {
+				// Show the extrafield in create or edit mode
 				$fieldid = 'id';
 				if ($object->table_element == 'societe') {
 					$fieldid = 'socid';
@@ -261,6 +262,8 @@ if (empty($reshook) && !empty($object->table_element) && isset($extrafields->att
 
 				print '</form>';
 			} else {
+				// Show the extrafield in view mode
+
 				//var_dump($tmpkeyextra.'-'.$value.'-'.$object->table_element);
 				print $extrafields->showOutputField($tmpkeyextra, $value, '', $object->table_element);
 			}

From 9fc78cd1b6dd92ba21e9268883126db12d048ef9 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Wed, 5 Feb 2025 18:16:09 +0100
Subject: [PATCH 507/602] Fix regression

---
 htdocs/core/lib/files.lib.php | 2 +-
 htdocs/projet/tasks/task.php  | 2 +-
 test/phpunit/FilesLibTest.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index ee9b55b21c3..ba7a1e82968 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1448,7 +1448,7 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 					}
 				}
 			} else {
-				$ok = false; // to avoid false positive
+				$ok = true; // nothing to delete when glob is on must return ok
 				dol_syslog("No files to delete found", LOG_DEBUG);
 			}
 		} else {
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 4f1ca11848b..7e3070dd41f 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -210,7 +210,7 @@ if ($action == 'remove_file' && $user->rights->projet->creer) {
 	$upload_dir = $conf->project->dir_output."/".dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
 	$file = $upload_dir.'/'.dol_sanitizeFileName(GETPOST('file'));
 
-	$ret = dol_delete_file($file);
+	$ret = dol_delete_file($file, 1);
 	if ($ret) {
 		setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
 	} else {
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index 8f235f3e868..58dc52b6f4b 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -372,7 +372,7 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
 		// Again to test there is error when deleting a non existing file with option disableglob
 		$result=dol_delete_file($conf->admin->dir_temp.'/file3.csv', 1, 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertFalse($result, 'delete file that does not exists with disableglo must return ko');
+		$this->assertFalse($result, 'delete file that does not exists with disabling glob must return ko');
 
 		// Again to test there is no error when deleting a non existing file without option disableglob
 		$result=dol_delete_file($conf->admin->dir_temp.'/file3csv', 0, 1);

From 6968e199ee3477811e1d637992696e472e92545d Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Wed, 5 Feb 2025 18:45:29 +0100
Subject: [PATCH 508/602] Fix: Not loading all fields in fetch function

---
 htdocs/compta/facture/class/facture.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index d10bf9fd0b3..361a1c03013 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -14,7 +14,7 @@
  * Copyright (C) 2012-2014  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2013       Cedric Gross            <c.gross@kreiz-it.fr>
  * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
- * Copyright (C) 2016-2022  Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2016-2025  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018-2024  Alexandre Spangaro      <alexandre@inovea-conseil.com>
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2022       Sylvain Legrand         <contact@infras.fr>
@@ -6168,6 +6168,7 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= ' fd.date_start as date_start, fd.date_end as date_end, fd.fk_product_fournisseur_price as fk_fournprice, fd.buy_price_ht as pa_ht,';
 		$sql .= ' fd.info_bits, fd.special_code, fd.total_ht, fd.total_tva, fd.total_ttc, fd.total_localtax1, fd.total_localtax2, fd.rang,';
 		$sql .= ' fd.fk_code_ventilation,';
+		$sql .= ' fd.batch, fd.fk_warehouse,';
 		$sql .= ' fd.fk_unit, fd.fk_user_author, fd.fk_user_modif,';
 		$sql .= ' fd.situation_percent, fd.fk_prev_id,';
 		$sql .= ' fd.multicurrency_subprice,';
@@ -6216,6 +6217,8 @@ class FactureLigne extends CommonInvoiceLine
 			$this->total_localtax2		= $objp->total_localtax2;
 			$this->total_ttc			= $objp->total_ttc;
 			$this->fk_code_ventilation  = $objp->fk_code_ventilation;
+			$this->batch                = $objp->batch;
+			$this->fk_warehouse         = $objp->fk_warehouse;
 			$this->rang					= $objp->rang;
 			$this->fk_fournprice = $objp->fk_fournprice;
 			$marginInfos				= getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $this->fk_fournprice, $objp->pa_ht);

From 26c0b7778dac2812f6f7dd0f6abef0f34ab7bc40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 5 Feb 2025 18:46:47 +0100
Subject: [PATCH 509/602] fix missing translations

---
 dev/translation/ignore_translation_keys.lst | 2 --
 htdocs/langs/en_US/trips.lang               | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst
index a75b4fa5975..b30a09e3af5 100644
--- a/dev/translation/ignore_translation_keys.lst
+++ b/dev/translation/ignore_translation_keys.lst
@@ -418,8 +418,6 @@ FailedToExecutCommandJob
 FailedToGetCostPrice
 FailedToOpenFile
 FailedToReadFile
-FailedToSetPaid
-FailedToSetToCancel
 FailedToUncompressFile
 FailedToUpdatePrice
 FailedtoSetToApprove
diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang
index 6af362c5091..8d0b02c7bb2 100644
--- a/htdocs/langs/en_US/trips.lang
+++ b/htdocs/langs/en_US/trips.lang
@@ -157,3 +157,5 @@ TF_PEAGE=Toll
 TF_TAXI=Taxi
 TF_TRAIN=Train
 TF_TRIP=Transportation
+FailedToSetPaid=Failed to set as paid
+FailedToSetToCancel=Failed to cancel

From 16b861b1d71ecdbf10663aff06fedd336e227e22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 5 Feb 2025 18:52:38 +0100
Subject: [PATCH 510/602] fix missing translations

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

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 2a0f0d1bcb3..acc8803a7f1 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  * Copyright (C) 2020      Tobias Sekan         <tobias.sekan@startmail.com>
  * Copyright (C) 2020      Josep Lluís Amador   <joseplluis@lliuretic.cat>
- * Copyright (C) 2021-2024 Frédéric France		<frederic.france@free.fr>
+ * Copyright (C) 2021-2025  Frédéric France		<frederic.france@free.fr>
  * Copyright (C) 2024      Rafael San José      <rsanjose@alxarafe.com>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
@@ -484,6 +484,7 @@ if (isModEnabled('don') && $user->hasRight('don', 'lire')) {
 				$donationstatic->statut = $obj->status;
 				$donationstatic->status = $obj->status;
 
+				$label = '';
 				if (!empty($obj->socid)) {
 					$companystatic = new Societe($db);
 					$ret = $companystatic->fetch($obj->socid);

From a4ce67492def62f9d9fbf105dc6aed31a0266f97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 5 Feb 2025 18:55:32 +0100
Subject: [PATCH 511/602] fix CI

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

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 5fc3880c600..d50842056ea 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -473,6 +473,7 @@ if (isModEnabled('don') && $user->hasRight('don', 'lire')) {
 				$donationstatic->statut = $obj->status;
 				$donationstatic->status = $obj->status;
 
+				$label = '';
 				if (!empty($obj->socid)) {
 					$companystatic = new Societe($db);
 					$ret = $companystatic->fetch($obj->socid);

From 42c64af5786f50f6c182acd6694136cc6eac4ca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 5 Feb 2025 19:01:42 +0100
Subject: [PATCH 512/602] fix missing translations

---
 dev/translation/ignore_translation_keys.lst |  1 -
 htdocs/compta/index.php                     | 26 ++++++++++-----------
 htdocs/hrm/compare.php                      |  4 ++--
 htdocs/langs/en_US/hrm.lang                 |  1 +
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst
index b30a09e3af5..3945b5a4f8b 100644
--- a/dev/translation/ignore_translation_keys.lst
+++ b/dev/translation/ignore_translation_keys.lst
@@ -123,7 +123,6 @@ AmountOfTicketsByMonthHT
 AmountOfinterventions
 AmountOfinterventionsByMonthHT
 AnObjectWithThisClassNameAlreadyExists
-Anciennete
 AnnualByAccountDueDebtMode
 AnnualByAccountInputOutputMode
 Anonymous
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index acc8803a7f1..31c98fef78c 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -1,17 +1,17 @@
 <?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2022 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2015 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2015-2020 Juanjo Menent	    <jmenent@2byte.es>
- * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
- * Copyright (C) 2015      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
- * Copyright (C) 2020      Tobias Sekan         <tobias.sekan@startmail.com>
- * Copyright (C) 2020      Josep Lluís Amador   <joseplluis@lliuretic.cat>
- * Copyright (C) 2021-2025  Frédéric France		<frederic.france@free.fr>
- * Copyright (C) 2024      Rafael San José      <rsanjose@alxarafe.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+/* Copyright (C) 2001-2005  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2022  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2015  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2015-2020  Juanjo Menent	        <jmenent@2byte.es>
+ * Copyright (C) 2015       Jean-François Ferry	    <jfefe@aternatik.fr>
+ * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2016       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2019       Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2020       Tobias Sekan            <tobias.sekan@startmail.com>
+ * Copyright (C) 2020       Josep Lluís Amador      <joseplluis@lliuretic.cat>
+ * Copyright (C) 2021-2025  Frédéric France		    <frederic.france@free.fr>
+ * Copyright (C) 2024       Rafael San José         <rsanjose@alxarafe.com>
+ * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.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
diff --git a/htdocs/hrm/compare.php b/htdocs/hrm/compare.php
index 3a06e903ab2..30f1a09c664 100644
--- a/htdocs/hrm/compare.php
+++ b/htdocs/hrm/compare.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2021		Greg Rastklan				<greg.rastklan@atm-consulting.fr>
  * Copyright (C) 2021		Jean-Pascal BOUDET			<jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021		Grégory BLEMAND				<gregory.blemand@atm-consulting.fr>
- * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024-2025  Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
@@ -491,7 +491,7 @@ function displayUsersListWithPicto(&$TUser, $fk_usergroup = 0, $namelist = 'list
 			}
 
 			if (!empty($user->array_options['options_DDA'])) {
-				$desc .= '<br>' . $langs->trans('Anciennete') . ' : ' . dol_print_date(strtotime($user->array_options['options_DDA']));
+				$desc .= '<br>' . $langs->trans('Seniority') . ' : ' . dol_print_date(strtotime($user->array_options['options_DDA']));
 			}
 
 			$out .= '<li fk_user="' . $user->id . '" class="' . $class . '">
diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang
index 55669d08b4f..283cec1e7ee 100644
--- a/htdocs/langs/en_US/hrm.lang
+++ b/htdocs/langs/en_US/hrm.lang
@@ -81,6 +81,7 @@ TypeHowToBe=How to be
 TypeKnowledge=Knowledge
 AbandonmentComment=Abandonment comment
 DateLastEval=Date last evaluation
+Seniority=Seniority
 NoEval=No evaluation done for this employee
 HowManyUserWithThisMaxNote=Number of users with this rank
 HighestRank=Highest rank

From da81270fb87ee8d59bc2168e1c2a5309aefed9d9 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 5 Feb 2025 12:13:36 +0100
Subject: [PATCH 513/602] Qual Fix phan notices (margin)

---
 dev/tools/phan/baseline.txt           | 10 ++--------
 htdocs/core/class/html.form.class.php |  2 +-
 htdocs/margin/agentMargins.php        |  8 ++++----
 htdocs/margin/customerMargins.php     | 10 +++++-----
 htdocs/margin/productMargins.php      |  5 +++--
 htdocs/margin/tabs/productMargins.php |  7 ++++---
 6 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 47f28a257ba..716996e9d84 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,14 +9,14 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 2570+ occurrences
+    // PhanTypeMismatchArgument : 2560+ occurrences
     // PhanUndeclaredProperty : 530+ occurrences
     // PhanTypeMismatchArgumentNullable : 450+ occurrences
     // PhanUndeclaredGlobalVariable : 190+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 180+ occurrences
     // PhanPossiblyUndeclaredGlobalVariable : 160+ occurrences
-    // PhanTypeMismatchArgumentProbablyReal : 130+ occurrences
     // PhanTypeMismatchProperty : 130+ occurrences
+    // PhanTypeMismatchArgumentProbablyReal : 120+ occurrences
     // PhanPluginUnknownArrayMethodParamType : 110+ occurrences
     // PhanRedefineFunction : 40+ occurrences
     // PhanTypeExpectedObjectPropAccess : 40+ occurrences
@@ -187,7 +187,6 @@ return [
         'htdocs/bookmarks/card.php' => ['PhanTypeMismatchArgument'],
         'htdocs/categories/class/api_categories.class.php' => ['PhanAccessMethodProtected', 'PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
         'htdocs/categories/class/categorie.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/categories/edit.php' => ['PhanTypeMismatchArgument'],
         'htdocs/categories/photos.php' => ['PhanTypeMismatchArgument'],
         'htdocs/categories/viewcat.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/collab/index.php' => ['PhanParamTooMany', 'PhanUndeclaredProperty'],
@@ -453,7 +452,6 @@ return [
         'htdocs/core/modules/member/doc/pdf_standard_member.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/member/modules_cards.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/modAdherent.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/modAgenda.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/modCommande.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/modContrat.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/modDon.class.php' => ['PhanTypeMismatchArgument'],
@@ -624,10 +622,6 @@ return [
         'htdocs/loan/document.php' => ['PhanUndeclaredProperty'],
         'htdocs/loan/note.php' => ['PhanUndeclaredProperty'],
         'htdocs/loan/payment/payment.php' => ['PhanUndeclaredProperty'],
-        'htdocs/margin/agentMargins.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
-        'htdocs/margin/customerMargins.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/margin/productMargins.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/margin/tabs/productMargins.php' => ['PhanTypeMismatchArgument'],
         'htdocs/modulebuilder/index.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/modulebuilder/template/admin/setup.php' => ['PhanTypeMismatchArgument'],
         'htdocs/modulebuilder/template/ajax/myobject.php' => ['PhanTypeMismatchArgument'],
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 55699796ffa..8772968c774 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5498,7 +5498,7 @@ class Form
 	 * Return list of categories having chosen type
 	 *
 	 * @param 	string|int 			$type 			Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.
-	 * @param 	string 				$selected 		Id of category preselected or 'auto' (autoselect category if there is only one element). Not used if $outputmode = 1.
+	 * @param 	int|'auto'|''		$selected 		Id of category preselected or 'auto' (autoselect category if there is only one element). Not used if $outputmode = 1.
 	 * @param 	string 				$htmlname 		HTML field name
 	 * @param 	int 				$maxlength 		Maximum length for labels
 	 * @param 	int|string|int[]	$fromid 		Keep only or Exclude (depending on $include parameter) all categories (including the leaf $fromid) into the tree after this id $fromid.
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 95c4ba1ad06..9bf8f5c3a0d 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2012-2013	Christophe Battarel	<christophe.battarel@altairis.fr>
  * Copyright (C) 2014		Ferran Marcet		<fmarcet@2byte.es>
  * Copyright (C) 2015       Marcos García       <marcosgdf@gmail.com>
- * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -134,7 +134,7 @@ print '<table class="border centpercent">';
 
 print '<tr><td class="titlefield">'.$langs->trans('ContactOfInvoice').'</td>';
 print '<td class="maxwidthonsmartphone" colspan="4">';
-print img_picto('', 'user').$form->select_dolusers($agentid, 'agentid', 1, '', $user->hasRight('margins', 'read', 'all') ? 0 : 1, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+print img_picto('', 'user').$form->select_dolusers($agentid, 'agentid', 1, null, $user->hasRight('margins', 'read', 'all') ? 0 : 1, '', '', '0', 0, 0, '', 0, '', 'maxwidth300');
 print '</td></tr>';
 
 // Start date
@@ -345,8 +345,8 @@ if ($result) {
 
 			print '<tr class="oddeven">';
 			print "<td>".$group_array['htmlname']."</td>\n";
-			print '<td class="nowrap right"><span class="amount">'.price(price2num($pv, 'MT')).'</span></td>';
-			print '<td class="nowrap right"><span class="amount">'.price(price2num($pa, 'MT')).'</span></td>';
+			print '<td class="nowrap right"><span class="amount">'.price(price2num((float) $pv, 'MT')).'</span></td>';
+			print '<td class="nowrap right"><span class="amount">'.price(price2num((float) $pa, 'MT')).'</span></td>';
 			print '<td class="nowrap right"><span class="amount">'.price(price2num($marge, 'MT')).'</span></td>';
 			if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 				print '<td class="nowrap right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'</td>';
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 1ec4b367601..a3fbcca6799 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2012-2013	Christophe Battarel	<christophe.battarel@altairis.fr>
  * Copyright (C) 2014		Ferran Marcet		<fmarcet@2byte.es>
- * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -65,7 +65,7 @@ if (GETPOST('startdatemonth')) {
 	$startdate = dol_mktime(0, 0, 0, GETPOSTINT('startdatemonth'), GETPOSTINT('startdateday'), GETPOSTINT('startdateyear'));
 }
 if (GETPOST('enddatemonth')) {
-	$enddate = dol_mktime(23, 59, 59, GETPOSTINT('enddatemonth'), GETPOSTINT('enddateday'), GETPOST('enddateyear'));
+	$enddate = dol_mktime(23, 59, 59, GETPOSTINT('enddatemonth'), GETPOSTINT('enddateday'), GETPOSTINT('enddateyear'));
 }
 
 // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
@@ -135,7 +135,7 @@ if ($socid > 0) {
 } else {
 	print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
 	print '<td class="maxwidthonsmartphone" colspan="4">';
-	print img_picto('', 'company').$form->select_company(null, 'socid', '((client:=:1) OR (client:=:3))', 1, 0, 0);
+	print img_picto('', 'company').$form->select_company(0, 'socid', '((client:=:1) OR (client:=:3))', 1, 0, 0);
 	print '</td></tr>';
 }
 
@@ -155,7 +155,7 @@ if (!$sortfield) {
 }
 
 // Products
-$TRes = $form->select_produits_list('', '', '', '', 0, '', 1, 2, 1, 0, '', 1);
+$TRes = $form->select_produits_list(0, '', '', 0, 0, '', 1, 2, 1, 0, '', 1);
 
 $TProducts = array();
 foreach ($TRes as $prod) {
@@ -168,7 +168,7 @@ print img_picto('', 'product').$form->multiselectarray('products', $TProducts, $
 print '</td></tr>';
 
 // Categories
-$TCats = $form->select_all_categories('product', array(), '', 64, 0, 3);
+$TCats = $form->select_all_categories('product', 0, '', 64, 0, 3);
 
 print '<tr>';
 print '<td class="titlefield">'.$langs->trans('Category').'</td>';
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index dac098bf848..459a1376dfb 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2014		Ferran Marcet		<fmarcet@2byte.es>
  * Copyright (C) 2020		Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -77,7 +78,7 @@ if (GETPOST('startdatemonth')) {
 	$startdate = dol_mktime(0, 0, 0, GETPOSTINT('startdatemonth'), GETPOSTINT('startdateday'), GETPOSTINT('startdateyear'));
 }
 if (GETPOST('enddatemonth')) {
-	$enddate = dol_mktime(23, 59, 59, GETPOSTINT('enddatemonth'), GETPOSTINT('enddateday'), GETPOST('enddateyear'));
+	$enddate = dol_mktime(23, 59, 59, GETPOSTINT('enddatemonth'), GETPOSTINT('enddateday'), GETPOSTINT('enddateyear'));
 }
 
 // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
@@ -130,7 +131,7 @@ print img_picto('', 'product', 'class="pictofixedwidth"').$form->select_produits
 print '</td></tr>';
 
 // Categories
-$TCats = $form->select_all_categories('product', array(), '', 64, 0, 3);
+$TCats = $form->select_all_categories('product', 0, '', 64, 0, 3);
 
 print '<tr>';
 print '<td class="titlefield">'.$langs->trans('Category').'</td>';
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index cb4c213efc6..280ccc458ca 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2012-2013	Christophe Battarel	<christophe.battarel@altairis.fr>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -213,9 +214,9 @@ if ($id > 0 || !empty($ref)) {
 				$sql .= " sc.fk_soc, sc.fk_user,";
 			}
 			$sql .= " sum(d.total_ht) as selling_price,"; // may be negative or positive
-			$sql .= " ".$db->ifsql('f.type = 2', -1, 1)." * sum(d.qty) as qty,"; // not always positive in case of Credit note
-			$sql .= " ".$db->ifsql('f.type = 2', -1, 1)." * sum(d.qty * d.buy_price_ht * (d.situation_percent / 100)) as buying_price,"; // not always positive in case of Credit note
-			$sql .= " ".$db->ifsql('f.type = 2', -1, 1)." * sum(abs(d.total_ht) - (d.buy_price_ht * d.qty * (d.situation_percent / 100))) as marge"; // not always positive in case of Credit note
+			$sql .= " ".$db->ifsql('f.type = 2', '-1', '1')." * sum(d.qty) as qty,"; // not always positive in case of Credit note
+			$sql .= " ".$db->ifsql('f.type = 2', '-1', '1')." * sum(d.qty * d.buy_price_ht * (d.situation_percent / 100)) as buying_price,"; // not always positive in case of Credit note
+			$sql .= " ".$db->ifsql('f.type = 2', '-1', '1')." * sum(abs(d.total_ht) - (d.buy_price_ht * d.qty * (d.situation_percent / 100))) as marge"; // not always positive in case of Credit note
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."facture as f";
 			$sql .= ", ".MAIN_DB_PREFIX."facturedet as d";

From c5a4bcf9438aac0078f794fe58055e8c8c020f7d Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 6 Feb 2025 10:48:01 +0100
Subject: [PATCH 514/602] Debug v21

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

diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 5f833ed119d..9372a667b1e 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -74,7 +74,13 @@ if (isModEnabled('paypal')) {
  * @var string $dolibarr_main_url_root
  */
 
+// Hook to be used by external payment modules (ie Payzen, ...)
+$hookmanager = new HookManager($db);
+
+$hookmanager->initHooks(array('newpayment'));
+
 $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal", "stripe"));
+
 $PAYPALTOKEN = "";
 $PAYPALPAYERID = "";
 if (isModEnabled('paypal')) {

From e68b8652ad4fdc5e6a8a38a631c26c606c1ce555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Fali=C3=A8re?= <benjamin.faliere@altairis.fr>
Date: Thu, 6 Feb 2025 11:11:15 +0100
Subject: [PATCH 515/602] ENH: use a non existing domain in install data

The domain domain.com is an existing domain. If a user tests email sending with the default value, it will make useless requests to the domain.com domain. Here, I propose to change it by domain.tld, which can't exist
---
 htdocs/install/mysql/data/llx_const.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql
index ccf4c41defb..2e2d993fb97 100644
--- a/htdocs/install/mysql/data/llx_const.sql
+++ b/htdocs/install/mysql/data/llx_const.sql
@@ -50,7 +50,7 @@ insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_M
 
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_SMTP_SERVER','','chaine','Host or ip address for SMTP server',0,1);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_SMTP_PORT','','chaine','Port for SMTP server',0,1);
-insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_EMAIL_FROM','robot@domain.com','chaine','email emitter for Dolibarr automatic emails',0,1);
+insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_EMAIL_FROM','robot@domain.tld','chaine','email emitter for Dolibarr automatic emails',0,1);
 
 --
 -- IHM
@@ -87,7 +87,7 @@ insert into llx_const (name, value, type, note, visible) values ('MAIN_DELAY_EXP
 -- Mail Mailing
 --
 --insert into llx_const (name, value, type, note, visible) values ('MAIN_FIX_FOR_BUGGED_MTA','1','chaine','Set constant to fix email ending from PHP with some linux like system',1);
-insert into llx_const (name, value, type, note, visible) values ('MAILING_EMAIL_FROM','no-reply@mydomain.com','chaine','EMail emmetteur pour les envois d emailings',0);
+insert into llx_const (name, value, type, note, visible) values ('MAILING_EMAIL_FROM','no-reply@mydomain.tld','chaine','EMail emmetteur pour les envois d emailings',0);
 
 
 --

From 7f78e009c62eaa838bcab550effe10a02ea5f497 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 6 Feb 2025 11:39:56 +0100
Subject: [PATCH 516/602] FIX line_date_xxx into ODF was not loaded

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

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index f37bfc34085..36d7a5919b2 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -933,8 +933,9 @@ abstract class CommonDocGenerator
 			array('line_date_end_rfc', 'date_end', 'dayrfc', 'auto', null)
 		);
 		foreach ($date_specs as $date_spec) {
-			if (property_exists($line, $date_spec[1])) {
-				$resarray[$date_spec[0]] = dol_print_date($line->${$date_spec[1]}, $date_spec[2], $date_spec[3], $date_spec[4]);
+			$propertyname = $date_spec[1];
+			if (property_exists($line, $propertyname)) {
+				$resarray[$date_spec[0]] = dol_print_date($line->$propertyname, $date_spec[2], $date_spec[3], $date_spec[4]);
 			}
 		}
 
@@ -1126,9 +1127,9 @@ abstract class CommonDocGenerator
 	 * Define array with couple substitution key => substitution value
 	 *
 	 * @param   array<string,CommonObject|float|int|string>	$object	Dolibarr Object
-	 * @param   Translate	$outputlangs	Language object for output
-	 * @param   boolean|int	$recursive		Want to fetch child array or child object.
-	 * @return	array<string,mixed>			Array of substitution key->code
+	 * @param   Translate			$outputlangs	Language object for output
+	 * @param   boolean|int			$recursive		Want to fetch child array or child object.
+	 * @return	array<string,mixed>					Array of substitution key->code
 	 */
 	public function get_substitutionarray_each_var_object(&$object, $outputlangs, $recursive = 1)
 	{

From 1195777042251a7418f6f7e6842e97ba7fd5262e Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 6 Feb 2025 11:39:56 +0100
Subject: [PATCH 517/602] FIX line_date_xxx into ODF was not loaded

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

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 632f7e1b3b3..892069373d8 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -925,8 +925,9 @@ abstract class CommonDocGenerator
 			array('line_date_end_rfc', 'date_end', 'dayrfc', 'auto', null)
 		);
 		foreach ($date_specs as $date_spec) {
-			if (property_exists($line, $date_spec[1])) {
-				$resarray[$date_spec[0]] = dol_print_date($line->${$date_spec[1]}, $date_spec[2], $date_spec[3], $date_spec[4]);
+			$propertyname = $date_spec[1];
+			if (property_exists($line, $propertyname)) {
+				$resarray[$date_spec[0]] = dol_print_date($line->$propertyname, $date_spec[2], $date_spec[3], $date_spec[4]);
 			}
 		}
 
@@ -1082,9 +1083,9 @@ abstract class CommonDocGenerator
 	 * Define array with couple substitution key => substitution value
 	 *
 	 * @param   array<string,CommonObject|float|int|string>	$object	Dolibarr Object
-	 * @param   Translate	$outputlangs	Language object for output
-	 * @param   boolean|int	$recursive		Want to fetch child array or child object.
-	 * @return	array<string,mixed>			Array of substitution key->code
+	 * @param   Translate			$outputlangs	Language object for output
+	 * @param   boolean|int			$recursive		Want to fetch child array or child object.
+	 * @return	array<string,mixed>					Array of substitution key->code
 	 */
 	public function get_substitutionarray_each_var_object(&$object, $outputlangs, $recursive = 1)
 	{

From 52a4cd597525f2dba46ba96fae5cfb429e586388 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 6 Feb 2025 12:01:21 +0100
Subject: [PATCH 518/602] FIX get_substitutionarray_each_var_object was
 returning empty array

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

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 36d7a5919b2..884639b234e 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1126,7 +1126,7 @@ abstract class CommonDocGenerator
 	/**
 	 * Define array with couple substitution key => substitution value
 	 *
-	 * @param   array<string,CommonObject|float|int|string>	$object	Dolibarr Object
+	 * @param   array<string,CommonObject|float|int|string>|CommonObject	$object		Dolibarr Object
 	 * @param   Translate			$outputlangs	Language object for output
 	 * @param   boolean|int			$recursive		Want to fetch child array or child object.
 	 * @return	array<string,mixed>					Array of substitution key->code
@@ -1135,7 +1135,9 @@ abstract class CommonDocGenerator
 	{
 		// phpcs:enable
 		$array_other = array();
-		if (is_array($object) && count($object)) {
+
+		if ((is_array($object) && count($object)) || is_object($object)) {
+			// Loop on each entry of array or on each property of object
 			foreach ($object as $key => $value) {
 				if (in_array($key, array('db', 'fields', 'lines', 'modelpdf', 'model_pdf'))) {		// discard some properties
 					continue;

From 0772222900ef5c690df8ffb0d396e4436fd94aac Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 6 Feb 2025 12:04:41 +0100
Subject: [PATCH 519/602] QUAL Add get_substitutionarray_each_var_object in
 phpunit

---
 htdocs/commande/class/commande.class.php      |  2 +-
 htdocs/core/class/commonobject.class.php      |  2 +-
 .../doc/doc_generic_order_odt.modules.php     |  3 ++
 test/phpunit/CommonClassTest.class.php        |  3 ++
 test/phpunit/ODFTest.php                      | 38 +++++++++++++++++++
 5 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 28c11b0b566..c8c3c37ba53 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -4073,7 +4073,7 @@ class Commande extends CommonOrder
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-		global $conf, $langs;
+		global $langs;
 
 		$langs->load("orders");
 		$outputlangs->load("products");
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index fb52b9b8fc9..3758c0c3d6c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5801,7 +5801,7 @@ abstract class CommonObject
 	 */
 	protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams = null)
 	{
-		global $conf, $langs, $user, $hookmanager, $action;
+		global $conf, $langs, $hookmanager, $action;
 
 		$srctemplatepath = '';
 
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 41ff51ed49d..5ee13332781 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -38,6 +38,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
 
 /**
  *	Class to build documents using ODF templates generator
+ *
+ *  This files is called by the "$obj = new $classname($this->db);" found into
+ *  the commobject.class.php->commonGenerateDocument() called by $object->generateDocument()
  */
 class doc_generic_order_odt extends ModelePDFCommandes
 {
diff --git a/test/phpunit/CommonClassTest.class.php b/test/phpunit/CommonClassTest.class.php
index 4f75b562dcd..7e71bfda436 100644
--- a/test/phpunit/CommonClassTest.class.php
+++ b/test/phpunit/CommonClassTest.class.php
@@ -37,6 +37,9 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 
 
+// Delete the log file to avoid problem of writing permission on it
+@unlink(DOL_DATA_ROOT.'/dolibarr.log');
+
 
 if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
diff --git a/test/phpunit/ODFTest.php b/test/phpunit/ODFTest.php
index 8700f0a52a6..441469edd48 100644
--- a/test/phpunit/ODFTest.php
+++ b/test/phpunit/ODFTest.php
@@ -28,6 +28,7 @@ global $conf,$user,$langs,$db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/commande/class/commande.class.php';
 require_once dirname(__FILE__).'/../../htdocs/includes/odtphp/odf.php';
 require_once dirname(__FILE__).'/CommonClassTest.class.php';
 
@@ -50,6 +51,43 @@ $langs->load("main");
  */
 class ODFTest extends CommonClassTest
 {
+	/**
+	 * test ODF convertVarToOdf
+	 *
+	 * @return int
+	 */
+	public function testGetSubstitutionarrayEachVarObject()
+	{
+		global $conf,$user,$langs,$db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new Commande($db);
+		$localobject->fetch(1);
+
+		$localobject->lines[0]->date_start = dol_now();
+		$localobject->lines[0]->date_end = dol_now() + 84600;
+
+		$result = $localobject->generateDocument('generic_order_odt', $langs);
+		print __METHOD__." result=".$result."\n";
+
+		$this->assertEquals(1, $result);
+
+
+		$filefound = DOL_DOCUMENT_ROOT.'/core/modules/commande/doc/doc_generic_order_odt.modules.php';
+		require_once $filefound;
+
+		$objdoc = new doc_generic_order_odt($db);
+
+		$result = $objdoc->get_substitutionarray_each_var_object($localobject, $langs);
+
+		$this->assertEquals(1, $result['object_id']);
+	}
+
+
+
 	/**
 	 * test ODF convertVarToOdf
 	 *

From 4d97945cf96a47f2463d5c5c65fb766a3a293457 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 6 Feb 2025 12:01:21 +0100
Subject: [PATCH 520/602] FIX get_substitutionarray_each_var_object was
 returning empty array

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

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 892069373d8..ba37cce06b2 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1082,7 +1082,7 @@ abstract class CommonDocGenerator
 	/**
 	 * Define array with couple substitution key => substitution value
 	 *
-	 * @param   array<string,CommonObject|float|int|string>	$object	Dolibarr Object
+	 * @param   array<string,CommonObject|float|int|string>|CommonObject	$object		Dolibarr Object
 	 * @param   Translate			$outputlangs	Language object for output
 	 * @param   boolean|int			$recursive		Want to fetch child array or child object.
 	 * @return	array<string,mixed>					Array of substitution key->code
@@ -1091,7 +1091,9 @@ abstract class CommonDocGenerator
 	{
 		// phpcs:enable
 		$array_other = array();
-		if (is_array($object) && count($object)) {
+
+		if ((is_array($object) && count($object)) || is_object($object)) {
+			// Loop on each entry of array or on each property of object
 			foreach ($object as $key => $value) {
 				if (in_array($key, array('db', 'fields', 'lines', 'modelpdf', 'model_pdf'))) {		// discard some properties
 					continue;

From 142f62b4b9bc43cc40b590b0e0e19adb9e3de2e8 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 6 Feb 2025 12:32:00 +0100
Subject: [PATCH 521/602] FIX bad link, page size lost

---
 htdocs/categories/viewcat.php | 42 +++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 725e43717cd..fcef409cc55 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -298,9 +298,9 @@ dol_banner_tab($object, 'label', $linkback, ($user->socid ? 0 : 1), 'label', 'la
 // Confirmation of deletion
 if ($action == 'delete') {
 	if ($backtopage) {
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type.'&backtopage='.urlencode($backtopage), $langs->trans('DeleteCategory'), $langs->trans('ConfirmDeleteCategory'), 'confirm_delete', '', '', 2);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.urlencode($type).'&backtopage='.urlencode($backtopage), $langs->trans('DeleteCategory'), $langs->trans('ConfirmDeleteCategory'), 'confirm_delete', '', '', 2);
 	} else {
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type, $langs->trans('DeleteCategory'), $langs->trans('ConfirmDeleteCategory'), 'confirm_delete', '', '', 1);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.urlencode($type), $langs->trans('DeleteCategory'), $langs->trans('ConfirmDeleteCategory'), 'confirm_delete', '', '', 1);
 	}
 }
 
@@ -349,11 +349,11 @@ if ($reshook < 0) {
 if (empty($reshook)) {
 	if ($user->hasRight('categorie', 'creer')) {
 		$socid = ($object->socid ? "&socid=".$object->socid : "");
-		print '<a class="butAction" href="edit.php?id='.$object->id.$socid.'&type='.$type.'">'.$langs->trans("Modify").'</a>';
+		print '<a class="butAction" href="edit.php?id='.$object->id.$socid.'&type='.urlencode($type).'">'.$langs->trans("Modify").'</a>';
 	}
 
 	if ($user->hasRight('categorie', 'supprimer')) {
-		print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'&type='.$type.'&backtolist='.urlencode($backtolist).'">'.$langs->trans("Delete").'</a>';
+		print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'&type='.urlencode($type).'&backtolist='.urlencode($backtolist).'">'.$langs->trans("Delete").'</a>';
 	}
 }
 
@@ -363,8 +363,8 @@ $newcardbutton = '';
 if ($user->hasRight('categorie', 'creer')) {
 	$link = DOL_URL_ROOT.'/categories/card.php';
 	$link .= '?action=create';
-	$link .= '&type='.$type;
-	$link .= '&catorigin='.$object->id;
+	$link .= '&type='.urlencode($type);
+	$link .= '&catorigin='.((int) $object->id);
 	$link .= '&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type='.$type.'&id='.$id);
 
 	$newcardbutton = '<div class="right">';
@@ -462,13 +462,13 @@ if ($cats < 0) {
 		$entry .= $counter;
 
 		$entry .= '<td class="right" width="20px;">';
-		$entry .= '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.$type.'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?id='.$id.'&type='.$type).'">'.img_view().'</a>';
+		$entry .= '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.urlencode($type).'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?id='.$id.'&type='.urlencode($type)).'">'.img_view().'</a>';
 		$entry .= '</td>';
 		$entry .= '<td class="right" width="20px;">';
-		$entry .= '<a class="editfielda" href="'.DOL_URL_ROOT.'/categories/edit.php?id='.$val['id'].'&type='.$type.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$id.'&type='.$type).'">'.img_edit().'</a>';
+		$entry .= '<a class="editfielda" href="'.DOL_URL_ROOT.'/categories/edit.php?id='.$val['id'].'&type='.urlencode($type).'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$id.'&type='.urlencode($type)).'">'.img_edit().'</a>';
 		$entry .= '</td>';
 		$entry .= '<td class="right" width="20px;">';
-		$entry .= '<a class="deletefilelink" href="'.DOL_URL_ROOT.'/categories/viewcat.php?action=delete&token='.newToken().'&id='.$val['id'].'&type='.$type.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$id.'&type='.$type).'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?id='.$id.'&type='.$type).'">'.img_delete().'</a>';
+		$entry .= '<a class="deletefilelink" href="'.DOL_URL_ROOT.'/categories/viewcat.php?action=delete&token='.newToken().'&id='.$val['id'].'&type='.urlencode($type).'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$id.'&type='.urlencode($type)).'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?id='.$id.'&type='.urlencode($type)).'">'.img_delete().'</a>';
 		$entry .= '</td>';
 
 		$entry .= '</tr>';
@@ -517,7 +517,7 @@ $arrayofmassactions = array(
 );
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-$typeid = $type;
+$typeid = $type;	// warning, typeid can be a string
 
 
 // List of products or services (type is type of category)
@@ -579,7 +579,7 @@ if ($type == Categorie::TYPE_PRODUCT) {
 					// Link to delete from category
 					print '<td class="right">';
 					if ($permission) {
-						print '<a class="reposition" href= "'.$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".((int) $object->id)."&type=".urlencode($typeid)."&action=unlink&token=".newToken()."&removeelem=".$prod->id.'">';
+						print '<a class="reposition" href= "'.$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".((int) $object->id)."&type=".urlencode($typeid)."&action=unlink&token=".newToken()."&removeelem=".((int) $prod->id).($limit ? '&limit='.$limit : '').'">';
 						//print $langs->trans("DeleteFromCat");
 						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', 0, 0, 0, '', 'paddingleft');
 						print "</a>";
@@ -659,7 +659,7 @@ if ($type == Categorie::TYPE_CUSTOMER) {
 					// Link to delete from category
 					print '<td class="right">';
 					if ($permission) {
-						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$soc->id."'>";
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".urlencode($typeid)."&action=unlink&token=".newToken()."&removeelem=".((int) $soc->id).($limit ? '&limit='.$limit : '')."'>";
 						//print $langs->trans("DeleteFromCat");
 						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', 0, 0, 0, '', 'paddingleft');
 						print "</a>";
@@ -740,7 +740,7 @@ if ($type == Categorie::TYPE_SUPPLIER) {
 					// Link to delete from category
 					print '<td class="right">';
 					if ($permission) {
-						print '<a class="reposition" href="'.$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$soc->id.($limit ? '&limit='.$limit : '').'">';
+						print '<a class="reposition" href="'.$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".urlencode($typeid)."&action=unlink&token=".newToken()."&removeelem=".((int) $soc->id).($limit ? '&limit='.$limit : '').'">';
 						//print $langs->trans("DeleteFromCat");
 						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', 0, 0, 0, '', 'paddingleft');
 						print "</a>";
@@ -825,7 +825,7 @@ if ($type == Categorie::TYPE_MEMBER) {
 					// Link to delete from category
 					print '<td class="right">';
 					if ($permission) {
-						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$member->id."'>";
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".urlencode($typeid)."&action=unlink&token=".newToken()."&removeelem=".((int) $member->id).($limit ? '&limit='.$limit : '')."'>";
 						//print $langs->trans("DeleteFromCat");
 						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', 0, 0, 0, '', 'paddingleft');
 						print "</a>";
@@ -911,7 +911,7 @@ if ($type == Categorie::TYPE_CONTACT) {
 					// Link to delete from category
 					print '<td class="right">';
 					if ($permission) {
-						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$contact->id."'>";
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".urlencode($typeid)."&action=unlink&token=".newToken()."&removeelem=".((int) $contact->id).($limit ? '&limit='.$limit : '')."'>";
 						//print $langs->trans("DeleteFromCat");
 						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', 0, 0, 0, '', 'paddingleft');
 						print "</a>";
@@ -994,7 +994,7 @@ if ($type == Categorie::TYPE_ACCOUNT) {
 					// Link to delete from category
 					print '<td class="right">';
 					if ($permission) {
-						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$account->id."'>";
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".urlencode($typeid)."&action=unlink&token=".newToken()."&removeelem=".((int) $account->id).($limit ? '&limit='.$limit : '')."'>";
 						//print $langs->trans("DeleteFromCat");
 						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', 0, 0, 0, '', 'paddingleft');
 						print "</a>";
@@ -1076,7 +1076,7 @@ if ($type == Categorie::TYPE_PROJECT) {
 					// Link to delete from category
 					print '<td class="right">';
 					if ($permission) {
-						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$project->id."'>";
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".urlencode($typeid)."&action=unlink&token=".newToken()."&removeelem=".((int) $project->id).($limit ? '&limit='.$limit : '')."'>";
 						//print $langs->trans("DeleteFromCat");
 						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', 0, 0, 0, '', 'paddingleft');
 						print "</a>";
@@ -1154,7 +1154,7 @@ if ($type == Categorie::TYPE_USER) {
 					// Link to delete from category
 					print '<td class="right">';
 					if ($user->hasRight('user', 'user', 'creer')) {
-						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$userentry->id."'>";
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".urlencode($typeid)."&action=unlink&token=".newToken()."&removeelem=".((int) $userentry->id).($limit ? '&limit='.$limit : '')."'>";
 						//print $langs->trans("DeleteFromCat");
 						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', 0, 0, 0, '', 'paddingleft');
 						print "</a>";
@@ -1225,7 +1225,7 @@ if ($type == Categorie::TYPE_WAREHOUSE) {
 					// Link to delete from category
 					print '<td class="right">';
 					if ($permission) {
-						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$warehouse->id."'>";
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".urlencode($typeid)."&action=unlink&token=".newToken()."&removeelem=".((int) $warehouse->id).($limit ? '&limit='.$limit : '')."'>";
 						//print $langs->trans("DeleteFromCat");
 						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', 0, 0, 0, '', 'paddingleft');
 						print "</a>";
@@ -1305,7 +1305,7 @@ if ($type == Categorie::TYPE_TICKET) {
 					// Link to delete from category
 					print '<td class="right">';
 					if ($permission) {
-						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$ticket->id."'>";
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".urlencode($typeid)."&action=unlink&token=".newToken()."&removeelem=".((int) $ticket->id).($limit ? '&limit='.$limit : '')."'>";
 						//print $langs->trans("DeleteFromCat");
 						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', 0, 0, 0, '', 'paddingleft');
 						print "</a>";
@@ -1391,7 +1391,7 @@ if ($type == Categorie::TYPE_FICHINTER) {
 					// Link to delete from category
 					print '<td class="right">';
 					if ($permission) {
-						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$fichinter->id."'>";
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".((int) $object->id)."&type=".urlencode($typeid)."&action=unlink&token=".newToken()."&removeelem=".((int) $fichinter->id).($limit ? '&limit='.$limit : '')."'>";
 						print $langs->trans("DeleteFromCat");
 						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', 0, 0, 0, '', 'paddingleft');
 						print "</a>";

From a9ef15ee55349c7dea85feec2febe368c64151a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 6 Feb 2025 13:26:58 +0100
Subject: [PATCH 522/602] fix missing translations

---
 dev/translation/ignore_translation_keys.lst | 1 -
 htdocs/langs/en_US/main.lang                | 1 +
 htdocs/public/donations/donateurs_code.php  | 4 ++--
 htdocs/website/index.php                    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst
index 3945b5a4f8b..68932ab360e 100644
--- a/dev/translation/ignore_translation_keys.lst
+++ b/dev/translation/ignore_translation_keys.lst
@@ -125,7 +125,6 @@ AmountOfinterventionsByMonthHT
 AnObjectWithThisClassNameAlreadyExists
 AnnualByAccountDueDebtMode
 AnnualByAccountInputOutputMode
-Anonymous
 AnotherField
 Applications
 Articles
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index b87d3e0c148..cf6093a6061 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1349,3 +1349,4 @@ EcoTax=Eco-Tax
 GroupingLine=Grouping line
 AllTime=From start
 Transferred=Transferred
+Anonymous=Anonymous
diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
index e801451df37..b2d2d2c0e2b 100644
--- a/htdocs/public/donations/donateurs_code.php
+++ b/htdocs/public/donations/donateurs_code.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2018-2024	Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.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
@@ -67,7 +67,7 @@ if (!isModEnabled('don')) {
 }
 
 
-$langs->load("donations");
+$langs->load("donations", "main");
 
 
 /*
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index baec057484e..fb33d4c0468 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2016-2023  Laurent Destailleur  		<eldy@users.sourceforge.net>
  * Copyright (C) 2020 	    Nicolas ZABOURI				<info@inovea-conseil.com>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024-2025  Frédéric France             <frederic.france@free.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
@@ -4809,7 +4809,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 	print '<tr class="trpublicauthor hidden"><td>';
 	print $langs->trans('PublicAuthorAlias');
 	print '</td><td>';
-	print '<input type="text" class="flat minwidth300" name="WEBSITE_AUTHORALIAS" value="'.dol_escape_htmltag($pageauthoralias).'" placeholder="Anonymous">';
+	print '<input type="text" class="flat minwidth300" name="WEBSITE_AUTHORALIAS" value="'.dol_escape_htmltag($pageauthoralias).'" placeholder="'.dol_escape_htmltag($langs->trans("Anonymous")).'">';
 	print '</td></tr>';
 
 	print '<tr><td class="tdhtmlheader tdtop">';

From ea2728afa0b811534d59d682b2152b42f16de3c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 6 Feb 2025 13:31:18 +0100
Subject: [PATCH 523/602] fix missing translations

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

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index fb33d4c0468..8ff1b796049 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -64,7 +64,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
  */
 
 // Load translation files required by the page
-$langs->loadLangs(array("admin", "other", "website", "errors"));
+$langs->loadLangs(array("admin", "other", "website", "main", "errors"));
 
 // Security check
 if (!$user->hasRight('website', 'read')) {
@@ -2078,12 +2078,10 @@ if ($action == 'updatemeta' && $usercanedit) {
 			$langs->load("errors");
 			if ($db->lasterrno == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				$error++;
-				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorAPageWithThisNameOrAliasAlreadyExists"), null, 'errors');
 				$action = 'editmeta';
 			} else {
 				$error++;
-				$langs->load("errors");
 				setEventMessages($objectpage->error, $objectpage->errors, 'errors');
 				$action = 'editmeta';
 			}

From e1c9dd32a77422d2772075184abe05fd77be0b50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 6 Feb 2025 13:48:23 +0100
Subject: [PATCH 524/602] fix missing translations

---
 dev/translation/ignore_translation_keys.lst | 2 --
 htdocs/langs/en_US/sendings.lang            | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst
index 68932ab360e..c8e2dfc5294 100644
--- a/dev/translation/ignore_translation_keys.lst
+++ b/dev/translation/ignore_translation_keys.lst
@@ -199,7 +199,6 @@ CloneProgression
 CloneTimes
 Close Done
 Close2
-CloseShipment
 CodeTooltipHelp
 Column
 Combination
@@ -214,7 +213,6 @@ ConfirmActionMyObject
 ConfirmActionTarget
 ConfirmCloneMyObject
 ConfirmCloneTask
-ConfirmCloseShipment
 ConfirmCreateAdherent
 ConfirmDeleteAdherent
 ConfirmDeleteIndividual
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index f2fafacff93..bc12badb248 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -90,3 +90,5 @@ TypeContact_shipping_external_BILLING=Customer invoice contact
 TypeContact_shipping_external_CUSTOMER=Customer contact following-up shipping
 TypeContact_shipping_external_SHIPPING=Customer contact for shipping
 TypeContact_shipping_external_DELIVERY=Customer contact for delivery
+CloseShipment=Close shipment
+ConfirmCloseShipment=Confirm close shipment

From adb455e4a558b3c011870d922996247917b6e26c Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 6 Feb 2025 13:51:35 +0100
Subject: [PATCH 525/602] NEW Can set isMandatory property in generic setup
 framework

---
 htdocs/core/class/html.formsetup.class.php    | 5 ++---
 htdocs/modulebuilder/template/admin/setup.php | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index ce549b8f52f..99c78c1459a 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -329,7 +329,7 @@ class FormSetup
 			$this->setupNotEmpty++;
 			$out .= '<tr class="'.$trClass.'">';
 
-			$out .= '<td class="col-setup-title">';
+			$out .= '<td class="col-setup-title'.($item->fieldParams['isMandatory'] ? ' fieldrequired' : '').'">';
 			$out .= '<span id="helplink'.$item->confKey.'" class="spanforparamtooltip">';
 			$out .= $this->form->textwithpicto($item->getNameText(), $item->getHelpText(), 1, 'info', '', 0, 3, 'tootips'.$item->confKey);
 			$out .= '</span>';
@@ -931,7 +931,7 @@ class FormSetupItem
 		} elseif ($this->type == 'selectBankAccount') {
 			if (isModEnabled("bank")) {
 				$selected = (empty($this->fieldValue) ? '' : $this->fieldValue);
-				$out .= $this->form->select_comptes($selected, $this->confKey, 0, '', 0, '', 0, '', 1);
+				$out .= img_picto('', 'bank', 'class="pictofixedwidth"').$this->form->select_comptes($selected, $this->confKey, 0, '', 0, '', 0, '', 1);
 			}
 		} elseif ($this->type == 'password') {
 			$out .= $this->generateInputFieldPassword('dolibarr');
@@ -977,7 +977,6 @@ class FormSetupItem
 	 */
 	public function generateInputFieldHtml()
 	{
-		global $conf;
 		require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
 		$doleditor = new DolEditor($this->confKey, $this->fieldValue, '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%');
 		return $doleditor->Create(1);
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 306a28aa5b9..ad7fc9de5de 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -112,6 +112,7 @@ if (!$user->admin) {
 
 // Setup conf for selection of an URL
 $item = $formSetup->newItem('MYMODULE_MYPARAM1');
+$item->fieldParams['isMandatory'] = 1;
 $item->fieldAttr['placeholder'] = (empty($_SERVER['HTTPS']) ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'];
 $item->cssClass = 'minwidth500';
 

From 9043d1ad3e8d7e3f98c3488162c9ed435f4f64cb Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 6 Feb 2025 13:59:58 +0100
Subject: [PATCH 526/602] Fix doc

---
 htdocs/modulebuilder/template/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/modulebuilder/template/README.md b/htdocs/modulebuilder/template/README.md
index d6e49e154b7..978192bb622 100644
--- a/htdocs/modulebuilder/template/README.md
+++ b/htdocs/modulebuilder/template/README.md
@@ -34,10 +34,10 @@ You can also get a ready-to-use instance in the cloud from https://saas.dolibarr
 If the module is a ready-to-deploy zip file, so with a name `module_xxx-version.zip` (e.g., when downloading it from a marketplace like [Dolistore](https://www.dolistore.com)),
 go to menu `Home> Setup> Modules> Deploy external module` and upload the zip file.
 
-Note: If this screen tells you that there is no "custom" directory, check that your setup is correct:
-
 <!--
 
+Note: If this screen tells you that there is no "custom" directory, check that your setup is correct:
+
 - In your Dolibarr installation directory, edit the `htdocs/conf/conf.php` file and check that following lines are not commented:
 
     ```php

From 7e5a35cb45928fa20e47705b4e297110381535f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 6 Feb 2025 14:02:17 +0100
Subject: [PATCH 527/602] asset doesn't have lines

---
 .../core/modules/asset/doc/doc_generic_asset_odt.modules.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
index 1f63e7bac91..ba6c8e41029 100644
--- a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
+++ b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
@@ -391,7 +391,7 @@ class doc_generic_asset_odt extends ModelePDFAsset
 					}
 				}
 				// Replace tags of lines
-				try {
+				/*try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
@@ -429,7 +429,7 @@ class doc_generic_asset_odt extends ModelePDFAsset
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
-				}
+				}*/
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();

From 22fa107077dc95890dafc3c6980a012b95bea7d2 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 6 Feb 2025 14:12:06 +0100
Subject: [PATCH 528/602] Clean code

---
 htdocs/commande/class/commande.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index c8c3c37ba53..f448bf25154 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2120,8 +2120,6 @@ class Commande extends CommonOrder
 	public function fetch_lines($only_product = 0, $loadalsotranslation = 0)
 	{
 		// phpcs:enable
-		global $langs, $conf;
-
 		$this->lines = array();
 
 		$sql = 'SELECT l.rowid, l.fk_product, l.fk_parent_line, l.product_type, l.fk_commande, l.label as custom_label, l.description, l.price, l.qty, l.vat_src_code, l.tva_tx, l.ref_ext,';

From a97c2447a17fac68c932f62785db357663bcadb7 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 6 Feb 2025 15:02:55 +0100
Subject: [PATCH 529/602] Debug v21

---
 htdocs/asset/class/asset.class.php |  14 +-
 htdocs/asset/list.php              | 228 ++++++++++++++++++++---------
 2 files changed, 163 insertions(+), 79 deletions(-)

diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index e90672c6d76..aa7c019b1af 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -88,19 +88,19 @@ class Asset 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' => 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,),
+		'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", "css" => "maxwidth150"),
+		'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'csslist' => 'tdoverflowmax125', '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, 'csslist' => 'tdoverflowmax75', 'css' => 'maxwidth300'),
 		'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,),
-		'not_depreciated' => array('type' => 'boolean', 'label' => 'AssetNotDepreciated', 'enabled' => 1, 'position' => 80, 'notnull' => 0, 'default' => '0', 'visible' => 1, '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, 'csslist' => 'tdoverflowmax75'),
+		'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, 'csslist' => 'tdoverflowmax75'),
+		'not_depreciated' => array('type' => 'boolean', 'label' => 'AssetNotDepreciated', 'enabled' => 1, 'position' => 80, 'notnull' => 0, 'default' => '0', 'visible' => 1, 'validate' => 1, 'csslist' => 'maxwidth50 tdoverflowmax50', 'css' => 'maxwidth50imp'),
 		'date_acquisition' => array('type' => 'date', 'label' => 'AssetDateAcquisition', 'enabled' => 1, 'position' => 90, 'notnull' => 1, 'visible' => 1,),
 		'date_start' => array('type' => 'date', 'label' => 'AssetDateStart', 'enabled' => 1, 'position' => 100, 'notnull' => 0, 'visible' => -1,),
 		'acquisition_value_ht' => array('type' => 'price', 'label' => 'AssetAcquisitionValueHT', 'enabled' => 1, 'position' => 110, 'notnull' => 1, 'visible' => 1, 'isameasure' => 1, 'validate' => 1,),
 		'recovered_vat' => array('type' => 'price', 'label' => 'AssetRecoveredVAT', 'enabled' => 1, 'position' => 120, 'notnull' => 0, 'visible' => 1, 'isameasure' => 1, 'validate' => 1,),
 		'reversal_date' => array('type' => 'date', 'label' => 'AssetReversalDate', 'enabled' => 1, 'position' => 130, 'notnull' => 0, 'visible' => 1,),
-		'reversal_amount_ht' => array('type' => 'price', 'label' => 'AssetReversalAmountHT', 'enabled' => 1, 'position' => 140, 'notnull' => 0, 'visible' => 1, 'isameasure' => 1, 'validate' => 1,),
+		'reversal_amount_ht' => array('type' => 'price', 'label' => 'AssetReversalAmountHT', 'enabled' => 1, 'position' => 140, 'notnull' => 0, 'visible' => 1, 'isameasure' => 1, 'validate' => 1, 'csslist' => 'maxwidth50'),
 		'disposal_date' => array('type' => 'date', 'label' => 'AssetDisposalDate', 'enabled' => 1, 'position' => 200, 'notnull' => 0, 'visible' => -2,),
 		'disposal_amount_ht' => array('type' => 'price', 'label' => 'AssetDisposalAmount', 'enabled' => 1, 'position' => 210, 'notnull' => 0, 'visible' => -2, 'default' => '0', 'isameasure' => 1, 'validate' => 1,),
 		'fk_disposal_type' => array('type' => 'sellist:c_asset_disposal_type:label:rowid::active=1', 'label' => 'AssetDisposalType', 'enabled' => 1, 'position' => 220, 'notnull' => 0, 'visible' => -2, 'index' => 1, 'validate' => 1,),
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index 649f436b2e0..a00aed23e91 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -60,19 +60,20 @@ $id				= GETPOSTINT('id');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
-if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
+$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT('page');
+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 or if we click on clear filters or if we select empty mass action
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-// Initialize a technical objects
+// Initialize technical objects
 $object = new Asset($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('assetlist')); // Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array($contextpage));	// Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -90,7 +91,7 @@ if (!$sortorder) {
 }
 
 // Initialize array of search criteria
-$search_all = GETPOST('search_all', 'alphanohtml');
+$search_all = trim(GETPOST('search_all', 'alphanohtml'));
 $search = array();
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
@@ -111,12 +112,13 @@ foreach ($object->fields as $key => $val) {
 }
 
 // Definition of array of fields for columns
+$tableprefix = 't';
 $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((string) $val['visible'], 1);
-		$arrayfields['t.'.$key] = array(
+		$arrayfields[$tableprefix.'.'.$key] = array(
 			'label' => $val['label'],
 			'checked' => (($visible < 0) ? 0 : 1),
 			'enabled' => (abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
@@ -171,7 +173,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-$parameters = array();
+$parameters = array('arrayfields' => &$arrayfields);
 $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');
@@ -190,6 +192,7 @@ if (empty($reshook)) {
 				$search[$key.'_dtend'] = '';
 			}
 		}
+		$search_all = '';
 		$toselect = array();
 		$search_array_options = array();
 	}
@@ -202,6 +205,8 @@ if (empty($reshook)) {
 	$objectclass = 'Asset';
 	$objectlabel = 'Asset';
 	$uploaddir = $conf->asset->dir_output;
+
+	global $error;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
@@ -223,17 +228,17 @@ $morecss = array();
 
 // Build and execute select
 // --------------------------------------------------------------------
-$sql = 'SELECT ';
-$sql .= $object->getFieldList('t');
+$sql = "SELECT";
+$sql .= " ".$object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : "");
 	}
 }
 // 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 .= $hookmanager->resPrint;
 $sql = preg_replace('/,\s*$/', '', $sql);
 
@@ -245,10 +250,10 @@ 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).")";
+	$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOSTINT('search_current_entity') ? 0 : 1)).")";
 } else {
 	$sql .= " WHERE 1 = 1";
 }
@@ -264,18 +269,24 @@ foreach ($search as $key => $val) {
 			}
 			$mode_search = 2;
 		}
-		if ($search[$key] != '') {
-			$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+		if (empty($object->fields[$key]['searchmulti'])) {
+			if (!is_array($search[$key]) && $search[$key] != '') {
+				$sql .= natural_search("t.".$db->escape($key), $search[$key], (($key == 'status') ? 2 : $mode_search));
+			}
+		} else {
+			if (is_array($search[$key]) && !empty($search[$key])) {
+				$sql .= natural_search("t.".$db->escape($key), implode(',', $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->sanitize($columnName)." >= '".$db->idate($search[$key])."'";
 				}
 				if (preg_match('/_dtend$/', $key)) {
-					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+					$sql .= " AND t.".$db->sanitize($columnName)." <= '".$db->idate($search[$key])."'";
 				}
 			}
 		}
@@ -289,13 +300,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->sanitize($key).", ";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -303,9 +314,9 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 	}
 }
-// Add where from hooks
+// Add groupby from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/,\s*$/', '', $sql);
 */
@@ -313,8 +324,8 @@ $sql = preg_replace('/,\s*$/', '', $sql);
 // Add HAVING from hooks
 /*
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListHaving', $parameters, $object); // Note that $action and $object may have been modified by hook
-$sql .= !empty($hookmanager->resPrint) ? (" HAVING 1=1 " . $hookmanager->resPrint) : "";
+$reshook = $hookmanager->executeHooks('printFieldListHaving', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$sql .= empty($hookmanager->resPrint) ? "" : " HAVING 1=1 ".$hookmanager->resPrint;
 */
 
 // Count total nb of records
@@ -331,7 +342,7 @@ if (!getDolGlobalInt('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;
 	}
@@ -354,10 +365,10 @@ $num = $db->num_rows($resql);
 
 
 // Direct jump if only one record found
-if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
+if ($num == 1 && getDolGlobalInt('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
-	header("Location: ".DOL_URL_ROOT.'/asset/card.php?id='.$id);
+	header("Location: ".DOL_URL_ROOT.'/asset/card.php?id='.((int) $id));
 	exit;
 }
 
@@ -365,36 +376,46 @@ if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $s
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist mod-asset page-list');
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'mod-asset page-list bodyforlist');
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $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='.((int) $limit);
 }
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
+if ($groupby != '') {
+	$param .= '&groupby='.urlencode($groupby);
+}
 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);
 			}
 		}
+	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
+		$param .= '&search_'.$key.'month='.GETPOSTINT('search_'.$key.'month');
+		$param .= '&search_'.$key.'day='.GETPOSTINT('search_'.$key.'day');
+		$param .= '&search_'.$key.'year='.GETPOSTINT('search_'.$key.'year');
 	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
 }
-if ($optioncss != '') {
-	$param .= '&optioncss='.urlencode($optioncss);
-}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 // Add $param from hooks
 $parameters = array('param' => &$param);
-$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
@@ -404,7 +425,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 (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
@@ -423,6 +444,9 @@ 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('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/asset/card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
@@ -437,10 +461,14 @@ $trackid = 'asset'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all) {
+	$setupstring = '';
+	// @phan-suppress-next-line PhanEmptyForeach
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
+		$setupstring .= $key."=".$val.";";
 	}
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).implode(', ', $fieldstosearchall).'</div>';
+	print '<!-- Search done like if ASSET_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).implode(', ', $fieldstosearchall).'</div>'."\n";
 }
 
 $moreforfilter = '';
@@ -455,6 +483,9 @@ if (empty($reshook)) {
 } else {
 	$moreforfilter = $hookmanager->resPrint;
 }
+$parameters = array(
+	'arrayfields' => &$arrayfields,
+);
 
 if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -463,7 +494,8 @@ if (!empty($moreforfilter)) {
 }
 
 $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, $conf->main_checkbox_left_column); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
@@ -472,8 +504,16 @@ print '<table class="tagtable nobottomiftotal noborder liste'.($moreforfilter ?
 
 // Fields title search
 // --------------------------------------------------------------------
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
+// Action column
+if ($conf->main_checkbox_left_column) {
+	print '<td class="liste_titre center maxwidthsearch">';
+	$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';
@@ -481,15 +521,19 @@ 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')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $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);
+			if (empty($val['searchmulti'])) {
+				print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), 1, 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status width100 onrightofpage' : ''), 1);
+			} else {
+				print $form->multiselectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), 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);
+			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'));
@@ -500,9 +544,9 @@ foreach ($object->fields as $key => $val) {
 		} 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, array(), 1, 0, 0, 'minwidth100imp maxwidth125', 2);
+			print $formadmin->select_language((isset($search[$key]) ? $search[$key] : ''), 'search_lang', 0, array(), 1, 0, 0, 'minwidth100imp maxwidth125', 2);
 		} else {
-			print '<input type="text" class="flat maxwidth'.($val['type'] == 'integer' ? '50' : '75').'" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
+			print '<input type="text" class="flat maxwidth'.(in_array($val['type'], array('integer', 'price')) ? '50' : '75').'" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
 		print '</td>';
 	}
@@ -512,19 +556,28 @@ 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 (!$conf->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">';
+// Action column
+if ($conf->main_checkbox_left_column) {
+	print getTitleFieldOfList($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') {
@@ -533,21 +586,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')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $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 (!$conf->main_checkbox_left_column) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	$totalarray['nbfield']++;
+}
 print '</tr>'."\n";
 
 
@@ -565,9 +623,11 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 // Loop on record
 // --------------------------------------------------------------------
 $i = 0;
+$savnbfield = $totalarray['nbfield'];
 $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
@@ -576,8 +636,26 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-	// Show here line of result
-	print '<tr class="oddeven">';
+	// Show line of result
+	$j = 0;
+	print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+
+	// Action column
+	if ($conf->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']++;
+		}
+	}
+	// Fields
 	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'))) {
@@ -587,18 +665,22 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		}
 
 		if (in_array($val['type'], array('timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowraponall';
 		} elseif ($key == 'ref') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowraponall';
 		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && empty($val['arrayofkeyval'])) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'right';
 		}
 		//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) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) ? ' classfortooltip' : '').'"' : '');
+			if (preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key) && !in_array($key, array('ref'))) {
+				print ' title="'.dol_escape_htmltag($object->$key).'"';
+			}
+			print '>';
 			if ($key == 'status') {
 				print $object->getLibStatut(5);
 			} elseif ($key == 'rowid') {
@@ -628,20 +710,22 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	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 (empty($conf->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";
@@ -667,7 +751,7 @@ if ($num == 0) {
 $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";

From d8246d936add8945a858ff9b4af5d800d78b9bc0 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 6 Feb 2025 15:21:11 +0100
Subject: [PATCH 530/602] Fix css

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

diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index 75f92eda0cf..34b86b5a835 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -159,7 +159,7 @@ if (isset($extrafields->attributes[$elementtype]['type']) && is_array($extrafiel
 		print '<td class="center tdoverflowmax100" title="'.dol_escape_htmltag($extrafields->attributes[$elementtype]['csslist'][$key]).'">'.dol_escape_htmltag($extrafields->attributes[$elementtype]['csslist'][$key])."</td>\n";
 		// Multicompany
 		if (isModEnabled('multicompany')) {
-			print '<td class="center">';
+			print '<td class="center tdoverflowmax100">';
 			if (empty($extrafields->attributes[$elementtype]['entityid'][$key])) {
 				print $langs->trans("All");
 			} else {

From 7c96ba9f7bcb76c172d2b3648f1a640f4d6ae667 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Fali=C3=A8re?= <benjamin.faliere@altairis.fr>
Date: Thu, 6 Feb 2025 15:33:12 +0100
Subject: [PATCH 531/602] FIX: rights on odt fiels

Three .odt files had execution rights for ugo. Should be u+rw, g+r and o+r
---
 .../doctemplates/contracts/template_contract.odt    | Bin
 .../doctemplates/usergroups/template_usergroups.odt | Bin
 htdocs/install/doctemplates/users/template_user.odt | Bin
 3 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 htdocs/install/doctemplates/contracts/template_contract.odt
 mode change 100755 => 100644 htdocs/install/doctemplates/usergroups/template_usergroups.odt
 mode change 100755 => 100644 htdocs/install/doctemplates/users/template_user.odt

diff --git a/htdocs/install/doctemplates/contracts/template_contract.odt b/htdocs/install/doctemplates/contracts/template_contract.odt
old mode 100755
new mode 100644
diff --git a/htdocs/install/doctemplates/usergroups/template_usergroups.odt b/htdocs/install/doctemplates/usergroups/template_usergroups.odt
old mode 100755
new mode 100644
diff --git a/htdocs/install/doctemplates/users/template_user.odt b/htdocs/install/doctemplates/users/template_user.odt
old mode 100755
new mode 100644

From 13ac8170c23e2f86ccc57cab55bd362baa77d934 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 6 Feb 2025 16:12:04 +0100
Subject: [PATCH 532/602] Debug v21

---
 htdocs/compta/facture/card-rec.php | 16 +++++++++++++---
 htdocs/compta/facture/card.php     |  3 ++-
 htdocs/theme/md/style.css.php      | 10 +++++++---
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 5e67c50fb15..619e4e5a8ae 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -268,7 +268,7 @@ if (empty($reshook)) {
 				$error++;
 			}
 
-			// Get first contract linked to invoice used to generate template (facid is id of source invoice)
+			// Get first contract linked to invoice (or order or proposal) used to generate template (facid is id of source invoice)
 			if (GETPOSTINT('facid') > 0) {
 				$srcObject = new Facture($db);
 				$srcObject->fetch(GETPOSTINT('facid'));
@@ -278,9 +278,17 @@ if (empty($reshook)) {
 				if (!empty($srcObject->linkedObjectsIds['contrat'])) {
 					$contractidid = reset($srcObject->linkedObjectsIds['contrat']);
 
-					$object->origin = 'contrat';
+					$object->origin_type = 'contrat';
 					$object->origin_id = $contractidid;
-					$object->linked_objects[$object->origin] = $object->origin_id;
+					$object->linked_objects[$object->origin_type] = $object->origin_id;
+				} elseif (!empty($srcObject->linkedObjectsIds['commande'])) {
+					$orderid = reset($srcObject->linkedObjectsIds['commande']);
+
+					$object->linked_objects['commande'] = $orderid;
+				} elseif (!empty($srcObject->linkedObjectsIds['propal'])) {
+					$proposalid = reset($srcObject->linkedObjectsIds['propal']);
+
+					$object->linked_objects['commande'] = $proposalid;
 				}
 			}
 
@@ -1289,6 +1297,8 @@ if ($action == 'create') {
 		}
 		print "</table>\n";
 
+		print '<br>';
+
 		print $form->buttonsSaveCancel("Create");
 
 		print "</form>\n";
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 830364560df..3a28f4cd1f8 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3692,7 +3692,8 @@ if ($action == 'create') {
 					print $form->selectarray('typedeposit', $arraylist, $typedeposit, 0, 0, 0, '', 1);
 					print '</td>';
 					print '<td class="nowrap" style="padding-left: 5px">';
-					print '<span class="opacitymedium paddingleft">'.$langs->trans("AmountOrPercent").'</span><input type="text" id="valuedeposit" name="valuedeposit" class="width75 right" value="'.$valuedeposit.'"/>';
+					print '<span class="opacitymedium paddingleft">'.$langs->trans("AmountOrPercent").'</span>';
+					print '<input type="text" id="valuedeposit" name="valuedeposit" class="width75 right" value="'.($valuedeposit ? $valuedeposit : '').'"/>';
 					print '</td>';
 				}
 				print '</tr></table>';
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 72b5152557e..afa4c41ddf7 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -573,9 +573,11 @@ select.vmenusearchselectcombo {
 textarea:focus {
 	/* v6 box-shadow: 0 0 4px #8091BF; */
 	border: 1px solid #aaa !important;
+	/*
 	padding-left: 3px;
 	padding-right: 3px;
 	padding-top: 3px;
+	*/
 }
 input:focus, textarea:focus,
 button:focus:not(.button_search_x):not(.button_search):not(.button_removefilter), select:focus,
@@ -609,10 +611,12 @@ select#date_startday, select#date_startmonth, select#date_endday, select#date_en
 	margin-right: 4px;
 }
 
-input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
-	color: var(--colortext);
+input, input.flat, form.flat select, select, select.flat, .dataTables_length label select {
 	border: none;
+}
+input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
 	border<?php echo !getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT') ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
+	color: var(--colortext);
 	font-family: <?php print $fontlist ?>;
 	outline: none;
 	margin: 0px 0px 0px 0px;
@@ -4499,7 +4503,7 @@ tr.liste_titre_filter td.liste_titre {
 	padding-top: 4px;
 	padding-bottom: 3px;
 }
-.liste_titre_create td:not(.linecoldescription), .liste_titre_create th, .liste_titre_create .tagtd
+.liste_titre_create td, .liste_titre_create th, .liste_titre_create .tagtd
 {
 	border-top-width: 1px;
 	border-top-color: var(--colortopbordertitle1);

From fa0cc41f81cef8df216b1fab12d06bcbe615f0f5 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 6 Feb 2025 16:33:09 +0100
Subject: [PATCH 533/602] Fix #32964 - default value must be very high

---
 htdocs/core/lib/geturl.lib.php                             | 2 +-
 htdocs/webportal/controllers/document.controller.class.php | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index c25b095df08..70ba14f40b1 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -114,7 +114,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, getDolGlobalInt('MAIN_USE_CONNECT_TIMEOUT', 5));
 	curl_setopt($ch, CURLOPT_TIMEOUT, getDolGlobalInt('MAIN_USE_RESPONSE_TIMEOUT', 30));
 
-	// limit size of downloaded files. TODO Add MAIN_SECURITY_MAXFILESIZE_DOWNLOADED
+	// limit size of downloaded files.
 	$maxsize = getDolGlobalInt('MAIN_SECURITY_MAXFILESIZE_DOWNLOADED');
 	if ($maxsize && defined('CURLOPT_MAXFILESIZE_LARGE')) {
 		curl_setopt($ch, CURLOPT_MAXFILESIZE_LARGE, $maxsize);  // @phan-suppress-current-line PhanTypeMismatchArgumentNullableInternal
diff --git a/htdocs/webportal/controllers/document.controller.class.php b/htdocs/webportal/controllers/document.controller.class.php
index 2efd83fd953..6ea2e265d61 100644
--- a/htdocs/webportal/controllers/document.controller.class.php
+++ b/htdocs/webportal/controllers/document.controller.class.php
@@ -213,9 +213,8 @@ class DocumentController extends Controller
 		}
 
 		$fileSize = dol_filesize($fullpath_original_file);
-		$fileSizeMaxDefault = 20 * 1024; // 20 Mo by default
-		$fileSizeMax = getDolGlobalInt('MAIN_SECURITY_MAXFILESIZE_DOWNLOADED', $fileSizeMaxDefault);
-		if ($fileSize > $fileSizeMax) {
+		$fileSizeMax = getDolGlobalInt('MAIN_SECURITY_MAXFILESIZE_DOWNLOADED');
+		if ($fileSizeMax && $fileSize > $fileSizeMax) {
 			dol_syslog('ErrorFileSizeTooLarge: ' . $fileSize);
 			print 'ErrorFileSizeTooLarge: ' . $fileSize . ' (max ' . $fileSizeMax . ')';
 			exit;

From d5b46565186d488e2a30ad466ea4044c4d8ccefc Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 6 Feb 2025 16:38:12 +0100
Subject: [PATCH 534/602] Fix phan

---
 htdocs/asset/list.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index a00aed23e91..c519ce65848 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -53,7 +53,9 @@ $toselect		= GETPOST('toselect', 'array'); // Array of ids of elements selected
 $contextpage	= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'assetlist'; // 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');  // mode view (kanban or common)
+$mode       	= GETPOST('mode', 'aZ'); // The display mode ('list', 'kanban', 'hierarchy', 'calendar', 'gantt', ...)
+$groupby 		= GETPOST('groupby', 'aZ09');	// Example: $groupby = 'p.fk_opp_status' or $groupby = 'p.fk_statut'
+
 $id				= GETPOSTINT('id');
 
 // Load variable for pagination

From e9d0e4e9633356542d9344bd5c536329f894fb9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Fali=C3=A8re?= <benjamin.faliere@altairis.fr>
Date: Thu, 6 Feb 2025 15:33:12 +0100
Subject: [PATCH 535/602] FIX: rights on odt fiels

Three .odt files had execution rights for ugo. Should be u+rw, g+r and o+r
---
 .../doctemplates/contracts/template_contract.odt    | Bin
 .../doctemplates/usergroups/template_usergroups.odt | Bin
 htdocs/install/doctemplates/users/template_user.odt | Bin
 3 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 htdocs/install/doctemplates/contracts/template_contract.odt
 mode change 100755 => 100644 htdocs/install/doctemplates/usergroups/template_usergroups.odt
 mode change 100755 => 100644 htdocs/install/doctemplates/users/template_user.odt

diff --git a/htdocs/install/doctemplates/contracts/template_contract.odt b/htdocs/install/doctemplates/contracts/template_contract.odt
old mode 100755
new mode 100644
diff --git a/htdocs/install/doctemplates/usergroups/template_usergroups.odt b/htdocs/install/doctemplates/usergroups/template_usergroups.odt
old mode 100755
new mode 100644
diff --git a/htdocs/install/doctemplates/users/template_user.odt b/htdocs/install/doctemplates/users/template_user.odt
old mode 100755
new mode 100644

From 11719102b3c21bcf6d7f8ceb6ae34db44b20b3cb Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 6 Feb 2025 16:42:24 +0100
Subject: [PATCH 536/602] Fix phan

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

diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index c519ce65848..abc15afd4af 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -496,7 +496,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column); // This also change content of $arrayfields
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column); // This also change content of $arrayfields
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 

From ee137609f1a47b203acf583aee69206199ee1266 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 6 Feb 2025 16:42:24 +0100
Subject: [PATCH 537/602] Fix phan

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

diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index c519ce65848..abc15afd4af 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -496,7 +496,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column); // This also change content of $arrayfields
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column); // This also change content of $arrayfields
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 

From d69636b9218ffcab6970440a0c18cb5aad495edd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 6 Feb 2025 18:02:17 +0100
Subject: [PATCH 538/602] Update index.php

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

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 8ff1b796049..eab30a6de09 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -64,7 +64,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
  */
 
 // Load translation files required by the page
-$langs->loadLangs(array("admin", "other", "website", "main", "errors"));
+$langs->loadLangs(array("admin", "other", "website"));
 
 // Security check
 if (!$user->hasRight('website', 'read')) {

From 40f86ca101716232d7e6c14db631d530dbe8ac71 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Thu, 6 Feb 2025 18:13:25 +0100
Subject: [PATCH 539/602] FIX extrafields lost during creation from rec invoice

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index c8c5822bb19..cc0460ffead 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3476,7 +3476,12 @@ if ($action == 'create') {
 
 		// Overwrite some values if creation of invoice is from a predefined invoice
 		if (empty($origin) && empty($originid) && GETPOSTINT('fac_rec') > 0) {
-			$invoice_predefined->fetch(GETPOSTINT('fac_rec'));
+			//$invoice_predefined->fetch(GETPOSTINT('fac_rec'));
+			foreach ($invoice_predefined->array_options as $key => $option) {
+				if (!isset($object->array_options[$key])) {
+					$object->array_options[$key] = $invoice_predefined->array_options[$key];
+				}
+			}
 
 			$dateinvoice = $invoice_predefined->date_when; // To use next gen date by default later
 			if (empty($projectid)) {

From fb71027aecb9f4cdb6fa552b8a1f0e184c3884d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 6 Feb 2025 18:13:42 +0100
Subject: [PATCH 540/602] Update donateurs_code.php

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

diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
index b2d2d2c0e2b..8c84311b6c6 100644
--- a/htdocs/public/donations/donateurs_code.php
+++ b/htdocs/public/donations/donateurs_code.php
@@ -67,7 +67,7 @@ if (!isModEnabled('don')) {
 }
 
 
-$langs->load("donations", "main");
+$langs->load("donations");
 
 
 /*

From ab27a6799631e143efc5e9fee943d702e5b6abb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 6 Feb 2025 18:50:32 +0100
Subject: [PATCH 541/602] clean code

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

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 2db169bd49e..a9a84415f4b 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -224,7 +224,7 @@ if (empty($reshook)) {
 					}
 				}
 
-				$result = $object->createFromClone($user, $socid, (GETPOSTISSET('entity') ? GETPOSTINT('entity') : null), (GETPOST('update_prices') == 'on' ? true : false), (GETPOST('update_desc') == 'on' ? true : false));
+				$result = $object->createFromClone($user, $socid, (GETPOSTISSET('entity') ? GETPOSTINT('entity') : null), (GETPOST('update_prices') == 'on'), (GETPOST('update_desc') == 'on'));
 				if ($result > 0) {
 					$warningMsgLineList = array();
 					// check all product lines are to sell otherwise add a warning message for each product line is not to sell

From c470629a7912347fc9d2b2eb1068c80a4537441d Mon Sep 17 00:00:00 2001
From: futurehousestore <futurehousestore@yahoo.com>
Date: Fri, 7 Feb 2025 02:07:06 +0000
Subject: [PATCH 542/602] Update list.php

fix total stock quantity
---
 htdocs/product/stock/list.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index d49bb4078d7..ed830e2cc3e 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -679,7 +679,7 @@ 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
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 if (!empty($arrayfields['t.statut']['checked'])) {
@@ -898,11 +898,6 @@ while ($i < $imaxinloop) {
 	$i++;
 }
 
-if ($totalnboflines - $offset <= $limit) {
-	// Show total line
-	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
-}
-
 // If no record found
 if ($num == 0) {
 	$colspan = 1;
@@ -916,6 +911,9 @@ if ($num == 0) {
 
 $db->free($resql);
 
+// Unconditionally show the total line (modification: totals are now displayed on every page)
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
 $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;

From ae7e3dcf2d1721c3082cddceb856489127381137 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 7 Feb 2025 09:54:02 +0100
Subject: [PATCH 543/602] NEW: add const to not include default CSS in
 top_htmlhead with DISABLE_CSS_DEFAULT_THEME

---
 htdocs/main.inc.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 1bfd7b4361e..d25d87140b9 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2036,22 +2036,24 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.$fontawesome_directory.'/css/all.min.css'.($ext ? '?'.$ext : '').'">'."\n";
 		}
 
-		print '<!-- Includes CSS for Dolibarr theme -->'."\n";
-		// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
-		$themepath = dol_buildpath($conf->css, 1);
-		$themesubdir = '';
-		if (!empty($conf->modules_parts['theme'])) {	// This slow down
-			foreach ($conf->modules_parts['theme'] as $reldir) {
-				if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
-					$themepath = dol_buildpath($reldir.$conf->css, 1);
-					$themesubdir = $reldir;
-					break;
+		if (!defined('DISABLE_CSS_DEFAULT_THEME')) {
+			print '<!-- Includes CSS for Dolibarr theme -->'."\n";
+			// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
+			$themepath = dol_buildpath($conf->css, 1);
+			$themesubdir = '';
+			if (!empty($conf->modules_parts['theme'])) {	// This slow down
+				foreach ($conf->modules_parts['theme'] as $reldir) {
+					if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
+						$themepath = dol_buildpath($reldir.$conf->css, 1);
+						$themesubdir = $reldir;
+						break;
+					}
 				}
 			}
+
+			print '<link rel="stylesheet" type="text/css" href="' . $themepath . $themeparam . '">' . "\n";
 		}
 
-		//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
-		print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
 		if (getDolGlobalString('MAIN_FIX_FLASH_ON_CHROME')) {
 			print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
 		}

From 91abc644dd1d165681ba89b88d1706be25b83a7e Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 7 Feb 2025 10:04:34 +0100
Subject: [PATCH 544/602] NEW: add const to not include JQuery UI in
 top_htmlhead DISABLE_JQUERY_UI

---
 htdocs/main.inc.php | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 1bfd7b4361e..9004839fa99 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2012,14 +2012,16 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 
 		if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax) {
 			print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
-			$jquerytheme = 'base';
-			if (getDolGlobalString('MAIN_USE_JQUERY_THEME')) {
-				$jquerytheme = getDolGlobalString('MAIN_USE_JQUERY_THEME');
-			}
-			if (constant('JS_JQUERY_UI')) {
-				print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // Forced JQuery
-			} else {
-				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext ? '?'.$ext : '').'">'."\n"; // JQuery
+			if (!defined('DISABLE_JQUERY_UI')) {
+				$jquerytheme = 'base';
+				if (getDolGlobalString('MAIN_USE_JQUERY_THEME')) {
+					$jquerytheme = getDolGlobalString('MAIN_USE_JQUERY_THEME');
+				}
+				if (constant('JS_JQUERY_UI')) {
+					print '<link rel="stylesheet" type="text/css" href="' . JS_JQUERY_UI . 'css/' . $jquerytheme . '/jquery-ui.min.css' . ($ext ? '?' . $ext : '') . '">' . "\n"; // Forced JQuery
+				} else {
+					print '<link rel="stylesheet" type="text/css" href="' . DOL_URL_ROOT . '/includes/jquery/css/' . $jquerytheme . '/jquery-ui.css' . ($ext ? '?' . $ext : '') . '">' . "\n"; // JQuery
+				}
 			}
 			if (!defined('DISABLE_JQUERY_JNOTIFY')) {
 				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // JNotify
@@ -2118,10 +2120,12 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			} else {
 				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
-			if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
-				print '<script nonce="'.getNonce().'" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
-			} else {
-				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			if (!defined('DISABLE_JQUERY_UI')) {
+				if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
+					print '<script nonce="' . getNonce() . '" src="' . JS_JQUERY_UI . 'jquery-ui.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+				} else {
+					print '<script nonce="' . getNonce() . '" src="' . DOL_URL_ROOT . '/includes/jquery/js/jquery-ui.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
+				}
 			}
 			// jQuery jnotify
 			if (!getDolGlobalString('MAIN_DISABLE_JQUERY_JNOTIFY') && !defined('DISABLE_JQUERY_JNOTIFY')) {

From 15dec468cb555e43e3454d431b7c23b87e89d093 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 7 Feb 2025 10:05:06 +0100
Subject: [PATCH 545/602] NEW: add const to not include JQuery UI in
 top_htmlhead DISABLE_JQUERY_UI

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 9004839fa99..3ddad620a92 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2120,6 +2120,8 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			} else {
 				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
+
+
 			if (!defined('DISABLE_JQUERY_UI')) {
 				if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
 					print '<script nonce="' . getNonce() . '" src="' . JS_JQUERY_UI . 'jquery-ui.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";

From 867215e2eae009af0b4e5f11b84f01363fed2104 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 7 Feb 2025 10:05:17 +0100
Subject: [PATCH 546/602] NEW: add const to not include JQuery UI in
 top_htmlhead DISABLE_JQUERY_UI

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 3ddad620a92..9004839fa99 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2120,8 +2120,6 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			} else {
 				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
-
-
 			if (!defined('DISABLE_JQUERY_UI')) {
 				if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
 					print '<script nonce="' . getNonce() . '" src="' . JS_JQUERY_UI . 'jquery-ui.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";

From a8811551092404b7ea028c21001033173884af5d Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 7 Feb 2025 10:10:45 +0100
Subject: [PATCH 547/602] NEW: add const to not include default CSS in
 top_htmlhead with DISABLE_CSS_DEFAULT_THEME

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index d25d87140b9..9b126b49724 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2036,21 +2036,21 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.$fontawesome_directory.'/css/all.min.css'.($ext ? '?'.$ext : '').'">'."\n";
 		}
 
-		if (!defined('DISABLE_CSS_DEFAULT_THEME')) {
-			print '<!-- Includes CSS for Dolibarr theme -->'."\n";
-			// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
-			$themepath = dol_buildpath($conf->css, 1);
-			$themesubdir = '';
-			if (!empty($conf->modules_parts['theme'])) {	// This slow down
-				foreach ($conf->modules_parts['theme'] as $reldir) {
-					if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
-						$themepath = dol_buildpath($reldir.$conf->css, 1);
-						$themesubdir = $reldir;
-						break;
-					}
+		// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
+		$themepath = dol_buildpath($conf->css, 1);
+		$themesubdir = '';
+		if (!empty($conf->modules_parts['theme'])) {	// This slow down
+			foreach ($conf->modules_parts['theme'] as $reldir) {
+				if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
+					$themepath = dol_buildpath($reldir.$conf->css, 1);
+					$themesubdir = $reldir;
+					break;
 				}
 			}
+		}
 
+		if (!defined('DISABLE_CSS_DEFAULT_THEME')) {
+			print '<!-- Includes CSS for Dolibarr theme -->'."\n";
 			print '<link rel="stylesheet" type="text/css" href="' . $themepath . $themeparam . '">' . "\n";
 		}
 

From e0a8caec45b9d9dece3ec63a54a484bc7618d357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 7 Feb 2025 10:45:03 +0100
Subject: [PATCH 548/602] fix phpstan

---
 dev/build/phpstan/phpstan-baseline.neon                     | 6 ------
 htdocs/core/class/commondocgenerator.class.php              | 6 +++---
 .../modules/asset/doc/doc_generic_asset_odt.modules.php     | 6 +++---
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 4f95b73a9fb..deba1cbbeb2 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -8862,12 +8862,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/class/commondocgenerator.class.php
 
-		-
-			message: '#^Parameter \#2 \$array_to_fill of method CommonDocGenerator\:\:fill_substitutionarray_with_extrafields\(\) expects array\<string, string\>, array\<string, float\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/class/commondocgenerator.class.php
-
 		-
 			message: '#^Property CommonObject\:\:\$element \(string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 884639b234e..1f52f57bc31 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005-2012	Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2016-2023  Charlene Benke          <charlene@patas-monkey.com>
- * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2020       Josep Lluís Amador      <joseplluis@lliuretic.cat>
  * Copyright (C) 2024		MDW	                    <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Mélina Joum			    <melina.joum@altairis.fr>
@@ -1174,11 +1174,11 @@ abstract class CommonDocGenerator
 	 *  Note that vars into substitutions array are formatted.
 	 *
 	 *	@param  CommonObject	$object				Object with extrafields (must have $object->array_options filled)
-	 *	@param  array<string,string>	$array_to_fill      Substitution array
+	 *	@param  array<string,float|string>	$array_to_fill      Substitution array
 	 *  @param  Extrafields		$extrafields        Extrafields object
 	 *  @param  string			$array_key	        Prefix for name of the keys into returned array
 	 *  @param  Translate		$outputlangs        Lang object to use for output
-	 *	@return	array<string,string>				Substitution array
+	 *	@return	array<string,float|string>				Substitution array
 	 */
 	public function fill_substitutionarray_with_extrafields($object, $array_to_fill, $extrafields, $array_key, $outputlangs)
 	{
diff --git a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
index 92792da10e8..9848d61fbbd 100644
--- a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
+++ b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
  * Copyright (C) 2018-2021  Philippe Grand      <philippe.grand@atoo-net.com>
- * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2018-2025  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -398,7 +398,7 @@ class doc_generic_asset_odt extends ModelePDFAsset
 					}
 				}
 				// Replace tags of lines
-				$foundtagforlines = 1;
+				/*$foundtagforlines = 1;
 				try {
 					$listlines = $odfHandler->setSegment('lines');
 				} catch (OdfExceptionSegmentNotFound $e) {
@@ -431,7 +431,7 @@ class doc_generic_asset_odt extends ModelePDFAsset
 						dol_syslog($this->error, LOG_WARNING);
 						return -1;
 					}
-				}
+				}*/
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();

From 712a2b544a3b4e058934736d21aa1872df2400fb Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 7 Feb 2025 10:46:13 +0100
Subject: [PATCH 549/602] Fix false positive

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

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index ba37cce06b2..ba2c7d0ae94 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -927,6 +927,7 @@ abstract class CommonDocGenerator
 		foreach ($date_specs as $date_spec) {
 			$propertyname = $date_spec[1];
 			if (property_exists($line, $propertyname)) {
+				// @phan-suppress-next-line PhanUndeclaredProperty
 				$resarray[$date_spec[0]] = dol_print_date($line->$propertyname, $date_spec[2], $date_spec[3], $date_spec[4]);
 			}
 		}

From 28724db69e1e64e294b3dc871561e5c1b19b1669 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 7 Feb 2025 10:52:23 +0100
Subject: [PATCH 550/602] Try to fix phpstan false positive

---
 htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index f8a99d51d40..006d797f5b6 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -405,6 +405,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				if ($foundtagforlines) {
 					$linenumber = 0;
 					foreach ($object->lines as $line) {
+						/** @var BOMLine $line */
 						$linenumber++;
 
 						if ($line->fk_product > 0) {

From d01274ef4c5966b873476b40d30c75b55590d5d3 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 7 Feb 2025 11:28:13 +0100
Subject: [PATCH 551/602] Fix phan

---
 .../modules/commande/doc/doc_generic_order_odt.modules.php   | 1 +
 .../contract/doc/doc_generic_contract_odt.modules.php        | 1 +
 .../modules/facture/doc/doc_generic_invoice_odt.modules.php  | 1 +
 htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php   | 1 +
 .../project/task/doc/doc_generic_task_odt.modules.php        | 2 +-
 .../modules/propale/doc/doc_generic_proposal_odt.modules.php | 1 +
 .../reception/doc/doc_generic_reception_odt.modules.php      | 1 +
 .../doc/doc_generic_supplier_invoice_odt.modules.php         | 1 +
 .../doc/doc_generic_supplier_order_odt.modules.php           | 1 +
 .../doc/doc_generic_supplier_proposal_odt.modules.php        | 1 +
 htdocs/supplier_proposal/class/supplier_proposal.class.php   | 5 +++++
 11 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 5ee13332781..3495cc57265 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -426,6 +426,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				if ($foundtagforlines) {
 					$linenumber = 0;
 					foreach ($object->lines as $line) {
+						/** @var OrderLine $line */
 						$linenumber++;
 						$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index 27a295e61e4..6c68888cebc 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -420,6 +420,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				if ($foundtagforlines) {
 					$linenumber = 0;
 					foreach ($object->lines as $line) {
+						/** @var ContratLigne $line */
 						$linenumber++;
 						$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index f4435c982ed..7b081f4d4bd 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -482,6 +482,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				if ($foundtagforlines) {
 					$linenumber = 0;
 					foreach ($object->lines as $line) {
+						/** @var FactureLigne $line */
 						$linenumber++;
 						$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index ff22719c4ab..93ce87f2be5 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -408,6 +408,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				if ($foundtagforlines) {
 					$linenumber = 0;
 					foreach ($object->lines as $line) {
+						/** @var MoLine $line */
 						$linenumber++;
 						$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index a0c7210392a..2eb87a0189f 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -458,7 +458,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
-	 *	@param	Project		$object					Object source to build document
+	 *	@param	Task		$object					Object source to build document
 	 *	@param	Translate	$outputlangs			Lang output object
 	 * 	@param	string		$srctemplatepath		Full path of source filename for generator using a template file
 	 *	@return	int<-1,1>							1 if OK, <=0 if KO
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 86266b76b16..4e3f9adb01b 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
@@ -463,6 +463,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				if ($foundtagforlines) {
 					$linenumber = 0;
 					foreach ($object->lines as $line) {
+						/** @var PropaleLigne $line */
 						$linenumber++;
 						$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index bf7247fdde8..68b20c45977 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -412,6 +412,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				if ($foundtagforlines) {
 					$linenumber = 0;
 					foreach ($object->lines as $line) {
+						/** @var ReceptionLineBatch $line */
 						$linenumber++;
 						$tmparray = $this->get_substitutionarray_lines($line, $outputlangs);
 						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
diff --git a/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php b/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
index d59451d9be9..6ec79297018 100644
--- a/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
@@ -417,6 +417,7 @@ class doc_generic_supplier_invoice_odt extends ModelePDFSuppliersInvoices
 				if ($foundtagforlines) {
 					$linenumber = 0;
 					foreach ($object->lines as $line) {
+						/** @var CommonInvoiceLine $line */
 						$linenumber++;
 						$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index fcfa4212862..2c26e3fb876 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -412,6 +412,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				if ($foundtagforlines) {
 					$linenumber = 0;
 					foreach ($object->lines as $line) {
+						/** @var CommonOrderLine $line */
 						$linenumber++;
 						$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
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 a17f724a5fa..b207a616be8 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
@@ -441,6 +441,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				if ($foundtagforlines) {
 					$linenumber = 0;
 					foreach ($object->lines as $line) {
+						/** @var SupplierProposalLine $line */
 						$linenumber++;
 						$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index e33cdc6c377..fd534683010 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -192,7 +192,12 @@ class SupplierProposal extends CommonObject
 	 * @var array<string,string>  (Encoded as JSON in database)
 	 */
 	public $extraparams = array();
+
+	/**
+	 * @var SupplierProposalLine[]
+	 */
 	public $lines = array();
+
 	/**
 	 * @var SupplierProposalLine
 	 */

From f05bc70b2e24b2401b6b1e99a600fe78e336c2e3 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Wed, 5 Feb 2025 22:59:37 +0100
Subject: [PATCH 552/602] Qual: Fix phan notices (modulebuilder)

---
 dev/tools/phan/baseline.txt                   | 30 +---------
 htdocs/core/lib/functions.lib.php             |  7 ++-
 .../doc/doc_generic_usergroup_odt.modules.php |  4 +-
 htdocs/modulebuilder/index.php                | 60 ++++++++-----------
 htdocs/modulebuilder/template/admin/setup.php |  4 +-
 .../modulebuilder/template/ajax/myobject.php  |  2 +-
 .../template/class/api_mymodule.class.php     | 26 ++++----
 .../template/class/myobject.class.php         |  2 +-
 .../doc/pdf_standard_myobject.modules.php     | 12 ++--
 .../mymodule/mod_myobject_advanced.php        |  4 +-
 .../modulebuilder/template/myobject_list.php  | 18 +++---
 11 files changed, 71 insertions(+), 98 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 716996e9d84..0da0c9a1237 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,9 +9,9 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 2560+ occurrences
+    // PhanTypeMismatchArgument : 2490+ occurrences
     // PhanUndeclaredProperty : 530+ occurrences
-    // PhanTypeMismatchArgumentNullable : 450+ occurrences
+    // PhanTypeMismatchArgumentNullable : 430+ occurrences
     // PhanUndeclaredGlobalVariable : 190+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 180+ occurrences
     // PhanPossiblyUndeclaredGlobalVariable : 160+ occurrences
@@ -84,7 +84,7 @@ return [
         'htdocs/adherents/admin/website.php' => ['PhanTypeMismatchArgument'],
         'htdocs/adherents/canvas/actions_adherentcard_common.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/adherents/card.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/adherents/class/adherent.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/adherents/class/adherent.class.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/adherents/class/adherent_type.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/adherents/class/api_members.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/adherents/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable'],
@@ -411,20 +411,16 @@ return [
         'htdocs/core/login/functions_dolibarr.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/login/functions_ldap.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/core/menus/standard/auguria.lib.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/modules/asset/mod_asset_advanced.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/barcode/mod_barcode_product_standard.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/bom/mod_bom_advanced.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/cheque/doc/pdf_blochet.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/core/modules/cheque/modules_chequereceipts.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/commande/doc/pdf_einstein.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/commande/mod_commande_saphir.php' => ['PhanTypeMismatchArgumentNullable'],
-        'htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/contract/doc/pdf_strato.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/core/modules/delivery/doc/pdf_storm.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/core/modules/delivery/doc/pdf_typhon.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
@@ -435,7 +431,6 @@ return [
         'htdocs/core/modules/expedition/doc/pdf_rouget.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/expensereport/mod_expensereport_jade.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/facture/doc/pdf_crabe.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/facture/doc/pdf_octopus.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/facture/doc/pdf_sponge.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
@@ -471,38 +466,29 @@ return [
         'htdocs/core/modules/modSupplierProposal.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/modTicket.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/mrp/mod_mo_advanced.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/oauth/github_oauthcallback.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/project/doc/pdf_beluga.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/project/doc/pdf_timespent.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/propale/doc/pdf_azur.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/propale/doc/pdf_cyan.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/reception/doc/pdf_squille.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/societe/doc/doc_generic_odt.modules.php' => ['PhanTypeMismatchArgumentNullable'],
-        'htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchProperty'],
-        'htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanPluginDuplicateArrayKey'],
         'htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php' => ['PhanTypeMismatchArgumentNullable'],
-        'htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/workstation/mod_workstation_advanced.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/multicompany_page.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/search_page.php' => ['PhanTypeMismatchArgument'],
@@ -622,15 +608,6 @@ return [
         'htdocs/loan/document.php' => ['PhanUndeclaredProperty'],
         'htdocs/loan/note.php' => ['PhanUndeclaredProperty'],
         'htdocs/loan/payment/payment.php' => ['PhanUndeclaredProperty'],
-        'htdocs/modulebuilder/index.php' => ['PhanTypeMismatchArgumentNullable'],
-        'htdocs/modulebuilder/template/admin/setup.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/modulebuilder/template/ajax/myobject.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/modulebuilder/template/class/api_mymodule.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/modulebuilder/template/class/myobject.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
-        'htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/modulebuilder/template/myobject_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/mrp/ajax/ajax_bom.php' => ['PhanTypeMismatchArgument'],
         'htdocs/mrp/class/api_mos.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
         'htdocs/mrp/class/mo.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty'],
@@ -802,7 +779,6 @@ return [
         'htdocs/recruitment/class/api_recruitments.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/recruitment/class/recruitmentcandidature.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/recruitment/class/recruitmentjobposition.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3695a1eeb69..567eb7e4b86 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1207,7 +1207,7 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 /**
  *  Return a sanitized or empty value after checking value against a rule.
  *
- *  @param  string|array<mixed>	$out	 Value to check/clear.
+ *  @param  string|mixed[]|null	$out	 Value to check/clear.
  *  @param  string  		$check	     Type of check/sanitizing
  *  @param  ?int     		$filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
  *  @param  ?mixed   		$options     Options to pass to filter_var when $check is set to 'custom'
@@ -1217,6 +1217,9 @@ function sanitizeVal($out = '', $check = 'alphanohtml', $filter = null, $options
 {
 	// TODO : use class "Validate" to perform tests (and add missing tests) if needed for factorize
 	// Check is done after replacement
+	if ($out === null) {
+		$out = '';
+	}
 	switch ($check) {
 		case 'none':
 		case 'password':
@@ -9895,7 +9898,7 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null, $con
  *  Complete the $substitutionarray with more entries coming from external module that had set the "substitutions=1" into module_part array.
  *  In this case, method completesubstitutionarray provided by module is called.
  *
- *  @param  array<string,string>	$substitutionarray		Array substitution old value => new value value
+ *  @param  array<string,string|float|null>	$substitutionarray		Array substitution old value => new value value
  *  @param  Translate		$outputlangs            Output language
  *  @param  ?CommonObject	$object                 Source object
  *  @param  ?mixed			$parameters       		Add more parameters (useful to pass product lines)
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 da30d9a0b21..55015b96550 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
@@ -2,7 +2,7 @@
 /* Copyright (C) 2010-2012 	Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -447,7 +447,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 						$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 						foreach ($tmparray as $key => $val) {
 							try {
-								if (!is_array($val)) {
+								if (!is_array($val)) {  // @phpstan-ignore-line
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
 							} catch (SegmentException $e) {
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 86726bb5543..a947d497024 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004-2023 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2019 Nicolas ZABOURI	<info@inovea-conseil.com>
  * Copyright (C) 2023      Alexandre Janniaux   <alexandre.janniaux@gmail.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -67,7 +67,7 @@ $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'aZ09');
 
 $module = GETPOST('module', 'alpha');
-$tab = GETPOST('tab', 'aZ09');
+$tab = (string) GETPOST('tab', 'aZ09');
 $tabobj = GETPOST('tabobj', 'alpha');
 $tabdic = GETPOST('tabdic', 'alpha');
 $propertykey = GETPOST('propertykey', 'alpha');
@@ -77,6 +77,7 @@ if (empty($module)) {
 if (empty($tab)) {
 	$tab = 'description';
 }
+'@phan-var-force string $tab';  // Workaround 'empty()' bug of phan
 if (empty($tabobj)) {
 	$tabobj = 'newobjectifnoobj';
 }
@@ -850,6 +851,7 @@ if ($dirins && $action == 'initcli' && !empty($module) && $user->hasRight("modul
 
 
 $moduledescriptorfile = '/not_set/';
+$modulelowercase = null;
 
 // init Doc
 if ($dirins && $action == 'initdoc' && !empty($module) && $user->hasRight("modulebuilder", "run")) {
@@ -1288,7 +1290,7 @@ if ($dirins && $action == 'initobject' && $module && $objectname && $user->hasRi
 					$position = 900;
 				}
 				// $alwayseditable
-				$alwayseditable=0;
+				$alwayseditable = 0;
 				if ($fieldname == 'label') {
 					$alwayseditable = 1;
 				} else {
@@ -2347,15 +2349,12 @@ if ($dirins && $action == 'generatepackage' && $user->hasRight("modulebuilder",
 
 		$dirofmodule = dol_buildpath($modulelowercase, 0).'/bin';
 		$outputfilezip = $dirofmodule.'/'.$FILENAMEZIP;
-		if ($dirofmodule) {
-			if (!dol_is_dir($dirofmodule)) {
-				dol_mkdir($dirofmodule);
-			}
-			// Note: We exclude /bin/ to not include the already generated zip
-			$result = dol_compress_dir($dir, $outputfilezip, 'zip', '/\/bin\/|\.git|\.old|\.back|\.ssh/', $modulelowercase);
-		} else {
-			$result = -1;
+
+		if (!dol_is_dir($dirofmodule)) {
+			dol_mkdir($dirofmodule);
 		}
+		// Note: We exclude /bin/ to not include the already generated zip
+		$result = dol_compress_dir($dir, $outputfilezip, 'zip', '/\/bin\/|\.git|\.old|\.back|\.ssh/', $modulelowercase);
 
 		if ($result > 0) {
 			setEventMessages($langs->trans("ZipFileGeneratedInto", $outputfilezip), null);
@@ -2706,12 +2705,9 @@ if ($action == 'set' && $user->admin && $user->hasRight("modulebuilder", "run"))
 	if ($module) {
 		$param .= '&module='.urlencode($module);
 	}
-	if ($tab) {
-		$param .= '&tab='.urlencode($tab);
-	}
-	if ($tabobj) {
-		$param .= '&tabobj='.urlencode($tabobj);
-	}
+
+	$param .= '&tab='.urlencode($tab);
+	$param .= '&tabobj='.urlencode($tabobj);
 
 	$value = GETPOST('value', 'alpha');
 	$resarray = activateModule($value);
@@ -2744,12 +2740,8 @@ if ($action == 'reset' && $user->admin && $user->hasRight("modulebuilder", "run"
 	if ($module) {
 		$param .= '&module='.urlencode($module);
 	}
-	if ($tab) {
-		$param .= '&tab='.urlencode($tab);
-	}
-	if ($tabobj) {
-		$param .= '&tabobj='.urlencode($tabobj);
-	}
+	$param .= '&tab='.urlencode($tab);
+	$param .= '&tabobj='.urlencode($tabobj);
 
 	$value = GETPOST('value', 'alpha');
 	$result = unActivateModule($value);
@@ -3310,15 +3302,12 @@ if (is_array($listofmodules) && count($listofmodules) > 0) {
 	$modulelowercase = strtolower($module);
 
 	$param = '';
-	if ($tab) {
-		$param .= '&tab='.urlencode($tab);
-	}
 	if ($module) {
 		$param .= '&module='.urlencode($module);
 	}
-	if ($tabobj) {
-		$param .= '&tabobj='.urlencode($tabobj);
-	}
+
+	$param .= '&tab='.urlencode($tab);
+	$param .= '&tabobj='.urlencode($tabobj);
 
 	$urltomodulesetup = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?search_keyword='.urlencode($module).'">'.$langs->trans('Home').'-'.$langs->trans("Setup").'-'.$langs->trans("Modules").'</a>';
 
@@ -3333,9 +3322,7 @@ if (is_array($listofmodules) && count($listofmodules) > 0) {
 		$objMod = $moduleobj;
 		$backtourlparam = '';
 		$backtourlparam .= ($backtourlparam ? '&' : '?').'module='.$module; // No urlencode here, done later
-		if ($tab) {
-			$backtourlparam .= ($backtourlparam ? '&' : '?').'tab='.$tab; // No urlencode here, done later
-		}
+		$backtourlparam .= ($backtourlparam ? '&' : '?').'tab='.$tab; // No urlencode here, done later
 		$backtourl = $_SERVER["PHP_SELF"].$backtourlparam;
 
 		$regs = array();
@@ -3493,7 +3480,7 @@ if ($module == 'initmodule') {
 	print '<input type="text" name="module" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'" value="" autofocus>';
 	print '<input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Delete").'"'.($dirins ? '' : ' disabled="disabled"').'>';
 	print '</form>';
-} elseif (!empty($module) && isset($modulelowercase)) {
+} elseif (!empty($module) && $modulelowercase !== null) {
 	// Tabs for module
 	if (!$error) {
 		$dirread = $listofmodules[strtolower($module)]['moduledescriptorrootpath'];
@@ -3848,6 +3835,7 @@ if ($module == 'initmodule') {
 			} else {	// Edit text file
 				$fullpathoffile = dol_buildpath($file, 0, 1); // Description - level 2
 
+				$content = '';
 				if ($fullpathoffile) {
 					$content = file_get_contents($fullpathoffile);
 				}
@@ -4377,7 +4365,7 @@ if ($module == 'initmodule') {
 								print $form->textwithpicto('', $langs->trans("InfoForApiFile"), 1, 'warning');
 								print ' &nbsp; ';
 								// Comparing to null (phan considers $modulelowercase can be null here)
-								if ($modulelowercase !== null && !isModEnabled($modulelowercase)) {	// If module is not activated
+								if (!isModEnabled($modulelowercase)) {	// If module is not activated
 									print '<a href="#" class="classfortooltip" target="apiexplorer" title="'.$langs->trans("ModuleMustBeEnabled", $module).'"><strike>'.$langs->trans("ApiExplorer").'</strike></a>';
 								} else {
 									print '<a href="'.DOL_URL_ROOT.'/api/index.php/explorer/" target="apiexplorer">'.$langs->trans("ApiExplorer").'</a>';
@@ -6418,7 +6406,7 @@ if ($module == 'initmodule') {
 						print '</td>';
 
 						print '<td>';
-						$texttoshow = null;
+						$texttoshow = '';
 						if ($cron['jobtype'] == 'method') {
 							$text = $langs->trans("CronClass");
 							$texttoshow = $langs->trans('CronModule').': '.$module.'<br>';
@@ -6658,7 +6646,7 @@ if ($module == 'initmodule') {
 			print '<br>';
 
 			print '<span class="fa fa-file"></span> '.$langs->trans("PathToModulePackage").' : ';
-			if (!dol_is_file($outputfilezip)) {
+			if ($outputfilezip === null || !dol_is_file($outputfilezip)) {
 				print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 			} else {
 				$relativepath = $modulelowercase.'/bin/'.$FILENAMEZIP;
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index ad7fc9de5de..8825d6419ea 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -453,7 +453,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								}
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								print "</tr>\n";
@@ -589,7 +589,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 
 										print '<td class="center">';
-										print $form->textwithpicto('', $htmltooltip, 1, 0);
+										print $form->textwithpicto('', $htmltooltip, 1, 'info');
 										print '</td>';
 
 										// Preview
diff --git a/htdocs/modulebuilder/template/ajax/myobject.php b/htdocs/modulebuilder/template/ajax/myobject.php
index d4ca191942b..98bd1909bde 100644
--- a/htdocs/modulebuilder/template/ajax/myobject.php
+++ b/htdocs/modulebuilder/template/ajax/myobject.php
@@ -66,7 +66,7 @@ dol_include_once('/mymodule/class/myobject.class.php');
  */
 
 $mode = GETPOST('mode', 'aZ09');
-$objectId = GETPOST('objectId', 'aZ09');
+$objectId = GETPOSTINT('objectId');
 $field = GETPOST('field', 'aZ09');
 $value = GETPOST('value', 'aZ09');
 
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index a57d497ea30..11da9de8345 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -38,7 +38,7 @@ dol_include_once('/mymodule/class/myobject.class.php');
 class MyModuleApi extends DolibarrApi
 {
 	/**
-	 * @var MyObject $myobject {@type MyObject}
+	 * @var MyObject {@type MyObject}
 	 */
 	public $myobject;
 
@@ -46,7 +46,6 @@ class MyModuleApi extends DolibarrApi
 	 * Constructor
 	 *
 	 * @url     GET /
-	 *
 	 */
 	public function __construct()
 	{
@@ -194,8 +193,8 @@ class MyModuleApi extends DolibarrApi
 	 * Create myobject object
 	 *
 	 * @param array $request_data   Request data
-	 * @phan-param array{string,mixed} $request_data
-	 * @phpstan-param array{string,mixed} $request_data
+	 * @phan-param ?array<string,mixed> $request_data
+	 * @phpstan-param ?array<string,mixed> $request_data
 	 * @return int  				ID of myobject
 	 *
 	 * @throws RestException 403 Not allowed
@@ -215,7 +214,7 @@ class MyModuleApi extends DolibarrApi
 		foreach ($request_data as $field => $value) {
 			if ($field === 'caller') {
 				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller @phan-suppress-next-line PhanTypeInvalidDimOffset
-				$this->myobject->context['caller'] = sanitizeVal($request_data['caller'], 'aZ09');
+				$this->myobject->context['caller'] = sanitizeVal((string) $request_data['caller'], 'aZ09');
 				continue;
 			}
 
@@ -243,8 +242,8 @@ class MyModuleApi extends DolibarrApi
 	 *
 	 * @param 	int   		$id             Id of myobject to update
 	 * @param 	array 		$request_data   Data
-	 * @phan-param mixed[]	$request_data
-	 * @phpstan-param mixed[]	$request_data
+	 * @phan-param ?array<string,mixed>	$request_data
+	 * @phpstan-param ?array<string,mixed>	$request_data
 	 * @return 	Object						Object after update
 	 * @phan-return MyObject
 	 * @phpstan-return MyObject
@@ -301,7 +300,7 @@ class MyModuleApi extends DolibarrApi
 		// Clean data
 		// $this->myobject->abc = sanitizeVal($this->myobject->abc, 'alphanohtml');
 
-		if ($this->myobject->update(DolibarrApiAccess::$user, false) > 0) {
+		if ($this->myobject->update(DolibarrApiAccess::$user, 0) > 0) {
 			return $this->get($id);
 		} else {
 			throw new RestException(500, $this->myobject->error);
@@ -356,16 +355,19 @@ class MyModuleApi extends DolibarrApi
 	 * Validate fields before creating or updating object
 	 *
 	 * @param	array		$data   Array of data to validate
-	 * @phan-param array<string,null|int|float|string> $data
-	 * @phpstan-param	array<string,null|int|float|string> $data
+	 * @phan-param		?array<string,null|int|float|string> $data
+	 * @phpstan-param	?array<string,null|int|float|string> $data
 	 * @return	array
-	 * @phan-return array<string,null|int|float|string>|array{}
-	 * @phpstan-return array<string,null|int|float|string>|array{}
+	 * @phan-return		array<string,null|int|float|string>|array{}
+	 * @phpstan-return	array<string,null|int|float|string>|array{}
 	 *
 	 * @throws	RestException
 	 */
 	private function _validateMyObject($data)
 	{
+		if (!is_array($data)) {
+			$data = array();
+		}
 		$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) {
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index ceefd2998b0..500cdcaa476 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -802,7 +802,7 @@ class MyObject extends CommonObject
 
 		$result = '';
 		$params = [
-			'id' => $this->id,
+			'id' => (string) $this->id,
 			'objecttype' => $this->element.($this->module ? '@'.$this->module : ''),
 			'option' => $option,
 		];
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index 7ac4f25e47e..9abc8daff75 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2015		Marcos García				<marcosgdf@gmail.com>
  * Copyright (C) 2017		Ferran Marcet				<fmarcet@2byte.es>
  * Copyright (C) 2018-2024	Frédéric France				<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) ---Replace with your own copyright and developer email---
  *
@@ -431,12 +431,12 @@ class pdf_standard_myobject extends ModelePDFMyObject
 							// $this->_pagefoot($pdf,$object,$outputlangs,1);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 						}
 
 						// back to start
 						$pdf->setPage($pageposbeforenote);
-						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 						$pdf->SetFont('', '', $default_font_size - 1);
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 						$pageposafternote = $pdf->getPage();
@@ -450,7 +450,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 							$pdf->setPage($pageposafternote);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', true, $heightforfooter + $heightforfreetext);
 							//$posyafter = $tab_top_newpage;
 						}
 
@@ -472,7 +472,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 							}
 
 							// Add footer
-							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 
 							$i++;
@@ -1174,7 +1174,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
 			// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
-			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, $ltrdirection);
+			$pdf->MultiCell($widthrecbox, 2, (string) $carac_client_name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
 
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
index c8117863f12..b900878417c 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2009	Regis Houssin				<regis.houssin@inodbox.com>
  * Copyright (C) 2008i		Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  * Copyright (C) 2019-2024	Frédéric France				<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) ---Replace with your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
@@ -83,7 +83,7 @@ class mod_myobject_advanced extends ModeleNumRefMyObject
 
 		// prefix configuration
 		$text .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$text .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.getDolGlobalString('MYMODULE_MYOBJECT_ADVANCED_MASK').'">', $tooltip, 1, 1).'</td>';
+		$text .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.getDolGlobalString('MYMODULE_MYOBJECT_ADVANCED_MASK').'">', $tooltip, 1, 'help').'</td>';
 		$text .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'" name="Button"></td>';
 		$text .= '</tr>';
 
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 2451c35d972..6972f0f2567 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -336,14 +336,18 @@ foreach ($search as $key => $val) {
 		if ($key == 'status' && $search[$key] == -1) {
 			continue;
 		}
-		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-		if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0) || !empty($object->fields[$key]['arrayofkeyval'])) {
-			if ($search[$key] == '-1' || ($search[$key] === '0' && (empty($object->fields[$key]['arrayofkeyval']) || !array_key_exists('0', $object->fields[$key]['arrayofkeyval'])))) {
+		$field_spec = $object->fields[$key];
+		if ($field_spec === null) {
+			continue;
+		}
+		$mode_search = (($object->isInt($field_spec) || $object->isFloat($field_spec)) ? 1 : 0);
+		if ((strpos($field_spec['type'], 'integer:') === 0) || (strpos($field_spec['type'], 'sellist:') === 0) || !empty($field_spec['arrayofkeyval'])) {
+			if ($search[$key] == '-1' || ($search[$key] === '0' && (empty($field_spec['arrayofkeyval']) || !array_key_exists('0', $field_spec['arrayofkeyval'])))) {
 				$search[$key] = '';
 			}
 			$mode_search = 2;
 		}
-		if (empty($object->fields[$key]['searchmulti'])) {
+		if (empty($field_spec['searchmulti'])) {
 			if (!is_array($search[$key]) && $search[$key] != '') {
 				$sql .= natural_search("t.".$db->escape($key), $search[$key], (($key == 'status') ? 2 : $mode_search));
 			}
@@ -829,15 +833,15 @@ while ($i < $imaxinloop) {
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
 				print '<td'.($cssforfield ? ' class="'.$cssforfield.((preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key) && !in_array($key, array('ref'))) {
-					print ' title="'.dol_escape_htmltag($object->$key).'"';
+					print ' title="'.dol_escape_htmltag((string) $object->$key).'"';
 				}
 				print '>';
 				if ($key == 'status') {
 					print $object->getLibStatut(5);
 				} elseif ($key == 'rowid') {
-					print $object->showOutputField($val, $key, $object->id, '');
+					print $object->showOutputField($val, $key, (string) $object->id, '');
 				} else {
-					print $object->showOutputField($val, $key, $object->$key, '');
+					print $object->showOutputField($val, $key, (string) $object->$key, '');
 				}
 				print '</td>';
 				if (!$i) {

From 68ffd2b6a8011bd176b4570d41c27d4555fa3573 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 7 Feb 2025 12:51:44 +0100
Subject: [PATCH 553/602] Doc

---
 htdocs/install/mysql/migration/repair.sql | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 8262a3e1c98..dfae51fd352 100644
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -602,6 +602,10 @@ DELETE FROM llx_rights_def WHERE module = 'hrm' AND perms = 'employee';
 -- UPDATE llx_bank as b SET b.amount_main_currency = -b.amount_main_currency WHERE b.amount IS NOT NULL AND b.amount_main_currency IS NOT NULL AND SIGN(b.amount_main_currency) <> SIGN(b.amount);
 
 
+-- Sequence to fix the table llx_paiement_facture and llx_paiement for payment record on a bank account that does not exists anymore.
+-- delete from llx_paiement_facture where fk_paiement in (select rowid from llx_paiement WHERE fk_bank is not null AND fk_bank not in (select rowid from llx_bank));
+-- delete from llx_paiement WHERE fk_bank is not null AND fk_bank not in (select rowid from llx_bank);
+
 
 -- Delete duplicate entries into llx_c_transport_mode
 -- VMYSQL4.1 DELETE T1 FROM llx_c_transport_mode as T1, llx_c_transport_mode as T2 where T1.entity = T2.entity AND T1.code = T2.code and T1.rowid > T2.rowid;

From 0b67bf4dad96eb0bc42c8a7b77684eb32e11fb50 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 7 Feb 2025 13:00:24 +0100
Subject: [PATCH 554/602] Fix phan

---
 htdocs/core/modules/project/modules_project.php                 | 2 +-
 .../modules/project/task/doc/doc_generic_task_odt.modules.php   | 2 ++
 .../modules/mymodule/doc/doc_generic_myobject_odt.modules.php   | 1 +
 .../doc/doc_generic_recruitmentjobposition_odt.modules.php      | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php
index 48885f0e4c7..f0f8bdf6cb1 100644
--- a/htdocs/core/modules/project/modules_project.php
+++ b/htdocs/core/modules/project/modules_project.php
@@ -68,7 +68,7 @@ abstract class ModelePDFProjects extends CommonDocGenerator
 	/**
 	 *	Function to build pdf project onto disk
 	 *
-	 *	@param	Project		$object					Object source to build document
+	 *	@param	Task		$object					Object source to build document
 	 *	@param	Translate	$outputlangs			Lang output object
 	 * 	@param	string		$srctemplatepath	    Full path of source filename for generator using a template file
 	 *	@return	int<-1,1>      						1 if OK, <=0 if KO
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 2eb87a0189f..6c9f3b43861 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -606,6 +606,8 @@ class doc_generic_task_odt extends ModelePDFTask
 					}
 				}
 
+				/** var Task $object */
+
 				// Replace tags of lines for tasks
 				try {
 					// Security check
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index e4f82b3a537..59ae7b1ec71 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -445,6 +445,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				if ($foundtagforlines) {
 					$linenumber = 0;
 					foreach ($object->lines as $line) {
+						/** @var CommonObjectLine $line */
 						$linenumber++;
 						$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
index f40dcf70b41..637ba4f0cba 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
@@ -437,6 +437,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 				if ($foundtagforlines) {
 					$linenumber = 0;
 					foreach ($object->lines as $line) {
+						/** @var CommonObjectLine $line */
 						$linenumber++;
 						$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");

From c01c49074c4f11a636bc38ba0044c5813e73f5ea Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 7 Feb 2025 14:12:42 +0100
Subject: [PATCH 555/602] Fix phan

---
 .../modules/project/task/doc/doc_generic_task_odt.modules.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 6c9f3b43861..e45ce84f946 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -606,7 +606,7 @@ class doc_generic_task_odt extends ModelePDFTask
 					}
 				}
 
-				/** var Task $object */
+				/** @var Task $object */
 
 				// Replace tags of lines for tasks
 				try {

From 568a7723c92584b05294b79e5a3f5df0dc7bb329 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 7 Feb 2025 14:16:48 +0100
Subject: [PATCH 556/602] Fix phan

---
 htdocs/core/modules/project/modules_project.php   | 8 ++++----
 htdocs/core/modules/project/task/modules_task.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php
index f0f8bdf6cb1..26ffc207484 100644
--- a/htdocs/core/modules/project/modules_project.php
+++ b/htdocs/core/modules/project/modules_project.php
@@ -68,10 +68,10 @@ abstract class ModelePDFProjects extends CommonDocGenerator
 	/**
 	 *	Function to build pdf project onto disk
 	 *
-	 *	@param	Task		$object					Object source to build document
-	 *	@param	Translate	$outputlangs			Lang output object
-	 * 	@param	string		$srctemplatepath	    Full path of source filename for generator using a template file
-	 *	@return	int<-1,1>      						1 if OK, <=0 if KO
+	 *	@param	Project			$object					Object source to build document
+	 *	@param	Translate		$outputlangs			Lang output object
+	 * 	@param	string			$srctemplatepath	    Full path of source filename for generator using a template file
+	 *	@return	int<-1,1>      							1 if OK, <=0 if KO
 	 */
 	abstract public function write_file($object, $outputlangs, $srctemplatepath = '');
 	// phpcs:enable
diff --git a/htdocs/core/modules/project/task/modules_task.php b/htdocs/core/modules/project/task/modules_task.php
index 4bc906f6fae..5409b887914 100644
--- a/htdocs/core/modules/project/task/modules_task.php
+++ b/htdocs/core/modules/project/task/modules_task.php
@@ -60,7 +60,7 @@ abstract class ModelePDFTask extends CommonDocGenerator
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
-	 *	@param	Project		$object					Object source to build document
+	 *	@param	Task		$object					Object source to build document
 	 *	@param	Translate	$outputlangs			Lang output object
 	 * 	@param	string		$srctemplatepath		Full path of source filename for generator using a template file
 	 *	@return	int<-1,1>							1 if OK, <=0 if KO

From baa6a7928e5fab30d1e7f8b5702a30eb3fab39bd Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 7 Feb 2025 14:38:28 +0100
Subject: [PATCH 557/602] Fix type

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 27fb8fd3c27..21eb8e910d6 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2525,7 +2525,7 @@ class Societe extends CommonObject
 
 			// Position current discount
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe ";
-			$sql .= " SET remise_supplier = '".$this->db->escape($remise)."'";
+			$sql .= " SET remise_supplier = ".((float) $remise);
 			$sql .= " WHERE rowid = ".((int) $this->id);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
@@ -2574,7 +2574,7 @@ class Societe extends CommonObject
 		global $langs;
 
 		// Clean parameters
-		$remise = price2num($remise);
+		$remise = (float) price2num($remise);
 		$desc = trim($desc);
 
 		// Check parameters

From e57e185ef15e6b12a29cd67e0c075e62b2b75d99 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Fri, 7 Feb 2025 14:39:37 +0100
Subject: [PATCH 558/602] Merge branch 'develop' of
 git@github.com:Dolibarr/dolibarr.git into develop

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 21eb8e910d6..cb7cc1ad018 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2537,7 +2537,7 @@ class Societe extends CommonObject
 			// Writes trace in discount history
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_supplier";
 			$sql .= " (entity, datec, fk_soc, remise_supplier, note, fk_user_author)";
-			$sql .= " VALUES (".((int) $conf->entity).", '".$this->db->idate($now)."', ".((int) $this->id).", '".$this->db->escape($remise)."',";
+			$sql .= " VALUES (".((int) $conf->entity).", '".$this->db->idate($now)."', ".((int) $this->id).", ".((float) $remise).",";
 			$sql .= " '".$this->db->escape($note)."',";
 			$sql .= " ".((int) $user->id);
 			$sql .= ")";

From 96dd84ce8b9a5b9b066f0d1a97d2f228690c4037 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 7 Feb 2025 14:39:50 +0100
Subject: [PATCH 559/602] QUAL add hook "loadDictionaryCache"

---
 htdocs/core/class/html.form.class.php | 48 ++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8772968c774..067a3eeb738 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4304,7 +4304,7 @@ class Form
 	public function load_cache_conditions_paiements()
 	{
 		// phpcs:enable
-		global $langs;
+		global $langs, $hookmanager;
 
 		$num = count($this->cache_conditions_paiements);
 		if ($num > 0) {
@@ -4313,7 +4313,9 @@ class Form
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$sql = "SELECT rowid, code, libelle as label, deposit_percent";
+		$this->cache_conditions_paiements = array();
+
+		$sql = "SELECT rowid, code, libelle as label, deposit_percent, entity";
 		$sql .= " FROM " . $this->db->prefix() . 'c_payment_term';
 		$sql .= " WHERE entity IN (" . getEntity('c_payment_term') . ")";
 		$sql .= " AND active > 0";
@@ -4328,12 +4330,23 @@ class Form
 
 				// Si traduction existe, on l'utilise, sinon on prend le libelle par default
 				$label = ($langs->trans("PaymentConditionShort" . $obj->code) != "PaymentConditionShort" . $obj->code ? $langs->trans("PaymentConditionShort" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));
-				$this->cache_conditions_paiements[$obj->rowid]['code'] = $obj->code;
-				$this->cache_conditions_paiements[$obj->rowid]['label'] = $label;
-				$this->cache_conditions_paiements[$obj->rowid]['deposit_percent'] = $obj->deposit_percent;
+				$this->cache_conditions_paiements[$obj->rowid]['code'] = (string) $obj->code;
+				$this->cache_conditions_paiements[$obj->rowid]['label'] = (string) $label;
+				$this->cache_conditions_paiements[$obj->rowid]['deposit_percent'] = (string) $obj->deposit_percent;
+				$this->cache_conditions_paiements[$obj->rowid]['entity'] = (int) $obj->entity;
 				$i++;
 			}
 
+			$parameters = array('context' => 'paymentterm', 'cache_conditions_paiements' => $this->cache_conditions_paiements);
+			$reshook = $hookmanager->executeHooks('loadDictionaryCache', $parameters, $obj); // Note that $action and $object may have been modified by hook
+			if (empty($reshook)) {
+				if (is_array($hookmanager->resArray) && count($hookmanager->resArray)) {
+					$this->cache_conditions_paiements = array_merge($this->cache_conditions_paiements, $hookmanager->resArray);
+				}
+			} else {
+				$this->cache_conditions_paiements = $hookmanager->resArray;
+			}
+
 			//$this->cache_conditions_paiements=dol_sort_array($this->cache_conditions_paiements, 'label', 'asc', 0, 0, 1);		// We use the field sortorder of table
 
 			return $num;
@@ -4534,7 +4547,7 @@ class Form
 	public function load_cache_types_paiements()
 	{
 		// phpcs:enable
-		global $langs;
+		global $langs, $hookmanager;
 
 		$num = count($this->cache_types_paiements);        // TODO Use $conf->cache['payment_mode'] instead of $this->cache_types_paiements
 		if ($num > 0) {
@@ -4545,7 +4558,7 @@ class Form
 
 		$this->cache_types_paiements = array();
 
-		$sql = "SELECT id, code, libelle as label, type, active";
+		$sql = "SELECT id, code, libelle as label, type, entity, active";
 		$sql .= " FROM " . $this->db->prefix() . "c_paiement";
 		$sql .= " WHERE entity IN (" . getEntity('c_paiement') . ")";
 
@@ -4558,14 +4571,25 @@ class Form
 
 				// Si traduction existe, on l'utilise, sinon on prend le libelle par default
 				$label = ($langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) != "PaymentTypeShort" . $obj->code ? $langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));
-				$this->cache_types_paiements[$obj->id]['id'] = $obj->id;
-				$this->cache_types_paiements[$obj->id]['code'] = $obj->code;
-				$this->cache_types_paiements[$obj->id]['label'] = $label;
-				$this->cache_types_paiements[$obj->id]['type'] = $obj->type;
-				$this->cache_types_paiements[$obj->id]['active'] = $obj->active;
+				$this->cache_types_paiements[$obj->id]['id'] = (int) $obj->id;
+				$this->cache_types_paiements[$obj->id]['code'] = (string) $obj->code;
+				$this->cache_types_paiements[$obj->id]['label'] = (string) $label;
+				$this->cache_types_paiements[$obj->id]['type'] = (int) $obj->type;
+				$this->cache_types_paiements[$obj->id]['entity'] = (int) $obj->entity;
+				$this->cache_types_paiements[$obj->id]['active'] = (int) $obj->active;
 				$i++;
 			}
 
+			$parameters = array('context' => 'paymenttype', 'cache_types_paiements' => $this->cache_types_paiements);
+			$reshook = $hookmanager->executeHooks('loadDictionaryCache', $parameters, $obj); // Note that $action and $object may have been modified by hook
+			if (empty($reshook)) {
+				if (is_array($hookmanager->resArray) && count($hookmanager->resArray)) {
+					$this->cache_types_paiements = array_merge($this->cache_types_paiements, $hookmanager->resArray);
+				}
+			} else {
+				$this->cache_types_paiements = $hookmanager->resArray;
+			}
+
 			$this->cache_types_paiements = dol_sort_array($this->cache_types_paiements, 'label', 'asc', 0, 0, 1);
 
 			return $num;

From 8a2eb0824833f28a81154534d9c35001f473276e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 7 Feb 2025 14:54:05 +0100
Subject: [PATCH 560/602] FXI phan error

---
 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 067a3eeb738..de8ff559d11 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4338,7 +4338,7 @@ class Form
 			}
 
 			$parameters = array('context' => 'paymentterm', 'cache_conditions_paiements' => $this->cache_conditions_paiements);
-			$reshook = $hookmanager->executeHooks('loadDictionaryCache', $parameters, $obj); // Note that $action and $object may have been modified by hook
+			$reshook = $hookmanager->executeHooks('loadDictionaryCache', $parameters); // Note that $action and $object may have been modified by hook
 			if (empty($reshook)) {
 				if (is_array($hookmanager->resArray) && count($hookmanager->resArray)) {
 					$this->cache_conditions_paiements = array_merge($this->cache_conditions_paiements, $hookmanager->resArray);
@@ -4581,7 +4581,7 @@ class Form
 			}
 
 			$parameters = array('context' => 'paymenttype', 'cache_types_paiements' => $this->cache_types_paiements);
-			$reshook = $hookmanager->executeHooks('loadDictionaryCache', $parameters, $obj); // Note that $action and $object may have been modified by hook
+			$reshook = $hookmanager->executeHooks('loadDictionaryCache', $parameters); // Note that $action and $object may have been modified by hook
 			if (empty($reshook)) {
 				if (is_array($hookmanager->resArray) && count($hookmanager->resArray)) {
 					$this->cache_types_paiements = array_merge($this->cache_types_paiements, $hookmanager->resArray);

From cbe214d9f60f4d7f07ac9b00098de3b2f53c0ef8 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 7 Feb 2025 15:03:58 +0100
Subject: [PATCH 561/602] FIX add $this in $object and remove parameter

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index de8ff559d11..520642233a1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4337,8 +4337,8 @@ class Form
 				$i++;
 			}
 
-			$parameters = array('context' => 'paymentterm', 'cache_conditions_paiements' => $this->cache_conditions_paiements);
-			$reshook = $hookmanager->executeHooks('loadDictionaryCache', $parameters); // Note that $action and $object may have been modified by hook
+			$parameters = array('context' => 'paymentterm');
+			$reshook = $hookmanager->executeHooks('loadDictionaryCache', $parameters, $this); // Note that $action and $object may have been modified by hook
 			if (empty($reshook)) {
 				if (is_array($hookmanager->resArray) && count($hookmanager->resArray)) {
 					$this->cache_conditions_paiements = array_merge($this->cache_conditions_paiements, $hookmanager->resArray);
@@ -4580,8 +4580,8 @@ class Form
 				$i++;
 			}
 
-			$parameters = array('context' => 'paymenttype', 'cache_types_paiements' => $this->cache_types_paiements);
-			$reshook = $hookmanager->executeHooks('loadDictionaryCache', $parameters); // Note that $action and $object may have been modified by hook
+			$parameters = array('context' => 'paymenttype');
+			$reshook = $hookmanager->executeHooks('loadDictionaryCache', $parameters, $this); // Note that $action and $object may have been modified by hook
 			if (empty($reshook)) {
 				if (is_array($hookmanager->resArray) && count($hookmanager->resArray)) {
 					$this->cache_types_paiements = array_merge($this->cache_types_paiements, $hookmanager->resArray);

From be255c72a5378227e0d2cf7deb8886c5eb6a4935 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 7 Feb 2025 15:30:34 +0100
Subject: [PATCH 562/602] FIX travis error

---
 htdocs/core/class/discount.class.php | 2 +-
 test/phpunit/DiscountTest.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index d2234352d4f..131acc5ead5 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -354,7 +354,7 @@ class DiscountAbsolute extends CommonObject
 		$sql .= " ".price2num($this->multicurrency_amount_ht).", ".price2num($this->multicurrency_amount_tva).", ".price2num($this->multicurrency_amount_ttc).", ";
 		$sql .= " ".($this->fk_facture_source ? ((int) $this->fk_facture_source) : "null").",";
 		$sql .= " ".($this->fk_invoice_supplier_source ? ((int) $this->fk_invoice_supplier_source) : "null").",";
-		$sql .= " '".($this->multicurrency_code ? $this->multicurrency_code : "null")."',";
+		$sql .= " ".($this->multicurrency_code ? "'".$this->multicurrency_code."'" : "null").",";
 		$sql .= " ".($this->multicurrency_tx ? price2num($this->multicurrency_tx) : "null");
 		$sql .= ")";
 
diff --git a/test/phpunit/DiscountTest.php b/test/phpunit/DiscountTest.php
index e7ed4908d8a..530d6f8eff2 100644
--- a/test/phpunit/DiscountTest.php
+++ b/test/phpunit/DiscountTest.php
@@ -69,7 +69,7 @@ class DiscountTest extends CommonClassTest
 
 		$localobject = new DiscountAbsolute($db);
 		$localobject->initAsSpecimen();
-		$localobject->fk_soc = $socid;
+		$localobject->socid = $socid;
 		$result = $localobject->create($user);
 
 		$this->assertLessThan($result, 0);

From 59c3d3a0efe12382a70b53e6c681f768af08c607 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 7 Feb 2025 15:40:17 +0100
Subject: [PATCH 563/602] FIX missing escape

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

diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 131acc5ead5..dfdac04b9a4 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -354,7 +354,7 @@ class DiscountAbsolute extends CommonObject
 		$sql .= " ".price2num($this->multicurrency_amount_ht).", ".price2num($this->multicurrency_amount_tva).", ".price2num($this->multicurrency_amount_ttc).", ";
 		$sql .= " ".($this->fk_facture_source ? ((int) $this->fk_facture_source) : "null").",";
 		$sql .= " ".($this->fk_invoice_supplier_source ? ((int) $this->fk_invoice_supplier_source) : "null").",";
-		$sql .= " ".($this->multicurrency_code ? "'".$this->multicurrency_code."'" : "null").",";
+		$sql .= " ".($this->multicurrency_code ? "'".$this->db->escape($this->multicurrency_code)."'" : "null").",";
 		$sql .= " ".($this->multicurrency_tx ? price2num($this->multicurrency_tx) : "null");
 		$sql .= ")";
 

From f3e7e69107839db2e60d2853a6aa42f582b2294d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 7 Feb 2025 16:26:26 +0100
Subject: [PATCH 564/602] FIX travis error

---
 htdocs/core/class/discount.class.php | 2 +-
 test/phpunit/DiscountTest.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index d2234352d4f..dfdac04b9a4 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -354,7 +354,7 @@ class DiscountAbsolute extends CommonObject
 		$sql .= " ".price2num($this->multicurrency_amount_ht).", ".price2num($this->multicurrency_amount_tva).", ".price2num($this->multicurrency_amount_ttc).", ";
 		$sql .= " ".($this->fk_facture_source ? ((int) $this->fk_facture_source) : "null").",";
 		$sql .= " ".($this->fk_invoice_supplier_source ? ((int) $this->fk_invoice_supplier_source) : "null").",";
-		$sql .= " '".($this->multicurrency_code ? $this->multicurrency_code : "null")."',";
+		$sql .= " ".($this->multicurrency_code ? "'".$this->db->escape($this->multicurrency_code)."'" : "null").",";
 		$sql .= " ".($this->multicurrency_tx ? price2num($this->multicurrency_tx) : "null");
 		$sql .= ")";
 
diff --git a/test/phpunit/DiscountTest.php b/test/phpunit/DiscountTest.php
index e7ed4908d8a..530d6f8eff2 100644
--- a/test/phpunit/DiscountTest.php
+++ b/test/phpunit/DiscountTest.php
@@ -69,7 +69,7 @@ class DiscountTest extends CommonClassTest
 
 		$localobject = new DiscountAbsolute($db);
 		$localobject->initAsSpecimen();
-		$localobject->fk_soc = $socid;
+		$localobject->socid = $socid;
 		$result = $localobject->create($user);
 
 		$this->assertLessThan($result, 0);

From ce2f46379a360f11fcb7a0331cf317afad4dd4c2 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Fri, 7 Feb 2025 16:52:46 +0100
Subject: [PATCH 565/602] NEW shipment with product in cache

---
 htdocs/expedition/card.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index a19523f9d7b..0802d1b9b32 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2409,6 +2409,7 @@ if ($action == 'create') {
 	print '<tbody>';
 
 	// Loop on each product to send/sent
+	$conf->cache['product'] = array();
 	for ($i = 0; $i < $num_prod; $i++) {
 		$parameters = array('i' => $i, 'line' => $lines[$i], 'line_id' => $line_id, 'num' => $num_prod, 'alreadysent' => $alreadysent, 'editColspan' => !empty($editColspan) ? $editColspan : 0, 'outputlangs' => $outputlangs);
 		$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action);
@@ -2429,8 +2430,14 @@ if ($action == 'create') {
 			if ($lines[$i]->fk_product > 0) {
 				// Define output language
 				if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
-					$prod = new Product($db);
-					$prod->fetch($lines[$i]->fk_product);
+					$product_id = $lines[$i]->fk_product;
+					if (!isset($conf->cache['product'][$product_id])) {
+						$prod = new Product($db);
+						$prod->fetch($product_id);
+						$conf->cache['product'][$product_id] = $prod;
+					} else {
+						$prod = $conf->cache['product'][$product_id];
+					}
 					$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
 				} else {
 					$label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label);

From 936311ff27a7ff206324e5d87b92b0efadab3af0 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 7 Feb 2025 23:49:57 +0100
Subject: [PATCH 566/602] FIX try to fix phpstan error

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 520642233a1..149e23b3f9f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4375,6 +4375,8 @@ class Form
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
+		$this->cache_availability = array();
+
 		$langs->load('propal');
 
 		$sql = "SELECT rowid, code, label, position";

From 395fdbf39bfd25e5a3a335b02f7d1ba7ea964977 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 6 Feb 2025 22:16:48 +0100
Subject: [PATCH 567/602] Qual: Fix phan notices (mrp)

---
 dev/tools/phan/baseline.txt                   | 26 +++--------
 htdocs/admin/mrp.php                          | 13 +++---
 .../modules/mrp/doc/pdf_vinci.modules.php     |  6 +--
 htdocs/mrp/ajax/ajax_bom.php                  |  3 +-
 htdocs/mrp/class/api_mos.class.php            | 42 +++++++++++-------
 htdocs/mrp/class/mo.class.php                 | 10 ++---
 htdocs/mrp/class/moline.class.php             |  4 +-
 htdocs/mrp/index.php                          |  5 ++-
 htdocs/mrp/mo_agenda.php                      |  4 +-
 htdocs/mrp/mo_card.php                        | 16 +++----
 htdocs/mrp/mo_document.php                    |  3 +-
 htdocs/mrp/mo_list.php                        | 41 ++++++++---------
 htdocs/mrp/mo_movements.php                   | 44 +++++++++----------
 htdocs/mrp/mo_note.php                        |  3 +-
 htdocs/mrp/mo_production.php                  | 22 +++++-----
 htdocs/mrp/tpl/linkedobjectblock.tpl.php      |  4 +-
 htdocs/mrp/tpl/originproductline.tpl.php      | 12 +++--
 .../stock/class/mouvementstock.class.php      | 12 ++---
 18 files changed, 140 insertions(+), 130 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 0da0c9a1237..dcfbfa73dda 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,11 +9,11 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 2490+ occurrences
+    // PhanTypeMismatchArgument : 2450+ occurrences
     // PhanUndeclaredProperty : 530+ occurrences
     // PhanTypeMismatchArgumentNullable : 430+ occurrences
     // PhanUndeclaredGlobalVariable : 190+ occurrences
-    // PhanPluginUnknownArrayMethodReturnType : 180+ occurrences
+    // PhanPluginUnknownArrayMethodReturnType : 170+ occurrences
     // PhanPossiblyUndeclaredGlobalVariable : 160+ occurrences
     // PhanTypeMismatchProperty : 130+ occurrences
     // PhanTypeMismatchArgumentProbablyReal : 120+ occurrences
@@ -27,8 +27,8 @@ return [
     // PhanUndeclaredConstant : 15+ occurrences
     // PhanTypeComparisonFromArray : 10+ occurrences
     // PhanUndeclaredMethod : 10+ occurrences
-    // PhanPluginUnknownObjectMethodCall : 8 occurrences
     // PhanPluginSuspiciousParamPosition : 7 occurrences
+    // PhanPluginUnknownObjectMethodCall : 7 occurrences
     // PhanPluginDuplicateExpressionBinaryOp : 6 occurrences
     // PhanPluginEmptyStatementIf : 6 occurrences
     // PhanTypeArraySuspiciousNull : 6 occurrences
@@ -123,7 +123,6 @@ return [
         'htdocs/admin/mails_templates.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/admin/mails_ticket.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/admin/menus/index.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/mrp.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/multicurrency.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/order.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/payment.php' => ['PhanTypeMismatchArgument'],
@@ -466,7 +465,7 @@ return [
         'htdocs/core/modules/modSupplierProposal.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/modTicket.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/mrp/mod_mo_advanced.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/oauth/github_oauthcallback.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php' => ['PhanTypeMismatchArgument'],
@@ -608,20 +607,9 @@ return [
         'htdocs/loan/document.php' => ['PhanUndeclaredProperty'],
         'htdocs/loan/note.php' => ['PhanUndeclaredProperty'],
         'htdocs/loan/payment/payment.php' => ['PhanUndeclaredProperty'],
-        'htdocs/mrp/ajax/ajax_bom.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/mrp/class/api_mos.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
-        'htdocs/mrp/class/mo.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty'],
-        'htdocs/mrp/class/moline.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/mrp/index.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/mrp/mo_agenda.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/mrp/mo_card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/mrp/mo_document.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/mrp/mo_list.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/mrp/mo_movements.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/mrp/mo_note.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/mrp/mo_production.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/mrp/tpl/linkedobjectblock.tpl.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/mrp/tpl/originproductline.tpl.php' => ['PhanUndeclaredProperty'],
+        'htdocs/mrp/class/mo.class.php' => ['PhanTypeMismatchProperty'],
+        'htdocs/mrp/mo_movements.php' => ['PhanUndeclaredGlobalVariable'],
+        'htdocs/mrp/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/multicurrency/class/api_multicurrencies.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
         'htdocs/multicurrency/class/multicurrency.class.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchArgument'],
         'htdocs/multicurrency/multicurrency_rate.php' => ['PhanTypeMismatchArgument'],
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index 0b343459e3d..bc5a9c33f4d 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2019 Laurent Destailleur          <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -35,7 +35,6 @@ require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp.lib.php';
  * @var Conf $conf
  * @var DoliDB $db
  * @var HookManager $hookmanager
- * @var Societe $mysoc
  * @var Translate $langs
  * @var User $user
  */
@@ -263,13 +262,15 @@ foreach ($dirmodels as $reldir) {
 
 						$mrp = new Mo($db);
 						$mrp->initAsSpecimen();
+						$product = new Product($db);
+						$product->initAsSpecimen();
 
 						// Info
 						$htmltooltip = '';
 						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$mrp->type = 0;
-						$nextval = $module->getNextValue($mysoc, $mrp);
-						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+						$nextval = $module->getNextValue($product, $mrp);
+						if ((string) $nextval != $langs->trans("NotAvailable")) {
 							$htmltooltip .= ''.$langs->trans("NextValue").': ';
 							if ($nextval) {
 								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
@@ -282,7 +283,7 @@ foreach ($dirmodels as $reldir) {
 						}
 
 						print '<td class="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print $form->textwithpicto('', $htmltooltip, 1, 'info');
 						print '</td>';
 
 						print "</tr>\n";
@@ -417,7 +418,7 @@ foreach ($dirmodels as $reldir) {
 
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								// Preview
diff --git a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
index 8dcb13bcfb9..7a102ff9649 100644
--- a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
+++ b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
@@ -543,7 +543,7 @@ class pdf_vinci extends ModelePDFMo
 					// Enough for 6 chars
 					if ($this->getColumnStatus('qty')) {
 						$qty = $bom->lines[$i]->qty;
-						$this->printStdColumnContent($pdf, $curY, 'qty', $qty);
+						$this->printStdColumnContent($pdf, $curY, 'qty', (string) $qty);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
@@ -551,7 +551,7 @@ class pdf_vinci extends ModelePDFMo
 					// Enough for 6 chars
 					if ($this->getColumnStatus('qtytot')) {
 						$qtytot = $object->qty * $bom->lines[$i]->qty;
-						$this->printStdColumnContent($pdf, $curY, 'qtytot', $qtytot);
+						$this->printStdColumnContent($pdf, $curY, 'qtytot', (string) $qtytot);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
@@ -1108,7 +1108,7 @@ class pdf_vinci extends ModelePDFMo
 			$pdf->SetFont('', 'B', $default_font_size + 3);
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell($w, 3, html_entity_decode($prodToMake->description), '', 'R', false, 1, '', '', true, 0, false, true, 51, 'T', true);
+			$pdf->MultiCell($w, 3, html_entity_decode($prodToMake->description), '', 'R', false, 1, null, null, true, 0, false, true, 51, 'T', true);
 			$posy = $pdf->GetY() - 5;
 
 			// dimensions
diff --git a/htdocs/mrp/ajax/ajax_bom.php b/htdocs/mrp/ajax/ajax_bom.php
index 5fc84d5e76e..500018293af 100644
--- a/htdocs/mrp/ajax/ajax_bom.php
+++ b/htdocs/mrp/ajax/ajax_bom.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2019	Laurent Destailleur (eldy)	<eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -52,7 +53,7 @@ require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
  * @var User $user
  */
 
-$idbom = GETPOST('idbom', 'alpha');
+$idbom = GETPOSTINT('idbom');
 //$action = GETPOST('action', 'aZ09');
 
 $object = new BOM($db);
diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index 7b267902f66..df79b76fdb6 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2015       Jean-François Ferry         <jfefe@aternatik.fr>
  * Copyright (C) 2019       Maxime Kohlhaas             <maxime@atm-consulting.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 class Mos extends DolibarrApi
 {
 	/**
-	 * @var Mo $mo {@type Mo}
+	 * @var Mo {@type Mo}
 	 */
 	public $mo;
 
@@ -94,6 +94,8 @@ class Mos extends DolibarrApi
 	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
 	 * @param string		   $properties			Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array                               Array of order objects
+	 * @phan-return Mo[]
+	 * @phpstan-return Mo[]
 	 *
 	 * @throws RestException
 	 */
@@ -175,6 +177,8 @@ class Mos extends DolibarrApi
 	 * Create MO object
 	 *
 	 * @param array $request_data   Request datas
+	 * @phan-param ?array<string,string>    $request_data
+	 * @phpstan-param ?array<string,string> $request_data
 	 * @return int  ID of MO
 	 */
 	public function post($request_data = null)
@@ -208,6 +212,8 @@ class Mos extends DolibarrApi
 	 *
 	 * @param 	int   	$id             	Id of MO to update
 	 * @param 	array 	$request_data   	Datas
+	 * @phan-param ?array<string,string>    $request_data
+	 * @phpstan-param ?array<string,string> $request_data
 	 * @return 	Object						Updated object
 	 */
 	public function put($id, $request_data = null)
@@ -259,6 +265,8 @@ class Mos extends DolibarrApi
 	 *
 	 * @param   int     $id   MO ID
 	 * @return  array
+	 * @phan-return array<string,array{code:int,message:string}>
+	 * @phpstan-return array<string,array{code:int,message:string}>
 	 */
 	public function delete($id)
 	{
@@ -312,6 +320,8 @@ class Mos extends DolibarrApi
 	 *
 	 * @param int       $id				ID of state
 	 * @param array		$request_data   Request datas
+	 * @phan-param ?array<string,string>    $request_data
+	 * @phpstan-param ?array<string,string> $request_data
 	 *
 	 * @url     POST {id}/produceandconsumeall
 	 *
@@ -431,7 +441,7 @@ class Mos extends DolibarrApi
 									$error++;
 									throw new RestException(500, $moline->error);
 								}
-								$idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $value["objectid"], $value["fk_warehouse"], $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
+								$idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $value["objectid"], $value["fk_warehouse"], $qtytoprocess, 0, $labelmovement, dol_now(), '', '', (string) $tmpproduct->status_batch, $id_product_batch, $codemovement);
 							} else {
 								$moline = new MoLine($this->db);
 								$moline->fk_mo = $this->mo->id;
@@ -450,7 +460,7 @@ class Mos extends DolibarrApi
 									$error++;
 									throw new RestException(500, $moline->error);
 								}
-								$idstockmove = $stockmove->reception(DolibarrApiAccess::$user, $value["objectid"], $value["fk_warehouse"], $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
+								$idstockmove = $stockmove->reception(DolibarrApiAccess::$user, $value["objectid"], $value["fk_warehouse"], $qtytoprocess, 0, $labelmovement, '', '', (string) $tmpproduct->status_batch, dol_now(), $id_product_batch, $codemovement);
 							}
 							if ($idstockmove < 0) {
 								$error++;
@@ -519,9 +529,9 @@ class Mos extends DolibarrApi
 							$stockmove->origin_type = 'mo';
 							$stockmove->origin_id = $this->mo->id;
 							if ($qtytoprocess >= 0) {
-								$idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $line->fk_product, $line->fk_warehouse, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
+								$idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $line->fk_product, $line->fk_warehouse, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', (string) $tmpproduct->status_batch, $id_product_batch, $codemovement);
 							} else {
-								$idstockmove = $stockmove->reception(DolibarrApiAccess::$user, $line->fk_product, $line->fk_warehouse, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
+								$idstockmove = $stockmove->reception(DolibarrApiAccess::$user, $line->fk_product, $line->fk_warehouse, $qtytoprocess, 0, $labelmovement, '', '', (string) $tmpproduct->status_batch, dol_now(), $id_product_batch, $codemovement);
 							}
 							if ($idstockmove < 0) {
 								$error++;
@@ -579,9 +589,9 @@ class Mos extends DolibarrApi
 							$stockmove->origin_type = 'mo';
 							$stockmove->origin_id = $this->mo->id;
 							if ($qtytoprocess >= 0) {
-								$idstockmove = $stockmove->reception(DolibarrApiAccess::$user, $line->fk_product, $line->fk_warehouse, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
+								$idstockmove = $stockmove->reception(DolibarrApiAccess::$user, $line->fk_product, $line->fk_warehouse, $qtytoprocess, 0, $labelmovement, '', '', (string) $tmpproduct->status_batch, dol_now(), $id_product_batch, $codemovement);
 							} else {
-								$idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $line->fk_product, $line->fk_warehouse, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
+								$idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $line->fk_product, $line->fk_warehouse, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', (string) $tmpproduct->status_batch, $id_product_batch, $codemovement);
 							}
 							if ($idstockmove < 0) {
 								$error++;
@@ -688,6 +698,8 @@ class Mos extends DolibarrApi
 	 *
 	 * @param int       $id				ID of state
 	 * @param array		$request_data   Request datas
+	 * @phan-param ?array<string,string>    $request_data
+	 * @phpstan-param ?array<string,string> $request_data
 	 *
 	 * @url     POST {id}/produceandconsume
 	 *
@@ -803,15 +815,15 @@ class Mos extends DolibarrApi
 					$stockmove->origin_id = $this->mo->id;
 					if ($arrayname == "arraytoconsume") {
 						if ($qtytoprocess >= 0) {
-							$idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $molinetoprocess->fk_product, $fk_warehousetoprocess, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
+							$idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $molinetoprocess->fk_product, $fk_warehousetoprocess, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', (string) $tmpproduct->status_batch, $id_product_batch, $codemovement);
 						} else {
-							$idstockmove = $stockmove->reception(DolibarrApiAccess::$user, $molinetoprocess->fk_product, $fk_warehousetoprocess, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
+							$idstockmove = $stockmove->reception(DolibarrApiAccess::$user, $molinetoprocess->fk_product, $fk_warehousetoprocess, $qtytoprocess, 0, $labelmovement, '', '', (string) $tmpproduct->status_batch, dol_now(), $id_product_batch, $codemovement);
 						}
 					} else {
 						if ($qtytoprocess >= 0) {
-							$idstockmove = $stockmove->reception(DolibarrApiAccess::$user, $molinetoprocess->fk_product, $fk_warehousetoprocess, $qtytoprocess, $pricetoproduce, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
+							$idstockmove = $stockmove->reception(DolibarrApiAccess::$user, $molinetoprocess->fk_product, $fk_warehousetoprocess, $qtytoprocess, $pricetoproduce, $labelmovement, '', '', (string) $tmpproduct->status_batch, dol_now(), $id_product_batch, $codemovement);
 						} else {
-							$idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $molinetoprocess->fk_product, $fk_warehousetoprocess, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', $tmpproduct->status_batch, $id_product_batch, $codemovement);
+							$idstockmove = $stockmove->livraison(DolibarrApiAccess::$user, $molinetoprocess->fk_product, $fk_warehousetoprocess, $qtytoprocess, 0, $labelmovement, dol_now(), '', '', (string) $tmpproduct->status_batch, $id_product_batch, $codemovement);
 						}
 					}
 					if ($idstockmove <= 0) {
@@ -962,10 +974,10 @@ class Mos extends DolibarrApi
 	}
 
 	/**
-	 * Validate fields before create or update object
+	 * Validate fields before creating or updating an object
 	 *
-	 * @param	array		$data   Array of data to validate
-	 * @return	array
+	 * @param ?array<null|int|float|string> $data   Data to validate
+	 * @return array<string,null|int|float|string>
 	 *
 	 * @throws	RestException
 	 */
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index afbd022789f..86f72c71d2b 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -537,7 +537,7 @@ class Mo extends CommonObject
 					if ($key == 't.rowid') {
 						$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
 					} elseif (strpos($key, 'date') !== false) {
-						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate((int) $value)."'";
 					} else {
 						$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 					}
@@ -768,7 +768,7 @@ class Mo extends CommonObject
 				}
 			}
 
-			$resultline = $moline->create($user, false); // Never use triggers here
+			$resultline = $moline->create($user, 0); // Never use triggers here
 			if ($resultline <= 0) {
 				$error++;
 				$this->error = $moline->error;
@@ -808,7 +808,7 @@ class Mo extends CommonObject
 									$moline->fk_default_workstation = $line->fk_default_workstation;
 								}
 
-								$resultline = $moline->create($user, false); // Never use triggers here
+								$resultline = $moline->create($user, 0); // Never use triggers here
 								if ($resultline <= 0) {
 									$error++;
 									$this->error = $moline->error;
@@ -1747,9 +1747,9 @@ class Mo extends CommonObject
 		// Qty
 		print '<td class="right">'.$langs->trans('Qty');
 		if ($this->bom->bomtype == 0) {
-			print ' <span class="opacitymedium">('.$langs->trans("ForAQuantityOf", $this->bom->qty).')</span>';
+			print ' <span class="opacitymedium">('.$langs->trans("ForAQuantityOf", (string) $this->bom->qty).')</span>';
 		} else {
-			print ' <span class="opacitymedium">('.$langs->trans("ForAQuantityToConsumeOf", $this->bom->qty).')</span>';
+			print ' <span class="opacitymedium">('.$langs->trans("ForAQuantityToConsumeOf", (string) $this->bom->qty).')</span>';
 		}
 		// Unit
 		print '<td class="right">'.$langs->trans('Unit');
diff --git a/htdocs/mrp/class/moline.class.php b/htdocs/mrp/class/moline.class.php
index fc157e805a3..a7758c292cd 100644
--- a/htdocs/mrp/class/moline.class.php
+++ b/htdocs/mrp/class/moline.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2020  Lenin Rivas		   <lenin@leninrivas.com>
  * Copyright (C) 2023-2024  Frédéric France     <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		William Mead		<william.mead@manchenumerique.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -301,7 +301,7 @@ class MoLine extends CommonObjectLine
 					if ($key == 't.rowid') {
 						$sqlwhere[] = $this->db->sanitize($key)." = ".((int) $value);
 					} elseif (strpos($key, 'date') !== false) {
-						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate($value)."'";
+						$sqlwhere[] = $this->db->sanitize($key)." = '".$this->db->idate((int) $value)."'";
 					} else {
 						$sqlwhere[] = $this->db->sanitize($key)." LIKE '%".$this->db->escape($this->db->escapeforlike($value))."%'";
 					}
diff --git a/htdocs/mrp/index.php b/htdocs/mrp/index.php
index 2bc3b1432af..eeaa7f8acf7 100644
--- a/htdocs/mrp/index.php
+++ b/htdocs/mrp/index.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2019		Nicolas ZABOURI				<info@inovea-conseil.com>
  * Copyright (C) 2019-2024  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -207,7 +208,7 @@ if ($resql) {
 			$staticbom->status = $obj->status;
 
 			print '<tr class="oddeven">';
-			print '<td>'.$staticbom->getNomUrl(1, 32).'</td>';
+			print '<td>'.$staticbom->getNomUrl(1, '32').'</td>';
 			print '<td>'.dol_print_date($db->jdate($obj->datem), 'dayhour').'</td>';
 			print '<td class="right">'.$staticbom->getLibStatut(3).'</td>';
 			print '</tr>';
@@ -263,7 +264,7 @@ if ($resql) {
 			$staticmo->status = $obj->status;
 
 			print '<tr class="oddeven">';
-			print '<td>'.$staticmo->getNomUrl(1, 32).'</td>';
+			print '<td>'.$staticmo->getNomUrl(1, '32').'</td>';
 			print '<td>'.dol_print_date($db->jdate($obj->datem), 'dayhour').'</td>';
 			print '<td class="right">'.$staticmo->getLibStatut(3).'</td>';
 			print '</tr>';
diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php
index bbff7b188f3..b657aa4b124 100644
--- a/htdocs/mrp/mo_agenda.php
+++ b/htdocs/mrp/mo_agenda.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2017		Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -180,7 +180,7 @@ if ($object->id > 0) {
 			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');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 69c26b9f185..cd97ddf76be 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2017-2020	Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -170,7 +170,7 @@ if (empty($reshook)) {
 
 			$objectbomchildline->fetch($id_bom_line);
 
-			$TMoLines = $moline->fetchAll('DESC', 'rowid', '1', '', array('origin_id' => $id_bom_line));
+			$TMoLines = $moline->fetchAll('DESC', 'rowid', 1, 0, array('origin_id' => $id_bom_line));
 
 			foreach ($TMoLines as $tmpmoline) {
 				$_POST['fk_bom'] = $objectbomchildline->fk_bom_child;
@@ -188,7 +188,7 @@ if (empty($reshook)) {
 		exit;
 	} elseif ($action == 'confirm_cancel' && $confirm == 'yes' && !empty($permissiontoadd)) {
 		$also_cancel_consumed_and_produced_lines = (GETPOST('alsoCancelConsumedAndProducedLines', 'alpha') ? 1 : 0);
-		$result = $object->cancel($user, 0, $also_cancel_consumed_and_produced_lines);
+		$result = $object->cancel($user, 0, (bool) $also_cancel_consumed_and_produced_lines);
 		if ($result > 0) {
 			header("Location: " . dol_buildpath('/mrp/mo_card.php?id=' . $object->id, 1));
 			exit;
@@ -198,7 +198,7 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && !empty($permissiontodelete)) {
 		$also_cancel_consumed_and_produced_lines = (GETPOST('alsoCancelConsumedAndProducedLines', 'alpha') ? 1 : 0);
-		$result = $object->delete($user, 0, $also_cancel_consumed_and_produced_lines);
+		$result = $object->delete($user, 0, (bool) $also_cancel_consumed_and_produced_lines);
 		if ($result > 0) {
 			header("Location: " . $backurlforlist);
 			exit;
@@ -342,9 +342,9 @@ $help_url = 'EN:Module_Manufacturing_Orders|FR:Module_Ordres_de_Fabrication|DE:M
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-mrp page-card');
 
 
-
 // Part to create
 if ($action == 'create') {
+	$titlelist = null;
 	if (GETPOSTINT('fk_bom') > 0) {
 		$titlelist = $langs->trans("ToConsume");
 		if ($objectbom->bomtype == 1) {
@@ -439,7 +439,7 @@ if ($action == 'create') {
 	print $form->buttonsSaveCancel("Create");
 
 	if ($objectbom->id > 0) {
-		print load_fiche_titre($titlelist);
+		print load_fiche_titre((string) $titlelist);
 
 		print '<!-- list of product/services to consume -->'."\n";
 		print '<div class="div-table-responsive-no-min">';
@@ -642,7 +642,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			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');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
@@ -873,7 +873,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$htmltoenteralink = $tmparray['htmltoenteralink'];
 		print $htmltoenteralink;
 
-		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, false);
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, array());
 
 
 		print '</div><div class="fichehalfright">';
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index 9e5219d316f..b4e950d82e0 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2017	Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -156,7 +157,7 @@ if ($object->id) {
 			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');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index ea434e1187e..da3b60f5033 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2017	Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -122,22 +123,22 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval((string) $val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 
 	if ($key == 'fk_parent_line') {
 		$visible = (int) dol_eval((string) $val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible <= 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible <= 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -270,7 +271,7 @@ foreach ($search as $key => $val) {
 		}
 
 		if ($key == 'status') {
-			$sql .= natural_search('t.status', $search[$key], 0);
+			$sql .= natural_search('t.status', (string) $search[$key], 0);
 			continue;
 		}
 
@@ -445,8 +446,8 @@ 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 .= 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.'/mrp/mo_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 
@@ -545,7 +546,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -659,7 +660,7 @@ while ($i < $imaxinloop) {
 				$selected = 1;
 			}
 		}
-		print $object->getKanbanView('', array('bom'=>($obj->fk_bom > 0 ? $bom : null), 'product'=>($obj->fk_product > 0 ? $product : null), 'selected' => $selected));
+		print $object->getKanbanView('', array('bom' => ($obj->fk_bom > 0 ? $bom : null), 'product' => ($obj->fk_product > 0 ? $product : null), 'selected' => $selected));
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
@@ -708,7 +709,7 @@ while ($i < $imaxinloop) {
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
 				print '<td'.($cssforfield ? ' class="'.$cssforfield.((preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) {
-					print ' title="'.dol_escape_htmltag($object->$key).'"';
+					print ' title="'.dol_escape_htmltag((string) $object->$key).'"';
 				}
 				print '>';
 				if ($key == 'status') {
@@ -719,9 +720,9 @@ while ($i < $imaxinloop) {
 						print $moparent->getNomUrl(1);
 					}
 				} elseif ($key == 'rowid') {
-					print $object->showOutputField($val, $key, $object->id, '');
+					print $object->showOutputField($val, $key, (string) $object->id, '');
 				} else {
-					print $object->showOutputField($val, $key, $object->$key, '');
+					print $object->showOutputField($val, $key, (string) $object->$key, '');
 				}
 				print '</td>';
 				if (!$i) {
@@ -744,7 +745,7 @@ while ($i < $imaxinloop) {
 		// 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);
+		$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;
 
@@ -787,7 +788,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$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;
 
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index 5120d8a3c98..fabcca4d0e1 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2022		Ferran Marcet				<fmarcet@2byte.es>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -130,24 +130,24 @@ $objectlist = new MouvementStock($db);
 
 // Definition of fields for list
 $arrayfields = array(
-	'm.rowid' => array('label' => "Ref", 'checked' => 1, 'position' => 1),
-	'm.datem' => array('label' => "Date", 'checked' => 1, 'position' => 2),
-	'p.ref' => array('label' => "ProductRef", 'checked' => 1, 'css' => 'maxwidth100', 'position' => 3),
-	'p.label' => array('label' => "ProductLabel", 'checked' => 0, 'position' => 5),
-	'm.batch' => array('label' => "BatchNumberShort", 'checked' => 1, 'position' => 8, 'enabled' => (isModEnabled('productbatch'))),
-	'pl.eatby' => array('label' => "EatByDate", 'checked' => 0, 'position' => 9, 'enabled' => (isModEnabled('productbatch'))),
-	'pl.sellby' => array('label' => "SellByDate", 'checked' => 0, 'position' => 10, 'enabled' => (isModEnabled('productbatch'))),
-	'e.ref' => array('label' => "Warehouse", 'checked' => 1, 'position' => 100, 'enabled' => (!($id > 0))), // If we are on specific warehouse, we hide it
-	'm.fk_user_author' => array('label' => "Author", 'checked' => 0, 'position' => 120),
-	'm.inventorycode' => array('label' => "InventoryCodeShort", 'checked' => 1, 'position' => 130),
-	'm.label' => array('label' => "MovementLabel", 'checked' => 1, 'position' => 140),
-	'm.type_mouvement' => array('label' => "TypeMovement", 'checked' => 0, 'position' => 150),
-	'origin' => array('label' => "Origin", 'checked' => 1, 'position' => 155),
-	'm.fk_projet' => array('label' => 'Project', 'checked' => 0, 'position' => 180),
-	'm.value' => array('label' => "Qty", 'checked' => 1, 'position' => 200),
-	'm.price' => array('label' => "UnitPurchaseValue", 'checked' => 0, 'position' => 210)
-	//'m.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
-	//'m.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500)
+	'm.rowid' => array('label' => "Ref", 'checked' => '1', 'position' => 1),
+	'm.datem' => array('label' => "Date", 'checked' => '1', 'position' => 2),
+	'p.ref' => array('label' => "ProductRef", 'checked' => '1', 'css' => 'maxwidth100', 'position' => 3),
+	'p.label' => array('label' => "ProductLabel", 'checked' => '0', 'position' => 5),
+	'm.batch' => array('label' => "BatchNumberShort", 'checked' => '1', 'position' => 8, 'enabled' => (string) (int) (isModEnabled('productbatch'))),
+	'pl.eatby' => array('label' => "EatByDate", 'checked' => '0', 'position' => 9, 'enabled' => (string) (int) (isModEnabled('productbatch'))),
+	'pl.sellby' => array('label' => "SellByDate", 'checked' => '0', 'position' => 10, 'enabled' => (string) (int) (isModEnabled('productbatch'))),
+	'e.ref' => array('label' => "Warehouse", 'checked' => '1', 'position' => 100, 'enabled' => (string) (int) (!($id > 0))), // If we are on specific warehouse, we hide it
+	'm.fk_user_author' => array('label' => "Author", 'checked' => '0', 'position' => 120),
+	'm.inventorycode' => array('label' => "InventoryCodeShort", 'checked' => '1', 'position' => 130),
+	'm.label' => array('label' => "MovementLabel", 'checked' => '1', 'position' => 140),
+	'm.type_mouvement' => array('label' => "TypeMovement", 'checked' => '0', 'position' => 150),
+	'origin' => array('label' => "Origin", 'checked' => '1', 'position' => 155),
+	'm.fk_projet' => array('label' => 'Project', 'checked' => '0', 'position' => 180),
+	'm.value' => array('label' => "Qty", 'checked' => '1', 'position' => 200),
+	'm.price' => array('label' => "UnitPurchaseValue", 'checked' => '0', 'position' => 210)
+	//'m.datec'=>array('label'=>"DateCreation", 'checked'=>'0', 'position'=>500),
+	//'m.tms'=>array('label'=>"DateModificationShort", 'checked'=>'0', 'position'=>500)
 );
 if (getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 	unset($arrayfields['pl.sellby']);
@@ -169,7 +169,7 @@ $permissiontoproduce = $permissiontoadd;
 $permissiontoupdatecost = $user->hasRight('bom', 'write'); // User who can define cost must have knowledge of pricing
 
 if ($permissiontoupdatecost) {
-	$arrayfields['m.price']['enabled'] = 1;
+	$arrayfields['m.price']['enabled'] = '1';
 }
 
 $arrayofselected = array();
@@ -360,7 +360,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			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');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
@@ -1016,7 +1016,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// fk_project
 			print '<td>';
 			if ($objp->fk_project != 0) {
-				print $movement->get_origin($objp->fk_project, 'project');
+				print $objectlist->get_origin($objp->fk_project, 'project');
 			}
 			print '</td>';
 		}
diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index 304457df234..c2ba92da2ca 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2017	Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2024		Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -133,7 +134,7 @@ if ($id > 0 || !empty($ref)) {
 			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');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index bf68267ee2b..53d383ba51a 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2023		Christian Humpel			<christian.humpel@gmail.com>
  * Copyright (C) 2023		Vincent de Grandpré			<vincent@de-grandpre.quebec>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -142,7 +142,7 @@ if (empty($reshook)) {
 
 	if ($action == 'confirm_cancel' && $confirm == 'yes' && !empty($permissiontoadd)) {
 		$also_cancel_consumed_and_produced_lines = (GETPOST('alsoCancelConsumedAndProducedLines', 'alpha') ? 1 : 0);
-		$result = $object->cancel($user, 0, $also_cancel_consumed_and_produced_lines);
+		$result = $object->cancel($user, 0, (bool) $also_cancel_consumed_and_produced_lines);
 		if ($result > 0) {
 			header("Location: " . DOL_URL_ROOT.'/mrp/mo_card.php?id=' . $object->id);
 			exit;
@@ -152,7 +152,7 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && !empty($permissiontodelete)) {
 		$also_cancel_consumed_and_produced_lines = (GETPOST('alsoCancelConsumedAndProducedLines', 'alpha') ? 1 : 0);
-		$result = $object->delete($user, 0, $also_cancel_consumed_and_produced_lines);
+		$result = $object->delete($user, 0, (bool) $also_cancel_consumed_and_produced_lines);
 		if ($result > 0) {
 			header("Location: " . $backurlforlist);
 			exit;
@@ -244,7 +244,7 @@ if (empty($reshook)) {
 			$moline->array_options = $array_options;
 		}
 
-		$resultline = $moline->create($user, false); // Never use triggers here
+		$resultline = $moline->create($user, 0); // Never use triggers here
 		if ($resultline <= 0) {
 			$error++;
 			setEventMessages($moline->error, $moline->errors, 'errors');
@@ -297,9 +297,9 @@ if (empty($reshook)) {
 							$stockmove->context['mrp_role'] = 'toconsume';
 
 							if ($qtytoprocess >= 0) {
-								$idstockmove = $stockmove->livraison($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), $qtytoprocess, 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
+								$idstockmove = $stockmove->livraison($user, $line->fk_product, GETPOSTINT('idwarehouse-'.$line->id.'-'.$i), $qtytoprocess, 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
 							} else {
-								$idstockmove = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehouse-'.$line->id.'-'.$i), $qtytoprocess * -1, 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
+								$idstockmove = $stockmove->reception($user, $line->fk_product, GETPOSTINT('idwarehouse-'.$line->id.'-'.$i), $qtytoprocess * -1, 0, $labelmovement, dol_now(), '', '', GETPOST('batch-'.$line->id.'-'.$i), $id_product_batch, $codemovement);
 							}
 							if ($idstockmove < 0) {
 								$error++;
@@ -372,7 +372,7 @@ if (empty($reshook)) {
 							$stockmove->origin_id = $object->id;
 							$stockmove->context['mrp_role'] = 'toproduce';
 
-							$idstockmove = $stockmove->reception($user, $line->fk_product, GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i), $qtytoprocess, $pricetoprocess, $labelmovement, '', '', GETPOST('batchtoproduce-'.$line->id.'-'.$i), dol_now(), $id_product_batch, $codemovement);
+							$idstockmove = $stockmove->reception($user, $line->fk_product, GETPOSTINT('idwarehousetoproduce-'.$line->id.'-'.$i), $qtytoprocess, $pricetoprocess, $labelmovement, '', '', GETPOST('batchtoproduce-'.$line->id.'-'.$i), dol_now(), $id_product_batch, $codemovement);
 							if ($idstockmove < 0) {
 								$error++;
 								setEventMessages($stockmove->error, $stockmove->errors, 'errors');
@@ -680,7 +680,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			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');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
@@ -986,7 +986,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Extrafields Line
 			if (is_object($objectline)) {
 				$extrafields->fetch_name_optionals_label($object->table_element_line);
-				$temps = $objectline->showOptionals($extrafields, 'edit', array(), '', '', 1, 'line');
+				$temps = $objectline->showOptionals($extrafields, 'edit', array(), '', '', '1', 'line');
 				if (!empty($temps)) {
 					print '<tr class="liste_titre"><td style="padding-top: 20px" colspan="9" id="extrafield_lines_area_edit" name="extrafield_lines_area_edit">';
 					print $temps;
@@ -1146,7 +1146,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						// Extrafields Line
 						if (!empty($extrafields)) {
 							$line->fetch_optionals();
-							$temps = $line->showOptionals($extrafields, 'edit', array(), '', '', 1, 'line');
+							$temps = $line->showOptionals($extrafields, 'edit', array(), '', '', '1', 'line');
 							if (!empty($temps)) {
 								$colspan = 10;
 								print '<tr><td colspan="'.$colspan.'"><div style="padding-top: 20px" id="extrafield_lines_area_edit" name="extrafield_lines_area_edit">';
@@ -1307,7 +1307,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						// Extrafields Line
 						if (!empty($extrafields)) {
 							$line->fetch_optionals();
-							$temps = $line->showOptionals($extrafields, 'view', array(), '', '', 1, 'line');
+							$temps = $line->showOptionals($extrafields, 'view', array(), '', '', '1', 'line');
 							if (!empty($temps)) {
 								$colspan = 10;
 								print '<tr><td colspan="'.$colspan.'"><div id="extrafield_lines_area_'.$line->id.'" name="extrafield_lines_area_'.$line->id.'">';
diff --git a/htdocs/mrp/tpl/linkedobjectblock.tpl.php b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
index e4cfc5b8435..3ba0e580b5b 100644
--- a/htdocs/mrp/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2013		Juanjo Menent   <jmenent@2byte.es>
  * Copyright (C) 2014       Marcos García   <marcosgdf@gmail.com>
  * Copyright (C) 2013-2020	Charlene BENKE	<charlie@patas-monkey.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -60,7 +60,7 @@ if ($object->element == 'mo') {
 			echo '<tr class="' . $trclass . '" >';
 			echo '<td class="linkedcol-element tdoverflowmax100">' . $langs->trans("ManufacturingOrder");
 			if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
-				print '<a class="objectlinked_importbtn" href="' . $objectlink->getNomUrl(0, '', 0, 1) . '&amp;action=selectlines&amp;token='.newToken().'" data-element="' . $objectlink->element . '" data-id="' . $objectlink->id . '"  > <i class="fa fa-indent"></i> </a';
+				print '<a class="objectlinked_importbtn" href="' . $objectlink->getNomUrl(0, '', 0, '1') . '&amp;action=selectlines&amp;token='.newToken().'" data-element="' . $objectlink->element . '" data-id="' . $objectlink->id . '"  > <i class="fa fa-indent"></i> </a';
 			}
 			echo '</td>';
 			echo '<td class="linkedcol-name nowraponall" >' . $objectlink->getNomUrl(1) . '</td>';
diff --git a/htdocs/mrp/tpl/originproductline.tpl.php b/htdocs/mrp/tpl/originproductline.tpl.php
index 7b6a0436080..9b61917fe86 100644
--- a/htdocs/mrp/tpl/originproductline.tpl.php
+++ b/htdocs/mrp/tpl/originproductline.tpl.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2010-2012	Regis Houssin	<regis.houssin@inodbox.com>
  * Copyright (C) 2017		Charlie Benke	<charlie@patas-monkey.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,10 +22,14 @@
  * @var CommonObject $this
  * @var Conf $conf
  * @var Form $form
- * @var MoLine $line
+ * @var BOMLine $line
  * @var Translate $langs
  */
 
+'
+@phan-var-force BOMLine $line
+';
+
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
@@ -54,8 +58,8 @@ if ($line->fk_product > 0) {
 }
 $tmpbom = new BOM($db);
 $res = 0;
-if ($line->fk_bom_child > 0) {
-	$res = $tmpbom->fetch($line->fk_bom_child);
+if ((int) $line->fk_bom_child > 0) {
+	$res = $tmpbom->fetch((int) $line->fk_bom_child);
 }
 
 ?>
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 5794ace75d3..1c96b0284e3 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -208,15 +208,15 @@ class MouvementStock extends CommonObject
 	 *	@param		int				$price				Unit price HT of product, used to calculate average weighted price (AWP or PMP in french). If 0, average weighted price is not changed.
 	 *	@param		string			$label				Label of stock movement
 	 *	@param		string			$inventorycode		Inventory code
-	 *	@param		integer|string	$datem				Force date of movement
-	 *	@param		integer|string	$eatby				eat-by date. Will be used if lot does not exists yet and will be created.
-	 *	@param		integer|string	$sellby				sell-by date. Will be used if lot does not exists yet and will be created.
+	 *	@param		int|string		$datem				Force date of movement
+	 *	@param		int|string		$eatby				eat-by date. Will be used if lot does not exists yet and will be created.
+	 *	@param		int|string		$sellby				sell-by date. Will be used if lot does not exists yet and will be created.
 	 *	@param		string			$batch				batch number
 	 *	@param		boolean			$skip_batch			If set to true, stock movement is done without impacting batch record
 	 * 	@param		int				$id_product_batch	Id product_batch (when skip_batch is false and we already know which record of product_batch to use)
-	 *  @param		int				$disablestockchangeforsubproduct	Disable stock change for sub-products of kit (useful only if product is a subproduct)
-	 *  @param		int				$donotcleanemptylines				Do not clean lines in stock table with qty=0 (because we want to have this done by the caller)
-	 * 	@param		boolean			$force_update_batch	Allows to add batch stock movement even if $product doesn't use batch anymore
+	 *  @param		int<0,1>		$disablestockchangeforsubproduct	Disable stock change for sub-products of kit (useful only if product is a subproduct)
+	 *  @param		int<0,1>		$donotcleanemptylines				Do not clean lines in stock table with qty=0 (because we want to have this done by the caller)
+	 * 	@param		bool			$force_update_batch	Allows to add batch stock movement even if $product doesn't use batch anymore
 	 *	@return		int									Return integer <0 if KO, 0 if fk_product is null or product id does not exists, >0 if OK
 	 */
 	public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0, $disablestockchangeforsubproduct = 0, $donotcleanemptylines = 0, $force_update_batch = false)

From fd7fee2e8f2809f6b64c60667c6188ea969420ef Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 8 Feb 2025 01:49:29 +0100
Subject: [PATCH 568/602] Qual: Fix textwithpicto $type argument
 (0->info,1->help)

---
 dev/tools/phan/baseline.txt                   |  47 +----
 dev/tools/phan/config_fixer.php               |   3 +-
 dev/tools/phan/plugins/textwithpictoFixer.php | 177 ++++++++++++++++++
 htdocs/adherents/admin/member.php             |   4 +-
 htdocs/admin/agenda_other.php                 |   4 +-
 htdocs/admin/bank.php                         |   4 +-
 htdocs/admin/bom.php                          |   6 +-
 htdocs/admin/chequereceipts.php               |   4 +-
 htdocs/admin/contract.php                     |   6 +-
 htdocs/admin/delivery.php                     |   6 +-
 htdocs/admin/expedition.php                   |   6 +-
 htdocs/admin/expensereport.php                |   6 +-
 htdocs/admin/fichinter.php                    |   6 +-
 htdocs/admin/holiday.php                      |   6 +-
 htdocs/admin/hrm.php                          |   6 +-
 htdocs/admin/invoice.php                      |   6 +-
 htdocs/admin/knowledgemanagement.php          |   6 +-
 htdocs/admin/order.php                        |   6 +-
 htdocs/admin/payment.php                      |   4 +-
 htdocs/admin/propal.php                       |   6 +-
 htdocs/admin/reception_setup.php              |   6 +-
 htdocs/admin/stock.php                        |   4 +-
 htdocs/admin/stocktransfer.php                |   6 +-
 htdocs/admin/supplier_invoice.php             |   6 +-
 htdocs/admin/supplier_order.php               |   6 +-
 htdocs/admin/supplier_payment.php             |   6 +-
 htdocs/admin/supplier_proposal.php            |   6 +-
 htdocs/admin/user.php                         |   4 +-
 htdocs/admin/usergroup.php                    |   4 +-
 htdocs/admin/workstation.php                  |   6 +-
 htdocs/asset/admin/setup.php                  |   6 +-
 .../modules/mailings/modules_mailings.php     |   4 +-
 htdocs/core/tpl/admin_extrafields_add.tpl.php |  13 +-
 .../core/tpl/admin_extrafields_edit.tpl.php   |  37 ++--
 .../partnership/mod_partnership_advanced.php  |   4 +-
 htdocs/product/admin/product.php              |   6 +-
 htdocs/product/admin/product_lot.php          |   8 +-
 htdocs/product/card.php                       |  16 +-
 htdocs/product/price.php                      |  16 +-
 htdocs/projet/admin/project.php               |  10 +-
 htdocs/recruitment/admin/setup.php            |   6 +-
 .../recruitment/admin/setup_candidatures.php  |   6 +-
 htdocs/societe/admin/societe.php              |   4 +-
 .../canvas/actions_card_common.class.php      |   4 +-
 htdocs/societe/list.php                       |  16 +-
 htdocs/societe/price.php                      |  13 +-
 htdocs/takepos/admin/setup.php                |   4 +-
 47 files changed, 350 insertions(+), 196 deletions(-)
 create mode 100644 dev/tools/phan/plugins/textwithpictoFixer.php

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index dcfbfa73dda..6c27b5a85b5 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,7 +9,7 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 2450+ occurrences
+    // PhanTypeMismatchArgument : 2340+ occurrences
     // PhanUndeclaredProperty : 530+ occurrences
     // PhanTypeMismatchArgumentNullable : 430+ occurrences
     // PhanUndeclaredGlobalVariable : 190+ occurrences
@@ -92,29 +92,20 @@ return [
         'htdocs/adherents/subscription.php' => ['PhanTypeMismatchArgument'],
         'htdocs/adherents/type.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty'],
         'htdocs/adherents/vcard.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/agenda_other.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/admin/agenda_other.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/admin/agenda_reminder.php' => ['PhanTypeMismatchArgumentNullable'],
-        'htdocs/admin/bank.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/barcode.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/bom.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/chequereceipts.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/company.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/contract.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/defaultvalues.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/admin/delivery.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/dict.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/emailcollector_card.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/emailcollector_list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/eventorganization.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/expedition.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/expensereport.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/expensereport_rules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/external_rss.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/fckeditor.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/fichinter.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/holiday.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/hrm.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/invoice.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/knowledgemanagement.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/mails.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/mails_emailing.php' => ['PhanTypeMismatchArgumentNullable'],
@@ -124,32 +115,19 @@ return [
         'htdocs/admin/mails_ticket.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/admin/menus/index.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/multicurrency.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/order.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/payment.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/paymentbybanktransfer.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/pdf_other.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/prelevement.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/propal.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/receiptprinter.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/reception_setup.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/remotestore/class/PSWebServiceLibrary.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/admin/remotestore/class/dolistore.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/stock.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/stocktransfer.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/supplier_invoice.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/supplier_order.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/supplier_payment.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/supplier_proposal.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/system/filecheck.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/system/modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/taxes.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/admin/ticket.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/tools/export.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/user.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/usergroup.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/webhook.php' => ['PhanTypeMismatchArgument'],
         'htdocs/admin/website.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/admin/workstation.php' => ['PhanTypeMismatchArgument'],
         'htdocs/api/class/api_access.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanUndeclaredProperty'],
         'htdocs/api/class/api_documents.class.php' => ['PhanPluginDuplicateExpressionBinaryOp', 'PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
         'htdocs/api/class/api_login.class.php' => ['PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
@@ -442,7 +420,6 @@ return [
         'htdocs/core/modules/import/import_csv.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchProperty'],
         'htdocs/core/modules/import/import_xlsx.modules.php' => ['PhanTypeMismatchProperty'],
         'htdocs/core/modules/mailings/eventorganization.modules.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/mailings/modules_mailings.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/member/doc/pdf_standard_member.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/member/modules_cards.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/modAdherent.class.php' => ['PhanTypeMismatchArgument'],
@@ -470,10 +447,10 @@ return [
         'htdocs/core/modules/oauth/github_oauthcallback.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/project/doc/pdf_beluga.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/project/doc/pdf_timespent.modules.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/propale/doc/pdf_azur.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/propale/doc/pdf_cyan.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/reception/doc/pdf_squille.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
@@ -491,8 +468,6 @@ return [
         'htdocs/core/modules/workstation/mod_workstation_advanced.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/multicompany_page.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/search_page.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/tpl/admin_extrafields_add.tpl.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/tpl/admin_extrafields_edit.tpl.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/tpl/extrafields_list_array_fields.tpl.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/tpl/extrafields_list_print_fields.tpl.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/tpl/extrafields_view.tpl.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
@@ -623,14 +598,13 @@ return [
         'htdocs/opensurvey/wizard/create_survey.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/partnership/class/api_partnerships.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
         'htdocs/partnership/class/partnership.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php' => ['PhanUndeclaredProperty'],
         'htdocs/partnership/partnership_card.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/partnership/partnership_contact.php' => ['PhanTypeMismatchArgument'],
         'htdocs/partnership/partnership_list.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/printing/index.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/admin/price_rules.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/admin/product.php' => ['PhanPluginEmptyStatementIf', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/product/admin/product_lot.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/product/admin/product.php' => ['PhanPluginEmptyStatementIf', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/product/admin/product_tools.php' => ['PhanTypeMismatchArgument'],
         'htdocs/product/ajax/products.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/product/canvas/product/actions_card_product.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
@@ -671,7 +645,7 @@ return [
         'htdocs/product/stock/class/entrepot.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/stock/class/mouvementstock.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/product/stock/info.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/list.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
+        'htdocs/product/stock/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
         'htdocs/product/stock/massstockmove.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/product/stock/movement_card.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/product/stock/movement_list.php' => ['PhanPluginBothLiteralsBinaryOp', 'PhanPluginUndeclaredVariableIsset', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
@@ -693,7 +667,7 @@ return [
         'htdocs/projet/activity/perday.php' => ['PhanTypeMismatchArgument'],
         'htdocs/projet/activity/permonth.php' => ['PhanTypeMismatchArgument'],
         'htdocs/projet/activity/perweek.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/projet/admin/project.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/projet/admin/project.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/projet/admin/website.php' => ['PhanTypeMismatchArgument'],
         'htdocs/projet/ajax/projects.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/projet/card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable'],
@@ -762,8 +736,8 @@ return [
         'htdocs/reception/list.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/reception/note.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable'],
         'htdocs/reception/stats/index.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/recruitment/admin/setup.php' => ['PhanEmptyForeach', 'PhanTypeMismatchArgument'],
-        'htdocs/recruitment/admin/setup_candidatures.php' => ['PhanEmptyForeach', 'PhanTypeMismatchArgument'],
+        'htdocs/recruitment/admin/setup.php' => ['PhanEmptyForeach'],
+        'htdocs/recruitment/admin/setup_candidatures.php' => ['PhanEmptyForeach'],
         'htdocs/recruitment/class/api_recruitments.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/recruitment/class/recruitmentcandidature.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/recruitment/class/recruitmentjobposition.class.php' => ['PhanUndeclaredProperty'],
@@ -826,7 +800,6 @@ return [
         'htdocs/supplier_proposal/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/supplier_proposal/note.php' => ['PhanTypeMismatchArgument'],
         'htdocs/takepos/admin/bar.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/takepos/admin/setup.php' => ['PhanTypeMismatchArgument'],
         'htdocs/takepos/admin/terminal.php' => ['PhanTypeMismatchArgument'],
         'htdocs/takepos/ajax/ajax.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
         'htdocs/takepos/floors.php' => ['PhanTypeMismatchArgumentProbablyReal'],
diff --git a/dev/tools/phan/config_fixer.php b/dev/tools/phan/config_fixer.php
index 8f5df967bca..e9a0fa36763 100644
--- a/dev/tools/phan/config_fixer.php
+++ b/dev/tools/phan/config_fixer.php
@@ -14,7 +14,8 @@ $config = include __DIR__.DIRECTORY_SEPARATOR."config.php";
 //require_once __DIR__.'/plugins/PriceFormFixer.php';
 //require_once __DIR__.'/plugins/UrlEncodeStringifyFixer.php';
 //require_once __DIR__.'/plugins/SelectDateFixer.php';
-require_once __DIR__.'/plugins/setPageOrientationFixer.php';
+//require_once __DIR__.'/plugins/setPageOrientationFixer.php';
+require_once __DIR__.'/plugins/textwithpictoFixer.php';
 //require_once __DIR__.'/plugins/MultiCellFixer.php';
 //require_once __DIR__.'/plugins/setAutoPageBreakFixer.php';
 //require_once __DIR__.'/plugins/CellFixer.php';
diff --git a/dev/tools/phan/plugins/textwithpictoFixer.php b/dev/tools/phan/plugins/textwithpictoFixer.php
new file mode 100644
index 00000000000..484b02cf675
--- /dev/null
+++ b/dev/tools/phan/plugins/textwithpictoFixer.php
@@ -0,0 +1,177 @@
+<?php
+/* Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
+ *
+ * For 'price()', replace $form parameter that is '' with 0.
+ */
+
+declare(strict_types=1);
+
+use ast\flags;
+use Microsoft\PhpParser\Node\Expression\CallExpression;
+use Microsoft\PhpParser\Node\QualifiedName;
+use Phan\AST\TolerantASTConverter\NodeUtils;
+use Phan\CodeBase;
+use Phan\IssueInstance;
+use Phan\Library\FileCacheEntry;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEdit;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEditSet;
+use Phan\Plugin\Internal\IssueFixingPlugin\IssueFixer;
+use Microsoft\PhpParser\Node\Expression\ArgumentExpression;
+use Microsoft\PhpParser\Node\DelimitedList\ArgumentExpressionList;
+use Microsoft\PhpParser\Node\StringLiteral;
+use Microsoft\PhpParser\Node\NumericLiteral;
+use Microsoft\PhpParser\Node\ReservedWord;
+use Microsoft\PhpParser\Token;
+
+/**
+ * This is a prototype, there are various features it does not implement.
+ */
+
+call_user_func(static function (): void {
+	/**
+	 * @param $code_base @unused-param
+	 * @return ?FileEditSet a representation of the edit to make to replace a call to a function alias with a call to the original function
+	 */
+	$fix = static function (CodeBase $code_base, FileCacheEntry $contents, IssueInstance $instance): ?FileEditSet {
+
+		// Argument {INDEX} (${PARAMETER}) is {CODE} of type {TYPE}{DETAILS} but
+		// {FUNCTIONLIKE} takes {TYPE}{DETAILS} defined at {FILE}:{LINE} (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+
+		//htdocs\supplier_proposal\card.php:1705 PhanTypeMismatchArgumentProbablyReal Argument 3 ($h) is '' of type '' but \Form::selectDate() takes int (no real type) defined at htdocs\core\class\html.form.class.php:6799 (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+		//htdocs\supplier_proposal\card.php:1705 PhanTypeMismatchArgumentProbablyReal Argument 4 ($m) is '' of type '' but \Form::selectDate() takes int (no real type) defined at htdocs\core\class\html.form.class.php:6799 (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+		// var_dump($instance->getTemplateParameters());
+		$argument_index = (string) $instance->getTemplateParameters()[0];
+		$argument_name = (string) $instance->getTemplateParameters()[1];
+		$argument_code = (string) $instance->getTemplateParameters()[2];
+		$argument_type = (string) $instance->getTemplateParameters()[3];
+		$functionlike = (string) $instance->getTemplateParameters()[4];
+		$functiontype = (string) $instance->getTemplateParameters()[5];
+
+		$expected_functionlike = "\\Form::textwithpicto()";
+		$expected_name = "textwithpicto";
+		if ($functionlike !== $expected_functionlike) {
+			//print "$functionlike != '$expected_functionlike'".PHP_EOL;
+			return null;
+		}
+
+		$toBoolReplaceArray = array("0" => "'info'","1" => "'help'");
+		// Check if we fix any of this
+		if (
+			($argument_name === 'type' && in_array($argument_code, array_keys($toBoolReplaceArray)))
+			//|| ($argument_name === 'm' && $argument_code === "''")
+			//|| ($argument_name === 'empty' && $argument_code === "''")
+		) {
+			$replacement = $toBoolReplaceArray[$argument_code];
+			$argIdx = ($argument_index - 1) * 2;
+			$expectedStringValue = $argument_code;
+		} else {
+			print "ARG$argument_index:$argument_name CODE:$argument_name".PHP_EOL;
+			return null;
+		}
+
+		// At this point we established that the notification
+		// matches some we fix.
+
+		$line = $instance->getLine();
+
+		$edits = [];
+		foreach ($contents->getNodesAtLine($line) as $node) {
+			if (!$node instanceof ArgumentExpressionList) {
+				continue;
+			}
+			$arguments = $node->children;
+			if (count($arguments) <= $argIdx) {
+				// print "Arg Count is ".count($arguments)." - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			$is_actual_call = $node->parent instanceof CallExpression;
+			if (!$is_actual_call) {
+				// print "Not actual call - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			print "Actual call - $instance".PHP_EOL;
+			$callable = $node->parent;
+
+			$callableExpression = $callable->callableExpression;
+
+			if ($callableExpression instanceof Microsoft\PhpParser\Node\QualifiedName) {
+				$actual_name = $callableExpression->getResolvedName();
+			} elseif ($callableExpression instanceof Microsoft\PhpParser\Node\Expression\MemberAccessExpression) {
+				$memberNameToken = $callableExpression->memberName;
+				$actual_name = (new NodeUtils($contents->getContents()))->tokenToString($memberNameToken);
+			} else {
+				print "Callable expression is ".get_class($callableExpression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			if ((string) $actual_name !== (string) $expected_name) {
+				// print "Name unexpected '$actual_name'!='$expected_name' - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			foreach ($arguments as $i => $argument) {
+				if ($argument instanceof ArgumentExpression) {
+					// print "Type$i: ".get_class($argument->expression).PHP_EOL;
+				}
+			}
+
+			$fieldValue = null;
+
+
+			$arg = $arguments[$argIdx];
+
+			if (
+				$arg instanceof ArgumentExpression
+				&& $arg->expression instanceof NumericLiteral
+			) {
+				// Get the string value of the NumericLiteral
+				$fieldValue = (string) $arg->expression;
+				//print "Field is '$fieldValue'".PHP_EOL;
+			} elseif ($arg instanceof ArgumentExpression && $arg->expression instanceof ReservedWord) {
+				$child = $arg->expression->children;
+				if (!$child instanceof Token) {
+					continue;
+				}
+				$token_str = (new NodeUtils($contents->getContents()))->tokenToString($child);
+				print "$token_str KIND:".($child->kind ?? 'no kind')." ".get_class($child).PHP_EOL;
+
+				if ($token_str !== 'null') {
+					continue;
+				}
+
+				$fieldValue = '';  // Fake empty
+			} else {
+				// print "Expression is not expected type ".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			if ($fieldValue !== $expectedStringValue) {
+				// print "Not replacing '$argument_name' which is '$fieldValue'/".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			print "Fixture elem on $line - $actual_name(...'$fieldValue'...) - $instance".PHP_EOL;
+
+
+
+			// Get the first argument (delimiter)
+			$argument_to_replace = $arg;
+
+			$arg_start_pos = $argument_to_replace->getStartPosition();
+			$arg_end_pos = $argument_to_replace->getEndPosition();
+
+			// Set edit instruction
+			$edits[] = new FileEdit($arg_start_pos, $arg_end_pos, $replacement);
+		}
+		if ($edits) {
+			return new FileEditSet($edits);
+		}
+		return null;
+	};
+	IssueFixer::registerFixerClosure(
+		'PhanTypeMismatchArgument',
+		$fix
+	);
+});
diff --git a/htdocs/adherents/admin/member.php b/htdocs/adherents/admin/member.php
index 8bd3a2013ea..31a1597eeed 100644
--- a/htdocs/adherents/admin/member.php
+++ b/htdocs/adherents/admin/member.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2015		Jean-François Ferry			<jfefe@aternatik.fr>
  * Copyright (C) 2020-2024  Frédéric France      		<frederic.france@free.fr>
  * Copyright (C) 2023		Waël Almoman				<info@almoman.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -461,7 +461,7 @@ foreach ($dirmodels as $reldir) {
 
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								// Preview
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 5f50050e53c..fddb1cf8566 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2015		Jean-François Ferry	    <jfefe@aternatik.fr>
  * Copyright (C) 2016		Charlie Benke		    <charlie@patas-monkey.com>
  * Copyright (C) 2017       Open-DSI                <support@open-dsi.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -320,7 +320,7 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 						$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
 						$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
 						print '<td class="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print $form->textwithpicto('', $htmltooltip, 1, 'info');
 						print '</td>';
 						print '<td class="center">';
 						print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 2e1afa189cc..a01086727f0 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2010-2016  Juanjo Menent	       <jmenent@2byte.es>
  * Copyright (C) 2013-2018  Philippe Grand         <philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Jean-François Ferry    <jfefe@aternatik.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -413,7 +413,7 @@ foreach ($dirmodels as $reldir) {
 								//$htmltooltip .= '<br>' . $langs->trans("WatermarkOnDraftOrders") . ': ' . yn($module->option_draft_watermark, 1, 1);
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								// Preview
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index 1c4f0b4377a..de147fc81d3 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2019 Laurent Destailleur          <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -283,7 +283,7 @@ foreach ($dirmodels as $reldir) {
 						}
 
 						print '<td class="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print $form->textwithpicto('', $htmltooltip, 1, 'info');
 						print '</td>';
 
 						print "</tr>\n";
@@ -420,7 +420,7 @@ foreach ($dirmodels as $reldir) {
 
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								// Preview
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index a26f0f33af2..75b0e216b27 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2010-2016  Juanjo Menent	       <jmenent@2byte.es>
  * Copyright (C) 2013-2018  Philippe Grand             <philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Jean-François Ferry         <jfefe@aternatik.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -226,7 +226,7 @@ foreach ($dirmodels as $reldir) {
 							}
 
 							print '<td class="center">';
-							print $form->textwithpicto('', $htmltooltip, 1, 0);
+							print $form->textwithpicto('', $htmltooltip, 1, 'info');
 
 							if (getDolGlobalString('CHEQUERECEIPTS_ADDON').'.php' == $file) {  // If module is the one used, we show existing errors
 								if (!empty($module->error)) {
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index ae676a142fd..d9bd0289527 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2011-2013      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2011-2018      Philippe Grand	    <philippe.grand@atoo-net.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -316,7 +316,7 @@ foreach ($dirmodels as $reldir) {
 						}
 
 						print '<td class="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print $form->textwithpicto('', $htmltooltip, 1, 'info');
 						print '</td>';
 
 						print '</tr>';
@@ -456,7 +456,7 @@ foreach ($dirmodels as $reldir) {
 
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								// Preview
diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
index fa05a39c472..95ef16efbad 100644
--- a/htdocs/admin/delivery.php
+++ b/htdocs/admin/delivery.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2011-2013 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2011-2018 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2015	   Claudio Aschieri		<c.aschieri@19.coop>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -328,7 +328,7 @@ if (getDolGlobalString('MAIN_SUBMODULE_DELIVERY')) {
 							}
 
 							print '<td class="center">';
-							print $form->textwithpicto('', $htmltooltip, 1, 0);
+							print $form->textwithpicto('', $htmltooltip, 1, 'info');
 							print '</td>';
 
 							print '</tr>';
@@ -456,7 +456,7 @@ if (getDolGlobalString('MAIN_SUBMODULE_DELIVERY')) {
 								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").'</u>:';
 								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								// Preview
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 5ad30fc921f..1f03a708917 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2011-2012	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2011-2018	Philippe Grand			<philippe.grand@atoo-net.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -272,7 +272,7 @@ foreach ($dirmodels as $reldir) {
 						}
 
 						print '<td class="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print $form->textwithpicto('', $htmltooltip, 1, 'info');
 						print '</td>';
 
 						print '</tr>';
@@ -408,7 +408,7 @@ foreach ($dirmodels as $reldir) {
 								$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								// Preview
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 31087976ffc..e9d5c01acd8 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2008      Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  * Copyright (C) 2011-2013 Juanjo Menent			    <jmenent@2byte.es>
  * Copyright (C) 2011-2022 Philippe Grand			    <philippe.grand@atoo-net.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -298,7 +298,7 @@ foreach ($dirmodels as $reldir) {
 						}
 
 						print '<td class="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print $form->textwithpicto('', $htmltooltip, 1, 'info');
 						print '</td>';
 
 						print "</tr>\n";
@@ -427,7 +427,7 @@ foreach ($dirmodels as $reldir) {
 							$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 							$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
 							print '<td class="center">';
-							print $form->textwithpicto('', $htmltooltip, -1, 0);
+							print $form->textwithpicto('', $htmltooltip, -1, 'info');
 							print '</td>';
 
 							// Preview
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index edcd0469c1a..18c72b62051 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2008      Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  * Copyright (C) 2011-2013 Juanjo Menent			    <jmenent@2byte.es>
  * Copyright (C) 2011-2018 Philippe Grand			    <philippe.grand@atoo-net.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -364,7 +364,7 @@ foreach ($dirmodels as $reldir) {
 							}
 						}
 						print '<td class="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print $form->textwithpicto('', $htmltooltip, 1, 'info');
 						print '</td>';
 
 						print '</tr>';
@@ -503,7 +503,7 @@ foreach ($dirmodels as $reldir) {
 							$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 							$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
 							print '<td class="center">';
-							print $form->textwithpicto('', $htmltooltip, -1, 0);
+							print $form->textwithpicto('', $htmltooltip, -1, 'info');
 							print '</td>';
 
 							// Preview
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index b6fc587032d..4eb9e2f5dbd 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2011-2018      Philippe Grand	    <philippe.grand@atoo-net.com>
  * Copyright (C) 2018		    Charlene Benke		<charlie@patas-monkey.com>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -274,7 +274,7 @@ foreach ($dirmodels as $reldir) {
 						}
 
 						print '<td class="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print $form->textwithpicto('', $htmltooltip, 1, 'info');
 						print '</td>';
 
 						print '</tr>';
@@ -419,7 +419,7 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 
 
 									print '<td class="center">';
-									print $form->textwithpicto('', $htmltooltip, 1, 0);
+									print $form->textwithpicto('', $htmltooltip, 1, 'info');
 									print '</td>';
 
 									// Preview
diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index e80962f6d25..de8dfabaa18 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2021 Greg Rastklan <greg.rastklan@atm-consulting.fr>
  * Copyright (C) 2021 Jean-Pascal BOUDET <jean-pascal.boudet@atm-consulting.fr>
  * Copyright (C) 2021 Grégory BLEMAND <gregory.blemand@atm-consulting.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -331,7 +331,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								}
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								print "</tr>\n";
@@ -471,7 +471,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 
 										print '<td class="center">';
-										print $form->textwithpicto('', $htmltooltip, 1, 0);
+										print $form->textwithpicto('', $htmltooltip, 1, 'info');
 										print '</td>';
 
 										// Preview
diff --git a/htdocs/admin/invoice.php b/htdocs/admin/invoice.php
index e9dc88c9b96..1beac2929ee 100644
--- a/htdocs/admin/invoice.php
+++ b/htdocs/admin/invoice.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2012-2013  Juanjo Menent				<jmenent@2byte.es>
  * Copyright (C) 2014		Teddy Andreotti				<125155@supinfo.com>
  * Copyright (C) 2022		Anthony Berton				<anthony.berton@bb2a.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2024       Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
@@ -451,7 +451,7 @@ foreach ($dirmodels as $reldir) {
 							}
 
 							print '<td class="center">';
-							print $form->textwithpicto('', $htmltooltip, 1, 0);
+							print $form->textwithpicto('', $htmltooltip, 1, 'info');
 
 							if (getDolGlobalString('FACTURE_ADDON') . '.php' == $file) {  // If module is the one used, we show existing errors
 								if (!empty($module->error)) {
@@ -608,7 +608,7 @@ foreach ($dirmodels as $reldir) {
 
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								// Preview
diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index 7c7458a6901..953f7958bd7 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2017 	Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -450,7 +450,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								}
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								print "</tr>\n";
@@ -589,7 +589,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 
 										print '<td class="center">';
-										print $form->textwithpicto('', $htmltooltip, 1, 0);
+										print $form->textwithpicto('', $htmltooltip, 1, 'info');
 										print '</td>';
 
 										// Preview
diff --git a/htdocs/admin/order.php b/htdocs/admin/order.php
index 38b4dd721cf..27e6f623a62 100644
--- a/htdocs/admin/order.php
+++ b/htdocs/admin/order.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2011-2016 Philippe Grand			    <philippe.grand@atoo-net.com>
  * Copyright (C) 2013 	   Florian Henry			    <florian.henry@open-concept.pro>
  * Copyright (C) 2021-2024  Frédéric France				<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -368,7 +368,7 @@ foreach ($dirmodels as $reldir) {
 						}
 
 						print '<td class="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print $form->textwithpicto('', $htmltooltip, 1, 'info');
 						print '</td>';
 
 						print "</tr>\n";
@@ -509,7 +509,7 @@ foreach ($dirmodels as $reldir) {
 
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								// Preview
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index f60bed8f0c9..f40c357e13e 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2015  Juanjo Menent				<jmenent@2byte.es>
  * Copyright (C) 2020  Maxime DEMAREST              <maxime@indelog.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -230,7 +230,7 @@ foreach ($dirmodels as $reldir) {
 							}
 
 							print '<td class="center">';
-							print $form->textwithpicto('', $htmltooltip, 1, 0);
+							print $form->textwithpicto('', $htmltooltip, 1, 'info');
 
 							if (getDolGlobalString('PAYMENT_ADDON') . '.php' == $file) {  // If module is the one used, we show existing errors
 								if (!empty($module->error)) {
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 49ca75ee0a1..f9c26ab8616 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2005-2012 Regis Houssin               <regis.houssin@inodbox.com>
  * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  * Copyright (C) 2011-2013 Juanjo Menent			   <jmenent@2byte.es>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -346,7 +346,7 @@ foreach ($dirmodels as $reldir) {
 						}
 
 						print '<td class="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print $form->textwithpicto('', $htmltooltip, 1, 'info');
 						print '</td>';
 
 						print "</tr>\n";
@@ -486,7 +486,7 @@ foreach ($dirmodels as $reldir) {
 
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								// Preview
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index 7c1c855dc0a..b783d9e07df 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2018	   Quentin Vial-Gouteyron    <quentin.vial-gouteyron@atm-consulting.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -279,7 +279,7 @@ foreach ($dirmodels as $reldir) {
 						}
 
 						print '<td class="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print $form->textwithpicto('', $htmltooltip, 1, 'info');
 						print '</td>';
 
 						print '</tr>';
@@ -421,7 +421,7 @@ foreach ($dirmodels as $reldir) {
 								$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								// Preview
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 952bccf2074..10df54ee44d 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2012-2013 Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2013-2018 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -656,7 +656,7 @@ foreach ($dirmodels as $reldir) {
 
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								// Preview
diff --git a/htdocs/admin/stocktransfer.php b/htdocs/admin/stocktransfer.php
index 6a14e25c466..8dc65bc920e 100644
--- a/htdocs/admin/stocktransfer.php
+++ b/htdocs/admin/stocktransfer.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2021 SuperAdmin
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -337,7 +337,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								}
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								print "</tr>\n";
@@ -473,7 +473,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 
 										print '<td class="center">';
-										print $form->textwithpicto('', $htmltooltip, 1, 0);
+										print $form->textwithpicto('', $htmltooltip, 1, 'info');
 										print '</td>';
 
 										// Preview
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 8dab80b8157..b0c05b8bbea 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2004      Benoit Mortier          <benoit.mortier@opensides.be>
  * Copyright (C) 2010-2013 Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2011-2018 Philippe Grand          <philippe.grand@atoo-net.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -303,7 +303,7 @@ foreach ($dirmodels as $reldir) {
 						}
 
 						print '<td class="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print $form->textwithpicto('', $htmltooltip, 1, 'info');
 						print '</td>';
 
 						print '</tr>';
@@ -441,7 +441,7 @@ foreach ($dirmodels as $reldir) {
 					$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
 					$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
 					print '<td class="center">';
-					print $form->textwithpicto('', $htmltooltip, 1, 0);
+					print $form->textwithpicto('', $htmltooltip, 1, 'info');
 					print '</td>';
 					print '<td class="center">';
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.urlencode($name).'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index ba4886573f3..c10d59f2939 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2004      Benoit Mortier          <benoit.mortier@opensides.be>
  * Copyright (C) 2010-2013 Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2011-2018 Philippe Grand          <philippe.grand@atoo-net.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -320,7 +320,7 @@ foreach ($dirmodels as $reldir) {
 						}
 
 						print '<td class="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print $form->textwithpicto('', $htmltooltip, 1, 'info');
 						print '</td>';
 
 						print '</tr>';
@@ -446,7 +446,7 @@ foreach ($dirmodels as $reldir) {
 					$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
 					$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
 					print '<td class="center">';
-					print $form->textwithpicto('', $htmltooltip, 1, 0);
+					print $form->textwithpicto('', $htmltooltip, 1, 'info');
 					print '</td>';
 					print '<td class="center">';
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.urlencode($name).'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 3419f734977..20d89893d8e 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2015  Juanjo Menent				<jmenent@2byte.es>
  * Copyright (C) 2016  Laurent Destailleur          <eldy@users.sourceforge.net>
  * Copyright (C) 2020  Maxime DEMAREST              <maxime@indelog.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -307,7 +307,7 @@ foreach ($dirmodels as $reldir) {
 							}
 
 							print '<td class="center">';
-							print $form->textwithpicto('', $htmltooltip, 1, 0);
+							print $form->textwithpicto('', $htmltooltip, 1, 'info');
 
 							if (getDolGlobalString("PAYMENT_ADDON").'.php' == $file) {  // If module is the one used, we show existing errors
 								if (!empty($module->error)) {
@@ -421,7 +421,7 @@ foreach ($dirmodels as $reldir) {
 					$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
 					$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
 					print '<td class="center">';
-					print $form->textwithpicto('', $htmltooltip, 1, 0);
+					print $form->textwithpicto('', $htmltooltip, 1, 'info');
 					print '</td>';
 					print '<td class="center">';
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 4c3fc9ee12c..c642ff20383 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  * Copyright (C) 2011-2013 Juanjo Menent               <jmenent@2byte.es>
  * Copyright (C) 2015      Jean-François Ferry		   <jfefe@aternatik.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -336,7 +336,7 @@ foreach ($dirmodels as $reldir) {
 						}
 
 						print '<td class="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print $form->textwithpicto('', $htmltooltip, 1, 'info');
 						print '</td>';
 
 						print "</tr>\n";
@@ -475,7 +475,7 @@ foreach ($dirmodels as $reldir) {
 
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								// Preview
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 0c957617ce1..8055e5fdcde 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2005-2011	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2020-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -317,7 +317,7 @@ foreach ($dirmodels as $reldir) {
 
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								// Preview
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index fbaa912385a..15939c806c2 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
  * Copyright (C) 2005-2011	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -236,7 +236,7 @@ foreach ($dirmodels as $reldir) {
 
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								// Preview
diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index dc6017c33ed..b93b8e0bb0c 100644
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2020 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -281,7 +281,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								}
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								print "</tr>\n";
@@ -415,7 +415,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 
 										print '<td class="center">';
-										print $form->textwithpicto('', $htmltooltip, 1, 0);
+										print $form->textwithpicto('', $htmltooltip, 1, 'info');
 										print '</td>';
 
 										// Preview
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 22e36b47bda..4930864aa71 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004-2017  Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2024  Alexandre Spangaro   <alexandre@inovea-conseil.com>
- * Copyright (C) 2024       MDW                  <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW                  <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France      <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -301,7 +301,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								}
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								print "</tr>\n";
@@ -439,7 +439,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 
 										print '<td class="center">';
-										print $form->textwithpicto('', $htmltooltip, 1, 0);
+										print $form->textwithpicto('', $htmltooltip, 1, 'info');
 										print '</td>';
 
 										// Preview
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index 9605cbe9019..49818e9f766 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -111,7 +111,7 @@ class MailingTargets // This can't be abstract as it is used for some method
 		}
 
 		if ($this->tooltip && is_object($form)) {
-			$s .= ' '.$form->textwithpicto('', $langs->trans($this->tooltip), 1, 1);
+			$s .= ' '.$form->textwithpicto('', $langs->trans($this->tooltip), 1, 'help');
 		}
 		return $s;
 	}
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 25452bca8db..7c770e4ea77 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2012		Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
  * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW					<mdeweerd@users.noreply.github.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
@@ -194,12 +195,12 @@ print $formadmin->selectTypeOfFields('type', GETPOST('type', 'alpha'));
 	<tr><td>
 		<textarea name="param" id="param" cols="80" rows="<?php echo ROWS_4 ?>"><?php echo GETPOST('param', 'alpha'); ?></textarea>
 	</td><td>
-	<span id="helpselect" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 0, '', 0, 2, 'helpvalue1')?></span>
-	<span id="helpsellist" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist").(getDolGlobalInt('MAIN_FEATUREES_LEVEL') > 0 ? '<br>'.$langs->trans("ExtrafieldParamHelpsellist2") : ''), 1, 0, '', 0, 2, 'helpvalue2')?></span>
-	<span id="helpchkbxlst" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist").(getDolGlobalInt('MAIN_FEATUREES_LEVEL') > 0 ? '<br>'.$langs->trans("ExtrafieldParamHelpsellist2") : ''), 1, 0, '', 0, 2, 'helpvalue3')?></span>
-	<span id="helplink" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink").'<br><br>'.$langs->trans("Examples").':<br>'.$listofexamplesforlink, 1, 0, '', 0, 2, 'helpvalue4')?></span>
-	<span id="helppassword" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 0, '', 0, 2, 'helpvalue5')?></span>
-	<span id="helpseparate" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpSeparator"), 1, 0, '', 0, 2, 'helpvalue6')?></span>
+	<span id="helpselect" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 'info', '', 0, 2, 'helpvalue1')?></span>
+	<span id="helpsellist" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist").(getDolGlobalInt('MAIN_FEATUREES_LEVEL') > 0 ? '<br>'.$langs->trans("ExtrafieldParamHelpsellist2") : ''), 1, 'info', '', 0, 2, 'helpvalue2')?></span>
+	<span id="helpchkbxlst" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist").(getDolGlobalInt('MAIN_FEATUREES_LEVEL') > 0 ? '<br>'.$langs->trans("ExtrafieldParamHelpsellist2") : ''), 1, 'info', '', 0, 2, 'helpvalue3')?></span>
+	<span id="helplink" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink").'<br><br>'.$langs->trans("Examples").':<br>'.$listofexamplesforlink, 1, 'info', '', 0, 2, 'helpvalue4')?></span>
+	<span id="helppassword" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 'info', '', 0, 2, 'helpvalue5')?></span>
+	<span id="helpseparate" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpSeparator"), 1, 'info', '', 0, 2, 'helpvalue6')?></span>
 	</td></tr>
 	</table>
 </td>
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 78e0e8a2da0..5ae58298924 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2010-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012		Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW					<mdeweerd@users.noreply.github.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
@@ -210,18 +211,18 @@ if (is_array($param)) {
 <?php
 // Define list of possible type transition
 $typewecanchangeinto = array(
-	'varchar'=>array('varchar', 'phone', 'mail', 'url', 'ip', 'select', 'password', 'text', 'html'),
-	'double'=>array('double', 'price'),
-	'price'=>array('double', 'price'),
-	'text'=>array('text', 'html'),
-	'html'=>array('text', 'html'),
-	'password'=>array('password', 'varchar'),
-	'mail'=>array('varchar', 'phone', 'mail', 'url', 'ip', 'select'),
-	'url'=>array('varchar', 'phone', 'mail', 'url', 'ip', 'select'),
-	'phone'=>array('varchar', 'phone', 'mail', 'url', 'ip', 'select'),
-	'ip'=>array('varchar', 'phone', 'mail', 'url', 'ip', 'select'),
-	'select'=>array('varchar', 'phone', 'mail', 'url', 'ip', 'select'),
-	'date'=>array('date', 'datetime')
+	'varchar' => array('varchar', 'phone', 'mail', 'url', 'ip', 'select', 'password', 'text', 'html'),
+	'double' => array('double', 'price'),
+	'price' => array('double', 'price'),
+	'text' => array('text', 'html'),
+	'html' => array('text', 'html'),
+	'password' => array('password', 'varchar'),
+	'mail' => array('varchar', 'phone', 'mail', 'url', 'ip', 'select'),
+	'url' => array('varchar', 'phone', 'mail', 'url', 'ip', 'select'),
+	'phone' => array('varchar', 'phone', 'mail', 'url', 'ip', 'select'),
+	'ip' => array('varchar', 'phone', 'mail', 'url', 'ip', 'select'),
+	'select' => array('varchar', 'phone', 'mail', 'url', 'ip', 'select'),
+	'date' => array('date', 'datetime')
 );
 /* Disabled because text is text on several lines, when varchar is text on 1 line, we should not be able to convert
 if ($size <= 255 && in_array($type, array('text', 'html'))) {
@@ -256,12 +257,12 @@ if (in_array($type, array_keys($typewecanchangeinto))) {
 	<tr><td>
 		<textarea name="param" id="param" cols="80" rows="<?php echo ROWS_4 ?>"><?php echo dol_htmlcleanlastbr($param_chain); ?></textarea>
 	</td><td>
-	<span id="helpselect" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 0, '', 0, 2, 'helpvalue1')?></span>
-	<span id="helpsellist" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist").(getDolGlobalInt('MAIN_FEATUREES_LEVEL') > 0 ? '<br>'.$langs->trans("ExtrafieldParamHelpsellist2") : ''), 1, 0, '', 0, 2, 'helpvalue2')?></span>
-	<span id="helpchkbxlst" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist").(getDolGlobalInt('MAIN_FEATUREES_LEVEL') > 0 ? '<br>'.$langs->trans("ExtrafieldParamHelpsellist2") : ''), 1, 0, '', 0, 2, 'helpvalue3')?></span>
-	<span id="helplink" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink").'<br><br>'.$langs->trans("Examples").':<br>'.$listofexamplesforlink, 1, 0, '', 0, 2, 'helpvalue4')?></span>
-	<span id="helppassword" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 0, '', 0, 2, 'helpvalue5')?></span>
-	<span id="helpseparate" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpSeparator"), 1, 0, '', 0, 2, 'helpvalue6')?></span>
+	<span id="helpselect" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 'info', '', 0, 2, 'helpvalue1')?></span>
+	<span id="helpsellist" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist").(getDolGlobalInt('MAIN_FEATUREES_LEVEL') > 0 ? '<br>'.$langs->trans("ExtrafieldParamHelpsellist2") : ''), 1, 'info', '', 0, 2, 'helpvalue2')?></span>
+	<span id="helpchkbxlst" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist").(getDolGlobalInt('MAIN_FEATUREES_LEVEL') > 0 ? '<br>'.$langs->trans("ExtrafieldParamHelpsellist2") : ''), 1, 'info', '', 0, 2, 'helpvalue3')?></span>
+	<span id="helplink" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink").'<br><br>'.$langs->trans("Examples").':<br>'.$listofexamplesforlink, 1, 'info', '', 0, 2, 'helpvalue4')?></span>
+	<span id="helppassword" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 'info', '', 0, 2, 'helpvalue5')?></span>
+	<span id="helpseparate" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpSeparator"), 1, 'info', '', 0, 2, 'helpvalue6')?></span>
 	</td></tr>
 	</table>
 </td>
diff --git a/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php b/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php
index 1c677e2b282..c259be9cda6 100644
--- a/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php
+++ b/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
  * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  * Copyright (C) 2019-2024  Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -82,7 +82,7 @@ class mod_partnership_advanced extends ModeleNumRefPartnership
 
 		// Parametrage du prefix
 		$text .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$text .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskPartnership" value="'.getDolGlobalString('PARTNERSHIP_ADVANCED_MASK').'">', $tooltip, 1, 1).'</td>';
+		$text .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskPartnership" value="'.getDolGlobalString('PARTNERSHIP_ADVANCED_MASK').'">', $tooltip, 1, 'help').'</td>';
 
 		$text .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 60757b73689..fcb51f0e773 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2016      Charlie Benke		<charlie@patas-monkey.com>
  * Copyright (C) 2016	   Ferran Marcet		<fmarcet@2byte.es>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -69,7 +69,7 @@ $select_pricing_rules = array(
 	'PRODUCT_PRICE_UNIQ' => $langs->trans('PriceCatalogue'), // Unique price
 	'PRODUIT_MULTIPRICES' => $langs->trans('MultiPricesAbility'), // Several prices according to a customer level
 	'PRODUIT_CUSTOMER_PRICES' => $langs->trans('PriceByCustomer'), // Different price for each customer
-	'PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES'=>$langs->trans('PriceByCustomeAndMultiPricesAbility'), // Different price for each customer and several prices according to a customer level
+	'PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES' => $langs->trans('PriceByCustomeAndMultiPricesAbility'), // Different price for each customer and several prices according to a customer level
 );
 $keyforparam = 'PRODUIT_CUSTOMER_PRICES_BY_QTY';
 if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1 || getDolGlobalString($keyforparam)) {
@@ -504,7 +504,7 @@ foreach ($dirmodels as $reldir) {
 
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								// Preview
diff --git a/htdocs/product/admin/product_lot.php b/htdocs/product/admin/product_lot.php
index 0b777f04943..77b16d06800 100644
--- a/htdocs/product/admin/product_lot.php
+++ b/htdocs/product/admin/product_lot.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2021		Christophe Battarel  <christophe.battarel@altairis.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -280,7 +280,7 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							}
 
 							print '<td class="center">';
-							print $form->textwithpicto('', $htmltooltip, 1, 0);
+							print $form->textwithpicto('', $htmltooltip, 1, 'info');
 							print '</td>';
 
 							print "</tr>\n";
@@ -382,7 +382,7 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							}
 
 							print '<td class="center">';
-							print $form->textwithpicto('', $htmltooltip, 1, 0);
+							print $form->textwithpicto('', $htmltooltip, 1, 'info');
 							print '</td>';
 
 							print "</tr>\n";
@@ -511,7 +511,7 @@ foreach ($dirmodels as $reldir) {
 
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								// Preview
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 323a650bbbb..deff2ccba3b 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -20,7 +20,7 @@
  * Copyright (C) 2019-2020  Thibault FOUCART        <support@ptibogxiv.net>
  * Copyright (C) 2020       Pierre Ardoin           <mapiolca@me.com>
  * Copyright (C) 2022       Vincent de Grandpré     <vincent@de-grandpre.quebec>
- * Copyright (C) 2024       MDW                     <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW                     <mdeweerd@users.noreply.github.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
@@ -1513,7 +1513,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 						$inherited_mask_lot = getDolGlobalString('LOT_ADVANCED_MASK');
 						$inherited_mask_sn = getDolGlobalString('SN_ADVANCED_MASK');
 						print '<td id="field_mask">';
-						print $form->textwithpicto('<input type="text" class="flat minwidth175" name="batch_mask" id="batch_mask_input">', $tooltip, 1, 1);
+						print $form->textwithpicto('<input type="text" class="flat minwidth175" name="batch_mask" id="batch_mask_input">', $tooltip, 1, 'help');
 						print '<script type="text/javascript">
 									$(document).ready(function() {
 										$("#field_mask, #mask_option").addClass("hideobject");
@@ -1656,7 +1656,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				if (!getDolGlobalString('SERVICE_STRICT_MANDATORY_PERIOD')) {
 					$htmltooltip .= '<br>'.$langs->trans("mandatoryHelper2");
 				}
-				print $form->textwithpicto($langs->trans("mandatoryperiod"), $htmltooltip, 1, 0);
+				print $form->textwithpicto($langs->trans("mandatoryperiod"), $htmltooltip, 1, 'info');
 				print '</label>';
 
 				print '</td></tr>';
@@ -2125,7 +2125,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 							$inherited_mask_lot = getDolGlobalString('LOT_ADVANCED_MASK');
 							$inherited_mask_sn = getDolGlobalString('SN_ADVANCED_MASK');
 							print '<td id="field_mask">';
-							print $form->textwithpicto('<input type="text" class="flat minwidth175" name="batch_mask" id="batch_mask_input" value="'.$mask.'">', $tooltip, 1, 1);
+							print $form->textwithpicto('<input type="text" class="flat minwidth175" name="batch_mask" id="batch_mask_input" value="'.$mask.'">', $tooltip, 1, 'help');
 							// Add javascript to sho/hide field for custom mask
 							if (!empty($conf->use_javascript_ajax)) {
 								print '<script type="text/javascript">
@@ -2276,7 +2276,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 					// Mandatory period
 					//if ($object->duration_value > 0) {
-						print ' &nbsp; &nbsp; ';
+					print ' &nbsp; &nbsp; ';
 					//}
 					print '<input type="checkbox" class="valignmiddle" id="mandatoryperiod" name="mandatoryperiod"'.($object->mandatory_period == 1 ? ' checked="checked"' : '').'>';
 					print '<label for="mandatoryperiod">';
@@ -2284,7 +2284,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					if (!getDolGlobalString('SERVICE_STRICT_MANDATORY_PERIOD')) {
 						$htmltooltip .= '<br>'.$langs->trans("mandatoryHelper2");
 					}
-					print $form->textwithpicto($langs->trans("mandatoryperiod"), $htmltooltip, 1, 0);
+					print $form->textwithpicto($langs->trans("mandatoryperiod"), $htmltooltip, 1, 'info');
 					print '</label>';
 
 					print '</td></tr>';
@@ -2812,7 +2812,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					print '<tr><td class="titlefieldmiddle">'.$langs->trans("Duration").'</td><td>';
 					if ($object->duration_value) {
 						print $object->duration_value;
-						print (!empty($object->duration_unit) && isset($durations[$object->duration_unit]) ? "&nbsp; ".$langs->trans($durations[$object->duration_unit])."&nbsp;" : '');
+						print(!empty($object->duration_unit) && isset($durations[$object->duration_unit]) ? "&nbsp; ".$langs->trans($durations[$object->duration_unit])."&nbsp;" : '');
 					}
 
 					// Mandatory period
@@ -2824,7 +2824,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 						print ' &nbsp; &nbsp; ';
 					}
 					print '<input type="checkbox" class="valignmiddle" name="mandatoryperiod"'.($object->mandatory_period == 1 ? ' checked="checked"' : '').' disabled>';
-					print $form->textwithpicto($langs->trans("mandatoryperiod"), $htmltooltip, 1, 0);
+					print $form->textwithpicto($langs->trans("mandatoryperiod"), $htmltooltip, 1, 'info');
 
 					print '</td></tr>';
 				} else {
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 7e455771536..deff4d29ece 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -13,7 +13,7 @@
  * Copyright (C) 2016		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2018		Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2025		Mélina Joum				<melina.joum@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1733,7 +1733,7 @@ if (($action == 'edit_price' || $action == 'edit_level_price') && $object->getRi
 		$product->fetch($id, $ref, '', 1); //Ignore the math expression when getting the price
 		print '<tr id="price_numeric"><td>';
 		$text = $langs->trans('SellingPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
+		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 'help');
 		print '</td><td>';
 		if ($object->price_base_type == 'TTC') {
 			print '<input name="price" size="10" value="'.price($product->price_ttc).'">';
@@ -1745,7 +1745,7 @@ if (($action == 'edit_price' || $action == 'edit_level_price') && $object->getRi
 		// Price minimum
 		print '<tr><td>';
 		$text = $langs->trans('MinPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
+		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 'help');
 		print '</td><td>';
 		if ($object->price_base_type == 'TTC') {
 			print '<input name="price_min" size="10" value="'.price($object->price_min_ttc).'">';
@@ -1928,7 +1928,7 @@ if (($action == 'edit_price' || $action == 'edit_level_price') && $object->getRi
 			print '<td>';
 			$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$i;
 			$text = $langs->trans('SellingPrice').' '.$i.' - '.getDolGlobalString($keyforlabel);
-			print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
+			print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 'help');
 			print '</td>';
 
 			// VAT
@@ -2106,7 +2106,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT
 		// Price
 		print '<tr><td class="fieldrequired">';
 		$text = $langs->trans('SellingPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
+		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 'help');
 		print '</td><td>';
 		if ($object->price_base_type == 'TTC') {
 			print '<input name="price" size="10" value="'.price($object->price_ttc).'">';
@@ -2118,7 +2118,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT
 		// Price minimum
 		print '<tr><td>';
 		$text = $langs->trans('MinPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
+		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 'help');
 		if ($object->price_base_type == 'TTC') {
 			print '<td><input name="price_min" size="10" value="'.price($object->price_min_ttc).'">';
 		} else {
@@ -2223,7 +2223,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT
 		// Price
 		print '<tr><td class="fieldrequired">';
 		$text = $langs->trans('SellingPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
+		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 'help');
 		print '</td><td>';
 		if ($prodcustprice->price_base_type == 'TTC') {
 			print '<input name="price" size="10" value="'.price($prodcustprice->price_ttc).'">';
@@ -2235,7 +2235,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT
 		// Price minimum
 		print '<tr><td>';
 		$text = $langs->trans('MinPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
+		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 'help');
 		print '</td><td>';
 		if ($prodcustprice->price_base_type == 'TTC') {
 			print '<input name="price_min" size="10" value="'.price($prodcustprice->price_min_ttc).'">';
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 58fae61f8d2..0be249c1121 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2015       Marcos García       <marcosgdf@gmail.com>
  * Copyright (C) 2018		Ferran Marcet		<fmarcet@2byte.es>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -395,7 +395,7 @@ foreach ($dirmodels as $reldir) {
 						}
 
 						print '<td class="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print $form->textwithpicto('', $htmltooltip, 1, 'info');
 						print '</td>';
 
 						print '</tr>';
@@ -495,7 +495,7 @@ if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 							}
 
 							print '<td class="center">';
-							print $form->textwithpicto('', $htmltooltip, 1, 0);
+							print $form->textwithpicto('', $htmltooltip, 1, 'info');
 							print '</td>';
 
 							print '</tr>';
@@ -634,7 +634,7 @@ foreach ($dirmodels as $reldir) {
 								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								// Preview
@@ -780,7 +780,7 @@ if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 									$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
 
 									print '<td class="center">';
-									print $form->textwithpicto('', $htmltooltip, 1, 0);
+									print $form->textwithpicto('', $htmltooltip, 1, 'info');
 									print '</td>';
 
 									// Preview
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index cdf35793f84..b80897a2635 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2020  Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -343,7 +343,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								}
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								print "</tr>\n";
@@ -482,7 +482,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 
 										print '<td class="center">';
-										print $form->textwithpicto('', $htmltooltip, 1, 0);
+										print $form->textwithpicto('', $htmltooltip, 1, 'info');
 										print '</td>';
 
 										// Preview
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index b113a9a5b32..5fdbfa43419 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -337,7 +337,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								}
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $form->textwithpicto('', $htmltooltip, 1, 'info');
 								print '</td>';
 
 								print "</tr>\n";
@@ -476,7 +476,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
 
 										print '<td class="center">';
-										print $form->textwithpicto('', $htmltooltip, 1, 0);
+										print $form->textwithpicto('', $htmltooltip, 1, 'info');
 										print '</td>';
 
 										// Preview
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 29b48fb1e7b..e36905642e7 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2011  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2011-2012  Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -659,7 +659,7 @@ foreach ($dirsociete as $dirroot) {
 					$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraft").': '.yn((isset($module->option_draft_watermark) ? $module->option_draft_watermark : ''), 1, 1);
 
 					print '<td class="center nowrap">';
-					print $form->textwithpicto('', $htmltooltip, 1, 0);
+					print $form->textwithpicto('', $htmltooltip, 1, 'info');
 					print '</td>';
 
 					// Preview
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index a06a442568f..ef113ba10da 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2010-2012	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2011-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -318,7 +318,7 @@ abstract class ActionsCardCommon
 
 			$img = picto_from_langcode($this->object->country_code);
 			if ($this->object->isInEEC()) {
-				$this->tpl['country'] = $form->textwithpicto(($img ? $img.' ' : '').$this->object->country, $langs->trans("CountryIsInEEC"), 1, 0);
+				$this->tpl['country'] = $form->textwithpicto(($img ? $img.' ' : '').$this->object->country, $langs->trans("CountryIsInEEC"), 1, 'info');
 			}
 			$this->tpl['country'] = ($img ? $img.' ' : '').$this->object->country;
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index bd82817b05e..449a7b02a9b 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -14,7 +14,7 @@
  * Copyright (C) 2021-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2022       Anthony Berton          <anthony.berton@bb2a.fr>
  * Copyright (C) 2023       William Mead            <william.mead@manchenumerique.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Benjamin Falière		<benjamin.faliere@altairis.fr>
  * Copyright (C) 2024       Nick Fragoulis
  *
@@ -319,7 +319,7 @@ $arrayfields = array(
 	's.fk_prospectlevel' => array('label' => "ProspectLevel", 'position' => 62, 'checked' => $checkprospectlevel),
 	's.fk_stcomm' => array('label' => "StatusProsp", 'position' => 63, 'checked' => $checkstcomm),
 	's2.nom' => array('label' => 'ParentCompany', 'position' => 64, 'checked' => 0),
-	's.ip' => array('type'=>'ip', 'label' => "IPAddress", 'checked' => -2, 'position' => 500),
+	's.ip' => array('type' => 'ip', 'label' => "IPAddress", 'checked' => -2, 'position' => 500),
 	's.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 501),
 	's.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 505),
 	's.note_public' => array('label' => 'NotePublic', 'checked' => 0, 'position' => 520, 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES'))),
@@ -1730,27 +1730,27 @@ if (!empty($arrayfields['s.url']['checked'])) {
 	$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 ');
+	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"), $textprofid[1], 1, 'info'), $_SERVER["PHP_SELF"], "s.siren", "", $param, '', $sortfield, $sortorder, 'nowrap ');
 	$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 ');
+	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"), $textprofid[2], 1, 'info'), $_SERVER["PHP_SELF"], "s.siret", "", $param, '', $sortfield, $sortorder, 'nowrap ');
 	$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 ');
+	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"), $textprofid[3], 1, 'info'), $_SERVER["PHP_SELF"], "s.ape", "", $param, '', $sortfield, $sortorder, 'nowrap ');
 	$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 ');
+	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"), $textprofid[4], 1, 'info'), $_SERVER["PHP_SELF"], "s.idprof4", "", $param, '', $sortfield, $sortorder, 'nowrap ');
 	$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 ');
+	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"), $textprofid[5], 1, 'info'), $_SERVER["PHP_SELF"], "s.idprof5", "", $param, '', $sortfield, $sortorder, 'nowrap ');
 	$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 ');
+	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"), $textprofid[6], 1, 'info'), $_SERVER["PHP_SELF"], "s.idprof6", "", $param, '', $sortfield, $sortorder, 'nowrap ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.tva_intra']['checked'])) {
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 24a7f838ad8..e06605e8a66 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2023	    Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  * Copyright (C) 2024		Mélina Joum				<melina.joum@altairis.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -216,8 +217,8 @@ if (empty($reshook)) {
 		$result = $prodcustprice->update($user, 0, $update_child_soc);
 		if ($result > 0) {
 			$extrafields->fetch_name_optionals_label("product_customer_price");
-				$extralabels = !empty($extrafields->attributes["product_customer_price"]['label']) ? $extrafields->attributes["product_customer_price"]['label'] : '';
-				$extrafield_values = $extrafields->getOptionalsFromPost("product_customer_price");
+			$extralabels = !empty($extrafields->attributes["product_customer_price"]['label']) ? $extrafields->attributes["product_customer_price"]['label'] : '';
+			$extrafield_values = $extrafields->getOptionalsFromPost("product_customer_price");
 			if (!empty($extralabels) && is_array($extralabels)) {
 				$productcustomerprice = new ProductCustomerPrice($db);
 				$res = $productcustomerprice->fetch($prodcustprice->id);
@@ -392,7 +393,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT
 		// Price
 		print '<tr><td width="20%">';
 		$text = $langs->trans('SellingPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
+		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 'help');
 		print '</td><td>';
 		print '<input name="price" size="10" value="'.GETPOSTINT('price').'">';
 		print '</td></tr>';
@@ -400,7 +401,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT
 		// Price minimum
 		print '<tr><td>';
 		$text = $langs->trans('MinPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
+		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 'help');
 		print '<td><input name="price_min" size="10" value="'.GETPOSTINT('price_min').'">';
 		print '</td></tr>';
 
@@ -485,7 +486,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT
 			// Price
 			print '<tr><td>';
 			$text = $langs->trans('SellingPrice');
-			print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
+			print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 'help');
 			print '</td><td>';
 			if ($prodcustprice->price_base_type == 'TTC') {
 				print '<input name="price" size="10" value="'.price($prodcustprice->price_ttc).'">';
@@ -497,7 +498,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT
 			// Price minimum
 			print '<tr><td>';
 			$text = $langs->trans('MinPrice');
-			print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
+			print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 'help');
 			print '</td><td>';
 			if ($prodcustprice->price_base_type == 'TTC') {
 				print '<input name="price_min" size="10" value="'.price($prodcustprice->price_min_ttc).'">';
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index a1e33ab79a0..4e075c6d991 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2011-2017  Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2021       Nicolas ZABOURI     <info@inovea-conseil.com>
  * Copyright (C) 2022       Alexandre Spangaro  <aspangaro@open-dsi.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -242,7 +242,7 @@ foreach ($dirmodels as $reldir) {
 						}
 
 						print '<td align="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print $form->textwithpicto('', $htmltooltip, 1, 'info');
 						print '</td>';
 
 						print "</tr>\n";

From d41f178adbcaf14a904d1c95a79a54b6b7c76911 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 8 Feb 2025 08:04:18 +0100
Subject: [PATCH 569/602] FIX Timesheet per month - header with <th>

---
 htdocs/projet/activity/permonth.php | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index b53276328a9..c7c312dfe0e 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -1,10 +1,11 @@
 <?php
-/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010      François Legastelois <flegastelois@teclib.com>
+/* Copyright (C) 2005		Rodolphe Quiedeville		<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015	Laurent Destailleur			<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2010	Regis Houssin				<regis.houssin@capnetworks.com>
+ * Copyright (C) 2010		François Legastelois		<flegastelois@teclib.com>
  * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024		Frédéric France				<frederic.france@free.fr>
+ * Copyright (C) 2025		Alexandre Spangaro			<alexandre@inovea-conseil.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
@@ -608,29 +609,29 @@ print "</tr>\n";
 
 print '<tr class="liste_titre">';
 if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
-	print '<td>'.$langs->trans("Project").'</td>';
+	print '<th>'.$langs->trans("Project").'</th>';
 }
 if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
-	print '<td>'.$langs->trans("ThirdParty").'</td>';
+	print '<th>'.$langs->trans("ThirdParty").'</th>';
 }
-print '<td>'.$langs->trans("Task").'</td>';
+print '<th>'.$langs->trans("Task").'</th>';
 if (!empty($arrayfields['t.planned_workload']['checked'])) {
-	print '<td align="right" class="leftborder plannedworkload maxwidth75">'.$form->textwithpicto($langs->trans("PlannedWorkloadShort"), $langs->trans("PlannedWorkload")).'</td>';
+	print '<th class="leftborder plannedworkload maxwidth75 maxwidth100 right">'.$form->textwithpicto($langs->trans("PlannedWorkloadShort"), $langs->trans("PlannedWorkload")).'</th>';
 }
 if (!empty($arrayfields['t.progress']['checked'])) {
-	print '<td class="right maxwidth75">'.$langs->trans("ProgressDeclared").'</td>';
+	print '<th class="right maxwidth75">'.$langs->trans("ProgressDeclared").'</th>';
 }
 if (!empty($arrayfields['timeconsumed']['checked'])) {
-	print '<td class="right maxwidth100">'.$langs->trans("TimeSpentSmall").'<br>';
+	print '<th class="right maxwidth100">'.$langs->trans("TimeSpentSmall").'<br>';
 	print '<span class="nowraponall">';
 	print '<span class="opacitymedium nopadding userimg"><img alt="Photo" class="photouserphoto userphoto" src="'.DOL_URL_ROOT.'/theme/common/everybody.png"></span>';
 	print '<span class="opacitymedium paddingleft">'.$langs->trans("EverybodySmall").'</span>';
 	print '</span>';
-	print '</td>';
-	print '<td class="right maxwidth75">'.$langs->trans("TimeSpentSmall").($usertoprocess->firstname ? '<br><span class="nowraponall">'.$usertoprocess->getNomUrl(-2).'<span class="opacitymedium paddingleft">'.dol_trunc($usertoprocess->firstname, 10).'</span></span>' : '').'</td>';
+	print '</th>';
+	print '<th class="right maxwidth75">'.$langs->trans("TimeSpentSmall").($usertoprocess->firstname ? '<br><span class="nowraponall">'.$usertoprocess->getNomUrl(-2).'<span class="opacitymedium paddingleft">'.dol_trunc($usertoprocess->firstname, 10).'</span></span>' : '').'</th>';
 }
 foreach ($TWeek as $week_number) {
-	print '<td width="6%" class="center bold hide">'.$langs->trans("WeekShort").' '.$week_number.'<br>('.$TFirstDays[$week_number].'...'.$TLastDays[$week_number].')</td>';
+	print '<th width="6%" class="center bold hide">'.$langs->trans("WeekShort").' '.$week_number.'<br>('.$TFirstDays[$week_number].'...'.$TLastDays[$week_number].')</th>';
 }
 
 //print '<td></td>';

From 687421d8f007b990cb1b2fcc824832e636702ba0 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 8 Feb 2025 12:25:38 +0100
Subject: [PATCH 570/602] Qual: Fix phan notices
 (multicurrency,opcache,opensurvey)

---
 dev/tools/phan/baseline.txt                   | 15 ++------
 .../class/multicurrency.class.php             | 22 +++++++----
 htdocs/multicurrency/multicurrency_rate.php   | 10 ++---
 htdocs/opcachepreload.php                     |  3 +-
 htdocs/opensurvey/card.php                    | 11 +++---
 .../class/opensurveysondage.class.php         | 37 +++++++++++--------
 htdocs/opensurvey/exportcsv.php               |  3 +-
 htdocs/opensurvey/list.php                    |  9 ++---
 htdocs/opensurvey/results.php                 | 12 ++++--
 htdocs/opensurvey/wizard/choix_date.php       |  9 +++--
 htdocs/opensurvey/wizard/create_survey.php    |  5 ++-
 11 files changed, 77 insertions(+), 59 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 6c27b5a85b5..e10b6470f72 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,12 +9,12 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 2340+ occurrences
+    // PhanTypeMismatchArgument : 2330+ occurrences
     // PhanUndeclaredProperty : 530+ occurrences
     // PhanTypeMismatchArgumentNullable : 430+ occurrences
     // PhanUndeclaredGlobalVariable : 190+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 170+ occurrences
-    // PhanPossiblyUndeclaredGlobalVariable : 160+ occurrences
+    // PhanPossiblyUndeclaredGlobalVariable : 150+ occurrences
     // PhanTypeMismatchProperty : 130+ occurrences
     // PhanTypeMismatchArgumentProbablyReal : 120+ occurrences
     // PhanPluginUnknownArrayMethodParamType : 110+ occurrences
@@ -23,9 +23,9 @@ return [
     // PhanTypeInvalidDimOffset : 25+ occurrences
     // PhanPluginUndeclaredVariableIsset : 20+ occurrences
     // PhanTypeMismatchDimFetch : 20+ occurrences
-    // PhanTypeMismatchArgumentNullableInternal : 15+ occurrences
     // PhanUndeclaredConstant : 15+ occurrences
     // PhanTypeComparisonFromArray : 10+ occurrences
+    // PhanTypeMismatchArgumentNullableInternal : 10+ occurrences
     // PhanUndeclaredMethod : 10+ occurrences
     // PhanPluginSuspiciousParamPosition : 7 occurrences
     // PhanPluginUnknownObjectMethodCall : 7 occurrences
@@ -588,14 +588,7 @@ return [
         'htdocs/multicurrency/class/api_multicurrencies.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
         'htdocs/multicurrency/class/multicurrency.class.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchArgument'],
         'htdocs/multicurrency/multicurrency_rate.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/opcachepreload.php' => ['PhanEmptyForeach'],
-        'htdocs/opensurvey/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument'],
-        'htdocs/opensurvey/class/opensurveysondage.class.php' => ['PhanTypeMismatchProperty'],
-        'htdocs/opensurvey/exportcsv.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/opensurvey/list.php' => ['PhanPluginUndeclaredVariableIsset'],
-        'htdocs/opensurvey/results.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullableInternal', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/opensurvey/wizard/choix_date.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument'],
-        'htdocs/opensurvey/wizard/create_survey.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
+        'htdocs/opensurvey/results.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/partnership/class/api_partnerships.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
         'htdocs/partnership/class/partnership.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php' => ['PhanUndeclaredProperty'],
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index f5fe2aceea3..2523134ed36 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016       Pierre-Henry Favre  <phf@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -522,12 +522,12 @@ class MultiCurrency extends CommonObject
 	 *
 	 * @param DoliDB		$dbs	        Object db
 	 * @param string		$code	        Code value search
-	 * @param int|string	$date_document	Date from document (propal, order, invoice, ...)
+	 * @param int			$date_document	Date from document (propal, order, invoice, ...)
 	 *
 	 * @return 	array{0:int,1:float}		[0] => id currency
 	 *										[1] => rate
 	 */
-	public static function getIdAndTxFromCode($dbs, $code, $date_document = '')
+	public static function getIdAndTxFromCode($dbs, $code, $date_document = 0)
 	{
 		$sql1 = "SELECT m.rowid, mc.rate FROM ".MAIN_DB_PREFIX."multicurrency m";
 
@@ -699,11 +699,19 @@ class MultiCurrency extends CommonObject
 				}
 				return 1;
 			} else {
-				dol_syslog("Failed to call endpoint ".$response->error->info, LOG_WARNING);
-				if ($mode == "cron") {
-					$this->output = $langs->trans('multicurrency_syncronize_error', $response->error->info);
+				if (isset($response->error->info)) {
+					$error_info_syslog = $response->error->info;  // @phan-suppress-current-line PhanTypeExpectedObjectPropAccess
+					$error_info = $error_info_syslog;
 				} else {
-					setEventMessages($langs->trans('multicurrency_syncronize_error', $response->error->info), null, 'errors');
+					$error_info_syslog = json_encode($response);
+					$error_info = "No error information found (see syslog)";
+				}
+
+				dol_syslog("Failed to call endpoint ".$error_info_syslog, LOG_WARNING);
+				if ($mode == "cron") {
+					$this->output = $langs->trans('multicurrency_syncronize_error', $error_info);
+				} else {
+					setEventMessages($langs->trans('multicurrency_syncronize_error', $error_info), null, 'errors');
 				}
 				return -1;
 			}
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index f69bb7ba07e..bd0dfdacadb 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016       Ferran Marcet		    <fmarcet@2byte.es>
  * Copyright (C) 2023       Lenin Rivas		    	<lenin.rivas777@gmail.com>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -112,10 +112,10 @@ $fieldstosearchall = array(
 
 // Definition of fields for lists
 $arrayfields = array(
-	'cr.date_sync' => array('label' => 'Date', 'checked' => 1),
-	'cr.rate' => array('label' => 'Rate', 'checked' => 1),
-	'cr.rate_indirect' => array('label' => 'RateIndirect', 'checked' => 0, 'enabled' => (!getDolGlobalString('MULTICURRENCY_USE_RATE_INDIRECT') ? 0 : 1)),
-	'm.code' => array('label' => 'Code', 'checked' => 1),
+	'cr.date_sync' => array('label' => 'Date', 'checked' => '1'),
+	'cr.rate' => array('label' => 'Rate', 'checked' => '1'),
+	'cr.rate_indirect' => array('label' => 'RateIndirect', 'checked' => '0', 'enabled' => (!getDolGlobalString('MULTICURRENCY_USE_RATE_INDIRECT') ? '0' : '1')),
+	'm.code' => array('label' => 'Code', 'checked' => '1'),
 );
 
 
diff --git a/htdocs/opcachepreload.php b/htdocs/opcachepreload.php
index 44c9a40e919..49324f96724 100644
--- a/htdocs/opcachepreload.php
+++ b/htdocs/opcachepreload.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2019  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2025		MDW					<mdeweerd@users.noreply.github.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
@@ -27,6 +28,6 @@
 
 $files = array(); /* An array of files you want to preload */
 
-foreach ($files as $file) {
+foreach ($files as $file) {  // @phan-suppress-current-line PhanEmptyForeach
 	opcache_compile_file($file);
 }
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index f1dcd56ce4e..a6bd6721a30 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2013-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2014       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2018-2024	Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -61,7 +61,7 @@ if (GETPOST('id')) {
 // Initialize objects
 $object = new Opensurveysondage($db);
 
-$result = $object->fetch(0, $numsondage);
+$result = $object->fetch('', $numsondage);
 if ($result <= 0) {
 	dol_print_error($db, $object->error);
 	exit;
@@ -70,7 +70,7 @@ if ($result <= 0) {
 // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
 $hookmanager->initHooks(array('surveycard', 'globalcard'));
 
-$expiredate = dol_mktime(0, 0, 0, GETPOST('expiremonth'), GETPOST('expireday'), GETPOST('expireyear'));
+$expiredate = dol_mktime(0, 0, 0, GETPOSTINT('expiremonth'), GETPOSTINT('expireday'), GETPOSTINT('expireyear'));
 
 $permissiontoread = $user->hasRight('opensurvey', 'read');
 $permissiontoadd = $user->hasRight('opensurvey', 'write');
@@ -201,6 +201,7 @@ if (empty($reshook)) {
  */
 
 $form = new Form($db);
+$userstatic = null;
 
 if ($object->fk_user_creat) {
 	$userstatic = new User($db);
@@ -271,7 +272,7 @@ if ($action == 'edit') {
 	print yn($object->mailsonde);
 
 	//If option is active and linked user does not have an email, we show a warning
-	if ($object->fk_user_creat && $object->mailsonde) {
+	if ($object->fk_user_creat && $object->mailsonde && $userstatic !== null) {
 		if (!$userstatic->email) {
 			print ' '.img_warning($langs->trans('NoEMail'));
 		}
@@ -330,7 +331,7 @@ print '</td></tr>';
 // Author
 print '<tr><td>';
 print $langs->trans("Author").'</td><td>';
-if ($object->fk_user_creat > 0) {
+if ($object->fk_user_creat > 0 && $userstatic !== null) {
 	print $userstatic->getLoginUrl(-1);
 } else {
 	if ($action == 'edit') {
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 67a8cee2e0d..ca28657af40 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2013-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014      Marcos García	    <marcosgdf@gmail.com>
  * Copyright (C) 2020-2024  Frédéric France		<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -60,6 +60,13 @@ class Opensurveysondage extends CommonObject
 	public $date_m;
 
 
+	/**
+	 * Lines of the survey - Note: the type differs from CommonObjectLine[] !
+	 *
+	 * @var array<array{id_users:int,nom:string,responses:string}>
+	 */
+	public $lines;
+
 	/**
 	 *  'type' field format:
 	 *  	'integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]',
@@ -374,9 +381,9 @@ class Opensurveysondage extends CommonObject
 	/**
 	 *  Update object into database
 	 *
-	 *  @param	User    $user        User that modifies
-	 *  @param  int     $notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
+	 *  @param	User		$user        User that modifies
+	 *  @param  int<0,1>	$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int					   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
@@ -438,9 +445,9 @@ class Opensurveysondage extends CommonObject
 	/**
 	 *  Delete object in database
 	 *
-	 *	@param  User	$user        		User that deletes
-	 *  @param  int		$notrigger	 		0=launch triggers after, 1=disable triggers
-	 *  @param	string	$numsondage			Num sondage admin to delete
+	 *	@param  User		$user      		User that deletes
+	 *  @param  int<0,1>	$notrigger 		0=launch triggers after, 1=disable triggers
+	 *  @param	string		$numsondage		Num sondage admin to delete
 	 *  @return	int					 		Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = 0, $numsondage = '')
@@ -534,7 +541,7 @@ class Opensurveysondage extends CommonObject
 	 *	@param	int<0,2>	$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *  @param	int<0,1>	$notooltip					1=Disable tooltip
 	 *  @param  string		$morecss            		Add more css on link
-	 *  @param  int<-1,1>	$save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param  int<-1,1>	$save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values when clicking
 	 *	@return	string								String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
@@ -719,8 +726,8 @@ class Opensurveysondage extends CommonObject
 	/**
 	 * Deletes a comment of the poll
 	 *
-	 * @param int $id_comment Id of the comment
-	 * @return boolean False in case of the query fails, true if it was successful
+	 * @param int	$id_comment Id of the comment
+	 * @return bool				False in case of the query fails, true if it was successful
 	 */
 	public function deleteComment($id_comment)
 	{
@@ -758,7 +765,7 @@ class Opensurveysondage extends CommonObject
 	/**
 	 *	Return status label of Order
 	 *
-	 *  @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
+	 *  @param  int<0,6>	$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 if status
 	 */
 	public function getLibStatut($mode)
@@ -770,8 +777,8 @@ class Opensurveysondage extends CommonObject
 	/**
 	 *  Return label of status
 	 *
-	 *  @param	int		$status        	Id status
-	 *  @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
+	 *  @param	int			$status    	Id status
+	 *  @param  int<0,6>	$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 of status
 	 */
 	public function LibStatut($status, $mode)
@@ -809,7 +816,7 @@ class Opensurveysondage extends CommonObject
 	/**
 	 *	Return number of votes done for this survey.
 	 *
-	 *	@return     int			Number of votes
+	 *	@return     int<0,max>		Number of votes
 	 */
 	public function countVotes()
 	{
@@ -842,7 +849,7 @@ class Opensurveysondage extends CommonObject
 	 * @param  string		$filter       	Filter as an Universal Search string.
 	 * 										Example: '((client:=:1) OR ((client:>=:2) AND (client:<=:3))) AND (client:!=:8) AND (nom:like:'a%')'
 	 * @param  string      	$filtermode   	No more used
-	 * @return array|int                 	int <0 if KO, array of pages if OK
+	 * @return array<string,self>|int<-1,-1>  	int <0 if KO, array of pages if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = '', $filtermode = 'AND')
 	{
diff --git a/htdocs/opensurvey/exportcsv.php b/htdocs/opensurvey/exportcsv.php
index 94ed3aedfea..0b32e2dad24 100644
--- a/htdocs/opensurvey/exportcsv.php
+++ b/htdocs/opensurvey/exportcsv.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2013      Laurent Destailleur        <eldy@users.sourceforge.net>
  * Copyright (C) 2014      Marcos García              <marcosgdf@gmail.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -46,7 +47,7 @@ if (GETPOST('id')) {
 
 // Initialize Objects
 $object = new Opensurveysondage($db);
-$result = $object->fetch(0, $numsondage);
+$result = $object->fetch('', $numsondage);
 if ($result <= 0) {
 	dol_print_error(null, 'Failed to get survey id '.$numsondage);
 }
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 019de14845c..493d10157ab 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2013-2017 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2014      Marcos García       <marcosgdf@gmail.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -305,11 +306,9 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 
 if ($search_all) {
-	// Ensure $fieldstosearchall is set and array
-	if (!isset($fieldstosearchall) || !is_array($fieldstosearchall)) {
-		$fieldstosearchall = array();
-	}
-	foreach ($fieldstosearchall as $key => $val) {
+	$fieldstosearchall = array();
+	// @phan-suppress-next-line PhanEmptyForeach
+	foreach ($fieldstosearchall as $key => $val) {  // @phpstan-ignore-line
 		$fieldstosearchall[$key] = $langs->trans($val);
 	}
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).implode(', ', $fieldstosearchall).'</div>';
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 8db118c97c1..829a0b79512 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2013-2020  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2014       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2018-2024	Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -51,7 +51,7 @@ $action = GETPOST('action', 'aZ09');
 $numsondage = GETPOST("id", 'alphanohtml');
 
 $object = new Opensurveysondage($db);
-$result = $object->fetch(0, $numsondage);
+$result = $object->fetch('', $numsondage);
 if ($result <= 0) {
 	dol_print_error(null, 'Failed to get survey id '.$numsondage);
 }
@@ -115,6 +115,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) {		// bo
 $testmodifier = false;
 $testligneamodifier = false;
 $ligneamodifier = -1;
+$modifier = '';
 for ($i = 0; $i < $nblines; $i++) {
 	if (GETPOSTISSET('modifierligne'.$i)) {
 		$ligneamodifier = $i;
@@ -226,6 +227,7 @@ if (GETPOSTISSET("ajoutercolonne") && $object->format == "D") {
 		//on rajoute la valeur dans les valeurs
 		$datesbase = explode(",", $object->sujet);
 		$taillebase = count($datesbase);
+		$cleinsertion = -1;
 
 		//recherche de l'endroit de l'insertion de la nouvelle date dans les dates deja entrées dans le tableau
 		if ($nouvelledate < $datesbase[0]) {
@@ -424,13 +426,14 @@ for ($i = 0; $i < $nbcolonnes; $i++) {
  */
 
 $form = new Form($db);
+$userstatic = null;
 
 if ($object->fk_user_creat) {
 	$userstatic = new User($db);
 	$userstatic->fetch($object->fk_user_creat);
 }
 
-$result = $object->fetch(0, $numsondage);
+$result = $object->fetch('', $numsondage);
 if ($result <= 0) {
 	dol_print_error($db, $object->error);
 	exit;
@@ -538,7 +541,7 @@ print '</td></tr>';
 // Author
 print '<tr><td>';
 print $langs->trans("Author").'</td><td>';
-if ($object->fk_user_creat) {
+if ($object->fk_user_creat && $userstatic !== null) {
 	print $userstatic->getLoginUrl(-1);
 } else {
 	print dol_htmlentities($object->nom_admin);
@@ -1064,6 +1067,7 @@ if (empty($testligneamodifier)) {
 
 // Select value of best choice (for checkbox columns only)
 $nbofcheckbox = 0;
+$meilleurecolonne = null;
 for ($i = 0; $i < $nbcolonnes + 1; $i++) {
 	if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst'))) {
 		$nbofcheckbox++;
diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php
index d12ff0eeb7e..e920cb783ec 100644
--- a/htdocs/opensurvey/wizard/choix_date.php
+++ b/htdocs/opensurvey/wizard/choix_date.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2014       Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -49,7 +49,7 @@ $_SESSION["formatsondage"] = "D";
 $erreur = false;
 $erreurNb = 0;
 $choixdate = '';
-
+$errheure = array();
 
 /*
  * Actions
@@ -60,7 +60,6 @@ if (GETPOST('confirmation')) {
 	// We save hours entered
 	if (issetAndNoEmpty('totalchoixjour', $_SESSION) === true && issetAndNoEmpty('nbrecaseshoraires', $_SESSION) === true) {
 		$nbofchoice = count($_SESSION["totalchoixjour"]);
-		$errheure = array();
 
 		if ($nbofchoice * $_SESSION["nbrecaseshoraires"] > 200) {
 			setEventMessages($langs->trans("ErrorFieldTooLong"), null, 'errors');
@@ -148,6 +147,7 @@ if (GETPOST('confirmation')) {
 						$erreur = true;
 					}
 
+					// Suppress notice regarding $_SESSION @phan-suppress-next-line PhanTypeMismatchArgument
 					if (issetAndNoEmpty('horaires'.$i, $_SESSION) === false || issetAndNoEmpty((string) $j, $_SESSION['horaires'.$i]) === false) {
 						if (issetAndNoEmpty('horaires'.$i, $_SESSION) === true) {
 							$_SESSION["horaires$i"][$j] = '';
@@ -523,6 +523,7 @@ for ($i = 0; $i < $nbrejourmois + $premierjourmois; $i++) {
 	if ($i < $premierjourmois) {
 		print '<td class="avant"></td>'."\n";
 	} else {
+		$dejafait = null;
 		if (issetAndNoEmpty('totalchoixjour', $_SESSION) === true) {
 			$nbofchoice = count($_SESSION["totalchoixjour"]);
 			for ($j = 0; $j < $nbofchoice; $j++) {
@@ -589,7 +590,7 @@ if (issetAndNoEmpty('totalchoixjour', $_SESSION) || $erreur) {
 
 		//affichage des cases d'horaires
 		for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++) {
-			if (isset($errheure[$i][$j]) && $errheure[$i][$j]) {
+			if (isset($errheure[$i][$j]) /* && $errheure[$i][$j] */) {
 				// When an error is found, the checkbox background is red
 				print '<td><input type=text size="10" maxlength="11" name=horaires'.$i.'[] value="'.$_SESSION["horaires$i"][$j].'" style="background-color:#FF6666;"></td>'."\n";
 			} else {
diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index 0cf7deab04f..d0904ab85ce 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2014       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015-2016  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -64,6 +64,7 @@ foreach ($session_var as $var) {
 // On initialise également les autres variables
 $cocheplus = '';
 $cochemail = '';
+$champdatefin = 0;
 
 // Jump to correct page
 if (!empty($creation_sondage_date) || !empty($creation_sondage_autre)) {
@@ -181,6 +182,7 @@ if ($_SESSION["mailsonde"]) {
 
 print '<input type="checkbox" id="mailsonde" name="mailsonde" '.$cochemail.'> <label for="mailsonde">'.$langs->trans("ToReceiveEMailForEachVote").'</label><br>'."\n";
 
+$allow_comments = '';
 if ($_SESSION['allow_comments']) {
 	$allow_comments = 'checked';
 }
@@ -189,6 +191,7 @@ if (GETPOSTISSET('allow_comments')) {
 }
 print '<input type="checkbox" id="allow_comments" name="allow_comments" '.$allow_comments.'"> <label for="allow_comments">'.$langs->trans('CanComment').'</label><br>'."\n";
 
+$allow_spy = '';
 if ($_SESSION['allow_spy']) {
 	$allow_spy = 'checked';
 }

From 43ed58a0e90b6b84a415fb1e30d39cab18a543ee Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 8 Feb 2025 13:54:24 +0100
Subject: [PATCH 571/602] Ignore phpstan notice in baseline

---
 dev/build/phpstan/phpstan-baseline.neon | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index deba1cbbeb2..2aaaf6d7988 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -22278,6 +22278,11 @@ parameters:
 			count: 2
 			path: ../../../htdocs/opensurvey/card.php
 
+		-
+			message: '#^PHPDoc type .* is not covariant with PHPDoc type array<CommonObject\|stdClass> of overridden property CommonObject::\$lines\.$#'
+			count: 1
+			path: ../../../htdocs/opensurvey/class/opensurveysondage.class.php
+
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse

From 23ff8b378c3cad7942f1443f69e170b0a7a79639 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 8 Feb 2025 14:06:14 +0100
Subject: [PATCH 572/602] Qual: Fix phan: dol_mktime GETPOST args to GETPOSTINT

---
 htdocs/compta/payment_sc/card.php                |  6 +++---
 htdocs/fourn/commande/dispatch.php               |  6 +++---
 htdocs/product/stock/productlot_card.php         |  3 ++-
 htdocs/product/stock/tpl/stockcorrection.tpl.php |  6 +++---
 htdocs/projet/element.php                        | 11 +++++------
 htdocs/reception/dispatch.php                    | 10 +++++-----
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 777973ca035..95f3968d84b 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005       Marc Barilley / Ocebo   <marc@ocebo.com>
  * Copyright (C) 2005-2009  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2022       Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -88,7 +88,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('tax', '
 }
 
 /*if ($action == 'setdatep' && GETPOST('datepday') && $user->hasRight('tax', 'charges', 'creer')) {
-	$datepaye = dol_mktime(GETPOST('datephour', 'int'), GETPOST('datepmin', 'int'), GETPOST('datepsec', 'int'), GETPOST('datepmonth', 'int'), GETPOST('datepday', 'int'), GETPOST('datepyear', 'int'));
+	$datepaye = dol_mktime(GETPOSTINT('datephour'), GETPOSTINT('datepmin'), GETPOSTINT('datepsec'), GETPOSTINT('datepmonth'), GETPOSTINT('datepday'), GETPOSTINT('datepyear'));
 	$res = $object->update_date($datepaye);
 	if ($res === 0) {
 		setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
@@ -257,7 +257,7 @@ if (getDolGlobalString('BILL_ADD_PAYMENT_VALIDATION')) {
 	if ($user->socid == 0 && $object->statut == 0 && $action == '')
 	{
 		if ($user->hasRight('facture', 'paiement')){
-			print '<a class="butAction" href="card.php?id='.GETPOST('id', 'int').'&amp;facid='.$objp->facid.'&amp;action=valide">'.$langs->trans('Valid').'</a>';
+			print '<a class="butAction" href="card.php?id='.GETPOSTINT('id').'&amp;facid='.$objp->facid.'&amp;action=valide">'.$langs->trans('Valid').'</a>';
 		}
 	}
 }
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 5ea27856e14..c8a9a1ef953 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2017-2022  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2019-2020  Christophe Battarel	    <christophe@altairis.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -950,13 +950,13 @@ if ($id > 0 || !empty($ref)) {
 							print '</td>';
 							if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 								print '<td class="nowraponall">';
-								$dlcdatesuffix = dol_mktime(0, 0, 0, GETPOST('dlc'.$suffix.'month'), GETPOST('dlc'.$suffix.'day'), GETPOST('dlc'.$suffix.'year'));
+								$dlcdatesuffix = dol_mktime(0, 0, 0, GETPOSTINT('dlc'.$suffix.'month'), GETPOSTINT('dlc'.$suffix.'day'), GETPOSTINT('dlc'.$suffix.'year'));
 								print $form->selectDate($dlcdatesuffix, 'dlc'.$suffix, 0, 0, 1, '');
 								print '</td>';
 							}
 							if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 								print '<td class="nowraponall">';
-								$dluodatesuffix = dol_mktime(0, 0, 0, GETPOST('dluo'.$suffix.'month'), GETPOST('dluo'.$suffix.'day'), GETPOST('dluo'.$suffix.'year'));
+								$dluodatesuffix = dol_mktime(0, 0, 0, GETPOSTINT('dluo'.$suffix.'month'), GETPOSTINT('dluo'.$suffix.'day'), GETPOSTINT('dluo'.$suffix.'year'));
 								print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, 0, 0, 1, '');
 								print '</td>';
 							}
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 53e07ae1c73..a21f6041664 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2018      All-3kcis       		 <contact@all-3kcis.fr>
  * Copyright (C) 2021      Noé Cendrier         <noe.cendrier@altairis.fr>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -241,7 +242,7 @@ if (empty($reshook)) {
 	}
 
 	/* if ($action == 'setcommissionning_date' && $permissiontoadd && ! GETPOST('cancel', 'alpha')) {
-		$newvalue = dol_mktime(12, 0, 0, GETPOST('commissionning_datemonth', 'int'), GETPOST('commissionning_dateday', 'int'), GETPOST('commissionning_dateyear', 'int'));
+		$newvalue = dol_mktime(12, 0, 0, GETPOSTINT('commissionning_datemonth', 'int'), GETPOSTINT('commissionning_dateday', 'int'), GETPOSTINT('commissionning_dateyear', 'int'));
 		$result = $object->setValueFrom('commissionning_date', $newvalue, '', null, 'date', '', $user, 'PRODUCTLOT_MODIFY');
 		if ($result < 0) {
 			setEventMessages($object->error, null, 'errors');
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index ac59f574506..fb4878b5f08 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2010-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2024	Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -226,14 +226,14 @@ if (isModEnabled('productbatch') &&
 	print '<tr>';
 	if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 		print '<td'.($sellByCss ? ' class="'.$sellByCss.'"' : '').'>'.$langs->trans("SellByDate").'</td><td>';
-		$sellbyselected = dol_mktime(0, 0, 0, GETPOST('sellbymonth'), GETPOST('sellbyday'), GETPOST('sellbyyear'));
+		$sellbyselected = dol_mktime(0, 0, 0, GETPOSTINT('sellbymonth'), GETPOSTINT('sellbyday'), GETPOSTINT('sellbyyear'));
 		// If form was opened for a specific pdluoid, field is disabled
 		print $form->selectDate(($pdluo->id > 0 ? $pdluo->sellby : $sellbyselected), 'sellby', 0, 0, 1, "", 1, 0, ($pdluoid > 0 ? 1 : 0));
 		print '</td>';
 	}
 	if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 		print '<td'.($eatByCss ? ' class="'.$eatByCss.'"' : '').'>'.$langs->trans("EatByDate").'</td><td>';
-		$eatbyselected = dol_mktime(0, 0, 0, GETPOST('eatbymonth'), GETPOST('eatbyday'), GETPOST('eatbyyear'));
+		$eatbyselected = dol_mktime(0, 0, 0, GETPOSTINT('eatbymonth'), GETPOSTINT('eatbyday'), GETPOSTINT('eatbyyear'));
 		// If form was opened for a specific pdluoid, field is disabled
 		print $form->selectDate(($pdluo->id > 0 ? $pdluo->eatby : $eatbyselected), 'eatby', 0, 0, 1, "", 1, 0, ($pdluoid > 0 ? 1 : 0));
 		print '</td>';
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index f416f4fc55d..21fea1424d9 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -8,9 +8,8 @@
  * Copyright (C) 2016       Josep Lluís Amador   <joseplluis@lliuretic.cat>
  * Copyright (C) 2021-2023  Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2021       Noé Cendrier         <noe.cendrier@altairis.fr>
- * Copyright (C) 2023      	Frédéric France      wfrederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2023-2024 	Frédéric France      <frederic.france@free.fr>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -158,8 +157,8 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $datesrfc = GETPOST('datesrfc');	// deprecated
 $dateerfc = GETPOST('dateerfc');	// deprecated
-$dates = dol_mktime(0, 0, 0, GETPOST('datesmonth'), GETPOST('datesday'), GETPOST('datesyear'));
-$datee = dol_mktime(23, 59, 59, GETPOST('dateemonth'), GETPOST('dateeday'), GETPOST('dateeyear'));
+$dates = dol_mktime(0, 0, 0, GETPOSTINT('datesmonth'), GETPOSTINT('datesday'), GETPOSTINT('datesyear'));
+$datee = dol_mktime(23, 59, 59, GETPOSTINT('dateemonth'), GETPOSTINT('dateeday'), GETPOSTINT('dateeyear'));
 if (empty($dates) && !empty($datesrfc)) {	// deprecated
 	$dates = dol_stringtotime($datesrfc);
 }
@@ -917,7 +916,7 @@ foreach ($listofreferent as $key => $value) {
 						if (!empty($loanScheduleStatic->lines)) {
 							foreach ($loanScheduleStatic->lines as $loanSchedule) {
 								/**
-								 * @var $loanSchedule LoanSchedule
+								 * @var LoanSchedule $loanSchedule
 								 */
 								if (($loanSchedule->datep >= $dates && $loanSchedule->datep <= $datee) // dates filter is defined
 									|| !empty($dates) && empty($datee) && $loanSchedule->datep >= $dates && $loanSchedule->datep <= dol_now()
diff --git a/htdocs/reception/dispatch.php b/htdocs/reception/dispatch.php
index 8a08ff920ff..905a96f9492 100644
--- a/htdocs/reception/dispatch.php
+++ b/htdocs/reception/dispatch.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2017-2022 Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2018-2024  Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2019-2020 Christophe Battarel	<christophe@altairis.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -756,13 +756,13 @@ if ($id > 0 || !empty($ref)) {
 									print '</td>';
 									if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 										print '<td class="nowraponall">';
-										$dlcdatesuffix = !empty($objd->sellby) ? dol_stringtotime($objd->sellby) : dol_mktime(0, 0, 0, GETPOST('dlc'.$suffix.'month'), GETPOST('dlc'.$suffix.'day'), GETPOST('dlc'.$suffix.'year'));
+										$dlcdatesuffix = !empty($objd->sellby) ? dol_stringtotime($objd->sellby) : dol_mktime(0, 0, 0, GETPOSTINT('dlc'.$suffix.'month'), GETPOSTINT('dlc'.$suffix.'day'), GETPOSTINT('dlc'.$suffix.'year'));
 										print $form->selectDate($dlcdatesuffix, 'dlc'.$suffix, 0, 0, 1, '');
 										print '</td>';
 									}
 									if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 										print '<td class="nowraponall">';
-										$dluodatesuffix = !empty($objd->eatby) ? dol_stringtotime($objd->eatby) : dol_mktime(0, 0, 0, GETPOST('dluo'.$suffix.'month'), GETPOST('dluo'.$suffix.'day'), GETPOST('dluo'.$suffix.'year'));
+										$dluodatesuffix = !empty($objd->eatby) ? dol_stringtotime($objd->eatby) : dol_mktime(0, 0, 0, GETPOSTINT('dluo'.$suffix.'month'), GETPOSTINT('dluo'.$suffix.'day'), GETPOSTINT('dluo'.$suffix.'year'));
 										print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, 0, 0, 1, '');
 										print '</td>';
 									}
@@ -929,13 +929,13 @@ if ($id > 0 || !empty($ref)) {
 								print '</td>';
 								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 									print '<td class="nowraponall">';
-									$dlcdatesuffix = dol_mktime(0, 0, 0, GETPOST('dlc'.$suffix.'month'), GETPOST('dlc'.$suffix.'day'), GETPOST('dlc'.$suffix.'year'));
+									$dlcdatesuffix = dol_mktime(0, 0, 0, GETPOSTINT('dlc'.$suffix.'month'), GETPOSTINT('dlc'.$suffix.'day'), GETPOSTINT('dlc'.$suffix.'year'));
 									print $form->selectDate($dlcdatesuffix, 'dlc'.$suffix, 0, 0, 1, '');
 									print '</td>';
 								}
 								if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 									print '<td class="nowraponall">';
-									$dluodatesuffix = dol_mktime(0, 0, 0, GETPOST('dluo'.$suffix.'month'), GETPOST('dluo'.$suffix.'day'), GETPOST('dluo'.$suffix.'year'));
+									$dluodatesuffix = dol_mktime(0, 0, 0, GETPOSTINT('dluo'.$suffix.'month'), GETPOSTINT('dluo'.$suffix.'day'), GETPOSTINT('dluo'.$suffix.'year'));
 									print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, 0, 0, 1, '');
 									print '</td>';
 								}

From 7bd354ef17ed44527e3ff4baf311a7ac7c2f335e Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 8 Feb 2025 14:17:44 +0100
Subject: [PATCH 573/602] Qual: Fix phan (partnership)

---
 htdocs/partnership/partnership_contact.php | 3 ++-
 htdocs/partnership/partnership_list.php    | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/partnership/partnership_contact.php b/htdocs/partnership/partnership_contact.php
index 5705aed571f..2880e555890 100644
--- a/htdocs/partnership/partnership_contact.php
+++ b/htdocs/partnership/partnership_contact.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -105,7 +106,7 @@ if ($action == 'addcontact' && $permission) {
 	}
 } elseif ($action == 'swapstatut' && $permission) {
 	// Toggle the status of a contact
-	$result = $object->swapContactStatus(GETPOST('ligne'));
+	$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 } elseif ($action == 'deletecontact' && $permission) {
 	// Deletes a contact
 	$result = $object->delete_contact($lineid);
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index a02ad6b3864..74fa58b8d50 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2021		NextGestion			<contact@nextgestion.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -981,7 +981,7 @@ while ($i < $imaxinloop) {
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
 				print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) {
-					print ' title="'.dol_escape_htmltag($object->$key).'"';
+					print ' title="'.dol_escape_htmltag((string) $object->$key).'"';
 				}
 				print '>';
 				if ($key == 'status') {
@@ -1003,7 +1003,7 @@ while ($i < $imaxinloop) {
 						print $object->thirdparty->town;
 					}
 				} elseif ($key == 'rowid') {
-					print $object->showOutputField($val, $key, $object->id, '');
+					print $object->showOutputField($val, $key, (string) $object->id, '');
 				} else {
 					print $object->showOutputField($val, $key, $object->$key, '');
 				}

From 8a2a1331f73d054804d1b90791db82233172aa6a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 8 Feb 2025 14:24:26 +0100
Subject: [PATCH 574/602] Qual: Fix phan (printing)

---
 htdocs/core/modules/printing/modules_printing.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/printing/modules_printing.php b/htdocs/core/modules/printing/modules_printing.php
index a3c0ebf76d0..e1df70fa5f7 100644
--- a/htdocs/core/modules/printing/modules_printing.php
+++ b/htdocs/core/modules/printing/modules_printing.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * Copyright (C) 2014-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -63,6 +63,12 @@ class PrintingDriver
 	 */
 	public $resprint;
 
+	/**
+	 * @var string Name of active driver ? ("Constant" in child class)
+	 */
+	public $active = "NOT_SET";
+
+
 	/**
 	 *  Constructor
 	 *

From f45b1c0540c3f8178e72cb3bd758c7e6ca61b83a Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 8 Feb 2025 14:38:02 +0100
Subject: [PATCH 575/602] Update phan baseline

---
 dev/tools/phan/baseline.txt | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index e10b6470f72..3f0f9365f25 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,7 +9,7 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 2330+ occurrences
+    // PhanTypeMismatchArgument : 2300+ occurrences
     // PhanUndeclaredProperty : 530+ occurrences
     // PhanTypeMismatchArgumentNullable : 430+ occurrences
     // PhanUndeclaredGlobalVariable : 190+ occurrences
@@ -32,8 +32,8 @@ return [
     // PhanPluginDuplicateExpressionBinaryOp : 6 occurrences
     // PhanPluginEmptyStatementIf : 6 occurrences
     // PhanTypeArraySuspiciousNull : 6 occurrences
-    // PhanEmptyForeach : 5 occurrences
     // PhanParamTooMany : 5 occurrences
+    // PhanEmptyForeach : 4 occurrences
     // PhanPluginBothLiteralsBinaryOp : 4 occurrences
     // PhanPluginDuplicateArrayKey : 4 occurrences
     // PhanEmptyFQSENInClasslike : 3 occurrences
@@ -314,7 +314,6 @@ return [
         'htdocs/core/actions_extrafields.inc.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/actions_lineupdown.inc.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/actions_massactions.inc.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
-        'htdocs/core/actions_printing.inc.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/actions_sendmails.inc.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/core/ajax/ajaxdirpreview.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/core/ajax/ajaxdirtree.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty', 'PhanUndeclaredGlobalVariable'],
@@ -586,16 +585,14 @@ return [
         'htdocs/mrp/mo_movements.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/mrp/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/multicurrency/class/api_multicurrencies.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
-        'htdocs/multicurrency/class/multicurrency.class.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchArgument'],
+        'htdocs/multicurrency/class/multicurrency.class.php' => ['PhanTypeExpectedObjectPropAccess'],
         'htdocs/multicurrency/multicurrency_rate.php' => ['PhanTypeMismatchArgument'],
         'htdocs/opensurvey/results.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/partnership/class/api_partnerships.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
         'htdocs/partnership/class/partnership.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php' => ['PhanUndeclaredProperty'],
         'htdocs/partnership/partnership_card.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/partnership/partnership_contact.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/partnership/partnership_list.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/printing/index.php' => ['PhanUndeclaredProperty'],
+        'htdocs/partnership/partnership_list.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/admin/price_rules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/product/admin/product.php' => ['PhanPluginEmptyStatementIf', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/product/admin/product_tools.php' => ['PhanTypeMismatchArgument'],
@@ -655,7 +652,7 @@ return [
         'htdocs/product/stock/stocktransfer/stocktransfer_card.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable'],
         'htdocs/product/stock/stocktransfer/stocktransfer_contact.php' => ['PhanTypeMismatchArgument'],
         'htdocs/product/stock/stocktransfer/stocktransfer_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/product/stock/tpl/stockcorrection.tpl.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/product/stock/tpl/stockcorrection.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/stock/tpl/stocktransfer.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/projet/activity/perday.php' => ['PhanTypeMismatchArgument'],
         'htdocs/projet/activity/permonth.php' => ['PhanTypeMismatchArgument'],

From c0e4894a17da48093df13fc102ce0134ed721d25 Mon Sep 17 00:00:00 2001
From: Dolibot <dolibarr-bot@users.noreply.github.com>
Date: Sun, 9 Feb 2025 12:06:23 +0000
Subject: [PATCH 576/602] PHPStan > Update baseline

---
 dev/build/phpstan/phpstan-baseline.neon | 970 +-----------------------
 1 file changed, 2 insertions(+), 968 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index deba1cbbeb2..612f1180743 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -942,12 +942,6 @@ parameters:
 			count: 5
 			path: ../../../htdocs/adherents/class/adherent.class.php
 
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/adherents/class/adherent.class.php
-
 		-
 			message: '#^Property Adherent\:\:\$last_subscription_amount \(int\|string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -2556,12 +2550,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/blockedlog/ajax/block-add.php
 
-		-
-			message: '#^Call to function is_object\(\) with Don\|Facture\|FactureFournisseur\|PaymentVarious will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: ../../../htdocs/blockedlog/class/blockedlog.class.php
-
 		-
 			message: '#^Dead catch \- Exception is never thrown in the try block\.$#'
 			identifier: catch.neverThrown
@@ -5568,12 +5556,6 @@ parameters:
 			count: 3
 			path: ../../../htdocs/compta/facture/class/facture.class.php
 
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/compta/facture/class/facture.class.php
-
 		-
 			message: '#^Parameter \#12 \$localtaxes_array of function calcul_price_total expects array\{string, int\|string, string, int\|string, string, string\}\|array\{string, int\|string, string, string\}, array\{\} given\.$#'
 			identifier: argument.type
@@ -7620,12 +7602,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/contrat/list.php
 
-		-
-			message: '#^Parameter \#2 \$array of static method Form\:\:multiselectarray\(\) expects array\<string, array\{id\: string, label\: string, color\: string, picto\: string, labelhtml\: string\}\|string\>, non\-empty\-array\<int, array\{id\: int, fulllabel\: string, color\: string, picto\: string\}\|array\{rowid\: int, id\: int, fk_parent\: int, label\: string, description\: string, color\: string, position\: string, visible\: int, \.\.\.\}\|string\>\|non\-empty\-string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/contrat/list.php
-
 		-
 			message: '#^Unable to resolve the template type T in call to function dol_sort_array$#'
 			identifier: argument.templateType
@@ -7902,12 +7878,6 @@ parameters:
 			count: 3
 			path: ../../../htdocs/core/actions_massactions.inc.php
 
-		-
-			message: '#^Variable \$obj might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/core/actions_massactions.inc.php
-
 		-
 			message: '#^Variable \$permissiontoadd might not be defined\.$#'
 			identifier: variable.undefined
@@ -8538,24 +8508,12 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/boxes/box_produits.php
 
-		-
-			message: '#^Parameter \#2 \$menuentry of function isVisibleToUserType expects array\{enabled\: int\<0, 1\>, module\: string, perms\: string\}, array\{enabled\: bool, perms\: bool, module\: ''product\|service''\} given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/boxes/box_produits.php
-
 		-
 			message: '#^Constructor of class box_produits_alerte_stock has an unused parameter \$param\.$#'
 			identifier: constructor.unusedParameter
 			count: 1
 			path: ../../../htdocs/core/boxes/box_produits_alerte_stock.php
 
-		-
-			message: '#^Parameter \#2 \$menuentry of function isVisibleToUserType expects array\{enabled\: int\<0, 1\>, module\: string, perms\: string\}, array\{enabled\: bool, perms\: mixed, module\: ''product\|service…''\} given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/boxes/box_produits_alerte_stock.php
-
 		-
 			message: '#^Constructor of class box_project has an unused parameter \$param\.$#'
 			identifier: constructor.unusedParameter
@@ -8856,12 +8814,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/class/comment.class.php
 
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, CommonObject given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/class/commondocgenerator.class.php
-
 		-
 			message: '#^Property CommonObject\:\:\$element \(string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -9678,24 +9630,12 @@ parameters:
 			count: 4
 			path: ../../../htdocs/core/class/html.form.class.php
 
-		-
-			message: '#^Parameter \#1 \$selected of method Form\:\:getSelectConditionsPaiements\(\) expects int, string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/class/html.form.class.php
-
 		-
 			message: '#^Parameter \#15 \$excludeids of method Form\:\:select_company\(\) expects array\<string\>, array\<int\> given\.$#'
 			identifier: argument.type
 			count: 1
 			path: ../../../htdocs/core/class/html.form.class.php
 
-		-
-			message: '#^Parameter \#2 \$array of method Form\:\:multiselectarray\(\) expects array\<string, array\{id\: string, label\: string, color\: string, picto\: string, labelhtml\: string\}\|string\>, array\<int, array\{id\: int, fulllabel\: string, color\: string, picto\: string\}\|array\{rowid\: int, id\: int, fk_parent\: int, label\: string, description\: string, color\: string, position\: string, visible\: int, \.\.\.\}\|string\>\|string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/class/html.form.class.php
-
 		-
 			message: '#^Parameter \#3 \$optJson of method Form\:\:constructProjectListOption\(\) expects array\{key\: string, value\: string, type\: string\}, array\{\} given\.$#'
 			identifier: argument.type
@@ -9816,12 +9756,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/class/html.formcategory.class.php
 
-		-
-			message: '#^Parameter \#2 \$array of static method Form\:\:multiselectarray\(\) expects array\<string, array\{id\: string, label\: string, color\: string, picto\: string, labelhtml\: string\}\|string\>, array\<int, array\{id\: int, fulllabel\: string, color\: string, picto\: string\}\|array\{rowid\: int, id\: int, fk_parent\: int, label\: string, description\: string, color\: string, position\: string, visible\: int, \.\.\.\}\|string\>\|string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/class/html.formcategory.class.php
-
 		-
 			message: '#^Call to function is_array\(\) with array\<mixed\> will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -9924,24 +9858,12 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/class/html.formmail.class.php
 
-		-
-			message: '#^Parameter \#2 \$array of static method Form\:\:multiselectarray\(\) expects array\<string, array\{id\: string, label\: string, color\: string, picto\: string, labelhtml\: string\}\|string\>, array\<int, string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/class/html.formmail.class.php
-
 		-
 			message: '#^Property FormMail\:\:\$ckeditortoolbar \(string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
 			count: 1
 			path: ../../../htdocs/core/class/html.formmail.class.php
 
-		-
-			message: '#^Parameter \#2 \$array of static method Form\:\:multiselectarray\(\) expects array\<string, array\{id\: string, label\: string, color\: string, picto\: string, labelhtml\: string\}\|string\>, non\-empty\-array\<\-1\|0\|1\|2\|3, string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/class/html.formorder.class.php
-
 		-
 			message: '#^Parameter \#3 \$zone of static method InfoBox\:\:listBoxes\(\) expects int, string given\.$#'
 			identifier: argument.type
@@ -9966,12 +9888,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/class/html.formprojet.class.php
 
-		-
-			message: '#^Parameter \#2 \$array of static method Form\:\:multiselectarray\(\) expects array\<string, array\{id\: string, label\: string, color\: string, picto\: string, labelhtml\: string\}\|string\>, non\-empty\-array\<0\|1\|2, string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/class/html.formprojet.class.php
-
 		-
 			message: '#^Variable \$labeltoshow might not be defined\.$#'
 			identifier: variable.undefined
@@ -11586,84 +11502,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/menus/standard/eldy.lib.php
 
-		-
-			message: '#^Parameter \#2 \$menuentry of function isVisibleToUserType expects array\{enabled\: int\<0, 1\>, module\: string, perms\: string\}, array\{enabled\: 0\|1, perms\: 0\|1, module\: ''projet''\} given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/menus/standard/eldy.lib.php
-
-		-
-			message: '#^Parameter \#2 \$menuentry of function isVisibleToUserType expects array\{enabled\: int\<0, 1\>, module\: string, perms\: string\}, array\{enabled\: 0\|1, perms\: bool, module\: ''facture\|supplier…''\} given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/menus/standard/eldy.lib.php
-
-		-
-			message: '#^Parameter \#2 \$menuentry of function isVisibleToUserType expects array\{enabled\: int\<0, 1\>, module\: string, perms\: string\}, array\{enabled\: 0\|1, perms\: bool, module\: ''propal\|commande…''\} given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/menus/standard/eldy.lib.php
-
-		-
-			message: '#^Parameter \#2 \$menuentry of function isVisibleToUserType expects array\{enabled\: int\<0, 1\>, module\: string, perms\: string\}, array\{enabled\: 1, perms\: 1, module\: ''''\} given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/menus/standard/eldy.lib.php
-
-		-
-			message: '#^Parameter \#2 \$menuentry of function isVisibleToUserType expects array\{enabled\: int\<0, 1\>, module\: string, perms\: string\}, array\{enabled\: bool, perms\: bool, module\: ''banque\|prelevement…''\} given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/menus/standard/eldy.lib.php
-
-		-
-			message: '#^Parameter \#2 \$menuentry of function isVisibleToUserType expects array\{enabled\: int\<0, 1\>, module\: string, perms\: string\}, array\{enabled\: bool, perms\: bool, module\: ''bom\|mrp''\} given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/menus/standard/eldy.lib.php
-
-		-
-			message: '#^Parameter \#2 \$menuentry of function isVisibleToUserType expects array\{enabled\: int\<0, 1\>, module\: string, perms\: string\}, array\{enabled\: bool, perms\: bool, module\: ''comptabilite…''\} given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/menus/standard/eldy.lib.php
-
-		-
-			message: '#^Parameter \#2 \$menuentry of function isVisibleToUserType expects array\{enabled\: int\<0, 1\>, module\: string, perms\: string\}, array\{enabled\: bool, perms\: bool, module\: ''hrm\|holiday…''\} given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/menus/standard/eldy.lib.php
-
-		-
-			message: '#^Parameter \#2 \$menuentry of function isVisibleToUserType expects array\{enabled\: int\<0, 1\>, module\: string, perms\: string\}, array\{enabled\: bool, perms\: bool, module\: ''product\|service''\} given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/menus/standard/eldy.lib.php
-
-		-
-			message: '#^Parameter \#2 \$menuentry of function isVisibleToUserType expects array\{enabled\: int\<0, 1\>, module\: string, perms\: string\}, array\{enabled\: bool, perms\: bool, module\: ''societe\|fournisseur''\} given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/menus/standard/eldy.lib.php
-
-		-
-			message: '#^Parameter \#2 \$menuentry of function isVisibleToUserType expects array\{enabled\: int\<0, 1\>, module\: string, perms\: string\}, array\{enabled\: bool, perms\: bool, module\: ''ticket…''\} given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/menus/standard/eldy.lib.php
-
-		-
-			message: '#^Parameter \#2 \$menuentry of function isVisibleToUserType expects array\{enabled\: int\<0, 1\>, module\: string, perms\: string\}, array\{enabled\: bool, perms\: mixed, module\: ''adherent''\} given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/menus/standard/eldy.lib.php
-
-		-
-			message: '#^Parameter \#2 \$menuentry of function isVisibleToUserType expects array\{enabled\: int\<0, 1\>, module\: string, perms\: string\}, array\{enabled\: true, perms\: mixed, module\: ''projet''\} given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/menus/standard/eldy.lib.php
-
 		-
 			message: '#^Parameter \#8 \$menuval of function print_text_menu_entry expects array\{\}\|array\{rowid\: string, fk_menu\: string, langs\: string, enabled\: int\<0, 2\>, type\: string, fk_mainmenu\: string, fk_leftmenu\: string, url\: string, \.\.\.\}, array\{url\: string, titre\: string, enabled\: int\<0, 2\>, target\: string, mainmenu\: string, leftmenu\: string, position\: int, level\?\: int, \.\.\.\} given\.$#'
 			identifier: argument.type
@@ -11802,30 +11640,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/action/doc/pdf_standard_actions.class.php
 
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Asset given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_object\(\) expects CommonObject, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, float\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
-
-		-
-			message: '#^Parameter \#3 \$object of function complete_substitutions_array expects CommonObject\|null, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
-
 		-
 			message: '#^Property CommonObject\:\:\$entity \(int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -11958,30 +11772,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
 
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, BOM given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_object\(\) expects CommonObject, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, float\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
-
-		-
-			message: '#^Parameter \#3 \$object of function complete_substitutions_array expects CommonObject\|null, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
-
 		-
 			message: '#^Property CommonObject\:\:\$entity \(int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -11994,30 +11784,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/cheque/doc/pdf_blochet.class.php
 
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Commande given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_object\(\) expects CommonObject, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, float\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
-
-		-
-			message: '#^Parameter \#3 \$object of function complete_substitutions_array expects CommonObject\|null, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
-
 		-
 			message: '#^Property Commande\:\:\$availability \(string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -12150,24 +11916,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
 
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Contrat given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_object\(\) expects CommonObject, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
-
-		-
-			message: '#^Parameter \#3 \$object of function complete_substitutions_array expects CommonObject\|null, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
-
 		-
 			message: '#^Ternary operator condition is always false\.$#'
 			identifier: ternary.alwaysFalse
@@ -12252,12 +12000,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
 
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, float\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
-
 		-
 			message: '#^Parameter \#4 \$columnText of method CommonDocGenerator\:\:printStdColumnContent\(\) expects string, float given\.$#'
 			identifier: argument.type
@@ -12360,30 +12102,6 @@ parameters:
 			count: 6
 			path: ../../../htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php
 
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Facture given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_object\(\) expects CommonObject, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, float\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
-
-		-
-			message: '#^Parameter \#3 \$object of function complete_substitutions_array expects CommonObject\|null, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
-
 		-
 			message: '#^Variable \$array_propal_object in isset\(\) always exists and is not nullable\.$#'
 			identifier: isset.variable
@@ -13572,30 +13290,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
 
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Mo given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_object\(\) expects CommonObject, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, float\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
-
-		-
-			message: '#^Parameter \#3 \$object of function complete_substitutions_array expects CommonObject\|null, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
-
 		-
 			message: '#^Property Mo\:\:\$entity \(int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -13722,24 +13416,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
 
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Product given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, float\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
-
-		-
-			message: '#^Parameter \#3 \$object of function complete_substitutions_array expects CommonObject\|null, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
-
 		-
 			message: '#^Property Product\:\:\$weight_units \(int\|string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -13758,30 +13434,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Project given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$object of method doc_generic_project_odt\:\:get_substitutionarray_object\(\) expects CommonObject, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
-
-		-
-			message: '#^Parameter \#2 \$array_to_fill of method CommonDocGenerator\:\:fill_substitutionarray_with_extrafields\(\) expects array\<string, string\>, array\<string, mixed\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
-
-		-
-			message: '#^Parameter \#3 \$object of function complete_substitutions_array expects CommonObject\|null, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
-
 		-
 			message: '#^Variable \$objectdetail might not be defined\.$#'
 			identifier: variable.undefined
@@ -13830,60 +13482,12 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
 
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Project\|Task given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$task of method doc_generic_task_odt\:\:get_substitutionarray_tasks\(\) expects Task, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
-
-		-
-			message: '#^Parameter \#2 \$array_to_fill of method CommonDocGenerator\:\:fill_substitutionarray_with_extrafields\(\) expects array\<string, string\>, array\<string, int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
-
-		-
-			message: '#^Parameter \#3 \$object of function complete_substitutions_array expects CommonObject\|null, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
-
 		-
 			message: '#^Variable \$listlines might not be defined\.$#'
 			identifier: variable.undefined
 			count: 3
 			path: ../../../htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
 
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Propal given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_object\(\) expects CommonObject, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, float\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
-
-		-
-			message: '#^Parameter \#3 \$object of function complete_substitutions_array expects CommonObject\|null, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
-
 		-
 			message: '#^Property CommonObject\:\:\$multicurrency_tx \(array\<float\>\|float\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -14010,30 +13614,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/rapport/pdf_paiement.class.php
 
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Reception given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_object\(\) expects CommonObject, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, float\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
-
-		-
-			message: '#^Parameter \#3 \$object of function complete_substitutions_array expects CommonObject\|null, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
-
 		-
 			message: '#^Property Reception\:\:\$trueWeight \(float\|int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -14058,24 +13638,6 @@ parameters:
 			count: 3
 			path: ../../../htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
 
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, Entrepot given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, float\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
-
-		-
-			message: '#^Parameter \#3 \$object of function complete_substitutions_array expects CommonObject\|null, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
-
 		-
 			message: '#^Property CommonDocGenerator\:\:\$cols \(array\<string, array\{rank\: int, width\: float\|int, status\: bool, title\: array\{textkey\: string, label\: string, align\: string, padding\: array\{float, float, float, float\}\}, content\: array\{align\: string, padding\: array\{float, float, float, float\}\}\}\>\) does not accept non\-empty\-array\<string, array\{rank\: 0, width\: false, status\: true, title\: array\{textkey\: ''Designation'', align\: ''L'', padding\: array\{0\.5, 1, 0\.5, 1\.5\}\}, content\: array\{align\: ''L'', padding\: array\{1, 0\.5, 1, 1\.5\}\}\}\|array\{rank\: int, width\: float\|int, status\: bool, title\: array\{textkey\: string, label\: string, align\: string, padding\: array\{float, float, float, float\}\}, content\: array\{align\: string, padding\: array\{float, float, float, float\}\}\}\>\.$#'
 			identifier: assign.propertyType
@@ -14148,30 +13710,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
 
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, FactureFournisseur given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_object\(\) expects CommonObject, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, float\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
-
-		-
-			message: '#^Parameter \#3 \$object of function complete_substitutions_array expects CommonObject\|null, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
-
 		-
 			message: '#^Property CommonObject\:\:\$multicurrency_tx \(array\<float\>\|float\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -14190,30 +13728,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
 
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, CommandeFournisseur given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_object\(\) expects CommonObject, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, float\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
-
-		-
-			message: '#^Parameter \#3 \$object of function complete_substitutions_array expects CommonObject\|null, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
-
 		-
 			message: '#^Left side of \|\| is always false\.$#'
 			identifier: booleanOr.leftAlwaysFalse
@@ -14352,18 +13866,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
 
-		-
-			message: '#^Parameter \#1 \$line of method CommonDocGenerator\:\:get_substitutionarray_lines\(\) expects CommonObjectLine, CommonObject\|stdClass given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, float\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
-
 		-
 			message: '#^Left side of && is always true\.$#'
 			identifier: booleanAnd.leftAlwaysTrue
@@ -14490,30 +13992,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
 
-		-
-			message: '#^Call to function is_array\(\) with string will always evaluate to false\.$#'
-			identifier: function.impossibleType
-			count: 1
-			path: ../../../htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, UserGroup given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, float\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
-
-		-
-			message: '#^Parameter \#3 \$object of function complete_substitutions_array expects CommonObject\|null, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
-
 		-
 			message: '#^Variable \$contactobject might not be defined\.$#'
 			identifier: variable.undefined
@@ -14628,12 +14106,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/tpl/card_presend.tpl.php
 
-		-
-			message: '#^Variable \$modelmail might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/card_presend.tpl.php
-
 		-
 			message: '#^Variable \$newlang in empty\(\) always exists and is always falsy\.$#'
 			identifier: empty.variable
@@ -14961,7 +14433,7 @@ parameters:
 		-
 			message: '#^Variable \$conf might not be defined\.$#'
 			identifier: variable.undefined
-			count: 5
+			count: 4
 			path: ../../../htdocs/core/tpl/objectline_create.tpl.php
 
 		-
@@ -17664,12 +17136,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/fourn/class/fournisseur.facture-rec.class.php
 
-		-
-			message: '#^Parameter \#8 \$remise_percent of method FactureFournisseurRec\:\:addline\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/fourn/class/fournisseur.facture-rec.class.php
-
 		-
 			message: '#^Property CommonInvoice\:\:\$subtype \(int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -17730,12 +17196,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/fourn/class/fournisseur.facture.class.php
 
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/fourn/class/fournisseur.facture.class.php
-
 		-
 			message: '#^Parameter \#15 \$pu_devise of function calcul_price_total expects float, string given\.$#'
 			identifier: argument.type
@@ -18060,24 +17520,12 @@ parameters:
 			count: 2
 			path: ../../../htdocs/fourn/commande/card.php
 
-		-
-			message: '#^Variable \$array_option might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/fourn/commande/card.php
-
 		-
 			message: '#^Variable \$classname might not be defined\.$#'
 			identifier: variable.undefined
 			count: 2
 			path: ../../../htdocs/fourn/commande/card.php
 
-		-
-			message: '#^Variable \$fk_account might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/fourn/commande/card.php
-
 		-
 			message: '#^Variable \$line might not be defined\.$#'
 			identifier: variable.undefined
@@ -18102,12 +17550,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/fourn/commande/contact.php
 
-		-
-			message: '#^Variable \$caneditproject might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/fourn/commande/contact.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
@@ -18162,24 +17604,12 @@ parameters:
 			count: 1
 			path: ../../../htdocs/fourn/commande/document.php
 
-		-
-			message: '#^Variable \$caneditproject might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/fourn/commande/document.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
 			count: 1
 			path: ../../../htdocs/fourn/commande/info.php
 
-		-
-			message: '#^Variable \$caneditproject might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/fourn/commande/info.php
-
 		-
 			message: '#^Call to function method_exists\(\) with CommandeFournisseur and ''fetch_lines'' will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -18198,12 +17628,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/fourn/commande/list.php
 
-		-
-			message: '#^Variable \$billed might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/fourn/commande/list.php
-
 		-
 			message: '#^Variable \$contextpage in empty\(\) always exists and is not falsy\.$#'
 			identifier: empty.variable
@@ -18222,24 +17646,12 @@ parameters:
 			count: 1
 			path: ../../../htdocs/fourn/commande/note.php
 
-		-
-			message: '#^Variable \$caneditproject might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/fourn/commande/note.php
-
 		-
 			message: '#^Variable \$object might not be defined\.$#'
 			identifier: variable.undefined
 			count: 1
 			path: ../../../htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
 
-		-
-			message: '#^Variable \$begin might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: ../../../htdocs/fourn/contact.php
-
 		-
 			message: '#^Variable \$socid might not be defined\.$#'
 			identifier: variable.undefined
@@ -18252,48 +17664,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/fourn/facture/agenda.php
 
-		-
-			message: '#^Parameter \#1 \$hour of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 3
-			path: ../../../htdocs/fourn/facture/card-rec.php
-
-		-
-			message: '#^Parameter \#2 \$minute of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 3
-			path: ../../../htdocs/fourn/facture/card-rec.php
-
-		-
-			message: '#^Parameter \#3 \$second of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/fourn/facture/card-rec.php
-
-		-
-			message: '#^Parameter \#4 \$month of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 4
-			path: ../../../htdocs/fourn/facture/card-rec.php
-
-		-
-			message: '#^Parameter \#5 \$day of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 4
-			path: ../../../htdocs/fourn/facture/card-rec.php
-
-		-
-			message: '#^Parameter \#6 \$year of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 4
-			path: ../../../htdocs/fourn/facture/card-rec.php
-
-		-
-			message: '#^Variable \$formproject might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/fourn/facture/card-rec.php
-
 		-
 			message: '#^Variable \$label might not be defined\.$#'
 			identifier: variable.undefined
@@ -18312,24 +17682,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/fourn/facture/card-rec.php
 
-		-
-			message: '#^Variable \$predef might not be defined\.$#'
-			identifier: variable.undefined
-			count: 20
-			path: ../../../htdocs/fourn/facture/card-rec.php
-
-		-
-			message: '#^Variable \$price_min might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/fourn/facture/card-rec.php
-
-		-
-			message: '#^Variable \$ref_fournisseur might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/fourn/facture/card-rec.php
-
 		-
 			message: '#^Comparison operation "\>" between 0 and 0 is always false\.$#'
 			identifier: greater.alwaysFalse
@@ -18342,60 +17694,12 @@ parameters:
 			count: 2
 			path: ../../../htdocs/fourn/facture/card.php
 
-		-
-			message: '#^Parameter \#1 \$hour of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 6
-			path: ../../../htdocs/fourn/facture/card.php
-
-		-
-			message: '#^Parameter \#2 \$minute of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 6
-			path: ../../../htdocs/fourn/facture/card.php
-
-		-
-			message: '#^Parameter \#3 \$second of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 4
-			path: ../../../htdocs/fourn/facture/card.php
-
-		-
-			message: '#^Parameter \#4 \$month of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 6
-			path: ../../../htdocs/fourn/facture/card.php
-
-		-
-			message: '#^Parameter \#5 \$day of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 6
-			path: ../../../htdocs/fourn/facture/card.php
-
-		-
-			message: '#^Parameter \#6 \$year of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 6
-			path: ../../../htdocs/fourn/facture/card.php
-
-		-
-			message: '#^Property CommonObject\:\:\$cond_reglement_id \(int\) does not accept array\<mixed\>\|string\.$#'
-			identifier: assign.propertyType
-			count: 2
-			path: ../../../htdocs/fourn/facture/card.php
-
 		-
 			message: '#^Property CommonObject\:\:\$fk_project \(int\) does not accept null\.$#'
 			identifier: assign.propertyType
 			count: 1
 			path: ../../../htdocs/fourn/facture/card.php
 
-		-
-			message: '#^Property CommonObject\:\:\$mode_reglement_id \(int\) does not accept array\<mixed\>\|string\.$#'
-			identifier: assign.propertyType
-			count: 2
-			path: ../../../htdocs/fourn/facture/card.php
-
 		-
 			message: '#^Variable \$backtopageforcancel in empty\(\) always exists and is always falsy\.$#'
 			identifier: empty.variable
@@ -18420,12 +17724,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/fourn/facture/card.php
 
-		-
-			message: '#^Variable \$vat_reverse_charge might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/fourn/facture/card.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
@@ -18498,18 +17796,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/fourn/facture/list.php
 
-		-
-			message: '#^Variable \$numprlv might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/fourn/facture/list.php
-
-		-
-			message: '#^Variable \$soc might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/fourn/facture/list.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
@@ -18564,12 +17850,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/fourn/paiement/card.php
 
-		-
-			message: '#^Variable \$title_button might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/fourn/paiement/card.php
-
 		-
 			message: '#^Variable \$object might not be defined\.$#'
 			identifier: variable.undefined
@@ -18600,36 +17880,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/fourn/product/list.php
 
-		-
-			message: '#^Variable \$result2 might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/ftp/admin/ftpclient.php
-
-		-
-			message: '#^Variable \$result3 might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/ftp/admin/ftpclient.php
-
-		-
-			message: '#^Variable \$result4 might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/ftp/admin/ftpclient.php
-
-		-
-			message: '#^Variable \$result5 might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/ftp/admin/ftpclient.php
-
-		-
-			message: '#^Variable \$result6 might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/ftp/admin/ftpclient.php
-
 		-
 			message: '#^If condition is always true\.$#'
 			identifier: if.alwaysTrue
@@ -18660,12 +17910,6 @@ parameters:
 			count: 3
 			path: ../../../htdocs/ftp/index.php
 
-		-
-			message: '#^Variable \$newsectioniso might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/ftp/index.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
@@ -18678,24 +17922,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/holiday/card_group.php
 
-		-
-			message: '#^Parameter \#4 \$month of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 4
-			path: ../../../htdocs/holiday/card_group.php
-
-		-
-			message: '#^Parameter \#5 \$day of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 4
-			path: ../../../htdocs/holiday/card_group.php
-
-		-
-			message: '#^Parameter \#6 \$year of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 4
-			path: ../../../htdocs/holiday/card_group.php
-
 		-
 			message: '#^Variable \$errors might not be defined\.$#'
 			identifier: variable.undefined
@@ -18738,12 +17964,6 @@ parameters:
 			count: 3
 			path: ../../../htdocs/holiday/class/holiday.class.php
 
-		-
-			message: '#^Parameter \#4 \$new_solde of method Holiday\:\:addLogCP\(\) expects int, float given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/holiday/class/holiday.class.php
-
 		-
 			message: '#^Property Holiday\:\:\$events has no type specified\.$#'
 			identifier: missingType.property
@@ -18792,12 +18012,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/holiday/define_holiday.php
 
-		-
-			message: '#^Variable \$arraydata might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/holiday/list.php
-
 		-
 			message: '#^Variable \$contextpage in empty\(\) always exists and is not falsy\.$#'
 			identifier: empty.variable
@@ -19452,12 +18666,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/hrm/index.php
 
-		-
-			message: '#^Variable \$newcardbutton might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/hrm/job_agenda.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
@@ -19938,18 +19146,6 @@ parameters:
 			count: 8
 			path: ../../../htdocs/install/fileconf.php
 
-		-
-			message: '#^Variable \$testclass might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/install/fileconf.php
-
-		-
-			message: '#^Variable \$testfunction might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/install/fileconf.php
-
 		-
 			message: '#^Instanceof between mod_syslog_file and LogHandler will always evaluate to true\.$#'
 			identifier: instanceof.alwaysTrue
@@ -20040,18 +19236,6 @@ parameters:
 			count: 4
 			path: ../../../htdocs/install/repair.php
 
-		-
-			message: '#^Variable \$methodtofix might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/install/repair.php
-
-		-
-			message: '#^Variable \$object_instance might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: ../../../htdocs/install/repair.php
-
 		-
 			message: '#^Call to function is_array\(\) with array\<mixed\> will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -20184,12 +19368,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/install/step2.php
 
-		-
-			message: '#^Variable \$buffer might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/install/step2.php
-
 		-
 			message: '#^Variable \$conf might not be defined\.$#'
 			identifier: variable.undefined
@@ -20208,12 +19386,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/install/step2.php
 
-		-
-			message: '#^Variable \$dir might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: ../../../htdocs/install/step2.php
-
 		-
 			message: '#^Variable \$dolibarr_main_db_prefix might not be defined\.$#'
 			identifier: variable.undefined
@@ -20232,12 +19404,6 @@ parameters:
 			count: 3
 			path: ../../../htdocs/install/step2.php
 
-		-
-			message: '#^Variable \$versionarray might not be defined\.$#'
-			identifier: variable.undefined
-			count: 4
-			path: ../../../htdocs/install/step2.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
@@ -20472,12 +19638,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/install/upgrade.php
 
-		-
-			message: '#^Variable \$versionarray might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/install/upgrade.php
-
 		-
 			message: '#^Call to function is_array\(\) with array\<int\<0, max\>, array\{mixed, mixed, mixed\}\> will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -20628,12 +19788,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/intracommreport/class/intracommreport.class.php
 
-		-
-			message: '#^Parameter \#3 \$period_reference of method IntracommReport\:\:addItemsFact\(\) expects int, string given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/intracommreport/class/intracommreport.class.php
-
 		-
 			message: '#^Variable \$url in empty\(\) always exists and is not falsy\.$#'
 			identifier: empty.variable
@@ -20976,12 +20130,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/loan/payment/payment.php
 
-		-
-			message: '#^Variable \$sumpaid might not be defined\.$#'
-			identifier: variable.undefined
-			count: 4
-			path: ../../../htdocs/loan/payment/payment.php
-
 		-
 			message: '#^Variable \$result might not be defined\.$#'
 			identifier: variable.undefined
@@ -21042,18 +20190,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/main.inc.php
 
-		-
-			message: '#^Parameter \#1 \$var of function analyseVarsForSqlAndScriptsInjection expects array\<string, string\>\|string, array\<int, mixed\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/main.inc.php
-
-		-
-			message: '#^Parameter \#1 \$var of function analyseVarsForSqlAndScriptsInjection expects array\<string, string\>\|string, array\<int, string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/main.inc.php
-
 		-
 			message: '#^Ternary operator condition is always false\.$#'
 			identifier: ternary.alwaysFalse
@@ -21108,24 +20244,12 @@ parameters:
 			count: 2
 			path: ../../../htdocs/margin/customerMargins.php
 
-		-
-			message: '#^Parameter \#6 \$year of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/margin/customerMargins.php
-
 		-
 			message: '#^Ternary operator condition is always false\.$#'
 			identifier: ternary.alwaysFalse
 			count: 1
 			path: ../../../htdocs/margin/customerMargins.php
 
-		-
-			message: '#^Parameter \#6 \$year of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/margin/productMargins.php
-
 		-
 			message: '#^Ternary operator condition is always false\.$#'
 			identifier: ternary.alwaysFalse
@@ -21210,12 +20334,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/modulebuilder/index.php
 
-		-
-			message: '#^If condition is always true\.$#'
-			identifier: if.alwaysTrue
-			count: 1
-			path: ../../../htdocs/modulebuilder/index.php
-
 		-
 			message: '#^Negated boolean expression is always true\.$#'
 			identifier: booleanNot.alwaysTrue
@@ -21258,12 +20376,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/modulebuilder/index.php
 
-		-
-			message: '#^Variable \$content might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/modulebuilder/index.php
-
 		-
 			message: '#^Variable \$field might not be defined\.$#'
 			identifier: variable.undefined
@@ -21297,7 +20409,7 @@ parameters:
 		-
 			message: '#^Variable \$outputfilezip might not be defined\.$#'
 			identifier: variable.undefined
-			count: 3
+			count: 1
 			path: ../../../htdocs/modulebuilder/index.php
 
 		-
@@ -21396,12 +20508,6 @@ parameters:
 			count: 3
 			path: ../../../htdocs/modulebuilder/template/class/api_mymodule.class.php
 
-		-
-			message: '#^Parameter \#1 \$data of method MyModuleApi\:\:_validateMyObject\(\) expects array\<string, float\|int\|string\|null\>, list\<mixed\>\|null given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/modulebuilder/template/class/api_mymodule.class.php
-
 		-
 			message: '#^Result of && is always false\.$#'
 			identifier: booleanAnd.alwaysFalse
@@ -21504,12 +20610,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/modulebuilder/template/class/myobject.class.php
 
-		-
-			message: '#^Parameter \#1 \$params of method MyObject\:\:getTooltipContentArray\(\) expects array\<string, string\>, array\<string, int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/modulebuilder/template/class/myobject.class.php
-
 		-
 			message: '#^Property CommonObject\:\:\$isextrafieldmanaged \(int\<0, 1\>\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -21540,30 +20640,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/modulebuilder/template/core/modules/modMyModule.class.php
 
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, MyObject given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_object\(\) expects CommonObject, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, float\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
-
-		-
-			message: '#^Parameter \#3 \$object of function complete_substitutions_array expects CommonObject\|null, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
-
 		-
 			message: '#^Property MyObject\:\:\$entity \(int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -24000,12 +23076,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/product/stock/list.php
 
-		-
-			message: '#^Variable \$totalnboflines might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/product/stock/list.php
-
 		-
 			message: '#^Comparison operation "\<" between 0 and 0 is always false\.$#'
 			identifier: smaller.alwaysFalse
@@ -27432,30 +26502,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/recruitment/class/recruitmentjobposition.class.php
 
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\<string, CommonObject\|float\|int\|string\>, RecruitmentJobPosition given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_object\(\) expects CommonObject, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
-
-		-
-			message: '#^Parameter \#1 \$substitutionarray of function complete_substitutions_array expects array\<string, string\>, array\<string, float\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
-
-		-
-			message: '#^Parameter \#3 \$object of function complete_substitutions_array expects CommonObject\|null, array\<string, CommonObject\|float\|int\|string\> given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
-
 		-
 			message: '#^Property RecruitmentJobPosition\:\:\$entity \(int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -27534,12 +26580,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/recruitment/recruitmentcandidature_card.php
 
-		-
-			message: '#^Variable \$formquestion might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/recruitment/recruitmentcandidature_card.php
-
 		-
 			message: '#^Variable \$text might not be defined\.$#'
 			identifier: variable.undefined
@@ -31218,12 +30258,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/workstation/workstation_card.php
 
-		-
-			message: '#^Variable \$formquestion might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/workstation/workstation_card.php
-
 		-
 			message: '#^Variable \$upload_dir might not be defined\.$#'
 			identifier: variable.undefined

From 2130f1395aab0a43fc15b478abdc0ba22359b023 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 8 Feb 2025 18:30:42 +0100
Subject: [PATCH 577/602] Qual: Fix phan (product-part-1) implies fixing unit
 types

---
 htdocs/bom/tpl/objectline_view.tpl.php        |  6 +-
 .../core/class/commondocgenerator.class.php   | 22 ++---
 htdocs/core/class/html.form.class.php         |  2 +-
 htdocs/core/class/html.formcompany.class.php  | 18 ++--
 htdocs/core/lib/functions.lib.php             |  4 +-
 htdocs/core/lib/product.lib.php               | 18 ++--
 .../expedition/doc/pdf_espadon.modules.php    |  2 +-
 .../modules/product/modules_product.class.php | 10 +-
 htdocs/expedition/card.php                    |  4 +-
 htdocs/expedition/class/expedition.class.php  |  6 +-
 .../class/expeditionligne.class.php           |  6 +-
 htdocs/expedition/list.php                    |  2 +-
 htdocs/mrp/mo_production.php                  |  8 +-
 htdocs/mrp/tpl/originproductline.tpl.php      |  6 +-
 htdocs/product/admin/price_rules.php          |  6 +-
 htdocs/product/admin/product.php              |  4 +-
 htdocs/product/admin/product_tools.php        | 11 ++-
 htdocs/product/ajax/products.php              | 11 ++-
 .../product/actions_card_product.class.php    | 12 +--
 htdocs/product/card.php                       | 70 ++++++-------
 .../product/class/html.formproduct.class.php  |  6 +-
 htdocs/product/class/product.class.php        | 99 ++++++++++---------
 htdocs/product/stock/massstockmove.php        |  6 +-
 htdocs/reception/card.php                     |  6 +-
 24 files changed, 178 insertions(+), 167 deletions(-)

diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index def20558866..1ce3201aa9c 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2012-2014  Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2017		Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -153,7 +153,7 @@ print '</td>';
 if ($filtertype != 1) { // Product
 	if (getDolGlobalInt('PRODUCT_USE_UNITS')) {		// For product, unit is shown only if option PRODUCT_USE_UNITS is on
 		print '<td class="linecoluseunit nowrap">';
-		$label = measuringUnitString($line->fk_unit, '', '', 1);
+		$label = measuringUnitString((int) $line->fk_unit, '', null, 1);
 		if ($label !== '') {
 			print $langs->trans($label);
 		}
@@ -359,7 +359,7 @@ if ($resql) {
 			$total_cost += $sub_bom->total_cost * $sub_bom_line->qty * (float) $line->qty;
 		} elseif ($sub_bom_product->type == Product::TYPE_SERVICE && isModEnabled('workstation') && !empty($sub_bom_product->fk_default_workstation)) {
 			//Convert qty to hour
-			$unit = measuringUnitString($sub_bom_line->fk_unit, '', '', 1);
+			$unit = measuringUnitString($sub_bom_line->fk_unit, '', null, 1);
 			$qty = convertDurationtoHour($sub_bom_line->qty, $unit);
 			$workstation = new Workstation($this->db);
 			$res = $workstation->fetch($sub_bom_product->fk_default_workstation);
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 65f87ed9870..4bb9a8fbb08 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2016-2023  Charlene Benke          <charlene@patas-monkey.com>
  * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2020       Josep Lluís Amador      <joseplluis@lliuretic.cat>
- * Copyright (C) 2024		MDW	                    <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW	                    <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Mélina Joum			    <melina.joum@altairis.fr>
  * Copyright (C) 2024	    Nick Fragoulis
  *
@@ -1055,7 +1055,7 @@ abstract class CommonDocGenerator
 			$array_key.'_tracking_number' => $object->tracking_number,
 			$array_key.'_tracking_url' => $object->tracking_url,
 			$array_key.'_shipping_method' => $object->listmeths[0]['libelle'],
-			$array_key.'_weight' => $object->trueWeight.' '.measuringUnitString(0, 'weight', (string) $object->weight_units),
+			$array_key.'_weight' => $object->trueWeight.' '.measuringUnitString(0, 'weight', $object->weight_units),
 			$array_key.'_width' => $object->trueWidth.' '.measuringUnitString(0, 'size', $object->width_units),
 			$array_key.'_height' => $object->trueHeight.' '.measuringUnitString(0, 'size', $object->height_units),
 			$array_key.'_depth' => $object->trueDepth.' '.measuringUnitString(0, 'size', $object->depth_units),
@@ -1092,31 +1092,31 @@ abstract class CommonDocGenerator
 
 		// Set trueVolume and volume_units not currently stored into database
 		if ($object->trueWidth && $object->trueHeight && $object->trueDepth) {
-				$object->trueVolume = $object->trueWidth * $object->trueHeight * $object->trueDepth;
-				$object->volume_units = $object->size_units * 3;
+			$object->trueVolume = $object->trueWidth * $object->trueHeight * $object->trueDepth;
+			$object->volume_units = $object->size_units * 3;
 		}
 
 		$array_shipment[$array_key.'_total_ordered'] = (string) $totalOrdered;
 		$array_shipment[$array_key.'_total_toship'] = (string) $totalToShip;
 
 		if ($object->trueWeight) {
-				$array_shipment[$array_key.'_total_weight'] = (empty($totalWeight)) ? '' : showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
+			$array_shipment[$array_key.'_total_weight'] = (empty($totalWeight)) ? '' : showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
 		} elseif (!empty($totalWeight)) {
-				$array_shipment[$array_key.'_total_weight'] = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs, -1, 'no', 1);
+			$array_shipment[$array_key.'_total_weight'] = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs, -1, 'no', 1);
 		} else {
-				$array_shipment[$array_key.'_total_weight'] = "";
+			$array_shipment[$array_key.'_total_weight'] = "";
 		}
 
 		if (!empty($object->trueVolume)) {
 			if ($object->volume_units < 50) {
-					$array_shipment[$array_key.'_total_volume'] = (empty($totalVolume)) ? '' : showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+				$array_shipment[$array_key.'_total_volume'] = (empty($totalVolume)) ? '' : showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
 			} else {
-					$array_shipment[$array_key.'_total_volume'] = (empty($totalVolume)) ? '' :  price($object->trueVolume, 0, $outputlangs, 0, 0).' '.measuringUnitString(0, "volume", $object->volume_units);
+				$array_shipment[$array_key.'_total_volume'] = (empty($totalVolume)) ? '' : price($object->trueVolume, 0, $outputlangs, 0, 0).' '.measuringUnitString(0, "volume", $object->volume_units);
 			}
 		} elseif (!empty($totalVolume)) {
-				$array_shipment[$array_key.'_total_volume'] = showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs, -1, 'no', 1);
+			$array_shipment[$array_key.'_total_volume'] = showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs, -1, 'no', 1);
 		} else {
-				$array_shipment[$array_key.'_total_volume'] = "";
+			$array_shipment[$array_key.'_total_volume'] = "";
 		}
 
 		return $array_shipment;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8772968c774..a1ce6a738aa 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -204,7 +204,7 @@ class Form
 	 * @param string		$text 		Text of label (not used in this function)
 	 * @param string		$htmlname 	Name of select field
 	 * @param string|int	$value 		Value to show/edit
-	 * @param CommonObject 	$object 	Object (that we want to show)
+	 * @param CommonObject|ActionsCardProduct|ActionsCardService 	$object 	Object (that we want to show)
 	 * @param bool|int<0,1> $perm 		Permission to allow button to edit parameter
 	 * @param string		$typeofdata Type of data ('string' by default, 'checkbox', 'email', 'phone', 'amount:99', 'numeric:99',
 	 *                                  'text' or 'textarea:rows:cols%', 'safehtmlstring', 'restricthtml',
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 948907ff469..800913719ee 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2017		Rui Strecht			<rui.strecht@aliartalentos.com>
  * Copyright (C) 2020       Open-Dsi         	<support@open-dsi.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -249,9 +249,9 @@ class FormCompany extends Form
 	 *   The key of the list is the code (there can be several entries for a given code but in this case, the country field differs).
 	 *   Thus the links with the departments are done on a department independently of its name.
 	 *
-	 *   @param     string	$selected        	Code state preselected
-	 *   @param     int		$country_codeid     0=list for all countries, otherwise country code or country rowid to show
-	 *   @param     string	$htmlname			Id of department
+	 *   @param     string		$selected        	Code state preselected
+	 *   @param     int|string	$country_codeid     0=list for all countries, otherwise country code or country rowid to show
+	 *   @param     string		$htmlname			Id of department
 	 *   @return	void
 	 */
 	public function select_departement($selected = '', $country_codeid = 0, $htmlname = 'state_id')
@@ -267,11 +267,11 @@ class FormCompany extends Form
 	 *   The key of the list is the code (there can be several entries for a given code but in this case, the country field differs).
 	 *   Thus the links with the departments are done on a department independently of its name.
 	 *
-	 *    @param	int		$selected        	Code state preselected (must be state id)
-	 *    @param    int		$country_codeid    	Country code or id: 0=list for all countries, otherwise country code or country rowid to show
-	 *    @param    string	$htmlname			Id of department. If '', we want only the string with <option>
-	 *    @param	string	$morecss			Add more css
-	 * 	  @return	string						String with HTML select
+	 *    @param	int			$selected        	Code state preselected (must be state id)
+	 *    @param    int|string	$country_codeid    	Country code or id: 0=list for all countries, otherwise country code or country rowid to show
+	 *    @param    string		$htmlname			Id of department. If '', we want only the string with <option>
+	 *    @param	string		$morecss			Add more css
+	 * 	  @return	string							String with HTML select
 	 *    @see select_country()
 	 */
 	public function select_state($selected = 0, $country_codeid = 0, $htmlname = 'state_id', $morecss = 'maxwidth200onsmartphone  minwidth300')
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 567eb7e4b86..fae36b1f6f2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7104,7 +7104,7 @@ function price2num($amount, $rounding = '', $option = 0)
  * @param   Translate   $outputlangs    	Translate language object
  * @param   int<-1,max> $round          	-1 = non rounding, x = number of decimal
  * @param   string      $forceunitoutput    'no' or numeric (-3, -6, ...) compared to $unit (In most case, this value is value defined into $conf->global->MAIN_WEIGHT_DEFAULT_UNIT)
- * @param	int			$use_short_label	1=Use short label ('g' instead of 'gram'). Short labels are not translated.
+ * @param	int<0,1>	$use_short_label	1=Use short label ('g' instead of 'gram'). Short labels are not translated.
  * @return  string                      	String to show dimensions
  */
 function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round = -1, $forceunitoutput = 'no', $use_short_label = 0)
@@ -7139,7 +7139,7 @@ function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round
 
 	$ret = price($dimension, 0, $outputlangs, 0, 0, $round);
 	// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
-	$ret .= ' '.measuringUnitString(0, $type, (string) $unit, $use_short_label, $outputlangs);
+	$ret .= ' '.measuringUnitString(0, $type, $unit, $use_short_label, $outputlangs);
 
 	return $ret;
 }
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index f13d2df07b8..19f2b59b50f 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2015-2016	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2023	   	Gauthier VERDOL			<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024	   	Jean-Rémi TAPONIER		<jean-remi@netlogic.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Mélina Joum				<melina.joum@altairis.fr>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
@@ -879,15 +879,15 @@ function show_stats_for_batch($batch, $socid)
  *	Return translation label of a unit key.
  *  Function kept for backward compatibility.
  *
- *  @param	string  	$unitscale			Scale of unit: '0', '-3', '6', ...
+ *  @param	?int	  	$unitscale			Scale of unit: '0', '-3', '6', ...
  *	@param  string		$measuring_style    Style of unit: weight, volume,...
  *	@param	int			$unitid             ID of unit (rowid in llx_c_units table)
- *  @param	int			$use_short_label	1=Use short label ('g' instead of 'gram'). Short labels are not translated.
- *  @param	Translate	$outputlangs		Language object
+ *  @param	int<0,1>	$use_short_label	1=Use short label ('g' instead of 'gram'). Short labels are not translated.
+ *  @param	?Translate	$outputlangs		Language object
  *	@return	string	   			         	Unit string
  * 	@see	measuringUnitString() formproduct->selectMeasuringUnits()
  */
-function measuring_units_string($unitscale = '', $measuring_style = '', $unitid = 0, $use_short_label = 0, $outputlangs = null)
+function measuring_units_string($unitscale = null, $measuring_style = '', $unitid = 0, $use_short_label = 0, $outputlangs = null)
 {
 	return measuringUnitString($unitid, $measuring_style, $unitscale, $use_short_label, $outputlangs);
 }
@@ -897,13 +897,13 @@ function measuring_units_string($unitscale = '', $measuring_style = '', $unitid
  *
  *	@param	int			$unitid             ID of unit (rowid in llx_c_units table)
  *	@param  string		$measuring_style    Style of unit: 'weight', 'volume', ..., '' = 'net_measure' for option PRODUCT_ADD_NET_MEASURE
- *  @param	string  	$unitscale			Scale of unit: '0', '-3', '6', ...
- *  @param	int			$use_short_label	1=Use very short label ('g' instead of 'gram'), not translated. 2=Use translated short label.
- *  @param	Translate	$outputlangs		Language object
+ *  @param	?int	  	$unitscale			Scale of unit: '0', '-3', '6', ...
+ *  @param	int<0,2>	$use_short_label	1=Use very short label ('g' instead of 'gram'), not translated. 2=Use translated short label.
+ *  @param	?Translate	$outputlangs		Language object
  *	@return	string|-1	   			        Unit string if OK, -1 if KO
  * 	@see	formproduct->selectMeasuringUnits()
  */
-function measuringUnitString($unitid, $measuring_style = '', $unitscale = '', $use_short_label = 0, $outputlangs = null)
+function measuringUnitString($unitid, $measuring_style = '', $unitscale = null, $use_short_label = 0, $outputlangs = null)
 {
 	global $langs, $db;
 	global $measuring_unit_cache;
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 87d07f0e7cc..0c16ff7e5f6 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -705,7 +705,7 @@ class pdf_espadon extends ModelePdfExpedition
 					}
 
 					if ($this->getColumnStatus('unit_order')) {
-						$this->printStdColumnContent($pdf, $curY, 'unit_order', measuringUnitString($object->lines[$i]->fk_unit));
+						$this->printStdColumnContent($pdf, $curY, 'unit_order', measuringUnitString((int) $object->lines[$i]->fk_unit));
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index dc81b248f52..dc1526fbd58 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -81,7 +81,7 @@ abstract class ModeleProductCode extends CommonNumRefGenerator
 	/**
 	 *  Return next value available
 	 *
-	 *	@param	Product|string	$objproduct	Object product
+	 *	@param	Product|''		$objproduct	Object product
 	 *	@param	int				$type		Type
 	 *  @return string      				Value
 	 */
@@ -124,8 +124,8 @@ abstract class ModeleProductCode extends CommonNumRefGenerator
 	 *  Return description of module parameters
 	 *
 	 *  @param	Translate	$langs      Output language
-	 *  @param	Product		$product	Product object
-	 *  @param	int			$type		-1=Nothing, 0=Customer, 1=Supplier
+	 *  @param	Product|''	$product	Product object
+	 *  @param	int<-1,1>	$type		-1=Nothing, 0=Customer, 1=Supplier
 	 *  @return	string					HTML translated description
 	 */
 	public function getToolTip($langs, $product, $type)
@@ -205,7 +205,7 @@ abstract class ModeleProductCode extends CommonNumRefGenerator
 	 * Return an example of result returned by getNextValue
 	 *
 	 * @param	?Translate		$langs		Object langs
-	 * @param	Product|string	$objproduct	Object product
+	 * @param	Product|''		$objproduct	Object product
 	 * @param	int<-1,2>		$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
 	 * @return	string						Return string example
 	 */
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index a19523f9d7b..7f6e01723fd 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2113,7 +2113,7 @@ if ($action == 'create') {
 		print '</form>';
 	} else {
 		print $object->trueWeight;
-		print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", (string) $object->weight_units) : '';
+		print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
 	}
 
 	// Calculated
@@ -2175,7 +2175,7 @@ if ($action == 'create') {
 		if ($volumeUnit < 50) {
 			print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, getDolGlobalInt('MAIN_VOLUME_DEFAULT_ROUND', -1), getDolGlobalString('MAIN_VOLUME_DEFAULT_UNIT', 'no'));
 		} else {
-			print $calculatedVolume.' '.measuringUnitString(0, "volume", (string) $volumeUnit);
+			print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
 		}
 	}
 	if ($totalVolume > 0) {
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 49dc4843f56..6fe33e56318 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -149,7 +149,7 @@ class Expedition extends CommonObject
 	 */
 	public $trueWidth;
 	/**
-	 * @var string
+	 * @var int
 	 */
 	public $width_units;
 	/**
@@ -157,7 +157,7 @@ class Expedition extends CommonObject
 	 */
 	public $trueHeight;
 	/**
-	 * @var string
+	 * @var int
 	 */
 	public $height_units;
 	/**
@@ -165,7 +165,7 @@ class Expedition extends CommonObject
 	 */
 	public $trueDepth;
 	/**
-	 * @var string
+	 * @var int
 	 */
 	public $depth_units;
 	/**
diff --git a/htdocs/expedition/class/expeditionligne.class.php b/htdocs/expedition/class/expeditionligne.class.php
index 35d305d3d92..2cf8a039b6e 100644
--- a/htdocs/expedition/class/expeditionligne.class.php
+++ b/htdocs/expedition/class/expeditionligne.class.php
@@ -13,7 +13,7 @@
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2020       Lenin Rivas         	<lenin@leninrivas.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -228,7 +228,7 @@ class ExpeditionLigne extends CommonObjectLine
 	public $width;
 
 	/**
-	 * @var string|int
+	 * @var int
 	 */
 	public $width_units;
 
@@ -238,7 +238,7 @@ class ExpeditionLigne extends CommonObjectLine
 	public $height;
 
 	/**
-	 * @var string|int
+	 * @var int
 	 */
 	public $height_units;
 
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 03a6a11db5d..9c1f32b1e7a 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -1619,7 +1619,7 @@ while ($i < $imaxinloop) {
 				print $form->textwithpicto('', $langs->trans('EstimatedWeight'), 1);
 			} else {
 				print $object->trueWeight;
-				print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", (string) $object->weight_units) : '';
+				print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
 			}
 			print '</td>';
 			if (!$i) {
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 53d383ba51a..2e7fd89629b 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1039,7 +1039,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							}
 							$qtyhourforline = 0;
 							if ($line->fk_unit) {
-								$unitforline = measuringUnitString($line->fk_unit, '', '', 1);
+								$unitforline = measuringUnitString($line->fk_unit, '', null, 1);
 								$qtyhourforline = convertDurationtoHour($line->qty, $unitforline);
 							}
 
@@ -1096,7 +1096,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						print '<td class="right nowraponall">';
 						$useunit = (($tmpproduct->type == Product::TYPE_PRODUCT && getDolGlobalInt('PRODUCT_USE_UNITS')) || (($tmpproduct->type == Product::TYPE_SERVICE) && ($line->fk_unit)));
 						if ($useunit) {
-							print measuringUnitString($line->fk_unit, '', '', 2);
+							print measuringUnitString($line->fk_unit, '', null, 2);
 						}
 						print '</td>';
 
@@ -1186,7 +1186,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						print '<td class="right nowraponall">';
 						$useunit = (($tmpproduct->type == Product::TYPE_PRODUCT && getDolGlobalInt('PRODUCT_USE_UNITS')) || (($tmpproduct->type == Product::TYPE_SERVICE) && ($line->fk_unit)));
 						if ($useunit) {
-							print measuringUnitString($line->fk_unit, '', '', 2);
+							print measuringUnitString($line->fk_unit, '', null, 2);
 						}
 						print '</td>';
 
@@ -1671,7 +1671,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					print '<td class="right">'.$line->qty.'</td>';
 					// Unit
 					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
-						print '<td class="right">'.measuringUnitString($line->fk_unit, '', '', 1).'</td>';
+						print '<td class="right">'.measuringUnitString($line->fk_unit, '', null, 1).'</td>';
 					}
 					// Cost price
 					if ($permissiontoupdatecost) {
diff --git a/htdocs/mrp/tpl/originproductline.tpl.php b/htdocs/mrp/tpl/originproductline.tpl.php
index 9b61917fe86..1fae83d4fe1 100644
--- a/htdocs/mrp/tpl/originproductline.tpl.php
+++ b/htdocs/mrp/tpl/originproductline.tpl.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2010-2012	Regis Houssin	<regis.houssin@inodbox.com>
  * Copyright (C) 2017		Charlie Benke	<charlie@patas-monkey.com>
- * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -85,7 +85,7 @@ print '</td>';
 // Qty
 print '<td class="right">'.$this->tpl['qty'].(($this->tpl['efficiency'] > 0 && $this->tpl['efficiency'] < 1) ? ' / '.$form->textwithpicto($this->tpl['efficiency'], $langs->trans("ValueOfMeansLoss")).' = '.$qtytoconsumeforline : '').'</td>';
 // Unit
-print '<td class="right">'.measuringUnitString($this->tpl['fk_unit'], '', '', 1).'</td>';
+print '<td class="right">'.measuringUnitString($this->tpl['fk_unit'], '', null, 1).'</td>';
 // Stock
 print '<td class="center">';
 if ($tmpproduct->isStockManaged()) {
@@ -170,7 +170,7 @@ if ($resql) {
 		}
 
 		// Unit
-		print '<td class="linecolunit nowrap right" id="sub_bom_unit_'.$sub_bom_line->id.'">'.measuringUnitString($sub_bom_line->fk_unit, '', '', 1).'</td>';
+		print '<td class="linecolunit nowrap right" id="sub_bom_unit_'.$sub_bom_line->id.'">'.measuringUnitString($sub_bom_line->fk_unit, '', null, 1).'</td>';
 
 		// Stock réel
 		if ($sub_bom_product->stock_reel > 0) {
diff --git a/htdocs/product/admin/price_rules.php b/htdocs/product/admin/price_rules.php
index d5ad4f5df4a..64e20348446 100644
--- a/htdocs/product/admin/price_rules.php
+++ b/htdocs/product/admin/price_rules.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Copyright (C) 2015 Marcos García	<marcosgdf@gmail.com
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -93,12 +93,12 @@ if ($action == 'update') {
 		}
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_pricerules (level, fk_level, var_percent, var_min_percent) VALUES (";
-		$sql .= ((int) $i).", ".$db->escape($i_fk_level).", ".$i_var_percent.", ".$i_var_min_percent.")";
+		$sql .= ((int) $i).", ".((int) $i_fk_level).", ".$i_var_percent.", ".$i_var_min_percent.")";
 
 		if (!$db->query($sql)) {
 			//If we could not create, then we try updating
 			$sql = "UPDATE ".MAIN_DB_PREFIX."product_pricerules";
-			$sql .= " SET fk_level = ".$db->escape($i_fk_level).", var_percent = ".$i_var_percent.", var_min_percent = ".$i_var_min_percent." WHERE level = ".((int) $i);
+			$sql .= " SET fk_level = ".((int) $i_fk_level).", var_percent = ".$i_var_percent.", var_min_percent = ".$i_var_min_percent." WHERE level = ".((int) $i);
 
 			if (!$db->query($sql)) {
 				setEventMessages($langs->trans('ErrorSavingChanges'), null, 'errors');
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index fcb51f0e773..130b4bc1ce7 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -363,8 +363,8 @@ foreach ($dirproduct as $dirroot) {
 					print "</td>\n";
 				} else {
 					$disabled = false;
-					if (!(isModEnabled('multicompany') && ((is_object($mc) && !empty($mc->sharings['referent'])) && ($mc->sharings['referent'] == $conf->entity)))) {
-					}
+					// if (!(isModEnabled('multicompany') && ((is_object($mc) && !empty($mc->sharings['referent'])) && ($mc->sharings['referent'] == $conf->entity)))) {
+					// }
 					print '<td class="center">';
 					if (!$disabled) {
 						print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeproduct&token='.newToken().'&value='.urlencode($file).'">';
diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
index 7787a852f1c..caa131fd708 100644
--- a/htdocs/product/admin/product_tools.php
+++ b/htdocs/product/admin/product_tools.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2012	   Regis Houssin       <regis.houssin@inodbox.com>
  * Copyright (C) 2013-2015 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -150,7 +151,7 @@ if ($action == 'convert') {
 							$newlevel = $level;
 
 							//print "$objectstatic->id $newprice, $price_base_type, $newvat, $newminprice, $newlevel, $newnpr<br>\n";
-							$retm = $objectstatic->updatePrice($newprice, $price_base_type, $user, $newvatrateclean, $newminprice, $newlevel, $newnpr, 0, 0, $localtaxes_type, $newdefaultvatcode);
+							$retm = $objectstatic->updatePrice((float) $newprice, $price_base_type, $user, (float) $newvatrateclean, $newminprice, $newlevel, $newnpr, 0, 0, $localtaxes_type, $newdefaultvatcode);
 							if ($retm < 0) {
 								$error++;
 								break;
@@ -180,7 +181,7 @@ if ($action == 'convert') {
 						$newlevel = 0;
 						if (!empty($price_base_type) && !$updatelevel1) {
 							//print "$objectstatic->id $newprice, $price_base_type, $newvat, $newminprice, $newlevel, $newnpr<br>\n";
-							$ret = $objectstatic->updatePrice($newprice, $price_base_type, $user, $newvatrateclean, $newminprice, $newlevel, $newnpr, 0, 0, $localtaxes_type, $newdefaultvatcode);
+							$ret = $objectstatic->updatePrice((float) $newprice, $price_base_type, $user, (float) $newvatrateclean, $newminprice, $newlevel, $newnpr, 0, 0, $localtaxes_type, $newdefaultvatcode);
 						}
 
 						if ($ret < 0 || $retm < 0) {
@@ -236,8 +237,8 @@ if ($action == 'convert') {
 					//}
 					//else
 					//{
-						$newprice = price2num($obj->price, 'MU'); // Second param must be MU (we want a unit price so 'MU'. If unit price was on 4 decimal, we must keep 4 decimals)
-						//$newminprice=$objectstatic2->fourn_price_min;
+					$newprice = price2num($obj->price, 'MU'); // Second param must be MU (we want a unit price so 'MU'. If unit price was on 4 decimal, we must keep 4 decimals)
+					//$newminprice=$objectstatic2->fourn_price_min;
 					//}
 					//if ($newminprice > $newprice) $newminprice=$newprice;
 					$newvat = str_replace('*', '', $newvatrate);
@@ -254,7 +255,7 @@ if ($action == 'convert') {
 					if (!empty($price_base_type) && !$updatelevel1) {
 						//print "$objectstatic2->id $newprice, $price_base_type, $newvat, $newminprice, $newlevel, $newnpr<br>\n";
 						$fourn->id = $obj->fk_soc;
-						$ret = $objectstatic2->update_buyprice($obj->qty, $newprice, $user, $price_base_type, $fourn, $obj->fk_availability, $obj->ref_fourn, $newvat, '', $newpercent, 0, $newnpr, $newdeliverydelay, $newsupplierreputation, $localtaxes_type, $newdefaultvatcode);
+						$ret = $objectstatic2->update_buyprice($obj->qty, (float) $newprice, $user, $price_base_type, $fourn, $obj->fk_availability, $obj->ref_fourn, (float) $newvat, '', $newpercent, 0, $newnpr, $newdeliverydelay, $newsupplierreputation, $localtaxes_type, $newdefaultvatcode);
 					}
 
 					if ($ret < 0 || $retm < 0) {
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index a0337a75a49..274de7cce07 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2020      Josep Lluís Amador   <joseplluis@lliuretic.cat>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -68,7 +69,7 @@ $finished = GETPOSTINT('finished');
 $alsoproductwithnosupplierprice = GETPOSTINT('alsoproductwithnosupplierprice');
 $warehouseStatus = GETPOST('warehousestatus', 'alpha');
 $hidepriceinlabel = GETPOSTINT('hidepriceinlabel');
-$warehouseId = GETPOST('warehouseid', 'int');
+$warehouseId = GETPOSTINT('warehouseid');
 
 // Security check
 restrictedArea($user, 'produit|service|commande|propal|facture', 0, 'product&product');
@@ -214,7 +215,7 @@ if ($action == 'fetch' && !empty($id)) {
 
 			$prodcustprice = new ProductCustomerPrice($db);
 
-			$filter = array('t.fk_product' => $object->id, 't.fk_soc' => $socid);
+			$filter = array('t.fk_product' => (string) $object->id, 't.fk_soc' => (string) $socid);
 
 			$result = $prodcustprice->fetchAll('', '', 0, 0, $filter);
 			if ($result) {
@@ -252,7 +253,7 @@ if ($action == 'fetch' && !empty($id)) {
 			$tmpvatwithcode = get_default_tva($mysoc, $thirdparty_buyer, $id, 0);
 
 			if (!is_numeric($tmpvatwithcode) || $tmpvatwithcode != -1) {
-				$reg =array();
+				$reg = array();
 				if (preg_match('/(.+)\s\((.+)\)/', $tmpvatwithcode, $reg)) {
 					$outtva_tx = price2num($reg[1]);
 					$outtva_tx_formated = price($outtva_tx);
@@ -286,7 +287,7 @@ if ($action == 'fetch' && !empty($id)) {
 			'qty' => $outqty,
 			'discount' => $outdiscount,
 			'mandatory_period' => $mandatory_period,
-			'array_options'=>$object->array_options
+			'array_options' => $object->array_options
 		);
 	}
 
@@ -325,7 +326,7 @@ if ($action == 'fetch' && !empty($id)) {
 
 	$arrayresult = [];
 	if (empty($mode) || $mode == 1) {  // mode=1: customer
-		$arrayresult = $form->select_produits_list("", $htmlname, $type, getDolGlobalInt('PRODUIT_LIMIT_SIZE', 1000), $price_level, $searchkey, $status, $finished, $outjson, $socid, '1', 0, '', $hidepriceinlabel, $warehouseStatus, $status_purchase, $warehouseId);
+		$arrayresult = $form->select_produits_list(0, $htmlname, $type, getDolGlobalInt('PRODUIT_LIMIT_SIZE', 1000), $price_level, $searchkey, $status, $finished, $outjson, $socid, '1', 0, '', $hidepriceinlabel, $warehouseStatus, $status_purchase, $warehouseId);
 	} elseif ($mode == 2) {            // mode=2: supplier
 		$arrayresult = $form->select_produits_fournisseurs_list($socid, "", $htmlname, $type, "", $searchkey, $status, $outjson, getDolGlobalInt('PRODUIT_LIMIT_SIZE', 1000), $alsoproductwithnosupplierprice);
 	}
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index 4ed003ed06f..4f0b4cbe4bd 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2010-2018 Regis Houssin  <regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -245,23 +245,23 @@ class ActionsCardProduct
 
 			// Finished
 			$statutarray = array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
-			$this->tpl['finished'] = $form->selectarray('finished', $statutarray, $this->object->finished);
+			$this->tpl['finished'] = $form->selectarray('finished', $statutarray, (int) $this->object->finished);
 
 			// Weight
 			$this->tpl['weight'] = $this->object->weight;
-			$this->tpl['weight_units'] = $formproduct->selectMeasuringUnits("weight_units", "weight", $this->object->weight_units, 0, 2);
+			$this->tpl['weight_units'] = $formproduct->selectMeasuringUnits("weight_units", "weight", (string) $this->object->weight_units, 0, 2);
 
 			// Length
 			$this->tpl['length'] = $this->object->length;
-			$this->tpl['length_units'] = $formproduct->selectMeasuringUnits("length_units", "size", $this->object->length_units, 0, 2);
+			$this->tpl['length_units'] = $formproduct->selectMeasuringUnits("length_units", "size", (string) $this->object->length_units, 0, 2);
 
 			// Surface
 			$this->tpl['surface'] = $this->object->surface;
-			$this->tpl['surface_units'] = $formproduct->selectMeasuringUnits("surface_units", "surface", $this->object->surface_units, 0, 2);
+			$this->tpl['surface_units'] = $formproduct->selectMeasuringUnits("surface_units", "surface", (string) $this->object->surface_units, 0, 2);
 
 			// Volume
 			$this->tpl['volume'] = $this->object->volume;
-			$this->tpl['volume_units'] = $formproduct->selectMeasuringUnits("volume_units", "volume", $this->object->volume_units, 0, 2);
+			$this->tpl['volume_units'] = $formproduct->selectMeasuringUnits("volume_units", "volume", (string) $this->object->volume_units, 0, 2);
 		}
 
 		if ($action == 'view') {
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index deff2ccba3b..f685f012a5b 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -161,7 +161,7 @@ $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 if ($id > 0 || !empty($ref)) {
-	$result = $object->fetch($id, $ref);
+	$result = $object->fetch($id, (string) $ref);
 	if ($result < 0) {
 		dol_print_error($db, $object->error, $object->errors);
 	}
@@ -634,7 +634,7 @@ if (empty($reshook)) {
 			$object->desiredstock          = GETPOST('desiredstock') ? GETPOST('desiredstock') : 0;
 			$object->canvas             	 = GETPOST('canvas');
 			$object->net_measure           = GETPOST('net_measure');
-			$object->net_measure_units     = GETPOST('net_measure_units'); // This is not the fk_unit but the power of unit
+			$object->net_measure_units      = GETPOST('net_measure_units') === '' ? null : GETPOSTINT('net_measure_units'); // This is not the fk_unit but the power of unit
 			$object->weight             	 = GETPOST('weight');
 			$object->weight_units       	 = GETPOST('weight_units'); // This is not the fk_unit but the power of unit
 			$object->length             	 = GETPOST('size');
@@ -812,7 +812,7 @@ if (empty($reshook)) {
 
 				$object->canvas                 = GETPOST('canvas');
 				$object->net_measure            = GETPOST('net_measure');
-				$object->net_measure_units      = GETPOST('net_measure_units'); // This is not the fk_unit but the power of unit
+				$object->net_measure_units      = GETPOST('net_measure_units') === '' ? null : GETPOSTINT('net_measure_units'); // This is not the fk_unit but the power of unit
 				$object->weight                 = GETPOST('weight');
 				$object->weight_units           = GETPOST('weight_units'); // This is not the fk_unit but the power of unit
 				$object->length                 = GETPOST('size');
@@ -1090,27 +1090,27 @@ if (empty($reshook)) {
 		$commande = null;
 
 		// Get object and test permission
-		if (GETPOST('propalid') > 0) {
+		if (GETPOSTINT('propalid') > 0) {
 			$propal = new Propal($db);
-			$result = $propal->fetch(GETPOST('propalid'));
+			$result = $propal->fetch(GETPOSTINT('propalid'));
 			if ($result <= 0) {
 				dol_print_error($db, $propal->error);
 				exit;
 			}
 			$thirdpartyid = $propal->socid;
 			$permissiontoaddline = $user->hasRight('propal', 'creer');
-		} elseif (GETPOST('commandeid') > 0) {
+		} elseif (GETPOSTINT('commandeid') > 0) {
 			$commande = new Commande($db);
-			$result = $commande->fetch(GETPOST('commandeid'));
+			$result = $commande->fetch(GETPOSTINT('commandeid'));
 			if ($result <= 0) {
 				dol_print_error($db, $commande->error);
 				exit;
 			}
 			$thirdpartyid = $commande->socid;
 			$permissiontoaddline = $user->hasRight('commande', 'creer');
-		} elseif (GETPOST('factureid') > 0) {
+		} elseif (GETPOSTINT('factureid') > 0) {
 			$facture = new Facture($db);
-			$result = $facture->fetch(GETPOST('factureid'));
+			$result = $facture->fetch(GETPOSTINT('factureid'));
 			if ($result <= 0) {
 				dol_print_error($db, $facture->error);
 				exit;
@@ -1151,7 +1151,7 @@ if (empty($reshook)) {
 
 				$prodcustprice = new ProductCustomerPrice($db);
 
-				$filter = array('t.fk_product' => $object->id, 't.fk_soc' => $soc->id);
+				$filter = array('t.fk_product' => (string) $object->id, 't.fk_soc' => (string) $soc->id);
 
 				$result = $prodcustprice->fetchAll('', '', 0, 0, $filter);
 				if ($result) {
@@ -1165,7 +1165,7 @@ if (empty($reshook)) {
 			}
 
 			$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
-			$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
+			$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $object->tva_tx));
 
 			// On reevalue prix selon taux tva car taux tva transaction peut etre different
 			// de ceux du produit par default (par example si pays different entre vendeur et acheteur).
@@ -1177,10 +1177,10 @@ if (empty($reshook)) {
 				}
 			}
 
-			if (GETPOST('propalid') > 0 && $permissiontoaddline && is_object($propal)) {
+			if (GETPOSTINT('propalid') > 0 && $permissiontoaddline && is_object($propal)) {
 				// Define cost price for margin calculation
 				$buyprice = 0;
-				if (($result = $propal->defineBuyPrice($pu_ht, price2num(GETPOST('remise_percent'), '', 2), $object->id)) < 0) {
+				if (($result = $propal->defineBuyPrice($pu_ht, (float) price2num(GETPOST('remise_percent'), '', 2), $object->id)) < 0) {
 					dol_syslog($langs->trans('FailedToGetCostPrice'));
 					setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
 				} else {
@@ -1190,12 +1190,12 @@ if (empty($reshook)) {
 				$result = $propal->addline(
 					$desc,
 					$pu_ht,
-					price2num(GETPOST('qty'), 'MS'),
+					(float) price2num(GETPOST('qty'), 'MS'),
 					$tva_tx,
 					$localtax1_tx, // localtax1
 					$localtax2_tx, // localtax2
 					$object->id,
-					price2num(GETPOST('remise_percent'), '', 2),
+					(float) price2num(GETPOST('remise_percent'), '', 2),
 					$price_base_type,
 					$pu_ttc,
 					0,
@@ -1220,7 +1220,7 @@ if (empty($reshook)) {
 			} elseif (GETPOST('commandeid') > 0 && $permissiontoaddline && is_object($commande)) {
 				// Define cost price for margin calculation
 				$buyprice = 0;
-				if (($result = $commande->defineBuyPrice($pu_ht, price2num(GETPOST('remise_percent'), '', 2), $object->id)) < 0) {
+				if (($result = $commande->defineBuyPrice($pu_ht, (float) price2num(GETPOST('remise_percent'), '', 2), $object->id)) < 0) {
 					dol_syslog($langs->trans('FailedToGetCostPrice'));
 					setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
 				} else {
@@ -1229,13 +1229,13 @@ if (empty($reshook)) {
 
 				$result = $commande->addline(
 					$desc,
-					$pu_ht,
-					price2num(GETPOST('qty'), 'MS'),
+					(float) $pu_ht,
+					(float) price2num(GETPOST('qty'), 'MS'),
 					$tva_tx,
 					$localtax1_tx, // localtax1
 					$localtax2_tx, // localtax2
 					$object->id,
-					price2num(GETPOST('remise_percent'), '', 2),
+					(float) price2num(GETPOST('remise_percent'), '', 2),
 					0,
 					0,
 					$price_base_type,
@@ -1262,7 +1262,7 @@ if (empty($reshook)) {
 			} elseif (GETPOST('factureid') > 0 && $permissiontoaddline && is_object($facture)) {
 				// Define cost price for margin calculation
 				$buyprice = 0;
-				if (($result = $facture->defineBuyPrice($pu_ht, price2num(GETPOST('remise_percent'), '', 2), $object->id)) < 0) {
+				if (($result = $facture->defineBuyPrice($pu_ht, (float) price2num(GETPOST('remise_percent'), '', 2), $object->id)) < 0) {
 					dol_syslog($langs->trans('FailedToGetCostPrice'));
 					setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
 				} else {
@@ -1271,13 +1271,13 @@ if (empty($reshook)) {
 
 				$result = $facture->addline(
 					$desc,
-					$pu_ht,
-					price2num(GETPOST('qty'), 'MS'),
+					(float) $pu_ht,
+					(float) price2num(GETPOST('qty'), 'MS'),
 					$tva_tx,
 					$localtax1_tx,
 					$localtax2_tx,
 					$object->id,
-					price2num(GETPOST('remise_percent'), '', 2),
+					(float) price2num(GETPOST('remise_percent'), '', 2),
 					'',
 					'',
 					0,
@@ -1666,7 +1666,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				if (!getDolGlobalString('PRODUCT_DISABLE_NATURE')) {
 					// Nature
 					print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
-					print $formproduct->selectProductNature('finished', $object->finished);
+					print $formproduct->selectProductNature('finished', (string) $object->finished);
 					print '</td></tr>';
 				}
 			}
@@ -1845,7 +1845,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					} else {
 						$accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell') ? GETPOST('accountancy_code_sell', 'alpha') : getDolGlobalString("ACCOUNTING_SERVICE_SOLD_ACCOUNT"));
 					}
-					print $formaccounting->select_account($accountancy_code_sell, 'accountancy_code_sell', 1, array(), 1, 1, 'minwidth150 maxwidth300', 1);
+					print $formaccounting->select_account($accountancy_code_sell, 'accountancy_code_sell', 1, array(), 1, 1, 'minwidth150 maxwidth300', '1');
 					print '</td></tr>';
 
 					// Accountancy_code_sell_intra
@@ -1857,7 +1857,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 						} else {
 							$accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra') ? GETPOST('accountancy_code_sell_intra', 'alpha') : getDolGlobalString("ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT"));
 						}
-						print $formaccounting->select_account($accountancy_code_sell_intra, 'accountancy_code_sell_intra', 1, array(), 1, 1, 'minwidth150 maxwidth300', 1);
+						print $formaccounting->select_account($accountancy_code_sell_intra, 'accountancy_code_sell_intra', 1, array(), 1, 1, 'minwidth150 maxwidth300', '1');
 						print '</td></tr>';
 					}
 
@@ -1869,7 +1869,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					} else {
 						$accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export') ? GETPOST('accountancy_code_sell_export', 'alpha') : getDolGlobalString("ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT"));
 					}
-					print $formaccounting->select_account($accountancy_code_sell_export, 'accountancy_code_sell_export', 1, array(), 1, 1, 'minwidth150 maxwidth300', 1);
+					print $formaccounting->select_account($accountancy_code_sell_export, 'accountancy_code_sell_export', 1, array(), 1, 1, 'minwidth150 maxwidth300', '1');
 					print '</td></tr>';
 
 					// Accountancy_code_buy
@@ -1880,7 +1880,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					} else {
 						$accountancy_code_buy = (GETPOST('accountancy_code_buy', 'alpha') ? (GETPOST('accountancy_code_buy', 'alpha')) : getDolGlobalString("ACCOUNTING_SERVICE_BUY_ACCOUNT"));
 					}
-					print $formaccounting->select_account($accountancy_code_buy, 'accountancy_code_buy', 1, array(), 1, 1, 'minwidth150 maxwidth300', 1);
+					print $formaccounting->select_account($accountancy_code_buy, 'accountancy_code_buy', 1, array(), 1, 1, 'minwidth150 maxwidth300', '1');
 					print '</td></tr>';
 
 					// Accountancy_code_buy_intra
@@ -1892,7 +1892,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 						} else {
 							$accountancy_code_buy_intra = (GETPOSTISSET('accountancy_code_buy_intra') ? GETPOST('accountancy_code_buy_intra', 'alpha') : getDolGlobalString("ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT"));
 						}
-						print $formaccounting->select_account($accountancy_code_buy_intra, 'accountancy_code_buy_intra', 1, array(), 1, 1, 'minwidth150 maxwidth300', 1);
+						print $formaccounting->select_account($accountancy_code_buy_intra, 'accountancy_code_buy_intra', 1, array(), 1, 1, 'minwidth150 maxwidth300', '1');
 						print '</td></tr>';
 					}
 
@@ -1904,7 +1904,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					} else {
 						$accountancy_code_buy_export = (GETPOST('accountancy_code_buy_export') ? GETPOST('accountancy_code_buy_export', 'alpha') : getDolGlobalString("ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT"));
 					}
-					print $formaccounting->select_account($accountancy_code_buy_export, 'accountancy_code_buy_export', 1, array(), 1, 1, 'minwidth150 maxwidth300', 1);
+					print $formaccounting->select_account($accountancy_code_buy_export, 'accountancy_code_buy_export', 1, array(), 1, 1, 'minwidth150 maxwidth300', '1');
 					print '</td></tr>';
 				} else {// For external software
 					if (!empty($accountancy_code_sell)) {
@@ -2360,7 +2360,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					print '<tr><td>'.$langs->trans("CountryOrigin").'</td>';
 					print '<td>';
 					print img_picto('', 'globe-americas', 'class="paddingrightonly"');
-					print $form->select_country(GETPOSTISSET('country_id') ? GETPOSTINT('country_id') : $object->country_id, 'country_id', '', 0, 'minwidth100 maxwidthonsmartphone');
+					print $form->select_country((string) (GETPOSTISSET('country_id') ? GETPOSTINT('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth100 maxwidthonsmartphone');
 					if ($user->admin) {
 						print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 					}
@@ -2559,7 +2559,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				if (isModEnabled("product") && isModEnabled("service")) {
 					$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 					print '<tr><td class="titlefield">';
-					print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
+					print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', (string) $object->type, $object, (int) $usercancreate, $typeformat) : $langs->trans('Type');
 					print '</td><td>';
 					print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat);
 					print '</td></tr>';
@@ -2605,7 +2605,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					if ($action == 'editbarcode') {
 						$tmpcode = GETPOSTISSET('barcode') ? GETPOST('barcode') : $object->barcode;
 						if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) {
-							$tmpcode = $modBarCodeProduct->getNextValue($object, $fk_barcode_type);
+							$tmpcode = $modBarCodeProduct->getNextValue($object, (string) $fk_barcode_type);
 						}
 
 						print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
@@ -2900,7 +2900,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 						// Net Measure
 						print '<tr><td class="titlefieldmiddle">'.$langs->trans("NetMeasure").'</td><td>';
 						if ($object->net_measure != '') {
-							print $object->net_measure." ".measuringUnitString($object->net_measure_units);
+							print $object->net_measure." ".measuringUnitString((int) $object->net_measure_units);
 						} else {
 							print '&nbsp;';
 						}
@@ -3212,7 +3212,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete') {
 	$genallowed = $usercanread;
 	$delallowed = $usercancreate;
 
-	print $formfile->showdocuments($modulepart, $object->ref, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $langs->getDefaultLang(), '', $object);
+	print $formfile->showdocuments($modulepart, $object->ref, $filedir, $urlsource, (int) $genallowed, (int) $delallowed, '', 0, 0, 0, 28, 0, '', '', '', $langs->getDefaultLang(), '', $object);
 	$somethingshown = $formfile->numoffiles;
 
 	print '</div><div class="fichehalfright">';
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 50efd47aee2..d3aeeb8d17d 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2008-2009  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2015-2017  Francis Appels          <francis.appels@yahoo.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -292,7 +292,7 @@ class FormProduct
 	 *	@param	array<array{method:string,url:string,htmlname:string,params:array<string,string>}>	$events		Events to add to select2
 	 *  @param  string      $morecss            Add more css classes to HTML select
 	 *  @param	int[]	    $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  int<0,1>    $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 (only warehouse with stock > stockMin are loaded) or false not not filter by minimum stock
 	 *  @param  string      $orderBy            [='e.ref'] Order by
 	 *  @param	int<0,1>	$multiselect		1=Allow multiselect
@@ -307,7 +307,7 @@ class FormProduct
 		dol_syslog(get_class($this)."::selectWarehouses " . (is_array($selected) ? 'selected is array' : $selected) . ", $htmlname, $filterstatus, $empty, $disabled, $fk_product, $empty_label, $showstock, $forcecombo, $morecss", LOG_DEBUG);
 
 		$out = '';
-		if ((!getDolGlobalString('ENTREPOT_EXTRA_STATUS')) && ($filterstatus==="warehouseinternal")) {
+		if ((!getDolGlobalString('ENTREPOT_EXTRA_STATUS')) && ($filterstatus === "warehouseinternal")) {
 			$filterstatus = '';
 		}
 		if (!empty($fk_product) && $fk_product > 0) {
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 807acd3ce95..b406d67b761 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -246,7 +246,7 @@ class Product extends CommonObject
 	public $level;
 
 	/**
-	 * @var ?array<string,array{label:string,description:string,note?:string}>	Array for multilangs
+	 * @var ?array<string,array{label:string,description:string,note?:string,other?:string}>	Array for multilangs
 	 */
 	public $multilangs = array();
 
@@ -509,7 +509,7 @@ class Product extends CommonObject
 	public $weight;
 
 	/**
-	 * @var int|string
+	 * @var ?int
 	 */
 	public $weight_units;	// scale -3, 0, 3, 6
 	/**
@@ -517,7 +517,7 @@ class Product extends CommonObject
 	 */
 	public $length;
 	/**
-	 * @var int|string
+	 * @var ?int
 	 */
 	public $length_units;	// scale -3, 0, 3, 6
 	/**
@@ -525,7 +525,7 @@ class Product extends CommonObject
 	 */
 	public $width;
 	/**
-	 * @var int|string
+	 * @var ?int
 	 */
 	public $width_units;	// scale -3, 0, 3, 6
 	/**
@@ -533,7 +533,7 @@ class Product extends CommonObject
 	 */
 	public $height;
 	/**
-	 * @var int|string|null
+	 * @var ?int
 	 */
 	public $height_units;	// scale -3, 0, 3, 6
 	/**
@@ -541,7 +541,7 @@ class Product extends CommonObject
 	 */
 	public $surface;
 	/**
-	 * @var int|string|null
+	 * @var ?int
 	 */
 	public $surface_units;	// scale -3, 0, 3, 6
 	/**
@@ -549,7 +549,7 @@ class Product extends CommonObject
 	 */
 	public $volume;
 	/**
-	 * @var int|string|null
+	 * @var ?int
 	 */
 	public $volume_units;	// scale -3, 0, 3, 6
 
@@ -558,7 +558,7 @@ class Product extends CommonObject
 	 */
 	public $net_measure;
 	/**
-	 * @var ?string
+	 * @var ?int
 	 */
 	public $net_measure_units;	// scale -3, 0, 3, 6
 
@@ -1151,7 +1151,7 @@ class Product extends CommonObject
 					$sql .= ", ".((empty($this->sell_or_eat_by_mandatory) || $this->sell_or_eat_by_mandatory < 0) ? 0 : ((int) $this->sell_or_eat_by_mandatory));
 					$sql .= ", '".$this->db->escape($this->batch_mask)."'";
 					$sql .= ", ".($this->fk_unit > 0 ? ((int) $this->fk_unit) : 'NULL');
-					$sql .= ", '".$this->db->escape($this->mandatory_period)."'";
+					$sql .= ", '".$this->db->escape((string) $this->mandatory_period)."'";
 					$sql .= ")";
 
 					dol_syslog(get_class($this)."::Create", LOG_DEBUG);
@@ -1368,19 +1368,19 @@ class Product extends CommonObject
 		$this->note_private = (isset($this->note_private) ? trim($this->note_private) : null);
 		$this->note_public = (isset($this->note_public) ? trim($this->note_public) : null);
 		$this->net_measure = price2num($this->net_measure);
-		$this->net_measure_units = (is_null($this->net_measure_units) ? '' : trim((string) $this->net_measure_units));
+		$this->net_measure_units = (!is_numeric($this->net_measure_units) ? null : (int) $this->net_measure_units);
 		$this->weight = price2num($this->weight);
-		$this->weight_units = (is_null($this->weight_units) ? '' : trim((string) $this->weight_units));
+		$this->weight_units = (!is_numeric($this->weight_units) ? null : (int) $this->weight_units);
 		$this->length = price2num($this->length);
-		$this->length_units = (is_null($this->length_units) ? '' : trim((string) $this->length_units));
+		$this->length_units = (!is_numeric($this->length_units) ? null : (int) $this->length_units);
 		$this->width = price2num($this->width);
-		$this->width_units = (is_null($this->width_units) ? '' : trim((string) $this->width_units));
+		$this->width_units = (!is_numeric($this->width_units) ? null : (int) $this->width_units);
 		$this->height = price2num($this->height);
-		$this->height_units = (is_null($this->height_units) ? '' : trim((string) $this->height_units));
+		$this->height_units = (!is_numeric($this->height_units) ? null : (int) $this->height_units);
 		$this->surface = price2num($this->surface);
-		$this->surface_units = (is_null($this->surface_units) ? '' : trim((string) $this->surface_units));
+		$this->surface_units = (!is_numeric($this->surface_units) ? null : (int) $this->surface_units);
 		$this->volume = price2num($this->volume);
-		$this->volume_units = (is_null($this->volume_units) ? '' : trim((string) $this->volume_units));
+		$this->volume_units = (!is_numeric($this->volume_units) ? null : (int) $this->volume_units);
 
 		// set unit not defined
 		if (is_numeric($this->length_units)) {
@@ -1511,7 +1511,7 @@ class Product extends CommonObject
 								$ObjLot->entity = $this->entity;
 								$ObjLot->fk_user_creat = $user->id;
 								$ObjLot->batch = $valueforundefinedlot;
-								if ($ObjLot->create($user, true) < 0) {
+								if ($ObjLot->create($user, 1) < 0) {
 									$error++;
 									$this->errors = $ObjLot->errors;
 								}
@@ -1544,7 +1544,7 @@ class Product extends CommonObject
 			$sql .= ", localtax2_type = ".($this->localtax2_type != '' ? "'".$this->db->escape($this->localtax2_type)."'" : "'0'");
 
 			$sql .= ", barcode = ".(empty($this->barcode) ? "null" : "'".$this->db->escape($this->barcode)."'");
-			$sql .= ", fk_barcode_type = ".(empty($this->barcode_type) ? "null" : $this->db->escape($this->barcode_type));
+			$sql .= ", fk_barcode_type = ".(empty($this->barcode_type) ? "null" : $this->db->escape((string) $this->barcode_type));
 
 			$sql .= ", tosell = ".(int) $this->status;
 			$sql .= ", tobuy = ".(int) $this->status_buy;
@@ -1555,19 +1555,19 @@ class Product extends CommonObject
 			$sql .= ", finished = ".((!isset($this->finished) || $this->finished < 0 || $this->finished === '') ? "null" : (int) $this->finished);
 			$sql .= ", fk_default_bom = ".((!isset($this->fk_default_bom) || $this->fk_default_bom < 0 || $this->fk_default_bom == '') ? "null" : (int) $this->fk_default_bom);
 			$sql .= ", net_measure = ".($this->net_measure != '' ? "'".$this->db->escape($this->net_measure)."'" : 'null');
-			$sql .= ", net_measure_units = ".($this->net_measure_units != '' ? "'".$this->db->escape($this->net_measure_units)."'" : 'null');
+			$sql .= ", net_measure_units = ".((string) $this->net_measure_units != '' ? ((int) $this->net_measure_units) : 'null');
 			$sql .= ", weight = ".($this->weight != '' ? "'".$this->db->escape($this->weight)."'" : 'null');
-			$sql .= ", weight_units = ".($this->weight_units != '' ? "'".$this->db->escape($this->weight_units)."'" : 'null');
+			$sql .= ", weight_units = ".((string) $this->weight_units != '' ? ((int) $this->weight_units) : 'null');
 			$sql .= ", length = ".($this->length != '' ? "'".$this->db->escape($this->length)."'" : 'null');
-			$sql .= ", length_units = ".($this->length_units != '' ? "'".$this->db->escape($this->length_units)."'" : 'null');
+			$sql .= ", length_units = ".((string) $this->length_units != '' ? ((int) $this->length_units) : 'null');
 			$sql .= ", width= ".($this->width != '' ? "'".$this->db->escape($this->width)."'" : 'null');
-			$sql .= ", width_units = ".($this->width_units != '' ? "'".$this->db->escape($this->width_units)."'" : 'null');
+			$sql .= ", width_units = ".((string) $this->width_units != '' ? ((int) $this->width_units) : 'null');
 			$sql .= ", height = ".($this->height != '' ? "'".$this->db->escape($this->height)."'" : 'null');
-			$sql .= ", height_units = ".($this->height_units != '' ? "'".$this->db->escape($this->height_units)."'" : 'null');
+			$sql .= ", height_units = ".((string) $this->height_units != '' ? ((int) $this->height_units) : 'null');
 			$sql .= ", surface = ".($this->surface != '' ? "'".$this->db->escape($this->surface)."'" : 'null');
-			$sql .= ", surface_units = ".($this->surface_units != '' ? "'".$this->db->escape($this->surface_units)."'" : 'null');
+			$sql .= ", surface_units = ".((string) $this->surface_units != '' ? ((int) $this->surface_units) : 'null');
 			$sql .= ", volume = ".($this->volume != '' ? "'".$this->db->escape($this->volume)."'" : 'null');
-			$sql .= ", volume_units = ".($this->volume_units != '' ? "'".$this->db->escape($this->volume_units)."'" : 'null');
+			$sql .= ", volume_units = ".((string) $this->volume_units != '' ? ((int) $this->volume_units) : 'null');
 			$sql .= ", fk_default_warehouse = ".($this->fk_default_warehouse > 0 ? ((int) $this->fk_default_warehouse) : 'null');
 			$sql .= ", fk_default_workstation = ".($this->fk_default_workstation > 0 ? ((int) $this->fk_default_workstation) : 'null');
 			$sql .= ", seuil_stock_alerte = ".((isset($this->seuil_stock_alerte) && is_numeric($this->seuil_stock_alerte)) ? (float) $this->seuil_stock_alerte : 'null');
@@ -2346,7 +2346,7 @@ class Product extends CommonObject
 
 			$prodcustprice = new ProductCustomerPrice($this->db);
 
-			$filter = array('t.fk_product' => $this->id, 't.fk_soc' => $thirdparty_buyer->id);
+			$filter = array('t.fk_product' => (string) $this->id, 't.fk_soc' => (string) $thirdparty_buyer->id);
 
 			// If a price per customer exist
 			$pricebycustomerexist = false;
@@ -2409,7 +2409,7 @@ class Product extends CommonObject
 
 			$prodcustprice = new ProductCustomerPrice($this->db);
 
-			$filter = array('t.fk_product' => $this->id, 't.fk_soc' => $thirdparty_buyer->id);
+			$filter = array('t.fk_product' => (string) $this->id, 't.fk_soc' => (string) $thirdparty_buyer->id);
 
 			$result = $prodcustprice->fetchAll('', '', 0, 0, $filter);
 			if ($result) {
@@ -2783,7 +2783,7 @@ class Product extends CommonObject
 			$sql .= " default_vat_code = ".($newdefaultvatcode ? "'".$this->db->escape($newdefaultvatcode)."'" : "null").",";
 			$sql .= " price_label = ".(!empty($price_label) ? "'".$this->db->escape($price_label)."'" : "null").",";
 			$sql .= " tva_tx = ".(float) price2num($newvat).",";
-			$sql .= " recuperableonly = '".$this->db->escape($newnpr)."'";
+			$sql .= " recuperableonly = '".$this->db->escape((string) $newnpr)."'";
 			$sql .= " WHERE rowid = ".((int) $id);
 
 			dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
@@ -3616,7 +3616,7 @@ class Product extends CommonObject
 				if (getDolGlobalString('DECREASE_ONLY_UNINVOICEDPRODUCTS')) {
 					// If option DECREASE_ONLY_UNINVOICEDPRODUCTS is on, we make a compensation but only if order not yet invoice.
 					$adeduire = 0;
-					$sql = "SELECT SUM(".$this->db->ifsql('f.type=2', -1, 1)." * fd.qty) as count FROM ".$this->db->prefix()."facturedet as fd ";
+					$sql = "SELECT SUM(".$this->db->ifsql('f.type=2', '-1', '1')." * fd.qty) as count FROM ".$this->db->prefix()."facturedet as fd ";
 					$sql .= " JOIN ".$this->db->prefix()."facture as f ON fd.fk_facture = f.rowid";
 					$sql .= " JOIN ".$this->db->prefix()."element_element as el ON ((el.fk_target = f.rowid AND el.targettype = 'facture' AND sourcetype = 'commande') OR (el.fk_source = f.rowid AND el.targettype = 'commande' AND sourcetype = 'facture'))";
 					$sql .= " JOIN ".$this->db->prefix()."commande as c ON el.fk_source = c.rowid";
@@ -3638,7 +3638,7 @@ class Product extends CommonObject
 
 					// For every order having invoice already validated we need to decrease stock cause it's in physical stock
 					$adeduire = 0;
-					$sql = "SELECT sum(".$this->db->ifsql('f.type=2', -1, 1)." * fd.qty) as count FROM ".MAIN_DB_PREFIX."facturedet as fd ";
+					$sql = "SELECT sum(".$this->db->ifsql('f.type=2', '-1', '1')." * fd.qty) as count FROM ".MAIN_DB_PREFIX."facturedet as fd ";
 					$sql .= " JOIN ".MAIN_DB_PREFIX."facture as f ON fd.fk_facture = f.rowid";
 					$sql .= " JOIN ".MAIN_DB_PREFIX."element_element as el ON ((el.fk_target = f.rowid AND el.targettype = 'facture' AND sourcetype = 'commande') OR (el.fk_source = f.rowid AND el.targettype = 'commande' AND sourcetype = 'facture'))";
 					$sql .= " JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid";
@@ -5342,7 +5342,7 @@ class Product extends CommonObject
 	 * @param  int    $multiply   			Because each sublevel must be multiplicated by parent nb
 	 * @param  int    $level      			Init level
 	 * @param  int    $id_parent  			Id parent
-	 * @param  int    $ignore_stock_load 	Ignore stock load
+	 * @param  int<0,1> $ignore_stock_load 	Ignore stock load
 	 * @return void
 	 */
 	public function fetch_prod_arbo($prod, $compl_path = '', $multiply = 1, $level = 1, $id_parent = 0, $ignore_stock_load = 0)
@@ -5350,6 +5350,11 @@ class Product extends CommonObject
 		// phpcs:enable
 		$tmpproduct = null;
 
+		if ($multiply < 1) {
+			dol_syslog(get_class($this).'::'.__FUNCTION__.' Product quantity rounded up to 1 from '.$multiply.'. May result in unexpected end quantity for product children of '.$id_parent, LOG_WARNING);
+			$multiply = 1;
+		}
+
 		//var_dump($prod);
 		foreach ($prod as $id_product => $desc_pere) {    // $id_product is 0 (first call starting with root top) or an id of a sub_product
 			if (is_array($desc_pere)) {    // If desc_pere is an array, this means it's a child
@@ -5359,10 +5364,6 @@ class Product extends CommonObject
 				$label = (!empty($desc_pere[3]) ? $desc_pere[3] : '');
 				$incdec = (!empty($desc_pere[4]) ? $desc_pere[4] : 0);
 
-				if ($multiply < 1) {
-					$multiply = 1;
-				}
-
 				//print "XXX We add id=".$id." - label=".$label." - nb=".$nb." - multiply=".$multiply." fullpath=".$compl_path.$label."\n";
 				if (is_null($tmpproduct)) {
 					$tmpproduct = new Product($this->db); // So we initialize tmpproduct only once for all loop.
@@ -5392,8 +5393,12 @@ class Product extends CommonObject
 
 				// Recursive call if there child has children of its own
 				if (isset($desc_pere['childs']) && is_array($desc_pere['childs'])) {
+					if (!is_int($desc_pere[1] * $multiply)) {
+						dol_syslog(get_class($this).'::'.__FUNCTION__.' Source product quantity and multiplier may result in unexpected end quantity for '.$label.'/'.$multiply.' Child product:'.json_encode($desc_pere), LOG_WARNING);
+					}
+
 					//print 'YYY We go down for '.$desc_pere[3]." -> \n";
-					$this->fetch_prod_arbo($desc_pere['childs'], $compl_path.$desc_pere[3]." -> ", $desc_pere[1] * $multiply, $level + 1, $id, $ignore_stock_load);
+					$this->fetch_prod_arbo($desc_pere['childs'], $compl_path.$desc_pere[3]." -> ", (int) ceil($desc_pere[1] * $multiply), $level + 1, $id, $ignore_stock_load);
 				}
 			}
 		}
@@ -5405,7 +5410,7 @@ class Product extends CommonObject
 	 *  this->sousprods must have been loaded by this->get_sousproduits_arbo()
 	 *
 	 * @param	int	$multiply			Because each sublevel must be multiplicated by parent nb
-	 * @param	int	$ignore_stock_load	Ignore stock load
+	 * @param	int<0,1>	$ignore_stock_load	Ignore stock load
 	 * @return	array<int,array{id:int,id_parent:int,ref:string,nb:int,nb_total:int,stock:float,stock_alert:float,label:string,fullpath:string,type:int,desiredstick:float,level:int,incdec:int<0,1>,entity:CommonObject}>	Array with tree
 	 */
 	public function get_arbo_each_prod($multiply = 1, $ignore_stock_load = 0)
@@ -5426,8 +5431,8 @@ class Product extends CommonObject
 	/**
 	 * Count all parent and children products for current product (first level only)
 	 *
-	 * @param	int		$mode	0=Both parent and child, -1=Parents only, 1=Children only
-	 * @return 	int            	Nb of father + child
+	 * @param	int<-1,1>		$mode	0=Both parent and child, -1=Parents only, 1=Children only
+	 * @return 	int				    	Nb of father + child
 	 * @see getFather(), get_sousproduits_arbo()
 	 */
 	public function hasFatherOrChild($mode = 0)
@@ -6075,6 +6080,8 @@ class Product extends CommonObject
 
 			include_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
+			// Ensure $nbpiece is a number and positive
+			$nbpiece = (float) $nbpiece;
 			if ($nbpiece < 0) {
 				if (!$movement) {
 					$movement = 1;
@@ -6082,11 +6089,11 @@ class Product extends CommonObject
 				$nbpiece = abs($nbpiece);
 			}
 			$op = array();
-			$op[0] = "+".trim((string) $nbpiece);
-			$op[1] = "-".trim((string) $nbpiece);
+			$op[0] = $nbpiece;
+			$op[1] = -$nbpiece;
 
 			$movementstock = new MouvementStock($this->db);
-			$movementstock->setOrigin($origin_element, $origin_id); // Set ->origin_type and ->origin_id
+			$movementstock->setOrigin($origin_element, (int) $origin_id); // Set ->origin_type and ->origin_id
 			$result = $movementstock->_create($user, $this->id, $id_entrepot, $op[$movement], $movement, $price, $label, $inventorycode, '', '', '', '', false, 0, $disablestockchangeforsubproduct);
 
 			if ($result >= 0) {
@@ -6138,6 +6145,8 @@ class Product extends CommonObject
 
 			include_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
+			// Ensure $nbpiece is a number and positive
+			$nbpiece = (float) $nbpiece;
 			if ($nbpiece < 0) {
 				if (!$movement) {
 					$movement = 1;
@@ -6146,11 +6155,11 @@ class Product extends CommonObject
 			}
 
 			$op = array();
-			$op[0] = "+".trim((string) $nbpiece);
-			$op[1] = "-".trim((string) $nbpiece);
+			$op[0] = $nbpiece;
+			$op[1] = -$nbpiece;
 
 			$movementstock = new MouvementStock($this->db);
-			$movementstock->setOrigin($origin_element, $origin_id); // Set ->origin_type and ->fk_origin
+			$movementstock->setOrigin($origin_element, (int) $origin_id); // Set ->origin_type and ->fk_origin
 			$result = $movementstock->_create($user, $this->id, $id_entrepot, $op[$movement], $movement, $price, $label, $inventorycode, '', $dlc, $dluo, $lot, false, 0, $disablestockchangeforsubproduct, 0, $force_update_batch);
 
 			if ($result >= 0) {
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 1eea94722db..0290dea17ba 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2022  Laurent Destaileur		<ely@users.sourceforge.net>
  * Copyright (C) 2014	    Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -686,11 +686,11 @@ print '</tr>';
 print '<tr class="oddeven">';
 // From warehouse
 print '<td class="nowraponall">';
-print img_picto($langs->trans("WarehouseSource"), 'stock', 'class="paddingright"').$formproduct->selectWarehouses($id_sw, 'id_sw', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200');
+print img_picto($langs->trans("WarehouseSource"), 'stock', 'class="paddingright"').$formproduct->selectWarehouses(is_null($id_sw) ? '' : $id_sw, 'id_sw', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200');
 print '</td>';
 // To warehouse
 print '<td class="nowraponall">';
-print img_picto($langs->trans("WarehouseTarget"), 'stock', 'class="paddingright"').$formproduct->selectWarehouses($id_tw, 'id_tw', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200');
+print img_picto($langs->trans("WarehouseTarget"), 'stock', 'class="paddingright"').$formproduct->selectWarehouses(is_null($id_sw) ? '' : $id_tw, 'id_tw', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200');
 print '</td>';
 // Product
 print '<td class="nowraponall">';
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index f827643d2ea..37a0f4a7af6 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2016		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016		Yasser Carreón			<yacasia@gmail.com>
  * Copyright (C) 2018	    Quentin Vial-Gouteyron  <quentin.vial-gouteyron@atm-consulting.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -999,7 +999,7 @@ if ($action == 'create') {
 			/**
 			 * @var array<string,int> $suffix2numAsked map HTTP query parameter suffixes (like '1_0') to line indices so that
 			 *                             extrafields from HTTP query can be assigned to the correct dispatch line
-			*/
+			 */
 			$suffix2numAsked = array();
 			$dispatchLines = array();
 
@@ -1648,7 +1648,7 @@ if ($action == 'create') {
 		if ($volumeUnit < 50) {
 			print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, getDolGlobalInt('MAIN_VOLUME_DEFAULT_ROUND', -1), getDolGlobalString("MAIN_VOLUME_DEFAULT_UNIT", 'no'));
 		} else {
-			print $calculatedVolume.' '.measuringUnitString(0, "volume", (string) $volumeUnit);
+			print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
 		}
 	}
 	if ($totalVolume > 0) {

From 7952e82a6fb27799b13309f1c7b9ee6a06859f53 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 8 Feb 2025 19:08:42 +0100
Subject: [PATCH 578/602] Update baseline

---
 dev/tools/phan/baseline.txt | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 3f0f9365f25..cfc989ba39a 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,7 +9,7 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 2300+ occurrences
+    // PhanTypeMismatchArgument : 2230+ occurrences
     // PhanUndeclaredProperty : 530+ occurrences
     // PhanTypeMismatchArgumentNullable : 430+ occurrences
     // PhanUndeclaredGlobalVariable : 190+ occurrences
@@ -593,16 +593,8 @@ return [
         'htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php' => ['PhanUndeclaredProperty'],
         'htdocs/partnership/partnership_card.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/partnership/partnership_list.php' => ['PhanUndeclaredProperty'],
-        'htdocs/product/admin/price_rules.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/admin/product.php' => ['PhanPluginEmptyStatementIf', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/product/admin/product_tools.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/ajax/products.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/product/canvas/product/actions_card_product.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
-        'htdocs/product/canvas/service/actions_card_service.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable'],
         'htdocs/product/class/api_products.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/product/class/html.formproduct.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/product/class/product.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/product/class/productcustomerprice.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/product/class/productfournisseurprice.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
         'htdocs/product/composition/card.php' => ['PhanTypeMismatchArgument'],

From 4168a16151677a265b728afaba2b293b13b50376 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 8 Feb 2025 19:51:31 +0100
Subject: [PATCH 579/602] Qual: Fix ifsql argument type

---
 dev/tools/phan/config_fixer.php       |   3 +-
 dev/tools/phan/plugins/ifsqlFixer.php | 177 ++++++++++++++++++++++++++
 htdocs/accountancy/customer/index.php |  11 +-
 htdocs/asset/class/asset.class.php    |   4 +-
 htdocs/contrat/index.php              |  12 +-
 htdocs/contrat/list.php               |  12 +-
 htdocs/core/lib/invoice.lib.php       |  38 ++++--
 htdocs/product/stats/contrat.php      |   9 +-
 htdocs/product/stats/mo.php           |   9 +-
 htdocs/product/stock/stats/mo.php     |   5 +-
 htdocs/projet/class/task.class.php    |   6 +-
 11 files changed, 240 insertions(+), 46 deletions(-)
 create mode 100644 dev/tools/phan/plugins/ifsqlFixer.php

diff --git a/dev/tools/phan/config_fixer.php b/dev/tools/phan/config_fixer.php
index e9a0fa36763..521cbcbedbf 100644
--- a/dev/tools/phan/config_fixer.php
+++ b/dev/tools/phan/config_fixer.php
@@ -15,7 +15,8 @@ $config = include __DIR__.DIRECTORY_SEPARATOR."config.php";
 //require_once __DIR__.'/plugins/UrlEncodeStringifyFixer.php';
 //require_once __DIR__.'/plugins/SelectDateFixer.php';
 //require_once __DIR__.'/plugins/setPageOrientationFixer.php';
-require_once __DIR__.'/plugins/textwithpictoFixer.php';
+//require_once __DIR__.'/plugins/textwithpictoFixer.php';
+require_once __DIR__.'/plugins/ifsqlFixer.php';
 //require_once __DIR__.'/plugins/MultiCellFixer.php';
 //require_once __DIR__.'/plugins/setAutoPageBreakFixer.php';
 //require_once __DIR__.'/plugins/CellFixer.php';
diff --git a/dev/tools/phan/plugins/ifsqlFixer.php b/dev/tools/phan/plugins/ifsqlFixer.php
new file mode 100644
index 00000000000..ba97b719c24
--- /dev/null
+++ b/dev/tools/phan/plugins/ifsqlFixer.php
@@ -0,0 +1,177 @@
+<?php
+/* Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
+ *
+ * For 'price()', replace $form parameter that is '' with 0.
+ */
+
+declare(strict_types=1);
+
+use ast\flags;
+use Microsoft\PhpParser\Node\Expression\CallExpression;
+use Microsoft\PhpParser\Node\QualifiedName;
+use Phan\AST\TolerantASTConverter\NodeUtils;
+use Phan\CodeBase;
+use Phan\IssueInstance;
+use Phan\Library\FileCacheEntry;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEdit;
+use Phan\Plugin\Internal\IssueFixingPlugin\FileEditSet;
+use Phan\Plugin\Internal\IssueFixingPlugin\IssueFixer;
+use Microsoft\PhpParser\Node\Expression\ArgumentExpression;
+use Microsoft\PhpParser\Node\DelimitedList\ArgumentExpressionList;
+use Microsoft\PhpParser\Node\StringLiteral;
+use Microsoft\PhpParser\Node\NumericLiteral;
+use Microsoft\PhpParser\Node\ReservedWord;
+use Microsoft\PhpParser\Token;
+
+/**
+ * This is a prototype, there are various features it does not implement.
+ */
+
+call_user_func(static function (): void {
+	/**
+	 * @param $code_base @unused-param
+	 * @return ?FileEditSet a representation of the edit to make to replace a call to a function alias with a call to the original function
+	 */
+	$fix = static function (CodeBase $code_base, FileCacheEntry $contents, IssueInstance $instance): ?FileEditSet {
+
+		// Argument {INDEX} (${PARAMETER}) is {CODE} of type {TYPE}{DETAILS} but
+		// {FUNCTIONLIKE} takes {TYPE}{DETAILS} defined at {FILE}:{LINE} (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+
+		//htdocs\supplier_proposal\card.php:1705 PhanTypeMismatchArgumentProbablyReal Argument 3 ($h) is '' of type '' but \Form::selectDate() takes int (no real type) defined at htdocs\core\class\html.form.class.php:6799 (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+		//htdocs\supplier_proposal\card.php:1705 PhanTypeMismatchArgumentProbablyReal Argument 4 ($m) is '' of type '' but \Form::selectDate() takes int (no real type) defined at htdocs\core\class\html.form.class.php:6799 (the inferred real argument type has nothing in common with the parameter's phpdoc type)
+		// var_dump($instance->getTemplateParameters());
+		$argument_index = (string) $instance->getTemplateParameters()[0];
+		$argument_name = (string) $instance->getTemplateParameters()[1];
+		$argument_code = (string) $instance->getTemplateParameters()[2];
+		$argument_type = (string) $instance->getTemplateParameters()[3];
+		$functionlike = (string) $instance->getTemplateParameters()[4];
+		$functiontype = (string) $instance->getTemplateParameters()[5];
+
+		$expected_functionlike = "\\DoliDB::ifsql()";
+		$expected_name = "ifsql";
+		if ($functionlike !== $expected_functionlike) {
+			//print "$functionlike != '$expected_functionlike'".PHP_EOL;
+			return null;
+		}
+
+		$toBoolReplaceArray = array("0" => "'0'","1" => "'1'","-1" => "'-1'");
+		// Check if we fix any of this
+		if (
+			(in_array($argument_name, ['resok','resko']) && in_array($argument_code, array_keys($toBoolReplaceArray)))
+			//|| ($argument_name === 'm' && $argument_code === "''")
+			//|| ($argument_name === 'empty' && $argument_code === "''")
+		) {
+			$replacement = $toBoolReplaceArray[$argument_code];
+			$argIdx = ($argument_index - 1) * 2;
+			$expectedStringValue = $argument_code;
+		} else {
+			print "ARG$argument_index:$argument_name CODE:$argument_name".PHP_EOL;
+			return null;
+		}
+
+		// At this point we established that the notification
+		// matches some we fix.
+
+		$line = $instance->getLine();
+
+		$edits = [];
+		foreach ($contents->getNodesAtLine($line) as $node) {
+			if (!$node instanceof ArgumentExpressionList) {
+				continue;
+			}
+			$arguments = $node->children;
+			if (count($arguments) <= $argIdx) {
+				// print "Arg Count is ".count($arguments)." - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			$is_actual_call = $node->parent instanceof CallExpression;
+			if (!$is_actual_call) {
+				// print "Not actual call - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			print "Actual call - $instance".PHP_EOL;
+			$callable = $node->parent;
+
+			$callableExpression = $callable->callableExpression;
+
+			if ($callableExpression instanceof Microsoft\PhpParser\Node\QualifiedName) {
+				$actual_name = $callableExpression->getResolvedName();
+			} elseif ($callableExpression instanceof Microsoft\PhpParser\Node\Expression\MemberAccessExpression) {
+				$memberNameToken = $callableExpression->memberName;
+				$actual_name = (new NodeUtils($contents->getContents()))->tokenToString($memberNameToken);
+			} else {
+				print "Callable expression is ".get_class($callableExpression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			if ((string) $actual_name !== (string) $expected_name) {
+				// print "Name unexpected '$actual_name'!='$expected_name' - Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			foreach ($arguments as $i => $argument) {
+				if ($argument instanceof ArgumentExpression) {
+					// print "Type$i: ".get_class($argument->expression).PHP_EOL;
+				}
+			}
+
+			$fieldValue = null;
+
+
+			$arg = $arguments[$argIdx];
+
+			if (
+				$arg instanceof ArgumentExpression
+				&& $arg->expression instanceof NumericLiteral
+			) {
+				// Get the string value of the NumericLiteral
+				$fieldValue = (string) $arg->expression;
+				//print "Field is '$fieldValue'".PHP_EOL;
+			} elseif ($arg instanceof ArgumentExpression && $arg->expression instanceof ReservedWord) {
+				$child = $arg->expression->children;
+				if (!$child instanceof Token) {
+					continue;
+				}
+				$token_str = (new NodeUtils($contents->getContents()))->tokenToString($child);
+				print "$token_str KIND:".($child->kind ?? 'no kind')." ".get_class($child).PHP_EOL;
+
+				if ($token_str !== 'null') {
+					continue;
+				}
+
+				$fieldValue = '';  // Fake empty
+			} else {
+				// print "Expression is not expected type ".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			if ($fieldValue !== $expectedStringValue) {
+				// print "Not replacing '$argument_name' which is '$fieldValue'/".get_class($arg)."/".get_class($arg->expression)."- Skip $instance".PHP_EOL;
+				continue;
+			}
+
+			print "Fixture elem on $line - $actual_name(...'$fieldValue'...) - $instance".PHP_EOL;
+
+
+
+			// Get the first argument (delimiter)
+			$argument_to_replace = $arg;
+
+			$arg_start_pos = $argument_to_replace->getStartPosition();
+			$arg_end_pos = $argument_to_replace->getEndPosition();
+
+			// Set edit instruction
+			$edits[] = new FileEdit($arg_start_pos, $arg_end_pos, $replacement);
+		}
+		if ($edits) {
+			return new FileEditSet($edits);
+		}
+		return null;
+	};
+	IssueFixer::registerFixerClosure(
+		'PhanTypeMismatchArgument',
+		$fix
+	);
+});
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index e1934a31b0e..d2217e62654 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Jean-François Ferry <jfefe@aternatik.fr>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW					<mdeweerd@users.noreply.github.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
@@ -429,10 +430,10 @@ if ($resql) {
 			$cursoryear = ($cursormonth < getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1)) ? $y + 1 : $y;
 			$tmp = dol_getdate(dol_get_last_day($cursoryear, $cursormonth, 'gmt'), false, 'gmt');
 
-			print '<td class="right nowraponall amount" title="'.price($row[2*$i - 2]).' - '.$row[2*$i - 1].' lines">';
-			print price($row[2*$i - 2]);
+			print '<td class="right nowraponall amount" title="'.price($row[2 * $i - 2]).' - '.$row[2 * $i - 1].' lines">';
+			print price($row[2 * $i - 2]);
 			// Add link to make binding
-			if (!empty(price2num($row[2*$i - 2])) || !empty($row[2*$i - 1])) {
+			if (!empty(price2num($row[2 * $i - 2])) || !empty($row[2 * $i - 1])) {
 				print '<a href="'.$_SERVER['PHP_SELF'].'?action=validatehistory&year='.$y.'&validatemonth='.((int) $cursormonth).'&validateyear='.((int) $cursoryear).'&token='.newToken().'">';
 				print img_picto($langs->trans("ValidateHistory").' ('.$langs->trans('Month'.str_pad((string) $cursormonth, 2, '0', STR_PAD_LEFT)).' '.$cursoryear.')', 'link', 'class="marginleft2"');
 				print '</a>';
@@ -672,7 +673,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 						" (-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
+					'0'
 				).") AS month".str_pad((string) $j, 2, '0', STR_PAD_LEFT).",";
 			}
 			$sql .= "  SUM(".$db->ifsql(
@@ -694,7 +695,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 						" (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty)))",
 						"  (fd.total_ht - (fd.buy_price_ht * fd.qty))"
 					).")",
-					0
+					'0'
 				).") AS month".str_pad((string) $j, 2, '0', STR_PAD_LEFT).",";
 			}
 			$sql .= "  SUM(".$db->ifsql(
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 13c6119e9f8..44eb8af5724 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2017       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2024  Alexandre Spangaro      <alexandre@inovea-conseil.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024       MDW                     <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW                     <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Jose MARTINEZ           <jose.martinez@pichinov.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -713,7 +713,7 @@ class Asset extends CommonObject
 		*/
 
 		$sql = "SELECT ad.rowid, ad.depreciation_mode, ad.ref, ad.depreciation_date, ad.depreciation_ht, ad.cumulative_depreciation_ht";
-		$sql .= ", " . $this->db->ifsql('iab.fk_docdet IS NOT NULL', 1, 0) . " AS bookkeeping";
+		$sql .= ", " . $this->db->ifsql('iab.fk_docdet IS NOT NULL', '1', '0') . " AS bookkeeping";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation AS ad";
 		$sql .= " LEFT JOIN (SELECT DISTINCT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE doc_type = 'asset') AS iab ON iab.fk_docdet = ad.rowid";
 		$sql .= " WHERE ad.fk_asset = " . (int) $this->id;
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index be2f81dc20f..1906560455c 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2012	Regis Houssin				<regis.houssin@inodbox.com>
  * Copyright (C) 2015		Jean-François Ferry			<jfefe@aternatik.fr>
  * Copyright (C) 2019		Nicolas ZABOURI				<info@inovea-conseil.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
@@ -328,11 +328,11 @@ print '</div><div class="fichetwothirdright">';
 
 // Last modified contracts
 $sql = 'SELECT ';
-$sql .= " sum(".$db->ifsql("cd.statut=0", 1, 0).') as nb_initial,';
-$sql .= " sum(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite >= '".$db->idate($now)."')", 1, 0).') as nb_running,';
-$sql .= " sum(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')", 1, 0).') as nb_expired,';
-$sql .= " sum(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')", 1, 0).') as nb_late,';
-$sql .= " sum(".$db->ifsql("cd.statut=5", 1, 0).') as nb_closed,';
+$sql .= " sum(".$db->ifsql("cd.statut=0", '1', '0').') as nb_initial,';
+$sql .= " sum(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite >= '".$db->idate($now)."')", '1', '0').') as nb_running,';
+$sql .= " sum(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')", '1', '0').') as nb_expired,';
+$sql .= " sum(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')", '1', '0').') as nb_late,';
+$sql .= " sum(".$db->ifsql("cd.statut=5", '1', '0').') as nb_closed,';
 $sql .= " c.rowid as cid, c.ref, c.datec, c.tms, c.statut,";
 $sql .= " s.nom as name, s.name_alias, s.logo, s.rowid as socid, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,";
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 5dc7e793af9..52557b35668 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2016-2018	Ferran Marcet				<fmarcet@2byte.es>
  * Copyright (C) 2019		Nicolas Zabouri				<info@inovea-conseil.com>
  * Copyright (C) 2021-2024	Alexandre Spangaro			<alexandre@inovea-conseil.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2024		Benjamin Falière			<benjamin.faliere@altairis.fr>
  *
@@ -325,11 +325,11 @@ $sql .= " state.code_departement as state_code, state.nom as state_name,";
 // TODO Add a denormalized field "denormalized_lower_planned_end_date" so we can remove the HAVING and then,
 // remove completely the SUM and GROUP BY (faster). Status of each service can be read into the loop that build the list.
 $sql .= " MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") as lower_planned_end_date,";	// lowest expiration date among open service lines
-$sql .= " SUM(".$db->ifsql("cd.statut=0", 1, 0).') as nb_initial,';
-$sql .= " SUM(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite >= '".$db->idate($now)."')", 1, 0).') as nb_running,';
-$sql .= " SUM(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')", 1, 0).') as nb_expired,';
-$sql .= " SUM(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')", 1, 0).') as nb_late,';
-$sql .= " SUM(".$db->ifsql("cd.statut=5", 1, 0).') as nb_closed';
+$sql .= " SUM(".$db->ifsql("cd.statut=0", '1', '0').') as nb_initial,';
+$sql .= " SUM(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite >= '".$db->idate($now)."')", '1', '0').') as nb_running,';
+$sql .= " SUM(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')", '1', '0').') as nb_expired,';
+$sql .= " SUM(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')", '1', '0').') as nb_late,';
+$sql .= " SUM(".$db->ifsql("cd.statut=5", '1', '0').') as nb_closed';
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 4228c0a499f..c536e435c3a 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2015       Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2017      	Charlie Benke			<charlie@patas-monkey.com>
  * Copyright (C) 2017       ATM-CONSULTING			<contact@atm-consulting.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -441,12 +441,12 @@ function getNumberInvoicesPieChart($mode)
 		$amount_mode = (getDolGlobalInt('FACTURE_VALIDATED_IN_AMOUNT') == 1);
 
 		$sql = "SELECT";
-		$sql .= " sum(".$db->ifsql("f.date_lim_reglement < '".date_format($datenowsub30, 'Y-m-d')."'", $amount_mode ? "f.total_ht" : 1, 0).") as late30";
-		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement < '".date_format($datenowsub15, 'Y-m-d')."' AND f.date_lim_reglement >= '".date_format($datenowsub30, 'Y-m-d')."'", $amount_mode ? "f.total_ht" : 1, 0).") as late15";
-		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement < '".date_format($now, 'Y-m-d')."' AND f.date_lim_reglement >= '".date_format($datenowsub15, 'Y-m-d')."'", $amount_mode ? "f.total_ht" : 1, 0).") as latenow";
-		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement >= '".date_format($now, 'Y-m-d')."' AND f.date_lim_reglement < '".date_format($datenowadd15, 'Y-m-d')."'", $amount_mode ? "f.total_ht" : 1, 0).") as notlatenow";
-		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement >= '".date_format($datenowadd15, 'Y-m-d')."' AND f.date_lim_reglement < '".date_format($datenowadd30, 'Y-m-d')."'", $amount_mode ? "f.total_ht" : 1, 0).") as notlate15";
-		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement >= '".date_format($datenowadd30, 'Y-m-d')."'", $amount_mode ? "f.total_ht" : 1, 0).") as notlate30";
+		$sql .= " sum(".$db->ifsql("f.date_lim_reglement < '".date_format($datenowsub30, 'Y-m-d')."'", $amount_mode ? "f.total_ht" : 1, '0').") as late30";
+		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement < '".date_format($datenowsub15, 'Y-m-d')."' AND f.date_lim_reglement >= '".date_format($datenowsub30, 'Y-m-d')."'", $amount_mode ? "f.total_ht" : 1, '0').") as late15";
+		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement < '".date_format($now, 'Y-m-d')."' AND f.date_lim_reglement >= '".date_format($datenowsub15, 'Y-m-d')."'", $amount_mode ? "f.total_ht" : 1, '0').") as latenow";
+		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement >= '".date_format($now, 'Y-m-d')."' AND f.date_lim_reglement < '".date_format($datenowadd15, 'Y-m-d')."'", $amount_mode ? "f.total_ht" : 1, '0').") as notlatenow";
+		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement >= '".date_format($datenowadd15, 'Y-m-d')."' AND f.date_lim_reglement < '".date_format($datenowadd30, 'Y-m-d')."'", $amount_mode ? "f.total_ht" : 1, '0').") as notlate15";
+		$sql .= ", sum(".$db->ifsql("f.date_lim_reglement >= '".date_format($datenowadd30, 'Y-m-d')."'", $amount_mode ? "f.total_ht" : 1, '0').") as notlate30";
 		if ($mode == 'customers') {
 			$element = 'invoice';
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
@@ -569,7 +569,9 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)
 	$result = '';
 
 	if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
-		if ($user->socid > 0) $socid = $user->socid;
+		if ($user->socid > 0) {
+			$socid = $user->socid;
+		}
 		$maxofloop = (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
 
 		$tmpinvoice = new Facture($db);
@@ -721,7 +723,9 @@ function getDraftSupplierTable($maxCount = 500, $socid = 0)
 	$result = '';
 
 	if ((isModEnabled('fournisseur') || isModEnabled('supplier_invoice')) && $user->hasRight('facture', 'lire')) {
-		if ($user->socid > 0) $socid = $user->socid;
+		if ($user->socid > 0) {
+			$socid = $user->socid;
+		}
 		$maxofloop = (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
 
 		$facturesupplierstatic = new FactureFournisseur($db);
@@ -854,7 +858,9 @@ function getDraftSupplierTable($maxCount = 500, $socid = 0)
 function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 {
 	global $conf, $db, $langs, $user;
-	if ($user->socid > 0) $socid = $user->socid;
+	if ($user->socid > 0) {
+		$socid = $user->socid;
+	}
 	$sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, f.type, f.total_ht, f.total_tva, f.total_ttc, f.datec,";
 	$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
@@ -963,7 +969,9 @@ function getCustomerInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 function getPurchaseInvoiceLatestEditTable($maxCount = 5, $socid = 0)
 {
 	global $conf, $db, $langs, $user;
-	if ($user->socid > 0) $socid = $user->socid;
+	if ($user->socid > 0) {
+		$socid = $user->socid;
+	}
 	$sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, f.total_ht, f.total_tva, f.total_ttc, f.type, f.ref_supplier, f.datec,";
 	$sql .= " s.nom as socname, s.rowid as socid, s.canvas, s.client";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
@@ -1081,7 +1089,9 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 	$result = '';
 
 	if (isModEnabled('invoice') && $user->hasRight('facture', 'lire')) {
-		if ($user->socid > 0) $socid = $user->socid;
+		if ($user->socid > 0) {
+			$socid = $user->socid;
+		}
 		$tmpinvoice = new Facture($db);
 
 		$sql = "SELECT f.rowid, f.ref, f.fk_statut as status, f.datef, f.type, f.total_ht, f.total_tva, f.total_ttc, f.paye, f.tms";
@@ -1271,7 +1281,9 @@ function getPurchaseInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 	$result = '';
 
 	if (isModEnabled("supplier_invoice") && ($user->hasRight('fournisseur', 'facture', 'lire') || $user->hasRight('supplier_invoice', 'read'))) {
-		if ($user->socid > 0) $socid = $user->socid;
+		if ($user->socid > 0) {
+			$socid = $user->socid;
+		}
 		$facstatic = new FactureFournisseur($db);
 
 		$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut as status, ff.type, ff.libelle as label, ff.total_ht, ff.total_tva, ff.total_ttc, ff.paye";
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 593fe5c25aa..7903b1663fd 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -139,10 +140,10 @@ if ($id > 0 || !empty($ref)) {
 		$now = dol_now();
 
 		$sql = "SELECT";
-		$sql .= " sum(".$db->ifsql("cd.statut=0", 1, 0).') as nb_initial,';
-		$sql .= " sum(".$db->ifsql("cd.statut=4 AND cd.date_fin_validite > '".$db->idate($now)."'", 1, 0).") as nb_running,";
-		$sql .= " sum(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite <= '".$db->idate($now)."')", 1, 0).') as nb_late,';
-		$sql .= " sum(".$db->ifsql("cd.statut=5", 1, 0).') as nb_closed,';
+		$sql .= " sum(".$db->ifsql("cd.statut=0", '1', '0').') as nb_initial,';
+		$sql .= " sum(".$db->ifsql("cd.statut=4 AND cd.date_fin_validite > '".$db->idate($now)."'", '1', '0').") as nb_running,";
+		$sql .= " sum(".$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite <= '".$db->idate($now)."')", '1', '0').') as nb_late,';
+		$sql .= " sum(".$db->ifsql("cd.statut=5", '1', '0').') as nb_closed,';
 		$sql .= " c.rowid as rowid, c.ref, c.ref_customer, c.ref_supplier, c.date_contrat, c.statut as statut,";
 		$sql .= " s.nom as name, s.rowid as socid, s.code_client";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index 23a987a6243..6772312c4f1 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2023	   Gauthier VERDOL		<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -150,10 +151,10 @@ if ($id > 0 || !empty($ref)) {
 		$now = dol_now();
 
 		$sql = "SELECT";
-		$sql .= " sum(".$db->ifsql("cd.role='toconsume'", "cd.qty", 0).') as nb_toconsume,';
-		$sql .= " sum(".$db->ifsql("cd.role='consumed'", "cd.qty", 0).') as nb_consumed,';
-		$sql .= " sum(".$db->ifsql("cd.role='toproduce'", "cd.qty", 0).') as nb_toproduce,';
-		$sql .= " sum(".$db->ifsql("cd.role='produced'", "cd.qty", 0).') as nb_produced,';
+		$sql .= " sum(".$db->ifsql("cd.role='toconsume'", "cd.qty", '0').') as nb_toconsume,';
+		$sql .= " sum(".$db->ifsql("cd.role='consumed'", "cd.qty", '0').') as nb_consumed,';
+		$sql .= " sum(".$db->ifsql("cd.role='toproduce'", "cd.qty", '0').') as nb_toproduce,';
+		$sql .= " sum(".$db->ifsql("cd.role='produced'", "cd.qty", '0').') as nb_produced,';
 		$sql .= " c.rowid as rowid, c.ref, c.date_valid, c.status";
 		//$sql .= " s.nom as name, s.rowid as socid, s.code_client";
 		$sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as c";
diff --git a/htdocs/product/stock/stats/mo.php b/htdocs/product/stock/stats/mo.php
index 9a87fa83783..b1a3477871b 100644
--- a/htdocs/product/stock/stats/mo.php
+++ b/htdocs/product/stock/stats/mo.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2023	   Gauthier VERDOL		<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -176,9 +177,9 @@ if ($id > 0 || !empty($ref)) {
 
 		$sql = "SELECT";
 		//      $sql .= " sum(".$db->ifsql("cd.role='toconsume'", "cd.qty", 0).') as nb_toconsume,';
-		$sql .= " sum(".$db->ifsql("cd.role='consumed'", "cd.qty", 0).') as nb_consumed,';
+		$sql .= " sum(".$db->ifsql("cd.role='consumed'", "cd.qty", '0').') as nb_consumed,';
 		//      $sql .= " sum(".$db->ifsql("cd.role='toproduce'", "cd.qty", 0).') as nb_toproduce,';
-		$sql .= " sum(".$db->ifsql("cd.role='produced'", "cd.qty", 0).') as nb_produced,';
+		$sql .= " sum(".$db->ifsql("cd.role='produced'", "cd.qty", '0').') as nb_produced,';
 		$sql .= " c.rowid as rowid, c.ref, c.date_valid, c.status";
 		//$sql .= " s.nom as name, s.rowid as socid, s.code_client";
 		$sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as c";
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index ba6f4f83ca5..d76e3a605f4 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1845,9 +1845,9 @@ class Task extends CommonObjectLine
 		$sql .= " MIN(t.element_datehour) as min_date,";
 		$sql .= " MAX(t.element_datehour) as max_date,";
 		$sql .= " SUM(t.element_duration) as total_duration,";
-		$sql .= " SUM(t.element_duration / 3600 * ".$this->db->ifsql("t.thm IS NULL", 0, "t.thm").") as total_amount,";
+		$sql .= " SUM(t.element_duration / 3600 * ".$this->db->ifsql("t.thm IS NULL", '0', "t.thm").") as total_amount,";
 		$sql .= " COUNT(t.rowid) as nblines,";
-		$sql .= " SUM(".$this->db->ifsql("t.thm IS NULL", 1, 0).") as nblinesnull";
+		$sql .= " SUM(".$this->db->ifsql("t.thm IS NULL", '1', '0').") as nblinesnull";
 		$sql .= " FROM ".MAIN_DB_PREFIX."element_time as t";
 		$sql .= " WHERE t.elementtype='task'";
 		if ($morewherefilter) {
@@ -1899,7 +1899,7 @@ class Task extends CommonObjectLine
 
 		$sql = "SELECT";
 		$sql .= " SUM(t.element_duration) as nbseconds,";
-		$sql .= " SUM(t.element_duration / 3600 * ".$this->db->ifsql("t.thm IS NULL", 0, "t.thm").") as amount, SUM(".$this->db->ifsql("t.thm IS NULL", 1, 0).") as nblinesnull";
+		$sql .= " SUM(t.element_duration / 3600 * ".$this->db->ifsql("t.thm IS NULL", '0', "t.thm").") as amount, SUM(".$this->db->ifsql("t.thm IS NULL", '1', '0').") as nblinesnull";
 		$sql .= " FROM ".MAIN_DB_PREFIX."element_time as t";
 		$sql .= " WHERE t.elementtype='task' AND t.fk_element = ".((int) $id);
 		if (is_object($fuser) && $fuser->id > 0) {

From c9d69aa954cef4e927e9382d721b1da757e034de Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 8 Feb 2025 20:05:38 +0100
Subject: [PATCH 580/602] Qual: Update phan baseline

---
 dev/tools/phan/baseline.txt | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index cfc989ba39a..6d6142302e7 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,9 +9,9 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 2230+ occurrences
+    // PhanTypeMismatchArgument : 2170+ occurrences
     // PhanUndeclaredProperty : 530+ occurrences
-    // PhanTypeMismatchArgumentNullable : 430+ occurrences
+    // PhanTypeMismatchArgumentNullable : 420+ occurrences
     // PhanUndeclaredGlobalVariable : 190+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 170+ occurrences
     // PhanPossiblyUndeclaredGlobalVariable : 150+ occurrences
@@ -30,9 +30,9 @@ return [
     // PhanPluginSuspiciousParamPosition : 7 occurrences
     // PhanPluginUnknownObjectMethodCall : 7 occurrences
     // PhanPluginDuplicateExpressionBinaryOp : 6 occurrences
-    // PhanPluginEmptyStatementIf : 6 occurrences
     // PhanTypeArraySuspiciousNull : 6 occurrences
     // PhanParamTooMany : 5 occurrences
+    // PhanPluginEmptyStatementIf : 5 occurrences
     // PhanEmptyForeach : 4 occurrences
     // PhanPluginBothLiteralsBinaryOp : 4 occurrences
     // PhanPluginDuplicateArrayKey : 4 occurrences
@@ -305,7 +305,6 @@ return [
         'htdocs/contrat/class/contratligne.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/contrat/contact.php' => ['PhanTypeMismatchArgument'],
         'htdocs/contrat/document.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/contrat/index.php' => ['PhanTypeMismatchArgument'],
         'htdocs/contrat/list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/contrat/messaging.php' => ['PhanTypeMismatchArgument'],
         'htdocs/contrat/note.php' => ['PhanTypeMismatchArgument'],
@@ -613,7 +612,6 @@ return [
         'htdocs/product/stats/card.php' => ['PhanTypeComparisonFromArray', 'PhanTypeMismatchArgument'],
         'htdocs/product/stats/commande.php' => ['PhanTypeMismatchArgument'],
         'htdocs/product/stats/commande_fournisseur.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/stats/contrat.php' => ['PhanTypeMismatchArgument'],
         'htdocs/product/stats/expedition.php' => ['PhanTypeMismatchArgument'],
         'htdocs/product/stats/facture_fournisseur.php' => ['PhanTypeMismatchArgument'],
         'htdocs/product/stats/facturerec.php' => ['PhanTypeMismatchArgument'],
@@ -628,7 +626,7 @@ return [
         'htdocs/product/stock/class/mouvementstock.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/product/stock/info.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/product/stock/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/massstockmove.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/product/stock/massstockmove.php' => ['PhanTypeMismatchArgument'],
         'htdocs/product/stock/movement_card.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/product/stock/movement_list.php' => ['PhanPluginBothLiteralsBinaryOp', 'PhanPluginUndeclaredVariableIsset', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/product/stock/product.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],

From 1a2d4ed6bedccc5eca52287528043c4687f89bbd Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Sat, 8 Feb 2025 21:53:48 +0100
Subject: [PATCH 581/602] Qual: Fix phan (product-2)

---
 dev/tools/phan/baseline.txt                   | 33 ++--------
 htdocs/core/class/html.form.class.php         | 19 +++---
 htdocs/core/lib/date.lib.php                  | 36 +++++-----
 .../class/productcustomerprice.class.php      |  8 +--
 htdocs/product/composition/card.php           |  6 +-
 htdocs/product/document.php                   |  9 ++-
 .../class/price_parser.class.php              |  4 +-
 htdocs/product/index.php                      |  6 +-
 .../inventory/ajax/searchfrombarcode.php      |  6 +-
 htdocs/product/inventory/card.php             |  8 ++-
 htdocs/product/inventory/inventory.php        |  7 +-
 htdocs/product/inventory/list.php             | 29 +++++----
 htdocs/product/list.php                       | 30 ++++-----
 htdocs/product/price.php                      | 44 +++++++------
 htdocs/product/price_suppliers.php            | 65 ++++++++++---------
 htdocs/product/stats/card.php                 | 24 +++----
 htdocs/product/stats/commande.php             |  7 +-
 htdocs/product/stats/commande_fournisseur.php |  7 +-
 htdocs/product/stats/expedition.php           |  7 +-
 htdocs/product/stats/facture_fournisseur.php  |  7 +-
 htdocs/product/stats/facturerec.php           |  7 +-
 htdocs/product/stats/mo.php                   |  7 +-
 htdocs/product/stats/propal.php               |  7 +-
 htdocs/product/stats/reception.php            |  7 +-
 htdocs/product/stats/supplier_proposal.php    |  7 +-
 25 files changed, 200 insertions(+), 197 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 6d6142302e7..611fce90ddb 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,12 +9,12 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 2170+ occurrences
+    // PhanTypeMismatchArgument : 2090+ occurrences
     // PhanUndeclaredProperty : 530+ occurrences
-    // PhanTypeMismatchArgumentNullable : 420+ occurrences
+    // PhanTypeMismatchArgumentNullable : 410+ occurrences
     // PhanUndeclaredGlobalVariable : 190+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 170+ occurrences
-    // PhanPossiblyUndeclaredGlobalVariable : 150+ occurrences
+    // PhanPossiblyUndeclaredGlobalVariable : 140+ occurrences
     // PhanTypeMismatchProperty : 130+ occurrences
     // PhanTypeMismatchArgumentProbablyReal : 120+ occurrences
     // PhanPluginUnknownArrayMethodParamType : 110+ occurrences
@@ -24,18 +24,18 @@ return [
     // PhanPluginUndeclaredVariableIsset : 20+ occurrences
     // PhanTypeMismatchDimFetch : 20+ occurrences
     // PhanUndeclaredConstant : 15+ occurrences
-    // PhanTypeComparisonFromArray : 10+ occurrences
     // PhanTypeMismatchArgumentNullableInternal : 10+ occurrences
     // PhanUndeclaredMethod : 10+ occurrences
+    // PhanTypeComparisonFromArray : 9 occurrences
     // PhanPluginSuspiciousParamPosition : 7 occurrences
     // PhanPluginUnknownObjectMethodCall : 7 occurrences
     // PhanPluginDuplicateExpressionBinaryOp : 6 occurrences
     // PhanTypeArraySuspiciousNull : 6 occurrences
     // PhanParamTooMany : 5 occurrences
-    // PhanPluginEmptyStatementIf : 5 occurrences
     // PhanEmptyForeach : 4 occurrences
     // PhanPluginBothLiteralsBinaryOp : 4 occurrences
     // PhanPluginDuplicateArrayKey : 4 occurrences
+    // PhanPluginEmptyStatementIf : 4 occurrences
     // PhanEmptyFQSENInClasslike : 3 occurrences
     // PhanInvalidFQSENInClasslike : 3 occurrences
     // PhanTypeMismatchDimAssignment : 2 occurrences
@@ -594,31 +594,10 @@ return [
         'htdocs/partnership/partnership_list.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/class/api_products.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/product/class/html.formproduct.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/product/class/productcustomerprice.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/product/class/productfournisseurprice.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
-        'htdocs/product/composition/card.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/document.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullable'],
-        'htdocs/product/dynamic_price/class/price_parser.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/index.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanTypeMismatchArgument'],
-        'htdocs/product/inventory/ajax/searchfrombarcode.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/inventory/card.php' => ['PhanPluginEmptyStatementIf', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/product/inventory/class/inventory.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/product/inventory/inventory.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/product/inventory/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/product/list.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
-        'htdocs/product/price.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/product/price_suppliers.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/product/price.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/reassort.php' => ['PhanTypeExpectedObjectPropAccessButGotNull'],
-        'htdocs/product/stats/card.php' => ['PhanTypeComparisonFromArray', 'PhanTypeMismatchArgument'],
-        'htdocs/product/stats/commande.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/stats/commande_fournisseur.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/stats/expedition.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/stats/facture_fournisseur.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/stats/facturerec.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/stats/mo.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/stats/propal.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/stats/reception.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/stats/supplier_proposal.php' => ['PhanTypeMismatchArgument'],
         'htdocs/product/stock/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
         'htdocs/product/stock/class/api_stockmovements.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
         'htdocs/product/stock/class/api_warehouses.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a1ce6a738aa..514d9bf10b5 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -81,6 +81,7 @@ class Form
 	public $cache_types_paiements = array();
 	public $cache_conditions_paiements = array();
 	public $cache_transport_mode = array();
+	/** @var array<int,array{code:string,label:string,position:int}> */
 	public $cache_availability = array();
 	public $cache_demand_reason = array();
 	public $cache_types_fees = array();
@@ -3734,7 +3735,7 @@ class Form
 	 * @param int 		$socid 				Id of supplier thirdparty (0 = no filter)
 	 * @param string 	$selected 			Product price preselected (must be 'id' in product_fournisseur_price or 'idprod_IDPROD')
 	 * @param string 	$htmlname 			Name of HTML select
-	 * @param string 	$filtertype 		Filter on product type (''=nofilter, 0=product, 1=service)
+	 * @param ''|int<0,1> 	$filtertype 		Filter on product type (''=nofilter, 0=product, 1=service)
 	 * @param string 	$filtre 			Generic filter. Data must not come from user input.
 	 * @param string 	$filterkey 			Filter of produdts
 	 * @param int 		$statut 			-1=Return all products, 0=Products not on buy, 1=Products on buy
@@ -4377,9 +4378,9 @@ class Form
 
 				// Si traduction existe, on l'utilise, sinon on prend le libelle par default
 				$label = ($langs->trans("AvailabilityType" . $obj->code) != "AvailabilityType" . $obj->code ? $langs->trans("AvailabilityType" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));
-				$this->cache_availability[$obj->rowid]['code'] = $obj->code;
-				$this->cache_availability[$obj->rowid]['label'] = $label;
-				$this->cache_availability[$obj->rowid]['position'] = $obj->position;
+				$this->cache_availability[$obj->rowid]['code'] = (string) $obj->code;
+				$this->cache_availability[$obj->rowid]['label'] = (string) $label;
+				$this->cache_availability[$obj->rowid]['position'] = (int) $obj->position;
 				$i++;
 			}
 
@@ -4395,11 +4396,11 @@ class Form
 	/**
 	 * Return the list of type of delay available.
 	 *
-	 * @param 	string 		$selected Id du type de delais pre-selectionne
-	 * @param 	string 		$htmlname Nom de la zone select
-	 * @param 	string 		$filtertype To add a filter
-	 * @param 	int 		$addempty Add empty entry
-	 * @param 	string 		$morecss More CSS
+	 * @param 	''|int			$selected	Id du type de delais pre-selectionne
+	 * @param 	string			$htmlname	Nom de la zone select
+	 * @param 	string|int<0,1> $filtertype To add a filter
+	 * @param 	int<0,1> 		$addempty	Add empty entry
+	 * @param 	string			$morecss	More CSS
 	 * @return  void
 	 */
 	public function selectAvailabilityDelay($selected = '', $htmlname = 'availid', $filtertype = '', $addempty = 0, $morecss = '')
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 897a6f5711d..bcb37f6a685 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2011-2015 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2017      Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2018-2024 Charlene Benke       <charlene@patas-monkey.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024      Frédéric France      <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -373,8 +373,8 @@ function convertDurationtoHour($duration_value, $duration_unit)
  * @param      int|string	$month_date			Month date (Can be 0 or '' for filter on a year)
  * @param      int|string	$year_date			Year date
  * @param	   int      	$excludefirstand	Exclude first and
- * @param	   mixed		$gm					False or 0 or 'tzserver' = Input date fields are date info in the server TZ. True or 1 or 'gmt' = Input are date info in GMT TZ.
- * 												Note: In database, dates are always for the server TZ.
+ * @param      bool|int<0,1>|'gmt'|'tzserver'|'tzref'|'tzuser'|'tzuserrel'	$gm		False or 0 or 'tzserver' = Input date fields are date info in the server TZ. True or 1 or 'gmt' = Input are date info in GMT TZ.
+ *                                                                                  Note: In database, dates are always for the server TZ.
  * @return     string		$sqldate			String with SQL filter
  * @see forgeSQLFromUniversalSearchCriteria()
  * @see natural_search()
@@ -420,8 +420,8 @@ function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date, $exclu
  *									YYYY-MM-DDTHH:MM:SSZ (RFC3339)
  *		                			DD/MM/YY or DD/MM/YYYY (deprecated)
  *		                			DD/MM/YY HH:MM:SS or DD/MM/YYYY HH:MM:SS (deprecated)
- *  @param	int|string	$gm         'gmt' or 1 =Input date is GM date,
- *                          	    'tzserver' or 0 =Input date is date using PHP server timezone
+ *  @param  int<0,1>|'gmt'|'tzserver'|'tzref'|'tzuser'|'tzuserrel'|'dayrfc'	$gm		'gmt' or 1 =Input date is GM date,
+ *                                                                                  'tzserver' or 0 =Input date is date using PHP server timezone
  *  @return	int						Date as a timestamp
  *		                			19700101020000 -> 7200 with gm=1
  *									19700101000000 -> 0 with gm=1
@@ -589,12 +589,12 @@ function dol_get_next_week($day, $week, $month, $year)
 /**
  *  Return GMT time for first day of a month or year
  *
- *	@param		int			$year		Year
- * 	@param		int			$month		Month
- * 	@param		bool|int|string	$gm		False or 0 or 'tzserver' = Return date to compare with server TZ,
- * 										True or 1 or 'gmt' to compare with GMT date.
- *                          			Example: dol_get_first_day(1970,1,false) will return -3600 with TZ+1, a dol_print_date on it will return 1970-01-01 00:00:00
- *                          			Example: dol_get_first_day(1970,1,true) will return 0 whatever is TZ, a dol_print_date on it will return 1970-01-01 00:00:00
+ *	@param	int			$year		Year
+ * 	@param	int			$month		Month
+ *  @param	bool|int<0,1>|'gmt'|'tzserver'|'tzref'|'tzuser'|'tzuserrel'	$gm		False or 0 or 'tzserver' = Return date to compare with server TZ,
+ *                                                                              True or 1 or 'gmt' to compare with GMT date.
+ *                                                                              Example: dol_get_first_day(1970,1,false) will return -3600 with TZ+1, a dol_print_date on it will return 1970-01-01 00:00:00
+ *                                                                              Example: dol_get_first_day(1970,1,true) will return 0 whatever is TZ, a dol_print_date on it will return 1970-01-01 00:00:00
  *  @return		int|string				Date as a timestamp, '' if error
  */
 function dol_get_first_day($year, $month = 1, $gm = false)
@@ -612,8 +612,8 @@ function dol_get_first_day($year, $month = 1, $gm = false)
  *
  *	@param		int			$year		Year
  * 	@param		int			$month		Month
- * 	@param		bool|int|string	$gm		False or 0 or 'tzserver' = Return date to compare with server TZ,
- * 										True or 1 or 'gmt' to compare with GMT date.
+ * 	@param		bool|int<0,1>|'gmt'|'tzserver'|'tzref'|'tzuser'|'tzuserrel'	$gm		False or 0 or 'tzserver' = Return date to compare with server TZ,
+ *                                                                                  True or 1 or 'gmt' to compare with GMT date.
  *	@return		int|string				Date as a timestamp, '' if error
  */
 function dol_get_last_day($year, $month = 12, $gm = false)
@@ -665,11 +665,11 @@ function dol_get_first_hour($date, $gm = 'tzserver')
 
 /**	Return first day of week for a date. First day of week may be monday if option MAIN_START_WEEK is 1.
  *
- *	@param		int		$day		Day
- * 	@param		int		$month		Month
- *  @param		int		$year		Year
- * 	@param		bool|int|'tzserver'	$gm	False or 0 or 'tzserver' = Return date to compare with server TZ,
- *                                      True or 1 or 'gmt' to compare with GMT date.
+ *	@param	int		$day		Day
+ * 	@param	int		$month		Month
+ *  @param	int		$year		Year
+ *  @param	bool|int<0,1>|'gmt'|'tzserver'|'tzref'|'tzuser'|'tzuserrel'	$gm		False or 0 or 'tzserver' = Return date to compare with server TZ,
+ *                                                                              True or 1 or 'gmt' to compare with GMT date.
  *	@return	array{year:int,month:int,week:string,first_day:int,first_month:int,first_year:int,prev_year:int,prev_month:int,prev_day:int}
  */
 function dol_get_first_day_week($day, $month, $year, $gm = false)
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index ccd7510b6de..4838885cb07 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014      Florian Henry   <florian.henry@open-concept.pro>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -282,8 +282,8 @@ class ProductCustomerPrice extends CommonObject
 		$sql .= ") VALUES (";
 		$sql .= " ".((int) $conf->entity).",";
 		$sql .= " '".$this->db->idate(dol_now())."',";
-		$sql .= " ".(!isset($this->fk_product) ? 'NULL' : "'".$this->db->escape($this->fk_product)."'").",";
-		$sql .= " ".(!isset($this->fk_soc) ? 'NULL' : "'".$this->db->escape($this->fk_soc)."'").",";
+		$sql .= " ".(!isset($this->fk_product) ? 'NULL' : ((int) $this->fk_product)).",";
+		$sql .= " ".(!isset($this->fk_soc) ? 'NULL' : ((int) $this->fk_soc)).",";
 		$sql .= " ".(!isset($this->ref_customer) ? 'NULL' : "'".$this->db->escape($this->ref_customer)."'").",";
 		$sql .= " ".(empty($this->price) ? '0' : "'".$this->db->escape($this->price)."'").",";
 		$sql .= " ".(empty($this->price_ttc) ? '0' : "'".$this->db->escape($this->price_ttc)."'").",";
@@ -918,7 +918,7 @@ class ProductCustomerPrice extends CommonObject
 				$prodsocprice = new ProductCustomerPrice($this->db);
 
 				$filter = array(
-					't.fk_product' => $this->fk_product, 't.fk_soc' => $obj->rowid
+					't.fk_product' => (string) $this->fk_product, 't.fk_soc' => (string) $obj->rowid
 				);
 
 				$result = $prodsocprice->fetchAll('', '', 0, 0, $filter);
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 2c7fd107a9d..6bbc5a45006 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2023		Benjamin Falière		<benjamin.faliere@altairis.fr>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -113,7 +113,7 @@ if (empty($reshook)) {
 		for ($i = 0; $i < $maxprod; $i++) {
 			$qty = price2num(GETPOST("prod_qty_" . $i, 'alpha'), 'MS');
 			if ($qty > 0) {
-				if ($object->add_sousproduit($id, GETPOSTINT("prod_id_" . $i), $qty, GETPOSTINT("prod_incdec_" . $i)) > 0) {
+				if ($object->add_sousproduit($id, GETPOSTINT("prod_id_" . $i), (float) $qty, GETPOSTINT("prod_incdec_" . $i)) > 0) {
 					//var_dump($i.' '.GETPOST("prod_id_".$i, 'int'), $qty, GETPOST("prod_incdec_".$i, 'int'));
 					$action = 'edit';
 				} else {
@@ -262,7 +262,7 @@ if ($id > 0 || !empty($ref)) {
 			if (isModEnabled("product") && isModEnabled("service")) {
 				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 				print '<tr><td class="titlefield">';
-				print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
+				print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', (string) $object->type, $object, (int) $usercancreate, $typeformat) : $langs->trans('Type');
 				print '</td><td>';
 				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat);
 				print '</td></tr>';
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 35e3ab0610d..82b361962f5 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
  * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -89,6 +89,8 @@ if (!$sortfield) {
 	$sortfield = "position_name";
 }
 
+$upload_dir = '';
+$upload_dirold = '';
 // Initialize objects
 $object = new Product($db);
 if ($id > 0 || !empty($ref)) {
@@ -172,7 +174,7 @@ if ($action == 'filemerge' && $permissiontoadd) {
 		// Delete all file already associated
 		$filetomerge = new Propalmergepdfproduct($db);
 
-		if (getDolGlobalInt('MAIN_MULTILANGS')) {
+		if (getDolGlobalInt('MAIN_MULTILANGS') && $lang_id !== null) {
 			$result = $filetomerge->delete_by_product($user, $object->id, $lang_id);
 		} else {
 			$result = $filetomerge->delete_by_product($user, $object->id);
@@ -338,6 +340,7 @@ if ($object->id > 0) {
 
 			print  '<table class="noborder">';
 
+			$default_lang = null;
 			// Get language
 			if (getDolGlobalInt('MAIN_MULTILANGS')) {
 				$langs->load("languages");
@@ -363,7 +366,7 @@ if ($object->id > 0) {
 					$checked = '';
 					$filename = $filetoadd['name'];
 
-					if (getDolGlobalInt('MAIN_MULTILANGS')) {
+					if (getDolGlobalInt('MAIN_MULTILANGS') && $default_lang !== null) {
 						if (array_key_exists($filetoadd['name'].'_'.$default_lang, $filetomerge->lines)) {
 							$filename = $filetoadd['name'].' - '.$langs->trans('Language_'.$default_lang);
 							$checked = ' checked ';
diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index f69d63391e0..9aa6a91d7c0 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2015      Ion Agorria          <ion@agorria.com>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -345,7 +345,7 @@ class PriceParser
 	{
 		//Get the product data
 		$product = new Product($this->db);
-		$product->fetch($product_id, '', '', 1);
+		$product->fetch($product_id, '', '', '1');
 
 		//Values for product expressions
 		$extra_values = array_merge($extra_values, array(
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index fdca1c4133a..ad9f60e0a1c 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2019       Pierre Ardoin           <mapiolca@me.com>
  * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2019       Nicolas ZABOURI         <info@inovea-conseil.com>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -119,7 +119,7 @@ print load_fiche_titre($transAreaType, $resultboxes['selectboxlist'], 'product')
 
 
 if (getDolGlobalString('MAIN_SEARCH_FORM_ON_HOME_AREAS')) {     // This may be useless due to the global search combo
-	if (!isset($listofsearchfields) || !is_array($listofsearchfields)) {
+	if (!isset($listofsearchfields) || !is_array($listofsearchfields)) { // @phan-suppress-current-line PhanPluginUndeclaredVariableIsset
 		// Ensure $listofsearchfields is set and array
 		$listofsearchfields = array();
 	}
@@ -743,7 +743,7 @@ function activitytrim($product_type)
 	$sql .= " AND pf.fk_facture = f.rowid";
 	$sql .= " AND pf.fk_paiement = p.rowid";
 	$sql .= " AND fd.product_type = ".((int) $product_type);
-	$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($yearofbegindate), 1)."'";
+	$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($yearofbegindate, 1))."'";
 	$sql .= " GROUP BY annee, mois ";
 	$sql .= " ORDER BY annee, mois ";
 
diff --git a/htdocs/product/inventory/ajax/searchfrombarcode.php b/htdocs/product/inventory/ajax/searchfrombarcode.php
index 5f1191aaf38..8f2a81a4936 100644
--- a/htdocs/product/inventory/ajax/searchfrombarcode.php
+++ b/htdocs/product/inventory/ajax/searchfrombarcode.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW	<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  */
 /*
  * This program is free software; you can redistribute it and/or modify
@@ -90,10 +90,10 @@ if ($action == "existbarcode" && !empty($barcode) && $user->hasRight('stock', 'l
 		$sql .= " WHERE p.barcode = '".$db->escape($barcode)."'";
 	}
 	if (!empty($fk_entrepot)) {
-		$sql .= " AND ps.fk_entrepot = '".$db->escape($fk_entrepot)."'";
+		$sql .= " AND ps.fk_entrepot = '".((int) ($fk_entrepot))."'";
 	}
 	if (!empty($fk_product)) {
-		$sql .= " AND ps.fk_product = '".$db->escape($fk_product)."'";
+		$sql .= " AND ps.fk_product = '".((int) ($fk_product))."'";
 	}
 	$result = $db->query($sql);
 	if ($result) {
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 81c52b976da..5f18b5acfa5 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -271,6 +272,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print dol_get_fiche_head($head, 'card', $langs->trans("Inventory"), -1, 'stock');
 
 	$formconfirm = '';
+	$text = '';
 
 
 	// Confirmation of action xxxx
@@ -450,9 +452,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 
 			// Clone
-			if ($permissiontoadd) {
-				//print dolGetButtonAction($langs->trans("ToClone"), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=inventory', 'clone', $permissiontoadd);
-			}
+			//if ($permissiontoadd) {
+			//print dolGetButtonAction($langs->trans("ToClone"), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=inventory', 'clone', $permissiontoadd);
+			//}
 
 			// Delete
 			print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $permissiontodelete);
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 4d860191269..5e69da95eed 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2019 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -227,7 +228,7 @@ if (empty($reshook)) {
 							$price = $line->pmp_real;
 						}
 
-						$idstockmove = $stockmovment->_create($user, $line->fk_product, $line->fk_warehouse, $stock_movement_qty, $movement_type, $price, $langs->trans('LabelOfInventoryMovemement', $object->ref), $inventorycode, $datemovement, '', '', $line->batch);
+						$idstockmove = $stockmovment->_create($user, $line->fk_product, $line->fk_warehouse, (float) $stock_movement_qty, $movement_type, $price, $langs->trans('LabelOfInventoryMovemement', $object->ref), $inventorycode, $datemovement, '', '', $line->batch);
 						if ($idstockmove < 0) {
 							$error++;
 							setEventMessages($stockmovment->error, $stockmovment->errors, 'errors');
@@ -789,7 +790,7 @@ if ($action == 'updatebyscaning') {
 							console.log("We change #"+product.Id+"_input to match input in scanner box");
 							if(product.hasOwnProperty("reelqty")){
 								$.ajax({ url: \''.DOL_URL_ROOT.'/product/inventory/ajax/searchfrombarcode.php\',
-									data: { "token":"'.newToken().'", "action":"addnewlineproduct", "fk_entrepot":product.Warehouse, "batch":product.Batch, "fk_inventory":'.dol_escape_js($object->id).', "fk_product":product.fk_product, "reelqty":product.reelqty},
+									data: { "token":"'.newToken().'", "action":"addnewlineproduct", "fk_entrepot":product.Warehouse, "batch":product.Batch, "fk_inventory":'.dol_escape_js((string) $object->id).', "fk_product":product.fk_product, "reelqty":product.reelqty},
 									type: \'POST\',
 									async: false,
 									success: function(response) {
@@ -1001,7 +1002,7 @@ if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STAT
 	} else {
 		$filtertype = 0;
 	}
-	print $form->select_produits((GETPOSTISSET('fk_product') ? GETPOSTINT('fk_product') : $object->fk_product), 'fk_product', $filtertype, 0, 0, -1, 2, '', 0, null, 0, '1', 0, 'maxwidth300');
+	print $form->select_produits((GETPOSTISSET('fk_product') ? GETPOSTINT('fk_product') : $object->fk_product), 'fk_product', $filtertype, 0, 0, -1, 2, '', 0, array(), 0, '1', 0, 'maxwidth300');
 	print '</td>';
 	if (isModEnabled('productbatch')) {
 		print '<td>';
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 6c93ecfdd39..e99979b0a91 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -122,11 +123,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval((string) $val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -453,8 +454,8 @@ 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 .= 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.'/product/inventory/card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 
@@ -563,7 +564,7 @@ foreach ($object->fields as $key => $val) {
 		} 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, 'minwidth100imp maxwidth125', 2);
+			print $formadmin->select_language($search[$key], 'search_lang', 0, array(), 1, 0, 0, 'minwidth100imp maxwidth125', 2);
 		} else {
 			print '<input type="text" class="flat maxwidth'.($val['type'] == 'integer' ? '50' : '75').'" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
@@ -574,7 +575,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -617,7 +618,7 @@ foreach ($object->fields as $key => $val) {
 // 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, 'totalarray'=>&$totalarray);
+$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
@@ -712,13 +713,13 @@ while ($i < $imaxinloop) {
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
 				print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield) && !is_numeric($object->$key)) {
-					print ' title="'.dol_escape_htmltag($object->$key).'"';
+					print ' title="'.dol_escape_htmltag((string) $object->$key).'"';
 				}
 				print '>';
 				if ($key == 'status') {
 					print $object->getLibStatut(5);
 				} elseif ($key == 'rowid') {
-					print $object->showOutputField($val, $key, $object->id, '');
+					print $object->showOutputField($val, $key, (string) $object->id, '');
 				} else {
 					print $object->showOutputField($val, $key, $object->$key, '');
 				}
@@ -743,7 +744,7 @@ while ($i < $imaxinloop) {
 		// 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);
+		$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;
 		// Action column
@@ -786,7 +787,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index aa378d1c85c..bbf883954ba 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -14,7 +14,7 @@
  * Copyright (C) 2020-2021	Open-DSI                <support@open-dsi.fr>
  * Copyright (C) 2022		Charlene Benke          <charlene@patas-monkey.com>
  * Copyright (C) 2020-2023	Alexandre Spangaro      <aspangaro@easya.solutions>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Benjamin Falière		<benjamin.faliere@altairis.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
@@ -313,7 +313,7 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 		} else {
 			$labelp = $langs->transnoentitiesnoconv("SellingPrice")." ".$i;
 		}
-		$arrayfields['p.sellprice'.$i] = array('label' => $labelp, 'checked' => ($i == 1 ? 1 : 0), 'enabled' => getDolGlobalString('PRODUIT_MULTIPRICES'), 'position' => (float) ('40.'.sprintf('%03d', $i)));
+		$arrayfields['p.sellprice'.$i] = array('label' => $labelp, 'checked' => ($i == 1 ? '1' : '0'), 'enabled' => getDolGlobalString('PRODUIT_MULTIPRICES'), 'position' => (float) ('40.'.sprintf('%03d', $i)));
 		$arraypricelevel[$i] = array($i);
 	}
 }
@@ -323,7 +323,8 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+// Note: forcing int for position, but in reality it is a float here.
+'@phan-var-force array<string,array{label:string,checked?:string,position?:int,enabled?:string,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
 
 // Security check
 if ($search_type == '0') {
@@ -440,6 +441,7 @@ if (empty($reshook)) {
  */
 
 $product_static = new Product($db);
+$workstation_static = null;
 if (isModEnabled('workstation')) {
 	$workstation_static = new Workstation($db);
 }
@@ -898,6 +900,7 @@ $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'));
 
+$perm = false;
 if ($type === "") {
 	$perm = ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer'));
 } elseif ($type == Product::TYPE_SERVICE) {
@@ -913,11 +916,11 @@ if ($type === "") {
 $newcardbutton .= dolGetButtonTitleSeparator();
 if ((isModEnabled('product') && $type === "") || $type == Product::TYPE_PRODUCT) {
 	$label = 'NewProduct';
-	$newcardbutton .= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type=0', '', $perm, $params);
+	$newcardbutton .= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type=0', '', (int) $perm, $params);
 }
 if ((isModEnabled('service') && $type === "") || $type == Product::TYPE_SERVICE) {
 	$label = 'NewService';
-	$newcardbutton .= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type=1', '', $perm, $params);
+	$newcardbutton .= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type=1', '', (int) $perm, $params);
 }
 
 print '<form id="searchFormList" action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formulaire">';
@@ -1242,7 +1245,7 @@ if (!empty($arrayfields['p.fk_country']['checked'])) {
 // State
 if (!empty($arrayfields['p.fk_state']['checked'])) {
 	print '<td class="liste_titre center">';
-	print $formcompany->select_state($search_state, $search_country);
+	print $formcompany->select_state((int) $search_state, $search_country);
 	print '</td>';
 }
 // Accountancy code sell
@@ -1961,7 +1964,7 @@ while ($i < $imaxinloop) {
 		// Default Workstation
 		if (!empty($arrayfields['p.fk_default_workstation']['checked'])) {
 			print '<td align="left">';
-			if (isModEnabled('workstation') && !empty($obj->fk_default_workstation)) {
+			if (isModEnabled('workstation') && !empty($obj->fk_default_workstation) && $workstation_static !== null) {
 				$workstation_static->id = $obj->fk_default_workstation;
 				$workstation_static->ref = $obj->ref_workstation;
 				$workstation_static->status = $obj->status_workstation;
@@ -1990,14 +1993,10 @@ while ($i < $imaxinloop) {
 			}
 		}
 
+		$productpricescache = array();
 		// Multiprices
 		if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
-			if (! isset($productpricescache)) {
-				$productpricescache = array();
-			}
-			if (! isset($productpricescache[$obj->rowid])) {
-				$productpricescache[$obj->rowid] = array();
-			}
+			$productpricescache[$obj->rowid] = array();
 
 			if ($product_static->status && $usercancreadprice) {
 				// Make 1 request for all price levels (without filter on price_level) and saved result into an cache array
@@ -2027,6 +2026,7 @@ while ($i < $imaxinloop) {
 					dol_print_error($db);
 				}
 			}
+			'@phan-var-force array<int,array<int,array{price:string,price_ttc:string,price_base_type:string}>> $productpricescache';
 
 			foreach ($arraypricelevel as $key => $value) {
 				if (!empty($arrayfields['p.sellprice'.$key]['checked'])) {
@@ -2073,7 +2073,7 @@ while ($i < $imaxinloop) {
 			if ($product_static->status_buy && $usercancreadprice) {
 				if (count($productFournList = $product_fourn->list_product_fournisseur_price($obj->rowid)) > 0) {
 					$htmltext = $product_fourn->display_price_product_fournisseur(1, 1, 0, 1, $productFournList);
-					print $form->textwithpicto(count($productFournList), $htmltext);
+					print $form->textwithpicto((string) count($productFournList), $htmltext);
 				}
 			}
 			print '</td>';
@@ -2275,7 +2275,7 @@ while ($i < $imaxinloop) {
 		// Import ID
 		if (!empty($arrayfields['p.import_key']['checked'])) {
 			print '<td class="center nowrap">';
-			print dol_escape_htmltag($product_static->import_key);
+			print dol_escape_htmltag((string) $product_static->import_key);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index deff4d29ece..c0f087f9d49 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -108,6 +108,7 @@ if ($object->id > 0) {
 	restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 }
 
+$maxpricesupplier = 0;
 
 /*
  * Actions
@@ -235,7 +236,7 @@ if (empty($reshook)) {
 					//$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
 					$localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retrieve them.
 					$level = $i;
-					$ret = $object->updatePrice($oldprice, $oldpricebasetype, $user, $tva_tx, $oldminprice, $level, $oldnpr, 0, 0, $localtaxarray, $vatratecode, $price_label);
+					$ret = $object->updatePrice($oldprice, $oldpricebasetype, $user, (float) $tva_tx, $oldminprice, $level, $oldnpr, 0, 0, $localtaxarray, $vatratecode, $price_label);
 
 					if ($ret < 0) {
 						$error++;
@@ -257,7 +258,7 @@ if (empty($reshook)) {
 				//$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
 				$localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retrieve them when required.
 				$level = 0;
-				$ret = $object->updatePrice($oldprice, $oldpricebasetype, $user, $tva_tx, $oldminprice, $level, $oldnpr, 0, 0, $localtaxarray, $vatratecode, $price_label);
+				$ret = $object->updatePrice($oldprice, $oldpricebasetype, $user, (float) $tva_tx, $oldminprice, $level, $oldnpr, 0, 0, $localtaxarray, $vatratecode, $price_label);
 
 				if ($ret < 0) {
 					$error++;
@@ -275,6 +276,8 @@ if (empty($reshook)) {
 		$action = '';
 	}
 
+	$maxpricesupplier = 0;
+
 	if (($action == 'update_price' || $action == 'update_level_price') && !$cancel && $object->getRights()->creer) {
 		$error = 0;
 		$pricestoupdate = array();
@@ -507,7 +510,7 @@ if (empty($reshook)) {
 				}
 				// If price has changed, we update it
 				if (!array_key_exists($key, $object->multiprices) || $object->multiprices[$key] != $newprice || $object->multiprices_min[$key] != $newprice_min || $object->multiprices_base_type[$key] != $val['price_base_type'] || $object->multiprices_tva_tx[$key] != $newvattx) {
-					$res = $object->updatePrice($newprice, $val['price_base_type'], $user, $val['vat_tx'], $newprice_min, $key, $val['npr'], $psq, 0, $val['localtaxes_array'], $val['default_vat_code'], $val['price_label']);
+					$res = $object->updatePrice((float) $newprice, $val['price_base_type'], $user, (float) $val['vat_tx'], (float) $newprice_min, $key, $val['npr'], $psq, 0, $val['localtaxes_array'], $val['default_vat_code'], $val['price_label']);
 					if ($res > 0) {
 						$extralabels = $extrafields->fetch_name_optionals_label("product");
 						if (!getDolGlobalString('PRODUIT_MULTIPRICES') && !getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES') && !empty($extralabels)) {
@@ -799,9 +802,9 @@ if (empty($reshook)) {
 			$error++;
 			$action = 'add_customer_price';
 		}
-		if (getDolGlobalString('PRODUCT_MINIMUM_RECOMMENDED_PRICE') && $prodcustprice->price_min < $maxpricesupplier) {
+		if (getDolGlobalString('PRODUCT_MINIMUM_RECOMMENDED_PRICE') && $prodcustprice->price_min < (float) $maxpricesupplier) {
 			$langs->load("errors");
-			setEventMessages($langs->trans("MinimumPriceLimit", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')), null, 'errors');
+			setEventMessages($langs->trans("MinimumPriceLimit", price((float) $maxpricesupplier, 0, '', 1, -1, -1, 'auto')), null, 'errors');
 			$error++;
 			$action = 'add_customer_price';
 		}
@@ -1030,9 +1033,10 @@ print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
 print '<table class="border tableforfield centpercent">';
 
+$soc = null;
+
 // Price per customer segment/level
 if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) {
-	$soc = null;
 	// Price and min price are variable (depends on level of company).
 	if (!empty($socid)) {
 		$soc = new Societe($db);
@@ -1043,7 +1047,7 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUS
 		if (isModEnabled("product") && isModEnabled("service")) {
 			$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 			print '<tr><td class="">';
-			print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
+			print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', (string) $object->type, $object, 0, $typeformat) : $langs->trans('Type');
 			print '</td><td>';
 			print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
 			print '</td></tr>';
@@ -1127,7 +1131,7 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUS
 			if (isModEnabled("product") && isModEnabled("service")) {
 				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 				print '<tr><td class="">';
-				print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
+				print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', (string) $object->type, $object, 0, $typeformat) : $langs->trans('Type');
 				print '</td><td>';
 				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
 				print '</td></tr>';
@@ -1142,7 +1146,7 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUS
 			if (isModEnabled("product") && isModEnabled("service")) {
 				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 				print '<tr><td class="">';
-				print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
+				print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', (string) $object->type, $object, 0, $typeformat) : $langs->trans('Type');
 				print '</td><td>';
 				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
 				print '</td></tr>';
@@ -1319,6 +1323,7 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUS
 					print '<td class="right">'.$langs->trans("Discount").'</td>';
 					print '<td>&nbsp;</td>';
 					print '</tr>';
+					$ii = 0;
 					foreach ($object->prices_by_qty_list[$i] as $ii => $prices) {
 						if ($action == 'edit_price_by_qty' && $rowid == $prices['rowid'] && ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer'))) {
 							print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
@@ -1441,6 +1446,7 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUS
 	print $object->price_label;
 	print '</td></tr>';
 
+	$ii = 0;
 	// Price by quantity
 	if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {    // TODO Fix the form inside tr instead of td
 		print '<tr><td>'.$langs->trans("PriceByQuantity");
@@ -1469,7 +1475,7 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUS
 				print '<input type="hidden" name="priceid" value="'.$object->prices_by_qty_id[0].'">'; // id in product_price
 				print '<input type="hidden" value="0" name="rowid">'; // id in product_price_by_qty
 
-				print '<tr class="'.($ii % 2 == 0 ? 'pair' : 'impair').'">';
+				print '<tr class="'.(($ii % 2) == 0 ? 'pair' : 'impair').'">';  // @phpstan-ignore-line
 				print '<td><input size="5" type="text" value="1" name="quantity"></td>';
 				print '<td class="right"><input class="width50 right" type="text" value="0" name="price"></td>';
 				print '<td>';
@@ -1730,7 +1736,7 @@ if (($action == 'edit_price' || $action == 'edit_level_price') && $object->getRi
 
 		// Price
 		$product = new Product($db);
-		$product->fetch($id, $ref, '', 1); //Ignore the math expression when getting the price
+		$product->fetch($id, $ref, '', '1'); //Ignore the math expression when getting the price
 		print '<tr id="price_numeric"><td>';
 		$text = $langs->trans('SellingPrice');
 		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 'help');
@@ -1753,7 +1759,7 @@ if (($action == 'edit_price' || $action == 'edit_level_price') && $object->getRi
 			print '<input name="price_min" size="10" value="'.price($object->price_min).'">';
 		}
 		if (getDolGlobalString('PRODUCT_MINIMUM_RECOMMENDED_PRICE')) {
-			print ' &nbsp; '.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')).' '.img_warning().'</td>';
+			print ' &nbsp; '.$langs->trans("MinimumRecommendedPrice", price((float) $maxpricesupplier, 0, '', 1, -1, -1, 'auto')).' '.img_warning().'</td>';
 		}
 		print '</td>';
 		print '</tr>';
@@ -1944,7 +1950,7 @@ if (($action == 'edit_price' || $action == 'edit_level_price') && $object->getRi
 			} else {
 				// This option is kept for backward compatibility but has no sense
 				print '<td style="text-align: center">';
-				print $form->load_tva("tva_tx[".$i.']', $object->multiprices_tva_tx[$i], $mysoc, '', $object->id, false, $object->type, false, 1);
+				print $form->load_tva("tva_tx[".$i.']', $object->multiprices_tva_tx[$i], $mysoc, null, $object->id, 0, $object->type, false, 1);
 				print '</td>';
 			}
 
@@ -1966,7 +1972,7 @@ if (($action == 'edit_price' || $action == 'edit_level_price') && $object->getRi
 				print '<input name="price_min['.$i.']" size="10" value="'.price($object->multiprices_min [$i]).'">';
 			}
 			if (getDolGlobalString('PRODUCT_MINIMUM_RECOMMENDED_PRICE')) {
-				print '<td class="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')).' '.img_warning().'</td>';
+				print '<td class="left">'.$langs->trans("MinimumRecommendedPrice", price((float) $maxpricesupplier, 0, '', 1, -1, -1, 'auto')).' '.img_warning().'</td>';
 			}
 			print '</td>';
 
@@ -2056,10 +2062,10 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT
 	}
 
 	// Build filter to display only concerned lines
-	$filter = array('t.fk_product' => $object->id);
+	$filter = array('t.fk_product' => (string) $object->id);
 
 	if (!empty($search_soc)) {
-		$filter['soc.nom'] = $search_soc;
+		$filter['soc.nom'] = (string) $search_soc;
 	}
 
 	if ($action == 'add_customer_price') {
@@ -2327,7 +2333,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT
 		// List of all log of prices by customers
 		print '<!-- list of all log of prices per customer -->'."\n";
 
-		$filter = array('t.fk_product' => $object->id, 't.fk_soc' => GETPOSTINT('socid'));
+		$filter = array('t.fk_product' => (string) $object->id, 't.fk_soc' => (string) GETPOSTINT('socid'));
 
 		// Count total nb of records
 		$nbtotalofrecords = '';
@@ -2396,7 +2402,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT
 				// Local tax is not saved into table of product. We use value linked to VAT code.
 				$localtaxarray = getLocalTaxesFromRate($line->tva_tx.($line->default_vat_code ? ' ('.$line->default_vat_code.')' : ''), 0, $staticsoc, $mysoc);
 				// Define part of HT, VAT, TTC
-				$resultarray = calcul_price_total(1, $pu, 0, $line->tva_tx, 1, 1, 0, $line->price_base_type, $line->recuperableonly, $object->type, $mysoc, $localtaxarray);
+				$resultarray = calcul_price_total(1, $pu, 0, (float) $line->tva_tx, 1, 1, 0, $line->price_base_type, $line->recuperableonly, $object->type, $mysoc, $localtaxarray);
 				// Calcul du total ht sans remise
 				$total_ht = $resultarray[0];
 				$total_vat = $resultarray[1];
@@ -2645,7 +2651,7 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT
 				// Local tax is not saved into table of product. We use value linked to VAT code.
 				$localtaxarray = getLocalTaxesFromRate($line->tva_tx.($line->default_vat_code ? ' ('.$line->default_vat_code.')' : ''), 0, $staticsoc, $mysoc);
 				// Define part of HT, VAT, TTC
-				$resultarray = calcul_price_total(1, $pu, 0, $line->tva_tx, 1, 1, 0, $line->price_base_type, $line->recuperableonly, $object->type, $mysoc, $localtaxarray);
+				$resultarray = calcul_price_total(1, $pu, 0, (float) $line->tva_tx, 1, 1, 0, $line->price_base_type, $line->recuperableonly, $object->type, $mysoc, $localtaxarray);
 				// Calcul du total ht sans remise
 				$total_ht = $resultarray[0];
 				$total_vat = $resultarray[1];
diff --git a/htdocs/product/price_suppliers.php b/htdocs/product/price_suppliers.php
index 32720ebf10a..18d7a0ae6a5 100644
--- a/htdocs/product/price_suppliers.php
+++ b/htdocs/product/price_suppliers.php
@@ -12,6 +12,7 @@
  * Copyright (C) 2019      Tim Otte			    <otte@meuser.it>
  * Copyright (C) 2020      Pierre Ardoin        <mapiolca@me.com>
  * Copyright (C) 2023	   Joachim Kueter		<git-jk@bloxera.com>
+ * Copyright (C) 2025		MDW					<mdeweerd@users.noreply.github.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
@@ -141,7 +142,7 @@ if ($cancel) {
 	$action = '';
 }
 
-$parameters = array('socid'=>$socid, 'id_prod'=>$id);
+$parameters = array('socid' => $socid, 'id_prod' => $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');
@@ -197,9 +198,9 @@ if (empty($reshook)) {
 
 	if ($action == 'save_price' && $usercancreate) {
 		$ref_fourn_price_id = GETPOSTINT('ref_fourn_price_id');
-		$id_fourn = GETPOST("id_fourn");
+		$id_fourn = GETPOSTINT("id_fourn");
 		if (empty($id_fourn)) {
-			$id_fourn = GETPOST("search_id_fourn");
+			$id_fourn = GETPOSTINT("search_id_fourn");
 		}
 		$ref_fourn = GETPOST("ref_fourn");
 		if (empty($ref_fourn)) {
@@ -282,7 +283,7 @@ if (empty($reshook)) {
 			$db->begin();
 
 			if (empty($ref_fourn_price_id)) {
-				$ret = $object->add_fournisseur($user, $id_fourn, $ref_fourn_old, $quantity); // This insert record with no value for price. Values are update later with update_buyprice
+				$ret = $object->add_fournisseur($user, $id_fourn, $ref_fourn_old, (float) $quantity); // This inserts record with no value for price. Values are updated later with update_buyprice
 				if ($ret == -3) {
 					$error++;
 
@@ -324,9 +325,9 @@ if (empty($reshook)) {
 					$multicurrency_price = GETPOSTFLOAT("multicurrency_price");
 					$multicurrency_code = GETPOST("multicurrency_code", 'alpha');
 
-					$ret = $object->update_buyprice($quantity, $newprice, $user, GETPOST("price_base_type"), $supplier, GETPOST("oselDispo"), $ref_fourn, $tva_tx, GETPOST("charges"), $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', $multicurrency_price, GETPOST("multicurrency_price_base_type"), $multicurrency_tx, $multicurrency_code, $supplier_description, $barcode, $fk_barcode_type, $extrafield_values);
+					$ret = $object->update_buyprice((float) $quantity, $newprice, $user, GETPOST("price_base_type"), $supplier, GETPOSTINT("oselDispo"), $ref_fourn, (float) $tva_tx, GETPOST("charges"), (float) $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', $multicurrency_price, GETPOST("multicurrency_price_base_type"), $multicurrency_tx, $multicurrency_code, $supplier_description, $barcode, $fk_barcode_type, $extrafield_values);
 				} else {
-					$ret = $object->update_buyprice($quantity, $newprice, $user, GETPOST("price_base_type"), $supplier, GETPOST("oselDispo"), $ref_fourn, $tva_tx, GETPOST("charges"), $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', 0, 'HT', 1, '', $supplier_description, $barcode, $fk_barcode_type, $extrafield_values);
+					$ret = $object->update_buyprice((float) $quantity, $newprice, $user, GETPOST("price_base_type"), $supplier, GETPOSTINT("oselDispo"), $ref_fourn, (float) $tva_tx, GETPOST("charges"), (float) $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', 0, 'HT', 1, '', $supplier_description, $barcode, $fk_barcode_type, $extrafield_values);
 				}
 				if ($ret < 0) {
 					$error++;
@@ -421,7 +422,7 @@ if ($id > 0 || $ref) {
 			if (isModEnabled("product") && isModEnabled("service")) {
 				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 				print '<tr><td class="">';
-				print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
+				print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', (string) $object->type, $object, 0, $typeformat) : $langs->trans('Type');
 				print '</td><td>';
 				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
 				print '</td></tr>';
@@ -432,7 +433,7 @@ if ($id > 0 || $ref) {
 			$textdesc = $langs->trans("CostPriceDescription");
 			$textdesc .= "<br>".$langs->trans("CostPriceUsage");
 			$text = $form->textwithpicto($langs->trans("CostPrice"), $textdesc, 1, 'help', '');
-			print $form->editfieldkey($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
+			print $form->editfieldkey($text, 'cost_price', (string) $object->cost_price, $object, (int) $usercancreate, 'amount:6');
 			print '</td><td>';
 			print $form->editfieldval($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
 			print '</td></tr>';
@@ -445,7 +446,7 @@ if ($id > 0 || $ref) {
 			print '<tr><td class="titlefieldcreate">';
 			$textdesc = $langs->trans("AverageUnitPricePMPDesc");
 			$text = $form->textwithpicto($langs->trans("AverageUnitPricePMPShort"), $textdesc, 1, 'help', '');
-			print $form->editfieldkey($text, 'pmp', $object->pmp, $object, $usercaneditpmp, 'amount:6');
+			print $form->editfieldkey($text, 'pmp', (string) $object->pmp, $object, $usercaneditpmp, 'amount:6');
 			print '</td><td>';
 			print $form->editfieldval($text, 'pmp', ($object->pmp > 0 ? $object->pmp : ''), $object, $usercaneditpmp, 'amount:6');
 			if ($object->pmp > 0) {
@@ -519,7 +520,7 @@ if ($id > 0 || $ref) {
 					$filter = '(fournisseur:=:1) AND (status:=:1)';
 					print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company(GETPOST("id_fourn", 'alpha'), 'id_fourn', $filter, $langs->transnoentitiesnoconv('SelectThirdParty'), 0, 0, $events);
 
-					$parameters = array('filter'=>$filter, 'html_name'=>'id_fourn', 'selected'=>GETPOST("id_fourn"), 'showempty'=>1, 'prod_id'=>$object->id);
+					$parameters = array('filter' => $filter, 'html_name' => 'id_fourn', 'selected' => GETPOST("id_fourn"), 'showempty' => 1, 'prod_id' => $object->id);
 					$reshook = $hookmanager->executeHooks('formCreateThirdpartyOptions', $parameters, $object, $action);
 					if (empty($reshook)) {
 						if (empty($form->result)) {
@@ -794,7 +795,7 @@ if ($id > 0 || $ref) {
 				if (getDolGlobalString('PRODUCT_CHARGES')) {
 					print '<tr>';
 					print '<td>'.$langs->trans("Charges").'</td>';
-					print '<td><input class="flat" name="charges" size="8" value="'.(GETPOST('charges') ? price(GETPOST('charges')) : (isset($object->fourn_charges) ? price($object->fourn_charges) : '')).'">';
+					print '<td><input class="flat" name="charges" size="8" value="'.(GETPOST('charges') ? price(GETPOST('charges')) : (isset($object->fourn_charges) ? price((string) $object->fourn_charges) : '')).'">';
 					print '</td>';
 					print '</tr>';
 				}
@@ -901,7 +902,7 @@ if ($id > 0 || $ref) {
 				}
 
 				if (is_object($hookmanager)) {
-					$parameters = array('id_fourn'=>!empty($id_fourn) ? $id_fourn : 0, 'prod_id'=>$object->id);
+					$parameters = array('id_fourn' => !empty($id_fourn) ? $id_fourn : 0, 'prod_id' => $object->id);
 					$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
 					print $hookmanager->resPrint;
 				}
@@ -961,22 +962,22 @@ if ($id > 0 || $ref) {
 				// Definition of fields for lists
 				// Some fields are missing because they are not included in the database query
 				$arrayfields = array(
-					'pfp.datec'=>array('label'=>$langs->trans("AppliedPricesFrom"), 'checked'=>1, 'position'=>1),
-					's.nom'=>array('label'=>$langs->trans("Suppliers"), 'checked'=>1, 'position'=>2),
-					'pfp.fk_availability'=>array('label'=>$langs->trans("Availability"), 'enabled' => getDolGlobalInt('FOURN_PRODUCT_AVAILABILITY'), 'checked'=>0, 'position'=>4),
-					'pfp.quantity'=>array('label'=>$langs->trans("QtyMin"), 'checked'=>1, 'position'=>5),
-					'pfp.unitprice'=>array('label'=>$langs->trans("UnitPriceHT"), 'checked'=>1, 'position'=>9),
-					'pfp.multicurrency_unitprice'=>array('label'=>$langs->trans("UnitPriceHTCurrency"), 'enabled' => isModEnabled('multicurrency'), 'checked'=>0, 'position'=>10),
-					'pfp.charges'=>array('label'=>$langs->trans("Charges"), 'enabled' => getDolGlobalString('PRODUCT_CHARGES'), 'checked'=>0, 'position'=>11),
-					'pfp.delivery_time_days'=>array('label'=>$langs->trans("NbDaysToDelivery"), 'checked'=>-1, 'position'=>13),
-					'pfp.supplier_reputation'=>array('label'=>$langs->trans("ReputationForThisProduct"), 'checked'=>-1, 'position'=>14),
-					'pfp.fk_barcode_type'=>array('label'=>$langs->trans("BarcodeType"), 'enabled' => isModEnabled('barcode'), 'checked'=>0, 'position'=>15),
-					'pfp.barcode'=>array('label'=>$langs->trans("BarcodeValue"), 'enabled' => isModEnabled('barcode'), 'checked'=>0, 'position'=>16),
-					'pfp.packaging'=>array('label'=>$langs->trans("PackagingForThisProduct"), 'enabled' => getDolGlobalInt('PRODUCT_USE_SUPPLIER_PACKAGING'), 'checked'=>0, 'position'=>17),
-					'pfp.status'=>array('label'=>$langs->trans("Status"), 'enabled' => 1, 'checked'=>0, 'position'=>40),
-					'pfp.tms'=>array('label'=>$langs->trans("DateModification"), 'enabled' => isModEnabled('barcode'), 'checked'=>1, 'position'=>50),
-					'pfp.price'=>array('label'=>$langs->trans("PriceQtyMinHT"), 'checked'=>1, 'position'=>60),
-					'pfp.multicurrency_price'=>array('label'=>$langs->trans("PriceQtyMinHTCurrency"), 'enabled' => isModEnabled('multicurrency'), 'checked'=>1, 'position'=>70),
+					'pfp.datec' => array('label' => $langs->trans("AppliedPricesFrom"), 'checked' => '1', 'position' => 1),
+					's.nom' => array('label' => $langs->trans("Suppliers"), 'checked' => '1', 'position' => 2),
+					'pfp.fk_availability' => array('label' => $langs->trans("Availability"), 'enabled' => (string) getDolGlobalInt('FOURN_PRODUCT_AVAILABILITY'), 'checked' => '0', 'position' => 4),
+					'pfp.quantity' => array('label' => $langs->trans("QtyMin"), 'checked' => '1', 'position' => 5),
+					'pfp.unitprice' => array('label' => $langs->trans("UnitPriceHT"), 'checked' => '1', 'position' => 9),
+					'pfp.multicurrency_unitprice' => array('label' => $langs->trans("UnitPriceHTCurrency"), 'enabled' => (string) (int) isModEnabled('multicurrency'), 'checked' => '0', 'position' => 10),
+					'pfp.charges' => array('label' => $langs->trans("Charges"), 'enabled' => getDolGlobalString('PRODUCT_CHARGES'), 'checked' => '0', 'position' => 11),
+					'pfp.delivery_time_days' => array('label' => $langs->trans("NbDaysToDelivery"), 'checked' => '-1', 'position' => 13),
+					'pfp.supplier_reputation' => array('label' => $langs->trans("ReputationForThisProduct"), 'checked' => '-1', 'position' => 14),
+					'pfp.fk_barcode_type' => array('label' => $langs->trans("BarcodeType"), 'enabled' => (string) (int) isModEnabled('barcode'), 'checked' => '0', 'position' => 15),
+					'pfp.barcode' => array('label' => $langs->trans("BarcodeValue"), 'enabled' => (string) (int) isModEnabled('barcode'), 'checked' => '0', 'position' => 16),
+					'pfp.packaging' => array('label' => $langs->trans("PackagingForThisProduct"), 'enabled' => (string) getDolGlobalInt('PRODUCT_USE_SUPPLIER_PACKAGING'), 'checked' => '0', 'position' => 17),
+					'pfp.status' => array('label' => $langs->trans("Status"), 'enabled' => '1', 'checked' => '0', 'position' => 40),
+					'pfp.tms' => array('label' => $langs->trans("DateModification"), 'enabled' => (string) (int) isModEnabled('barcode'), 'checked' => '1', 'position' => 50),
+					'pfp.price' => array('label' => $langs->trans("PriceQtyMinHT"), 'checked' => '1', 'position' => 60),
+					'pfp.multicurrency_price' => array('label' => $langs->trans("PriceQtyMinHTCurrency"), 'enabled' => (string) (int) isModEnabled('multicurrency'), 'checked' => '1', 'position' => 70),
 
 				);
 
@@ -990,7 +991,7 @@ if ($id > 0 || $ref) {
 							// Show field if not hidden
 							if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
 								$extratitle = $langs->trans($value);
-								$arrayfields['ef.' . $key] = array('label'    => $extratitle, 'checked' => 0,
+								$arrayfields['ef.' . $key] = array('label'    => $extratitle, 'checked' => '0',
 								'position' => (end($arrayfields)['position'] + 1),
 								'langfile' => $extrafields->attributes["product_fournisseur_price"]['langfile'][$key],
 								'help'     => $extrafields->attributes["product_fournisseur_price"]['help'][$key]);
@@ -1130,7 +1131,7 @@ if ($id > 0 || $ref) {
 				}
 
 				if (is_object($hookmanager)) {
-					$parameters = array('id_fourn'=>(!empty($id_fourn) ? $id_fourn : ''), 'prod_id'=>$object->id, 'nbfields'=>$nbfields);
+					$parameters = array('id_fourn' => (!empty($id_fourn) ? $id_fourn : ''), 'prod_id' => $object->id, 'nbfields' => $nbfields);
 					$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action);
 				}
 				if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
@@ -1237,7 +1238,7 @@ if ($id > 0 || $ref) {
 						// Charges
 						if (!empty($arrayfields['pfp.charges']['checked'])) {	// Possible only when getDolGlobalString('PRODUCT_CHARGES') is set
 							print '<td class="right">';
-							print price($productfourn->fourn_charges);
+							print price((string) $productfourn->fourn_charges);
 							print '</td>';
 						}
 
@@ -1329,7 +1330,7 @@ if ($id > 0 || $ref) {
 						}
 
 						if (is_object($hookmanager)) {
-							$parameters = array('id_pfp'=>$productfourn->product_fourn_price_id, 'id_fourn'=>(!empty($id_fourn) ? $id_fourn : ''), 'prod_id'=>$object->id);
+							$parameters = array('id_pfp' => $productfourn->product_fourn_price_id, 'id_fourn' => (!empty($id_fourn) ? $id_fourn : ''), 'prod_id' => $object->id);
 							$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action);
 						}
 
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 4505e050091..72832801e3f 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005		Eric Seigne				<eric.seigne@ryxeo.com>
  * Copyright (C) 2013		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2019		Thibault FOUCART		<support@ptibogxiv.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -237,13 +237,13 @@ if ($result || !($id > 0)) {
 	print '<tr class="nooddeven"><td class="titlefield">'.$langs->trans("Year").'</td><td>';
 	$arrayyears = array();
 	for ($year = $currentyear - 25; $year < $currentyear; $year++) {
-		$arrayyears[$year] = $year;
+		$arrayyears[$year] = (string) $year;
 	}
 	if (!in_array($year, $arrayyears)) {
-		$arrayyears[$year] = $year;
+		$arrayyears[$year] = (string) $year;
 	}
 	if (!in_array($currentyear, $arrayyears)) {
-		$arrayyears[$currentyear] = $currentyear;
+		$arrayyears[$currentyear] = (string) $currentyear;
 	}
 	arsort($arrayyears);
 	print $form->selectarray('search_year', $arrayyears, $search_year, 1, 0, 0, '', 0, 0, 0, '', 'width75');
@@ -490,30 +490,30 @@ if ($result || !($id > 0)) {
 				continue;
 			}
 
-			if ($graphfiles == 'propal' && !$user->hasRight('propal', 'lire')) {
+			if ($key == 'propal' && !$user->hasRight('propal', 'lire')) {
 				continue;
 			}
-			if ($graphfiles == 'order' && !$user->hasRight('commande', 'lire')) {
+			if ($key == 'order' && !$user->hasRight('commande', 'lire')) {
 				continue;
 			}
-			if ($graphfiles == 'invoices' && !$user->hasRight('facture', 'lire')) {
+			if ($key == 'invoices' && !$user->hasRight('facture', 'lire')) {
 				continue;
 			}
-			if ($graphfiles == 'proposals_suppliers' && !$user->hasRight('supplier_proposal', 'lire')) {
+			if ($key == 'proposals_suppliers' && !$user->hasRight('supplier_proposal', 'lire')) {
 				continue;
 			}
-			if ($graphfiles == 'invoices_suppliers' && !$user->hasRight('fournisseur', 'facture', 'lire')) {
+			if ($key == 'invoices_suppliers' && !$user->hasRight('fournisseur', 'facture', 'lire')) {
 				continue;
 			}
-			if ($graphfiles == 'orders_suppliers' && !$user->hasRight('fournisseur', 'commande', 'lire')) {
+			if ($key == 'orders_suppliers' && !$user->hasRight('fournisseur', 'commande', 'lire')) {
 				continue;
 			}
-			if ($graphfiles == 'mrp' && !$user->hasRight('mrp', 'read')) {
+			if ($key == 'mrp' && !$user->hasRight('mrp', 'read')) {
 				continue;
 			}
 
 
-			if ($i % 2 == 0) {
+			if (($i % 2) == 0) {
 				print "\n".'<div class="fichecenter"><div class="fichehalfleft">'."\n";
 			} else {
 				print "\n".'<div class="fichehalfright">'."\n";
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 20822e9a209..06168cb5237 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -172,10 +173,10 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " AND d.fk_commande = c.rowid";
 			$sql .= " AND d.fk_product = ".((int) $product->id);
 			if (!empty($search_month)) {
-				$sql .= " AND MONTH(c.date_commande) IN (".$db->sanitize($search_month).")";
+				$sql .= " AND MONTH(c.date_commande) = ".((int) $search_month);
 			}
 			if (!empty($search_year)) {
-				$sql .= " AND YEAR(c.date_commande) IN (".$db->sanitize($search_year).")";
+				$sql .= " AND YEAR(c.date_commande) = ".((int) $search_year);
 			}
 			if (!$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
@@ -243,7 +244,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("OrderDate").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.($search_month > 0 ? $search_month : '').'"> ';
-				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
+				print $langs->trans('Year').':'.$formother->selectyear(($search_year ? (string) $search_year : '-1'), 'search_year', 1, 20, 5);
 				print $langs->trans('Status');
 				$formorder->selectOrderStatus($search_status, 1, 'search_status');
 				print '<div style="vertical-align: middle; display: inline-block">';
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 7279c322ef3..1358456ce44 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2024       Charlene Benke             <charlene@patas-monkey.com>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -173,10 +174,10 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " AND d.fk_commande = c.rowid";
 			$sql .= " AND d.fk_product = ".((int) $product->id);
 			if (!empty($search_month)) {
-				$sql .= " AND MONTH(c.date_commande) IN (".$db->sanitize($search_month).")";
+				$sql .= " AND MONTH(c.date_commande) = ".((int) $search_month);
 			}
 			if (!empty($search_year)) {
-				$sql .= " AND YEAR(c.date_commande) IN (".$db->sanitize($search_year).")";
+				$sql .= " AND YEAR(c.date_commande) = ".((int) $search_year);
 			}
 			if (!$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
@@ -244,7 +245,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("OrderDate").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.($search_month > 0 ? $search_month : '').'"> ';
-				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
+				print $langs->trans('Year').':'.$formother->selectyear(($search_year ? (string) $search_year : '-1'), 'search_year', 1, 20, 5);
 				print $langs->trans('Status');
 				$formorder->selectSupplierOrderStatus($search_status, 1, 'search_status');
 				print '<div style="vertical-align: middle; display: inline-block">';
diff --git a/htdocs/product/stats/expedition.php b/htdocs/product/stats/expedition.php
index 595f05526af..83d6c52e444 100644
--- a/htdocs/product/stats/expedition.php
+++ b/htdocs/product/stats/expedition.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2024	   Jean-Rémi Taponier	<jean-remi@netlogic.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -164,10 +165,10 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
 			$sql .= " AND cd.fk_product = ".((int) $product->id);
 			if (!empty($search_month)) {
-				$sql .= ' AND MONTH(e.date_creation) IN ('.$db->sanitize($search_month).')';
+				$sql .= ' AND MONTH(e.date_creation) ='.((int) $search_month);
 			}
 			if (!empty($search_year)) {
-				$sql .= ' AND YEAR(e.date_creation) IN ('.$db->sanitize($search_year).')';
+				$sql .= ' AND YEAR(e.date_creation) ='.((int) $search_year);
 			}
 			if ($socid) {
 				$sql .= " AND e.fk_soc = ".((int) $socid);
@@ -223,7 +224,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("DateCreation").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.($search_month > 0 ? $search_month : '').'"> ';
-				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
+				print $langs->trans('Year').':'.$formother->selectyear(($search_year ? (string) $search_year : '-1'), 'search_year', 1, 20, 5);
 				print '<div style="vertical-align: middle; display: inline-block">';
 				print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 				print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"), 'searchclear.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 82be6f9503a..2ea447de01e 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2013	   Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -165,10 +166,10 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " AND d.fk_facture_fourn = f.rowid";
 			$sql .= " AND d.fk_product = ".((int) $product->id);
 			if (!empty($search_month)) {
-				$sql .= ' AND MONTH(f.datef) IN ('.$db->sanitize($search_month).')';
+				$sql .= ' AND MONTH(f.datef) = '.((int) $search_month);
 			}
 			if (!empty($search_year)) {
-				$sql .= ' AND YEAR(f.datef) IN ('.$db->sanitize($search_year).')';
+				$sql .= ' AND YEAR(f.datef) = '.((int) $search_year);
 			}
 			if (!$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
@@ -227,7 +228,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("DateInvoice").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.($search_month > 0 ? $search_month : '').'"> ';
-				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
+				print $langs->trans('Year').':'.$formother->selectyear(($search_year ? (string) $search_year : '-1'), 'search_year', 1, 20, 5);
 				print '<div style="vertical-align: middle; display: inline-block">';
 				print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 				print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"), 'searchclear.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
diff --git a/htdocs/product/stats/facturerec.php b/htdocs/product/stats/facturerec.php
index 9b08fd822db..04040fad093 100644
--- a/htdocs/product/stats/facturerec.php
+++ b/htdocs/product/stats/facturerec.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2022	   Eric Seigne			<eric.seigne@cap-rel.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -181,10 +182,10 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " AND d.fk_facture = f.rowid";
 			$sql .= " AND d.fk_product = ".((int) $product->id);
 			if (!empty($search_month)) {
-				$sql .= ' AND MONTH(f.datec) IN ('.$db->sanitize($search_month).')';
+				$sql .= ' AND MONTH(f.datec) = '.((int) $search_month);
 			}
 			if (!empty($search_year)) {
-				$sql .= ' AND YEAR(f.datec) IN ('.$db->sanitize($search_year).')';
+				$sql .= ' AND YEAR(f.datec) = '.((int) $search_year);
 			}
 			if (!$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
@@ -243,7 +244,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("DateInvoice").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.($search_month > 0 ? $search_month : '').'"> ';
-				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
+				print $langs->trans('Year').':'.$formother->selectyear(($search_year ? (string) $search_year : '-1'), 'search_year', 1, 20, 5);
 				print '<div style="vertical-align: middle; display: inline-block">';
 				print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 				print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"), 'searchclear.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index 6772312c4f1..f94a7a4fcc4 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -45,6 +45,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 $langs->loadLangs(array('mrp', 'products', 'companies'));
 
 $id = GETPOSTINT('id');
+;
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
@@ -163,10 +164,10 @@ if ($id > 0 || !empty($ref)) {
 		$sql .= " AND c.entity IN (".getEntity('mo').")";
 		$sql .= " AND cd.fk_product = ".((int) $product->id);
 		if (!empty($search_month)) {
-			$sql .= ' AND MONTH(c.date_valid) IN ('.$db->sanitize($search_month).')';
+			$sql .= ' AND MONTH(c.date_valid) = '.((int) $search_month);
 		}
 		if (!empty($search_year)) {
-			$sql .= ' AND YEAR(c.date_valid) IN ('.$db->sanitize($search_year).')';
+			$sql .= ' AND YEAR(c.date_valid) = '.((int) $search_year);
 		}
 		if ($socid > 0) {
 			$sql .= " AND s.rowid = ".((int) $socid);
@@ -220,7 +221,7 @@ if ($id > 0 || !empty($ref)) {
 			print '<div class="divsearchfield">';
 			print $langs->trans('Period').' ('.$langs->trans("DateCreation").') - ';
 			print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.($search_month > 0 ? $search_month : '').'"> ';
-			print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
+			print $langs->trans('Year').':'.$formother->selectyear(($search_year ? (string) $search_year : '-1'), 'search_year', 1, 20, 5);
 			print '<div style="vertical-align: middle; display: inline-block">';
 			print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 			print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"), 'searchclear.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 0b3ca3d1c4c..a508c415e8c 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -167,10 +168,10 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " AND d.fk_propal = p.rowid";
 			$sql .= " AND d.fk_product = ".((int) $product->id);
 			if (!empty($search_month)) {
-				$sql .= ' AND MONTH(p.datep) IN ('.$db->sanitize($search_month).')';
+				$sql .= ' AND MONTH(p.datep) = '.((int) $search_month);
 			}
 			if (!empty($search_year)) {
-				$sql .= ' AND YEAR(p.datep) IN ('.$db->sanitize($search_year).')';
+				$sql .= ' AND YEAR(p.datep) = '.((int) $search_year);
 			}
 			if (!$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
@@ -229,7 +230,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("DatePropal").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.($search_month > 0 ? $search_month : '').'"> ';
-				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
+				print $langs->trans('Year').':'.$formother->selectyear(($search_year ? (string) $search_year : '-1'), 'search_year', 1, 20, 5);
 				print '<div style="vertical-align: middle; display: inline-block">';
 				print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 				print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"), 'searchclear.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
diff --git a/htdocs/product/stats/reception.php b/htdocs/product/stats/reception.php
index d7440722d81..5c41291924d 100644
--- a/htdocs/product/stats/reception.php
+++ b/htdocs/product/stats/reception.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2024	   Jean-Rémi Taponier	<jean-remi@netlogic.fr>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -163,10 +164,10 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " WHERE r.entity IN (".getEntity('reception').")";
 			$sql .= " AND cfd.fk_product = ".((int) $product->id);
 			if (!empty($search_month)) {
-				$sql .= ' AND MONTH(r.date_creation) IN ('.$db->sanitize($search_month).')';
+				$sql .= ' AND MONTH(r.date_creation) = '.((int) $search_month);
 			}
 			if (!empty($search_year)) {
-				$sql .= ' AND YEAR(r.date_creation) IN ('.$db->sanitize($search_year).')';
+				$sql .= ' AND YEAR(r.date_creation) = '.((int) $search_year);
 			}
 			if ($socid) {
 				$sql .= " AND r.fk_soc = ".((int) $socid);
@@ -222,7 +223,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("DateCreation").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.($search_month > 0 ? $search_month : '').'"> ';
-				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
+				print $langs->trans('Year').':'.$formother->selectyear(($search_year ? (string) $search_year : '-1'), 'search_year', 1, 20, 5);
 				print '<div style="vertical-align: middle; display: inline-block">';
 				print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 				print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"), 'searchclear.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index df00f9381a6..9bde87ea5b6 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.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
@@ -164,10 +165,10 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " AND d.fk_supplier_proposal = p.rowid";
 			$sql .= " AND d.fk_product = ".((int) $product->id);
 			if (!empty($search_month)) {
-				$sql .= ' AND MONTH(p.datep) IN ('.$db->sanitize($search_month).')';
+				$sql .= ' AND MONTH(p.datep) = '.((int) $search_month);
 			}
 			if (!empty($search_year)) {
-				$sql .= ' AND YEAR(p.datep) IN ('.$db->sanitize($search_year).')';
+				$sql .= ' AND YEAR(p.datep) = '.((int) $search_year);
 			}
 			if (!$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
@@ -226,7 +227,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("DatePropal").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.($search_month > 0 ? $search_month : '').'"> ';
-				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
+				print $langs->trans('Year').':'.$formother->selectyear(($search_year ? (string) $search_year : '-1'), 'search_year', 1, 20, 5);
 				print '<div style="vertical-align: middle; display: inline-block">';
 				print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 				print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"), 'searchclear.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';

From 99fac7c8d3999678d96c2e09aedf45b99ae16e22 Mon Sep 17 00:00:00 2001
From: MarcVJ <38230768+MarcVJ@users.noreply.github.com>
Date: Sun, 9 Feb 2025 22:20:05 +0100
Subject: [PATCH 582/602] Added one line to allow use of price_ttc in
 calculated extra fields (ex : price per kilo)

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

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index aa378d1c85c..c023c3ca97d 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -1628,7 +1628,8 @@ while ($i < $imaxinloop) {
 	}
 
 	$product_static->price = $obj->price;
-
+	$product_static->price_ttc = $obj->price_ttc; // Allows to use price_ttc in calculated extra fields (ex : price per kilo)
+	
 	$object = $product_static;
 
 	$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('product', 'product_advance', 'read_prices') : $user->hasRight('product', 'lire');

From 4c3329481aa8bbfcc876168ac0120f248121f3a5 Mon Sep 17 00:00:00 2001
From: MarcVJ <38230768+MarcVJ@users.noreply.github.com>
Date: Sun, 9 Feb 2025 22:33:56 +0100
Subject: [PATCH 583/602] Removed incorrect white space on line 1632

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

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index c023c3ca97d..d262f757909 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -1629,7 +1629,7 @@ while ($i < $imaxinloop) {
 
 	$product_static->price = $obj->price;
 	$product_static->price_ttc = $obj->price_ttc; // Allows to use price_ttc in calculated extra fields (ex : price per kilo)
-	
+
 	$object = $product_static;
 
 	$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('product', 'product_advance', 'read_prices') : $user->hasRight('product', 'lire');

From c9bedf8fe232d167729c2e831556291c35804c30 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 10 Feb 2025 11:15:08 +0100
Subject: [PATCH 584/602] Qual: Fix phan notices (stock-1)

---
 dev/tools/phan/baseline.txt                   | 28 +++----
 htdocs/core/class/html.form.class.php         | 14 ++--
 htdocs/core/class/html.formfile.class.php     | 41 +++++-----
 htdocs/product/stock/card.php                 | 29 ++++----
 htdocs/product/stock/class/entrepot.class.php |  3 +-
 .../stock/class/mouvementstock.class.php      | 12 +--
 htdocs/product/stock/info.php                 |  6 +-
 htdocs/product/stock/list.php                 | 24 +++---
 htdocs/product/stock/massstockmove.php        | 12 +--
 htdocs/product/stock/movement_card.php        | 73 ++++++++++--------
 htdocs/product/stock/movement_list.php        | 74 +++++++++----------
 11 files changed, 165 insertions(+), 151 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index 611fce90ddb..e4d6b885ce3 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,15 +9,15 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 2090+ occurrences
-    // PhanUndeclaredProperty : 530+ occurrences
+    // PhanTypeMismatchArgument : 2050+ occurrences
+    // PhanUndeclaredProperty : 520+ occurrences
     // PhanTypeMismatchArgumentNullable : 410+ occurrences
-    // PhanUndeclaredGlobalVariable : 190+ occurrences
+    // PhanUndeclaredGlobalVariable : 180+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 170+ occurrences
-    // PhanPossiblyUndeclaredGlobalVariable : 140+ occurrences
     // PhanTypeMismatchProperty : 130+ occurrences
-    // PhanTypeMismatchArgumentProbablyReal : 120+ occurrences
+    // PhanPossiblyUndeclaredGlobalVariable : 120+ occurrences
     // PhanPluginUnknownArrayMethodParamType : 110+ occurrences
+    // PhanTypeMismatchArgumentProbablyReal : 110+ occurrences
     // PhanRedefineFunction : 40+ occurrences
     // PhanTypeExpectedObjectPropAccess : 40+ occurrences
     // PhanTypeInvalidDimOffset : 25+ occurrences
@@ -28,16 +28,16 @@ return [
     // PhanUndeclaredMethod : 10+ occurrences
     // PhanTypeComparisonFromArray : 9 occurrences
     // PhanPluginSuspiciousParamPosition : 7 occurrences
-    // PhanPluginUnknownObjectMethodCall : 7 occurrences
     // PhanPluginDuplicateExpressionBinaryOp : 6 occurrences
+    // PhanPluginUnknownObjectMethodCall : 6 occurrences
     // PhanTypeArraySuspiciousNull : 6 occurrences
     // PhanParamTooMany : 5 occurrences
     // PhanEmptyForeach : 4 occurrences
-    // PhanPluginBothLiteralsBinaryOp : 4 occurrences
     // PhanPluginDuplicateArrayKey : 4 occurrences
     // PhanPluginEmptyStatementIf : 4 occurrences
     // PhanEmptyFQSENInClasslike : 3 occurrences
     // PhanInvalidFQSENInClasslike : 3 occurrences
+    // PhanPluginBothLiteralsBinaryOp : 3 occurrences
     // PhanTypeMismatchDimAssignment : 2 occurrences
     // PhanTypeMismatchDimFetchNullable : 2 occurrences
     // PhanTypeSuspiciousStringExpression : 2 occurrences
@@ -349,7 +349,7 @@ return [
         'htdocs/core/class/hookmanager.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/class/html.form.class.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/class/html.formcompany.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/core/class/html.formfile.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
+        'htdocs/core/class/html.formfile.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/html.formmail.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/core/class/html.formother.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/html.formprojet.class.php' => ['PhanTypeMismatchArgument'],
@@ -598,16 +598,12 @@ return [
         'htdocs/product/inventory/class/inventory.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/price.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/reassort.php' => ['PhanTypeExpectedObjectPropAccessButGotNull'],
-        'htdocs/product/stock/card.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty'],
         'htdocs/product/stock/class/api_stockmovements.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
         'htdocs/product/stock/class/api_warehouses.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
-        'htdocs/product/stock/class/entrepot.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/product/stock/class/mouvementstock.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/stock/info.php' => ['PhanPluginUnknownObjectMethodCall', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/massstockmove.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/stock/movement_card.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/movement_list.php' => ['PhanPluginBothLiteralsBinaryOp', 'PhanPluginUndeclaredVariableIsset', 'PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/product/stock/info.php' => ['PhanUndeclaredProperty'],
+        'htdocs/product/stock/list.php' => ['PhanUndeclaredProperty'],
+        'htdocs/product/stock/movement_card.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/product/stock/movement_list.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/product/stock/product.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/product/stock/productlot_card.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/product/stock/productlot_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 514d9bf10b5..ddc59c1ee53 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2564,7 +2564,7 @@ class Form
 	 *
 	 * @param string 	$action 			Value for $action
 	 * @param string 	$htmlname			Field name in form
-	 * @param int 		$show_empty 		0=list without the empty value, 1=add empty value
+	 * @param int<0,1>	$show_empty 		0=list without the empty value, 1=add empty value
 	 * @param int[] 	$exclude 			Array list of users id to exclude
 	 * @param int<0,1>	$disabled 			If select list must be disabled
 	 * @param int[]|string 	$include 		Array list of users id to include or 'hierarchy' to have only supervised users
@@ -2573,7 +2573,7 @@ class Form
 	 * @param int 		$maxlength 			Maximum length of string into list (0=no limit)
 	 * @param int<-1,1>	$showstatus 		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
 	 * @param string 	$morefilter 		Add more filters into sql request
-	 * @param int 		$showproperties 	Show properties of each attendees
+	 * @param int<0,1>	$showproperties 	Show properties of each attendees
 	 * @param array<int,array{transparency:bool|int<0,1>}> $listofresourceid 	Array with properties of each resource
 	 * @return    string                    HTML select string
 	 */
@@ -2662,14 +2662,14 @@ class Form
 	 *  @param		int|string	$filtertype				Filter on product type (''=nofilter, 0=product, 1=service)
 	 *  @param		int			$limit					Limit on number of returned lines
 	 *  @param		int			$price_level			Level of price to show
-	 *  @param		int			$status					Sell status: -1=No filter on sell status, 0=Products not on sell, 1=Products on sell
-	 *  @param		int			$finished				2=all, 1=finished, 0=raw material
+	 *  @param		int<-1,1>	$status					Sell status: -1=No filter on sell status, 0=Products not on sell, 1=Products on sell
+	 *  @param		int<0,2>	$finished				2=all, 1=finished, 0=raw material
 	 *  @param		string		$selected_input_value	Value of preselected input text (for use with ajax)
-	 *  @param		int			$hidelabel				Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)
+	 *  @param		int<0,3>	$hidelabel				Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)
 	 *  @param		array<string,string|string[]>	$ajaxoptions			Options for ajax_autocompleter
 	 *  @param      int			$socid					Thirdparty Id (to get also price dedicated to this customer)
-	 *  @param		string|int<0,1>	$showempty			'' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.
-	 * 	@param		int			$forcecombo				Force to use combo box.
+	 *  @param		string|int<0,1>	$showempty				'' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.
+	 * 	@param		int<0,1>	$forcecombo				Force to use combo box.
 	 *  @param      string      $morecss                Add more css on select
 	 *  @param      int<0,1>	$hidepriceinlabel       1=Hide prices in label
 	 *  @param      string      $warehouseStatus        Warehouse status filter to count the quantity in stock. Following comma separated filter options can be used
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 85cedff7d47..1558bfea3dc 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -396,8 +396,8 @@ class FormFile
 	 *      @param      string				$modulesubdir       Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
 	 *      @param      string				$filedir            Directory to scan
 	 *      @param      string				$urlsource          Url of origin page (for return)
-	 *      @param      int					$genallowed         Generation is allowed (1/0 or array of formats)
-	 *      @param      int					$delallowed         Remove is allowed (1/0)
+	 *      @param      int<0,1>			$genallowed         Generation is allowed (1/0 or array of formats)
+	 *      @param      int<0,1>			$delallowed         Remove is allowed (1/0)
 	 *      @param      string				$modelselected      Model to preselect by default
 	 *      @param      integer				$allowgenifempty	Show warning if no model activated
 	 *      @param      integer				$forcenomultilang	Do not show language option (even if MAIN_MULTILANGS defined)
@@ -427,24 +427,24 @@ class FormFile
 	 *      @param      string				$modulesubdir       Existing (so sanitized) sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into a subdir of module.
 	 *      @param      string				$filedir            Directory to scan (must not end with a /). Example: '/mydolibarrdocuments/facture/FAYYMM-1234'
 	 *      @param      string				$urlsource          Url of origin page (for return)
-	 *      @param      int|string[]        $genallowed         Generation is allowed (1/0 or array list of templates)
-	 *      @param      int					$delallowed         Remove is allowed (1/0)
+	 *      @param      int<0,1>|string[]	$genallowed         Generation is allowed (1/0 or array list of templates)
+	 *      @param      int<0,1>			$delallowed         Remove is allowed (1/0)
 	 *      @param      string				$modelselected      Model to preselect by default
-	 *      @param      integer				$allowgenifempty	Allow generation even if list of template ($genallowed) is empty (show however a warning)
-	 *      @param      integer				$forcenomultilang	Do not show language option (even if MAIN_MULTILANGS defined)
+	 *      @param      int<0,1>			$allowgenifempty	Allow generation even if list of template ($genallowed) is empty (show however a warning)
+	 *      @param      int<0,1>			$forcenomultilang	Do not show language option (even if MAIN_MULTILANGS defined)
 	 *      @param      int					$iconPDF            Deprecated, see getDocumentsLink
 	 * 		@param		int					$notused	        Not used
-	 * 		@param		integer				$noform				Do not output html form tags
+	 * 		@param		int<0,1>			$noform				Do not output html form tags
 	 * 		@param		string				$param				More param on http links
 	 * 		@param		string				$title				Title to show on top of form. Example: '' (Default to "Documents") or 'none'
 	 * 		@param		string				$buttonlabel		Label on submit button
 	 * 		@param		string				$codelang			Default language code to use on lang combo box if multilang is enabled
 	 * 		@param		string				$morepicto			Add more HTML content into cell with picto
 	 *      @param      Object|null         $object             Object when method is called from an object card.
-	 *      @param		int					$hideifempty		Hide section of generated files if there is no file
+	 *      @param		int<0,1>			$hideifempty		Hide section of generated files if there is no file
 	 *      @param      string              $removeaction       (optional) The action to remove a file
 	 *      @param		string				$tooltipontemplatecombo		Text to show on a tooltip after the combo list of templates
-	 * 		@return		string|int             					Output string with HTML array of documents (might be empty string)
+	 * 		@return		string|int<-1,-1>           					Output string with HTML array of documents (might be empty string)
 	 */
 	public function showdocuments($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed = 0, $modelselected = '', $allowgenifempty = 1, $forcenomultilang = 0, $iconPDF = 0, $notused = 0, $noform = 0, $param = '', $title = '', $buttonlabel = '', $codelang = '', $morepicto = '', $object = null, $hideifempty = 0, $removeaction = 'remove_file', $tooltipontemplatecombo = '')
 	{
@@ -947,6 +947,8 @@ class FormFile
 					}
 				}
 
+				'@phan-var-force array<array{name:string,path:string,level1name:string,relativename:string,fullname:string,date:string,size:int,perm:int,type:string,position_name:string,cover:string,keywords:string,acl:string,rowid:int,label:string,share:string}> $file_list';
+
 				require_once DOL_DOCUMENT_ROOT . '/ecm/class/ecmfiles.class.php';
 
 				$i = 0;
@@ -1145,13 +1147,13 @@ class FormFile
 	 *  You may want to call this into a div like this:
 	 *  print '<div class="inline-block valignmiddle">'.$formfile->getDocumentsLink($element_doc, $filename, $filedir).'</div>';
 	 *
-	 *	@param	string	$modulepart		'propal', 'facture', 'facture_fourn', ...
-	 *	@param	string	$modulesubdir	Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
-	 *	@param	string	$filedir		Full path to directory to scan
-	 *  @param	string	$filter			Filter filenames on this regex string (Example: '\.pdf$')
-	 *  @param	string	$morecss		Add more css to the download picto
-	 *  @param	int 	$allfiles		0=Only generated docs, 1=All files
-	 *	@return	string              	Output string with HTML link of documents (might be empty string). This also fill the array ->infofiles
+	 *	@param	string		$modulepart		'propal', 'facture', 'facture_fourn', ...
+	 *	@param	string		$modulesubdir	Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
+	 *	@param	string		$filedir		Full path to directory to scan
+	 *  @param	string		$filter			Filter filenames on this regex string (Example: '\.pdf$')
+	 *  @param	string		$morecss		Add more css to the download picto
+	 *  @param	int<0,1>	$allfiles		0=Only generated docs, 1=All files
+	 *	@return	string				   	Output string with HTML link of documents (might be empty string). This also fill the array ->infofiles
 	 */
 	public function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter = '', $morecss = 'valignmiddle', $allfiles = 0)
 	{
@@ -1373,6 +1375,7 @@ class FormFile
 			if ($permtoeditline < 0) {  // Old behaviour for backward compatibility. New feature should call method with value 0 or 1
 				$permtoeditline = 0;
 				if (in_array($modulepart, array('product', 'produit', 'service'))) {
+					'@phan-var-force Product $object';
 					if ($user->hasRight('produit', 'creer') && $object->type == Product::TYPE_PRODUCT) {
 						$permtoeditline = 1;
 					}
@@ -2352,9 +2355,9 @@ class FormFile
 	 * Show detail icon with link for preview
 	 *
 	 * @param   array{name:string,path:string,level1name:string,relativename:string,fullname:string,date:string,size:int,perm:int,type:string}     $file           Array with data of file. Example: array('name'=>...)
-	 * @param   string    $modulepart     propal, facture, facture_fourn, ...
-	 * @param   string    $relativepath   Relative path of docs
-	 * @param   integer   $ruleforpicto   Rule for picto: 0=Use the generic preview picto, 1=Use the picto of mime type of file). Use a negative value to show a generic picto even if preview not available.
+	 * @param   string		$modulepart     propal, facture, facture_fourn, ...
+	 * @param   string		$relativepath   Relative path of docs
+	 * @param   int<min,1>	$ruleforpicto   Rule for picto: 0=Use the generic preview picto, 1=Use the picto of mime type of file). Use a negative value to show a generic picto even if preview not available.
 	 * @param	string	  $param		  More param on http links
 	 * @return  string    $out            Output string with HTML
 	 */
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 1914448023d..41bcc14c066 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2021-2024  Frédéric France			<frederic.france@free.fr>
  * Copyright (C) 2022-2023	Charlene Benke			<charlene@patas-monkey.com>
  * Copyright (C) 2023       Christian Foellmann     <christian@foellmann.de>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -212,14 +212,14 @@ if (empty($reshook)) {
 		if ($object->fetch($id)) {
 			$object->label = GETPOST("libelle");
 			$object->fk_parent   = GETPOST("fk_parent");
-			$object->fk_project = GETPOST('projectid');
+			$object->fk_project = GETPOSTINT('projectid');
 			$object->description = GETPOST("desc", 'restricthtml');
 			$object->statut      = GETPOST("statut");
 			$object->lieu        = GETPOST("lieu");
 			$object->address     = GETPOST("address");
 			$object->zip         = GETPOST("zipcode");
 			$object->town        = GETPOST("town");
-			$object->country_id  = GETPOST("country_id");
+			$object->country_id  = GETPOSTINT("country_id");
 			$object->phone = GETPOST("phone");
 			$object->fax = GETPOST("fax");
 
@@ -292,6 +292,7 @@ $form = new Form($db);
 $formproduct = new FormProduct($db);
 $formcompany = new FormCompany($db);
 $formfile = new FormFile($db);
+$formproject = null;
 if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
@@ -330,10 +331,10 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Project
-	if (isModEnabled('project')) {
+	if (isModEnabled('project') && $formproject !== null) {
 		$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');
+		print img_picto('', 'project').$formproject->select_projects(($socid > 0 ? $socid : -1), (string) $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
 		print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$socid.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$socid).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 		print '</td></tr>';
 	}
@@ -402,7 +403,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, 3);
-		print img_picto('', 'category', 'class="pictofixedwidth"').$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, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 		print "</td></tr>";
 	}
 	print '</table>';
@@ -457,7 +458,7 @@ if ($action == 'create') {
 			$morehtmlref .= $langs->trans("LocationSummary").' : '.$object->lieu;
 
 			// Project
-			if (isModEnabled('project')) {
+			if (isModEnabled('project') && $formproject !== null) {
 				$langs->load("projects");
 				$morehtmlref .= '<br>'.img_picto('', 'project').' '.$langs->trans('Project').' ';
 				if ($usercancreate) {
@@ -469,11 +470,11 @@ if ($action == 'create') {
 						$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(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
+						$morehtmlref .= $formproject->select_projects(($socid > 0 ? $socid : -1), (string) $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
 						$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 						$morehtmlref .= '</form>';
 					} else {
-						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, ($socid > 0 ? $socid : -1), $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
+						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, ($socid > 0 ? $socid : -1), (string) $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 					}
 				} else {
 					if (!empty($object->fk_project)) {
@@ -555,6 +556,7 @@ if ($action == 'create') {
 				$sql = "SELECT max(m.datem) as datem";
 				$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
 				$sql .= " WHERE m.fk_entrepot = ".((int) $object->id);
+				$lastmovementdate = 0;
 				$resqlbis = $db->query($sql);
 				if ($resqlbis) {
 					$obj = $db->fetch_object($resqlbis);
@@ -818,6 +820,7 @@ if ($action == 'create') {
 					print '<td class="right amount nowraponall">'.price(price2num($objp->ppmp * $objp->value, 'MT')).'</td>';
 					$totalvalue += price2num($objp->ppmp * $objp->value, 'MT');
 
+					$pricemin = 0;
 					// Price sell min
 					if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 						$pricemin = $objp->price;
@@ -914,11 +917,11 @@ if ($action == 'create') {
 			print '</td></tr>';
 
 			// Project
-			if (isModEnabled('project')) {
+			if (isModEnabled('project') && $formproject !== null) {
 				$projectid = $object->fk_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');
+				print img_picto('', 'project').$formproject->select_projects(($socid > 0 ? $socid : -1), (string) $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
 				print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.($socid > 0 ? $socid : "").'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create'.($socid > 0 ? '&socid='.$socid : "")).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 				print '</td></tr>';
 			}
@@ -993,7 +996,7 @@ if ($action == 'create') {
 				foreach ($cats as $cat) {
 					$arrayselected[] = $cat->id;
 				}
-				print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 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>";
 			}
 
@@ -1028,7 +1031,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete') {
 	$delallowed = $usercancreate;
 	$modulepart = 'stock';
 
-	print $formfile->showdocuments($modulepart, $objectref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, '', 0, '', '', '', $object);
+	print $formfile->showdocuments($modulepart, $objectref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, '', '', '', '', '', $object);
 	$somethingshown = $formfile->numoffiles;
 
 	print '</div><div class="fichehalfright">';
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index ebe21bdc622..88cdb7a8585 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -1059,7 +1059,8 @@ class Entrepot extends CommonObject
 		if (property_exists($this, 'lieu') && (!empty($this->lieu))) {
 			$return .= '<br><span class="info-box-label opacitymedium">'.$this->lieu.'</span>';
 		}
-		if (property_exists($this, 'sellvalue') && $this->sellvalue != 0) {
+		if (property_exists($this, 'sellvalue') && $this->sellvalue != 0) { // @phan-suppress-current-line PhanUndeclaredProperty
+			// @phan-suppress-next-line PhanUndeclaredProperty
 			$return .= '<br><span class="info-box-label amount">'.price($this->sellvalue).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 1c96b0284e3..7659c066370 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -209,17 +209,17 @@ class MouvementStock extends CommonObject
 	 *	@param		string			$label				Label of stock movement
 	 *	@param		string			$inventorycode		Inventory code
 	 *	@param		int|string		$datem				Force date of movement
-	 *	@param		int|string		$eatby				eat-by date. Will be used if lot does not exists yet and will be created.
-	 *	@param		int|string		$sellby				sell-by date. Will be used if lot does not exists yet and will be created.
+	 *	@param		int|''			$eatby				eat-by date. Will be used if lot does not exists yet and will be created.
+	 *	@param		int|''			$sellby				sell-by date. Will be used if lot does not exists yet and will be created.
 	 *	@param		string			$batch				batch number
-	 *	@param		boolean			$skip_batch			If set to true, stock movement is done without impacting batch record
+	 *	@param		bool			$skip_batch			If set to true, stock movement is done without impacting batch record
 	 * 	@param		int				$id_product_batch	Id product_batch (when skip_batch is false and we already know which record of product_batch to use)
 	 *  @param		int<0,1>		$disablestockchangeforsubproduct	Disable stock change for sub-products of kit (useful only if product is a subproduct)
 	 *  @param		int<0,1>		$donotcleanemptylines				Do not clean lines in stock table with qty=0 (because we want to have this done by the caller)
 	 * 	@param		bool			$force_update_batch	Allows to add batch stock movement even if $product doesn't use batch anymore
 	 *	@return		int									Return integer <0 if KO, 0 if fk_product is null or product id does not exists, >0 if OK
 	 */
-	public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0, $disablestockchangeforsubproduct = 0, $donotcleanemptylines = 0, $force_update_batch = false)
+	public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = 0, $sellby = 0, $batch = '', $skip_batch = false, $id_product_batch = 0, $disablestockchangeforsubproduct = 0, $donotcleanemptylines = 0, $force_update_batch = false)
 	{
 		// phpcs:enable
 		global $conf, $langs;
@@ -363,7 +363,7 @@ class MouvementStock extends CommonObject
 						$obj = $this->db->fetch_object($resql);
 						if ($obj->eatby) {
 							if ($eatby) {
-								$tmparray = dol_getdate($eatby, true);
+								$tmparray = dol_getdate((int) $eatby, true);
 								$eatbywithouthour = dol_mktime(0, 0, 0, $tmparray['mon'], $tmparray['mday'], $tmparray['year']);
 								if ($this->db->jdate($obj->eatby) != $eatby && $this->db->jdate($obj->eatby) != $eatbywithouthour) {    // We test date without hours and with hours for backward compatibility
 									// If found and eatby/sellby defined into table and provided and differs, return error
@@ -392,7 +392,7 @@ class MouvementStock extends CommonObject
 						}
 						if ($obj->sellby) {
 							if ($sellby) {
-								$tmparray = dol_getdate($sellby, true);
+								$tmparray = dol_getdate((int) $sellby, true);
 								$sellbywithouthour = dol_mktime(0, 0, 0, $tmparray['mon'], $tmparray['mday'], $tmparray['year']);
 								if ($this->db->jdate($obj->sellby) != $sellby && $this->db->jdate($obj->sellby) != $sellbywithouthour) {    // We test date without hours and with hours for backward compatibility
 									// If found and eatby/sellby defined into table and provided and differs, return error
diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php
index d400873d96b..8487bd92637 100644
--- a/htdocs/product/stock/info.php
+++ b/htdocs/product/stock/info.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -87,15 +88,16 @@ if (isModEnabled('project')) {
 			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 		}
 		if ($action == 'classify') {
+			$formproject = new FormProjets($db);
 			$projectid = $object->fk_project;
 			$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(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
+			$morehtmlref .= $formproject->select_projects(($socid > 0 ? $socid : -1), (string) $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
 			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			$morehtmlref .= '</form>';
 		} else {
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!empty($object->socid) ? $object->socid : 0), $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!empty($object->socid) ? $object->socid : 0), (string) $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 		}
 	} else {
 		if (!empty($object->fk_project)) {
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index ed830e2cc3e..d00b85f8be8 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2015       Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2020       Tobias Sekan            <tobias.sekan@startmail.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -121,9 +121,9 @@ foreach ($object->fields as $key => $val) {
 
 // Definition of array of fields for columns
 $arrayfields = array(
-	'stockqty' => array('type' => 'float', 'label' => 'PhysicalStock', 'enabled' => 1, 'visible' => -2, 'checked' => 0, 'position' => 170),
-	'estimatedvalue' => array('type' => 'float', 'label' => 'EstimatedStockValue', 'enabled' => 1, 'visible' => 1, 'checked' => 1, 'position' => 171),
-	'estimatedstockvaluesell' => array('type' => 'float', 'label' => 'EstimatedStockValueSell', 'enabled' => 1, 'checked' => 1, 'visible' => 2, 'position' => 172),
+	'stockqty' => array('type' => 'float', 'label' => 'PhysicalStock', 'enabled' => '1', 'visible' => -2, 'checked' => '0', 'position' => 170),
+	'estimatedvalue' => array('type' => 'float', 'label' => 'EstimatedStockValue', 'enabled' => '1', 'visible' => 1, 'checked' => '1', 'position' => 171),
+	'estimatedstockvaluesell' => array('type' => 'float', 'label' => 'EstimatedStockValueSell', 'enabled' => '1', 'checked' => '1', 'visible' => 2, 'position' => 172),
 );
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
@@ -131,8 +131,8 @@ foreach ($object->fields as $key => $val) {
 		$visible = (int) dol_eval((string) $val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
 			'label' => $val['label'],
-			'checked' => (($visible < 0) ? 0 : 1),
-			'enabled' => (abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
+			'checked' => (($visible < 0) ? '0' : '1'),
+			'enabled' => (string) (int) (abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
 			'position' => $val['position'],
 			'help' => isset($val['help']) ? $val['help'] : ''
 		);
@@ -256,7 +256,7 @@ if ($separatedPMP) {
 }
 $sql .= " WHERE t.entity IN (".getEntity('stock').")";
 foreach ($search as $key => $val) {
-	if (array_key_exists($key, $object->fields)||$key == 'status') {
+	if (array_key_exists($key, $object->fields) || $key == 'status') {
 		$class_key = $key;
 		if ($class_key == 'status') {
 			$class_key = 'statut'; // remove this after refactoring entrepot.class property statut to status
@@ -279,10 +279,10 @@ foreach ($search as $key => $val) {
 			$columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key);
 			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
 				if (preg_match('/_dtstart$/', $key)) {
-					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
+					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate((int) $search[$key])."'";
 				}
 				if (preg_match('/_dtend$/', $key)) {
-					$sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
+					$sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate((int) $search[$key])."'";
 				}
 			}
 		}
@@ -581,7 +581,7 @@ foreach ($object->fields as $key => $val) {
 		} 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, 'minwidth100imp maxwidth125', 2);
+			print $formadmin->select_language($search[$key], 'search_lang', 0, array(), 1, 0, 0, 'minwidth100imp maxwidth125', 2);
 		} else {
 			print '<input type="text" class="flat maxwidth'.($val['type'] == 'integer' ? '50' : '75').'" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
@@ -781,7 +781,7 @@ while ($i < $imaxinloop) {
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
 				print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield) && !is_numeric($object->$key)) {
-					print ' title="'.dol_escape_htmltag($object->$key).'"';
+					print ' title="'.dol_escape_htmltag((string) $object->$key).'"';
 				}
 				print '>';
 				if ($key == 'statut') {
@@ -792,7 +792,7 @@ while ($i < $imaxinloop) {
 				} elseif ($key == 'fax') {
 					print dol_print_phone($object->fax, '', 0, $object->id, 'AC_FAX');
 				} else {
-					print $warehouse->showOutputField($val, $key, $object->$key, '');
+					print $warehouse->showOutputField($val, $key, (string) $object->$key, '');
 				}
 				print '</td>';
 				if (!$i) {
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 0290dea17ba..0e55f337b9a 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -228,7 +228,7 @@ if ($action == 'createmovements' && $user->hasRight('stock', 'mouvement', 'creer
 						$result1 = $product->correct_stock(
 							$user,
 							$id_sw,
-							$qty,
+							(float) $qty,
 							1,
 							GETPOST("label"),
 							$pricesrc,
@@ -244,7 +244,7 @@ if ($action == 'createmovements' && $user->hasRight('stock', 'mouvement', 'creer
 					$result2 = $product->correct_stock(
 						$user,
 						$id_tw,
-						$qty,
+						(float) $qty,
 						0,
 						GETPOST("label"),
 						$pricedest,
@@ -275,7 +275,7 @@ if ($action == 'createmovements' && $user->hasRight('stock', 'mouvement', 'creer
 						$result1 = $product->correct_stock_batch(
 							$user,
 							$id_sw,
-							$qty,
+							(float) $qty,
 							1,
 							GETPOST("label"),
 							$pricesrc,
@@ -294,7 +294,7 @@ if ($action == 'createmovements' && $user->hasRight('stock', 'mouvement', 'creer
 					$result2 = $product->correct_stock_batch(
 						$user,
 						$id_tw,
-						$qty,
+						(float) $qty,
 						0,
 						GETPOST("label"),
 						$pricedest,
@@ -699,9 +699,9 @@ if (getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 	$filtertype = '';
 }
 if (getDolGlobalInt('PRODUIT_LIMIT_SIZE') <= 0) {
-	$limit = '';
+	$limit = 0;
 } else {
-	$limit = getDolGlobalString('PRODUIT_LIMIT_SIZE');
+	$limit = getDolGlobalInt('PRODUIT_LIMIT_SIZE');
 }
 print img_picto($langs->trans("Product"), 'product', 'class="paddingright"');
 print $form->select_produits((isset($id_product) ? $id_product : 0), 'productid', $filtertype, $limit, 0, -1, 2, '', 1, array(), 0, '1', 0, 'minwidth200imp maxwidth300', 1, '', null, 1);
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index 9c81e707e3d..590420e2028 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -114,23 +114,23 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 $arrayfields = array(
-	'm.rowid' => array('label' => $langs->trans("Ref"), 'checked' => 1),
-	'm.datem' => array('label' => $langs->trans("Date"), 'checked' => 1),
-	'p.ref' => array('label' => $langs->trans("ProductRef"), 'checked' => 1, 'css' => 'maxwidth100'),
-	'p.label' => array('label' => $langs->trans("ProductLabel"), 'checked' => 1),
-	'm.batch' => array('label' => $langs->trans("BatchNumberShort"), 'checked' => 1, 'enabled' => (isModEnabled('productbatch'))),
-	'pl.eatby' => array('label' => $langs->trans("EatByDate"), 'checked' => 0, 'position' => 10, 'enabled' => (isModEnabled('productbatch'))),
-	'pl.sellby' => array('label' => $langs->trans("SellByDate"), 'checked' => 0, 'position' => 10, 'enabled' => (isModEnabled('productbatch'))),
-	'e.ref' => array('label' => $langs->trans("Warehouse"), 'checked' => 1, 'enabled' => (!($id > 0))), // If we are on specific warehouse, we hide it
-	'm.fk_user_author' => array('label' => $langs->trans("Author"), 'checked' => 0),
-	'm.inventorycode' => array('label' => $langs->trans("InventoryCodeShort"), 'checked' => 1),
-	'm.label' => array('label' => $langs->trans("MovementLabel"), 'checked' => 1),
-	'm.type_mouvement' => array('label' => $langs->trans("TypeMovement"), 'checked' => 1),
-	'origin' => array('label' => $langs->trans("Origin"), 'checked' => 1),
-	'm.value' => array('label' => $langs->trans("Qty"), 'checked' => 1),
-	'm.price' => array('label' => $langs->trans("UnitPurchaseValue"), 'checked' => 0),
-	//'m.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-	//'m.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
+	'm.rowid' => array('label' => $langs->trans("Ref"), 'checked' => '1'),
+	'm.datem' => array('label' => $langs->trans("Date"), 'checked' => '1'),
+	'p.ref' => array('label' => $langs->trans("ProductRef"), 'checked' => '1', 'css' => 'maxwidth100'),
+	'p.label' => array('label' => $langs->trans("ProductLabel"), 'checked' => '1'),
+	'm.batch' => array('label' => $langs->trans("BatchNumberShort"), 'checked' => '1', 'enabled' => (string) (int) (isModEnabled('productbatch'))),
+	'pl.eatby' => array('label' => $langs->trans("EatByDate"), 'checked' => '0', 'position' => 10, 'enabled' => (string) (int) (isModEnabled('productbatch'))),
+	'pl.sellby' => array('label' => $langs->trans("SellByDate"), 'checked' => '0', 'position' => 10, 'enabled' => (string) (int) (isModEnabled('productbatch'))),
+	'e.ref' => array('label' => $langs->trans("Warehouse"), 'checked' => '1', 'enabled' => (string) (int) (!($id > 0))), // If we are on specific warehouse, we hide it
+	'm.fk_user_author' => array('label' => $langs->trans("Author"), 'checked' => '0'),
+	'm.inventorycode' => array('label' => $langs->trans("InventoryCodeShort"), 'checked' => '1'),
+	'm.label' => array('label' => $langs->trans("MovementLabel"), 'checked' => '1'),
+	'm.type_mouvement' => array('label' => $langs->trans("TypeMovement"), 'checked' => '1'),
+	'origin' => array('label' => $langs->trans("Origin"), 'checked' => '1'),
+	'm.value' => array('label' => $langs->trans("Qty"), 'checked' => '1'),
+	'm.price' => array('label' => $langs->trans("UnitPurchaseValue"), 'checked' => '0'),
+	//'m.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked' => '0', 'position'=>500),
+	//'m.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked' => '0', 'position'=>500)
 );
 
 $usercanread = (($user->hasRight('stock', 'mouvement', 'lire')));
@@ -218,10 +218,10 @@ if ($action == "correct_stock" && !$cancel && $usercancreate) {
 			$result = $product->correct_stock_batch(
 				$user,
 				$id,
-				GETPOSTINT("nbpiece"),
+				GETPOSTFLOAT("nbpiece"),
 				GETPOSTINT("mouvement"),
 				GETPOST("label", 'san_alpha'),
-				GETPOST('unitprice', 'alpha'),
+				GETPOSTFLOAT('unitprice'),
 				$eatby,
 				$sellby,
 				$batch,
@@ -233,10 +233,10 @@ if ($action == "correct_stock" && !$cancel && $usercancreate) {
 			$result = $product->correct_stock(
 				$user,
 				$id,
-				GETPOSTINT("nbpiece"),
-				GETPOST("mouvement", 'alpha'),
+				GETPOSTFLOAT("nbpiece"),
+				GETPOSTINT("mouvement"),
 				GETPOST("label", 'san_alpha'),
-				GETPOST('unitprice', 'alpha'),
+				GETPOSTFLOAT('unitprice'),
 				GETPOST('inventorycode', 'alpha'),
 				$origin_element,
 				$origin_id
@@ -276,7 +276,7 @@ if ($action == "transfert_stock" && !$cancel && $usercancreate) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Product")), null, 'errors');
 		$action = 'transfert';
 	}
-	if (!GETPOSTINT("nbpiece")) {
+	if (!GETPOSTFLOAT("nbpiece")) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumberOfUnit")), null, 'errors');
 		$error++;
 		$action = 'transfert';
@@ -314,14 +314,22 @@ if ($action == "transfert_stock" && !$cancel && $usercancreate) {
 			}
 			$pricedest = $pricesrc;
 
+			$result1 = -1;
+			$result2 = -1;
+
 			if ($product->hasbatch()) {
 				$pdluo = new Productbatch($db);
 
+				$batch = '';
+				$eatby = 0;
+				$sellby = 0;
+				$srcwarehouseid = 0;
+
 				if ($pdluoid > 0) {
 					$result = $pdluo->fetch($pdluoid);
 					if ($result) {
 						$srcwarehouseid = $pdluo->warehouseid;
-						$batch = $pdluo->batch;
+						$batch = (string) $pdluo->batch;
 						$eatby = $pdluo->eatby;
 						$sellby = $pdluo->sellby;
 					} else {
@@ -330,7 +338,7 @@ if ($action == "transfert_stock" && !$cancel && $usercancreate) {
 					}
 				} else {
 					$srcwarehouseid = $id;
-					$batch = GETPOST('batch_number', 'alpha');
+					$batch = (string) GETPOST('batch_number', 'alpha');
 					$eatby = $d_eatby;
 					$sellby = $d_sellby;
 				}
@@ -340,7 +348,7 @@ if ($action == "transfert_stock" && !$cancel && $usercancreate) {
 					$result1 = $product->correct_stock_batch(
 						$user,
 						$srcwarehouseid,
-						GETPOSTINT("nbpiece"),
+						GETPOSTFLOAT("nbpiece"),
 						1,
 						GETPOST("label", 'san_alpha'),
 						$pricesrc,
@@ -353,7 +361,7 @@ if ($action == "transfert_stock" && !$cancel && $usercancreate) {
 					$result2 = $product->correct_stock_batch(
 						$user,
 						GETPOSTINT("id_entrepot_destination"),
-						GETPOSTINT("nbpiece"),
+						GETPOSTFLOAT("nbpiece"),
 						0,
 						GETPOST("label", 'san_alpha'),
 						$pricedest,
@@ -368,7 +376,7 @@ if ($action == "transfert_stock" && !$cancel && $usercancreate) {
 				$result1 = $product->correct_stock(
 					$user,
 					$id,
-					GETPOSTINT("nbpiece"),
+					GETPOSTFLOAT("nbpiece"),
 					1,
 					GETPOST("label", 'alpha'),
 					$pricesrc,
@@ -378,8 +386,8 @@ if ($action == "transfert_stock" && !$cancel && $usercancreate) {
 				// Add stock
 				$result2 = $product->correct_stock(
 					$user,
-					GETPOST("id_entrepot_destination"),
-					GETPOSTINT("nbpiece"),
+					GETPOSTINT("id_entrepot_destination"),
+					GETPOSTFLOAT("nbpiece"),
 					0,
 					GETPOST("label", 'alpha'),
 					$pricedest,
@@ -632,6 +640,7 @@ if ($resql) {
 		$sql = "SELECT MAX(m.datem) as datem";
 		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
 		$sql .= " WHERE m.fk_entrepot = ".(int) $object->id;
+		$lastmovementdate = 0;
 		$resqlbis = $db->query($sql);
 		if ($resqlbis) {
 			$obj = $db->fetch_object($resqlbis);
@@ -1218,7 +1227,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete' && $id > 0)
 	$genallowed = $user->hasRight('stock', 'lire');
 	$delallowed = $user->hasRight('stock', 'creer');
 
-	print $formfile->showdocuments($modulepart, $objectref, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $object->default_lang, '', $object);
+	print $formfile->showdocuments($modulepart, $objectref, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', '', '', $object->default_lang, '', $object);
 	$somethingshown = $formfile->numoffiles;
 
 	print '</div><div class="fichehalfright">';
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index e5cabbe26d5..a8df7f3435c 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018-2022	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2019-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -73,8 +73,8 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 $id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $msid = GETPOSTINT('msid');
-$idproduct = GETPOST('idproduct', 'intcomma');
-$product_id = GETPOST("product_id", 'intcomma');
+$idproduct = GETPOSTINT('idproduct');
+$product_id = GETPOSTINT('product_id');
 $show_files = GETPOSTINT('show_files');
 
 $search_all = trim(GETPOST('search_all', 'alphanohtml'));
@@ -136,24 +136,24 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 $arrayfields = array(
-	'm.rowid' => array('label' => "Ref", 'checked' => 1, 'position' => 1),
-	'm.datem' => array('label' => "Date", 'checked' => 1, 'position' => 2),
-	'p.ref' => array('label' => "ProductRef", 'checked' => 1, 'css' => 'maxwidth100', 'position' => 3),
-	'p.label' => array('label' => "ProductLabel", 'checked' => 0, 'position' => 5),
-	'm.batch' => array('label' => "BatchNumberShort", 'checked' => 1, 'position' => 8, 'enabled' => (isModEnabled('productbatch'))),
-	'pl.eatby' => array('label' => "EatByDate", 'checked' => 0, 'position' => 9, 'enabled' => (isModEnabled('productbatch'))),
-	'pl.sellby' => array('label' => "SellByDate", 'checked' => 0, 'position' => 10, 'enabled' => (isModEnabled('productbatch'))),
-	'e.ref' => array('label' => "Warehouse", 'checked' => 1, 'position' => 100, 'enabled' => (!($id > 0))), // If we are on specific warehouse, we hide it
-	'm.fk_user_author' => array('label' => "Author", 'checked' => 0, 'position' => 120),
-	'm.inventorycode' => array('label' => "InventoryCodeShort", 'checked' => 1, 'position' => 130),
-	'm.label' => array('label' => "MovementLabel", 'checked' => 1, 'position' => 140),
-	'm.type_mouvement' => array('label' => "TypeMovement", 'checked' => 0, 'position' => 150),
-	'origin' => array('label' => "Origin", 'checked' => 1, 'position' => 155),
-	'm.fk_projet' => array('label' => 'Project', 'checked' => 0, 'position' => 180),
-	'm.value' => array('label' => "Qty", 'checked' => 1, 'position' => 200),
-	'm.price' => array('label' => "UnitPurchaseValue", 'checked' => 0, 'position' => 210, 'enabled' => (!getDolGlobalInt('STOCK_MOVEMENT_LIST_HIDE_UNIT_PRICE')))
-	//'m.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
-	//'m.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500)
+	'm.rowid' => array('label' => "Ref", 'checked' => '1', 'position' => 1),
+	'm.datem' => array('label' => "Date", 'checked' => '1', 'position' => 2),
+	'p.ref' => array('label' => "ProductRef", 'checked' => '1', 'css' => 'maxwidth100', 'position' => 3),
+	'p.label' => array('label' => "ProductLabel", 'checked' => '0', 'position' => 5),
+	'm.batch' => array('label' => "BatchNumberShort", 'checked' => '1', 'position' => 8, 'enabled' => (string) (int) (isModEnabled('productbatch'))),
+	'pl.eatby' => array('label' => "EatByDate", 'checked' => '0', 'position' => 9, 'enabled' => (string) (int) (isModEnabled('productbatch'))),
+	'pl.sellby' => array('label' => "SellByDate", 'checked' => '0', 'position' => 10, 'enabled' => (string) (int) (isModEnabled('productbatch'))),
+	'e.ref' => array('label' => "Warehouse", 'checked' => '1', 'position' => 100, 'enabled' => (string) (int) (!($id > 0))), // If we are on specific warehouse, we hide it
+	'm.fk_user_author' => array('label' => "Author", 'checked' => '0', 'position' => 120),
+	'm.inventorycode' => array('label' => "InventoryCodeShort", 'checked' => '1', 'position' => 130),
+	'm.label' => array('label' => "MovementLabel", 'checked' => '1', 'position' => 140),
+	'm.type_mouvement' => array('label' => "TypeMovement", 'checked' => '0', 'position' => 150),
+	'origin' => array('label' => "Origin", 'checked' => '1', 'position' => 155),
+	'm.fk_projet' => array('label' => 'Project', 'checked' => '0', 'position' => 180),
+	'm.value' => array('label' => "Qty", 'checked' => '1', 'position' => 200),
+	'm.price' => array('label' => "UnitPurchaseValue", 'checked' => '0', 'position' => 210, 'enabled' => (string) (int) (!getDolGlobalInt('STOCK_MOVEMENT_LIST_HIDE_UNIT_PRICE')))
+	//'m.datec'=>array('label'=>"DateCreation", 'checked' => '0', 'position'=>500),
+	//'m.tms'=>array('label'=>"DateModificationShort", 'checked' => '0', 'position'=>500)
 );
 
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -399,10 +399,10 @@ if ($action == "correct_stock" && $permissiontoadd) {
 			$result = $product->correct_stock_batch(
 				$user,
 				$id,
-				GETPOSTINT("nbpiece"),
+				GETPOSTFLOAT("nbpiece"),
 				GETPOSTINT("mouvement"),
 				GETPOST("label", 'alphanohtml'),
-				price2num(GETPOST('unitprice'), 'MT'),
+				(float) price2num(GETPOST('unitprice'), 'MT'),
 				$eatby,
 				$sellby,
 				$batch,
@@ -416,10 +416,10 @@ if ($action == "correct_stock" && $permissiontoadd) {
 			$result = $product->correct_stock(
 				$user,
 				$id,
-				GETPOSTINT("nbpiece"),
+				GETPOSTFLOAT("nbpiece"),
 				GETPOSTINT("mouvement"),
 				GETPOST("label", 'alphanohtml'),
-				price2num(GETPOST('unitprice'), 'MT'),
+				(float) price2num(GETPOST('unitprice'), 'MT'),
 				GETPOST('inventorycode', 'alphanohtml'),
 				$origin_element,
 				$origin_id,
@@ -461,7 +461,7 @@ if ($action == "transfert_stock" && $permissiontoadd && !$cancel) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Product")), null, 'errors');
 		$action = 'transfert';
 	}
-	if (!GETPOSTINT("nbpiece")) {
+	if (!GETPOSTFLOAT("nbpiece")) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumberOfUnit")), null, 'errors');
 		$error++;
 		$action = 'transfert';
@@ -530,7 +530,7 @@ if ($action == "transfert_stock" && $permissiontoadd && !$cancel) {
 					$result1 = $product->correct_stock_batch(
 						$user,
 						$srcwarehouseid,
-						GETPOSTINT("nbpiece"),
+						GETPOSTFLOAT("nbpiece"),
 						1,
 						GETPOST("label", 'san_alpha'),
 						$pricesrc,
@@ -547,7 +547,7 @@ if ($action == "transfert_stock" && $permissiontoadd && !$cancel) {
 					$result2 = $product->correct_stock_batch(
 						$user,
 						GETPOSTINT("id_entrepot_destination"),
-						GETPOSTINT("nbpiece"),
+						GETPOSTFLOAT("nbpiece"),
 						0,
 						GETPOST("label", 'san_alpha'),
 						$pricedest,
@@ -566,7 +566,7 @@ if ($action == "transfert_stock" && $permissiontoadd && !$cancel) {
 				$result1 = $product->correct_stock(
 					$user,
 					$id,
-					GETPOST("nbpiece"),
+					GETPOSTFLOAT("nbpiece"),
 					1,
 					GETPOST("label", 'san_alpha'),
 					$pricesrc,
@@ -580,8 +580,8 @@ if ($action == "transfert_stock" && $permissiontoadd && !$cancel) {
 				// Add stock
 				$result2 = $product->correct_stock(
 					$user,
-					GETPOST("id_entrepot_destination"),
-					GETPOST("nbpiece"),
+					GETPOSTINT("id_entrepot_destination"),
+					GETPOSTFLOAT("nbpiece"),
 					0,
 					GETPOST("label", 'san_alpha'),
 					$pricedest,
@@ -755,7 +755,7 @@ if (!empty($search_batch)) {
 	$sql .= natural_search('m.batch', $search_batch);
 }
 if (!empty($product_id) && $product_id != '-1') {
-	$sql .= natural_search('p.rowid', $product_id);
+	$sql .= natural_search('p.rowid', (string) $product_id);
 }
 if (!empty($search_fk_project) && $search_fk_project != '-1') {
 	$sql .= natural_search('m.fk_projet', $search_fk_project);
@@ -865,7 +865,7 @@ if ($warehouse->id > 0) {
 	if (isModEnabled('project') && $formproject !== null) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.img_picto('', 'project').' '.$langs->trans('Project').' ';
-		if ($usercancreate && 1 == 2) {
+		if ($usercancreate && 1 == 2) {  // @phan-suppress-current-line PhanPluginBothLiteralsBinaryOp
 			if ($action != 'classify') {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$warehouse->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 			}
@@ -874,11 +874,11 @@ if ($warehouse->id > 0) {
 				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$warehouse->id.'">';
 				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
 				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-				$morehtmlref .= $formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
+				$morehtmlref .= $formproject->select_projects(($socid > 0 ? $socid : -1), (string) $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$warehouse->id, $warehouse->socid, $warehouse->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$warehouse->id, $warehouse->socid, (string) $warehouse->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		} else {
 			if (!empty($warehouse->fk_project)) {
@@ -1688,8 +1688,8 @@ if (count($arrayofuniqueproduct) == 1 && !empty($year) && is_numeric($year)) {
 		$productidselected = $key;
 		$productlabelselected = $val;
 	}
-	$datebefore = dol_get_first_day($year ? $year : dol_print_date(time(), "%Y"), $month ? $month : 1, true);
-	$dateafter = dol_get_last_day($year ? $year : dol_print_date(time(), "%Y"), $month ? $month : 12, true);
+	$datebefore = dol_get_first_day($year ? $year : (int) dol_print_date(time(), "%Y"), $month ? $month : 1, true);
+	$dateafter = dol_get_last_day($year ? $year : (int) dol_print_date(time(), "%Y"), $month ? $month : 12, true);
 	$balancebefore = $object->calculateBalanceForProductBefore($productidselected, $datebefore);
 	$balanceafter = $object->calculateBalanceForProductBefore($productidselected, $dateafter);
 

From 461a5766695ee7b60f57ad48655e49802b720b83 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 10 Feb 2025 12:42:41 +0100
Subject: [PATCH 585/602] Close #32966

---
 htdocs/core/class/extrafields.class.php       | 44 ++++++++++++++-----
 .../tpl/extrafields_list_print_fields.tpl.php |  9 ++--
 .../tpl/extrafields_list_search_input.tpl.php |  6 ++-
 .../tpl/extrafields_list_search_title.tpl.php | 11 +++--
 htdocs/public/ticket/list.php                 |  2 +-
 5 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 3313aa39bc7..9954624538e 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -2438,8 +2438,22 @@ class ExtraFields
 	 * @param   string	$key            		Key of attribute
 	 * @param	string	$extrafieldsobjectkey	If defined, use the new method to get extrafields data
 	 * @return	string							Formatted value
+	 * @deprecated Use getCSSClass()
 	 */
 	public function getAlignFlag($key, $extrafieldsobjectkey = '')
+	{
+		return $this->getCSSClass($key, $extrafieldsobjectkey);
+	}
+
+	/**
+	 * Return the CSS to use for this extrafield into list
+	 *
+	 * @param   string	$key            		Key of attribute
+	 * @param	string	$extrafieldsobjectkey	If defined, use the new method to get extrafields data
+	 * @param	string	$mode					'csslist' (used on td into table list), 'css' (used on create/update), 'cssview' (used on view)
+	 * @return	string							Formatted value
+	 */
+	public function getCSSClass($key, $extrafieldsobjectkey = '', $mode = 'csslist')
 	{
 		$type = 'varchar';
 		if (!empty($extrafieldsobjectkey)) {
@@ -2448,19 +2462,27 @@ class ExtraFields
 
 		$cssstring = '';
 
-		if (in_array($type, array('date', 'datetime', 'datetimegmt',))) {
-			$cssstring = "center";
-		} elseif (in_array($type, array('int', 'price', 'double', 'duration'))) {
-			$cssstring = "right";
-		} elseif (in_array($type, array('boolean', 'radio', 'checkbox', 'ip', 'icon'))) {
-			$cssstring = "center";
+		if ($mode == 'csslist') {
+			if (in_array($type, array('date', 'datetime', 'datetimegmt',))) {
+				$cssstring = "center";
+			} elseif (in_array($type, array('int', 'price', 'double', 'duration'))) {
+				$cssstring = "right";
+			} elseif (in_array($type, array('boolean', 'radio', 'checkbox', 'ip', 'icon'))) {
+				$cssstring = "center";
+			}
+
+			if (!empty($this->attributes[$extrafieldsobjectkey][$mode][$key])) {
+				$cssstring .= ($cssstring ? ' ' : '').$this->attributes[$extrafieldsobjectkey][$mode][$key];
+			} else {
+				if (in_array($type, array('ip'))) {
+					$cssstring .= ($cssstring ? ' ' : '').'tdoverflowmax150';
+				}
+			}
 		}
 
-		if (!empty($this->attributes[$extrafieldsobjectkey]['csslist'][$key])) {
-			$cssstring .= ($cssstring ? ' ' : '').$this->attributes[$extrafieldsobjectkey]['csslist'][$key];
-		} else {
-			if (in_array($type, array('ip'))) {
-				$cssstring .= ($cssstring ? ' ' : '').'tdoverflowmax150';
+		if ($mode == 'css' || $mode == 'cssview') {
+			if (!empty($this->attributes[$extrafieldsobjectkey][$mode][$key])) {
+				$cssstring = ($cssstring ? ' ' : '').$this->attributes[$extrafieldsobjectkey][$mode][$key];
 			}
 		}
 
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index e7fb7e0ac2b..63421ff9021 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -45,7 +45,8 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
 					continue;
 				}
 
-				$cssclass = $extrafields->getAlignFlag($key, $extrafieldsobjectkey);
+				$cssclasstd = $extrafields->getCSSClass($key, $extrafieldsobjectkey, 'csslist');
+				$cssclassview = $extrafields->getCSSClass($key, $extrafieldsobjectkey, 'cssview');
 
 				$tmpkey = 'options_'.$key;
 
@@ -64,7 +65,7 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
 				}
 				// If field is a computed field, we make computation to get value
 				if ($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]) {
-					$objectoffield = $object; //For compatibility with the computed formula
+					$objectoffield = $object; // For compatibility with the computed formula
 					$value = dol_eval((string) $extrafields->attributes[$extrafieldsobjectkey]['computed'][$key], 1, 1, '2');
 					if (is_numeric(price2num($value)) && $extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) {
 						$obj->$tmpkey = price2num($value);
@@ -74,11 +75,13 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
 				$valuetoshow = $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey, null, $object);
 				$title = dol_string_nohtmltag($valuetoshow);
 
-				print '<td'.($cssclass ? ' class="'.$cssclass.'"' : '');	// TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist'
+				print '<td'.($cssclasstd ? ' class="'.$cssclasstd.'"' : '');
 				print ' data-key="'.$extrafieldsobjectkey.'.'.$key.'"';
 				print($title ? ' title="'.dol_escape_htmltag($title).'"' : '');
 				print '>';
+				print $cssclassview ? '<span class="'.$cssclassview.'">' : '';
 				print $valuetoshow;
+				print $cssclassview ? '</span>' : '';
 				print '</td>';
 
 				if (!$i) {
diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index 7582f21e471..c7c6b2ec789 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -50,9 +50,11 @@ if (!empty($extrafieldsobjectkey)) {	// $extrafieldsobject is the $object->table
 				if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') {
 					continue;
 				}
-				$cssclass = $extrafields->getAlignFlag($key, $extrafieldsobjectkey);
+
+				$cssclasstd = $extrafields->getCSSClass($key, $extrafieldsobjectkey, 'csslist');
+
 				$typeofextrafield = $extrafields->attributes[$extrafieldsobjectkey]['type'][$key];
-				print '<td class="liste_titre'.($cssclass ? ' '.$cssclass : '').'">';
+				print '<td class="liste_titre'.($cssclasstd ? ' '.$cssclasstd : '').'">';
 				$tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);
 				if (in_array($typeofextrafield, array('varchar', 'mail', 'ip', 'url', 'int', 'double')) && empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) {
 					$searchclass = '';
diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index b225d507022..1f2fa760e4d 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2025		MDW	<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2025		Frédéric France			<frederic.france@free.fr>
  *
@@ -22,6 +21,11 @@
  * @var Conf $conf
  * @var CommonObject $object
  * @var ?Translate $langs
+ *
+ * @var ?string $extrafieldsobjectkey
+ * @var ?int   $disablesortlink
+ * @var string $sortfield
+ * @var string $sortorder
  */
 
 // Protection to avoid direct call of template
@@ -53,7 +57,8 @@ if (!empty($extrafieldsobjectkey)) {	// $extrafieldsobject is the $object->table
 					continue;
 				}
 
-				$cssclass = $extrafields->getAlignFlag($key, $extrafieldsobjectkey);
+				$cssclasstd = $extrafields->getCSSClass($key, $extrafieldsobjectkey, 'csslist');
+
 				$sortonfield = $extrafieldsobjectprefix.$key;
 				if (!empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) {
 					$sortonfield = '';
@@ -66,7 +71,7 @@ if (!empty($extrafieldsobjectkey)) {	// $extrafieldsobject is the $object->table
 				$tooltip = empty($extrafields->attributes[$extrafieldsobjectkey]['help'][$key]) ? '' : $extrafields->attributes[$extrafieldsobjectkey]['help'][$key];
 
 				// Show cell
-				print getTitleFieldOfList($extrafields->attributes[$extrafieldsobjectkey]['label'][$key], 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, 'data-titlekey="'.$key.'"', $sortfield, $sortorder, $cssclass.' ', $disablesortlink, $tooltip)."\n";
+				print getTitleFieldOfList($extrafields->attributes[$extrafieldsobjectkey]['label'][$key], 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, 'data-titlekey="'.$key.'"', $sortfield, $sortorder, $cssclassview.' ', $disablesortlink, $tooltip)."\n";
 				if (isset($totalarray) && isset($totalarray['nbfield'])) {
 					$totalarray['nbfield']++;
 				}
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index c835bdd1cf2..d769ac209a0 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -700,7 +700,7 @@ if ($action == "view_ticketlist") {
 						foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 							if (!empty($arrayfields["ef.".$key]['checked'])) {
 								print '<td';
-								$cssstring = $extrafields->getAlignFlag($key, $object->table_element);
+								$cssstring = $extrafields->getCSSClass($key, $object->table_element, 'csslist');
 								if ($cssstring) {
 									print ' class="'.$cssstring.'"';
 								}

From c45adc4e964418332003e6ae736f2c978a62aadf Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 10 Feb 2025 12:55:45 +0100
Subject: [PATCH 586/602] Close #32966

---
 htdocs/core/tpl/extrafields_list_search_title.tpl.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index 1f2fa760e4d..801d081924b 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *
  */
 
 /**
@@ -71,7 +70,7 @@ if (!empty($extrafieldsobjectkey)) {	// $extrafieldsobject is the $object->table
 				$tooltip = empty($extrafields->attributes[$extrafieldsobjectkey]['help'][$key]) ? '' : $extrafields->attributes[$extrafieldsobjectkey]['help'][$key];
 
 				// Show cell
-				print getTitleFieldOfList($extrafields->attributes[$extrafieldsobjectkey]['label'][$key], 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, 'data-titlekey="'.$key.'"', $sortfield, $sortorder, $cssclassview.' ', $disablesortlink, $tooltip)."\n";
+				print getTitleFieldOfList($extrafields->attributes[$extrafieldsobjectkey]['label'][$key], 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, 'data-titlekey="'.$key.'"', $sortfield, $sortorder, $cssclasstd.' ', $disablesortlink, $tooltip)."\n";
 				if (isset($totalarray) && isset($totalarray['nbfield'])) {
 					$totalarray['nbfield']++;
 				}

From 09ba5162e7601c622f75d3a86d49f378aadbfa92 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 10 Feb 2025 13:03:37 +0100
Subject: [PATCH 587/602] Clean code

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

diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index dfdac04b9a4..5cd03e46f74 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -339,7 +339,7 @@ class DiscountAbsolute extends CommonObject
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 			$tmpinvoice = new Facture($this->db);
 			$tmpinvoice->fetch($this->fk_facture_source);
-			$userid = $tmpinvoice->fk_user_author; // We use the author of invoice
+			$userid = $tmpinvoice->user_creation_id; // We use the author of invoice
 		}
 
 		// Insert request

From 1f61789e5bfee5b6db5e995769e0a90d8a1fe350 Mon Sep 17 00:00:00 2001
From: Dolibot <dolibarr-bot@users.noreply.github.com>
Date: Mon, 10 Feb 2025 12:06:47 +0000
Subject: [PATCH 588/602] PHPStan > Update baseline

---
 dev/build/phpstan/phpstan-baseline.neon | 235 +-----------------------
 1 file changed, 4 insertions(+), 231 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 60134c6002a..8e8123cefb0 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -13302,12 +13302,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
 
-		-
-			message: '#^Parameter \#4 \$columnText of method CommonDocGenerator\:\:printStdColumnContent\(\) expects string, float given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
-
 		-
 			message: '#^Property CommonDocGenerator\:\:\$cols \(array\<string, array\{rank\: int, width\: float\|int, status\: bool, title\: array\{textkey\: string, label\: string, align\: string, padding\: array\{float, float, float, float\}\}, content\: array\{align\: string, padding\: array\{float, float, float, float\}\}\}\>\) does not accept non\-empty\-array\<string, array\{rank\: 0, status\: true, width\: 35, title\: array\{textkey\: ''Ref'', align\: ''L'', padding\: array\{0\.5, 1, 0\.5, 1\.5\}\}, border\-left\: true, content\: array\{align\: ''L'', padding\: array\{1, 0\.5, 1, 1\.5\}\}\}\|array\{rank\: int, width\: float\|int, status\: bool, title\: array\{textkey\: string, label\: string, align\: string, padding\: array\{float, float, float, float\}\}, content\: array\{align\: string, padding\: array\{float, float, float, float\}\}\}\>\.$#'
 			identifier: assign.propertyType
@@ -14262,18 +14256,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/tpl/extrafields_list_search_title.tpl.php
 
-		-
-			message: '#^Variable \$sortfield might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/extrafields_list_search_title.tpl.php
-
-		-
-			message: '#^Variable \$sortorder might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/tpl/extrafields_list_search_title.tpl.php
-
 		-
 			message: '#^Left side of && is always true\.$#'
 			identifier: booleanAnd.leftAlwaysTrue
@@ -17556,24 +17538,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/fourn/commande/dispatch.php
 
-		-
-			message: '#^Parameter \#4 \$month of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/fourn/commande/dispatch.php
-
-		-
-			message: '#^Parameter \#5 \$day of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/fourn/commande/dispatch.php
-
-		-
-			message: '#^Parameter \#6 \$year of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/fourn/commande/dispatch.php
-
 		-
 			message: '#^Right side of && is always false\.$#'
 			identifier: booleanAnd.rightAlwaysFalse
@@ -20928,54 +20892,6 @@ parameters:
 			count: 3
 			path: ../../../htdocs/mrp/class/api_mos.class.php
 
-		-
-			message: '#^Method Mos\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/mrp/class/api_mos.class.php
-
-		-
-			message: '#^Method Mos\:\:_validate\(\) return type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/mrp/class/api_mos.class.php
-
-		-
-			message: '#^Method Mos\:\:delete\(\) return type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/mrp/class/api_mos.class.php
-
-		-
-			message: '#^Method Mos\:\:index\(\) return type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/mrp/class/api_mos.class.php
-
-		-
-			message: '#^Method Mos\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/mrp/class/api_mos.class.php
-
-		-
-			message: '#^Method Mos\:\:produceAndConsume\(\) has parameter \$request_data with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/mrp/class/api_mos.class.php
-
-		-
-			message: '#^Method Mos\:\:produceAndConsumeAll\(\) has parameter \$request_data with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/mrp/class/api_mos.class.php
-
-		-
-			message: '#^Method Mos\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../../../htdocs/mrp/class/api_mos.class.php
-
 		-
 			message: '#^Negated boolean expression is always true\.$#'
 			identifier: booleanNot.alwaysTrue
@@ -21150,12 +21066,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/mrp/mo_card.php
 
-		-
-			message: '#^Variable \$titlelist might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/mrp/mo_card.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
@@ -21186,12 +21096,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/mrp/mo_movements.php
 
-		-
-			message: '#^Variable \$movement might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/mrp/mo_movements.php
-
 		-
 			message: '#^Variable \$text might not be defined\.$#'
 			identifier: variable.undefined
@@ -21324,41 +21228,12 @@ parameters:
 			count: 1
 			path: ../../../htdocs/opcachepreload.php
 
-		-
-			message: '#^Parameter \#4 \$month of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/opensurvey/card.php
-
-		-
-			message: '#^Parameter \#5 \$day of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/opensurvey/card.php
-
-		-
-			message: '#^Parameter \#6 \$year of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../../htdocs/opensurvey/card.php
-
 		-
 			message: '#^Variable \$id might not be defined\.$#'
 			identifier: variable.undefined
 			count: 1
 			path: ../../../htdocs/opensurvey/card.php
 
-		-
-			message: '#^Variable \$userstatic might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/opensurvey/card.php
-
-		-
-			message: '#^PHPDoc type .* is not covariant with PHPDoc type array<CommonObject\|stdClass> of overridden property CommonObject::\$lines\.$#'
-			count: 1
-			path: ../../../htdocs/opensurvey/class/opensurveysondage.class.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
@@ -21372,14 +21247,14 @@ parameters:
 			path: ../../../htdocs/opensurvey/class/opensurveysondage.class.php
 
 		-
-			message: '#^Method Opensurveysondage\:\:fetchAll\(\) return type has no value type specified in iterable type array\.$#'
-			identifier: missingType.iterableValue
+			message: '#^Negated boolean expression is always true\.$#'
+			identifier: booleanNot.alwaysTrue
 			count: 1
 			path: ../../../htdocs/opensurvey/class/opensurveysondage.class.php
 
 		-
-			message: '#^Negated boolean expression is always true\.$#'
-			identifier: booleanNot.alwaysTrue
+			message: '#^PHPDoc type array\<array\<string, int\|string\>\> of property Opensurveysondage\:\:\$lines is not covariant with PHPDoc type array\<CommonObject\|stdClass\> of overridden property CommonObject\:\:\$lines\.$#'
+			identifier: property.phpDocType
 			count: 1
 			path: ../../../htdocs/opensurvey/class/opensurveysondage.class.php
 
@@ -21443,12 +21318,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/opensurvey/results.php
 
-		-
-			message: '#^Variable \$cleinsertion might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/opensurvey/results.php
-
 		-
 			message: '#^Variable \$erreur_ajout_date in isset\(\) always exists and is not nullable\.$#'
 			identifier: isset.variable
@@ -21461,42 +21330,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/opensurvey/results.php
 
-		-
-			message: '#^Variable \$meilleurecolonne might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/opensurvey/results.php
-
-		-
-			message: '#^Variable \$modifier might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/opensurvey/results.php
-
-		-
-			message: '#^Variable \$userstatic might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/opensurvey/results.php
-
-		-
-			message: '#^Variable \$allow_comments might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/opensurvey/wizard/create_survey.php
-
-		-
-			message: '#^Variable \$allow_spy might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/opensurvey/wizard/create_survey.php
-
-		-
-			message: '#^Variable \$champdatefin might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/opensurvey/wizard/create_survey.php
-
 		-
 			message: '#^Left side of && is always false\.$#'
 			identifier: booleanAnd.leftAlwaysFalse
@@ -23597,24 +23430,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/product/stock/tpl/extrafields_add.tpl.php
 
-		-
-			message: '#^Parameter \#4 \$month of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/product/stock/tpl/stockcorrection.tpl.php
-
-		-
-			message: '#^Parameter \#5 \$day of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/product/stock/tpl/stockcorrection.tpl.php
-
-		-
-			message: '#^Parameter \#6 \$year of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/product/stock/tpl/stockcorrection.tpl.php
-
 		-
 			message: '#^Ternary operator condition is always false\.$#'
 			identifier: ternary.alwaysFalse
@@ -24143,30 +23958,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/projet/element.php
 
-		-
-			message: '#^PHPDoc tag @var has invalid value \(\$loanSchedule LoanSchedule\)\: Unexpected token "\$loanSchedule", expected type at offset 20 on line 2$#'
-			identifier: phpDoc.parseError
-			count: 1
-			path: ../../../htdocs/projet/element.php
-
-		-
-			message: '#^Parameter \#4 \$month of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/projet/element.php
-
-		-
-			message: '#^Parameter \#5 \$day of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/projet/element.php
-
-		-
-			message: '#^Parameter \#6 \$year of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 2
-			path: ../../../htdocs/projet/element.php
-
 		-
 			message: '#^Variable \$margin in isset\(\) always exists and is not nullable\.$#'
 			identifier: isset.variable
@@ -26141,24 +25932,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/reception/dispatch.php
 
-		-
-			message: '#^Parameter \#4 \$month of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 4
-			path: ../../../htdocs/reception/dispatch.php
-
-		-
-			message: '#^Parameter \#5 \$day of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 4
-			path: ../../../htdocs/reception/dispatch.php
-
-		-
-			message: '#^Parameter \#6 \$year of function dol_mktime expects int, array\<mixed\>\|string given\.$#'
-			identifier: argument.type
-			count: 4
-			path: ../../../htdocs/reception/dispatch.php
-
 		-
 			message: '#^Variable \$modebatch might not be defined\.$#'
 			identifier: variable.undefined

From 0062c9929aef9b160b2a873f3e792d7a16a00fee Mon Sep 17 00:00:00 2001
From: Anthony V <45999044+AnthonyVallenet@users.noreply.github.com>
Date: Mon, 10 Feb 2025 15:10:28 +0100
Subject: [PATCH 589/602] Fix: Avoid undefined array key warning in form setup

- Added a check to ensure 'isMandatory' exists in $item->fieldParams before accessing it.
- Prevents "Undefined array key" warning in html.formsetup.class.php.
- Improved robustness by using !empty() to handle missing or false values safely.
---
 htdocs/core/class/html.formsetup.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 99c78c1459a..b3addf7f7db 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -329,7 +329,7 @@ class FormSetup
 			$this->setupNotEmpty++;
 			$out .= '<tr class="'.$trClass.'">';
 
-			$out .= '<td class="col-setup-title'.($item->fieldParams['isMandatory'] ? ' fieldrequired' : '').'">';
+			$out .= '<td class="col-setup-title'.(!empty($item->fieldParams['isMandatory']) ? ' fieldrequired' : '').'">';
 			$out .= '<span id="helplink'.$item->confKey.'" class="spanforparamtooltip">';
 			$out .= $this->form->textwithpicto($item->getNameText(), $item->getHelpText(), 1, 'info', '', 0, 3, 'tootips'.$item->confKey);
 			$out .= '</span>';

From 4cceac1f460264e336ea496923781da885061e25 Mon Sep 17 00:00:00 2001
From: NefiteTifall | Nicolas <58378334+NefiteTifall@users.noreply.github.com>
Date: Mon, 10 Feb 2025 15:48:04 +0100
Subject: [PATCH 590/602] FIX: Correct HTML escaping function

---
 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 fae36b1f6f2..b21a6f45fe9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13024,7 +13024,7 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
 	);
 
 	if (!empty($helpText)) {
-		$attr['title'] = dol_escape_htmltag($helpText);
+		$attr['title'] = dol_escape_php($helpText);
 	} elseif ($label) { // empty($attr['title']) &&
 		$attr['title'] = $label;
 		$useclassfortooltip = 0;

From eac36245bbe3f4d21e67affe6874307eec2d163a Mon Sep 17 00:00:00 2001
From: Anthony V <45999044+AnthonyVallenet@users.noreply.github.com>
Date: Mon, 10 Feb 2025 15:55:28 +0100
Subject: [PATCH 591/602] Fix: Prevent warnings and fatal error in
 admin/mrp.php

- Fixed "Undefined property: stdClass::$MRP_MO_ADDON_PDF" by checking existence with !empty().
- Fixed "Class 'Product' not found" by adding require_once for product.class.php.
- Improves stability and prevents unexpected crashes in MRP module.
---
 htdocs/admin/mrp.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index bc5a9c33f4d..7a66d1afd16 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp_mo.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 /**
  * @var Conf $conf
@@ -397,7 +398,7 @@ foreach ($dirmodels as $reldir) {
 
 								// Default
 								print '<td class="center">';
-								if ($conf->global->MRP_MO_ADDON_PDF == $name) {
+								if (!empty($conf->global->MRP_MO_ADDON_PDF) && $conf->global->MRP_MO_ADDON_PDF == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
 									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';

From e26b5ae42866d8b919719dd5993831de5d4d5d48 Mon Sep 17 00:00:00 2001
From: Gregory Toccanier <115637044+GregoryBT@users.noreply.github.com>
Date: Mon, 10 Feb 2025 16:00:50 +0100
Subject: [PATCH 592/602] Update facture.class.php

Delete fk_product when $prodids[$prodid] is undefined
---
 htdocs/compta/facture/class/facture.class.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 4d62524f43f..d7583b42d62 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -5208,7 +5208,9 @@ class Facture extends CommonInvoice
 				$line->remise_percent = 0;
 				if ($xnbp == 1) {        // Qty is negative (product line)
 					$prodid = mt_rand(1, $num_prods);
-					$line->fk_product = $prodids[$prodid];
+					if (isset($prodids[$prodid])) {
+						$line->fk_product = $prodids[$prodid];
+					}
 					$line->qty = -1;
 					$line->total_ht = -100;
 					$line->total_ttc = -119.6;
@@ -5227,7 +5229,9 @@ class Facture extends CommonInvoice
 					$line->multicurrency_total_tva = -39.2;
 				} elseif ($xnbp == 3) {    // Discount is 50% (product line)
 					$prodid = mt_rand(1, $num_prods);
-					$line->fk_product = $prodids[$prodid];
+					if (isset($prodids[$prodid])) {
+						$line->fk_product = $prodids[$prodid];
+					}
 					$line->total_ht = 50;
 					$line->total_ttc = 59.8;
 					$line->total_tva = 9.8;
@@ -5237,7 +5241,9 @@ class Facture extends CommonInvoice
 					$line->remise_percent = 50;
 				} else { // (product line)
 					$prodid = mt_rand(1, $num_prods);
-					$line->fk_product = $prodids[$prodid];
+					if (isset($prodids[$prodid])) {
+						$line->fk_product = $prodids[$prodid];
+					}
 					$line->total_ht = 100;
 					$line->total_ttc = 119.6;
 					$line->total_tva = 19.6;
@@ -5278,7 +5284,9 @@ class Facture extends CommonInvoice
 			$line->multicurrency_total_ttc = 0;
 			$line->multicurrency_total_tva = 0;
 			$prodid = mt_rand(1, $num_prods);
-			$line->fk_product = $prodids[$prodid];
+			if (isset($prodids[$prodid])) {
+				$line->fk_product = $prodids[$prodid];
+			}
 
 			$this->lines[$xnbp] = $line;
 			$xnbp++;

From 2358dc81a62c6c9b34f4a8ee9f3a5e0a9420bd8b Mon Sep 17 00:00:00 2001
From: Anthony V <45999044+AnthonyVallenet@users.noreply.github.com>
Date: Mon, 10 Feb 2025 16:05:25 +0100
Subject: [PATCH 593/602] Fix: Prevent invalid foreach() on extrafields label
 in product/price.php

- Ensured $extralabels is always an array before looping to prevent warnings.
- Fixes "foreach() argument must be of type array|string given" error.
- Improves stability when handling extrafields.
---
 htdocs/product/price.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index c0f087f9d49..483ea6c4525 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1539,7 +1539,7 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUS
 
 	// Extrafields
 	$extrafields->fetch_name_optionals_label("product");
-	$extralabels = !empty($extrafields->attributes["product"]['label']) ? $extrafields->attributes["product"]['label'] : '';
+	$extralabels = !empty($extrafields->attributes["product"]['label']) ? $extrafields->attributes["product"]['label'] : [];
 	$extrafield_values = $extrafields->getOptionalsFromPost("product");
 	$sql  = "SELECT";
 	$sql .= " fk_object";

From a0eaf653e6990d5fc2817f9964815c258bdcf529 Mon Sep 17 00:00:00 2001
From: Anthony V <45999044+AnthonyVallenet@users.noreply.github.com>
Date: Mon, 10 Feb 2025 16:09:47 +0100
Subject: [PATCH 594/602] Fix: Use getDolGlobalString

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

diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index 7a66d1afd16..9f75b7efa18 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -398,7 +398,7 @@ foreach ($dirmodels as $reldir) {
 
 								// Default
 								print '<td class="center">';
-								if (!empty($conf->global->MRP_MO_ADDON_PDF) && $conf->global->MRP_MO_ADDON_PDF == $name) {
+								if (getDolGlobalString("MRP_MO_ADDON_PDF") == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
 									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';

From a7a20142159fa6daac649c85224331688c936c63 Mon Sep 17 00:00:00 2001
From: Norbert Penel <homer8173@gmail.com>
Date: Mon, 10 Feb 2025 17:10:41 +0100
Subject: [PATCH 595/602] Update html.formmargin.class.php

Under PHP 8 , can't add string and float on following lines. So i propose to convert to avoid errors
---
 htdocs/core/class/html.formmargin.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index 5537893d372..9574caf010e 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -99,7 +99,7 @@ class FormMargin
 				$line->pa_ht = $line->subprice * (1 - ($line->remise_percent / 100));
 			}
 
-			$pv = $line->total_ht;
+			$pv = (float)$line->total_ht;
 
 			// $line->pa_ht is always positive in database, so we guess the correct sign
 

From 29542344203d7e1762e36467eb3c5da5ec2e83cc Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Mon, 10 Feb 2025 21:04:12 +0100
Subject: [PATCH 596/602] FIX #33003

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 853176694ca..0b07dd0b80a 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2597,7 +2597,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	$langs->load('companies');
 
 	$userImage = $userDropDownImage = '';
-	if (!empty($user->photo)) {
+	if (!empty($user->photo) || isModEnabled('gravatar')) {
 		$userImage          = Form::showphoto('userphoto', $user, 0, 0, 0, 'photouserphoto userphoto', 'small', 0, 1);
 		$userDropDownImage  = Form::showphoto('userphoto', $user, 0, 0, 0, 'dropdown-user-image', 'small', 0, 1);
 	} else {

From 076399b11be64ba726a8858bb8228241f489fe96 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 10 Feb 2025 18:50:16 +0100
Subject: [PATCH 597/602] Qual: Fix phan (stock-2)

---
 dev/tools/phan/baseline.txt                   | 29 ++++++--------
 htdocs/core/class/html.form.class.php         |  2 +-
 .../stocktransfer/doc/pdf_eagle.modules.php   |  6 +--
 .../doc/pdf_eagle_proforma.modules.php        |  2 +-
 .../mod_stocktransfer_advanced.php            |  4 +-
 .../mod_stocktransfer_standard.php            |  4 +-
 .../stocktransfer/modules_stocktransfer.php   |  4 +-
 htdocs/product/stock/product.php              | 39 ++++++++++++-------
 htdocs/product/stock/productlot_card.php      |  2 +-
 htdocs/product/stock/productlot_list.php      | 25 ++++++------
 htdocs/product/stock/replenish.php            | 11 +++---
 .../stock/stats/commande_fournisseur.php      |  7 ++--
 htdocs/product/stock/stats/expedition.php     |  7 ++--
 htdocs/product/stock/stats/mo.php             |  6 +--
 htdocs/product/stock/stats/reception.php      |  7 ++--
 htdocs/product/stock/stockatdate.php          |  5 ++-
 .../class/stocktransferline.class.php         |  7 ++--
 .../stocktransfer/stocktransfer_card.php      |  8 ++--
 .../stocktransfer/stocktransfer_contact.php   |  3 +-
 .../stocktransfer/stocktransfer_list.php      | 16 ++++----
 20 files changed, 102 insertions(+), 92 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index e4d6b885ce3..a12f0d94454 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,15 +9,15 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 2050+ occurrences
+    // PhanTypeMismatchArgument : 2000+ occurrences
     // PhanUndeclaredProperty : 520+ occurrences
-    // PhanTypeMismatchArgumentNullable : 410+ occurrences
+    // PhanTypeMismatchArgumentNullable : 400+ occurrences
     // PhanUndeclaredGlobalVariable : 180+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 170+ occurrences
     // PhanTypeMismatchProperty : 130+ occurrences
-    // PhanPossiblyUndeclaredGlobalVariable : 120+ occurrences
     // PhanPluginUnknownArrayMethodParamType : 110+ occurrences
     // PhanTypeMismatchArgumentProbablyReal : 110+ occurrences
+    // PhanPossiblyUndeclaredGlobalVariable : 100+ occurrences
     // PhanRedefineFunction : 40+ occurrences
     // PhanTypeExpectedObjectPropAccess : 40+ occurrences
     // PhanTypeInvalidDimOffset : 25+ occurrences
@@ -453,8 +453,7 @@ return [
         'htdocs/core/modules/propale/doc/pdf_cyan.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/reception/doc/pdf_squille.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/societe/doc/doc_generic_odt.modules.php' => ['PhanTypeMismatchArgumentNullable'],
-        'htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php' => ['PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchProperty'],
         'htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
@@ -604,19 +603,13 @@ return [
         'htdocs/product/stock/list.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/stock/movement_card.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/product/stock/movement_list.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/product.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
-        'htdocs/product/stock/productlot_card.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/productlot_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/product/stock/replenish.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/product/stock/stats/commande_fournisseur.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/stats/expedition.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/stats/mo.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/stats/reception.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/stockatdate.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullable'],
-        'htdocs/product/stock/stocktransfer/class/stocktransferline.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/stocktransfer/stocktransfer_card.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/product/stock/stocktransfer/stocktransfer_contact.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/product/stock/stocktransfer/stocktransfer_list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
+        'htdocs/product/stock/productlot_card.php' => ['PhanUndeclaredProperty'],
+        'htdocs/product/stock/stats/commande_fournisseur.php' => ['PhanUndeclaredProperty'],
+        'htdocs/product/stock/stats/expedition.php' => ['PhanUndeclaredProperty'],
+        'htdocs/product/stock/stats/mo.php' => ['PhanUndeclaredProperty'],
+        'htdocs/product/stock/stats/reception.php' => ['PhanUndeclaredProperty'],
+        'htdocs/product/stock/stocktransfer/class/stocktransferline.class.php' => ['PhanUndeclaredProperty'],
+        'htdocs/product/stock/stocktransfer/stocktransfer_card.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/product/stock/tpl/stockcorrection.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/stock/tpl/stocktransfer.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/projet/activity/perday.php' => ['PhanTypeMismatchArgument'],
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ac2eb622bd2..537a0be605b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2659,7 +2659,7 @@ class Form
 	 *
 	 *  @param		int			$selected				Preselected products
 	 *  @param		string		$htmlname				Name of HTML select field (must be unique in page).
-	 *  @param		int|string	$filtertype				Filter on product type (''=nofilter, 0=product, 1=service)
+	 *  @param		int|''		$filtertype				Filter on product type (''=nofilter, 0=product, 1=service)
 	 *  @param		int			$limit					Limit on number of returned lines
 	 *  @param		int			$price_level			Level of price to show
 	 *  @param		int<-1,1>	$status					Sell status: -1=No filter on sell status, 0=Products not on sell, 1=Products on sell
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
index 4413d742a92..77b6299e775 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
@@ -401,7 +401,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 						if (!empty($object->tracking_url)) {
 							if ($object->shipping_method_id > 0) {
 								// Get code using getLabelFromKey
-								$code = $outputlangs->getLabelFromKey($this->db, $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
+								$code = $outputlangs->getLabelFromKey($this->db, (string) $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
 								$label = '';
 								if ($object->tracking_url != $object->tracking_number) {
 									$label .= $outputlangs->trans("LinkToTrackYourPackage")."<br>";
@@ -636,7 +636,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 					// Qty
 					$pdf->SetXY($this->posxqty, $curY);
-					$pdf->writeHTMLCell($this->posxwarehousesource - $this->posxqty + 2, 3, $this->posxqty - 1, $curY, $object->lines[$i]->qty, 0, 0, false, true, 'C');
+					$pdf->writeHTMLCell($this->posxwarehousesource - $this->posxqty + 2, 3, $this->posxqty - 1, $curY, (string) $object->lines[$i]->qty, 0, 0, false, true, 'C');
 					//$pdf->MultiCell(($this->posxwarehousesource - $this->posxqty), 3, $weighttxt.(($weighttxt && $voltxt)?'<br>':'').$voltxt,'','C');
 
 					// Warehouse source
@@ -847,7 +847,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 		if (!getDolGlobalString('STOCKTRANSFER_PDF_HIDE_ORDERED')) {
 			$pdf->SetXY($this->posxqty, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($this->posxwarehousesource - $this->posxqty, $tab2_hl, $totalQty, 0, 'C', true);
+			$pdf->MultiCell($this->posxwarehousesource - $this->posxqty, $tab2_hl, (string) $totalQty, 0, 'C', true);
 		}
 
 		if (getDolGlobalString('STOCKTRANSFER_PDF_DISPLAY_AMOUNT_HT')) {
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 9856be325d4..1b63623c86b 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
@@ -365,7 +365,7 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
 				}
 
 				// Displays notes
-				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
+				$notetoshow = empty($object->note_public) ? '' : (string) $object->note_public;
 				if (getDolGlobalString('MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE')) {
 					// Get first sale rep
 					if (is_object($object->thirdparty)) {
diff --git a/htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php b/htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php
index 0bc819da50b..fde24100654 100644
--- a/htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php
+++ b/htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
  * Copyright (C) 2019-2024  Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2021 		Gauthier VERDOL 			<gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -126,7 +126,7 @@ class mod_stocktransfer_advanced extends ModeleNumRefStockTransfer
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param  StockTransfer	$object		Object we need next value for
+	 *  @param  StockTransfer|StockTransferLine	$object		Object we need next value for
 	 *  @return string|int<-1,0>			Value if OK, 0 if KO
 	 */
 	public function getNextValue($object)
diff --git a/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php b/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php
index e2f2335cb82..46d77a2f7c7 100644
--- a/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php
+++ b/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2009  Regis Houssin       <regis.houssin@inodbox.com>
  * Copyright (C) 2021 		Gauthier VERDOL 	<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024-2025  Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -123,7 +123,7 @@ class mod_stocktransfer_standard extends ModeleNumRefStockTransfer
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param  StockTransfer	$object		Object we need next value for
+	 *  @param  StockTransfer|StockTransferLine	$object		Object we need next value for
 	 *  @return string|int<-1,0>			Value if OK, 0 if KO
 	 */
 	public function getNextValue($object)
diff --git a/htdocs/core/modules/stocktransfer/modules_stocktransfer.php b/htdocs/core/modules/stocktransfer/modules_stocktransfer.php
index a11976bb280..1aa2d3905d7 100644
--- a/htdocs/core/modules/stocktransfer/modules_stocktransfer.php
+++ b/htdocs/core/modules/stocktransfer/modules_stocktransfer.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2012      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2021		Gauthier VERDOL		<gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -86,7 +86,7 @@ abstract class ModeleNumRefStockTransfer extends CommonNumRefGenerator
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param  StockTransfer	$object		Object we need next value for
+	 *  @param  StockTransfer|StockTransferLine	$object		Object we need next value for
 	 *  @return string|int<-1,0>			Value if OK, 0 if KO
 	 */
 	abstract public function getNextValue($object);
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 6d66d54c92e..a3c19abd5d3 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2015      Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2021	   Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -305,10 +305,10 @@ if ($action == "correct_stock" && !$cancel && $usercanupdatestock) {
 				$result = $object->correct_stock_batch(
 					$user,
 					GETPOSTINT("id_entrepot"),
-					$nbpiece,
+					(float) $nbpiece,
 					GETPOSTINT("mouvement"),
 					GETPOST("label", 'alphanohtml'), // label movement
-					$priceunit,
+					(float) $priceunit,
 					$d_eatby,
 					$d_sellby,
 					$batchnumber,
@@ -321,10 +321,10 @@ if ($action == "correct_stock" && !$cancel && $usercanupdatestock) {
 				$result = $object->correct_stock(
 					$user,
 					GETPOSTINT("id_entrepot"),
-					$nbpiece,
+					(float) $nbpiece,
 					GETPOSTINT("mouvement"),
 					GETPOST("label", 'alphanohtml'),
-					$priceunit,
+					(float) $priceunit,
 					GETPOST('inventorycode', 'alphanohtml'),
 					$origin_element,
 					$origin_id,
@@ -375,11 +375,16 @@ if ($action == "transfert_stock" && !$cancel && $usercanupdatestock) {
 			$action = 'transfert';
 		}
 	}
+	$batch = '';
+	$sellby = 0;
+	$eatby = 0;
 
 	if (!$error) {
 		if ($id) {
 			$object = new Product($db);
 			$result = $object->fetch($id);
+			$result1 = -1;
+			$result2 = -1;
 
 			$db->begin();
 
@@ -397,6 +402,8 @@ if ($action == "transfert_stock" && !$cancel && $usercanupdatestock) {
 			if ($object->hasbatch()) {
 				$pdluo = new Productbatch($db);
 
+				$srcwarehouseid = 0;
+
 				if ($pdluoid > 0) {
 					$result = $pdluo->fetch($pdluoid);
 					if ($result) {
@@ -422,7 +429,7 @@ if ($action == "transfert_stock" && !$cancel && $usercanupdatestock) {
 					$result1 = $object->correct_stock_batch(
 						$user,
 						$srcwarehouseid,
-						$nbpiece,
+						(float) $nbpiece,
 						1,
 						GETPOST("label", 'alphanohtml'),
 						$pricesrc,
@@ -440,13 +447,13 @@ if ($action == "transfert_stock" && !$cancel && $usercanupdatestock) {
 					$result2 = $object->correct_stock_batch(
 						$user,
 						GETPOSTINT("id_entrepot_destination"),
-						$nbpiece,
+						(float) $nbpiece,
 						0,
 						GETPOST("label", 'alphanohtml'),
 						$pricedest,
 						$eatby,
 						$sellby,
-						$batch,
+						(string) $batch,
 						GETPOST('inventorycode', 'alphanohtml')
 					);
 					if ($result2 < 0) {
@@ -459,7 +466,7 @@ if ($action == "transfert_stock" && !$cancel && $usercanupdatestock) {
 					$result1 = $object->correct_stock(
 						$user,
 						GETPOSTINT("id_entrepot"),
-						$nbpiece,
+						(float) $nbpiece,
 						1,
 						GETPOST("label", 'alphanohtml'),
 						$pricesrc,
@@ -474,7 +481,7 @@ if ($action == "transfert_stock" && !$cancel && $usercanupdatestock) {
 					$result2 = $object->correct_stock(
 						$user,
 						GETPOSTINT("id_entrepot_destination"),
-						$nbpiece,
+						(float) $nbpiece,
 						0,
 						GETPOST("label", 'alphanohtml'),
 						$pricedest,
@@ -543,10 +550,13 @@ if ($action == 'updateline' && GETPOST('save') == $langs->trans("Save") && $user
 
 $form = new Form($db);
 $formproduct = new FormProduct($db);
+$formproject = null;
 if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
+
+$variants = false;
 if ($id > 0 || $ref) {
 	$object = new Product($db);
 	$result = $object->fetch($id, $ref);
@@ -645,7 +655,7 @@ if ($id > 0 || $ref) {
 			if (isModEnabled("product") && isModEnabled("service")) {
 				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 				print '<tr><td class="">';
-				print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
+				print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', (string) $object->type, $object, 0, $typeformat) : $langs->trans('Type');
 				print '</td><td>';
 				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
 				print '</td></tr>';
@@ -667,7 +677,7 @@ if ($id > 0 || $ref) {
 				print '</td><td>';
 				print $form->editfieldval($text, 'cost_price', '', $object, 0, 'amount:6');
 			} else {
-				print $form->editfieldkey($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
+				print $form->editfieldkey($text, 'cost_price', (string) $object->cost_price, $object, (int) $usercancreate, 'amount:6');
 				print '</td><td>';
 				print $form->editfieldval($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
 			}
@@ -746,12 +756,12 @@ if ($id > 0 || $ref) {
 			print '<table class="border tableforfield centpercent">';
 
 			// Stock alert threshold
-			print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("StockLimit"), $langs->trans("StockLimitDesc"), 1), 'seuil_stock_alerte', $object->seuil_stock_alerte, $object, $user->hasRight('produit', 'creer')).'</td><td>';
+			print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("StockLimit"), $langs->trans("StockLimitDesc"), 1), 'seuil_stock_alerte', (string) $object->seuil_stock_alerte, $object, $user->hasRight('produit', 'creer')).'</td><td>';
 			print $form->editfieldval("StockLimit", 'seuil_stock_alerte', $object->seuil_stock_alerte, $object, $user->hasRight('produit', 'creer'), 'string');
 			print '</td></tr>';
 
 			// Desired stock
-			print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1), 'desiredstock', $object->desiredstock, $object, $user->hasRight('produit', 'creer'));
+			print '<tr><td>'.$form->editfieldkey($form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1), 'desiredstock', (string) $object->desiredstock, $object, $user->hasRight('produit', 'creer'));
 			print '</td><td>';
 			print $form->editfieldval("DesiredStock", 'desiredstock', $object->desiredstock, $object, $user->hasRight('produit', 'creer'), 'string');
 			print '</td></tr>';
@@ -891,6 +901,7 @@ if ($id > 0 || $ref) {
 				$sql = "SELECT max(m.datem) as datem";
 				$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
 				$sql .= " WHERE m.fk_product = ".((int) $object->id);
+				$lastmovementdate = 0;
 				$resqlbis = $db->query($sql);
 				if ($resqlbis) {
 					$obj = $db->fetch_object($resqlbis);
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index a21f6041664..7ef691049c2 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -608,7 +608,7 @@ if ($action != 'presend') {
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 		$genallowed = $usercanread; // If you can read, you can build the PDF to read content
 		$delallowed = $usercancreate; // If you can create/edit, you can remove a file on card
-		print $formfile->showdocuments('product_batch', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, '', 0, '', (empty($object->default_lang) ? '' : $object->default_lang), '', $object);
+		print $formfile->showdocuments('product_batch', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, '', '', '', (empty($object->default_lang) ? '' : $object->default_lang), '', $object);
 	}
 
 	print '</div><div class="fichehalfright">';
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index e6164d741d3..ca502f5cae7 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2021  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2019-2024	Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -122,11 +123,11 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval((string) $val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
-			'label'=>$val['label'],
-			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>(abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
-			'position'=>$val['position'],
-			'help'=> isset($val['help']) ? $val['help'] : ''
+			'label' => $val['label'],
+			'checked' => (($visible < 0) ? 0 : 1),
+			'enabled' => (abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
+			'position' => $val['position'],
+			'help' => isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -526,7 +527,7 @@ foreach ($object->fields as $key => $val) {
 		} 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, 'minwidth100imp maxwidth125', 2);
+			print $formadmin->select_language($search[$key], 'search_lang', 0, array(), 1, 0, 0, 'minwidth100imp maxwidth125', 2);
 		} else {
 			print '<input type="text" class="flat maxwidth'.($val['type'] == 'integer' ? '50' : '75').'" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
@@ -537,7 +538,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 /*if (!empty($arrayfields['anotherfield']['checked'])) {
@@ -581,7 +582,7 @@ foreach ($object->fields as $key => $val) {
 // 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, 'totalarray'=>&$totalarray);
+$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
 print $hookmanager->resPrint;
 // Action column
@@ -655,13 +656,13 @@ while ($i < $imaxinloop) {
 		if (!empty($arrayfields['t.'.$key]['checked'])) {
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
 			if (preg_match('/tdoverflow/', $cssforfield) && !is_numeric($object->$key)) {
-				print ' title="'.dol_escape_htmltag($object->$key).'"';
+				print ' title="'.dol_escape_htmltag((string) $object->$key).'"';
 			}
 			print '>';
 			if ($key == 'status') {
 				print $object->getLibStatut(5);
 			} elseif ($key == 'rowid') {
-				print $object->showOutputField($val, $key, $object->id, '');
+				print $object->showOutputField($val, $key, (string) $object->id, '');
 			} else {
 				if ($key == 'batch') {
 					print $object->getNomUrl(1);
@@ -690,7 +691,7 @@ while ($i < $imaxinloop) {
 	// 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);
+	$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
 	print $hookmanager->resPrint;
 	// Action column
@@ -731,7 +732,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 1f0a72aeb43..b242e522acd 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2019-2024	Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2021		Ferran Marcet		<fmarcet@2byte.es>
  * Copyright (C) 2021		Antonin MARCHAL		<antonin@letempledujeu.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -80,6 +80,7 @@ $fk_entrepot = GETPOSTINT('fk_entrepot');
 // List all visible warehouses
 $resWar = $db->query("SELECT rowid FROM " . MAIN_DB_PREFIX . "entrepot WHERE entity IN (" . $db->sanitize(getEntity('stock')) . ")");
 $listofqualifiedwarehousesid = "";
+$lastWarehouseID = 0;
 $count = 0;
 while ($tmpobj = $db->fetch_object($resWar)) {
 	if (!empty($listofqualifiedwarehousesid)) {
@@ -286,10 +287,10 @@ if ($action == 'order' && GETPOST('valid') && $user->hasRight('fournisseur', 'co
 						0,
 						$line->type,
 						0,
-						false,
-						null,
-						null,
 						0,
+						null,
+						null,
+						array(),
 						$line->fk_unit,
 						$line->multicurrency_subprice
 					);
@@ -855,7 +856,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			exit;
 		}
 
-		$prod->load_stock('warehouseopen, warehouseinternal'.(!$usevirtualstock ? ', novirtual' : ''), $draftchecked);
+		$prod->load_stock('warehouseopen, warehouseinternal'.(!$usevirtualstock ? ', novirtual' : ''), $draftchecked === 'checked' ? 1 : 0);
 
 		// Multilangs
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
diff --git a/htdocs/product/stock/stats/commande_fournisseur.php b/htdocs/product/stock/stats/commande_fournisseur.php
index ce07ee4a3de..8bf1ba453f3 100644
--- a/htdocs/product/stock/stats/commande_fournisseur.php
+++ b/htdocs/product/stock/stats/commande_fournisseur.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2023	   Gauthier VERDOL		<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -241,10 +242,10 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " WHERE cf.entity IN (".getEntity('product').")";
 			$sql .= " AND cfdi.batch = '".($db->escape($object->batch))."'";
 			if (!empty($search_month)) {
-				$sql .= ' AND MONTH(cf.date_commande) IN ('.$db->sanitize($search_month).')';
+				$sql .= ' AND MONTH(cf.date_commande) IN ('.$db->sanitize((string) $search_month).')';
 			}
 			if (!empty($search_year)) {
-				$sql .= ' AND YEAR(cf.date_commande) IN ('.$db->sanitize($search_year).')';
+				$sql .= ' AND YEAR(cf.date_commande) IN ('.$db->sanitize((string) $search_year).')';
 			}
 			if (!$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
@@ -300,7 +301,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("OrderDate").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
-				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
+				print $langs->trans('Year').':'.$formother->selectyear($search_year ? (string) $search_year : '-1', 'search_year', 1, 20, 5);
 				print '<div style="vertical-align: middle; display: inline-block">';
 				print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 				print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"), 'searchclear.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
diff --git a/htdocs/product/stock/stats/expedition.php b/htdocs/product/stock/stats/expedition.php
index 98e95f94520..b7e8e77a5f1 100644
--- a/htdocs/product/stock/stats/expedition.php
+++ b/htdocs/product/stock/stats/expedition.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2014	    Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2023	    Gauthier VERDOL			<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -241,10 +242,10 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " WHERE exp.entity IN (".getEntity('product').")";
 			$sql .= " AND db.batch = '".($db->escape($object->batch))."'";
 			if (!empty($search_month)) {
-				$sql .= ' AND MONTH(exp.date_creation) IN ('.$db->sanitize($search_month).')';
+				$sql .= ' AND MONTH(exp.date_creation) IN ('.$db->sanitize((string) $search_month).')';
 			}
 			if (!empty($search_year)) {
-				$sql .= ' AND YEAR(exp.date_creation) IN ('.$db->sanitize($search_year).')';
+				$sql .= ' AND YEAR(exp.date_creation) IN ('.$db->sanitize((string) $search_year).')';
 			}
 			if (!$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
@@ -299,7 +300,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("DateCreation").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
-				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
+				print $langs->trans('Year').':'.$formother->selectyear($search_year ? (string) $search_year : '-1', 'search_year', 1, 20, 5);
 				print '<div style="vertical-align: middle; display: inline-block">';
 				print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 				print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"), 'searchclear.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
diff --git a/htdocs/product/stock/stats/mo.php b/htdocs/product/stock/stats/mo.php
index b1a3477871b..933de644b1f 100644
--- a/htdocs/product/stock/stats/mo.php
+++ b/htdocs/product/stock/stats/mo.php
@@ -188,10 +188,10 @@ if ($id > 0 || !empty($ref)) {
 		$sql .= " AND c.entity IN (".getEntity('mo').")";
 		$sql .= " AND cd.batch = '".($db->escape($object->batch))."'";
 		if (!empty($search_month)) {
-			$sql .= ' AND MONTH(c.date_valid) IN ('.$db->sanitize($search_month).')';
+			$sql .= ' AND MONTH(c.date_valid) IN ('.$db->sanitize((string) $search_month).')';
 		}
 		if (!empty($search_year)) {
-			$sql .= ' AND YEAR(c.date_valid) IN ('.$db->sanitize($search_year).')';
+			$sql .= ' AND YEAR(c.date_valid) IN ('.$db->sanitize((string) $search_year).')';
 		}
 		if ($socid > 0) {
 			$sql .= " AND s.rowid = ".((int) $socid);
@@ -245,7 +245,7 @@ if ($id > 0 || !empty($ref)) {
 			print '<div class="divsearchfield">';
 			print $langs->trans('Period').' ('.$langs->trans("DateCreation").') - ';
 			print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
-			print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
+			print $langs->trans('Year').':'.$formother->selectyear($search_year ? (string) $search_year : '-1', 'search_year', 1, 20, 5);
 			print '<div style="vertical-align: middle; display: inline-block">';
 			print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 			print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"), 'searchclear.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
diff --git a/htdocs/product/stock/stats/reception.php b/htdocs/product/stock/stats/reception.php
index 00eae3cb6aa..bbd3c4f129f 100644
--- a/htdocs/product/stock/stats/reception.php
+++ b/htdocs/product/stock/stats/reception.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2023	   Gauthier VERDOL		<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -240,10 +241,10 @@ if ($id > 0 || !empty($ref)) {
 			$sql .= " WHERE recep.entity IN (".getEntity('product').")";
 			$sql .= " AND d.batch = '".($db->escape($object->batch))."'";
 			if (!empty($search_month)) {
-				$sql .= ' AND MONTH(recep.date_creation) IN ('.$db->sanitize($search_month).')';
+				$sql .= ' AND MONTH(recep.date_creation) IN ('.$db->sanitize((string) $search_month).')';
 			}
 			if (!empty($search_year)) {
-				$sql .= ' AND YEAR(recep.date_creation) IN ('.$db->sanitize($search_year).')';
+				$sql .= ' AND YEAR(recep.date_creation) IN ('.$db->sanitize((string) $search_year).')';
 			}
 			if (!$user->hasRight('societe', 'client', 'voir')) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
@@ -298,7 +299,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<div class="divsearchfield">';
 				print $langs->trans('Period').' ('.$langs->trans("DateCreation").') - ';
 				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
-				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
+				print $langs->trans('Year').':'.$formother->selectyear($search_year ? (string) $search_year : '-1', 'search_year', 1, 20, 5);
 				print '<div style="vertical-align: middle; display: inline-block">';
 				print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 				print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"), 'searchclear.png', '', 0, 1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 1ae34e47050..0c25b9bb8ba 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2016		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2016		ATM Consulting		<support@atm-consulting.fr>
  * Copyright (C) 2019-2024  Frédéric France     <frederic.france@free.fr>
- * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -612,6 +612,8 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			//}
 		}
 
+		$nbofmovement = 0;
+		$virtualstock = 0;
 		if ($mode == 'future') {
 			$prod->load_stock('warehouseopen,warehouseinternal,nobatch', 0, $dateendofday);
 			$stock = $prod->stock_theorique;		// virtual stock at a date
@@ -619,7 +621,6 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$virtualstock = $prod->stock_theorique;	// virtual stock in infinite future
 		} else {
 			$stock = $currentstock;
-			$nbofmovement = 0;
 			if (!empty($search_fk_warehouse)) {
 				foreach ($search_fk_warehouse as $val) {
 					$stock -= empty($movements_prod_warehouse[$objp->rowid][$val]) ? 0 : $movements_prod_warehouse[$objp->rowid][$val];
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index f4bc5fa55c7..a9b6de52bf7 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -1,9 +1,8 @@
 <?php
 /* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2021  Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) ---Put here your own copyright and developer email---
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -457,7 +456,7 @@ class StockTransferLine extends CommonObjectLine
 				$user,
 				$p->id,
 				$fk_entrepot,
-				$op[$direction],
+				(float) $op[$direction],
 				$direction,
 				empty($direction) ? $this->pmp : 0,
 				$label,
@@ -484,7 +483,7 @@ class StockTransferLine extends CommonObjectLine
 					$user,
 					$p->id,
 					$fk_entrepot,
-					$op[$direction],
+					(float) $op[$direction],
 					$direction,
 					empty($direction) ? $this->pmp : 0,
 					$label,
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_card.php b/htdocs/product/stock/stocktransfer/stocktransfer_card.php
index 5e17dbc626e..32edbcc2494 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_card.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017 		Laurent Destailleur  	<eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -647,7 +647,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			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');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, (string) $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
@@ -941,9 +941,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			$filtertype = '';
 		}
 		if (getDolGlobalInt('PRODUIT_LIMIT_SIZE') <= 0) {
-			$limit = '';
+			$limit = 0;
 		} else {
-			$limit = getDolGlobalString('PRODUIT_LIMIT_SIZE');
+			$limit = getDolGlobalInt('PRODUIT_LIMIT_SIZE');
 		}
 
 		$form->select_produits($fk_product, 'fk_product', $filtertype, $limit, 0, -1, 2, '', 0, array(), 0, 0, 0, 'minwidth200imp maxwidth300', 1);
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_contact.php b/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
index aab6d493cc7..dfae3f2f121 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2011-2015 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2021  Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -123,7 +124,7 @@ if ($action == 'addcontact' && $user->hasRight('stocktransfer', 'stocktransfer',
 	}
 } elseif ($action == 'swapstatut' && $user->hasRight('stocktransfer', 'stocktransfer', 'write')) { // Toggle the status of a contact
 	if ($object->id > 0) {
-		$result = $object->swapContactStatus(GETPOST('ligne'));
+		$result = $object->swapContactStatus(GETPOSTINT('ligne'));
 	}
 } elseif ($action == 'deletecontact' && $user->hasRight('stocktransfer', 'stocktransfer', 'write')) { // Deletes a contact
 	$result = $object->delete_contact($lineid);
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_list.php b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
index c108ba11a80..cef55ad167c 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_list.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
@@ -1,8 +1,8 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2021  Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) ---Put here your own copyright and developer email---
  * Copyright (C) 2024		Frédéric France			<frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -523,7 +523,7 @@ foreach ($object->fields as $key => $val) {
 		} 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, 'minwidth100imp maxwidth125', 2);
+			print $formadmin->select_language($search[$key], 'search_lang', 0, array(), 1, 0, 0, 'minwidth100imp maxwidth125', 2);
 		} else {
 			print '<input type="text" class="flat maxwidth'.($val['type'] == 'integer' ? '50' : '75').'" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
@@ -534,7 +534,7 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
+$parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
@@ -577,7 +577,7 @@ foreach ($object->fields as $key => $val) {
 // 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, 'totalarray'=>&$totalarray);
+$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
@@ -676,13 +676,13 @@ while ($i < $imaxinloop) {
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
 				print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) {
-					print ' title="'.dol_escape_htmltag($object->$key).'"';
+					print ' title="'.dol_escape_htmltag((string) $object->$key).'"';
 				}
 				print '>';
 				if ($key == 'status') {
 					print $object->getLibStatut(5);
 				} elseif ($key == 'rowid') {
-					print $object->showOutputField($val, $key, $object->id, '');
+					print $object->showOutputField($val, $key, (string) $object->id, '');
 				} else {
 					print $object->showOutputField($val, $key, $object->$key, '');
 				}
@@ -707,7 +707,7 @@ while ($i < $imaxinloop) {
 		// 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);
+		$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;
 		// Action column
@@ -749,7 +749,7 @@ if ($num == 0) {
 
 $db->free($resql);
 
-$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From 0fbaad635a8487c81254db7bc527bb7d2ae504f4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 10 Feb 2025 21:39:55 +0100
Subject: [PATCH 598/602] Update html.formmargin.class.php

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

diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index 9574caf010e..a18d28b9f32 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -99,7 +99,7 @@ class FormMargin
 				$line->pa_ht = $line->subprice * (1 - ($line->remise_percent / 100));
 			}
 
-			$pv = (float)$line->total_ht;
+			$pv = (float) $line->total_ht;
 
 			// $line->pa_ht is always positive in database, so we guess the correct sign
 

From 928402c8474797f0e483608ae7716aaf1d09a95b Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Mon, 10 Feb 2025 21:20:09 +0100
Subject: [PATCH 599/602] Qual: Fix phan (project-1)

---
 dev/tools/phan/baseline.txt                   | 34 ++------
 htdocs/comm/action/card.php                   | 16 ++--
 htdocs/comm/propal/card.php                   |  6 +-
 htdocs/comm/propal/class/propal.class.php     |  4 +-
 htdocs/commande/class/commande.class.php      |  2 +-
 htdocs/compta/accounting-files.php            |  4 +-
 htdocs/compta/bank/various_payment/card.php   |  4 +-
 htdocs/compta/facture/card.php                | 16 ++--
 htdocs/compta/sociales/card.php               |  4 +-
 htdocs/contrat/class/contrat.class.php        |  2 +-
 htdocs/core/class/html.formprojet.class.php   | 51 ++++++------
 htdocs/core/lib/agenda.lib.php                |  4 +-
 htdocs/core/lib/project.lib.php               | 24 +++---
 htdocs/core/lib/security.lib.php              |  4 +-
 .../mailings/eventorganization.modules.php    |  4 +-
 .../doc/doc_generic_project_odt.modules.php   |  5 +-
 .../project/doc/pdf_beluga.modules.php        |  2 +-
 htdocs/holiday/class/holiday.class.php        | 26 +++---
 htdocs/projet/activity/perday.php             | 28 +++----
 htdocs/projet/activity/permonth.php           | 24 +++---
 htdocs/projet/activity/perweek.php            | 22 ++---
 htdocs/projet/ajax/projects.php               |  5 +-
 htdocs/projet/card.php                        | 14 ++--
 htdocs/projet/class/api_projects.class.php    | 10 +--
 htdocs/projet/class/project.class.php         | 80 +++++++++----------
 htdocs/projet/class/projectstats.class.php    |  4 +-
 htdocs/projet/class/task.class.php            | 46 +++++------
 htdocs/projet/class/taskstats.class.php       |  4 +-
 htdocs/projet/contact.php                     | 10 +--
 htdocs/projet/element.php                     | 66 +++++++++++----
 htdocs/projet/ganttchart.inc.php              | 33 +++++---
 htdocs/projet/ganttview.php                   |  8 +-
 htdocs/projet/graph_opportunities.inc.php     |  9 ++-
 htdocs/projet/list.php                        | 58 +++++++++-----
 htdocs/webservices/server_project.php         |  2 +-
 35 files changed, 341 insertions(+), 294 deletions(-)

diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt
index a12f0d94454..ccbaaf9a33f 100644
--- a/dev/tools/phan/baseline.txt
+++ b/dev/tools/phan/baseline.txt
@@ -9,24 +9,24 @@
  */
 return [
     // # Issue statistics:
-    // PhanTypeMismatchArgument : 2000+ occurrences
+    // PhanTypeMismatchArgument : 1900+ occurrences
     // PhanUndeclaredProperty : 520+ occurrences
-    // PhanTypeMismatchArgumentNullable : 400+ occurrences
-    // PhanUndeclaredGlobalVariable : 180+ occurrences
+    // PhanTypeMismatchArgumentNullable : 380+ occurrences
     // PhanPluginUnknownArrayMethodReturnType : 170+ occurrences
+    // PhanUndeclaredGlobalVariable : 170+ occurrences
     // PhanTypeMismatchProperty : 130+ occurrences
     // PhanPluginUnknownArrayMethodParamType : 110+ occurrences
-    // PhanTypeMismatchArgumentProbablyReal : 110+ occurrences
     // PhanPossiblyUndeclaredGlobalVariable : 100+ occurrences
+    // PhanTypeMismatchArgumentProbablyReal : 100+ occurrences
     // PhanRedefineFunction : 40+ occurrences
     // PhanTypeExpectedObjectPropAccess : 40+ occurrences
     // PhanTypeInvalidDimOffset : 25+ occurrences
-    // PhanPluginUndeclaredVariableIsset : 20+ occurrences
     // PhanTypeMismatchDimFetch : 20+ occurrences
+    // PhanPluginUndeclaredVariableIsset : 15+ occurrences
     // PhanUndeclaredConstant : 15+ occurrences
     // PhanTypeMismatchArgumentNullableInternal : 10+ occurrences
     // PhanUndeclaredMethod : 10+ occurrences
-    // PhanTypeComparisonFromArray : 9 occurrences
+    // PhanTypeComparisonFromArray : 8 occurrences
     // PhanPluginSuspiciousParamPosition : 7 occurrences
     // PhanPluginDuplicateExpressionBinaryOp : 6 occurrences
     // PhanPluginUnknownObjectMethodCall : 6 occurrences
@@ -352,7 +352,6 @@ return [
         'htdocs/core/class/html.formfile.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/html.formmail.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/core/class/html.formother.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/class/html.formprojet.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/html.formsetup.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/core/class/link.class.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/class/menubase.class.php' => ['PhanTypeMismatchArgument'],
@@ -417,7 +416,6 @@ return [
         'htdocs/core/modules/hrm/mod_evaluation_advanced.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/import/import_csv.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchProperty'],
         'htdocs/core/modules/import/import_xlsx.modules.php' => ['PhanTypeMismatchProperty'],
-        'htdocs/core/modules/mailings/eventorganization.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/member/doc/pdf_standard_member.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/member/modules_cards.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/modAdherent.class.php' => ['PhanTypeMismatchArgument'],
@@ -612,25 +610,9 @@ return [
         'htdocs/product/stock/stocktransfer/stocktransfer_card.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/product/stock/tpl/stockcorrection.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/stock/tpl/stocktransfer.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/projet/activity/perday.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/projet/activity/permonth.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/projet/activity/perweek.php' => ['PhanTypeMismatchArgument'],
         'htdocs/projet/admin/project.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/projet/admin/website.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/projet/ajax/projects.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/projet/card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/projet/class/api_projects.class.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/projet/card.php' => ['PhanTypeMismatchArgumentNullable', 'PhanUndeclaredGlobalVariable'],
         'htdocs/projet/class/api_tasks.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgument'],
-        'htdocs/projet/class/project.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/projet/class/projectstats.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/projet/class/task.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/projet/class/taskstats.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/projet/contact.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeComparisonFromArray', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/projet/element.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
-        'htdocs/projet/ganttchart.inc.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/projet/ganttview.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/projet/graph_opportunities.inc.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanUndeclaredGlobalVariable'],
-        'htdocs/projet/list.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
         'htdocs/projet/stats/index.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument'],
         'htdocs/projet/tasks.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/projet/tasks/comment.php' => ['PhanTypeMismatchArgumentProbablyReal'],
@@ -778,7 +760,7 @@ return [
         'htdocs/ticket/class/ticketstats.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/ticket/contact.php' => ['PhanTypeMismatchArgument'],
         'htdocs/ticket/document.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/ticket/index.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentNullableInternal'],
+        'htdocs/ticket/index.php' => ['PhanPossiblyUndeclaredGlobalVariable'],
         'htdocs/ticket/list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/ticket/messaging.php' => ['PhanTypeMismatchArgument'],
         'htdocs/ticket/stats/index.php' => ['PhanTypeMismatchArgument'],
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 6af0cf4aca6..9ebc4408438 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2015       Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2019	      Ferran Marcet	          <fmarcet@2byte.es>
- * Copyright (C) 2024		    MDW						          <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW				          <mdeweerd@users.noreply.github.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
@@ -1682,7 +1682,7 @@ if ($action == 'create') {
 
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Project").'</td><td id="project-input-container">';
 		print img_picto('', 'project', 'class="pictofixedwidth"');
-		print $formproject->select_projects(($object->socid > 0 ? $object->socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx maxwidth500');
+		print $formproject->select_projects(($object->socid > 0 ? $object->socid : -1), (string) $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx maxwidth500');
 
 		print '&nbsp;<a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.(empty($societe->id) ? '' : $societe->id).'&action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'">';
 		print '<span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
@@ -1708,14 +1708,14 @@ if ($action == 'create') {
 		// Task
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Task").'</td><td id="project-task-input-container" >';
 		print img_picto('', 'projecttask', 'class="paddingrightonly"');
-		$projectsListId = false;
+		$projectsListId = '';
 		if (!empty($projectid)) {
 			$projectsListId = $projectid;
 		}
 
 		$tid = GETPOSTISSET("projecttaskid") ? GETPOSTINT("projecttaskid") : (GETPOSTISSET("taskid") ? GETPOSTINT("taskid") : '');
 
-		$formproject->selectTasks((!empty($societe->id) ? $societe->id : -1), $tid, 'taskid', 24, 0, '1', 1, 0, 0, 'maxwidth500 widthcentpercentminusxx', $projectsListId);
+		$formproject->selectTasks((!empty($societe->id) ? $societe->id : -1), $tid, 'taskid', 24, 0, '1', 1, 0, 0, 'maxwidth500 widthcentpercentminusxx', (string) $projectsListId);
 		print '</td></tr>';
 	}
 
@@ -2144,8 +2144,8 @@ if ($id > 0) {
 					'type' => 'user',
 					//'transparency'=>$object->userassigned[$user->id]['transparency'],
 					'transparency' => $object->transparency, // Force transparency on ownerfrom event
-					'answer_status' => (isset($object->userassigned[$object->userownerid]['answer_status']) ? $object->userassigned[$object->userownerid]['answer_status']: null),
-					'mandatory' => (isset($object->userassigned[$object->userownerid]['mandatory']) ? $object->userassigned[$object->userownerid]['mandatory']:null)
+					'answer_status' => (isset($object->userassigned[$object->userownerid]['answer_status']) ? $object->userassigned[$object->userownerid]['answer_status'] : null),
+					'mandatory' => (isset($object->userassigned[$object->userownerid]['mandatory']) ? $object->userassigned[$object->userownerid]['mandatory'] : null)
 				);
 			}
 			if (!empty($object->userassigned)) {	// Now concat assigned users
@@ -2255,7 +2255,7 @@ if ($id > 0) {
 
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("Project").'</td><td>';
 			print img_picto('', 'project', 'class="pictofixedwidth"');
-			$numprojet = $formproject->select_projects(($object->socid > 0 ? $object->socid : -1), $object->fk_project, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth500 widthcentpercentminusxx');
+			$numprojet = $formproject->select_projects(($object->socid > 0 ? $object->socid : -1), (string) $object->fk_project, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth500 widthcentpercentminusxx');
 			if ($numprojet == 0) {
 				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$object->socid.'&action=create&token='.newToken().'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
 			}
@@ -2294,7 +2294,7 @@ if ($id > 0) {
                 })';
 				print '</script>'."\n";
 
-				$formproject->selectTasks((!empty($societe->id) ? $societe->id : -1), $object->fk_element, 'fk_element', 24, 0, 0, 1, 0, 0, 'maxwidth500', $object->fk_project);
+				$formproject->selectTasks((!empty($societe->id) ? $societe->id : -1), $object->fk_element, 'fk_element', 24, 0, '', 1, 0, 0, 'maxwidth500', (string) $object->fk_project);
 				print '<input type="hidden" name="elementtype" value="'.$object->elementtype.'">';
 
 				print '</td>';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 7e0da30d5c8..f815cd849ed 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -17,7 +17,7 @@
  * Copyright (C) 2022		Gauthier VERDOL				<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2023		Lenin Rivas					<lenin.rivas777@gmail.com>
  * Copyright (C) 2023		William Mead				<william.mead@manchenumerique.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -2164,7 +2164,7 @@ if ($action == 'create') {
 			$sday = date("d", $tmpdte);
 			print $form->selectDate($syear."-".$smonth."-".$sday, 'date_livraison', 0, 0, 0, "addprop");
 		} else {
-			$tmp_date_delivery = GETPOST('date_delivery') ? : -1;
+			$tmp_date_delivery = GETPOST('date_delivery') ?: -1;
 			print $form->selectDate($tmp_date_delivery, 'date_livraison', 0, 0, 0, "addprop", 1, 1);
 		}
 		print '</td></tr>';
@@ -2174,7 +2174,7 @@ if ($action == 'create') {
 			$langs->load("projects");
 			print '<tr class="field_projectid">';
 			print '<td class="titlefieldcreate">'.$langs->trans("Project").'</td><td class="valuefieldcreate">';
-			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 widthcentpercentminusxx');
+			print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects(($soc->id > 0 ? $soc->id : -1), (string) $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).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
 			print '</td>';
 			print '</tr>';
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 5f3e292e106..7457acd4e36 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -19,7 +19,7 @@
  * Copyright (C) 2022       OpenDSI                 <support@open-dsi.fr>
  * Copyright (C) 2022      	Gauthier VERDOL     	<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2023		William Mead			<william.mead@manchenumerique.fr>
- * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -3771,7 +3771,7 @@ class Propal extends CommonObject
 				if (is_null($this->project) || (is_object($this->project) && $this->project->isEmpty())) {
 					$res = $this->fetchProject();
 					if ($res > 0 && $this->project instanceof Project) {
-						$datas['project'] = '<br><b>'.$langs->trans('Project').':</b> '.$this->project->getNomUrl(1, '', 0, 1);
+						$datas['project'] = '<br><b>'.$langs->trans('Project').':</b> '.$this->project->getNomUrl(1, '', 0, '1');
 					}
 				}
 			}
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index f448bf25154..5fb70cfcc54 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3728,7 +3728,7 @@ class Commande extends CommonOrder
 				if (is_null($this->project) || (is_object($this->project) && $this->project->isEmpty())) {
 					$res = $this->fetchProject();
 					if ($res > 0 && $this->project instanceof Project) {
-						$datas['project'] = '<br><b>'.$langs->trans('Project').':</b> '.$this->project->getNomUrl(1, '', 0, 1);
+						$datas['project'] = '<br><b>'.$langs->trans('Project').':</b> '.$this->project->getNomUrl(1, '', 0, '1');
 					}
 				}
 			}
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 5ccd1ffa2d8..94bd781bcdd 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2020		Maxime DEMAREST				<maxime@indelog.fr>
  * Copyright (C) 2021		Gauthier VERDOL				<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2022-2025	Alexandre Spangaro          <alexandre@inovea-conseil.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France				<frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -673,7 +673,7 @@ if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 	$langs->load('projects');
 	print '<span class="marginrightonly">'.$langs->trans('Project').":</span>";
-	print img_picto('', 'project').$formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, '');
+	print img_picto('', 'project').$formproject->select_projects(($socid > 0 ? $socid : -1), (string) $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, '');
 	print '<span class="classfortooltip" style="padding: 0px; padding: 0px; padding-right: 3px !important;" title="'.$langs->trans('ExportAccountingProjectHelp').'"><span class="fas fa-info-circle  em088 opacityhigh" style=" vertical-align: middle; cursor: help"></span></span>';
 	print '<br>';
 }
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index fe6102bbf61..5d985f68ce0 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -514,7 +514,7 @@ if ($action == 'create') {
 
 		print '<tr><td>'.$langs->trans("Project").'</td><td>';
 		print img_picto('', 'project', 'class="pictofixedwidth"');
-		print $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 1);
+		print $formproject->select_projects(-1, (string) $projectid, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 1);
 		print '</td></tr>';
 	}
 
@@ -626,7 +626,7 @@ if ($id) {
 				$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(-1, $object->fk_project, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
+				$morehtmlref .= $formproject->select_projects(-1, (string) $object->fk_project, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 932f72d8864..e374e52450e 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -17,7 +17,7 @@
  * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2022       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2023       Nick Fragoulis
- * Copyright (C) 2024       MDW                     <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW                     <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Alexandre Spangaro      <alexandre@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -892,27 +892,27 @@ if (empty($reshook)) {
 					$keyforvatrate = $line->tva_tx.($line->vat_src_code ? ' ('.$line->vat_src_code.')' : '');
 
 					if (!isset($amount_ht[$keyforvatrate])) {
-						$amount_ht[$keyforvatrate]=0;
+						$amount_ht[$keyforvatrate] = 0;
 					}
 					$amount_ht[$keyforvatrate] += $line->total_ht;
 					if (!isset($amount_tva[$keyforvatrate])) {
-						$amount_tva[$keyforvatrate]=0;
+						$amount_tva[$keyforvatrate] = 0;
 					}
 					$amount_tva[$keyforvatrate] += $line->total_tva;
 					if (!isset($amount_ttc[$keyforvatrate])) {
-						$amount_ttc[$keyforvatrate]=0;
+						$amount_ttc[$keyforvatrate] = 0;
 					}
 					$amount_ttc[$keyforvatrate] += $line->total_ttc;
 					if (!isset($multicurrency_amount_ht[$keyforvatrate])) {
-						$multicurrency_amount_ht[$keyforvatrate]=0;
+						$multicurrency_amount_ht[$keyforvatrate] = 0;
 					}
 					$multicurrency_amount_ht[$keyforvatrate] += $line->multicurrency_total_ht;
 					if (!isset($multicurrency_amount_tva[$keyforvatrate])) {
-						$multicurrency_amount_tva[$keyforvatrate]=0;
+						$multicurrency_amount_tva[$keyforvatrate] = 0;
 					}
 					$multicurrency_amount_tva[$keyforvatrate] += $line->multicurrency_total_tva;
 					if (!isset($multicurrency_amount_ttc[$keyforvatrate])) {
-						$multicurrency_amount_ttc[$keyforvatrate]=0;
+						$multicurrency_amount_ttc[$keyforvatrate] = 0;
 					}
 					$multicurrency_amount_ttc[$keyforvatrate] += $line->multicurrency_total_ttc;
 					$i++;
@@ -4070,7 +4070,7 @@ if ($action == 'create') {
 			$langs->load('projects');
 			print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
 			print img_picto('', 'project', 'class="pictofixedwidth"');
-			print $formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
+			print $formproject->select_projects(($socid > 0 ? $socid : -1), (string) $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>';
 		}
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 4bda1228b91..9c37b76e37b 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2016-2024  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2017-2024  Alexandre Spangaro      <alexandre@inovea-conseil.com>
  * Copyright (C) 2021       Gauthier VERDOL     	<gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -431,7 +431,7 @@ if ($action == 'create') {
 
 		print '<tr><td>'.$langs->trans("Project").'</td><td>';
 
-		print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects(-1, $fk_project, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 1);
+		print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects(-1, (string) $fk_project, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 1);
 
 		print '</td></tr>';
 	}
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index f1ea95f0024..e2e5496e0c8 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2068,7 +2068,7 @@ class Contrat extends CommonObject
 				if (is_null($this->project) || (is_object($this->project) && $this->project->isEmpty())) {
 					$res = $this->fetchProject();
 					if ($res > 0 && $this->project instanceof Project) {
-						$datas['project'] = '<br><b>'.$langs->trans('Project').':</b> '.$this->project->getNomUrl(1, '', 0, 1);
+						$datas['project'] = '<br><b>'.$langs->trans('Project').':</b> '.$this->project->getNomUrl(1, '', 0, '1');
 					}
 				}
 			}
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index f817c7b98bb..2534c04a58c 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 		Marcos García  				<marcosgdf@gmail.com>
  * Copyright (C) 2018 		Charlene Benke 				<charlie@patas-monkey.com>
  * Copyright (C) 2024		Frédéric France				<frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Benjamin Falière			<benjamin.faliere@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -113,7 +113,7 @@ class FormProjets extends Form
 			}
 			$out .= '<input type="text" class="minwidth200' . ($morecss ? ' ' . $morecss : '') . '" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . $placeholder . ' />';
 
-			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/projet/ajax/projects.php', $urloption, $conf->global->PROJECT_USE_SEARCH_TO_SELECT, 0, array());
+			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/projet/ajax/projects.php', $urloption, getDolGlobalInt('PROJECT_USE_SEARCH_TO_SELECT'), 0, array());
 		} else {
 			$out .= $this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, abs($discard_closed), $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid, $morecss, $morefilter);
 		}
@@ -153,7 +153,6 @@ class FormProjets extends Form
 	 * @param string 	$morecss 		More CSS
 	 * @param string 	$morefilter 	More filters (Must be a sql sanitized string)
 	 * @return int|string|array<array{key:int,value:string,ref:string,labelx:string,label:string,disabled:bool}>         HTML string or array of option or <0 if KO
-
 	 */
 	public function select_projects_list($socid = -1, $selected = 0, $htmlname = 'projectid', $maxlength = 24, $option_only = 0, $show_empty = 1, $discard_closed = 0, $forcefocus = 0, $disabled = 0, $mode = 0, $filterkey = '', $nooutput = 0, $forceaddid = 0, $htmlid = '', $morecss = 'maxwidth500', $morefilter = '')
 	{
@@ -333,16 +332,16 @@ class FormProjets extends Form
 	 * @param int 		$selected 		Id task preselected
 	 * @param string 	$htmlname 		Name of HTML select
 	 * @param int 		$maxlength 		Maximum length of label
-	 * @param int 		$option_only 	Return only html options lines without the select tag
+	 * @param int<0,1>	$option_only 	Return only html options lines without the select tag
 	 * @param string 	$show_empty 	Add an empty line ('1' or string to show for empty line)
-	 * @param int 		$discard_closed Discard closed projects (0=Keep, 1=hide completely, 2=Disable)
-	 * @param int 		$forcefocus 	Force focus on field (works with javascript only)
-	 * @param int 		$disabled 		Disabled
+	 * @param int<0,2> 	$discard_closed Discard closed projects (0=Keep, 1=hide completely, 2=Disable)
+	 * @param int<0,1>	$forcefocus 	Force focus on field (works with javascript only)
+	 * @param int<0,1>	$disabled 		Disabled
 	 * @param string 	$morecss 		More css added to the select component
 	 * @param string 	$projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids.
-	 * @param string 	$showmore 		'all' = Show project info, 'progress' = Show task progression, ''=Show nothing more
-	 * @param User 		$usertofilter 	User object to use for filtering
-	 * @param int 		$nooutput 		1=Return string, do not send to output
+	 * @param 'all'|'progress'|'' 	$showmore 	'all' = Show project info, 'progress' = Show task progression, ''=Show nothing more
+	 * @param ?User 	$usertofilter 	User object to use for filtering
+	 * @param int<0,1>	$nooutput 		1=Return string, do not send to output
 	 *
 	 * @return int|string                   Nbr of tasks if OK, <0 if KO. If nooutput=1: Return a HTML select string.
 	 */
@@ -694,17 +693,17 @@ class FormProjets extends Form
 	 *    Build a HTML select list of element of same thirdparty to suggest to link them to project
 	 *
 	 * @param string $htmlname HTML name
-	 * @param string $preselected Preselected (int or 'all' or 'none')
-	 * @param int $showempty Add an empty line
-	 * @param int $useshortlabel Use short label
-	 * @param int $showallnone Add choice "All" and "None"
-	 * @param int $showpercent Show default probability for status
-	 * @param string $morecss Add more css
-	 * @param int $noadmininfo 0=Add admin info, 1=Disable admin info
-	 * @param int $addcombojs 1=Add a js combo
+	 * @param int|'all'|'none'|'notopenedopp'	$preselected Preselected (int or 'all' or 'none')
+	 * @param int<0,1>	$showempty Add an empty line
+	 * @param int<0,1>	$useshortlabel Use short label
+	 * @param int<0,1>	$showallnone Add choice "All" and "None"
+	 * @param int<0,1>	$showpercent Show default probability for status
+	 * @param string	$morecss Add more css
+	 * @param int<0,1>	$noadmininfo 0=Add admin info, 1=Disable admin info
+	 * @param int<0,1>	$addcombojs 1=Add a js combo
 	 * @return  int<-1,-1>|string                      The HTML select list of element or '' if nothing or -1 if KO
 	 */
-	public function selectOpportunityStatus($htmlname, $preselected = '-1', $showempty = 1, $useshortlabel = 0, $showallnone = 0, $showpercent = 0, $morecss = '', $noadmininfo = 0, $addcombojs = 0)
+	public function selectOpportunityStatus($htmlname, $preselected = -1, $showempty = 1, $useshortlabel = 0, $showallnone = 0, $showpercent = 0, $morecss = '', $noadmininfo = 0, $addcombojs = 0)
 	{
 		global $conf, $langs, $user;
 
@@ -780,12 +779,12 @@ class FormProjets extends Form
 	/**
 	 *  Return combo list of different statuses of orders
 	 *
-	 *  @param	string	$selected   Preselected value
-	 *  @param	int		$short		Use short labels
-	 *  @param	string	$hmlname	Name of HTML select element
+	 *  @param	string		$selected   Preselected value
+	 *  @param	int<0,1>	$short		Use short labels
+	 *  @param	string		$htmlname	Name of HTML select element
 	 *  @return	void
 	 */
-	public function selectProjectsStatus($selected = '', $short = 0, $hmlname = 'order_status')
+	public function selectProjectsStatus($selected = '', $short = 0, $htmlname = 'order_status')
 	{
 		$options = array();
 
@@ -813,7 +812,7 @@ class FormProjets extends Form
 			$selectedarray = explode(',', $selected);
 		}
 
-		print Form::multiselectarray($hmlname, $options, $selectedarray, 0, 0, 'minwidth100');
+		print Form::multiselectarray($htmlname, $options, $selectedarray, 0, 0, 'minwidth100');
 	}
 
 	/**
@@ -947,11 +946,11 @@ class FormProjets extends Form
 	 *
 	 *  @param	string $page       		Page
 	 *  @param  string $selected   		Id preselected
-	 *  @param 	int    $percent_value		percentage of the opportunity
+	 *  @param 	''|int $percent_value	percentage of the opportunity
 	 *  @param	string $htmlname_status	name of HTML element for status select
 	 *  @param	string $htmlname_percent	name of HTML element for percent input
 	 *  @param  string $filter         	optional filters criteras
-	 *  @param  int    $nooutput       	No print output. Return it only.
+	 *  @param  int<0,1> $nooutput     	No print output. Return it only.
 	 *  @return	void|string
 	 */
 	public function formOpportunityStatus($page, $selected = '', $percent_value = 0, $htmlname_status = 'none', $htmlname_percent = 'none', $filter = '', $nooutput = 0)
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 6143ed6ac5b..6945ef93e8c 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011	   Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2022-2025  Frédéric France				<frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -138,7 +138,7 @@ function print_actions_filter(
 
 		print '<div class="divsearchfield">';
 		print img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth inline-block"');
-		print $formproject->select_projects($socid ? $socid : -1, $pid, 'search_projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'minwidth100 maxwidth250 widthcentpercentminusx');
+		print $formproject->select_projects($socid ? $socid : -1, (string) $pid, 'search_projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'minwidth100 maxwidth250 widthcentpercentminusx');
 		print '</div>';
 	}
 
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 4c5e77fb0a3..f7b1f3e7203 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2018-2025 Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2022      Charlene Benke       <charlene@patas-monkey.com>
  * Copyright (C) 2023      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Vincent de Grandpré	<vincent@de-grandpre.quebec>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -587,7 +587,7 @@ function project_admin_prepare_head()
  * @param   int			$level				    Level (start to 0, then increased/decrease by recursive call), or -1 to show all level in order of $lines without the recursive groupment feature.
  * @param 	string		$var				    Not used
  * @param 	int			$showproject		    Show project columns
- * @param	int			$taskrole			    Array of roles of user for each tasks
+ * @param	array<int,string>	$taskrole	    Array of roles of user for each tasks
  * @param	string		$projectsListId		    List of id of projects allowed to user (string separated with comma)
  * @param	int			$addordertick		    Add a tick to move task
  * @param   int         $projectidfortotallink  0 or Id of project to use on total line (link to see all time consumed for project)
@@ -1182,8 +1182,8 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
  * @param	?User		$fuser					Restrict list to user if defined
  * @param   Task[]		$lines					Array of lines
  * @param   int			$level					Level (start to 0, then increased/decrease by recursive call)
- * @param   string		$projectsrole			Array of roles user has on project
- * @param   string		$tasksrole				Array of roles user has on task
+ * @param   array<int,string>	$projectsrole	Array of roles user has on project
+ * @param   array<int,string>	$tasksrole		Array of roles user has on task
  * @param	string		$mine					Show only task lines I am assigned to
  * @param   int<0,1>	$restricteditformytask	0=No restriction, 1=Enable add time only if task is a task i am affected to
  * @param	int			$preselectedday			Preselected day
@@ -1412,8 +1412,8 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
  * @param	?User		$fuser					Restrict list to user if defined
  * @param   Task[]		$lines					Array of lines
  * @param   int			$level					Level (start to 0, then increased/decrease by recursive call)
- * @param   string		$projectsrole			Array of roles user has on project
- * @param   string		$tasksrole				Array of roles user has on task
+ * @param   array<int,string>	$projectsrole	Array of roles user has on project
+ * @param   array<int,string>	$tasksrole		Array of roles user has on task
  * @param	int<0,1>	$mine					Show only task lines I am assigned to
  * @param   int<0,2>	$restricteditformytask	0=No restriction, 1=Enable add time only if task is assigned to me, 2=Enable add time only if tasks is assigned to me and hide others
  * @param	int			$preselectedday			Preselected day
@@ -1816,8 +1816,8 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
  * @param   int 		$parent					Id of parent task to show (0 to show all)
  * @param   Task[]		$lines					Array of lines (list of tasks but we will show only if we have a specific role on task)
  * @param   int			$level					Level (start to 0, then increased/decrease by recursive call)
- * @param   string		$projectsrole			Array of roles user has on project
- * @param   string		$tasksrole				Array of roles user has on task
+ * @param   array<int,string>	$projectsrole	Array of roles user has on project
+ * @param   array<int,string>	$tasksrole		Array of roles user has on task
  * @param	int<0,1>	$mine					Show only task lines I am assigned to
  * @param   int<0,2>	$restricteditformytask	0=No restriction, 1=Enable add time only if task is assigned to me, 2=Enable add time only if tasks is assigned to me and hide others
  * @param   array<int,array{morning:int<0,1>,afternoon:int<0,1>}>	$isavailable	Array with data that say if user is available for several days for morning and afternoon
@@ -2222,13 +2222,13 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
  * @param   int 		$parent					Id of parent task to show (0 to show all)
  * @param   Task[]		$lines					Array of lines (list of tasks but we will show only if we have a specific role on task)
  * @param   int			$level					Level (start to 0, then increased/decrease by recursive call)
- * @param   string		$projectsrole			Array of roles user has on project
- * @param   string		$tasksrole				Array of roles user has on task
+ * @param   array<int,string>	$projectsrole	Array of roles user has on project
+ * @param   array<int,string>	$tasksrole		Array of roles user has on task
  * @param	int<0,1>	$mine					Show only task lines I am assigned to
  * @param   int<0,1>	$restricteditformytask	0=No restriction, 1=Enable add time only if task is a task i am affected to
  * @param   array<int,array{morning:int<0,1>,afternoon:int<0,1>}>	$isavailable	Array with data that say if user is available for several days for morning and afternoon
  * @param	int			$oldprojectforbreak		Old project id of last project break
- * @param	string[]		$TWeek				Array of week numbers ('02', ...
+ * @param	string[]	$TWeek					Array of week numbers ('02', ...
  * @param	array<string, array<string, int|string>> $arrayfields		    Array of additional column
  * @param	Extrafields	$extrafields		    Object extrafields
  * @return  array<string,int>					Array with time spent for $fuser for each day of week on tasks in $lines and subtasks (index is string, month is '01', ...)
@@ -2525,7 +2525,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
  * @param 	int		$inc				Counter that count number of lines legitimate to show (for return)
  * @param 	int		$parent				Id of parent task to start
  * @param 	Task[]	$lines				Array of all tasks
- * @param	string	$taskrole			Array of task filtered on a particular user
+ * @param	array<int,string>	$taskrole	Array of task filtered on a particular user
  * @return	int							1 if there is
  */
 function searchTaskInChild(&$inc, $parent, &$lines, &$taskrole)
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 92afd4da700..b7a37c346d6 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -1113,10 +1113,10 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 			}
 			$checkonentitydone = 1;
 		}
-		if (in_array($feature, $checktask) && $objectid > 0) {
+		if (in_array($feature, $checktask) && (int) $objectid > 0) {
 			if (isModEnabled('project') && !$user->hasRight('projet', 'all', 'lire')) {
 				$task = new Task($db);
-				$task->fetch($objectid);
+				$task->fetch((int) $objectid);
 				$projectid = $task->fk_project;
 
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
diff --git a/htdocs/core/modules/mailings/eventorganization.modules.php b/htdocs/core/modules/mailings/eventorganization.modules.php
index 528072d76e9..79ee29df177 100644
--- a/htdocs/core/modules/mailings/eventorganization.modules.php
+++ b/htdocs/core/modules/mailings/eventorganization.modules.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2018-2018  Andre Schild        	<a.schild@aarboard.ch>
  * Copyright (C) 2005-2010  Laurent Destailleur 	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009  Regis Houssin       	<regis.houssin@inodbox.com>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This file is an example to follow to add your own email selector inside
@@ -204,7 +204,7 @@ class mailing_eventorganization extends MailingTargets
 		$formproject = new FormProjets($this->db);
 
 		$s = img_picto($langs->trans("OrganizedEvent"), 'project', 'class="pictofixedwidth"');
-		$s .= $formproject->select_projects(-1, 0, "filter_eventorganization", 0, 0, $langs->trans("OrganizedEvent"), 1, 0, 0, 0, '', 1, 0, '', '', 'usage_organize_event=1');
+		$s .= $formproject->select_projects(-1, '0', "filter_eventorganization", 0, 0, $langs->trans("OrganizedEvent"), 1, 0, 0, 0, '', 1, 0, '', '', 'usage_organize_event=1');
 
 		return $s;
 	}
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 63f17a6a644..94878e5d2ae 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2016-2023	Charlene Benke		<charlene@patas-monkey.com>
  * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2023      	Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -183,7 +183,6 @@ class doc_generic_project_odt extends ModelePDFProjects
 	 *	@param  Task			$task				Task Object
 	 *	@param  Translate		$outputlangs        Lang object to use for output
 	 *  @return	array{task_ref:string,task_fk_project:string,task_projectref:string,task_projectlabel:string,task_label:string,task_description:string,task_fk_parent:string,task_duration:string,task_duration_hour:string,task_planned_workload:string,task_planned_workload_hour:string,task_progress:string,task_public:string,task_date_start:string,task_date_end:string,task_note_private:string,task_note_public:string}			Return a substitution array + extrafields
-
 	 */
 	public function get_substitutionarray_tasks(Task $task, $outputlangs)
 	{
@@ -1053,7 +1052,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 									$ref_array['type'] = (string) $langs->trans($classname);
 
 									$element = new $classname($this->db);
-									$element->fetch($elementarray[$i]);
+									$element->fetch((int) $elementarray[$i]);
 									$element->fetch_thirdparty();
 
 									//Ref object
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 3b5cf8daf32..0c0a6527da8 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -467,7 +467,7 @@ class pdf_beluga extends ModelePDFProjects
 					//var_dump("$key, $tablename, $datefieldname, $dates, $datee");
 					$elementarray = $object->get_element_list($key, $tablename, $datefieldname, 0, 0, $projectField);
 
-					$num = count($elementarray);
+					$num = is_array($elementarray) ? count($elementarray) : $elementarray;
 					if ($num >= 0) {
 						$nexY = $pdf->GetY() + 5;
 
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 082111cd7f0..2ddcc41a1c0 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2016       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.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
@@ -887,7 +887,7 @@ class Holiday extends CommonObject
 	 *
 	 *  @param	User		$user        	User that approve
 	 *  @param  int<0,1>	$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int         			Return integer <0 if KO, >0 if OK
+	 *  @return int							Return integer <0 if KO, >0 if OK
 	 */
 	public function approve($user = null, $notrigger = 0)
 	{
@@ -1151,9 +1151,9 @@ class Holiday extends CommonObject
 	/**
 	 *   Delete object in database
 	 *
-	 *	 @param		User	$user        	User that delete
-	 *   @param     int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *	 @return	int						Return integer <0 if KO, >0 if OK
+	 *	 @param		User		$user        	User that delete
+	 *   @param     int<0,1>	$notrigger	    0=launch triggers after, 1=disable triggers
+	 *	 @return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -1202,12 +1202,12 @@ class Holiday extends CommonObject
 	 *  This function can be used to avoid to have 2 leave requests on same period for example.
 	 *  Warning: It consumes a lot of memory because it load in ->holiday all holiday of a dedicated user at each call.
 	 *
-	 *  @param 	int		$fk_user		Id user
-	 *  @param 	integer	$dateStart		Start date of period to check
-	 *  @param 	integer	$dateEnd		End date of period to check
-	 *  @param  int     $halfday        Tag to define how start and end the period to check:
+	 *  @param 	int			$fk_user	Id user
+	 *  @param 	int			$dateStart	Start date of period to check
+	 *  @param 	int			$dateEnd	End date of period to check
+	 *  @param  int<-1,2>	$halfday    Tag to define how start and end the period to check:
 	 *                                  0:Full days, 2:Start afternoon end morning, -1:Start afternoon end afternoon, 1:Start morning end morning
-	 * 	@return boolean					False = New range overlap an existing holiday, True = no overlapping (is never on holiday during checked period).
+	 * 	@return bool					False = New range overlap an existing holiday, True = no overlapping (is never on holiday during checked period).
 	 *  @see verifDateHolidayForTimestamp()
 	 */
 	public function verifDateHolidayCP($fk_user, $dateStart, $dateEnd, $halfday = 0)
@@ -1287,9 +1287,9 @@ class Holiday extends CommonObject
 	 *	Check that a user is not on holiday for a particular timestamp. Can check approved leave requests and not into public holidays of company.
 	 *
 	 * 	@param 	int			$fk_user				Id user
-	 *  @param	integer	    $timestamp				Time stamp date for a day (YYYY-MM-DD) without hours  (= 12:00AM in english and not 12:00PM that is 12:00)
+	 *  @param	int		    $timestamp				Time stamp date for a day (YYYY-MM-DD) without hours  (= 12:00AM in english and not 12:00PM that is 12:00)
 	 *  @param	string		$status					Filter on holiday status. '-1' = no filter.
-	 * 	@return array{morning_reason?:string,afternoon_reason?:string}		array('morning'=> ,'afternoon'=> ), Boolean is true if user is available for day timestamp.
+	 * 	@return array{morning:int<0,1>,afternoon:int<0,1>,morning_reason?:string,afternoon_reason?:string}		array('morning'=> ,'afternoon'=> ), Boolean is true if user is available for day timestamp.
 	 *  @see verifDateHolidayCP()
 	 */
 	public function verifDateHolidayForTimestamp($fk_user, $timestamp, $status = '-1')
@@ -1349,7 +1349,7 @@ class Holiday extends CommonObject
 			dol_print_error($this->db);
 		}
 
-		$result = array('morning' => $isavailablemorning, 'afternoon' => $isavailableafternoon);
+		$result = array('morning' => (int) $isavailablemorning, 'afternoon' => (int) $isavailableafternoon);
 		if (!$isavailablemorning) {
 			$result['morning_reason'] = 'leave_request';
 		}
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 3a784e4db5e..e5958376156 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2010      François Legastelois <flegastelois@teclib.com>
  * Copyright (C) 2018-2024  Frédéric France      <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -90,9 +90,9 @@ $search_declared_progress = GETPOST('search_declared_progress', 'alpha');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 
-$monthofday = GETPOST('addtimemonth');
-$dayofday = GETPOST('addtimeday');
-$yearofday = GETPOST('addtimeyear');
+$monthofday = GETPOSTINT('addtimemonth');
+$dayofday = GETPOSTINT('addtimeday');
+$yearofday = GETPOSTINT('addtimeyear');
 
 //var_dump(GETPOST('remonth'));
 //var_dump(GETPOST('button_search_x'));
@@ -134,9 +134,9 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Definition of fields for list
 $arrayfields = array();
-$arrayfields['t.planned_workload'] = array('label' => 'PlannedWorkload', 'checked' => 1, 'enabled' => 1, 'position' => 0);
-$arrayfields['t.progress'] = array('label' => 'ProgressDeclared', 'checked' => 1, 'enabled' => 1, 'position' => 0);
-$arrayfields['timeconsumed'] = array('label' => 'TimeConsumed', 'checked' => 1, 'enabled' => 1, 'position' => 15);
+$arrayfields['t.planned_workload'] = array('label' => 'PlannedWorkload', 'checked' => '1', 'enabled' => '1', 'position' => 0);
+$arrayfields['t.progress'] = array('label' => 'ProgressDeclared', 'checked' => '1', 'enabled' => '1', 'position' => 0);
+$arrayfields['timeconsumed'] = array('label' => 'TimeConsumed', 'checked' => '1', 'enabled' => '1', 'position' => 15);
 /*$arrayfields=array(
  // Project
  'p.opp_amount'=>array('label'=>$langs->trans("OpportunityAmountShort"), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES?1:0), 'position'=>103),
@@ -150,7 +150,7 @@ $arrayfields['timeconsumed'] = array('label' => 'TimeConsumed', 'checked' => 1,
 if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
-			$arrayfields["efpt.".$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'checked' => (($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position' => $extrafields->attributes[$object->table_element]['pos'][$key], 'enabled' => (abs((int) $extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+			$arrayfields["efpt.".$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'checked' => (($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? '0' : '1'), 'position' => $extrafields->attributes[$object->table_element]['pos'][$key], 'enabled' => (string) (int) (abs((int) $extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
 		}
 	}
 }
@@ -407,14 +407,14 @@ $search_options_pattern = 'search_task_options_';
 $extrafieldsobjectkey = 'projet_task';
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 
-$tasksarray = $taskstatic->getTasksArray(null, null, ($project->id ? $project->id : 0), $socid, 0, $search_project_ref, $onlyopenedproject, $morewherefilter, ($search_usertoprocessid ? $search_usertoprocessid : 0), 0, $extrafields); // We want to see all task of opened project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
+$tasksarray = $taskstatic->getTasksArray(null, null, ($project->id ? $project->id : 0), $socid, 0, $search_project_ref, (string) $onlyopenedproject, $morewherefilter, ($search_usertoprocessid ? $search_usertoprocessid : 0), 0, $extrafields); // We want to see all task of opened project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
 
 $tasksarraywithoutfilter = array();
 if ($morewherefilter) {	// Get all task without any filter, so we can show total of time spent for not visible tasks
-	$tasksarraywithoutfilter = $taskstatic->getTasksArray(null, null, ($project->id ? $project->id : 0), $socid, 0, '', $onlyopenedproject, '', ($search_usertoprocessid ? $search_usertoprocessid : 0)); // We want to see all task of opened project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
+	$tasksarraywithoutfilter = $taskstatic->getTasksArray(null, null, ($project->id ? $project->id : 0), $socid, 0, '', (string) $onlyopenedproject, '', ($search_usertoprocessid ? $search_usertoprocessid : 0)); // We want to see all task of opened project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
 }
-$projectsrole = $taskstatic->getUserRolesForProjectsOrTasks($usertoprocess, null, ($project->id ? $project->id : 0), 0, $onlyopenedproject);
-$tasksrole = $taskstatic->getUserRolesForProjectsOrTasks(null, $usertoprocess, ($project->id ? $project->id : 0), 0, $onlyopenedproject);
+$projectsrole = $taskstatic->getUserRolesForProjectsOrTasks($usertoprocess, null, ($project->id ? (string) $project->id : '0'), 0, $onlyopenedproject);
+$tasksrole = $taskstatic->getUserRolesForProjectsOrTasks(null, $usertoprocess, ($project->id ? (string) $project->id : '0'), 0, $onlyopenedproject);
 
 llxHeader('', $title, '', '', 0, 0, array('/core/js/timesheet.js'), '', '', 'mod-project project-activity page-activity_perday');
 
@@ -521,7 +521,7 @@ if (!$user->hasRight('user', 'user', 'lire')) {
 	$includeonly = array($user->id);
 }
 $selecteduser = $search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id;
-$moreforfiltertmp = $form->select_dolusers($selecteduser, 'search_usertoprocessid', 0, null, 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200');
+$moreforfiltertmp = $form->select_dolusers($selecteduser, 'search_usertoprocessid', 0, null, 0, $includeonly, '', '0', 0, 0, '', 0, '', 'maxwidth200');
 if ($form->num > 1 || empty($conf->dol_optimize_smallscreen)) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= '<div class="inline-block hideonsmartphone"></div>';
@@ -656,7 +656,7 @@ if (getDolGlobalString('MAIN_DEFAULT_WORKING_DAYS')) {
 }
 
 $statusofholidaytocheck = Holiday::STATUS_APPROVED;
-$isavailablefordayanduser = $holiday->verifDateHolidayForTimestamp($usertoprocess->id, $daytoparse, $statusofholidaytocheck); // $daytoparse is a date with hours = 0
+$isavailablefordayanduser = $holiday->verifDateHolidayForTimestamp($usertoprocess->id, $daytoparse, (string) $statusofholidaytocheck); // $daytoparse is a date with hours = 0
 $isavailable[$daytoparse] = $isavailablefordayanduser; // in projectLinesPerWeek later, we are using $firstdaytoshow and dol_time_plus_duree to loop on each day
 
 $test = num_public_holiday($daytoparsegmt, $daytoparsegmt + 86400, $mysoc->country_code);
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 502e85e1cba..dbb30f61c91 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2015	Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010	Regis Houssin				<regis.houssin@capnetworks.com>
  * Copyright (C) 2010		François Legastelois		<flegastelois@teclib.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024		Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2025		Alexandre Spangaro			<alexandre@inovea-conseil.com>
  *
@@ -137,9 +137,9 @@ $arrayfields = array();
  'p.budget_amount'=>array('label'=>$langs->trans("Budget"), 'checked'=>0, 'position'=>110),
  'p.usage_bill_time'=>array('label'=>$langs->trans("BillTimeShort"), 'checked'=>0, 'position'=>115),
  );*/
-$arrayfields['t.planned_workload'] = array('label' => 'PlannedWorkload', 'checked' => 1, 'enabled' => 1, 'position' => 5);
-$arrayfields['t.progress'] = array('label' => 'ProgressDeclared', 'checked' => 1, 'enabled' => 1, 'position' => 10);
-$arrayfields['timeconsumed'] = array('label' => 'TimeConsumed', 'checked' => 1, 'enabled' => 1, 'position' => 15);
+$arrayfields['t.planned_workload'] = array('label' => 'PlannedWorkload', 'checked' => '1', 'enabled' => '1', 'position' => 5);
+$arrayfields['t.progress'] = array('label' => 'ProgressDeclared', 'checked' => '1', 'enabled' => '1', 'position' => 10);
+$arrayfields['timeconsumed'] = array('label' => 'TimeConsumed', 'checked' => '1', 'enabled' => '1', 'position' => 15);
 /*foreach($object->fields as $key => $val)
  {
  // If $val['visible']==0, then we never show the field
@@ -150,7 +150,7 @@ $arrayfields['timeconsumed'] = array('label' => 'TimeConsumed', 'checked' => 1,
 if (!empty($extrafields->attributes['projet_task']['label']) && is_array($extrafields->attributes['projet_task']['label']) && count($extrafields->attributes['projet_task']['label']) > 0) {
 	foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) {
 		if (!empty($extrafields->attributes['projet_task']['list'][$key])) {
-			$arrayfields["efpt.".$key] = array('label' => $extrafields->attributes['projet_task']['label'][$key], 'checked' => (($extrafields->attributes['projet_task']['list'][$key] < 0) ? 0 : 1), 'position' => $extrafields->attributes['projet_task']['pos'][$key], 'enabled' => (abs((int) $extrafields->attributes['projet_task']['list'][$key]) != 3 && $extrafields->attributes['projet_task']['perms'][$key]));
+			$arrayfields["efpt.".$key] = array('label' => $extrafields->attributes['projet_task']['label'][$key], 'checked' => (($extrafields->attributes['projet_task']['list'][$key] < 0) ? '0' : '1'), 'position' => $extrafields->attributes['projet_task']['pos'][$key], 'enabled' => (string) (int) (abs((int) $extrafields->attributes['projet_task']['list'][$key]) != 3 && $extrafields->attributes['projet_task']['perms'][$key]));
 		}
 	}
 }
@@ -424,12 +424,12 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 
 $tasksarraywithoutfilter = array();  // Default
 
-$tasksarray = $taskstatic->getTasksArray(null, null, ($project->id ? $project->id : 0), $socid, 0, $search_project_ref, $onlyopenedproject, $morewherefilter, ($search_usertoprocessid ? $search_usertoprocessid : 0), 0, $extrafields); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
+$tasksarray = $taskstatic->getTasksArray(null, null, ($project->id ? $project->id : 0), $socid, 0, $search_project_ref, (string) $onlyopenedproject, $morewherefilter, ($search_usertoprocessid ? $search_usertoprocessid : 0), 0, $extrafields); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
 if ($morewherefilter) {	// Get all task without any filter, so we can show total of time spent for not visible tasks
-	$tasksarraywithoutfilter = $taskstatic->getTasksArray(null, null, ($project->id ? $project->id : 0), $socid, 0, '', $onlyopenedproject, '', ($search_usertoprocessid ? $search_usertoprocessid : 0)); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
+	$tasksarraywithoutfilter = $taskstatic->getTasksArray(null, null, ($project->id ? $project->id : 0), $socid, 0, '', (string) $onlyopenedproject, '', ($search_usertoprocessid ? $search_usertoprocessid : 0)); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
 }
-$projectsrole = $taskstatic->getUserRolesForProjectsOrTasks($usertoprocess, null, ($project->id ? $project->id : 0), 0, $onlyopenedproject);
-$tasksrole = $taskstatic->getUserRolesForProjectsOrTasks(null, $usertoprocess, ($project->id ? $project->id : 0), 0, $onlyopenedproject);
+$projectsrole = $taskstatic->getUserRolesForProjectsOrTasks($usertoprocess, null, ($project->id ? (string) $project->id : '0'), 0, $onlyopenedproject);
+$tasksrole = $taskstatic->getUserRolesForProjectsOrTasks(null, $usertoprocess, ($project->id ? (string) $project->id : '0'), 0, $onlyopenedproject);
 //var_dump($tasksarray);
 //var_dump($projectsrole);
 //var_dump($taskrole);
@@ -536,7 +536,7 @@ if (!$user->hasRight('user', 'user', 'lire')) {
 	$includeonly = array($user->id);
 }
 $selecteduser = $search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id;
-$moreforfiltertmp = $form->select_dolusers($selecteduser, 'search_usertoprocessid', 0, null, 0, $includeonly, array(), 0, 0, 0, '', 0, '', 'maxwidth200');
+$moreforfiltertmp = $form->select_dolusers($selecteduser, 'search_usertoprocessid', 0, null, 0, $includeonly, array(), '0', 0, 0, '', 0, '', 'maxwidth200');
 if ($form->num > 1 || empty($conf->dol_optimize_smallscreen)) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= '<div class="inline-block hideonsmartphone"></div>';
@@ -774,8 +774,8 @@ if (count($tasksarray) > 0) {
 			if (!empty($THolidays[$weekNb]["ids"]) && in_array($h->rowid, $THolidays[$weekNb]["ids"])) {
 				continue;
 			}
-			$startweekholiday =(int) (($h["date_debut"] <= $weekstart) ? $weekstart : $h["date_debut"] );
-			$endweekholiday =(int) (($h["date_fin"] >= $weekend) ? $weekend : $h["date_fin"]);
+			$startweekholiday = (int) (($h["date_debut"] <= $weekstart) ? $weekstart : $h["date_debut"]);
+			$endweekholiday = (int) (($h["date_fin"] >= $weekend) ? $weekend : $h["date_fin"]);
 			$halfdays = (int) $h["halfday"];
 			$nbdays = num_open_day($startweekholiday, $endweekholiday, 0, 1, $halfdays);
 
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index a7f799d74aa..a2a96bb2b01 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2010      François Legastelois <flegastelois@teclib.com>
  * Copyright (C) 2018-2024  Frédéric France      <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -139,9 +139,9 @@ $arrayfields = array();
  'p.budget_amount'=>array('label'=>$langs->trans("Budget"), 'checked'=>0, 'position'=>110),
  'p.usage_bill_time'=>array('label'=>$langs->trans("BillTimeShort"), 'checked'=>0, 'position'=>115),
  );*/
-$arrayfields['t.planned_workload'] = array('label' => 'PlannedWorkload', 'checked' => 1, 'enabled' => 1, 'position' => 5);
-$arrayfields['t.progress'] = array('label' => 'ProgressDeclared', 'checked' => 1, 'enabled' => 1, 'position' => 10);
-$arrayfields['timeconsumed'] = array('label' => 'TimeConsumed', 'checked' => 1, 'enabled' => 1, 'position' => 15);
+$arrayfields['t.planned_workload'] = array('label' => 'PlannedWorkload', 'checked' => '1', 'enabled' => '1', 'position' => 5);
+$arrayfields['t.progress'] = array('label' => 'ProgressDeclared', 'checked' => '1', 'enabled' => '1', 'position' => 10);
+$arrayfields['timeconsumed'] = array('label' => 'TimeConsumed', 'checked' => '1', 'enabled' => '1', 'position' => 15);
 /*foreach($object->fields as $key => $val)
  {
  // If $val['visible']==0, then we never show the field
@@ -152,7 +152,7 @@ $arrayfields['timeconsumed'] = array('label' => 'TimeConsumed', 'checked' => 1,
 if (!empty($extrafields->attributes['projet_task']['label']) && is_array($extrafields->attributes['projet_task']['label']) && count($extrafields->attributes['projet_task']['label']) > 0) {
 	foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) {
 		if (!empty($extrafields->attributes['projet_task']['list'][$key])) {
-			$arrayfields["efpt.".$key] = array('label' => $extrafields->attributes['projet_task']['label'][$key], 'checked' => (($extrafields->attributes['projet_task']['list'][$key] < 0) ? 0 : 1), 'position' => $extrafields->attributes['projet_task']['pos'][$key], 'enabled' => (abs((int) $extrafields->attributes['projet_task']['list'][$key]) != 3 && $extrafields->attributes['projet_task']['perms'][$key]));
+			$arrayfields["efpt.".$key] = array('label' => $extrafields->attributes['projet_task']['label'][$key], 'checked' => (($extrafields->attributes['projet_task']['list'][$key] < 0) ? '0' : '1'), 'position' => $extrafields->attributes['projet_task']['pos'][$key], 'enabled' => (string) (int) (abs((int) $extrafields->attributes['projet_task']['list'][$key]) != 3 && $extrafields->attributes['projet_task']['perms'][$key]));
 		}
 	}
 }
@@ -422,13 +422,13 @@ $search_options_pattern = 'search_task_options_';
 $extrafieldsobjectkey = 'projet_task';
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 
-$tasksarray = $taskstatic->getTasksArray(null, null, ($project->id ? $project->id : 0), $socid, 0, $search_project_ref, $onlyopenedproject, $morewherefilter, ($search_usertoprocessid ? $search_usertoprocessid : 0), 0, $extrafields); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
+$tasksarray = $taskstatic->getTasksArray(null, null, ($project->id ? $project->id : 0), $socid, 0, $search_project_ref, (string) $onlyopenedproject, $morewherefilter, ($search_usertoprocessid ? $search_usertoprocessid : 0), 0, $extrafields); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
 $tasksarraywithoutfilter = array();
 if ($morewherefilter) {	// Get all task without any filter, so we can show total of time spent for not visible tasks
-	$tasksarraywithoutfilter = $taskstatic->getTasksArray(null, null, ($project->id ? $project->id : 0), $socid, 0, '', $onlyopenedproject, '', ($search_usertoprocessid ? $search_usertoprocessid : 0)); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
+	$tasksarraywithoutfilter = $taskstatic->getTasksArray(null, null, ($project->id ? $project->id : 0), $socid, 0, '', (string) $onlyopenedproject, '', ($search_usertoprocessid ? $search_usertoprocessid : 0)); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
 }
-$projectsrole = $taskstatic->getUserRolesForProjectsOrTasks($usertoprocess, null, ($project->id ? $project->id : 0), 0, $onlyopenedproject);
-$tasksrole = $taskstatic->getUserRolesForProjectsOrTasks(null, $usertoprocess, ($project->id ? $project->id : 0), 0, $onlyopenedproject);
+$projectsrole = $taskstatic->getUserRolesForProjectsOrTasks($usertoprocess, null, ($project->id ? (string) $project->id : '0'), 0, (int) $onlyopenedproject);
+$tasksrole = $taskstatic->getUserRolesForProjectsOrTasks(null, $usertoprocess, ($project->id ? (string) $project->id : '0'), 0, (int) $onlyopenedproject);
 //var_dump($tasksarray);
 //var_dump($projectsrole);
 //var_dump($taskrole);
@@ -542,7 +542,7 @@ for ($idw = 0; $idw < 7; $idw++) {
 
 	$statusofholidaytocheck = Holiday::STATUS_APPROVED;
 
-	$isavailablefordayanduser = $holiday->verifDateHolidayForTimestamp($usertoprocess->id, $dayinloopfromfirstdaytoshow, $statusofholidaytocheck);
+	$isavailablefordayanduser = $holiday->verifDateHolidayForTimestamp($usertoprocess->id, $dayinloopfromfirstdaytoshow, (string) $statusofholidaytocheck);
 	$isavailable[$dayinloopfromfirstdaytoshow] = $isavailablefordayanduser; // in projectLinesPerWeek later, we are using $firstdaytoshow and dol_time_plus_duree to loop on each day
 
 	$test = num_public_holiday($dayinloopfromfirstdaytoshowgmt, $dayinloopfromfirstdaytoshowgmt + 86400, $mysoc->country_code);
@@ -571,7 +571,7 @@ if (!$user->hasRight('user', 'user', 'lire')) {
 	$includeonly = array($user->id);
 }
 $selecteduser = $search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id;
-$moreforfiltertmp = $form->select_dolusers($selecteduser, 'search_usertoprocessid', 0, null, 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200');
+$moreforfiltertmp = $form->select_dolusers($selecteduser, 'search_usertoprocessid', 0, null, 0, $includeonly, '', '0', 0, 0, '', 0, '', 'maxwidth200');
 if ($form->num > 1 || empty($conf->dol_optimize_smallscreen)) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= '<div class="inline-block hideonsmartphone"></div>';
diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
index 81ffe73f17d..8b2dc432e60 100644
--- a/htdocs/projet/ajax/projects.php
+++ b/htdocs/projet/ajax/projects.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2007-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.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
@@ -78,7 +79,7 @@ if (empty($mode) || $mode != 'gettasks') {
 	$searchkey = (GETPOSTISSET($htmlname) ? GETPOST($htmlname, 'aZ09') : '');
 
 	$formproject = new FormProjets($db);
-	$arrayresult = $formproject->select_projects_list($socid, '', '', 0, 0, 1, $discard_closed, 0, 0, 1, $searchkey);
+	$arrayresult = $formproject->select_projects_list($socid, 0, '', 0, 0, 1, $discard_closed, 0, 0, 1, $searchkey);
 
 	$db->close();
 
@@ -93,7 +94,7 @@ if ($mode == 'gettasks') {
 	top_httphead();
 
 	$formproject = new FormProjets($db);
-	$formproject->selectTasks((!empty($socid) ? $socid : -1), 0, 'taskid', 24, 1, '1', 1, 0, 0, 'maxwidth500', GETPOSTINT('projectid'), '');
+	$formproject->selectTasks((!empty($socid) ? $socid : -1), 0, 'taskid', 24, 1, '1', 1, 0, 0, 'maxwidth500', (string) GETPOSTINT('projectid'), '');
 
 	$db->close();
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index dba5f48db1c..08625a71259 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2023       Charlene Benke          <charlene@patas_monkey.com>
  * Copyright (C) 2023       Christian Foellmann     <christian@foellmann.de>
- * Copyright (C) 2024       MDW                     <mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW                     <mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2024       Alexandre Spangaro      <alexandre@inovea-conseil.com>
  *
@@ -313,7 +313,7 @@ if (empty($reshook)) {
 		}
 
 		$db->begin();
-		$old_start_date = null;
+		$old_start_date = 0;
 		if (!$error) {
 			$object->oldcopy = clone $object;
 
@@ -1095,7 +1095,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		if (getDolGlobalInt('PROJECT_ENABLE_SUB_PROJECT')) {
 			print '<tr><td>'.$langs->trans("Parent").'</td><td class="maxwidthonsmartphone">';
 			print img_picto('', 'project', 'class="pictofixedwidth"');
-			$formproject->select_projects(-1, $object->fk_project, 'fk_project', 64, 0, 1, 1, 0, 0, 0, '', 0, 0, '', '', '');
+			$formproject->select_projects(-1, (string) $object->fk_project, 'fk_project', 64, 0, 1, 1, 0, 0, 0, '', 0, 0, '', '', '');
 			print '</td></tr>';
 		}
 
@@ -1240,7 +1240,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			print '<tr class="classuseopportunity'.$classfortr.'"><td>'.$langs->trans("OpportunityStatus").'</td>';
 			print '<td>';
 			print '<div>';
-			print $formproject->selectOpportunityStatus('opp_status', $object->opp_status, 1, 0, 0, 0, 'minwidth150 inline-block valignmiddle', 1, 1);
+			print $formproject->selectOpportunityStatus('opp_status', (string) $object->opp_status, 1, 0, 0, 0, 'minwidth150 inline-block valignmiddle', 1, 1);
 
 			// Opportunity probability
 			print ' <input class="width50 right" type="text" id="opp_percent" name="opp_percent" title="'.dol_escape_htmltag($langs->trans("OpportunityProbability")).'" value="'.(GETPOSTISSET('opp_percent') ? GETPOST('opp_percent') : (strcmp($object->opp_percent, '') ? vatrate($object->opp_percent) : '')).'"> %';
@@ -1442,8 +1442,8 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			print '</td><td>';
 			$html_name_status 	= ($action == 'edit_opp_status') ? 'opp_status' : 'none';
 			$html_name_percent 	= ($action == 'edit_opp_status') ? 'opp_percent' : 'none';
-			$percent_value = (GETPOSTISSET('opp_percent') ? GETPOST('opp_percent') : (strcmp($object->opp_percent, '') ? vatrate($object->opp_percent) : ''));
-			$formproject->formOpportunityStatus($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->opp_status, $percent_value, $html_name_status, $html_name_percent);
+			$percent_value = (GETPOSTISSET('opp_percent') ? GETPOSTINT('opp_percent') : (strcmp($object->opp_percent, '') ? vatrate($object->opp_percent) : ''));
+			$formproject->formOpportunityStatus($_SERVER['PHP_SELF'].'?socid='.$object->id, (string) $object->opp_status, $percent_value, $html_name_status, $html_name_percent);
 			print '</td></tr>';
 
 			// Opportunity Amount
@@ -1808,7 +1808,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		$genallowed = ($user->hasRight('projet', 'lire') && $userAccess > 0);
 		$delallowed = ($user->hasRight('projet', 'creer') && $userWrite > 0);
 
-		print $formfile->showdocuments('project', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 0, 0, '', '', '', '', '', $object);
+		print $formfile->showdocuments('project', $filename, $filedir, $urlsource, (int) $genallowed, (int) $delallowed, $object->model_pdf, 1, 0, 0, 0, 0, '', '', '', '', '', $object);
 
 		print '</div><div class="fichehalfright">';
 
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 979745c3805..842522ff561 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.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
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 class Projects extends DolibarrApi
 {
 	/**
-	 * @var string[]   $FIELDS     Mandatory fields, checked when create and update object
+	 * @var string[]       Mandatory fields, checked when create and update object
 	 */
 	public static $FIELDS = array(
 		'ref',
@@ -39,12 +39,12 @@ class Projects extends DolibarrApi
 	);
 
 	/**
-	 * @var Project $project {@type Project}
+	 * @var Project {@type Project}
 	 */
 	public $project;
 
 	/**
-	 * @var Task $task {@type Task}
+	 * @var Task {@type Task}
 	 */
 	public $task;
 
@@ -459,7 +459,7 @@ class Projects extends DolibarrApi
 			$userp = new User($this->db);
 			$userp->fetch($userid);
 		}
-		$this->project->roles = $taskstatic->getUserRolesForProjectsOrTasks($userp, null, $id, 0);
+		$this->project->roles = $taskstatic->getUserRolesForProjectsOrTasks($userp, null, (string) $id, 0);
 		$result = array();
 		foreach ($this->project->roles as $line) {
 			array_push($result, $this->_cleanObjectDatas($line));
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index fa22c00d98b..fa328d51da8 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -861,13 +861,13 @@ class Project extends CommonObject
 	/**
 	 * 	Return list of elements for type, linked to a project
 	 *
-	 * 	@param		string		$type			'propal','order','invoice','order_supplier','invoice_supplier',...
-	 * 	@param		string		$tablename		name of table associated of the type
-	 * 	@param		string		$datefieldname	name of date field for filter
-	 *  @param		int			$date_start		Start date
-	 *  @param		int			$date_end		End date
-	 *	@param		string		$projectkey		Equivalent key  to fk_projet for actual type
-	 * 	@return		mixed						Array list of object ids linked to project, < 0 or string if error
+	 * 	@param	string		$type				'propal','order','invoice','order_supplier','invoice_supplier',...
+	 * 	@param	string		$tablename			name of table associated of the type
+	 * 	@param	string		$datefieldname		name of date field for filter
+	 *  @param	?int		$date_start			Start date
+	 *  @param	?int		$date_end			End date
+	 *	@param	string		$projectkey			Equivalent key  to fk_projet for actual type
+	 * 	@return	array<int,string>|int<-1,-1>|string	Array list of object ids linked to project, < 0 or string if error
 	 */
 	public function get_element_list($type, $tablename, $datefieldname = '', $date_start = null, $date_end = null, $projectkey = 'fk_projet')
 	{
@@ -884,23 +884,23 @@ class Project extends CommonObject
 		$ids = $this->id;
 
 		if ($type == 'agenda') {
-			$sql = "SELECT id as rowid FROM ".MAIN_DB_PREFIX."actioncomm WHERE fk_project IN (".$this->db->sanitize($ids).") AND entity IN (".getEntity('agenda').")";
+			$sql = "SELECT id as rowid FROM ".MAIN_DB_PREFIX."actioncomm WHERE fk_project IN (".$this->db->sanitize((string) $ids).") AND entity IN (".getEntity('agenda').")";
 		} elseif ($type == 'expensereport') {
-			$sql = "SELECT ed.rowid FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND e.entity IN (".getEntity('expensereport').") AND ed.fk_projet IN (".$this->db->sanitize($ids).")";
+			$sql = "SELECT ed.rowid FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND e.entity IN (".getEntity('expensereport').") AND ed.fk_projet IN (".$this->db->sanitize((string) $ids).")";
 		} elseif ($type == 'project_task') {
-			$sql = "SELECT DISTINCT pt.rowid FROM ".MAIN_DB_PREFIX."projet_task as pt WHERE pt.fk_projet IN (".$this->db->sanitize($ids).")";
+			$sql = "SELECT DISTINCT pt.rowid FROM ".MAIN_DB_PREFIX."projet_task as pt WHERE pt.fk_projet IN (".$this->db->sanitize((string) $ids).")";
 		} elseif ($type == 'element_time') {	// Case we want to duplicate line foreach user
-			$sql = "SELECT DISTINCT pt.rowid, ptt.fk_user FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."element_time as ptt WHERE pt.rowid = ptt.fk_element AND ptt.elementtype = 'task' AND pt.fk_projet IN (".$this->db->sanitize($ids).")";
+			$sql = "SELECT DISTINCT pt.rowid, ptt.fk_user FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."element_time as ptt WHERE pt.rowid = ptt.fk_element AND ptt.elementtype = 'task' AND pt.fk_projet IN (".$this->db->sanitize((string) $ids).")";
 		} elseif ($type == 'stocktransfer_stocktransfer') {
-			$sql = "SELECT ms.rowid, ms.fk_user_author as fk_user FROM ".MAIN_DB_PREFIX."stocktransfer_stocktransfer as ms, ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = ms.fk_entrepot AND e.entity IN (".getEntity('stock').") AND ms.origintype = 'project' AND ms.fk_origin IN (".$this->db->sanitize($ids).") AND ms.type_mouvement = 1";
+			$sql = "SELECT ms.rowid, ms.fk_user_author as fk_user FROM ".MAIN_DB_PREFIX."stocktransfer_stocktransfer as ms, ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = ms.fk_entrepot AND e.entity IN (".getEntity('stock').") AND ms.origintype = 'project' AND ms.fk_origin IN (".$this->db->sanitize((string) $ids).") AND ms.type_mouvement = 1";
 		} elseif ($type == 'loan') {
-			$sql = "SELECT l.rowid, l.fk_user_author as fk_user FROM ".MAIN_DB_PREFIX."loan as l WHERE l.entity IN (".getEntity('loan').") AND l.fk_projet IN (".$this->db->sanitize($ids).")";
+			$sql = "SELECT l.rowid, l.fk_user_author as fk_user FROM ".MAIN_DB_PREFIX."loan as l WHERE l.entity IN (".getEntity('loan').") AND l.fk_projet IN (".$this->db->sanitize((string) $ids).")";
 		} else {
-			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$tablename." WHERE ".$projectkey." IN (".$this->db->sanitize($ids).") AND entity IN (".getEntity($type).")";
+			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$tablename." WHERE ".$projectkey." IN (".$this->db->sanitize((string) $ids).") AND entity IN (".getEntity($type).")";
 		}
 
 		if (isDolTms($date_start) && $type == 'loan') {
-			$sql .= " AND (dateend > '".$this->db->idate($date_start)."' OR dateend IS NULL)";
+			$sql .= " AND (dateend > '".$this->db->idate((int) $date_start)."' OR dateend IS NULL)";
 		} elseif (isDolTms($date_start) && ($type != 'project_task')) {	// For table project_taks, we want the filter on date apply on project_time_spent table
 			if (empty($datefieldname) && !empty($this->table_element_date)) {
 				$datefieldname = $this->table_element_date;
@@ -908,11 +908,11 @@ class Project extends CommonObject
 			if (empty($datefieldname)) {
 				return 'Error this object has no date field defined';
 			}
-			$sql .= " AND (".$datefieldname." >= '".$this->db->idate($date_start)."' OR ".$datefieldname." IS NULL)";
+			$sql .= " AND (".$datefieldname." >= '".$this->db->idate((int) $date_start)."' OR ".$datefieldname." IS NULL)";
 		}
 
 		if (isDolTms($date_end) && $type == 'loan') {
-			$sql .= " AND (datestart < '".$this->db->idate($date_end)."' OR datestart IS NULL)";
+			$sql .= " AND (datestart < '".$this->db->idate((int) $date_end)."' OR datestart IS NULL)";
 		} elseif (isDolTms($date_end) && ($type != 'project_task')) {	// For table project_taks, we want the filter on date apply on project_time_spent table
 			if (empty($datefieldname) && !empty($this->table_element_date)) {
 				$datefieldname = $this->table_element_date;
@@ -920,7 +920,7 @@ class Project extends CommonObject
 			if (empty($datefieldname)) {
 				return 'Error this object has no date field defined';
 			}
-			$sql .= " AND (".$datefieldname." <= '".$this->db->idate($date_end)."' OR ".$datefieldname." IS NULL)";
+			$sql .= " AND (".$datefieldname." <= '".$this->db->idate((int) $date_end)."' OR ".$datefieldname." IS NULL)";
 		}
 
 		$parameters = array(
@@ -1411,18 +1411,18 @@ class Project extends CommonObject
 	}
 
 	/**
-	 * 	Return clickable name (with picto eventually)
+	 * 	Return clickable name (with optional picto)
 	 *
-	 * 	@param	int		$withpicto		          0=No picto, 1=Include picto into link, 2=Only picto
-	 * 	@param	string	$option			          Variant where the link point to ('', 'nolink')
-	 * 	@param	int		$addlabel		          0=Default, 1=Add label into string, >1=Add first chars into string
-	 *  @param	string	$moreinpopup	          Text to add into popup
-	 *  @param	string	$sep			          Separator between ref and label if option addlabel is set
-	 *  @param	int   	$notooltip		          1=Disable tooltip
-	 *  @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-	 *  @param	string	$morecss				  More css on a link
-	 *  @param	string	$save_pageforbacktolist		  Back to this page 'context:url'
-	 * 	@return	string					          String with URL
+	 * 	@param	int<0,2>	$withpicto		          0=No picto, 1=Include picto into link, 2=Only picto
+	 * 	@param	string		$option			          Variant where the link point to ('', 'nolink')
+	 * 	@param	int			$addlabel		          0=Default, 1=Add label into string, >1=Add first chars into string
+	 *  @param	string		$moreinpopup	          Text to add into popup
+	 *  @param	string		$sep			          Separator between ref and label if option addlabel is set
+	 *  @param	int<0,1>   	$notooltip		          1=Disable tooltip
+	 *  @param  int<-1,1>	$save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param	string		$morecss				  More css on a link
+	 *  @param	string		$save_pageforbacktolist	  Back to this page 'context:url'
+	 * 	@return	string						          String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $addlabel = 0, $moreinpopup = '', $sep = ' - ', $notooltip = 0, $save_lastsearch_value = -1, $morecss = '', $save_pageforbacktolist = '')
 	{
@@ -1740,17 +1740,17 @@ class Project extends CommonObject
 	/**
 	 * Load an object from its id and create a new one in database
 	 *
-	 *  @param	User	$user		          User making the clone
-	 *  @param	int		$fromid     	      Id of object to clone
-	 *  @param	bool	$clone_contact	      Clone contact of project
-	 *  @param	bool	$clone_task		      Clone task of project
-	 *  @param	bool	$clone_project_file	  Clone file of project
-	 *  @param	bool	$clone_task_file	  Clone file of task (if task are copied)
-	 *  @param	bool	$clone_note		      Clone note of project
-	 *  @param	bool	$move_date		      Move task date on clone
-	 *  @param	int    	$notrigger		      No trigger flag
-	 *  @param  int     $newthirdpartyid      New thirdparty id
-	 *  @return	int						      New id of clone
+	 *  @param	User			$user		          User making the clone
+	 *  @param	int				$fromid     	      Id of object to clone
+	 *  @param	bool|int<0,1>	$clone_contact	      Clone contact of project
+	 *  @param	bool|int<0,1>	$clone_task		      Clone task of project
+	 *  @param	bool|int<0,1>	$clone_project_file	  Clone file of project
+	 *  @param	bool|int<0,1>	$clone_task_file	  Clone file of task (if task are copied)
+	 *  @param	bool|int<0,1>	$clone_note		      Clone note of project
+	 *  @param	bool|int<0,1>	$move_date		      Move task date on clone
+	 *  @param	int<0,1>		$notrigger		      No trigger flag
+	 *  @param  int				$newthirdpartyid      New thirdparty id
+	 *  @return	int								      New id of clone
 	 */
 	public function createFromClone(User $user, $fromid, $clone_contact = false, $clone_task = true, $clone_project_file = false, $clone_task_file = false, $clone_note = true, $move_date = true, $notrigger = 0, $newthirdpartyid = 0)
 	{
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index 90eb6b41040..892171de15e 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Lead
  * Copyright (C) 2014-2015 Florian HENRY <florian.henry@open-concept.pro>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW				<mdeweerd@users.noreply.github.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
@@ -224,7 +224,7 @@ class ProjectStats extends Stats
 		}
 
 		if (!empty($this->status)) {
-			$sqlwhere[] = " t.fk_statut IN (".$this->db->sanitize($this->status).")";
+			$sqlwhere[] = " t.fk_statut IN (".$this->db->sanitize((string) $this->status).")";
 		}
 
 		if (!empty($this->opp_status)) {
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index d76e3a605f4..da26f12997b 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -674,7 +674,7 @@ class Task extends CommonObjectLine
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task SET";
 		$sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
-		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "'".$this->db->escape($this->id)."'").",";
+		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "'".$this->db->escape((string) $this->id)."'").",";
 		$sql .= " fk_task_parent=".(isset($this->fk_task_parent) ? $this->fk_task_parent : "null").",";
 		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
 		$sql .= " description=".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "null").",";
@@ -1121,24 +1121,24 @@ class Task extends CommonObjectLine
 	 * Return list of tasks for all projects or for one particular project
 	 * Sort order is on project, then on position of task, and last on start date of first level task
 	 *
-	 * @param	?User	$usert					Object user to limit tasks affected to a particular user
-	 * @param	?User	$userp					Object user to limit projects of a particular user and public projects
-	 * @param	int		$projectid				Project id
-	 * @param	int		$socid					Third party id
-	 * @param	int		$mode					0=Return list of tasks and their projects, 1=Return projects and tasks if exists
-	 * @param	string	$filteronproj    		Filter on project ref or label
-	 * @param	string	$filteronprojstatus		Filter on project status ('-1'=no filter, '0,1'=Draft+Validated only)
-	 * @param	string	$morewherefilter		Add more filter into where SQL request (must start with ' AND ...')
-	 * @param	int		$filteronprojuser		Filter on user that is a contact of project
-	 * @param	int		$filterontaskuser		Filter on user assigned to task
-	 * @param	?Extrafields	$extrafields	Show additional column from project or task
-	 * @param   int     $includebilltime    	Calculate also the time to bill and billed
+	 * @param	?User		$usert				Object user to limit tasks affected to a particular user
+	 * @param	?User		$userp				Object user to limit projects of a particular user and public projects
+	 * @param	int			$projectid			Project id
+	 * @param	int			$socid				Third party id
+	 * @param	int<0,1>		$mode				0=Return list of tasks and their projects, 1=Return projects and tasks if exists
+	 * @param	string			$filteronproj    	Filter on project ref or label
+	 * @param	string			$filteronprojstatus	Filter on project status ('-1'=no filter, '0,1'=Draft+Validated only)
+	 * @param	string			$morewherefilter	Add more filter into where SQL request (must start with ' AND ...')
+	 * @param	int<0,1>		$filteronprojuser	Filter on user that is a contact of project
+	 * @param	int<0,1>		$filterontaskuser	Filter on user assigned to task
+	 * @param	?Extrafields	$extrafields		Show additional column from project or task
+	 * @param   int<0,1>		$includebilltime   	Calculate also the time to bill and billed
 	 * @param   array<string,string>   $search_array_options 	Array of search filters. Not Used yet.
-	 * @param   int     $loadextras         	Fetch all Extrafields on each project and 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 	Task[]|string					Array of tasks
+	 * @param   int<0,1>		$loadextras        	Fetch all Extrafields on each project and task
+	 * @param	int<0,1>		$loadRoleMode		1= will test Roles on task;  0 used in delete project action
+	 * @param	string			$sortfield			Sort field
+	 * @param	string			$sortorder			Sort order
+	 * @return 	Task[]|string						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 = null, $includebilltime = 0, $search_array_options = array(), $loadextras = 0, $loadRoleMode = 1, $sortfield = '', $sortorder = '')
 	{
@@ -1244,7 +1244,7 @@ class Task extends CommonObjectLine
 			$sql .= " AND p.fk_soc = ".((int) $socid);
 		}
 		if ($projectid) {
-			$sql .= " AND p.rowid IN (".$this->db->sanitize($projectid).")";
+			$sql .= " AND p.rowid IN (".$this->db->sanitize((string) $projectid).")";
 		}
 		if ($filteronproj) {
 			$sql .= natural_search(array("p.ref", "p.title"), $filteronproj);
@@ -1907,11 +1907,11 @@ class Task extends CommonObjectLine
 		}
 		if ($dates > 0) {
 			$datefieldname = "element_datehour";
-			$sql .= " AND (".$datefieldname." >= '".$this->db->idate($dates)."' OR ".$datefieldname." IS NULL)";
+			$sql .= " AND (".$datefieldname." >= '".$this->db->idate((int) $dates)."' OR ".$datefieldname." IS NULL)";
 		}
 		if ($datee > 0) {
 			$datefieldname = "element_datehour";
-			$sql .= " AND (".$datefieldname." <= '".$this->db->idate($datee)."' OR ".$datefieldname." IS NULL)";
+			$sql .= " AND (".$datefieldname." <= '".$this->db->idate((int) $datee)."' OR ".$datefieldname." IS NULL)";
 		}
 		//print $sql;
 
@@ -2220,7 +2220,7 @@ class Task extends CommonObjectLine
 
 		if (!$error) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
-			$sql .= " SET duration_effective = duration_effective - ".$this->db->escape($this->timespent_duration ? $this->timespent_duration : 0);
+			$sql .= " SET duration_effective = duration_effective - ".$this->db->escape($this->timespent_duration ? (string) $this->timespent_duration : '0');
 			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
@@ -2291,7 +2291,7 @@ class Task extends CommonObjectLine
 			require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON').'.php';
 			$modTask = new $obj();
 			'@phan-var-force ModeleNumRefTask $modTask';
-			$defaultref = $modTask->getNextValue(0, $clone_task);
+			$defaultref = $modTask->getNextValue(null, $clone_task);
 		}
 
 		$ori_project_id					= $clone_task->fk_project;
diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php
index 3db3f872217..99a176c9470 100644
--- a/htdocs/projet/class/taskstats.class.php
+++ b/htdocs/projet/class/taskstats.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2014-2015  Florian HENRY               <florian.henry@open-concept.pro>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.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
@@ -162,7 +162,7 @@ class TaskStats extends Stats
 			$sqlwhere[] = " t.datec BETWEEN '".$this->db->idate(dol_get_first_day($this->year, $this->month))."' AND '".$this->db->idate(dol_get_last_day($this->year, $this->month))."'";
 		}
 		if (!empty($this->priority)) {
-			$sqlwhere[] = " t.priority IN (".$this->db->sanitize($this->priority, 1).")";
+			$sqlwhere[] = " t.priority IN (".$this->db->sanitize((string) $this->priority, 1).")";
 		}
 
 		if (count($sqlwhere) > 0) {
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index f04c1df9ae6..22f4d4a33a9 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2010      Regis Houssin       <regis.houssin@inodbox.com>
  * Copyright (C) 2012-2015 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -88,16 +88,16 @@ if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
+$formconfirmtoaddtasks = '';
 if (empty($reshook)) {
 	// Test if we can add contact to the tasks at the same times, if not or not required, make a redirect
-	$formconfirmtoaddtasks = '';
 	if ($action == 'addcontact' && $permissiontoadd) {
 		$form = new Form($db);
 
 		$source = GETPOST("source", 'aZ09');
 
 		$taskstatic = new Task($db);
-		$task_array = $taskstatic->getTasksArray(0, 0, $object->id, 0, 0);
+		$task_array = $taskstatic->getTasksArray(null, null, $object->id, 0, 0);
 		$nbTasks = count($task_array);
 
 		//If no task available, redirec to to add confirm
@@ -191,7 +191,7 @@ if (empty($reshook)) {
 			if ($result > 0) {
 				$excludefilter = 'statut = 1';
 				$tmpcontactarray = $usergroup->listUsersForGroup($excludefilter, 0);
-				if ($contactarray <= 0) {
+				if (!is_array($tmpcontactarray)) {
 					$error++;
 				} else {
 					foreach ($tmpcontactarray as $tmpuser) {
@@ -245,7 +245,7 @@ if (empty($reshook)) {
 						foreach ($task_to_affect as $task_id) {
 							if (GETPOSTISSET('person_'.$task_id) && GETPOST('person_'.$task_id, 'san_alpha')) {
 								$tasksToAffect = new Task($db);
-								$result = $tasksToAffect->fetch($task_id);
+								$result = $tasksToAffect->fetch((int) $task_id);
 								if ($result < 0) {
 									setEventMessages($tasksToAffect->error, null, 'errors');
 								} else {
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 21fea1424d9..7d03c54a5b6 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -737,7 +737,7 @@ if (!empty($hookmanager->resArray)) {
 
 if ($action == "addelement") {
 	$tablename = GETPOST("tablename");
-	$elementselectid = GETPOST("elementselect");
+	$elementselectid = GETPOSTINT("elementselect");
 	$result = $object->update_element($tablename, $elementselectid);
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -766,10 +766,10 @@ if (!$showdatefilter) {
 	print '<input type="hidden" name="tablename" value="'.(empty($tablename) ? '' : $tablename).'">';
 	print '<input type="hidden" name="action" value="view">';
 	print '<div class="inline-block">';
-	print $form->selectDate($dates, 'dates', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print $form->selectDate((int) $dates, 'dates', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '<div class="inline-block">';
-	print $form->selectDate($datee, 'datee', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print $form->selectDate((int) $datee, 'datee', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '<div class="inline-block">';
 	print '<input type="submit" name="refresh" value="'.$langs->trans("Refresh").'" class="button small">';
@@ -866,8 +866,8 @@ foreach ($listofreferent as $key => $value) {
 			$num = count($elementarray);
 			for ($i = 0; $i < $num; $i++) {
 				$tmp = explode('_', $elementarray[$i]);
-				$idofelement = $tmp[0];
-				$idofelementuser = !empty($tmp[1]) ? $tmp[1] : "";
+				$idofelement = (int) $tmp[0];
+				$idofelementuser = !empty($tmp[1]) ? (int) $tmp[1] : 0;
 
 				$element->fetch($idofelement);
 				if ($idofelementuser) {
@@ -896,15 +896,20 @@ foreach ($listofreferent as $key => $value) {
 
 				// Define $total_ht_by_line
 				if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'salary') {
+					'@phan-var-force ChargeSociales|PaymentVarious|Salary $element';
 					$total_ht_by_line = $element->amount;
 				} elseif ($tablename == 'fichinter') {
+					'@phan-var-force Fichinter $element';
 					$total_ht_by_line = $element->getAmount();
 				} elseif ($tablename == 'stock_mouvement') {
+					'@phan-var-force MouvementStock $element';
 					$total_ht_by_line = $element->price * abs($element->qty);
 				} elseif ($tablename == 'projet_task') {
-					$tmp = $element->getSumOfAmount($idofelementuser ? $elementuser : '', $dates, $datee);
+					'@phan-var-force Task $element';
+					$tmp = $element->getSumOfAmount($idofelementuser ? $elementuser : '', (string) $dates, (string) $datee);
 					$total_ht_by_line = price2num($tmp['amount'], 'MT');
 				} elseif ($key == 'loan') {
+					'@phan-var-force Loan $element';
 					if ((empty($dates) && empty($datee)) || (intval($dates) <= $element->datestart && intval($datee) >= $element->dateend)) {
 						// Get total loan
 						$total_ht_by_line = -$element->capital;
@@ -933,12 +938,16 @@ foreach ($listofreferent as $key => $value) {
 
 				// Define $total_ttc_by_line
 				if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'salary') {
+					'@phan-var-force ChargeSociales|PaymentVarious|Salary $element';
 					$total_ttc_by_line = $element->amount;
 				} elseif ($tablename == 'fichinter') {
+					'@phan-var-force Fichinter $element';
 					$total_ttc_by_line = $element->getAmount();
 				} elseif ($tablename == 'stock_mouvement') {
+					'@phan-var-force MouvementStock $element';
 					$total_ttc_by_line = $element->price * abs($element->qty);
 				} elseif ($tablename == 'projet_task') {
+					'@phan-var-force Task $element';
 					$defaultvat = get_default_tva($mysoc, $mysoc);
 					$reg = array();
 					if (preg_replace('/^(\d+\.)\s\(.*\)/', $defaultvat, $reg)) {
@@ -1101,7 +1110,7 @@ foreach ($listofreferent as $key => $value) {
 		$exclude_select_element[] = $value['exclude_select_element'];
 	}
 
-	if ($qualified) {
+	if ($qualified && $tablename !== null) {
 		// If we want the project task array to have details of users
 		//if ($key == 'project_task') $key = 'project_task_time';
 
@@ -1268,8 +1277,8 @@ foreach ($listofreferent as $key => $value) {
 			$total_time = 0;
 			for ($i = 0; $i < $num; $i++) {
 				$tmp = explode('_', $elementarray[$i]);
-				$idofelement = $tmp[0];
-				$idofelementuser = isset($tmp[1]) ? $tmp[1] : "";
+				$idofelement = (int) $tmp[0];
+				$idofelementuser = isset($tmp[1]) ? (int) $tmp[1] : 0;
 
 				$element->fetch($idofelement);
 				if ($idofelementuser) {
@@ -1390,6 +1399,7 @@ foreach ($listofreferent as $key => $value) {
 				print "</td>\n";
 				// Product and qty on stock movement
 				if ('MouvementStock' == $classname) {
+					'@phan-var-force MouvementStock $element';
 					$mvsProd = new Product($element->db);
 					$mvsProd->fetch($element->product_id);
 					print '<td>'.$mvsProd->getNomUrl(1).'</td>';
@@ -1397,28 +1407,38 @@ foreach ($listofreferent as $key => $value) {
 				}
 				// Date or TimeSpent
 				$date = '';
-				$total_time_by_line = null;
+				$total_time_by_line = 0;
 				if ($tablename == 'expensereport_det') {
+					'@phan-var-force ExpenseReportLine $element';
 					$date = $element->date; // No draft status on lines
 				} elseif ($tablename == 'stock_mouvement') {
+					'@phan-var-force MouvementStock $element';
 					$date = $element->datem;
 				} elseif ($tablename == 'salary') {
+					'@phan-var-force Salary $element';
 					$date = $element->datesp;
 				} elseif ($tablename == 'payment_various') {
+					'@phan-var-force PaymentVarious $element';
 					$date = $element->datev;
 				} elseif ($tablename == 'chargesociales') {
+					'@phan-var-force ChargeSociales $element';
 					$date = $element->date_ech;
 				} elseif (!empty($element->status) || !empty($element->statut) || !empty($element->fk_status)) {
 					if ($tablename == 'don') {
-						$date = $element->datedon;
+						'@phan-var-force Don $element';
+						$date = $element->date;
 					}
 					if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order') {
+						'@phan-var-force CommandeFournisseur $element';
 						$date = ($element->date_commande ? $element->date_commande : $element->date_valid);
 					} elseif ($tablename == 'supplier_proposal') {
+						'@phan-var-force SupplierProposal $element';
 						$date = $element->date_validation; // There is no other date for this
 					} elseif ($tablename == 'fichinter') {
+						'@phan-var-force Fichinter $element';
 						$date = $element->datev; // There is no other date for this
 					} elseif ($tablename == 'projet_task') {
+						'@phan-var-force Task $element';
 						$date = ''; // We show no date. Showing date of beginning of task make user think it is date of time consumed
 					} else {
 						$date = $element->date; // invoice, ...
@@ -1429,21 +1449,25 @@ foreach ($listofreferent as $key => $value) {
 							$date = $element->datev;
 						}
 						if (empty($date) && !empty($datefieldname)) {
+							// @phan-suppress-next-line PhanUndeclaredProperty
 							$date = $element->$datefieldname;
 						}
 					}
 				} elseif ($key == 'loan') {
+					'@phan-var-force Loan $element';
 					$date = $element->datestart;
 				}
 
 				print '<td class="center">';
 				if ($tablename == 'actioncomm') {
+					'@phan-var-force ActionComm $element';
 					print dol_print_date($element->datep, 'dayhour');
 					if ($element->datef && $element->datef > $element->datep) {
 						print " - ".dol_print_date($element->datef, 'dayhour');
 					}
 				} elseif (in_array($tablename, array('projet_task'))) {
-					$tmpprojtime = $element->getSumOfAmount($idofelementuser ? $elementuser : '', $dates, $datee); // $element is a task. $elementuser may be empty
+					'@phan-var-force Task $element';
+					$tmpprojtime = $element->getSumOfAmount($idofelementuser ? $elementuser : '', (string) $dates, (string) $datee); // $element is a task. $elementuser may be empty
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$idofelement.'&withproject=1">';
 					print convertSecondToTime($tmpprojtime['nbseconds'], 'allhourmin');
 					print '</a>';
@@ -1466,6 +1490,7 @@ foreach ($listofreferent as $key => $value) {
 					$tmpuser->fetch($element->fk_user);
 					print $tmpuser->getNomUrl(1, '', 48);
 				} elseif ($tablename == 'don' || $tablename == 'stock_mouvement') {
+					'@phan-var-force Don|MouvementStock $element';
 					if ($element->fk_user_author > 0) {
 						$tmpuser2 = new User($db);
 						$tmpuser2->fetch($element->fk_user_author);
@@ -1474,12 +1499,14 @@ foreach ($listofreferent as $key => $value) {
 				} elseif ($tablename == 'projet_task' && $key == 'element_time') {	// if $key == 'project_task', we don't want details per user
 					print $elementuser->getNomUrl(1);
 				} elseif ($tablename == 'payment_various') {	// payment label
+					'@phan-var-force PaymentVarious $element';
 					print $element->label;
 				}
 				print '</td>';
 
 				// Add duration and store it in counter for fichinter
 				if ($tablename == 'fichinter') {
+					'@phan-var-force FichInter $element';
 					print '<td>';
 					print convertSecondToTime($element->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
 					$total_duration += $element->duration;
@@ -1492,10 +1519,13 @@ foreach ($listofreferent as $key => $value) {
 					$total_ht_by_line = null;
 					$othermessage = '';
 					if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'salary') {
+						'@phan-var-force Don|ChargeSociales|PaymentVarious|Salary $element';
 						$total_ht_by_line = $element->amount;
 					} elseif ($tablename == 'fichinter') {
+						'@phan-var-force FichInter $element';
 						$total_ht_by_line = $element->getAmount();
 					} elseif ($tablename == 'stock_mouvement') {
+						'@phan-var-force MouvementStock $element';
 						$total_ht_by_line = $element->price * abs($element->qty);
 					} elseif (in_array($tablename, array('projet_task'))) {
 						if (isModEnabled('salaries')) {
@@ -1509,6 +1539,7 @@ foreach ($listofreferent as $key => $value) {
 							$othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
 						}
 					} elseif ($key == 'loan') {
+						'@phan-var-force Loan $element';
 						$total_ht_by_line = $element->capital;
 					} else {
 						$total_ht_by_line = $element->total_ht;
@@ -1546,10 +1577,13 @@ foreach ($listofreferent as $key => $value) {
 				if (empty($value['disableamount'])) {
 					$total_ttc_by_line = null;
 					if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'salary') {
+						'@phan-var-force Don|ChargeSociales|PaymentVarious $element';
 						$total_ttc_by_line = $element->amount;
 					} elseif ($tablename == 'fichinter') {
+						'@phan-var-force Fichinter $element';
 						$total_ttc_by_line = $element->getAmount();
 					} elseif ($tablename == 'stock_mouvement') {
+						'@phan-var-force MouvementStock $element';
 						$total_ttc_by_line = $element->price * abs($element->qty);
 					} elseif ($tablename == 'projet_task') {
 						if (isModEnabled('salaries')) {
@@ -1560,6 +1594,7 @@ foreach ($listofreferent as $key => $value) {
 							$othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
 						}
 					} elseif ($key == 'loan') {
+						'@phan-var-force Loan $element';
 						$total_ttc_by_line = $element->capital - $element->getSumPayment();
 					} else {
 						$total_ttc_by_line = $element->total_ttc;
@@ -1605,6 +1640,7 @@ foreach ($listofreferent as $key => $value) {
 						print $element->progress.' %';
 					}
 				} elseif ($tablename == 'stock_mouvement') {
+					'@phan-var-force MouvementStock $element';
 					print $element->getLibStatut(3);
 				} else {
 					print $element->getLibStatut(5);
@@ -1662,7 +1698,7 @@ foreach ($listofreferent as $key => $value) {
 				print '<tr class="liste_total"><td colspan="'.$colspan.'">'.$langs->trans("Number").': '.$i.'</td>';
 				if (in_array($tablename, array('projet_task'))) {
 					print '<td class="center">';
-					print convertSecondToTime($total_time, 'allhourmin');
+					print convertSecondToTime((int) $total_time, 'allhourmin');
 					print '</td>';
 					print '<td>';
 					print '</td>';
@@ -1746,8 +1782,8 @@ function canApplySubtotalOn($tablename)
 /**
  * sortElementsByClientName
  *
- * @param 	int[]		$elementarray	Element array
- * @return	int[]						Element array sorted
+ * @param 	array<int,string>		$elementarray	Element array
+ * @return	array<int,string>						Element array sorted
  */
 function sortElementsByClientName($elementarray)
 {
diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php
index a887f6d24b5..c2a68c65d7c 100644
--- a/htdocs/projet/ganttchart.inc.php
+++ b/htdocs/projet/ganttchart.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2010-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,13 @@
  * @var DoliDB $db
  * @var Translate $langs
  */
+'
+@phan-var-force string $dateformatinput
+@phan-var-force string $dateformat
+@phan-var-force string $datehourformat
+@phan-var-force array<int,array{task_id:int,task_alternate_id:int,task_project_id:int,task_parent:int,task_is_group:int<0,1>,task_css:string,task_position:int,task_planned_workload:int,task_milestone:int,task_percent_complete:float,task_name:string,task_start_date:int,task_end_date:int,task_color:string,task_resources:string,note:string,task_parent_alternate_id:int}> $tasks
+@phan-var-force array{} $task_dependencies
+';
 ?>
 
 <div id="principal_content" style="margin-left: 0;">
@@ -129,14 +136,14 @@ if (g.getDivId() != null)
 			$projecttmp = new Project($db);
 			$projecttmp->fetch($t['task_project_id']);
 			$tmpt = array(
-			'task_id' => '-'.$t['task_project_id'],
-			'task_alternate_id' => '-'.$t['task_project_id'],
+			'task_id' => (int) -$t['task_project_id'],
+			'task_alternate_id' => (int) -$t['task_project_id'],
 			'task_name' => $projecttmp->ref.' '.$projecttmp->title,
 			'task_resources' => '',
-			'task_start_date' => '',
-			'task_end_date' => '',
+			'task_start_date' => 0,
+			'task_end_date' => 0,
 			'task_is_group' => 1, 'task_position' => 0, 'task_css' => 'ggroupblack', 'task_milestone' => 0, 'task_parent' => 0, 'task_parent_alternate_id' => 0,
-			'task_notes' => '',
+			'note' => '',
 			'task_planned_workload' => 0
 			);
 			constructGanttLine($tasks, $tmpt, array(), 0, $t['task_project_id']);
@@ -166,10 +173,10 @@ else
 
 <?php
 /**
- * Add a gant chart line
+ * Add a gantt chart line
  *
- * @param 	array<int,array{task_id:string,task_alternate_id:string,task_name:string,task_resources:string,task_start_date:string,task_end_date:string,task_is_group:int<0,1>,task_position:int,task_css:string,task_milestone:int,task_parent:int,task_parent_alternate_id:int}>	$tarr					Array of all tasks
- * @param	array{task_id:string,task_alternate_id:string,task_name:string,task_resources:string,task_start_date:string,task_end_date:string,task_is_group:int<0,1>,task_position:int,task_css:string,task_milestone:int,task_parent:int,task_parent_alternate_id:int}	$task					Array with properties of one task
+ * @param 	array<int,array{task_id:int,task_alternate_id:int,task_name:string,task_resources:string,task_start_date:int,task_end_date:int,task_is_group:int<0,1>,task_position:int,task_css:string,task_milestone:int,task_parent:int,task_parent_alternate_id:int}>	$tarr					Array of all tasks
+ * @param	array{task_id:int,task_alternate_id:int,task_name:string,task_resources:string,task_start_date:int,task_end_date:int,task_is_group:int<0,1>,task_position:int,task_css:string,task_milestone:int,task_parent:int,task_parent_alternate_id:int}	$task					Array with properties of one task
  * @param 	array<int[]>	$task_dependencies		Task dependencies (array(array(0=>idtask,1=>idtasktofinishfisrt))
  * @param 	int		$level					Level
  * @param 	int		$project_id				Id of project
@@ -280,8 +287,8 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $proje
 /**
  * Find child Gantt line
  *
- * @param 	array<int,array{task_id:string,task_alternate_id:string,task_name:string,task_resources:string,task_start_date:string,task_end_date:string,task_is_group:int<0,1>,task_position:int,task_css:string,task_milestone:int,task_parent:int,task_parent_alternate_id:int}>	$tarr					tarr
- * @param	string	$parent					Parent
+ * @param 	array<int,array{task_id:int,task_alternate_id:int,task_name:string,task_resources:string,task_start_date:int,task_end_date:int,task_is_group:int<0,1>,task_position:int,task_css:string,task_milestone:int,task_parent:int,task_parent_alternate_id:int}>	$tarr					tarr
+ * @param	int		$parent					Parent
  * @param 	array<int[]>	$task_dependencies		Task dependencies
  * @param 	int		$level					Level
  * @return	void
@@ -298,12 +305,12 @@ function findChildGanttLine($tarr, $parent, $task_dependencies, $level)
 			{
 				$tmpt = array(
 				'task_id'=> -98, 'task_name'=>'Level '.$level, 'task_resources'=>'', 'task_start_date'=>'', 'task_end_date'=>'',
-				'task_is_group'=>1, 'task_css'=>'ggroupblack', 'task_milestone'=> 0, 'task_parent'=>$tarr[$x]["task_parent"], 'task_notes'=>'');
+				'task_is_group'=>1, 'task_css'=>'ggroupblack', 'task_milestone'=> 0, 'task_parent'=>$tarr[$x]["task_parent"], 'note'=>'');
 				constructGanttLine($tasks, $tmpt, array(), 0, $tarr[$x]['task_project_id']);
 				$old_parent_id = $tarr[$x]['task_project_id'];
 			}*/
 
-			constructGanttLine($tarr, $tarr[$x], $task_dependencies, $level, null);
+			constructGanttLine($tarr, $tarr[$x], $task_dependencies, $level, 0);
 			findChildGanttLine($tarr, $tarr[$x]["task_id"], $task_dependencies, $level + 1);
 		}
 	}
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 33f7122723b..97ea895d75f 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -101,6 +101,8 @@ $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 
 llxHeader("", $title, $help_url, '', 0, 0, $arrayofjs, $arrayofcss, '', 'mod-project page-card_ganttview');
 
+$userWrite = 0;
+
 if (($id > 0 && is_numeric($id)) || !empty($ref)) {
 	// To verify role of users
 	//$userAccess = $object->restrictedProjectArea($user,'read');
@@ -272,7 +274,7 @@ print load_fiche_titre($title, $linktotasks.' &nbsp; '.$linktocreatetask, 'proje
 // 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).
-$tasksarray = $task->getTasksArray(0, 0, ($object->id ? $object->id : $id), $socid, 0);
+$tasksarray = $task->getTasksArray(null, null, ($object->id ? $object->id : $id), $socid, 0);
 // We load also tasks limited to a particular user
 //$tasksrole=($_REQUEST["mode"]=='mine' ? $task->getUserRolesForProjectsOrTasks(null, $user, $object->id, 0) : '');
 //var_dump($tasksarray);
@@ -313,7 +315,7 @@ if (count($tasksarray) > 0) {
 			$tasks[$taskcursor]['task_css'] = 'ggroupblack';
 			//$tasks[$taskcursor]['task_css'] = 'gtaskblue';
 		}
-		$tasks[$taskcursor]['task_milestone'] = '0';
+		$tasks[$taskcursor]['task_milestone'] = 0;
 		$tasks[$taskcursor]['task_percent_complete'] = $val->progress;
 		//$tasks[$taskcursor]['task_name']=$task->getNomUrl(1);
 		//print dol_print_date($val->date_start).dol_print_date($val->date_end).'<br>'."\n";
diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php
index 78d3ead854d..9ddb37a5d26 100644
--- a/htdocs/projet/graph_opportunities.inc.php
+++ b/htdocs/projet/graph_opportunities.inc.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2020  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2024		MDW						<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -29,6 +29,13 @@
  * @var int $socid
  * @var string[] $listofoppstatus
  */
+'
+@phan-var-force string $projectsListId
+@phan-var-force int $socid
+@phan-var-force string[] $listofoppstatus
+@phan-var-force ?array<int,string> $listofopplabel
+@phan-var-force array<string,string> $colorseries
+';
 
 if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 	$sql = "SELECT p.fk_opp_status as opp_status, cls.code, COUNT(p.rowid) as nb, SUM(p.opp_amount) as opp_amount, SUM(p.opp_amount * p.opp_percent) as ponderated_opp_amount";
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index c606b0d14f1..71c71590c54 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2018 	   Ferran Marcet	    <fmarcet@2byte.es>
  * Copyright (C) 2019 	   Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2020	   Tobias Sean			<tobias.sekan@startmail.com>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
  * Copyright (C) 2024		Benjamin Falière	<benjamin.faliere@altairis.fr>
  * Copyright (C) 2024		William Mead		<william.mead@manchenumerique.fr>
@@ -246,8 +246,8 @@ foreach ($object->fields as $key => $val) {
 		$visible = (int) dol_eval((string) $val['visible'], 1, 1, '1');
 		$arrayfields['p.'.$key] = array(
 			'label' => $val['label'],
-			'checked' => (($visible < 0) ? 0 : 1),
-			'enabled' => (abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
+			'checked' => (($visible < 0) ? '0' : '1'),
+			'enabled' => (string) (int) (abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
 			'position' => $val['position'],
 			'help' => isset($val['help']) ? $val['help'] : ''
 		);
@@ -257,38 +257,48 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 // Add non object fields to fields for list
-$arrayfields['s.nom'] = array('label' => "ThirdParty", 'checked' => 1, 'position' => 21, 'enabled' => (!isModEnabled('societe') ? 0 : 1));
-$arrayfields['s.name_alias'] = array('label' => "AliasNameShort", 'checked' => 0, 'position' => 22);
-$arrayfields['co.country_code'] = array('label' => "Country", 'checked' => -1, 'position' => 23);
-$arrayfields['commercial'] = array('label' => "SaleRepresentativesOfThirdParty", 'checked' => 0, 'position' => 25);
-$arrayfields['c.assigned'] = array('label' => "AssignedTo", 'checked' => 1, 'position' => 120);
-$arrayfields['opp_weighted_amount'] = array('label' => 'OpportunityWeightedAmountShort', 'checked' => 0, 'enabled' => (!getDolGlobalString('PROJECT_USE_OPPORTUNITIES') ? 0 : 1), 'position' => 106);
-$arrayfields['u.login'] = array('label' => "Author", 'checked' => -1, 'position' => 165);
+$arrayfields['s.nom'] = array('label' => "ThirdParty", 'checked' => '1', 'position' => 21, 'enabled' => (!isModEnabled('societe') ? '0' : '1'));
+$arrayfields['s.name_alias'] = array('label' => "AliasNameShort", 'checked' => '0', 'position' => 22);
+$arrayfields['co.country_code'] = array('label' => "Country", 'checked' => '-1', 'position' => 23);
+$arrayfields['commercial'] = array('label' => "SaleRepresentativesOfThirdParty", 'checked' => '0', 'position' => 25);
+$arrayfields['c.assigned'] = array('label' => "AssignedTo", 'checked' => '1', 'position' => 120);
+$arrayfields['opp_weighted_amount'] = array('label' => 'OpportunityWeightedAmountShort', 'checked' => '0', 'enabled' => (!getDolGlobalString('PROJECT_USE_OPPORTUNITIES') ? '0' : '1'), 'position' => 106);
+$arrayfields['u.login'] = array('label' => "Author", 'checked' => '-1', 'position' => 165);
 // Force some fields according to search_usage filter...
 //if (GETPOST('search_usage_opportunity')) {
 //$arrayfields['p.usage_opportunity']['visible'] = 1;	// Not required, filter on search_opp_status is enough
 //$arrayfields['p.usage_opportunity']['checked'] = 1;	// Not required, filter on search_opp_status is enough
 //}
 if (GETPOST('search_usage_event_organization')) {
-	$arrayfields['p.fk_opp_status']['enabled'] = 0;
-	$arrayfields['p.opp_amount']['enabled'] = 0;
-	$arrayfields['p.opp_percent']['enabled'] = 0;
-	$arrayfields['opp_weighted_amount']['enabled'] = 0;
-	$arrayfields['p.usage_organize_event']['visible'] = 1;
-	$arrayfields['p.usage_organize_event']['checked'] = 1;
+	if (array_key_exists('p.fk_opp_status', $arrayfields)) {
+		$arrayfields['p.fk_opp_status']['enabled'] = '0';
+	}
+	if (array_key_exists('p.fk_opp_amount', $arrayfields)) {
+		$arrayfields['p.opp_amount']['enabled'] = '0';
+	}
+	if (array_key_exists('p.fk_opp_percent', $arrayfields)) {
+		$arrayfields['p.opp_percent']['enabled'] = '0';
+	}
+	$arrayfields['opp_weighted_amount']['enabled'] = '0';
+	if (array_key_exists('p.usage_organize_event', $arrayfields)) {
+		$arrayfields['p.usage_organize_event']['visible'] = '1';
+		$arrayfields['p.usage_organize_event']['checked'] = '1';
+	}
 }
-$arrayfields['p.fk_project']['enabled'] = 0;
+$arrayfields['p.fk_project']['enabled'] = '0';
 
 // Force this field to be visible
 if ($contextpage == 'lead') {
-	$arrayfields['p.fk_opp_status']['enabled'] = 1;
-	$arrayfields['p.fk_opp_status']['visible'] = 1;
+	if (array_key_exists('p.fk_opp_status', $arrayfields)) {
+		$arrayfields['p.fk_opp_status']['enabled'] = '1';
+		$arrayfields['p.fk_opp_status']['visible'] = '1';
+	}
 }
 
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+// '@phan-var-force array<string,array{label:string,checked?:string,enabled?:string,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
 
 // Add a groupby field. Set $groupby and $groupbyvalues.
 // TODO Move this into a inc file
@@ -1203,7 +1213,7 @@ $includeonly = '';
 if (!$user->hasRight('user', 'user', 'lire')) {
 	$includeonly = array($user->id);
 }
-$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_project_user ? $search_project_user : '', 'search_project_user', $tmptitle, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth300 widthcentpercentminusx');
+$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_project_user ? $search_project_user : '', 'search_project_user', $tmptitle, null, 0, $includeonly, '', '0', 0, 0, '', 0, '', 'maxwidth300 widthcentpercentminusx');
 $moreforfilter .= '</div>';
 
 $moreforfilter .= '<div class="divsearchfield">';
@@ -1291,7 +1301,7 @@ if (!empty($arrayfields['s.nom']['checked'])) {
 		$tmpthirdparty->fetch($socid);
 		$search_societe = $tmpthirdparty->name;
 	}
-	print '<input type="text" class="flat" name="search_societe" size="8" value="'.dol_escape_htmltag($search_societe).'">';
+	print '<input type="text" class="flat" name="search_societe" size="8" value="'.dol_escape_htmltag((string) $search_societe).'">';
 	print '</td>';
 }
 
@@ -1527,14 +1537,17 @@ if (!empty($arrayfields['c.assigned']['checked'])) {
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.fk_opp_status']['checked'])) {
+	// @phan-suppress-next-line PhanTypeInvalidDimOffset
 	print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.opp_amount']['checked'])) {
+	// @phan-suppress-next-line PhanTypeInvalidDimOffset
 	print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.opp_percent']['checked'])) {
+	// @phan-suppress-next-line PhanTypeInvalidDimOffset
 	print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER['PHP_SELF'], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
@@ -1559,6 +1572,7 @@ if (!empty($arrayfields['p.usage_bill_time']['checked'])) {
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.usage_organize_event']['checked'])) {
+	// @phan-suppress-next-line PhanTypeInvalidDimOffset
 	print_liste_field_titre($arrayfields['p.usage_organize_event']['label'], $_SERVER["PHP_SELF"], 'p.usage_organize_event', "", $param, '', $sortfield, $sortorder, '');
 	$totalarray['nbfield']++;
 }
diff --git a/htdocs/webservices/server_project.php b/htdocs/webservices/server_project.php
index 4f9091a3df4..87921d46d99 100644
--- a/htdocs/webservices/server_project.php
+++ b/htdocs/webservices/server_project.php
@@ -420,7 +420,7 @@ function getProject($authentication, $id = '', $ref = '')
 				foreach ($listofreferent as $key => $tablename) {
 					$elements[$key] = array();
 					$element_array = $project->get_element_list($key, $tablename);
-					if (count($element_array) > 0 && is_array($element_array)) {
+					if (is_array($element_array) && count($element_array) > 0) {
 						foreach ($element_array as $element) {
 							$tmp = explode('_', $element);
 							$idofelement = count($tmp) > 0 ? $tmp[0] : "";

From b4f06c8f1c49209072860e249aec4ccbc931ba63 Mon Sep 17 00:00:00 2001
From: NefiteTifall | Nicolas <nefitetifall@gmail.com>
Date: Tue, 11 Feb 2025 10:20:23 +0100
Subject: [PATCH 600/602] =?UTF-8?q?=F0=9F=94=A7=20Remove=20escape?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Eliminated unnecessary escaping of help text in button titles, simplifying the code and ensuring that the title attribute directly uses the provided help text without modification.
---
 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 b21a6f45fe9..0c3ce6892f0 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13024,7 +13024,7 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
 	);
 
 	if (!empty($helpText)) {
-		$attr['title'] = dol_escape_php($helpText);
+		$attr['title'] = $helpText;
 	} elseif ($label) { // empty($attr['title']) &&
 		$attr['title'] = $label;
 		$useclassfortooltip = 0;

From 9055ab3b4c908447ad84b2c9b4cfc98119e148b9 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 11 Feb 2025 10:55:34 +0100
Subject: [PATCH 601/602] css

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

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 082c4bc1ff5..2b42d7f9937 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -5509,8 +5509,8 @@ div.boximport {
 
 .fieldrequired { font-weight: bold; color: var(--fieldrequiredcolor) !important; }
 
-td.widthpictotitle, .table-fiche-title img.widthpictotitle { width: 38px; text-align: <?php echo $left; ?>; }
-span.widthpictotitle { font-size: 1.7em; }
+td.widthpictotitle, .table-fiche-title img.widthpictotitle { width: 34px; text-align: <?php echo $left; ?>; }
+span.widthpictotitle { font-size: 1.5em; }
 table.titlemodulehelp tr td img.widthpictotitle { width: 80px; }
 
 .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index afa4c41ddf7..185e9916abb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2835,7 +2835,7 @@ td.nobordernopadding.widthpictotitle.col-picto {
 	width: 14px;
 }
 span.widthpictotitle {
-	font-size: 1.3em;
+	font-size: 1em;
 }
 .table-list-of-attached-files .col-picto, .table-list-of-links .col-picto {
 	opacity: 0.7 !important;

From a4e39ba1be5e2fb50dc4702686d619489c61f1d2 Mon Sep 17 00:00:00 2001
From: "Laurent Destailleur (aka Eldy)" <eldy@destailleur.fr>
Date: Tue, 11 Feb 2025 11:01:24 +0100
Subject: [PATCH 602/602] Debug v21

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0c3ce6892f0..87edd5fc92e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13001,7 +13001,7 @@ function getFieldErrorIcon($fieldValidationErrorMsg)
  */
 function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $url = '', $id = '', $status = 1, $params = array())
 {
-	global $langs, $conf, $user;
+	global $langs, $user;
 
 	// Actually this conf is used in css too for external module compatibility and smooth transition to this function
 	if (getDolGlobalString('MAIN_BUTTON_HIDE_UNAUTHORIZED') && (!$user->admin) && $status <= 0) {
@@ -13038,9 +13038,9 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
 		$attr['href'] = '';
 
 		if ($status == -1) { // disable
-			$attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("FeatureDisabled"));
+			$attr['title'] = $langs->transnoentitiesnoconv("FeatureDisabled");
 		} elseif ($status == 0) { // Not enough permissions
-			$attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions"));
+			$attr['title'] = $langs->transnoentitiesnoconv("NotEnoughPermissions");
 		}
 	}
 
@@ -13071,6 +13071,7 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
 
 	// TODO : add a hook
 
+	// Generate attributes with escapement
 	$TCompiledAttr = array();
 	foreach ($attr as $key => $value) {
 		$TCompiledAttr[] = $key.'="'.dol_escape_htmltag($value).'"';	// Do not use dolPrintHTMLForAttribute() here, we must accept "javascript:string"